From 9e36d42859cabc31944e77d617c2f7e9836be246 Mon Sep 17 00:00:00 2001 From: kfazz Date: Thu, 9 Jun 2016 13:07:03 -0400 Subject: [PATCH 01/91] Kinetis pwm support, based on kl_ftm driver. Initial commit. Compile checked only. --- arch/arm/src/kinetis/Kconfig | 63 +++ arch/arm/src/kinetis/Make.defs | 4 + arch/arm/src/kinetis/kinetis_pwm.c | 783 +++++++++++++++++++++++++++++ arch/arm/src/kinetis/kinetis_pwm.h | 197 ++++++++ 4 files changed, 1047 insertions(+) create mode 100644 arch/arm/src/kinetis/kinetis_pwm.c create mode 100644 arch/arm/src/kinetis/kinetis_pwm.h diff --git a/arch/arm/src/kinetis/Kconfig b/arch/arm/src/kinetis/Kconfig index fdf54e1941..5710c2d32c 100644 --- a/arch/arm/src/kinetis/Kconfig +++ b/arch/arm/src/kinetis/Kconfig @@ -383,6 +383,69 @@ config KINETIS_PIT endmenu +config KINETIS_FTM0_PWM + bool "FTM0 PWM" + default n + depends on KINETIS_FTM0 + ---help--- + Reserve timer 0 for use by PWM + + Timer devices may be used for different purposes. One special purpose is + to generate modulated outputs for such things as motor control. If KINETIS_FTM0 + is defined then THIS following may also be defined to indicate that + the timer is intended to be used for pulsed output modulation. + +config KINETIS_FTM0_CHANNEL + int "FTM0 PWM Output Channel" + default 0 + range 0 7 + depends on KINETIS_FTM0_PWM + ---help--- + If FTM0 is enabled for PWM usage, you also need specifies the timer output + channel {0,..,7} + +config KINETIS_FTM1_PWM + bool "FTM1 PWM" + default n + depends on KINETIS_FTM1 + ---help--- + Reserve timer 1 for use by PWM + + Timer devices may be used for different purposes. One special purpose is + to generate modulated outputs for such things as motor control. If KINETIS_FTM1 + is defined then THIS following may also be defined to indicate that + the timer is intended to be used for pulsed output modulation. + +config KINETIS_FTM1_CHANNEL + int "FTM1 PWM Output Channel" + default 0 + range 0 1 + depends on KINETIS_FTM1_PWM + ---help--- + If FTM1 is enabled for PWM usage, you also need specifies the timer output + channel {0,..,1} + +config KINETIS_FTM2_PWM + bool "FTM2 PWM" + default n + depends on KINETIS_FTM2 + ---help--- + Reserve timer 2 for use by PWM + + Timer devices may be used for different purposes. One special purpose is + to generate modulated outputs for such things as motor control. If KINETIS_FTM2 + is defined then THIS following may also be defined to indicate that + the timer is intended to be used for pulsed output modulation. + +config KINETIS_FTM2_CHANNEL + int "FTM2 PWM Output Channel" + default 0 + range 0 1 + depends on KINETIS_FTM2_PWM + ---help--- + If FTM2 is enabled for PWM usage, you also need specifies the timer output + channel {0,..,1} + comment "Kinetis GPIO Interrupt Configuration" config GPIO_IRQ diff --git a/arch/arm/src/kinetis/Make.defs b/arch/arm/src/kinetis/Make.defs index c9c5ec6ca8..32631fa63d 100644 --- a/arch/arm/src/kinetis/Make.defs +++ b/arch/arm/src/kinetis/Make.defs @@ -127,6 +127,10 @@ ifeq ($(CONFIG_KINETIS_DMA),y) CHIP_CSRCS += kinetis_dma.c kinetis_pindma.c endif +ifeq ($(CONFIG_PWM),y) +CHIP_CSRCS += kinetis_pwm.c +endif + ifeq ($(CONFIG_NET),y) ifeq ($(CONFIG_KINETIS_ENET),y) CHIP_CSRCS += kinetis_enet.c diff --git a/arch/arm/src/kinetis/kinetis_pwm.c b/arch/arm/src/kinetis/kinetis_pwm.c new file mode 100644 index 0000000000..8939317374 --- /dev/null +++ b/arch/arm/src/kinetis/kinetis_pwm.c @@ -0,0 +1,783 @@ +/**************************************************************************** + * arch/arm/src/kinetis/kinetis_pwm.c + * + * Copyright (C) 2013, 2016 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * Alan Carvalho de Assis + * Ken Fazzone + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include "up_internal.h" +#include "up_arch.h" + +#include "chip.h" + +#include "kinetis.h" +#include "kinetis_pwm.h" +#include "kinetis_gpio.h" +#include "kinetis_ftm.h" +#include "kinetis_sim.h" + +/* This module then only compiles if there is at least one enabled timer + * intended for use with the PWM upper half driver. + */ + +#if defined(CONFIG_KINETIS_FTM0_PWM) || defined(CONFIG_KINETIS_FTM1_PWM) || \ + defined(CONFIG_KINETIS_FTM2_PWM) + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ +/* PWM/Timer Definitions ****************************************************/ + +/* Debug ********************************************************************/ +/* Non-standard debug that may be enabled just for testing PWM */ + +#ifndef CONFIG_DEBUG +# undef CONFIG_DEBUG_PWM +#endif + +#ifdef CONFIG_DEBUG_PWM +# define pwmdbg dbg +# define pwmlldbg lldbg +# ifdef CONFIG_DEBUG_VERBOSE +# define pwmvdbg vdbg +# define pwmllvdbg llvdbg +# define pwm_dumpgpio(p,m) kinetis_dumpgpio(p,m) +# else +# define pwmlldbg(x...) +# define pwmllvdbg(x...) +# define pwm_dumpgpio(p,m) +# endif +#else +# define pwmdbg(x...) +# define pwmlldbg(x...) +# define pwmvdbg(x...) +# define pwmllvdbg(x...) +# define pwm_dumpgpio(p,m) +#endif + +/**************************************************************************** + * Private Types + ****************************************************************************/ +/* This structure represents the state of one PWM timer */ + +struct kinetis_pwmtimer_s +{ + FAR const struct pwm_ops_s *ops; /* PWM operations */ + uint8_t tpmid; /* Timer/PWM Module ID {0,..,2} */ + uint8_t channel; /* Timer/PWM Module channel: {0,..5} */ + uint32_t base; /* The base address of the timer */ + uint32_t pincfg; /* Output pin configuration */ + uint32_t pclk; /* The frequency of the peripheral clock */ +}; + +/**************************************************************************** + * Static Function Prototypes + ****************************************************************************/ +/* Register access */ + +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) +static void pwm_dumpregs(struct kinetis_pwmtimer_s *priv, FAR const char *msg); +#else +# define pwm_dumpregs(priv,msg) +#endif + +/* Timer management */ + +static int pwm_timer(FAR struct kinetis_pwmtimer_s *priv, + FAR const struct pwm_info_s *info); + +/* PWM driver methods */ + +static int pwm_setup(FAR struct pwm_lowerhalf_s *dev); +static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev); + +static int pwm_start(FAR struct pwm_lowerhalf_s *dev, + FAR const struct pwm_info_s *info); + +static int pwm_stop(FAR struct pwm_lowerhalf_s *dev); +static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, + int cmd, unsigned long arg); + +/**************************************************************************** + * Private Data + ****************************************************************************/ +/* This is the list of lower half PWM driver methods used by the upper half driver */ + +static const struct pwm_ops_s g_pwmops = +{ + .setup = pwm_setup, + .shutdown = pwm_shutdown, + .start = pwm_start, + .stop = pwm_stop, + .ioctl = pwm_ioctl, +}; + +#ifdef CONFIG_KINETIS_FTM0_PWM +static struct kinetis_pwmtimer_s g_pwm0dev = +{ + .ops = &g_pwmops, + .tpmid = 0, + .channel = CONFIG_KINETIS_FTM0_CHANNEL, + .base = KINETIS_FTM0_BASE, + .pincfg = PWM_FTM0_PINCFG, + .pclk = BOARD_CORECLK_FREQ, +}; +#endif + +#ifdef CONFIG_KINETIS_FTM1_PWM +static struct kinetis_pwmtimer_s g_pwm1dev = +{ + .ops = &g_pwmops, + .tpmid = 1, + .channel = CONFIG_KINETIS_FTM1_CHANNEL, + .base = KINETIS_FTM1_BASE, + .pincfg = PWM_FTM1_PINCFG, + .pclk = BOARD_CORECLK_FREQ, +}; +#endif + +#ifdef CONFIG_KINETIS_FTM2_PWM +static struct kinetis_pwmtimer_s g_pwm2dev = +{ + .ops = &g_pwmops, + .tpmid = 2, + .channel = CONFIG_KINETIS_FTM2_CHANNEL, + .base = KINETIS_FTM2_BASE, + .pincfg = PWM_FTM2_PINCFG, + .pclk = BOARD_CORECLK_FREQ, +}; +#endif + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: pwm_getreg + * + * Description: + * Read the value of an PWM timer register. + * + * Input Parameters: + * priv - A reference to the PWM block status + * offset - The offset to the register to read + * + * Returned Value: + * The current contents of the specified register + * + ****************************************************************************/ + +static uint32_t pwm_getreg(struct kinetis_pwmtimer_s *priv, int offset) +{ + return getreg32(priv->base + offset); +} + +/**************************************************************************** + * Name: pwm_putreg + * + * Description: + * Read the value of an PWM timer register. + * + * Input Parameters: + * priv - A reference to the PWM block status + * offset - The offset to the register to read + * + * Returned Value: + * None + * + ****************************************************************************/ + +static void pwm_putreg(struct kinetis_pwmtimer_s *priv, int offset, uint32_t value) +{ + putreg32(value, priv->base + offset); +} + +/**************************************************************************** + * Name: pwm_dumpregs + * + * Description: + * Dump all timer registers. + * + * Input parameters: + * priv - A reference to the PWM block status + * + * Returned Value: + * None + * + ****************************************************************************/ + +#if defined(CONFIG_DEBUG_PWM) && defined(CONFIG_DEBUG_VERBOSE) +static void pwm_dumpregs(struct kinetis_pwmtimer_s *priv, FAR const char *msg) +{ + int nchannels = (priv->tpmid == 0) ? 8 : 2; + + pwmvdbg("%s:\n", msg); + pwmvdbg(" FTM%d_SC: %04x FTM%d_CNT: %04x FTM%d_MOD: %04x\n", + priv->tpmid, + pwm_getreg(priv, KINETIS_FTM_SC_OFFSET), + priv->tpmid, + pwm_getreg(priv, KINETIS_FTM_CNT_OFFSET), + priv->tpmid, + pwm_getreg(priv, KINETIS_FTM_MOD_OFFSET)); + pwmvdbg(" FTM%d_STATUS: %04x FTM%d_CONF: %04x\n", + priv->tpmid, + pwm_getreg(priv, KINETIS_FTM_STATUS_OFFSET), + priv->tpmid, + pwm_getreg(priv, KINETIS_FTM_CONF_OFFSET)); + pwmvdbg(" FTM%d_C0SC: %04x FTM%d_C0V: %04x\n", + priv->tpmid, + pwm_getreg(priv, KINETIS_FTM_C0SC_OFFSET), + priv->tpmid, + pwm_getreg(priv, KINETIS_FTM_C0V_OFFSET)); + pwmvdbg(" FTM%d_C1SC: %04x FTM%d_C1V: %04x\n", + priv->tpmid, + pwm_getreg(priv, KINETIS_FTM_C1SC_OFFSET), + priv->tpmid, + pwm_getreg(priv, KINETIS_FTM_C1V_OFFSET)); + + if (nchannels >= 3) + { + pwmvdbg(" FTM%d_C2SC: %04x FTM%d_C2V: %04x\n", + priv->tpmid, + pwm_getreg(priv, KINETIS_FTM_C2SC_OFFSET), + priv->tpmid, + pwm_getreg(priv, KINETIS_FTM_C2V_OFFSET)); + } + + if (nchannels >= 4) + { + pwmvdbg(" FTM%d_C3SC: %04x FTM%d_C3V: %04x\n", + priv->tpmid, + pwm_getreg(priv, KINETIS_FTM_C3SC_OFFSET), + priv->tpmid, + pwm_getreg(priv, KINETIS_FTM_C3V_OFFSET)); + } + + if (nchannels >= 5) + { + pwmvdbg(" FTM%d_C4SC: %04x FTM%d_C4V: %04x\n", + priv->tpmid, + pwm_getreg(priv, KINETIS_FTM_C4SC_OFFSET), + priv->tpmid, + pwm_getreg(priv, KINETIS_FTM_C4V_OFFSET)); + } + + if (nchannels >= 6) + { + pwmvdbg(" FTM%d_C5SC: %04x FTM%d_C5V: %04x\n", + priv->tpmid, + pwm_getreg(priv, KINETIS_FTM_C5SC_OFFSET), + priv->tpmid, + pwm_getreg(priv, KINETIS_FTM_C5V_OFFSET)); + } + if (nchannels >= 7) + { + pwmvdbg(" FTM%d_C6SC: %04x FTM%d_C6V: %04x\n", + priv->tpmid, + pwm_getreg(priv, KINETIS_FTM_C6SC_OFFSET), + priv->tpmid, + pwm_getreg(priv, KINETIS_FTM_C6V_OFFSET)); + } + if (nchannels >= 8) + { + pwmvdbg(" FTM%d_C7SC: %04x FTM%d_C7V: %04x\n", + priv->tpmid, + pwm_getreg(priv, KINETIS_FTM_C7SC_OFFSET), + priv->tpmid, + pwm_getreg(priv, KINETIS_FTM_C7V_OFFSET)); + } +} +#endif + +/**************************************************************************** + * Name: pwm_timer + * + * Description: + * (Re-)initialize the timer resources and start the pulsed output + * + * Input parameters: + * priv - A reference to the lower half PWM driver state structure + * info - A reference to the characteristics of the pulsed output + * + * Returned Value: + * Zero on success; a negated errno value on failure + * + ****************************************************************************/ + +static int pwm_timer(FAR struct kinetis_pwmtimer_s *priv, + FAR const struct pwm_info_s *info) +{ + /* Calculated values */ + + uint32_t prescaler; + uint32_t tpmclk; + uint32_t modulo; + uint32_t regval; + uint32_t cv; + uint8_t i; + + static const uint8_t presc_values[8] = {1, 2, 4, 8, 16, 32, 64, 128}; + + /* Register contents */ + + DEBUGASSERT(priv != NULL && info != NULL); + + pwmvdbg("FTM%d channel: %d frequency: %d duty: %08x\n", + priv->tpmid, priv->channel, info->frequency, info->duty); + + DEBUGASSERT(info->frequency > 0 && info->duty > 0 && + info->duty < uitoub16(100)); + + /* Calculate optimal values for the timer prescaler and for the timer modulo + * register. If' frequency' is the desired frequency, then + * + * modulo = tpmclk / frequency + * tpmclk = pclk / presc + * + * Or, + * + * modulo = pclk / presc / frequency + * + * There are many solutions to do this, but the best solution will be the + * one that has the largest modulo value and the smallest prescaler value. + * That is the solution that should give us the most accuracy in the timer + * control. Subject to: + * + * 1 <= presc <= 128 (need to be 1, 2, 4, 8, 16, 32, 64, 128) + * 1 <= modulo <= 65535 + * + * So presc = pclk / 65535 / frequency would be optimal. + * + * Example: + * + * pclk = 24 MHz + * frequency = 100 Hz + * + * prescaler = 24,000,000 / 65,535 / 100 + * = 3.6 (or 4 -- taking the ceiling always) + * timclk = 24,000,000 / 4 + * = 6,000,000 + * modulo = 6,000,000 / 100 + * = 60,000 + */ + + prescaler = (priv->pclk / info->frequency + 65534) / 65535; + + for (i = 0; i < 7; i++) + { + if (prescaler <= presc_values[i]) + { + break; + } + } + + prescaler = i; + + tpmclk = priv->pclk / presc_values[prescaler]; + + modulo = tpmclk / info->frequency; + if (modulo < 1) + { + modulo = 1; + } + else if (modulo > 65535) + { + modulo = 65535; + } + + /* Duty cycle: + * + * duty cycle = cv / modulo (fractional value) + */ + + cv = b16toi(info->duty * modulo + b16HALF); + + pwmvdbg("FTM%d PCLK: %d frequency: %d FTMCLK: %d prescaler: %d modulo: %d c0v: %d\n", + priv->tpmid, priv->pclk, info->frequency, tpmclk, + presc_values[prescaler], modulo, cv); + + /* Disable FTM and reset CNT before writing MOD and PS */ + + pwm_putreg(priv, KINETIS_FTM_SC_OFFSET, FTM_SC_CLKS_NONE); + pwm_putreg(priv, KINETIS_FTM_CNT_OFFSET, 0); + + /* Set the modulo value */ + + pwm_putreg(priv, KINETIS_FTM_MOD_OFFSET, (uint16_t)modulo); + + /* Set the duty cycle for channel specific */ + + switch (priv->channel) + { + case 0: /* PWM Mode configuration: Channel 0 */ + { + pwm_putreg(priv, KINETIS_FTM_C0SC_OFFSET, FTM_CSC_MSB | FTM_CSC_ELSB); + pwm_putreg(priv, KINETIS_FTM_C0V_OFFSET, (uint16_t) cv); + } + break; + + case 1: /* PWM Mode configuration: Channel 1 */ + { + pwm_putreg(priv, KINETIS_FTM_C1SC_OFFSET, FTM_CSC_MSB | FTM_CSC_ELSB); + pwm_putreg(priv, KINETIS_FTM_C1V_OFFSET, (uint16_t) cv); + } + break; + + case 2: /* PWM Mode configuration: Channel 2 */ + { + pwm_putreg(priv, KINETIS_FTM_C2SC_OFFSET, FTM_CSC_MSB | FTM_CSC_ELSB); + pwm_putreg(priv, KINETIS_FTM_C2V_OFFSET, (uint16_t) cv); + } + break; + + case 3: /* PWM Mode configuration: Channel 3 */ + { + pwm_putreg(priv, KINETIS_FTM_C3SC_OFFSET, FTM_CSC_MSB | FTM_CSC_ELSB); + pwm_putreg(priv, KINETIS_FTM_C3V_OFFSET, (uint16_t) cv); + } + break; + + case 4: /* PWM Mode configuration: Channel 4 */ + { + pwm_putreg(priv, KINETIS_FTM_C4SC_OFFSET, FTM_CSC_MSB | FTM_CSC_ELSB); + pwm_putreg(priv, KINETIS_FTM_C4V_OFFSET, (uint16_t) cv); + } + break; + + case 5: /* PWM Mode configuration: Channel 5 */ + { + pwm_putreg(priv, KINETIS_FTM_C5SC_OFFSET, FTM_CSC_MSB | FTM_CSC_ELSB); + pwm_putreg(priv, KINETIS_FTM_C5V_OFFSET, (uint16_t) cv); + } + break; + + default: + pwmdbg("No such channel: %d\n", priv->channel); + return -EINVAL; + } + + /* Set prescaler and enable clock */ + + regval = pwm_getreg(priv, KINETIS_FTM_SC_OFFSET); + regval &= ~(FTM_SC_PS_MASK); + regval &= ~(FTM_SC_CLKS_MASK); + regval |= prescaler | FTM_SC_CLKS_SYSCLK; + pwm_putreg(priv, KINETIS_FTM_SC_OFFSET, (uint16_t)regval); + + pwm_dumpregs(priv, "After starting"); + return OK; +} + +/**************************************************************************** + * Name: pwm_setup + * + * Description: + * This method is called when the driver is opened. The lower half driver + * should configure and initialize the device so that it is ready for use. + * It should not, however, output pulses until the start method is called. + * + * Input parameters: + * dev - A reference to the lower half PWM driver state structure + * + * Returned Value: + * Zero on success; a negated errno value on failure + * + * Assumptions: + * AHB1 or 2 clocking for the GPIOs and timer has already been configured + * by the RCC logic at power up. + * + ****************************************************************************/ + +static int pwm_setup(FAR struct pwm_lowerhalf_s *dev) +{ + uint32_t regval; + FAR struct kinetis_pwmtimer_s *priv = (FAR struct kinetis_pwmtimer_s *)dev; + + /* Enable access to FTM modules */ + + regval = getreg32(KINETIS_SIM_SCGC6); + regval |= SIM_SCGC6_FTM0 | SIM_SCGC6_FTM1; + putreg32(regval, KINETIS_SIM_SCGC6); + + regval = getreg32(KINETIS_SIM_SCGC3); + regval |= SIM_SCGC3_FTM2; + putreg32(regval, KINETIS_SIM_SCGC3); + + pwmvdbg("FTM%d pincfg: %08x\n", priv->tpmid, priv->pincfg); + pwm_dumpregs(priv, "Initially"); + + /* Configure the PWM output pin, but do not start the timer yet */ + + kinetis_configgpio(priv->pincfg); + pwm_dumpgpio(priv->pincfg, "PWM setup"); + return OK; +} + +/**************************************************************************** + * Name: pwm_shutdown + * + * Description: + * This method is called when the driver is closed. The lower half driver + * stop pulsed output, free any resources, disable the timer hardware, and + * put the system into the lowest possible power usage state + * + * Input parameters: + * dev - A reference to the lower half PWM driver state structure + * + * Returned Value: + * Zero on success; a negated errno value on failure + * + ****************************************************************************/ + +static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev) +{ + FAR struct kinetis_pwmtimer_s *priv = (FAR struct kinetis_pwmtimer_s *)dev; + uint32_t pincfg; + + pwmvdbg("FTM%d pincfg: %08x\n", priv->tpmid, priv->pincfg); + + /* Make sure that the output has been stopped */ + + pwm_stop(dev); + + /* Then put the GPIO pin back to the default state */ + + pincfg = (priv->pincfg & ~(_PIN_MODE_MASK)); + pincfg |= GPIO_INPUT; + kinetis_configgpio(pincfg); + return OK; +} + +/**************************************************************************** + * Name: pwm_start + * + * Description: + * (Re-)initialize the timer resources and start the pulsed output + * + * Input parameters: + * dev - A reference to the lower half PWM driver state structure + * info - A reference to the characteristics of the pulsed output + * + * Returned Value: + * Zero on success; a negated errno value on failure + * + ****************************************************************************/ + +static int pwm_start(FAR struct pwm_lowerhalf_s *dev, + FAR const struct pwm_info_s *info) +{ + FAR struct kinetis_pwmtimer_s *priv = (FAR struct kinetis_pwmtimer_s *)dev; + return pwm_timer(priv, info); +} + +/**************************************************************************** + * Name: pwm_stop + * + * Description: + * Stop the pulsed output and reset the timer resources + * + * Input parameters: + * dev - A reference to the lower half PWM driver state structure + * + * Returned Value: + * Zero on success; a negated errno value on failure + * + * Assumptions: + * This function is called to stop the pulsed output at anytime. This + * method is also called from the timer interrupt handler when a repetition + * count expires... automatically stopping the timer. + * + ****************************************************************************/ + +static int pwm_stop(FAR struct pwm_lowerhalf_s *dev) +{ + FAR struct kinetis_pwmtimer_s *priv = (FAR struct kinetis_pwmtimer_s *)dev; + irqstate_t flags; + + pwmvdbg("FTM%d\n", priv->tpmid); + + /* Disable interrupts momentary to stop any ongoing timer processing and + * to prevent any concurrent access to the reset register. + */ + + flags = enter_critical_section(); + + /* Disable further interrupts and stop the timer */ + + pwm_putreg(priv, KINETIS_FTM_SC_OFFSET, FTM_SC_CLKS_NONE); + pwm_putreg(priv, KINETIS_FTM_CNT_OFFSET, 0); + + /* Determine which timer channel to clear */ + + switch (priv->channel) + { + case 0: + pwm_putreg(priv, KINETIS_FTM_C0V_OFFSET, 0); + break; + + case 1: + pwm_putreg(priv, KINETIS_FTM_C1V_OFFSET, 0); + break; + + case 2: + pwm_putreg(priv, KINETIS_FTM_C2V_OFFSET, 0); + break; + + case 3: + pwm_putreg(priv, KINETIS_FTM_C3V_OFFSET, 0); + break; + + case 4: + pwm_putreg(priv, KINETIS_FTM_C4V_OFFSET, 0); + break; + + case 5: + pwm_putreg(priv, KINETIS_FTM_C5V_OFFSET, 0); + break; + + default: + pwmdbg("No such channel: %d\n", priv->channel); + return -EINVAL; + } + + leave_critical_section(flags); + + pwm_dumpregs(priv, "After stop"); + return OK; +} + +/**************************************************************************** + * Name: pwm_ioctl + * + * Description: + * Lower-half logic may support platform-specific ioctl commands + * + * Input parameters: + * dev - A reference to the lower half PWM driver state structure + * cmd - The ioctl command + * arg - The argument accompanying the ioctl command + * + * Returned Value: + * Zero on success; a negated errno value on failure + * + ****************************************************************************/ + +static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, int cmd, unsigned long arg) +{ +#ifdef CONFIG_DEBUG_PWM + FAR struct kinetis_pwmtimer_s *priv = (FAR struct kinetis_pwmtimer_s *)dev; + + /* There are no platform-specific ioctl commands */ + + pwmvdbg("FTM%d\n", priv->tpmid); +#endif + return -ENOTTY; +} + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: kinetis_pwminitialize + * + * Description: + * Initialize one timer for use with the upper_level PWM driver. + * + * Input Parameters: + * timer - A number identifying the timer use. + * + * Returned Value: + * On success, a pointer to the kinetis lower half PWM driver is returned. + * NULL is returned on any failure. + * + ****************************************************************************/ + +FAR struct pwm_lowerhalf_s *kinetis_pwminitialize(int timer) +{ + FAR struct kinetis_pwmtimer_s *lower; + + pwmvdbg("FTM%d\n", timer); + + switch (timer) + { +#ifdef CONFIG_KINETIS_FTM0_PWM + case 0: + lower = &g_pwm0dev; + + break; +#endif + +#ifdef CONFIG_KINETIS_FTM1_PWM + case 1: + lower = &g_pwm1dev; + + break; +#endif + +#ifdef CONFIG_KINETIS_FTM2_PWM + case 2: + lower = &g_pwm2dev; + + break; +#endif + + default: + pwmdbg("No such timer configured\n"); + return NULL; + } + + return (FAR struct pwm_lowerhalf_s *)lower; +} + +#endif /* CONFIG_KINETIS_FTMn_PWM, n = 0,...,2 */ diff --git a/arch/arm/src/kinetis/kinetis_pwm.h b/arch/arm/src/kinetis/kinetis_pwm.h new file mode 100644 index 0000000000..95a6ecf632 --- /dev/null +++ b/arch/arm/src/kinetis/kinetis_pwm.h @@ -0,0 +1,197 @@ +/************************************************************************************ + * arch/arm/src/kinetis/kinetis_pwm.h + * + * Copyright (C) 2013 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * Alan Carvalho de Assis + * Ken Fazzone + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ************************************************************************************/ + +#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_PWM_H +#define __ARCH_ARM_SRC_KINETIS_KINETIS_PWM_H + +/************************************************************************************ + * Included Files + ************************************************************************************/ + +#include + +#include "chip.h" + +/************************************************************************************ + * Pre-processor Definitions + ************************************************************************************/ +/* Configuration ********************************************************************/ +/* Timer devices may be used for different purposes. One special purpose is + * to generate modulated outputs for such things as motor control. If CONFIG_KINETIS_FTMn + * is defined then the CONFIG_KINETIS_FTMn_PWM must also be defined to indicate that + * timer "n" is intended to be used for pulsed output signal generation. + */ + +#ifndef CONFIG_KINETIS_FTM0 +# undef CONFIG_KINETIS_FTM0_PWM +#endif +#ifndef CONFIG_KINETIS_FTM1 +# undef CONFIG_KINETIS_FTM1_PWM +#endif +#ifndef CONFIG_KINETIS_FTM2 +# undef CONFIG_KINETIS_FTM2_PWM +#endif + +/* Check if PWM support for any channel is enabled. */ + +#if defined(CONFIG_KINETIS_FTM0_PWM) || defined(CONFIG_KINETIS_FTM1_PWM) || \ + defined(CONFIG_KINETIS_FTM2_PWM) + +#include +#include "kinetis_pinmux.h" + +/* For each timer that is enabled for PWM usage, we need the following additional + * configuration settings: + * + * CONFIG_KINETIS_FTMx_CHANNEL - Specifies the timer output channel {1,..,4} + * PWM_FTMx_CHn - One of the values defined in kinetis*_pinmap.h. In the case + * where there are multiple pin selections, the correct setting must be provided + * in the arch/board/board.h file. + */ + +#ifdef CONFIG_KINETIS_FTM0_PWM +# if !defined(CONFIG_KINETIS_FTM0_CHANNEL) +# error "CONFIG_KINETIS_FTM0_CHANNEL must be provided" +# elif CONFIG_KINETIS_FTM0_CHANNEL == 0 +# define PWM_FTM0_PINCFG GPIO_FTM0_CH0OUT +# elif CONFIG_KINETIS_FTM0_CHANNEL == 1 +# define PWM_FTM0_PINCFG GPIO_FTM0_CH1OUT +# elif CONFIG_KINETIS_FTM0_CHANNEL == 2 +# define PWM_FTM0_PINCFG GPIO_FTM0_CH2OUT +# elif CONFIG_KINETIS_FTM0_CHANNEL == 3 +# define PWM_FTM0_PINCFG GPIO_FTM0_CH3OUT +# elif CONFIG_KINETIS_FTM0_CHANNEL == 4 +# define PWM_FTM0_PINCFG GPIO_FTM0_CH4OUT +# elif CONFIG_KINETIS_FTM0_CHANNEL == 5 +# define PWM_FTM0_PINCFG GPIO_FTM0_CH5OUT +# elif CONFIG_KINETIS_FTM0_CHANNEL == 6 +# define PWM_FTM0_PINCFG GPIO_FTM0_CH6OUT +# elif CONFIG_KINETIS_FTM0_CHANNEL == 7 +# define PWM_FTM0_PINCFG GPIO_FTM0_CH7OUT +# else +# error "Unsupported value of CONFIG_KINETIS_FTM1_CHANNEL" +# endif +#endif + +#ifdef CONFIG_KINETIS_FTM1_PWM +# if !defined(CONFIG_KINETIS_FTM1_CHANNEL) +# error "CONFIG_KINETIS_FTM1_CHANNEL must be provided" +# elif CONFIG_KINETIS_FTM1_CHANNEL == 0 +# define PWM_FTM1_PINCFG GPIO_FTM1_CH0OUT +# elif CONFIG_KINETIS_FTM1_CHANNEL == 1 +# define PWM_FTM1_PINCFG GPIO_FTM1_CH1OUT +# elif CONFIG_KINETIS_FTM1_CHANNEL == 2 +# define PWM_FTM1_PINCFG GPIO_FTM1_CH2OUT +# elif CONFIG_KINETIS_FTM1_CHANNEL == 3 +# define PWM_FTM1_PINCFG GPIO_FTM1_CH3OUT +# elif CONFIG_KINETIS_FTM1_CHANNEL == 4 +# define PWM_FTM1_PINCFG GPIO_FTM1_CH4OUT +# elif CONFIG_KINETIS_FTM1_CHANNEL == 5 +# define PWM_FTM1_PINCFG GPIO_FTM1_CH5OUT +# else +# error "Unsupported value of CONFIG_KINETIS_FTM2_CHANNEL" +# endif +#endif + +#ifdef CONFIG_KINETIS_FTM2_PWM +# if !defined(CONFIG_KINETIS_FTM2_CHANNEL) +# error "CONFIG_KINETIS_FTM2_CHANNEL must be provided" +# elif CONFIG_KINETIS_FTM2_CHANNEL == 0 +# define PWM_FTM2_PINCFG GPIO_FTM2_CH0OUT +# elif CONFIG_KINETIS_FTM2_CHANNEL == 1 +# define PWM_FTM2_PINCFG GPIO_FTM2_CH1OUT +# elif CONFIG_KINETIS_FTM2_CHANNEL == 2 +# define PWM_FTM2_PINCFG GPIO_FTM2_CH2OUT +# elif CONFIG_KINETIS_FTM2_CHANNEL == 3 +# define PWM_FTM2_PINCFG GPIO_FTM2_CH3OUT +# elif CONFIG_KINETIS_FTM2_CHANNEL == 4 +# define PWM_FTM2_PINCFG GPIO_FTM2_CH4OUT +# elif CONFIG_KINETIS_FTM2_CHANNEL == 5 +# define PWM_FTM2_PINCFG GPIO_FTM2_CH5OUT +# else +# error "Unsupported value of CONFIG_KINETIS_FTM3_CHANNEL" +# endif +#endif + +/************************************************************************************ + * Public Types + ************************************************************************************/ + +/************************************************************************************ + * Public Data + ************************************************************************************/ + +#ifndef __ASSEMBLY__ + +#undef EXTERN +#if defined(__cplusplus) +#define EXTERN extern "C" +extern "C" +{ +#else +#define EXTERN extern +#endif + +/************************************************************************************ + * Public Functions + ************************************************************************************/ + +/************************************************************************************ + * Name: kinetis_pwminitialize + * + * Description: + * Initialize one timer for use with the upper_level PWM driver. + * + * Input Parameters: + * timer - A number identifying the timer use. + * + * Returned Value: + * On success, a pointer to the kinetis lower half PWM driver is returned. + * NULL is returned on any failure. + * + ************************************************************************************/ + +FAR struct pwm_lowerhalf_s *kinetis_pwminitialize(int timer); + +#undef EXTERN +#if defined(__cplusplus) +} +#endif + +#endif /* __ASSEMBLY__ */ +#endif /* CONFIG_KINETIS_FTMx_PWM */ +#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_PWM_H */ -- GitLab From 00c02fde620c23a1ade1325953572803abc9284a Mon Sep 17 00:00:00 2001 From: kfazz Date: Thu, 9 Jun 2016 13:08:35 -0400 Subject: [PATCH 02/91] Teensy 3.x FTM pin definitions. --- configs/teensy-3.x/include/board.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/configs/teensy-3.x/include/board.h b/configs/teensy-3.x/include/board.h index 78ac30b109..95b7b6528c 100644 --- a/configs/teensy-3.x/include/board.h +++ b/configs/teensy-3.x/include/board.h @@ -140,6 +140,28 @@ #define BOARD_FLEXBUS_FREQ (BOARD_MCG_FREQ / BOARD_OUTDIV3) #define BOARD_FLASHCLK_FREQ (BOARD_MCG_FREQ / BOARD_OUTDIV4) +/* PWM Configuration */ +/* FTM0 Channels */ + +#define GPIO_FTM0_CH0OUT PIN_FTM0_CH0_2 /* Pin 22: PTC1 */ +#define GPIO_FTM0_CH1OUT PIN_FTM0_CH1_2 /* Pin 23: PTC2 */ +#define GPIO_FTM0_CH2OUT PIN_FTM0_CH2_2 /* Pin 9: PTC3 */ +#define GPIO_FTM0_CH3OUT PIN_FTM0_CH3 /* Pin 10: PTC4 */ +#define GPIO_FTM0_CH4OUT PIN_FTM0_CH4 /* Pin 6: PTD4 */ +#define GPIO_FTM0_CH5OUT PIN_FTM0_CH5_2 /* Pin 20: PTD5 */ +#define GPIO_FTM0_CH6OUT PIN_FTM0_CH6_2 /* Pin 21: PTD6 */ +#define GPIO_FTM0_CH7OUT PIN_FTM0_CH7_2 /* Pin 5: PTD7 */ + +/* FTM1 Channels */ + +#define GPIO_FTM1_CH0OUT PIN_FTM1_CH0_1 /* Pin 3: PTA12 */ +#define GPIO_FTM1_CH1OUT PIN_FTM1_CH1_1 /* Pin 4: PTA13 */ + +/* FTM2 Channels */ + +#define GPIO_FTM2_CH0OUT PIN_FTM2_CH0 /* Pin 25: PTB18 */ +#define GPIO_FTM2_CH1OUT PIN_FTM2_CH1 /* Pin 32: PTB19 */ + /* LED definitions ******************************************************************/ /* A single LED is available driven by PTC5. The LED is grounded so bringing PTC5 * high will illuminate the LED. -- GitLab From 3cc843480b52411895e064ec3a18ed5287404a16 Mon Sep 17 00:00:00 2001 From: kfazz Date: Thu, 9 Jun 2016 13:16:11 -0400 Subject: [PATCH 03/91] updated copyright year and fixed comment whitespace. --- arch/arm/src/kinetis/kinetis_pwm.c | 2 +- arch/arm/src/kinetis/kinetis_pwm.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/kinetis/kinetis_pwm.c b/arch/arm/src/kinetis/kinetis_pwm.c index 8939317374..b037df8dee 100644 --- a/arch/arm/src/kinetis/kinetis_pwm.c +++ b/arch/arm/src/kinetis/kinetis_pwm.c @@ -648,7 +648,7 @@ static int pwm_stop(FAR struct pwm_lowerhalf_s *dev) /* Disable interrupts momentary to stop any ongoing timer processing and * to prevent any concurrent access to the reset register. - */ + */ flags = enter_critical_section(); diff --git a/arch/arm/src/kinetis/kinetis_pwm.h b/arch/arm/src/kinetis/kinetis_pwm.h index 95a6ecf632..e9db2c1d77 100644 --- a/arch/arm/src/kinetis/kinetis_pwm.h +++ b/arch/arm/src/kinetis/kinetis_pwm.h @@ -1,7 +1,7 @@ /************************************************************************************ * arch/arm/src/kinetis/kinetis_pwm.h * - * Copyright (C) 2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2013, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * Alan Carvalho de Assis * Ken Fazzone -- GitLab From 6e9df2adf7651e979d5505ac40bfe2c67c9f91fa Mon Sep 17 00:00:00 2001 From: kfazz Date: Thu, 9 Jun 2016 23:34:24 -0400 Subject: [PATCH 04/91] support up to 8 channels per timer. TODO: port kl_dumpgpio.c to kinetis --- arch/arm/src/kinetis/kinetis_pwm.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/arch/arm/src/kinetis/kinetis_pwm.c b/arch/arm/src/kinetis/kinetis_pwm.c index b037df8dee..d84ca872ae 100644 --- a/arch/arm/src/kinetis/kinetis_pwm.c +++ b/arch/arm/src/kinetis/kinetis_pwm.c @@ -88,7 +88,7 @@ # ifdef CONFIG_DEBUG_VERBOSE # define pwmvdbg vdbg # define pwmllvdbg llvdbg -# define pwm_dumpgpio(p,m) kinetis_dumpgpio(p,m) +# define pwm_dumpgpio(p,m) /* kinetis_dumpgpio(p,m) */ # else # define pwmlldbg(x...) # define pwmllvdbg(x...) @@ -501,6 +501,19 @@ static int pwm_timer(FAR struct kinetis_pwmtimer_s *priv, } break; + case 6: /* PWM Mode configuration: Channel 6 */ + { + pwm_putreg(priv, KINETIS_FTM_C6SC_OFFSET, FTM_CSC_MSB | FTM_CSC_ELSB); + pwm_putreg(priv, KINETIS_FTM_C6V_OFFSET, (uint16_t) cv); + } + break; + case 7: /* PWM Mode configuration: Channel 7 */ + { + pwm_putreg(priv, KINETIS_FTM_C7SC_OFFSET, FTM_CSC_MSB | FTM_CSC_ELSB); + pwm_putreg(priv, KINETIS_FTM_C7V_OFFSET, (uint16_t) cv); + } + break; + default: pwmdbg("No such channel: %d\n", priv->channel); return -EINVAL; @@ -558,7 +571,7 @@ static int pwm_setup(FAR struct pwm_lowerhalf_s *dev) /* Configure the PWM output pin, but do not start the timer yet */ - kinetis_configgpio(priv->pincfg); + kinetis_pinconfig(priv->pincfg); pwm_dumpgpio(priv->pincfg, "PWM setup"); return OK; } @@ -594,7 +607,7 @@ static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev) pincfg = (priv->pincfg & ~(_PIN_MODE_MASK)); pincfg |= GPIO_INPUT; - kinetis_configgpio(pincfg); + kinetis_pinconfig(pincfg); return OK; } @@ -685,6 +698,14 @@ static int pwm_stop(FAR struct pwm_lowerhalf_s *dev) pwm_putreg(priv, KINETIS_FTM_C5V_OFFSET, 0); break; + case 6: + pwm_putreg(priv, KINETIS_FTM_C6V_OFFSET, 0); + break; + + case 7: + pwm_putreg(priv, KINETIS_FTM_C7V_OFFSET, 0); + break; + default: pwmdbg("No such channel: %d\n", priv->channel); return -EINVAL; -- GitLab From 7df66c5654e9a85476436ce20987d7df7e83c85e Mon Sep 17 00:00:00 2001 From: kfazz Date: Fri, 10 Jun 2016 01:11:44 -0400 Subject: [PATCH 05/91] register each enabled timer --- configs/teensy-3.x/src/Makefile | 6 +- configs/teensy-3.x/src/k20_pwm.c | 160 +++++++++++++++++++++++++++++++ 2 files changed, 165 insertions(+), 1 deletion(-) create mode 100644 configs/teensy-3.x/src/k20_pwm.c diff --git a/configs/teensy-3.x/src/Makefile b/configs/teensy-3.x/src/Makefile index ff73a6953a..87734c76c0 100644 --- a/configs/teensy-3.x/src/Makefile +++ b/configs/teensy-3.x/src/Makefile @@ -1,7 +1,7 @@ ############################################################################ # configs/teensy-3.x/src/Makefile # -# Copyright (C) 2015 Gregory Nutt. All rights reserved. +# Copyright (C) 2015,2016 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -51,4 +51,8 @@ ifeq ($(CONFIG_LIB_BOARDCTL),y) CSRCS += k20_appinit.c endif +ifeq ($(CONFIG_PWM),y) +CSRCS += k20_pwm.c +endif + include $(TOPDIR)/configs/Board.mk diff --git a/configs/teensy-3.x/src/k20_pwm.c b/configs/teensy-3.x/src/k20_pwm.c new file mode 100644 index 0000000000..94af831308 --- /dev/null +++ b/configs/teensy-3.x/src/k20_pwm.c @@ -0,0 +1,160 @@ +/************************************************************************************ + * configs/teensy-3.x/src/k20_pwm.c + * + * Copyright (C) 2015,2016 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * Alan Carvalho de Assis + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ************************************************************************************/ + +/************************************************************************************ + * Included Files + ************************************************************************************/ + +#include + +#include +#include +#include + +#include +#include + +#include + +#include "chip.h" +#include "up_arch.h" +#include "kinetis_pwm.h" + +/************************************************************************************ + * Pre-processor Definitions + ************************************************************************************/ +/* Configuration *******************************************************************/ +/* PWM + * + * The Kinetis Freedom board provides a LED on GPIO. + */ + +#ifdef CONFIG_PWM + +extern struct pwm_lowerhalf_s *kinetis_pwminitialize(int timer); + +/************************************************************************************ + * Private Functions + ************************************************************************************/ + +/************************************************************************************ + * Public Functions + ************************************************************************************/ + +/************************************************************************************ + * Name: board_pwm_setup + * + * Description: + * All Kinetis K20 architectures must provide the following interface to work with + * examples/pwm. + * + ************************************************************************************/ + +int board_pwm_setup(void) +{ + static bool initialized = false; + struct pwm_lowerhalf_s *pwm; + int ret; + + /* Have we already initialized? */ + + if (!initialized) + { + /* Call kinetis_pwminitialize() to get an instance of the PWM interface */ +#ifdef CONFIG_KINETIS_FTM0_PWM + pwm = kinetis_pwminitialize(0); + if (!pwm) + { + adbg("Failed to get the KL20 PWM lower half\n"); + return -ENODEV; + } + + /* Register the PWM driver at "/dev/pwm0" */ + + ret = pwm_register("/dev/pwm0", pwm); + if (ret < 0) + { + adbg("pwm_register failed: %d\n", ret); + return ret; + } + + /* Now we are initialized */ +#endif +#ifdef CONFIG_KINETIS_FTM1_PWM + pwm = kinetis_pwminitialize(1); + if (!pwm) + { + adbg("Failed to get the KL20 PWM lower half\n"); + return -ENODEV; + } + + /* Register the PWM driver at "/dev/pwm1" */ + + ret = pwm_register("/dev/pwm1", pwm); + if (ret < 0) + { + adbg("pwm_register failed: %d\n", ret); + return ret; + } + + /* Now we are initialized */ +#endif +#ifdef CONFIG_KINETIS_FTM2_PWM + pwm = kinetis_pwminitialize(2); + if (!pwm) + { + adbg("Failed to get the KL20 PWM lower half\n"); + return -ENODEV; + } + + /* Register the PWM driver at "/dev/pwm2" */ + + ret = pwm_register("/dev/pwm2", pwm); + if (ret < 0) + { + adbg("pwm_register failed: %d\n", ret); + return ret; + } + + /* Now we are initialized */ +#endif + initialized = true; + } + + return OK; +} + +#endif /* CONFIG_PWM */ -- GitLab From fdbbe8dc9a1063dcf7bfed86474bac98fb4e8e56 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Fri, 10 Jun 2016 09:13:43 -0400 Subject: [PATCH 06/91] crc16: fix error --- libc/misc/lib_crc16.c | 4 ++-- libc/misc/lib_crc32.c | 4 ++-- libc/misc/lib_crc8.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libc/misc/lib_crc16.c b/libc/misc/lib_crc16.c index 76e8dac8a5..0240e41ab2 100644 --- a/libc/misc/lib_crc16.c +++ b/libc/misc/lib_crc16.c @@ -114,9 +114,9 @@ uint16_t crc16part(FAR const uint8_t *src, size_t len, uint16_t crc16val) { size_t i; - for (i = 0; i < len; i++) + for (i = 0; i < len; i++) { - crc16val = crc16_tab[((crc16val >> 8) & 255)] ^ (crc16val << 8) ^ src[i]; + crc16val = crc16_tab[((crc16val >> 8) & 0xff) ^ src[i]] ^ (crc16val << 8); } return crc16val; diff --git a/libc/misc/lib_crc32.c b/libc/misc/lib_crc32.c index 40e7c014a0..cd6ac0758a 100644 --- a/libc/misc/lib_crc32.c +++ b/libc/misc/lib_crc32.c @@ -102,9 +102,9 @@ uint32_t crc32part(FAR const uint8_t *src, size_t len, uint32_t crc32val) { size_t i; - for (i = 0; i < len; i++) + for (i = 0; i < len; i++) { - crc32val = crc32_tab[(crc32val ^ src[i]) & 0xff] ^ (crc32val >> 8); + crc32val = crc32_tab[(crc32val & 0xff) ^ src[i]] ^ (crc32val >> 8); } return crc32val; } diff --git a/libc/misc/lib_crc8.c b/libc/misc/lib_crc8.c index ae3e01d5d7..4da049c60a 100644 --- a/libc/misc/lib_crc8.c +++ b/libc/misc/lib_crc8.c @@ -124,13 +124,13 @@ uint8_t crc8part(FAR const uint8_t *src, size_t len, uint8_t crc8val) { size_t i; - crc8val ^= 0xFF; - for (i = 0; i < len; i++) + crc8val ^= 0xff; + for (i = 0; i < len; i++) { crc8val = crc8_tab[crc8val ^ src[i]]; } - return crc8val ^ 0xFF; + return crc8val ^ 0xff; } /************************************************************************************************ -- GitLab From 9587c551ad556c15b8f75d8e62455a6a154aa195 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Fri, 10 Jun 2016 11:03:50 -0400 Subject: [PATCH 07/91] libc/misc: add crc64 --- include/crc64.h | 83 ++++++++++++ libc/Kconfig | 6 + libc/misc/Make.defs | 3 +- libc/misc/lib_crc64.c | 302 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 393 insertions(+), 1 deletion(-) create mode 100644 include/crc64.h create mode 100644 libc/misc/lib_crc64.c diff --git a/include/crc64.h b/include/crc64.h new file mode 100644 index 0000000000..8db458ad66 --- /dev/null +++ b/include/crc64.h @@ -0,0 +1,83 @@ +/**************************************************************************** + * include/crc64.h + * + * Copyright (C) 2016 Omni Hoverboards Inc. All rights reserved. + * Author: Paul Alexander Patience + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +#ifndef __INCLUDE_CRC64_H +#define __INCLUDE_CRC64_H + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include +#include + +/**************************************************************************** + * Public Function Prototypes + ****************************************************************************/ + +#ifdef __cplusplus +#define EXTERN extern "C" +extern "C" +{ +#else +#define EXTERN extern +#endif + +/**************************************************************************** + * Name: crc64part + * + * Description: + * Continue CRC calculation on a part of the buffer. + * + ****************************************************************************/ + +uint64_t crc64part(FAR const uint8_t *src, size_t len, uint64_t crc64val); + +/**************************************************************************** + * Name: crc64 + * + * Description: + * Return a 64-bit CRC of the contents of the 'src' buffer, length 'len'. + * + ****************************************************************************/ + +uint64_t crc64(FAR const uint8_t *src, size_t len); + +#undef EXTERN +#ifdef __cplusplus +} +#endif + +#endif /* __INCLUDE_CRC64_H */ diff --git a/libc/Kconfig b/libc/Kconfig index 276cc502e5..59f41f73ed 100644 --- a/libc/Kconfig +++ b/libc/Kconfig @@ -795,6 +795,12 @@ endif # NETDB_DNSCLIENT comment "Non-standard Library Support" +config LIB_CRC64_FAST + bool "Fast CRC64" + default n + ---help--- + Enable the CRC64 lookup table to compute the CRC64 faster. + if BUILD_PROTECTED || BUILD_KERNEL config LIB_USRWORK diff --git a/libc/misc/Make.defs b/libc/misc/Make.defs index 1a9f7911c1..45f3705a28 100644 --- a/libc/misc/Make.defs +++ b/libc/misc/Make.defs @@ -75,7 +75,8 @@ endif # Add the miscellaneous C files to the build -CSRCS += lib_match.c lib_crc32.c lib_crc16.c lib_crc8.c lib_dumpbuffer.c +CSRCS += lib_crc64.c lib_crc32.c lib_crc16.c lib_crc8.c +CSRCS += lib_dumpbuffer.c lib_match.c ifeq ($(CONFIG_DEBUG),y) CSRCS += lib_dbg.c diff --git a/libc/misc/lib_crc64.c b/libc/misc/lib_crc64.c new file mode 100644 index 0000000000..4b0374c554 --- /dev/null +++ b/libc/misc/lib_crc64.c @@ -0,0 +1,302 @@ +/**************************************************************************** + * libc/misc/lib_crc64.c + * + * Copyright (C) 2016 Omni Hoverboards Inc. All rights reserved. + * Author: Paul Alexander Patience + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include +#include +#include + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +/**************************************************************************** + * CRC64 table generated with: + * + * #include + * #include + * #include + * + * #define CRC64_POLYNOMIAL ((uint64_t)0x42f0e1eba9ea3693) + * #define CRC64_TABLEN ((size_t)256) + * + * int main(void) + * { + * uint64_t crc64val; + * size_t i; + * size_t j; + * + * printf("static const uint64_t crc64_tab[%zu] =\n", CRC64_TABLEN); + * printf("{\n "); + * + * for (i = 0; i < CRC64_TABLEN; i++) + * { + * crc64val = (uint64_t)i << 56; + * for (j = 0; j < 8; j++) + * { + * if ((crc64val & ((uint64_t)1 << 63)) != 0) + * { + * crc64val = (crc64val << 1) ^ CRC64_POLYNOMIAL; + * } + * else + * { + * crc64val = crc64val << 1; + * } + * } + * + * printf("0x%016"PRIx64, crc64val); + * if (i + 1 >= CRC64_TABLEN) + * { + * printf("\n"); + * } + * else if (i % 2 == 1) + * { + * printf(",\n "); + * } + * else + * { + * printf(", "); + * } + * } + * + * printf("};\n"); + * return 0; + * } + * + ****************************************************************************/ + +#ifdef CONFIG_LIB_CRC64_FAST +static const uint64_t crc64_tab[256] = +{ + 0x0000000000000000, 0x42f0e1eba9ea3693, + 0x85e1c3d753d46d26, 0xc711223cfa3e5bb5, + 0x493366450e42ecdf, 0x0bc387aea7a8da4c, + 0xccd2a5925d9681f9, 0x8e224479f47cb76a, + 0x9266cc8a1c85d9be, 0xd0962d61b56fef2d, + 0x17870f5d4f51b498, 0x5577eeb6e6bb820b, + 0xdb55aacf12c73561, 0x99a54b24bb2d03f2, + 0x5eb4691841135847, 0x1c4488f3e8f96ed4, + 0x663d78ff90e185ef, 0x24cd9914390bb37c, + 0xe3dcbb28c335e8c9, 0xa12c5ac36adfde5a, + 0x2f0e1eba9ea36930, 0x6dfeff5137495fa3, + 0xaaefdd6dcd770416, 0xe81f3c86649d3285, + 0xf45bb4758c645c51, 0xb6ab559e258e6ac2, + 0x71ba77a2dfb03177, 0x334a9649765a07e4, + 0xbd68d2308226b08e, 0xff9833db2bcc861d, + 0x388911e7d1f2dda8, 0x7a79f00c7818eb3b, + 0xcc7af1ff21c30bde, 0x8e8a101488293d4d, + 0x499b3228721766f8, 0x0b6bd3c3dbfd506b, + 0x854997ba2f81e701, 0xc7b97651866bd192, + 0x00a8546d7c558a27, 0x4258b586d5bfbcb4, + 0x5e1c3d753d46d260, 0x1cecdc9e94ace4f3, + 0xdbfdfea26e92bf46, 0x990d1f49c77889d5, + 0x172f5b3033043ebf, 0x55dfbadb9aee082c, + 0x92ce98e760d05399, 0xd03e790cc93a650a, + 0xaa478900b1228e31, 0xe8b768eb18c8b8a2, + 0x2fa64ad7e2f6e317, 0x6d56ab3c4b1cd584, + 0xe374ef45bf6062ee, 0xa1840eae168a547d, + 0x66952c92ecb40fc8, 0x2465cd79455e395b, + 0x3821458aada7578f, 0x7ad1a461044d611c, + 0xbdc0865dfe733aa9, 0xff3067b657990c3a, + 0x711223cfa3e5bb50, 0x33e2c2240a0f8dc3, + 0xf4f3e018f031d676, 0xb60301f359dbe0e5, + 0xda050215ea6c212f, 0x98f5e3fe438617bc, + 0x5fe4c1c2b9b84c09, 0x1d14202910527a9a, + 0x93366450e42ecdf0, 0xd1c685bb4dc4fb63, + 0x16d7a787b7faa0d6, 0x5427466c1e109645, + 0x4863ce9ff6e9f891, 0x0a932f745f03ce02, + 0xcd820d48a53d95b7, 0x8f72eca30cd7a324, + 0x0150a8daf8ab144e, 0x43a04931514122dd, + 0x84b16b0dab7f7968, 0xc6418ae602954ffb, + 0xbc387aea7a8da4c0, 0xfec89b01d3679253, + 0x39d9b93d2959c9e6, 0x7b2958d680b3ff75, + 0xf50b1caf74cf481f, 0xb7fbfd44dd257e8c, + 0x70eadf78271b2539, 0x321a3e938ef113aa, + 0x2e5eb66066087d7e, 0x6cae578bcfe24bed, + 0xabbf75b735dc1058, 0xe94f945c9c3626cb, + 0x676dd025684a91a1, 0x259d31cec1a0a732, + 0xe28c13f23b9efc87, 0xa07cf2199274ca14, + 0x167ff3eacbaf2af1, 0x548f120162451c62, + 0x939e303d987b47d7, 0xd16ed1d631917144, + 0x5f4c95afc5edc62e, 0x1dbc74446c07f0bd, + 0xdaad56789639ab08, 0x985db7933fd39d9b, + 0x84193f60d72af34f, 0xc6e9de8b7ec0c5dc, + 0x01f8fcb784fe9e69, 0x43081d5c2d14a8fa, + 0xcd2a5925d9681f90, 0x8fdab8ce70822903, + 0x48cb9af28abc72b6, 0x0a3b7b1923564425, + 0x70428b155b4eaf1e, 0x32b26afef2a4998d, + 0xf5a348c2089ac238, 0xb753a929a170f4ab, + 0x3971ed50550c43c1, 0x7b810cbbfce67552, + 0xbc902e8706d82ee7, 0xfe60cf6caf321874, + 0xe224479f47cb76a0, 0xa0d4a674ee214033, + 0x67c58448141f1b86, 0x253565a3bdf52d15, + 0xab1721da49899a7f, 0xe9e7c031e063acec, + 0x2ef6e20d1a5df759, 0x6c0603e6b3b7c1ca, + 0xf6fae5c07d3274cd, 0xb40a042bd4d8425e, + 0x731b26172ee619eb, 0x31ebc7fc870c2f78, + 0xbfc9838573709812, 0xfd39626eda9aae81, + 0x3a28405220a4f534, 0x78d8a1b9894ec3a7, + 0x649c294a61b7ad73, 0x266cc8a1c85d9be0, + 0xe17dea9d3263c055, 0xa38d0b769b89f6c6, + 0x2daf4f0f6ff541ac, 0x6f5faee4c61f773f, + 0xa84e8cd83c212c8a, 0xeabe6d3395cb1a19, + 0x90c79d3fedd3f122, 0xd2377cd44439c7b1, + 0x15265ee8be079c04, 0x57d6bf0317edaa97, + 0xd9f4fb7ae3911dfd, 0x9b041a914a7b2b6e, + 0x5c1538adb04570db, 0x1ee5d94619af4648, + 0x02a151b5f156289c, 0x4051b05e58bc1e0f, + 0x87409262a28245ba, 0xc5b073890b687329, + 0x4b9237f0ff14c443, 0x0962d61b56fef2d0, + 0xce73f427acc0a965, 0x8c8315cc052a9ff6, + 0x3a80143f5cf17f13, 0x7870f5d4f51b4980, + 0xbf61d7e80f251235, 0xfd913603a6cf24a6, + 0x73b3727a52b393cc, 0x31439391fb59a55f, + 0xf652b1ad0167feea, 0xb4a25046a88dc879, + 0xa8e6d8b54074a6ad, 0xea16395ee99e903e, + 0x2d071b6213a0cb8b, 0x6ff7fa89ba4afd18, + 0xe1d5bef04e364a72, 0xa3255f1be7dc7ce1, + 0x64347d271de22754, 0x26c49cccb40811c7, + 0x5cbd6cc0cc10fafc, 0x1e4d8d2b65facc6f, + 0xd95caf179fc497da, 0x9bac4efc362ea149, + 0x158e0a85c2521623, 0x577eeb6e6bb820b0, + 0x906fc95291867b05, 0xd29f28b9386c4d96, + 0xcedba04ad0952342, 0x8c2b41a1797f15d1, + 0x4b3a639d83414e64, 0x09ca82762aab78f7, + 0x87e8c60fded7cf9d, 0xc51827e4773df90e, + 0x020905d88d03a2bb, 0x40f9e43324e99428, + 0x2cffe7d5975e55e2, 0x6e0f063e3eb46371, + 0xa91e2402c48a38c4, 0xebeec5e96d600e57, + 0x65cc8190991cb93d, 0x273c607b30f68fae, + 0xe02d4247cac8d41b, 0xa2dda3ac6322e288, + 0xbe992b5f8bdb8c5c, 0xfc69cab42231bacf, + 0x3b78e888d80fe17a, 0x7988096371e5d7e9, + 0xf7aa4d1a85996083, 0xb55aacf12c735610, + 0x724b8ecdd64d0da5, 0x30bb6f267fa73b36, + 0x4ac29f2a07bfd00d, 0x08327ec1ae55e69e, + 0xcf235cfd546bbd2b, 0x8dd3bd16fd818bb8, + 0x03f1f96f09fd3cd2, 0x41011884a0170a41, + 0x86103ab85a2951f4, 0xc4e0db53f3c36767, + 0xd8a453a01b3a09b3, 0x9a54b24bb2d03f20, + 0x5d45907748ee6495, 0x1fb5719ce1045206, + 0x919735e51578e56c, 0xd367d40ebc92d3ff, + 0x1476f63246ac884a, 0x568617d9ef46bed9, + 0xe085162ab69d5e3c, 0xa275f7c11f7768af, + 0x6564d5fde549331a, 0x279434164ca30589, + 0xa9b6706fb8dfb2e3, 0xeb46918411358470, + 0x2c57b3b8eb0bdfc5, 0x6ea7525342e1e956, + 0x72e3daa0aa188782, 0x30133b4b03f2b111, + 0xf7021977f9cceaa4, 0xb5f2f89c5026dc37, + 0x3bd0bce5a45a6b5d, 0x79205d0e0db05dce, + 0xbe317f32f78e067b, 0xfcc19ed95e6430e8, + 0x86b86ed5267cdbd3, 0xc4488f3e8f96ed40, + 0x0359ad0275a8b6f5, 0x41a94ce9dc428066, + 0xcf8b0890283e370c, 0x8d7be97b81d4019f, + 0x4a6acb477bea5a2a, 0x089a2aacd2006cb9, + 0x14dea25f3af9026d, 0x562e43b4931334fe, + 0x913f6188692d6f4b, 0xd3cf8063c0c759d8, + 0x5dedc41a34bbeeb2, 0x1f1d25f19d51d821, + 0xd80c07cd676f8394, 0x9afce626ce85b507 +}; +#else +# define CRC64_POLYNOMIAL ((uint64_t)0x42f0e1eba9ea3693) +#endif + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: crc64part + * + * Description: + * Continue CRC calculation on a part of the buffer. + * + ****************************************************************************/ + +#ifdef CONFIG_LIB_CRC64_FAST +uint64_t crc64part(FAR const uint8_t *src, size_t len, uint64_t crc64val) +{ + size_t i; + + for (i = 0; i < len; i++) + { + crc64val = crc64_tab[((crc64val >> 56) & 0xff) ^ src[i]] ^ (crc64val << 8); + } + + return crc64val; +} +#else +uint64_t crc64part(FAR const uint8_t *src, size_t len, uint64_t crc64val) +{ + size_t i; + size_t j; + + for (i = 0; i < len; i++) + { + crc64val ^= (uint64_t)src[i] << 56; + for (j = 0; j < 8; j++) + { + if ((crc64val & ((uint64_t)1 << 63)) != 0) + { + crc64val = (crc64val << 1) ^ CRC64_POLYNOMIAL; + } + else + { + crc64val = crc64val << 1; + } + } + } + + return crc64val; +} +#endif + +/**************************************************************************** + * Name: crc64 + * + * Description: + * Return a 64-bit CRC of the contents of the 'src' buffer, length 'len'. + * + ****************************************************************************/ + +uint64_t crc64(FAR const uint8_t *src, size_t len) +{ + return crc64part(src, len, ~(uint64_t)0); +} -- GitLab From 0f40ef86b92f5f96862763fa79dcc72ea3777870 Mon Sep 17 00:00:00 2001 From: kfazz Date: Fri, 10 Jun 2016 11:35:20 -0400 Subject: [PATCH 08/91] Added kl_dumpgpio functionality as kinetis_pindump, which was already prototyped in kinetis.h. It is enabled when CONFIG_DEBUG_GPIO is defined. --- arch/arm/src/kinetis/Make.defs | 2 +- arch/arm/src/kinetis/kinetis.h | 2 +- arch/arm/src/kinetis/kinetis_pindump.c | 135 +++++++++++++++++++++++++ arch/arm/src/kinetis/kinetis_pwm.c | 2 +- 4 files changed, 138 insertions(+), 3 deletions(-) create mode 100644 arch/arm/src/kinetis/kinetis_pindump.c diff --git a/arch/arm/src/kinetis/Make.defs b/arch/arm/src/kinetis/Make.defs index 32631fa63d..ed4311a721 100644 --- a/arch/arm/src/kinetis/Make.defs +++ b/arch/arm/src/kinetis/Make.defs @@ -108,7 +108,7 @@ CHIP_CSRCS += kinetis_pinirq.c endif ifeq ($(CONFIG_DEBUG_GPIO),y) -CHIP_CSRCS += kinetis_pindbg.c +CHIP_CSRCS += kinetis_pindump.c endif ifeq ($(CONFIG_KINETIS_SDHC),y) diff --git a/arch/arm/src/kinetis/kinetis.h b/arch/arm/src/kinetis/kinetis.h index b0c016d22a..325b88d697 100644 --- a/arch/arm/src/kinetis/kinetis.h +++ b/arch/arm/src/kinetis/kinetis.h @@ -567,7 +567,7 @@ void kinetis_pindmadisable(uint32_t pinset); ************************************************************************************/ #ifdef CONFIG_DEBUG_GPIO -int kinetis_pindump(uint32_t pinset, const char *msg); +void kinetis_pindump(uint32_t pinset, const char *msg); #else # define kinetis_pindump(p,m) #endif diff --git a/arch/arm/src/kinetis/kinetis_pindump.c b/arch/arm/src/kinetis/kinetis_pindump.c new file mode 100644 index 0000000000..354fa3fcb5 --- /dev/null +++ b/arch/arm/src/kinetis/kinetis_pindump.c @@ -0,0 +1,135 @@ +/**************************************************************************** + * arch/arm/src/kinetis/kinetis_pindump.c + * + * Copyright (C) 2013, 2016 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include +#include + +#include +#include "up_arch.h" + +#include "kinetis.h" +#include "kinetis_gpio.h" +#include "kinetis_port.h" + +#ifdef CONFIG_DEBUG_GPIO + +/**************************************************************************** + * Private Data + ****************************************************************************/ +/* Port letters for prettier debug output */ + +static const char g_portchar[KINETIS_NPORTS] = +{ +#if KINETIS_NPORTS > 9 +# error "Additional support required for this number of GPIOs" +#elif KINETIS_NPORTS > 8 + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I' +#elif KINETIS_NPORTS > 7 + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H' +#elif KINETIS_NPORTS > 6 + 'A', 'B', 'C', 'D', 'E', 'F', 'G' +#elif KINETIS_NPORTS > 5 + 'A', 'B', 'C', 'D', 'E', 'F' +#elif KINETIS_NPORTS > 4 + 'A', 'B', 'C', 'D', 'E' +#elif KINETIS_NPORTS > 3 + 'A', 'B', 'C', 'D' +#elif KINETIS_NPORTS > 2 + 'A', 'B', 'C' +#elif KINETIS_NPORTS > 1 + 'A', 'B' +#elif KINETIS_NPORTS > 0 + 'A' +#else +# error "Bad number of GPIOs" +#endif +}; + +/**************************************************************************** + * Public Data + ****************************************************************************/ + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Function: kinetis_pindump + * + * Description: + * Dump all GPIO registers associated with the provided pin description + * along with a descriptive messasge. + * + ****************************************************************************/ + +void kinetis_pindump(uint32_t pinset, const char *msg) +{ + irqstate_t flags; + uintptr_t base; + int port; + + /* Decode the port and pin. Use the port number to get the GPIO base + * address. + */ + + port = (pinset & _PIN_PORT_MASK) >> _PIN_PORT_SHIFT; + DEBUGASSERT((unsigned)port < KINETIS_NPORTS); + base = KINETIS_GPIO_BASE(port); + + /* The following requires exclusive access to the GPIO registers */ + + flags = enter_critical_section(); + + lldbg("GPIO%c pinset: %08x base: %08x -- %s\n", + g_portchar[port], pinset, base, msg); + lldbg(" PDOR: %08x PDIR: %08x PDDR: %08x\n", + getreg32(base + KINETIS_GPIO_PDOR_OFFSET), + getreg32(base + KINETIS_GPIO_PDIR_OFFSET), + getreg32(base + KINETIS_GPIO_PDDR_OFFSET)); + + leave_critical_section(flags); +} + +#endif /* CONFIG_DEBUG_GPIO */ diff --git a/arch/arm/src/kinetis/kinetis_pwm.c b/arch/arm/src/kinetis/kinetis_pwm.c index d84ca872ae..0cf31bbd90 100644 --- a/arch/arm/src/kinetis/kinetis_pwm.c +++ b/arch/arm/src/kinetis/kinetis_pwm.c @@ -88,7 +88,7 @@ # ifdef CONFIG_DEBUG_VERBOSE # define pwmvdbg vdbg # define pwmllvdbg llvdbg -# define pwm_dumpgpio(p,m) /* kinetis_dumpgpio(p,m) */ +# define pwm_dumpgpio(p,m) kinetis_pindump(p,m) # else # define pwmlldbg(x...) # define pwmllvdbg(x...) -- GitLab From c98f00a93b3d0246f0986d6da718e670a3d4db68 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 10 Jun 2016 09:36:23 -0600 Subject: [PATCH 09/91] Update comments; trivial addtion to a document. --- Documentation/NuttXCCodingStandard.html | 10 +++++----- net/tcp/tcp_input.c | 6 +++--- net/udp/udp_input.c | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Documentation/NuttXCCodingStandard.html b/Documentation/NuttXCCodingStandard.html index d1e96795c7..581c6f60c4 100644 --- a/Documentation/NuttXCCodingStandard.html +++ b/Documentation/NuttXCCodingStandard.html @@ -162,10 +162,10 @@ Pre-processor Definitions
  • - Private Types + Private Types (definitions)
  • - Private Function Prototypes + Private Function Prototypes (declarations)
  • Private Data (definitions) @@ -191,7 +191,7 @@ Pre-processor Definitions
  • - Public Types + Public Types (definitions)
  • Public Data (declarations) @@ -212,12 +212,12 @@

    Header File Idempotence. - C header file must protect against multipleinclusion through the use of macros that "guard" against multiple definitions if the header file is included multiple times. + C header file must protect against multiple inclusion through the use of macros that "guard" against multiple definitions if the header file is included multiple times.

    • - Each header file must contain the following pre-processor commands near the beginning of the header file: Between the file header and the "Included Files" block comment. + Each header file must contain the following pre-processor conditional logic near the beginning of the header file: Between the file header and the "Included Files" block comment. For example, 

        diff --git a/net/tcp/tcp_input.c b/net/tcp/tcp_input.c
index 19c207f655..27ab34e1b3 100644
--- a/net/tcp/tcp_input.c
+++ b/net/tcp/tcp_input.c
@@ -71,9 +71,9 @@
  *   Handle incoming TCP input
  *
  * Parameters:
- *   dev      - The device driver structure containing the received TCP packet.
- *   tcp      - A pointer to the TCP header in the packet
- *   tcpiplen - Combined length of the IP and TCP headers
+ *   dev   - The device driver structure containing the received TCP packet.
+ *   tcp   - A pointer to the TCP header in the packet
+ *   iplen - Combined length of the IP and TCP headers
  *
  * Return:
  *   None
diff --git a/net/udp/udp_input.c b/net/udp/udp_input.c
index 640fd617ad..75d0ff40a8 100644
--- a/net/udp/udp_input.c
+++ b/net/udp/udp_input.c
@@ -67,9 +67,9 @@
  *   Handle incoming UDP input
  *
  * Parameters:
- *   dev      - The device driver structure containing the received UDP packet
- *   udp      - A pointer to the UDP header in the packet
- *   udpiplen - Length of the IP and UDP headers
+ *   dev   - The device driver structure containing the received UDP packet
+ *   udp   - A pointer to the UDP header in the packet
+ *   iplen - Length of the IP and UDP headers
  *
  * Return:
  *   OK  The packet has been processed  and can be deleted
-- 
GitLab


From 78a2465af4394a734edc453254896e1d32fb132c Mon Sep 17 00:00:00 2001
From: OrbitalFox 
Date: Fri, 10 Jun 2016 09:56:35 -0600
Subject: [PATCH 10/91] SAM4E: Fix some errors in AFEC header file.

---
 Documentation/NuttXCCodingStandard.html | 2 +-
 arch/arm/src/sam34/chip/sam_afec.h      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/NuttXCCodingStandard.html b/Documentation/NuttXCCodingStandard.html
index 581c6f60c4..e3b3103297 100644
--- a/Documentation/NuttXCCodingStandard.html
+++ b/Documentation/NuttXCCodingStandard.html
@@ -248,7 +248,7 @@
 
 
        
   Deoxygen Information.
-  NuttX does not use Deoxygen for documentation and no file should contain Doxygen tags.
+  NuttX does not use Deoxygen for documentation and no file should contain Doxygen tags or Doxygen style comments.
 
        
 
 
        
diff --git a/arch/arm/src/sam34/chip/sam_afec.h b/arch/arm/src/sam34/chip/sam_afec.h
index 9e779a1e4c..6dbf515f87 100644
--- a/arch/arm/src/sam34/chip/sam_afec.h
+++ b/arch/arm/src/sam34/chip/sam_afec.h
@@ -211,8 +211,8 @@
 #  define AFEC_EMR_CMPMODE_HIGH     (1 << AFEC_EMR_CMPMODE_SHIFT) /* Event when higher than high window threshold */
 #  define AFEC_EMR_CMPMODE_IN       (2 << AFEC_EMR_CMPMODE_SHIFT) /* Event when in comparison window */
 #  define AFEC_EMR_CMPMODE_OUT      (3 << AFEC_EMR_CMPMODE_SHIFT) /* Event when out of comparison window */
-#define AFEC_EMR_CMPSEL_SHIFT       (4)       /* Bit 4-7: Comparison Selected Channel */
-#define AFEC_EMR_CMPSEL_MASK        (15 << AFEC_EMR_CMPSEL_SHIFT)
+#define AFEC_EMR_CMPSEL_SHIFT       (3)       /* Bit 3-7: Comparison Selected Channel */
+#define AFEC_EMR_CMPSEL_MASK        (31 << AFEC_EMR_CMPSEL_SHIFT)
 #  define AFEC_EMR_CMPSEL(n)        ((uint32_t)(n) << AFEC_EMR_CMPSEL_SHIFT)
 #define AFEC_EMR_CMPALL             (1 << 9)  /* Bit 9:  Compare All Channels */
 #define AFEC_EMR_CMPFILTER_SHIFT    (12)      /* Bits 12-13: Compare Event Filtering */
@@ -375,7 +375,7 @@
 #  define AFEC_CWR_LOWTHRES(n)       ((uint32_t)(n) << AFEC_CWR_LOWTHRES_SHIFT)
 #define AFEC_CWR_HIGHTHRES_SHIFT     (16)      /* Bits 16-27: High Threshold */
 #define AFEC_CWR_HIGHTHRES_MASK      (0xfff << AFEC_CWR_LOWTHRES_SHIFT)
-#  define AFEC_CWR_HIGHTHRES(n)K     ((uint32_t)(n) << AFEC_CWR_LOWTHRES_SHIFT)
+#  define AFEC_CWR_HIGHTHRES(n)      ((uint32_t)(n) << AFEC_CWR_LOWTHRES_SHIFT)
 
 /* Channel Gain Register */
 
-- 
GitLab


From ae1281d244d21e23be9fe822266746a9fb99cd29 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Fri, 10 Jun 2016 10:00:36 -0600
Subject: [PATCH 11/91] SAM4E AFEC: Fix some columnar alignement

---
 arch/arm/src/sam34/chip/sam_afec.h | 46 +++++++++++++++---------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/arch/arm/src/sam34/chip/sam_afec.h b/arch/arm/src/sam34/chip/sam_afec.h
index 6dbf515f87..246ad67a7b 100644
--- a/arch/arm/src/sam34/chip/sam_afec.h
+++ b/arch/arm/src/sam34/chip/sam_afec.h
@@ -205,29 +205,29 @@
 
 /* Extended Mode Register */
 
-#define AFEC_EMR_CMPMODE_SHIFT      (0)      /* Bit 0-1: Comparison Mode */
-#define AFEC_EMR_CMPMODE_MASK       (3 << AFEC_EMR_CMPMODE_SHIFT)
-#  define AFEC_EMR_CMPMODE_LOW      (0 << AFEC_EMR_CMPMODE_SHIFT) /* Event when lower than low window threshold */
-#  define AFEC_EMR_CMPMODE_HIGH     (1 << AFEC_EMR_CMPMODE_SHIFT) /* Event when higher than high window threshold */
-#  define AFEC_EMR_CMPMODE_IN       (2 << AFEC_EMR_CMPMODE_SHIFT) /* Event when in comparison window */
-#  define AFEC_EMR_CMPMODE_OUT      (3 << AFEC_EMR_CMPMODE_SHIFT) /* Event when out of comparison window */
-#define AFEC_EMR_CMPSEL_SHIFT       (3)       /* Bit 3-7: Comparison Selected Channel */
-#define AFEC_EMR_CMPSEL_MASK        (31 << AFEC_EMR_CMPSEL_SHIFT)
-#  define AFEC_EMR_CMPSEL(n)        ((uint32_t)(n) << AFEC_EMR_CMPSEL_SHIFT)
-#define AFEC_EMR_CMPALL             (1 << 9)  /* Bit 9:  Compare All Channels */
-#define AFEC_EMR_CMPFILTER_SHIFT    (12)      /* Bits 12-13: Compare Event Filtering */
-#define AFEC_EMR_CMPFILTER_MASK     (3 << AFEC_EMR_CMPFILTER_SHIFT)
-#  define AFEC_EMR_CMPFILTER(n)     ((uint32_t)(n) << AFEC_EMR_CMPFILTER_SHIFT)
-#define AFEC_EMR_RES_SHIFT          (16)      /* Bits 16-18: Resolution */
-#define AFEC_EMR_RES_MASK           (7 << AFEC_EMR_RES_SHIFT)
-# define AFEC_EMR_RES_NOAVG         (0 << AFEC_EMR_RES_SHIFT) /* 12-bit resolution, AFEC sample rate is maximum (no averaging) */
-# define AFEC_EMR_RES_LOWRES        (1 << AFEC_EMR_RES_SHIFT) /* 10-bit resolution, AFEC sample rate is maximum (no averaging) */
-# define AFEC_EMR_RES_OSR4          (2 << AFEC_EMR_RES_SHIFT) /* 13-bit resolution, AFEC sample rate divided by 4 (averaging) */
-# define AFEC_EMR_RES_OSR16         (3 << AFEC_EMR_RES_SHIFT) /* 14-bit resolution, AFEC sample rate divided by 16 (averaging) */
-# define AFEC_EMR_RES_OSR64         (4 << AFEC_EMR_RES_SHIFT) /* 15-bit resolution, AFEC sample rate divided by 64 (averaging) */
-# define AFEC_EMR_RES_OSR256        (5 << AFEC_EMR_RES_SHIFT) /* 16-bit resolution, AFEC sample rate divided by 256 (averaging) */
-#define AFEC_EMR_TAG                (1 << 24) /* Bit 24: TAG of the AFEC_LDCR register */
-#define AFEC_EMR_STM                (1 << 25) /* Bit 25: Single Trigger Mode */
+#define AFEC_EMR_CMPMODE_SHIFT       (0)      /* Bit 0-1: Comparison Mode */
+#define AFEC_EMR_CMPMODE_MASK        (3 << AFEC_EMR_CMPMODE_SHIFT)
+#  define AFEC_EMR_CMPMODE_LOW       (0 << AFEC_EMR_CMPMODE_SHIFT) /* Event when lower than low window threshold */
+#  define AFEC_EMR_CMPMODE_HIGH      (1 << AFEC_EMR_CMPMODE_SHIFT) /* Event when higher than high window threshold */
+#  define AFEC_EMR_CMPMODE_IN        (2 << AFEC_EMR_CMPMODE_SHIFT) /* Event when in comparison window */
+#  define AFEC_EMR_CMPMODE_OUT       (3 << AFEC_EMR_CMPMODE_SHIFT) /* Event when out of comparison window */
+#define AFEC_EMR_CMPSEL_SHIFT        (3)       /* Bit 3-7: Comparison Selected Channel */
+#define AFEC_EMR_CMPSEL_MASK         (31 << AFEC_EMR_CMPSEL_SHIFT)
+#  define AFEC_EMR_CMPSEL(n)         ((uint32_t)(n) << AFEC_EMR_CMPSEL_SHIFT)
+#define AFEC_EMR_CMPALL              (1 << 9)  /* Bit 9:  Compare All Channels */
+#define AFEC_EMR_CMPFILTER_SHIFT     (12)      /* Bits 12-13: Compare Event Filtering */
+#define AFEC_EMR_CMPFILTER_MASK      (3 << AFEC_EMR_CMPFILTER_SHIFT)
+#  define AFEC_EMR_CMPFILTER(n)      ((uint32_t)(n) << AFEC_EMR_CMPFILTER_SHIFT)
+#define AFEC_EMR_RES_SHIFT           (16)      /* Bits 16-18: Resolution */
+#define AFEC_EMR_RES_MASK            (7 << AFEC_EMR_RES_SHIFT)
+# define AFEC_EMR_RES_NOAVG          (0 << AFEC_EMR_RES_SHIFT) /* 12-bit resolution, AFEC sample rate is maximum (no averaging) */
+# define AFEC_EMR_RES_LOWRES         (1 << AFEC_EMR_RES_SHIFT) /* 10-bit resolution, AFEC sample rate is maximum (no averaging) */
+# define AFEC_EMR_RES_OSR4           (2 << AFEC_EMR_RES_SHIFT) /* 13-bit resolution, AFEC sample rate divided by 4 (averaging) */
+# define AFEC_EMR_RES_OSR16          (3 << AFEC_EMR_RES_SHIFT) /* 14-bit resolution, AFEC sample rate divided by 16 (averaging) */
+# define AFEC_EMR_RES_OSR64          (4 << AFEC_EMR_RES_SHIFT) /* 15-bit resolution, AFEC sample rate divided by 64 (averaging) */
+# define AFEC_EMR_RES_OSR256         (5 << AFEC_EMR_RES_SHIFT) /* 16-bit resolution, AFEC sample rate divided by 256 (averaging) */
+#define AFEC_EMR_TAG                 (1 << 24) /* Bit 24: TAG of the AFEC_LDCR register */
+#define AFEC_EMR_STM                 (1 << 25) /* Bit 25: Single Trigger Mode */
 
 /* Channel Sequence 1 Register */
 
-- 
GitLab


From 275f8988f8cf70c4ec597b27276db0de0f9d9725 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Fri, 10 Jun 2016 10:13:30 -0600
Subject: [PATCH 12/91] Fix a cloned error in debug macro definitions

---
 arch/arm/src/efm32/efm32_pwm.c     |  2 +-
 arch/arm/src/kl/kl_pwm.c           |  2 +-
 arch/arm/src/lpc11xx/lpc11_timer.c |  2 +-
 arch/arm/src/lpc17xx/lpc17_mcpwm.c |  2 +-
 arch/arm/src/lpc17xx/lpc17_pwm.c   |  2 +-
 arch/arm/src/lpc17xx/lpc17_timer.c |  2 +-
 arch/arm/src/sam34/chip/sam_afec.h | 70 +++++++++++++++---------------
 arch/arm/src/sama5/sam_pwm.c       |  2 +-
 8 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/arch/arm/src/efm32/efm32_pwm.c b/arch/arm/src/efm32/efm32_pwm.c
index 04941d4434..c4f42d1712 100644
--- a/arch/arm/src/efm32/efm32_pwm.c
+++ b/arch/arm/src/efm32/efm32_pwm.c
@@ -89,7 +89,7 @@
 #    define pwmllvdbg         llvdbg
 #    define pwm_dumpgpio(p,m) efm32_dumpgpio(p,m)
 #  else
-#    define pwmlldbg(x...)
+#    define pwmvdbg(x...)
 #    define pwmllvdbg(x...)
 #    define pwm_dumpgpio(p,m)
 #  endif
diff --git a/arch/arm/src/kl/kl_pwm.c b/arch/arm/src/kl/kl_pwm.c
index c4714178e4..0e2fa2149e 100644
--- a/arch/arm/src/kl/kl_pwm.c
+++ b/arch/arm/src/kl/kl_pwm.c
@@ -87,7 +87,7 @@
 #    define pwmllvdbg         llvdbg
 #    define pwm_dumpgpio(p,m) kl_dumpgpio(p,m)
 #  else
-#    define pwmlldbg(x...)
+#    define pwmvdbg(x...)
 #    define pwmllvdbg(x...)
 #    define pwm_dumpgpio(p,m)
 #  endif
diff --git a/arch/arm/src/lpc11xx/lpc11_timer.c b/arch/arm/src/lpc11xx/lpc11_timer.c
index b9106becbc..d53b6b40db 100644
--- a/arch/arm/src/lpc11xx/lpc11_timer.c
+++ b/arch/arm/src/lpc11xx/lpc11_timer.c
@@ -96,7 +96,7 @@
 #    define pwmllvdbg         llvdbg
 #    define pwm_dumpgpio(p,m) stm32_dumpgpio(p,m)
 #  else
-#    define pwmlldbg(x...)
+#    define pwmvdbg(x...)
 #    define pwmllvdbg(x...)
 #    define pwm_dumpgpio(p,m)
 #  endif
diff --git a/arch/arm/src/lpc17xx/lpc17_mcpwm.c b/arch/arm/src/lpc17xx/lpc17_mcpwm.c
index f8d552941b..dd3e71de26 100644
--- a/arch/arm/src/lpc17xx/lpc17_mcpwm.c
+++ b/arch/arm/src/lpc17xx/lpc17_mcpwm.c
@@ -95,7 +95,7 @@
 #    define pwmllvdbg         llvdbg
 #    define pwm_dumpgpio(p,m) stm32_dumpgpio(p,m)
 #  else
-#    define pwmlldbg(x...)
+#    define pwmvdbg(x...)
 #    define pwmllvdbg(x...)
 #    define pwm_dumpgpio(p,m)
 #  endif
diff --git a/arch/arm/src/lpc17xx/lpc17_pwm.c b/arch/arm/src/lpc17xx/lpc17_pwm.c
index 4f8c79315c..f33938beae 100644
--- a/arch/arm/src/lpc17xx/lpc17_pwm.c
+++ b/arch/arm/src/lpc17xx/lpc17_pwm.c
@@ -113,7 +113,7 @@
 #    define pwmllvdbg         llvdbg
 #    define pwm_dumpgpio(p,m) stm32_dumpgpio(p,m)
 #  else
-#    define pwmlldbg(x...)
+#    define pwmvdbg(x...)
 #    define pwmllvdbg(x...)
 #    define pwm_dumpgpio(p,m)
 #  endif
diff --git a/arch/arm/src/lpc17xx/lpc17_timer.c b/arch/arm/src/lpc17xx/lpc17_timer.c
index b4a821ffc0..2cd143fccc 100644
--- a/arch/arm/src/lpc17xx/lpc17_timer.c
+++ b/arch/arm/src/lpc17xx/lpc17_timer.c
@@ -96,7 +96,7 @@
 #    define pwmllvdbg         llvdbg
 #    define pwm_dumpgpio(p,m) stm32_dumpgpio(p,m)
 #  else
-#    define pwmlldbg(x...)
+#    define pwmvdbg(x...)
 #    define pwmllvdbg(x...)
 #    define pwm_dumpgpio(p,m)
 #  endif
diff --git a/arch/arm/src/sam34/chip/sam_afec.h b/arch/arm/src/sam34/chip/sam_afec.h
index 246ad67a7b..d5a8be44ab 100644
--- a/arch/arm/src/sam34/chip/sam_afec.h
+++ b/arch/arm/src/sam34/chip/sam_afec.h
@@ -205,7 +205,7 @@
 
 /* Extended Mode Register */
 
-#define AFEC_EMR_CMPMODE_SHIFT       (0)      /* Bit 0-1: Comparison Mode */
+#define AFEC_EMR_CMPMODE_SHIFT       (0)       /* Bit 0-1: Comparison Mode */
 #define AFEC_EMR_CMPMODE_MASK        (3 << AFEC_EMR_CMPMODE_SHIFT)
 #  define AFEC_EMR_CMPMODE_LOW       (0 << AFEC_EMR_CMPMODE_SHIFT) /* Event when lower than low window threshold */
 #  define AFEC_EMR_CMPMODE_HIGH      (1 << AFEC_EMR_CMPMODE_SHIFT) /* Event when higher than high window threshold */
@@ -234,28 +234,28 @@
 #define AFEC_SEQ1R_USCH_SHIFT(n)     ((n) << 2) /* n=0..7 */
 #define AFEC_SEQ1R_USCH_MASK(n)      (15 << AFEC_SEQ1R_USCH_SHIFT(n))
 #  define AFEC_SEQ1R_USCH(n,v)       ((uint32_t)(v) << AFEC_SEQ1R_USCH_SHIFT(n))
-#define AFEC_SEQ1R_USCH0_SHIFT       (0) /* Bits 0-3: User sequence number 0 */
+#define AFEC_SEQ1R_USCH0_SHIFT       (0)       /* Bits 0-3: User sequence number 0 */
 #define AFEC_SEQ1R_USCH0_MASK        (15 << AFEC_SEQ1R_USCH0_SHIFT)
 #  define AFEC_SEQ1R_USCH0(v)        ((uint32_t)(v) << AFEC_SEQ1R_USCH0_SHIFT)
-#define AFEC_SEQ1R_USCH1_SHIFT       (4) /* Bits 4-7: User sequence number 1 */
+#define AFEC_SEQ1R_USCH1_SHIFT       (4)       /* Bits 4-7: User sequence number 1 */
 #define AFEC_SEQ1R_USCH1_MASK        (15 << AFEC_SEQ1R_USCH1_SHIFT)
 #  define AFEC_SEQ1R_USCH1(v)        ((uint32_t)(v) << AFEC_SEQ1R_USCH1_SHIFT)
-#define AFEC_SEQ1R_USCH2_SHIFT       (8) /* Bits 8-11: User sequence number 2 */
+#define AFEC_SEQ1R_USCH2_SHIFT       (8)       /* Bits 8-11: User sequence number 2 */
 #define AFEC_SEQ1R_USCH2_MASK        (15 << AFEC_SEQ1R_USCH2_SHIFT)
 #  define AFEC_SEQ1R_USCH2(v)        ((uint32_t)(v) << AFEC_SEQ1R_USCH2_SHIFT)
-#define AFEC_SEQ1R_USCH3_SHIFT       (12) /* Bits 12-15: User sequence number 3 */
+#define AFEC_SEQ1R_USCH3_SHIFT       (12)      /* Bits 12-15: User sequence number 3 */
 #define AFEC_SEQ1R_USCH3_MASK        (15 << AFEC_SEQ1R_USCH3_SHIFT)
 #  define AFEC_SEQ1R_USCH3(v)        ((uint32_t)(v) << AFEC_SEQ1R_USCH3_SHIFT)
-#define AFEC_SEQ1R_USCH4_SHIFT       (16) /* Bits 16-19: User sequence number 4 */
+#define AFEC_SEQ1R_USCH4_SHIFT       (16)      /* Bits 16-19: User sequence number 4 */
 #define AFEC_SEQ1R_USCH4_MASK        (15 << AFEC_SEQ1R_USCH4_SHIFT)
 #  define AFEC_SEQ1R_USCH4(v)        ((uint32_t)(v) << AFEC_SEQ1R_USCH4_SHIFT)
-#define AFEC_SEQ1R_USCH5_SHIFT       (20) /* Bits 20-23: User sequence number 5 */
+#define AFEC_SEQ1R_USCH5_SHIFT       (20)      /* Bits 20-23: User sequence number 5 */
 #define AFEC_SEQ1R_USCH5_MASK        (15 << AFEC_SEQ1R_USCH5_SHIFT)
 #  define AFEC_SEQ1R_USCH5(v)        ((uint32_t)(v) << AFEC_SEQ1R_USCH5_SHIFT)
-#define AFEC_SEQ1R_USCH6_SHIFT       (24) /* Bits 24-27: User sequence number 6 */
+#define AFEC_SEQ1R_USCH6_SHIFT       (24)      /* Bits 24-27: User sequence number 6 */
 #define AFEC_SEQ1R_USCH6_MASK        (15 << AFEC_SEQ1R_USCH6_SHIFT)
 #  define AFEC_SEQ1R_USCH6(v)        ((uint32_t)(v) << AFEC_SEQ1R_USCH6_SHIFT)
-#define AFEC_SEQ1R_USCH7_SHIFT       (28) /* Bits 28-31: User sequence number 7 */
+#define AFEC_SEQ1R_USCH7_SHIFT       (28)      /* Bits 28-31: User sequence number 7 */
 #define AFEC_SEQ1R_USCH7_MASK        (15 << AFEC_SEQ1R_USCH7_SHIFT)
 #  define AFEC_SEQ1R_USCH7(v)        ((uint32_t)(v) << AFEC_SEQ1R_USCH7_SHIFT)
 
@@ -264,28 +264,28 @@
 #define AFEC_SEQ2R_USCH_SHIFT(n)     (((n)-8) << 2) /* n=8..15 */
 #define AFEC_SEQ2R_USCH_MASK(n)      (15 << AFEC_SEQ2R_USCH_SHIFT(n))
 #  define AFEC_SEQ2R_USCH(n,v)       ((uint32_t)(v) << AFEC_SEQ2R_USCH_SHIFT(n))
-#define AFEC_SEQ2R_USCH8_SHIFT       (0) /* Bits 0-3: User sequence number 8 */
+#define AFEC_SEQ2R_USCH8_SHIFT       (0)       /* Bits 0-3: User sequence number 8 */
 #define AFEC_SEQ2R_USCH8_MASK        (15 << AFEC_SEQ2R_USCH8_SHIFT)
 #  define AFEC_SEQ2R_USCH8(v)        ((uint32_t)(v) << AFEC_SEQ2R_USCH8_SHIFT)
-#define AFEC_SEQ2R_USCH9_SHIFT       (4) /* Bits 4-7: User sequence number 9 */
+#define AFEC_SEQ2R_USCH9_SHIFT       (4)       /* Bits 4-7: User sequence number 9 */
 #define AFEC_SEQ2R_USCH9_MASK        (15 << AFEC_SEQ2R_USCH9_SHIFT)
 #  define AFEC_SEQ2R_USCH9(v)        ((uint32_t)(v) << AFEC_SEQ2R_USCH9_SHIFT)
-#define AFEC_SEQ2R_USCH10_SHIFT      (8) /* Bits 8-11: User sequence number 10 */
+#define AFEC_SEQ2R_USCH10_SHIFT      (8)       /* Bits 8-11: User sequence number 10 */
 #define AFEC_SEQ2R_USCH10_MASK       (15 << AFEC_SEQ2R_USCH10_SHIFT)
 #  define AFEC_SEQ2R_USCH10(v)       ((uint32_t)(v) << AFEC_SEQ2R_USCH10_SHIFT)
-#define AFEC_SEQ2R_USCH11_SHIFT      (12) /* Bits 12-15: User sequence number 11 */
+#define AFEC_SEQ2R_USCH11_SHIFT      (12)      /* Bits 12-15: User sequence number 11 */
 #define AFEC_SEQ2R_USCH11_MASK       (15 << AFEC_SEQ2R_USCH11_SHIFT)
 #  define AFEC_SEQ2R_USCH11(v)       ((uint32_t)(v) << AFEC_SEQ2R_USCH11_SHIFT)
-#define AFEC_SEQ2R_USCH12_SHIFT      (16) /* Bits 16-19: User sequence number 12 */
+#define AFEC_SEQ2R_USCH12_SHIFT      (16)      /* Bits 16-19: User sequence number 12 */
 #define AFEC_SEQ2R_USCH12_MASK       (15 << AFEC_SEQ2R_USCH12_SHIFT)
 #  define AFEC_SEQ2R_USCH12(v)       ((uint32_t)(v) << AFEC_SEQ2R_USCH12_SHIFT)
-#define AFEC_SEQ2R_USCH13_SHIFT      (20) /* Bits 20-23: User sequence number 13 */
+#define AFEC_SEQ2R_USCH13_SHIFT      (20)      /* Bits 20-23: User sequence number 13 */
 #define AFEC_SEQ2R_USCH13_MASK       (15 << AFEC_SEQ2R_USCH13_SHIFT)
 #  define AFEC_SEQ2R_USCH13(v)       ((uint32_t)(v) << AFEC_SEQ2R_USCH13_SHIFT)
-#define AFEC_SEQ2R_USCH14_SHIFT      (24) /* Bits 24-27: User sequence number 14 */
+#define AFEC_SEQ2R_USCH14_SHIFT      (24)      /* Bits 24-27: User sequence number 14 */
 #define AFEC_SEQ2R_USCH14_MASK       (15 << AFEC_SEQ2R_USCH14_SHIFT)
 #  define AFEC_SEQ2R_USCH14(v)       ((uint32_t)(v) << AFEC_SEQ2R_USCH14_SHIFT)
-#define AFEC_SEQ2R_USCH15_SHIFT      (28) /* Bits 28-31: User sequence number 15 */
+#define AFEC_SEQ2R_USCH15_SHIFT      (28)      /* Bits 28-31: User sequence number 15 */
 #define AFEC_SEQ2R_USCH15_MASK       (15 << AFEC_SEQ2R_USCH15_SHIFT)
 #  define AFEC_SEQ2R_USCH15(v)       ((uint32_t)(v) << AFEC_SEQ2R_USCH15_SHIFT)
 
@@ -382,52 +382,52 @@
 #define AFEC_CGR_GAIN_SHIFT(n)       ((n) << 1) /* n=0..15 */
 #define AFEC_CGR_GAIN_MASK(n)        (3 << AFEC_CGR_GAIN_SHIFT(n))
 #  define AFEC_CGR_GAIN(n,v)         ((uint32_t)(v) << AFEC_CGR_GAIN_SHIFT(n))
-#define AFEC_CGR_GAIN0_SHIFT         (0)        /* Bits 0-1: Gain for channel 0 */
+#define AFEC_CGR_GAIN0_SHIFT         (0)       /* Bits 0-1: Gain for channel 0 */
 #define AFEC_CGR_GAIN0_MASK          (3 << AFEC_CGR_GAIN0_SHIFT)
 #  define AFEC_CGR_GAIN0(v)          ((uint32_t)(v) << AFEC_CGR_GAIN0_SHIFT)
-#define AFEC_CGR_GAIN1_SHIFT         (2)        /* Bits 2-3: Gain for channel 1 */
+#define AFEC_CGR_GAIN1_SHIFT         (2)       /* Bits 2-3: Gain for channel 1 */
 #define AFEC_CGR_GAIN1_MASK          (3 << AFEC_CGR_GAIN1_SHIFT)
 #  define AFEC_CGR_GAIN1(v)          ((uint32_t)(v) << AFEC_CGR_GAIN1_SHIFT)
-#define AFEC_CGR_GAIN2_SHIFT         (4)        /* Bits 4-5: Gain for channel 2 */
+#define AFEC_CGR_GAIN2_SHIFT         (4)       /* Bits 4-5: Gain for channel 2 */
 #define AFEC_CGR_GAIN2_MASK          (3 << AFEC_CGR_GAIN2_SHIFT)
 #  define AFEC_CGR_GAIN2(v)          ((uint32_t)(v) << AFEC_CGR_GAIN2_SHIFT)
-#define AFEC_CGR_GAIN3_SHIFT         (6)        /* Bits 6-7: Gain for channel 3 */
+#define AFEC_CGR_GAIN3_SHIFT         (6)       /* Bits 6-7: Gain for channel 3 */
 #define AFEC_CGR_GAIN3_MASK          (3 << AFEC_CGR_GAIN3_SHIFT)
 #  define AFEC_CGR_GAIN3(v)          ((uint32_t)(v) << AFEC_CGR_GAIN3_SHIFT)
-#define AFEC_CGR_GAIN4_SHIFT         (8)        /* Bits 8-9: Gain for channel 4 */
+#define AFEC_CGR_GAIN4_SHIFT         (8)       /* Bits 8-9: Gain for channel 4 */
 #define AFEC_CGR_GAIN4_MASK          (3 << AFEC_CGR_GAIN4_SHIFT)
 #  define AFEC_CGR_GAIN4(v)          ((uint32_t)(v) << AFEC_CGR_GAIN4_SHIFT)
-#define AFEC_CGR_GAIN5_SHIFT         (10)       /* Bits 10-11: Gain for channel 5 */
+#define AFEC_CGR_GAIN5_SHIFT         (10)      /* Bits 10-11: Gain for channel 5 */
 #define AFEC_CGR_GAIN5_MASK          (3 << AFEC_CGR_GAIN5_SHIFT)
 #  define AFEC_CGR_GAIN5(v)          ((uint32_t)(v) << AFEC_CGR_GAIN5_SHIFT)
-#define AFEC_CGR_GAIN6_SHIFT         (12)       /* Bits 12-13: Gain for channel 6 */
+#define AFEC_CGR_GAIN6_SHIFT         (12)      /* Bits 12-13: Gain for channel 6 */
 #define AFEC_CGR_GAIN6_MASK          (3 << AFEC_CGR_GAIN6_SHIFT)
 #  define AFEC_CGR_GAIN6(v)          ((uint32_t)(v) << AFEC_CGR_GAIN6_SHIFT)
-#define AFEC_CGR_GAIN7_SHIFT         (14)       /* Bits 14-15: Gain for channel 7 */
+#define AFEC_CGR_GAIN7_SHIFT         (14)      /* Bits 14-15: Gain for channel 7 */
 #define AFEC_CGR_GAIN7_MASK          (3 << AFEC_CGR_GAIN7_SHIFT)
 #  define AFEC_CGR_GAIN7(v)          ((uint32_t)(v) << AFEC_CGR_GAIN7_SHIFT)
-#define AFEC_CGR_GAIN8_SHIFT         (16)       /* Bits 16-17: Gain for channel 8 */
+#define AFEC_CGR_GAIN8_SHIFT         (16)      /* Bits 16-17: Gain for channel 8 */
 #define AFEC_CGR_GAIN8_MASK          (3 << AFEC_CGR_GAIN8_SHIFT)
 #  define AFEC_CGR_GAIN8(v)          ((uint32_t)(v) << AFEC_CGR_GAIN8_SHIFT)
-#define AFEC_CGR_GAIN9_SHIFT         (18)       /* Bits 18-19: Gain for channel 9 */
+#define AFEC_CGR_GAIN9_SHIFT         (18)      /* Bits 18-19: Gain for channel 9 */
 #define AFEC_CGR_GAIN9_MASK          (3 << AFEC_CGR_GAIN9_SHIFT)
 #  define AFEC_CGR_GAIN9(v)          ((uint32_t)(v) << AFEC_CGR_GAIN9_SHIFT)
-#define AFEC_CGR_GAIN10_SHIFT        (20)       /* Bits 20-21: Gain for channel 10 */
+#define AFEC_CGR_GAIN10_SHIFT        (20)      /* Bits 20-21: Gain for channel 10 */
 #define AFEC_CGR_GAIN10_MASK         (3 << AFEC_CGR_GAIN10_SHIFT)
 #  define AFEC_CGR_GAIN10(v)         ((uint32_t)(v) << AFEC_CGR_GAIN10_SHIFT)
-#define AFEC_CGR_GAIN11_SHIFT        (22)       /* Bits 22-23: Gain for channel 11 */
+#define AFEC_CGR_GAIN11_SHIFT        (22)      /* Bits 22-23: Gain for channel 11 */
 #define AFEC_CGR_GAIN11_MASK         (3 << AFEC_CGR_GAIN11_SHIFT)
 #  define AFEC_CGR_GAIN11(v)         ((uint32_t)(v) << AFEC_CGR_GAIN11_SHIFT)
-#define AFEC_CGR_GAIN12_SHIFT        (24)       /* Bits 24-25: Gain for channel 12 */
+#define AFEC_CGR_GAIN12_SHIFT        (24)      /* Bits 24-25: Gain for channel 12 */
 #define AFEC_CGR_GAIN12_MASK         (3 << AFEC_CGR_GAIN12_SHIFT)
 #  define AFEC_CGR_GAIN12(v)         ((uint32_t)(v) << AFEC_CGR_GAIN12_SHIFT)
-#define AFEC_CGR_GAIN13_SHIFT        (26)       /* Bits 26-27: Gain for channel 13 */
+#define AFEC_CGR_GAIN13_SHIFT        (26)      /* Bits 26-27: Gain for channel 13 */
 #define AFEC_CGR_GAIN13_MASK         (3 << AFEC_CGR_GAIN13_SHIFT)
 #  define AFEC_CGR_GAIN13(v)         ((uint32_t)(v) << AFEC_CGR_GAIN13_SHIFT)
-#define AFEC_CGR_GAIN14_SHIFT        (28)       /* Bits 28-29: Gain for channel 14 */
+#define AFEC_CGR_GAIN14_SHIFT        (28)      /* Bits 28-29: Gain for channel 14 */
 #define AFEC_CGR_GAIN14_MASK         (3 << AFEC_CGR_GAIN14_SHIFT)
 #  define AFEC_CGR_GAIN14(v)         ((uint32_t)(v) << AFEC_CGR_GAIN14_SHIFT)
-#define AFEC_CGR_GAIN15_SHIFT        (30)       /* Bits 30-31: Gain for channel 15 */
+#define AFEC_CGR_GAIN15_SHIFT        (30)      /* Bits 30-31: Gain for channel 15 */
 #define AFEC_CGR_GAIN15_MASK         (3 << AFEC_CGR_GAIN15_SHIFT)
 #  define AFEC_CGR_GAIN15(v)         ((uint32_t)(v) << AFEC_CGR_GAIN15_SHIFT)
 
@@ -487,8 +487,8 @@
 
 /* Temperature Sensor Mode Register */
 
-#define AFEC_TEMPMR_RTCT              (1 << 0)  /* Bit 0:  Temperature Sensor RTC Trigger mode */
-#define AFEC_TEMPMR_TEMPCMPMOD_SHIFT  (4)       /* Bits 4-5: Temperature Comparison Mode */
+#define AFEC_TEMPMR_RTCT              (1 << 0) /* Bit 0:  Temperature Sensor RTC Trigger mode */
+#define AFEC_TEMPMR_TEMPCMPMOD_SHIFT  (4)      /* Bits 4-5: Temperature Comparison Mode */
 #define AFEC_TEMPMR_TEMPCMPMOD_MASK   (3 << AFEC_TEMPMR_TEMPCMPMOD_SHIFT)
 #  define AFEC_TEMPMR_TEMPCMPMOD_LOW  (0 << AFEC_TEMPMR_TEMPCMPMOD_SHIFT) /* Event when data is lower than low threshold */
 #  define AFEC_TEMPMR_TEMPCMPMOD_HIGH (1 << AFEC_TEMPMR_TEMPCMPMOD_SHIFT) /* Event when data is higher than high threshold */
diff --git a/arch/arm/src/sama5/sam_pwm.c b/arch/arm/src/sama5/sam_pwm.c
index c83764d50c..e03db0d932 100644
--- a/arch/arm/src/sama5/sam_pwm.c
+++ b/arch/arm/src/sama5/sam_pwm.c
@@ -407,7 +407,7 @@
 #    define pwmvdbg           vdbg
 #    define pwmllvdbg         llvdbg
 #  else
-#    define pwmlldbg(x...)
+#    define pwmvdbg(x...)
 #    define pwmllvdbg(x...)
 #  endif
 #else
-- 
GitLab


From 5cfffbfa62aaf425ec6b309f7054b8b3c7d6ef28 Mon Sep 17 00:00:00 2001
From: "Paul A. Patience" 
Date: Fri, 10 Jun 2016 11:41:11 -0400
Subject: [PATCH 13/91] crc64: fix error

---
 include/crc64.h       | 22 ++++++++++++++++++++++
 libc/misc/lib_crc64.c | 15 +++++++--------
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/include/crc64.h b/include/crc64.h
index 8db458ad66..e08183327a 100644
--- a/include/crc64.h
+++ b/include/crc64.h
@@ -43,6 +43,28 @@
 #include 
 #include 
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/*
+ * CRC64_CHECK is the CRC64 of the string "123456789" without the null byte.
+ *
+ *   const uint8_t checkbuf[] =
+ *   {
+ *     '1', '2', '3', '4', '5', '6', '7', '8', '9'
+ *   };
+ *
+ *   assert(crc64(checkbuf, sizeof(checkbuf)) == CRC64_CHECK);
+ */
+
+/* CRC-64/WE */
+
+#define CRC64_POLY   ((uint64_t)0x42f0e1eba9ea3693)
+#define CRC64_INIT   ((uint64_t)0xffffffffffffffff)
+#define CRC64_XOROUT ((uint64_t)0xffffffffffffffff)
+#define CRC64_CHECK  ((uint64_t)0x62ec59e3f1a4f00a)
+
 /****************************************************************************
  * Public Function Prototypes
  ****************************************************************************/
diff --git a/libc/misc/lib_crc64.c b/libc/misc/lib_crc64.c
index 4b0374c554..8faf0193d1 100644
--- a/libc/misc/lib_crc64.c
+++ b/libc/misc/lib_crc64.c
@@ -54,8 +54,8 @@
  *   #include 
  *   #include 
  *
- *   #define CRC64_POLYNOMIAL ((uint64_t)0x42f0e1eba9ea3693)
- *   #define CRC64_TABLEN     ((size_t)256)
+ *   #define CRC64_POLY   ((uint64_t)0x42f0e1eba9ea3693)
+ *   #define CRC64_TABLEN ((size_t)256)
  *
  *   int main(void)
  *   {
@@ -73,7 +73,7 @@
  *           {
  *             if ((crc64val & ((uint64_t)1 << 63)) != 0)
  *               {
- *                 crc64val = (crc64val << 1) ^ CRC64_POLYNOMIAL;
+ *                 crc64val = (crc64val << 1) ^ CRC64_POLY;
  *               }
  *             else
  *               {
@@ -234,8 +234,6 @@ static const uint64_t crc64_tab[256] =
   0x5dedc41a34bbeeb2, 0x1f1d25f19d51d821,
   0xd80c07cd676f8394, 0x9afce626ce85b507
 };
-#else
-#  define CRC64_POLYNOMIAL ((uint64_t)0x42f0e1eba9ea3693)
 #endif
 
 /****************************************************************************
@@ -257,7 +255,8 @@ uint64_t crc64part(FAR const uint8_t *src, size_t len, uint64_t crc64val)
 
   for (i = 0; i < len; i++)
     {
-      crc64val = crc64_tab[((crc64val >> 56) & 0xff) ^ src[i]] ^ (crc64val << 8);
+      crc64val = crc64_tab[((crc64val >> 56) & 0xff) ^ src[i]] ^
+                 (crc64val << 8);
     }
 
   return crc64val;
@@ -275,7 +274,7 @@ uint64_t crc64part(FAR const uint8_t *src, size_t len, uint64_t crc64val)
         {
           if ((crc64val & ((uint64_t)1 << 63)) != 0)
             {
-              crc64val = (crc64val << 1) ^ CRC64_POLYNOMIAL;
+              crc64val = (crc64val << 1) ^ CRC64_POLY;
             }
           else
             {
@@ -298,5 +297,5 @@ uint64_t crc64part(FAR const uint8_t *src, size_t len, uint64_t crc64val)
 
 uint64_t crc64(FAR const uint8_t *src, size_t len)
 {
-  return crc64part(src, len, ~(uint64_t)0);
+  return crc64part(src, len, CRC64_INIT) ^ CRC64_XOROUT;
 }
-- 
GitLab


From b9e7b4ed7010f978b2fd76c31acfaff07db577f1 Mon Sep 17 00:00:00 2001
From: Konstantin Berezenko 
Date: Fri, 10 Jun 2016 10:52:58 -0700
Subject: [PATCH 14/91] Correct the can2 rx irq number for stm32f10xx chips

---
 arch/arm/include/stm32/stm32f10xxx_irq.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/include/stm32/stm32f10xxx_irq.h b/arch/arm/include/stm32/stm32f10xxx_irq.h
index 29f07b0fd8..beed495254 100644
--- a/arch/arm/include/stm32/stm32f10xxx_irq.h
+++ b/arch/arm/include/stm32/stm32f10xxx_irq.h
@@ -199,7 +199,7 @@
 #  define STM32_IRQ_ETH         (77) /* 61: Ethernet global interrupt */
 #  define STM32_IRQ_ETHWKUP     (78) /* 62: Ethernet Wakeup through EXTI line interrupt */
 #  define STM32_IRQ_CAN2TX      (79) /* 63: CAN2 TX interrupts */
-#  define STM32_IRQ_CAN2RX0     (70) /* 64: CAN2 RX0 interrupts */
+#  define STM32_IRQ_CAN2RX0     (80) /* 64: CAN2 RX0 interrupts */
 #  define STM32_IRQ_CAN2RX1     (81) /* 65: CAN2 RX1 interrupt */
 #  define STM32_IRQ_CAN2SCE     (82) /* 66: CAN2 SCE interrupt */
 #  define STM32_IRQ_OTGFS       (83) /* 67: USB On The Go FS global interrupt */
-- 
GitLab


From e891a33c2e1ee2647d95c2fd3bd90e1d7837678a Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Fri, 10 Jun 2016 14:59:53 -0600
Subject: [PATCH 15/91] Completely trivial changes from review of last PR

---
 arch/arm/src/kinetis/kinetis_pindump.c | 9 +--------
 arch/arm/src/kinetis/kinetis_pwm.c     | 6 +++++-
 arch/arm/src/kinetis/kinetis_pwm.h     | 1 +
 configs/teensy-3.x/src/Makefile        | 2 +-
 configs/teensy-3.x/src/k20_pwm.c       | 7 +++++--
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/arch/arm/src/kinetis/kinetis_pindump.c b/arch/arm/src/kinetis/kinetis_pindump.c
index 354fa3fcb5..1e1c2325eb 100644
--- a/arch/arm/src/kinetis/kinetis_pindump.c
+++ b/arch/arm/src/kinetis/kinetis_pindump.c
@@ -54,6 +54,7 @@
 /****************************************************************************
  * Private Data
  ****************************************************************************/
+
 /* Port letters for prettier debug output */
 
 static const char g_portchar[KINETIS_NPORTS] =
@@ -83,14 +84,6 @@ static const char g_portchar[KINETIS_NPORTS] =
 #endif
 };
 
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
diff --git a/arch/arm/src/kinetis/kinetis_pwm.c b/arch/arm/src/kinetis/kinetis_pwm.c
index 0cf31bbd90..23438917f7 100644
--- a/arch/arm/src/kinetis/kinetis_pwm.c
+++ b/arch/arm/src/kinetis/kinetis_pwm.c
@@ -120,6 +120,7 @@ struct kinetis_pwmtimer_s
 /****************************************************************************
  * Static Function Prototypes
  ****************************************************************************/
+
 /* Register access */
 
 static uint32_t pwm_getreg(struct kinetis_pwmtimer_s *priv, int offset);
@@ -151,7 +152,10 @@ static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev,
 /****************************************************************************
  * Private Data
  ****************************************************************************/
-/* This is the list of lower half PWM driver methods used by the upper half driver */
+
+/* This is the list of lower half PWM driver methods used by the upper half
+ * driver.
+ */
 
 static const struct pwm_ops_s g_pwmops =
 {
diff --git a/arch/arm/src/kinetis/kinetis_pwm.h b/arch/arm/src/kinetis/kinetis_pwm.h
index e9db2c1d77..09508d4bfe 100644
--- a/arch/arm/src/kinetis/kinetis_pwm.h
+++ b/arch/arm/src/kinetis/kinetis_pwm.h
@@ -49,6 +49,7 @@
 /************************************************************************************
  * Pre-processor Definitions
  ************************************************************************************/
+
 /* Configuration ********************************************************************/
 /* Timer devices may be used for different purposes.  One special purpose is
  * to generate modulated outputs for such things as motor control.  If CONFIG_KINETIS_FTMn
diff --git a/configs/teensy-3.x/src/Makefile b/configs/teensy-3.x/src/Makefile
index 87734c76c0..3483e6deb2 100644
--- a/configs/teensy-3.x/src/Makefile
+++ b/configs/teensy-3.x/src/Makefile
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/teensy-3.x/src/Makefile
 #
-#   Copyright (C) 2015,2016 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2015, 2016 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt 
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/configs/teensy-3.x/src/k20_pwm.c b/configs/teensy-3.x/src/k20_pwm.c
index 94af831308..73ec5c5414 100644
--- a/configs/teensy-3.x/src/k20_pwm.c
+++ b/configs/teensy-3.x/src/k20_pwm.c
@@ -1,7 +1,7 @@
 /************************************************************************************
  * configs/teensy-3.x/src/k20_pwm.c
  *
- *   Copyright (C) 2015,2016 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2015, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *           Alan Carvalho de Assis 
  *
@@ -93,8 +93,9 @@ int board_pwm_setup(void)
 
   if (!initialized)
     {
-      /* Call kinetis_pwminitialize() to get an instance of the PWM interface */
 #ifdef CONFIG_KINETIS_FTM0_PWM
+      /* Call kinetis_pwminitialize() to get an instance of the PWM interface */
+
       pwm = kinetis_pwminitialize(0);
       if (!pwm)
         {
@@ -113,6 +114,7 @@ int board_pwm_setup(void)
 
       /* Now we are initialized */
 #endif
+
 #ifdef CONFIG_KINETIS_FTM1_PWM
       pwm = kinetis_pwminitialize(1);
       if (!pwm)
@@ -132,6 +134,7 @@ int board_pwm_setup(void)
 
       /* Now we are initialized */
 #endif
+
 #ifdef CONFIG_KINETIS_FTM2_PWM
       pwm = kinetis_pwminitialize(2);
       if (!pwm)
-- 
GitLab


From 9c4b604074df3a80ad4eb81c7d55904637f3b42d Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sat, 11 Jun 2016 07:22:31 -0600
Subject: [PATCH 16/91] Button upper half driver:  Add definitions needed for
 compilation with the poll() interface is not disabled.

---
 drivers/input/Kconfig           |  2 +-
 drivers/input/button_upper.c    | 22 +++++++++++-----------
 include/nuttx/input/ajoystick.h |  2 ++
 include/nuttx/input/buttons.h   | 28 ++++++++++++++++++++++++++--
 4 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index ebf00232ee..17cbe285f3 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -331,7 +331,7 @@ config BUTTONS
 if BUTTONS
 
 config BUTTONS_LOWER
-	bool "Generic Lower Half Button Dirver"
+	bool "Generic Lower Half Button Driver"
 	default n
 	depends on ARCH_BUTTONS && ARCH_IRQBUTTONS
 	---help---
diff --git a/drivers/input/button_upper.c b/drivers/input/button_upper.c
index 5eadfd87e3..07c11307e0 100644
--- a/drivers/input/button_upper.c
+++ b/drivers/input/button_upper.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * drivers/input/button_upper.c
  *
- *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2015-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -230,8 +230,8 @@ static void btn_enable(FAR struct btn_upperhalf_s *priv)
             {
               /* Yes.. OR in the poll event buttons */
 
-              press   |= opriv->bo_pollevents.ap_press;
-              release |= opriv->bo_pollevents.ap_release;
+              press   |= opriv->bo_pollevents.bp_press;
+              release |= opriv->bo_pollevents.bp_release;
               break;
             }
         }
@@ -322,8 +322,8 @@ static void btn_sample(FAR struct btn_upperhalf_s *priv)
    * newly released.
    */
 
-  change  = sample ^ priv->bu_sample;
-  press   = change & sample;
+  change = sample ^ priv->bu_sample;
+  press  = change & sample;
 
   DEBUGASSERT(lower->bl_supported);
   release = change & (lower->bl_supported(lower) & ~sample);
@@ -335,8 +335,8 @@ static void btn_sample(FAR struct btn_upperhalf_s *priv)
 #ifndef CONFIG_DISABLE_POLL
       /* Have any poll events occurred? */
 
-      if ((press & opriv->bo_pollevents.ap_press)     != 0 ||
-          (release & opriv->bo_pollevents.ap_release) != 0)
+      if ((press & opriv->bo_pollevents.bp_press)     != 0 ||
+          (release & opriv->bo_pollevents.bp_release) != 0)
         {
           /* Yes.. Notify all waiters */
 
@@ -431,8 +431,8 @@ static int btn_open(FAR struct file *filep)
   DEBUGASSERT(lower && lower->bl_supported);
   supported = lower->bl_supported(lower);
 
-  opriv->bo_pollevents.ap_press   = supported;
-  opriv->bo_pollevents.ap_release = supported;
+  opriv->bo_pollevents.bp_press   = supported;
+  opriv->bo_pollevents.bp_release = supported;
 #endif
 
   /* Attach the open structure to the device */
@@ -664,8 +664,8 @@ static int btn_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
           {
             /* Save the poll events */
 
-            opriv->bo_pollevents.ap_press   = pollevents->ap_press;
-            opriv->bo_pollevents.ap_release = pollevents->ap_release;
+            opriv->bo_pollevents.bp_press   = pollevents->bp_press;
+            opriv->bo_pollevents.bp_release = pollevents->bp_release;
 
             /* Enable/disable interrupt handling */
 
diff --git a/include/nuttx/input/ajoystick.h b/include/nuttx/input/ajoystick.h
index b672ed57ed..b50d98d56e 100644
--- a/include/nuttx/input/ajoystick.h
+++ b/include/nuttx/input/ajoystick.h
@@ -61,6 +61,7 @@
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
+
 /* Configuration ************************************************************/
 
 #ifndef CONFIG_AJOYSTICK_NPOLLWAITERS
@@ -159,6 +160,7 @@
 /****************************************************************************
  * Public Types
  ****************************************************************************/
+
 /* This type is a bit set that contains the state of all analog joystick
  * buttons.
  */
diff --git a/include/nuttx/input/buttons.h b/include/nuttx/input/buttons.h
index f31a197a1e..ee0785ef95 100644
--- a/include/nuttx/input/buttons.h
+++ b/include/nuttx/input/buttons.h
@@ -1,7 +1,7 @@
 /************************************************************************************
  * include/nuttx/input/buttons.h
  *
- *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2015-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -46,6 +46,7 @@
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
+
 /* Configuration ************************************************************/
 
 #ifndef CONFIG_BUTTONS_NPOLLWAITERS
@@ -64,6 +65,17 @@
 
 #define BTNIOC_SUPPORTED  _BTNIOC(0x0001)
 
+/* Command:     BTNIOC_POLLEVENTS
+ * Description: Specify the set of button events that can cause a poll()
+ *              to awaken.  The default is all button depressions and all
+ *              button releases (all supported buttons);
+ * Argument:    A read-only pointer to an instance of struct ajoy_pollevents_s
+ * Return:      Zero (OK) on success.  Minus one will be returned on failure
+ *              with the errno value set appropriately.
+ */
+
+#define BTNIOC_POLLEVENTS _BTNIOC(0x0002)
+
 /* Command:     BTNIOC_REGISTER
  * Description: Register to receive a signal whenever there is a change in
  *              the state of button inputs.  This feature, of course, depends
@@ -73,11 +85,12 @@
  *              with the errno value set appropriately.
  */
 
-#define BTNIOC_REGISTER   _BTNIOC(0x0002)
+#define BTNIOC_REGISTER   _BTNIOC(0x0003)
 
 /****************************************************************************
  * Public Types
  ****************************************************************************/
+
 /* This type is a bit set that contains the state of all buttons as defined
  * in arch/board/board.h.  This is the value that is returned when reading
  * from the button driver.
@@ -85,6 +98,17 @@
 
 typedef uint8_t btn_buttonset_t;
 
+/* A reference to this structure is provided with the BTNIOC_POLLEVENTS IOCTL
+ * command and describes the conditions under which the client would like
+ * to receive notification.
+ */
+
+struct btn_pollevents_s
+{
+  btn_buttonset_t bp_press;   /* Set of button depressions to wake up the poll */
+  btn_buttonset_t bp_release; /* Set of button releases to wake up the poll */
+};
+
 /* A reference to this structure is provided with the BTNIOC_REGISTER IOCTL
  * command and describes the conditions under which the client would like
  * to receive notification.
-- 
GitLab


From 3a74a438d94eda97c4ac85d3728a304260c3d98a Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sat, 11 Jun 2016 11:50:18 -0600
Subject: [PATCH 17/91] Rename CONFIG_DEBUG_VERBOSE to CONFIG_DEBUG_INFO

---
 Documentation/UsbTrace.html                   |  2 +-
 Kconfig                                       | 15 ++++++-------
 arch/arm/src/arm/up_assert.c                  |  4 ++--
 arch/arm/src/arm/up_dataabort.c               |  4 ++--
 arch/arm/src/arm/up_prefetchabort.c           |  4 ++--
 arch/arm/src/arm/up_syscall.c                 |  4 ++--
 arch/arm/src/arm/up_undefinedinsn.c           |  4 ++--
 arch/arm/src/armv6-m/up_assert.c              |  4 ++--
 arch/arm/src/armv7-a/arm_assert.c             |  4 ++--
 arch/arm/src/armv7-a/arm_dataabort.c          |  4 ++--
 arch/arm/src/armv7-a/arm_prefetchabort.c      |  4 ++--
 arch/arm/src/armv7-a/arm_syscall.c            |  4 ++--
 arch/arm/src/armv7-a/arm_undefinedinsn.c      |  4 ++--
 arch/arm/src/armv7-m/up_assert.c              |  4 ++--
 arch/arm/src/armv7-r/arm_assert.c             |  4 ++--
 arch/arm/src/armv7-r/arm_dataabort.c          |  4 ++--
 arch/arm/src/armv7-r/arm_prefetchabort.c      |  4 ++--
 arch/arm/src/armv7-r/arm_syscall.c            |  4 ++--
 arch/arm/src/armv7-r/arm_undefinedinsn.c      |  4 ++--
 arch/arm/src/c5471/c5471_ethernet.c           |  2 +-
 arch/arm/src/efm32/efm32_adc.c                |  2 +-
 arch/arm/src/efm32/efm32_pwm.c                |  6 ++---
 arch/arm/src/efm32/efm32_rmu.h                |  4 ++--
 arch/arm/src/efm32/efm32_spi.c                |  4 ++--
 arch/arm/src/efm32/efm32_timer.c              |  4 ++--
 arch/arm/src/kinetis/kinetis_pwm.c            |  6 ++---
 arch/arm/src/kinetis/kinetis_sdhc.c           |  2 +-
 arch/arm/src/kinetis/kinetis_usbdev.c         |  4 ++--
 arch/arm/src/kl/kl_pwm.c                      |  6 ++---
 arch/arm/src/kl/kl_spi.c                      |  4 ++--
 arch/arm/src/lpc11xx/lpc11_spi.c              |  4 ++--
 arch/arm/src/lpc11xx/lpc11_ssp.c              |  4 ++--
 arch/arm/src/lpc11xx/lpc11_timer.c            |  6 ++---
 arch/arm/src/lpc17xx/lpc17_mcpwm.c            |  6 ++---
 arch/arm/src/lpc17xx/lpc17_pwm.c              |  6 ++---
 arch/arm/src/lpc17xx/lpc17_sdcard.c           |  2 +-
 arch/arm/src/lpc17xx/lpc17_spi.c              |  4 ++--
 arch/arm/src/lpc17xx/lpc17_ssp.c              |  4 ++--
 arch/arm/src/lpc17xx/lpc17_timer.c            |  6 ++---
 arch/arm/src/lpc2378/lpc23xx_spi.c            |  2 +-
 arch/arm/src/lpc31xx/lpc31_ehci.c             |  6 ++---
 arch/arm/src/lpc43xx/lpc43_ehci.c             |  6 ++---
 arch/arm/src/lpc43xx/lpc43_spi.c              |  4 ++--
 arch/arm/src/lpc43xx/lpc43_spifi.c            |  4 ++--
 arch/arm/src/sam34/Kconfig                    |  8 +++----
 arch/arm/src/sam34/sam_emac.c                 |  4 ++--
 arch/arm/src/sam34/sam_hsmci.c                |  2 +-
 arch/arm/src/sam34/sam_spi.c                  |  8 +++----
 arch/arm/src/sama5/Kconfig                    | 12 +++++-----
 arch/arm/src/sama5/sam_ehci.c                 |  6 ++---
 arch/arm/src/sama5/sam_emaca.c                |  4 ++--
 arch/arm/src/sama5/sam_emacb.c                |  4 ++--
 arch/arm/src/sama5/sam_gmac.c                 |  4 ++--
 arch/arm/src/sama5/sam_hsmci.c                |  2 +-
 arch/arm/src/sama5/sam_lcd.c                  |  2 +-
 arch/arm/src/sama5/sam_pwm.c                  |  6 ++---
 arch/arm/src/sama5/sam_spi.c                  |  8 +++----
 arch/arm/src/sama5/sam_ssc.c                  |  8 +++----
 arch/arm/src/sama5/sam_twi.c                  |  2 +-
 arch/arm/src/samdl/sam_spi.c                  |  8 +++----
 arch/arm/src/samv7/Kconfig                    | 12 +++++-----
 arch/arm/src/samv7/sam_emac.c                 |  4 ++--
 arch/arm/src/samv7/sam_hsmci.c                |  2 +-
 arch/arm/src/samv7/sam_qspi.c                 |  8 +++----
 arch/arm/src/samv7/sam_spi.c                  |  8 +++----
 arch/arm/src/samv7/sam_spi_slave.c            |  8 +++----
 arch/arm/src/samv7/sam_ssc.c                  |  8 +++----
 arch/arm/src/samv7/sam_twihs.c                |  2 +-
 arch/arm/src/stm32/stm32.h                    |  2 +-
 arch/arm/src/stm32/stm32_pwm.c                |  6 ++---
 arch/arm/src/stm32/stm32_qencoder.c           |  6 ++---
 arch/arm/src/stm32/stm32_sdio.c               |  2 +-
 arch/arm/src/stm32/stm32_spi.c                |  4 ++--
 arch/arm/src/stm32l4/stm32l4.h                |  2 +-
 arch/arm/src/stm32l4/stm32l4_qspi.c           |  8 +++----
 arch/arm/src/stm32l4/stm32l4_spi.c            |  4 ++--
 arch/arm/src/tiva/tiva_ssi.c                  |  4 ++--
 arch/avr/src/avr/up_dumpstate.c               |  4 ++--
 arch/avr/src/avr32/up_dumpstate.c             |  4 ++--
 arch/avr/src/common/up_assert.c               |  4 ++--
 arch/hc/src/m9s12/m9s12_assert.c              |  4 ++--
 arch/mips/src/mips32/up_assert.c              |  4 ++--
 arch/mips/src/mips32/up_dumpstate.c           |  4 ++--
 arch/mips/src/pic32mx/pic32mx-exception.c     |  2 +-
 arch/mips/src/pic32mx/pic32mx-gpio.c          |  2 +-
 arch/mips/src/pic32mx/pic32mx-spi.c           |  2 +-
 arch/mips/src/pic32mx/pic32mx-usbdev.c        |  4 ++--
 arch/mips/src/pic32mz/pic32mz-exception.c     |  2 +-
 arch/mips/src/pic32mz/pic32mz-gpio.c          |  2 +-
 arch/mips/src/pic32mz/pic32mz-spi.c           |  2 +-
 arch/sh/src/common/up_assert.c                |  4 ++--
 arch/sh/src/m16c/m16c_dumpstate.c             |  4 ++--
 arch/sh/src/sh1/sh1_dumpstate.c               |  4 ++--
 arch/sim/src/board_lcd.c                      |  4 ++--
 arch/sim/src/up_spiflash.c                    |  4 ++--
 arch/x86/src/common/up_assert.c               |  4 ++--
 arch/x86/src/i486/up_regdump.c                |  4 ++--
 arch/z16/src/common/up_assert.c               |  4 ++--
 arch/z16/src/common/up_registerdump.c         |  4 ++--
 arch/z16/src/common/up_stackdump.c            |  4 ++--
 arch/z16/src/z16f/z16f_espi.c                 |  8 +++----
 arch/z80/src/common/up_assert.c               |  4 ++--
 arch/z80/src/common/up_stackdump.c            |  4 ++--
 arch/z80/src/ez80/ez80_registerdump.c         |  4 ++--
 arch/z80/src/z180/z180_registerdump.c         |  4 ++--
 arch/z80/src/z8/z8_registerdump.c             |  4 ++--
 arch/z80/src/z80/z80_registerdump.c           |  4 ++--
 binfmt/elf.c                                  |  4 ++--
 binfmt/libelf/Kconfig                         |  2 +-
 binfmt/libelf/libelf_bind.c                   |  4 ++--
 binfmt/libelf/libelf_init.c                   |  4 ++--
 binfmt/libnxflat/Kconfig                      |  2 +-
 binfmt/libnxflat/libnxflat_bind.c             |  4 ++--
 binfmt/libnxflat/libnxflat_init.c             |  4 ++--
 binfmt/libpcode/Kconfig                       |  2 +-
 binfmt/libpcode/README.txt                    |  2 +-
 binfmt/nxflat.c                               |  4 ++--
 configs/arduino-due/README.txt                |  2 +-
 configs/arduino-due/src/sam_autoleds.c        |  2 +-
 configs/arduino-due/src/sam_userleds.c        |  2 +-
 .../cc3200-launchpad/src/cc3200_autoleds.c    |  2 +-
 configs/cloudctrl/src/stm32_autoleds.c        |  2 +-
 configs/cloudctrl/src/stm32_spi.c             |  2 +-
 configs/cloudctrl/src/stm32_userleds.c        |  2 +-
 configs/demo9s12ne64/src/m9s12_leds.c         |  2 +-
 configs/dk-tm4c129x/src/tm4c_ssi.c            |  2 +-
 configs/dk-tm4c129x/src/tm4c_userleds.c       |  2 +-
 configs/ea3131/src/lpc31_leds.c               |  2 +-
 configs/ea3152/src/lpc31_leds.c               |  2 +-
 configs/eagle100/src/lm_leds.c                |  2 +-
 configs/efm32-g8xx-stk/src/efm32_autoleds.c   |  2 +-
 configs/efm32-g8xx-stk/src/efm32_userleds.c   |  2 +-
 configs/efm32gg-stk3700/src/efm32_autoleds.c  |  2 +-
 configs/efm32gg-stk3700/src/efm32_userleds.c  |  2 +-
 configs/ekk-lm3s9b96/src/lm_leds.c            |  2 +-
 configs/ez80f910200kitg/ostest/defconfig      |  2 +-
 configs/ez80f910200zco/dhcpd/defconfig        |  2 +-
 configs/ez80f910200zco/httpd/defconfig        |  2 +-
 configs/ez80f910200zco/nettest/defconfig      |  2 +-
 configs/ez80f910200zco/nsh/defconfig          |  2 +-
 configs/ez80f910200zco/poll/defconfig         |  2 +-
 configs/fire-stm32v2/src/stm32_autoleds.c     |  2 +-
 configs/fire-stm32v2/src/stm32_userleds.c     |  2 +-
 configs/freedom-kl25z/src/kl_led.c            |  6 ++---
 configs/freedom-kl25z/src/kl_spi.c            |  2 +-
 configs/freedom-kl26z/src/kl_led.c            |  6 ++---
 configs/freedom-kl26z/src/kl_spi.c            |  2 +-
 configs/hymini-stm32v/README.txt              |  4 ++--
 configs/hymini-stm32v/src/stm32_leds.c        |  2 +-
 configs/hymini-stm32v/src/stm32_ssd1289.c     |  4 ++--
 configs/kwikstik-k40/src/k40_leds.c           |  2 +-
 .../launchxl-tms57004/src/tms570_autoleds.c   |  2 +-
 configs/lincoln60/src/lpc17_leds.c            |  6 ++---
 configs/lm3s6432-s2e/src/lm_leds.c            |  2 +-
 configs/lm3s6965-ek/src/lm_leds.c             |  2 +-
 configs/lm3s6965-ek/src/lm_oled.c             |  4 ++--
 configs/lm3s8962-ek/src/lm_leds.c             |  2 +-
 configs/lm3s8962-ek/src/lm_oled.c             |  4 ++--
 configs/lm4f120-launchpad/src/lm4f_autoleds.c |  2 +-
 configs/lm4f120-launchpad/src/lm4f_ssi.c      |  2 +-
 configs/lpc4330-xplorer/README.txt            |  2 +-
 configs/lpc4330-xplorer/src/lpc43_autoleds.c  |  4 ++--
 configs/lpc4330-xplorer/src/lpc43_userleds.c  |  4 ++--
 configs/lpc4337-ws/README.txt                 |  2 +-
 configs/lpc4357-evb/README.txt                |  2 +-
 configs/lpc4357-evb/src/lpc43_autoleds.c      |  4 ++--
 configs/lpc4357-evb/src/lpc43_userleds.c      |  4 ++--
 configs/lpc4370-link2/README.txt              |  2 +-
 configs/lpc4370-link2/src/lpc43_autoleds.c    |  4 ++--
 configs/lpc4370-link2/src/lpc43_userleds.c    |  4 ++--
 configs/lpcxpresso-lpc1115/src/lpc11_leds.c   |  4 ++--
 configs/lpcxpresso-lpc1768/src/lpc17_leds.c   |  4 ++--
 configs/lpcxpresso-lpc1768/src/lpc17_oled.c   |  4 ++--
 configs/maple/src/stm32_lcd.c                 |  4 ++--
 configs/maple/src/stm32_leds.c                |  2 +-
 configs/maple/src/stm32_spi.c                 |  4 ++--
 configs/mbed/src/lpc17_leds.c                 |  6 ++---
 configs/mcu123-lpc214x/src/lpc2148_spi1.c     |  2 +-
 configs/mikroe-stm32f4/src/stm32_mio283qt2.c  |  4 ++--
 configs/mikroe-stm32f4/src/stm32_mio283qt9a.c |  4 ++--
 configs/mirtoo/src/pic32_leds.c               |  4 ++--
 configs/moteino-mega/src/avr_leds.c           |  4 ++--
 configs/ne64badge/src/m9s12_buttons.c         |  2 +-
 configs/ne64badge/src/m9s12_leds.c            |  6 ++---
 configs/nucleo-144/src/stm32_autoleds.c       |  2 +-
 configs/nucleo-144/src/stm32_userleds.c       |  2 +-
 configs/nucleo-f303re/src/stm32_autoleds.c    |  2 +-
 configs/nucleo-f303re/src/stm32_userleds.c    |  2 +-
 configs/nucleo-f4x1re/src/stm32_autoleds.c    |  2 +-
 configs/nucleo-f4x1re/src/stm32_spi.c         |  4 ++--
 configs/nucleo-f4x1re/src/stm32_userleds.c    |  2 +-
 configs/nucleo-l476rg/nsh/defconfig           |  2 +-
 configs/nucleo-l476rg/src/stm32_autoleds.c    |  2 +-
 configs/nucleo-l476rg/src/stm32_spi.c         |  4 ++--
 configs/nucleo-l476rg/src/stm32_userleds.c    |  2 +-
 configs/nutiny-nuc120/src/nuc_led.c           |  6 ++---
 configs/olimex-lpc-h3131/src/lpc31_leds.c     |  2 +-
 configs/olimex-lpc1766stk/README.txt          |  2 +-
 configs/olimex-lpc1766stk/src/lpc17_lcd.c     |  4 ++--
 configs/olimex-lpc1766stk/src/lpc17_leds.c    |  6 ++---
 .../olimex-stm32-h405/src/stm32_autoleds.c    |  2 +-
 .../olimex-stm32-h405/src/stm32_userleds.c    |  2 +-
 .../olimex-stm32-h407/src/stm32_autoleds.c    |  2 +-
 .../olimex-stm32-h407/src/stm32_userleds.c    |  2 +-
 .../olimex-stm32-p207/src/stm32_autoleds.c    |  2 +-
 .../olimex-stm32-p207/src/stm32_userleds.c    |  2 +-
 configs/olimexino-stm32/src/stm32_leds.c      |  6 ++---
 configs/open1788/README.txt                   |  4 ++--
 configs/open1788/src/lpc17_autoleds.c         |  6 ++---
 configs/open1788/src/lpc17_ssp.c              |  4 ++--
 configs/open1788/src/lpc17_touchscreen.c      |  4 ++--
 configs/open1788/src/lpc17_userleds.c         |  6 ++---
 configs/pcblogic-pic32mx/README.txt           |  2 +-
 .../pcblogic-pic32mx/src/pic32mx_lcd1602.c    | 10 ++++-----
 configs/pcduino-a10/src/a1x_leds.c            |  2 +-
 configs/pic32mx-starterkit/src/pic32mx_leds.c |  4 ++--
 configs/pic32mx7mmb/src/pic32_leds.c          |  4 ++--
 configs/pic32mx7mmb/src/pic32_mio283qt2.c     |  4 ++--
 .../pic32mz-starterkit/src/pic32mz_autoleds.c |  4 ++--
 .../pic32mz-starterkit/src/pic32mz_userleds.c |  4 ++--
 configs/rgmp/arm/nsh/defconfig                |  2 +-
 configs/rgmp/x86/cxxtest/defconfig            |  2 +-
 configs/rgmp/x86/helloxx/defconfig            |  2 +-
 configs/rgmp/x86/nsh/defconfig                |  2 +-
 configs/sabre-6quad/README.txt                |  2 +-
 configs/sabre-6quad/src/imx_autoleds.c        |  2 +-
 configs/sam3u-ek/README.txt                   |  2 +-
 configs/sam3u-ek/src/sam_lcd.c                |  4 ++--
 configs/sam3u-ek/src/sam_leds.c               |  2 +-
 configs/sam3u-ek/src/sam_touchscreen.c        |  4 ++--
 configs/sam4e-ek/README.txt                   |  4 ++--
 configs/sam4e-ek/src/sam_ads7843e.c           |  4 ++--
 configs/sam4e-ek/src/sam_ethernet.c           |  4 ++--
 configs/sam4e-ek/src/sam_ili9325.c            |  4 ++--
 configs/sam4e-ek/src/sam_ili9341.c            |  4 ++--
 configs/sam4e-ek/src/sam_leds.c               |  2 +-
 configs/sam4l-xplained/src/sam_autoleds.c     |  2 +-
 configs/sam4l-xplained/src/sam_slcd.c         | 10 ++++-----
 configs/sam4l-xplained/src/sam_userleds.c     |  2 +-
 configs/sam4s-xplained-pro/src/sam_autoleds.c |  2 +-
 configs/sam4s-xplained-pro/src/sam_tc.c       |  2 +-
 configs/sam4s-xplained-pro/src/sam_userleds.c |  2 +-
 configs/sam4s-xplained-pro/src/sam_wdt.c      |  2 +-
 configs/sam4s-xplained/src/sam_autoleds.c     |  2 +-
 configs/sam4s-xplained/src/sam_userleds.c     |  2 +-
 configs/sama5d2-xult/src/sam_autoleds.c       |  2 +-
 configs/sama5d2-xult/src/sam_userleds.c       |  2 +-
 configs/sama5d3-xplained/src/sam_autoleds.c   |  2 +-
 configs/sama5d3-xplained/src/sam_ethernet.c   |  4 ++--
 configs/sama5d3-xplained/src/sam_userleds.c   |  2 +-
 configs/sama5d3x-ek/Kconfig                   |  2 +-
 configs/sama5d3x-ek/src/sam_autoleds.c        |  2 +-
 configs/sama5d3x-ek/src/sam_ethernet.c        |  4 ++--
 configs/sama5d3x-ek/src/sam_userleds.c        |  2 +-
 configs/sama5d4-ek/Kconfig                    |  4 ++--
 configs/sama5d4-ek/src/sam_autoleds.c         |  2 +-
 configs/sama5d4-ek/src/sam_ethernet.c         |  4 ++--
 configs/sama5d4-ek/src/sam_userleds.c         |  2 +-
 configs/samd20-xplained/src/sam_autoleds.c    |  2 +-
 configs/samd20-xplained/src/sam_userleds.c    |  2 +-
 configs/samd21-xplained/src/sam_autoleds.c    |  2 +-
 configs/samd21-xplained/src/sam_userleds.c    |  2 +-
 configs/same70-xplained/README.txt            |  2 +-
 configs/same70-xplained/src/sam_autoleds.c    |  2 +-
 configs/same70-xplained/src/sam_ethernet.c    |  4 ++--
 configs/saml21-xplained/src/sam_autoleds.c    |  2 +-
 configs/saml21-xplained/src/sam_userleds.c    |  2 +-
 configs/samv71-xult/README.txt                |  2 +-
 configs/samv71-xult/src/sam_autoleds.c        |  2 +-
 configs/samv71-xult/src/sam_ethernet.c        |  4 ++--
 configs/samv71-xult/src/sam_ili9488.c         |  4 ++--
 configs/shenzhou/src/stm32_autoleds.c         |  2 +-
 configs/shenzhou/src/stm32_ili93xx.c          |  4 ++--
 configs/shenzhou/src/stm32_spi.c              |  2 +-
 configs/shenzhou/src/stm32_ssd1289.c          |  4 ++--
 configs/shenzhou/src/stm32_userleds.c         |  2 +-
 configs/shenzhou/thttpd/defconfig             |  2 +-
 configs/sim/configdata/defconfig              |  2 +-
 configs/sim/cxxtest/defconfig                 |  2 +-
 configs/sim/mount/defconfig                   |  2 +-
 configs/sim/mtdpart/defconfig                 |  2 +-
 configs/sim/mtdrwb/defconfig                  |  2 +-
 configs/sim/nx/defconfig                      |  2 +-
 configs/sim/nx11/defconfig                    |  2 +-
 configs/sim/ostest/defconfig                  |  2 +-
 configs/sim/touchscreen/defconfig             |  2 +-
 configs/sim/traveler/defconfig                |  2 +-
 configs/spark/src/stm32_autoleds.c            |  2 +-
 configs/spark/src/stm32_userleds.c            |  2 +-
 configs/stm3210e-eval/README.txt              |  4 ++--
 configs/stm3210e-eval/src/stm32_lcd.c         |  4 ++--
 configs/stm3210e-eval/src/stm32_leds.c        |  2 +-
 configs/stm3220g-eval/src/stm32_autoleds.c    |  2 +-
 configs/stm3220g-eval/src/stm32_lcd.c         |  4 ++--
 configs/stm3220g-eval/src/stm32_userleds.c    |  2 +-
 configs/stm3240g-eval/src/stm32_autoleds.c    |  2 +-
 configs/stm3240g-eval/src/stm32_lcd.c         |  4 ++--
 configs/stm3240g-eval/src/stm32_userleds.c    |  2 +-
 configs/stm32_tiny/src/stm32_leds.c           |  2 +-
 configs/stm32_tiny/src/stm32_spi.c            |  4 ++--
 .../stm32f103-minimum/src/stm32_autoleds.c    |  2 +-
 configs/stm32f103-minimum/src/stm32_spi.c     |  4 ++--
 configs/stm32f3discovery/src/stm32_autoleds.c |  2 +-
 configs/stm32f3discovery/src/stm32_userleds.c |  2 +-
 configs/stm32f429i-disco/ltdc/defconfig       |  2 +-
 configs/stm32f429i-disco/src/stm32_autoleds.c |  2 +-
 configs/stm32f429i-disco/src/stm32_userleds.c |  2 +-
 configs/stm32f4discovery/rgbled/defconfig     |  2 +-
 configs/stm32f4discovery/src/stm32_autoleds.c |  2 +-
 configs/stm32f4discovery/src/stm32_ethernet.c |  4 ++--
 configs/stm32f4discovery/src/stm32_ssd1289.c  |  4 ++--
 configs/stm32f4discovery/src/stm32_userleds.c |  2 +-
 configs/stm32f746g-disco/src/stm32_autoleds.c |  2 +-
 configs/stm32f746g-disco/src/stm32_userleds.c |  2 +-
 configs/stm32l476vg-disco/nsh/defconfig       |  2 +-
 .../stm32l476vg-disco/src/stm32_autoleds.c    |  2 +-
 configs/stm32l476vg-disco/src/stm32_spi.c     |  4 ++--
 .../stm32l476vg-disco/src/stm32_userleds.c    |  2 +-
 configs/stm32ldiscovery/README.txt            |  2 +-
 configs/stm32ldiscovery/src/stm32_autoleds.c  |  2 +-
 configs/stm32ldiscovery/src/stm32_lcd.c       | 10 ++++-----
 configs/stm32ldiscovery/src/stm32_userleds.c  |  2 +-
 configs/stm32vldiscovery/src/stm32_leds.c     |  2 +-
 configs/sure-pic32mx/README.txt               |  4 ++--
 configs/sure-pic32mx/src/pic32mx_autoleds.c   |  4 ++--
 configs/sure-pic32mx/src/pic32mx_lcd1602.c    | 10 ++++-----
 configs/sure-pic32mx/src/pic32mx_spi.c        |  6 ++---
 configs/teensy-2.0/src/at90usb_leds.c         |  4 ++--
 configs/teensy-lc/nsh/defconfig               |  2 +-
 configs/teensy-lc/src/kl_led.c                |  4 ++--
 configs/teensy-lc/src/kl_spi.c                |  2 +-
 .../tm4c123g-launchpad/src/tm4c_autoleds.c    |  2 +-
 configs/tm4c123g-launchpad/src/tm4c_ssi.c     |  2 +-
 .../tm4c1294-launchpad/src/tm4c_userleds.c    |  2 +-
 configs/twr-k60n512/src/k60_leds.c            |  2 +-
 configs/u-blox-c027/nsh/defconfig             |  2 +-
 configs/u-blox-c027/src/lpc17_leds.c          |  4 ++--
 configs/ubw32/src/pic32_leds.c                |  4 ++--
 configs/viewtool-stm32f107/README.txt         |  2 +-
 configs/viewtool-stm32f107/src/stm32_leds.c   |  2 +-
 .../viewtool-stm32f107/src/stm32_ssd1289.c    |  4 ++--
 configs/z16f2800100zcog/nsh/defconfig         |  2 +-
 configs/z16f2800100zcog/ostest/defconfig      |  2 +-
 configs/z16f2800100zcog/pashello/defconfig    |  2 +-
 configs/z8encore000zco/ostest/defconfig       |  2 +-
 configs/z8f64200100kit/ostest/defconfig       |  2 +-
 configs/zkit-arm-1769/src/lpc17_lcd.c         |  2 +-
 configs/zkit-arm-1769/src/lpc17_leds.c        |  4 ++--
 configs/zkit-arm-1769/src/lpc17_spi.c         |  4 ++--
 configs/zkit-arm-1769/src/lpc17_ssp.c         |  4 ++--
 configs/zp214xpa/src/lpc2148_spi1.c           |  2 +-
 drivers/analog/ads1242.c                      | 16 +++++++-------
 drivers/analog/pga11x.c                       |  4 ++--
 drivers/audio/i2schar.c                       |  4 ++--
 drivers/input/Kconfig                         |  4 ++--
 drivers/input/mxt.c                           |  4 ++--
 drivers/input/mxt.h                           |  4 ++--
 drivers/lcd/mio283qt2.c                       |  4 ++--
 drivers/lcd/mio283qt9a.c                      |  4 ++--
 drivers/lcd/nokia6100.c                       |  4 ++--
 drivers/lcd/p14201.c                          |  4 ++--
 drivers/lcd/ra8875.c                          |  4 ++--
 drivers/lcd/skeleton.c                        |  4 ++--
 drivers/lcd/ssd1289.c                         |  4 ++--
 drivers/lcd/st7565.c                          |  4 ++--
 drivers/lcd/st7567.c                          |  4 ++--
 drivers/lcd/ug-9664hswag01.c                  |  4 ++--
 drivers/leds/userled_upper.c                  |  4 ++--
 drivers/mmcsd/mmcsd.h                         |  4 ++--
 drivers/mmcsd/mmcsd_debug.c                   |  2 +-
 drivers/mmcsd/mmcsd_sdio.c                    | 22 +++++++++----------
 drivers/mtd/mtd_nand.c                        | 14 ++++++------
 drivers/net/Kconfig                           |  4 ++--
 drivers/net/phy_notify.c                      |  4 ++--
 drivers/net/telnet.c                          |  2 +-
 drivers/spi/spi_bitbang.c                     |  4 ++--
 drivers/usbdev/usbmsc_scsi.c                  |  4 ++--
 drivers/usbhost/usbhost_cdcacm.c              |  2 +-
 drivers/usbhost/usbhost_hidkbd.c              |  4 ++--
 drivers/usbhost/usbhost_hidmouse.c            |  4 ++--
 drivers/usbhost/usbhost_hub.c                 |  2 +-
 drivers/usbhost/usbhost_storage.c             |  4 ++--
 graphics/vnc/server/vnc_fbdev.c               |  4 ++--
 graphics/vnc/server/vnc_negotiate.c           |  4 ++--
 graphics/vnc/server/vnc_raw.c                 |  4 ++--
 graphics/vnc/server/vnc_receiver.c            |  4 ++--
 graphics/vnc/server/vnc_rre.c                 |  4 ++--
 graphics/vnc/server/vnc_server.c              |  4 ++--
 graphics/vnc/server/vnc_updater.c             |  4 ++--
 include/debug.h                               | 16 +++++++-------
 include/nuttx/analog/pga11x.h                 |  2 +-
 include/nuttx/audio/audio.h                   |  2 +-
 include/nuttx/pwm.h                           |  2 +-
 include/nuttx/spi/spi_bitbang.c               |  4 ++--
 include/nuttx/spi/spi_bitbang.h               |  4 ++--
 include/nuttx/usb/usbhost_trace.h             |  6 ++---
 libc/libc.csv                                 |  4 ++--
 libc/misc/lib_dbg.c                           |  4 ++--
 libc/misc/lib_slcddecode.c                    |  4 ++--
 sched/Kconfig                                 |  2 +-
 sched/module/mod_init.c                       |  4 ++--
 sched/module/mod_insmod.c                     |  4 ++--
 tools/mkconfig.c                              |  2 +-
 403 files changed, 716 insertions(+), 717 deletions(-)

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");
-- 
GitLab


From fc3540cffebbb0860f27fb8b2503fcdea3dc172d Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sat, 11 Jun 2016 11:59:51 -0600
Subject: [PATCH 18/91] Replace all occurrences of vdbg with vinfo

---
 arch/arm/src/a1x/a1x_serial.c                 |   4 +-
 arch/arm/src/arm/up_dataabort.c               |   2 +-
 arch/arm/src/arm/up_elf.c                     |  10 +-
 arch/arm/src/armv6-m/up_elf.c                 |  22 +-
 arch/arm/src/armv7-a/arm_addrenv.c            |  16 +-
 arch/arm/src/armv7-a/arm_addrenv_kstack.c     |   4 +-
 arch/arm/src/armv7-a/arm_addrenv_shm.c        |   4 +-
 arch/arm/src/armv7-a/arm_addrenv_ustack.c     |   6 +-
 arch/arm/src/armv7-a/arm_addrenv_utils.c      |   4 +-
 arch/arm/src/armv7-a/arm_cpustart.c           |   4 +-
 arch/arm/src/armv7-a/arm_dataabort.c          |   2 +-
 arch/arm/src/armv7-a/arm_elf.c                |  10 +-
 arch/arm/src/armv7-a/arm_gicv2.c              |   2 +-
 arch/arm/src/armv7-a/gic.h                    |   8 +-
 arch/arm/src/armv7-m/up_elf.c                 |  24 +-
 arch/arm/src/armv7-m/up_ramvec_attach.c       |   6 +-
 arch/arm/src/armv7-m/up_ramvec_initialize.c   |   8 +-
 arch/arm/src/armv7-r/arm_elf.c                |  10 +-
 arch/arm/src/c5471/c5471_ethernet.c           |  52 +--
 arch/arm/src/common/up_vfork.c                |  16 +-
 arch/arm/src/dm320/dm320_framebuffer.c        | 132 +++----
 arch/arm/src/dm320/dm320_usbdev.c             |   4 +-
 arch/arm/src/efm32/efm32_adc.c                |  36 +-
 arch/arm/src/efm32/efm32_dma.c                |   4 +-
 arch/arm/src/efm32/efm32_i2c.c                |   8 +-
 arch/arm/src/efm32/efm32_idle.c               |   2 +-
 arch/arm/src/efm32/efm32_pwm.c                |  42 +--
 arch/arm/src/efm32/efm32_rmu.h                |   6 +-
 arch/arm/src/efm32/efm32_spi.c                |  22 +-
 arch/arm/src/efm32/efm32_timer.c              |  22 +-
 arch/arm/src/efm32/efm32_usbdev.c             |  14 +-
 arch/arm/src/efm32/efm32_usbhost.c            |  32 +-
 arch/arm/src/kinetis/kinetis_enet.c           |   4 +-
 arch/arm/src/kinetis/kinetis_pwm.c            |  46 +--
 arch/arm/src/kinetis/kinetis_sdhc.c           |  44 +--
 arch/arm/src/kinetis/kinetis_usbdev.c         |  26 +-
 arch/arm/src/kl/kl_idle.c                     |   2 +-
 arch/arm/src/kl/kl_pwm.c                      |  44 +--
 arch/arm/src/kl/kl_spi.c                      |  14 +-
 arch/arm/src/lpc11xx/lpc11_serial.c           |   2 +-
 arch/arm/src/lpc11xx/lpc11_spi.c              |   6 +-
 arch/arm/src/lpc11xx/lpc11_ssp.c              |  10 +-
 arch/arm/src/lpc11xx/lpc11_timer.c            |  12 +-
 arch/arm/src/lpc17xx/lpc176x_rtc.c            |   8 +-
 arch/arm/src/lpc17xx/lpc17_can.c              |  34 +-
 arch/arm/src/lpc17xx/lpc17_ethernet.c         |  16 +-
 arch/arm/src/lpc17xx/lpc17_lcd.c              |  38 +-
 arch/arm/src/lpc17xx/lpc17_mcpwm.c            |  30 +-
 arch/arm/src/lpc17xx/lpc17_pwm.c              |  30 +-
 arch/arm/src/lpc17xx/lpc17_sdcard.c           |  20 +-
 arch/arm/src/lpc17xx/lpc17_serial.c           |   4 +-
 arch/arm/src/lpc17xx/lpc17_spi.c              |   6 +-
 arch/arm/src/lpc17xx/lpc17_ssp.c              |  10 +-
 arch/arm/src/lpc17xx/lpc17_timer.c            |  12 +-
 arch/arm/src/lpc17xx/lpc17_usbdev.c           |  12 +-
 arch/arm/src/lpc17xx/lpc17_usbhost.c          |  60 ++--
 arch/arm/src/lpc214x/lpc214x_serial.c         |   4 +-
 arch/arm/src/lpc214x/lpc214x_usbdev.c         |  12 +-
 arch/arm/src/lpc2378/lpc23xx_serial.c         |   4 +-
 arch/arm/src/lpc2378/lpc23xx_spi.c            |   6 +-
 arch/arm/src/lpc31xx/lpc31_ehci.c             |  12 +-
 arch/arm/src/lpc31xx/lpc31_serial.c           |   4 +-
 arch/arm/src/lpc31xx/lpc31_usbdev.c           |   6 +-
 arch/arm/src/lpc43xx/lpc43_ehci.c             |  12 +-
 arch/arm/src/lpc43xx/lpc43_ethernet.c         |  50 +--
 arch/arm/src/lpc43xx/lpc43_gpdma.c            |   6 +-
 arch/arm/src/lpc43xx/lpc43_idle.c             |   2 +-
 arch/arm/src/lpc43xx/lpc43_serial.c           |   4 +-
 arch/arm/src/lpc43xx/lpc43_spi.c              |   6 +-
 arch/arm/src/lpc43xx/lpc43_spifi.c            |  96 +++---
 arch/arm/src/lpc43xx/lpc43_ssp.c              |  10 +-
 arch/arm/src/lpc43xx/lpc43_usb0dev.c          |   6 +-
 arch/arm/src/nuc1xx/nuc_idle.c                |   2 +-
 arch/arm/src/sam34/sam4cm_freerun.c           |   8 +-
 arch/arm/src/sam34/sam4cm_oneshot.c           |  18 +-
 arch/arm/src/sam34/sam4cm_tc.c                |  18 +-
 arch/arm/src/sam34/sam4cm_tc.h                |   8 +-
 arch/arm/src/sam34/sam4cm_tickless.c          |   2 +-
 arch/arm/src/sam34/sam_dmac.c                 |  20 +-
 arch/arm/src/sam34/sam_emac.c                 |  76 ++--
 arch/arm/src/sam34/sam_hsmci.c                |  18 +-
 arch/arm/src/sam34/sam_rtc.c                  |   8 +-
 arch/arm/src/sam34/sam_rtt.c                  |  28 +-
 arch/arm/src/sam34/sam_spi.c                  |  42 +--
 arch/arm/src/sam34/sam_tc.c                   |  30 +-
 arch/arm/src/sam34/sam_twi.c                  |  18 +-
 arch/arm/src/sam34/sam_udp.c                  |  10 +-
 arch/arm/src/sam34/sam_wdt.c                  |  30 +-
 arch/arm/src/sama5/sam_adc.c                  |  54 +--
 arch/arm/src/sama5/sam_can.c                  |  32 +-
 arch/arm/src/sama5/sam_dmac.c                 |  26 +-
 arch/arm/src/sama5/sam_ehci.c                 |  12 +-
 arch/arm/src/sama5/sam_emaca.c                |  76 ++--
 arch/arm/src/sama5/sam_emacb.c                |  76 ++--
 arch/arm/src/sama5/sam_freerun.c              |   8 +-
 arch/arm/src/sama5/sam_gmac.c                 |  72 ++--
 arch/arm/src/sama5/sam_hsmci.c                |  18 +-
 arch/arm/src/sama5/sam_isi.c                  |   2 +-
 arch/arm/src/sama5/sam_lcd.c                  |  44 +--
 arch/arm/src/sama5/sam_nand.c                 |  36 +-
 arch/arm/src/sama5/sam_ohci.c                 |  12 +-
 arch/arm/src/sama5/sam_oneshot.c              |  18 +-
 arch/arm/src/sama5/sam_pmecc.c                |  20 +-
 arch/arm/src/sama5/sam_pwm.c                  |  50 +--
 arch/arm/src/sama5/sam_rtc.c                  |   8 +-
 arch/arm/src/sama5/sam_spi.c                  |  42 +--
 arch/arm/src/sama5/sam_ssc.c                  |  42 +--
 arch/arm/src/sama5/sam_tc.c                   |  18 +-
 arch/arm/src/sama5/sam_tc.h                   |   8 +-
 arch/arm/src/sama5/sam_tickless.c             |   2 +-
 arch/arm/src/sama5/sam_trng.c                 |   8 +-
 arch/arm/src/sama5/sam_tsd.c                  |  34 +-
 arch/arm/src/sama5/sam_twi.c                  |  22 +-
 arch/arm/src/sama5/sam_udphs.c                |  12 +-
 arch/arm/src/sama5/sam_wdt.c                  |  32 +-
 arch/arm/src/sama5/sam_xdmac.c                |  26 +-
 arch/arm/src/samdl/sam_dmac.c                 |  20 +-
 arch/arm/src/samdl/sam_idle.c                 |   2 +-
 arch/arm/src/samdl/sam_spi.c                  |  30 +-
 arch/arm/src/samv7/sam_emac.c                 |  78 ++---
 arch/arm/src/samv7/sam_freerun.c              |   8 +-
 arch/arm/src/samv7/sam_hsmci.c                |  20 +-
 arch/arm/src/samv7/sam_mcan.c                 |  28 +-
 arch/arm/src/samv7/sam_oneshot.c              |  18 +-
 arch/arm/src/samv7/sam_qspi.c                 |  56 +--
 arch/arm/src/samv7/sam_rswdt.c                |  32 +-
 arch/arm/src/samv7/sam_spi.c                  |  42 +--
 arch/arm/src/samv7/sam_spi_slave.c            |  34 +-
 arch/arm/src/samv7/sam_ssc.c                  |  42 +--
 arch/arm/src/samv7/sam_tc.c                   |  24 +-
 arch/arm/src/samv7/sam_tc.h                   |   8 +-
 arch/arm/src/samv7/sam_tickless.c             |   2 +-
 arch/arm/src/samv7/sam_trng.c                 |   8 +-
 arch/arm/src/samv7/sam_twihs.c                |  22 +-
 arch/arm/src/samv7/sam_usbdevhs.c             |  10 +-
 arch/arm/src/samv7/sam_wdt.c                  |  32 +-
 arch/arm/src/samv7/sam_xdmac.c                |  20 +-
 arch/arm/src/stm32/stm32_adc.c                |  76 ++--
 arch/arm/src/stm32/stm32_can.c                |  34 +-
 arch/arm/src/stm32/stm32_dac.c                |   4 +-
 arch/arm/src/stm32/stm32_dma2d.c              |  68 ++--
 arch/arm/src/stm32/stm32_eth.c                |  52 +--
 arch/arm/src/stm32/stm32_i2c.c                |   8 +-
 arch/arm/src/stm32/stm32_i2c_alt.c            |  78 ++---
 arch/arm/src/stm32/stm32_idle.c               |   2 +-
 arch/arm/src/stm32/stm32_iwdg.c               |  28 +-
 arch/arm/src/stm32/stm32_ltdc.c               | 164 ++++-----
 arch/arm/src/stm32/stm32_otgfsdev.c           |  14 +-
 arch/arm/src/stm32/stm32_otgfshost.c          |  32 +-
 arch/arm/src/stm32/stm32_otghsdev.c           |  14 +-
 arch/arm/src/stm32/stm32_otghshost.c          |  32 +-
 arch/arm/src/stm32/stm32_procfs_ccm.c         |   6 +-
 arch/arm/src/stm32/stm32_pwm.c                |  58 ++--
 arch/arm/src/stm32/stm32_qencoder.c           |  20 +-
 arch/arm/src/stm32/stm32_rng.c                |   4 +-
 arch/arm/src/stm32/stm32_rtcc.c               |   8 +-
 arch/arm/src/stm32/stm32_sdio.c               |  20 +-
 arch/arm/src/stm32/stm32_spi.c                |  22 +-
 arch/arm/src/stm32/stm32_usbdev.c             |  10 +-
 arch/arm/src/stm32/stm32_wwdg.c               |  32 +-
 arch/arm/src/stm32/stm32f30xxx_i2c.c          |   8 +-
 arch/arm/src/stm32/stm32f40xxx_dma.c          |  18 +-
 arch/arm/src/stm32/stm32f40xxx_rtcc.c         |  16 +-
 arch/arm/src/stm32f7/stm32_dma.c              |  18 +-
 arch/arm/src/stm32f7/stm32_ethernet.c         |  64 ++--
 arch/arm/src/stm32f7/stm32_procfs_dtcm.c      |   6 +-
 arch/arm/src/stm32l4/stm32l4_can.c            |  34 +-
 arch/arm/src/stm32l4/stm32l4_i2c.c            |   8 +-
 arch/arm/src/stm32l4/stm32l4_idle.c           |   2 +-
 arch/arm/src/stm32l4/stm32l4_qspi.c           |  86 ++---
 arch/arm/src/stm32l4/stm32l4_rng.c            |   4 +-
 arch/arm/src/stm32l4/stm32l4_rtcc.c           |  16 +-
 arch/arm/src/stm32l4/stm32l4_spi.c            |  24 +-
 arch/arm/src/tiva/lm3s_ethernet.c             |  24 +-
 arch/arm/src/tiva/tiva_adclib.c               |  44 +--
 arch/arm/src/tiva/tiva_adclow.c               |  74 ++--
 arch/arm/src/tiva/tiva_flash.c                |   2 +-
 arch/arm/src/tiva/tiva_gpio.c                 |  12 +-
 arch/arm/src/tiva/tiva_gpio.h                 |   8 +-
 arch/arm/src/tiva/tiva_gpioirq.c              |  10 +-
 arch/arm/src/tiva/tiva_i2c.c                  |  30 +-
 arch/arm/src/tiva/tiva_ssi.c                  |  36 +-
 arch/arm/src/tiva/tiva_timer.h                |   4 +-
 arch/arm/src/tiva/tiva_timerlib.c             |   4 +-
 arch/arm/src/tiva/tiva_timerlow32.c           |  28 +-
 arch/arm/src/tiva/tm4c_ethernet.c             |  68 ++--
 arch/avr/src/at90usb/at90usb_usbdev.c         |   6 +-
 arch/avr/src/avr/up_spi.c                     |   6 +-
 arch/hc/src/m9s12/m9s12_ethernet.c            |   4 +-
 arch/mips/src/mips32/up_schedulesigaction.c   |   4 +-
 arch/mips/src/mips32/up_sigdeliver.c          |   2 +-
 arch/mips/src/mips32/up_vfork.c               |  26 +-
 arch/mips/src/pic32mx/pic32mx-ethernet.c      |  10 +-
 arch/mips/src/pic32mx/pic32mx-exception.c     |  40 +--
 arch/mips/src/pic32mx/pic32mx-spi.c           |  28 +-
 arch/mips/src/pic32mx/pic32mx-usbdev.c        |  26 +-
 arch/mips/src/pic32mz/pic32mz-ethernet.c      |  10 +-
 arch/mips/src/pic32mz/pic32mz-exception.c     |  40 +--
 arch/mips/src/pic32mz/pic32mz-spi.c           |  30 +-
 arch/sim/src/board_lcd.c                      |  16 +-
 arch/sim/src/up_netdriver.c                   |   4 +-
 arch/sim/src/up_spiflash.c                    |  12 +-
 arch/sim/src/up_touchscreen.c                 |  34 +-
 arch/z16/src/z16f/z16f_espi.c                 |  32 +-
 arch/z80/src/ez80/ez80_emac.c                 |  80 ++---
 audio/audio.c                                 |  46 +--
 audio/pcm_decode.c                            |  42 +--
 binfmt/binfmt_copyargv.c                      |   2 +-
 binfmt/binfmt_execmodule.c                    |   4 +-
 binfmt/binfmt_loadmodule.c                    |   4 +-
 binfmt/binfmt_schedunload.c                   |   4 +-
 binfmt/binfmt_unloadmodule.c                  |   6 +-
 binfmt/builtin.c                              |   4 +-
 binfmt/elf.c                                  |   6 +-
 binfmt/libelf/libelf_bind.c                   |   2 +-
 binfmt/libelf/libelf_ctors.c                  |   6 +-
 binfmt/libelf/libelf_dtors.c                  |   6 +-
 binfmt/libelf/libelf_init.c                   |   4 +-
 binfmt/libelf/libelf_load.c                   |   8 +-
 binfmt/libelf/libelf_read.c                   |   2 +-
 binfmt/libelf/libelf_sections.c               |   2 +-
 binfmt/libelf/libelf_symbols.c                |   6 +-
 binfmt/libelf/libelf_verify.c                 |   2 +-
 binfmt/libnxflat/libnxflat_bind.c             |  30 +-
 binfmt/libnxflat/libnxflat_init.c             |   4 +-
 binfmt/libnxflat/libnxflat_load.c             |   6 +-
 binfmt/libnxflat/libnxflat_read.c             |   2 +-
 binfmt/nxflat.c                               |   6 +-
 binfmt/pcode.c                                |  10 +-
 configs/arduino-due/src/sam_autoleds.c        |   4 +-
 configs/arduino-due/src/sam_mmcsd.c           |   8 +-
 configs/arduino-due/src/sam_touchscreen.c     |   6 +-
 configs/arduino-due/src/sam_userleds.c        |   4 +-
 .../cc3200-launchpad/src/cc3200_autoleds.c    |   4 +-
 configs/cloudctrl/src/stm32_autoleds.c        |   4 +-
 configs/cloudctrl/src/stm32_spi.c             |   6 +-
 configs/cloudctrl/src/stm32_usb.c             |  10 +-
 configs/cloudctrl/src/stm32_userleds.c        |   4 +-
 configs/compal_e99/src/ssd1783.c              |  22 +-
 configs/demo9s12ne64/src/m9s12_leds.c         |   4 +-
 configs/demo9s12ne64/src/m9s12_spi.c          |   6 +-
 configs/dk-tm4c129x/src/tm4c_ssi.c            |   4 +-
 configs/dk-tm4c129x/src/tm4c_timer.c          |   2 +-
 configs/dk-tm4c129x/src/tm4c_userleds.c       |   4 +-
 configs/ea3131/src/lpc31_fillpage.c           |   6 +-
 configs/ea3131/src/lpc31_leds.c               |   4 +-
 configs/ea3131/src/lpc31_spi.c                |   6 +-
 configs/ea3131/src/lpc31_usbhost.c            |   4 +-
 configs/ea3152/src/lpc31_fillpage.c           |   6 +-
 configs/ea3152/src/lpc31_leds.c               |   4 +-
 configs/ea3152/src/lpc31_spi.c                |   6 +-
 configs/eagle100/src/lm_leds.c                |   4 +-
 configs/eagle100/src/lm_ssi.c                 |   6 +-
 configs/efm32-g8xx-stk/src/efm32_autoleds.c   |   4 +-
 configs/efm32-g8xx-stk/src/efm32_userleds.c   |   4 +-
 configs/efm32gg-stk3700/src/efm32_autoleds.c  |   4 +-
 configs/efm32gg-stk3700/src/efm32_userleds.c  |   4 +-
 configs/ekk-lm3s9b96/src/lm_leds.c            |   4 +-
 configs/ekk-lm3s9b96/src/lm_ssi.c             |   6 +-
 configs/fire-stm32v2/src/stm32_autoleds.c     |   4 +-
 configs/fire-stm32v2/src/stm32_enc28j60.c     |   2 +-
 configs/fire-stm32v2/src/stm32_mmcsd.c        |   4 +-
 configs/fire-stm32v2/src/stm32_spi.c          |   6 +-
 configs/fire-stm32v2/src/stm32_userleds.c     |   4 +-
 configs/freedom-kl25z/src/kl_adxl345.c        |   4 +-
 configs/freedom-kl25z/src/kl_led.c            |   6 +-
 configs/freedom-kl25z/src/kl_spi.c            |  10 +-
 configs/freedom-kl25z/src/kl_tsi.c            |   4 +-
 configs/freedom-kl25z/src/kl_wifi.c           |   6 +-
 configs/freedom-kl26z/src/kl_led.c            |   6 +-
 configs/freedom-kl26z/src/kl_spi.c            |  10 +-
 configs/freedom-kl26z/src/kl_tsi.c            |   4 +-
 configs/hymini-stm32v/src/stm32_appinit.c     |   2 +-
 configs/hymini-stm32v/src/stm32_leds.c        |   4 +-
 configs/hymini-stm32v/src/stm32_r61505u.c     |  20 +-
 configs/hymini-stm32v/src/stm32_spi.c         |   8 +-
 configs/hymini-stm32v/src/stm32_ssd1289.c     |   6 +-
 configs/hymini-stm32v/src/stm32_ts.c          |   4 +-
 configs/kwikstik-k40/src/k40_lcd.c            |   4 +-
 configs/kwikstik-k40/src/k40_leds.c           |   4 +-
 configs/kwikstik-k40/src/k40_spi.c            |   6 +-
 .../launchxl-tms57004/src/tms570_autoleds.c   |   4 +-
 configs/lincoln60/src/lpc17_leds.c            |   6 +-
 configs/lm3s6432-s2e/src/lm_leds.c            |   4 +-
 configs/lm3s6432-s2e/src/lm_ssi.c             |   6 +-
 configs/lm3s6965-ek/src/lm_leds.c             |   4 +-
 configs/lm3s6965-ek/src/lm_oled.c             |   4 +-
 configs/lm3s6965-ek/src/lm_ssi.c              |   6 +-
 configs/lm3s8962-ek/src/lm_leds.c             |   4 +-
 configs/lm3s8962-ek/src/lm_oled.c             |   4 +-
 configs/lm3s8962-ek/src/lm_ssi.c              |   6 +-
 configs/lm4f120-launchpad/src/lm4f_autoleds.c |   4 +-
 configs/lm4f120-launchpad/src/lm4f_ssi.c      |   4 +-
 configs/lpc4330-xplorer/src/lpc43_autoleds.c  |   6 +-
 configs/lpc4330-xplorer/src/lpc43_userleds.c  |   6 +-
 configs/lpc4357-evb/src/lpc43_autoleds.c      |   6 +-
 configs/lpc4357-evb/src/lpc43_userleds.c      |   6 +-
 configs/lpc4370-link2/src/lpc43_autoleds.c    |   6 +-
 configs/lpc4370-link2/src/lpc43_userleds.c    |   6 +-
 configs/lpcxpresso-lpc1115/src/lpc11_leds.c   |   6 +-
 configs/lpcxpresso-lpc1115/src/lpc11_ssp.c    |   6 +-
 configs/lpcxpresso-lpc1768/src/lpc17_leds.c   |   6 +-
 configs/lpcxpresso-lpc1768/src/lpc17_oled.c   |   6 +-
 configs/lpcxpresso-lpc1768/src/lpc17_ssp.c    |   6 +-
 configs/maple/src/stm32_lcd.c                 |   2 +-
 configs/maple/src/stm32_leds.c                |  10 +-
 configs/maple/src/stm32_spi.c                 |   6 +-
 configs/mbed/src/lpc17_leds.c                 |   6 +-
 configs/mcu123-lpc214x/src/lpc2148_spi1.c     |  10 +-
 configs/mikroe-stm32f4/src/stm32_mio283qt2.c  |   6 +-
 configs/mikroe-stm32f4/src/stm32_mio283qt9a.c |   6 +-
 configs/mikroe-stm32f4/src/stm32_qencoder.c   |   2 +-
 configs/mikroe-stm32f4/src/stm32_spi.c        |   8 +-
 .../mikroe-stm32f4/src/stm32_touchscreen.c    |  16 +-
 configs/mikroe-stm32f4/src/stm32_usb.c        |  10 +-
 configs/mikroe-stm32f4/src/stm32_vs1053.c     |   2 +-
 configs/mirtoo/src/pic32_leds.c               |   6 +-
 configs/mirtoo/src/pic32_spi2.c               |   4 +-
 configs/moteino-mega/src/avr_leds.c           |   6 +-
 configs/ne64badge/src/m9s12_buttons.c         |   6 +-
 configs/ne64badge/src/m9s12_leds.c            |   6 +-
 configs/ne64badge/src/m9s12_spi.c             |   6 +-
 configs/nucleo-144/src/stm32_autoleds.c       |   4 +-
 configs/nucleo-144/src/stm32_sdio.c           |   8 +-
 configs/nucleo-144/src/stm32_spi.c            |   6 +-
 configs/nucleo-144/src/stm32_userleds.c       |   4 +-
 configs/nucleo-f303re/src/stm32_autoleds.c    |   4 +-
 configs/nucleo-f303re/src/stm32_can.c         |   8 +-
 configs/nucleo-f303re/src/stm32_pwm.c         |   8 +-
 configs/nucleo-f303re/src/stm32_spi.c         |   6 +-
 configs/nucleo-f303re/src/stm32_ssd1351.c     |   6 +-
 configs/nucleo-f303re/src/stm32_userleds.c    |   4 +-
 configs/nucleo-f4x1re/src/stm32_ajoystick.c   |  18 +-
 configs/nucleo-f4x1re/src/stm32_autoleds.c    |   4 +-
 configs/nucleo-f4x1re/src/stm32_spi.c         |   6 +-
 configs/nucleo-f4x1re/src/stm32_userleds.c    |   4 +-
 configs/nucleo-f4x1re/src/stm32_wireless.c    |   6 +-
 configs/nucleo-l476rg/src/stm32_ajoystick.c   |  18 +-
 configs/nucleo-l476rg/src/stm32_autoleds.c    |   4 +-
 configs/nucleo-l476rg/src/stm32_spi.c         |   6 +-
 configs/nucleo-l476rg/src/stm32_userleds.c    |   4 +-
 configs/nucleo-l476rg/src/stm32_wireless.c    |   6 +-
 configs/nutiny-nuc120/src/nuc_led.c           |   6 +-
 configs/olimex-lpc-h3131/src/lpc31_leds.c     |   4 +-
 configs/olimex-lpc-h3131/src/lpc31_mmcsd.c    |   6 +-
 configs/olimex-lpc-h3131/src/lpc31_spi.c      |   6 +-
 configs/olimex-lpc-h3131/src/lpc31_usbhost.c  |   4 +-
 configs/olimex-lpc1766stk/src/lpc17_can.c     |   8 +-
 .../olimex-lpc1766stk/src/lpc17_hidmouse.c    |   8 +-
 configs/olimex-lpc1766stk/src/lpc17_lcd.c     |   4 +-
 configs/olimex-lpc1766stk/src/lpc17_leds.c    |   6 +-
 configs/olimex-lpc1766stk/src/lpc17_ssp.c     |   6 +-
 .../olimex-stm32-h405/src/stm32_autoleds.c    |   4 +-
 configs/olimex-stm32-h405/src/stm32_can.c     |   8 +-
 .../olimex-stm32-h405/src/stm32_userleds.c    |   4 +-
 .../olimex-stm32-h407/src/stm32_autoleds.c    |   4 +-
 configs/olimex-stm32-h407/src/stm32_can.c     |   8 +-
 configs/olimex-stm32-h407/src/stm32_sdio.c    |   8 +-
 configs/olimex-stm32-h407/src/stm32_usb.c     |  10 +-
 .../olimex-stm32-h407/src/stm32_userleds.c    |   4 +-
 configs/olimex-stm32-p107/src/stm32_can.c     |   8 +-
 .../olimex-stm32-p107/src/stm32_encx24j600.c  |   2 +-
 configs/olimex-stm32-p107/src/stm32_spi.c     |   6 +-
 .../olimex-stm32-p207/src/stm32_autoleds.c    |   4 +-
 configs/olimex-stm32-p207/src/stm32_can.c     |   8 +-
 configs/olimex-stm32-p207/src/stm32_usb.c     |  10 +-
 .../olimex-stm32-p207/src/stm32_userleds.c    |   4 +-
 configs/olimex-strp711/src/str71_enc28j60.c   |   2 +-
 configs/olimexino-stm32/src/stm32_can.c       |   8 +-
 configs/olimexino-stm32/src/stm32_leds.c      |   6 +-
 configs/olimexino-stm32/src/stm32_spi.c       |   6 +-
 configs/open1788/src/lpc17_autoleds.c         |   6 +-
 configs/open1788/src/lpc17_ssp.c              |   6 +-
 configs/open1788/src/lpc17_touchscreen.c      |   6 +-
 configs/open1788/src/lpc17_userleds.c         |   6 +-
 .../pcblogic-pic32mx/src/pic32mx_lcd1602.c    |  24 +-
 configs/pcduino-a10/src/a1x_leds.c            |   4 +-
 configs/pic32mx-starterkit/src/pic32mx_leds.c |   6 +-
 configs/pic32mx-starterkit/src/pic32mx_spi.c  |   6 +-
 configs/pic32mx7mmb/src/pic32_leds.c          |   6 +-
 configs/pic32mx7mmb/src/pic32_mio283qt2.c     |   6 +-
 configs/pic32mx7mmb/src/pic32_spi.c           |   4 +-
 configs/pic32mx7mmb/src/pic32_touchscreen.c   |  16 +-
 .../pic32mz-starterkit/src/pic32mz_autoleds.c |   6 +-
 configs/pic32mz-starterkit/src/pic32mz_spi.c  |   6 +-
 .../pic32mz-starterkit/src/pic32mz_userleds.c |   6 +-
 configs/sabre-6quad/src/imx_autoleds.c        |   4 +-
 configs/sam3u-ek/src/sam_lcd.c                |  32 +-
 configs/sam3u-ek/src/sam_leds.c               |   4 +-
 configs/sam3u-ek/src/sam_mmcsd.c              |   4 +-
 configs/sam3u-ek/src/sam_spi.c                |   6 +-
 configs/sam3u-ek/src/sam_touchscreen.c        |   8 +-
 configs/sam4e-ek/src/sam_ads7843e.c           |   8 +-
 configs/sam4e-ek/src/sam_ethernet.c           |   2 +-
 configs/sam4e-ek/src/sam_hsmci.c              |   2 +-
 configs/sam4e-ek/src/sam_ili9325.c            |  22 +-
 configs/sam4e-ek/src/sam_ili9341.c            |  28 +-
 configs/sam4e-ek/src/sam_leds.c               |   4 +-
 configs/sam4e-ek/src/sam_spi.c                |   6 +-
 configs/sam4l-xplained/src/sam_autoleds.c     |   4 +-
 configs/sam4l-xplained/src/sam_mmcsd.c        |   8 +-
 configs/sam4l-xplained/src/sam_slcd.c         |  46 +--
 configs/sam4l-xplained/src/sam_spi.c          |   6 +-
 .../sam4l-xplained/src/sam_ug2832hsweg04.c    |   6 +-
 configs/sam4l-xplained/src/sam_userleds.c     |   4 +-
 configs/sam4s-xplained-pro/src/sam_autoleds.c |   4 +-
 configs/sam4s-xplained-pro/src/sam_hsmci.c    |   2 +-
 configs/sam4s-xplained-pro/src/sam_tc.c       |  38 +-
 configs/sam4s-xplained-pro/src/sam_userleds.c |   4 +-
 configs/sam4s-xplained-pro/src/sam_wdt.c      |  26 +-
 configs/sam4s-xplained/src/sam_autoleds.c     |   4 +-
 configs/sam4s-xplained/src/sam_userleds.c     |   4 +-
 configs/sama5d2-xult/src/sam_autoleds.c       |   4 +-
 configs/sama5d2-xult/src/sam_userleds.c       |   4 +-
 configs/sama5d3-xplained/src/sam_ajoystick.c  |  12 +-
 configs/sama5d3-xplained/src/sam_autoleds.c   |   4 +-
 configs/sama5d3-xplained/src/sam_can.c        |   8 +-
 configs/sama5d3-xplained/src/sam_ethernet.c   |   2 +-
 configs/sama5d3-xplained/src/sam_hsmci.c      |   2 +-
 configs/sama5d3-xplained/src/sam_spi.c        |   6 +-
 configs/sama5d3-xplained/src/sam_usb.c        |   6 +-
 configs/sama5d3-xplained/src/sam_userleds.c   |   4 +-
 configs/sama5d3x-ek/src/sam_at24.c            |  10 +-
 configs/sama5d3x-ek/src/sam_autoleds.c        |   4 +-
 configs/sama5d3x-ek/src/sam_can.c             |   8 +-
 configs/sama5d3x-ek/src/sam_ethernet.c        |   2 +-
 configs/sama5d3x-ek/src/sam_hsmci.c           |   2 +-
 configs/sama5d3x-ek/src/sam_ov2640.c          |   2 +-
 configs/sama5d3x-ek/src/sam_spi.c             |   6 +-
 configs/sama5d3x-ek/src/sam_usb.c             |   6 +-
 configs/sama5d3x-ek/src/sam_userleds.c        |   4 +-
 configs/sama5d3x-ek/src/sam_wm8904.c          |  10 +-
 configs/sama5d4-ek/src/sam_autoleds.c         |   4 +-
 configs/sama5d4-ek/src/sam_automount.c        |   2 +-
 configs/sama5d4-ek/src/sam_ethernet.c         |   2 +-
 configs/sama5d4-ek/src/sam_hsmci.c            |   2 +-
 configs/sama5d4-ek/src/sam_maxtouch.c         |   4 +-
 configs/sama5d4-ek/src/sam_spi.c              |   6 +-
 configs/sama5d4-ek/src/sam_usb.c              |   6 +-
 configs/sama5d4-ek/src/sam_userleds.c         |   4 +-
 configs/sama5d4-ek/src/sam_wm8904.c           |  10 +-
 configs/samd20-xplained/src/sam_autoleds.c    |   4 +-
 configs/samd20-xplained/src/sam_mmcsd.c       |   8 +-
 configs/samd20-xplained/src/sam_spi.c         |   6 +-
 .../samd20-xplained/src/sam_ug2832hsweg04.c   |   6 +-
 configs/samd20-xplained/src/sam_userleds.c    |   4 +-
 configs/samd21-xplained/src/sam_autoleds.c    |   4 +-
 configs/samd21-xplained/src/sam_mmcsd.c       |   8 +-
 configs/samd21-xplained/src/sam_spi.c         |   6 +-
 .../samd21-xplained/src/sam_ug2832hsweg04.c   |   6 +-
 configs/samd21-xplained/src/sam_userleds.c    |   4 +-
 configs/same70-xplained/src/sam_autoleds.c    |   4 +-
 configs/same70-xplained/src/sam_ethernet.c    |   4 +-
 configs/same70-xplained/src/sam_hsmci.c       |   2 +-
 configs/same70-xplained/src/sam_mcan.c        |   8 +-
 configs/same70-xplained/src/sam_spi.c         |   6 +-
 configs/saml21-xplained/src/sam_autoleds.c    |   4 +-
 configs/saml21-xplained/src/sam_mmcsd.c       |   8 +-
 configs/saml21-xplained/src/sam_spi.c         |   6 +-
 .../saml21-xplained/src/sam_ug2832hsweg04.c   |   6 +-
 configs/saml21-xplained/src/sam_userleds.c    |   4 +-
 configs/samv71-xult/src/sam_autoleds.c        |   4 +-
 configs/samv71-xult/src/sam_ethernet.c        |   4 +-
 configs/samv71-xult/src/sam_hsmci.c           |   2 +-
 configs/samv71-xult/src/sam_ili9488.c         |  30 +-
 configs/samv71-xult/src/sam_maxtouch.c        |   4 +-
 configs/samv71-xult/src/sam_mcan.c            |   8 +-
 configs/samv71-xult/src/sam_spi.c             |   6 +-
 configs/samv71-xult/src/sam_wm8904.c          |  10 +-
 configs/shenzhou/src/stm32_autoleds.c         |   4 +-
 configs/shenzhou/src/stm32_can.c              |   8 +-
 configs/shenzhou/src/stm32_ili93xx.c          |  22 +-
 configs/shenzhou/src/stm32_mmcsd.c            |   8 +-
 configs/shenzhou/src/stm32_spi.c              |   6 +-
 configs/shenzhou/src/stm32_ssd1289.c          |   6 +-
 configs/shenzhou/src/stm32_touchscreen.c      |   4 +-
 configs/shenzhou/src/stm32_usb.c              |  10 +-
 configs/shenzhou/src/stm32_userleds.c         |   4 +-
 configs/sim/src/sim_touchscreen.c             |   6 +-
 configs/spark/src/stm32_autoleds.c            |   4 +-
 configs/spark/src/stm32_composite.c           |   8 +-
 configs/spark/src/stm32_spi.c                 |   6 +-
 configs/spark/src/stm32_userleds.c            |   4 +-
 configs/spark/src/stm32_wireless.c            |   6 +-
 configs/stm3210e-eval/src/stm32_can.c         |   8 +-
 configs/stm3210e-eval/src/stm32_djoystick.c   |   8 +-
 configs/stm3210e-eval/src/stm32_idle.c        |   2 +-
 configs/stm3210e-eval/src/stm32_lcd.c         |  16 +-
 configs/stm3210e-eval/src/stm32_leds.c        |   4 +-
 configs/stm3210e-eval/src/stm32_spi.c         |   6 +-
 configs/stm3220g-eval/src/stm32_autoleds.c    |   4 +-
 configs/stm3220g-eval/src/stm32_can.c         |   8 +-
 configs/stm3220g-eval/src/stm32_lcd.c         |  22 +-
 configs/stm3220g-eval/src/stm32_spi.c         |   6 +-
 configs/stm3220g-eval/src/stm32_stmpe811.c    |   4 +-
 configs/stm3220g-eval/src/stm32_usb.c         |  10 +-
 configs/stm3220g-eval/src/stm32_userleds.c    |   4 +-
 configs/stm3240g-eval/src/stm32_autoleds.c    |   4 +-
 configs/stm3240g-eval/src/stm32_can.c         |   8 +-
 configs/stm3240g-eval/src/stm32_lcd.c         |  22 +-
 configs/stm3240g-eval/src/stm32_spi.c         |   6 +-
 configs/stm3240g-eval/src/stm32_stmpe811.c    |   4 +-
 configs/stm3240g-eval/src/stm32_usb.c         |  10 +-
 configs/stm3240g-eval/src/stm32_userleds.c    |   4 +-
 configs/stm32_tiny/src/stm32_leds.c           |   8 +-
 configs/stm32_tiny/src/stm32_spi.c            |  10 +-
 configs/stm32_tiny/src/stm32_wireless.c       |   4 +-
 .../stm32f103-minimum/src/stm32_autoleds.c    |   8 +-
 configs/stm32f103-minimum/src/stm32_spi.c     |   6 +-
 configs/stm32f3discovery/src/stm32_autoleds.c |   4 +-
 configs/stm32f3discovery/src/stm32_qencoder.c |   2 +-
 configs/stm32f3discovery/src/stm32_spi.c      |   6 +-
 configs/stm32f3discovery/src/stm32_userleds.c |   4 +-
 configs/stm32f429i-disco/src/stm32_autoleds.c |   4 +-
 .../stm32f429i-disco/src/stm32_ili93414ws.c   |  18 +-
 configs/stm32f429i-disco/src/stm32_lcd.c      |  18 +-
 configs/stm32f429i-disco/src/stm32_spi.c      |   6 +-
 configs/stm32f429i-disco/src/stm32_usb.c      |  10 +-
 configs/stm32f429i-disco/src/stm32_userleds.c |   4 +-
 configs/stm32f4discovery/src/stm32_autoleds.c |   4 +-
 configs/stm32f4discovery/src/stm32_ethernet.c |   2 +-
 configs/stm32f4discovery/src/stm32_qencoder.c |   2 +-
 configs/stm32f4discovery/src/stm32_sdio.c     |   8 +-
 configs/stm32f4discovery/src/stm32_spi.c      |   6 +-
 configs/stm32f4discovery/src/stm32_ssd1289.c  |   6 +-
 configs/stm32f4discovery/src/stm32_ssd1351.c  |   6 +-
 .../src/stm32_ug2864ambag01.c                 |   6 +-
 .../src/stm32_ug2864hsweg01.c                 |   6 +-
 configs/stm32f4discovery/src/stm32_usb.c      |  10 +-
 configs/stm32f4discovery/src/stm32_userleds.c |   4 +-
 .../stm32f4discovery/src/stm32_zerocross.c    |   2 +-
 configs/stm32f746g-disco/src/stm32_autoleds.c |   4 +-
 configs/stm32f746g-disco/src/stm32_spi.c      |   6 +-
 configs/stm32f746g-disco/src/stm32_userleds.c |   4 +-
 .../stm32l476vg-disco/src/stm32_autoleds.c    |   4 +-
 configs/stm32l476vg-disco/src/stm32_spi.c     |   6 +-
 .../stm32l476vg-disco/src/stm32_userleds.c    |   4 +-
 configs/stm32ldiscovery/src/stm32_autoleds.c  |   4 +-
 configs/stm32ldiscovery/src/stm32_lcd.c       |  60 ++--
 configs/stm32ldiscovery/src/stm32_qencoder.c  |   2 +-
 configs/stm32ldiscovery/src/stm32_spi.c       |   6 +-
 configs/stm32ldiscovery/src/stm32_userleds.c  |   4 +-
 configs/stm32vldiscovery/src/stm32_leds.c     |   4 +-
 configs/sure-pic32mx/src/pic32mx_autoleds.c   |   6 +-
 configs/sure-pic32mx/src/pic32mx_lcd1602.c    |  28 +-
 configs/sure-pic32mx/src/pic32mx_spi.c        |  10 +-
 configs/teensy-2.0/src/at90usb_leds.c         |   6 +-
 configs/teensy-2.0/src/at90usb_spi.c          |   6 +-
 configs/teensy-3.x/src/k20_spi.c              |   6 +-
 configs/teensy-lc/src/kl_led.c                |   6 +-
 configs/teensy-lc/src/kl_spi.c                |  10 +-
 .../tm4c123g-launchpad/src/tm4c_autoleds.c    |   4 +-
 configs/tm4c123g-launchpad/src/tm4c_ssi.c     |   4 +-
 configs/tm4c1294-launchpad/src/tm4c_timer.c   |   2 +-
 .../tm4c1294-launchpad/src/tm4c_userleds.c    |   4 +-
 configs/twr-k60n512/src/k60_leds.c            |   4 +-
 configs/twr-k60n512/src/k60_spi.c             |   6 +-
 configs/u-blox-c027/src/lpc17_leds.c          |   6 +-
 configs/u-blox-c027/src/lpc17_ssp.c           |   6 +-
 configs/u-blox-c027/src/lpc17_ubxmdm.c        |   8 +-
 configs/ubw32/src/pic32_leds.c                |   6 +-
 configs/us7032evb1/shterm/shterm.c            |   2 +-
 configs/viewtool-stm32f107/src/stm32_can.c    |   8 +-
 configs/viewtool-stm32f107/src/stm32_leds.c   |   4 +-
 configs/viewtool-stm32f107/src/stm32_mmcsd.c  |   4 +-
 configs/viewtool-stm32f107/src/stm32_spi.c    |   6 +-
 .../viewtool-stm32f107/src/stm32_ssd1289.c    |   6 +-
 .../src/stm32_touchscreen.c                   |   6 +-
 configs/zkit-arm-1769/src/lpc17_can.c         |   8 +-
 configs/zkit-arm-1769/src/lpc17_lcd.c         |   8 +-
 configs/zkit-arm-1769/src/lpc17_leds.c        |   6 +-
 configs/zkit-arm-1769/src/lpc17_spi.c         |   6 +-
 configs/zkit-arm-1769/src/lpc17_ssp.c         |   6 +-
 configs/zp214xpa/src/lpc2148_spi1.c           |  10 +-
 configs/zp214xpa/src/lpc2148_ug2864ambag01.c  |  10 +-
 crypto/crypto.c                               |   2 +-
 drivers/analog/adc.c                          |   4 +-
 drivers/analog/pga11x.c                       |  46 +--
 drivers/audio/audio_null.c                    |  64 ++--
 drivers/audio/i2schar.c                       |  22 +-
 drivers/audio/vs1053.c                        |  14 +-
 drivers/audio/wm8904.c                        |  80 ++---
 drivers/can.c                                 |  30 +-
 drivers/eeprom/spi_xx25xx.c                   |   2 +-
 drivers/i2c/i2c_driver.c                      |   6 +-
 drivers/input/ads7843e.c                      |  38 +-
 drivers/input/ajoystick.c                     |  28 +-
 drivers/input/button_lower.c                  |   4 +-
 drivers/input/button_upper.c                  |  28 +-
 drivers/input/djoystick.c                     |  28 +-
 drivers/input/max11802.c                      |  48 +--
 drivers/input/mxt.c                           |  26 +-
 drivers/input/stmpe811_base.c                 |   2 +-
 drivers/input/stmpe811_tsc.c                  |  12 +-
 drivers/input/tsc2007.c                       |  14 +-
 drivers/lcd/ili9341.c                         |  22 +-
 drivers/lcd/memlcd.c                          |  12 +-
 drivers/lcd/mio283qt2.c                       |  22 +-
 drivers/lcd/mio283qt9a.c                      |  40 +--
 drivers/lcd/nokia6100.c                       |  20 +-
 drivers/lcd/p14201.c                          |  16 +-
 drivers/lcd/pcf8574_lcd_backpack.c            |  22 +-
 drivers/lcd/ra8875.c                          |  34 +-
 drivers/lcd/skeleton.c                        |  20 +-
 drivers/lcd/ssd1289.c                         |  18 +-
 drivers/lcd/ssd1306.h                         |   4 +-
 drivers/lcd/ssd1306_base.c                    |  18 +-
 drivers/lcd/ssd1306_spi.c                     |   2 +-
 drivers/lcd/ssd1351.c                         |   8 +-
 drivers/lcd/st7565.c                          |  18 +-
 drivers/lcd/st7567.c                          |  18 +-
 drivers/lcd/ug-2864ambag01.c                  |  22 +-
 drivers/lcd/ug-9664hswag01.c                  |  18 +-
 drivers/leds/rgbled.c                         |  14 +-
 drivers/leds/userled_lower.c                  |   2 +-
 drivers/leds/userled_upper.c                  |  26 +-
 drivers/mmcsd/mmcsd.h                         |   2 +-
 drivers/mmcsd/mmcsd_debug.c                   |  80 ++---
 drivers/mmcsd/mmcsd_sdio.c                    | 150 ++++----
 drivers/mmcsd/mmcsd_spi.c                     |  82 ++---
 drivers/modem/u-blox.c                        |  14 +-
 drivers/mtd/at24xx.c                          |  22 +-
 drivers/mtd/at25.c                            |  40 +--
 drivers/mtd/at45db.c                          |  32 +-
 drivers/mtd/ftl.c                             |  22 +-
 drivers/mtd/hamming.c                         |   6 +-
 drivers/mtd/is25xp.c                          |  46 +--
 drivers/mtd/m25px.c                           |  46 +--
 drivers/mtd/mtd_nand.c                        |  32 +-
 drivers/mtd/mtd_nandecc.c                     |   4 +-
 drivers/mtd/mtd_nandmodel.c                   |  16 +-
 drivers/mtd/mtd_onfi.c                        |  24 +-
 drivers/mtd/mtd_partition.c                   |   6 +-
 drivers/mtd/mtd_procfs.c                      |   6 +-
 drivers/mtd/mtd_rwbuffer.c                    |  12 +-
 drivers/mtd/n25qxxx.c                         |  42 +--
 drivers/mtd/ramtron.c                         |  40 +--
 drivers/mtd/s25fl1.c                          |  42 +--
 drivers/mtd/sector512.c                       |  26 +-
 drivers/mtd/smart.c                           |  50 +--
 drivers/mtd/sst25.c                           |  44 +--
 drivers/mtd/sst25xx.c                         |  46 +--
 drivers/mtd/sst26.c                           |  54 +--
 drivers/mtd/sst39vf.c                         |   4 +-
 drivers/mtd/w25.c                             |  46 +--
 drivers/net/cs89x0.c                          |   8 +-
 drivers/net/dm90x0.c                          |  30 +-
 drivers/net/e1000.c                           |   4 +-
 drivers/net/enc28j60.c                        |  22 +-
 drivers/net/encx24j600.c                      |  30 +-
 drivers/net/ftmac100.c                        |  50 +--
 drivers/net/loopback.c                        |   4 +-
 drivers/net/phy_notify.c                      |   4 +-
 drivers/net/skeleton.c                        |   6 +-
 drivers/net/slip.c                            |  16 +-
 drivers/net/telnet.c                          |  14 +-
 drivers/net/tun.c                             |   4 +-
 drivers/net/vnet.c                            |   4 +-
 drivers/pipes/pipe_common.c                   |   2 +-
 drivers/pwm.c                                 |  38 +-
 drivers/ramdisk.c                             |  26 +-
 drivers/rwbuffer.c                            |  26 +-
 drivers/sensors/adxl345_base.c                |   6 +-
 drivers/sensors/bmp180.c                      |  12 +-
 drivers/sensors/lsm9ds1.c                     |   4 +-
 drivers/sensors/qencoder.c                    |  14 +-
 drivers/sensors/zerocross.c                   |  16 +-
 drivers/serial/serial.c                       |   2 +-
 drivers/serial/uart_16550.c                   |   4 +-
 drivers/spi/spi_bitbang.c                     |  20 +-
 drivers/timers/ds3231.c                       |   8 +-
 drivers/timers/pcf85263.c                     |   8 +-
 drivers/timers/timer.c                        |  20 +-
 drivers/timers/watchdog.c                     |  20 +-
 drivers/usbdev/cdcacm.c                       |   8 +-
 drivers/usbdev/composite.c                    |   2 +-
 drivers/usbdev/pl2303.c                       |   6 +-
 drivers/usbdev/usbmsc.c                       |   8 +-
 drivers/usbdev/usbmsc_scsi.c                  |   6 +-
 drivers/usbhost/usbhost_cdcacm.c              |  40 +--
 drivers/usbhost/usbhost_enumerate.c           |  16 +-
 drivers/usbhost/usbhost_findclass.c           |   6 +-
 drivers/usbhost/usbhost_hidkbd.c              |  58 ++--
 drivers/usbhost/usbhost_hidmouse.c            |  64 ++--
 drivers/usbhost/usbhost_hub.c                 |  66 ++--
 drivers/usbhost/usbhost_registerclass.c       |   2 +-
 drivers/usbhost/usbhost_skeleton.c            |  24 +-
 drivers/usbhost/usbhost_storage.c             |  80 ++---
 drivers/video/ov2640.c                        |   2 +-
 drivers/wireless/cc3000/cc3000.c              |  44 +--
 drivers/wireless/cc3000/cc3000drv.c           |   8 +-
 drivers/wireless/cc3000/evnt_handler.c        |  22 +-
 drivers/wireless/cc3000/hci.c                 |   4 +-
 drivers/wireless/cc3000/wlan.c                |   2 +-
 drivers/wireless/nrf24l01.c                   |  18 +-
 fs/binfs/fs_binfs.c                           |  26 +-
 fs/fat/fs_configfat.c                         |  10 +-
 fs/fat/fs_fat32.c                             |   2 +-
 fs/fat/fs_fat32util.c                         |  10 +-
 fs/mount/fs_automount.c                       |  16 +-
 fs/nfs/nfs_util.c                             |   2 +-
 fs/nfs/nfs_vfsops.c                           |  34 +-
 fs/nfs/rpc_clnt.c                             |  10 +-
 fs/nxffs/nxffs_cache.c                        |   2 +-
 fs/nxffs/nxffs_dirent.c                       |   6 +-
 fs/nxffs/nxffs_initialize.c                   |  14 +-
 fs/nxffs/nxffs_inode.c                        |   6 +-
 fs/nxffs/nxffs_ioctl.c                        |   6 +-
 fs/nxffs/nxffs_open.c                         |  12 +-
 fs/nxffs/nxffs_read.c                         |   6 +-
 fs/nxffs/nxffs_stat.c                         |   4 +-
 fs/nxffs/nxffs_unlink.c                       |   2 +-
 fs/nxffs/nxffs_write.c                        |   2 +-
 fs/procfs/fs_procfs.c                         |  14 +-
 fs/procfs/fs_procfscpuload.c                  |   6 +-
 fs/procfs/fs_procfskmm.c                      |   6 +-
 fs/procfs/fs_procfsproc.c                     |  10 +-
 fs/procfs/fs_procfsuptime.c                   |   6 +-
 fs/procfs/fs_skeleton.c                       |  10 +-
 fs/romfs/fs_romfs.c                           |  38 +-
 fs/romfs/fs_romfsutil.c                       |   6 +-
 fs/smartfs/smartfs_procfs.c                   |  10 +-
 fs/smartfs/smartfs_smart.c                    |   4 +-
 fs/tmpfs/fs_tmpfs.c                           |  40 +--
 fs/unionfs/fs_unionfs.c                       |  38 +-
 fs/vfs/fs_epoll.c                             |   4 +-
 graphics/nxbe/nxbe_getrectangle.c             |   2 +-
 graphics/nxmu/nx_start.c                      |   4 +-
 graphics/nxmu/nxmu_server.c                   |   4 +-
 graphics/nxsu/nx_open.c                       |   2 +-
 graphics/nxterm/nxterm_kbdin.c                |   2 +-
 graphics/nxterm/nxterm_redraw.c               |   2 +-
 graphics/vnc/server/vnc_fbdev.c               |  28 +-
 graphics/vnc/server/vnc_negotiate.c           |  32 +-
 graphics/vnc/server/vnc_raw.c                 |   2 +-
 graphics/vnc/server/vnc_receiver.c            |  14 +-
 graphics/vnc/server/vnc_rre.c                 |   2 +-
 graphics/vnc/server/vnc_server.c              |  12 +-
 graphics/vnc/server/vnc_server.h              |  16 +-
 graphics/vnc/server/vnc_updater.c             |  12 +-
 include/debug.h                               | 326 +++++++++---------
 include/nuttx/mm/shm.h                        |   8 +-
 include/nuttx/spi/spi_bitbang.c               |   8 +-
 include/nuttx/spi/spi_bitbang.h               |   6 +-
 include/nuttx/wireless/nrf24l01.h             |   8 +-
 libc/audio/lib_buffer.c                       |   2 +-
 libc/libc.csv                                 |   4 +-
 libc/misc/lib_dbg.c                           |   6 +-
 libc/misc/lib_slcddecode.c                    |   4 +-
 libc/netdb/lib_dnsaddserver.c                 |   6 +-
 libc/netdb/lib_dnsforeach.c                   |   2 +-
 libc/netdb/lib_dnsquery.c                     |  16 +-
 libc/netdb/lib_gethostbyaddrr.c               |   2 +-
 libc/netdb/lib_gethostbynamer.c               |   2 +-
 libc/stdio/lib_sscanf.c                       |  28 +-
 libnx/nxglib/nxglib_splitline.c               |  22 +-
 libnx/nxmu/nx_eventhandler.c                  |   2 +-
 libnx/nxmu/nx_getrectangle.c                  |   2 +-
 libnx/nxtk/nxtk_events.c                      |   8 +-
 libnx/nxtk/nxtk_gettoolbar.c                  |   2 +-
 libnx/nxtk/nxtk_getwindow.c                   |   2 +-
 mm/mm_gran/mm_gran.h                          |   8 +-
 mm/mm_gran/mm_pgalloc.c                       |   8 +-
 mm/mm_heap/mm_free.c                          |   2 +-
 mm/mm_heap/mm_mallinfo.c                      |   4 +-
 mm/mm_heap/mm_malloc.c                        |   2 +-
 net/arp/arp_arpin.c                           |   4 +-
 net/arp/arp_out.c                             |   2 +-
 net/arp/arp_send.c                            |   2 +-
 net/devif/devif_callback.c                    |   4 +-
 net/icmp/icmp_input.c                         |   2 +-
 net/icmp/icmp_ping.c                          |  12 +-
 net/icmp/icmp_send.c                          |   2 +-
 net/icmpv6/icmpv6_advertise.c                 |   2 +-
 net/icmpv6/icmpv6_autoconfig.c                |   8 +-
 net/icmpv6/icmpv6_input.c                     |   2 +-
 net/icmpv6/icmpv6_neighbor.c                  |   2 +-
 net/icmpv6/icmpv6_ping.c                      |  14 +-
 net/icmpv6/icmpv6_radvertise.c                |   2 +-
 net/icmpv6/icmpv6_rnotify.c                   |  18 +-
 net/icmpv6/icmpv6_rsolicit.c                  |   2 +-
 net/icmpv6/icmpv6_solicit.c                   |   2 +-
 net/igmp/igmp_group.c                         |  18 +-
 net/igmp/igmp_initialize.c                    |   4 +-
 net/igmp/igmp_input.c                         |  10 +-
 net/igmp/igmp_join.c                          |   2 +-
 net/igmp/igmp_leave.c                         |   2 +-
 net/igmp/igmp_mcastmac.c                      |   6 +-
 net/igmp/igmp_poll.c                          |   8 +-
 net/igmp/igmp_send.c                          |   4 +-
 net/igmp/igmp_timer.c                         |  18 +-
 net/iob/iob_copyin.c                          |   8 +-
 net/iob/iob_free.c                            |   4 +-
 net/iob/iob_trimhead.c                        |   6 +-
 net/iob/iob_trimtail.c                        |   2 +-
 net/local/local_recvutils.c                   |   2 +-
 net/local/local_sendpacket.c                  |   2 +-
 net/neighbor/neighbor_add.c                   |   4 +-
 net/neighbor/neighbor_findentry.c             |   6 +-
 net/neighbor/neighbor_lookup.c                |   2 +-
 net/neighbor/neighbor_out.c                   |   4 +-
 net/netdev/netdev_ioctl.c                     |   4 +-
 net/pkt/pkt_callback.c                        |   2 +-
 net/pkt/pkt_send.c                            |   2 +-
 net/procfs/net_procfs.c                       |  12 +-
 net/socket/connect.c                          |   4 +-
 net/socket/net_checksd.c                      |   2 +-
 net/socket/net_close.c                        |   4 +-
 net/socket/net_monitor.c                      |   2 +-
 net/socket/net_sendfile.c                     |  10 +-
 net/socket/net_vfcntl.c                       |   2 +-
 net/socket/recvfrom.c                         |  26 +-
 net/tcp/tcp_accept.c                          |   2 +-
 net/tcp/tcp_appsend.c                         |  10 +-
 net/tcp/tcp_backlog.c                         |  10 +-
 net/tcp/tcp_callback.c                        |   8 +-
 net/tcp/tcp_conn.c                            |   2 +-
 net/tcp/tcp_input.c                           |  22 +-
 net/tcp/tcp_netpoll.c                         |   2 +-
 net/tcp/tcp_send.c                            |   6 +-
 net/tcp/tcp_send_buffered.c                   |  38 +-
 net/tcp/tcp_send_unbuffered.c                 |  10 +-
 net/tcp/tcp_timer.c                           |   8 +-
 net/udp/udp_callback.c                        |   8 +-
 net/udp/udp_netpoll.c                         |   2 +-
 net/udp/udp_psock_sendto.c                    |   2 +-
 net/udp/udp_send.c                            |   4 +-
 sched/init/os_bringup.c                       |   6 +-
 sched/module/mod_init.c                       |   4 +-
 sched/module/mod_insmod.c                     |   4 +-
 sched/module/mod_load.c                       |   6 +-
 sched/module/mod_procfs.c                     |   6 +-
 sched/module/mod_read.c                       |   2 +-
 sched/module/mod_sections.c                   |   2 +-
 sched/module/mod_symbols.c                    |   6 +-
 sched/module/mod_verify.c                     |   2 +-
 sched/paging/pg_miss.c                        |   2 +-
 sched/paging/pg_worker.c                      |  28 +-
 sched/pthread/pthread_completejoin.c          |   4 +-
 sched/task/task_posixspawn.c                  |   2 +-
 sched/task/task_spawn.c                       |   2 +-
 sched/task/task_spawnparms.c                  |  14 +-
 sched/task/task_vfork.c                       |   6 +-
 sched/wqueue/kwork_hpthread.c                 |   2 +-
 sched/wqueue/kwork_lpthread.c                 |   2 +-
 845 files changed, 5817 insertions(+), 5817 deletions(-)

diff --git a/arch/arm/src/a1x/a1x_serial.c b/arch/arm/src/a1x/a1x_serial.c
index b6e536fdc6..00c484bab9 100644
--- a/arch/arm/src/a1x/a1x_serial.c
+++ b/arch/arm/src/a1x/a1x_serial.c
@@ -1156,7 +1156,7 @@ static int uart_interrupt(struct uart_dev_s *dev)
               /* Read the modem status register (MSR) to clear */
 
               status = up_serialin(priv, A1X_UART_MSR_OFFSET);
-              vdbg("MSR: %02x\n", status);
+              info("MSR: %02x\n", status);
               break;
             }
 
@@ -1167,7 +1167,7 @@ static int uart_interrupt(struct uart_dev_s *dev)
               /* Read the line status register (LSR) to clear */
 
               status = up_serialin(priv, A1X_UART_LSR_OFFSET);
-              vdbg("LSR: %02x\n", status);
+              info("LSR: %02x\n", status);
               break;
             }
 
diff --git a/arch/arm/src/arm/up_dataabort.c b/arch/arm/src/arm/up_dataabort.c
index c6586832cf..676928c7cd 100644
--- a/arch/arm/src/arm/up_dataabort.c
+++ b/arch/arm/src/arm/up_dataabort.c
@@ -142,7 +142,7 @@ void up_dataabort(uint32_t *regs, uint32_t far, uint32_t fsr)
    * (It has not yet been saved in the register context save area).
    */
 
-  pgllvdbg("VBASE: %08x VEND: %08x\n", PG_PAGED_VBASE, PG_PAGED_VEND);
+  pgllinfo("VBASE: %08x VEND: %08x\n", PG_PAGED_VBASE, PG_PAGED_VEND);
   if (far < PG_PAGED_VBASE || far >= PG_PAGED_VEND)
     {
       goto segfault;
diff --git a/arch/arm/src/arm/up_elf.c b/arch/arm/src/arm/up_elf.c
index 07eba7341d..bb6a09d7cc 100644
--- a/arch/arm/src/arm/up_elf.c
+++ b/arch/arm/src/arm/up_elf.c
@@ -172,7 +172,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
     case R_ARM_CALL:
     case R_ARM_JUMP24:
       {
-        bvdbg("Performing PC24 [%d] link at addr %08lx [%08lx] to sym '%s' st_value=%08lx\n",
+        binfo("Performing PC24 [%d] link at addr %08lx [%08lx] to sym '%s' st_value=%08lx\n",
               ELF32_R_TYPE(rel->r_info), (long)addr, (long)(*(uint32_t *)addr),
               sym, (long)sym->st_value);
 
@@ -201,7 +201,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
     case R_ARM_ABS32:
     case R_ARM_TARGET1:  /* New ABI:  TARGET1 always treated as ABS32 */
       {
-        bvdbg("Performing ABS32 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n",
+        binfo("Performing ABS32 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n",
               (long)addr, (long)(*(uint32_t *)addr), sym, (long)sym->st_value);
 
         *(uint32_t *)addr += sym->st_value;
@@ -210,7 +210,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
 
     case R_ARM_V4BX:
       {
-        bvdbg("Performing V4BX link at addr=%08lx [%08lx]\n",
+        binfo("Performing V4BX link at addr=%08lx [%08lx]\n",
               (long)addr, (long)(*(uint32_t *)addr));
 
          /* Preserve only Rm and the condition code */
@@ -225,7 +225,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
 
     case R_ARM_PREL31:
       {
-        bvdbg("Performing PREL31 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n",
+        binfo("Performing PREL31 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n",
               (long)addr, (long)(*(uint32_t *)addr), sym, (long)sym->st_value);
 
         offset            = *(uint32_t *)addr + sym->st_value - addr;
@@ -236,7 +236,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
     case R_ARM_MOVW_ABS_NC:
     case R_ARM_MOVT_ABS:
       {
-        bvdbg("Performing MOVx_ABS [%d] link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n",
+        binfo("Performing MOVx_ABS [%d] link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n",
               ELF32_R_TYPE(rel->r_info), (long)addr, (long)(*(uint32_t *)addr),
               sym, (long)sym->st_value);
 
diff --git a/arch/arm/src/armv6-m/up_elf.c b/arch/arm/src/armv6-m/up_elf.c
index dbe002cbb1..6e101ffe60 100644
--- a/arch/arm/src/armv6-m/up_elf.c
+++ b/arch/arm/src/armv6-m/up_elf.c
@@ -168,7 +168,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
     case R_ARM_CALL:
     case R_ARM_JUMP24:
       {
-        bvdbg("Performing PC24 [%d] link at addr %08lx [%08lx] to sym '%s' st_value=%08lx\n",
+        binfo("Performing PC24 [%d] link at addr %08lx [%08lx] to sym '%s' st_value=%08lx\n",
               ELF32_R_TYPE(rel->r_info), (long)addr, (long)(*(uint32_t *)addr),
               sym, (long)sym->st_value);
 
@@ -197,7 +197,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
     case R_ARM_ABS32:
     case R_ARM_TARGET1:  /* New ABI:  TARGET1 always treated as ABS32 */
       {
-        bvdbg("Performing ABS32 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n",
+        binfo("Performing ABS32 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n",
               (long)addr, (long)(*(uint32_t *)addr), sym, (long)sym->st_value);
 
         *(uint32_t *)addr += sym->st_value;
@@ -245,7 +245,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
         upper_insn = (uint32_t)(*(uint16_t *)addr);
         lower_insn = (uint32_t)(*(uint16_t *)(addr + 2));
 
-        bvdbg("Performing THM_JUMP24 [%d] link at addr=%08lx [%04x %04x] to sym=%p st_value=%08lx\n",
+        binfo("Performing THM_JUMP24 [%d] link at addr=%08lx [%04x %04x] to sym=%p st_value=%08lx\n",
               ELF32_R_TYPE(rel->r_info), (long)addr, (int)upper_insn, (int)lower_insn,
               sym, (long)sym->st_value);
 
@@ -279,7 +279,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
 
         /* And perform the relocation */
 
-        bvdbg("  S=%d J1=%d J2=%d offset=%08lx branch target=%08lx\n",
+        binfo("  S=%d J1=%d J2=%d offset=%08lx branch target=%08lx\n",
               S, J1, J2, (long)offset, offset + sym->st_value - addr);
 
         offset += sym->st_value - addr;
@@ -320,14 +320,14 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
         lower_insn = ((lower_insn & 0xd000) | (J1 << 13) | (J2 << 11) | ((offset >> 1) & 0x07ff));
         *(uint16_t *)(addr + 2) = (uint16_t)lower_insn;
 
-        bvdbg("  S=%d J1=%d J2=%d insn [%04x %04x]\n",
+        binfo("  S=%d J1=%d J2=%d insn [%04x %04x]\n",
               S, J1, J2, (int)upper_insn, (int)lower_insn);
       }
       break;
 
     case R_ARM_V4BX:
       {
-        bvdbg("Performing V4BX link at addr=%08lx [%08lx]\n",
+        binfo("Performing V4BX link at addr=%08lx [%08lx]\n",
               (long)addr, (long)(*(uint32_t *)addr));
 
          /* Preserve only Rm and the condition code */
@@ -342,7 +342,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
 
     case R_ARM_PREL31:
       {
-        bvdbg("Performing PREL31 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n",
+        binfo("Performing PREL31 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n",
               (long)addr, (long)(*(uint32_t *)addr), sym, (long)sym->st_value);
 
         offset            = *(uint32_t *)addr + sym->st_value - addr;
@@ -353,7 +353,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
     case R_ARM_MOVW_ABS_NC:
     case R_ARM_MOVT_ABS:
       {
-        bvdbg("Performing MOVx_ABS [%d] link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n",
+        binfo("Performing MOVx_ABS [%d] link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n",
               ELF32_R_TYPE(rel->r_info), (long)addr, (long)(*(uint32_t *)addr),
               sym, (long)sym->st_value);
 
@@ -408,7 +408,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
         upper_insn = (uint32_t)(*(uint16_t *)addr);
         lower_insn = (uint32_t)(*(uint16_t *)(addr + 2));
 
-        bvdbg("Performing THM_MOVx [%d] link at addr=%08lx [%04x %04x] to sym=%p st_value=%08lx\n",
+        binfo("Performing THM_MOVx [%d] link at addr=%08lx [%04x %04x] to sym=%p st_value=%08lx\n",
               ELF32_R_TYPE(rel->r_info), (long)addr, (int)upper_insn, (int)lower_insn,
               sym, (long)sym->st_value);
 
@@ -425,7 +425,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
 
         /* And perform the relocation */
 
-        bvdbg("  offset=%08lx branch target=%08lx\n",
+        binfo("  offset=%08lx branch target=%08lx\n",
               (long)offset, offset + sym->st_value);
 
         offset += sym->st_value;
@@ -445,7 +445,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
         lower_insn = ((lower_insn & 0x8f00) | ((offset & 0x0700) << 4) | (offset & 0x00ff));
         *(uint16_t *)(addr + 2) = (uint16_t)lower_insn;
 
-        bvdbg("  insn [%04x %04x]\n",
+        binfo("  insn [%04x %04x]\n",
              (int)upper_insn, (int)lower_insn);
       }
       break;
diff --git a/arch/arm/src/armv7-a/arm_addrenv.c b/arch/arm/src/armv7-a/arm_addrenv.c
index 2bd1f886ce..92ab46cabd 100644
--- a/arch/arm/src/armv7-a/arm_addrenv.c
+++ b/arch/arm/src/armv7-a/arm_addrenv.c
@@ -257,7 +257,7 @@ int up_addrenv_create(size_t textsize, size_t datasize, size_t heapsize,
 {
   int ret;
 
-  bvdbg("addrenv=%p textsize=%lu datasize=%lu\n",
+  binfo("addrenv=%p textsize=%lu datasize=%lu\n",
         addrenv, (unsigned long)textsize, (unsigned long)datasize);
 
   DEBUGASSERT(addrenv);
@@ -353,7 +353,7 @@ errout:
 
 int up_addrenv_destroy(FAR group_addrenv_t *addrenv)
 {
-  bvdbg("addrenv=%p\n", addrenv);
+  binfo("addrenv=%p\n", addrenv);
   DEBUGASSERT(addrenv);
 
   /* Destroy the .text region */
@@ -405,7 +405,7 @@ int up_addrenv_destroy(FAR group_addrenv_t *addrenv)
 
 int up_addrenv_vtext(FAR group_addrenv_t *addrenv, FAR void **vtext)
 {
-  bvdbg("return=%p\n", (FAR void *)CONFIG_ARCH_TEXT_VBASE);
+  binfo("return=%p\n", (FAR void *)CONFIG_ARCH_TEXT_VBASE);
 
   /* Not much to do in this case */
 
@@ -439,7 +439,7 @@ int up_addrenv_vtext(FAR group_addrenv_t *addrenv, FAR void **vtext)
 int up_addrenv_vdata(FAR group_addrenv_t *addrenv, uintptr_t textsize,
                      FAR void **vdata)
 {
-  bvdbg("return=%p\n",
+  binfo("return=%p\n",
         (FAR void *)(CONFIG_ARCH_DATA_VBASE + ARCH_DATA_RESERVE_SIZE));
 
   /* Not much to do in this case */
@@ -636,7 +636,7 @@ int up_addrenv_restore(FAR const save_addrenv_t *oldenv)
   uintptr_t vaddr;
   int i;
 
-  bvdbg("oldenv=%p\n", oldenv);
+  binfo("oldenv=%p\n", oldenv);
   DEBUGASSERT(oldenv);
 
   for (vaddr = CONFIG_ARCH_TEXT_VBASE, i = 0;
@@ -752,7 +752,7 @@ int up_addrenv_coherent(FAR const group_addrenv_t *addrenv)
 int up_addrenv_clone(FAR const group_addrenv_t *src,
                      FAR group_addrenv_t *dest)
 {
-  bvdbg("src=%p dest=%p\n", src, dest);
+  binfo("src=%p dest=%p\n", src, dest);
   DEBUGASSERT(src && dest);
 
   /* Just copy the address environment from the source to the destination */
@@ -784,7 +784,7 @@ int up_addrenv_clone(FAR const group_addrenv_t *src,
 
 int up_addrenv_attach(FAR struct task_group_s *group, FAR struct tcb_s *tcb)
 {
-  bvdbg("group=%p tcb=%p\n", group, tcb);
+  binfo("group=%p tcb=%p\n", group, tcb);
 
   /* Nothing needs to be done in this implementation */
 
@@ -817,7 +817,7 @@ int up_addrenv_attach(FAR struct task_group_s *group, FAR struct tcb_s *tcb)
 
 int up_addrenv_detach(FAR struct task_group_s *group, FAR struct tcb_s *tcb)
 {
-  bvdbg("group=%p tcb=%p\n", group, tcb);
+  binfo("group=%p tcb=%p\n", group, tcb);
 
   /* Nothing needs to be done in this implementation */
 
diff --git a/arch/arm/src/armv7-a/arm_addrenv_kstack.c b/arch/arm/src/armv7-a/arm_addrenv_kstack.c
index da2a474126..2172023d9a 100644
--- a/arch/arm/src/armv7-a/arm_addrenv_kstack.c
+++ b/arch/arm/src/armv7-a/arm_addrenv_kstack.c
@@ -144,7 +144,7 @@
 
 int up_addrenv_kstackalloc(FAR struct tcb_s *tcb)
 {
-  bvdbg("tcb=%p stacksize=%u\n", tcb, ARCH_KERNEL_STACKSIZE);
+  binfo("tcb=%p stacksize=%u\n", tcb, ARCH_KERNEL_STACKSIZE);
 
   DEBUGASSERT(tcb && tcb->xcp.kstack == 0);
 
@@ -177,7 +177,7 @@ int up_addrenv_kstackalloc(FAR struct tcb_s *tcb)
 
 int up_addrenv_kstackfree(FAR struct tcb_s *tcb)
 {
-  bvdbg("tcb=%p\n", tcb);
+  binfo("tcb=%p\n", tcb);
   DEBUGASSERT(tcb);
 
   /* Does the exiting thread have a kernel stack? */
diff --git a/arch/arm/src/armv7-a/arm_addrenv_shm.c b/arch/arm/src/armv7-a/arm_addrenv_shm.c
index 9a05b9f7b9..cc9c9440d8 100644
--- a/arch/arm/src/armv7-a/arm_addrenv_shm.c
+++ b/arch/arm/src/armv7-a/arm_addrenv_shm.c
@@ -92,7 +92,7 @@ int up_shmat(FAR uintptr_t *pages, unsigned int npages, uintptr_t vaddr)
   unsigned int nmapped;
   unsigned int shmndx;
 
-  shmvdbg("pages=%p npages=%d vaddr=%08lx\n",
+  shminfo("pages=%p npages=%d vaddr=%08lx\n",
           pages, npages, (unsigned long)vaddr);
 
   /* Sanity checks */
@@ -241,7 +241,7 @@ int up_shmdt(uintptr_t vaddr, unsigned int npages)
   unsigned int nunmapped;
   unsigned int shmndx;
 
-  shmvdbg("npages=%d vaddr=%08lx\n", npages, (unsigned long)vaddr);
+  shminfo("npages=%d vaddr=%08lx\n", npages, (unsigned long)vaddr);
 
   /* Sanity checks */
 
diff --git a/arch/arm/src/armv7-a/arm_addrenv_ustack.c b/arch/arm/src/armv7-a/arm_addrenv_ustack.c
index 206d517ef3..bf8d135564 100644
--- a/arch/arm/src/armv7-a/arm_addrenv_ustack.c
+++ b/arch/arm/src/armv7-a/arm_addrenv_ustack.c
@@ -143,7 +143,7 @@ int up_addrenv_ustackalloc(FAR struct tcb_s *tcb, size_t stacksize)
 {
   int ret;
 
-  bvdbg("tcb=%p stacksize=%lu\n", tcb, (unsigned long)stacksize);
+  binfo("tcb=%p stacksize=%lu\n", tcb, (unsigned long)stacksize);
 
   DEBUGASSERT(tcb);
 
@@ -190,7 +190,7 @@ int up_addrenv_ustackalloc(FAR struct tcb_s *tcb, size_t stacksize)
 
 int up_addrenv_ustackfree(FAR struct tcb_s *tcb)
 {
-  bvdbg("tcb=%p\n", tcb);
+  binfo("tcb=%p\n", tcb);
   DEBUGASSERT(tcb);
 
   /* Destroy the stack region */
@@ -221,7 +221,7 @@ int up_addrenv_ustackfree(FAR struct tcb_s *tcb)
 
 int up_addrenv_vustack(FAR const struct tcb_s *tcb, FAR void **vstack)
 {
-  bvdbg("Return=%p\n", (FAR void *)CONFIG_ARCH_STACK_VBASE);
+  binfo("Return=%p\n", (FAR void *)CONFIG_ARCH_STACK_VBASE);
 
   /* Not much to do in this case */
 
diff --git a/arch/arm/src/armv7-a/arm_addrenv_utils.c b/arch/arm/src/armv7-a/arm_addrenv_utils.c
index f3147918f2..afc2650a89 100644
--- a/arch/arm/src/armv7-a/arm_addrenv_utils.c
+++ b/arch/arm/src/armv7-a/arm_addrenv_utils.c
@@ -84,7 +84,7 @@ int arm_addrenv_create_region(FAR uintptr_t **list, unsigned int listlen,
   unsigned int i;
   unsigned int j;
 
-  bvdbg("listlen=%d vaddr=%08lx regionsize=%ld, mmuflags=%08x\n",
+  binfo("listlen=%d vaddr=%08lx regionsize=%ld, mmuflags=%08x\n",
         listlen, (unsigned long)vaddr, (unsigned long)regionsize,
         (unsigned int)mmuflags);
 
@@ -201,7 +201,7 @@ void arm_addrenv_destroy_region(FAR uintptr_t **list, unsigned int listlen,
   int i;
   int j;
 
-  bvdbg("listlen=%d vaddr=%08lx\n", listlen, (unsigned long)vaddr);
+  binfo("listlen=%d vaddr=%08lx\n", listlen, (unsigned long)vaddr);
 
   for (i = 0; i < listlen; vaddr += SECTION_SIZE, list++, i++)
     {
diff --git a/arch/arm/src/armv7-a/arm_cpustart.c b/arch/arm/src/armv7-a/arm_cpustart.c
index 1ec95da855..cec904e2df 100644
--- a/arch/arm/src/armv7-a/arm_cpustart.c
+++ b/arch/arm/src/armv7-a/arm_cpustart.c
@@ -106,7 +106,7 @@ int arm_start_handler(int irq, FAR void *context)
 {
   FAR struct tcb_s *tcb;
 
-  sllvdbg("CPU%d Started\n", up_cpu_index());
+  sllinfo("CPU%d Started\n", up_cpu_index());
 
   /* Reset scheduler parameters */
 
@@ -155,7 +155,7 @@ int arm_start_handler(int irq, FAR void *context)
 
 int up_cpu_start(int cpu)
 {
-  sllvdbg("Starting CPU%d\n", cpu);
+  sllinfo("Starting CPU%d\n", cpu);
 
   DEBUGASSERT(cpu >= 0 && cpu < CONFIG_SMP_NCPUS && cpu != this_cpu());
 
diff --git a/arch/arm/src/armv7-a/arm_dataabort.c b/arch/arm/src/armv7-a/arm_dataabort.c
index 38a9cbe4b5..52c6bb2f98 100644
--- a/arch/arm/src/armv7-a/arm_dataabort.c
+++ b/arch/arm/src/armv7-a/arm_dataabort.c
@@ -126,7 +126,7 @@ uint32_t *arm_dataabort(uint32_t *regs, uint32_t dfar, uint32_t dfsr)
    * (It has not yet been saved in the register context save area).
    */
 
-  pgllvdbg("VBASE: %08x VEND: %08x\n", PG_PAGED_VBASE, PG_PAGED_VEND);
+  pgllinfo("VBASE: %08x VEND: %08x\n", PG_PAGED_VBASE, PG_PAGED_VEND);
   if (dfar < PG_PAGED_VBASE || dfar >= PG_PAGED_VEND)
     {
       goto segfault;
diff --git a/arch/arm/src/armv7-a/arm_elf.c b/arch/arm/src/armv7-a/arm_elf.c
index 57898e136a..ada27e19cc 100644
--- a/arch/arm/src/armv7-a/arm_elf.c
+++ b/arch/arm/src/armv7-a/arm_elf.c
@@ -162,7 +162,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
     case R_ARM_CALL:
     case R_ARM_JUMP24:
       {
-        bvdbg("Performing PC24 [%d] link at addr %08lx [%08lx] to sym '%s' st_value=%08lx\n",
+        binfo("Performing PC24 [%d] link at addr %08lx [%08lx] to sym '%s' st_value=%08lx\n",
               ELF32_R_TYPE(rel->r_info), (long)addr, (long)(*(uint32_t *)addr),
               sym, (long)sym->st_value);
 
@@ -191,7 +191,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
     case R_ARM_ABS32:
     case R_ARM_TARGET1:  /* New ABI:  TARGET1 always treated as ABS32 */
       {
-        bvdbg("Performing ABS32 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n",
+        binfo("Performing ABS32 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n",
               (long)addr, (long)(*(uint32_t *)addr), sym, (long)sym->st_value);
 
         *(uint32_t *)addr += sym->st_value;
@@ -200,7 +200,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
 
     case R_ARM_V4BX:
       {
-        bvdbg("Performing V4BX link at addr=%08lx [%08lx]\n",
+        binfo("Performing V4BX link at addr=%08lx [%08lx]\n",
               (long)addr, (long)(*(uint32_t *)addr));
 
          /* Preserve only Rm and the condition code */
@@ -215,7 +215,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
 
     case R_ARM_PREL31:
       {
-        bvdbg("Performing PREL31 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n",
+        binfo("Performing PREL31 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n",
               (long)addr, (long)(*(uint32_t *)addr), sym, (long)sym->st_value);
 
         offset            = *(uint32_t *)addr + sym->st_value - addr;
@@ -226,7 +226,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
     case R_ARM_MOVW_ABS_NC:
     case R_ARM_MOVT_ABS:
       {
-        bvdbg("Performing MOVx_ABS [%d] link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n",
+        binfo("Performing MOVx_ABS [%d] link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n",
               ELF32_R_TYPE(rel->r_info), (long)addr, (long)(*(uint32_t *)addr),
               sym, (long)sym->st_value);
 
diff --git a/arch/arm/src/armv7-a/arm_gicv2.c b/arch/arm/src/armv7-a/arm_gicv2.c
index 990a2c66dd..3d44e61f5f 100644
--- a/arch/arm/src/armv7-a/arm_gicv2.c
+++ b/arch/arm/src/armv7-a/arm_gicv2.c
@@ -387,7 +387,7 @@ uint32_t *arm_decodeirq(uint32_t *regs)
   regval = getreg32(GIC_ICCIAR);
   irq    = (regval & GIC_ICCIAR_INTID_MASK) >> GIC_ICCIAR_INTID_SHIFT;
 
-  gicllvdbg("irq=%d\n", irq);
+  gicllinfo("irq=%d\n", irq);
 
   /* Ignore spurions IRQs.  ICCIAR will report 1023 if there is no pending
    * interrupt.
diff --git a/arch/arm/src/armv7-a/gic.h b/arch/arm/src/armv7-a/gic.h
index cc6ee48330..9bddaa06ae 100644
--- a/arch/arm/src/armv7-a/gic.h
+++ b/arch/arm/src/armv7-a/gic.h
@@ -596,13 +596,13 @@
 #ifdef CONFIG_DEBUG_IRQ
 #  define gicdbg(format, ...)    dbg(format, ##__VA_ARGS__)
 #  define giclldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
-#  define gicvdbg(format, ...)   vdbg(format, ##__VA_ARGS__)
-#  define gicllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__)
+#  define gicinfo(format, ...)   info(format, ##__VA_ARGS__)
+#  define gicllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 #  define gicdbg(x...)
 #  define giclldbg(x...)
-#  define gicvdbg(x...)
-#  define gicllvdbg(x...)
+#  define gicinfo(x...)
+#  define gicllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/arch/arm/src/armv7-m/up_elf.c b/arch/arm/src/armv7-m/up_elf.c
index bf492f1aca..e3c2a8c1d3 100644
--- a/arch/arm/src/armv7-m/up_elf.c
+++ b/arch/arm/src/armv7-m/up_elf.c
@@ -164,7 +164,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
     case R_ARM_CALL:
     case R_ARM_JUMP24:
       {
-        bvdbg("Performing PC24 [%d] link at addr %08lx [%08lx] to sym '%s' st_value=%08lx\n",
+        binfo("Performing PC24 [%d] link at addr %08lx [%08lx] to sym '%s' st_value=%08lx\n",
               ELF32_R_TYPE(rel->r_info), (long)addr, (long)(*(uint32_t *)addr),
               sym, (long)sym->st_value);
 
@@ -193,7 +193,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
     case R_ARM_ABS32:
     case R_ARM_TARGET1:  /* New ABI:  TARGET1 always treated as ABS32 */
       {
-        bvdbg("Performing ABS32 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n",
+        binfo("Performing ABS32 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n",
               (long)addr, (long)(*(uint32_t *)addr), sym, (long)sym->st_value);
 
         *(uint32_t *)addr += sym->st_value;
@@ -204,7 +204,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
     case R_ARM_TARGET2:  /* TARGET2 is a platform-specific relocation: gcc-arm-none-eabi
                           * performs a self relocation */
       {
-        bvdbg("Performing TARGET2 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n",
+        binfo("Performing TARGET2 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n",
               (long)addr, (long)(*(uint32_t *)addr), sym, (long)sym->st_value);
 
         *(uint32_t *)addr += sym->st_value - addr;
@@ -253,7 +253,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
         upper_insn = (uint32_t)(*(uint16_t *)addr);
         lower_insn = (uint32_t)(*(uint16_t *)(addr + 2));
 
-        bvdbg("Performing THM_JUMP24 [%d] link at addr=%08lx [%04x %04x] to sym=%p st_value=%08lx\n",
+        binfo("Performing THM_JUMP24 [%d] link at addr=%08lx [%04x %04x] to sym=%p st_value=%08lx\n",
               ELF32_R_TYPE(rel->r_info), (long)addr, (int)upper_insn, (int)lower_insn,
               sym, (long)sym->st_value);
 
@@ -287,7 +287,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
 
         /* And perform the relocation */
 
-        bvdbg("  S=%d J1=%d J2=%d offset=%08lx branch target=%08lx\n",
+        binfo("  S=%d J1=%d J2=%d offset=%08lx branch target=%08lx\n",
               S, J1, J2, (long)offset, offset + sym->st_value - addr);
 
         offset += sym->st_value - addr;
@@ -328,14 +328,14 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
         lower_insn = ((lower_insn & 0xd000) | (J1 << 13) | (J2 << 11) | ((offset >> 1) & 0x07ff));
         *(uint16_t *)(addr + 2) = (uint16_t)lower_insn;
 
-        bvdbg("  S=%d J1=%d J2=%d insn [%04x %04x]\n",
+        binfo("  S=%d J1=%d J2=%d insn [%04x %04x]\n",
               S, J1, J2, (int)upper_insn, (int)lower_insn);
       }
       break;
 
     case R_ARM_V4BX:
       {
-        bvdbg("Performing V4BX link at addr=%08lx [%08lx]\n",
+        binfo("Performing V4BX link at addr=%08lx [%08lx]\n",
               (long)addr, (long)(*(uint32_t *)addr));
 
          /* Preserve only Rm and the condition code */
@@ -350,7 +350,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
 
     case R_ARM_PREL31:
       {
-        bvdbg("Performing PREL31 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n",
+        binfo("Performing PREL31 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n",
               (long)addr, (long)(*(uint32_t *)addr), sym, (long)sym->st_value);
 
         offset            = *(uint32_t *)addr + sym->st_value - addr;
@@ -361,7 +361,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
     case R_ARM_MOVW_ABS_NC:
     case R_ARM_MOVT_ABS:
       {
-        bvdbg("Performing MOVx_ABS [%d] link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n",
+        binfo("Performing MOVx_ABS [%d] link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n",
               ELF32_R_TYPE(rel->r_info), (long)addr, (long)(*(uint32_t *)addr),
               sym, (long)sym->st_value);
 
@@ -416,7 +416,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
         upper_insn = (uint32_t)(*(uint16_t *)addr);
         lower_insn = (uint32_t)(*(uint16_t *)(addr + 2));
 
-        bvdbg("Performing THM_MOVx [%d] link at addr=%08lx [%04x %04x] to sym=%p st_value=%08lx\n",
+        binfo("Performing THM_MOVx [%d] link at addr=%08lx [%04x %04x] to sym=%p st_value=%08lx\n",
               ELF32_R_TYPE(rel->r_info), (long)addr, (int)upper_insn, (int)lower_insn,
               sym, (long)sym->st_value);
 
@@ -433,7 +433,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
 
         /* And perform the relocation */
 
-        bvdbg("  offset=%08lx branch target=%08lx\n",
+        binfo("  offset=%08lx branch target=%08lx\n",
               (long)offset, offset + sym->st_value);
 
         offset += sym->st_value;
@@ -455,7 +455,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
                       (offset & 0x00ff));
         *(uint16_t *)(addr + 2) = (uint16_t)lower_insn;
 
-        bvdbg("  insn [%04x %04x]\n",
+        binfo("  insn [%04x %04x]\n",
              (int)upper_insn, (int)lower_insn);
       }
       break;
diff --git a/arch/arm/src/armv7-m/up_ramvec_attach.c b/arch/arm/src/armv7-m/up_ramvec_attach.c
index 3700cdb00b..03314616b6 100644
--- a/arch/arm/src/armv7-m/up_ramvec_attach.c
+++ b/arch/arm/src/armv7-m/up_ramvec_attach.c
@@ -60,10 +60,10 @@
 
 #ifdef CONFIG_DEBUG_IRQ
 #  define intdbg    lldbg
-#  define intvdbg   llvdbg
+#  define intinfo   llinfo
 #else
 #  define intdbg(x...)
-#  define intvdbg(x...)
+#  define intinfo(x...)
 #endif
 
 /****************************************************************************
@@ -103,7 +103,7 @@ int up_ramvec_attach(int irq, up_vector_t vector)
 {
   int ret = -EINVAL;
 
-  intvdbg("%s IRQ%d\n", vector ? "Attaching" : "Detaching", irq);
+  intinfo("%s IRQ%d\n", vector ? "Attaching" : "Detaching", irq);
 
   if ((unsigned)irq < NR_VECTORS)
     {
diff --git a/arch/arm/src/armv7-m/up_ramvec_initialize.c b/arch/arm/src/armv7-m/up_ramvec_initialize.c
index 80b176d674..7cc11cfb02 100644
--- a/arch/arm/src/armv7-m/up_ramvec_initialize.c
+++ b/arch/arm/src/armv7-m/up_ramvec_initialize.c
@@ -79,10 +79,10 @@
 
 #ifdef CONFIG_DEBUG_IRQ
 #  define intdbg    lldbg
-#  define intvdbg   llvdbg
+#  define intinfo   llinfo
 #else
 #  define intdbg(x...)
-#  define intvdbg(x...)
+#  define intinfo(x...)
 #endif
 
 /****************************************************************************
@@ -147,7 +147,7 @@ void up_ramvec_initialize(void)
   src  = (const CODE up_vector_t *)getreg32(NVIC_VECTAB);
   dest = g_ram_vectors;
 
-  intvdbg("src=%p dest=%p\n", src, dest);
+  intinfo("src=%p dest=%p\n", src, dest);
 
   for (i = 0; i < ARMV7M_VECTAB_SIZE; i++)
     {
@@ -163,7 +163,7 @@ void up_ramvec_initialize(void)
    * the table alignment is insufficient.
    */
 
-  intvdbg("NVIC_VECTAB=%08x\n", getreg32(NVIC_VECTAB));
+  intinfo("NVIC_VECTAB=%08x\n", getreg32(NVIC_VECTAB));
   DEBUGASSERT(getreg32(NVIC_VECTAB) == (uint32_t)g_ram_vectors);
 }
 
diff --git a/arch/arm/src/armv7-r/arm_elf.c b/arch/arm/src/armv7-r/arm_elf.c
index 698ecd0084..71ee69450b 100644
--- a/arch/arm/src/armv7-r/arm_elf.c
+++ b/arch/arm/src/armv7-r/arm_elf.c
@@ -174,7 +174,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
     case R_ARM_CALL:
     case R_ARM_JUMP24:
       {
-        bvdbg("Performing PC24 [%d] link at addr %08lx [%08lx] to sym '%s' st_value=%08lx\n",
+        binfo("Performing PC24 [%d] link at addr %08lx [%08lx] to sym '%s' st_value=%08lx\n",
               ELF32_R_TYPE(rel->r_info), (long)addr, (long)(*(uint32_t *)addr),
               sym, (long)sym->st_value);
 
@@ -203,7 +203,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
     case R_ARM_ABS32:
     case R_ARM_TARGET1:  /* New ABI:  TARGET1 always treated as ABS32 */
       {
-        bvdbg("Performing ABS32 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n",
+        binfo("Performing ABS32 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n",
               (long)addr, (long)(*(uint32_t *)addr), sym, (long)sym->st_value);
 
         *(uint32_t *)addr += sym->st_value;
@@ -212,7 +212,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
 
     case R_ARM_V4BX:
       {
-        bvdbg("Performing V4BX link at addr=%08lx [%08lx]\n",
+        binfo("Performing V4BX link at addr=%08lx [%08lx]\n",
               (long)addr, (long)(*(uint32_t *)addr));
 
          /* Preserve only Rm and the condition code */
@@ -227,7 +227,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
 
     case R_ARM_PREL31:
       {
-        bvdbg("Performing PREL31 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n",
+        binfo("Performing PREL31 link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n",
               (long)addr, (long)(*(uint32_t *)addr), sym, (long)sym->st_value);
 
         offset            = *(uint32_t *)addr + sym->st_value - addr;
@@ -238,7 +238,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
     case R_ARM_MOVW_ABS_NC:
     case R_ARM_MOVT_ABS:
       {
-        bvdbg("Performing MOVx_ABS [%d] link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n",
+        binfo("Performing MOVx_ABS [%d] link at addr=%08lx [%08lx] to sym=%p st_value=%08lx\n",
               ELF32_R_TYPE(rel->r_info), (long)addr, (long)(*(uint32_t *)addr),
               sym, (long)sym->st_value);
 
diff --git a/arch/arm/src/c5471/c5471_ethernet.c b/arch/arm/src/c5471/c5471_ethernet.c
index 671f3fe59b..3497ded776 100644
--- a/arch/arm/src/c5471/c5471_ethernet.c
+++ b/arch/arm/src/c5471/c5471_ethernet.c
@@ -417,7 +417,7 @@ static inline void c5471_dumpbuffer(const char *msg, const uint8_t *buffer, unsi
    * defined or the following does nothing.
    */
 
-  nvdbgdumpbuffer(msg, buffer, nbytes);
+  ninfodumpbuffer(msg, buffer, nbytes);
 }
 #else
 # define c5471_dumpbuffer(msg, buffer,nbytes)
@@ -802,7 +802,7 @@ static inline void c5471_inctxcpu(struct c5471_driver_s *c5471)
       c5471->c_txcpudesc += 2*sizeof(uint32_t);
     }
 
-  nvdbg("TX CPU desc: %08x\n", c5471->c_txcpudesc);
+  ninfo("TX CPU desc: %08x\n", c5471->c_txcpudesc);
 }
 
 /****************************************************************************
@@ -825,7 +825,7 @@ static inline void c5471_incrxcpu(struct c5471_driver_s *c5471)
       c5471->c_rxcpudesc += 2*sizeof(uint32_t);
     }
 
-  nvdbg("RX CPU desc: %08x\n", c5471->c_rxcpudesc);
+  ninfo("RX CPU desc: %08x\n", c5471->c_rxcpudesc);
 }
 
 /****************************************************************************
@@ -861,7 +861,7 @@ static int c5471_transmit(struct c5471_driver_s *c5471)
   bfirstframe            = true;
   c5471->c_lastdescstart = c5471->c_rxcpudesc;
 
-  nvdbg("Packet size: %d RX CPU desc: %08x\n", nbytes, c5471->c_rxcpudesc);
+  ninfo("Packet size: %d RX CPU desc: %08x\n", nbytes, c5471->c_rxcpudesc);
   c5471_dumpbuffer("Transmit packet", dev->d_buf, dev->d_len);
 
   while (nbytes)
@@ -918,7 +918,7 @@ static int c5471_transmit(struct c5471_driver_s *c5471)
 
       putreg32(((getreg32(c5471->c_rxcpudesc) & ~EIM_RXDESC_BYTEMASK) | framelen), c5471->c_rxcpudesc);
       nbytes -= framelen;
-      nvdbg("Wrote framelen: %d nbytes: %d nshorts: %d\n", framelen, nbytes, nshorts);
+      ninfo("Wrote framelen: %d nbytes: %d nshorts: %d\n", framelen, nbytes, nshorts);
 
       if (0 == nbytes)
         {
@@ -1092,43 +1092,43 @@ static void c5471_rxstatus(struct c5471_driver_s *c5471)
       if ((rxstatus & EIM_TXDESC_RETRYERROR) != 0)
         {
           c5471->c_rxretries++;
-          nvdbg("c_rxretries: %d\n", c5471->c_rxretries);
+          ninfo("c_rxretries: %d\n", c5471->c_rxretries);
         }
 
       if ((rxstatus & EIM_TXDESC_HEARTBEAT) != 0)
         {
           c5471->c_rxheartbeat++;
-          nvdbg("c_rxheartbeat: %d\n", c5471->c_rxheartbeat);
+          ninfo("c_rxheartbeat: %d\n", c5471->c_rxheartbeat);
         }
 
       if ((rxstatus & EIM_TXDESC_LCOLLISON) != 0)
         {
           c5471->c_rxlcollision++;
-          nvdbg("c_rxlcollision: %d\n", c5471->c_rxlcollision);
+          ninfo("c_rxlcollision: %d\n", c5471->c_rxlcollision);
         }
 
       if ((rxstatus & EIM_TXDESC_COLLISION) != 0)
         {
           c5471->c_rxcollision++;
-          nvdbg("c_rxcollision: %d\n", c5471->c_rxcollision);
+          ninfo("c_rxcollision: %d\n", c5471->c_rxcollision);
         }
 
       if ((rxstatus & EIM_TXDESC_CRCERROR) != 0)
         {
           c5471->c_rxcrc++;
-          nvdbg("c_rxcrc: %d\n", c5471->c_rxcrc);
+          ninfo("c_rxcrc: %d\n", c5471->c_rxcrc);
         }
 
       if ((rxstatus & EIM_TXDESC_UNDERRUN) != 0)
         {
           c5471->c_rxunderrun++;
-          nvdbg("c_rxunderrun: %d\n", c5471->c_rxunderrun);
+          ninfo("c_rxunderrun: %d\n", c5471->c_rxunderrun);
         }
 
       if ((rxstatus & EIM_TXDESC_LOC) != 0)
         {
           c5471->c_rxloc++;
-          nvdbg("c_rxloc: %d\n", c5471->c_rxloc);
+          ninfo("c_rxloc: %d\n", c5471->c_rxloc);
         }
     }
 }
@@ -1166,7 +1166,7 @@ static void c5471_receive(struct c5471_driver_s *c5471)
    * the EIM for additional packets that might be received later from the network.
    */
 
-  nvdbg("Reading TX CPU desc: %08x\n", c5471->c_txcpudesc);
+  ninfo("Reading TX CPU desc: %08x\n", c5471->c_txcpudesc);
   while (bmore)
     {
       /* Words #0 and #1 of descriptor */
@@ -1196,7 +1196,7 @@ static void c5471_receive(struct c5471_driver_s *c5471)
           /* Divide by 2 with round up to get the number of 16-bit words. */
 
           nshorts = (framelen + 1) >> 1;
-          nvdbg("Reading framelen: %d packetlen: %d nshorts: %d packetmen: %p\n",
+          ninfo("Reading framelen: %d packetlen: %d nshorts: %d packetmen: %p\n",
                  framelen, packetlen, nshorts, packetmem);
 
           for (i = 0 ; i < nshorts; i++, j++)
@@ -1210,7 +1210,7 @@ static void c5471_receive(struct c5471_driver_s *c5471)
         }
       else
         {
-          nvdbg("Discarding framelen: %d packetlen\n", framelen, packetlen);
+          ninfo("Discarding framelen: %d packetlen\n", framelen, packetlen);
         }
 
       if (getreg32(c5471->c_txcpudesc) & EIM_TXDESC_LIF)
@@ -1253,7 +1253,7 @@ static void c5471_receive(struct c5471_driver_s *c5471)
       /* Set amount of data in c5471->c_dev.d_len. */
 
       dev->d_len = packetlen;
-      nvdbg("Received packet, packetlen: %d type: %02x\n", packetlen, ntohs(BUF->type));
+      ninfo("Received packet, packetlen: %d type: %02x\n", packetlen, ntohs(BUF->type));
       c5471_dumpbuffer("Received packet", dev->d_buf, dev->d_len);
 
 #ifdef CONFIG_NET_PKT
@@ -1267,7 +1267,7 @@ static void c5471_receive(struct c5471_driver_s *c5471)
 #ifdef CONFIG_NET_IPv4
       if (BUF->type == HTONS(ETHTYPE_IP))
         {
-          nllvdbg("IPv4 frame\n");
+          nllinfo("IPv4 frame\n");
 
           /* Handle ARP on input then give the IPv4 packet to the network
            * layer
@@ -1310,7 +1310,7 @@ static void c5471_receive(struct c5471_driver_s *c5471)
 #ifdef CONFIG_NET_IPv6
       if (BUF->type == HTONS(ETHTYPE_IP6))
         {
-          nllvdbg("Iv6 frame\n");
+          nllinfo("Iv6 frame\n");
 
           /* Give the IPv6 packet to the network layer */
 
@@ -1432,43 +1432,43 @@ static void c5471_txstatus(struct c5471_driver_s *c5471)
       if ((txstatus & EIM_RXDESC_MISS) != 0)
         {
           c5471->c_txmiss++;
-          nvdbg("c_txmiss: %d\n", c5471->c_txmiss);
+          ninfo("c_txmiss: %d\n", c5471->c_txmiss);
         }
 
       if ((txstatus & EIM_RXDESC_VLAN) != 0)
         {
           c5471->c_txvlan++;
-          nvdbg("c_txvlan: %d\n", c5471->c_txvlan);
+          ninfo("c_txvlan: %d\n", c5471->c_txvlan);
         }
 
       if ((txstatus & EIM_RXDESC_LFRAME) != 0)
         {
           c5471->c_txlframe++;
-          nvdbg("c_txlframe: %d\n", c5471->c_txlframe);
+          ninfo("c_txlframe: %d\n", c5471->c_txlframe);
         }
 
       if ((txstatus & EIM_RXDESC_SFRAME) != 0)
         {
           c5471->c_txsframe++;
-          nvdbg("c_txsframe: %d\n", c5471->c_txsframe);
+          ninfo("c_txsframe: %d\n", c5471->c_txsframe);
         }
 
       if ((txstatus & EIM_RXDESC_CRCERROR) != 0)
         {
           c5471->c_txcrc++;
-          nvdbg("c_txcrc: %d\n", c5471->c_txcrc);
+          ninfo("c_txcrc: %d\n", c5471->c_txcrc);
         }
 
       if ((txstatus & EIM_RXDESC_OVERRUN) != 0)
         {
           c5471->c_txoverrun++;
-          nvdbg("c_txoverrun: %d\n", c5471->c_txoverrun);
+          ninfo("c_txoverrun: %d\n", c5471->c_txoverrun);
         }
 
       if ((txstatus & EIM_RXDESC_OVERRUN) != 0)
         {
           c5471->c_txalign++;
-          nvdbg("c_txalign: %d\n", c5471->c_txalign);
+          ninfo("c_txalign: %d\n", c5471->c_txalign);
         }
     }
 }
@@ -1607,7 +1607,7 @@ static void c5471_txtimeout(int argc, uint32_t arg, ...)
 
 #ifdef CONFIG_C5471_NET_STATS
   c5471->c_txtimeouts++;
-  nvdbg("c_txtimeouts: %d\n", c5471->c_txtimeouts);
+  ninfo("c_txtimeouts: %d\n", c5471->c_txtimeouts);
 #endif
 
   /* Then try to restart the hardware */
diff --git a/arch/arm/src/common/up_vfork.c b/arch/arm/src/common/up_vfork.c
index b902ccba7b..1d8e8c5de1 100644
--- a/arch/arm/src/common/up_vfork.c
+++ b/arch/arm/src/common/up_vfork.c
@@ -130,12 +130,12 @@ pid_t up_vfork(const struct vfork_s *context)
   uint32_t stackutil;
   int ret;
 
-  svdbg("vfork context [%p]:\n", context);
-  svdbg("  r4:%08x r5:%08x r6:%08x r7:%08x\n",
+  sinfo("vfork context [%p]:\n", context);
+  sinfo("  r4:%08x r5:%08x r6:%08x r7:%08x\n",
         context->r4, context->r5, context->r6, context->r7);
-  svdbg("  r8:%08x r9:%08x r10:%08x\n",
+  sinfo("  r8:%08x r9:%08x r10:%08x\n",
         context->r8, context->r9, context->r10);
-  svdbg("  fp:%08x sp:%08x lr:%08x\n",
+  sinfo("  fp:%08x sp:%08x lr:%08x\n",
         context->fp, context->sp, context->lr);
 
   /* Allocate and initialize a TCB for the child task. */
@@ -147,7 +147,7 @@ pid_t up_vfork(const struct vfork_s *context)
       return (pid_t)ERROR;
     }
 
-  svdbg("TCBs: Parent=%p Child=%p\n", parent, child);
+  sinfo("TCBs: Parent=%p Child=%p\n", parent, child);
 
   /* Get the size of the parent task's stack.  Due to alignment operations,
    * the adjusted stack size may be smaller than the stack size originally
@@ -176,7 +176,7 @@ pid_t up_vfork(const struct vfork_s *context)
   DEBUGASSERT((uint32_t)parent->adj_stack_ptr > context->sp);
   stackutil = (uint32_t)parent->adj_stack_ptr - context->sp;
 
-  svdbg("Parent: stacksize:%d stackutil:%d\n", stacksize, stackutil);
+  sinfo("Parent: stacksize:%d stackutil:%d\n", stacksize, stackutil);
 
   /* Make some feeble effort to preserve the stack contents.  This is
    * feeble because the stack surely contains invalid pointers and other
@@ -201,9 +201,9 @@ pid_t up_vfork(const struct vfork_s *context)
       newfp = context->fp;
     }
 
-  svdbg("Parent: stack base:%08x SP:%08x FP:%08x\n",
+  sinfo("Parent: stack base:%08x SP:%08x FP:%08x\n",
         parent->adj_stack_ptr, context->sp, context->fp);
-  svdbg("Child:  stack base:%08x SP:%08x FP:%08x\n",
+  sinfo("Child:  stack base:%08x SP:%08x FP:%08x\n",
         child->cmn.adj_stack_ptr, newsp, newfp);
 
   /* Update the stack pointer, frame pointer, and volatile registers.  When
diff --git a/arch/arm/src/dm320/dm320_framebuffer.c b/arch/arm/src/dm320/dm320_framebuffer.c
index 8fd4ec4463..b6c6def0d5 100644
--- a/arch/arm/src/dm320/dm320_framebuffer.c
+++ b/arch/arm/src/dm320/dm320_framebuffer.c
@@ -768,15 +768,15 @@ static void dm320_disable(void)
 {
   /* Disable all planes */
 
-  gvdbg("Inactivate OSD:\n");
+  ginfo("Inactivate OSD:\n");
 
   putreg16(0, DM320_OSD_OSDWIN0MD); /* Win0 mode = 0 (1:active) */
   putreg16(0, DM320_OSD_OSDWIN1MD); /* Win1 mode = 0 (1:active) */
   putreg16(0, DM320_OSD_RECTCUR);   /* Rectangular cursor mode = 0 (1:active) */
 
-  gvdbg("DM320_OSD_OSDWIN0MD:   %04x\n", getreg16(DM320_OSD_OSDWIN0MD));
-  gvdbg("DM320_OSD_OSDWIN1MD:   %04x\n", getreg16(DM320_OSD_OSDWIN1MD));
-  gvdbg("DM320_OSD_RECTCUR:     %04x\n", getreg16(DM320_OSD_RECTCUR));
+  ginfo("DM320_OSD_OSDWIN0MD:   %04x\n", getreg16(DM320_OSD_OSDWIN0MD));
+  ginfo("DM320_OSD_OSDWIN1MD:   %04x\n", getreg16(DM320_OSD_OSDWIN1MD));
+  ginfo("DM320_OSD_RECTCUR:     %04x\n", getreg16(DM320_OSD_RECTCUR));
 }
 
 /****************************************************************************
@@ -791,17 +791,17 @@ static void dm320_hwinitialize(void)
 
   /* Initialize the main video to correct the origin */
 
-  gvdbg("Setup main video origin:\n");
+  ginfo("Setup main video origin:\n");
 
   putreg16(CONFIG_DM320_BASEX, DM320_OSD_BASEPX);
   putreg16(CONFIG_DM320_BASEY, DM320_OSD_BASEPY);
 
-  gvdbg("DM320_OSD_BASEPX:      %04x\n", getreg16(DM320_OSD_BASEPX));
-  gvdbg("DM320_OSD_BASEPY:      %04x\n", getreg16(DM320_OSD_BASEPY));
+  ginfo("DM320_OSD_BASEPX:      %04x\n", getreg16(DM320_OSD_BASEPX));
+  ginfo("DM320_OSD_BASEPY:      %04x\n", getreg16(DM320_OSD_BASEPY));
 
   /* Set up the frame buffer address registers */
 
-  gvdbg("Setup framebuffer addresses:\n");
+  ginfo("Setup framebuffer addresses:\n");
 
 
   putreg16(((dm320_osd1upperoffset() << 8) |
@@ -809,9 +809,9 @@ static void dm320_hwinitialize(void)
   putreg16(dm320_osd0loweroffset(), DM320_OSD_OSDWIN0ADL);
   putreg16(dm320_osd1loweroffset(), DM320_OSD_OSDWIN1ADL);
 
-  gvdbg("DM320_OSD_OSDWINADH:   %04x\n", getreg16(DM320_OSD_OSDWINADH));
-  gvdbg("DM320_OSD_OSDWIN0ADL:  %04x\n", getreg16(DM320_OSD_OSDWIN0ADL));
-  gvdbg("DM320_OSD_OSDWIN1ADL:  %04x\n", getreg16(DM320_OSD_OSDWIN1ADL));
+  ginfo("DM320_OSD_OSDWINADH:   %04x\n", getreg16(DM320_OSD_OSDWINADH));
+  ginfo("DM320_OSD_OSDWIN0ADL:  %04x\n", getreg16(DM320_OSD_OSDWIN0ADL));
+  ginfo("DM320_OSD_OSDWIN1ADL:  %04x\n", getreg16(DM320_OSD_OSDWIN1ADL));
 
   /* Set up VID WIN0 */
 
@@ -820,19 +820,19 @@ static void dm320_hwinitialize(void)
 #endif
 
 #ifndef CONFIG_DM320_VID0_DISABLE
-  gvdbg("Initialize video win0:\n");
+  ginfo("Initialize video win0:\n");
   putreg16(dm320_vid0loweroffset(), DM320_OSD_VIDWIN0ADL);
 
-  gvdbg("DM320_OSD_VIDWINADH:   %04x\n", getreg16(DM320_OSD_VIDWINADH));
-  gvdbg("DM320_OSD_VIDWIN0ADL:  %04x\n", getreg16(DM320_OSD_VIDWIN0ADL));
+  ginfo("DM320_OSD_VIDWINADH:   %04x\n", getreg16(DM320_OSD_VIDWINADH));
+  ginfo("DM320_OSD_VIDWIN0ADL:  %04x\n", getreg16(DM320_OSD_VIDWIN0ADL));
   dm320_blankscreen((uint8_t *)g_vid0base, DM320_VID0_FBLEN);
 
 #ifndef CONFIG_DM320_DISABLE_PINGPONG
   putreg16(dm320_vid0ppupperoffset(), DM320_OSD_PPVWIN0ADH);
   putreg16(dm320_vid0pploweroffset(), DM320_OSD_PPVWIN0ADL);
 
-  gvdbg("DM320_OSD_PPVWIN0ADH:  %04x\n", getreg16(DM320_OSD_PPVWIN0ADH));
-  gvdbg("DM320_OSD_PPVWIN0ADL:  %04x\n", getreg16(DM320_OSD_PPVWIN0ADL));
+  ginfo("DM320_OSD_PPVWIN0ADH:  %04x\n", getreg16(DM320_OSD_PPVWIN0ADH));
+  ginfo("DM320_OSD_PPVWIN0ADL:  %04x\n", getreg16(DM320_OSD_PPVWIN0ADL));
   dm320_blankscreen((uint8_t *)g_vid0ppbase, DM320_VID0_FBLEN);
 #endif
 
@@ -842,21 +842,21 @@ static void dm320_hwinitialize(void)
   putreg16(CONFIG_DM320_VID0_XRES, DM320_OSD_VIDWIN0XL);
   putreg16(CONFIG_DM320_VID0_YRES, DM320_OSD_VIDWIN0YL);
 
-  gvdbg("DM320_OSD_VIDWIN0XP:   %04x\n", getreg16(DM320_OSD_VIDWIN0XP));
-  gvdbg("DM320_OSD_VIDWIN0YP:   %04x\n", getreg16(DM320_OSD_VIDWIN0YP));
-  gvdbg("DM320_OSD_VIDWIN0OFST: %04x\n", getreg16(DM320_OSD_VIDWIN0OFST));
-  gvdbg("DM320_OSD_VIDWIN0XL:   %04x\n", getreg16(DM320_OSD_VIDWIN0XL));
-  gvdbg("DM320_OSD_VIDWIN0YL:   %04x\n", getreg16(DM320_OSD_VIDWIN0YL));
+  ginfo("DM320_OSD_VIDWIN0XP:   %04x\n", getreg16(DM320_OSD_VIDWIN0XP));
+  ginfo("DM320_OSD_VIDWIN0YP:   %04x\n", getreg16(DM320_OSD_VIDWIN0YP));
+  ginfo("DM320_OSD_VIDWIN0OFST: %04x\n", getreg16(DM320_OSD_VIDWIN0OFST));
+  ginfo("DM320_OSD_VIDWIN0XL:   %04x\n", getreg16(DM320_OSD_VIDWIN0XL));
+  ginfo("DM320_OSD_VIDWIN0YL:   %04x\n", getreg16(DM320_OSD_VIDWIN0YL));
 #endif
 
   /* Set up VID WIN1 */
 
 #ifndef CONFIG_DM320_VID1_DISABLE
-  gvdbg("Initialize video win1:\n");
+  ginfo("Initialize video win1:\n");
   putreg16(dm320_vid1loweroffset(), DM320_OSD_VIDWIN1ADL);
 
-  gvdbg("DM320_OSD_VIDWINADH:   %04x\n", getreg16(DM320_OSD_VIDWINADH));
-  gvdbg("DM320_OSD_VIDWIN1ADL:  %04x\n", getreg16(DM320_OSD_VIDWIN1ADL));
+  ginfo("DM320_OSD_VIDWINADH:   %04x\n", getreg16(DM320_OSD_VIDWINADH));
+  ginfo("DM320_OSD_VIDWIN1ADL:  %04x\n", getreg16(DM320_OSD_VIDWIN1ADL));
   dm320_blankscreen((uint8_t *)g_vid1base, DM320_VID1_FBLEN);
 
   putreg16(CONFIG_DM320_VID1_XPOS, DM320_OSD_VIDWIN1XP);
@@ -865,20 +865,20 @@ static void dm320_hwinitialize(void)
   putreg16(CONFIG_DM320_VID1_XRES, DM320_OSD_VIDWIN1XL);
   putreg16(CONFIG_DM320_VID1_YRES, DM320_OSD_VIDWIN1YL);
 
-  gvdbg("DM320_OSD_VIDWIN1XP:   %04x\n", getreg16(DM320_OSD_VIDWIN1XP));
-  gvdbg("DM320_OSD_VIDWIN1YP:   %04x\n", getreg16(DM320_OSD_VIDWIN1YP));
-  gvdbg("DM320_OSD_VIDWIN1OFST: %04x\n", getreg16(DM320_OSD_VIDWIN1OFST));
-  gvdbg("DM320_OSD_VIDWIN1XL:   %04x\n", getreg16(DM320_OSD_VIDWIN1XL));
-  gvdbg("DM320_OSD_VIDWIN1YL:   %04x\n", getreg16(DM320_OSD_VIDWIN1YL));
+  ginfo("DM320_OSD_VIDWIN1XP:   %04x\n", getreg16(DM320_OSD_VIDWIN1XP));
+  ginfo("DM320_OSD_VIDWIN1YP:   %04x\n", getreg16(DM320_OSD_VIDWIN1YP));
+  ginfo("DM320_OSD_VIDWIN1OFST: %04x\n", getreg16(DM320_OSD_VIDWIN1OFST));
+  ginfo("DM320_OSD_VIDWIN1XL:   %04x\n", getreg16(DM320_OSD_VIDWIN1XL));
+  ginfo("DM320_OSD_VIDWIN1YL:   %04x\n", getreg16(DM320_OSD_VIDWIN1YL));
 #endif
 
   putreg16(DM320_VIDMODE, DM320_OSD_VIDWINMD);
-  gvdbg("DM320_OSD_VIDWINMD:    %04x\n", getreg16(DM320_OSD_VIDWINMD));
+  ginfo("DM320_OSD_VIDWINMD:    %04x\n", getreg16(DM320_OSD_VIDWINMD));
 
   /* Set up OSD WIN0 */
 
 #ifndef CONFIG_DM320_OSD0_DISABLE
-  gvdbg("Initialize OSD win0:\n");
+  ginfo("Initialize OSD win0:\n");
   dm320_blankscreen((uint8_t *)g_osd0base, DM320_OSD0_FBLEN);
 
   putreg16(CONFIG_DM320_OSD0_XPOS, DM320_OSD_OSDWIN0XP);
@@ -892,18 +892,18 @@ static void dm320_hwinitialize(void)
   putreg16(CONFIG_DM320_OSD0_YRES, DM320_OSD_OSDWIN0YL);
   putreg16(INITIAL_OSD0MODE, DM320_OSD_OSDWIN0MD);
 
-  gvdbg("DM320_OSD_OSDWIN0XP:   %04x\n", getreg16(DM320_OSD_OSDWIN0XP));
-  gvdbg("DM320_OSD_OSDWIN0YP:   %04x\n", getreg16(DM320_OSD_OSDWIN0YP));
-  gvdbg("DM320_OSD_OSDWIN0OFST: %04x\n", getreg16(DM320_OSD_OSDWIN0OFST));
-  gvdbg("DM320_OSD_OSDWIN0XL:   %04x\n", getreg16(DM320_OSD_OSDWIN0XL));
-  gvdbg("DM320_OSD_OSDWIN0YL:   %04x\n", getreg16(DM320_OSD_OSDWIN0YL));
-  gvdbg("DM320_OSD_OSDWIN0MD:   %04x\n", getreg16(DM320_OSD_OSDWIN0MD));
+  ginfo("DM320_OSD_OSDWIN0XP:   %04x\n", getreg16(DM320_OSD_OSDWIN0XP));
+  ginfo("DM320_OSD_OSDWIN0YP:   %04x\n", getreg16(DM320_OSD_OSDWIN0YP));
+  ginfo("DM320_OSD_OSDWIN0OFST: %04x\n", getreg16(DM320_OSD_OSDWIN0OFST));
+  ginfo("DM320_OSD_OSDWIN0XL:   %04x\n", getreg16(DM320_OSD_OSDWIN0XL));
+  ginfo("DM320_OSD_OSDWIN0YL:   %04x\n", getreg16(DM320_OSD_OSDWIN0YL));
+  ginfo("DM320_OSD_OSDWIN0MD:   %04x\n", getreg16(DM320_OSD_OSDWIN0MD));
 #endif
 
   /* Set up OSD WIN1 */
 
 #ifndef CONFIG_DM320_OSD1_DISABLE
-  gvdbg("Initialize OSD win1\n");
+  ginfo("Initialize OSD win1\n");
   dm320_blankscreen((uint8_t *)g_osd1base, DM320_OSD1_FBLEN);
 
   putreg16(CONFIG_DM320_OSD1_XPOS, DM320_OSD_OSDWIN1XP);
@@ -917,12 +917,12 @@ static void dm320_hwinitialize(void)
   putreg16(CONFIG_DM320_OSD1_YRES, DM320_OSD_OSDWIN1YL);
   putreg16(INITIAL_OSD1MODE, DM320_OSD_OSDWIN1MD);
 
-  gvdbg("DM320_OSD_OSDWIN1XP:   %04x\n", getreg16(DM320_OSD_OSDWIN1XP));
-  gvdbg("DM320_OSD_OSDWIN1YP:   %04x\n", getreg16(DM320_OSD_OSDWIN1YP));
-  gvdbg("DM320_OSD_OSDWIN1OFST: %04x\n", getreg16(DM320_OSD_OSDWIN1OFST));
-  gvdbg("DM320_OSD_OSDWIN1XL:   %04x\n", getreg16(DM320_OSD_OSDWIN1XL));
-  gvdbg("DM320_OSD_OSDWIN1YL:   %04x\n", getreg16(DM320_OSD_OSDWIN1YL));
-  gvdbg("DM320_OSD_OSDWIN1MD:   %04x\n", getreg16(DM320_OSD_OSDWIN1MD));
+  ginfo("DM320_OSD_OSDWIN1XP:   %04x\n", getreg16(DM320_OSD_OSDWIN1XP));
+  ginfo("DM320_OSD_OSDWIN1YP:   %04x\n", getreg16(DM320_OSD_OSDWIN1YP));
+  ginfo("DM320_OSD_OSDWIN1OFST: %04x\n", getreg16(DM320_OSD_OSDWIN1OFST));
+  ginfo("DM320_OSD_OSDWIN1XL:   %04x\n", getreg16(DM320_OSD_OSDWIN1XL));
+  ginfo("DM320_OSD_OSDWIN1YL:   %04x\n", getreg16(DM320_OSD_OSDWIN1YL));
+  ginfo("DM320_OSD_OSDWIN1MD:   %04x\n", getreg16(DM320_OSD_OSDWIN1MD));
 #endif
 
   /* Set up the rectangular cursor with defaults */
@@ -946,11 +946,11 @@ static void dm320_hwinitialize(void)
 
   putreg16(DM320_RECTCURSOR_SETUP, DM320_OSD_RECTCUR);
 
-  gvdbg("DM320_OSD_CURXP:       %04x\n", getreg16(DM320_OSD_CURXP));
-  gvdbg("DM320_OSD_CURYP:       %04x\n", getreg16(DM320_OSD_CURYP));
-  gvdbg("DM320_OSD_CURXL:       %04x\n", getreg16(DM320_OSD_CURXL));
-  gvdbg("DM320_OSD_CURYL:       %04x\n", getreg16(DM320_OSD_CURYL));
-  gvdbg("DM320_OSD_RECTCUR:     %04x\n", getreg16(DM320_OSD_RECTCUR));
+  ginfo("DM320_OSD_CURXP:       %04x\n", getreg16(DM320_OSD_CURXP));
+  ginfo("DM320_OSD_CURYP:       %04x\n", getreg16(DM320_OSD_CURYP));
+  ginfo("DM320_OSD_CURXL:       %04x\n", getreg16(DM320_OSD_CURXL));
+  ginfo("DM320_OSD_CURYL:       %04x\n", getreg16(DM320_OSD_CURYL));
+  ginfo("DM320_OSD_RECTCUR:     %04x\n", getreg16(DM320_OSD_RECTCUR));
 #endif
 
   /* Set main window to the hardware default state.  That initial
@@ -969,7 +969,7 @@ static void dm320_hwinitialize(void)
    */
 
   putreg16(CONFIG_DM320_BKGDCLUT, DM320_OSD_OSDMODE);
-  gvdbg("DM320_OSD_OSDMODE:     %04x\n", getreg16(DM320_OSD_OSDMODE));
+  ginfo("DM320_OSD_OSDMODE:     %04x\n", getreg16(DM320_OSD_OSDMODE));
 }
 
 /****************************************************************************
@@ -1265,16 +1265,16 @@ static int dm320_getcursor(FAR struct fb_vtable_s *vtable, FAR struct fb_cursora
   attrib->mxsize.w = MAX_XRES;
   attrib->mxsize.h = MAX_YRES;
 
-  gvdbg("DM320_OSD_CURXP:       %04x\n", attrib->pos.x);
-  gvdbg("DM320_OSD_CURYP:       %04x\n", attrib->pos.y);
+  ginfo("DM320_OSD_CURXP:       %04x\n", attrib->pos.x);
+  ginfo("DM320_OSD_CURYP:       %04x\n", attrib->pos.y);
 #ifdef CONFIG_FB_HWCURSORSIZE
-  gvdbg("DM320_OSD_CURXL:       %04x\n", attrib->size.w);
-  gvdbg("DM320_OSD_CURYL:       %04x\n", attrib->size.h);
+  ginfo("DM320_OSD_CURXL:       %04x\n", attrib->size.w);
+  ginfo("DM320_OSD_CURYL:       %04x\n", attrib->size.h);
 #else
-  gvdbg("DM320_OSD_CURXL:       %04x\n", getreg16(DM320_OSD_CURXL));
-  gvdbg("DM320_OSD_CURYL:       %04x\n", getreg16(DM320_OSD_CURYL));
+  ginfo("DM320_OSD_CURXL:       %04x\n", getreg16(DM320_OSD_CURXL));
+  ginfo("DM320_OSD_CURYL:       %04x\n", getreg16(DM320_OSD_CURYL));
 #endif
-  gvdbg("DM320_OSD_RECTCUR:     %04x\n", getreg16(DM320_OSD_RECTCUR));
+  ginfo("DM320_OSD_RECTCUR:     %04x\n", getreg16(DM320_OSD_RECTCUR));
 }
 #endif
 
@@ -1300,7 +1300,7 @@ static int dm320_setcursor(FAR struct fb_vtable_s *vtable, FAR struct fb_setcurs
   flags = enter_critical_section();
   if ((settings->flags & FB_CUR_SETPOSITION) != 0)
     {
-      gvdbg("x=%d y=%d\n", settings->pos.x, settings->pos.y);
+      ginfo("x=%d y=%d\n", settings->pos.x, settings->pos.y);
 
       if (settings->pos.x > MAX_YRES)
         {
@@ -1319,7 +1319,7 @@ static int dm320_setcursor(FAR struct fb_vtable_s *vtable, FAR struct fb_setcurs
 #ifdef CONFIG_FB_HWCURSORSIZE
   if ((settings->flags & FB_CUR_SETSIZE) != 0)
     {
-      gvdbg("h=%d w=%d\n", settings->size.h, settings->size.w);
+      ginfo("h=%d w=%d\n", settings->size.h, settings->size.w);
 
       if (settings->size.w > MAX_YRES)
         {
@@ -1349,11 +1349,11 @@ static int dm320_setcursor(FAR struct fb_vtable_s *vtable, FAR struct fb_setcurs
   putreg16(regval, DM320_OSD_RECTCUR);
   leave_critical_section(flags);
 
-  gvdbg("DM320_OSD_CURXP:       %04x\n", getreg16(DM320_OSD_CURXP));
-  gvdbg("DM320_OSD_CURYP:       %04x\n", getreg16(DM320_OSD_CURYP));
-  gvdbg("DM320_OSD_CURXL:       %04x\n", getreg16(DM320_OSD_CURXL));
-  gvdbg("DM320_OSD_CURYL:       %04x\n", getreg16(DM320_OSD_CURYL));
-  gvdbg("DM320_OSD_RECTCUR:     %04x\n", getreg16(DM320_OSD_RECTCUR));
+  ginfo("DM320_OSD_CURXP:       %04x\n", getreg16(DM320_OSD_CURXP));
+  ginfo("DM320_OSD_CURYP:       %04x\n", getreg16(DM320_OSD_CURYP));
+  ginfo("DM320_OSD_CURXL:       %04x\n", getreg16(DM320_OSD_CURXL));
+  ginfo("DM320_OSD_CURYL:       %04x\n", getreg16(DM320_OSD_CURYL));
+  ginfo("DM320_OSD_RECTCUR:     %04x\n", getreg16(DM320_OSD_RECTCUR));
 }
 #endif
 
@@ -1381,7 +1381,7 @@ int up_fbinitialize(int display)
 {
   int ret;
 
-  gvdbg("Allocating framebuffers\n");
+  ginfo("Allocating framebuffers\n");
   ret = dm320_allocvideomemory();
   if (ret != 0)
     {
@@ -1391,7 +1391,7 @@ int up_fbinitialize(int display)
 
   /* Initialize the hardware */
 
-  gvdbg("Initializing hardware\n");
+  ginfo("Initializing hardware\n");
   dm320_hwinitialize();
   return 0;
 }
diff --git a/arch/arm/src/dm320/dm320_usbdev.c b/arch/arm/src/dm320/dm320_usbdev.c
index f0f87b7f58..aae0d5fe3c 100644
--- a/arch/arm/src/dm320/dm320_usbdev.c
+++ b/arch/arm/src/dm320/dm320_usbdev.c
@@ -1216,7 +1216,7 @@ static inline void dm320_ep0setup(struct dm320_usbdev_s *priv)
   value = GETUINT16(ctrl.value);
   len   = GETUINT16(ctrl.len);
 
-  ullvdbg("type=%02x req=%02x value=%04x index=%04x len=%04x\n",
+  ullinfo("type=%02x req=%02x value=%04x index=%04x len=%04x\n",
           ctrl.type, ctrl.req, value, index, len);
 
   /* Dispatch any non-standard requests */
@@ -1618,7 +1618,7 @@ static int dm320_ctlrinterrupt(int irq, FAR void *context)
               }
             else
               {
-                ullvdbg("Pending data on OUT endpoint\n");
+                ullinfo("Pending data on OUT endpoint\n");
                 priv->rxpending = 1;
               }
           }
diff --git a/arch/arm/src/efm32/efm32_adc.c b/arch/arm/src/efm32/efm32_adc.c
index 66010104cf..29e01d9d0d 100644
--- a/arch/arm/src/efm32/efm32_adc.c
+++ b/arch/arm/src/efm32/efm32_adc.c
@@ -717,22 +717,22 @@ endif /* defined(ADC_COUNT) && (ADC_COUNT > 0) */
 static void adc_tim_dumpregs(struct efm32_dev_s *priv, FAR const char *msg)
 {
 #if defined(CONFIG_DEBUG_ANALOG) && defined(CONFIG_DEBUG_INFO)
-  avdbg("%s:\n", msg);
-  avdbg("  CR1: %04x CR2:  %04x SMCR:  %04x DIER:  %04x\n",
+  ainfo("%s:\n", msg);
+  ainfo("  CR1: %04x CR2:  %04x SMCR:  %04x DIER:  %04x\n",
         tim_getreg(priv, EFM32_GTIM_CR1_OFFSET),
         tim_getreg(priv, EFM32_GTIM_CR2_OFFSET),
         tim_getreg(priv, EFM32_GTIM_SMCR_OFFSET),
         tim_getreg(priv, EFM32_GTIM_DIER_OFFSET));
-  avdbg("   SR: %04x EGR:  0000 CCMR1: %04x CCMR2: %04x\n",
+  ainfo("   SR: %04x EGR:  0000 CCMR1: %04x CCMR2: %04x\n",
         tim_getreg(priv, EFM32_GTIM_SR_OFFSET),
         tim_getreg(priv, EFM32_GTIM_CCMR1_OFFSET),
         tim_getreg(priv, EFM32_GTIM_CCMR2_OFFSET));
-  avdbg(" CCER: %04x CNT:  %04x PSC:   %04x ARR:   %04x\n",
+  ainfo(" CCER: %04x CNT:  %04x PSC:   %04x ARR:   %04x\n",
         tim_getreg(priv, EFM32_GTIM_CCER_OFFSET),
         tim_getreg(priv, EFM32_GTIM_CNT_OFFSET),
         tim_getreg(priv, EFM32_GTIM_PSC_OFFSET),
         tim_getreg(priv, EFM32_GTIM_ARR_OFFSET));
-  avdbg(" CCR1: %04x CCR2: %04x CCR3:  %04x CCR4:  %04x\n",
+  ainfo(" CCR1: %04x CCR2: %04x CCR3:  %04x CCR4:  %04x\n",
         tim_getreg(priv, EFM32_GTIM_CCR1_OFFSET),
         tim_getreg(priv, EFM32_GTIM_CCR2_OFFSET),
         tim_getreg(priv, EFM32_GTIM_CCR3_OFFSET),
@@ -740,7 +740,7 @@ static void adc_tim_dumpregs(struct efm32_dev_s *priv, FAR const char *msg)
 
   if (priv->tbase == EFM32_TIM1_BASE || priv->tbase == EFM32_TIM8_BASE)
     {
-      avdbg("  RCR: %04x BDTR: %04x DCR:   %04x DMAR:  %04x\n",
+      ainfo("  RCR: %04x BDTR: %04x DCR:   %04x DMAR:  %04x\n",
             tim_getreg(priv, EFM32_ATIM_RCR_OFFSET),
             tim_getreg(priv, EFM32_ATIM_BDTR_OFFSET),
             tim_getreg(priv, EFM32_ATIM_DCR_OFFSET),
@@ -748,7 +748,7 @@ static void adc_tim_dumpregs(struct efm32_dev_s *priv, FAR const char *msg)
     }
   else
     {
-      avdbg("  DCR: %04x DMAR: %04x\n",
+      ainfo("  DCR: %04x DMAR: %04x\n",
             tim_getreg(priv, EFM32_GTIM_DCR_OFFSET),
             tim_getreg(priv, EFM32_GTIM_DMAR_OFFSET));
     }
@@ -775,7 +775,7 @@ static void adc_startconv(struct efm32_dev_s *priv, bool enable)
 {
   uint32_t regval;
 
-  avdbg("enable: %d\n", enable);
+  ainfo("enable: %d\n", enable);
 
   regval = adc_getreg(priv, EFM32_ADC_CR2_OFFSET);
   if (enable)
@@ -864,7 +864,7 @@ static void adc_enable(FAR struct efm32_dev_s *priv, bool enable)
 {
   uint32_t regval;
 
-  avdbg("enable: %d\n", enable);
+  ainfo("enable: %d\n", enable);
 
   regval  = adc_getreg(priv, EFM32_ADC_CR2_OFFSET);
   if (enable)
@@ -922,7 +922,7 @@ static void adc_reset(FAR struct adc_dev_s *dev)
   int ret;
 #endif
 
-  avdbg("intf: ADC%d\n", priv->intf);
+  ainfo("intf: ADC%d\n", priv->intf);
   flags = enter_critical_section();
 
   /* Enable ADC reset state */
@@ -1040,11 +1040,11 @@ static void adc_reset(FAR struct adc_dev_s *dev)
 
   leave_critical_section(flags);
 
-  avdbg("SR:   0x%08x CR1:  0x%08x CR2:  0x%08x\n",
+  ainfo("SR:   0x%08x CR1:  0x%08x CR2:  0x%08x\n",
         adc_getreg(priv, EFM32_ADC_SR_OFFSET),
         adc_getreg(priv, EFM32_ADC_CR1_OFFSET),
         adc_getreg(priv, EFM32_ADC_CR2_OFFSET));
-  avdbg("SQR1: 0x%08x SQR2: 0x%08x SQR3: 0x%08x\n",
+  ainfo("SQR1: 0x%08x SQR2: 0x%08x SQR3: 0x%08x\n",
         adc_getreg(priv, EFM32_ADC_SQR1_OFFSET),
         adc_getreg(priv, EFM32_ADC_SQR2_OFFSET),
         adc_getreg(priv, EFM32_ADC_SQR3_OFFSET));
@@ -1081,7 +1081,7 @@ static int adc_setup(FAR struct adc_dev_s *dev)
 
       /* Enable the ADC interrupt */
 
-      avdbg("Enable the ADC interrupt: irq=%d\n", priv->irq);
+      ainfo("Enable the ADC interrupt: irq=%d\n", priv->irq);
       up_enable_irq(priv->irq);
     }
 
@@ -1132,7 +1132,7 @@ static void adc_rxint(FAR struct adc_dev_s *dev, bool enable)
   FAR struct efm32_dev_s *priv = (FAR struct efm32_dev_s *)dev->ad_priv;
   uint32_t regval;
 
-  avdbg("intf: %d enable: %d\n", priv->intf, enable);
+  ainfo("intf: %d enable: %d\n", priv->intf, enable);
 
   regval = adc_getreg(priv, EFM32_ADC_CR1_OFFSET);
   if (enable)
@@ -1271,12 +1271,12 @@ struct adc_dev_s *efm32_adcinitialize(int intf, const uint8_t *chanlist, int nch
   FAR struct adc_dev_s   *dev;
   FAR struct efm32_dev_s *priv;
 
-  avdbg("intf: %d nchannels: %d\n", intf, nchannels);
+  ainfo("intf: %d nchannels: %d\n", intf, nchannels);
 
 #ifdef CONFIG_EFM32_ADC1
   if (intf == 1)
     {
-      avdbg("ADC1 Selected\n");
+      ainfo("ADC1 Selected\n");
       dev = &g_adcdev1;
     }
   else
@@ -1284,7 +1284,7 @@ struct adc_dev_s *efm32_adcinitialize(int intf, const uint8_t *chanlist, int nch
 #ifdef CONFIG_EFM32_ADC2
   if (intf == 2)
     {
-      avdbg("ADC2 Selected\n");
+      ainfo("ADC2 Selected\n");
       dev = &g_adcdev2;
     }
   else
@@ -1292,7 +1292,7 @@ struct adc_dev_s *efm32_adcinitialize(int intf, const uint8_t *chanlist, int nch
 #ifdef CONFIG_EFM32_ADC3
   if (intf == 3)
     {
-      avdbg("ADC3 Selected\n");
+      ainfo("ADC3 Selected\n");
       dev = &g_adcdev3;
     }
   else
diff --git a/arch/arm/src/efm32/efm32_dma.c b/arch/arm/src/efm32/efm32_dma.c
index a96bc160c0..c6c7af4e48 100644
--- a/arch/arm/src/efm32/efm32_dma.c
+++ b/arch/arm/src/efm32/efm32_dma.c
@@ -270,7 +270,7 @@ void weak_function up_dmainitialize(void)
   uint32_t regval;
   int i;
 
-  dmallvdbg("Initialize XDMAC0\n");
+  dmallinfo("Initialize XDMAC0\n");
 
   /* Initialize the channel list  */
 
@@ -416,7 +416,7 @@ void efm32_dmafree(DMA_HANDLE handle)
   struct dma_channel_s *dmach = (struct dma_channel_s *)handle;
 
   DEBUGASSERT(dmach != NULL && dmach->inuse);
-  dmavdbg("DMA channel %d\n", dmach->chan);
+  dmainfo("DMA channel %d\n", dmach->chan);
 
   /* Disable the channel */
 
diff --git a/arch/arm/src/efm32/efm32_i2c.c b/arch/arm/src/efm32/efm32_i2c.c
index 3f4638390e..de775d4dd4 100644
--- a/arch/arm/src/efm32/efm32_i2c.c
+++ b/arch/arm/src/efm32/efm32_i2c.c
@@ -138,10 +138,10 @@
 
 #ifdef CONFIG_DEBUG_I2C
 #  define i2cdbg dbg
-#  define i2cvdbg vdbg
+#  define i2cinfo info
 #else
 #  define i2cdbg(x...)
-#  define i2cvdbg(x...)
+#  define i2cinfo(x...)
 #endif
 
 /* I2C event trace logic.  NOTE:  trace uses the internal, non-standard,
@@ -605,7 +605,7 @@ static inline int efm32_i2c_sem_waitdone(FAR struct efm32_i2c_priv_s *priv)
 
   while (priv->result == I2CRESULT_INPROGRESS);
 
-  i2cvdbg("result: %s elapsed: %d threshold: %d i2c_state %s "
+  i2cinfo("result: %s elapsed: %d threshold: %d i2c_state %s "
           "I2Cx_STATES: %08x I2Cx_IF: %08x\n",
           efm32_i2c_result_str(priv->result), elapsed, timeout,
           efm32_i2c_state_str(priv->i2c_state), priv->i2c_reg_state,
@@ -652,7 +652,7 @@ static inline int efm32_i2c_sem_waitdone(FAR struct efm32_i2c_priv_s *priv)
 
   while ((priv->result == I2CRESULT_INPROGRESS) && elapsed < timeout);
 
-  i2cvdbg("result: %s elapsed: %d threshold: %d i2c_state %s "
+  i2cinfo("result: %s elapsed: %d threshold: %d i2c_state %s "
           "I2Cx_STATES: %08x I2Cx_IF: %08x\n",
           efm32_i2c_result_str(priv->result), elapsed, timeout,
           efm32_i2c_state_str(priv->i2c_state), priv->i2c_reg_state,
diff --git a/arch/arm/src/efm32/efm32_idle.c b/arch/arm/src/efm32/efm32_idle.c
index 62d4e6315b..5d42299d70 100644
--- a/arch/arm/src/efm32/efm32_idle.c
+++ b/arch/arm/src/efm32/efm32_idle.c
@@ -110,7 +110,7 @@ static void up_idlepm(void)
 
       /* Perform board-specific, state-dependent logic here */
 
-      llvdbg("newstate= %d oldstate=%d\n", newstate, oldstate);
+      llinfo("newstate= %d oldstate=%d\n", newstate, oldstate);
 
       /* Then force the global state change */
 
diff --git a/arch/arm/src/efm32/efm32_pwm.c b/arch/arm/src/efm32/efm32_pwm.c
index 175903511b..d0db8e6bde 100644
--- a/arch/arm/src/efm32/efm32_pwm.c
+++ b/arch/arm/src/efm32/efm32_pwm.c
@@ -85,19 +85,19 @@
 #  define pwmdbg              dbg
 #  define pwmlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define pwmvdbg           vdbg
-#    define pwmllvdbg         llvdbg
+#    define pwminfo           info
+#    define pwmllinfo         llinfo
 #    define pwm_dumpgpio(p,m) efm32_dumpgpio(p,m)
 #  else
-#    define pwmvdbg(x...)
-#    define pwmllvdbg(x...)
+#    define pwminfo(x...)
+#    define pwmllinfo(x...)
 #    define pwm_dumpgpio(p,m)
 #  endif
 #else
 #  define pwmdbg(x...)
 #  define pwmlldbg(x...)
-#  define pwmvdbg(x...)
-#  define pwmllvdbg(x...)
+#  define pwminfo(x...)
+#  define pwmllinfo(x...)
 #  define pwm_dumpgpio(p,m)
 #endif
 
@@ -329,23 +329,23 @@ static void pwm_dumpregs(struct efm32_pwmtimer_s *priv, FAR const char *msg)
   /* TODO debug pwm_dumpregs */
 
 #if 0
-  pwmvdbg("%s:\n", msg);
-  pwmvdbg("  CR1: %04x CR2:  %04x SMCR:  %04x DIER:  %04x\n",
+  pwminfo("%s:\n", msg);
+  pwminfo("  CR1: %04x CR2:  %04x SMCR:  %04x DIER:  %04x\n",
           pwm_getreg(priv, STM32_GTIM_CR1_OFFSET),
           pwm_getreg(priv, STM32_GTIM_CR2_OFFSET),
           pwm_getreg(priv, STM32_GTIM_SMCR_OFFSET),
           pwm_getreg(priv, STM32_GTIM_DIER_OFFSET));
-  pwmvdbg("   SR: %04x EGR:  %04x CCMR1: %04x CCMR2: %04x\n",
+  pwminfo("   SR: %04x EGR:  %04x CCMR1: %04x CCMR2: %04x\n",
           pwm_getreg(priv, STM32_GTIM_SR_OFFSET),
           pwm_getreg(priv, STM32_GTIM_EGR_OFFSET),
           pwm_getreg(priv, STM32_GTIM_CCMR1_OFFSET),
           pwm_getreg(priv, STM32_GTIM_CCMR2_OFFSET));
-  pwmvdbg(" CCER: %04x CNT:  %04x PSC:   %04x ARR:   %04x\n",
+  pwminfo(" CCER: %04x CNT:  %04x PSC:   %04x ARR:   %04x\n",
           pwm_getreg(priv, STM32_GTIM_CCER_OFFSET),
           pwm_getreg(priv, STM32_GTIM_CNT_OFFSET),
           pwm_getreg(priv, STM32_GTIM_PSC_OFFSET),
           pwm_getreg(priv, STM32_GTIM_ARR_OFFSET));
-  pwmvdbg(" CCR1: %04x CCR2: %04x CCR3:  %04x CCR4:  %04x\n",
+  pwminfo(" CCR1: %04x CCR2: %04x CCR3:  %04x CCR4:  %04x\n",
           pwm_getreg(priv, STM32_GTIM_CCR1_OFFSET),
           pwm_getreg(priv, STM32_GTIM_CCR2_OFFSET),
           pwm_getreg(priv, STM32_GTIM_CCR3_OFFSET),
@@ -353,7 +353,7 @@ static void pwm_dumpregs(struct efm32_pwmtimer_s *priv, FAR const char *msg)
 #if defined(CONFIG_STM32_TIM1_PWM) || defined(CONFIG_STM32_TIM8_PWM)
   if (priv->timtype == TIMTYPE_ADVANCED)
     {
-      pwmvdbg("  RCR: %04x BDTR: %04x DCR:   %04x DMAR:  %04x\n",
+      pwminfo("  RCR: %04x BDTR: %04x DCR:   %04x DMAR:  %04x\n",
           pwm_getreg(priv, STM32_ATIM_RCR_OFFSET),
           pwm_getreg(priv, STM32_ATIM_BDTR_OFFSET),
           pwm_getreg(priv, STM32_ATIM_DCR_OFFSET),
@@ -362,7 +362,7 @@ static void pwm_dumpregs(struct efm32_pwmtimer_s *priv, FAR const char *msg)
   else
 #endif
     {
-      pwmvdbg("  DCR: %04x DMAR: %04x\n",
+      pwminfo("  DCR: %04x DMAR: %04x\n",
           pwm_getreg(priv, STM32_GTIM_DCR_OFFSET),
           pwm_getreg(priv, STM32_GTIM_DMAR_OFFSET));
     }
@@ -396,11 +396,11 @@ static int pwm_timer(FAR struct efm32_pwmtimer_s *priv,
   DEBUGASSERT(priv != NULL && info != NULL);
 
 #ifdef CONFIG_PWM_PULSECOUNT
-  pwmvdbg("TIMER%d channel: %d frequency: %d duty: %08x count: %d\n",
+  pwminfo("TIMER%d channel: %d frequency: %d duty: %08x count: %d\n",
           priv->timid, priv->channel, info->frequency,
           info->duty, info->count);
 #else
-  pwmvdbg("TIMER%d channel: %d frequency: %d duty: %08x\n",
+  pwminfo("TIMER%d channel: %d frequency: %d duty: %08x\n",
           priv->timid, priv->channel, info->frequency, info->duty);
 #endif
   DEBUGASSERT(info->frequency > 0 && info->duty >= 0 &&
@@ -541,7 +541,7 @@ static int pwm_interrupt(struct efm32_pwmtimer_s *priv)
 
   /* Now all of the time critical stuff is done so we can do some debug output */
 
-  pwmllvdbg("Update interrupt SR: %04x prev: %d curr: %d count: %d\n",
+  pwmllinfo("Update interrupt SR: %04x prev: %d curr: %d count: %d\n",
             regval, priv->prev, priv->curr, priv->count);
 
   return OK;
@@ -669,7 +669,7 @@ static int pwm_setup(FAR struct pwm_lowerhalf_s *dev)
 {
   FAR struct efm32_pwmtimer_s *priv = (FAR struct efm32_pwmtimer_s *)dev;
 
-  pwmvdbg("TIMER%d pincfg: %08x\n", priv->timid, priv->pincfg);
+  pwminfo("TIMER%d pincfg: %08x\n", priv->timid, priv->pincfg);
   pwm_dumpregs(priv, "Initially");
 
   /* Configure the PWM output pin, but do not start the timer yet */
@@ -726,7 +726,7 @@ static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev)
   FAR struct efm32_pwmtimer_s *priv = (FAR struct efm32_pwmtimer_s *)dev;
   uint32_t pincfg;
 
-  pwmvdbg("TIMER%d pincfg: %08x\n", priv->timid, priv->pincfg);
+  pwminfo("TIMER%d pincfg: %08x\n", priv->timid, priv->pincfg);
 
   /* Make sure that the output has been stopped */
 
@@ -805,7 +805,7 @@ static int pwm_stop(FAR struct pwm_lowerhalf_s *dev)
   FAR struct efm32_pwmtimer_s *priv = (FAR struct efm32_pwmtimer_s *)dev;
   irqstate_t flags;
 
-  pwmvdbg("TIMER%d\n", priv->timid);
+  pwminfo("TIMER%d\n", priv->timid);
 
   /* Disable interrupts momentary to stop any ongoing timer processing and
    * to prevent any concurrent access to the reset register.
@@ -848,7 +848,7 @@ static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, int cmd, unsigned long arg
 
   /* There are no platform-specific ioctl commands */
 
-  pwmvdbg("TIMER%d\n", priv->timid);
+  pwminfo("TIMER%d\n", priv->timid);
 #endif
   return -ENOTTY;
 }
@@ -878,7 +878,7 @@ FAR struct pwm_lowerhalf_s *efm32_pwminitialize(int timer)
 {
   FAR struct efm32_pwmtimer_s *lower;
 
-  pwmvdbg("TIMER%d\n", timer);
+  pwminfo("TIMER%d\n", timer);
 
   switch (timer)
     {
diff --git a/arch/arm/src/efm32/efm32_rmu.h b/arch/arm/src/efm32/efm32_rmu.h
index b6983a06a5..9d4dfb514e 100644
--- a/arch/arm/src/efm32/efm32_rmu.h
+++ b/arch/arm/src/efm32/efm32_rmu.h
@@ -58,13 +58,13 @@
 #ifdef CONFIG_EFM32_RMU_DEBUG
 #  define rmudbg lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define rmuvdbg lldbg
+#    define rmuinfo lldbg
 #  else
-#    define rmuvdbg(x...)
+#    define rmuinfo(x...)
 #  endif
 #else
 #  define rmudbg(x...)
-#  define rmuvdbg(x...)
+#  define rmuinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/arch/arm/src/efm32/efm32_spi.c b/arch/arm/src/efm32/efm32_spi.c
index ad2055d79f..7c48070e4a 100644
--- a/arch/arm/src/efm32/efm32_spi.c
+++ b/arch/arm/src/efm32/efm32_spi.c
@@ -102,13 +102,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /****************************************************************************
@@ -897,7 +897,7 @@ static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency)
        */
 
       actual = (BOARD_HFPERCLK_FREQUENCY << 7) / (256 + clkdiv);
-      spivdbg("frequency=%u actual=%u\n", frequency, actual);
+      spiinfo("frequency=%u actual=%u\n", frequency, actual);
 
       /* Save the frequency selection so that subsequent reconfigurations
        * will be faster.
@@ -932,7 +932,7 @@ static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode)
   uint32_t setting;
   uint32_t regval;
 
-  spivdbg("mode=%d\n", mode);
+  spiinfo("mode=%d\n", mode);
 
   DEBUGASSERT(priv && priv->config);
   config = priv->config;
@@ -998,7 +998,7 @@ static void spi_setbits(struct spi_dev_s *dev, int nbits)
   uint32_t setting;
   bool lsbfirst;
 
-  spivdbg("nbits=%d\n", nbits);
+  spiinfo("nbits=%d\n", nbits);
 
   DEBUGASSERT(priv && priv->config);
   config = priv->config;
@@ -1222,7 +1222,7 @@ static uint16_t spi_send(struct spi_dev_s *dev, uint16_t wd)
   spi_wait_status(config, _USART_STATUS_RXDATAV_MASK, USART_STATUS_RXDATAV);
   ret = (uint16_t)spi_getreg(config, EFM32_USART_RXDATA_OFFSET);
 
-  spivdbg("Sent: %04x Return: %04x \n", wd, ret);
+  spiinfo("Sent: %04x Return: %04x \n", wd, ret);
   return ret;
 }
 
@@ -1263,7 +1263,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
   DEBUGASSERT(priv && priv->config);
   config = priv->config;
 
-  spivdbg("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords);
+  spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords);
 
   /* Flush any unread data */
 
@@ -1427,7 +1427,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
   else
 #endif
     {
-      spivdbg("txbuffer=%p rxbuffer=%p nwords=%d\n",
+      spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n",
               txbuffer, rxbuffer, nwords);
 
       /* Pre-calculate the timeout value */
@@ -1492,7 +1492,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
 static void spi_sndblock(struct spi_dev_s *dev, const void *txbuffer,
                          size_t nwords)
 {
-  spivdbg("txbuffer=%p nwords=%d\n", txbuffer, nwords);
+  spiinfo("txbuffer=%p nwords=%d\n", txbuffer, nwords);
   return spi_exchange(dev, txbuffer, NULL, nwords);
 }
 #endif
@@ -1521,7 +1521,7 @@ static void spi_sndblock(struct spi_dev_s *dev, const void *txbuffer,
 static void spi_recvblock(struct spi_dev_s *dev, void *rxbuffer,
                           size_t nwords)
 {
-  spivdbg("rxbuffer=%p nwords=%d\n", rxbuffer, nwords);
+  spiinfo("rxbuffer=%p nwords=%d\n", rxbuffer, nwords);
   return spi_exchange(dev, NULL, rxbuffer, nwords);
 }
 #endif
diff --git a/arch/arm/src/efm32/efm32_timer.c b/arch/arm/src/efm32/efm32_timer.c
index 1788723c6e..3e75e631ea 100644
--- a/arch/arm/src/efm32/efm32_timer.c
+++ b/arch/arm/src/efm32/efm32_timer.c
@@ -71,19 +71,19 @@
 #  define efm32_timerdbg              dbg
 #  define efm32_timerlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define efm32_timervdbg           vdbg
-#    define efm32_timerllvdbg         llvdbg
+#    define efm32_timerinfo           info
+#    define efm32_timerllinfo         llinfo
 #    define efm32_timer_dumpgpio(p,m) efm32_dumpgpio(p,m)
 #  else
 #    define efm32_timerlldbg(x...)
-#    define efm32_timerllvdbg(x...)
+#    define efm32_timerllinfo(x...)
 #    define efm32_timer_dumpgpio(p,m)
 #  endif
 #else
 #  define efm32_timerdbg(x...)
 #  define efm32_timerlldbg(x...)
-#  define efm32_timervdbg(x...)
-#  define efm32_timerllvdbg(x...)
+#  define efm32_timerinfo(x...)
+#  define efm32_timerllinfo(x...)
 #  define efm32_timer_dumpgpio(p,m)
 #endif
 
@@ -121,14 +121,14 @@ void efm32_timer_dumpregs(uintptr_t base, FAR const char *msg)
 {
   int i;
 
-  efm32_timervdbg("%s:\n", msg);
-  efm32_timervdbg("  CTRL: %04x STATUS: %04x   IEN: %04x     IF: %04x\n",
+  efm32_timerinfo("%s:\n", msg);
+  efm32_timerinfo("  CTRL: %04x STATUS: %04x   IEN: %04x     IF: %04x\n",
                   getreg32(base + EFM32_TIMER_CTRL_OFFSET   ),
                   getreg32(base + EFM32_TIMER_STATUS_OFFSET ),
                   getreg32(base + EFM32_TIMER_IEN_OFFSET    ),
                   getreg32(base + EFM32_TIMER_IF_OFFSET     )
                  );
-  efm32_timervdbg("   TOP: %04x   TOPB: %04x   CNT: %04x  ROUTE: %04x\n",
+  efm32_timerinfo("   TOP: %04x   TOPB: %04x   CNT: %04x  ROUTE: %04x\n",
                   getreg32(base + EFM32_TIMER_TOP_OFFSET    ),
                   getreg32(base + EFM32_TIMER_TOPB_OFFSET   ),
                   getreg32(base + EFM32_TIMER_CNT_OFFSET    ),
@@ -140,7 +140,7 @@ void efm32_timer_dumpregs(uintptr_t base, FAR const char *msg)
 #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",
+      efm32_timerinfo("CC%d => CTRL: %04x    CCV:  %04x  CCVP: %04x CCVB: %04x\n",
                       i
                       getreg32(base_cc + EFM32_TIMER_CC_CTRL_OFFSET ),
                       getreg32(base_cc + EFM32_TIMER_CC_CCV_OFFSET  ),
@@ -149,13 +149,13 @@ void efm32_timer_dumpregs(uintptr_t base, FAR const char *msg)
                      );
     }
 
-  efm32_timervdbg("DTCTRL: %04x DTTIME: %04x  DTFC: %04x DTOGEN:  %04x\n",
+  efm32_timerinfo("DTCTRL: %04x DTTIME: %04x  DTFC: %04x DTOGEN:  %04x\n",
                   getreg32(base + EFM32_TIMER_CTRL_OFFSET   ),
                   getreg32(base + EFM32_TIMER_STATUS_OFFSET ),
                   getreg32(base + EFM32_TIMER_IEN_OFFSET    ),
                   getreg32(base + EFM32_TIMER_IF_OFFSET     )
                  );
-  efm32_timervdbg("DTFAULT: %04x DTFAULTC: %04x  DTLOCK: %04x \n",
+  efm32_timerinfo("DTFAULT: %04x DTFAULTC: %04x  DTLOCK: %04x \n",
                   getreg32(base + EFM32_TIMER_CTRL_OFFSET   ),
                   getreg32(base + EFM32_TIMER_STATUS_OFFSET ),
                   getreg32(base + EFM32_TIMER_IEN_OFFSET    ),
diff --git a/arch/arm/src/efm32/efm32_usbdev.c b/arch/arm/src/efm32/efm32_usbdev.c
index fb20993657..bffcadbf93 100644
--- a/arch/arm/src/efm32/efm32_usbdev.c
+++ b/arch/arm/src/efm32/efm32_usbdev.c
@@ -1220,7 +1220,7 @@ static void efm32_epin_request(FAR struct efm32_usbdev_s *priv,
       return;
     }
 
-  ullvdbg("EP%d req=%p: len=%d xfrd=%d zlp=%d\n",
+  ullinfo("EP%d req=%p: len=%d xfrd=%d zlp=%d\n",
           privep->epphy, privreq, privreq->req.len,
           privreq->req.xfrd, privep->zlp);
 
@@ -1486,7 +1486,7 @@ static void efm32_epout_complete(FAR struct efm32_usbdev_s *priv,
       return;
     }
 
-  ullvdbg("EP%d: len=%d xfrd=%d\n",
+  ullinfo("EP%d: len=%d xfrd=%d\n",
           privep->epphy, privreq->req.len, privreq->req.xfrd);
 
   /* Return the completed read request to the class driver and mark the state
@@ -1521,7 +1521,7 @@ static inline void efm32_ep0out_receive(FAR struct efm32_ep_s *privep, int bcnt)
   DEBUGASSERT(privep && privep->ep.priv);
   priv = (FAR struct efm32_usbdev_s *)privep->ep.priv;
 
-  ullvdbg("EP0: bcnt=%d\n", bcnt);
+  ullinfo("EP0: bcnt=%d\n", bcnt);
   usbtrace(TRACE_READ(EP0), bcnt);
 
   /* Verify that an OUT SETUP request as received before this data was
@@ -1614,7 +1614,7 @@ static inline void efm32_epout_receive(FAR struct efm32_ep_s *privep, int bcnt)
       return;
     }
 
-  ullvdbg("EP%d: len=%d xfrd=%d\n", privep->epphy, privreq->req.len, privreq->req.xfrd);
+  ullinfo("EP%d: len=%d xfrd=%d\n", privep->epphy, privreq->req.len, privreq->req.xfrd);
   usbtrace(TRACE_READ(privep->epphy), bcnt);
 
   /* Get the number of bytes to transfer from the RxFIFO */
@@ -1698,7 +1698,7 @@ static void efm32_epout_request(FAR struct efm32_usbdev_s *priv,
               return;
             }
 
-          ullvdbg("EP%d: len=%d\n", privep->epphy, privreq->req.len);
+          ullinfo("EP%d: len=%d\n", privep->epphy, privreq->req.len);
 
           /* Ignore any attempt to receive a zero length packet (this really
            * should not happen.
@@ -2494,7 +2494,7 @@ static inline void efm32_ep0out_setup(struct efm32_usbdev_s *priv)
   ctrlreq.index = GETUINT16(priv->ctrlreq.index);
   ctrlreq.len   = GETUINT16(priv->ctrlreq.len);
 
-  ullvdbg("type=%02x req=%02x value=%04x index=%04x len=%04x\n",
+  ullinfo("type=%02x req=%02x value=%04x index=%04x len=%04x\n",
           ctrlreq.type, ctrlreq.req, ctrlreq.value, ctrlreq.index, ctrlreq.len);
 
   /* Check for a standard request */
@@ -4333,7 +4333,7 @@ static int efm32_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *
   if (!req || !req->callback || !req->buf || !ep)
     {
       usbtrace(TRACE_DEVERROR(EFM32_TRACEERR_INVALIDPARMS), 0);
-      ullvdbg("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep);
+      ullinfo("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep);
       return -EINVAL;
     }
 #endif
diff --git a/arch/arm/src/efm32/efm32_usbhost.c b/arch/arm/src/efm32/efm32_usbhost.c
index cc9fe1c7d8..9f4c926cbe 100644
--- a/arch/arm/src/efm32/efm32_usbhost.c
+++ b/arch/arm/src/efm32/efm32_usbhost.c
@@ -2016,7 +2016,7 @@ static void efm32_in_next(FAR struct efm32_usbhost_s *priv,
 
   /* The transfer is complete, with or without an error */
 
-  uvdbg("Transfer complete:  %d\n", result);
+  uinfo("Transfer complete:  %d\n", result);
 
   /* Extract the callback information */
 
@@ -2302,7 +2302,7 @@ static void efm32_out_next(FAR struct efm32_usbhost_s *priv,
 
   /* The transfer is complete, with or without an error */
 
-  uvdbg("Transfer complete:  %d\n", result);
+  uinfo("Transfer complete:  %d\n", result);
 
   /* Extract the callback information */
 
@@ -2448,7 +2448,7 @@ static inline void efm32_gint_hcinisr(FAR struct efm32_usbhost_s *priv,
   /* AND the two to get the set of enabled, pending HC interrupts */
 
   pending &= regval;
-  ullvdbg("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending);
+  ullinfo("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending);
 
   /* Check for a pending ACK response received/transmitted (ACK) interrupt */
 
@@ -2709,7 +2709,7 @@ static inline void efm32_gint_hcoutisr(FAR struct efm32_usbhost_s *priv,
   /* AND the two to get the set of enabled, pending HC interrupts */
 
   pending &= regval;
-  ullvdbg("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending);
+  ullinfo("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending);
 
   /* Check for a pending ACK response received/transmitted (ACK) interrupt */
 
@@ -3012,7 +3012,7 @@ static inline void efm32_gint_rxflvlisr(FAR struct efm32_usbhost_s *priv)
   /* Read and pop the next status from the Rx FIFO */
 
   grxsts = efm32_getreg(EFM32_USB_GRXSTSP);
-  ullvdbg("GRXSTS: %08x\n", grxsts);
+  ullinfo("GRXSTS: %08x\n", grxsts);
 
   /* Isolate the channel number/index in the status word */
 
@@ -3166,7 +3166,7 @@ static inline void efm32_gint_nptxfeisr(FAR struct efm32_usbhost_s *priv)
 
   /* Write the next group of packets into the Tx FIFO */
 
-  ullvdbg("HNPTXSTS: %08x chidx: %d avail: %d buflen: %d xfrd: %d wrsize: %d\n",
+  ullinfo("HNPTXSTS: %08x chidx: %d avail: %d buflen: %d xfrd: %d wrsize: %d\n",
            regval, chidx, avail, chan->buflen, chan->xfrd, wrsize);
 
   efm32_gint_wrpacket(priv, chan->buffer, chidx, wrsize);
@@ -3254,7 +3254,7 @@ static inline void efm32_gint_ptxfeisr(FAR struct efm32_usbhost_s *priv)
 
   /* Write the next group of packets into the Tx FIFO */
 
-  ullvdbg("HPTXSTS: %08x chidx: %d avail: %d buflen: %d xfrd: %d wrsize: %d\n",
+  ullinfo("HPTXSTS: %08x chidx: %d avail: %d buflen: %d xfrd: %d wrsize: %d\n",
            regval, chidx, avail, chan->buflen, chan->xfrd, wrsize);
 
   efm32_gint_wrpacket(priv, chan->buffer, chidx, wrsize);
@@ -3827,7 +3827,7 @@ static int efm32_wait(FAR struct usbhost_connection_s *conn,
           *hport = connport;
           leave_critical_section(flags);
 
-          uvdbg("RHport Connected: %s\n", connport->connected ? "YES" : "NO");
+          uinfo("RHport Connected: %s\n", connport->connected ? "YES" : "NO");
           return OK;
         }
 
@@ -3844,7 +3844,7 @@ static int efm32_wait(FAR struct usbhost_connection_s *conn,
           *hport = connport;
           leave_critical_section(flags);
 
-          uvdbg("Hub port Connected: %s\n", connport->connected ? "YES" : "NO");
+          uinfo("Hub port Connected: %s\n", connport->connected ? "YES" : "NO");
           return OK;
         }
 #endif
@@ -3964,7 +3964,7 @@ static int efm32_enumerate(FAR struct usbhost_connection_s *conn,
 
   /* Then let the common usbhost_enumerate do the real enumeration. */
 
-  uvdbg("Enumerate the device\n");
+  uinfo("Enumerate the device\n");
   priv->smstate = SMSTATE_ENUM;
   ret = usbhost_enumerate(hport, &hport->devclass);
 
@@ -4380,7 +4380,7 @@ static int efm32_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
 
   DEBUGASSERT(priv != NULL && ep0info != NULL && req != NULL);
   usbhost_vtrace2(USBHOST_VTRACE2_CTRLIN, req->type, req->req);
-  uvdbg("type:%02x req:%02x value:%02x%02x index:%02x%02x len:%02x%02x\n",
+  uinfo("type:%02x req:%02x value:%02x%02x index:%02x%02x len:%02x%02x\n",
         req->type, req->req, req->value[1], req->value[0],
         req->index[1], req->index[0], req->len[1], req->len[0]);
 
@@ -4465,7 +4465,7 @@ static int efm32_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
 
   DEBUGASSERT(priv != NULL && ep0info != NULL && req != NULL);
   usbhost_vtrace2(USBHOST_VTRACE2_CTRLOUT, req->type, req->req);
-  uvdbg("type:%02x req:%02x value:%02x%02x index:%02x%02x len:%02x%02x\n",
+  uinfo("type:%02x req:%02x value:%02x%02x index:%02x%02x len:%02x%02x\n",
         req->type, req->req, req->value[1], req->value[0],
         req->index[1], req->index[0], req->len[1], req->len[0]);
 
@@ -4583,7 +4583,7 @@ static ssize_t efm32_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep
   unsigned int chidx = (unsigned int)ep;
   ssize_t nbytes;
 
-  uvdbg("chidx: %d buflen: %d\n",  (unsigned int)ep, buflen);
+  uinfo("chidx: %d buflen: %d\n",  (unsigned int)ep, buflen);
 
   DEBUGASSERT(priv && buffer && chidx < EFM32_MAX_TX_FIFOS && buflen > 0);
 
@@ -4650,7 +4650,7 @@ static int efm32_asynch(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep,
   unsigned int chidx = (unsigned int)ep;
   int ret;
 
-  uvdbg("chidx: %d buflen: %d\n",  (unsigned int)ep, buflen);
+  uinfo("chidx: %d buflen: %d\n",  (unsigned int)ep, buflen);
 
   DEBUGASSERT(priv && buffer && chidx < EFM32_MAX_TX_FIFOS && buflen > 0);
 
@@ -4700,7 +4700,7 @@ static int efm32_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep)
   unsigned int chidx = (unsigned int)ep;
   irqstate_t flags;
 
-  uvdbg("chidx: %u: %d\n",  chidx);
+  uinfo("chidx: %u: %d\n",  chidx);
 
   DEBUGASSERT(priv && chidx < EFM32_MAX_TX_FIFOS);
   chan = &priv->chan[chidx];
@@ -4795,7 +4795,7 @@ static int efm32_connect(FAR struct usbhost_driver_s *drvr,
   /* Set the connected/disconnected flag */
 
   hport->connected = connected;
-  ullvdbg("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO");
+  ullinfo("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO");
 
   /* Report the connection event */
 
diff --git a/arch/arm/src/kinetis/kinetis_enet.c b/arch/arm/src/kinetis/kinetis_enet.c
index 0a05346055..3328587c1c 100644
--- a/arch/arm/src/kinetis/kinetis_enet.c
+++ b/arch/arm/src/kinetis/kinetis_enet.c
@@ -557,7 +557,7 @@ static void kinetis_receive(FAR struct kinetis_driver_s *priv)
 #ifdef CONFIG_NET_IPv4
       if (BUF->type == HTONS(ETHTYPE_IP))
         {
-          nllvdbg("IPv4 frame\n");
+          nllinfo("IPv4 frame\n");
           NETDEV_RXIPV4(&priv->dev);
 
           /* Handle ARP on input then give the IPv4 packet to the network
@@ -598,7 +598,7 @@ static void kinetis_receive(FAR struct kinetis_driver_s *priv)
 #ifdef CONFIG_NET_IPv6
       if (BUF->type == HTONS(ETHTYPE_IP6))
         {
-          nllvdbg("Iv6 frame\n");
+          nllinfo("Iv6 frame\n");
           NETDEV_RXIPV6(&priv->dev);
 
           /* Give the IPv6 packet to the network layer */
diff --git a/arch/arm/src/kinetis/kinetis_pwm.c b/arch/arm/src/kinetis/kinetis_pwm.c
index 1091b88b28..6d8f223591 100644
--- a/arch/arm/src/kinetis/kinetis_pwm.c
+++ b/arch/arm/src/kinetis/kinetis_pwm.c
@@ -86,19 +86,19 @@
 #  define pwmdbg              dbg
 #  define pwmlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define pwmvdbg           vdbg
-#    define pwmllvdbg         llvdbg
+#    define pwminfo           info
+#    define pwmllinfo         llinfo
 #    define pwm_dumpgpio(p,m) kinetis_pindump(p,m)
 #  else
 #    define pwmlldbg(x...)
-#    define pwmllvdbg(x...)
+#    define pwmllinfo(x...)
 #    define pwm_dumpgpio(p,m)
 #  endif
 #else
 #  define pwmdbg(x...)
 #  define pwmlldbg(x...)
-#  define pwmvdbg(x...)
-#  define pwmllvdbg(x...)
+#  define pwminfo(x...)
+#  define pwmllinfo(x...)
 #  define pwm_dumpgpio(p,m)
 #endif
 
@@ -265,25 +265,25 @@ static void pwm_dumpregs(struct kinetis_pwmtimer_s *priv, FAR const char *msg)
 {
   int nchannels = (priv->tpmid == 0) ? 8 : 2;
 
-  pwmvdbg("%s:\n", msg);
-  pwmvdbg("  FTM%d_SC:     %04x   FTM%d_CNT:  %04x     FTM%d_MOD:  %04x\n",
+  pwminfo("%s:\n", msg);
+  pwminfo("  FTM%d_SC:     %04x   FTM%d_CNT:  %04x     FTM%d_MOD:  %04x\n",
           priv->tpmid,
           pwm_getreg(priv, KINETIS_FTM_SC_OFFSET),
           priv->tpmid,
           pwm_getreg(priv, KINETIS_FTM_CNT_OFFSET),
           priv->tpmid,
           pwm_getreg(priv, KINETIS_FTM_MOD_OFFSET));
-  pwmvdbg("  FTM%d_STATUS: %04x   FTM%d_CONF: %04x\n",
+  pwminfo("  FTM%d_STATUS: %04x   FTM%d_CONF: %04x\n",
           priv->tpmid,
           pwm_getreg(priv, KINETIS_FTM_STATUS_OFFSET),
           priv->tpmid,
           pwm_getreg(priv, KINETIS_FTM_CONF_OFFSET));
-  pwmvdbg("   FTM%d_C0SC:  %04x   FTM%d_C0V:  %04x\n",
+  pwminfo("   FTM%d_C0SC:  %04x   FTM%d_C0V:  %04x\n",
           priv->tpmid,
           pwm_getreg(priv, KINETIS_FTM_C0SC_OFFSET),
           priv->tpmid,
           pwm_getreg(priv, KINETIS_FTM_C0V_OFFSET));
-  pwmvdbg("   FTM%d_C1SC:  %04x   FTM%d_C1V:  %04x\n",
+  pwminfo("   FTM%d_C1SC:  %04x   FTM%d_C1V:  %04x\n",
           priv->tpmid,
           pwm_getreg(priv, KINETIS_FTM_C1SC_OFFSET),
           priv->tpmid,
@@ -291,7 +291,7 @@ static void pwm_dumpregs(struct kinetis_pwmtimer_s *priv, FAR const char *msg)
 
   if (nchannels >= 3)
     {
-      pwmvdbg("   FTM%d_C2SC:  %04x   FTM%d_C2V:  %04x\n",
+      pwminfo("   FTM%d_C2SC:  %04x   FTM%d_C2V:  %04x\n",
               priv->tpmid,
               pwm_getreg(priv, KINETIS_FTM_C2SC_OFFSET),
               priv->tpmid,
@@ -300,7 +300,7 @@ static void pwm_dumpregs(struct kinetis_pwmtimer_s *priv, FAR const char *msg)
 
   if (nchannels >= 4)
     {
-      pwmvdbg("   FTM%d_C3SC:  %04x   FTM%d_C3V:  %04x\n",
+      pwminfo("   FTM%d_C3SC:  %04x   FTM%d_C3V:  %04x\n",
               priv->tpmid,
               pwm_getreg(priv, KINETIS_FTM_C3SC_OFFSET),
               priv->tpmid,
@@ -309,7 +309,7 @@ static void pwm_dumpregs(struct kinetis_pwmtimer_s *priv, FAR const char *msg)
 
   if (nchannels >= 5)
     {
-      pwmvdbg("   FTM%d_C4SC:  %04x   FTM%d_C4V:  %04x\n",
+      pwminfo("   FTM%d_C4SC:  %04x   FTM%d_C4V:  %04x\n",
               priv->tpmid,
               pwm_getreg(priv, KINETIS_FTM_C4SC_OFFSET),
               priv->tpmid,
@@ -318,7 +318,7 @@ static void pwm_dumpregs(struct kinetis_pwmtimer_s *priv, FAR const char *msg)
 
   if (nchannels >= 6)
     {
-      pwmvdbg("   FTM%d_C5SC:  %04x   FTM%d_C5V:  %04x\n",
+      pwminfo("   FTM%d_C5SC:  %04x   FTM%d_C5V:  %04x\n",
               priv->tpmid,
               pwm_getreg(priv, KINETIS_FTM_C5SC_OFFSET),
               priv->tpmid,
@@ -326,7 +326,7 @@ static void pwm_dumpregs(struct kinetis_pwmtimer_s *priv, FAR const char *msg)
     }
   if (nchannels >= 7)
     {
-      pwmvdbg("   FTM%d_C6SC:  %04x   FTM%d_C6V:  %04x\n",
+      pwminfo("   FTM%d_C6SC:  %04x   FTM%d_C6V:  %04x\n",
               priv->tpmid,
               pwm_getreg(priv, KINETIS_FTM_C6SC_OFFSET),
               priv->tpmid,
@@ -334,7 +334,7 @@ static void pwm_dumpregs(struct kinetis_pwmtimer_s *priv, FAR const char *msg)
     }
   if (nchannels >= 8)
     {
-      pwmvdbg("   FTM%d_C7SC:  %04x   FTM%d_C7V:  %04x\n",
+      pwminfo("   FTM%d_C7SC:  %04x   FTM%d_C7V:  %04x\n",
               priv->tpmid,
               pwm_getreg(priv, KINETIS_FTM_C7SC_OFFSET),
               priv->tpmid,
@@ -376,7 +376,7 @@ static int pwm_timer(FAR struct kinetis_pwmtimer_s *priv,
 
   DEBUGASSERT(priv != NULL && info != NULL);
 
-  pwmvdbg("FTM%d channel: %d frequency: %d duty: %08x\n",
+  pwminfo("FTM%d channel: %d frequency: %d duty: %08x\n",
           priv->tpmid, priv->channel, info->frequency, info->duty);
 
   DEBUGASSERT(info->frequency > 0 && info->duty > 0 &&
@@ -446,7 +446,7 @@ static int pwm_timer(FAR struct kinetis_pwmtimer_s *priv,
 
   cv = b16toi(info->duty * modulo + b16HALF);
 
-  pwmvdbg("FTM%d PCLK: %d frequency: %d FTMCLK: %d prescaler: %d modulo: %d c0v: %d\n",
+  pwminfo("FTM%d PCLK: %d frequency: %d FTMCLK: %d prescaler: %d modulo: %d c0v: %d\n",
           priv->tpmid, priv->pclk, info->frequency, tpmclk,
           presc_values[prescaler], modulo, cv);
 
@@ -570,7 +570,7 @@ static int pwm_setup(FAR struct pwm_lowerhalf_s *dev)
   regval |= SIM_SCGC3_FTM2;
   putreg32(regval, KINETIS_SIM_SCGC3);
 
-  pwmvdbg("FTM%d pincfg: %08x\n", priv->tpmid, priv->pincfg);
+  pwminfo("FTM%d pincfg: %08x\n", priv->tpmid, priv->pincfg);
   pwm_dumpregs(priv, "Initially");
 
   /* Configure the PWM output pin, but do not start the timer yet */
@@ -601,7 +601,7 @@ static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev)
   FAR struct kinetis_pwmtimer_s *priv = (FAR struct kinetis_pwmtimer_s *)dev;
   uint32_t pincfg;
 
-  pwmvdbg("FTM%d pincfg: %08x\n", priv->tpmid, priv->pincfg);
+  pwminfo("FTM%d pincfg: %08x\n", priv->tpmid, priv->pincfg);
 
   /* Make sure that the output has been stopped */
 
@@ -661,7 +661,7 @@ static int pwm_stop(FAR struct pwm_lowerhalf_s *dev)
   FAR struct kinetis_pwmtimer_s *priv = (FAR struct kinetis_pwmtimer_s *)dev;
   irqstate_t flags;
 
-  pwmvdbg("FTM%d\n", priv->tpmid);
+  pwminfo("FTM%d\n", priv->tpmid);
 
   /* Disable interrupts momentary to stop any ongoing timer processing and
    * to prevent any concurrent access to the reset register.
@@ -744,7 +744,7 @@ static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, int cmd, unsigned long arg
 
   /* There are no platform-specific ioctl commands */
 
-  pwmvdbg("FTM%d\n", priv->tpmid);
+  pwminfo("FTM%d\n", priv->tpmid);
 #endif
   return -ENOTTY;
 }
@@ -772,7 +772,7 @@ FAR struct pwm_lowerhalf_s *kinetis_pwminitialize(int timer)
 {
   FAR struct kinetis_pwmtimer_s *lower;
 
-  pwmvdbg("FTM%d\n", timer);
+  pwminfo("FTM%d\n", timer);
 
   switch (timer)
     {
diff --git a/arch/arm/src/kinetis/kinetis_sdhc.c b/arch/arm/src/kinetis/kinetis_sdhc.c
index 72754437ea..d385592b40 100644
--- a/arch/arm/src/kinetis/kinetis_sdhc.c
+++ b/arch/arm/src/kinetis/kinetis_sdhc.c
@@ -791,7 +791,7 @@ static void kinetis_transmit(struct kinetis_dev_s *priv)
    * ready (BWR)
    */
 
-  fllvdbg("Entry: remaining: %d IRQSTAT: %08x\n",
+  fllinfo("Entry: remaining: %d IRQSTAT: %08x\n",
           priv->remaining, getreg32(KINETIS_SDHC_IRQSTAT));
 
   while (priv->remaining > 0 &&
@@ -837,7 +837,7 @@ static void kinetis_transmit(struct kinetis_dev_s *priv)
       putreg32(data.w, KINETIS_SDHC_DATPORT);
     }
 
-  fllvdbg("Exit: remaining: %d IRQSTAT: %08x\n",
+  fllinfo("Exit: remaining: %d IRQSTAT: %08x\n",
           priv->remaining, getreg32(KINETIS_SDHC_IRQSTAT));
 
 }
@@ -877,7 +877,7 @@ static void kinetis_receive(struct kinetis_dev_s *priv)
    * ready (BRR)
    */
 
-  fllvdbg("Entry: remaining: %d IRQSTAT: %08x\n",
+  fllinfo("Entry: remaining: %d IRQSTAT: %08x\n",
           priv->remaining, getreg32(KINETIS_SDHC_IRQSTAT));
 
   while (priv->remaining > 0 &&
@@ -929,7 +929,7 @@ static void kinetis_receive(struct kinetis_dev_s *priv)
 
   putreg32(watermark << SDHC_WML_RD_SHIFT, KINETIS_SDHC_WML);
 
-  fllvdbg("Exit: remaining: %d IRQSTAT: %08x WML: %08x\n",
+  fllinfo("Exit: remaining: %d IRQSTAT: %08x WML: %08x\n",
           priv->remaining, getreg32(KINETIS_SDHC_IRQSTAT),
           getreg32(KINETIS_SDHC_WML));
 
@@ -1105,7 +1105,7 @@ static int kinetis_interrupt(int irq, void *context)
 
   regval  = getreg32(KINETIS_SDHC_IRQSIGEN);
   enabled = getreg32(KINETIS_SDHC_IRQSTAT) & regval;
-  fllvdbg("IRQSTAT: %08x IRQSIGEN %08x enabled: %08x\n",
+  fllinfo("IRQSTAT: %08x IRQSIGEN %08x enabled: %08x\n",
           getreg32(KINETIS_SDHC_IRQSTAT), regval, enabled);
 
   /* Disable card interrupts to clear the card interrupt to the host system. */
@@ -1289,7 +1289,7 @@ static void kinetis_reset(FAR struct sdio_dev_s *dev)
 
   putreg32(SDHC_INT_ALL, KINETIS_SDHC_IRQSTATEN);
 
-  fvdbg("SYSCTL: %08x PRSSTAT: %08x IRQSTATEN: %08x\n",
+  finfo("SYSCTL: %08x PRSSTAT: %08x IRQSTATEN: %08x\n",
         getreg32(KINETIS_SDHC_SYSCTL), getreg32(KINETIS_SDHC_PRSSTAT),
         getreg32(KINETIS_SDHC_IRQSTATEN));
 
@@ -1504,7 +1504,7 @@ static void kinetis_frequency(FAR struct sdio_dev_s *dev, uint32_t frequency)
   regval |= (SDHC_SYSCTL_SDCLKEN | SDHC_SYSCTL_PEREN | SDHC_SYSCTL_HCKEN |
              SDHC_SYSCTL_IPGEN);
   putreg32(regval, KINETIS_SDHC_SYSCTL);
-  fvdbg("SYSCTRL: %08x\n", getreg32(KINETIS_SDHC_SYSCTL));
+  finfo("SYSCTRL: %08x\n", getreg32(KINETIS_SDHC_SYSCTL));
 }
 #endif
 
@@ -1538,7 +1538,7 @@ static void kinetis_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate)
   regval  = getreg32(KINETIS_SDHC_SYSCTL);
   regval &= ~SDHC_SYSCTL_SDCLKEN;
   putreg32(regval, KINETIS_SDHC_SYSCTL);
-  fvdbg("SYSCTRL: %08x\n", getreg32(KINETIS_SDHC_SYSCTL));
+  finfo("SYSCTRL: %08x\n", getreg32(KINETIS_SDHC_SYSCTL));
 
   switch (rate)
     {
@@ -1552,7 +1552,7 @@ static void kinetis_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate)
           regval &= ~(SDHC_SYSCTL_IPGEN | SDHC_SYSCTL_HCKEN | SDHC_SYSCTL_PEREN |
                       SDHC_SYSCTL_SDCLKFS_MASK | SDHC_SYSCTL_DVS_MASK);
           putreg32(regval, KINETIS_SDHC_SYSCTL);
-          fvdbg("SYSCTRL: %08x\n", getreg32(KINETIS_SDHC_SYSCTL));
+          finfo("SYSCTRL: %08x\n", getreg32(KINETIS_SDHC_SYSCTL));
           return;
         }
 
@@ -1593,7 +1593,7 @@ static void kinetis_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate)
   regval  = getreg32(KINETIS_SDHC_SYSCTL);
   regval &= ~SDHC_SYSCTL_SDCLKEN;
   putreg32(regval, KINETIS_SDHC_SYSCTL);
-  fvdbg("SYSCTRL: %08x\n", getreg32(KINETIS_SDHC_SYSCTL));
+  finfo("SYSCTRL: %08x\n", getreg32(KINETIS_SDHC_SYSCTL));
 
   /* Clear the old prescaler and divisor values so that new ones can be ORed
    * in.
@@ -1619,7 +1619,7 @@ static void kinetis_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate)
 
           regval &= ~(SDHC_SYSCTL_IPGEN | SDHC_SYSCTL_HCKEN | SDHC_SYSCTL_PEREN);
           putreg32(regval, KINETIS_SDHC_SYSCTL);
-          fvdbg("SYSCTRL: %08x\n", getreg32(KINETIS_SDHC_SYSCTL));
+          finfo("SYSCTRL: %08x\n", getreg32(KINETIS_SDHC_SYSCTL));
           return;
         }
 
@@ -1653,7 +1653,7 @@ static void kinetis_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate)
     }
 
   putreg32(regval, KINETIS_SDHC_SYSCTL);
-  fvdbg("SYSCTRL: %08x\n", getreg32(KINETIS_SDHC_SYSCTL));
+  finfo("SYSCTRL: %08x\n", getreg32(KINETIS_SDHC_SYSCTL));
 }
 #endif
 
@@ -1824,7 +1824,7 @@ static int kinetis_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t ar
 
   /* Other bits? What about CMDTYP? */
 
-  fvdbg("cmd: %08x arg: %08x regval: %08x\n", cmd, arg, regval);
+  finfo("cmd: %08x arg: %08x regval: %08x\n", cmd, arg, regval);
 
   /* The Command Inhibit (CIHB) bit is set in the PRSSTAT bit immediately
    * after the transfer type register is written.  This bit is cleared when
@@ -2486,7 +2486,7 @@ static void kinetis_callbackenable(FAR struct sdio_dev_s *dev,
 {
   struct kinetis_dev_s *priv = (struct kinetis_dev_s *)dev;
 
-  fvdbg("eventset: %02x\n", eventset);
+  finfo("eventset: %02x\n", eventset);
   DEBUGASSERT(priv != NULL);
 
   priv->cbevents = eventset;
@@ -2522,7 +2522,7 @@ static int kinetis_registercallback(FAR struct sdio_dev_s *dev,
 
   /* Disable callbacks and register this callback and is argument */
 
-  fvdbg("Register %p(%p)\n", callback, arg);
+  finfo("Register %p(%p)\n", callback, arg);
   DEBUGASSERT(priv != NULL);
 
   priv->cbevents = 0;
@@ -2694,7 +2694,7 @@ static void kinetis_callback(void *arg)
   /* Is a callback registered? */
 
   DEBUGASSERT(priv != NULL);
-  fvdbg("Callback %p(%p) cbevents: %02x cdstatus: %02x\n",
+  finfo("Callback %p(%p) cbevents: %02x cdstatus: %02x\n",
         priv->callback, priv->cbarg, priv->cbevents, priv->cdstatus);
 
   if (priv->callback)
@@ -2739,14 +2739,14 @@ static void kinetis_callback(void *arg)
         {
           /* Yes.. queue it */
 
-           fvdbg("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg);
+           finfo("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg);
           (void)work_queue(HPWORK, &priv->cbwork, (worker_t)priv->callback, priv->cbarg, 0);
         }
       else
         {
           /* No.. then just call the callback here */
 
-          fvdbg("Callback to %p(%p)\n", priv->callback, priv->cbarg);
+          finfo("Callback to %p(%p)\n", priv->callback, priv->cbarg);
           priv->callback(priv->cbarg);
         }
     }
@@ -2792,7 +2792,7 @@ FAR struct sdio_dev_s *sdhc_initialize(int slotno)
   regval = getreg32(KINETIS_SIM_SCGC3);
   regval |= SIM_SCGC3_SDHC;
   putreg32(regval, KINETIS_SIM_SCGC3);
-  fvdbg("SIM_SCGC3: %08x\n", regval);
+  finfo("SIM_SCGC3: %08x\n", regval);
 
   /* In addition to the system clock, the SDHC module needs a clock for the
    * base for the external card clock.  There are four possible sources for
@@ -2808,7 +2808,7 @@ FAR struct sdio_dev_s *sdhc_initialize(int slotno)
   regval &= ~SIM_SOPT2_SDHCSRC_MASK;
   regval |= SIM_SOPT2_SDHCSRC_CORE;
   putreg32(regval, KINETIS_SIM_SOPT2);
-  fvdbg("SIM_SOPT2: %08x\n", regval);
+  finfo("SIM_SOPT2: %08x\n", regval);
 
   /* Configure pins for 1 or 4-bit, wide-bus operation (the chip is capable
    * of 8-bit wide bus operation but D4-D7 are not configured).
@@ -2892,7 +2892,7 @@ void sdhc_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot)
       priv->cdstatus &= ~SDIO_STATUS_PRESENT;
     }
 
-  fvdbg("cdstatus OLD: %02x NEW: %02x\n", cdstatus, priv->cdstatus);
+  finfo("cdstatus OLD: %02x NEW: %02x\n", cdstatus, priv->cdstatus);
 
   /* Perform any requested callback if the status has changed */
 
@@ -2937,7 +2937,7 @@ void sdhc_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect)
       priv->cdstatus &= ~SDIO_STATUS_WRPROTECTED;
     }
 
-  fvdbg("cdstatus: %02x\n", priv->cdstatus);
+  finfo("cdstatus: %02x\n", priv->cdstatus);
   leave_critical_section(flags);
 }
 #endif /* CONFIG_KINETIS_SDHC */
diff --git a/arch/arm/src/kinetis/kinetis_usbdev.c b/arch/arm/src/kinetis/kinetis_usbdev.c
index 936ea7192f..fdb76f455c 100644
--- a/arch/arm/src/kinetis/kinetis_usbdev.c
+++ b/arch/arm/src/kinetis/kinetis_usbdev.c
@@ -371,9 +371,9 @@ const struct trace_msg_t g_usb_trace_strings_deverror[] =
 
 #  define regdbg lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define regvdbg lldbg
+#    define reginfo lldbg
 #  else
-#    define regvdbg(x...)
+#    define reginfo(x...)
 #  endif
 
 #else
@@ -381,7 +381,7 @@ const struct trace_msg_t g_usb_trace_strings_deverror[] =
 #  define khci_getreg(addr)      getreg8(addr)
 #  define khci_putreg(val,addr)  putreg8(val,addr)
 #  define regdbg(x...)
-#  define regvdbg(x...)
+#  define reginfo(x...)
 
 #endif
 
@@ -391,15 +391,15 @@ const struct trace_msg_t g_usb_trace_strings_deverror[] =
 
 #  define bdtdbg lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define bdtvdbg lldbg
+#    define bdtinfo lldbg
 #  else
-#    define bdtvdbg(x...)
+#    define bdtinfo(x...)
 #  endif
 
 #else
 
 #  define bdtdbg(x...)
-#  define bdtvdbg(x...)
+#  define bdtinfo(x...)
 
 #endif
 
@@ -987,10 +987,10 @@ static void khci_wrcomplete(struct khci_usbdev_s *priv,
   epno   = USB_EPNO(privep->ep.eplog);
 
 #ifdef CONFIG_USBDEV_NOWRITEAHEAD
-  ullvdbg("EP%d: len=%d xfrd=%d inflight=%d\n",
+  ullinfo("EP%d: len=%d xfrd=%d inflight=%d\n",
           epno, privreq->req.len, privreq->req.xfrd, privreq->inflight[0]);
 #else
-  ullvdbg("EP%d: len=%d xfrd=%d inflight={%d, %d}\n",
+  ullinfo("EP%d: len=%d xfrd=%d inflight={%d, %d}\n",
           epno, privreq->req.len, privreq->req.xfrd,
           privreq->inflight[0], privreq->inflight[1]);
 #endif
@@ -1303,7 +1303,7 @@ static int khci_wrstart(struct khci_usbdev_s *priv,
       bytesleft = privreq->req.len;
     }
 
-  ullvdbg("epno=%d req=%p: len=%d xfrd=%d index=%d nullpkt=%d\n",
+  ullinfo("epno=%d req=%p: len=%d xfrd=%d index=%d nullpkt=%d\n",
           epno, privreq, privreq->req.len, xfrd, index, privep->txnullpkt);
 
   /* Get the number of bytes left to be sent in the packet */
@@ -1417,7 +1417,7 @@ static int khci_rdcomplete(struct khci_usbdev_s *priv,
   bdtout = privep->bdtout;
   epno   = USB_EPNO(privep->ep.eplog);
 
-  ullvdbg("EP%d: len=%d xfrd=%d\n",
+  ullinfo("EP%d: len=%d xfrd=%d\n",
           epno, privreq->req.len, privreq->req.xfrd);
   bdtdbg("EP%d BDT OUT [%p] {%08x, %08x}\n",
          epno, bdtout, bdtout->status, bdtout->addr);
@@ -1705,7 +1705,7 @@ static int khci_rdrequest(struct khci_usbdev_s *priv,
       return OK;
     }
 
-  ullvdbg("EP%d: len=%d\n", USB_EPNO(privep->ep.eplog), privreq->req.len);
+  ullinfo("EP%d: len=%d\n", USB_EPNO(privep->ep.eplog), privreq->req.len);
 
   /* Ignore any attempt to receive a zero length packet */
 
@@ -1995,7 +1995,7 @@ static void khci_ep0setup(struct khci_usbdev_s *priv)
   index.w = GETUINT16(priv->ctrl.index);
   len.w   = GETUINT16(priv->ctrl.len);
 
-  ullvdbg("SETUP: type=%02x req=%02x value=%04x index=%04x len=%04x\n",
+  ullinfo("SETUP: type=%02x req=%02x value=%04x index=%04x len=%04x\n",
           priv->ctrl.type, priv->ctrl.req, value.w, index.w, len.w);
 
   /* Dispatch any non-standard requests */
@@ -2239,7 +2239,7 @@ static void khci_ep0setup(struct khci_usbdev_s *priv)
               {
                 /* Special case recipient=device test mode */
 
-                ullvdbg("test mode: %d\n", index.w);
+                ullinfo("test mode: %d\n", index.w);
               }
             else
               {
diff --git a/arch/arm/src/kl/kl_idle.c b/arch/arm/src/kl/kl_idle.c
index e711b39e3c..b8a51b04da 100644
--- a/arch/arm/src/kl/kl_idle.c
+++ b/arch/arm/src/kl/kl_idle.c
@@ -103,7 +103,7 @@ static void up_idlepm(void)
 
       /* Perform board-specific, state-dependent logic here */
 
-      llvdbg("newstate= %d oldstate=%d\n", newstate, oldstate);
+      llinfo("newstate= %d oldstate=%d\n", newstate, oldstate);
 
       /* Then force the global state change */
 
diff --git a/arch/arm/src/kl/kl_pwm.c b/arch/arm/src/kl/kl_pwm.c
index 266bb41770..52249f34fe 100644
--- a/arch/arm/src/kl/kl_pwm.c
+++ b/arch/arm/src/kl/kl_pwm.c
@@ -83,19 +83,19 @@
 #  define pwmdbg              dbg
 #  define pwmlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define pwmvdbg           vdbg
-#    define pwmllvdbg         llvdbg
+#    define pwminfo           info
+#    define pwmllinfo         llinfo
 #    define pwm_dumpgpio(p,m) kl_dumpgpio(p,m)
 #  else
-#    define pwmvdbg(x...)
-#    define pwmllvdbg(x...)
+#    define pwminfo(x...)
+#    define pwmllinfo(x...)
 #    define pwm_dumpgpio(p,m)
 #  endif
 #else
 #  define pwmdbg(x...)
 #  define pwmlldbg(x...)
-#  define pwmvdbg(x...)
-#  define pwmllvdbg(x...)
+#  define pwminfo(x...)
+#  define pwmllinfo(x...)
 #  define pwm_dumpgpio(p,m)
 #endif
 
@@ -258,25 +258,25 @@ static void pwm_dumpregs(struct kl_pwmtimer_s *priv, FAR const char *msg)
 {
   int nchannels = (priv->tpmid == 0) ? 6 : 2;
 
-  pwmvdbg("%s:\n", msg);
-  pwmvdbg("  TPM%d_SC:     %04x   TPM%d_CNT:  %04x     TPM%d_MOD:  %04x\n",
+  pwminfo("%s:\n", msg);
+  pwminfo("  TPM%d_SC:     %04x   TPM%d_CNT:  %04x     TPM%d_MOD:  %04x\n",
           priv->tpmid,
           pwm_getreg(priv, TPM_SC_OFFSET),
           priv->tpmid,
           pwm_getreg(priv, TPM_CNT_OFFSET),
           priv->tpmid,
           pwm_getreg(priv, TPM_MOD_OFFSET));
-  pwmvdbg("  TPM%d_STATUS: %04x   TPM%d_CONF: %04x\n",
+  pwminfo("  TPM%d_STATUS: %04x   TPM%d_CONF: %04x\n",
           priv->tpmid,
           pwm_getreg(priv, TPM_STATUS_OFFSET),
           priv->tpmid,
           pwm_getreg(priv, TPM_CONF_OFFSET));
-  pwmvdbg("   TPM%d_C0SC:  %04x   TPM%d_C0V:  %04x\n",
+  pwminfo("   TPM%d_C0SC:  %04x   TPM%d_C0V:  %04x\n",
           priv->tpmid,
           pwm_getreg(priv, TPM_C0SC_OFFSET),
           priv->tpmid,
           pwm_getreg(priv, TPM_C0V_OFFSET));
-  pwmvdbg("   TPM%d_C1SC:  %04x   TPM%d_C1V:  %04x\n",
+  pwminfo("   TPM%d_C1SC:  %04x   TPM%d_C1V:  %04x\n",
           priv->tpmid,
           pwm_getreg(priv, TPM_C1SC_OFFSET),
           priv->tpmid,
@@ -284,7 +284,7 @@ static void pwm_dumpregs(struct kl_pwmtimer_s *priv, FAR const char *msg)
 
   if (nchannels >= 3)
     {
-      pwmvdbg("   TPM%d_C2SC:  %04x   TPM%d_C2V:  %04x\n",
+      pwminfo("   TPM%d_C2SC:  %04x   TPM%d_C2V:  %04x\n",
               priv->tpmid,
               pwm_getreg(priv, TPM_C2SC_OFFSET),
               priv->tpmid,
@@ -293,7 +293,7 @@ static void pwm_dumpregs(struct kl_pwmtimer_s *priv, FAR const char *msg)
 
   if (nchannels >= 4)
     {
-      pwmvdbg("   TPM%d_C3SC:  %04x   TPM%d_C3V:  %04x\n",
+      pwminfo("   TPM%d_C3SC:  %04x   TPM%d_C3V:  %04x\n",
               priv->tpmid,
               pwm_getreg(priv, TPM_C3SC_OFFSET),
               priv->tpmid,
@@ -302,7 +302,7 @@ static void pwm_dumpregs(struct kl_pwmtimer_s *priv, FAR const char *msg)
 
   if (nchannels >= 5)
     {
-      pwmvdbg("   TPM%d_C4SC:  %04x   TPM%d_C4V:  %04x\n",
+      pwminfo("   TPM%d_C4SC:  %04x   TPM%d_C4V:  %04x\n",
               priv->tpmid,
               pwm_getreg(priv, TPM_C4SC_OFFSET),
               priv->tpmid,
@@ -311,7 +311,7 @@ static void pwm_dumpregs(struct kl_pwmtimer_s *priv, FAR const char *msg)
 
   if (nchannels >= 6)
     {
-      pwmvdbg("   TPM%d_C5SC:  %04x   TPM%d_C5V:  %04x\n",
+      pwminfo("   TPM%d_C5SC:  %04x   TPM%d_C5V:  %04x\n",
               priv->tpmid,
               pwm_getreg(priv, TPM_C5SC_OFFSET),
               priv->tpmid,
@@ -353,7 +353,7 @@ static int pwm_timer(FAR struct kl_pwmtimer_s *priv,
 
   DEBUGASSERT(priv != NULL && info != NULL);
 
-  pwmvdbg("TPM%d channel: %d frequency: %d duty: %08x\n",
+  pwminfo("TPM%d channel: %d frequency: %d duty: %08x\n",
           priv->tpmid, priv->channel, info->frequency, info->duty);
 
   DEBUGASSERT(info->frequency > 0 && info->duty > 0 &&
@@ -423,7 +423,7 @@ static int pwm_timer(FAR struct kl_pwmtimer_s *priv,
 
   cv = b16toi(info->duty * modulo + b16HALF);
 
-  pwmvdbg("TPM%d PCLK: %d frequency: %d TPMCLK: %d prescaler: %d modulo: %d c0v: %d\n",
+  pwminfo("TPM%d PCLK: %d frequency: %d TPMCLK: %d prescaler: %d modulo: %d c0v: %d\n",
           priv->tpmid, priv->pclk, info->frequency, tpmclk,
           presc_values[prescaler], modulo, cv);
 
@@ -530,7 +530,7 @@ static int pwm_setup(FAR struct pwm_lowerhalf_s *dev)
   regval |= SIM_SCGC6_TPM0 | SIM_SCGC6_TPM1 | SIM_SCGC6_TPM2;
   putreg32(regval, KL_SIM_SCGC6);
 
-  pwmvdbg("TPM%d pincfg: %08x\n", priv->tpmid, priv->pincfg);
+  pwminfo("TPM%d pincfg: %08x\n", priv->tpmid, priv->pincfg);
   pwm_dumpregs(priv, "Initially");
 
   /* Configure the PWM output pin, but do not start the timer yet */
@@ -561,7 +561,7 @@ static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev)
   FAR struct kl_pwmtimer_s *priv = (FAR struct kl_pwmtimer_s *)dev;
   uint32_t pincfg;
 
-  pwmvdbg("TPM%d pincfg: %08x\n", priv->tpmid, priv->pincfg);
+  pwminfo("TPM%d pincfg: %08x\n", priv->tpmid, priv->pincfg);
 
   /* Make sure that the output has been stopped */
 
@@ -621,7 +621,7 @@ static int pwm_stop(FAR struct pwm_lowerhalf_s *dev)
   FAR struct kl_pwmtimer_s *priv = (FAR struct kl_pwmtimer_s *)dev;
   irqstate_t flags;
 
-  pwmvdbg("TPM%d\n", priv->tpmid);
+  pwminfo("TPM%d\n", priv->tpmid);
 
   /* Disable interrupts momentary to stop any ongoing timer processing and
    * to prevent any concurrent access to the reset register.
@@ -696,7 +696,7 @@ static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, int cmd, unsigned long arg
 
   /* There are no platform-specific ioctl commands */
 
-  pwmvdbg("TPM%d\n", priv->tpmid);
+  pwminfo("TPM%d\n", priv->tpmid);
 #endif
   return -ENOTTY;
 }
@@ -724,7 +724,7 @@ FAR struct pwm_lowerhalf_s *kl_pwminitialize(int timer)
 {
   FAR struct kl_pwmtimer_s *lower;
 
-  pwmvdbg("TPM%d\n", timer);
+  pwminfo("TPM%d\n", timer);
 
   switch (timer)
     {
diff --git a/arch/arm/src/kl/kl_spi.c b/arch/arm/src/kl/kl_spi.c
index 741e75c371..eacebac98a 100644
--- a/arch/arm/src/kl/kl_spi.c
+++ b/arch/arm/src/kl/kl_spi.c
@@ -73,13 +73,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /****************************************************************************
@@ -388,7 +388,7 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode)
   FAR struct kl_spidev_s *priv = (FAR struct kl_spidev_s *)dev;
   uint8_t regval;
 
-  spivdbg("mode=%d\n", mode);
+  spiinfo("mode=%d\n", mode);
 
   /* Has the mode changed? */
 
@@ -519,7 +519,7 @@ static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
   FAR uint8_t *txptr = (FAR uint8_t *)txbuffer;
   uint8_t data;
 
-  spivdbg("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords);
+  spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords);
 
   /* Loop, sending each word in the user-provied data buffer. */
 
@@ -585,7 +585,7 @@ static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
 static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
                          size_t nwords)
 {
-  spivdbg("txbuffer=%p nwords=%d\n", txbuffer, nwords);
+  spiinfo("txbuffer=%p nwords=%d\n", txbuffer, nwords);
   return spi_exchange(dev, txbuffer, NULL, nwords);
 }
 #endif
@@ -612,7 +612,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
 #ifndef CONFIG_SPI_EXCHANGE
 static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *rxbuffer, size_t nwords)
 {
-  spivdbg("rxbuffer=%p nwords=%d\n", rxbuffer, nwords);
+  spiinfo("rxbuffer=%p nwords=%d\n", rxbuffer, nwords);
   return spi_exchange(dev, NULL, rxbuffer, nwords);
 }
 #endif
diff --git a/arch/arm/src/lpc11xx/lpc11_serial.c b/arch/arm/src/lpc11xx/lpc11_serial.c
index 86e3feb11c..02f6ef37d3 100644
--- a/arch/arm/src/lpc11xx/lpc11_serial.c
+++ b/arch/arm/src/lpc11xx/lpc11_serial.c
@@ -630,7 +630,7 @@ static int up_interrupt(int irq, void *context)
               /* Read the line status register (LSR) to clear */
 
               status = up_serialin(priv, LPC11_UART_LSR_OFFSET);
-              vdbg("LSR: %02x\n", status);
+              info("LSR: %02x\n", status);
               break;
             }
 
diff --git a/arch/arm/src/lpc11xx/lpc11_spi.c b/arch/arm/src/lpc11xx/lpc11_spi.c
index e0422372c2..942ff3e2fc 100644
--- a/arch/arm/src/lpc11xx/lpc11_spi.c
+++ b/arch/arm/src/lpc11xx/lpc11_spi.c
@@ -82,13 +82,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /* SSP Clocking *************************************************************/
diff --git a/arch/arm/src/lpc11xx/lpc11_ssp.c b/arch/arm/src/lpc11xx/lpc11_ssp.c
index 0e1889c3be..7ebb1b3bdb 100644
--- a/arch/arm/src/lpc11xx/lpc11_ssp.c
+++ b/arch/arm/src/lpc11xx/lpc11_ssp.c
@@ -83,13 +83,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define sspdbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define sspdbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /* SSP Clocking *************************************************************/
@@ -754,7 +754,7 @@ static void ssp_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer,
        * and (3) there are more bytes to be sent.
        */
 
-      spivdbg("TX: rxpending: %d nwords: %d\n", rxpending, nwords);
+      spiinfo("TX: rxpending: %d nwords: %d\n", rxpending, nwords);
       while ((ssp_getreg(priv, LPC11_SSP_SR_OFFSET) & SSP_SR_TNF) &&
              (rxpending < LPC11_SSP_FIFOSZ) && nwords)
         {
@@ -767,7 +767,7 @@ static void ssp_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer,
        * empty.
        */
 
-      spivdbg("RX: rxpending: %d\n", rxpending);
+      spiinfo("RX: rxpending: %d\n", rxpending);
       while (ssp_getreg(priv, LPC11_SSP_SR_OFFSET) & SSP_SR_RNE)
         {
           data = (uint8_t)ssp_getreg(priv, LPC11_SSP_DR_OFFSET);
diff --git a/arch/arm/src/lpc11xx/lpc11_timer.c b/arch/arm/src/lpc11xx/lpc11_timer.c
index 01c2554279..a7b995fd90 100644
--- a/arch/arm/src/lpc11xx/lpc11_timer.c
+++ b/arch/arm/src/lpc11xx/lpc11_timer.c
@@ -92,19 +92,19 @@
 #  define pwmdbg              dbg
 #  define pwmlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define pwmvdbg           vdbg
-#    define pwmllvdbg         llvdbg
+#    define pwminfo           info
+#    define pwmllinfo         llinfo
 #    define pwm_dumpgpio(p,m) stm32_dumpgpio(p,m)
 #  else
-#    define pwmvdbg(x...)
-#    define pwmllvdbg(x...)
+#    define pwminfo(x...)
+#    define pwmllinfo(x...)
 #    define pwm_dumpgpio(p,m)
 #  endif
 #else
 #  define pwmdbg(x...)
 #  define pwmlldbg(x...)
-#  define pwmvdbg(x...)
-#  define pwmllvdbg(x...)
+#  define pwminfo(x...)
+#  define pwmllinfo(x...)
 #  define pwm_dumpgpio(p,m)
 #endif
 
diff --git a/arch/arm/src/lpc17xx/lpc176x_rtc.c b/arch/arm/src/lpc17xx/lpc176x_rtc.c
index a0aa525ff7..fbec7c40e2 100644
--- a/arch/arm/src/lpc17xx/lpc176x_rtc.c
+++ b/arch/arm/src/lpc17xx/lpc176x_rtc.c
@@ -82,14 +82,14 @@
 
 #ifdef CONFIG_DEBUG_RTC
 #  define rtcdbg    dbg
-#  define rtcvdbg   vdbg
+#  define rtcinfo   info
 #  define rtclldbg  lldbg
-#  define rtcllvdbg llvdbg
+#  define rtcllinfo llinfo
 #else
 #  define rtcdbg(x...)
-#  define rtcvdbg(x...)
+#  define rtcinfo(x...)
 #  define rtclldbg(x...)
-#  define rtcllvdbg(x...)
+#  define rtcllinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/arch/arm/src/lpc17xx/lpc17_can.c b/arch/arm/src/lpc17xx/lpc17_can.c
index c3949f2778..ea08c70fe1 100644
--- a/arch/arm/src/lpc17xx/lpc17_can.c
+++ b/arch/arm/src/lpc17xx/lpc17_can.c
@@ -167,18 +167,18 @@
 #ifdef CONFIG_DEBUG_CAN
 #  ifdef CONFIG_CAN_REGDEBUG
 #    define candbg  lldbg
-#    define canvdbg llvdbg
+#    define caninfo llinfo
 #  else
 #    define candbg  dbg
-#    define canvdbg vdbg
+#    define caninfo info
 #  endif
 #  define canlldbg  lldbg
-#  define canllvdbg llvdbg
+#  define canllinfo llinfo
 #else
 #  define candbg(x...)
-#  define canvdbg(x...)
+#  define caninfo(x...)
 #  define canlldbg(x...)
-#  define canllvdbg(x...)
+#  define canllinfo(x...)
 #endif
 
 /* Timing *******************************************************************/
@@ -504,7 +504,7 @@ static void can_reset(FAR struct can_dev_s *dev)
   irqstate_t flags;
   int ret;
 
-  canvdbg("CAN%d\n", priv->port);
+  caninfo("CAN%d\n", priv->port);
 
   flags = enter_critical_section();
 
@@ -558,7 +558,7 @@ static int can_setup(FAR struct can_dev_s *dev)
 #endif
   int ret;
 
-  canvdbg("CAN%d\n", priv->port);
+  caninfo("CAN%d\n", priv->port);
 
   ret = irq_attach(LPC17_IRQ_CAN, can12_interrupt);
   if (ret == OK)
@@ -588,7 +588,7 @@ static void can_shutdown(FAR struct can_dev_s *dev)
 #ifdef CONFIG_DEBUG_CAN
   FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->cd_priv;
 
-  canvdbg("CAN%d\n", priv->port);
+  caninfo("CAN%d\n", priv->port);
 #endif
 
   up_disable_irq(LPC17_IRQ_CAN);
@@ -615,7 +615,7 @@ static void can_rxint(FAR struct can_dev_s *dev, bool enable)
   uint32_t regval;
   irqstate_t flags;
 
-  canvdbg("CAN%d enable: %d\n", priv->port, enable);
+  caninfo("CAN%d enable: %d\n", priv->port, enable);
 
   /* The EIR register is also modifed from the interrupt handler, so we have
    * to protect this code section.
@@ -656,7 +656,7 @@ static void can_txint(FAR struct can_dev_s *dev, bool enable)
   uint32_t regval;
   irqstate_t flags;
 
-  canvdbg("CAN%d enable: %d\n", priv->port, enable);
+  caninfo("CAN%d enable: %d\n", priv->port, enable);
 
   /* Only disabling of the TX interrupt is supported here.  The TX interrupt
    * is automatically enabled just before a message is sent in order to avoid
@@ -753,7 +753,7 @@ static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg)
   irqstate_t flags;
   int ret = OK;
 
-  canvdbg("CAN%d ID: %d DLC: %d\n",
+  caninfo("CAN%d ID: %d DLC: %d\n",
           priv->port, msg->cm_hdr.ch_id, msg->cm_hdr.ch_dlc);
 
   if (msg->cm_hdr.ch_rtr)
@@ -958,7 +958,7 @@ static void can_interrupt(FAR struct can_dev_s *dev)
   /* Read the interrupt and capture register (also clearing most status bits) */
 
   regval = can_getreg(priv, LPC17_CAN_ICR_OFFSET);
-  canllvdbg("CAN%d ICR: %08x\n",  priv->port, regval);
+  canllinfo("CAN%d ICR: %08x\n",  priv->port, regval);
 
   /* Check for a receive interrupt */
 
@@ -1065,7 +1065,7 @@ static int can12_interrupt(int irq, void *context)
 {
   /* Handle CAN1/2 interrupts */
 
-  canllvdbg("irq: %d\n",  irq);
+  canllinfo("irq: %d\n",  irq);
 
 #ifdef CONFIG_LPC17_CAN1
   can_interrupt(&g_can1dev);
@@ -1142,7 +1142,7 @@ static int can_bittiming(struct up_dev_s *priv)
   uint32_t ts2;
   uint32_t sjw;
 
-  canllvdbg("CAN%d PCLK: %d baud: %d\n", priv->port,
+  canllinfo("CAN%d PCLK: %d baud: %d\n", priv->port,
             CAN_CLOCK_FREQUENCY(priv->divisor), priv->baud);
 
   /* Try to get CAN_BIT_QUANTA quanta in one bit_time.
@@ -1195,7 +1195,7 @@ static int can_bittiming(struct up_dev_s *priv)
 
   sjw = 1;
 
-  canllvdbg("TS1: %d TS2: %d BRP: %d SJW= %d\n", ts1, ts2, brp, sjw);
+  canllinfo("TS1: %d TS2: %d BRP: %d SJW= %d\n", ts1, ts2, brp, sjw);
 
   /* Configure bit timing */
 
@@ -1212,7 +1212,7 @@ static int can_bittiming(struct up_dev_s *priv)
   btr |= CAN_BTR_SAM;
 #endif
 
-  canllvdbg("Setting CANxBTR= 0x%08x\n", btr);
+  canllinfo("Setting CANxBTR= 0x%08x\n", btr);
   can_putreg(priv, LPC17_CAN_BTR_OFFSET, btr);        /* Set bit timing */
   return OK;
 }
@@ -1240,7 +1240,7 @@ FAR struct can_dev_s *lpc17_caninitialize(int port)
   irqstate_t flags;
   uint32_t regval;
 
-  canllvdbg("CAN%d\n",  port);
+  canllinfo("CAN%d\n",  port);
 
   flags = enter_critical_section();
 
diff --git a/arch/arm/src/lpc17xx/lpc17_ethernet.c b/arch/arm/src/lpc17xx/lpc17_ethernet.c
index 4bc992d2ce..5180204a32 100644
--- a/arch/arm/src/lpc17xx/lpc17_ethernet.c
+++ b/arch/arm/src/lpc17xx/lpc17_ethernet.c
@@ -906,7 +906,7 @@ static void lpc17_rxdone_process(struct lpc17_driver_s *priv)
 #ifdef CONFIG_NET_IPv4
           if (BUF->type == HTONS(ETHTYPE_IP))
             {
-              nllvdbg("IPv4 frame\n");
+              nllinfo("IPv4 frame\n");
               NETDEV_RXIPV4(&priv->lp_dev);
 
               /* Handle ARP on input then give the IPv4 packet to the
@@ -948,7 +948,7 @@ static void lpc17_rxdone_process(struct lpc17_driver_s *priv)
 #ifdef CONFIG_NET_IPv6
           if (BUF->type == HTONS(ETHTYPE_IP6))
             {
-              nllvdbg("Iv6 frame\n");
+              nllinfo("Iv6 frame\n");
               NETDEV_RXIPV6(&priv->lp_dev);
 
               /* Give the IPv6 packet to the network layer */
@@ -1671,7 +1671,7 @@ static void lpc17_ipv6multicast(FAR struct lpc17_driver_s *priv)
   mac[4] = tmp16 & 0xff;
   mac[5] = tmp16 >> 8;
 
-  nvdbg("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  ninfo("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n",
         mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
   (void)lpc17_addmac(dev, mac);
@@ -2145,7 +2145,7 @@ static int lpc17_addmac(struct net_driver_s *dev, const uint8_t *mac)
   uint32_t crc;
   unsigned int ndx;
 
-  nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
           mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
   /* Hash function:
@@ -2221,7 +2221,7 @@ static int lpc17_rmmac(struct net_driver_s *dev, const uint8_t *mac)
   uint32_t crc;
   unsigned int ndx;
 
-  nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
           mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
   /* Hash function:
@@ -2647,14 +2647,14 @@ static inline int lpc17_phyinit(struct lpc17_driver_s *priv)
        */
 
       phyreg = (unsigned int)lpc17_phyread(phyaddr, MII_PHYID1);
-      nvdbg("Addr: %d PHY ID1: %04x\n", phyaddr, phyreg);
+      ninfo("Addr: %d PHY ID1: %04x\n", phyaddr, phyreg);
 
       /* Compare OUI bits 3-18 */
 
       if (phyreg == LPC17_PHYID1)
         {
           phyreg = lpc17_phyread(phyaddr, MII_PHYID2);
-          nvdbg("Addr: %d PHY ID2: %04x\n", phyaddr, phyreg);
+          ninfo("Addr: %d PHY ID2: %04x\n", phyaddr, phyreg);
 
           /* Compare OUI bits 19-24 and the 6-bit model number (ignoring the
            * 4-bit revision number).
@@ -2676,7 +2676,7 @@ static inline int lpc17_phyinit(struct lpc17_driver_s *priv)
       ndbg("No PHY detected\n");
       return -ENODEV;
     }
-  nvdbg("phyaddr: %d\n", phyaddr);
+  ninfo("phyaddr: %d\n", phyaddr);
 
   /* Save the discovered PHY device address */
 
diff --git a/arch/arm/src/lpc17xx/lpc17_lcd.c b/arch/arm/src/lpc17xx/lpc17_lcd.c
index 79be36191c..0c0af0cd7c 100644
--- a/arch/arm/src/lpc17xx/lpc17_lcd.c
+++ b/arch/arm/src/lpc17xx/lpc17_lcd.c
@@ -202,7 +202,7 @@ struct fb_vtable_s g_fbobject =
 static int lpc17_getvideoinfo(FAR struct fb_vtable_s *vtable,
                               FAR struct fb_videoinfo_s *vinfo)
 {
-  gvdbg("vtable=%p vinfo=%p\n", vtable, vinfo);
+  ginfo("vtable=%p vinfo=%p\n", vtable, vinfo);
   if (vtable && vinfo)
     {
       memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s));
@@ -220,7 +220,7 @@ static int lpc17_getvideoinfo(FAR struct fb_vtable_s *vtable,
 static int lpc17_getplaneinfo(FAR struct fb_vtable_s *vtable, int planeno,
                               FAR struct fb_planeinfo_s *pinfo)
 {
-  gvdbg("vtable=%p planeno=%d pinfo=%p\n", vtable, planeno, pinfo);
+  ginfo("vtable=%p planeno=%d pinfo=%p\n", vtable, planeno, pinfo);
   if (vtable && planeno == 0 && pinfo)
     {
       memcpy(pinfo, &g_planeinfo, sizeof(struct fb_planeinfo_s));
@@ -244,7 +244,7 @@ static int lpc17_getcmap(FAR struct fb_vtable_s *vtable,
   int last;
   int i;
 
-  gvdbg("vtable=%p cmap=%p first=%d len=%d\n",
+  ginfo("vtable=%p cmap=%p first=%d len=%d\n",
         vtable, cmap, cmap->first, cmap->len);
 
   DEBUGASSERT(vtable && cmap &&
@@ -319,7 +319,7 @@ static int lpc17_putcmap(FAR struct fb_vtable_s *vtable,
   int last;
   int i;
 
-  gvdbg("vtable=%p cmap=%p first=%d len=%d\n",
+  ginfo("vtable=%p cmap=%p first=%d len=%d\n",
         vtable, cmap, cmap->first, cmap->len);
 
   DEBUGASSERT(vtable && cmap);
@@ -383,21 +383,21 @@ static int lpc17_putcmap(FAR struct fb_vtable_s *vtable,
 static int lpc17_getcursor(FAR struct fb_vtable_s *vtable,
                         FAR struct fb_cursorattrib_s *attrib)
 {
-  gvdbg("vtable=%p attrib=%p\n", vtable, attrib);
+  ginfo("vtable=%p attrib=%p\n", vtable, attrib);
   if (vtable && attrib)
     {
 #ifdef CONFIG_FB_HWCURSORIMAGE
       attrib->fmt = LPC17_COLOR_FMT;
 #endif
 
-      gvdbg("pos: (x=%d, y=%d)\n", g_cpos.x, g_cpos.y);
+      ginfo("pos: (x=%d, y=%d)\n", g_cpos.x, g_cpos.y);
       attrib->pos = g_cpos;
 
 #ifdef CONFIG_FB_HWCURSORSIZE
       attrib->mxsize.h = CONFIG_LPC17_LCD_VHEIGHT;
       attrib->mxsize.w = CONFIG_LPC17_LCD_HWIDTH;
 
-      gvdbg("size: (h=%d, w=%d)\n", g_csize.h, g_csize.w);
+      ginfo("size: (h=%d, w=%d)\n", g_csize.h, g_csize.w);
       attrib->size = g_csize;
 #endif
       return OK;
@@ -416,26 +416,26 @@ static int lpc17_getcursor(FAR struct fb_vtable_s *vtable,
 static int lpc17_setcursor(FAR struct fb_vtable_s *vtable,
                        FAR struct fb_setcursor_s *setttings)
 {
-  gvdbg("vtable=%p setttings=%p\n", vtable, setttings);
+  ginfo("vtable=%p setttings=%p\n", vtable, setttings);
   if (vtable && setttings)
     {
-      gvdbg("flags: %02x\n", settings->flags);
+      ginfo("flags: %02x\n", settings->flags);
       if ((flags & FB_CUR_SETPOSITION) != 0)
         {
           g_cpos = settings->pos;
-          gvdbg("pos: (h:%d, w:%d)\n", g_cpos.x, g_cpos.y);
+          ginfo("pos: (h:%d, w:%d)\n", g_cpos.x, g_cpos.y);
         }
 #ifdef CONFIG_FB_HWCURSORSIZE
       if ((flags & FB_CUR_SETSIZE) != 0)
         {
           g_csize = settings->size;
-          gvdbg("size: (h:%d, w:%d)\n", g_csize.h, g_csize.w);
+          ginfo("size: (h:%d, w:%d)\n", g_csize.h, g_csize.w);
         }
 #endif
 #ifdef CONFIG_FB_HWCURSORIMAGE
       if ((flags & FB_CUR_SETIMAGE) != 0)
         {
-          gvdbg("image: (h:%d, w:%d) @ %p\n",
+          ginfo("image: (h:%d, w:%d) @ %p\n",
                 settings->img.height, settings->img.width,
                 settings->img.image);
         }
@@ -473,7 +473,7 @@ int up_fbinitialize(int display)
   uint32_t regval;
   int i;
 
-  gvdbg("Entry\n");
+  ginfo("Entry\n");
 
   /* Give LCD bus priority */
 
@@ -485,7 +485,7 @@ int up_fbinitialize(int display)
   /* Configure pins */
   /* Video data */
 
-  gvdbg("Configuring pins\n");
+  ginfo("Configuring pins\n");
 
   lpc17_configgpio(GPIO_LCD_VD0);
   lpc17_configgpio(GPIO_LCD_VD1);
@@ -528,7 +528,7 @@ int up_fbinitialize(int display)
 
   modifyreg32(LPC17_SYSCON_PCONP, 0, SYSCON_PCONP_PCLCD);
 
-  gvdbg("Configuring the LCD controller\n");
+  ginfo("Configuring the LCD controller\n");
 
   /* Disable the cursor */
 
@@ -686,7 +686,7 @@ int up_fbinitialize(int display)
 #endif
 
   putreg32(0, LPC17_LCD_INTMSK);
-  gvdbg("Enabling the display\n");
+  ginfo("Enabling the display\n");
 
   for (i = LPC17_LCD_PWREN_DELAY; i; i--);
 
@@ -727,7 +727,7 @@ int up_fbinitialize(int display)
 
 FAR struct fb_vtable_s *up_fbgetvplane(int display, int vplane)
 {
-  gvdbg("vplane: %d\n", vplane);
+  ginfo("vplane: %d\n", vplane);
   if (vplane == 0)
     {
       return &g_fbobject;
@@ -801,14 +801,14 @@ void lpc17_lcdclear(nxgl_mxpixel_t color)
 #if LPC17_BPP > 16
   uint32_t *dest = (uint32_t *)CONFIG_LPC17_LCD_VRAMBASE;
 
-  gvdbg("Clearing display: color=%08x VRAM=%08x size=%d\n",
+  ginfo("Clearing display: color=%08x VRAM=%08x size=%d\n",
         color, CONFIG_LPC17_LCD_VRAMBASE,
         CONFIG_LPC17_LCD_HWIDTH * CONFIG_LPC17_LCD_VHEIGHT * sizeof(uint32_t));
 
 #else
   uint16_t *dest = (uint16_t *)CONFIG_LPC17_LCD_VRAMBASE;
 
-  gvdbg("Clearing display: color=%08x VRAM=%08x size=%d\n",
+  ginfo("Clearing display: color=%08x VRAM=%08x size=%d\n",
         color, CONFIG_LPC17_LCD_VRAMBASE,
         CONFIG_LPC17_LCD_HWIDTH * CONFIG_LPC17_LCD_VHEIGHT * sizeof(uint16_t));
 #endif
diff --git a/arch/arm/src/lpc17xx/lpc17_mcpwm.c b/arch/arm/src/lpc17xx/lpc17_mcpwm.c
index 831132a3d6..04c1830dad 100644
--- a/arch/arm/src/lpc17xx/lpc17_mcpwm.c
+++ b/arch/arm/src/lpc17xx/lpc17_mcpwm.c
@@ -91,19 +91,19 @@
 #  define pwmdbg              dbg
 #  define pwmlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define pwmvdbg           vdbg
-#    define pwmllvdbg         llvdbg
+#    define pwminfo           info
+#    define pwmllinfo         llinfo
 #    define pwm_dumpgpio(p,m) stm32_dumpgpio(p,m)
 #  else
-#    define pwmvdbg(x...)
-#    define pwmllvdbg(x...)
+#    define pwminfo(x...)
+#    define pwmllinfo(x...)
 #    define pwm_dumpgpio(p,m)
 #  endif
 #else
 #  define pwmdbg(x...)
 #  define pwmlldbg(x...)
-#  define pwmvdbg(x...)
-#  define pwmllvdbg(x...)
+#  define pwminfo(x...)
+#  define pwmllinfo(x...)
 #  define pwm_dumpgpio(p,m)
 #endif
 
@@ -246,8 +246,8 @@ static void mcpwm_putreg(struct lpc17_mcpwmtimer_s *priv, int offset, uint32_t v
 static void mcpwm_dumpregs(FAR struct lpc17_mcpwmtimer_s *priv,
                            FAR const char *msg)
 {
-  pwmvdbg("%s:\n", msg);
-  pwmvdbg("  CR1: %04x CR2:  %04x SMCR:  %04x DIER:  %04x\n",
+  pwminfo("%s:\n", msg);
+  pwminfo("  CR1: %04x CR2:  %04x SMCR:  %04x DIER:  %04x\n",
           mcpwm_getreg(priv, LPC17_PWM_MR0_OFFSET),
           mcpwm_getreg(priv, LPC17_PWM_MR1_OFFSET),
           mcpwm_getreg(priv, LPC17_PWM_MR2_OFFSET),
@@ -255,7 +255,7 @@ static void mcpwm_dumpregs(FAR struct lpc17_mcpwmtimer_s *priv,
 #if defined(CONFIG_LPC17_MCPWM)
   if (priv->timtype == TIMTYPE_ADVANCED)
     {
-      pwmvdbg("  RCR: %04x BDTR: %04x DCR:   %04x DMAR:  %04x\n",
+      pwminfo("  RCR: %04x BDTR: %04x DCR:   %04x DMAR:  %04x\n",
               mcpwm_getreg(priv, LPC17_PWM_MR0_OFFSET),
               mcpwm_getreg(priv, LPC17_PWM_MR1_OFFSET),
               mcpwm_getreg(priv, LPC17_PWM_MR2_OFFSET),
@@ -264,7 +264,7 @@ static void mcpwm_dumpregs(FAR struct lpc17_mcpwmtimer_s *priv,
   else
 #endif
     {
-      pwmvdbg("  DCR: %04x DMAR: %04x\n",
+      pwminfo("  DCR: %04x DMAR: %04x\n",
               mcpwm_getreg(priv, LPC17_PWM_MR2_OFFSET),
               mcpwm_getreg(priv, LPC17_PWM_MR3_OFFSET));
     }
@@ -520,7 +520,7 @@ static int mcpwm_shutdown(FAR struct pwm_lowerhalf_s *dev)
   FAR struct lpc17_mcpwmtimer_s *priv = (FAR struct lpc17_mcpwmtimer_s *)dev;
   uint32_t pincfg;
 
-  pwmvdbg("TIM%d pincfg: %08x\n", priv->timid, priv->pincfg);
+  pwminfo("TIM%d pincfg: %08x\n", priv->timid, priv->pincfg);
 
   /* Make sure that the output has been stopped */
 
@@ -576,7 +576,7 @@ static int mcpwm_stop(FAR struct pwm_lowerhalf_s *dev)
   uint32_t regval;
   irqstate_t flags;
 
-  pwmvdbg("TIM%d\n", priv->timid);
+  pwminfo("TIM%d\n", priv->timid);
 
   /* Disable interrupts momentary to stop any ongoing timer processing and
    * to prevent any concurrent access to the reset register.
@@ -602,7 +602,7 @@ static int mcpwm_stop(FAR struct pwm_lowerhalf_s *dev)
 
   leave_critical_section(flags);
 
-  pwmvdbg("regaddr: %08x resetbit: %08x\n", regaddr, resetbit);
+  pwminfo("regaddr: %08x resetbit: %08x\n", regaddr, resetbit);
   mcpwm_dumpregs(priv, "After stop");
   return OK;
 }
@@ -630,7 +630,7 @@ static int mcpwm_ioctl(FAR struct pwm_lowerhalf_s *dev, int cmd, unsigned long a
 
   /* There are no platform-specific ioctl commands */
 
-  pwmvdbg("TIM%d\n", priv->timid);
+  pwminfo("TIM%d\n", priv->timid);
 #endif
   return -ENOTTY;
 }
@@ -660,7 +660,7 @@ FAR struct pwm_lowerhalf_s *lpc17_mcpwminitialize(int timer)
 {
   FAR struct lpc17_mcpwmtimer_s *lower;
 
-  pwmvdbg("TIM%d\n", timer);
+  pwminfo("TIM%d\n", timer);
 
   switch (timer)
     {
diff --git a/arch/arm/src/lpc17xx/lpc17_pwm.c b/arch/arm/src/lpc17xx/lpc17_pwm.c
index 66794cdc65..3fdb7397ac 100644
--- a/arch/arm/src/lpc17xx/lpc17_pwm.c
+++ b/arch/arm/src/lpc17xx/lpc17_pwm.c
@@ -109,19 +109,19 @@
 #  define pwmdbg              dbg
 #  define pwmlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define pwmvdbg           vdbg
-#    define pwmllvdbg         llvdbg
+#    define pwminfo           info
+#    define pwmllinfo         llinfo
 #    define pwm_dumpgpio(p,m) stm32_dumpgpio(p,m)
 #  else
-#    define pwmvdbg(x...)
-#    define pwmllvdbg(x...)
+#    define pwminfo(x...)
+#    define pwmllinfo(x...)
 #    define pwm_dumpgpio(p,m)
 #  endif
 #else
 #  define pwmdbg(x...)
 #  define pwmlldbg(x...)
-#  define pwmvdbg(x...)
-#  define pwmllvdbg(x...)
+#  define pwminfo(x...)
+#  define pwmllinfo(x...)
 #  define pwm_dumpgpio(p,m)
 #endif
 
@@ -261,8 +261,8 @@ static void pwm_putreg(struct lpc17_pwmtimer_s *priv, int offset, uint32_t value
 #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);
-  pwmvdbg("  CR1: %04x CR2:  %04x SMCR:  %04x DIER:  %04x\n",
+  pwminfo("%s:\n", msg);
+  pwminfo("  CR1: %04x CR2:  %04x SMCR:  %04x DIER:  %04x\n",
           pwm_getreg(priv, LPC17_PWM_MR0_OFFSET),
           pwm_getreg(priv, LPC17_PWM_MR1_OFFSET),
           pwm_getreg(priv, LPC17_PWM_MR2_OFFSET),
@@ -270,7 +270,7 @@ static void pwm_dumpregs(struct lpc17_pwmtimer_s *priv, FAR const char *msg)
 #if defined(CONFIG_LPC17_PWM1)
   if (priv->timtype == TIMTYPE_ADVANCED)
     {
-      pwmvdbg("  RCR: %04x BDTR: %04x DCR:   %04x DMAR:  %04x\n",
+      pwminfo("  RCR: %04x BDTR: %04x DCR:   %04x DMAR:  %04x\n",
               pwm_getreg(priv, LPC17_PWM_MR0_OFFSET),
               pwm_getreg(priv, LPC17_PWM_MR1_OFFSET),
               pwm_getreg(priv, LPC17_PWM_MR2_OFFSET),
@@ -279,7 +279,7 @@ static void pwm_dumpregs(struct lpc17_pwmtimer_s *priv, FAR const char *msg)
   else
 #endif
     {
-      pwmvdbg("  DCR: %04x DMAR: %04x\n",
+      pwminfo("  DCR: %04x DMAR: %04x\n",
               pwm_getreg(priv, LPC17_PWM_MR2_OFFSET),
               pwm_getreg(priv, LPC17_PWM_MR3_OFFSET));
     }
@@ -491,7 +491,7 @@ static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev)
   FAR struct lpc17_pwmtimer_s *priv = (FAR struct lpc17_pwmtimer_s *)dev;
   uint32_t pincfg;
 
-  pwmvdbg("TIM%d pincfg: %08x\n", priv->timid, priv->pincfg);
+  pwminfo("TIM%d pincfg: %08x\n", priv->timid, priv->pincfg);
 
   /* Make sure that the output has been stopped */
 
@@ -547,7 +547,7 @@ static int pwm_stop(FAR struct pwm_lowerhalf_s *dev)
   uint32_t regval;
   irqstate_t flags;
 
-  pwmvdbg("TIM%d\n", priv->timid);
+  pwminfo("TIM%d\n", priv->timid);
 
   /* Disable interrupts momentary to stop any ongoing timer processing and
    * to prevent any concurrent access to the reset register.
@@ -573,7 +573,7 @@ static int pwm_stop(FAR struct pwm_lowerhalf_s *dev)
 
   leave_critical_section(flags);
 
-  pwmvdbg("regaddr: %08x resetbit: %08x\n", regaddr, resetbit);
+  pwminfo("regaddr: %08x resetbit: %08x\n", regaddr, resetbit);
   pwm_dumpregs(priv, "After stop");
   return OK;
 }
@@ -601,7 +601,7 @@ static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, int cmd, unsigned long arg
 
   /* There are no platform-specific ioctl commands */
 
-  pwmvdbg("TIM%d\n", priv->timid);
+  pwminfo("TIM%d\n", priv->timid);
 #endif
   return -ENOTTY;
 }
@@ -631,7 +631,7 @@ FAR struct pwm_lowerhalf_s *lpc17_pwminitialize(int timer)
 {
   FAR struct lpc17_pwmtimer_s *lower;
 
-  pwmvdbg("TIM%d\n", timer);
+  pwminfo("TIM%d\n", timer);
 
   switch (timer)
     {
diff --git a/arch/arm/src/lpc17xx/lpc17_sdcard.c b/arch/arm/src/lpc17xx/lpc17_sdcard.c
index a00fd6ffaa..3f5c5a5b66 100644
--- a/arch/arm/src/lpc17xx/lpc17_sdcard.c
+++ b/arch/arm/src/lpc17xx/lpc17_sdcard.c
@@ -529,7 +529,7 @@ static inline void lpc17_setclock(uint32_t clkcr)
   regval |=  clkcr;
   putreg32(regval, LPC17_SDCARD_CLOCK);
 
-  fvdbg("CLKCR: %08x PWR: %08x\n",
+  finfo("CLKCR: %08x PWR: %08x\n",
         getreg32(LPC17_SDCARD_CLOCK), getreg32(LPC17_SDCARD_PWR));
 }
 
@@ -1480,7 +1480,7 @@ static void lpc17_reset(FAR struct sdio_dev_s *dev)
   lpc17_setpwrctrl(SDCARD_PWR_CTRL_ON);
   leave_critical_section(flags);
 
-  fvdbg("CLCKR: %08x POWER: %08x\n",
+  finfo("CLCKR: %08x POWER: %08x\n",
         getreg32(LPC17_SDCARD_CLOCK), getreg32(LPC17_SDCARD_PWR));
 }
 
@@ -1689,7 +1689,7 @@ static int lpc17_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t arg)
   cmdidx  = (cmd & MMCSD_CMDIDX_MASK) >> MMCSD_CMDIDX_SHIFT;
   regval |= cmdidx | SDCARD_CMD_CPSMEN;
 
-  fvdbg("cmd: %08x arg: %08x regval: %08x\n", cmd, arg, regval);
+  finfo("cmd: %08x arg: %08x regval: %08x\n", cmd, arg, regval);
 
   /* Write the SD card CMD */
 
@@ -2341,7 +2341,7 @@ static void lpc17_callbackenable(FAR struct sdio_dev_s *dev,
 {
   struct lpc17_dev_s *priv = (struct lpc17_dev_s *)dev;
 
-  fvdbg("eventset: %02x\n", eventset);
+  finfo("eventset: %02x\n", eventset);
   DEBUGASSERT(priv != NULL);
 
   priv->cbevents = eventset;
@@ -2377,7 +2377,7 @@ static int lpc17_registercallback(FAR struct sdio_dev_s *dev,
 
   /* Disable callbacks and register this callback and is argument */
 
-  fvdbg("Register %p(%p)\n", callback, arg);
+  finfo("Register %p(%p)\n", callback, arg);
   DEBUGASSERT(priv != NULL);
 
   priv->cbevents = 0;
@@ -2590,7 +2590,7 @@ static void lpc17_callback(void *arg)
   /* Is a callback registered? */
 
   DEBUGASSERT(priv != NULL);
-  fvdbg("Callback %p(%p) cbevents: %02x cdstatus: %02x\n",
+  finfo("Callback %p(%p) cbevents: %02x cdstatus: %02x\n",
         priv->callback, priv->cbarg, priv->cbevents, priv->cdstatus);
 
   if (priv->callback)
@@ -2635,14 +2635,14 @@ static void lpc17_callback(void *arg)
         {
           /* Yes.. queue it */
 
-           fvdbg("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg);
+           finfo("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg);
           (void)work_queue(HPWORK, &priv->cbwork, (worker_t)priv->callback, priv->cbarg, 0);
         }
       else
         {
           /* No.. then just call the callback here */
 
-          fvdbg("Callback to %p(%p)\n", priv->callback, priv->cbarg);
+          finfo("Callback to %p(%p)\n", priv->callback, priv->cbarg);
           priv->callback(priv->cbarg);
         }
     }
@@ -2781,7 +2781,7 @@ void sdio_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot)
     {
       priv->cdstatus &= ~SDIO_STATUS_PRESENT;
     }
-  fvdbg("cdstatus OLD: %02x NEW: %02x\n", cdstatus, priv->cdstatus);
+  finfo("cdstatus OLD: %02x NEW: %02x\n", cdstatus, priv->cdstatus);
 
   /* Perform any requested callback if the status has changed */
 
@@ -2824,7 +2824,7 @@ void sdio_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect)
     {
       priv->cdstatus &= ~SDIO_STATUS_WRPROTECTED;
     }
-  fvdbg("cdstatus: %02x\n", priv->cdstatus);
+  finfo("cdstatus: %02x\n", priv->cdstatus);
   leave_critical_section(flags);
 }
 #endif /* CONFIG_LPC17_SDCARD */
diff --git a/arch/arm/src/lpc17xx/lpc17_serial.c b/arch/arm/src/lpc17xx/lpc17_serial.c
index d0e2ceeecf..6dda0aabc3 100644
--- a/arch/arm/src/lpc17xx/lpc17_serial.c
+++ b/arch/arm/src/lpc17xx/lpc17_serial.c
@@ -1134,7 +1134,7 @@ static int up_interrupt(int irq, void *context)
               /* Read the modem status register (MSR) to clear */
 
               status = up_serialin(priv, LPC17_UART_MSR_OFFSET);
-              vdbg("MSR: %02x\n", status);
+              info("MSR: %02x\n", status);
               break;
             }
 
@@ -1145,7 +1145,7 @@ static int up_interrupt(int irq, void *context)
               /* Read the line status register (LSR) to clear */
 
               status = up_serialin(priv, LPC17_UART_LSR_OFFSET);
-              vdbg("LSR: %02x\n", status);
+              info("LSR: %02x\n", status);
               break;
             }
 
diff --git a/arch/arm/src/lpc17xx/lpc17_spi.c b/arch/arm/src/lpc17xx/lpc17_spi.c
index 06a6659264..7853419cdc 100644
--- a/arch/arm/src/lpc17xx/lpc17_spi.c
+++ b/arch/arm/src/lpc17xx/lpc17_spi.c
@@ -82,13 +82,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /* SSP Clocking *************************************************************/
diff --git a/arch/arm/src/lpc17xx/lpc17_ssp.c b/arch/arm/src/lpc17xx/lpc17_ssp.c
index a99c061727..f80b12de1d 100644
--- a/arch/arm/src/lpc17xx/lpc17_ssp.c
+++ b/arch/arm/src/lpc17xx/lpc17_ssp.c
@@ -83,13 +83,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define sspdbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define sspdbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /* SSP Clocking *************************************************************/
@@ -745,7 +745,7 @@ static void ssp_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw
        * and (3) there are more bytes to be sent.
        */
 
-      spivdbg("TX: rxpending: %d nwords: %d\n", rxpending, nwords);
+      spiinfo("TX: rxpending: %d nwords: %d\n", rxpending, nwords);
       while ((ssp_getreg(priv, LPC17_SSP_SR_OFFSET) & SSP_SR_TNF) &&
              (rxpending < LPC17_SSP_FIFOSZ) && nwords)
         {
@@ -756,7 +756,7 @@ static void ssp_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw
 
       /* Now, read the RX data from the RX FIFO while the RX FIFO is not empty */
 
-      spivdbg("RX: rxpending: %d\n", rxpending);
+      spiinfo("RX: rxpending: %d\n", rxpending);
       while (ssp_getreg(priv, LPC17_SSP_SR_OFFSET) & SSP_SR_RNE)
         {
           data = (uint8_t)ssp_getreg(priv, LPC17_SSP_DR_OFFSET);
diff --git a/arch/arm/src/lpc17xx/lpc17_timer.c b/arch/arm/src/lpc17xx/lpc17_timer.c
index 4cbe8238f1..198c099cd1 100644
--- a/arch/arm/src/lpc17xx/lpc17_timer.c
+++ b/arch/arm/src/lpc17xx/lpc17_timer.c
@@ -92,19 +92,19 @@
 #  define pwmdbg              dbg
 #  define pwmlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define pwmvdbg           vdbg
-#    define pwmllvdbg         llvdbg
+#    define pwminfo           info
+#    define pwmllinfo         llinfo
 #    define pwm_dumpgpio(p,m) stm32_dumpgpio(p,m)
 #  else
-#    define pwmvdbg(x...)
-#    define pwmllvdbg(x...)
+#    define pwminfo(x...)
+#    define pwmllinfo(x...)
 #    define pwm_dumpgpio(p,m)
 #  endif
 #else
 #  define pwmdbg(x...)
 #  define pwmlldbg(x...)
-#  define pwmvdbg(x...)
-#  define pwmllvdbg(x...)
+#  define pwminfo(x...)
+#  define pwmllinfo(x...)
 #  define pwm_dumpgpio(p,m)
 #endif
 
diff --git a/arch/arm/src/lpc17xx/lpc17_usbdev.c b/arch/arm/src/lpc17xx/lpc17_usbdev.c
index 9995e03cda..62495439af 100644
--- a/arch/arm/src/lpc17xx/lpc17_usbdev.c
+++ b/arch/arm/src/lpc17xx/lpc17_usbdev.c
@@ -1076,7 +1076,7 @@ static int lpc17_wrrequest(struct lpc17_ep_s *privep)
       return OK;
     }
 
-  ullvdbg("epphy=%d req=%p: len=%d xfrd=%d nullpkt=%d\n",
+  ullinfo("epphy=%d req=%p: len=%d xfrd=%d nullpkt=%d\n",
           privep->epphy, privreq, privreq->req.len, privreq->req.xfrd, privep->txnullpkt);
 
   /* Ignore any attempt to send a zero length packet on anything but EP0IN */
@@ -1185,7 +1185,7 @@ static int lpc17_rdrequest(struct lpc17_ep_s *privep)
       return OK;
     }
 
-  ullvdbg("len=%d xfrd=%d nullpkt=%d\n",
+  ullinfo("len=%d xfrd=%d nullpkt=%d\n",
           privreq->req.len, privreq->req.xfrd, privep->txnullpkt);
 
   /* Ignore any attempt to receive a zero length packet */
@@ -1593,7 +1593,7 @@ static inline void lpc17_ep0setup(struct lpc17_usbdev_s *priv)
   index = GETUINT16(ctrl.index);
   len   = GETUINT16(ctrl.len);
 
-  ullvdbg("type=%02x req=%02x value=%04x index=%04x len=%04x\n",
+  ullinfo("type=%02x req=%02x value=%04x index=%04x len=%04x\n",
           ctrl.type, ctrl.req, value, index, len);
 
   /* Dispatch any non-standard requests */
@@ -1739,7 +1739,7 @@ static inline void lpc17_ep0setup(struct lpc17_usbdev_s *priv)
         if (((ctrl.type & USB_REQ_RECIPIENT_MASK) == USB_REQ_RECIPIENT_DEVICE) &&
             value == USB_FEATURE_TESTMODE)
           {
-            ullvdbg("test mode: %d\n", index);
+            ullinfo("test mode: %d\n", index);
           }
         else if ((ctrl.type & USB_REQ_RECIPIENT_MASK) != USB_REQ_RECIPIENT_ENDPOINT)
           {
@@ -2321,7 +2321,7 @@ static int lpc17_usbinterrupt(int irq, FAR void *context)
                                 }
                               else
                                 {
-                                  ullvdbg("Pending data on OUT endpoint\n");
+                                  ullinfo("Pending data on OUT endpoint\n");
                                   priv->rxpending = 1;
                                 }
                             }
@@ -2797,7 +2797,7 @@ static int lpc17_epsubmit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *r
   if (!req || !req->callback || !req->buf || !ep)
     {
       usbtrace(TRACE_DEVERROR(LPC17_TRACEERR_INVALIDPARMS), 0);
-      ullvdbg("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep);
+      ullinfo("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep);
       return -EINVAL;
     }
 #endif
diff --git a/arch/arm/src/lpc17xx/lpc17_usbhost.c b/arch/arm/src/lpc17xx/lpc17_usbhost.c
index 94003be06d..e0cf06a037 100644
--- a/arch/arm/src/lpc17xx/lpc17_usbhost.c
+++ b/arch/arm/src/lpc17xx/lpc17_usbhost.c
@@ -1192,7 +1192,7 @@ static inline int lpc17_addinted(struct lpc17_usbhost_s *priv,
 
   interval     = lpc17_getinterval(epdesc->interval);
   ed->interval = interval;
-  uvdbg("interval: %d->%d\n", epdesc->interval, interval);
+  uinfo("interval: %d->%d\n", epdesc->interval, interval);
 
   /* Get the offset associated with the ED direction. IN EDs get the even
    * entries, OUT EDs get the odd entries.
@@ -1225,7 +1225,7 @@ static inline int lpc17_addinted(struct lpc17_usbhost_s *priv,
           interval = priv->outinterval;
         }
     }
-  uvdbg("min interval: %d offset: %d\n", interval, offset);
+  uinfo("min interval: %d offset: %d\n", interval, offset);
 
   /* Get the head of the first of the duplicated entries.  The first offset
    * entry is always guaranteed to contain the common ED list head.
@@ -1244,7 +1244,7 @@ static inline int lpc17_addinted(struct lpc17_usbhost_s *priv,
 
   ed->hw.nexted = head;
   lpc17_setinttab((uint32_t)ed, interval, offset);
-  uvdbg("head: %08x next: %08x\n", ed, head);
+  uinfo("head: %08x next: %08x\n", ed, head);
 
   /* Re-enabled periodic list processing */
 
@@ -1314,7 +1314,7 @@ static inline int lpc17_reminted(struct lpc17_usbhost_s *priv,
    */
 
   head = (struct lpc17_ed_s *)HCCA->inttbl[offset];
-  uvdbg("ed: %08x head: %08x next: %08x offset: %d\n",
+  uinfo("ed: %08x head: %08x next: %08x offset: %d\n",
         ed, head, head ? head->hw.nexted : 0, offset);
 
   /* Find the ED to be removed in the ED list */
@@ -1349,7 +1349,7 @@ static inline int lpc17_reminted(struct lpc17_usbhost_s *priv,
           prev->hw.nexted = ed->hw.nexted;
         }
 
-        uvdbg("ed: %08x head: %08x next: %08x\n",
+        uinfo("ed: %08x head: %08x next: %08x\n",
               ed, head, head ? head->hw.nexted : 0);
 
       /* Calculate the new minimum interval for this list */
@@ -1363,7 +1363,7 @@ static inline int lpc17_reminted(struct lpc17_usbhost_s *priv,
             }
         }
 
-      uvdbg("min interval: %d offset: %d\n", interval, offset);
+      uinfo("min interval: %d offset: %d\n", interval, offset);
 
       /* Save the new minimum interval */
 
@@ -1642,7 +1642,7 @@ static int lpc17_usbinterrupt(int irq, void *context)
 
   intst  = lpc17_getreg(LPC17_USBHOST_INTST);
   regval = lpc17_getreg(LPC17_USBHOST_INTEN);
-  ullvdbg("INST: %08x INTEN: %08x\n", intst, regval);
+  ullinfo("INST: %08x INTEN: %08x\n", intst, regval);
 
   pending = intst & regval;
   if (pending != 0)
@@ -1652,18 +1652,18 @@ static int lpc17_usbinterrupt(int irq, void *context)
       if ((pending & OHCI_INT_RHSC) != 0)
         {
           uint32_t rhportst1 = lpc17_getreg(LPC17_USBHOST_RHPORTST1);
-          ullvdbg("Root Hub Status Change, RHPORTST1: %08x\n", rhportst1);
+          ullinfo("Root Hub Status Change, RHPORTST1: %08x\n", rhportst1);
 
           if ((rhportst1 & OHCI_RHPORTST_CSC) != 0)
             {
               uint32_t rhstatus = lpc17_getreg(LPC17_USBHOST_RHSTATUS);
-              ullvdbg("Connect Status Change, RHSTATUS: %08x\n", rhstatus);
+              ullinfo("Connect Status Change, RHSTATUS: %08x\n", rhstatus);
 
               /* If DRWE is set, Connect Status Change indicates a remote wake-up event */
 
               if (rhstatus & OHCI_RHSTATUS_DRWE)
                 {
-                  ullvdbg("DRWE: Remote wake-up\n");
+                  ullinfo("DRWE: Remote wake-up\n");
                 }
 
               /* Otherwise... Not a remote wake-up event */
@@ -1680,7 +1680,7 @@ static int lpc17_usbinterrupt(int irq, void *context)
                         {
                           /* Yes.. connected. */
 
-                          ullvdbg("Connected\n");
+                          ullinfo("Connected\n");
                           priv->connected = true;
                           priv->change    = true;
 
@@ -1710,7 +1710,7 @@ static int lpc17_usbinterrupt(int irq, void *context)
                           priv->rhport.hport.speed = USB_SPEED_FULL;
                         }
 
-                      ullvdbg("Speed:%d\n", priv->rhport.hport.speed);
+                      ullinfo("Speed:%d\n", priv->rhport.hport.speed);
                     }
 
                   /* Check if we are now disconnected */
@@ -1719,7 +1719,7 @@ static int lpc17_usbinterrupt(int irq, void *context)
                     {
                       /* Yes.. disconnect the device */
 
-                      ullvdbg("Disconnected\n");
+                      ullinfo("Disconnected\n");
                       priv->connected = false;
                       priv->change    = true;
 
@@ -2089,7 +2089,7 @@ static int lpc17_enumerate(FAR struct usbhost_connection_s *conn,
 
   /* Then let the common usbhost_enumerate do the real enumeration. */
 
-  uvdbg("Enumerate the device\n");
+  uinfo("Enumerate the device\n");
   ret = usbhost_enumerate(hport, &hport->devclass);
   if (ret < 0)
     {
@@ -2155,7 +2155,7 @@ static int lpc17_ep0configure(struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
 
   lpc17_givesem(&priv->exclsem);
 
-  uvdbg("EP0 CTRL:%08x\n", ed->hw.ctrl);
+  uinfo("EP0 CTRL:%08x\n", ed->hw.ctrl);
   return OK;
 }
 
@@ -2255,7 +2255,7 @@ static int lpc17_epalloc(struct usbhost_driver_s *drvr,
           ed->hw.ctrl |= ED_CONTROL_F;
         }
 #endif
-      uvdbg("EP%d CTRL:%08x\n", epdesc->addr, ed->hw.ctrl);
+      uinfo("EP%d CTRL:%08x\n", epdesc->addr, ed->hw.ctrl);
 
       /* Initialize the semaphore that is used to wait for the endpoint
        * WDH event.
@@ -2608,7 +2608,7 @@ static int lpc17_ctrlin(struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
 
   DEBUGASSERT(priv != NULL && ed != NULL && req != NULL);
 
-  uvdbg("type:%02x req:%02x value:%02x%02x index:%02x%02x len:%02x%02x\n",
+  uinfo("type:%02x req:%02x value:%02x%02x index:%02x%02x len:%02x%02x\n",
         req->type, req->req, req->value[1], req->value[0],
         req->index[1], req->index[0], req->len[1], req->len[0]);
 
@@ -2646,7 +2646,7 @@ static int lpc17_ctrlout(struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
 
   DEBUGASSERT(priv != NULL && ed != NULL && req != NULL);
 
-  uvdbg("type:%02x req:%02x value:%02x%02x index:%02x%02x len:%02x%02x\n",
+  uinfo("type:%02x req:%02x value:%02x%02x index:%02x%02x len:%02x%02x\n",
         req->type, req->req, req->value[1], req->value[0],
         req->index[1], req->index[0], req->len[1], req->len[0]);
 
@@ -2712,7 +2712,7 @@ static int lpc17_transfer_common(struct lpc17_usbhost_s *priv,
   xfrinfo = ed->xfrinfo;
   in      = (ed->hw.ctrl & ED_CONTROL_D_MASK) == ED_CONTROL_D_IN;
 
-  uvdbg("EP%u %s toggle:%u maxpacket:%u buflen:%lu\n",
+  uinfo("EP%u %s toggle:%u maxpacket:%u buflen:%lu\n",
         (ed->hw.ctrl  & ED_CONTROL_EN_MASK) >> ED_CONTROL_EN_SHIFT,
         in ? "IN" : "OUT",
         (ed->hw.headp & ED_HEADP_C) != 0 ? 1 : 0,
@@ -2790,7 +2790,7 @@ static int lpc17_dma_alloc(struct lpc17_usbhost_s *priv,
 
       if (buflen > CONFIG_USBHOST_IOBUFSIZE)
         {
-          uvdbg("buflen (%d) > IO buffer size (%d)\n",
+          uinfo("buflen (%d) > IO buffer size (%d)\n",
                  buflen, CONFIG_USBHOST_IOBUFSIZE);
           return -ENOMEM;
         }
@@ -2800,7 +2800,7 @@ static int lpc17_dma_alloc(struct lpc17_usbhost_s *priv,
       newbuffer = lpc17_allocio();
       if (!newbuffer)
         {
-          uvdbg("IO buffer allocation failed\n");
+          uinfo("IO buffer allocation failed\n");
           return -ENOMEM;
         }
 
@@ -3454,7 +3454,7 @@ static int lpc17_connect(FAR struct usbhost_driver_s *drvr,
   /* Set the connected/disconnected flag */
 
   hport->connected = connected;
-  ullvdbg("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO");
+  ullinfo("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO");
 
   /* Report the connection event */
 
@@ -3700,14 +3700,14 @@ struct usbhost_connection_s *lpc17_usbhost_initialize(int controller)
   /* Show AHB SRAM memory map */
 
 #if 0 /* Useful if you have doubts about the layout */
-  uvdbg("AHB SRAM:\n");
-  uvdbg("  HCCA:   %08x %d\n", LPC17_HCCA_BASE,   LPC17_HCCA_SIZE);
-  uvdbg("  TDTAIL: %08x %d\n", LPC17_TDTAIL_ADDR, LPC17_TD_SIZE);
-  uvdbg("  EDCTRL: %08x %d\n", LPC17_EDCTRL_ADDR, LPC17_ED_SIZE);
-  uvdbg("  EDFREE: %08x %d\n", LPC17_EDFREE_BASE, LPC17_ED_SIZE);
-  uvdbg("  TDFREE: %08x %d\n", LPC17_TDFREE_BASE, LPC17_EDFREE_SIZE);
-  uvdbg("  TBFREE: %08x %d\n", LPC17_TBFREE_BASE, LPC17_TBFREE_SIZE);
-  uvdbg("  IOFREE: %08x %d\n", LPC17_IOFREE_BASE, LPC17_IOBUFFERS * CONFIG_USBHOST_IOBUFSIZE);
+  uinfo("AHB SRAM:\n");
+  uinfo("  HCCA:   %08x %d\n", LPC17_HCCA_BASE,   LPC17_HCCA_SIZE);
+  uinfo("  TDTAIL: %08x %d\n", LPC17_TDTAIL_ADDR, LPC17_TD_SIZE);
+  uinfo("  EDCTRL: %08x %d\n", LPC17_EDCTRL_ADDR, LPC17_ED_SIZE);
+  uinfo("  EDFREE: %08x %d\n", LPC17_EDFREE_BASE, LPC17_ED_SIZE);
+  uinfo("  TDFREE: %08x %d\n", LPC17_TDFREE_BASE, LPC17_EDFREE_SIZE);
+  uinfo("  TBFREE: %08x %d\n", LPC17_TBFREE_BASE, LPC17_TBFREE_SIZE);
+  uinfo("  IOFREE: %08x %d\n", LPC17_IOFREE_BASE, LPC17_IOBUFFERS * CONFIG_USBHOST_IOBUFSIZE);
 #endif
 
   /* Initialize all the TDs, EDs and HCCA to 0 */
diff --git a/arch/arm/src/lpc214x/lpc214x_serial.c b/arch/arm/src/lpc214x/lpc214x_serial.c
index 62b18ecfe3..f3ddd0cdd4 100644
--- a/arch/arm/src/lpc214x/lpc214x_serial.c
+++ b/arch/arm/src/lpc214x/lpc214x_serial.c
@@ -530,7 +530,7 @@ static int up_interrupt(int irq, void *context)
               /* Read the modem status register (MSR) to clear */
 
               status = up_serialin(priv, LPC214X_UART_MSR_OFFSET);
-              vdbg("MSR: %02x\n", status);
+              info("MSR: %02x\n", status);
               break;
             }
 
@@ -541,7 +541,7 @@ static int up_interrupt(int irq, void *context)
               /* Read the line status register (LSR) to clear */
 
               status = up_serialin(priv, LPC214X_UART_LSR_OFFSET);
-              vdbg("LSR: %02x\n", status);
+              info("LSR: %02x\n", status);
               break;
             }
 
diff --git a/arch/arm/src/lpc214x/lpc214x_usbdev.c b/arch/arm/src/lpc214x/lpc214x_usbdev.c
index 5c058a6bc3..cce4c2adb0 100644
--- a/arch/arm/src/lpc214x/lpc214x_usbdev.c
+++ b/arch/arm/src/lpc214x/lpc214x_usbdev.c
@@ -1021,7 +1021,7 @@ static int lpc214x_wrrequest(struct lpc214x_ep_s *privep)
       return OK;
     }
 
-  ullvdbg("epphy=%d req=%p: len=%d xfrd=%d nullpkt=%d\n",
+  ullinfo("epphy=%d req=%p: len=%d xfrd=%d nullpkt=%d\n",
           privep->epphy, privreq, privreq->req.len, privreq->req.xfrd, privep->txnullpkt);
 
   /* Ignore any attempt to send a zero length packet on anything but EP0IN */
@@ -1130,7 +1130,7 @@ static int lpc214x_rdrequest(struct lpc214x_ep_s *privep)
       return OK;
     }
 
-  ullvdbg("len=%d xfrd=%d nullpkt=%d\n",
+  ullinfo("len=%d xfrd=%d nullpkt=%d\n",
           privreq->req.len, privreq->req.xfrd, privep->txnullpkt);
 
   /* Ignore any attempt to receive a zero length packet */
@@ -1552,7 +1552,7 @@ static inline void lpc214x_ep0setup(struct lpc214x_usbdev_s *priv)
   index = GETUINT16(ctrl.index);
   len   = GETUINT16(ctrl.len);
 
-  ullvdbg("type=%02x req=%02x value=%04x index=%04x len=%04x\n",
+  ullinfo("type=%02x req=%02x value=%04x index=%04x len=%04x\n",
           ctrl.type, ctrl.req, value, index, len);
 
   /* Dispatch any non-standard requests */
@@ -1697,7 +1697,7 @@ static inline void lpc214x_ep0setup(struct lpc214x_usbdev_s *priv)
         if (((ctrl.type & USB_REQ_RECIPIENT_MASK) == USB_REQ_RECIPIENT_DEVICE) &&
             value == USB_FEATURE_TESTMODE)
           {
-            ullvdbg("test mode: %d\n", index);
+            ullinfo("test mode: %d\n", index);
           }
         else if ((ctrl.type & USB_REQ_RECIPIENT_MASK) != USB_REQ_RECIPIENT_ENDPOINT)
           {
@@ -2287,7 +2287,7 @@ static int lpc214x_usbinterrupt(int irq, FAR void *context)
                                 }
                               else
                                 {
-                                  ullvdbg("Pending data on OUT endpoint\n");
+                                  ullinfo("Pending data on OUT endpoint\n");
                                   priv->rxpending = 1;
                                 }
                             }
@@ -2763,7 +2763,7 @@ static int lpc214x_epsubmit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s
   if (!req || !req->callback || !req->buf || !ep)
     {
       usbtrace(TRACE_DEVERROR(LPC214X_TRACEERR_INVALIDPARMS), 0);
-      ullvdbg("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep);
+      ullinfo("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep);
       return -EINVAL;
     }
 #endif
diff --git a/arch/arm/src/lpc2378/lpc23xx_serial.c b/arch/arm/src/lpc2378/lpc23xx_serial.c
index 9650a0827a..90e62bf0a7 100644
--- a/arch/arm/src/lpc2378/lpc23xx_serial.c
+++ b/arch/arm/src/lpc2378/lpc23xx_serial.c
@@ -648,7 +648,7 @@ static int up_interrupt(int irq, void *context)
             /* Read the modem status register (MSR) to clear */
 
             status = up_serialin(priv, UART_MSR_OFFSET);
-            vdbg("MSR: %02x\n", status);
+            info("MSR: %02x\n", status);
             break;
           }
 
@@ -659,7 +659,7 @@ static int up_interrupt(int irq, void *context)
             /* Read the line status register (LSR) to clear */
 
             status = up_serialin(priv, UART_LSR_OFFSET);
-            vdbg("LSR: %02x\n", status);
+            info("LSR: %02x\n", status);
             break;
           }
 
diff --git a/arch/arm/src/lpc2378/lpc23xx_spi.c b/arch/arm/src/lpc2378/lpc23xx_spi.c
index fa20e563a6..21aefa2f99 100644
--- a/arch/arm/src/lpc2378/lpc23xx_spi.c
+++ b/arch/arm/src/lpc2378/lpc23xx_spi.c
@@ -81,13 +81,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /* SPI Clocking.
diff --git a/arch/arm/src/lpc31xx/lpc31_ehci.c b/arch/arm/src/lpc31xx/lpc31_ehci.c
index 83ae348776..b881daea63 100644
--- a/arch/arm/src/lpc31xx/lpc31_ehci.c
+++ b/arch/arm/src/lpc31xx/lpc31_ehci.c
@@ -2113,7 +2113,7 @@ static int lpc31_async_setup(struct lpc31_rhport_s *rhport,
 #ifdef CONFIG_USBHOST_TRACE
   usbhost_vtrace2(EHCI_VTRACE2_ASYNCXFR, epinfo->epno, buflen);
 #else
-  uvdbg("RHport%d EP%d: buffer=%p, buflen=%d, req=%p\n",
+  uinfo("RHport%d EP%d: buffer=%p, buflen=%d, req=%p\n",
         RHPORT(rhport), epinfo->epno, buffer, buflen, req);
 #endif
 
@@ -2391,7 +2391,7 @@ static int lpc31_intr_setup(struct lpc31_rhport_s *rhport,
 #ifdef CONFIG_USBHOST_TRACE
   usbhost_vtrace2(EHCI_VTRACE2_INTRXFR, epinfo->epno, buflen);
 #else
-  uvdbg("RHport%d EP%d: buffer=%p, buflen=%d\n",
+  uinfo("RHport%d EP%d: buffer=%p, buflen=%d\n",
         RHPORT(rhport), epinfo->epno, buffer, buflen);
 #endif
 
@@ -3377,7 +3377,7 @@ static int lpc31_ehci_interrupt(int irq, FAR void *context)
 #ifdef CONFIG_USBHOST_TRACE
   usbhost_vtrace1(EHCI_VTRACE1_TOPHALF, usbsts & regval);
 #else
-  ullvdbg("USBSTS: %08x USBINTR: %08x\n", usbsts, regval);
+  ullinfo("USBSTS: %08x USBINTR: %08x\n", usbsts, regval);
 #endif
 
   /* Handle all unmasked interrupt sources */
@@ -3909,7 +3909,7 @@ static int lpc31_epalloc(FAR struct usbhost_driver_s *drvr,
 #ifdef CONFIG_USBHOST_TRACE
   usbhost_vtrace2(EHCI_VTRACE2_EPALLOC, epdesc->addr, epdesc->xfrtype);
 #else
-  uvdbg("EP%d DIR=%s FA=%08x TYPE=%d Interval=%d MaxPacket=%d\n",
+  uinfo("EP%d DIR=%s FA=%08x TYPE=%d Interval=%d MaxPacket=%d\n",
         epdesc->addr, epdesc->in ? "IN" : "OUT", hport->funcaddr,
         epdesc->xfrtype, epdesc->interval, epdesc->mxpacketsize);
 #endif
@@ -4199,7 +4199,7 @@ static int lpc31_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
 #ifdef CONFIG_USBHOST_TRACE
   usbhost_vtrace2(EHCI_VTRACE2_CTRLINOUT, RHPORT(rhport), req->req);
 #else
-  uvdbg("RHPort%d type: %02x req: %02x value: %02x%02x index: %02x%02x len: %04x\n",
+  uinfo("RHPort%d type: %02x req: %02x value: %02x%02x index: %02x%02x len: %04x\n",
         RHPORT(rhport), req->type, req->req, req->value[1], req->value[0],
         req->index[1], req->index[0], len);
 #endif
@@ -4687,7 +4687,7 @@ static int lpc31_connect(FAR struct usbhost_driver_s *drvr,
   /* Set the connected/disconnected flag */
 
   hport->connected = connected;
-  ullvdbg("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO");
+  ullinfo("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO");
 
   /* Report the connection event */
 
diff --git a/arch/arm/src/lpc31xx/lpc31_serial.c b/arch/arm/src/lpc31xx/lpc31_serial.c
index 6567ce267e..74a0db9ddd 100644
--- a/arch/arm/src/lpc31xx/lpc31_serial.c
+++ b/arch/arm/src/lpc31xx/lpc31_serial.c
@@ -541,7 +541,7 @@ static int up_interrupt(int irq, void *context)
               /* Read the modem status register (MSR) to clear */
 
               status = getreg32(LPC31_UART_MSR);
-              fvdbg("MSR: %02x\n", status);
+              finfo("MSR: %02x\n", status);
               break;
             }
 
@@ -552,7 +552,7 @@ static int up_interrupt(int irq, void *context)
               /* Read the line status register (LSR) to clear */
 
               status = getreg32(LPC31_UART_LSR);
-              fvdbg("LSR: %02x\n", status);
+              finfo("LSR: %02x\n", status);
               break;
             }
 
diff --git a/arch/arm/src/lpc31xx/lpc31_usbdev.c b/arch/arm/src/lpc31xx/lpc31_usbdev.c
index c1ece00bf6..25a8bb6004 100644
--- a/arch/arm/src/lpc31xx/lpc31_usbdev.c
+++ b/arch/arm/src/lpc31xx/lpc31_usbdev.c
@@ -1183,7 +1183,7 @@ static inline void lpc31_ep0setup(struct lpc31_usbdev_s *priv)
   index = GETUINT16(ctrl.index);
   len   = GETUINT16(ctrl.len);
 
-  ullvdbg("type=%02x req=%02x value=%04x index=%04x len=%04x\n",
+  ullinfo("type=%02x req=%02x value=%04x index=%04x len=%04x\n",
           ctrl.type, ctrl.req, value, index, len);
 
   /* Dispatch any non-standard requests */
@@ -1323,7 +1323,7 @@ static inline void lpc31_ep0setup(struct lpc31_usbdev_s *priv)
           if (((ctrl.type & USB_REQ_RECIPIENT_MASK) == USB_REQ_RECIPIENT_DEVICE) &&
               value == USB_FEATURE_TESTMODE)
             {
-              ullvdbg("test mode: %d\n", index);
+              ullinfo("test mode: %d\n", index);
             }
           else if ((ctrl.type & USB_REQ_RECIPIENT_MASK) != USB_REQ_RECIPIENT_ENDPOINT)
             {
@@ -2083,7 +2083,7 @@ static int lpc31_epsubmit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *r
   if (!req || !req->callback || !req->buf || !ep)
     {
       usbtrace(TRACE_DEVERROR(LPC31_TRACEERR_INVALIDPARMS), 0);
-      ullvdbg("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep);
+      ullinfo("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep);
       return -EINVAL;
     }
 #endif
diff --git a/arch/arm/src/lpc43xx/lpc43_ehci.c b/arch/arm/src/lpc43xx/lpc43_ehci.c
index b1de82ab53..a170b01e21 100644
--- a/arch/arm/src/lpc43xx/lpc43_ehci.c
+++ b/arch/arm/src/lpc43xx/lpc43_ehci.c
@@ -1989,7 +1989,7 @@ static int lpc43_async_setup(struct lpc43_rhport_s *rhport,
 #ifdef CONFIG_USBHOST_TRACE
   usbhost_vtrace2(EHCI_VTRACE2_ASYNCXFR, epinfo->epno, buflen);
 #else
-  uvdbg("RHport%d EP%d: buffer=%p, buflen=%d, req=%p\n",
+  uinfo("RHport%d EP%d: buffer=%p, buflen=%d, req=%p\n",
         RHPORT(rhport), epinfo->epno, buffer, buflen, req);
 #endif
 
@@ -2267,7 +2267,7 @@ static int lpc43_intr_setup(struct lpc43_rhport_s *rhport,
 #ifdef CONFIG_USBHOST_TRACE
   usbhost_vtrace2(EHCI_VTRACE2_INTRXFR, epinfo->epno, buflen);
 #else
-  uvdbg("RHport%d EP%d: buffer=%p, buflen=%d\n",
+  uinfo("RHport%d EP%d: buffer=%p, buflen=%d\n",
         RHPORT(rhport), epinfo->epno, buffer, buflen);
 #endif
 
@@ -3207,7 +3207,7 @@ static int lpc43_ehci_interrupt(int irq, FAR void *context)
 #ifdef CONFIG_USBHOST_TRACE
   usbhost_vtrace1(EHCI_VTRACE1_TOPHALF, usbsts & regval);
 #else
-  ullvdbg("USBSTS: %08x USBINTR: %08x\n", usbsts, regval);
+  ullinfo("USBSTS: %08x USBINTR: %08x\n", usbsts, regval);
 #endif
 
   /* Handle all unmasked interrupt sources */
@@ -3739,7 +3739,7 @@ static int lpc43_epalloc(FAR struct usbhost_driver_s *drvr,
 #ifdef CONFIG_USBHOST_TRACE
   usbhost_vtrace2(EHCI_VTRACE2_EPALLOC, epdesc->addr, epdesc->xfrtype);
 #else
-  uvdbg("EP%d DIR=%s FA=%08x TYPE=%d Interval=%d MaxPacket=%d\n",
+  uinfo("EP%d DIR=%s FA=%08x TYPE=%d Interval=%d MaxPacket=%d\n",
         epdesc->addr, epdesc->in ? "IN" : "OUT", hport->funcaddr,
         epdesc->xfrtype, epdesc->interval, epdesc->mxpacketsize);
 #endif
@@ -4023,7 +4023,7 @@ static int lpc43_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
 #ifdef CONFIG_USBHOST_TRACE
   usbhost_vtrace2(EHCI_VTRACE2_CTRLINOUT, RHPORT(rhport), req->req);
 #else
-  uvdbg("RHPort%d type: %02x req: %02x value: %02x%02x index: %02x%02x len: %04x\n",
+  uinfo("RHPort%d type: %02x req: %02x value: %02x%02x index: %02x%02x len: %04x\n",
         RHPORT(rhport), req->type, req->req, req->value[1], req->value[0],
         req->index[1], req->index[0], len);
 #endif
@@ -4511,7 +4511,7 @@ static int lpc43_connect(FAR struct usbhost_driver_s *drvr,
   /* Set the connected/disconnected flag */
 
   hport->connected = connected;
-  ullvdbg("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO");
+  ullinfo("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO");
 
   /* Report the connection event */
 
diff --git a/arch/arm/src/lpc43xx/lpc43_ethernet.c b/arch/arm/src/lpc43xx/lpc43_ethernet.c
index cca1e89766..6b5e456c24 100644
--- a/arch/arm/src/lpc43xx/lpc43_ethernet.c
+++ b/arch/arm/src/lpc43xx/lpc43_ethernet.c
@@ -947,7 +947,7 @@ static int lpc43_transmit(FAR struct lpc43_ethmac_s *priv)
   txdesc  = priv->txhead;
   txfirst = txdesc;
 
-  nllvdbg("d_len: %d d_buf: %p txhead: %p tdes0: %08x\n",
+  nllinfo("d_len: %d d_buf: %p txhead: %p tdes0: %08x\n",
           priv->dev.d_len, priv->dev.d_buf, txdesc, txdesc->tdes0);
 
   DEBUGASSERT(txdesc && (txdesc->tdes0 & ETH_TDES0_OWN) == 0);
@@ -964,7 +964,7 @@ static int lpc43_transmit(FAR struct lpc43_ethmac_s *priv)
       bufcount = (priv->dev.d_len + (CONFIG_LPC43_ETH_BUFSIZE-1)) / CONFIG_LPC43_ETH_BUFSIZE;
       lastsize = priv->dev.d_len - (bufcount - 1) * CONFIG_LPC43_ETH_BUFSIZE;
 
-      nllvdbg("bufcount: %d lastsize: %d\n", bufcount, lastsize);
+      nllinfo("bufcount: %d lastsize: %d\n", bufcount, lastsize);
 
       /* Set the first segment bit in the first TX descriptor */
 
@@ -1074,7 +1074,7 @@ static int lpc43_transmit(FAR struct lpc43_ethmac_s *priv)
 
   priv->inflight++;
 
-  nllvdbg("txhead: %p txtail: %p inflight: %d\n",
+  nllinfo("txhead: %p txtail: %p inflight: %d\n",
           priv->txhead, priv->txtail, priv->inflight);
 
   /* If all TX descriptors are in-flight, then we have to disable receive interrupts
@@ -1373,7 +1373,7 @@ static void lpc43_freesegment(FAR struct lpc43_ethmac_s *priv,
   struct eth_rxdesc_s *rxdesc;
   int i;
 
-  nllvdbg("rxfirst: %p segments: %d\n", rxfirst, segments);
+  nllinfo("rxfirst: %p segments: %d\n", rxfirst, segments);
 
   /* Set OWN bit in RX descriptors.  This gives the buffers back to DMA */
 
@@ -1431,7 +1431,7 @@ static int lpc43_recvframe(FAR struct lpc43_ethmac_s *priv)
   uint8_t *buffer;
   int i;
 
-  nllvdbg("rxhead: %p rxcurr: %p segments: %d\n",
+  nllinfo("rxhead: %p rxcurr: %p segments: %d\n",
           priv->rxhead, priv->rxcurr, priv->segments);
 
   /* Check if there are free buffers.  We cannot receive new frames in this
@@ -1497,7 +1497,7 @@ static int lpc43_recvframe(FAR struct lpc43_ethmac_s *priv)
               rxcurr = priv->rxcurr;
             }
 
-          nllvdbg("rxhead: %p rxcurr: %p segments: %d\n",
+          nllinfo("rxhead: %p rxcurr: %p segments: %d\n",
               priv->rxhead, priv->rxcurr, priv->segments);
 
           /* Check if any errors are reported in the frame */
@@ -1536,7 +1536,7 @@ static int lpc43_recvframe(FAR struct lpc43_ethmac_s *priv)
               priv->rxhead   = (struct eth_rxdesc_s *)rxdesc->rdes3;
               lpc43_freesegment(priv, rxcurr, priv->segments);
 
-              nllvdbg("rxhead: %p d_buf: %p d_len: %d\n",
+              nllinfo("rxhead: %p d_buf: %p d_len: %d\n",
                       priv->rxhead, dev->d_buf, dev->d_len);
 
               return OK;
@@ -1563,7 +1563,7 @@ static int lpc43_recvframe(FAR struct lpc43_ethmac_s *priv)
 
   priv->rxhead = rxdesc;
 
-  nllvdbg("rxhead: %p rxcurr: %p segments: %d\n",
+  nllinfo("rxhead: %p rxcurr: %p segments: %d\n",
           priv->rxhead, priv->rxcurr, priv->segments);
 
   return -EAGAIN;
@@ -1632,7 +1632,7 @@ static void lpc43_receive(FAR struct lpc43_ethmac_s *priv)
 #ifdef CONFIG_NET_IPv4
       if (BUF->type == HTONS(ETHTYPE_IP))
         {
-          nllvdbg("IPv4 frame\n");
+          nllinfo("IPv4 frame\n");
 
           /* Handle ARP on input then give the IPv4 packet to the network
            * layer
@@ -1672,7 +1672,7 @@ static void lpc43_receive(FAR struct lpc43_ethmac_s *priv)
 #ifdef CONFIG_NET_IPv6
       if (BUF->type == HTONS(ETHTYPE_IP6))
         {
-          nllvdbg("Iv6 frame\n");
+          nllinfo("Iv6 frame\n");
 
           /* Give the IPv6 packet to the network layer */
 
@@ -1709,7 +1709,7 @@ static void lpc43_receive(FAR struct lpc43_ethmac_s *priv)
 #ifdef CONFIG_NET_ARP
       if (BUF->type == htons(ETHTYPE_ARP))
         {
-          nllvdbg("ARP frame\n");
+          nllinfo("ARP frame\n");
 
           /* Handle ARP packet */
 
@@ -1768,7 +1768,7 @@ static void lpc43_freeframe(FAR struct lpc43_ethmac_s *priv)
   struct eth_txdesc_s *txdesc;
   int i;
 
-  nllvdbg("txhead: %p txtail: %p inflight: %d\n",
+  nllinfo("txhead: %p txtail: %p inflight: %d\n",
           priv->txhead, priv->txtail, priv->inflight);
 
   /* Scan for "in-flight" descriptors owned by the CPU */
@@ -1784,7 +1784,7 @@ static void lpc43_freeframe(FAR struct lpc43_ethmac_s *priv)
            * TX descriptors.
            */
 
-          nllvdbg("txtail: %p tdes0: %08x tdes2: %08x tdes3: %08x\n",
+          nllinfo("txtail: %p tdes0: %08x tdes2: %08x tdes3: %08x\n",
                   txdesc, txdesc->tdes0, txdesc->tdes2, txdesc->tdes3);
 
           DEBUGASSERT(txdesc->tdes2 != 0);
@@ -1837,7 +1837,7 @@ static void lpc43_freeframe(FAR struct lpc43_ethmac_s *priv)
 
       priv->txtail = txdesc;
 
-      nllvdbg("txhead: %p txtail: %p inflight: %d\n",
+      nllinfo("txhead: %p txtail: %p inflight: %d\n",
               priv->txhead, priv->txtail, priv->inflight);
     }
 }
@@ -2480,7 +2480,7 @@ static int lpc43_ifdown(struct net_driver_s *dev)
 
 static inline void lpc43_txavail_process(FAR struct lpc43_ethmac_s *priv)
 {
-  nvdbg("ifup: %d\n", priv->ifup);
+  ninfo("ifup: %d\n", priv->ifup);
 
   /* Ignore the notification if the interface is not yet up */
 
@@ -2647,7 +2647,7 @@ static int lpc43_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
   uint32_t temp;
   uint32_t registeraddress;
 
-  nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
           mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
   /* Add the MAC address to the hardware multicast hash table */
@@ -2704,7 +2704,7 @@ static int lpc43_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac)
   uint32_t temp;
   uint32_t registeraddress;
 
-  nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
           mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
   /* Remove the MAC address to the hardware multicast hash table */
@@ -3172,7 +3172,7 @@ static inline int lpc43_dm9161(FAR struct lpc43_ethmac_s *priv)
       up_systemreset();
     }
 
-  nvdbg("PHY ID1: 0x%04X\n", phyval);
+  ninfo("PHY ID1: 0x%04X\n", phyval);
 
   /* Now check the "DAVICOM Specified Configuration Register (DSCR)", Register 16 */
 
@@ -3330,7 +3330,7 @@ static int lpc43_phyinit(FAR struct lpc43_ethmac_s *priv)
 
   /* Remember the selected speed and duplex modes */
 
-  nvdbg("PHYSR[%d]: %04x\n", CONFIG_LPC43_PHYSR, phyval);
+  ninfo("PHYSR[%d]: %04x\n", CONFIG_LPC43_PHYSR, phyval);
 
 #ifdef CONFIG_ETH0_PHY_LAN8720
   if ((phyval & (MII_MSR_100BASETXHALF | MII_MSR_100BASETXFULL)) != 0)
@@ -3718,7 +3718,7 @@ static void lpc43_macaddress(FAR struct lpc43_ethmac_s *priv)
   FAR struct net_driver_s *dev = &priv->dev;
   uint32_t regval;
 
-  nllvdbg("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  nllinfo("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
           dev->d_ifname,
           dev->d_mac.ether_addr_octet[0], dev->d_mac.ether_addr_octet[1],
           dev->d_mac.ether_addr_octet[2], dev->d_mac.ether_addr_octet[3],
@@ -3786,7 +3786,7 @@ static void lpc43_ipv6multicast(FAR struct lpc43_ethmac_s *priv)
   mac[4] = tmp16 & 0xff;
   mac[5] = tmp16 >> 8;
 
-  nvdbg("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  ninfo("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n",
         mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
   (void)lpc43_addmac(dev, mac);
@@ -3925,12 +3925,12 @@ static int lpc43_ethconfig(FAR struct lpc43_ethmac_s *priv)
 
   /* Reset the Ethernet block */
 
-  nllvdbg("Reset the Ethernet block\n");
+  nllinfo("Reset the Ethernet block\n");
   lpc43_ethreset(priv);
 
   /* Initialize the PHY */
 
-  nllvdbg("Initialize the PHY\n");
+  nllinfo("Initialize the PHY\n");
   ret = lpc43_phyinit(priv);
   if (ret < 0)
     {
@@ -3945,7 +3945,7 @@ static int lpc43_ethconfig(FAR struct lpc43_ethmac_s *priv)
 
   /* Initialize the MAC and DMA */
 
-  nllvdbg("Initialize the MAC and DMA\n");
+  nllinfo("Initialize the MAC and DMA\n");
   ret = lpc43_macconfig(priv);
   if (ret < 0)
     {
@@ -3966,7 +3966,7 @@ static int lpc43_ethconfig(FAR struct lpc43_ethmac_s *priv)
 
   /* Enable normal MAC operation */
 
-  nllvdbg("Enable normal operation\n");
+  nllinfo("Enable normal operation\n");
   return lpc43_macenable(priv);
 }
 
diff --git a/arch/arm/src/lpc43xx/lpc43_gpdma.c b/arch/arm/src/lpc43xx/lpc43_gpdma.c
index 991f80a1cf..37313b901e 100644
--- a/arch/arm/src/lpc43xx/lpc43_gpdma.c
+++ b/arch/arm/src/lpc43xx/lpc43_gpdma.c
@@ -69,14 +69,14 @@
 #ifdef DMA_DEBUG
 #  define dmadbg  lldbg
 #  ifdef DMA_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef DMA_VERBOSE
 #  define dmadbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc43xx/lpc43_idle.c b/arch/arm/src/lpc43xx/lpc43_idle.c
index 62f665495e..4dc5a30209 100644
--- a/arch/arm/src/lpc43xx/lpc43_idle.c
+++ b/arch/arm/src/lpc43xx/lpc43_idle.c
@@ -98,7 +98,7 @@ static void up_idlepm(void)
 
       /* Perform board-specific, state-dependent logic here */
 
-      llvdbg("newstate= %d oldstate=%d\n", newstate, oldstate);
+      llinfo("newstate= %d oldstate=%d\n", newstate, oldstate);
 
       /* Then force the global state change */
 
diff --git a/arch/arm/src/lpc43xx/lpc43_serial.c b/arch/arm/src/lpc43xx/lpc43_serial.c
index c12d65597b..78778b609e 100644
--- a/arch/arm/src/lpc43xx/lpc43_serial.c
+++ b/arch/arm/src/lpc43xx/lpc43_serial.c
@@ -854,7 +854,7 @@ static int up_interrupt(int irq, void *context)
               /* Read the modem status register (MSR) to clear */
 
               status = up_serialin(priv, LPC43_UART_MSR_OFFSET);
-              vdbg("MSR: %02x\n", status);
+              info("MSR: %02x\n", status);
               break;
             }
 
@@ -865,7 +865,7 @@ static int up_interrupt(int irq, void *context)
               /* Read the line status register (LSR) to clear */
 
               status = up_serialin(priv, LPC43_UART_LSR_OFFSET);
-              vdbg("LSR: %02x\n", status);
+              info("LSR: %02x\n", status);
               break;
             }
 
diff --git a/arch/arm/src/lpc43xx/lpc43_spi.c b/arch/arm/src/lpc43xx/lpc43_spi.c
index 46eda5576d..bc9813f44d 100644
--- a/arch/arm/src/lpc43xx/lpc43_spi.c
+++ b/arch/arm/src/lpc43xx/lpc43_spi.c
@@ -69,14 +69,14 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef CONFIG_DEBUG_INFO
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /* SPI Clocking.
diff --git a/arch/arm/src/lpc43xx/lpc43_spifi.c b/arch/arm/src/lpc43xx/lpc43_spifi.c
index 41b1703f97..e7e183ab55 100644
--- a/arch/arm/src/lpc43xx/lpc43_spifi.c
+++ b/arch/arm/src/lpc43xx/lpc43_spifi.c
@@ -382,7 +382,7 @@ static void lpc43_blockerase(struct lpc43_dev_s *priv, off_t sector)
   priv->operands.dest   = SPIFI_BASE + (sector << SPIFI_BLKSHIFT);
   priv->operands.length = SPIFI_BLKSIZE;
 
-  fvdbg("SPIFI_ERASE: dest=%p length=%d\n",
+  finfo("SPIFI_ERASE: dest=%p length=%d\n",
         priv->operands.dest, priv->operands.length);
 
   result = SPIFI_ERASE(priv, &priv->rom, &priv->operands);
@@ -411,7 +411,7 @@ static inline int lpc43_chiperase(struct lpc43_dev_s *priv)
   priv->operands.dest   = SPIFI_BASE;
   priv->operands.length = SPIFI_BLKSIZE * priv->nblocks;
 
-  fvdbg("SPIFI_ERASE: dest=%p length=%d\n",
+  finfo("SPIFI_ERASE: dest=%p length=%d\n",
         priv->operands.dest, priv->operands.length);
 
   result = SPIFI_ERASE(priv, &priv->rom, &priv->operands);
@@ -457,7 +457,7 @@ static int lpc43_pagewrite(FAR struct lpc43_dev_s *priv, FAR uint8_t *dest,
   priv->operands.dest   = dest;
   priv->operands.length = nbytes;
 
-  fvdbg("SPIFI_PROGRAM: src=%p dest=%p length=%d\n",
+  finfo("SPIFI_PROGRAM: src=%p dest=%p length=%d\n",
         src, priv->operands.dest, priv->operands.length);
 
   result = SPIFI_PROGRAM(priv, &priv->rom, src, &priv->operands);
@@ -492,7 +492,7 @@ static inline void lpc43_pageread(FAR struct lpc43_dev_s *priv,
                                   FAR uint8_t *dest, FAR const uint8_t *src,
                                   size_t nbytes)
 {
-  fvdbg("src=%p dest=%p length=%d\n", src, dest, nbytes);
+  finfo("src=%p dest=%p length=%d\n", src, dest, nbytes);
   memcpy(dest, src, nbytes);
 }
 
@@ -511,7 +511,7 @@ static void lpc43_cacheflush(struct lpc43_dev_s *priv)
    * the cached erase block to FLASH.
    */
 
-  fvdbg("flags: %02x blkno: %d\n", priv->flags, priv->blkno);
+  finfo("flags: %02x blkno: %d\n", priv->flags, priv->blkno);
   if (IS_DIRTY(priv) || IS_ERASED(priv))
     {
       /* Get the SPIFI address corresponding to the cached erase block */
@@ -551,7 +551,7 @@ static FAR uint8_t *lpc43_cacheread(struct lpc43_dev_s *priv, off_t sector)
    */
 
   blkno = sector >> (SPIFI_BLKSHIFT - SPIFI_512SHIFT);
-  fvdbg("sector: %ld blkno: %d\n", sector, blkno);
+  finfo("sector: %ld blkno: %d\n", sector, blkno);
 
   /* Check if the requested erase block is already in the cache */
 
@@ -612,7 +612,7 @@ static void lpc43_cacheerase(struct lpc43_dev_s *priv, off_t sector)
   if (!IS_ERASED(priv))
     {
       off_t blkno  = sector >> (SPIFI_BLKSHIFT - SPIFI_512SHIFT);
-      fvdbg("sector: %ld blkno: %d\n", sector, blkno);
+      finfo("sector: %ld blkno: %d\n", sector, blkno);
 
       lpc43_blockerase(priv, blkno);
       SET_ERASED(priv);
@@ -646,7 +646,7 @@ static void lpc43_cachewrite(FAR struct lpc43_dev_s *priv, FAR const uint8_t *bu
 
       dest = lpc43_cacheread(priv, sector);
 
-      fvdbg("dest=%p src=%p sector: %ld flags: %02x\n",
+      finfo("dest=%p src=%p sector: %ld flags: %02x\n",
             dest, buffer, sector, priv->flags);
 
       /* Erase the block containing this sector if it is not already erased.
@@ -657,7 +657,7 @@ static void lpc43_cachewrite(FAR struct lpc43_dev_s *priv, FAR const uint8_t *bu
       if (!IS_ERASED(priv))
         {
           off_t blkno  = sector >> (SPIFI_BLKSHIFT - SPIFI_512SHIFT);
-          fvdbg("sector: %ld blkno: %d\n", sector, blkno);
+          finfo("sector: %ld blkno: %d\n", sector, blkno);
 
           lpc43_blockerase(priv, blkno);
           SET_ERASED(priv);
@@ -692,7 +692,7 @@ static int lpc43_erase(FAR struct mtd_dev_s *dev, off_t startblock, size_t nbloc
   FAR struct lpc43_dev_s *priv = (FAR struct lpc43_dev_s *)dev;
   size_t blocksleft = nblocks;
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   while (blocksleft-- > 0)
     {
@@ -726,7 +726,7 @@ static ssize_t lpc43_bread(FAR struct mtd_dev_s *dev, off_t startblock, size_t n
 #ifdef CONFIG_SPIFI_SECTOR512
   ssize_t nbytes;
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* On this device, we can handle the block read just like the byte-oriented read */
 
@@ -743,7 +743,7 @@ static ssize_t lpc43_bread(FAR struct mtd_dev_s *dev, off_t startblock, size_t n
   FAR struct lpc43_dev_s *priv = (FAR struct lpc43_dev_s *)dev;
   ssize_t nbytes;
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* On this device, we can handle the block read just like the byte-oriented read */
 
@@ -774,7 +774,7 @@ static ssize_t lpc43_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, size_t
 
   FAR struct lpc43_dev_s *priv = (FAR struct lpc43_dev_s *)dev;
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   lpc43_cachewrite(priv, buffer, startblock, nblocks);
 
@@ -786,7 +786,7 @@ static ssize_t lpc43_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, size_t
   FAR struct lpc43_dev_s *priv = (FAR struct lpc43_dev_s *)dev;
   FAR uint8_t *dest;
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* Get the SPIFI address corresponding to the erase block */
 
@@ -819,7 +819,7 @@ static ssize_t lpc43_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes
   FAR struct lpc43_dev_s *priv = (FAR struct lpc43_dev_s *)dev;
   FAR const uint8_t *src;
 
-  fvdbg("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes);
+  finfo("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes);
 
   /* Get the SPIFI address corresponding sector */
 
@@ -829,7 +829,7 @@ static ssize_t lpc43_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes
 
   lpc43_pageread(priv, buffer, src, nbytes);
 
-  fvdbg("return nbytes: %d\n", (int)nbytes);
+  finfo("return nbytes: %d\n", (int)nbytes);
   return nbytes;
 }
 
@@ -842,7 +842,7 @@ static int lpc43_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
   FAR struct lpc43_dev_s *priv = (FAR struct lpc43_dev_s *)dev;
   int ret = -EINVAL; /* Assume good command with bad parameters */
 
-  fvdbg("cmd: %d \n", cmd);
+  finfo("cmd: %d \n", cmd);
 
   switch (cmd)
     {
@@ -871,7 +871,7 @@ static int lpc43_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
 #endif
               ret               = OK;
 
-              fvdbg("blocksize: %d erasesize: %d neraseblocks: %d\n",
+              finfo("blocksize: %d erasesize: %d neraseblocks: %d\n",
                     geo->blocksize, geo->erasesize, geo->neraseblocks);
             }
         }
@@ -891,7 +891,7 @@ static int lpc43_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
         break;
     }
 
-  fvdbg("return %d\n", ret);
+  finfo("return %d\n", ret);
   return ret;
 }
 
@@ -1038,24 +1038,24 @@ static inline int lpc43_rominit(FAR struct lpc43_dev_s *priv)
         }
     }
 
-  fvdbg("SPFI:\n");
-  fvdbg("      base: %08x\n", priv->rom.base);
-  fvdbg("   regbase: %08x\n", priv->rom.regbase);
-  fvdbg("   devsize: %08x\n", priv->rom.devsize);
-  fvdbg("   memsize: %08x\n", priv->rom.memsize);
-  fvdbg("     mfger: %02x\n", priv->rom.mfger);
-  fvdbg("   devtype: %02x\n", priv->rom.devtype);
-  fvdbg("     devid: %02x\n", priv->rom.devid);
-  fvdbg("      busy: %02x\n", priv->rom.busy);
-  fvdbg("      stat: %04x\n", priv->rom.stat.h);
-  fvdbg("   setprot: %04x\n", priv->rom.setprot);
-  fvdbg(" writeprot: %04x\n", priv->rom.writeprot);
-  fvdbg("    memcmd: %08x\n", priv->rom.memcmd);
-  fvdbg("   progcmd: %08x\n", priv->rom.progcmd);
-  fvdbg("   sectors: %04x\n", priv->rom.sectors);
-  fvdbg(" protbytes: %04x\n", priv->rom.protbytes);
-  fvdbg("      opts: %08x\n", priv->rom.opts);
-  fvdbg("  errcheck: %08x\n", priv->rom.errcheck);
+  finfo("SPFI:\n");
+  finfo("      base: %08x\n", priv->rom.base);
+  finfo("   regbase: %08x\n", priv->rom.regbase);
+  finfo("   devsize: %08x\n", priv->rom.devsize);
+  finfo("   memsize: %08x\n", priv->rom.memsize);
+  finfo("     mfger: %02x\n", priv->rom.mfger);
+  finfo("   devtype: %02x\n", priv->rom.devtype);
+  finfo("     devid: %02x\n", priv->rom.devid);
+  finfo("      busy: %02x\n", priv->rom.busy);
+  finfo("      stat: %04x\n", priv->rom.stat.h);
+  finfo("   setprot: %04x\n", priv->rom.setprot);
+  finfo(" writeprot: %04x\n", priv->rom.writeprot);
+  finfo("    memcmd: %08x\n", priv->rom.memcmd);
+  finfo("   progcmd: %08x\n", priv->rom.progcmd);
+  finfo("   sectors: %04x\n", priv->rom.sectors);
+  finfo(" protbytes: %04x\n", priv->rom.protbytes);
+  finfo("      opts: %08x\n", priv->rom.opts);
+  finfo("  errcheck: %08x\n", priv->rom.errcheck);
 
   /* Get the largest erase block size */
 
@@ -1065,11 +1065,11 @@ static inline int lpc43_rominit(FAR struct lpc43_dev_s *priv)
   sectors = priv->rom.sectors;
   log2    = 0;
 
-  fvdbg("FLASH Geometry:\n");
+  finfo("FLASH Geometry:\n");
 
   while (sectors > 0)
     {
-      fvdbg("  log2: %d rept: %d\n", desc->log2, desc->rept);
+      finfo("  log2: %d rept: %d\n", desc->log2, desc->rept);
 
       /* Check if this is the largest erase block size seen */
 
@@ -1091,10 +1091,10 @@ static inline int lpc43_rominit(FAR struct lpc43_dev_s *priv)
   priv->blksize  = (1 << log2);
   priv->nblocks  = (priv->rom.memsize - CONFIG_SPIFI_OFFSET) / priv->blksize;
 
-  fvdbg("Driver FLASH Geometry:\n");
-  fvdbg("  blkshift: %d\n", priv->blkshift);
-  fvdbg("   blksize: %08x\n", priv->blksize);
-  fvdbg("   nblocks: %d\n", priv->nblocks);
+  finfo("Driver FLASH Geometry:\n");
+  finfo("  blkshift: %d\n", priv->blkshift);
+  finfo("   blksize: %08x\n", priv->blksize);
+  finfo("   nblocks: %d\n", priv->nblocks);
 
 #ifdef CONFIG_SPIFI_SECTOR512
   DEBUGASSERT(log2 > 9);
@@ -1106,10 +1106,10 @@ static inline int lpc43_rominit(FAR struct lpc43_dev_s *priv)
 
   priv->nblocks  = ((priv->rom.memsize  - CONFIG_SPIFI_OFFSET) >> SPIFI_BLKSHIFT);
 
-  fvdbg("Driver FLASH Geometry:\n");
-  fvdbg("  blkshift: %d\n", SPIFI_BLKSHIFT);
-  fvdbg("   blksize: %08x\n", SPIFI_BLKSIZE);
-  fvdbg("   nblocks: %d\n", priv->nblocks);
+  finfo("Driver FLASH Geometry:\n");
+  finfo("  blkshift: %d\n", SPIFI_BLKSHIFT);
+  finfo("   blksize: %08x\n", SPIFI_BLKSIZE);
+  finfo("   nblocks: %d\n", priv->nblocks);
 #endif
 
   return OK;
@@ -1208,7 +1208,7 @@ FAR struct mtd_dev_s *lpc43_spifi_initialize(void)
 
   /* Return the implementation-specific state structure as the MTD device */
 
-  fvdbg("Return %p\n", priv);
+  finfo("Return %p\n", priv);
   return (FAR struct mtd_dev_s *)priv;
 }
 
diff --git a/arch/arm/src/lpc43xx/lpc43_ssp.c b/arch/arm/src/lpc43xx/lpc43_ssp.c
index 0d227fa8fa..61c8ce3c4e 100644
--- a/arch/arm/src/lpc43xx/lpc43_ssp.c
+++ b/arch/arm/src/lpc43xx/lpc43_ssp.c
@@ -78,14 +78,14 @@
 #ifdef CONFIG_SSP_DEBUG
 #  define sspdbg  lldbg
 #  ifdef CONFIG_SSP_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef CONFIG_SSP_VERBOSE
 #  define sspdbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 
@@ -576,7 +576,7 @@ static void ssp_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
        * and (3) there are more bytes to be sent.
        */
 
-      spivdbg("TX: rxpending: %d nwords: %d\n", rxpending, nwords);
+      spiinfo("TX: rxpending: %d nwords: %d\n", rxpending, nwords);
       while ((ssp_getreg(priv, LPC43_SSP_SR_OFFSET) & SSP_SR_TNF) &&
              (rxpending < LPC43_SSP_FIFOSZ) && nwords)
         {
@@ -599,7 +599,7 @@ static void ssp_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
 
       /* Now, read the RX data from the RX FIFO while the RX FIFO is not empty */
 
-      spivdbg("RX: rxpending: %d\n", rxpending);
+      spiinfo("RX: rxpending: %d\n", rxpending);
       while (ssp_getreg(priv, LPC43_SSP_SR_OFFSET) & SSP_SR_RNE)
         {
           data = ssp_getreg(priv, LPC43_SSP_DR_OFFSET);
diff --git a/arch/arm/src/lpc43xx/lpc43_usb0dev.c b/arch/arm/src/lpc43xx/lpc43_usb0dev.c
index 57e3ef2c8c..082f35eb3b 100644
--- a/arch/arm/src/lpc43xx/lpc43_usb0dev.c
+++ b/arch/arm/src/lpc43xx/lpc43_usb0dev.c
@@ -1228,7 +1228,7 @@ static inline void lpc43_ep0setup(struct lpc43_usbdev_s *priv)
 
   priv->ep0buf_len = len;
 
-  ullvdbg("type=%02x req=%02x value=%04x index=%04x len=%04x\n",
+  ullinfo("type=%02x req=%02x value=%04x index=%04x len=%04x\n",
           ctrl->type, ctrl->req, value, index, len);
 
   /* Starting a control request - update state */
@@ -1393,7 +1393,7 @@ static inline void lpc43_ep0setup(struct lpc43_usbdev_s *priv)
           if (((ctrl->type & USB_REQ_RECIPIENT_MASK) == USB_REQ_RECIPIENT_DEVICE) &&
               value == USB_FEATURE_TESTMODE)
             {
-              ullvdbg("test mode: %d\n", index);
+              ullinfo("test mode: %d\n", index);
             }
           else if ((ctrl->type & USB_REQ_RECIPIENT_MASK) != USB_REQ_RECIPIENT_ENDPOINT)
             {
@@ -2206,7 +2206,7 @@ static int lpc43_epsubmit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *r
   if (!req || !req->callback || !req->buf || !ep)
     {
       usbtrace(TRACE_DEVERROR(LPC43_TRACEERR_INVALIDPARMS), 0);
-      ullvdbg("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep);
+      ullinfo("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep);
       return -EINVAL;
     }
 #endif
diff --git a/arch/arm/src/nuc1xx/nuc_idle.c b/arch/arm/src/nuc1xx/nuc_idle.c
index 9dd225313f..e0e0131059 100644
--- a/arch/arm/src/nuc1xx/nuc_idle.c
+++ b/arch/arm/src/nuc1xx/nuc_idle.c
@@ -99,7 +99,7 @@ static void up_idlepm(void)
 
       /* Perform board-specific, state-dependent logic here */
 
-      llvdbg("newstate= %d oldstate=%d\n", newstate, oldstate);
+      llinfo("newstate= %d oldstate=%d\n", newstate, oldstate);
 
       /* Then force the global state change */
 
diff --git a/arch/arm/src/sam34/sam4cm_freerun.c b/arch/arm/src/sam34/sam4cm_freerun.c
index 63bcea2031..429ae813c5 100644
--- a/arch/arm/src/sam34/sam4cm_freerun.c
+++ b/arch/arm/src/sam34/sam4cm_freerun.c
@@ -121,7 +121,7 @@ int sam_freerun_initialize(struct sam_freerun_s *freerun, int chan,
   uint32_t cmr;
   int ret;
 
-  tcvdbg("chan=%d resolution=%d usec\n", chan, resolution);
+  tcinfo("chan=%d resolution=%d usec\n", chan, resolution);
   DEBUGASSERT(freerun && resolution > 0);
 
   /* Get the TC frequency the corresponds to the requested resolution */
@@ -137,7 +137,7 @@ int sam_freerun_initialize(struct sam_freerun_s *freerun, int chan,
       return ret;
     }
 
-  tcvdbg("frequency=%lu, divisor=%u, cmr=%08lx\n",
+  tcinfo("frequency=%lu, divisor=%u, cmr=%08lx\n",
          (unsigned long)frequency, (unsigned long)divisor,
          (unsigned long)cmr);
 
@@ -257,7 +257,7 @@ int sam_freerun_counter(struct sam_freerun_s *freerun, struct timespec *ts)
 
   leave_critical_section(flags);
 
-  tcvdbg("counter=%lu (%lu) overflow=%lu, sr=%08lx\n",
+  tcinfo("counter=%lu (%lu) overflow=%lu, sr=%08lx\n",
          (unsigned long)counter,  (unsigned long)verify,
          (unsigned long)overflow, (unsigned long)sr);
 
@@ -277,7 +277,7 @@ int sam_freerun_counter(struct sam_freerun_s *freerun, struct timespec *ts)
   ts->tv_sec  = sec;
   ts->tv_nsec = (usec - (sec * USEC_PER_SEC)) * NSEC_PER_USEC;
 
-  tcvdbg("usec=%llu ts=(%lu, %lu)\n",
+  tcinfo("usec=%llu ts=(%lu, %lu)\n",
           usec, (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec);
 
   return OK;
diff --git a/arch/arm/src/sam34/sam4cm_oneshot.c b/arch/arm/src/sam34/sam4cm_oneshot.c
index eeda41bc8e..79a668ee0f 100644
--- a/arch/arm/src/sam34/sam4cm_oneshot.c
+++ b/arch/arm/src/sam34/sam4cm_oneshot.c
@@ -91,7 +91,7 @@ static void sam_oneshot_handler(TC_HANDLE tch, void *arg, uint32_t sr)
   oneshot_handler_t oneshot_handler;
   void *oneshot_arg;
 
-  tcllvdbg("Expired...\n");
+  tcllinfo("Expired...\n");
   DEBUGASSERT(oneshot && oneshot->handler);
 
   /* The clock was stopped, but not disabled when the RC match occurred.
@@ -148,7 +148,7 @@ int sam_oneshot_initialize(struct sam_oneshot_s *oneshot, int chan,
   uint32_t cmr;
   int ret;
 
-  tcvdbg("chan=%d resolution=%d usec\n", chan, resolution);
+  tcinfo("chan=%d resolution=%d usec\n", chan, resolution);
   DEBUGASSERT(oneshot && resolution > 0);
 
   /* Get the TC frequency the corresponds to the requested resolution */
@@ -164,7 +164,7 @@ int sam_oneshot_initialize(struct sam_oneshot_s *oneshot, int chan,
       return ret;
     }
 
-  tcvdbg("frequency=%lu, divisor=%lu, cmr=%08lx\n",
+  tcinfo("frequency=%lu, divisor=%lu, cmr=%08lx\n",
          (unsigned long)frequency, (unsigned long)divisor,
          (unsigned long)cmr);
 
@@ -258,7 +258,7 @@ int sam_oneshot_start(struct sam_oneshot_s *oneshot, struct sam_freerun_s *freer
   uint64_t regval;
   irqstate_t flags;
 
-  tcvdbg("handler=%p arg=%p, ts=(%lu, %lu)\n",
+  tcinfo("handler=%p arg=%p, ts=(%lu, %lu)\n",
          handler, arg, (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec);
   DEBUGASSERT(oneshot && handler && ts);
 
@@ -269,7 +269,7 @@ int sam_oneshot_start(struct sam_oneshot_s *oneshot, struct sam_freerun_s *freer
     {
       /* Yes.. then cancel it */
 
-      tcvdbg("Already running... cancelling\n");
+      tcinfo("Already running... cancelling\n");
       (void)sam_oneshot_cancel(oneshot, freerun, NULL);
     }
 
@@ -291,7 +291,7 @@ int sam_oneshot_start(struct sam_oneshot_s *oneshot, struct sam_freerun_s *freer
 
   regval = (usec * (uint64_t)sam_tc_divfreq(oneshot->tch)) / USEC_PER_SEC;
 
-  tcvdbg("usec=%llu regval=%08llx\n", usec, regval);
+  tcinfo("usec=%llu regval=%08llx\n", usec, regval);
   DEBUGASSERT(regval <= UINT16_MAX);
 
   /* Set up to receive the callback when the interrupt occurs */
@@ -400,7 +400,7 @@ int sam_oneshot_cancel(struct sam_oneshot_s *oneshot, struct sam_freerun_s *free
    * REVISIT:  This does not appear to be the case.
    */
 
-  tcvdbg("Cancelling...\n");
+  tcinfo("Cancelling...\n");
 
   count = sam_tc_getcounter(oneshot->tch);
   rc    = sam_tc_getregister(oneshot->tch, TC_REGC);
@@ -436,7 +436,7 @@ int sam_oneshot_cancel(struct sam_oneshot_s *oneshot, struct sam_freerun_s *free
        * oneshot timer.
        */
 
-      tcvdbg("rc=%lu count=%lu usec=%lu\n",
+      tcinfo("rc=%lu count=%lu usec=%lu\n",
              (unsigned long)rc, (unsigned long)count, (unsigned long)usec);
 
       /* REVISIT: I am not certain why the timer counter value sometimes
@@ -481,7 +481,7 @@ int sam_oneshot_cancel(struct sam_oneshot_s *oneshot, struct sam_freerun_s *free
           ts->tv_nsec = (unsigned long)nsec;
         }
 
-      tcvdbg("remaining (%lu, %lu)\n",
+      tcinfo("remaining (%lu, %lu)\n",
              (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec);
     }
 
diff --git a/arch/arm/src/sam34/sam4cm_tc.c b/arch/arm/src/sam34/sam4cm_tc.c
index 91ab9c3ca2..22afa97928 100644
--- a/arch/arm/src/sam34/sam4cm_tc.c
+++ b/arch/arm/src/sam34/sam4cm_tc.c
@@ -876,7 +876,7 @@ TC_HANDLE sam_tc_allocate(int channel, int mode)
    * access to the requested channel.
    */
 
-  tcvdbg("channel=%d mode=%08x\n", channel, mode);
+  tcinfo("channel=%d mode=%08x\n", channel, mode);
 
   chan = sam_tc_initialize(channel);
   if (chan)
@@ -902,7 +902,7 @@ TC_HANDLE sam_tc_allocate(int channel, int mode)
 
   /* Return an opaque reference to the channel */
 
-  tcvdbg("Returning %p\n", chan);
+  tcinfo("Returning %p\n", chan);
   return (TC_HANDLE)chan;
 }
 
@@ -924,7 +924,7 @@ void sam_tc_free(TC_HANDLE handle)
 {
   struct sam_chan_s *chan = (struct sam_chan_s *)handle;
 
-  tcvdbg("Freeing %p channel=%d inuse=%d\n", chan, chan->chan, chan->inuse);
+  tcinfo("Freeing %p channel=%d inuse=%d\n", chan, chan->chan, chan->inuse);
   DEBUGASSERT(chan && chan->inuse);
 
   /* Make sure that interrupts are detached and disabled and that the channel
@@ -957,7 +957,7 @@ void sam_tc_start(TC_HANDLE handle)
 {
   struct sam_chan_s *chan = (struct sam_chan_s *)handle;
 
-  tcvdbg("Starting channel %d inuse=%d\n", chan->chan, chan->inuse);
+  tcinfo("Starting channel %d inuse=%d\n", chan->chan, chan->inuse);
   DEBUGASSERT(chan && chan->inuse);
 
   /* Read the SR to clear any pending interrupts on this channel */
@@ -989,7 +989,7 @@ void sam_tc_stop(TC_HANDLE handle)
 {
   struct sam_chan_s *chan = (struct sam_chan_s *)handle;
 
-  tcvdbg("Stopping channel %d inuse=%d\n", chan->chan, chan->inuse);
+  tcinfo("Stopping channel %d inuse=%d\n", chan->chan, chan->inuse);
   DEBUGASSERT(chan && chan->inuse);
 
   sam_chan_putreg(chan, SAM_TC_CCR_OFFSET, TC_CCR_CLKDIS);
@@ -1096,7 +1096,7 @@ void sam_tc_setregister(TC_HANDLE handle, int regid, uint32_t regval)
 
   DEBUGASSERT(chan && regid < TC_NREGISTERS);
 
-  tcvdbg("Channel %d: Set register RC%d to %08lx\n",
+  tcinfo("Channel %d: Set register RC%d to %08lx\n",
          chan->chan, regid, (unsigned long)regval);
 
   sam_chan_putreg(chan, g_regoffset[regid], regval);
@@ -1233,7 +1233,7 @@ int sam_tc_divisor(uint32_t frequency, uint32_t *div, uint32_t *tcclks)
   uint32_t ftcin = sam_tc_infreq();
   int ndx = 0;
 
-  tcvdbg("frequency=%d\n", frequency);
+  tcinfo("frequency=%d\n", frequency);
 
   /* Satisfy lower bound.  That is, the value of the divider such that:
    *
@@ -1270,7 +1270,7 @@ int sam_tc_divisor(uint32_t frequency, uint32_t *div, uint32_t *tcclks)
   if (div)
     {
       uint32_t value = sam_tc_freqdiv_lookup(ftcin, ndx);
-      tcvdbg("return div=%lu\n", (unsigned long)value);
+      tcinfo("return div=%lu\n", (unsigned long)value);
       *div = value;
     }
 
@@ -1278,7 +1278,7 @@ int sam_tc_divisor(uint32_t frequency, uint32_t *div, uint32_t *tcclks)
 
   if (tcclks)
     {
-      tcvdbg("return tcclks=%08lx\n", (unsigned long)TC_CMR_TCCLKS(ndx));
+      tcinfo("return tcclks=%08lx\n", (unsigned long)TC_CMR_TCCLKS(ndx));
       *tcclks = TC_CMR_TCCLKS(ndx);
     }
 
diff --git a/arch/arm/src/sam34/sam4cm_tc.h b/arch/arm/src/sam34/sam4cm_tc.h
index 85520d84d9..e71ffdb42b 100644
--- a/arch/arm/src/sam34/sam4cm_tc.h
+++ b/arch/arm/src/sam34/sam4cm_tc.h
@@ -84,14 +84,14 @@
 
 #ifdef CONFIG_SAM34_TC_DEBUG
 #  define tcdbg    dbg
-#  define tcvdbg   vdbg
+#  define tcinfo   info
 #  define tclldbg  lldbg
-#  define tcllvdbg llvdbg
+#  define tcllinfo llinfo
 #else
 #  define tcdbg(x...)
-#  define tcvdbg(x...)
+#  define tcinfo(x...)
 #  define tclldbg(x...)
-#  define tcllvdbg(x...)
+#  define tcllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/arch/arm/src/sam34/sam4cm_tickless.c b/arch/arm/src/sam34/sam4cm_tickless.c
index 7d13e8756e..a942d429f3 100644
--- a/arch/arm/src/sam34/sam4cm_tickless.c
+++ b/arch/arm/src/sam34/sam4cm_tickless.c
@@ -197,7 +197,7 @@ static struct sam_tickless_s g_tickless;
 
 static void sam_oneshot_handler(void *arg)
 {
-  tcllvdbg("Expired...\n");
+  tcllinfo("Expired...\n");
   sched_timer_expiration();
 }
 
diff --git a/arch/arm/src/sam34/sam_dmac.c b/arch/arm/src/sam34/sam_dmac.c
index bcc8fb03f0..2c60c958ba 100644
--- a/arch/arm/src/sam34/sam_dmac.c
+++ b/arch/arm/src/sam34/sam_dmac.c
@@ -1354,7 +1354,7 @@ static int sam_dmainterrupt(int irq, void *context)
 
 void weak_function up_dmainitialize(void)
 {
-  dmallvdbg("Initialize DMAC0\n");
+  dmallinfo("Initialize DMAC0\n");
 
   /* Enable peripheral clock */
 
@@ -1460,7 +1460,7 @@ DMA_HANDLE sam_dmachannel(uint32_t chflags)
 
   sam_givechsem();
 
-  dmavdbg("chflags: %08x returning dmach: %p\n",  (int)chflags, dmach);
+  dmainfo("chflags: %08x returning dmach: %p\n",  (int)chflags, dmach);
   return (DMA_HANDLE)dmach;
 }
 
@@ -1486,7 +1486,7 @@ void sam_dmaconfig(DMA_HANDLE handle, uint32_t chflags)
 
   /* Set the new DMA channel flags. */
 
-  dmavdbg("chflags: %08x\n",  (int)chflags);
+  dmainfo("chflags: %08x\n",  (int)chflags);
   dmach->flags = chflags;
 }
 
@@ -1507,7 +1507,7 @@ void sam_dmafree(DMA_HANDLE handle)
 {
   struct sam_dma_s *dmach = (struct sam_dma_s *)handle;
 
-  dmavdbg("dmach: %p\n", dmach);
+  dmainfo("dmach: %p\n", dmach);
   DEBUGASSERT((dmach != NULL) && (dmach->inuse));
 
   /* Mark the channel no longer in use.  Clearing the inuse flag is an atomic
@@ -1536,10 +1536,10 @@ int sam_dmatxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr, size_t nby
   size_t maxtransfer;
   int ret = OK;
 
-  dmavdbg("dmach: %p paddr: %08x maddr: %08x nbytes: %d\n",
+  dmainfo("dmach: %p paddr: %08x maddr: %08x nbytes: %d\n",
           dmach, (int)paddr, (int)maddr, (int)nbytes);
   DEBUGASSERT(dmach);
-  dmavdbg("llhead: %p lltail: %p\n", dmach->llhead, dmach->lltail);
+  dmainfo("llhead: %p lltail: %p\n", dmach->llhead, dmach->lltail);
 
   /* The maximum transfer size in bytes depends upon the maximum number of
    * transfers and the number of bytes per transfer.
@@ -1604,10 +1604,10 @@ int sam_dmarxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr, size_t nby
   size_t maxtransfer;
   int ret = OK;
 
-  dmavdbg("dmach: %p paddr: %08x maddr: %08x nbytes: %d\n",
+  dmainfo("dmach: %p paddr: %08x maddr: %08x nbytes: %d\n",
           dmach, (int)paddr, (int)maddr, (int)nbytes);
   DEBUGASSERT(dmach);
-  dmavdbg("llhead: %p lltail: %p\n", dmach->llhead, dmach->lltail);
+  dmainfo("llhead: %p lltail: %p\n", dmach->llhead, dmach->lltail);
 
   /* The maximum transfer size in bytes depends upon the maximum number of
    * transfers and the number of bytes per transfer.
@@ -1667,7 +1667,7 @@ int sam_dmastart(DMA_HANDLE handle, dma_callback_t callback, void *arg)
   struct sam_dma_s *dmach = (struct sam_dma_s *)handle;
   int ret = -EINVAL;
 
-  dmavdbg("dmach: %p callback: %p arg: %p\n", dmach, callback, arg);
+  dmainfo("dmach: %p callback: %p arg: %p\n", dmach, callback, arg);
   DEBUGASSERT(dmach != NULL);
 
   /* Verify that the DMA has been setup (i.e., at least one entry in the
@@ -1711,7 +1711,7 @@ void sam_dmastop(DMA_HANDLE handle)
   struct sam_dma_s *dmach = (struct sam_dma_s *)handle;
   irqstate_t flags;
 
-  dmavdbg("dmach: %p\n", dmach);
+  dmainfo("dmach: %p\n", dmach);
   DEBUGASSERT(dmach != NULL);
 
   flags = enter_critical_section();
diff --git a/arch/arm/src/sam34/sam_emac.c b/arch/arm/src/sam34/sam_emac.c
index 957ea10d34..e6fdd770ed 100644
--- a/arch/arm/src/sam34/sam_emac.c
+++ b/arch/arm/src/sam34/sam_emac.c
@@ -753,7 +753,7 @@ static int sam_transmit(struct sam_emac_s *priv)
   uint32_t regval;
   uint32_t status;
 
-  nllvdbg("d_len: %d txhead: %d\n",  dev->d_len, priv->txhead);
+  nllinfo("d_len: %d txhead: %d\n",  dev->d_len, priv->txhead);
   sam_dumppacket("Transmit packet", dev->d_buf, dev->d_len);
 
   /* Check parameter */
@@ -830,7 +830,7 @@ static int sam_transmit(struct sam_emac_s *priv)
 
   if (sam_txfree(priv) < 1)
     {
-      nllvdbg("Disabling RX interrupts\n");
+      nllinfo("Disabling RX interrupts\n");
       sam_putreg(priv, SAM_EMAC_IDR, EMAC_INT_RCOMP);
     }
 
@@ -1010,7 +1010,7 @@ static int sam_recvframe(struct sam_emac_s *priv)
   sam_cmcc_invalidate((uintptr_t)rxdesc,
                       (uintptr_t)rxdesc + sizeof(struct emac_rxdesc_s));
 
-  nllvdbg("rxndx: %d\n", rxndx);
+  nllinfo("rxndx: %d\n", rxndx);
 
   while ((rxdesc->addr & EMACRXD_ADDR_OWNER) != 0)
     {
@@ -1060,7 +1060,7 @@ static int sam_recvframe(struct sam_emac_s *priv)
         {
           if (rxndx == priv->rxndx)
             {
-              nllvdbg("ERROR: No EOF (Invalid of buffers too small)\n");
+              nllinfo("ERROR: No EOF (Invalid of buffers too small)\n");
               do
                 {
                   /* Give ownership back to the EMAC */
@@ -1107,7 +1107,7 @@ static int sam_recvframe(struct sam_emac_s *priv)
               /* Frame size from the EMAC */
 
               dev->d_len = (rxdesc->status & EMACRXD_STA_FRLEN_MASK);
-              nllvdbg("packet %d-%d (%d)\n", priv->rxndx, rxndx, dev->d_len);
+              nllinfo("packet %d-%d (%d)\n", priv->rxndx, rxndx, dev->d_len);
 
               /* All data have been copied in the application frame buffer,
                * release the RX descriptor
@@ -1132,7 +1132,7 @@ static int sam_recvframe(struct sam_emac_s *priv)
                * all of the data.
                */
 
-              nllvdbg("rxndx: %d d_len: %d\n", priv->rxndx, dev->d_len);
+              nllinfo("rxndx: %d d_len: %d\n", priv->rxndx, dev->d_len);
 
               if (pktlen < dev->d_len)
                 {
@@ -1167,7 +1167,7 @@ static int sam_recvframe(struct sam_emac_s *priv)
   /* No packet was found */
 
   priv->rxndx = rxndx;
-  nllvdbg("rxndx: %d\n", priv->rxndx);
+  nllinfo("rxndx: %d\n", priv->rxndx);
   return -EAGAIN;
 }
 
@@ -1222,7 +1222,7 @@ static void sam_receive(struct sam_emac_s *priv)
 #ifdef CONFIG_NET_IPv4
       if (BUF->type == HTONS(ETHTYPE_IP))
         {
-          nllvdbg("IPv4 frame\n");
+          nllinfo("IPv4 frame\n");
 
           /* Handle ARP on input then give the IPv4 packet to the network
            * layer
@@ -1262,7 +1262,7 @@ static void sam_receive(struct sam_emac_s *priv)
 #ifdef CONFIG_NET_IPv6
       if (BUF->type == HTONS(ETHTYPE_IP6))
         {
-          nllvdbg("Iv6 frame\n");
+          nllinfo("Iv6 frame\n");
 
           /* Give the IPv6 packet to the network layer */
 
@@ -1299,7 +1299,7 @@ static void sam_receive(struct sam_emac_s *priv)
 #ifdef CONFIG_NET_ARP
       if (BUF->type == htons(ETHTYPE_ARP))
         {
-          nllvdbg("ARP frame\n");
+          nllinfo("ARP frame\n");
 
           /* Handle ARP packet */
 
@@ -1442,7 +1442,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv)
   imr = sam_getreg(priv, SAM_EMAC_IMR);
 
   pending = isr & ~(imr | EMAC_INT_UNUSED);
-  nllvdbg("isr: %08x pending: %08x\n", isr, pending);
+  nllinfo("isr: %08x pending: %08x\n", isr, pending);
 
   /* Check for the completion of a transmission.  This should be done before
    * checking for received data (because receiving can cause another transmission
@@ -1962,7 +1962,7 @@ static int sam_ifup(struct net_driver_s *dev)
 
   /* Configure the EMAC interface for normal operation. */
 
-  nllvdbg("Initialize the EMAC\n");
+  nllinfo("Initialize the EMAC\n");
   sam_emac_configure(priv);
 
   /* Set the MAC address (should have been configured while we were down) */
@@ -1994,11 +1994,11 @@ static int sam_ifup(struct net_driver_s *dev)
     }
 
   while (sam_linkup(priv) == 0);
-  nllvdbg("Link detected \n");
+  nllinfo("Link detected \n");
 
   /* Enable normal MAC operation */
 
-  nllvdbg("Enable normal operation\n");
+  nllinfo("Enable normal operation\n");
 
   /* Set and activate a timer process */
 
@@ -2077,7 +2077,7 @@ static int sam_ifdown(struct net_driver_s *dev)
 
 static inline void sam_txavail_process(FAR struct sam_emac_s *priv)
 {
-  nllvdbg("ifup: %d\n", priv->ifup);
+  nllinfo("ifup: %d\n", priv->ifup);
 
   /* Ignore the notification if the interface is not yet up */
 
@@ -2331,7 +2331,7 @@ static int sam_addmac(struct net_driver_s *dev, const uint8_t *mac)
   unsigned int bit;
 
   UNUSED(priv);
-  nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
           mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
   /* Calculate the 6-bit has table index */
@@ -2405,7 +2405,7 @@ static int sam_rmmac(struct net_driver_s *dev, const uint8_t *mac)
   unsigned int bit;
 
   UNUSED(priv);
-  nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
           mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
   /* Calculate the 6-bit has table index */
@@ -2601,21 +2601,21 @@ static void sam_phydump(struct sam_emac_s *priv)
   sam_putreg(priv, SAM_EMAC_NCR, regval);
 
 #ifdef CONFIG_SAM34_EMAC_RMII
-  nllvdbg("RMII Registers (Address %02x)\n", priv->phyaddr);
+  nllinfo("RMII Registers (Address %02x)\n", priv->phyaddr);
 #else /* defined(CONFIG_SAM34_EMAC_MII) */
-  nllvdbg("MII Registers (Address %02x)\n", priv->phyaddr);
+  nllinfo("MII Registers (Address %02x)\n", priv->phyaddr);
 #endif
 
   sam_phyread(priv, priv->phyaddr, MII_MCR, &phyval);
-  nllvdbg("  MCR:       %04x\n", phyval);
+  nllinfo("  MCR:       %04x\n", phyval);
   sam_phyread(priv, priv->phyaddr, MII_MSR, &phyval);
-  nllvdbg("  MSR:       %04x\n", phyval);
+  nllinfo("  MSR:       %04x\n", phyval);
   sam_phyread(priv, priv->phyaddr, MII_ADVERTISE, &phyval);
-  nllvdbg("  ADVERTISE: %04x\n", phyval);
+  nllinfo("  ADVERTISE: %04x\n", phyval);
   sam_phyread(priv, priv->phyaddr, MII_LPA, &phyval);
-  nllvdbg("  LPR:       %04x\n", phyval);
+  nllinfo("  LPR:       %04x\n", phyval);
   sam_phyread(priv, priv->phyaddr, CONFIG_SAM34_EMAC_PHYSR, &phyval);
-  nllvdbg("  PHYSR:     %04x\n", phyval);
+  nllinfo("  PHYSR:     %04x\n", phyval);
 
   /* Disable management port */
 
@@ -2738,7 +2738,7 @@ static int sam_phyreset(struct sam_emac_s *priv)
   int timeout;
   int ret;
 
-  nllvdbg(" sam_phyreset\n");
+  nllinfo(" sam_phyreset\n");
 
   /* Enable management port */
 
@@ -2805,7 +2805,7 @@ static int sam_phyfind(struct sam_emac_s *priv, uint8_t *phyaddr)
   unsigned int offset;
   int ret = -ESRCH;
 
-  nllvdbg("Find a valid PHY address\n");
+  nllinfo("Find a valid PHY address\n");
 
   /* Enable management port */
 
@@ -2850,10 +2850,10 @@ static int sam_phyfind(struct sam_emac_s *priv, uint8_t *phyaddr)
 
   if (ret == OK)
     {
-      nllvdbg("  PHYID1: %04x PHY addr: %d\n", phyval, candidate);
+      nllinfo("  PHYID1: %04x PHY addr: %d\n", phyval, candidate);
       *phyaddr = candidate;
       sam_phyread(priv, candidate, CONFIG_SAM34_EMAC_PHYSR, &phyval);
-      nllvdbg("  PHYSR:  %04x PHY addr: %d\n", phyval, candidate);
+      nllinfo("  PHYSR:  %04x PHY addr: %d\n", phyval, candidate);
     }
 
   /* Disable management port */
@@ -3030,7 +3030,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
       goto errout;
     }
 
-  nllvdbg("PHYID1: %04x PHY address: %02x\n", phyid1, priv->phyaddr);
+  nllinfo("PHYID1: %04x PHY address: %02x\n", phyid1, priv->phyaddr);
 
   ret = sam_phyread(priv, priv->phyaddr, MII_PHYID2, &phyid2);
   if (ret < 0)
@@ -3039,14 +3039,14 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
       goto errout;
     }
 
-  nllvdbg("PHYID2: %04x PHY address: %02x\n", phyid2, priv->phyaddr);
+  nllinfo("PHYID2: %04x PHY address: %02x\n", phyid2, priv->phyaddr);
 
   if (phyid1 == MII_OUI_MSB &&
      ((phyid2 & MII_PHYID2_OUI_MASK) >> MII_PHYID2_OUI_SHIFT) == MII_OUI_LSB)
     {
-      nllvdbg("  Vendor Model Number:   %04x\n",
+      nllinfo("  Vendor Model Number:   %04x\n",
              (phyid2 & MII_PHYID2_MODEL_MASK) >> MII_PHYID2_MODEL_SHIFT);
-      nllvdbg("  Model Revision Number: %04x\n",
+      nllinfo("  Model Revision Number: %04x\n",
              (phyid2 & MII_PHYID2_REV_MASK) >> MII_PHYID2_REV_SHIFT);
     }
   else
@@ -3118,7 +3118,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
       goto errout;
     }
 
-  nllvdbg("  MCR: %04x\n", mcr);
+  nllinfo("  MCR: %04x\n", mcr);
 
   /* Check AutoNegotiate complete */
 
@@ -3138,7 +3138,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
         {
           /* Yes.. break out of the loop */
 
-          nllvdbg("AutoNegotiate complete\n");
+          nllinfo("AutoNegotiate complete\n");
           break;
         }
 
@@ -3297,7 +3297,7 @@ static bool sam_linkup(struct sam_emac_s *priv)
 
   /* Start the EMAC transfers */
 
-  nllvdbg("Link is up\n");
+  nllinfo("Link is up\n");
   linkup = true;
 
 errout:
@@ -3598,7 +3598,7 @@ static void sam_macaddress(struct sam_emac_s *priv)
   struct net_driver_s *dev = &priv->dev;
   uint32_t regval;
 
-  nllvdbg("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  nllinfo("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
           dev->d_ifname,
           dev->d_mac.ether_addr_octet[0], dev->d_mac.ether_addr_octet[1],
           dev->d_mac.ether_addr_octet[2], dev->d_mac.ether_addr_octet[3],
@@ -3664,7 +3664,7 @@ static void sam_ipv6multicast(struct sam_emac_s *priv)
   mac[4] = tmp16 & 0xff;
   mac[5] = tmp16 >> 8;
 
-  nvdbg("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  ninfo("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n",
         mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
   (void)sam_addmac(dev, mac);
@@ -3710,7 +3710,7 @@ static int sam_emac_configure(struct sam_emac_s *priv)
 {
   uint32_t regval;
 
-  nllvdbg("Entry\n");
+  nllinfo("Entry\n");
 
   /* Enable clocking to the EMAC peripheral */
 
diff --git a/arch/arm/src/sam34/sam_hsmci.c b/arch/arm/src/sam34/sam_hsmci.c
index d84fb0175f..bf5f3c6e71 100644
--- a/arch/arm/src/sam34/sam_hsmci.c
+++ b/arch/arm/src/sam34/sam_hsmci.c
@@ -1320,7 +1320,7 @@ static int sam_interrupt(int irq, void *context)
                 {
                   /* Yes.. Was the error some kind of timeout? */
 
-                  fllvdbg("ERROR: events: %08x SR: %08x\n",
+                  fllinfo("ERROR: events: %08x SR: %08x\n",
                           priv->cmdrmask, enabled);
 
                   if ((pending & HSMCI_RESPONSE_TIMEOUT_ERRORS) != 0)
@@ -1754,7 +1754,7 @@ static int sam_sendcmd(FAR struct sdio_dev_s *dev,
 
   /* Write the fully decorated command to CMDR */
 
-  fvdbg("cmd: %08x arg: %08x regval: %08x\n", cmd, arg, regval);
+  finfo("cmd: %08x arg: %08x regval: %08x\n", cmd, arg, regval);
   putreg32(regval, SAM_HSMCI_CMDR);
   sam_cmdsample1(SAMPLENDX_AFTER_CMDR);
   return OK;
@@ -2348,7 +2348,7 @@ static void sam_callbackenable(FAR struct sdio_dev_s *dev,
 {
   struct sam_dev_s *priv = (struct sam_dev_s *)dev;
 
-  fvdbg("eventset: %02x\n", eventset);
+  finfo("eventset: %02x\n", eventset);
   DEBUGASSERT(priv != NULL);
 
   priv->cbevents = eventset;
@@ -2384,7 +2384,7 @@ static int sam_registercallback(FAR struct sdio_dev_s *dev,
 
   /* Disable callbacks and register this callback and is argument */
 
-  fvdbg("Register %p(%p)\n", callback, arg);
+  finfo("Register %p(%p)\n", callback, arg);
   DEBUGASSERT(priv != NULL);
 
   priv->cbevents = 0;
@@ -2581,7 +2581,7 @@ static void sam_callback(void *arg)
   /* Is a callback registered? */
 
   DEBUGASSERT(priv != NULL);
-  fvdbg("Callback %p(%p) cbevents: %02x cdstatus: %02x\n",
+  finfo("Callback %p(%p) cbevents: %02x cdstatus: %02x\n",
         priv->callback, priv->cbarg, priv->cbevents, priv->cdstatus);
 
   if (priv->callback)
@@ -2626,14 +2626,14 @@ static void sam_callback(void *arg)
         {
           /* Yes.. queue it */
 
-           fllvdbg("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg);
+           fllinfo("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg);
           (void)work_queue(LPWORK, &priv->cbwork, (worker_t)priv->callback, priv->cbarg, 0);
         }
       else
         {
           /* No.. then just call the callback here */
 
-          fvdbg("Callback to %p(%p)\n", priv->callback, priv->cbarg);
+          finfo("Callback to %p(%p)\n", priv->callback, priv->cbarg);
           priv->callback(priv->cbarg);
         }
     }
@@ -2741,7 +2741,7 @@ void sdio_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot)
       priv->cdstatus &= ~SDIO_STATUS_PRESENT;
     }
 
-  fllvdbg("cdstatus OLD: %02x NEW: %02x\n", cdstatus, priv->cdstatus);
+  fllinfo("cdstatus OLD: %02x NEW: %02x\n", cdstatus, priv->cdstatus);
 
   /* Perform any requested callback if the status has changed */
 
@@ -2786,7 +2786,7 @@ void sdio_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect)
       priv->cdstatus &= ~SDIO_STATUS_WRPROTECTED;
     }
 
-  fvdbg("cdstatus: %02x\n", priv->cdstatus);
+  finfo("cdstatus: %02x\n", priv->cdstatus);
   leave_critical_section(flags);
 }
 #endif /* CONFIG_SAM34_HSMCI */
diff --git a/arch/arm/src/sam34/sam_rtc.c b/arch/arm/src/sam34/sam_rtc.c
index 8dbe4e9e1a..1877f7d111 100644
--- a/arch/arm/src/sam34/sam_rtc.c
+++ b/arch/arm/src/sam34/sam_rtc.c
@@ -90,14 +90,14 @@
 
 #ifdef CONFIG_DEBUG_RTC
 #  define rtcdbg    dbg
-#  define rtcvdbg   vdbg
+#  define rtcinfo   info
 #  define rtclldbg  lldbg
-#  define rtcllvdbg llvdbg
+#  define rtcllinfo llinfo
 #else
 #  define rtcdbg(x...)
-#  define rtcvdbg(x...)
+#  define rtcinfo(x...)
 #  define rtclldbg(x...)
-#  define rtcllvdbg(x...)
+#  define rtcllinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/arch/arm/src/sam34/sam_rtt.c b/arch/arm/src/sam34/sam_rtt.c
index a0c94f7ef7..e281723114 100644
--- a/arch/arm/src/sam34/sam_rtt.c
+++ b/arch/arm/src/sam34/sam_rtt.c
@@ -82,10 +82,10 @@
 
 #ifdef CONFIG_DEBUG_RTT
 #  define rttdbg    lldbg
-#  define rttvdbg   llvdbg
+#  define rttinfo   llinfo
 #else
 #  define rttdbg(x...)
-#  define rttvdbg(x...)
+#  define rttinfo(x...)
 #endif
 
 /****************************************************************************
@@ -287,7 +287,7 @@ static int sam34_interrupt(int irq, FAR void *context)
 {
   FAR struct sam34_lowerhalf_s *priv = &g_tcdev;
 
-  rttvdbg("Entry\n");
+  rttinfo("Entry\n");
   DEBUGASSERT(irq == SAM_IRQ_RTT);
 
   /* Check if the interrupt is really pending */
@@ -373,7 +373,7 @@ static int sam34_start(FAR struct timer_lowerhalf_s *lower)
   uint32_t mr;
   uint32_t vr;
 
-  rttvdbg("Entry\n");
+  rttinfo("Entry\n");
   DEBUGASSERT(priv);
 
   if (priv->started)
@@ -433,7 +433,7 @@ static int sam34_start(FAR struct timer_lowerhalf_s *lower)
 static int sam34_stop(FAR struct timer_lowerhalf_s *lower)
 {
   FAR struct sam34_lowerhalf_s *priv = (FAR struct sam34_lowerhalf_s *)lower;
-  rttvdbg("Entry\n");
+  rttinfo("Entry\n");
   DEBUGASSERT(priv);
 
   if (!priv->started)
@@ -474,7 +474,7 @@ static int sam34_getstatus(FAR struct timer_lowerhalf_s *lower,
 {
   FAR struct sam34_lowerhalf_s *priv = (FAR struct sam34_lowerhalf_s *)lower;
 
-  rttvdbg("Entry\n");
+  rttinfo("Entry\n");
   DEBUGASSERT(priv);
 
   /* Return the status bit */
@@ -498,9 +498,9 @@ static int sam34_getstatus(FAR struct timer_lowerhalf_s *lower,
 
   status->timeleft = 1000000ULL*(sam34_getreg(SAM_RTT_AR) - sam34_readvr())/RTT_FCLK;
 
-  rttvdbg("  flags    : %08x\n", status->flags);
-  rttvdbg("  timeout  : %d\n", status->timeout);
-  rttvdbg("  timeleft : %d\n", status->timeleft);
+  rttinfo("  flags    : %08x\n", status->flags);
+  rttinfo("  timeout  : %d\n", status->timeout);
+  rttinfo("  timeleft : %d\n", status->timeleft);
   return OK;
 }
 
@@ -526,7 +526,7 @@ static int sam34_settimeout(FAR struct timer_lowerhalf_s *lower,
   FAR struct sam34_lowerhalf_s *priv = (FAR struct sam34_lowerhalf_s *)lower;
 
   DEBUGASSERT(priv);
-  rttvdbg("Entry: timeout=%d\n", timeout);
+  rttinfo("Entry: timeout=%d\n", timeout);
 
   if (priv->started)
     {
@@ -547,7 +547,7 @@ static int sam34_settimeout(FAR struct timer_lowerhalf_s *lower,
   timeout = (1000000ULL * priv->clkticks) / RTT_FCLK;          /* Truncated timeout */
   priv->adjustment = priv->timeout - timeout;                  /* Truncated time to be added to next interval (dither) */
 
-  rttvdbg("fclk=%d clkticks=%d timout=%d, adjustment=%d\n",
+  rttinfo("fclk=%d clkticks=%d timout=%d, adjustment=%d\n",
          RTT_FCLK, priv->clkticks, priv->timeout, priv->adjustment);
 
   return OK;
@@ -582,7 +582,7 @@ static tccb_t sam34_sethandler(FAR struct timer_lowerhalf_s *lower,
   flags = enter_critical_section();
 
   DEBUGASSERT(priv);
-  rttvdbg("Entry: handler=%p\n", handler);
+  rttinfo("Entry: handler=%p\n", handler);
 
   /* Get the old handler return value */
 
@@ -623,7 +623,7 @@ static int sam34_ioctl(FAR struct timer_lowerhalf_s *lower, int cmd,
   int ret = -ENOTTY;
 
   DEBUGASSERT(priv);
-  rttvdbg("Entry: cmd=%d arg=%ld\n", cmd, arg);
+  rttinfo("Entry: cmd=%d arg=%ld\n", cmd, arg);
   UNUSED(priv);
 
   return ret;
@@ -653,7 +653,7 @@ void sam_rttinitialize(FAR const char *devpath)
 {
   FAR struct sam34_lowerhalf_s *priv = &g_tcdev;
 
-  rttvdbg("Entry: devpath=%s\n", devpath);
+  rttinfo("Entry: devpath=%s\n", devpath);
 
   /* Initialize the driver state structure.  Here we assume: (1) the state
    * structure lies in .bss and was zeroed at reset time.  (2) This function
diff --git a/arch/arm/src/sam34/sam_spi.c b/arch/arm/src/sam34/sam_spi.c
index 203ec5a1df..ca9938782e 100644
--- a/arch/arm/src/sam34/sam_spi.c
+++ b/arch/arm/src/sam34/sam_spi.c
@@ -150,13 +150,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 #define DMA_INITIAL      0
@@ -523,17 +523,17 @@ static inline void spi_putreg(struct sam_spidev_s *spi, uint32_t value,
 #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);
-  spivdbg("    MR:%08x   SR:%08x  IMR:%08x\n",
+  spiinfo("%s:\n", msg);
+  spiinfo("    MR:%08x   SR:%08x  IMR:%08x\n",
           getreg32(spi->base + SAM_SPI_MR_OFFSET),
           getreg32(spi->base + SAM_SPI_SR_OFFSET),
           getreg32(spi->base + SAM_SPI_IMR_OFFSET));
-  spivdbg("  CSR0:%08x CSR1:%08x CSR2:%08x CSR3:%08x\n",
+  spiinfo("  CSR0:%08x CSR1:%08x CSR2:%08x CSR3:%08x\n",
           getreg32(spi->base + SAM_SPI_CSR0_OFFSET),
           getreg32(spi->base + SAM_SPI_CSR1_OFFSET),
           getreg32(spi->base + SAM_SPI_CSR2_OFFSET),
           getreg32(spi->base + SAM_SPI_CSR3_OFFSET));
-  spivdbg("  WPCR:%08x WPSR:%08x\n",
+  spiinfo("  WPCR:%08x WPSR:%08x\n",
           getreg32(spi->base + SAM_SPI_WPCR_OFFSET),
           getreg32(spi->base + SAM_SPI_WPSR_OFFSET));
 }
@@ -893,7 +893,7 @@ static int spi_lock(struct spi_dev_s *dev, bool lock)
   struct sam_spics_s *spics = (struct sam_spics_s *)dev;
   struct sam_spidev_s *spi = spi_device(spics);
 
-  spivdbg("lock=%d\n", lock);
+  spiinfo("lock=%d\n", lock);
   if (lock)
     {
       /* Take the semaphore (perhaps waiting) */
@@ -941,10 +941,10 @@ static void spi_select(struct spi_dev_s *dev, enum spi_dev_e devid,
 
   /* Are we selecting or de-selecting the device? */
 
-  spivdbg("selected=%d\n", selected);
+  spiinfo("selected=%d\n", selected);
   if (selected)
     {
-      spivdbg("cs=%d\n", spics->cs);
+      spiinfo("cs=%d\n", spics->cs);
 
       /* Before writing the TDR, the PCS field in the SPI_MR register must be set
        * in order to select a slave.
@@ -999,7 +999,7 @@ static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency)
   uint32_t regval;
   unsigned int offset;
 
-  spivdbg("cs=%d frequency=%d\n", spics->cs, frequency);
+  spiinfo("cs=%d frequency=%d\n", spics->cs, frequency);
 
   /* Check if the requested frequency is the same as the frequency selection */
 
@@ -1069,7 +1069,7 @@ static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency)
   /* Calculate the new actual frequency */
 
   actual = SAM_SPI_CLOCK / scbr;
-  spivdbg("csr[offset=%02x]=%08x actual=%d\n", offset, regval, actual);
+  spiinfo("csr[offset=%02x]=%08x actual=%d\n", offset, regval, actual);
 
   /* Save the frequency setting */
 
@@ -1102,7 +1102,7 @@ static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode)
   uint32_t regval;
   unsigned int offset;
 
-  spivdbg("cs=%d mode=%d\n", spics->cs, mode);
+  spiinfo("cs=%d mode=%d\n", spics->cs, mode);
 
   /* Has the mode changed? */
 
@@ -1145,7 +1145,7 @@ static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode)
         }
 
       spi_putreg(spi, regval, offset);
-      spivdbg("csr[offset=%02x]=%08x\n", offset, regval);
+      spiinfo("csr[offset=%02x]=%08x\n", offset, regval);
 
       /* Save the mode so that subsequent re-configurations will be faster */
 
@@ -1175,7 +1175,7 @@ static void spi_setbits(struct spi_dev_s *dev, int nbits)
   uint32_t regval;
   unsigned int offset;
 
-  spivdbg("cs=%d nbits=%d\n", spics->cs, nbits);
+  spiinfo("cs=%d nbits=%d\n", spics->cs, nbits);
   DEBUGASSERT(spics && nbits > 7 && nbits < 17);
 
   /* Has the number of bits changed? */
@@ -1190,7 +1190,7 @@ static void spi_setbits(struct spi_dev_s *dev, int nbits)
       regval |= SPI_CSR_BITS(nbits);
       spi_putreg(spi, regval, offset);
 
-      spivdbg("csr[offset=%02x]=%08x\n", offset, regval);
+      spiinfo("csr[offset=%02x]=%08x\n", offset, regval);
 
       /* Save the selection so the subsequence re-configurations will be faster */
 
@@ -1228,7 +1228,7 @@ static uint16_t spi_send(struct spi_dev_s *dev, uint16_t wd)
   rxbyte = (uint8_t)0;
   spi_exchange(dev, &txbyte, &rxbyte, 1);
 
-  spivdbg("Sent %02x received %02x\n", txbyte, rxbyte);
+  spiinfo("Sent %02x received %02x\n", txbyte, rxbyte);
   return (uint16_t)rxbyte;
 }
 
@@ -1276,7 +1276,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
   uint8_t *rxptr8;
   uint8_t *txptr8;
 
-  spivdbg("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords);
+  spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords);
 
   /* Set up PCS bits */
 
@@ -1422,7 +1422,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
       return;
     }
 
-  spivdbg("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords);
+  spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords);
 
   spics = (struct sam_spics_s *)dev;
   spi = spi_device(spics);
@@ -1745,7 +1745,7 @@ struct spi_dev_s *sam_spibus_initialize(int port)
 
   /* The support SAM parts have only a single SPI port */
 
-  spivdbg("port: %d csno: %d spino: %d\n", port, csno, spino);
+  spiinfo("port: %d csno: %d spino: %d\n", port, csno, spino);
   DEBUGASSERT(csno >= 0 && csno <= SAM_SPI_NCS);
 
 #if defined(CONFIG_SAM34_SPI0) && defined(CONFIG_SAM34_SPI1)
@@ -1924,7 +1924,7 @@ struct spi_dev_s *sam_spibus_initialize(int port)
   spi_putreg(spi, regval, offset);
 
   spics->nbits = 8;
-  spivdbg("csr[offset=%02x]=%08x\n", offset, regval);
+  spiinfo("csr[offset=%02x]=%08x\n", offset, regval);
 
   return &spics->spidev;
 }
diff --git a/arch/arm/src/sam34/sam_tc.c b/arch/arm/src/sam34/sam_tc.c
index a95fa49527..985249c6f6 100644
--- a/arch/arm/src/sam34/sam_tc.c
+++ b/arch/arm/src/sam34/sam_tc.c
@@ -80,10 +80,10 @@
 
 #ifdef CONFIG_DEBUG_TIMER
 #  define tcdbg    lldbg
-#  define tcvdbg   llvdbg
+#  define tcinfo   llinfo
 #else
 #  define tcdbg(x...)
-#  define tcvdbg(x...)
+#  define tcinfo(x...)
 #endif
 
 /****************************************************************************
@@ -268,7 +268,7 @@ static int sam34_interrupt(int irq, FAR void *context)
 {
   FAR struct sam34_lowerhalf_s *priv = &g_tcdevs[irq-SAM_IRQ_TC0];
 
-  tcvdbg("Entry\n");
+  tcinfo("Entry\n");
   DEBUGASSERT((irq >= SAM_IRQ_TC0) && (irq <= SAM_IRQ_TC5));
 
   /* Check if the interrupt is really pending */
@@ -299,7 +299,7 @@ static int sam34_interrupt(int irq, FAR void *context)
           /* No handler or the handler returned false.. stop the timer */
 
           sam34_stop((FAR struct timer_lowerhalf_s *)priv);
-          tcvdbg("Stopped\n");
+          tcinfo("Stopped\n");
         }
 
       /* TC_INT_CPCS is cleared by reading SAM_TCx_SR */
@@ -328,7 +328,7 @@ static int sam34_start(FAR struct timer_lowerhalf_s *lower)
   FAR struct sam34_lowerhalf_s *priv = (FAR struct sam34_lowerhalf_s *)lower;
   uint32_t mr_val;
 
-  tcvdbg("Entry\n");
+  tcinfo("Entry\n");
   DEBUGASSERT(priv);
 
   if (priv->started)
@@ -382,7 +382,7 @@ static int sam34_start(FAR struct timer_lowerhalf_s *lower)
 static int sam34_stop(FAR struct timer_lowerhalf_s *lower)
 {
   FAR struct sam34_lowerhalf_s *priv = (FAR struct sam34_lowerhalf_s *)lower;
-  tcvdbg("Entry\n");
+  tcinfo("Entry\n");
   DEBUGASSERT(priv);
 
   if (!priv->started)
@@ -421,7 +421,7 @@ static int sam34_getstatus(FAR struct timer_lowerhalf_s *lower,
   FAR struct sam34_lowerhalf_s *priv = (FAR struct sam34_lowerhalf_s *)lower;
   uint32_t elapsed;
 
-  tcvdbg("Entry\n");
+  tcinfo("Entry\n");
   DEBUGASSERT(priv);
 
   /* Return the status bit */
@@ -446,9 +446,9 @@ static int sam34_getstatus(FAR struct timer_lowerhalf_s *lower,
   elapsed = sam34_getreg(priv->base + SAM_TC_CV_OFFSET);
   status->timeleft = ((uint64_t)priv->timeout * elapsed) / (priv->clkticks + 1); /* TODO - check on this +1 */
 
-  tcvdbg("  flags    : %08x\n", status->flags);
-  tcvdbg("  timeout  : %d\n", status->timeout);
-  tcvdbg("  timeleft : %d\n", status->timeleft);
+  tcinfo("  flags    : %08x\n", status->flags);
+  tcinfo("  timeout  : %d\n", status->timeout);
+  tcinfo("  timeleft : %d\n", status->timeleft);
   return OK;
 }
 
@@ -480,7 +480,7 @@ static int sam34_settimeout(FAR struct timer_lowerhalf_s *lower,
       return -EPERM;
     }
 
-  tcvdbg("Entry: timeout=%d\n", timeout);
+  tcinfo("Entry: timeout=%d\n", timeout);
 
   /* Can this timeout be represented? */
 
@@ -496,7 +496,7 @@ static int sam34_settimeout(FAR struct timer_lowerhalf_s *lower,
   timeout = (1000000ULL * priv->clkticks) / TC_FCLK;          /* Truncated timeout */
   priv->adjustment = priv->timeout - timeout;                 /* Truncated time to be added to next interval (dither) */
 
-  tcvdbg("fclk=%d clkticks=%d timout=%d, adjustment=%d\n",
+  tcinfo("fclk=%d clkticks=%d timout=%d, adjustment=%d\n",
          TC_FCLK, priv->clkticks, priv->timeout, priv->adjustment);
 
   return OK;
@@ -531,7 +531,7 @@ static tccb_t sam34_sethandler(FAR struct timer_lowerhalf_s *lower,
   flags = enter_critical_section();
 
   DEBUGASSERT(priv);
-  tcvdbg("Entry: handler=%p\n", handler);
+  tcinfo("Entry: handler=%p\n", handler);
 
   /* Get the old handler return value */
 
@@ -572,7 +572,7 @@ static int sam34_ioctl(FAR struct timer_lowerhalf_s *lower, int cmd,
   int ret = -ENOTTY;
 
   DEBUGASSERT(priv);
-  tcvdbg("Entry: cmd=%d arg=%ld\n", cmd, arg);
+  tcinfo("Entry: cmd=%d arg=%ld\n", cmd, arg);
   UNUSED(priv);
 
   return ret;
@@ -602,7 +602,7 @@ void sam_tcinitialize(FAR const char *devpath, int irq)
 {
   FAR struct sam34_lowerhalf_s *priv = &g_tcdevs[irq-SAM_IRQ_TC0];
 
-  tcvdbg("Entry: devpath=%s\n", devpath);
+  tcinfo("Entry: devpath=%s\n", devpath);
   DEBUGASSERT((irq >= SAM_IRQ_TC0) && (irq <= SAM_IRQ_TC5));
 
   /* Initialize the driver state structure.  Here we assume: (1) the state
diff --git a/arch/arm/src/sam34/sam_twi.c b/arch/arm/src/sam34/sam_twi.c
index f8c2f7f7ca..265c3f636d 100644
--- a/arch/arm/src/sam34/sam_twi.c
+++ b/arch/arm/src/sam34/sam_twi.c
@@ -100,14 +100,14 @@
 
 #ifdef CONFIG_DEBUG_I2C
 #  define i2cdbg    dbg
-#  define i2cvdbg   vdbg
+#  define i2cinfo   info
 #  define i2clldbg  lldbg
-#  define i2cllvdbg llvdbg
+#  define i2cllinfo llinfo
 #else
 #  define i2cdbg(x...)
-#  define i2cvdbg(x...)
+#  define i2cinfo(x...)
 #  define i2clldbg(x...)
-#  define i2cllvdbg(x...)
+#  define i2cllinfo(x...)
 #endif
 
 /****************************************************************************
@@ -460,7 +460,7 @@ static int twi_interrupt(struct twi_dev_s *priv)
   imr     = twi_getrel(priv, SAM_TWI_IMR_OFFSET);
   pending = sr & imr;
 
-  i2cllvdbg("TWI%d pending: %08x\n", priv->twi, pending);
+  i2cllinfo("TWI%d pending: %08x\n", priv->twi, pending);
 
   msg = priv->msg;
 
@@ -708,7 +708,7 @@ static int twi_transfer(FAR struct i2c_master_s *dev,
   int ret;
 
   DEBUGASSERT(dev != NULL);
-  i2cvdbg("TWI%d count: %d\n", priv->twi, count);
+  i2cinfo("TWI%d count: %d\n", priv->twi, count);
 
   /* Get exclusive access to the device */
 
@@ -842,7 +842,7 @@ static void twi_hw_initialize(struct twi_dev_s *priv, unsigned int pid,
   uint32_t mck;
 #endif
 
-  i2cvdbg("TWI%d Initializing\n", priv->twi);
+  i2cinfo("TWI%d Initializing\n", priv->twi);
 
   /* SVEN: TWI Slave Mode Enabled */
 
@@ -925,7 +925,7 @@ struct i2c_master_s *sam_i2cbus_initialize(int bus)
   uint32_t frequency;
   unsigned int pid;
 
-  i2cvdbg("Initializing TWI%d\n", bus);
+  i2cinfo("Initializing TWI%d\n", bus);
 
   flags = enter_critical_section();
 
@@ -1029,7 +1029,7 @@ int sam_i2cbus_uninitialize(FAR struct i2c_master_s * dev)
 {
   struct twi_dev_s *priv = (struct twi_dev_s *) dev;
 
-  i2cvdbg("TWI%d Un-initializing\n", priv->twi);
+  i2cinfo("TWI%d Un-initializing\n", priv->twi);
 
   /* Disable interrupts */
 
diff --git a/arch/arm/src/sam34/sam_udp.c b/arch/arm/src/sam34/sam_udp.c
index 0a74f5ba24..c1a30c9fc5 100644
--- a/arch/arm/src/sam34/sam_udp.c
+++ b/arch/arm/src/sam34/sam_udp.c
@@ -968,7 +968,7 @@ static int sam_req_write(struct sam_usbdev_s *priv, struct sam_ep_s *privep)
           return -ENOENT;
         }
 
-      ullvdbg("epno=%d req=%p: len=%d xfrd=%d inflight=%d zlpneeded=%d\n",
+      ullinfo("epno=%d req=%p: len=%d xfrd=%d inflight=%d zlpneeded=%d\n",
               epno, privreq, privreq->req.len, privreq->req.xfrd,
               privreq->inflight, privep->zlpneeded);
 
@@ -1139,7 +1139,7 @@ static int sam_req_read(struct sam_usbdev_s *priv, struct sam_ep_s *privep,
           return -ENOENT;
         }
 
-      ullvdbg("EP%d: len=%d xfrd=%d\n",
+      ullinfo("EP%d: len=%d xfrd=%d\n",
               epno, privreq->req.len, privreq->req.xfrd);
 
       /* Ignore any attempt to receive a zero length packet */
@@ -1408,7 +1408,7 @@ static void sam_ep0_setup(struct sam_usbdev_s *priv)
   index.w = GETUINT16(priv->ctrl.index);
   len.w   = GETUINT16(priv->ctrl.len);
 
-  ullvdbg("SETUP: type=%02x req=%02x value=%04x index=%04x len=%04x\n",
+  ullinfo("SETUP: type=%02x req=%02x value=%04x index=%04x len=%04x\n",
           priv->ctrl.type, priv->ctrl.req, value.w, index.w, len.w);
 
   /* Dispatch any non-standard requests */
@@ -1572,7 +1572,7 @@ static void sam_ep0_setup(struct sam_usbdev_s *priv)
           {
             /* Special case recipient=device test mode */
 
-            ullvdbg("test mode: %d\n", index.w);
+            ullinfo("test mode: %d\n", index.w);
           }
         else if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) != USB_REQ_RECIPIENT_ENDPOINT)
           {
@@ -2749,7 +2749,7 @@ static int sam_ep_configure_internal(struct sam_ep_s *privep,
 
   DEBUGASSERT(privep && privep->dev && desc);
 
-  uvdbg("len: %02x type: %02x addr: %02x attr: %02x "
+  uinfo("len: %02x type: %02x addr: %02x attr: %02x "
         "maxpacketsize: %02x %02x interval: %02x\n",
         desc->len, desc->type, desc->addr, desc->attr,
         desc->mxpacketsize[0],  desc->mxpacketsize[1],
diff --git a/arch/arm/src/sam34/sam_wdt.c b/arch/arm/src/sam34/sam_wdt.c
index dbb3f6f895..92dde86756 100644
--- a/arch/arm/src/sam34/sam_wdt.c
+++ b/arch/arm/src/sam34/sam_wdt.c
@@ -89,10 +89,10 @@
 
 #ifdef CONFIG_DEBUG_WATCHDOG
 #  define wddbg    lldbg
-#  define wdvdbg   llvdbg
+#  define wdinfo   llinfo
 #else
 #  define wddbg(x...)
-#  define wdvdbg(x...)
+#  define wdinfo(x...)
 #endif
 
 /****************************************************************************
@@ -314,7 +314,7 @@ static int sam34_start(FAR struct watchdog_lowerhalf_s *lower)
   FAR struct sam34_lowerhalf_s *priv = (FAR struct sam34_lowerhalf_s *)lower;
   uint32_t mr_val = 0;
 
-  wdvdbg("Entry\n");
+  wdinfo("Entry\n");
   DEBUGASSERT(priv);
 
   /* The watchdog is always disabled after a reset. It is enabled by setting
@@ -360,7 +360,7 @@ static int sam34_stop(FAR struct watchdog_lowerhalf_s *lower)
    * except by a reset.
    */
 
-  wdvdbg("Entry\n");
+  wdinfo("Entry\n");
   return -ENOSYS;
 }
 
@@ -386,7 +386,7 @@ static int sam34_stop(FAR struct watchdog_lowerhalf_s *lower)
 
 static int sam34_keepalive(FAR struct watchdog_lowerhalf_s *lower)
 {
-  wdvdbg("Entry\n");
+  wdinfo("Entry\n");
 
   sam34_putreg((WDT_CR_KEY | WDT_CR_WDRSTT), SAM_WDT_CR);
   return OK;
@@ -414,7 +414,7 @@ static int sam34_getstatus(FAR struct watchdog_lowerhalf_s *lower,
   FAR struct sam34_lowerhalf_s *priv = (FAR struct sam34_lowerhalf_s *)lower;
   uint32_t elapsed;
 
-  wdvdbg("Entry\n");
+  wdinfo("Entry\n");
   DEBUGASSERT(priv);
 
   /* Return the status bit */
@@ -441,10 +441,10 @@ static int sam34_getstatus(FAR struct watchdog_lowerhalf_s *lower,
 
   status->timeleft = (priv->timeout * elapsed) / (priv->reload + 1);
 
-  wdvdbg("Status     : %08x\n", sam34_getreg(SAM_WDT_SR));
-  wdvdbg("  flags    : %08x\n", status->flags);
-  wdvdbg("  timeout  : %d\n", status->timeout);
-  wdvdbg("  timeleft : %d\n", status->timeleft);
+  wdinfo("Status     : %08x\n", sam34_getreg(SAM_WDT_SR));
+  wdinfo("  flags    : %08x\n", status->flags);
+  wdinfo("  timeout  : %d\n", status->timeout);
+  wdinfo("  timeleft : %d\n", status->timeleft);
   return OK;
 }
 
@@ -471,7 +471,7 @@ static int sam34_settimeout(FAR struct watchdog_lowerhalf_s *lower,
   uint32_t reload;
 
   DEBUGASSERT(priv);
-  wdvdbg("Entry: timeout=%d\n", timeout);
+  wdinfo("Entry: timeout=%d\n", timeout);
 
   /* Can this timeout be represented? */
 
@@ -503,7 +503,7 @@ static int sam34_settimeout(FAR struct watchdog_lowerhalf_s *lower,
 
   priv->reload = reload;
 
-  wdvdbg("fwdt=%d reload=%d timout=%d\n",
+  wdinfo("fwdt=%d reload=%d timout=%d\n",
          WDT_FCLK, reload, priv->timeout);
 
   /* Don't commit to MR register until started! */
@@ -543,7 +543,7 @@ static xcpt_t sam34_capture(FAR struct watchdog_lowerhalf_s *lower,
   uint16_t regval;
 
   DEBUGASSERT(priv);
-  wdvdbg("Entry: handler=%p\n", handler);
+  wdinfo("Entry: handler=%p\n", handler);
 
   /* Get the old handler return value */
 
@@ -611,7 +611,7 @@ static int sam34_ioctl(FAR struct watchdog_lowerhalf_s *lower, int cmd,
   int ret = -ENOTTY;
 
   DEBUGASSERT(priv);
-  wdvdbg("Entry: cmd=%d arg=%ld\n", cmd, arg);
+  wdinfo("Entry: cmd=%d arg=%ld\n", cmd, arg);
 
   /* WDIOC_MINTIME: Set the minimum ping time.  If two keepalive ioctls
    * are received within this time, a reset event will be generated.
@@ -676,7 +676,7 @@ void sam_wdtinitialize(FAR const char *devpath)
            WDT_MR_WDRSTEN);
   sam34_putreg(mr_val, SAM_WDT_MR);
 
-  wdvdbg("Entry: devpath=%s\n", devpath);
+  wdinfo("Entry: devpath=%s\n", devpath);
 
   /* NOTE we assume that clocking to the IWDG has already been provided by
    * the RCC initialization logic.
diff --git a/arch/arm/src/sama5/sam_adc.c b/arch/arm/src/sama5/sam_adc.c
index 68565bc502..e1e3071996 100644
--- a/arch/arm/src/sama5/sam_adc.c
+++ b/arch/arm/src/sama5/sam_adc.c
@@ -604,7 +604,7 @@ static void sam_adc_dmadone(void *arg)
   int chan;
   int i;
 
-  avdbg("ready=%d enabled=%d\n", priv->enabled, priv->ready);
+  ainfo("ready=%d enabled=%d\n", priv->enabled, priv->ready);
   ASSERT(priv != NULL && !priv->ready);
 
   /* If the DMA transfer is not enabled, just ignore the data (and do not start
@@ -725,7 +725,7 @@ static void sam_adc_dmacallback(DMA_HANDLE handle, void *arg, int result)
   struct sam_adc_s *priv = (struct sam_adc_s *)arg;
   int ret;
 
-  allvdbg("ready=%d enabled=%d\n", priv->enabled, priv->ready);
+  allinfo("ready=%d enabled=%d\n", priv->enabled, priv->ready);
   DEBUGASSERT(priv->ready);
 
   /* Check of the bottom half is keeping up with us.
@@ -798,7 +798,7 @@ static int sam_adc_dmasetup(FAR struct sam_adc_s *priv, FAR uint8_t *buffer,
   uint32_t paddr;
   uint32_t maddr;
 
-  avdbg("buffer=%p buflen=%d\n", buffer, (int)buflen);
+  ainfo("buffer=%p buflen=%d\n", buffer, (int)buflen);
   DEBUGASSERT(priv != NULL && buffer != NULL && buflen > 0);
   DEBUGASSERT(((uint32_t)buffer & 3) == 0);
 
@@ -849,7 +849,7 @@ static void sam_adc_endconversion(void *arg)
   int chan;
 
   ASSERT(priv != NULL);
-  avdbg("pending=%08x\n", priv->pending);
+  ainfo("pending=%08x\n", priv->pending);
 
   /* Get the set of unmasked, pending ADC interrupts */
 
@@ -1011,7 +1011,7 @@ static void sam_adc_reset(struct adc_dev_s *dev)
 #endif
   uint32_t regval;
 
-  avdbg("Resetting..\n");
+  ainfo("Resetting..\n");
 
   /* NOTE: We can't really reset the ADC hardware without losing the
    * touchscreen configuration.
@@ -1081,7 +1081,7 @@ static int sam_adc_setup(struct adc_dev_s *dev)
   struct sam_adc_s *priv = (struct sam_adc_s *)dev->ad_priv;
   uint32_t regval;
 
-  avdbg("Setup\n");
+  ainfo("Setup\n");
 
   /* Enable channel number tag.  This bit will force the channel number (CHNB)
    * to be included in the LDCR register content.
@@ -1152,7 +1152,7 @@ static void sam_adc_shutdown(struct adc_dev_s *dev)
   struct sam_adc_s *priv = (struct sam_adc_s *)dev->ad_priv;
 #endif
 
-  avdbg("Shutdown\n");
+  ainfo("Shutdown\n");
 
   /* Reset the ADC peripheral */
 
@@ -1181,7 +1181,7 @@ static void sam_adc_rxint(struct adc_dev_s *dev, bool enable)
   struct sam_adc_s *priv = (struct sam_adc_s *)dev->ad_priv;
 #endif
 
-  avdbg("enable=%d\n", enable);
+  ainfo("enable=%d\n", enable);
 
 #ifdef CONFIG_SAMA5_ADC_DMA
   /* Ignore redundant requests */
@@ -1232,7 +1232,7 @@ static int sam_adc_ioctl(struct adc_dev_s *dev, int cmd, unsigned long arg)
 #endif
   int ret = OK;
 
-  avdbg("cmd=%d arg=%ld\n", cmd, arg);
+  ainfo("cmd=%d arg=%ld\n", cmd, arg);
 
   switch (cmd)
     {
@@ -1277,7 +1277,7 @@ static int sam_adc_settimer(struct sam_adc_s *priv, uint32_t frequency,
   uint32_t regval;
   int ret;
 
-  avdbg("frequency=%ld channel=%d\n", (long)frequency, channel);
+  ainfo("frequency=%ld channel=%d\n", (long)frequency, channel);
   DEBUGASSERT(priv && frequency > 0);
 
   /* Configure TC for a 1Hz frequency and trigger on RC compare. */
@@ -1350,7 +1350,7 @@ static void sam_adc_freetimer(struct sam_adc_s *priv)
 {
   /* Is a timer allocated? */
 
-  avdbg("tc=%p\n", priv->tc);
+  ainfo("tc=%p\n", priv->tc);
 
   if (priv->tc)
     {
@@ -1377,7 +1377,7 @@ static int sam_adc_trigger(struct sam_adc_s *priv)
   int ret = OK;
 
 #if defined(CONFIG_SAMA5_ADC_SWTRIG)
-  avdbg("Setup software trigger\n");
+  ainfo("Setup software trigger\n");
 
   /* Configure the software trigger */
 
@@ -1393,7 +1393,7 @@ static int sam_adc_trigger(struct sam_adc_s *priv)
   sam_adc_putreg(priv, SAM_ADC_TRGR, regval);
 
 #elif defined(CONFIG_SAMA5_ADC_ADTRG)
-  avdbg("Setup ADTRG trigger\n");
+  ainfo("Setup ADTRG trigger\n");
 
   /* Configure the trigger via the external ADTRG signal */
 
@@ -1420,7 +1420,7 @@ static int sam_adc_trigger(struct sam_adc_s *priv)
   sam_adc_putreg(priv, SAM_ADC_TRGR, regval);
 
 #elif defined(CONFIG_SAMA5_ADC_TIOATRIG)
-  avdbg("Setup timer/counter trigger\n");
+  ainfo("Setup timer/counter trigger\n");
 
   /* Start the timer */
 
@@ -1500,7 +1500,7 @@ static void sam_adc_autocalibrate(struct sam_adc_s *priv)
 #ifdef CONFIG_SAMA5_ADC_AUTOCALIB
   uint32_t regval;
 
-  avdbg("Entry\n");
+  ainfo("Entry\n");
 
   /* Launch an automatic calibration of the ADC cell on next sequence */
 
@@ -1527,7 +1527,7 @@ static void sam_adc_offset(struct sam_adc_s *priv)
 {
   uint32_t regval = 0;
 
-  avdbg("Entry\n");
+  ainfo("Entry\n");
 
 #ifdef CONFIG_SAMA5_ADC_ANARCH
   /* Set the offset for each enabled channel.  This centers the analog signal
@@ -1644,7 +1644,7 @@ static void sam_adc_gain(struct sam_adc_s *priv)
 #ifdef CONFIG_SAMA5_ADC_ANARCH
   uint32_t regval;
 
-  avdbg("Entry\n");
+  ainfo("Entry\n");
 
   /* Set the gain for each enabled channel */
 
@@ -1690,7 +1690,7 @@ static void sam_adc_gain(struct sam_adc_s *priv)
   sam_adc_putreg(priv, SAM_ADC_CGR, regval);
 
 #else
-  avdbg("Gain=%d\n", CONFIG_SAMA5_ADC_GAIN);
+  ainfo("Gain=%d\n", CONFIG_SAMA5_ADC_GAIN);
 
   /* Set GAIN0 only.  GAIN0 will be used for all channels. */
 
@@ -1711,7 +1711,7 @@ static void sam_adc_analogchange(struct sam_adc_s *priv)
 {
   uint32_t regval;
 
-  avdbg("Entry\n");
+  ainfo("Entry\n");
 
   /* Enable/disable the analog change feature */
 
@@ -1754,7 +1754,7 @@ static void sam_adc_setseqr(int chan, uint32_t *seqr1, uint32_t *seqr2, int seq)
       *seqr1 |= ADC_SEQR1_USCH(seq, chan);
     }
 
-  avdbg("chan=%d seqr1=%08x seqr2=%08x seq=%d\n", chan, *seqr1, *seqr2, seq);
+  ainfo("chan=%d seqr1=%08x seqr2=%08x seq=%d\n", chan, *seqr1, *seqr2, seq);
 }
 #endif
 
@@ -1766,7 +1766,7 @@ static void sam_adc_sequencer(struct sam_adc_s *priv)
   uint32_t seqr2;
   int seq;
 
-  avdbg("Setup sequencer\n");
+  ainfo("Setup sequencer\n");
 
   /* Set user configured channel sequence */
 
@@ -1855,7 +1855,7 @@ static void sam_adc_sequencer(struct sam_adc_s *priv)
 #else
   uint32_t regval;
 
-  avdbg("Disable sequencer\n");
+  ainfo("Disable sequencer\n");
 
   /* Disable the sequencer */
 
@@ -1878,7 +1878,7 @@ static void sam_adc_channels(struct sam_adc_s *priv)
 {
   uint32_t regval;
 
-  avdbg("Entry\n");
+  ainfo("Entry\n");
 
   /* Enable channels. */
 
@@ -1964,7 +1964,7 @@ struct adc_dev_s *sam_adc_initialize(void)
 
   if (!priv->initialized)
     {
-      avdbg("Initializing...\n");
+      ainfo("Initializing...\n");
 
       /* Disable ADC peripheral clock */
 
@@ -2127,7 +2127,7 @@ struct adc_dev_s *sam_adc_initialize(void)
 
   /* Return a pointer to the device structure */
 
-  avdbg("Returning %p\n", &g_adcdev);
+  ainfo("Returning %p\n", &g_adcdev);
   return &g_adcdev;
 }
 
@@ -2143,7 +2143,7 @@ void sam_adc_lock(FAR struct sam_adc_s *priv)
 {
   int ret;
 
-  avdbg("Locking\n");
+  ainfo("Locking\n");
 
   do
     {
@@ -2168,7 +2168,7 @@ void sam_adc_lock(FAR struct sam_adc_s *priv)
 
 void sam_adc_unlock(FAR struct sam_adc_s *priv)
 {
-  avdbg("Unlocking\n");
+  ainfo("Unlocking\n");
   sem_post(&priv->exclsem);
 }
 
diff --git a/arch/arm/src/sama5/sam_can.c b/arch/arm/src/sama5/sam_can.c
index ac9e93cc08..2689ac414f 100644
--- a/arch/arm/src/sama5/sam_can.c
+++ b/arch/arm/src/sama5/sam_can.c
@@ -128,14 +128,14 @@
 
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
-#  define canvdbg   vdbg
+#  define caninfo   info
 #  define canlldbg  lldbg
-#  define canllvdbg llvdbg
+#  define canllinfo llinfo
 #else
 #  define candbg(x...)
-#  define canvdbg(x...)
+#  define caninfo(x...)
 #  define canlldbg(x...)
-#  define canllvdbg(x...)
+#  define canllinfo(x...)
 #endif
 
 #if !defined(CONFIG_DEBUG) || !defined(CONFIG_DEBUG_CAN)
@@ -730,7 +730,7 @@ static int can_recvsetup(FAR struct sam_can_s *priv)
 
       priv->rxmbset |= (1 << mbndx);
 
-      canvdbg("CAN%d Mailbox %d: Index=%d rxmbset=%02x\n",
+      caninfo("CAN%d Mailbox %d: Index=%d rxmbset=%02x\n",
               config->port, mbno, mbndx, priv->rxmbset);
 
       /* Set up the message ID and filter mask
@@ -798,7 +798,7 @@ static void can_reset(FAR struct can_dev_s *dev)
   config = priv->config;
   DEBUGASSERT(config);
 
-  canllvdbg("CAN%d\n", config->port);
+  canllinfo("CAN%d\n", config->port);
   UNUSED(config);
 
   /* Get exclusive access to the CAN peripheral */
@@ -855,7 +855,7 @@ static int can_setup(FAR struct can_dev_s *dev)
   config = priv->config;
   DEBUGASSERT(config);
 
-  canllvdbg("CAN%d pid: %d\n", config->port, config->pid);
+  canllinfo("CAN%d pid: %d\n", config->port, config->pid);
 
   /* Get exclusive access to the CAN peripheral */
 
@@ -933,7 +933,7 @@ static void can_shutdown(FAR struct can_dev_s *dev)
   config = priv->config;
   DEBUGASSERT(config);
 
-  canllvdbg("CAN%d\n", config->port);
+  canllinfo("CAN%d\n", config->port);
 
   /* Get exclusive access to the CAN peripheral */
 
@@ -972,7 +972,7 @@ static void can_rxint(FAR struct can_dev_s *dev, bool enable)
   FAR struct sam_can_s *priv = dev->cd_priv;
   DEBUGASSERT(priv && priv->config);
 
-  canllvdbg("CAN%d enable: %d\n", priv->config->port, enable);
+  canllinfo("CAN%d enable: %d\n", priv->config->port, enable);
 
   /* Enable/disable the mailbox interrupts from all receive mailboxes */
 
@@ -1005,7 +1005,7 @@ static void can_txint(FAR struct can_dev_s *dev, bool enable)
   FAR struct sam_can_s *priv = dev->cd_priv;
   DEBUGASSERT(priv && priv->config);
 
-  canllvdbg("CAN%d enable: %d\n", priv->config->port, enable);
+  canllinfo("CAN%d enable: %d\n", priv->config->port, enable);
 
   /* Get exclusive access to the CAN peripheral */
 
@@ -1106,8 +1106,8 @@ static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg)
   priv = dev->cd_priv;
   DEBUGASSERT(priv && priv->config);
 
-  canllvdbg("CAN%d\n", priv->config->port);
-  canllvdbg("CAN%d ID: %d DLC: %d\n",
+  canllinfo("CAN%d\n", priv->config->port);
+  canllinfo("CAN%d ID: %d DLC: %d\n",
             priv->config->port, msg->cm_hdr.ch_id, msg->cm_hdr.ch_dlc);
 
   /* Get exclusive access to the CAN peripheral */
@@ -1126,7 +1126,7 @@ static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg)
 
   priv->txmbset |= (1 << mbndx);
 
-  canvdbg("Mailbox Index=%d txmbset=%02x\n", mbndx, priv->txmbset);
+  caninfo("Mailbox Index=%d txmbset=%02x\n", mbndx, priv->txmbset);
 
   /* Set up the ID and mask, standard 11-bit or extended 29-bit.
    * REVISIT: This logic should be capable of sending standard messages
@@ -1788,7 +1788,7 @@ static int can_autobaud(struct sam_can_s *priv)
   uint32_t regval;
   int ret;
 
-  canllvdbg("CAN%d\n", config->port);
+  canllinfo("CAN%d\n", config->port);
 
   /* The CAN controller can start listening to the network in Autobaud Mode.
    * In this case, the error counters are locked and a mailbox may be
@@ -1858,7 +1858,7 @@ static int can_hwinitialize(struct sam_can_s *priv)
   uint32_t mck;
   int ret;
 
-  canllvdbg("CAN%d\n", config->port);
+  canllinfo("CAN%d\n", config->port);
 
   /* Configure CAN pins */
 
@@ -1970,7 +1970,7 @@ FAR struct can_dev_s *sam_caninitialize(int port)
   FAR struct sam_can_s *priv;
   FAR const struct sam_config_s *config;
 
-  canvdbg("CAN%d\n", port);
+  caninfo("CAN%d\n", port);
 
   /* NOTE:  Peripherical clocking for CAN0 and/or CAN1 was already provided
    * by sam_clockconfig() early in the reset sequence.
diff --git a/arch/arm/src/sama5/sam_dmac.c b/arch/arm/src/sama5/sam_dmac.c
index bf3f148168..f86edd3169 100644
--- a/arch/arm/src/sama5/sam_dmac.c
+++ b/arch/arm/src/sama5/sam_dmac.c
@@ -1920,7 +1920,7 @@ void sam_dmainitialize(struct sam_dmac_s *dmac)
 void weak_function up_dmainitialize(void)
 {
 #ifdef CONFIG_SAMA5_DMAC0
-  dmallvdbg("Initialize DMAC0\n");
+  dmallinfo("Initialize DMAC0\n");
 
   /* Enable peripheral clock */
 
@@ -1940,7 +1940,7 @@ void weak_function up_dmainitialize(void)
 #endif
 
 #ifdef CONFIG_SAMA5_DMAC1
-  dmallvdbg("Initialize DMAC1\n");
+  dmallinfo("Initialize DMAC1\n");
 
   /* Enable peripheral clock */
 
@@ -2046,7 +2046,7 @@ DMA_HANDLE sam_dmachannel(uint8_t dmacno, uint32_t chflags)
 
   if (dmach)
     {
-      dmavdbg("DMAC%d CH%d: chflags: %08x returning dmach: %p\n",
+      dmainfo("DMAC%d CH%d: chflags: %08x returning dmach: %p\n",
               (int)dmacno, dmach->chan, (int)chflags, dmach);
     }
   else
@@ -2082,13 +2082,13 @@ void sam_dmaconfig(DMA_HANDLE handle, uint32_t chflags)
   dmach->flags = chflags;
 
 #if defined(CONFIG_SAMA5_DMAC0) && defined(CONFIG_SAMA5_DMAC1)
-  dmavdbg("DMAC%d CH%d: chflags: %08x\n",
+  dmainfo("DMAC%d CH%d: chflags: %08x\n",
           dmach->dmac, dmach->chan, (int)chflags);
 #elif defined(CONFIG_SAMA5_DMAC0)
-  dmavdbg("DMAC0 CH%d: chflags: %08x\n",
+  dmainfo("DMAC0 CH%d: chflags: %08x\n",
           dmach->chan, (int)chflags);
 #else
-  dmavdbg("DMAC1 CH%d: chflags: %08x\n",
+  dmainfo("DMAC1 CH%d: chflags: %08x\n",
           dmach->chan, (int)chflags);
 #endif
 }
@@ -2110,7 +2110,7 @@ void sam_dmafree(DMA_HANDLE handle)
 {
   struct sam_dmach_s *dmach = (struct sam_dmach_s *)handle;
 
-  dmavdbg("dmach: %p\n", dmach);
+  dmainfo("dmach: %p\n", dmach);
   DEBUGASSERT((dmach != NULL) && (dmach->inuse));
 
   /* Mark the channel no longer in use.  Clearing the inuse flag is an atomic
@@ -2140,10 +2140,10 @@ int sam_dmatxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr,
   size_t remaining;
   int ret = OK;
 
-  dmavdbg("dmach: %p paddr: %08x maddr: %08x nbytes: %d\n",
+  dmainfo("dmach: %p paddr: %08x maddr: %08x nbytes: %d\n",
           dmach, (int)paddr, (int)maddr, (int)nbytes);
   DEBUGASSERT(dmach);
-  dmavdbg("llhead: %p lltail: %p\n", dmach->llhead, dmach->lltail);
+  dmainfo("llhead: %p lltail: %p\n", dmach->llhead, dmach->lltail);
 
   /* The maximum transfer size in bytes depends upon the maximum number of
    * transfers and the number of bytes per transfer.
@@ -2219,10 +2219,10 @@ int sam_dmarxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr,
   size_t remaining;
   int ret = OK;
 
-  dmavdbg("dmach: %p paddr: %08x maddr: %08x nbytes: %d\n",
+  dmainfo("dmach: %p paddr: %08x maddr: %08x nbytes: %d\n",
           dmach, (int)paddr, (int)maddr, (int)nbytes);
   DEBUGASSERT(dmach);
-  dmavdbg("llhead: %p lltail: %p\n", dmach->llhead, dmach->lltail);
+  dmainfo("llhead: %p lltail: %p\n", dmach->llhead, dmach->lltail);
 
   /* The maximum transfer size in bytes depends upon the maximum number of
    * transfers and the number of bytes per transfer.
@@ -2294,7 +2294,7 @@ int sam_dmastart(DMA_HANDLE handle, dma_callback_t callback, void *arg)
   struct sam_dmach_s *dmach = (struct sam_dmach_s *)handle;
   int ret = -EINVAL;
 
-  dmavdbg("dmach: %p callback: %p arg: %p\n", dmach, callback, arg);
+  dmainfo("dmach: %p callback: %p arg: %p\n", dmach, callback, arg);
   DEBUGASSERT(dmach != NULL);
 
   /* Verify that the DMA has been setup (i.e., at least one entry in the
@@ -2338,7 +2338,7 @@ void sam_dmastop(DMA_HANDLE handle)
   struct sam_dmach_s *dmach = (struct sam_dmach_s *)handle;
   irqstate_t flags;
 
-  dmavdbg("dmach: %p\n", dmach);
+  dmainfo("dmach: %p\n", dmach);
   DEBUGASSERT(dmach != NULL);
 
   flags = enter_critical_section();
diff --git a/arch/arm/src/sama5/sam_ehci.c b/arch/arm/src/sama5/sam_ehci.c
index 9c5dbd211a..8d41577c7d 100644
--- a/arch/arm/src/sama5/sam_ehci.c
+++ b/arch/arm/src/sama5/sam_ehci.c
@@ -1928,7 +1928,7 @@ static int sam_async_setup(struct sam_rhport_s *rhport,
 #ifdef CONFIG_USBHOST_TRACE
   usbhost_vtrace2(EHCI_VTRACE2_ASYNCXFR, epinfo->epno, buflen);
 #else
-  uvdbg("RHport%d EP%d: buffer=%p, buflen=%d, req=%p\n",
+  uinfo("RHport%d EP%d: buffer=%p, buflen=%d, req=%p\n",
         RHPORT(rhport), epinfo->epno, buffer, buflen, req);
 #endif
 
@@ -2206,7 +2206,7 @@ static int sam_intr_setup(struct sam_rhport_s *rhport,
 #ifdef CONFIG_USBHOST_TRACE
   usbhost_vtrace2(EHCI_VTRACE2_INTRXFR, epinfo->epno, buflen);
 #else
-  uvdbg("RHport%d EP%d: buffer=%p, buflen=%d\n",
+  uinfo("RHport%d EP%d: buffer=%p, buflen=%d\n",
         RHPORT(rhport), epinfo->epno, buffer, buflen);
 #endif
 
@@ -3187,7 +3187,7 @@ static int sam_ehci_tophalf(int irq, FAR void *context)
 #ifdef CONFIG_USBHOST_TRACE
   usbhost_vtrace1(EHCI_VTRACE1_TOPHALF, usbsts & regval);
 #else
-  ullvdbg("USBSTS: %08x USBINTR: %08x\n", usbsts, regval);
+  ullinfo("USBSTS: %08x USBINTR: %08x\n", usbsts, regval);
 #endif
 
   /* Handle all unmasked interrupt sources */
@@ -3730,7 +3730,7 @@ static int sam_epalloc(FAR struct usbhost_driver_s *drvr,
 #ifdef CONFIG_USBHOST_TRACE
   usbhost_vtrace2(EHCI_VTRACE2_EPALLOC, epdesc->addr, epdesc->xfrtype);
 #else
-  uvdbg("EP%d DIR=%s FA=%08x TYPE=%d Interval=%d MaxPacket=%d\n",
+  uinfo("EP%d DIR=%s FA=%08x TYPE=%d Interval=%d MaxPacket=%d\n",
         epdesc->addr, epdesc->in ? "IN" : "OUT", hport->funcaddr,
         epdesc->xfrtype, epdesc->interval, epdesc->mxpacketsize);
 #endif
@@ -4019,7 +4019,7 @@ static int sam_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
 #ifdef CONFIG_USBHOST_TRACE
   usbhost_vtrace2(EHCI_VTRACE2_CTRLINOUT, RHPORT(rhport), req->req);
 #else
-  uvdbg("RHPort%d type: %02x req: %02x value: %02x%02x index: %02x%02x len: %04x\n",
+  uinfo("RHPort%d type: %02x req: %02x value: %02x%02x index: %02x%02x len: %04x\n",
         RHPORT(rhport), req->type, req->req, req->value[1], req->value[0],
         req->index[1], req->index[0], len);
 #endif
@@ -4500,7 +4500,7 @@ static int sam_connect(FAR struct usbhost_driver_s *drvr,
   /* Set the connected/disconnected flag */
 
   hport->connected = connected;
-  ullvdbg("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO");
+  ullinfo("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO");
 
   /* Report the connection event */
 
diff --git a/arch/arm/src/sama5/sam_emaca.c b/arch/arm/src/sama5/sam_emaca.c
index 69b6db2cb3..755ccc1dd9 100644
--- a/arch/arm/src/sama5/sam_emaca.c
+++ b/arch/arm/src/sama5/sam_emaca.c
@@ -725,7 +725,7 @@ static int sam_transmit(struct sam_emac_s *priv)
   uint32_t regval;
   uint32_t status;
 
-  nllvdbg("d_len: %d txhead: %d\n",  dev->d_len, priv->txhead);
+  nllinfo("d_len: %d txhead: %d\n",  dev->d_len, priv->txhead);
   sam_dumppacket("Transmit packet", dev->d_buf, dev->d_len);
 
   /* Check parameter */
@@ -806,7 +806,7 @@ static int sam_transmit(struct sam_emac_s *priv)
 
   if (sam_txfree(priv) < 1)
     {
-      nllvdbg("Disabling RX interrupts\n");
+      nllinfo("Disabling RX interrupts\n");
       sam_putreg(priv, SAM_EMAC_IDR, EMAC_INT_RCOMP);
     }
 
@@ -986,7 +986,7 @@ static int sam_recvframe(struct sam_emac_s *priv)
   arch_invalidate_dcache((uintptr_t)rxdesc,
                          (uintptr_t)rxdesc + sizeof(struct emac_rxdesc_s));
 
-  nllvdbg("rxndx: %d\n", rxndx);
+  nllinfo("rxndx: %d\n", rxndx);
 
   while ((rxdesc->addr & EMACRXD_ADDR_OWNER) != 0)
     {
@@ -1042,7 +1042,7 @@ static int sam_recvframe(struct sam_emac_s *priv)
         {
           if (rxndx == priv->rxndx)
             {
-              nllvdbg("ERROR: No EOF (Invalid of buffers too small)\n");
+              nllinfo("ERROR: No EOF (Invalid of buffers too small)\n");
               do
                 {
                   /* Give ownership back to the EMAC */
@@ -1097,7 +1097,7 @@ static int sam_recvframe(struct sam_emac_s *priv)
               /* Frame size from the EMAC */
 
               dev->d_len = (rxdesc->status & EMACRXD_STA_FRLEN_MASK);
-              nllvdbg("packet %d-%d (%d)\n", priv->rxndx, rxndx, dev->d_len);
+              nllinfo("packet %d-%d (%d)\n", priv->rxndx, rxndx, dev->d_len);
 
               /* All data have been copied in the application frame buffer,
                * release the RX descriptor
@@ -1128,7 +1128,7 @@ static int sam_recvframe(struct sam_emac_s *priv)
                * all of the data.
                */
 
-              nllvdbg("rxndx: %d d_len: %d\n", priv->rxndx, dev->d_len);
+              nllinfo("rxndx: %d d_len: %d\n", priv->rxndx, dev->d_len);
 
               if (pktlen < dev->d_len)
                 {
@@ -1172,7 +1172,7 @@ static int sam_recvframe(struct sam_emac_s *priv)
   /* No packet was found */
 
   priv->rxndx = rxndx;
-  nllvdbg("rxndx: %d\n", priv->rxndx);
+  nllinfo("rxndx: %d\n", priv->rxndx);
   return -EAGAIN;
 }
 
@@ -1227,7 +1227,7 @@ static void sam_receive(struct sam_emac_s *priv)
 #ifdef CONFIG_NET_IPv4
       if (BUF->type == HTONS(ETHTYPE_IP))
         {
-          nllvdbg("IPv4 frame\n");
+          nllinfo("IPv4 frame\n");
 
           /* Handle ARP on input then give the IPv4 packet to the network
            * layer
@@ -1267,7 +1267,7 @@ static void sam_receive(struct sam_emac_s *priv)
 #ifdef CONFIG_NET_IPv6
       if (BUF->type == HTONS(ETHTYPE_IP6))
         {
-          nllvdbg("Iv6 frame\n");
+          nllinfo("Iv6 frame\n");
 
           /* Give the IPv6 packet to the network layer */
 
@@ -1304,7 +1304,7 @@ static void sam_receive(struct sam_emac_s *priv)
 #ifdef CONFIG_NET_ARP
       if (BUF->type == htons(ETHTYPE_ARP))
         {
-          nllvdbg("ARP frame\n");
+          nllinfo("ARP frame\n");
 
           /* Handle ARP packet */
 
@@ -1449,7 +1449,7 @@ static int sam_emac_interrupt(int irq, void *context)
   imr = sam_getreg(priv, SAM_EMAC_IMR);
 
   pending = isr & ~(imr | EMAC_INT_UNUSED);
-  nllvdbg("isr: %08x pending: %08x\n", isr, pending);
+  nllinfo("isr: %08x pending: %08x\n", isr, pending);
 
   /* Check for the completion of a transmission.  This should be done before
    * checking for received data (because receiving can cause another transmission
@@ -1705,7 +1705,7 @@ static int sam_ifup(struct net_driver_s *dev)
 
   /* Configure the EMAC interface for normal operation. */
 
-  nllvdbg("Initialize the EMAC\n");
+  nllinfo("Initialize the EMAC\n");
   sam_emac_configure(priv);
 
   /* Set the MAC address (should have been configured while we were down) */
@@ -1737,11 +1737,11 @@ static int sam_ifup(struct net_driver_s *dev)
     }
 
   while (sam_linkup(priv) == 0);
-  nllvdbg("Link detected \n");
+  nllinfo("Link detected \n");
 
   /* Enable normal MAC operation */
 
-  nllvdbg("Enable normal operation\n");
+  nllinfo("Enable normal operation\n");
 
   /* Set and activate a timer process */
 
@@ -1825,7 +1825,7 @@ static int sam_txavail(struct net_driver_s *dev)
   struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private;
   irqstate_t flags;
 
-  nllvdbg("ifup: %d\n", priv->ifup);
+  nllinfo("ifup: %d\n", priv->ifup);
 
   /* Disable interrupts because this function may be called from interrupt
    * level processing.
@@ -2003,7 +2003,7 @@ static int sam_addmac(struct net_driver_s *dev, const uint8_t *mac)
   unsigned int bit;
   UNUSED(priv);
 
-  nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
           mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
   /* Calculate the 6-bit has table index */
@@ -2077,7 +2077,7 @@ static int sam_rmmac(struct net_driver_s *dev, const uint8_t *mac)
   unsigned int bit;
   UNUSED(priv);
 
-  nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
           mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
   /* Calculate the 6-bit has table index */
@@ -2273,21 +2273,21 @@ static void sam_phydump(struct sam_emac_s *priv)
   sam_putreg(priv, SAM_EMAC_NCR, regval);
 
 #ifdef CONFIG_SAMA5_EMAC_RMII
-  nllvdbg("RMII Registers (Address %02x)\n", priv->phyaddr);
+  nllinfo("RMII Registers (Address %02x)\n", priv->phyaddr);
 #else /* defined(CONFIG_SAMA5_EMAC_MII) */
-  nllvdbg("MII Registers (Address %02x)\n", priv->phyaddr);
+  nllinfo("MII Registers (Address %02x)\n", priv->phyaddr);
 #endif
 
   sam_phyread(priv, priv->phyaddr, MII_MCR, &phyval);
-  nllvdbg("  MCR:       %04x\n", phyval);
+  nllinfo("  MCR:       %04x\n", phyval);
   sam_phyread(priv, priv->phyaddr, MII_MSR, &phyval);
-  nllvdbg("  MSR:       %04x\n", phyval);
+  nllinfo("  MSR:       %04x\n", phyval);
   sam_phyread(priv, priv->phyaddr, MII_ADVERTISE, &phyval);
-  nllvdbg("  ADVERTISE: %04x\n", phyval);
+  nllinfo("  ADVERTISE: %04x\n", phyval);
   sam_phyread(priv, priv->phyaddr, MII_LPA, &phyval);
-  nllvdbg("  LPR:       %04x\n", phyval);
+  nllinfo("  LPR:       %04x\n", phyval);
   sam_phyread(priv, priv->phyaddr, CONFIG_SAMA5_EMAC_PHYSR, &phyval);
-  nllvdbg("  PHYSR:     %04x\n", phyval);
+  nllinfo("  PHYSR:     %04x\n", phyval);
 
   /* Disable management port */
 
@@ -2410,7 +2410,7 @@ static int sam_phyreset(struct sam_emac_s *priv)
   int timeout;
   int ret;
 
-  nllvdbg(" sam_phyreset\n");
+  nllinfo(" sam_phyreset\n");
 
   /* Enable management port */
 
@@ -2477,7 +2477,7 @@ static int sam_phyfind(struct sam_emac_s *priv, uint8_t *phyaddr)
   unsigned int offset;
   int ret = -ESRCH;
 
-  nllvdbg("Find a valid PHY address\n");
+  nllinfo("Find a valid PHY address\n");
 
   /* Enable management port */
 
@@ -2522,10 +2522,10 @@ static int sam_phyfind(struct sam_emac_s *priv, uint8_t *phyaddr)
 
   if (ret == OK)
     {
-      nllvdbg("  PHYID1: %04x PHY addr: %d\n", phyval, candidate);
+      nllinfo("  PHYID1: %04x PHY addr: %d\n", phyval, candidate);
       *phyaddr = candidate;
       sam_phyread(priv, candidate, CONFIG_SAMA5_EMAC_PHYSR, &phyval);
-      nllvdbg("  PHYSR:  %04x PHY addr: %d\n", phyval, candidate);
+      nllinfo("  PHYSR:  %04x PHY addr: %d\n", phyval, candidate);
     }
 
   /* Disable management port */
@@ -2684,7 +2684,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
       goto errout;
     }
 
-  nllvdbg("PHYID1: %04x PHY address: %02x\n", phyid1, priv->phyaddr);
+  nllinfo("PHYID1: %04x PHY address: %02x\n", phyid1, priv->phyaddr);
 
   ret = sam_phyread(priv, priv->phyaddr, MII_PHYID2, &phyid2);
   if (ret < 0)
@@ -2693,14 +2693,14 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
       goto errout;
     }
 
-  nllvdbg("PHYID2: %04x PHY address: %02x\n", phyid2, priv->phyaddr);
+  nllinfo("PHYID2: %04x PHY address: %02x\n", phyid2, priv->phyaddr);
 
   if (phyid1 == MII_OUI_MSB &&
      ((phyid2 & MII_PHYID2_OUI_MASK) >> MII_PHYID2_OUI_SHIFT) == MII_OUI_LSB)
     {
-      nllvdbg("  Vendor Model Number:   %04x\n",
+      nllinfo("  Vendor Model Number:   %04x\n",
              (phyid2 & MII_PHYID2_MODEL_MASK) >> MII_PHYID2_MODEL_SHIFT);
-      nllvdbg("  Model Revision Number: %04x\n",
+      nllinfo("  Model Revision Number: %04x\n",
              (phyid2 & MII_PHYID2_REV_MASK) >> MII_PHYID2_REV_SHIFT);
     }
   else
@@ -2772,7 +2772,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
       goto errout;
     }
 
-  nllvdbg("  MCR: %04x\n", mcr);
+  nllinfo("  MCR: %04x\n", mcr);
 
   /* Check AutoNegotiate complete */
 
@@ -2792,7 +2792,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
         {
           /* Yes.. break out of the loop */
 
-          nllvdbg("AutoNegotiate complete\n");
+          nllinfo("AutoNegotiate complete\n");
           break;
         }
 
@@ -2955,7 +2955,7 @@ static bool sam_linkup(struct sam_emac_s *priv)
 
   /* Start the EMAC transfers */
 
-  nllvdbg("Link is up\n");
+  nllinfo("Link is up\n");
   linkup = true;
 
 errout:
@@ -3276,7 +3276,7 @@ static void sam_macaddress(struct sam_emac_s *priv)
   struct net_driver_s *dev = &priv->dev;
   uint32_t regval;
 
-  nllvdbg("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  nllinfo("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
           dev->d_ifname,
           dev->d_mac.ether_addr_octet[0], dev->d_mac.ether_addr_octet[1],
           dev->d_mac.ether_addr_octet[2], dev->d_mac.ether_addr_octet[3],
@@ -3342,7 +3342,7 @@ static void sam_ipv6multicast(struct sam_emac_s *priv)
   mac[4] = tmp16 & 0xff;
   mac[5] = tmp16 >> 8;
 
-  nvdbg("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  ninfo("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n",
         mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
   (void)sam_addmac(dev, mac);
@@ -3388,7 +3388,7 @@ static int sam_emac_configure(struct sam_emac_s *priv)
 {
   uint32_t regval;
 
-  nllvdbg("Entry\n");
+  nllinfo("Entry\n");
 
   /* Enable clocking to the EMAC peripheral */
 
diff --git a/arch/arm/src/sama5/sam_emacb.c b/arch/arm/src/sama5/sam_emacb.c
index 65eb01e7fd..c6fe757a98 100644
--- a/arch/arm/src/sama5/sam_emacb.c
+++ b/arch/arm/src/sama5/sam_emacb.c
@@ -1088,7 +1088,7 @@ static int sam_transmit(struct sam_emac_s *priv)
   uint32_t regval;
   uint32_t status;
 
-  nllvdbg("d_len: %d txhead: %d\n",  dev->d_len, priv->txhead);
+  nllinfo("d_len: %d txhead: %d\n",  dev->d_len, priv->txhead);
   sam_dumppacket("Transmit packet", dev->d_buf, dev->d_len);
 
   /* Check parameter */
@@ -1169,7 +1169,7 @@ static int sam_transmit(struct sam_emac_s *priv)
 
   if (sam_txfree(priv) < 1)
     {
-      nllvdbg("Disabling RX interrupts\n");
+      nllinfo("Disabling RX interrupts\n");
       sam_putreg(priv, SAM_EMAC_IDR_OFFSET, EMAC_INT_RCOMP);
     }
 
@@ -1349,7 +1349,7 @@ static int sam_recvframe(struct sam_emac_s *priv)
 
   arch_invalidate_dcache((uintptr_t)rxdesc,
                          (uintptr_t)rxdesc + sizeof(struct emac_rxdesc_s));
-  nllvdbg("rxndx: %d\n", rxndx);
+  nllinfo("rxndx: %d\n", rxndx);
 
   while ((rxdesc->addr & EMACRXD_ADDR_OWNER) != 0)
     {
@@ -1405,7 +1405,7 @@ static int sam_recvframe(struct sam_emac_s *priv)
         {
           if (rxndx == priv->rxndx)
             {
-              nllvdbg("ERROR: No EOF (Invalid of buffers too small)\n");
+              nllinfo("ERROR: No EOF (Invalid of buffers too small)\n");
               do
                 {
                   /* Give ownership back to the EMAC */
@@ -1460,7 +1460,7 @@ static int sam_recvframe(struct sam_emac_s *priv)
               /* Frame size from the EMAC */
 
               dev->d_len = (rxdesc->status & EMACRXD_STA_FRLEN_MASK);
-              nllvdbg("packet %d-%d (%d)\n", priv->rxndx, rxndx, dev->d_len);
+              nllinfo("packet %d-%d (%d)\n", priv->rxndx, rxndx, dev->d_len);
 
               /* All data have been copied in the application frame buffer,
                * release the RX descriptor
@@ -1491,7 +1491,7 @@ static int sam_recvframe(struct sam_emac_s *priv)
                * all of the data.
                */
 
-              nllvdbg("rxndx: %d d_len: %d\n", priv->rxndx, dev->d_len);
+              nllinfo("rxndx: %d d_len: %d\n", priv->rxndx, dev->d_len);
               if (pktlen < dev->d_len)
                 {
                   nlldbg("ERROR: Buffer size %d; frame size %d\n",
@@ -1535,7 +1535,7 @@ static int sam_recvframe(struct sam_emac_s *priv)
   /* No packet was found */
 
   priv->rxndx = rxndx;
-  nllvdbg("rxndx: %d\n", priv->rxndx);
+  nllinfo("rxndx: %d\n", priv->rxndx);
   return -EAGAIN;
 }
 
@@ -1590,7 +1590,7 @@ static void sam_receive(struct sam_emac_s *priv)
 #ifdef CONFIG_NET_IPv4
       if (BUF->type == HTONS(ETHTYPE_IP))
         {
-          nllvdbg("IPv4 frame\n");
+          nllinfo("IPv4 frame\n");
 
           /* Handle ARP on input then give the IPv4 packet to the network
            * layer
@@ -1630,7 +1630,7 @@ static void sam_receive(struct sam_emac_s *priv)
 #ifdef CONFIG_NET_IPv6
       if (BUF->type == HTONS(ETHTYPE_IP6))
         {
-          nllvdbg("Iv6 frame\n");
+          nllinfo("Iv6 frame\n");
 
           /* Give the IPv6 packet to the network layer */
 
@@ -1667,7 +1667,7 @@ static void sam_receive(struct sam_emac_s *priv)
 #ifdef CONFIG_NET_ARP
       if (BUF->type == htons(ETHTYPE_ARP))
         {
-          nllvdbg("ARP frame\n");
+          nllinfo("ARP frame\n");
 
           /* Handle ARP packet */
 
@@ -1836,7 +1836,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv)
   imr = sam_getreg(priv, SAM_EMAC_IMR_OFFSET);
 
   pending = isr & ~(imr | EMAC_INT_UNUSED);
-  nllvdbg("isr: %08x pending: %08x\n", isr, pending);
+  nllinfo("isr: %08x pending: %08x\n", isr, pending);
 
   /* Check for the completion of a transmission.  This should be done before
    * checking for received data (because receiving can cause another transmission
@@ -2390,7 +2390,7 @@ static int sam_ifup(struct net_driver_s *dev)
 
   /* Configure the EMAC interface for normal operation. */
 
-  nllvdbg("Initialize the EMAC\n");
+  nllinfo("Initialize the EMAC\n");
   sam_emac_configure(priv);
 
   /* Set the MAC address (should have been configured while we were down) */
@@ -2422,11 +2422,11 @@ static int sam_ifup(struct net_driver_s *dev)
     }
 
   while (sam_linkup(priv) == 0);
-  nllvdbg("Link detected \n");
+  nllinfo("Link detected \n");
 
   /* Enable normal MAC operation */
 
-  nllvdbg("Enable normal operation\n");
+  nllinfo("Enable normal operation\n");
 
   /* Set and activate a timer process */
 
@@ -2505,7 +2505,7 @@ static int sam_ifdown(struct net_driver_s *dev)
 
 static inline void sam_txavail_process(FAR struct sam_emac_s *priv)
 {
-  nllvdbg("ifup: %d\n", priv->ifup);
+  nllinfo("ifup: %d\n", priv->ifup);
 
   /* Ignore the notification if the interface is not yet up */
 
@@ -2758,7 +2758,7 @@ static int sam_addmac(struct net_driver_s *dev, const uint8_t *mac)
   unsigned int ndx;
   unsigned int bit;
 
-  nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
           mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
   /* Calculate the 6-bit has table index */
@@ -2831,7 +2831,7 @@ static int sam_rmmac(struct net_driver_s *dev, const uint8_t *mac)
   unsigned int ndx;
   unsigned int bit;
 
-  nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
           mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
   /* Calculate the 6-bit has table index */
@@ -3026,19 +3026,19 @@ static void sam_phydump(struct sam_emac_s *priv)
   regval |= EMAC_NCR_MPE;
   sam_putreg(priv, SAM_EMAC_NCR_OFFSET, regval);
 
-  nllvdbg("%s Registers (Address %02x)\n",
+  nllinfo("%s Registers (Address %02x)\n",
           priv->attr->rmii ? "RMII" : "MII", priv->phyaddr);
 
   sam_phyread(priv, priv->phyaddr, MII_MCR, &phyval);
-  nllvdbg("  MCR:       %04x\n", phyval);
+  nllinfo("  MCR:       %04x\n", phyval);
   sam_phyread(priv, priv->phyaddr, MII_MSR, &phyval);
-  nllvdbg("  MSR:       %04x\n", phyval);
+  nllinfo("  MSR:       %04x\n", phyval);
   sam_phyread(priv, priv->phyaddr, MII_ADVERTISE, &phyval);
-  nllvdbg("  ADVERTISE: %04x\n", phyval);
+  nllinfo("  ADVERTISE: %04x\n", phyval);
   sam_phyread(priv, priv->phyaddr, MII_LPA, &phyval);
-  nllvdbg("  LPR:       %04x\n", phyval);
+  nllinfo("  LPR:       %04x\n", phyval);
   sam_phyread(priv, priv->phyaddr, priv->attr->physr, &phyval);
-  nllvdbg("  PHYSR:     %04x\n", phyval);
+  nllinfo("  PHYSR:     %04x\n", phyval);
 
   /* Disable management port */
 
@@ -3262,7 +3262,7 @@ static int sam_phyreset(struct sam_emac_s *priv)
   int timeout;
   int ret;
 
-  nllvdbg(" sam_phyreset\n");
+  nllinfo(" sam_phyreset\n");
 
   /* Enable management port */
 
@@ -3329,7 +3329,7 @@ static int sam_phyfind(struct sam_emac_s *priv, uint8_t *phyaddr)
   unsigned int offset;
   int ret = -ESRCH;
 
-  nllvdbg("Find a valid PHY address\n");
+  nllinfo("Find a valid PHY address\n");
 
   /* Enable management port */
 
@@ -3374,10 +3374,10 @@ static int sam_phyfind(struct sam_emac_s *priv, uint8_t *phyaddr)
 
   if (ret == OK)
     {
-      nllvdbg("  PHYID1: %04x PHY addr: %d\n", phyval, candidate);
+      nllinfo("  PHYID1: %04x PHY addr: %d\n", phyval, candidate);
       *phyaddr = candidate;
       sam_phyread(priv, candidate, priv->attr->physr, &phyval);
-      nllvdbg("  PHYSR:  %04x PHY addr: %d\n", phyval, candidate);
+      nllinfo("  PHYSR:  %04x PHY addr: %d\n", phyval, candidate);
     }
 
   /* Disable management port */
@@ -3556,7 +3556,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
       goto errout;
     }
 
-  nllvdbg("PHYID1: %04x PHY address: %02x\n", phyid1, priv->phyaddr);
+  nllinfo("PHYID1: %04x PHY address: %02x\n", phyid1, priv->phyaddr);
 
   ret = sam_phyread(priv, priv->phyaddr, MII_PHYID2, &phyid2);
   if (ret < 0)
@@ -3565,15 +3565,15 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
       goto errout;
     }
 
-  nllvdbg("PHYID2: %04x PHY address: %02x\n", phyid2, priv->phyaddr);
+  nllinfo("PHYID2: %04x PHY address: %02x\n", phyid2, priv->phyaddr);
 
   if (phyid1 == priv->attr->msoui &&
      ((phyid2 & MII_PHYID2_OUI_MASK) >> MII_PHYID2_OUI_SHIFT) ==
       (uint16_t)priv->attr->lsoui)
     {
-      nllvdbg("  Vendor Model Number:   %04x\n",
+      nllinfo("  Vendor Model Number:   %04x\n",
              (phyid2 & MII_PHYID2_MODEL_MASK) >> MII_PHYID2_MODEL_SHIFT);
-      nllvdbg("  Model Revision Number: %04x\n",
+      nllinfo("  Model Revision Number: %04x\n",
              (phyid2 & MII_PHYID2_REV_MASK) >> MII_PHYID2_REV_SHIFT);
     }
   else
@@ -3645,7 +3645,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
       goto errout;
     }
 
-  nllvdbg("  MCR: %04x\n", mcr);
+  nllinfo("  MCR: %04x\n", mcr);
 
   /* Check AutoNegotiate complete */
 
@@ -3665,7 +3665,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
         {
           /* Yes.. break out of the loop */
 
-          nllvdbg("AutoNegotiate complete\n");
+          nllinfo("AutoNegotiate complete\n");
           break;
         }
 
@@ -3828,7 +3828,7 @@ static bool sam_linkup(struct sam_emac_s *priv)
 
   /* Start the EMAC transfers */
 
-  nllvdbg("Link is up\n");
+  nllinfo("Link is up\n");
   linkup = true;
 
 errout:
@@ -4012,7 +4012,7 @@ static inline void sam_ethgpioconfig(struct sam_emac_s *priv)
   else
 #endif
     {
-      nvdbg("ERROR: emac=%d\n", priv->attr->emac);
+      ninfo("ERROR: emac=%d\n", priv->attr->emac);
     }
 }
 
@@ -4311,7 +4311,7 @@ static void sam_macaddress(struct sam_emac_s *priv)
   struct net_driver_s *dev = &priv->dev;
   uint32_t regval;
 
-  nllvdbg("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  nllinfo("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
           dev->d_ifname,
           dev->d_mac.ether_addr_octet[0], dev->d_mac.ether_addr_octet[1],
           dev->d_mac.ether_addr_octet[2], dev->d_mac.ether_addr_octet[3],
@@ -4377,7 +4377,7 @@ static void sam_ipv6multicast(struct sam_emac_s *priv)
   mac[4] = tmp16 & 0xff;
   mac[5] = tmp16 >> 8;
 
-  nvdbg("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  ninfo("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n",
         mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
   (void)sam_addmac(dev, mac);
@@ -4423,7 +4423,7 @@ static int sam_emac_configure(struct sam_emac_s *priv)
 {
   uint32_t regval;
 
-  nllvdbg("Entry\n");
+  nllinfo("Entry\n");
 
   /* Enable clocking to the EMAC peripheral */
 
diff --git a/arch/arm/src/sama5/sam_freerun.c b/arch/arm/src/sama5/sam_freerun.c
index 18d2556bbf..0828660151 100644
--- a/arch/arm/src/sama5/sam_freerun.c
+++ b/arch/arm/src/sama5/sam_freerun.c
@@ -138,7 +138,7 @@ int sam_freerun_initialize(struct sam_freerun_s *freerun, int chan,
   uint32_t cmr;
   int ret;
 
-  tcvdbg("chan=%d resolution=%d usec\n", chan, resolution);
+  tcinfo("chan=%d resolution=%d usec\n", chan, resolution);
   DEBUGASSERT(freerun && resolution > 0);
 
   /* Get the TC frequency the corresponds to the requested resolution */
@@ -154,7 +154,7 @@ int sam_freerun_initialize(struct sam_freerun_s *freerun, int chan,
       return ret;
     }
 
-  tcvdbg("frequency=%lu, divisor=%u, cmr=%08lx\n",
+  tcinfo("frequency=%lu, divisor=%u, cmr=%08lx\n",
          (unsigned long)frequency, (unsigned long)divisor,
          (unsigned long)cmr);
 
@@ -274,7 +274,7 @@ int sam_freerun_counter(struct sam_freerun_s *freerun, struct timespec *ts)
 
   leave_critical_section(flags);
 
-  tcvdbg("counter=%lu (%lu) overflow=%lu, sr=%08lx\n",
+  tcinfo("counter=%lu (%lu) overflow=%lu, sr=%08lx\n",
          (unsigned long)counter,  (unsigned long)verify,
          (unsigned long)overflow, (unsigned long)sr);
 
@@ -294,7 +294,7 @@ int sam_freerun_counter(struct sam_freerun_s *freerun, struct timespec *ts)
   ts->tv_sec  = sec;
   ts->tv_nsec = (usec - (sec * USEC_PER_SEC)) * NSEC_PER_USEC;
 
-  tcvdbg("usec=%llu ts=(%lu, %lu)\n",
+  tcinfo("usec=%llu ts=(%lu, %lu)\n",
           usec, (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec);
 
   return OK;
diff --git a/arch/arm/src/sama5/sam_gmac.c b/arch/arm/src/sama5/sam_gmac.c
index a242093746..fd06f414de 100644
--- a/arch/arm/src/sama5/sam_gmac.c
+++ b/arch/arm/src/sama5/sam_gmac.c
@@ -656,7 +656,7 @@ static int sam_transmit(struct sam_gmac_s *priv)
   uint32_t regval;
   uint32_t status;
 
-  nllvdbg("d_len: %d txhead: %d txtail: %d\n",
+  nllinfo("d_len: %d txhead: %d txtail: %d\n",
           dev->d_len, priv->txhead, priv->txtail);
   sam_dumppacket("Transmit packet", dev->d_buf, dev->d_len);
 
@@ -738,7 +738,7 @@ static int sam_transmit(struct sam_gmac_s *priv)
 
   if (sam_txfree(priv) < 1)
     {
-      nllvdbg("Disabling RX interrupts\n");
+      nllinfo("Disabling RX interrupts\n");
       sam_putreg(priv, SAM_GMAC_IDR, GMAC_INT_RCOMP);
     }
 
@@ -918,7 +918,7 @@ static int sam_recvframe(struct sam_gmac_s *priv)
   arch_invalidate_dcache((uintptr_t)rxdesc,
                          (uintptr_t)rxdesc + sizeof(struct gmac_rxdesc_s));
 
-  nllvdbg("rxndx: %d\n", rxndx);
+  nllinfo("rxndx: %d\n", rxndx);
 
   while ((rxdesc->addr & GMACRXD_ADDR_OWNER) != 0)
     {
@@ -974,7 +974,7 @@ static int sam_recvframe(struct sam_gmac_s *priv)
         {
           if (rxndx == priv->rxndx)
             {
-              nllvdbg("ERROR: No EOF (Invalid of buffers too small)\n");
+              nllinfo("ERROR: No EOF (Invalid of buffers too small)\n");
               do
                 {
                   /* Give ownership back to the GMAC */
@@ -1029,7 +1029,7 @@ static int sam_recvframe(struct sam_gmac_s *priv)
               /* Frame size from the GMAC */
 
               dev->d_len = (rxdesc->status & GMACRXD_STA_FRLEN_MASK);
-              nllvdbg("packet %d-%d (%d)\n", priv->rxndx, rxndx, dev->d_len);
+              nllinfo("packet %d-%d (%d)\n", priv->rxndx, rxndx, dev->d_len);
 
               /* All data have been copied in the application frame buffer,
                * release the RX descriptor
@@ -1060,7 +1060,7 @@ static int sam_recvframe(struct sam_gmac_s *priv)
                * all of the data.
                */
 
-              nllvdbg("rxndx: %d d_len: %d\n", priv->rxndx, dev->d_len);
+              nllinfo("rxndx: %d d_len: %d\n", priv->rxndx, dev->d_len);
 
               if (pktlen < dev->d_len)
                 {
@@ -1102,7 +1102,7 @@ static int sam_recvframe(struct sam_gmac_s *priv)
   /* No packet was found */
 
   priv->rxndx = rxndx;
-  nllvdbg("rxndx: %d\n", priv->rxndx);
+  nllinfo("rxndx: %d\n", priv->rxndx);
   return -EAGAIN;
 }
 
@@ -1157,7 +1157,7 @@ static void sam_receive(struct sam_gmac_s *priv)
 #ifdef CONFIG_NET_IPv4
       if (BUF->type == HTONS(ETHTYPE_IP))
         {
-          nllvdbg("IPv4 frame\n");
+          nllinfo("IPv4 frame\n");
 
           /* Handle ARP on input then give the IPv4 packet to the network
            * layer
@@ -1197,7 +1197,7 @@ static void sam_receive(struct sam_gmac_s *priv)
 #ifdef CONFIG_NET_IPv6
       if (BUF->type == HTONS(ETHTYPE_IP6))
         {
-          nllvdbg("Iv6 frame\n");
+          nllinfo("Iv6 frame\n");
 
           /* Give the IPv6 packet to the network layer */
 
@@ -1234,7 +1234,7 @@ static void sam_receive(struct sam_gmac_s *priv)
 #ifdef CONFIG_NET_ARP
       if (BUF->type == htons(ETHTYPE_ARP))
         {
-          nllvdbg("ARP frame\n");
+          nllinfo("ARP frame\n");
 
           /* Handle ARP packet */
 
@@ -1377,7 +1377,7 @@ static int sam_gmac_interrupt(int irq, void *context)
   imr = sam_getreg(priv, SAM_GMAC_IMR);
 
   pending = isr & ~(imr | GMAC_INT_UNUSED);
-  nllvdbg("isr: %08x pending: %08x\n", isr, pending);
+  nllinfo("isr: %08x pending: %08x\n", isr, pending);
 
   /* Check for the completion of a transmission.  This should be done before
    * checking for received data (because receiving can cause another transmission
@@ -1657,7 +1657,7 @@ static int sam_ifup(struct net_driver_s *dev)
 
   /* Configure the GMAC interface for normal operation. */
 
-  nllvdbg("Initialize the GMAC\n");
+  nllinfo("Initialize the GMAC\n");
   sam_gmac_configure(priv);
 
   /* Set the MAC address (should have been configured while we were down) */
@@ -1696,7 +1696,7 @@ static int sam_ifup(struct net_driver_s *dev)
 
   /* Enable normal MAC operation */
 
-  nllvdbg("Enable normal operation\n");
+  nllinfo("Enable normal operation\n");
 
   /* Set and activate a timer process */
 
@@ -1780,7 +1780,7 @@ static int sam_txavail(struct net_driver_s *dev)
   struct sam_gmac_s *priv = (struct sam_gmac_s *)dev->d_private;
   irqstate_t flags;
 
-  nllvdbg("ifup: %d\n", priv->ifup);
+  nllinfo("ifup: %d\n", priv->ifup);
 
   /* Disable interrupts because this function may be called from interrupt
    * level processing.
@@ -1958,7 +1958,7 @@ static int sam_addmac(struct net_driver_s *dev, const uint8_t *mac)
   unsigned int bit;
   UNUSED(priv);
 
-  nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
           mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
   /* Calculate the 6-bit has table index */
@@ -2032,7 +2032,7 @@ static int sam_rmmac(struct net_driver_s *dev, const uint8_t *mac)
   unsigned int bit;
   UNUSED(priv);
 
-  nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
           mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
   /* Calculate the 6-bit has table index */
@@ -2220,21 +2220,21 @@ static void sam_phydump(struct sam_gmac_s *priv)
 
   sam_enablemdio(priv);
 
-  nllvdbg("GMII Registers (Address %02x)\n", priv->phyaddr);
+  nllinfo("GMII Registers (Address %02x)\n", priv->phyaddr);
   sam_phyread(priv, priv->phyaddr, GMII_MCR, &phyval);
-  nllvdbg("       MCR: %04x\n", phyval);
+  nllinfo("       MCR: %04x\n", phyval);
   sam_phyread(priv, priv->phyaddr, GMII_MSR, &phyval);
-  nllvdbg("       MSR: %04x\n", phyval);
+  nllinfo("       MSR: %04x\n", phyval);
   sam_phyread(priv, priv->phyaddr, GMII_ADVERTISE, &phyval);
-  nllvdbg(" ADVERTISE: %04x\n", phyval);
+  nllinfo(" ADVERTISE: %04x\n", phyval);
   sam_phyread(priv, priv->phyaddr, GMII_LPA, &phyval);
-  nllvdbg("       LPR: %04x\n", phyval);
+  nllinfo("       LPR: %04x\n", phyval);
   sam_phyread(priv, priv->phyaddr, GMII_1000BTCR, &phyval);
-  nllvdbg("  1000BTCR: %04x\n", phyval);
+  nllinfo("  1000BTCR: %04x\n", phyval);
   sam_phyread(priv, priv->phyaddr, GMII_1000BTSR, &phyval);
-  nllvdbg("  1000BTSR: %04x\n", phyval);
+  nllinfo("  1000BTSR: %04x\n", phyval);
   sam_phyread(priv, priv->phyaddr, GMII_ESTATUS, &phyval);
-  nllvdbg("   ESTATUS: %04x\n", phyval);
+  nllinfo("   ESTATUS: %04x\n", phyval);
 
   /* Disable management port */
 
@@ -2418,7 +2418,7 @@ static int sam_phyreset(struct sam_gmac_s *priv)
   int timeout;
   int ret;
 
-  nllvdbg(" sam_phyreset\n");
+  nllinfo(" sam_phyreset\n");
 
   /* Enable management port */
 
@@ -2480,7 +2480,7 @@ static int sam_phyfind(struct sam_gmac_s *priv, uint8_t *phyaddr)
   unsigned int offset;
   int ret = -ESRCH;
 
-  nllvdbg("Find a valid PHY address\n");
+  nllinfo("Find a valid PHY address\n");
 
   /* Enable management port */
 
@@ -2523,7 +2523,7 @@ static int sam_phyfind(struct sam_gmac_s *priv, uint8_t *phyaddr)
 
   if (ret == OK)
     {
-      nllvdbg("  PHYID1: %04x PHY addr: %d\n", phyval, candidate);
+      nllinfo("  PHYID1: %04x PHY addr: %d\n", phyval, candidate);
       *phyaddr = candidate;
     }
 
@@ -2683,7 +2683,7 @@ static int sam_autonegotiate(struct sam_gmac_s *priv)
       goto errout;
     }
 
-  nllvdbg("PHYID1: %04x PHY address: %02x\n", phyid1, priv->phyaddr);
+  nllinfo("PHYID1: %04x PHY address: %02x\n", phyid1, priv->phyaddr);
 
   /* Read the LS bits of the OUI from Pthe PHYID2 register */
 
@@ -2694,14 +2694,14 @@ static int sam_autonegotiate(struct sam_gmac_s *priv)
       goto errout;
     }
 
-  nllvdbg("PHYID2: %04x PHY address: %02x\n", phyid2, priv->phyaddr);
+  nllinfo("PHYID2: %04x PHY address: %02x\n", phyid2, priv->phyaddr);
 
   if (phyid1 == GMII_OUI_MSB &&
      (phyid2 & GMII_PHYID2_OUI_MASK) == GMII_OUI_LSB)
     {
-      nllvdbg("  Vendor Model Number:   %04x\n",
+      nllinfo("  Vendor Model Number:   %04x\n",
              (phyid2 & GMII_PHYID2_MODEL_MASK) >> GMII_PHYID2_MODEL_SHIFT);
-      nllvdbg("  Model Revision Number: %04x\n",
+      nllinfo("  Model Revision Number: %04x\n",
              (phyid2 & GMII_PHYID2_REV_MASK) >> GMII_PHYID2_REV_SHIFT);
     }
   else
@@ -2777,7 +2777,7 @@ static int sam_autonegotiate(struct sam_gmac_s *priv)
       goto errout;
     }
 
-  nllvdbg(" MCR: 0x%X\n", phyval);
+  nllinfo(" MCR: 0x%X\n", phyval);
 
   /* Wait for autonegotion to complete */
 
@@ -2797,7 +2797,7 @@ static int sam_autonegotiate(struct sam_gmac_s *priv)
         {
           /* Yes.. break out of the loop */
 
-          nllvdbg("AutoNegotiate complete\n");
+          nllinfo("AutoNegotiate complete\n");
           break;
         }
 
@@ -3324,7 +3324,7 @@ static void sam_macaddress(struct sam_gmac_s *priv)
   struct net_driver_s *dev = &priv->dev;
   uint32_t regval;
 
-  nllvdbg("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  nllinfo("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
           dev->d_ifname,
           dev->d_mac.ether_addr_octet[0], dev->d_mac.ether_addr_octet[1],
           dev->d_mac.ether_addr_octet[2], dev->d_mac.ether_addr_octet[3],
@@ -3390,7 +3390,7 @@ static void sam_ipv6multicast(struct sam_gmac_s *priv)
   mac[4] = tmp16 & 0xff;
   mac[5] = tmp16 >> 8;
 
-  nvdbg("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  ninfo("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n",
         mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
   (void)sam_addmac(dev, mac);
@@ -3436,7 +3436,7 @@ static int sam_gmac_configure(struct sam_gmac_s *priv)
 {
   uint32_t regval;
 
-  nllvdbg("Entry\n");
+  nllinfo("Entry\n");
 
   /* Enable clocking to the GMAC peripheral */
 
diff --git a/arch/arm/src/sama5/sam_hsmci.c b/arch/arm/src/sama5/sam_hsmci.c
index 3a44973373..2e13488a59 100644
--- a/arch/arm/src/sama5/sam_hsmci.c
+++ b/arch/arm/src/sama5/sam_hsmci.c
@@ -1609,7 +1609,7 @@ static int sam_hsmci_interrupt(struct sam_dev_s *priv)
                 {
                   /* Yes.. Was the error some kind of timeout? */
 
-                  fllvdbg("ERROR: events: %08x SR: %08x\n",
+                  fllinfo("ERROR: events: %08x SR: %08x\n",
                           priv->cmdrmask, enabled);
 
                   if ((pending & HSMCI_RESPONSE_TIMEOUT_ERRORS) != 0)
@@ -2090,7 +2090,7 @@ static int sam_sendcmd(FAR struct sdio_dev_s *dev,
 
   /* Write the fully decorated command to CMDR */
 
-  fvdbg("cmd: %08x arg: %08x regval: %08x\n", cmd, arg, regval);
+  finfo("cmd: %08x arg: %08x regval: %08x\n", cmd, arg, regval);
   sam_putreg(priv, regval, SAM_HSMCI_CMDR_OFFSET);
   sam_cmdsample1(priv, SAMPLENDX_AFTER_CMDR);
   return OK;
@@ -2812,7 +2812,7 @@ static void sam_callbackenable(FAR struct sdio_dev_s *dev,
 {
   struct sam_dev_s *priv = (struct sam_dev_s *)dev;
 
-  fvdbg("eventset: %02x\n", eventset);
+  finfo("eventset: %02x\n", eventset);
   DEBUGASSERT(priv != NULL);
 
   priv->cbevents = eventset;
@@ -2848,7 +2848,7 @@ static int sam_registercallback(FAR struct sdio_dev_s *dev,
 
   /* Disable callbacks and register this callback and is argument */
 
-  fvdbg("Register %p(%p)\n", callback, arg);
+  finfo("Register %p(%p)\n", callback, arg);
   DEBUGASSERT(priv != NULL);
 
   priv->cbevents = 0;
@@ -3095,7 +3095,7 @@ static void sam_callback(void *arg)
   /* Is a callback registered? */
 
   DEBUGASSERT(priv != NULL);
-  fvdbg("Callback %p(%p) cbevents: %02x cdstatus: %02x\n",
+  finfo("Callback %p(%p) cbevents: %02x cdstatus: %02x\n",
         priv->callback, priv->cbarg, priv->cbevents, priv->cdstatus);
 
   flags = enter_critical_section();
@@ -3153,7 +3153,7 @@ static void sam_callback(void *arg)
           fdbg("ERROR: Failed to cancel work: %d\n", ret);
         }
 
-      fllvdbg("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg);
+      fllinfo("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg);
       ret = work_queue(LPWORK, &priv->cbwork, (worker_t)priv->callback,
                        priv->cbarg, 0);
       if (ret < 0)
@@ -3323,7 +3323,7 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno)
       return NULL;
     }
 
-  fvdbg("priv: %p base: %08x hsmci: %d dmac: %d pid: %d\n",
+  finfo("priv: %p base: %08x hsmci: %d dmac: %d pid: %d\n",
         priv, priv->base, priv->hsmci, dmac, pid);
 
   /* Initialize the HSMCI slot structure */
@@ -3393,7 +3393,7 @@ void sdio_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot)
       priv->cdstatus &= ~SDIO_STATUS_PRESENT;
     }
 
-  fllvdbg("cdstatus OLD: %02x NEW: %02x\n", cdstatus, priv->cdstatus);
+  fllinfo("cdstatus OLD: %02x NEW: %02x\n", cdstatus, priv->cdstatus);
 
   /* Perform any requested callback if the status has changed */
 
@@ -3438,7 +3438,7 @@ void sdio_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect)
       priv->cdstatus &= ~SDIO_STATUS_WRPROTECTED;
     }
 
-  fvdbg("cdstatus: %02x\n", priv->cdstatus);
+  finfo("cdstatus: %02x\n", priv->cdstatus);
   leave_critical_section(flags);
 }
 
diff --git a/arch/arm/src/sama5/sam_isi.c b/arch/arm/src/sama5/sam_isi.c
index 124734a416..86fa8e0dad 100644
--- a/arch/arm/src/sama5/sam_isi.c
+++ b/arch/arm/src/sama5/sam_isi.c
@@ -160,7 +160,7 @@ int sam_isi_initialize(void)
    */
 
   g_isi.actual = sam_pck_configure(ISI_PCKID, PCKSRC_MCK, CONFIG_ISI_MCKFREQ);
-  gvdbg("PCK%d frequency=%d actual=%d\n",
+  ginfo("PCK%d frequency=%d actual=%d\n",
         ISI_PCKID, CONFIG_ISI_MCKFREQ, g_isi.actual);
 
   /* Enable the MCK (output) */
diff --git a/arch/arm/src/sama5/sam_lcd.c b/arch/arm/src/sama5/sam_lcd.c
index 90a15d4053..cc2b4bf1c8 100644
--- a/arch/arm/src/sama5/sam_lcd.c
+++ b/arch/arm/src/sama5/sam_lcd.c
@@ -1101,7 +1101,7 @@ static void sam_wait_lcdstatus(uint32_t mask, uint32_t value)
 static int sam_base_getvideoinfo(struct fb_vtable_s *vtable,
                                  struct fb_videoinfo_s *vinfo)
 {
-  gvdbg("vtable=%p vinfo=%p\n", vtable, vinfo);
+  ginfo("vtable=%p vinfo=%p\n", vtable, vinfo);
   if (vtable && vinfo)
     {
       memcpy(vinfo, &g_base_videoinfo, sizeof(struct fb_videoinfo_s));
@@ -1119,7 +1119,7 @@ static int sam_base_getvideoinfo(struct fb_vtable_s *vtable,
 static int sam_base_getplaneinfo(struct fb_vtable_s *vtable, int planeno,
                                  struct fb_planeinfo_s *pinfo)
 {
-  gvdbg("vtable=%p planeno=%d pinfo=%p\n", vtable, planeno, pinfo);
+  ginfo("vtable=%p planeno=%d pinfo=%p\n", vtable, planeno, pinfo);
   if (vtable && planeno == 0 && pinfo)
     {
       pinfo->fbmem   = (void *)LAYER_BASE.framebuffer;
@@ -1166,21 +1166,21 @@ static int sam_base_putcmap(struct fb_vtable_s *vtable,
 static int sam_hcr_getcursor(struct fb_vtable_s *vtable,
                              struct fb_cursorattrib_s *attrib)
 {
-  gvdbg("vtable=%p attrib=%p\n", vtable, attrib);
+  ginfo("vtable=%p attrib=%p\n", vtable, attrib);
   if (vtable && attrib)
     {
 #ifdef CONFIG_FB_HWCURSORIMAGE
       attrib->fmt = SAMA5_HCR_COLOR_FMT;
 #endif
 
-      gvdbg("pos: (x=%d, y=%d)\n", g_lcdc.cpos.x, g_lcdc.cpos.y);
+      ginfo("pos: (x=%d, y=%d)\n", g_lcdc.cpos.x, g_lcdc.cpos.y);
       attrib->pos = g_lcdc.cpos;
 
 #ifdef CONFIG_FB_HWCURSORSIZE
       attrib->mxsize.h = CONFIG_SAMA5_LCDC_HCR_HEIGHT;
       attrib->mxsize.w = CONFIG_SAMA5_LCDC_HCR_WIDTH;
 
-      gvdbg("size: (h=%d, w=%d)\n", g_lcdc.csize.h, g_lcdc.csize.w);
+      ginfo("size: (h=%d, w=%d)\n", g_lcdc.csize.h, g_lcdc.csize.w);
       attrib->size = g_lcdc.csize;
 #endif
       return OK;
@@ -1199,26 +1199,26 @@ static int sam_hcr_getcursor(struct fb_vtable_s *vtable,
 static int sam_hcr_setcursor(struct fb_vtable_s *vtable,
                              struct fb_setcursor_s *setttings)
 {
-  gvdbg("vtable=%p setttings=%p\n", vtable, setttings);
+  ginfo("vtable=%p setttings=%p\n", vtable, setttings);
   if (vtable && setttings)
     {
-      gvdbg("flags: %02x\n", settings->flags);
+      ginfo("flags: %02x\n", settings->flags);
       if ((flags & FB_CUR_SETPOSITION) != 0)
         {
           g_lcdc.cpos = settings->pos;
-          gvdbg("pos: (h:%d, w:%d)\n", g_lcdc.cpos.x, g_lcdc.cpos.y);
+          ginfo("pos: (h:%d, w:%d)\n", g_lcdc.cpos.x, g_lcdc.cpos.y);
         }
 #ifdef CONFIG_FB_HWCURSORSIZE
       if ((flags & FB_CUR_SETSIZE) != 0)
         {
           g_lcdc.csize = settings->size;
-          gvdbg("size: (h:%d, w:%d)\n", g_lcdc.csize.h, g_lcdc.csize.w);
+          ginfo("size: (h:%d, w:%d)\n", g_lcdc.csize.h, g_lcdc.csize.w);
         }
 #endif
 #ifdef CONFIG_FB_HWCURSORIMAGE
       if ((flags & FB_CUR_SETIMAGE) != 0)
         {
-          gvdbg("image: (h:%d, w:%d) @ %p\n",
+          ginfo("image: (h:%d, w:%d) @ %p\n",
                 settings->img.height, settings->img.width,
                 settings->img.image);
         }
@@ -1294,9 +1294,9 @@ static void sam_dmasetup(int lid, struct sam_dscr_s *dscr, uint8_t *buffer)
 #if defined(CONFIG_DEBUG_GRAPHICS) && defined(CONFIG_DEBUG_INFO)
   /* Dump the DMA setup */
 
-  gvdbg("DMA descriptor:   addr=%08x ctrl=%08x next=%08x\n",
+  ginfo("DMA descriptor:   addr=%08x ctrl=%08x next=%08x\n",
         dscr->addr, dscr->ctrl, dscr->next);
-  gvdbg("DMA registers[%d]: head=%08x addr=%08x ctrl=%08x next=%08x\n",
+  ginfo("DMA registers[%d]: head=%08x addr=%08x ctrl=%08x next=%08x\n",
         lid, sam_getreg(g_layerhead[lid]), sam_getreg(g_layeraddr[lid]),
         sam_getreg(g_layerctrl[lid]), sam_getreg(g_layernext[lid]));
 #endif
@@ -1379,7 +1379,7 @@ static int sam_setclut(struct sam_layer_s *layer,
   unsigned int end;
   int i;
 
-  gvdbg("layer=%d cmap=%p first=%d len=%d\n",
+  ginfo("layer=%d cmap=%p first=%d len=%d\n",
         layer->lid, cmap, cmap->first, cmap->len);
 
   DEBUGASSERT(layer && cmap);
@@ -1460,7 +1460,7 @@ static int sam_getclut(struct sam_layer_s *layer,
   uintptr_t regval;
   int i;
 
-  gvdbg("layer=%d cmap=%p first=%d len=%d\n",
+  ginfo("layer=%d cmap=%p first=%d len=%d\n",
         layer->lid, cmap, layer->offset, layer->nclut);
 
   DEBUGASSERT(layer && cmap);
@@ -1514,7 +1514,7 @@ static void sam_pio_config(void)
 {
   int i;
 
-  gvdbg("Configuring pins\n");
+  ginfo("Configuring pins\n");
 
   /* Configure each pin */
 
@@ -2915,7 +2915,7 @@ int up_fbinitialize(int display)
   uint32_t regval;
 #endif
 
-  gvdbg("Entry\n");
+  ginfo("Entry\n");
 
   /* Configure layer layer structures, DMA descriptor memory, and
    * framebuffers
@@ -2931,7 +2931,7 @@ int up_fbinitialize(int display)
 
   sam_pio_config();
 
-  gvdbg("Configuring the LCD controller\n");
+  ginfo("Configuring the LCD controller\n");
 
   /* Enable the LCD peripheral clock */
 
@@ -2959,7 +2959,7 @@ int up_fbinitialize(int display)
 
   /* And turn the LCD on */
 
-  gvdbg("Enabling the display\n");
+  ginfo("Enabling the display\n");
   sam_lcd_enable();
 
   /* Display base layer */
@@ -3012,7 +3012,7 @@ int up_fbinitialize(int display)
 
 FAR struct fb_vtable_s *up_fbgetvplane(int display, int vplane)
 {
-  gvdbg("vplane: %d\n", vplane);
+  ginfo("vplane: %d\n", vplane);
   if (vplane == 0)
     {
       return (struct fb_vtable_s *)&g_base_vtable;
@@ -3062,7 +3062,7 @@ void sam_lcdclear(nxgl_mxpixel_t color)
   uint16_t *dest = (uint16_t *)LAYER_BASE.framebuffer;
   int i;
 
-  gvdbg("Clearing display: BPP=16 color=%04x framebuffer=%08x size=%d\n",
+  ginfo("Clearing display: BPP=16 color=%04x framebuffer=%08x size=%d\n",
         color, LAYER_BASE.framebuffer, SAMA5_BASE_FBSIZE);
 
   for (i = 0; i < SAMA5_BASE_FBSIZE; i += sizeof(uint16_t))
@@ -3076,7 +3076,7 @@ void sam_lcdclear(nxgl_mxpixel_t color)
   uint8_t b;
   int i;
 
-  gvdbg("Clearing display: BPP=24 color=%06x framebuffer=%08x size=%d\n",
+  ginfo("Clearing display: BPP=24 color=%06x framebuffer=%08x size=%d\n",
         color, LAYER_BASE.framebuffer, SAMA5_BASE_FBSIZE);
 
   b =  color        & 0xff;
@@ -3093,7 +3093,7 @@ void sam_lcdclear(nxgl_mxpixel_t color)
   uint32_t *dest = (uint32_t *)LAYER_BASE.framebuffer;
   int i;
 
-  gvdbg("Clearing display: BPP=32 color=%08x framebuffer=%08x size=%d\n",
+  ginfo("Clearing display: BPP=32 color=%08x framebuffer=%08x size=%d\n",
         color, LAYER_BASE.framebuffer, SAMA5_BASE_FBSIZE);
 
   for (i = 0; i < SAMA5_BASE_FBSIZE; i += sizeof(uint32_t))
diff --git a/arch/arm/src/sama5/sam_nand.c b/arch/arm/src/sama5/sam_nand.c
index d5d235d216..6e53471e40 100644
--- a/arch/arm/src/sama5/sam_nand.c
+++ b/arch/arm/src/sama5/sam_nand.c
@@ -999,7 +999,7 @@ static uint32_t nand_nfc_poll(void)
   sr = nand_getreg(SAM_HSMC_SR);
 
 #ifndef CONFIG_SAMA5_NAND_REGDEBUG
-  // fllvdbg("sr=%08x\n", sr);
+  // fllinfo("sr=%08x\n", sr);
 #endif
 
   /* When set to one, this XFRDONE indicates that the NFC has terminated
@@ -1065,7 +1065,7 @@ static int hsmc_interrupt(int irq, void *context)
   uint32_t pending = sr & imr;
 
 #ifndef CONFIG_SAMA5_NAND_REGDEBUG
-  fllvdbg("sr=%08x imr=%08x\n", sr, imr);
+  fllinfo("sr=%08x imr=%08x\n", sr, imr);
 #endif
 
   /* When set to one, this XFRDONE indicates that the NFC has terminated
@@ -1233,7 +1233,7 @@ static int nand_wait_dma(struct sam_nandcs_s *priv)
         }
     }
 
-  fvdbg("Awakened: result=%d\n", priv->result);
+  finfo("Awakened: result=%d\n", priv->result);
   priv->dmadone = false;
   return priv->result;
 }
@@ -1293,7 +1293,7 @@ static int nand_dma_read(struct sam_nandcs_s *priv,
 
   DEBUGASSERT(priv->dma);
 
-  fvdbg("vsrc=%08x vdest=%08x nbytes=%d\n",
+  finfo("vsrc=%08x vdest=%08x nbytes=%d\n",
         (int)vsrc, (int)vdest, (int)nbytes);
 
   /* Initialize sampling */
@@ -1463,7 +1463,7 @@ static int nand_nfcsram_read(struct sam_nandcs_s *priv, uint8_t *buffer,
   int remaining;
   int ret;
 
-  fvdbg("buffer=%p buflen=%d\n", buffer, buflen);
+  finfo("buffer=%p buflen=%d\n", buffer, buflen);
 
   /* Get the offset data source address */
 
@@ -1530,7 +1530,7 @@ static int nand_read(struct sam_nandcs_s *priv, uint8_t *buffer,
   int buswidth;
   int ret;
 
-  fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen);
+  finfo("buffer=%p buflen=%d\n", buffer, (int)buflen);
 
   /* Get the buswidth */
 
@@ -1622,7 +1622,7 @@ static int nand_read_pmecc(struct sam_nandcs_s *priv, off_t block,
   uint16_t sparesize;
   int ret;
 
-  fvdbg("block=%d page=%d data=%p\n", (int)block, page, data);
+  finfo("block=%d page=%d data=%p\n", (int)block, page, data);
   DEBUGASSERT(priv && data);
 
   /* Get page and spare sizes */
@@ -1765,7 +1765,7 @@ static int nand_nfcsram_write(struct sam_nandcs_s *priv, uint8_t *buffer,
   uintptr_t dest;
   int ret;
 
-  fvdbg("buffer=%p buflen=%d offset=%d\n", buffer, buflen, offset);
+  finfo("buffer=%p buflen=%d offset=%d\n", buffer, buflen, offset);
   nand_dump("NFC SRAM Write", buffer, buflen);
 
   /* Apply the offset to the destination address */
@@ -1829,7 +1829,7 @@ static int nand_write(struct sam_nandcs_s *priv, uint8_t *buffer,
   int buswidth;
   int ret;
 
-  fvdbg("buffer=%p buflen=%d offset=%d\n", buffer, buflen, offset);
+  finfo("buffer=%p buflen=%d offset=%d\n", buffer, buflen, offset);
   nand_dump("NAND Write", buffer, buflen);
 
   /* Apply the offset to the destination address */
@@ -1924,7 +1924,7 @@ static int nand_readpage_noecc(struct sam_nandcs_s *priv, off_t block,
   off_t coladdr;
   int ret;
 
-  fvdbg("block=%d page=%d data=%p spare=%p\n", (int)block, page, data, spare);
+  finfo("block=%d page=%d data=%p spare=%p\n", (int)block, page, data, spare);
   DEBUGASSERT(priv && (data || spare));
 
   /* Get page and spare sizes */
@@ -2038,7 +2038,7 @@ static int nand_readpage_pmecc(struct sam_nandcs_s *priv, off_t block,
   int ret;
   int i;
 
-  fvdbg("block=%d page=%d data=%p\n", (int)block, page, data);
+  finfo("block=%d page=%d data=%p\n", (int)block, page, data);
   DEBUGASSERT(priv && data);
 
   /* Make sure that we have exclusive access to the PMECC and that the PMECC
@@ -2159,7 +2159,7 @@ static int nand_writepage_noecc(struct sam_nandcs_s *priv, off_t block,
   off_t rowaddr;
   int ret = OK;
 
-  fvdbg("block=%d page=%d data=%p spare=%p\n", (int)block, page, data, spare);
+  finfo("block=%d page=%d data=%p spare=%p\n", (int)block, page, data, spare);
 
   /* Get page and spare sizes */
 
@@ -2320,7 +2320,7 @@ static int nand_writepage_pmecc(struct sam_nandcs_s *priv, off_t block,
   unsigned int i;
   int ret = 0;
 
-  fvdbg("block=%d page=%d data=%p\n", (int)block, page, data);
+  finfo("block=%d page=%d data=%p\n", (int)block, page, data);
   DEBUGASSERT(priv && data);
 
   /* Make sure that we have exclusive access to the PMECC and that the PMECC
@@ -2344,7 +2344,7 @@ static int nand_writepage_pmecc(struct sam_nandcs_s *priv, off_t block,
   /* Calculate physical address of the page */
 
   rowaddr = block * nandmodel_pagesperblock(&priv->raw.model) + page;
-  fvdbg("pagesize=%d eccsaddr=%d rowaddr=%d\n", pagesize, eccsaddr, rowaddr);
+  finfo("pagesize=%d eccsaddr=%d rowaddr=%d\n", pagesize, eccsaddr, rowaddr);
 
 #if 1 /* Use NFC SRAM */
   /* Write the data area to NFC SRAM */
@@ -2437,7 +2437,7 @@ static int nand_writepage_pmecc(struct sam_nandcs_s *priv, off_t block,
   eccpersector = (pmecc_get_eccsize()) / sectersperpage;
   eccsize      = sectersperpage * eccpersector;
 
-  fvdbg("sectersperpage=%d eccpersector=%d eccsize=%d\n",
+  finfo("sectersperpage=%d eccpersector=%d eccsize=%d\n",
         sectersperpage, eccpersector, eccsize);
 
 #ifdef CONFIG_SAMA5_PMECC_TRIMPAGE
@@ -2550,7 +2550,7 @@ static int nand_eraseblock(struct nand_raw_s *raw, off_t block)
 
   DEBUGASSERT(priv);
 
-  fvdbg("block=%d\n", (int)block);
+  finfo("block=%d\n", (int)block);
 
   /* Get exclusvie access to the HSMC hardware.
    * REVISIT:  The scope of this exclusivity is just NAND.
@@ -2796,7 +2796,7 @@ static int nand_writepage(struct nand_raw_s *raw, off_t block,
 
 static void nand_reset(struct sam_nandcs_s *priv)
 {
-  fvdbg("Resetting\n");
+  finfo("Resetting\n");
   nand_nfc_cleale(priv, 0, COMMAND_RESET, 0, 0, 0);
   nand_wait_ready(priv);
 }
@@ -2834,7 +2834,7 @@ struct mtd_dev_s *sam_nand_initialize(int cs)
   uint8_t ecctype;
   int ret;
 
-  fvdbg("CS%d\n", cs);
+  finfo("CS%d\n", cs);
 
   /* Select the device structure (In SAMA5D3, NAND is only supported on CS3). */
 
diff --git a/arch/arm/src/sama5/sam_ohci.c b/arch/arm/src/sama5/sam_ohci.c
index 5dbad089e9..65e5111d56 100644
--- a/arch/arm/src/sama5/sam_ohci.c
+++ b/arch/arm/src/sama5/sam_ohci.c
@@ -1318,7 +1318,7 @@ static inline int sam_reminted(struct sam_ed_s *ed)
 #ifdef CONFIG_USBHOST_TRACE
   usbhost_vtrace1(OHCI_VTRACE1_VIRTED, (uintptr_t)ed);
 #else
-  uvdbg("ed: %08x head: %08x next: %08x offset: %d\n",
+  uinfo("ed: %08x head: %08x next: %08x offset: %d\n",
         ed, physhead, head ? head->hw.nexted : 0, offset);
 #endif
 
@@ -1358,7 +1358,7 @@ static inline int sam_reminted(struct sam_ed_s *ed)
 #ifdef CONFIG_USBHOST_TRACE
       usbhost_vtrace1(OHCI_VTRACE1_VIRTED, (uintptr_t)ed);
 #else
-      uvdbg("ed: %08x head: %08x next: %08x\n",
+      uinfo("ed: %08x head: %08x next: %08x\n",
             ed, physhead, head ? head->hw.nexted : 0);
 #endif
 
@@ -3103,7 +3103,7 @@ static int sam_ctrlin(struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
 #ifdef CONFIG_USBHOST_TRACE
   usbhost_vtrace2(OHCI_VTRACE2_CTRLIN, RHPORT(rhport), req->req);
 #else
-  uvdbg("RHPort%d type: %02x req: %02x value: %02x%02x index: %02x%02x len: %02x%02x\n",
+  uinfo("RHPort%d type: %02x req: %02x value: %02x%02x index: %02x%02x len: %02x%02x\n",
         RHPORT(rhport), req->type, req->req, req->value[1],
         req->value[0], req->index[1], req->index[0], req->len[1],
         req->len[0]);
@@ -3152,7 +3152,7 @@ static int sam_ctrlout(struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
 #ifdef CONFIG_USBHOST_TRACE
   usbhost_vtrace2(OHCI_VTRACE2_CTRLOUT, RHPORT(rhport), req->req);
 #else
-  uvdbg("RHPort%d type: %02x req: %02x value: %02x%02x index: %02x%02x len: %02x%02x\n",
+  uinfo("RHPort%d type: %02x req: %02x value: %02x%02x index: %02x%02x len: %02x%02x\n",
         RHPORT(rhport), req->type, req->req, req->value[1],
         req->value[0], req->index[1], req->index[0], req->len[1],
         req->len[0]);
@@ -3227,7 +3227,7 @@ static int sam_transfer_common(struct sam_rhport_s *rhport,
                   (ed->hw.ctrl  & ED_CONTROL_EN_MASK) >> ED_CONTROL_EN_SHIFT,
                   (uint16_t)buflen);
 #else
-  uvdbg("EP%d %s toggle: %d maxpacket: %d buflen: %d\n",
+  uinfo("EP%d %s toggle: %d maxpacket: %d buflen: %d\n",
         (ed->hw.ctrl  & ED_CONTROL_EN_MASK) >> ED_CONTROL_EN_SHIFT,
         in ? "IN" : "OUT",
         (ed->hw.headp & ED_HEADP_C) != 0 ? 1 : 0,
@@ -3788,7 +3788,7 @@ static int sam_connect(struct usbhost_driver_s *drvr,
   /* Set the connected/disconnected flag */
 
   hport->connected = connected;
-  ullvdbg("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO");
+  ullinfo("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO");
 
   /* Report the connection event */
 
diff --git a/arch/arm/src/sama5/sam_oneshot.c b/arch/arm/src/sama5/sam_oneshot.c
index c6d0a79ef5..cb53ea11f7 100644
--- a/arch/arm/src/sama5/sam_oneshot.c
+++ b/arch/arm/src/sama5/sam_oneshot.c
@@ -108,7 +108,7 @@ static void sam_oneshot_handler(TC_HANDLE tch, void *arg, uint32_t sr)
   oneshot_handler_t oneshot_handler;
   void *oneshot_arg;
 
-  tcllvdbg("Expired...\n");
+  tcllinfo("Expired...\n");
   DEBUGASSERT(oneshot && oneshot->handler);
 
   /* The clock was stopped, but not disabled when the RC match occurred.
@@ -165,7 +165,7 @@ int sam_oneshot_initialize(struct sam_oneshot_s *oneshot, int chan,
   uint32_t cmr;
   int ret;
 
-  tcvdbg("chan=%d resolution=%d usec\n", chan, resolution);
+  tcinfo("chan=%d resolution=%d usec\n", chan, resolution);
   DEBUGASSERT(oneshot && resolution > 0);
 
   /* Get the TC frequency the corresponds to the requested resolution */
@@ -181,7 +181,7 @@ int sam_oneshot_initialize(struct sam_oneshot_s *oneshot, int chan,
       return ret;
     }
 
-  tcvdbg("frequency=%lu, divisor=%lu, cmr=%08lx\n",
+  tcinfo("frequency=%lu, divisor=%lu, cmr=%08lx\n",
          (unsigned long)frequency, (unsigned long)divisor,
          (unsigned long)cmr);
 
@@ -260,7 +260,7 @@ int sam_oneshot_start(struct sam_oneshot_s *oneshot, struct sam_freerun_s *freer
   uint64_t regval;
   irqstate_t flags;
 
-  tcvdbg("handler=%p arg=%p, ts=(%lu, %lu)\n",
+  tcinfo("handler=%p arg=%p, ts=(%lu, %lu)\n",
          handler, arg, (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec);
   DEBUGASSERT(oneshot && handler && ts);
 
@@ -271,7 +271,7 @@ int sam_oneshot_start(struct sam_oneshot_s *oneshot, struct sam_freerun_s *freer
     {
       /* Yes.. then cancel it */
 
-      tcvdbg("Already running... cancelling\n");
+      tcinfo("Already running... cancelling\n");
       (void)sam_oneshot_cancel(oneshot, freerun, NULL);
     }
 
@@ -293,7 +293,7 @@ int sam_oneshot_start(struct sam_oneshot_s *oneshot, struct sam_freerun_s *freer
 
   regval = (usec * (uint64_t)sam_tc_divfreq(oneshot->tch)) / USEC_PER_SEC;
 
-  tcvdbg("usec=%llu regval=%08llx\n", usec, regval);
+  tcinfo("usec=%llu regval=%08llx\n", usec, regval);
   DEBUGASSERT(regval <= UINT32_MAX);
 
   /* Set up to receive the callback when the interrupt occurs */
@@ -402,7 +402,7 @@ int sam_oneshot_cancel(struct sam_oneshot_s *oneshot, struct sam_freerun_s *free
    * REVISIT:  This does not appear to be the case.
    */
 
-  tcvdbg("Cancelling...\n");
+  tcinfo("Cancelling...\n");
 
   count = sam_tc_getcounter(oneshot->tch);
   rc    = sam_tc_getregister(oneshot->tch, TC_REGC);
@@ -438,7 +438,7 @@ int sam_oneshot_cancel(struct sam_oneshot_s *oneshot, struct sam_freerun_s *free
        * oneshot timer.
        */
 
-      tcvdbg("rc=%lu count=%lu usec=%lu\n",
+      tcinfo("rc=%lu count=%lu usec=%lu\n",
              (unsigned long)rc, (unsigned long)count, (unsigned long)usec);
 
       /* REVISIT: I am not certain why the timer counter value sometimes
@@ -483,7 +483,7 @@ int sam_oneshot_cancel(struct sam_oneshot_s *oneshot, struct sam_freerun_s *free
           ts->tv_nsec = (unsigned long)nsec;
         }
 
-      tcvdbg("remaining (%lu, %lu)\n",
+      tcinfo("remaining (%lu, %lu)\n",
              (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec);
     }
 
diff --git a/arch/arm/src/sama5/sam_pmecc.c b/arch/arm/src/sama5/sam_pmecc.c
index 8dfee40e3a..c1f42478a3 100644
--- a/arch/arm/src/sama5/sam_pmecc.c
+++ b/arch/arm/src/sama5/sam_pmecc.c
@@ -858,7 +858,7 @@ static int pmecc_pagelayout(uint16_t datasize, uint16_t eccsize)
   int bcherr1k;
   int selector;
 
-  fvdbg("datasize=%d eccsize=%d\n", datasize, eccsize);
+  finfo("datasize=%d eccsize=%d\n", datasize, eccsize);
   DEBUGASSERT(datasize > 0 && eccsize > 0);
 
   /* Try for 512 byte sectors */
@@ -877,7 +877,7 @@ static int pmecc_pagelayout(uint16_t datasize, uint16_t eccsize)
       selector = 1;
     }
 
-  fvdbg("nsectors512=%d bcherr512=%d selector=%d\n",
+  finfo("nsectors512=%d bcherr512=%d selector=%d\n",
         nsectors512, bcherr512, selector);
 
   /* Try for 1024 byte sectors */
@@ -902,7 +902,7 @@ static int pmecc_pagelayout(uint16_t datasize, uint16_t eccsize)
       selector |= 2;
     }
 
-  fvdbg("nsectors1k=%d bcherr1k=%d selector=%d\n",
+  finfo("nsectors1k=%d bcherr1k=%d selector=%d\n",
         nsectors1k, bcherr1k, selector);
 
   /* Now pick the best (most likely 1024) */
@@ -960,7 +960,7 @@ static int pmecc_pagelayout(uint16_t datasize, uint16_t eccsize)
 
   g_pmecc.desc.bcherr = ((uint32_t)bcherr << HSMC_PMECCFG_BCHERR_SHIFT);
 
-  fvdbg("sector1k=%d nsectors=%d bcherr=%d correctability=%d\n",
+  finfo("sector1k=%d nsectors=%d bcherr=%d correctability=%d\n",
         g_pmecc.sector1k, g_pmecc.nsectors, bcherr, g_pmecc.correctability);
 
   return OK;
@@ -1018,7 +1018,7 @@ int pmecc_configure(struct sam_nandcs_s *priv, bool protected)
   uint32_t regval;
   int ret;
 
-  fvdbg("protected=%d configured=%d\n", protected, g_pmecc.configured);
+  finfo("protected=%d configured=%d\n", protected, g_pmecc.configured);
 
   /* Check if we need to re-configure */
 
@@ -1030,7 +1030,7 @@ int pmecc_configure(struct sam_nandcs_s *priv, bool protected)
     {
       /* No, we are already configured */
 
-      fvdbg("Already configured\n");
+      finfo("Already configured\n");
       return OK;
     }
 
@@ -1096,7 +1096,7 @@ int pmecc_configure(struct sam_nandcs_s *priv, bool protected)
 #endif
     }
 
-  fvdbg("sectorsz=%08x sectorsperpage=%d mm=%d\n",
+  finfo("sectorsz=%08x sectorsperpage=%d mm=%d\n",
         g_pmecc.desc.sectorsz, sectorsperpage, g_pmecc.desc.mm);
 
   switch (sectorsperpage)
@@ -1120,7 +1120,7 @@ int pmecc_configure(struct sam_nandcs_s *priv, bool protected)
 
   g_pmecc.desc.nn = (1 << g_pmecc.desc.mm) - 1;
 
-  fvdbg("pagesize=%08x nn=%d\n", g_pmecc.desc.pagesize, g_pmecc.desc.nn);
+  finfo("pagesize=%08x nn=%d\n", g_pmecc.desc.pagesize, g_pmecc.desc.nn);
 
   /* Real value of ECC bit number correction (2, 4, 8, 12, 24) */
 
@@ -1136,13 +1136,13 @@ int pmecc_configure(struct sam_nandcs_s *priv, bool protected)
         (((g_pmecc.desc.mm * g_pmecc.correctability) >> 3) + 1) * sectorsperpage;
     }
 
-  fvdbg("mm=%d correctability=%d eccsize=%d\n",
+  finfo("mm=%d correctability=%d eccsize=%d\n",
         g_pmecc.desc.mm, g_pmecc.correctability, g_pmecc.desc.eccsize);
 
   g_pmecc.desc.eccstart = eccoffset;
   g_pmecc.desc.eccend   = eccoffset + g_pmecc.desc.eccsize;
 
-  fvdbg("eccstart=%d eccend=%d sparesize=%d\n",
+  finfo("eccstart=%d eccend=%d sparesize=%d\n",
         g_pmecc.desc.eccstart, g_pmecc.desc.eccend,
         priv->raw.model.sparesize);
 
diff --git a/arch/arm/src/sama5/sam_pwm.c b/arch/arm/src/sama5/sam_pwm.c
index af6edf98bf..c80cf5812e 100644
--- a/arch/arm/src/sama5/sam_pwm.c
+++ b/arch/arm/src/sama5/sam_pwm.c
@@ -404,17 +404,17 @@
 #  define pwmdbg              dbg
 #  define pwmlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define pwmvdbg           vdbg
-#    define pwmllvdbg         llvdbg
+#    define pwminfo           info
+#    define pwmllinfo         llinfo
 #  else
-#    define pwmvdbg(x...)
-#    define pwmllvdbg(x...)
+#    define pwminfo(x...)
+#    define pwmllinfo(x...)
 #  endif
 #else
 #  define pwmdbg(x...)
 #  define pwmlldbg(x...)
-#  define pwmvdbg(x...)
-#  define pwmllvdbg(x...)
+#  define pwminfo(x...)
+#  define pwmllinfo(x...)
 #endif
 
 /****************************************************************************
@@ -917,58 +917,58 @@ static void pwm_chan_putreg(struct sam_pwm_chan_s *chan, int offset,
 #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);
-  pwmvdbg("   CLK: %08x    SR: %08x  IMR1: %08x  ISR1: %08x\n",
+  pwminfo("PWM: %s\n", msg);
+  pwminfo("   CLK: %08x    SR: %08x  IMR1: %08x  ISR1: %08x\n",
           pwm_getreg(chan, SAM_PWM_CLK_OFFSET),
           pwm_getreg(chan, SAM_PWM_SR_OFFSET),
           pwm_getreg(chan, SAM_PWM_IMR1_OFFSET),
           pwm_getreg(chan, SAM_PWM_ISR1_OFFSET));
-  pwmvdbg("   SCM: %08x  SCUC: %08x  SCUP: %08x  IMR2: %08x\n",
+  pwminfo("   SCM: %08x  SCUC: %08x  SCUP: %08x  IMR2: %08x\n",
           pwm_getreg(chan, SAM_PWM_SCM_OFFSET),
           pwm_getreg(chan, SAM_PWM_SCUC_OFFSET),
           pwm_getreg(chan, SAM_PWM_SCUP_OFFSET),
           pwm_getreg(chan, SAM_PWM_IMR2_OFFSET));
-  pwmvdbg("  ISR2: %08x   OOV: %08x    OS: %08x   FMR: %08x\n",
+  pwminfo("  ISR2: %08x   OOV: %08x    OS: %08x   FMR: %08x\n",
           pwm_getreg(chan, SAM_PWM_ISR2_OFFSET),
           pwm_getreg(chan, SAM_PWM_OOV_OFFSET),
           pwm_getreg(chan, SAM_PWM_OS_OFFSET),
           pwm_getreg(chan, SAM_PWM_FMR_OFFSET));
-  pwmvdbg("   FSR: %08x   FPV: %08x   FPE: %08x ELMR0: %08x\n",
+  pwminfo("   FSR: %08x   FPV: %08x   FPE: %08x ELMR0: %08x\n",
           pwm_getreg(chan, SAM_PWM_FSR_OFFSET),
           pwm_getreg(chan, SAM_PWM_FPV_OFFSET),
           pwm_getreg(chan, SAM_PWM_FPE_OFFSET),
           pwm_getreg(chan, SAM_PWM_ELMR0_OFFSET));
-  pwmvdbg(" ELMR1: %08x  SMMR: %08x  WPSR: %08x\n",
+  pwminfo(" ELMR1: %08x  SMMR: %08x  WPSR: %08x\n",
           pwm_getreg(chan, SAM_PWM_ELMR1_OFFSET),
           pwm_getreg(chan, SAM_PWM_SMMR_OFFSET),
           pwm_getreg(chan, SAM_PWM_WPSR_OFFSET));
-  pwmvdbg(" CMPV0: %08x CMPM0: %08x CMPV1: %08x CMPM1: %08x\n",
+  pwminfo(" CMPV0: %08x CMPM0: %08x CMPV1: %08x CMPM1: %08x\n",
           pwm_getreg(chan, SAM_PWM_CMPV0_OFFSET),
           pwm_getreg(chan, SAM_PWM_CMPM0_OFFSET),
           pwm_getreg(chan, SAM_PWM_CMPV1_OFFSET),
           pwm_getreg(chan, SAM_PWM_CMPM1_OFFSET));
-  pwmvdbg(" CMPV2: %08x CMPM2: %08x CMPV3: %08x CMPM3: %08x\n",
+  pwminfo(" CMPV2: %08x CMPM2: %08x CMPV3: %08x CMPM3: %08x\n",
           pwm_getreg(chan, SAM_PWM_CMPV2_OFFSET),
           pwm_getreg(chan, SAM_PWM_CMPM2_OFFSET),
           pwm_getreg(chan, SAM_PWM_CMPV3_OFFSET),
           pwm_getreg(chan, SAM_PWM_CMPM3_OFFSET));
-  pwmvdbg(" CMPV4: %08x CMPM4: %08x CMPV5: %08x CMPM5: %08x\n",
+  pwminfo(" CMPV4: %08x CMPM4: %08x CMPV5: %08x CMPM5: %08x\n",
           pwm_getreg(chan, SAM_PWM_CMPV4_OFFSET),
           pwm_getreg(chan, SAM_PWM_CMPM4_OFFSET),
           pwm_getreg(chan, SAM_PWM_CMPV5_OFFSET),
           pwm_getreg(chan, SAM_PWM_CMPM5_OFFSET));
-  pwmvdbg(" CMPV6: %08x CMPM6: %08x CMPV7: %08x CMPM7: %08x\n",
+  pwminfo(" CMPV6: %08x CMPM6: %08x CMPV7: %08x CMPM7: %08x\n",
           pwm_getreg(chan, SAM_PWM_CMPV6_OFFSET),
           pwm_getreg(chan, SAM_PWM_CMPM6_OFFSET),
           pwm_getreg(chan, SAM_PWM_CMPV7_OFFSET),
           pwm_getreg(chan, SAM_PWM_CMPM7_OFFSET));
-  pwmvdbg("Channel %d: %s\n", chan->channel, msg);
-  pwmvdbg("   CMR: %08x  CDTY: %08x  CPRD: %08x  CCNT: %08x\n",
+  pwminfo("Channel %d: %s\n", chan->channel, msg);
+  pwminfo("   CMR: %08x  CDTY: %08x  CPRD: %08x  CCNT: %08x\n",
           pwm_chan_getreg(chan, SAM_PWM_CMR_OFFSET),
           pwm_chan_getreg(chan, SAM_PWM_CDTY_OFFSET),
           pwm_chan_getreg(chan, SAM_PWM_CPRD_OFFSET),
           pwm_chan_getreg(chan, SAM_PWM_CCNT_OFFSET));
-  pwmvdbg("    CT: %08x\n",
+  pwminfo("    CT: %08x\n",
           pwm_chan_getreg(chan, SAM_PWM_DT_OFFSET));
 }
 #endif
@@ -1018,7 +1018,7 @@ static int pwm_setup(FAR struct pwm_lowerhalf_s *dev)
 {
   FAR struct sam_pwm_chan_s *chan = (FAR struct sam_pwm_chan_s *)dev;
 
-  pwmvdbg("Channel %d: H=%08x L=%08x FI=%08x\n",
+  pwminfo("Channel %d: H=%08x L=%08x FI=%08x\n",
           chan->channel, chan->ohpincfg, chan->olpincfg, chan->fipincfg);
 
   /* Configure selected PWM pins */
@@ -1061,7 +1061,7 @@ static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev)
 {
   FAR struct sam_pwm_chan_s *chan = (FAR struct sam_pwm_chan_s *)dev;
 
-  pwmvdbg("Channel %d\n", chan->channel);
+  pwminfo("Channel %d\n", chan->channel);
 
   /* Make sure that the output has been stopped */
 
@@ -1167,7 +1167,7 @@ static int pwm_start(FAR struct pwm_lowerhalf_s *dev,
     }
 
   pwm_chan_putreg(chan, SAM_PWM_CDTY_OFFSET, regval);
-  pwmvdbg("Fsrc=%d cprd=%d cdty=%d\n", fsrc, cprd, regval);
+  pwminfo("Fsrc=%d cprd=%d cdty=%d\n", fsrc, cprd, regval);
 
   /* Enable the channel */
 
@@ -1199,7 +1199,7 @@ static int pwm_stop(FAR struct pwm_lowerhalf_s *dev)
 {
   FAR struct sam_pwm_chan_s *chan = (FAR struct sam_pwm_chan_s *)dev;
 
-  pwmvdbg("Channel %d\n", chan->channel);
+  pwminfo("Channel %d\n", chan->channel);
 
   /* Disable further PWM interrupts from this channel */
 
@@ -1236,7 +1236,7 @@ static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, int cmd, unsigned long arg
 
   /* There are no platform-specific ioctl commands */
 
-  pwmvdbg("Channel %d\n", chan->channel);
+  pwminfo("Channel %d\n", chan->channel);
 #endif
   return -ENOTTY;
 }
@@ -1299,7 +1299,7 @@ FAR struct pwm_lowerhalf_s *sam_pwminitialize(int channel)
   FAR struct sam_pwm_chan_s *chan;
   uint32_t regval;
 
-  pwmvdbg("Channel %d\n", channel);
+  pwminfo("Channel %d\n", channel);
 
   switch (channel)
     {
diff --git a/arch/arm/src/sama5/sam_rtc.c b/arch/arm/src/sama5/sam_rtc.c
index 94bca91142..05600d9ec1 100644
--- a/arch/arm/src/sama5/sam_rtc.c
+++ b/arch/arm/src/sama5/sam_rtc.c
@@ -87,14 +87,14 @@
 
 #ifdef CONFIG_DEBUG_RTC
 #  define rtcdbg    dbg
-#  define rtcvdbg   vdbg
+#  define rtcinfo   info
 #  define rtclldbg  lldbg
-#  define rtcllvdbg llvdbg
+#  define rtcllinfo llinfo
 #else
 #  define rtcdbg(x...)
-#  define rtcvdbg(x...)
+#  define rtcinfo(x...)
 #  define rtclldbg(x...)
-#  define rtcllvdbg(x...)
+#  define rtcllinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/arch/arm/src/sama5/sam_spi.c b/arch/arm/src/sama5/sam_spi.c
index e914af0aa8..646a848bee 100644
--- a/arch/arm/src/sama5/sam_spi.c
+++ b/arch/arm/src/sama5/sam_spi.c
@@ -143,13 +143,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 #define DMA_INITIAL      0
@@ -512,17 +512,17 @@ static inline void spi_putreg(struct sam_spidev_s *spi, uint32_t value,
 #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);
-  spivdbg("    MR:%08x   SR:%08x  IMR:%08x\n",
+  spiinfo("%s:\n", msg);
+  spiinfo("    MR:%08x   SR:%08x  IMR:%08x\n",
           getreg32(spi->base + SAM_SPI_MR_OFFSET),
           getreg32(spi->base + SAM_SPI_SR_OFFSET),
           getreg32(spi->base + SAM_SPI_IMR_OFFSET));
-  spivdbg("  CSR0:%08x CSR1:%08x CSR2:%08x CSR3:%08x\n",
+  spiinfo("  CSR0:%08x CSR1:%08x CSR2:%08x CSR3:%08x\n",
           getreg32(spi->base + SAM_SPI_CSR0_OFFSET),
           getreg32(spi->base + SAM_SPI_CSR1_OFFSET),
           getreg32(spi->base + SAM_SPI_CSR2_OFFSET),
           getreg32(spi->base + SAM_SPI_CSR3_OFFSET));
-  spivdbg("  WPCR:%08x WPSR:%08x\n",
+  spiinfo("  WPCR:%08x WPSR:%08x\n",
           getreg32(spi->base + SAM_SPI_WPCR_OFFSET),
           getreg32(spi->base + SAM_SPI_WPSR_OFFSET));
 }
@@ -882,7 +882,7 @@ static int spi_lock(struct spi_dev_s *dev, bool lock)
   struct sam_spics_s *spics = (struct sam_spics_s *)dev;
   struct sam_spidev_s *spi = spi_device(spics);
 
-  spivdbg("lock=%d\n", lock);
+  spiinfo("lock=%d\n", lock);
   if (lock)
     {
       /* Take the semaphore (perhaps waiting) */
@@ -930,10 +930,10 @@ static void spi_select(struct spi_dev_s *dev, enum spi_dev_e devid,
 
   /* Are we selecting or de-selecting the device? */
 
-  spivdbg("selected=%d\n", selected);
+  spiinfo("selected=%d\n", selected);
   if (selected)
     {
-      spivdbg("cs=%d\n", spics->cs);
+      spiinfo("cs=%d\n", spics->cs);
 
       /* Before writing the TDR, the PCS field in the SPI_MR register must be set
        * in order to select a slave.
@@ -988,7 +988,7 @@ static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency)
   uint32_t regval;
   unsigned int offset;
 
-  spivdbg("cs=%d frequency=%d\n", spics->cs, frequency);
+  spiinfo("cs=%d frequency=%d\n", spics->cs, frequency);
 
   /* Check if the requested frequency is the same as the frequency selection */
 
@@ -1058,7 +1058,7 @@ static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency)
   /* Calculate the new actual frequency */
 
   actual = SAM_SPI_CLOCK / scbr;
-  spivdbg("csr[offset=%02x]=%08x actual=%d\n", offset, regval, actual);
+  spiinfo("csr[offset=%02x]=%08x actual=%d\n", offset, regval, actual);
 
   /* Save the frequency setting */
 
@@ -1091,7 +1091,7 @@ static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode)
   uint32_t regval;
   unsigned int offset;
 
-  spivdbg("cs=%d mode=%d\n", spics->cs, mode);
+  spiinfo("cs=%d mode=%d\n", spics->cs, mode);
 
   /* Has the mode changed? */
 
@@ -1134,7 +1134,7 @@ static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode)
         }
 
       spi_putreg(spi, regval, offset);
-      spivdbg("csr[offset=%02x]=%08x\n", offset, regval);
+      spiinfo("csr[offset=%02x]=%08x\n", offset, regval);
 
       /* Save the mode so that subsequent re-configurations will be faster */
 
@@ -1164,7 +1164,7 @@ static void spi_setbits(struct spi_dev_s *dev, int nbits)
   uint32_t regval;
   unsigned int offset;
 
-  spivdbg("cs=%d nbits=%d\n", spics->cs, nbits);
+  spiinfo("cs=%d nbits=%d\n", spics->cs, nbits);
   DEBUGASSERT(spics && nbits > 7 && nbits < 17);
 
   /* NOTE:  The logic in spi_send and in spi_exchange only handles 8-bit
@@ -1186,7 +1186,7 @@ static void spi_setbits(struct spi_dev_s *dev, int nbits)
       regval |= SPI_CSR_BITS(nbits);
       spi_putreg(spi, regval, offset);
 
-      spivdbg("csr[offset=%02x]=%08x\n", offset, regval);
+      spiinfo("csr[offset=%02x]=%08x\n", offset, regval);
 
       /* Save the selection so the subsequence re-configurations will be faster */
 
@@ -1224,7 +1224,7 @@ static uint16_t spi_send(struct spi_dev_s *dev, uint16_t wd)
   rxbyte = (uint8_t)0;
   spi_exchange(dev, &txbyte, &rxbyte, 1);
 
-  spivdbg("Sent %02x received %02x\n", txbyte, rxbyte);
+  spiinfo("Sent %02x received %02x\n", txbyte, rxbyte);
   return (uint16_t)rxbyte;
 }
 
@@ -1270,7 +1270,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
   uint32_t pcs;
   uint32_t data;
 
-  spivdbg("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords);
+  spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords);
 
   /* Set up PCS bits */
 
@@ -1390,7 +1390,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
       return;
     }
 
-  spivdbg("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords);
+  spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords);
 
   spics = (struct sam_spics_s *)dev;
   spi = spi_device(spics);
@@ -1673,7 +1673,7 @@ struct spi_dev_s *sam_spibus_initialize(int port)
 
   /* The support SAM parts have only a single SPI port */
 
-  spivdbg("port: %d csno: %d spino: %d\n", port, csno, spino);
+  spiinfo("port: %d csno: %d spino: %d\n", port, csno, spino);
   DEBUGASSERT(csno >= 0 && csno <= SAM_SPI_NCS);
 
 #if defined(CONFIG_SAMA5_SPI0) && defined(CONFIG_SAMA5_SPI1)
@@ -1852,7 +1852,7 @@ struct spi_dev_s *sam_spibus_initialize(int port)
   spi_putreg(spi, regval, offset);
 
   spics->nbits = 8;
-  spivdbg("csr[offset=%02x]=%08x\n", offset, regval);
+  spiinfo("csr[offset=%02x]=%08x\n", offset, regval);
 
   return &spics->spidev;
 }
diff --git a/arch/arm/src/sama5/sam_ssc.c b/arch/arm/src/sama5/sam_ssc.c
index 4ea4f5f611..97ce8ce964 100644
--- a/arch/arm/src/sama5/sam_ssc.c
+++ b/arch/arm/src/sama5/sam_ssc.c
@@ -417,16 +417,16 @@
 #  define i2sdbg         dbg
 #  define i2slldbg       lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define i2svdbg      dbg
-#    define i2sllvdbg    lldbg
+#    define i2sinfo      dbg
+#    define i2sllinfo    lldbg
 #  else
-#    define i2svdbg(x...)
+#    define i2sinfo(x...)
 #  endif
 #else
 #  define i2sdbg(x...)
 #  define i2slldbg(x...)
-#  define i2svdbg(x...)
-#  define i2sllvdbg(x...)
+#  define i2sinfo(x...)
+#  define i2sllinfo(x...)
 #endif
 
 #define DMA_INITIAL      0
@@ -820,18 +820,18 @@ static inline uintptr_t ssc_physregaddr(struct sam_ssc_s *priv,
 #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);
-  i2svdbg("   CMR:%08x RCMR:%08x RFMR:%08x TCMR:%08x\n",
+  i2sinfo("SSC%d: %s\n", priv->sscno, msg);
+  i2sinfo("   CMR:%08x RCMR:%08x RFMR:%08x TCMR:%08x\n",
           getreg32(priv->base + SAM_SSC_CMR_OFFSET),
           getreg32(priv->base + SAM_SSC_RCMR_OFFSET),
           getreg32(priv->base + SAM_SSC_RFMR_OFFSET),
           getreg32(priv->base + SAM_SSC_TCMR_OFFSET));
-  i2svdbg("  TFMR:%08x RC0R:%08x RC1R:%08x   SR:%08x\n",
+  i2sinfo("  TFMR:%08x RC0R:%08x RC1R:%08x   SR:%08x\n",
           getreg32(priv->base + SAM_SSC_TFMR_OFFSET),
           getreg32(priv->base + SAM_SSC_RC0R_OFFSET),
           getreg32(priv->base + SAM_SSC_RC1R_OFFSET),
           getreg32(priv->base + SAM_SSC_SR_OFFSET));
-  i2svdbg("   IMR:%08x WPMR:%08x WPSR:%08x\n",
+  i2sinfo("   IMR:%08x WPMR:%08x WPSR:%08x\n",
           getreg32(priv->base + SAM_SSC_IMR_OFFSET),
           getreg32(priv->base + SAM_SSC_WPMR_OFFSET),
           getreg32(priv->base + SAM_SSC_WPSR_OFFSET));
@@ -868,11 +868,11 @@ static void ssc_dump_queue(sq_queue_t *queue)
 
       if (!apb)
         {
-          i2sllvdbg("    %p: No buffer\n", bfcontainer);
+          i2sllinfo("    %p: No buffer\n", bfcontainer);
         }
       else
         {
-          i2sllvdbg("    %p: buffer=%p nmaxbytes=%d nbytes=%d\n",
+          i2sllinfo("    %p: buffer=%p nmaxbytes=%d nbytes=%d\n",
                     bfcontainer, apb, apb->nmaxbytes, apb->nbytes);
         }
     }
@@ -883,12 +883,12 @@ static void ssc_dump_queues(struct sam_transport_s *xpt, const char *msg)
   irqstate_t flags;
 
   flags = enter_critical_section();
-  i2sllvdbg("%s\n", msg);
-  i2sllvdbg("  Pending:\n");
+  i2sllinfo("%s\n", msg);
+  i2sllinfo("  Pending:\n");
   ssc_dump_queue(&xpt->pend);
-  i2sllvdbg("  Active:\n");
+  i2sllinfo("  Active:\n");
   ssc_dump_queue(&xpt->act);
-  i2sllvdbg("  Done:\n");
+  i2sllinfo("  Done:\n");
   ssc_dump_queue(&xpt->done);
   leave_critical_section(flags);
 }
@@ -1447,7 +1447,7 @@ static void ssc_rx_worker(void *arg)
    * So we have to start the next DMA here.
    */
 
-  i2svdbg("rx.act.head=%p rx.done.head=%p\n",
+  i2sinfo("rx.act.head=%p rx.done.head=%p\n",
           priv->rx.act.head, priv->rx.done.head);
   ssc_dump_rxqueues(priv, "RX worker start");
 
@@ -1859,7 +1859,7 @@ static void ssc_tx_worker(void *arg)
    * So we have to start the next DMA here.
    */
 
-  i2svdbg("tx.act.head=%p tx.done.head=%p\n",
+  i2sinfo("tx.act.head=%p tx.done.head=%p\n",
            priv->tx.act.head, priv->tx.done.head);
   ssc_dump_txqueues(priv, "TX worker start");
 
@@ -2234,7 +2234,7 @@ static int ssc_receive(struct i2s_dev_s *dev, struct ap_buffer_s *apb,
 #endif
 
   DEBUGASSERT(priv && apb && ((uintptr_t)apb->samp & priv->align) == 0);
-  i2svdbg("apb=%p nmaxbytes=%d arg=%p timeout=%d\n",
+  i2sinfo("apb=%p nmaxbytes=%d arg=%p timeout=%d\n",
           apb, apb->nmaxbytes, arg, timeout);
 
   ssc_init_buffer(apb->samp, apb->nmaxbytes);
@@ -2449,7 +2449,7 @@ static int ssc_send(struct i2s_dev_s *dev, struct ap_buffer_s *apb,
    */
 
   DEBUGASSERT(priv && apb);
-  i2svdbg("apb=%p nbytes=%d arg=%p timeout=%d\n",
+  i2sinfo("apb=%p nbytes=%d arg=%p timeout=%d\n",
           apb, apb->nbytes - apb->curbyte, arg, timeout);
 
   ssc_dump_buffer("Sending", &apb->samp[apb->curbyte],
@@ -2929,7 +2929,7 @@ static void ssc_clocking(struct sam_ssc_s *priv)
 
   sam_enableperiph1(priv->pid);
 
-  i2svdbg("PCSR1=%08x PCR=%08x CMR=%08x\n",
+  i2sinfo("PCSR1=%08x PCR=%08x CMR=%08x\n",
           getreg32(SAM_PMC_PCSR1), regval,
           ssc_getreg(priv, SAM_SSC_CMR_OFFSET));
 }
@@ -3431,7 +3431,7 @@ struct i2s_dev_s *sam_ssc_initialize(int port)
 
   /* The support SAM parts have only a single SSC port */
 
-  i2svdbg("port: %d\n", port);
+  i2sinfo("port: %d\n", port);
 
   /* Allocate a new state structure for this chip select.  NOTE that there
    * is no protection if the same chip select is used in two different
diff --git a/arch/arm/src/sama5/sam_tc.c b/arch/arm/src/sama5/sam_tc.c
index 54cf71242c..af434004ef 100644
--- a/arch/arm/src/sama5/sam_tc.c
+++ b/arch/arm/src/sama5/sam_tc.c
@@ -1102,7 +1102,7 @@ TC_HANDLE sam_tc_allocate(int channel, int mode)
    * access to the requested channel.
    */
 
-  tcvdbg("channel=%d mode=%08x\n", channel, mode);
+  tcinfo("channel=%d mode=%08x\n", channel, mode);
 
   chan = sam_tc_initialize(channel);
   if (chan)
@@ -1128,7 +1128,7 @@ TC_HANDLE sam_tc_allocate(int channel, int mode)
 
   /* Return an opaque reference to the channel */
 
-  tcvdbg("Returning %p\n", chan);
+  tcinfo("Returning %p\n", chan);
   return (TC_HANDLE)chan;
 }
 
@@ -1150,7 +1150,7 @@ void sam_tc_free(TC_HANDLE handle)
 {
   struct sam_chan_s *chan = (struct sam_chan_s *)handle;
 
-  tcvdbg("Freeing %p channel=%d inuse=%d\n", chan, chan->chan, chan->inuse);
+  tcinfo("Freeing %p channel=%d inuse=%d\n", chan, chan->chan, chan->inuse);
   DEBUGASSERT(chan && chan->inuse);
 
   /* Make sure that interrupts are detached and disabled and that the channel
@@ -1183,7 +1183,7 @@ void sam_tc_start(TC_HANDLE handle)
 {
   struct sam_chan_s *chan = (struct sam_chan_s *)handle;
 
-  tcvdbg("Starting channel %d inuse=%d\n", chan->chan, chan->inuse);
+  tcinfo("Starting channel %d inuse=%d\n", chan->chan, chan->inuse);
   DEBUGASSERT(chan && chan->inuse);
 
   /* Read the SR to clear any pending interrupts on this channel */
@@ -1215,7 +1215,7 @@ void sam_tc_stop(TC_HANDLE handle)
 {
   struct sam_chan_s *chan = (struct sam_chan_s *)handle;
 
-  tcvdbg("Stopping channel %d inuse=%d\n", chan->chan, chan->inuse);
+  tcinfo("Stopping channel %d inuse=%d\n", chan->chan, chan->inuse);
   DEBUGASSERT(chan && chan->inuse);
 
   sam_chan_putreg(chan, SAM_TC_CCR_OFFSET, TC_CCR_CLKDIS);
@@ -1322,7 +1322,7 @@ void sam_tc_setregister(TC_HANDLE handle, int regid, uint32_t regval)
 
   DEBUGASSERT(chan && regid < TC_NREGISTERS);
 
-  tcvdbg("Channel %d: Set register RC%d to %08lx\n",
+  tcinfo("Channel %d: Set register RC%d to %08lx\n",
          chan->chan, regid, (unsigned long)regval);
 
   sam_chan_putreg(chan, g_regoffset[regid], regval);
@@ -1465,7 +1465,7 @@ int sam_tc_divisor(uint32_t frequency, uint32_t *div, uint32_t *tcclks)
   uint32_t ftcin = sam_tc_infreq();
   int ndx = 0;
 
-  tcvdbg("frequency=%d\n", frequency);
+  tcinfo("frequency=%d\n", frequency);
 
   /* Satisfy lower bound.  That is, the value of the divider such that:
    *
@@ -1502,7 +1502,7 @@ int sam_tc_divisor(uint32_t frequency, uint32_t *div, uint32_t *tcclks)
   if (div)
     {
       uint32_t value = sam_tc_freqdiv_lookup(ftcin, ndx);
-      tcvdbg("return div=%lu\n", (unsigned long)value);
+      tcinfo("return div=%lu\n", (unsigned long)value);
       *div = value;
     }
 
@@ -1510,7 +1510,7 @@ int sam_tc_divisor(uint32_t frequency, uint32_t *div, uint32_t *tcclks)
 
   if (tcclks)
     {
-      tcvdbg("return tcclks=%08lx\n", (unsigned long)TC_CMR_TCCLKS(ndx));
+      tcinfo("return tcclks=%08lx\n", (unsigned long)TC_CMR_TCCLKS(ndx));
       *tcclks = TC_CMR_TCCLKS(ndx);
     }
 
diff --git a/arch/arm/src/sama5/sam_tc.h b/arch/arm/src/sama5/sam_tc.h
index 311f6d329f..8d5df8423e 100644
--- a/arch/arm/src/sama5/sam_tc.h
+++ b/arch/arm/src/sama5/sam_tc.h
@@ -87,14 +87,14 @@
 
 #ifdef CONFIG_SAMA5_TC_DEBUG
 #  define tcdbg    dbg
-#  define tcvdbg   vdbg
+#  define tcinfo   info
 #  define tclldbg  lldbg
-#  define tcllvdbg llvdbg
+#  define tcllinfo llinfo
 #else
 #  define tcdbg(x...)
-#  define tcvdbg(x...)
+#  define tcinfo(x...)
 #  define tclldbg(x...)
-#  define tcllvdbg(x...)
+#  define tcllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/arch/arm/src/sama5/sam_tickless.c b/arch/arm/src/sama5/sam_tickless.c
index 70cecb1217..190cdf19a5 100644
--- a/arch/arm/src/sama5/sam_tickless.c
+++ b/arch/arm/src/sama5/sam_tickless.c
@@ -209,7 +209,7 @@ static struct sam_tickless_s g_tickless;
 
 static void sam_oneshot_handler(void *arg)
 {
-  tcllvdbg("Expired...\n");
+  tcllinfo("Expired...\n");
   sched_timer_expiration();
 }
 
diff --git a/arch/arm/src/sama5/sam_trng.c b/arch/arm/src/sama5/sam_trng.c
index 1be5585bc4..eb9ee65c27 100644
--- a/arch/arm/src/sama5/sam_trng.c
+++ b/arch/arm/src/sama5/sam_trng.c
@@ -243,7 +243,7 @@ static ssize_t sam_read(struct file *filep, char *buffer, size_t buflen)
   ssize_t retval;
   int ret;
 
-  fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen);
+  finfo("buffer=%p buflen=%d\n", buffer, (int)buflen);
 
   /* Get exclusive access to the TRNG harware */
 
@@ -283,7 +283,7 @@ static ssize_t sam_read(struct file *filep, char *buffer, size_t buflen)
     {
       ret = sem_wait(&g_trngdev.waitsem);
 
-      fvdbg("Awakened: nsamples=%d maxsamples=%d ret=%d\n",
+      finfo("Awakened: nsamples=%d maxsamples=%d ret=%d\n",
             g_trngdev.nsamples, g_trngdev.maxsamples, ret);
 
       if (ret < 0)
@@ -320,7 +320,7 @@ errout:
 
   sem_post(&g_trngdev.exclsem);
 
-  fvdbg("Return %d\n", (int)retval);
+  finfo("Return %d\n", (int)retval);
   return retval;
 }
 
@@ -346,7 +346,7 @@ void up_rnginitialize(void)
 {
   int ret;
 
-  fvdbg("Initializing TRNG hardware\n");
+  finfo("Initializing TRNG hardware\n");
 
   /* Initialize the device structure */
 
diff --git a/arch/arm/src/sama5/sam_tsd.c b/arch/arm/src/sama5/sam_tsd.c
index 3bed567508..5159a34e7e 100644
--- a/arch/arm/src/sama5/sam_tsd.c
+++ b/arch/arm/src/sama5/sam_tsd.c
@@ -285,7 +285,7 @@ static void sam_tsd_notify(struct sam_tsd_s *priv)
       if (fds)
         {
           fds->revents |= POLLIN;
-          ivdbg("Report events: %02x\n", fds->revents);
+          iinfo("Report events: %02x\n", fds->revents);
           sem_post(fds->sem);
         }
     }
@@ -380,7 +380,7 @@ static int sam_tsd_waitsample(struct sam_tsd_s *priv, struct sam_sample_s *sampl
     {
       /* Wait for a sample data */
 
-      ivdbg("Waiting..\n");
+      iinfo("Waiting..\n");
       priv->nwaiters++;
       ret = sem_wait(&priv->waitsem);
       priv->nwaiters--;
@@ -398,7 +398,7 @@ static int sam_tsd_waitsample(struct sam_tsd_s *priv, struct sam_sample_s *sampl
         }
     }
 
-  ivdbg("Sampled\n");
+  iinfo("Sampled\n");
 
   /* Re-acquire the semaphore that manages mutually exclusive access to
    * the device structure.  We may have to wait here.  But we have our sample.
@@ -538,7 +538,7 @@ static void sam_tsd_bottomhalf(void *arg)
 
   /* Handle the change from pen down to pen up */
 
-  ivdbg("pending: %08x pendown: %d contact: %d\n",
+  iinfo("pending: %08x pendown: %d contact: %d\n",
         pending, pendown, priv->sample.contact);
 
   if (!pendown)
@@ -834,7 +834,7 @@ static int sam_tsd_open(struct file *filep)
   uint8_t tmp;
   int ret;
 
-  ivdbg("crefs: %d\n", priv->crefs);
+  iinfo("crefs: %d\n", priv->crefs);
 
   /* Get exclusive access to the device structures */
 
@@ -883,7 +883,7 @@ static int sam_tsd_close(struct file *filep)
   FAR struct inode *inode = filep->f_inode;
   FAR struct sam_tsd_s *priv = inode->i_private;
 
-  ivdbg("crefs: %d\n", priv->crefs);
+  iinfo("crefs: %d\n", priv->crefs);
 
   /* Get exclusive access to the ADC device */
 
@@ -919,7 +919,7 @@ static ssize_t sam_tsd_read(struct file *filep, char *buffer, size_t len)
   struct sam_sample_s sample;
   int ret;
 
-  ivdbg("buffer:%p len:%d\n", buffer, len);
+  iinfo("buffer:%p len:%d\n", buffer, len);
   DEBUGASSERT(filep);
   inode = filep->f_inode;
 
@@ -954,7 +954,7 @@ static ssize_t sam_tsd_read(struct file *filep, char *buffer, size_t len)
        * option, then just return an error.
        */
 
-      ivdbg("Sample data is not available\n");
+      iinfo("Sample data is not available\n");
       if (filep->f_oflags & O_NONBLOCK)
         {
           ret = -EAGAIN;
@@ -1018,16 +1018,16 @@ static ssize_t sam_tsd_read(struct file *filep, char *buffer, size_t len)
       report->point[0].flags  = TSD_PENMOVE;
     }
 
-  ivdbg("  id:      %d\n", report->point[0].id);
-  ivdbg("  flags:   %02x\n", report->point[0].flags);
-  ivdbg("  x:       %d\n", report->point[0].x);
-  ivdbg("  y:       %d\n", report->point[0].y);
+  iinfo("  id:      %d\n", report->point[0].id);
+  iinfo("  flags:   %02x\n", report->point[0].flags);
+  iinfo("  x:       %d\n", report->point[0].x);
+  iinfo("  y:       %d\n", report->point[0].y);
 
   ret = SIZEOF_TOUCH_SAMPLE_S(1);
 
 errout:
   sam_adc_unlock(priv->adc);
-  ivdbg("Returning: %d\n", ret);
+  iinfo("Returning: %d\n", ret);
   return (ssize_t)ret;
 }
 
@@ -1041,7 +1041,7 @@ static int sam_tsd_ioctl(struct file *filep, int cmd, unsigned long arg)
   struct sam_tsd_s *priv;
   int ret;
 
-  ivdbg("cmd: %d arg: %ld\n", cmd, arg);
+  iinfo("cmd: %d arg: %ld\n", cmd, arg);
   DEBUGASSERT(filep);
   inode = filep->f_inode;
 
@@ -1077,7 +1077,7 @@ static int sam_tsd_poll(struct file *filep, struct pollfd *fds, bool setup)
   int ret = OK;
   int i;
 
-  ivdbg("setup: %d\n", (int)setup);
+  iinfo("setup: %d\n", (int)setup);
   DEBUGASSERT(filep && fds);
   inode = filep->f_inode;
 
@@ -1655,7 +1655,7 @@ int sam_tsd_register(struct sam_adc_s *adc, int minor)
   char devname[DEV_NAMELEN];
   int ret;
 
-  ivdbg("minor: %d\n", minor);
+  iinfo("minor: %d\n", minor);
 
   /* Debug-only sanity checks */
 
@@ -1674,7 +1674,7 @@ int sam_tsd_register(struct sam_adc_s *adc, int minor)
   /* Register the device as an input device */
 
   (void)snprintf(devname, DEV_NAMELEN, DEV_FORMAT, minor);
-  ivdbg("Registering %s\n", devname);
+  iinfo("Registering %s\n", devname);
 
   ret = register_driver(devname, &g_tsdops, 0666, priv);
   if (ret < 0)
diff --git a/arch/arm/src/sama5/sam_twi.c b/arch/arm/src/sama5/sam_twi.c
index 72b9358b65..d430898dde 100644
--- a/arch/arm/src/sama5/sam_twi.c
+++ b/arch/arm/src/sama5/sam_twi.c
@@ -128,14 +128,14 @@
 
 #ifdef CONFIG_DEBUG_I2C
 #  define i2cdbg    dbg
-#  define i2cvdbg   vdbg
+#  define i2cinfo   info
 #  define i2clldbg  lldbg
-#  define i2cllvdbg llvdbg
+#  define i2cllinfo llinfo
 #else
 #  define i2cdbg(x...)
-#  define i2cvdbg(x...)
+#  define i2cinfo(x...)
 #  define i2clldbg(x...)
-#  define i2cllvdbg(x...)
+#  define i2cllinfo(x...)
 #endif
 
 /****************************************************************************
@@ -514,9 +514,9 @@ static int twi_wait(struct twi_dev_s *priv, unsigned int size)
 
   do
     {
-      i2cvdbg("TWI%d Waiting...\n", priv->attr->twi);
+      i2cinfo("TWI%d Waiting...\n", priv->attr->twi);
       twi_takesem(&priv->waitsem);
-      i2cvdbg("TWI%d Awakened with result: %d\n",
+      i2cinfo("TWI%d Awakened with result: %d\n",
               priv->attr->twi, priv->result);
     }
   while (priv->result == -EBUSY);
@@ -574,7 +574,7 @@ static int twi_interrupt(struct twi_dev_s *priv)
   imr     = twi_getrel(priv, SAM_TWI_IMR_OFFSET);
   pending = sr & imr;
 
-  i2cllvdbg("TWI%d pending: %08x\n", priv->attr->twi, pending);
+  i2cllinfo("TWI%d pending: %08x\n", priv->attr->twi, pending);
 
   /* Byte received */
 
@@ -841,7 +841,7 @@ static int twi_transfer(FAR struct i2c_master_s *dev,
   int ret;
 
   DEBUGASSERT(dev != NULL && msgs != NULL && count > 0);
-  i2cvdbg("TWI%d count: %d\n", priv->attr->twi, count);
+  i2cinfo("TWI%d count: %d\n", priv->attr->twi, count);
 
   /* Calculate the total transfer size so that we can calculate a reasonable
    * timeout value.
@@ -1127,7 +1127,7 @@ static void twi_hw_initialize(struct twi_dev_s *priv, uint32_t frequency)
   uint32_t regval;
   uint32_t mck;
 
-  i2cvdbg("TWI%d Initializing\n", priv->attr->twi);
+  i2cinfo("TWI%d Initializing\n", priv->attr->twi);
 
   /* Configure PIO pins */
 
@@ -1228,7 +1228,7 @@ struct i2c_master_s *sam_i2cbus_initialize(int bus)
   irqstate_t flags;
   int ret;
 
-  i2cvdbg("Initializing TWI%d\n", bus);
+  i2cinfo("Initializing TWI%d\n", bus);
 
 #ifdef CONFIG_SAMA5_TWI0
   if (bus == 0)
@@ -1347,7 +1347,7 @@ int sam_i2cbus_uninitialize(FAR struct i2c_master_s *dev)
 {
   struct twi_dev_s *priv = (struct twi_dev_s *) dev;
 
-  i2cvdbg("TWI%d Un-initializing\n", priv->attr->twi);
+  i2cinfo("TWI%d Un-initializing\n", priv->attr->twi);
 
   /* Disable TWI interrupts */
 
diff --git a/arch/arm/src/sama5/sam_udphs.c b/arch/arm/src/sama5/sam_udphs.c
index 06c2cf2fed..72d8bb8241 100644
--- a/arch/arm/src/sama5/sam_udphs.c
+++ b/arch/arm/src/sama5/sam_udphs.c
@@ -1357,7 +1357,7 @@ static int sam_req_write(struct sam_usbdev_s *priv, struct sam_ep_s *privep)
           return -ENOENT;
         }
 
-      ullvdbg("epno=%d req=%p: len=%d xfrd=%d inflight=%d zlpneeded=%d\n",
+      ullinfo("epno=%d req=%p: len=%d xfrd=%d inflight=%d zlpneeded=%d\n",
               epno, privreq, privreq->req.len, privreq->req.xfrd,
               privreq->inflight, privep->zlpneeded);
 
@@ -1600,7 +1600,7 @@ static int sam_req_read(struct sam_usbdev_s *priv, struct sam_ep_s *privep,
           return -ENOENT;
         }
 
-      ullvdbg("EP%d: len=%d xfrd=%d\n",
+      ullinfo("EP%d: len=%d xfrd=%d\n",
               epno, privreq->req.len, privreq->req.xfrd);
 
       /* Ignore any attempt to receive a zero length packet */
@@ -1885,7 +1885,7 @@ static void sam_ep0_setup(struct sam_usbdev_s *priv)
   index.w = GETUINT16(priv->ctrl.index);
   len.w   = GETUINT16(priv->ctrl.len);
 
-  ullvdbg("SETUP: type=%02x req=%02x value=%04x index=%04x len=%04x\n",
+  ullinfo("SETUP: type=%02x req=%02x value=%04x index=%04x len=%04x\n",
           priv->ctrl.type, priv->ctrl.req, value.w, index.w, len.w);
 
   /* Dispatch any non-standard requests */
@@ -2049,7 +2049,7 @@ static void sam_ep0_setup(struct sam_usbdev_s *priv)
           {
             /* Special case recipient=device test mode */
 
-            ullvdbg("test mode: %d\n", index.w);
+            ullinfo("test mode: %d\n", index.w);
           }
         else if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) != USB_REQ_RECIPIENT_ENDPOINT)
           {
@@ -2349,7 +2349,7 @@ static void sam_dma_interrupt(struct sam_usbdev_s *priv, int epno)
   /* Get the result of the DMA operation */
 
   dmastatus = sam_getreg(SAM_UDPHS_DMASTATUS(epno));
-  uvdbg("DMA%d DMASTATUS: %08x\n", epno, dmastatus);
+  uinfo("DMA%d DMASTATUS: %08x\n", epno, dmastatus);
 
   /* Disable DMA interrupt to avoid receiving 2 (B_EN and TR_EN) */
 
@@ -3220,7 +3220,7 @@ static int sam_ep_configure_internal(struct sam_ep_s *privep,
   uint8_t nbtrans;
   bool dirin;
 
-  uvdbg("len: %02x type: %02x addr: %02x attr: %02x "
+  uinfo("len: %02x type: %02x addr: %02x attr: %02x "
         "maxpacketsize: %02x %02x interval: %02x\n",
         desc->len, desc->type, desc->addr, desc->attr,
         desc->mxpacketsize[0],  desc->mxpacketsize[1],
diff --git a/arch/arm/src/sama5/sam_wdt.c b/arch/arm/src/sama5/sam_wdt.c
index d14f45c198..8e1141543a 100644
--- a/arch/arm/src/sama5/sam_wdt.c
+++ b/arch/arm/src/sama5/sam_wdt.c
@@ -88,10 +88,10 @@
 
 #ifdef CONFIG_DEBUG_WATCHDOG
 #  define wddbg    lldbg
-#  define wdvdbg   llvdbg
+#  define wdinfo   llinfo
 #else
 #  define wddbg(x...)
-#  define wdvdbg(x...)
+#  define wdinfo(x...)
 #endif
 
 /****************************************************************************
@@ -315,7 +315,7 @@ static int sam_start(FAR struct watchdog_lowerhalf_s *lower)
    * timer with the newly programmed mode parameters.
    */
 
-  wdvdbg("Entry\n");
+  wdinfo("Entry\n");
   return priv->started ? OK : -ENOSYS;
 }
 
@@ -343,7 +343,7 @@ static int sam_stop(FAR struct watchdog_lowerhalf_s *lower)
    * timer with the newly programmed mode parameters.
    */
 
-  wdvdbg("Entry\n");
+  wdinfo("Entry\n");
   return -ENOSYS;
 }
 
@@ -366,7 +366,7 @@ static int sam_stop(FAR struct watchdog_lowerhalf_s *lower)
 
 static int sam_keepalive(FAR struct watchdog_lowerhalf_s *lower)
 {
-  wdvdbg("Entry\n");
+  wdinfo("Entry\n");
 
   /* Write WDT_CR_WDRSTT to the WDT CR regiser (along with the KEY value)
    * will restart the watchdog timer.
@@ -397,7 +397,7 @@ static int sam_getstatus(FAR struct watchdog_lowerhalf_s *lower,
 {
   FAR struct sam_lowerhalf_s *priv = (FAR struct sam_lowerhalf_s *)lower;
 
-  wdvdbg("Entry\n");
+  wdinfo("Entry\n");
   DEBUGASSERT(priv);
 
   /* Return the status bit */
@@ -426,10 +426,10 @@ static int sam_getstatus(FAR struct watchdog_lowerhalf_s *lower,
 
   status->timeleft = 0;
 
-  wdvdbg("Status     :\n");
-  wdvdbg("  flags    : %08x\n", status->flags);
-  wdvdbg("  timeout  : %d\n", status->timeout);
-  wdvdbg("  timeleft : %d\n", status->timeleft);
+  wdinfo("Status     :\n");
+  wdinfo("  flags    : %08x\n", status->flags);
+  wdinfo("  timeout  : %d\n", status->timeout);
+  wdinfo("  timeleft : %d\n", status->timeleft);
   return OK;
 }
 
@@ -457,7 +457,7 @@ static int sam_settimeout(FAR struct watchdog_lowerhalf_s *lower,
   uint32_t regval;
 
   DEBUGASSERT(priv);
-  wdvdbg("Entry: timeout=%d\n", timeout);
+  wdinfo("Entry: timeout=%d\n", timeout);
 
   /* Can this timeout be represented? */
 
@@ -496,7 +496,7 @@ static int sam_settimeout(FAR struct watchdog_lowerhalf_s *lower,
 
   priv->reload = reload;
 
-  wdvdbg("reload=%d timout: %d->%d\n",
+  wdinfo("reload=%d timout: %d->%d\n",
          reload, timeout, priv->timeout);
 
   /* Set the WDT_MR according to calculated value
@@ -541,7 +541,7 @@ static int sam_settimeout(FAR struct watchdog_lowerhalf_s *lower,
 
   priv->started = true;
 
-  wdvdbg("Setup: CR: %08x MR: %08x SR: %08x\n",
+  wdinfo("Setup: CR: %08x MR: %08x SR: %08x\n",
          sam_getreg(SAM_WDT_CR), sam_getreg(SAM_WDT_MR),
          sam_getreg(SAM_WDT_SR));
 
@@ -582,7 +582,7 @@ static xcpt_t sam_capture(FAR struct watchdog_lowerhalf_s *lower,
   xcpt_t oldhandler;
 
   DEBUGASSERT(priv);
-  wdvdbg("Entry: handler=%p\n", handler);
+  wdinfo("Entry: handler=%p\n", handler);
 
   /* Get the old handler return value */
 
@@ -636,7 +636,7 @@ static xcpt_t sam_capture(FAR struct watchdog_lowerhalf_s *lower,
 static int sam_ioctl(FAR struct watchdog_lowerhalf_s *lower, int cmd,
                     unsigned long arg)
 {
-  wdvdbg("cmd=%d arg=%ld\n", cmd, arg);
+  wdinfo("cmd=%d arg=%ld\n", cmd, arg);
 
   /* No ioctls are supported */
 
@@ -667,7 +667,7 @@ int sam_wdt_initialize(void)
 {
   FAR struct sam_lowerhalf_s *priv = &g_wdtdev;
 
-  wdvdbg("Entry: CR: %08x MR: %08x SR: %08x\n",
+  wdinfo("Entry: CR: %08x MR: %08x SR: %08x\n",
          sam_getreg(SAM_WDT_CR), sam_getreg(SAM_WDT_MR),
          sam_getreg(SAM_WDT_SR));
 
diff --git a/arch/arm/src/sama5/sam_xdmac.c b/arch/arm/src/sama5/sam_xdmac.c
index bb4ce4e1dd..77301c5c43 100644
--- a/arch/arm/src/sama5/sam_xdmac.c
+++ b/arch/arm/src/sama5/sam_xdmac.c
@@ -1957,7 +1957,7 @@ void sam_dmainitialize(struct sam_xdmac_s *xdmac)
 void weak_function up_dmainitialize(void)
 {
 #ifdef CONFIG_SAMA5_XDMAC0
-  dmallvdbg("Initialize XDMAC0\n");
+  dmallinfo("Initialize XDMAC0\n");
 
   /* Enable peripheral clock */
 
@@ -1977,7 +1977,7 @@ void weak_function up_dmainitialize(void)
 #endif
 
 #ifdef CONFIG_SAMA5_XDMAC1
-  dmallvdbg("Initialize XDMAC1\n");
+  dmallinfo("Initialize XDMAC1\n");
 
   /* Enable peripheral clock */
 
@@ -2083,7 +2083,7 @@ DMA_HANDLE sam_dmachannel(uint8_t dmacno, uint32_t chflags)
 
   if (xdmach)
     {
-      dmavdbg("XDMAC%d CH%d: chflags: %08x returning xdmach: %p\n",
+      dmainfo("XDMAC%d CH%d: chflags: %08x returning xdmach: %p\n",
               (int)dmacno, xdmach->chan, (int)chflags, xdmach);
     }
   else
@@ -2119,13 +2119,13 @@ void sam_dmaconfig(DMA_HANDLE handle, uint32_t chflags)
   xdmach->flags = chflags;
 
 #if defined(CONFIG_SAMA5_XDMAC0) && defined(CONFIG_SAMA5_XDMAC1)
-  dmavdbg("XDMAC%d CH%d: chflags: %08x\n",
+  dmainfo("XDMAC%d CH%d: chflags: %08x\n",
           xdmach->xdmac, xdmach->chan, (int)chflags);
 #elif defined(CONFIG_SAMA5_XDMAC0)
-  dmavdbg("XDMAC0 CH%d: chflags: %08x\n",
+  dmainfo("XDMAC0 CH%d: chflags: %08x\n",
           xdmach->chan, (int)chflags);
 #else
-  dmavdbg("XDMAC1 CH%d: chflags: %08x\n",
+  dmainfo("XDMAC1 CH%d: chflags: %08x\n",
           xdmach->chan, (int)chflags);
 #endif
 }
@@ -2148,7 +2148,7 @@ void sam_dmafree(DMA_HANDLE handle)
   struct sam_xdmach_s *xdmach = (struct sam_xdmach_s *)handle;
   struct sam_xdmac_s *xdmac;
 
-  dmavdbg("xdmach: %p\n", xdmach);
+  dmainfo("xdmach: %p\n", xdmach);
   DEBUGASSERT((xdmach != NULL) && (xdmach->inuse));
 
   xdmac = sam_controller(xdmach);
@@ -2186,10 +2186,10 @@ int sam_dmatxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr,
   size_t remaining;
   int ret = OK;
 
-  dmavdbg("xdmach: %p paddr: %08x maddr: %08x nbytes: %d\n",
+  dmainfo("xdmach: %p paddr: %08x maddr: %08x nbytes: %d\n",
           xdmach, (int)paddr, (int)maddr, (int)nbytes);
   DEBUGASSERT(xdmach);
-  dmavdbg("llhead: %p lltail: %p\n", xdmach->llhead, xdmach->lltail);
+  dmainfo("llhead: %p lltail: %p\n", xdmach->llhead, xdmach->lltail);
 
   /* The maximum transfer size in bytes depends upon the maximum number of
    * transfers and the number of bytes per transfer.
@@ -2265,10 +2265,10 @@ int sam_dmarxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr,
   size_t remaining;
   int ret = OK;
 
-  dmavdbg("xdmach: %p paddr: %08x maddr: %08x nbytes: %d\n",
+  dmainfo("xdmach: %p paddr: %08x maddr: %08x nbytes: %d\n",
           xdmach, (int)paddr, (int)maddr, (int)nbytes);
   DEBUGASSERT(xdmach);
-  dmavdbg("llhead: %p lltail: %p\n", xdmach->llhead, xdmach->lltail);
+  dmainfo("llhead: %p lltail: %p\n", xdmach->llhead, xdmach->lltail);
 
   /* The maximum transfer size in bytes depends upon the maximum number of
    * transfers and the number of bytes per transfer.
@@ -2340,7 +2340,7 @@ int sam_dmastart(DMA_HANDLE handle, dma_callback_t callback, void *arg)
   struct sam_xdmach_s *xdmach = (struct sam_xdmach_s *)handle;
   int ret = -EINVAL;
 
-  dmavdbg("xdmach: %p callback: %p arg: %p\n", xdmach, callback, arg);
+  dmainfo("xdmach: %p callback: %p arg: %p\n", xdmach, callback, arg);
   DEBUGASSERT(xdmach != NULL);
 
   /* Verify that the DMA has been setup (i.e., at least one entry in the
@@ -2384,7 +2384,7 @@ void sam_dmastop(DMA_HANDLE handle)
   struct sam_xdmach_s *xdmach = (struct sam_xdmach_s *)handle;
   irqstate_t flags;
 
-  dmavdbg("xdmach: %p\n", xdmach);
+  dmainfo("xdmach: %p\n", xdmach);
   DEBUGASSERT(xdmach != NULL);
 
   flags = enter_critical_section();
diff --git a/arch/arm/src/samdl/sam_dmac.c b/arch/arm/src/samdl/sam_dmac.c
index de5004f2d7..4eafd93790 100644
--- a/arch/arm/src/samdl/sam_dmac.c
+++ b/arch/arm/src/samdl/sam_dmac.c
@@ -769,7 +769,7 @@ static int sam_rxbuffer(struct sam_dmach_s *dmach, uint32_t paddr,
 
 void weak_function up_dmainitialize(void)
 {
-  dmallvdbg("Initialize DMAC\n");
+  dmallinfo("Initialize DMAC\n");
   int i;
 
   /* Initialize global semaphores */
@@ -888,7 +888,7 @@ DMA_HANDLE sam_dmachannel(uint32_t chflags)
 
   sam_givechsem();
 
-  dmavdbg("chflags: %08x returning dmach: %p\n",  (int)chflags, dmach);
+  dmainfo("chflags: %08x returning dmach: %p\n",  (int)chflags, dmach);
   return (DMA_HANDLE)dmach;
 }
 
@@ -914,7 +914,7 @@ void sam_dmaconfig(DMA_HANDLE handle, uint32_t chflags)
 
   /* Set the new DMA channel flags. */
 
-  dmavdbg("chflags: %08x\n",  (int)chflags);
+  dmainfo("chflags: %08x\n",  (int)chflags);
   dmach->dc_flags = chflags;
 }
 
@@ -935,7 +935,7 @@ void sam_dmafree(DMA_HANDLE handle)
 {
   struct sam_dmach_s *dmach = (struct sam_dmach_s *)handle;
 
-  dmavdbg("dmach: %p\n", dmach);
+  dmainfo("dmach: %p\n", dmach);
   DEBUGASSERT((dmach != NULL) && (dmach->dc_inuse));
 
   /* Mark the channel no longer in use.  Clearing the inuse flag is an atomic
@@ -965,12 +965,12 @@ int sam_dmatxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr,
   size_t maxtransfer;
   int ret = OK;
 
-  dmavdbg("dmach: %p paddr: %08x maddr: %08x nbytes: %d\n",
+  dmainfo("dmach: %p paddr: %08x maddr: %08x nbytes: %d\n",
           dmach, (int)paddr, (int)maddr, (int)nbytes);
   DEBUGASSERT(dmach);
 
 #if CONFIG_SAMDL_DMAC_NDESC > 0
-  dmavdbg("dc_head: %p dc_tail: %p\n", dmach->dc_head, dmach->dc_tail);
+  dmainfo("dc_head: %p dc_tail: %p\n", dmach->dc_head, dmach->dc_tail);
 #endif
 
   /* The maximum transfer size in bytes depends upon the maximum number of
@@ -1039,12 +1039,12 @@ int sam_dmarxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr,
   size_t maxtransfer;
   int ret = OK;
 
-  dmavdbg("dmach: %p paddr: %08x maddr: %08x nbytes: %d\n",
+  dmainfo("dmach: %p paddr: %08x maddr: %08x nbytes: %d\n",
           dmach, (int)paddr, (int)maddr, (int)nbytes);
   DEBUGASSERT(dmach);
 
 #if CONFIG_SAMDL_DMAC_NDESC > 0
-  dmavdbg("dc_head: %p dc_tail: %p\n", dmach->dc_head, dmach->dc_tail);
+  dmainfo("dc_head: %p dc_tail: %p\n", dmach->dc_head, dmach->dc_tail);
 #endif
 
   /* The maximum transfer size in bytes depends upon the maximum number of
@@ -1115,7 +1115,7 @@ int sam_dmastart(DMA_HANDLE handle, dma_callback_t callback, void *arg)
   uint8_t memqos;
   int ret = -EINVAL;
 
-  dmavdbg("dmach: %p callback: %p arg: %p\n", dmach, callback, arg);
+  dmainfo("dmach: %p callback: %p arg: %p\n", dmach, callback, arg);
   DEBUGASSERT(dmach != NULL && dmach->dc_chan < SAMDL_NDMACHAN);
   head = &g_base_desc[dmach->dc_chan];
 
@@ -1240,7 +1240,7 @@ void sam_dmastop(DMA_HANDLE handle)
   struct sam_dmach_s *dmach = (struct sam_dmach_s *)handle;
   irqstate_t flags;
 
-  dmavdbg("dmach: %p\n", dmach);
+  dmainfo("dmach: %p\n", dmach);
   DEBUGASSERT(dmach != NULL);
 
   flags = enter_critical_section();
diff --git a/arch/arm/src/samdl/sam_idle.c b/arch/arm/src/samdl/sam_idle.c
index be58de12be..b54d8d3a7d 100644
--- a/arch/arm/src/samdl/sam_idle.c
+++ b/arch/arm/src/samdl/sam_idle.c
@@ -99,7 +99,7 @@ static void up_idlepm(void)
 
       /* Perform board-specific, state-dependent logic here */
 
-      llvdbg("newstate= %d oldstate=%d\n", newstate, oldstate);
+      llinfo("newstate= %d oldstate=%d\n", newstate, oldstate);
 
       /* Then force the global state change */
 
diff --git a/arch/arm/src/samdl/sam_spi.c b/arch/arm/src/samdl/sam_spi.c
index 35aa6cfc76..78bc1b9cf3 100644
--- a/arch/arm/src/samdl/sam_spi.c
+++ b/arch/arm/src/samdl/sam_spi.c
@@ -93,13 +93,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /****************************************************************************
@@ -742,16 +742,16 @@ static void spi_putreg32(struct sam_spidev_s *priv, uint32_t regval,
 #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);
-  spivdbg("   CTRLA:%08x CTRLB:%08x DBGCTRL:%02x\n",
+  spiinfo("%s:\n", msg);
+  spiinfo("   CTRLA:%08x CTRLB:%08x DBGCTRL:%02x\n",
           getreg32(priv->base + SAM_SPI_CTRLA_OFFSET),
           getreg32(priv->base + SAM_SPI_CTRLB_OFFSET),
           getreg8(priv->base + SAM_SPI_DBGCTRL_OFFSET));
-  spivdbg("    BAUD:%02x       INTEN:%02x       INTFLAG:%02x\n",
+  spiinfo("    BAUD:%02x       INTEN:%02x       INTFLAG:%02x\n",
           getreg8(priv->base + SAM_SPI_BAUD_OFFSET),
           getreg8(priv->base + SAM_SPI_INTENCLR_OFFSET),
           getreg8(priv->base + SAM_SPI_INTFLAG_OFFSET));
-  spivdbg("  STATUS:%04x      ADDR:%08x\n",
+  spiinfo("  STATUS:%04x      ADDR:%08x\n",
           getreg16(priv->base + SAM_SPI_STATUS_OFFSET),
           getreg32(priv->base + SAM_SPI_ADDR_OFFSET));
 }
@@ -890,7 +890,7 @@ static int spi_lock(struct spi_dev_s *dev, bool lock)
 {
   struct sam_spidev_s *priv = (struct sam_spidev_s *)dev;
 
-  spivdbg("lock=%d\n", lock);
+  spiinfo("lock=%d\n", lock);
   if (lock)
     {
       /* Take the semaphore (perhaps waiting) */
@@ -935,7 +935,7 @@ static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency)
   uint32_t baud;
   uint32_t ctrla;
 
-  spivdbg("sercom=%d frequency=%d\n", priv->sercom, frequency);
+  spiinfo("sercom=%d frequency=%d\n", priv->sercom, frequency);
 
   /* Check if the configured BAUD is within the valid range */
 
@@ -1016,7 +1016,7 @@ static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency)
   priv->frequency = frequency;
   priv->actual    = actual;
 
-  spivdbg("Frequency %d->%d\n", frequency, actual);
+  spiinfo("Frequency %d->%d\n", frequency, actual);
   return actual;
 }
 
@@ -1040,7 +1040,7 @@ static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode)
   struct sam_spidev_s *priv = (struct sam_spidev_s *)dev;
   uint32_t regval;
 
-  spivdbg("sercom=%d mode=%d\n", priv->sercom, mode);
+  spiinfo("sercom=%d mode=%d\n", priv->sercom, mode);
 
   /* Has the mode changed? */
 
@@ -1101,7 +1101,7 @@ static void spi_setbits(struct spi_dev_s *dev, int nbits)
   struct sam_spidev_s *priv = (struct sam_spidev_s *)dev;
   uint32_t regval;
 
-  spivdbg("sercom=%d nbits=%d\n", priv->sercom, nbits);
+  spiinfo("sercom=%d nbits=%d\n", priv->sercom, nbits);
   DEBUGASSERT(priv && nbits > 7 && nbits < 10);
 
   /* Has the number of bits changed? */
@@ -1156,7 +1156,7 @@ static uint16_t spi_send(struct spi_dev_s *dev, uint16_t wd)
   rxbyte = (uint8_t)0;
   spi_exchange(dev, &txbyte, &rxbyte, 1);
 
-  spivdbg("Sent %02x received %02x\n", txbyte, rxbyte);
+  spiinfo("Sent %02x received %02x\n", txbyte, rxbyte);
   return (uint16_t)rxbyte;
 }
 
@@ -1194,7 +1194,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
   uint8_t *prx8;
   uint16_t data;
 
-  spivdbg("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords);
+  spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords);
 
   /* Set up data receive and transmit pointers */
 
@@ -1438,7 +1438,7 @@ struct spi_dev_s *sam_spibus_initialize(int port)
 
   /* Get the port state structure */
 
-  spivdbg("port: %d \n", port);
+  spiinfo("port: %d \n", port);
 
 #ifdef SAMDL_HAVE_SPI0
   if (port == 0)
diff --git a/arch/arm/src/samv7/sam_emac.c b/arch/arm/src/samv7/sam_emac.c
index 4f2384b9cb..e03cd76e6c 100644
--- a/arch/arm/src/samv7/sam_emac.c
+++ b/arch/arm/src/samv7/sam_emac.c
@@ -1379,7 +1379,7 @@ static int sam_transmit(struct sam_emac_s *priv, int qid)
   txhead = xfrq->txhead;
   txdesc = &xfrq->txdesc[txhead];
 
-  nllvdbg("d_len: %d txhead[%d]: %d\n",  dev->d_len, qid, xfrq->txhead);
+  nllinfo("d_len: %d txhead[%d]: %d\n",  dev->d_len, qid, xfrq->txhead);
   sam_dumppacket("Transmit packet", dev->d_buf, dev->d_len);
 
   /* If no free TX descriptor, buffer can't be sent */
@@ -1460,7 +1460,7 @@ static int sam_transmit(struct sam_emac_s *priv, int qid)
 
   if (sam_txfree(priv, qid) < 1)
     {
-      nllvdbg("Disabling RX interrupts\n");
+      nllinfo("Disabling RX interrupts\n");
       sam_putreg(priv, SAM_EMAC_IDR_OFFSET, EMAC_INT_RCOMP);
     }
 
@@ -1646,7 +1646,7 @@ static int sam_recvframe(struct sam_emac_s *priv, int qid)
   arch_invalidate_dcache((uintptr_t)rxdesc,
                          (uintptr_t)rxdesc + sizeof(struct emac_rxdesc_s));
 
-  nllvdbg("Entry rxndx[%d]: %d\n", qid, rxndx);
+  nllinfo("Entry rxndx[%d]: %d\n", qid, rxndx);
 
   while ((rxdesc->addr & EMACRXD_ADDR_OWNER) != 0)
     {
@@ -1709,7 +1709,7 @@ static int sam_recvframe(struct sam_emac_s *priv, int qid)
         {
           if (rxndx == xfrq->rxndx)
             {
-              nllvdbg("ERROR: No EOF (Invalid or buffers too small)\n");
+              nllinfo("ERROR: No EOF (Invalid or buffers too small)\n");
               do
                 {
                   /* Give ownership back to the EMAC */
@@ -1767,7 +1767,7 @@ static int sam_recvframe(struct sam_emac_s *priv, int qid)
               /* Frame size from the EMAC */
 
               dev->d_len = (rxdesc->status & EMACRXD_STA_FRLEN_MASK);
-              nllvdbg("packet %d-%d (%d)\n", xfrq->rxndx, rxndx, dev->d_len);
+              nllinfo("packet %d-%d (%d)\n", xfrq->rxndx, rxndx, dev->d_len);
 
               /* All data have been copied in the application frame buffer,
                * release the RX descriptor(s).  Loop until all descriptors
@@ -1801,7 +1801,7 @@ static int sam_recvframe(struct sam_emac_s *priv, int qid)
                * all of the data.
                */
 
-              nllvdbg("rxndx: %d d_len: %d\n",
+              nllinfo("rxndx: %d d_len: %d\n",
                       xfrq->rxndx, dev->d_len);
               if (pktlen < dev->d_len)
                 {
@@ -1854,7 +1854,7 @@ static int sam_recvframe(struct sam_emac_s *priv, int qid)
   /* No packet was found */
 
   xfrq->rxndx = rxndx;
-  nllvdbg("Exit rxndx[%d]: %d\n", qid, xfrq->rxndx);
+  nllinfo("Exit rxndx[%d]: %d\n", qid, xfrq->rxndx);
   return -EAGAIN;
 }
 
@@ -1912,7 +1912,7 @@ static void sam_receive(struct sam_emac_s *priv, int qid)
 #ifdef CONFIG_NET_IPv4
       if (BUF->type == HTONS(ETHTYPE_IP))
         {
-          nllvdbg("IPv4 frame\n");
+          nllinfo("IPv4 frame\n");
           NETDEV_RXIPV4(&priv->dev);
 
           /* Handle ARP on input then give the IPv4 packet to the network
@@ -1953,7 +1953,7 @@ static void sam_receive(struct sam_emac_s *priv, int qid)
 #ifdef CONFIG_NET_IPv6
       if (BUF->type == HTONS(ETHTYPE_IP6))
         {
-          nllvdbg("Iv6 frame\n");
+          nllinfo("Iv6 frame\n");
           NETDEV_RXIPV6(&priv->dev);
 
           /* Give the IPv6 packet to the network layer */
@@ -1991,7 +1991,7 @@ static void sam_receive(struct sam_emac_s *priv, int qid)
 #ifdef CONFIG_NET_ARP
       if (BUF->type == htons(ETHTYPE_ARP))
         {
-          nllvdbg("ARP frame\n");
+          nllinfo("ARP frame\n");
           NETDEV_RXARP(&priv->dev);
 
           /* Handle ARP packet */
@@ -2286,7 +2286,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv, int qid)
   imr = sam_getreg(priv, SAM_EMAC_IMR_OFFSET);
   pending = isr & ~(imr | EMAC_INT_UNUSED);
 
-  nllvdbg("isr: %08x pending: %08x\n", isr, pending);
+  nllinfo("isr: %08x pending: %08x\n", isr, pending);
 
   /* Check for the receipt of an RX packet.
    *
@@ -2837,7 +2837,7 @@ static int sam_ifup(struct net_driver_s *dev)
 
   /* Configure the EMAC interface for normal operation. */
 
-  nllvdbg("Initialize the EMAC\n");
+  nllinfo("Initialize the EMAC\n");
   sam_emac_configure(priv);
   sam_queue_configure(priv, EMAC_QUEUE_1);
   sam_queue_configure(priv, EMAC_QUEUE_2);
@@ -2872,11 +2872,11 @@ static int sam_ifup(struct net_driver_s *dev)
     }
 
   while (sam_linkup(priv) == 0);
-  nllvdbg("Link detected \n");
+  nllinfo("Link detected \n");
 
   /* Enable normal MAC operation */
 
-  nllvdbg("Enable normal operation\n");
+  nllinfo("Enable normal operation\n");
 
   /* Set and activate a timer process */
 
@@ -2955,7 +2955,7 @@ static int sam_ifdown(struct net_driver_s *dev)
 
 static inline void sam_txavail_process(FAR struct sam_emac_s *priv)
 {
-  nllvdbg("ifup: %d\n", priv->ifup);
+  nllinfo("ifup: %d\n", priv->ifup);
 
   /* Ignore the notification if the interface is not yet up */
 
@@ -3208,7 +3208,7 @@ static int sam_addmac(struct net_driver_s *dev, const uint8_t *mac)
   unsigned int ndx;
   unsigned int bit;
 
-  nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
           mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
   /* Calculate the 6-bit has table index */
@@ -3281,7 +3281,7 @@ static int sam_rmmac(struct net_driver_s *dev, const uint8_t *mac)
   unsigned int ndx;
   unsigned int bit;
 
-  nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
           mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
   /* Calculate the 6-bit has table index */
@@ -3476,19 +3476,19 @@ static void sam_phydump(struct sam_emac_s *priv)
   regval |= EMAC_NCR_MPE;
   sam_putreg(priv, SAM_EMAC_NCR_OFFSET, regval);
 
-  nllvdbg("%s Registers (Address %02x)\n",
+  nllinfo("%s Registers (Address %02x)\n",
           priv->attr->rmii ? "RMII" : "MII", priv->phyaddr);
 
   sam_phyread(priv, priv->phyaddr, MII_MCR, &phyval);
-  nllvdbg("  MCR:       %04x\n", phyval);
+  nllinfo("  MCR:       %04x\n", phyval);
   sam_phyread(priv, priv->phyaddr, MII_MSR, &phyval);
-  nllvdbg("  MSR:       %04x\n", phyval);
+  nllinfo("  MSR:       %04x\n", phyval);
   sam_phyread(priv, priv->phyaddr, MII_ADVERTISE, &phyval);
-  nllvdbg("  ADVERTISE: %04x\n", phyval);
+  nllinfo("  ADVERTISE: %04x\n", phyval);
   sam_phyread(priv, priv->phyaddr, MII_LPA, &phyval);
-  nllvdbg("  LPR:       %04x\n", phyval);
+  nllinfo("  LPR:       %04x\n", phyval);
   sam_phyread(priv, priv->phyaddr, priv->attr->physr, &phyval);
-  nllvdbg("  PHYSR:     %04x\n", phyval);
+  nllinfo("  PHYSR:     %04x\n", phyval);
 
   /* Disable management port */
 
@@ -3716,7 +3716,7 @@ static int sam_phyreset(struct sam_emac_s *priv)
   int timeout;
   int ret;
 
-  nllvdbg(" sam_phyreset\n");
+  nllinfo(" sam_phyreset\n");
 
   /* Enable management port */
 
@@ -3783,7 +3783,7 @@ static int sam_phyfind(struct sam_emac_s *priv, uint8_t *phyaddr)
   unsigned int offset;
   int ret = -ESRCH;
 
-  nllvdbg("Find a valid PHY address\n");
+  nllinfo("Find a valid PHY address\n");
 
   /* Enable management port */
 
@@ -3828,10 +3828,10 @@ static int sam_phyfind(struct sam_emac_s *priv, uint8_t *phyaddr)
 
   if (ret == OK)
     {
-      nllvdbg("  PHYID1: %04x PHY addr: %d\n", phyval, candidate);
+      nllinfo("  PHYID1: %04x PHY addr: %d\n", phyval, candidate);
       *phyaddr = candidate;
       sam_phyread(priv, candidate, priv->attr->physr, &phyval);
-      nllvdbg("  PHYSR:  %04x PHY addr: %d\n", phyval, candidate);
+      nllinfo("  PHYSR:  %04x PHY addr: %d\n", phyval, candidate);
     }
 
   /* Disable management port */
@@ -4011,7 +4011,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
       goto errout;
     }
 
-  nllvdbg("PHYID1: %04x PHY address: %02x\n", phyid1, priv->phyaddr);
+  nllinfo("PHYID1: %04x PHY address: %02x\n", phyid1, priv->phyaddr);
 
   ret = sam_phyread(priv, priv->phyaddr, MII_PHYID2, &phyid2);
   if (ret < 0)
@@ -4020,15 +4020,15 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
       goto errout;
     }
 
-  nllvdbg("PHYID2: %04x PHY address: %02x\n", phyid2, priv->phyaddr);
+  nllinfo("PHYID2: %04x PHY address: %02x\n", phyid2, priv->phyaddr);
 
   if (phyid1 == priv->attr->msoui &&
      ((phyid2 & MII_PHYID2_OUI_MASK) >> MII_PHYID2_OUI_SHIFT) ==
       (uint16_t)priv->attr->lsoui)
     {
-      nllvdbg("  Vendor Model Number:   %04x\n",
+      nllinfo("  Vendor Model Number:   %04x\n",
              (phyid2 & MII_PHYID2_MODEL_MASK) >> MII_PHYID2_MODEL_SHIFT);
-      nllvdbg("  Model Revision Number: %04x\n",
+      nllinfo("  Model Revision Number: %04x\n",
              (phyid2 & MII_PHYID2_REV_MASK) >> MII_PHYID2_REV_SHIFT);
     }
   else
@@ -4100,7 +4100,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
       goto errout;
     }
 
-  nllvdbg("  MCR: %04x\n", mcr);
+  nllinfo("  MCR: %04x\n", mcr);
 
   /* Check AutoNegotiate complete */
 
@@ -4120,7 +4120,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
         {
           /* Yes.. break out of the loop */
 
-          nllvdbg("AutoNegotiate complete\n");
+          nllinfo("AutoNegotiate complete\n");
           break;
         }
 
@@ -4288,7 +4288,7 @@ static bool sam_linkup(struct sam_emac_s *priv)
 
   /* Start the EMAC transfers */
 
-  nllvdbg("Link is up\n");
+  nllinfo("Link is up\n");
   linkup = true;
 
 errout:
@@ -4480,7 +4480,7 @@ static inline void sam_ethgpioconfig(struct sam_emac_s *priv)
   else
 #endif
     {
-      nvdbg("ERROR: emac=%d\n", priv->attr->emac);
+      ninfo("ERROR: emac=%d\n", priv->attr->emac);
     }
 }
 
@@ -4803,7 +4803,7 @@ static void sam_macaddress(struct sam_emac_s *priv)
   struct net_driver_s *dev = &priv->dev;
   uint32_t regval;
 
-  nllvdbg("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  nllinfo("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
           dev->d_ifname,
           dev->d_mac.ether_addr_octet[0], dev->d_mac.ether_addr_octet[1],
           dev->d_mac.ether_addr_octet[2], dev->d_mac.ether_addr_octet[3],
@@ -4869,7 +4869,7 @@ static void sam_ipv6multicast(struct sam_emac_s *priv)
   mac[4] = tmp16 & 0xff;
   mac[5] = tmp16 >> 8;
 
-  nvdbg("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  ninfo("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n",
         mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
   (void)sam_addmac(dev, mac);
@@ -5006,7 +5006,7 @@ static int sam_emac_configure(struct sam_emac_s *priv)
 {
   uint32_t regval;
 
-  nllvdbg("Entry\n");
+  nllinfo("Entry\n");
 
   /* Enable clocking to the EMAC peripheral */
 
@@ -5270,7 +5270,7 @@ int sam_emac_setmacaddr(int intf, uint8_t mac[6])
   dev = &priv->dev;
   memcpy(dev->d_mac.ether_addr_octet, mac, 6);
 
-  nvdbg("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  ninfo("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
         dev->d_ifname,
         dev->d_mac.ether_addr_octet[0], dev->d_mac.ether_addr_octet[1],
         dev->d_mac.ether_addr_octet[2], dev->d_mac.ether_addr_octet[3],
diff --git a/arch/arm/src/samv7/sam_freerun.c b/arch/arm/src/samv7/sam_freerun.c
index c5eec516dd..b4c438781b 100644
--- a/arch/arm/src/samv7/sam_freerun.c
+++ b/arch/arm/src/samv7/sam_freerun.c
@@ -124,7 +124,7 @@ int sam_freerun_initialize(struct sam_freerun_s *freerun, int chan,
   uint32_t cmr;
   int ret;
 
-  tcvdbg("chan=%d resolution=%d usec\n", chan, resolution);
+  tcinfo("chan=%d resolution=%d usec\n", chan, resolution);
   DEBUGASSERT(freerun && resolution > 0);
 
   /* Get the TC frequency the corresponds to the requested resolution */
@@ -140,7 +140,7 @@ int sam_freerun_initialize(struct sam_freerun_s *freerun, int chan,
       return ret;
     }
 
-  tcvdbg("frequency=%lu, actual=%lu, cmr=%08lx\n",
+  tcinfo("frequency=%lu, actual=%lu, cmr=%08lx\n",
          (unsigned long)frequency, (unsigned long)actual,
          (unsigned long)cmr);
 
@@ -260,7 +260,7 @@ int sam_freerun_counter(struct sam_freerun_s *freerun, struct timespec *ts)
 
   leave_critical_section(flags);
 
-  tcvdbg("counter=%lu (%lu) overflow=%lu, sr=%08lx\n",
+  tcinfo("counter=%lu (%lu) overflow=%lu, sr=%08lx\n",
          (unsigned long)counter,  (unsigned long)verify,
          (unsigned long)overflow, (unsigned long)sr);
 
@@ -280,7 +280,7 @@ int sam_freerun_counter(struct sam_freerun_s *freerun, struct timespec *ts)
   ts->tv_sec  = sec;
   ts->tv_nsec = (usec - (sec * USEC_PER_SEC)) * NSEC_PER_USEC;
 
-  tcvdbg("usec=%llu ts=(%lu, %lu)\n",
+  tcinfo("usec=%llu ts=(%lu, %lu)\n",
           usec, (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec);
 
   return OK;
diff --git a/arch/arm/src/samv7/sam_hsmci.c b/arch/arm/src/samv7/sam_hsmci.c
index ccea194a24..10b0cff4b5 100644
--- a/arch/arm/src/samv7/sam_hsmci.c
+++ b/arch/arm/src/samv7/sam_hsmci.c
@@ -1590,7 +1590,7 @@ static int sam_hsmci_interrupt(struct sam_dev_s *priv)
                 {
                   /* Yes.. Was the error some kind of timeout? */
 
-                  fllvdbg("ERROR: events: %08x SR: %08x\n",
+                  fllinfo("ERROR: events: %08x SR: %08x\n",
                           priv->cmdrmask, enabled);
 
                   if ((pending & HSMCI_RESPONSE_TIMEOUT_ERRORS) != 0)
@@ -2056,7 +2056,7 @@ static int sam_sendcmd(FAR struct sdio_dev_s *dev,
 
   /* Write the fully decorated command to CMDR */
 
-  fvdbg("cmd: %08x arg: %08x regval: %08x\n", cmd, arg, regval);
+  finfo("cmd: %08x arg: %08x regval: %08x\n", cmd, arg, regval);
   sam_putreg(priv, regval, SAM_HSMCI_CMDR_OFFSET);
   sam_cmdsample1(priv, SAMPLENDX_AFTER_CMDR);
   return OK;
@@ -2847,7 +2847,7 @@ static void sam_callbackenable(FAR struct sdio_dev_s *dev,
 {
   struct sam_dev_s *priv = (struct sam_dev_s *)dev;
 
-  fvdbg("eventset: %02x\n", eventset);
+  finfo("eventset: %02x\n", eventset);
   DEBUGASSERT(priv != NULL);
 
   priv->cbevents = eventset;
@@ -2883,7 +2883,7 @@ static int sam_registercallback(FAR struct sdio_dev_s *dev,
 
   /* Disable callbacks and register this callback and is argument */
 
-  fvdbg("Register %p(%p)\n", callback, arg);
+  finfo("Register %p(%p)\n", callback, arg);
   DEBUGASSERT(priv != NULL);
 
   priv->cbevents = 0;
@@ -3158,7 +3158,7 @@ static void sam_callback(void *arg)
   /* Is a callback registered? */
 
   DEBUGASSERT(priv != NULL);
-  fvdbg("Callback %p(%p) cbevents: %02x cdstatus: %02x\n",
+  finfo("Callback %p(%p) cbevents: %02x cdstatus: %02x\n",
         priv->callback, priv->cbarg, priv->cbevents, priv->cdstatus);
 
   flags = enter_critical_section();
@@ -3216,7 +3216,7 @@ static void sam_callback(void *arg)
           fdbg("ERROR: Failed to cancel work: %d\n", ret);
         }
 
-      fllvdbg("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg);
+      fllinfo("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg);
       ret = work_queue(LPWORK, &priv->cbwork, (worker_t)priv->callback,
                        priv->cbarg, 0);
       if (ret < 0)
@@ -3261,7 +3261,7 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno)
    * for now, an* HSMCI peripheral does correspond to a slot.
    */
 
-  fvdbg("slotno: %d\n", slotno);
+  finfo("slotno: %d\n", slotno);
 
 #ifdef CONFIG_SAMV7_HSMCI0
   if (slotno == 0)
@@ -3344,7 +3344,7 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno)
       return NULL;
     }
 
-  fvdbg("priv: %p base: %08x hsmci: %d pid: %d\n",
+  finfo("priv: %p base: %08x hsmci: %d pid: %d\n",
         priv, priv->base, priv->hsmci, pid);
 
   /* Initialize the HSMCI slot structure */
@@ -3414,7 +3414,7 @@ void sdio_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot)
       priv->cdstatus &= ~SDIO_STATUS_PRESENT;
     }
 
-  fllvdbg("cdstatus OLD: %02x NEW: %02x\n", cdstatus, priv->cdstatus);
+  fllinfo("cdstatus OLD: %02x NEW: %02x\n", cdstatus, priv->cdstatus);
 
   /* Perform any requested callback if the status has changed */
 
@@ -3459,7 +3459,7 @@ void sdio_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect)
       priv->cdstatus &= ~SDIO_STATUS_WRPROTECTED;
     }
 
-  fvdbg("cdstatus: %02x\n", priv->cdstatus);
+  finfo("cdstatus: %02x\n", priv->cdstatus);
   leave_critical_section(flags);
 }
 
diff --git a/arch/arm/src/samv7/sam_mcan.c b/arch/arm/src/samv7/sam_mcan.c
index f7b9e31592..15c9104781 100644
--- a/arch/arm/src/samv7/sam_mcan.c
+++ b/arch/arm/src/samv7/sam_mcan.c
@@ -795,9 +795,9 @@
 
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
-#  define canvdbg   vdbg
+#  define caninfo   info
 #  define canlldbg  lldbg
-#  define canllvdbg llvdbg
+#  define canllinfo llinfo
 
 #  ifdef CONFIG_SAMV7_MCAN_REGDEBUG
 #    define canregdbg lldbg
@@ -807,9 +807,9 @@
 
 #else
 #  define candbg(x...)
-#  define canvdbg(x...)
+#  define caninfo(x...)
 #  define canlldbg(x...)
-#  define canllvdbg(x...)
+#  define canllinfo(x...)
 #  define canregdbg(x...)
 #endif
 
@@ -2151,7 +2151,7 @@ static void mcan_reset(FAR struct can_dev_s *dev)
   config = priv->config;
   DEBUGASSERT(config);
 
-  canllvdbg("MCAN%d\n", config->port);
+  canllinfo("MCAN%d\n", config->port);
   UNUSED(config);
 
   /* Get exclusive access to the MCAN peripheral */
@@ -2208,7 +2208,7 @@ static int mcan_setup(FAR struct can_dev_s *dev)
   config = priv->config;
   DEBUGASSERT(config);
 
-  canllvdbg("MCAN%d pid: %d\n", config->port, config->pid);
+  canllinfo("MCAN%d pid: %d\n", config->port, config->pid);
 
   /* Get exclusive access to the MCAN peripheral */
 
@@ -2285,7 +2285,7 @@ static void mcan_shutdown(FAR struct can_dev_s *dev)
   config = priv->config;
   DEBUGASSERT(config);
 
-  canllvdbg("MCAN%d\n", config->port);
+  canllinfo("MCAN%d\n", config->port);
 
   /* Get exclusive access to the MCAN peripheral */
 
@@ -2334,7 +2334,7 @@ static void mcan_rxint(FAR struct can_dev_s *dev, bool enable)
 
   DEBUGASSERT(priv && priv->config);
 
-  canllvdbg("MCAN%d enable: %d\n", priv->config->port, enable);
+  canllinfo("MCAN%d enable: %d\n", priv->config->port, enable);
 
   /* Enable/disable the receive interrupts */
 
@@ -2376,7 +2376,7 @@ static void mcan_txint(FAR struct can_dev_s *dev, bool enable)
 
   DEBUGASSERT(priv && priv->config);
 
-  canllvdbg("MCAN%d enable: %d\n", priv->config->port, enable);
+  canllinfo("MCAN%d enable: %d\n", priv->config->port, enable);
 
   /* Enable/disable the receive interrupts */
 
@@ -2415,7 +2415,7 @@ static int mcan_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg)
   FAR struct sam_mcan_s *priv;
   int ret = -ENOTTY;
 
-  canvdbg("cmd=%04x arg=%lu\n", cmd, arg);
+  caninfo("cmd=%04x arg=%lu\n", cmd, arg);
 
   DEBUGASSERT(dev && dev->cd_priv);
   priv = dev->cd_priv;
@@ -2683,8 +2683,8 @@ static int mcan_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg)
   DEBUGASSERT(priv && priv->config);
   config = priv->config;
 
-  canllvdbg("MCAN%d\n", config->port);
-  canllvdbg("MCAN%d ID: %d DLC: %d\n",
+  canllinfo("MCAN%d\n", config->port);
+  canllinfo("MCAN%d ID: %d DLC: %d\n",
             config->port, msg->cm_hdr.ch_id, msg->cm_hdr.ch_dlc);
 
   /* That that FIFO elements were configured.
@@ -3608,7 +3608,7 @@ static int mcan_hw_initialize(struct sam_mcan_s *priv)
   uint32_t cntr;
   uint32_t cmr;
 
-  canllvdbg("MCAN%d\n", config->port);
+  canllinfo("MCAN%d\n", config->port);
 
   /* Configure MCAN pins */
 
@@ -3883,7 +3883,7 @@ FAR struct can_dev_s *sam_mcan_initialize(int port)
   FAR const struct sam_config_s *config;
   uint32_t regval;
 
-  canvdbg("MCAN%d\n", port);
+  caninfo("MCAN%d\n", port);
 
   /* Select PCK5 clock source and pre-scaler value.  Both MCAN controllers
    * use PCK5 to derive bit rate.
diff --git a/arch/arm/src/samv7/sam_oneshot.c b/arch/arm/src/samv7/sam_oneshot.c
index 76c4ee1a41..bc0fb34015 100644
--- a/arch/arm/src/samv7/sam_oneshot.c
+++ b/arch/arm/src/samv7/sam_oneshot.c
@@ -109,7 +109,7 @@ static void sam_oneshot_handler(TC_HANDLE tch, void *arg, uint32_t sr)
   oneshot_handler_t oneshot_handler;
   void *oneshot_arg;
 
-  tcllvdbg("Expired...\n");
+  tcllinfo("Expired...\n");
   DEBUGASSERT(oneshot && oneshot->handler);
 
   /* The clock was stopped, but not disabled when the RC match occurred.
@@ -166,7 +166,7 @@ int sam_oneshot_initialize(struct sam_oneshot_s *oneshot, int chan,
   uint32_t cmr;
   int ret;
 
-  tcvdbg("chan=%d resolution=%d usec\n", chan, resolution);
+  tcinfo("chan=%d resolution=%d usec\n", chan, resolution);
   DEBUGASSERT(oneshot && resolution > 0);
 
   /* Get the TC frequency the corresponds to the requested resolution */
@@ -182,7 +182,7 @@ int sam_oneshot_initialize(struct sam_oneshot_s *oneshot, int chan,
       return ret;
     }
 
-  tcvdbg("frequency=%lu, actual=%lu, cmr=%08lx\n",
+  tcinfo("frequency=%lu, actual=%lu, cmr=%08lx\n",
          (unsigned long)frequency, (unsigned long)actual,
          (unsigned long)cmr);
 
@@ -261,7 +261,7 @@ int sam_oneshot_start(struct sam_oneshot_s *oneshot, struct sam_freerun_s *freer
   uint64_t regval;
   irqstate_t flags;
 
-  tcvdbg("handler=%p arg=%p, ts=(%lu, %lu)\n",
+  tcinfo("handler=%p arg=%p, ts=(%lu, %lu)\n",
          handler, arg, (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec);
   DEBUGASSERT(oneshot && handler && ts);
 
@@ -272,7 +272,7 @@ int sam_oneshot_start(struct sam_oneshot_s *oneshot, struct sam_freerun_s *freer
     {
       /* Yes.. then cancel it */
 
-      tcvdbg("Already running... cancelling\n");
+      tcinfo("Already running... cancelling\n");
       (void)sam_oneshot_cancel(oneshot, freerun, NULL);
     }
 
@@ -294,7 +294,7 @@ int sam_oneshot_start(struct sam_oneshot_s *oneshot, struct sam_freerun_s *freer
 
   regval = (usec * (uint64_t)sam_tc_divfreq(oneshot->tch)) / USEC_PER_SEC;
 
-  tcvdbg("usec=%llu regval=%08llx\n", usec, regval);
+  tcinfo("usec=%llu regval=%08llx\n", usec, regval);
   DEBUGASSERT(regval <= UINT16_MAX);
 
   /* Set up to receive the callback when the interrupt occurs */
@@ -403,7 +403,7 @@ int sam_oneshot_cancel(struct sam_oneshot_s *oneshot, struct sam_freerun_s *free
    * REVISIT:  This does not appear to be the case.
    */
 
-  tcvdbg("Cancelling...\n");
+  tcinfo("Cancelling...\n");
 
   count = sam_tc_getcounter(oneshot->tch);
   rc    = sam_tc_getregister(oneshot->tch, TC_REGC);
@@ -439,7 +439,7 @@ int sam_oneshot_cancel(struct sam_oneshot_s *oneshot, struct sam_freerun_s *free
        * oneshot timer.
        */
 
-      tcvdbg("rc=%lu count=%lu usec=%lu\n",
+      tcinfo("rc=%lu count=%lu usec=%lu\n",
              (unsigned long)rc, (unsigned long)count, (unsigned long)usec);
 
       /* REVISIT: I am not certain why the timer counter value sometimes
@@ -484,7 +484,7 @@ int sam_oneshot_cancel(struct sam_oneshot_s *oneshot, struct sam_freerun_s *free
           ts->tv_nsec = (unsigned long)nsec;
         }
 
-      tcvdbg("remaining (%lu, %lu)\n",
+      tcinfo("remaining (%lu, %lu)\n",
              (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec);
     }
 
diff --git a/arch/arm/src/samv7/sam_qspi.c b/arch/arm/src/samv7/sam_qspi.c
index 150739dfd4..b08490f248 100644
--- a/arch/arm/src/samv7/sam_qspi.c
+++ b/arch/arm/src/samv7/sam_qspi.c
@@ -156,13 +156,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define qspidbg lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define qspivdbg lldbg
+#    define qspiinfo lldbg
 #  else
-#    define qspivdbg(x...)
+#    define qspiinfo(x...)
 #  endif
 #else
 #  define qspidbg(x...)
-#  define qspivdbg(x...)
+#  define qspiinfo(x...)
 #endif
 
 #define DMA_INITIAL      0
@@ -477,18 +477,18 @@ static inline void qspi_putreg(struct sam_qspidev_s *priv, uint32_t value,
 #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);
-  qspivdbg("    MR:%08x   SR:%08x  IMR:%08x  SCR:%08x\n",
+  qspiinfo("%s:\n", msg);
+  qspiinfo("    MR:%08x   SR:%08x  IMR:%08x  SCR:%08x\n",
           getreg32(priv->base + SAM_QSPI_MR_OFFSET),
           getreg32(priv->base + SAM_QSPI_SR_OFFSET),
           getreg32(priv->base + SAM_QSPI_IMR_OFFSET),
           getreg32(priv->base + SAM_QSPI_SCR_OFFSET));
-  qspivdbg("   IAR:%08x  ICR:%08x  IFR:%08x  SMR:%08x\n",
+  qspiinfo("   IAR:%08x  ICR:%08x  IFR:%08x  SMR:%08x\n",
           getreg32(priv->base + SAM_QSPI_IAR_OFFSET),
           getreg32(priv->base + SAM_QSPI_ICR_OFFSET),
           getreg32(priv->base + SAM_QSPI_IFR_OFFSET),
           getreg32(priv->base + SAM_QSPI_SMR_OFFSET));
-  qspivdbg("  WPCR:%08x WPSR:%08x\n",
+  qspiinfo("  WPCR:%08x WPSR:%08x\n",
           getreg32(priv->base + SAM_QSPI_WPCR_OFFSET),
           getreg32(priv->base + SAM_QSPI_WPSR_OFFSET));
 }
@@ -1078,7 +1078,7 @@ static int qspi_lock(struct qspi_dev_s *dev, bool lock)
 {
   struct sam_qspidev_s *priv = (struct sam_qspidev_s *)dev;
 
-  qspivdbg("lock=%d\n", lock);
+  qspiinfo("lock=%d\n", lock);
   if (lock)
     {
       /* Take the semaphore (perhaps waiting) */
@@ -1128,7 +1128,7 @@ static uint32_t qspi_setfrequency(struct qspi_dev_s *dev, uint32_t frequency)
 #endif
   uint32_t regval;
 
-  qspivdbg("frequency=%d\n", frequency);
+  qspiinfo("frequency=%d\n", frequency);
   DEBUGASSERT(priv);
 
   /* Check if the requested frequency is the same as the frequency selection */
@@ -1215,14 +1215,14 @@ static uint32_t qspi_setfrequency(struct qspi_dev_s *dev, uint32_t frequency)
   /* Calculate the new actual frequency */
 
   actual = SAM_QSPI_CLOCK / scbr;
-  qspivdbg("SCBR=%d actual=%d\n", scbr, actual);
+  qspiinfo("SCBR=%d actual=%d\n", scbr, actual);
 
   /* Save the frequency setting */
 
   priv->frequency = frequency;
   priv->actual    = actual;
 
-  qspivdbg("Frequency %d->%d\n", frequency, actual);
+  qspiinfo("Frequency %d->%d\n", frequency, actual);
   return actual;
 }
 
@@ -1246,7 +1246,7 @@ static void qspi_setmode(struct qspi_dev_s *dev, enum qspi_mode_e mode)
   struct sam_qspidev_s *priv = (struct sam_qspidev_s *)dev;
   uint32_t regval;
 
-  qspivdbg("mode=%d\n", mode);
+  qspiinfo("mode=%d\n", mode);
 
   /* Has the mode changed? */
 
@@ -1288,7 +1288,7 @@ static void qspi_setmode(struct qspi_dev_s *dev, enum qspi_mode_e mode)
         }
 
       qspi_putreg(priv, regval, SAM_QSPI_SCR_OFFSET);
-      qspivdbg("SCR=%08x\n", regval);
+      qspiinfo("SCR=%08x\n", regval);
 
       /* Save the mode so that subsequent re-configurations will be faster */
 
@@ -1316,7 +1316,7 @@ static void qspi_setbits(struct qspi_dev_s *dev, int nbits)
   struct sam_qspidev_s *priv = (struct sam_qspidev_s *)dev;
   uint32_t regval;
 
-  qspivdbg("nbits=%d\n", nbits);
+  qspiinfo("nbits=%d\n", nbits);
   DEBUGASSERT(priv != NULL);
   DEBUGASSERT(nbits >= SAM_QSPI_MINBITS && nbits <= SAM_QSPI_MAXBITS);
 
@@ -1331,7 +1331,7 @@ static void qspi_setbits(struct qspi_dev_s *dev, int nbits)
       regval |= QSPI_MR_NBBITS(nbits);
       qspi_putreg(priv, regval, SAM_QSPI_MR_OFFSET);
 
-      qspivdbg("MR=%08x\n", regval);
+      qspiinfo("MR=%08x\n", regval);
 
       /* Save the selection so the subsequence re-configurations will be faster */
 
@@ -1364,20 +1364,20 @@ static int qspi_command(struct qspi_dev_s *dev,
   DEBUGASSERT(priv != NULL && cmdinfo != NULL);
 
 #ifdef CONFIG_DEBUG_SPI
-  qspivdbg("Transfer:\n");
-  qspivdbg("  flags: %02x\n", cmdinfo->flags);
-  qspivdbg("  cmd: %04x\n", cmdinfo->cmd);
+  qspiinfo("Transfer:\n");
+  qspiinfo("  flags: %02x\n", cmdinfo->flags);
+  qspiinfo("  cmd: %04x\n", cmdinfo->cmd);
 
   if (QSPICMD_ISADDRESS(cmdinfo->flags))
     {
-      qspivdbg("  address/length: %08lx/%d\n",
+      qspiinfo("  address/length: %08lx/%d\n",
               (unsigned long)cmdinfo->addr, cmdinfo->addrlen);
     }
 
   if (QSPICMD_ISDATA(cmdinfo->flags))
     {
-      qspivdbg("  %s Data:\n", QSPICMD_ISWRITE(cmdinfo->flags) ? "Write" : "Read");
-      qspivdbg("    buffer/length: %p/%d\n", cmdinfo->buffer, cmdinfo->buflen);
+      qspiinfo("  %s Data:\n", QSPICMD_ISWRITE(cmdinfo->flags) ? "Write" : "Read");
+      qspiinfo("    buffer/length: %p/%d\n", cmdinfo->buffer, cmdinfo->buflen);
     }
 #endif
 
@@ -1572,13 +1572,13 @@ static int qspi_memory(struct qspi_dev_s *dev,
 
   DEBUGASSERT(priv != NULL && meminfo != NULL);
 
-  qspivdbg("Transfer:\n");
-  qspivdbg("  flags: %02x\n", meminfo->flags);
-  qspivdbg("  cmd: %04x\n", meminfo->cmd);
-  qspivdbg("  address/length: %08lx/%d\n",
+  qspiinfo("Transfer:\n");
+  qspiinfo("  flags: %02x\n", meminfo->flags);
+  qspiinfo("  cmd: %04x\n", meminfo->cmd);
+  qspiinfo("  address/length: %08lx/%d\n",
           (unsigned long)meminfo->addr, meminfo->addrlen);
-  qspivdbg("  %s Data:\n", QSPIMEM_ISWRITE(meminfo->flags) ? "Write" : "Read");
-  qspivdbg("    buffer/length: %p/%d\n", meminfo->buffer, meminfo->buflen);
+  qspiinfo("  %s Data:\n", QSPIMEM_ISWRITE(meminfo->flags) ? "Write" : "Read");
+  qspiinfo("    buffer/length: %p/%d\n", meminfo->buffer, meminfo->buflen);
 
 #ifdef CONFIG_SAMV7_QSPI_DMA
   /* Can we perform DMA?  Should we perform DMA? */
@@ -1746,7 +1746,7 @@ struct qspi_dev_s *sam_qspi_initialize(int intf)
 
   /* The supported SAM parts have only a single QSPI port */
 
-  qspivdbg("intf: %d\n", intf);
+  qspiinfo("intf: %d\n", intf);
   DEBUGASSERT(intf >= 0 && intf < SAMV7_NQSPI);
 
   /* Select the QSPI interface */
diff --git a/arch/arm/src/samv7/sam_rswdt.c b/arch/arm/src/samv7/sam_rswdt.c
index 20ea3c2183..c9f08e444c 100644
--- a/arch/arm/src/samv7/sam_rswdt.c
+++ b/arch/arm/src/samv7/sam_rswdt.c
@@ -88,10 +88,10 @@
 
 #ifdef CONFIG_DEBUG_WATCHDOG
 #  define wddbg    lldbg
-#  define wdvdbg   llvdbg
+#  define wdinfo   llinfo
 #else
 #  define wddbg(x...)
-#  define wdvdbg(x...)
+#  define wdinfo(x...)
 #endif
 
 /****************************************************************************
@@ -315,7 +315,7 @@ static int sam_start(FAR struct watchdog_lowerhalf_s *lower)
    * timer with the newly programmed mode parameters.
    */
 
-  wdvdbg("Entry\n");
+  wdinfo("Entry\n");
   return priv->started ? OK : -ENOSYS;
 }
 
@@ -343,7 +343,7 @@ static int sam_stop(FAR struct watchdog_lowerhalf_s *lower)
    * timer with the newly programmed mode parameters.
    */
 
-  wdvdbg("Entry\n");
+  wdinfo("Entry\n");
   return -ENOSYS;
 }
 
@@ -366,7 +366,7 @@ static int sam_stop(FAR struct watchdog_lowerhalf_s *lower)
 
 static int sam_keepalive(FAR struct watchdog_lowerhalf_s *lower)
 {
-  wdvdbg("Entry\n");
+  wdinfo("Entry\n");
 
   /* Write RSWDT_CR_WDRSTT to the RSWDT CR regiser (along with the KEY value)
    * will restart the watchdog timer.
@@ -397,7 +397,7 @@ static int sam_getstatus(FAR struct watchdog_lowerhalf_s *lower,
 {
   FAR struct sam_lowerhalf_s *priv = (FAR struct sam_lowerhalf_s *)lower;
 
-  wdvdbg("Entry\n");
+  wdinfo("Entry\n");
   DEBUGASSERT(priv);
 
   /* Return the status bit */
@@ -426,10 +426,10 @@ static int sam_getstatus(FAR struct watchdog_lowerhalf_s *lower,
 
   status->timeleft = 0;
 
-  wdvdbg("Status     :\n");
-  wdvdbg("  flags    : %08x\n", status->flags);
-  wdvdbg("  timeout  : %d\n", status->timeout);
-  wdvdbg("  timeleft : %d\n", status->timeleft);
+  wdinfo("Status     :\n");
+  wdinfo("  flags    : %08x\n", status->flags);
+  wdinfo("  timeout  : %d\n", status->timeout);
+  wdinfo("  timeleft : %d\n", status->timeleft);
   return OK;
 }
 
@@ -457,7 +457,7 @@ static int sam_settimeout(FAR struct watchdog_lowerhalf_s *lower,
   uint32_t regval;
 
   DEBUGASSERT(priv);
-  wdvdbg("Entry: timeout=%d\n", timeout);
+  wdinfo("Entry: timeout=%d\n", timeout);
 
   /* Can this timeout be represented? */
 
@@ -496,7 +496,7 @@ static int sam_settimeout(FAR struct watchdog_lowerhalf_s *lower,
 
   priv->reload = reload;
 
-  wdvdbg("reload=%d timout: %d->%d\n",
+  wdinfo("reload=%d timout: %d->%d\n",
          reload, timeout, priv->timeout);
 
   /* Set the RSWDT_MR according to calculated value
@@ -541,7 +541,7 @@ static int sam_settimeout(FAR struct watchdog_lowerhalf_s *lower,
 
   priv->started = true;
 
-  wdvdbg("Setup: CR: %08x MR: %08x SR: %08x\n",
+  wdinfo("Setup: CR: %08x MR: %08x SR: %08x\n",
          sam_getreg(SAM_RSWDT_CR), sam_getreg(SAM_RSWDT_MR),
          sam_getreg(SAM_RSWDT_SR));
 
@@ -582,7 +582,7 @@ static xcpt_t sam_capture(FAR struct watchdog_lowerhalf_s *lower,
   xcpt_t oldhandler;
 
   DEBUGASSERT(priv);
-  wdvdbg("Entry: handler=%p\n", handler);
+  wdinfo("Entry: handler=%p\n", handler);
 
   /* Get the old handler return value */
 
@@ -636,7 +636,7 @@ static xcpt_t sam_capture(FAR struct watchdog_lowerhalf_s *lower,
 static int sam_ioctl(FAR struct watchdog_lowerhalf_s *lower, int cmd,
                     unsigned long arg)
 {
-  wdvdbg("cmd=%d arg=%ld\n", cmd, arg);
+  wdinfo("cmd=%d arg=%ld\n", cmd, arg);
 
   /* No ioctls are supported */
 
@@ -667,7 +667,7 @@ int sam_rswdt_initialize(void)
 {
   FAR struct sam_lowerhalf_s *priv = &g_wdtdev;
 
-  wdvdbg("Entry: CR: %08x MR: %08x SR: %08x\n",
+  wdinfo("Entry: CR: %08x MR: %08x SR: %08x\n",
          sam_getreg(SAM_RSWDT_CR), sam_getreg(SAM_RSWDT_MR),
          sam_getreg(SAM_RSWDT_SR));
 
diff --git a/arch/arm/src/samv7/sam_spi.c b/arch/arm/src/samv7/sam_spi.c
index b03a9dd7c6..454947d572 100644
--- a/arch/arm/src/samv7/sam_spi.c
+++ b/arch/arm/src/samv7/sam_spi.c
@@ -138,13 +138,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 #define DMA_INITIAL      0
@@ -518,17 +518,17 @@ static inline void spi_putreg(struct sam_spidev_s *spi, uint32_t value,
 #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);
-  spivdbg("    MR:%08x   SR:%08x  IMR:%08x\n",
+  spiinfo("%s:\n", msg);
+  spiinfo("    MR:%08x   SR:%08x  IMR:%08x\n",
           getreg32(spi->base + SAM_SPI_MR_OFFSET),
           getreg32(spi->base + SAM_SPI_SR_OFFSET),
           getreg32(spi->base + SAM_SPI_IMR_OFFSET));
-  spivdbg("  CSR0:%08x CSR1:%08x CSR2:%08x CSR3:%08x\n",
+  spiinfo("  CSR0:%08x CSR1:%08x CSR2:%08x CSR3:%08x\n",
           getreg32(spi->base + SAM_SPI_CSR0_OFFSET),
           getreg32(spi->base + SAM_SPI_CSR1_OFFSET),
           getreg32(spi->base + SAM_SPI_CSR2_OFFSET),
           getreg32(spi->base + SAM_SPI_CSR3_OFFSET));
-  spivdbg("  WPCR:%08x WPSR:%08x\n",
+  spiinfo("  WPCR:%08x WPSR:%08x\n",
           getreg32(spi->base + SAM_SPI_WPCR_OFFSET),
           getreg32(spi->base + SAM_SPI_WPSR_OFFSET));
 }
@@ -903,7 +903,7 @@ static int spi_lock(struct spi_dev_s *dev, bool lock)
   struct sam_spics_s *spics = (struct sam_spics_s *)dev;
   struct sam_spidev_s *spi = spi_device(spics);
 
-  spivdbg("lock=%d\n", lock);
+  spiinfo("lock=%d\n", lock);
   if (lock)
     {
       /* Take the semaphore (perhaps waiting) */
@@ -951,10 +951,10 @@ static void spi_select(struct spi_dev_s *dev, enum spi_dev_e devid,
 
   /* Are we selecting or de-selecting the device? */
 
-  spivdbg("selected=%d\n", selected);
+  spiinfo("selected=%d\n", selected);
   if (selected)
     {
-      spivdbg("cs=%d\n", spics->cs);
+      spiinfo("cs=%d\n", spics->cs);
 
       /* Before writing the TDR, the PCS field in the SPI_MR register must be set
        * in order to select a slave.
@@ -1009,7 +1009,7 @@ static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency)
   uint32_t regval;
   unsigned int offset;
 
-  spivdbg("cs=%d frequency=%d\n", spics->cs, frequency);
+  spiinfo("cs=%d frequency=%d\n", spics->cs, frequency);
 
   /* Check if the requested frequency is the same as the frequency selection */
 
@@ -1079,7 +1079,7 @@ static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency)
   /* Calculate the new actual frequency */
 
   actual = SAM_SPI_CLOCK / scbr;
-  spivdbg("csr[offset=%02x]=%08x actual=%d\n", offset, regval, actual);
+  spiinfo("csr[offset=%02x]=%08x actual=%d\n", offset, regval, actual);
 
   /* Save the frequency setting */
 
@@ -1112,7 +1112,7 @@ static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode)
   uint32_t regval;
   unsigned int offset;
 
-  spivdbg("cs=%d mode=%d\n", spics->cs, mode);
+  spiinfo("cs=%d mode=%d\n", spics->cs, mode);
 
   /* Has the mode changed? */
 
@@ -1155,7 +1155,7 @@ static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode)
         }
 
       spi_putreg(spi, regval, offset);
-      spivdbg("csr[offset=%02x]=%08x\n", offset, regval);
+      spiinfo("csr[offset=%02x]=%08x\n", offset, regval);
 
       /* Save the mode so that subsequent re-configurations will be faster */
 
@@ -1185,7 +1185,7 @@ static void spi_setbits(struct spi_dev_s *dev, int nbits)
   uint32_t regval;
   unsigned int offset;
 
-  spivdbg("cs=%d nbits=%d\n", spics->cs, nbits);
+  spiinfo("cs=%d nbits=%d\n", spics->cs, nbits);
   DEBUGASSERT(spics && nbits > 7 && nbits < 17);
 
   /* Has the number of bits changed? */
@@ -1200,7 +1200,7 @@ static void spi_setbits(struct spi_dev_s *dev, int nbits)
       regval |= SPI_CSR_BITS(nbits);
       spi_putreg(spi, regval, offset);
 
-      spivdbg("csr[offset=%02x]=%08x\n", offset, regval);
+      spiinfo("csr[offset=%02x]=%08x\n", offset, regval);
 
       /* Save the selection so the subsequence re-configurations will be faster */
 
@@ -1238,7 +1238,7 @@ static uint16_t spi_send(struct spi_dev_s *dev, uint16_t wd)
   rxbyte = (uint8_t)0;
   spi_exchange(dev, &txbyte, &rxbyte, 1);
 
-  spivdbg("Sent %02x received %02x\n", txbyte, rxbyte);
+  spiinfo("Sent %02x received %02x\n", txbyte, rxbyte);
   return (uint16_t)rxbyte;
 }
 
@@ -1286,7 +1286,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
   uint8_t *rxptr8;
   uint8_t *txptr8;
 
-  spivdbg("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords);
+  spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords);
 
   /* Set up PCS bits */
 
@@ -1432,7 +1432,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
       return;
     }
 
-  spivdbg("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords);
+  spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords);
 
   spics = (struct sam_spics_s *)dev;
   spi = spi_device(spics);
@@ -1751,7 +1751,7 @@ FAR struct spi_dev_s *sam_spibus_initialize(int port)
 
   /* The support SAM parts have only a single SPI port */
 
-  spivdbg("port: %d csno: %d spino: %d\n", port, csno, spino);
+  spiinfo("port: %d csno: %d spino: %d\n", port, csno, spino);
   DEBUGASSERT(csno >= 0 && csno <= SAM_SPI_NCS);
 
 #if defined(CONFIG_SAMV7_SPI0_MASTER) && defined(CONFIG_SAMV7_SPI1_MASTER)
@@ -1934,7 +1934,7 @@ FAR struct spi_dev_s *sam_spibus_initialize(int port)
   spi_putreg(spi, regval, offset);
 
   spics->nbits = 8;
-  spivdbg("csr[offset=%02x]=%08x\n", offset, regval);
+  spiinfo("csr[offset=%02x]=%08x\n", offset, regval);
 
   return &spics->spidev;
 }
diff --git a/arch/arm/src/samv7/sam_spi_slave.c b/arch/arm/src/samv7/sam_spi_slave.c
index 317d7955c4..b2203519cb 100644
--- a/arch/arm/src/samv7/sam_spi_slave.c
+++ b/arch/arm/src/samv7/sam_spi_slave.c
@@ -87,13 +87,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /****************************************************************************
@@ -351,17 +351,17 @@ static void spi_putreg(struct sam_spidev_s *priv, uint32_t value,
 #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);
-  spivdbg("    MR:%08x   SR:%08x  IMR:%08x\n",
+  spiinfo("%s:\n", msg);
+  spiinfo("    MR:%08x   SR:%08x  IMR:%08x\n",
           getreg32(priv->base + SAM_SPI_MR_OFFSET),
           getreg32(priv->base + SAM_SPI_SR_OFFSET),
           getreg32(priv->base + SAM_SPI_IMR_OFFSET));
-  spivdbg("  CSR0:%08x CSR1:%08x CSR2:%08x CSR3:%08x\n",
+  spiinfo("  CSR0:%08x CSR1:%08x CSR2:%08x CSR3:%08x\n",
           getreg32(priv->base + SAM_SPI_CSR0_OFFSET),
           getreg32(priv->base + SAM_SPI_CSR1_OFFSET),
           getreg32(priv->base + SAM_SPI_CSR2_OFFSET),
           getreg32(priv->base + SAM_SPI_CSR3_OFFSET));
-  spivdbg("  WPCR:%08x WPSR:%08x\n",
+  spiinfo("  WPCR:%08x WPSR:%08x\n",
           getreg32(priv->base + SAM_SPI_WPCR_OFFSET),
           getreg32(priv->base + SAM_SPI_WPSR_OFFSET));
 }
@@ -699,7 +699,7 @@ static void spi_setmode(struct sam_spidev_s *priv, enum spi_smode_e mode)
 {
   uint32_t regval;
 
-  spivdbg("mode=%d\n", mode);
+  spiinfo("mode=%d\n", mode);
 
   /* Has the mode changed? */
 
@@ -741,7 +741,7 @@ static void spi_setmode(struct sam_spidev_s *priv, enum spi_smode_e mode)
         }
 
       spi_putreg(priv, regval, SAM_SPI_CSR0_OFFSET);
-      spivdbg("csr0=%08x\n", regval);
+      spiinfo("csr0=%08x\n", regval);
 
       /* Save the mode so that subsequent re-configurations will be faster */
 
@@ -768,7 +768,7 @@ static void spi_setbits(struct sam_spidev_s *priv, int nbits)
 {
   uint32_t regval;
 
-  spivdbg("nbits=%d\n", nbits);
+  spiinfo("nbits=%d\n", nbits);
   DEBUGASSERT(priv && nbits > 7 && nbits < 17);
 
   /* Has the number of bits changed? */
@@ -782,7 +782,7 @@ static void spi_setbits(struct sam_spidev_s *priv, int nbits)
       regval |= SPI_CSR_BITS(nbits);
       spi_putreg(priv, regval, SAM_SPI_CSR0_OFFSET);
 
-      spivdbg("csr0=%08x\n", regval);
+      spiinfo("csr0=%08x\n", regval);
 
       /* Save the selection so the subsequence re-configurations will be faster */
 
@@ -819,7 +819,7 @@ static void spi_bind(struct spi_sctrlr_s *sctrlr,
   struct sam_spidev_s *priv = (struct sam_spidev_s *)sctrlr;
   uint32_t regval;
 
-  spivdbg("sdev=%p mode=%d nbits=%d\n", sdv, mode, nbits);
+  spiinfo("sdev=%p mode=%d nbits=%d\n", sdv, mode, nbits);
 
   DEBUGASSERT(priv != NULL && priv->sdev == NULL && sdev != NULL);
 
@@ -921,7 +921,7 @@ static void spi_unbind(struct spi_sctrlr_s *sctrlr)
   struct sam_spidev_s *priv = (struct sam_spidev_s *)sctrlr;
 
   DEBUGASSERT(priv != NULL);
-  spivdbg("Unbinding %p\n", priv->sdev);
+  spiinfo("Unbinding %p\n", priv->sdev);
 
   DEBUGASSERT(priv->sdev != NULL);
 
@@ -978,7 +978,7 @@ static int spi_enqueue(struct spi_sctrlr_s *sctrlr, uint16_t data)
   int next;
   int ret;
 
-  spivdbg("data=%04x\n", data);
+  spiinfo("data=%04x\n", data);
   DEBUGASSERT(priv != NULL && priv->sdev != NULL);
 
   /* Get exclusive access to the SPI device */
@@ -1095,7 +1095,7 @@ static void spi_qflush(struct spi_sctrlr_s *sctrlr)
   struct sam_spidev_s *priv = (struct sam_spidev_s *)sctrlr;
   irqstate_t flags;
 
-  spivdbg("data=%04x\n", data);
+  spiinfo("data=%04x\n", data);
 
   DEBUGASSERT(priv != NULL && priv->sdev != NULL);
 
@@ -1140,7 +1140,7 @@ struct spi_sctrlr_s *sam_spi_slave_initialize(int port)
 
   /* The support SAM parts have only a single SPI port */
 
-  spivdbg("port: %d spino: %d\n", port, spino);
+  spiinfo("port: %d spino: %d\n", port, spino);
 
 #if defined(CONFIG_SAMV7_SPI0_SLAVE) && defined(CONFIG_SAMV7_SPI1_SLAVE)
   DEBUGASSERT(spino >= 0 && spino <= 1);
@@ -1287,7 +1287,7 @@ struct spi_sctrlr_s *sam_spi_slave_initialize(int port)
   spi_putreg(priv, regval, SAM_SPI_CSR0_OFFSET);
 
   priv->nbits = 8;
-  spivdbg("csr[offset=%02x]=%08x\n", offset, regval);
+  spiinfo("csr[offset=%02x]=%08x\n", offset, regval);
 
   return &priv->sctrlr;
 }
diff --git a/arch/arm/src/samv7/sam_ssc.c b/arch/arm/src/samv7/sam_ssc.c
index 32abed171c..52891da588 100644
--- a/arch/arm/src/samv7/sam_ssc.c
+++ b/arch/arm/src/samv7/sam_ssc.c
@@ -390,16 +390,16 @@
 #  define i2sdbg         dbg
 #  define i2slldbg       lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define i2svdbg      dbg
-#    define i2sllvdbg    lldbg
+#    define i2sinfo      dbg
+#    define i2sllinfo    lldbg
 #  else
-#    define i2svdbg(x...)
+#    define i2sinfo(x...)
 #  endif
 #else
 #  define i2sdbg(x...)
 #  define i2slldbg(x...)
-#  define i2svdbg(x...)
-#  define i2sllvdbg(x...)
+#  define i2sinfo(x...)
+#  define i2sllinfo(x...)
 #endif
 
 #define DMA_INITIAL      0
@@ -792,18 +792,18 @@ static inline uintptr_t ssc_regaddr(struct sam_ssc_s *priv, unsigned int offset)
 #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);
-  i2svdbg("   CMR:%08x RCMR:%08x RFMR:%08x TCMR:%08x\n",
+  i2sinfo("SSC%d: %s\n", priv->sscno, msg);
+  i2sinfo("   CMR:%08x RCMR:%08x RFMR:%08x TCMR:%08x\n",
           getreg32(priv->base + SAM_SSC_CMR_OFFSET),
           getreg32(priv->base + SAM_SSC_RCMR_OFFSET),
           getreg32(priv->base + SAM_SSC_RFMR_OFFSET),
           getreg32(priv->base + SAM_SSC_TCMR_OFFSET));
-  i2svdbg("  TFMR:%08x RC0R:%08x RC1R:%08x   SR:%08x\n",
+  i2sinfo("  TFMR:%08x RC0R:%08x RC1R:%08x   SR:%08x\n",
           getreg32(priv->base + SAM_SSC_TFMR_OFFSET),
           getreg32(priv->base + SAM_SSC_RC0R_OFFSET),
           getreg32(priv->base + SAM_SSC_RC1R_OFFSET),
           getreg32(priv->base + SAM_SSC_SR_OFFSET));
-  i2svdbg("   IMR:%08x WPMR:%08x WPSR:%08x\n",
+  i2sinfo("   IMR:%08x WPMR:%08x WPSR:%08x\n",
           getreg32(priv->base + SAM_SSC_IMR_OFFSET),
           getreg32(priv->base + SAM_SSC_WPMR_OFFSET),
           getreg32(priv->base + SAM_SSC_WPSR_OFFSET));
@@ -840,11 +840,11 @@ static void ssc_dump_queue(sq_queue_t *queue)
 
       if (!apb)
         {
-          i2sllvdbg("    %p: No buffer\n", bfcontainer);
+          i2sllinfo("    %p: No buffer\n", bfcontainer);
         }
       else
         {
-          i2sllvdbg("    %p: buffer=%p nmaxbytes=%d nbytes=%d\n",
+          i2sllinfo("    %p: buffer=%p nmaxbytes=%d nbytes=%d\n",
                     bfcontainer, apb, apb->nmaxbytes, apb->nbytes);
         }
     }
@@ -855,12 +855,12 @@ static void ssc_dump_queues(struct sam_transport_s *xpt, const char *msg)
   irqstate_t flags;
 
   flags = enter_critical_section();
-  i2sllvdbg("%s\n", msg);
-  i2sllvdbg("  Pending:\n");
+  i2sllinfo("%s\n", msg);
+  i2sllinfo("  Pending:\n");
   ssc_dump_queue(&xpt->pend);
-  i2sllvdbg("  Active:\n");
+  i2sllinfo("  Active:\n");
   ssc_dump_queue(&xpt->act);
-  i2sllvdbg("  Done:\n");
+  i2sllinfo("  Done:\n");
   ssc_dump_queue(&xpt->done);
   leave_critical_section(flags);
 }
@@ -1420,7 +1420,7 @@ static void ssc_rx_worker(void *arg)
    * So we have to start the next DMA here.
    */
 
-  i2svdbg("rx.act.head=%p rx.done.head=%p\n",
+  i2sinfo("rx.act.head=%p rx.done.head=%p\n",
           priv->rx.act.head, priv->rx.done.head);
   ssc_dump_rxqueues(priv, "RX worker start");
 
@@ -1836,7 +1836,7 @@ static void ssc_tx_worker(void *arg)
    * So we have to start the next DMA here.
    */
 
-  i2svdbg("tx.act.head=%p tx.done.head=%p\n",
+  i2sinfo("tx.act.head=%p tx.done.head=%p\n",
            priv->tx.act.head, priv->tx.done.head);
   ssc_dump_txqueues(priv, "TX worker start");
 
@@ -2211,7 +2211,7 @@ static int ssc_receive(struct i2s_dev_s *dev, struct ap_buffer_s *apb,
 #endif
 
   DEBUGASSERT(priv && apb && ((uintptr_t)apb->samp & priv->align) == 0);
-  i2svdbg("apb=%p nmaxbytes=%d arg=%p timeout=%d\n",
+  i2sinfo("apb=%p nmaxbytes=%d arg=%p timeout=%d\n",
           apb, apb->nmaxbytes, arg, timeout);
 
   ssc_init_buffer(apb->samp, apb->nmaxbytes);
@@ -2426,7 +2426,7 @@ static int ssc_send(struct i2s_dev_s *dev, struct ap_buffer_s *apb,
    */
 
   DEBUGASSERT(priv && apb);
-  i2svdbg("apb=%p nbytes=%d arg=%p timeout=%d\n",
+  i2sinfo("apb=%p nbytes=%d arg=%p timeout=%d\n",
           apb, apb->nbytes - apb->curbyte, arg, timeout);
 
   ssc_dump_buffer("Sending", &apb->samp[apb->curbyte],
@@ -2906,7 +2906,7 @@ static void ssc_clocking(struct sam_ssc_s *priv)
 
   sam_enableperiph1(priv->pid);
 
-  i2svdbg("PCSR1=%08x PCR=%08x CMR=%08x\n",
+  i2sinfo("PCSR1=%08x PCR=%08x CMR=%08x\n",
           getreg32(SAM_PMC_PCSR1), regval,
           ssc_getreg(priv, SAM_SSC_CMR_OFFSET));
 }
@@ -3405,7 +3405,7 @@ struct i2s_dev_s *sam_ssc_initialize(int port)
 
   /* The support SAM parts have only a single SSC port */
 
-  i2svdbg("port: %d\n", port);
+  i2sinfo("port: %d\n", port);
 
   /* Allocate a new state structure for this chip select.  NOTE that there
    * is no protection if the same chip select is used in two different
diff --git a/arch/arm/src/samv7/sam_tc.c b/arch/arm/src/samv7/sam_tc.c
index 0356985776..d50ea984d2 100644
--- a/arch/arm/src/samv7/sam_tc.c
+++ b/arch/arm/src/samv7/sam_tc.c
@@ -841,7 +841,7 @@ static int sam_tc_interrupt(struct sam_tc_s *tc, struct sam_chan_s *chan)
   imr     = sam_chan_getreg(chan, SAM_TC_IMR_OFFSET);
   pending = sr & imr;
 
-  tcllvdbg("TC%d Channel %d: pending=%08lx\n",
+  tcllinfo("TC%d Channel %d: pending=%08lx\n",
            tc->tc, chan->chan, (unsigned long)pending);
 
   /* Are there any pending interrupts for this channel? */
@@ -1046,7 +1046,7 @@ static int sam_tc_mcksrc(uint32_t frequency, uint32_t *tcclks,
   uint32_t fnext;
   int ndx = 0;
 
-  tcvdbg("frequency=%d\n", frequency);
+  tcinfo("frequency=%d\n", frequency);
 
   /* Satisfy lower bound.  That is, the value of the divider such that:
    *
@@ -1318,7 +1318,7 @@ TC_HANDLE sam_tc_allocate(int channel, int mode)
    * access to the requested channel.
    */
 
-  tcvdbg("channel=%d mode=%08x\n", channel, mode);
+  tcinfo("channel=%d mode=%08x\n", channel, mode);
 
   chan = sam_tc_initialize(channel);
   if (chan)
@@ -1344,7 +1344,7 @@ TC_HANDLE sam_tc_allocate(int channel, int mode)
 
   /* Return an opaque reference to the channel */
 
-  tcvdbg("Returning %p\n", chan);
+  tcinfo("Returning %p\n", chan);
   return (TC_HANDLE)chan;
 }
 
@@ -1366,7 +1366,7 @@ void sam_tc_free(TC_HANDLE handle)
 {
   struct sam_chan_s *chan = (struct sam_chan_s *)handle;
 
-  tcvdbg("Freeing %p channel=%d inuse=%d\n", chan, chan->chan, chan->inuse);
+  tcinfo("Freeing %p channel=%d inuse=%d\n", chan, chan->chan, chan->inuse);
   DEBUGASSERT(chan && chan->inuse);
 
   /* Make sure that interrupts are detached and disabled and that the channel
@@ -1399,7 +1399,7 @@ void sam_tc_start(TC_HANDLE handle)
 {
   struct sam_chan_s *chan = (struct sam_chan_s *)handle;
 
-  tcvdbg("Starting channel %d inuse=%d\n", chan->chan, chan->inuse);
+  tcinfo("Starting channel %d inuse=%d\n", chan->chan, chan->inuse);
   DEBUGASSERT(chan && chan->inuse);
 
   /* Read the SR to clear any pending interrupts on this channel */
@@ -1431,7 +1431,7 @@ void sam_tc_stop(TC_HANDLE handle)
 {
   struct sam_chan_s *chan = (struct sam_chan_s *)handle;
 
-  tcvdbg("Stopping channel %d inuse=%d\n", chan->chan, chan->inuse);
+  tcinfo("Stopping channel %d inuse=%d\n", chan->chan, chan->inuse);
   DEBUGASSERT(chan && chan->inuse);
 
   sam_chan_putreg(chan, SAM_TC_CCR_OFFSET, TC_CCR_CLKDIS);
@@ -1538,7 +1538,7 @@ void sam_tc_setregister(TC_HANDLE handle, int regid, uint32_t regval)
 
   DEBUGASSERT(chan && regid < TC_NREGISTERS);
 
-  tcvdbg("Channel %d: Set register RC%d to %08lx\n",
+  tcinfo("Channel %d: Set register RC%d to %08lx\n",
          chan->chan, regid, (unsigned long)regval);
 
   sam_chan_putreg(chan, g_regoffset[regid], regval);
@@ -1717,7 +1717,7 @@ int sam_tc_clockselect(uint32_t frequency, uint32_t *tcclks,
 
           if (actual)
             {
-              tcvdbg("return actual=%lu\n", (unsigned long)fselect);
+              tcinfo("return actual=%lu\n", (unsigned long)fselect);
               *actual = pck6_actual;
             }
 
@@ -1725,7 +1725,7 @@ int sam_tc_clockselect(uint32_t frequency, uint32_t *tcclks,
 
           if (tcclks)
             {
-              tcvdbg("return tcclks=%08lx\n", (unsigned long)TC_CMR_TCCLKS_PCK6);
+              tcinfo("return tcclks=%08lx\n", (unsigned long)TC_CMR_TCCLKS_PCK6);
               *tcclks = TC_CMR_TCCLKS_PCK6;
             }
 
@@ -1739,7 +1739,7 @@ int sam_tc_clockselect(uint32_t frequency, uint32_t *tcclks,
 
   if (actual)
     {
-      tcvdbg("return actual=%lu\n", (unsigned long)mck_actual);
+      tcinfo("return actual=%lu\n", (unsigned long)mck_actual);
       *actual = mck_actual;
     }
 
@@ -1747,7 +1747,7 @@ int sam_tc_clockselect(uint32_t frequency, uint32_t *tcclks,
 
   if (tcclks)
     {
-      tcvdbg("return tcclks=%08lx\n", (unsigned long)mck_tcclks);
+      tcinfo("return tcclks=%08lx\n", (unsigned long)mck_tcclks);
       *tcclks = mck_tcclks;
     }
 
diff --git a/arch/arm/src/samv7/sam_tc.h b/arch/arm/src/samv7/sam_tc.h
index 5dda45ece9..15673deaf9 100644
--- a/arch/arm/src/samv7/sam_tc.h
+++ b/arch/arm/src/samv7/sam_tc.h
@@ -88,14 +88,14 @@
 
 #ifdef CONFIG_SAMV7_TC_DEBUG
 #  define tcdbg    dbg
-#  define tcvdbg   vdbg
+#  define tcinfo   info
 #  define tclldbg  lldbg
-#  define tcllvdbg llvdbg
+#  define tcllinfo llinfo
 #else
 #  define tcdbg(x...)
-#  define tcvdbg(x...)
+#  define tcinfo(x...)
 #  define tclldbg(x...)
-#  define tcllvdbg(x...)
+#  define tcllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/arch/arm/src/samv7/sam_tickless.c b/arch/arm/src/samv7/sam_tickless.c
index 3d1a7ad95a..899d464609 100644
--- a/arch/arm/src/samv7/sam_tickless.c
+++ b/arch/arm/src/samv7/sam_tickless.c
@@ -221,7 +221,7 @@ static struct sam_tickless_s g_tickless;
 
 static void sam_oneshot_handler(void *arg)
 {
-  tcllvdbg("Expired...\n");
+  tcllinfo("Expired...\n");
   sched_timer_expiration();
 }
 
diff --git a/arch/arm/src/samv7/sam_trng.c b/arch/arm/src/samv7/sam_trng.c
index 3a76b924e1..392e6af70f 100644
--- a/arch/arm/src/samv7/sam_trng.c
+++ b/arch/arm/src/samv7/sam_trng.c
@@ -244,7 +244,7 @@ static ssize_t sam_read(struct file *filep, char *buffer, size_t buflen)
   ssize_t retval;
   int ret;
 
-  fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen);
+  finfo("buffer=%p buflen=%d\n", buffer, (int)buflen);
 
   /* Get exclusive access to the TRNG harware */
 
@@ -284,7 +284,7 @@ static ssize_t sam_read(struct file *filep, char *buffer, size_t buflen)
     {
       ret = sem_wait(&g_trngdev.waitsem);
 
-      fvdbg("Awakened: nsamples=%d maxsamples=%d ret=%d\n",
+      finfo("Awakened: nsamples=%d maxsamples=%d ret=%d\n",
             g_trngdev.nsamples, g_trngdev.maxsamples, ret);
 
       if (ret < 0)
@@ -321,7 +321,7 @@ errout:
 
   sem_post(&g_trngdev.exclsem);
 
-  fvdbg("Return %d\n", (int)retval);
+  finfo("Return %d\n", (int)retval);
   return retval;
 }
 
@@ -347,7 +347,7 @@ void up_rnginitialize(void)
 {
   int ret;
 
-  fvdbg("Initializing TRNG hardware\n");
+  finfo("Initializing TRNG hardware\n");
 
   /* Initialize the device structure */
 
diff --git a/arch/arm/src/samv7/sam_twihs.c b/arch/arm/src/samv7/sam_twihs.c
index 3e2779597b..3e242d8525 100644
--- a/arch/arm/src/samv7/sam_twihs.c
+++ b/arch/arm/src/samv7/sam_twihs.c
@@ -125,14 +125,14 @@
 
 #ifdef CONFIG_DEBUG_I2C
 #  define i2cdbg    dbg
-#  define i2cvdbg   vdbg
+#  define i2cinfo   info
 #  define i2clldbg  lldbg
-#  define i2cllvdbg llvdbg
+#  define i2cllinfo llinfo
 #else
 #  define i2cdbg(x...)
-#  define i2cvdbg(x...)
+#  define i2cinfo(x...)
 #  define i2clldbg(x...)
-#  define i2cllvdbg(x...)
+#  define i2cllinfo(x...)
 #endif
 
 /****************************************************************************
@@ -494,9 +494,9 @@ static int twi_wait(struct twi_dev_s *priv, unsigned int size)
 
   do
     {
-      i2cvdbg("TWIHS%d Waiting...\n", priv->attr->twi);
+      i2cinfo("TWIHS%d Waiting...\n", priv->attr->twi);
       twi_takesem(&priv->waitsem);
-      i2cvdbg("TWIHS%d Awakened with result: %d\n",
+      i2cinfo("TWIHS%d Awakened with result: %d\n",
               priv->attr->twi, priv->result);
     }
   while (priv->result == -EBUSY);
@@ -554,7 +554,7 @@ static int twi_interrupt(struct twi_dev_s *priv)
   imr     = twi_getrel(priv, SAM_TWIHS_IMR_OFFSET);
   pending = sr & imr;
 
-  i2cllvdbg("TWIHS%d pending: %08x\n", priv->attr->twi, pending);
+  i2cllinfo("TWIHS%d pending: %08x\n", priv->attr->twi, pending);
 
   /* Byte received */
 
@@ -871,7 +871,7 @@ static int twi_transfer(FAR struct i2c_master_s *dev,
   int ret;
 
   DEBUGASSERT(dev != NULL && msgs != NULL && count > 0);
-  i2cvdbg("TWIHS%d count: %d\n", priv->attr->twi, count);
+  i2cinfo("TWIHS%d count: %d\n", priv->attr->twi, count);
 
   /* Calculate the total transfer size so that we can calculate a reasonable
    * timeout value.
@@ -1157,7 +1157,7 @@ static void twi_hw_initialize(struct twi_dev_s *priv, uint32_t frequency)
   uint32_t regval;
   uint32_t mck;
 
-  i2cvdbg("TWIHS%d Initializing\n", priv->attr->twi);
+  i2cinfo("TWIHS%d Initializing\n", priv->attr->twi);
 
   /* Configure PIO pins */
 
@@ -1258,7 +1258,7 @@ struct i2c_master_s *sam_i2cbus_initialize(int bus)
   irqstate_t flags;
   int ret;
 
-  i2cvdbg("Initializing TWIHS%d\n", bus);
+  i2cinfo("Initializing TWIHS%d\n", bus);
 
 #ifdef CONFIG_SAMV7_TWIHS0
   if (bus == 0)
@@ -1374,7 +1374,7 @@ int sam_i2cbus_uninitialize(FAR struct i2c_master_s *dev)
   struct twi_dev_s *priv = (struct twi_dev_s *) dev;
   irqstate_t flags;
 
-  i2cvdbg("TWIHS%d Un-initializing\n", priv->attr->twi);
+  i2cinfo("TWIHS%d Un-initializing\n", priv->attr->twi);
 
   /* Disable TWIHS interrupts */
 
diff --git a/arch/arm/src/samv7/sam_usbdevhs.c b/arch/arm/src/samv7/sam_usbdevhs.c
index de6872e92e..c7c2275b98 100644
--- a/arch/arm/src/samv7/sam_usbdevhs.c
+++ b/arch/arm/src/samv7/sam_usbdevhs.c
@@ -1412,7 +1412,7 @@ static int sam_req_write(struct sam_usbdev_s *priv, struct sam_ep_s *privep)
           return -ENOENT;
         }
 
-      ullvdbg("epno=%d req=%p: len=%d xfrd=%d inflight=%d zlpneeded=%d\n",
+      ullinfo("epno=%d req=%p: len=%d xfrd=%d inflight=%d zlpneeded=%d\n",
               epno, privreq, privreq->req.len, privreq->req.xfrd,
               privreq->inflight, privep->zlpneeded);
 
@@ -1647,7 +1647,7 @@ static int sam_req_read(struct sam_usbdev_s *priv, struct sam_ep_s *privep,
           return -ENOENT;
         }
 
-      ullvdbg("EP%d: len=%d xfrd=%d\n",
+      ullinfo("EP%d: len=%d xfrd=%d\n",
               epno, privreq->req.len, privreq->req.xfrd);
 
       /* Ignore any attempt to receive a zero length packet */
@@ -1982,7 +1982,7 @@ static void sam_ep0_setup(struct sam_usbdev_s *priv)
   index.w = GETUINT16(priv->ctrl.index);
   len.w   = GETUINT16(priv->ctrl.len);
 
-  ullvdbg("SETUP: type=%02x req=%02x value=%04x index=%04x len=%04x\n",
+  ullinfo("SETUP: type=%02x req=%02x value=%04x index=%04x len=%04x\n",
           priv->ctrl.type, priv->ctrl.req, value.w, index.w, len.w);
 
   /* Dispatch any non-standard requests */
@@ -2146,7 +2146,7 @@ static void sam_ep0_setup(struct sam_usbdev_s *priv)
           {
             /* Special case recipient=device test mode */
 
-            ullvdbg("test mode: %d\n", index.w);
+            ullinfo("test mode: %d\n", index.w);
           }
         else if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) != USB_REQ_RECIPIENT_ENDPOINT)
           {
@@ -3489,7 +3489,7 @@ static int sam_ep_configure_internal(struct sam_ep_s *privep,
   uint8_t nbtrans;
   bool dirin;
 
-  uvdbg("len: %02x type: %02x addr: %02x attr: %02x "
+  uinfo("len: %02x type: %02x addr: %02x attr: %02x "
         "maxpacketsize: %02x %02x interval: %02x\n",
         desc->len, desc->type, desc->addr, desc->attr,
         desc->mxpacketsize[0],  desc->mxpacketsize[1],
diff --git a/arch/arm/src/samv7/sam_wdt.c b/arch/arm/src/samv7/sam_wdt.c
index 8d63806682..cd156021e3 100644
--- a/arch/arm/src/samv7/sam_wdt.c
+++ b/arch/arm/src/samv7/sam_wdt.c
@@ -88,10 +88,10 @@
 
 #ifdef CONFIG_DEBUG_WATCHDOG
 #  define wddbg    lldbg
-#  define wdvdbg   llvdbg
+#  define wdinfo   llinfo
 #else
 #  define wddbg(x...)
-#  define wdvdbg(x...)
+#  define wdinfo(x...)
 #endif
 
 /****************************************************************************
@@ -315,7 +315,7 @@ static int sam_start(FAR struct watchdog_lowerhalf_s *lower)
    * timer with the newly programmed mode parameters.
    */
 
-  wdvdbg("Entry\n");
+  wdinfo("Entry\n");
   return priv->started ? OK : -ENOSYS;
 }
 
@@ -343,7 +343,7 @@ static int sam_stop(FAR struct watchdog_lowerhalf_s *lower)
    * timer with the newly programmed mode parameters.
    */
 
-  wdvdbg("Entry\n");
+  wdinfo("Entry\n");
   return -ENOSYS;
 }
 
@@ -366,7 +366,7 @@ static int sam_stop(FAR struct watchdog_lowerhalf_s *lower)
 
 static int sam_keepalive(FAR struct watchdog_lowerhalf_s *lower)
 {
-  wdvdbg("Entry\n");
+  wdinfo("Entry\n");
 
   /* Write WDT_CR_WDRSTT to the WDT CR regiser (along with the KEY value)
    * will restart the watchdog timer.
@@ -397,7 +397,7 @@ static int sam_getstatus(FAR struct watchdog_lowerhalf_s *lower,
 {
   FAR struct sam_lowerhalf_s *priv = (FAR struct sam_lowerhalf_s *)lower;
 
-  wdvdbg("Entry\n");
+  wdinfo("Entry\n");
   DEBUGASSERT(priv);
 
   /* Return the status bit */
@@ -426,10 +426,10 @@ static int sam_getstatus(FAR struct watchdog_lowerhalf_s *lower,
 
   status->timeleft = 0;
 
-  wdvdbg("Status     :\n");
-  wdvdbg("  flags    : %08x\n", status->flags);
-  wdvdbg("  timeout  : %d\n", status->timeout);
-  wdvdbg("  timeleft : %d\n", status->timeleft);
+  wdinfo("Status     :\n");
+  wdinfo("  flags    : %08x\n", status->flags);
+  wdinfo("  timeout  : %d\n", status->timeout);
+  wdinfo("  timeleft : %d\n", status->timeleft);
   return OK;
 }
 
@@ -457,7 +457,7 @@ static int sam_settimeout(FAR struct watchdog_lowerhalf_s *lower,
   uint32_t regval;
 
   DEBUGASSERT(priv);
-  wdvdbg("Entry: timeout=%d\n", timeout);
+  wdinfo("Entry: timeout=%d\n", timeout);
 
   /* Can this timeout be represented? */
 
@@ -496,7 +496,7 @@ static int sam_settimeout(FAR struct watchdog_lowerhalf_s *lower,
 
   priv->reload = reload;
 
-  wdvdbg("reload=%d timout: %d->%d\n",
+  wdinfo("reload=%d timout: %d->%d\n",
          reload, timeout, priv->timeout);
 
   /* Set the WDT_MR according to calculated value
@@ -541,7 +541,7 @@ static int sam_settimeout(FAR struct watchdog_lowerhalf_s *lower,
 
   priv->started = true;
 
-  wdvdbg("Setup: CR: %08x MR: %08x SR: %08x\n",
+  wdinfo("Setup: CR: %08x MR: %08x SR: %08x\n",
          sam_getreg(SAM_WDT_CR), sam_getreg(SAM_WDT_MR),
          sam_getreg(SAM_WDT_SR));
 
@@ -582,7 +582,7 @@ static xcpt_t sam_capture(FAR struct watchdog_lowerhalf_s *lower,
   xcpt_t oldhandler;
 
   DEBUGASSERT(priv);
-  wdvdbg("Entry: handler=%p\n", handler);
+  wdinfo("Entry: handler=%p\n", handler);
 
   /* Get the old handler return value */
 
@@ -636,7 +636,7 @@ static xcpt_t sam_capture(FAR struct watchdog_lowerhalf_s *lower,
 static int sam_ioctl(FAR struct watchdog_lowerhalf_s *lower, int cmd,
                     unsigned long arg)
 {
-  wdvdbg("cmd=%d arg=%ld\n", cmd, arg);
+  wdinfo("cmd=%d arg=%ld\n", cmd, arg);
 
   /* No ioctls are supported */
 
@@ -667,7 +667,7 @@ int sam_wdt_initialize(void)
 {
   FAR struct sam_lowerhalf_s *priv = &g_wdtdev;
 
-  wdvdbg("Entry: CR: %08x MR: %08x SR: %08x\n",
+  wdinfo("Entry: CR: %08x MR: %08x SR: %08x\n",
          sam_getreg(SAM_WDT_CR), sam_getreg(SAM_WDT_MR),
          sam_getreg(SAM_WDT_SR));
 
diff --git a/arch/arm/src/samv7/sam_xdmac.c b/arch/arm/src/samv7/sam_xdmac.c
index 886de898fe..c52f63fb9b 100644
--- a/arch/arm/src/samv7/sam_xdmac.c
+++ b/arch/arm/src/samv7/sam_xdmac.c
@@ -1616,7 +1616,7 @@ void sam_dmainitialize(struct sam_xdmac_s *xdmac)
 
 void weak_function up_dmainitialize(void)
 {
-  dmallvdbg("Initialize XDMAC\n");
+  dmallinfo("Initialize XDMAC\n");
 
   /* Enable peripheral clock */
 
@@ -1697,7 +1697,7 @@ DMA_HANDLE sam_dmachannel(uint8_t dmacno, uint32_t chflags)
 
   if (xdmach)
     {
-      dmavdbg("XDMAC%d CH%d: chflags: %08x returning xdmach: %p\n",
+      dmainfo("XDMAC%d CH%d: chflags: %08x returning xdmach: %p\n",
               (int)dmacno, xdmach->chan, (int)chflags, xdmach);
     }
   else
@@ -1731,7 +1731,7 @@ void sam_dmaconfig(DMA_HANDLE handle, uint32_t chflags)
   /* Set the new DMA channel flags. */
 
   xdmach->flags = chflags;
-  dmavdbg("XDMAC CH%d: chflags: %08x\n",  xdmach->chan, (int)chflags);
+  dmainfo("XDMAC CH%d: chflags: %08x\n",  xdmach->chan, (int)chflags);
 }
 
 /****************************************************************************
@@ -1752,7 +1752,7 @@ void sam_dmafree(DMA_HANDLE handle)
   struct sam_xdmach_s *xdmach = (struct sam_xdmach_s *)handle;
   struct sam_xdmac_s *xdmac;
 
-  dmavdbg("xdmach: %p\n", xdmach);
+  dmainfo("xdmach: %p\n", xdmach);
   DEBUGASSERT((xdmach != NULL) && (xdmach->inuse));
 
   xdmac = sam_controller(xdmach);
@@ -1790,10 +1790,10 @@ int sam_dmatxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr,
   size_t remaining;
   int ret = OK;
 
-  dmavdbg("xdmach: %p paddr: %08x maddr: %08x nbytes: %d\n",
+  dmainfo("xdmach: %p paddr: %08x maddr: %08x nbytes: %d\n",
           xdmach, (int)paddr, (int)maddr, (int)nbytes);
   DEBUGASSERT(xdmach);
-  dmavdbg("llhead: %p lltail: %p\n", xdmach->llhead, xdmach->lltail);
+  dmainfo("llhead: %p lltail: %p\n", xdmach->llhead, xdmach->lltail);
 
   /* The maximum transfer size in bytes depends upon the maximum number of
    * transfers and the number of bytes per transfer.
@@ -1869,10 +1869,10 @@ int sam_dmarxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr,
   size_t remaining;
   int ret = OK;
 
-  dmavdbg("xdmach: %p paddr: %08x maddr: %08x nbytes: %d\n",
+  dmainfo("xdmach: %p paddr: %08x maddr: %08x nbytes: %d\n",
           xdmach, (int)paddr, (int)maddr, (int)nbytes);
   DEBUGASSERT(xdmach);
-  dmavdbg("llhead: %p lltail: %p\n", xdmach->llhead, xdmach->lltail);
+  dmainfo("llhead: %p lltail: %p\n", xdmach->llhead, xdmach->lltail);
 
   /* The maximum transfer size in bytes depends upon the maximum number of
    * transfers and the number of bytes per transfer.
@@ -1944,7 +1944,7 @@ int sam_dmastart(DMA_HANDLE handle, dma_callback_t callback, void *arg)
   struct sam_xdmach_s *xdmach = (struct sam_xdmach_s *)handle;
   int ret = -EINVAL;
 
-  dmavdbg("xdmach: %p callback: %p arg: %p\n", xdmach, callback, arg);
+  dmainfo("xdmach: %p callback: %p arg: %p\n", xdmach, callback, arg);
   DEBUGASSERT(xdmach != NULL);
 
   /* Verify that the DMA has been setup (i.e., at least one entry in the
@@ -1998,7 +1998,7 @@ void sam_dmastop(DMA_HANDLE handle)
   struct sam_xdmach_s *xdmach = (struct sam_xdmach_s *)handle;
   irqstate_t flags;
 
-  dmavdbg("xdmach: %p\n", xdmach);
+  dmainfo("xdmach: %p\n", xdmach);
   DEBUGASSERT(xdmach != NULL);
 
   flags = enter_critical_section();
diff --git a/arch/arm/src/stm32/stm32_adc.c b/arch/arm/src/stm32/stm32_adc.c
index 5e34110fc9..f3970f3d31 100644
--- a/arch/arm/src/stm32/stm32_adc.c
+++ b/arch/arm/src/stm32/stm32_adc.c
@@ -748,22 +748,22 @@ static void tim_modifyreg(FAR struct stm32_dev_s *priv, int offset,
 #ifdef ADC_HAVE_TIMER
 static void tim_dumpregs(FAR struct stm32_dev_s *priv, FAR const char *msg)
 {
-  avdbg("%s:\n", msg);
-  avdbg("  CR1: %04x CR2:  %04x SMCR:  %04x DIER:  %04x\n",
+  ainfo("%s:\n", msg);
+  ainfo("  CR1: %04x CR2:  %04x SMCR:  %04x DIER:  %04x\n",
         tim_getreg(priv, STM32_GTIM_CR1_OFFSET),
         tim_getreg(priv, STM32_GTIM_CR2_OFFSET),
         tim_getreg(priv, STM32_GTIM_SMCR_OFFSET),
         tim_getreg(priv, STM32_GTIM_DIER_OFFSET));
-  avdbg("   SR: %04x EGR:  0000 CCMR1: %04x CCMR2: %04x\n",
+  ainfo("   SR: %04x EGR:  0000 CCMR1: %04x CCMR2: %04x\n",
         tim_getreg(priv, STM32_GTIM_SR_OFFSET),
         tim_getreg(priv, STM32_GTIM_CCMR1_OFFSET),
         tim_getreg(priv, STM32_GTIM_CCMR2_OFFSET));
-  avdbg(" CCER: %04x CNT:  %04x PSC:   %04x ARR:   %04x\n",
+  ainfo(" CCER: %04x CNT:  %04x PSC:   %04x ARR:   %04x\n",
         tim_getreg(priv, STM32_GTIM_CCER_OFFSET),
         tim_getreg(priv, STM32_GTIM_CNT_OFFSET),
         tim_getreg(priv, STM32_GTIM_PSC_OFFSET),
         tim_getreg(priv, STM32_GTIM_ARR_OFFSET));
-  avdbg(" CCR1: %04x CCR2: %04x CCR3:  %04x CCR4:  %04x\n",
+  ainfo(" CCR1: %04x CCR2: %04x CCR3:  %04x CCR4:  %04x\n",
         tim_getreg(priv, STM32_GTIM_CCR1_OFFSET),
         tim_getreg(priv, STM32_GTIM_CCR2_OFFSET),
         tim_getreg(priv, STM32_GTIM_CCR3_OFFSET),
@@ -771,7 +771,7 @@ static void tim_dumpregs(FAR struct stm32_dev_s *priv, FAR const char *msg)
 #ifndef CONFIG_STM32_STM32L15XX
   if (priv->tbase == STM32_TIM1_BASE || priv->tbase == STM32_TIM8_BASE)
     {
-      avdbg("  RCR: %04x BDTR: %04x DCR:   %04x DMAR:  %04x\n",
+      ainfo("  RCR: %04x BDTR: %04x DCR:   %04x DMAR:  %04x\n",
             tim_getreg(priv, STM32_ATIM_RCR_OFFSET),
             tim_getreg(priv, STM32_ATIM_BDTR_OFFSET),
             tim_getreg(priv, STM32_ATIM_DCR_OFFSET),
@@ -779,7 +779,7 @@ static void tim_dumpregs(FAR struct stm32_dev_s *priv, FAR const char *msg)
     }
   else
     {
-      avdbg("  DCR: %04x DMAR: %04x\n",
+      ainfo("  DCR: %04x DMAR: %04x\n",
             tim_getreg(priv, STM32_GTIM_DCR_OFFSET),
             tim_getreg(priv, STM32_GTIM_DMAR_OFFSET));
     }
@@ -804,7 +804,7 @@ static void tim_dumpregs(FAR struct stm32_dev_s *priv, FAR const char *msg)
 #ifdef ADC_HAVE_TIMER
 static void adc_timstart(FAR struct stm32_dev_s *priv, bool enable)
 {
-  avdbg("enable: %d\n", enable ? 1 : 0);
+  ainfo("enable: %d\n", enable ? 1 : 0);
 
   if (enable)
     {
@@ -873,7 +873,7 @@ static int adc_timinit(FAR struct stm32_dev_s *priv)
    *   position.
    */
 
-  avdbg("Initializing timers extsel = 0x%08x\n", priv->extsel);
+  ainfo("Initializing timers extsel = 0x%08x\n", priv->extsel);
 
   adc_modifyreg(priv, STM32_ADC_EXTREG_OFFSET,
                 ADC_EXTREG_EXTEN_MASK | ADC_EXTREG_EXTSEL_MASK,
@@ -1205,7 +1205,7 @@ static int adc_timinit(FAR struct stm32_dev_s *priv)
 #if defined(CONFIG_STM32_STM32F10XX)
 static void adc_startconv(FAR struct stm32_dev_s *priv, bool enable)
 {
-  avdbg("enable: %d\n", enable ? 1 : 0);
+  ainfo("enable: %d\n", enable ? 1 : 0);
 
   if (!enable)
     {
@@ -1227,7 +1227,7 @@ static void adc_startconv(FAR struct stm32_dev_s *priv, bool enable)
 {
   uint32_t regval;
 
-  avdbg("enable: %d\n", enable ? 1 : 0);
+  ainfo("enable: %d\n", enable ? 1 : 0);
 
   if (enable)
     {
@@ -1256,7 +1256,7 @@ static void adc_startconv(FAR struct stm32_dev_s *priv, bool enable)
 #else
 static void adc_startconv(FAR struct stm32_dev_s *priv, bool enable)
 {
-  avdbg("enable: %d\n", enable ? 1 : 0);
+  ainfo("enable: %d\n", enable ? 1 : 0);
 
   if (enable)
     {
@@ -1364,7 +1364,7 @@ static void adc_power_down_idle(FAR struct stm32_dev_s *priv, bool pdi_high)
 {
   uint32_t regval;
 
-  avdbg("PDI: %d\n", pdi_high ? 1 : 0);
+  ainfo("PDI: %d\n", pdi_high ? 1 : 0);
 
   regval = adc_getreg(priv, STM32_ADC_CR1_OFFSET);
 
@@ -1405,7 +1405,7 @@ static void adc_power_down_delay(FAR struct stm32_dev_s *priv, bool pdd_high)
 {
   uint32_t regval;
 
-  avdbg("PDD: %d\n", pdd_high ? 1 : 0);
+  ainfo("PDD: %d\n", pdd_high ? 1 : 0);
 
   regval = adc_getreg(priv, STM32_ADC_CR1_OFFSET);
 
@@ -1445,7 +1445,7 @@ static void adc_power_down_delay(FAR struct stm32_dev_s *priv, bool pdd_high)
 static void adc_dels_after_conversion(FAR struct stm32_dev_s *priv,
                                       uint32_t delay)
 {
-  avdbg("Delay selected: 0x%08x\n", delay);
+  ainfo("Delay selected: 0x%08x\n", delay);
 
   adc_modifyreg(priv, STM32_ADC_CR2_OFFSET, ADC_CR2_DELS_MASK, delay);
 }
@@ -1471,7 +1471,7 @@ static void adc_dels_after_conversion(FAR struct stm32_dev_s *priv,
 static void adc_select_ch_bank(FAR struct stm32_dev_s *priv,
                                bool chb_selected)
 {
-  avdbg("Bank of channels selected: %c\n", chb_selected ? 'B' : 'A');
+  ainfo("Bank of channels selected: %c\n", chb_selected ? 'B' : 'A');
 
   if (chb_selected)
     {
@@ -1505,7 +1505,7 @@ static void adc_enable(FAR struct stm32_dev_s *priv, bool enable)
 {
   uint32_t regval;
 
-  avdbg("enable: %d\n", enable ? 1 : 0);
+  ainfo("enable: %d\n", enable ? 1 : 0);
 
   regval = adc_getreg(priv, STM32_ADC_CR_OFFSET);
 
@@ -1543,7 +1543,7 @@ static void adc_enable(FAR struct stm32_dev_s *priv, bool enable)
   bool enabled = false;
 #endif
 
-  avdbg("enable: %d\n", enable ? 1 : 0);
+  ainfo("enable: %d\n", enable ? 1 : 0);
 
   if (!enabled && enable)
     {
@@ -1717,7 +1717,7 @@ static void adc_reset(FAR struct adc_dev_s *dev)
   int ret;
 #endif
 
-  allvdbg("intf: %d\n", priv->intf);
+  allinfo("intf: %d\n", priv->intf);
   flags = enter_critical_section();
 
 #if defined(CONFIG_STM32_STM32L15XX) && \
@@ -2018,26 +2018,26 @@ static void adc_reset(FAR struct adc_dev_s *dev)
   leave_critical_section(flags);
 
 #ifdef CONFIG_STM32_STM32F30XX
-  avdbg("ISR:  0x%08x CR:   0x%08x CFGR: 0x%08x\n",
+  ainfo("ISR:  0x%08x CR:   0x%08x CFGR: 0x%08x\n",
         adc_getreg(priv, STM32_ADC_ISR_OFFSET),
         adc_getreg(priv, STM32_ADC_CR_OFFSET),
         adc_getreg(priv, STM32_ADC_CFGR_OFFSET));
 #else
-  avdbg("SR:   0x%08x CR1:  0x%08x CR2:  0x%08x\n",
+  ainfo("SR:   0x%08x CR1:  0x%08x CR2:  0x%08x\n",
         adc_getreg(priv, STM32_ADC_SR_OFFSET),
         adc_getreg(priv, STM32_ADC_CR1_OFFSET),
         adc_getreg(priv, STM32_ADC_CR2_OFFSET));
 #endif
 
-  avdbg("SQR1: 0x%08x SQR2: 0x%08x SQR3: 0x%08x\n",
+  ainfo("SQR1: 0x%08x SQR2: 0x%08x SQR3: 0x%08x\n",
         adc_getreg(priv, STM32_ADC_SQR1_OFFSET),
         adc_getreg(priv, STM32_ADC_SQR2_OFFSET),
         adc_getreg(priv, STM32_ADC_SQR3_OFFSET));
 
 #if defined(CONFIG_STM32_STM32F30XX)
-  avdbg("SQR4: 0x%08x\n", adc_getreg(priv, STM32_ADC_SQR4_OFFSET));
+  ainfo("SQR4: 0x%08x\n", adc_getreg(priv, STM32_ADC_SQR4_OFFSET));
 #elif defined(CONFIG_STM32_STM32L15XX)
-  avdbg("SQR4: 0x%08x SQR5: 0x%08x\n",
+  ainfo("SQR4: 0x%08x SQR5: 0x%08x\n",
         adc_getreg(priv, STM32_ADC_SQR4_OFFSET)
         adc_getreg(priv, STM32_ADC_SQR5_OFFSET));
 #endif
@@ -2045,16 +2045,16 @@ static void adc_reset(FAR struct adc_dev_s *dev)
 #if defined(CONFIG_STM32_STM32F30XX)
   if (priv->base == STM32_ADC1_BASE || priv->base == STM32_ADC2_BASE)
     {
-      avdbg("CCR:  0x%08x\n", getreg32(STM32_ADC12_CCR));
+      ainfo("CCR:  0x%08x\n", getreg32(STM32_ADC12_CCR));
     }
   else
     {
-      avdbg("CCR:  0x%08x\n", getreg32(STM32_ADC34_CCR));
+      ainfo("CCR:  0x%08x\n", getreg32(STM32_ADC34_CCR));
     }
 #elif defined(CONFIG_STM32_STM32F20XX) || \
       defined(CONFIG_STM32_STM32F40XX) || \
       defined(CONFIG_STM32_STM32L15XX)
-  avdbg("CCR:  0x%08x\n", getreg32(STM32_ADC_CCR));
+  ainfo("CCR:  0x%08x\n", getreg32(STM32_ADC_CCR));
 #endif
 }
 
@@ -2107,7 +2107,7 @@ static int adc_setup(FAR struct adc_dev_s *dev)
   ret = irq_attach(priv->irq, priv->isr);
   if (ret < 0)
     {
-      avdbg("irq_attach failed: %d\n", ret);
+      ainfo("irq_attach failed: %d\n", ret);
       return ret;
     }
 
@@ -2117,7 +2117,7 @@ static int adc_setup(FAR struct adc_dev_s *dev)
 
   /* Enable the ADC interrupt */
 
-  avdbg("Enable the ADC interrupt: irq=%d\n", priv->irq);
+  ainfo("Enable the ADC interrupt: irq=%d\n", priv->irq);
   up_enable_irq(priv->irq);
 
   return ret;
@@ -2172,7 +2172,7 @@ static void adc_rxint(FAR struct adc_dev_s *dev, bool enable)
 {
   FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev->ad_priv;
 
-  avdbg("intf: %d enable: %d\n", priv->intf, enable ? 1 : 0);
+  ainfo("intf: %d enable: %d\n", priv->intf, enable ? 1 : 0);
 
   if (enable)
     {
@@ -2219,7 +2219,7 @@ static void adc_ioc_enable_tvref_register(FAR struct adc_dev_s *dev,
       stm32_modifyreg32(STM32_ADC_CCR, ADC_CCR_TSVREFE, 0);
     }
 
-  avdbg("STM32_ADC_CCR value: 0x%08x\n", getreg32(STM32_ADC_CCR));
+  ainfo("STM32_ADC_CCR value: 0x%08x\n", getreg32(STM32_ADC_CCR));
 }
 #endif
 
@@ -2263,7 +2263,7 @@ static int adc_ioc_change_sleep_between_opers(FAR struct adc_dev_s *dev,
         break;
 
       default:
-        avdbg("unknown cmd: %d\n", cmd);
+        ainfo("unknown cmd: %d\n", cmd);
         break;
     }
 
@@ -2436,7 +2436,7 @@ static int adc_ioc_change_ints(FAR struct adc_dev_s *dev, int cmd, bool arg)
         break;
 
       default:
-        avdbg("unknown cmd: %d\n", cmd);
+        ainfo("unknown cmd: %d\n", cmd);
         break;
     }
 
@@ -2983,31 +2983,31 @@ struct adc_dev_s *stm32_adcinitialize(int intf, FAR const uint8_t *chanlist,
   FAR struct adc_dev_s   *dev;
   FAR struct stm32_dev_s *priv;
 
-  avdbg("intf: %d cchannels: %d\n", intf, cchannels);
+  ainfo("intf: %d cchannels: %d\n", intf, cchannels);
 
   switch (intf)
     {
 #ifdef CONFIG_STM32_ADC1
       case 1:
-        avdbg("ADC1 selected\n");
+        ainfo("ADC1 selected\n");
         dev = &g_adcdev1;
         break;
 #endif
 #ifdef CONFIG_STM32_ADC2
       case 2:
-        avdbg("ADC2 selected\n");
+        ainfo("ADC2 selected\n");
         dev = &g_adcdev2;
         break;
 #endif
 #ifdef CONFIG_STM32_ADC3
       case 3:
-        avdbg("ADC3 selected\n");
+        ainfo("ADC3 selected\n");
         dev = &g_adcdev3;
         break;
 #endif
 #ifdef CONFIG_STM32_ADC4
       case 4:
-        avdbg("ADC4 selected\n");
+        ainfo("ADC4 selected\n");
         dev = &g_adcdev4;
         break;
 #endif
diff --git a/arch/arm/src/stm32/stm32_can.c b/arch/arm/src/stm32/stm32_can.c
index 8cb61decf1..29545492ef 100644
--- a/arch/arm/src/stm32/stm32_can.c
+++ b/arch/arm/src/stm32/stm32_can.c
@@ -86,14 +86,14 @@
 
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
-#  define canvdbg   vdbg
+#  define caninfo   info
 #  define canlldbg  lldbg
-#  define canllvdbg llvdbg
+#  define canllinfo llinfo
 #else
 #  define candbg(x...)
-#  define canvdbg(x...)
+#  define caninfo(x...)
 #  define canlldbg(x...)
-#  define canllvdbg(x...)
+#  define canllinfo(x...)
 #endif
 
 #if !defined(CONFIG_DEBUG) || !defined(CONFIG_DEBUG_CAN)
@@ -555,7 +555,7 @@ static void can_reset(FAR struct can_dev_s *dev)
   uint32_t regbit = 0;
   irqstate_t flags;
 
-  canllvdbg("CAN%d\n", priv->port);
+  canllinfo("CAN%d\n", priv->port);
 
   /* Get the bits in the AHB1RSTR register needed to reset this CAN device */
 
@@ -617,7 +617,7 @@ static int can_setup(FAR struct can_dev_s *dev)
   FAR struct stm32_can_s *priv = dev->cd_priv;
   int ret;
 
-  canllvdbg("CAN%d RX0 irq: %d RX1 irq: %d TX irq: %d\n",
+  canllinfo("CAN%d RX0 irq: %d RX1 irq: %d TX irq: %d\n",
             priv->port, priv->canrx[0], priv->canrx[1], priv->cantx);
 
   /* CAN cell initialization */
@@ -700,7 +700,7 @@ static void can_shutdown(FAR struct can_dev_s *dev)
 {
   FAR struct stm32_can_s *priv = dev->cd_priv;
 
-  canllvdbg("CAN%d\n", priv->port);
+  canllinfo("CAN%d\n", priv->port);
 
   /* Disable the RX FIFO 0/1 and TX interrupts */
 
@@ -738,7 +738,7 @@ static void can_rxint(FAR struct can_dev_s *dev, bool enable)
   FAR struct stm32_can_s *priv = dev->cd_priv;
   uint32_t regval;
 
-  canllvdbg("CAN%d enable: %d\n", priv->port, enable);
+  canllinfo("CAN%d enable: %d\n", priv->port, enable);
 
   /* Enable/disable the FIFO 0/1 message pending interrupt */
 
@@ -773,7 +773,7 @@ static void can_txint(FAR struct can_dev_s *dev, bool enable)
   FAR struct stm32_can_s *priv = dev->cd_priv;
   uint32_t regval;
 
-  canllvdbg("CAN%d enable: %d\n", priv->port, enable);
+  canllinfo("CAN%d enable: %d\n", priv->port, enable);
 
   /* Support only disabling the transmit mailbox interrupt */
 
@@ -858,7 +858,7 @@ static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg)
   int dlc;
   int txmb;
 
-  canllvdbg("CAN%d ID: %d DLC: %d\n",
+  canllinfo("CAN%d ID: %d DLC: %d\n",
             priv->port, msg->cm_hdr.ch_id, msg->cm_hdr.ch_dlc);
 
   /* Select one empty transmit mailbox */
@@ -1011,7 +1011,7 @@ static bool can_txready(FAR struct can_dev_s *dev)
   /* Return true if any mailbox is available */
 
   regval = can_getreg(priv, STM32_CAN_TSR_OFFSET);
-  canllvdbg("CAN%d TSR: %08x\n", priv->port, regval);
+  canllinfo("CAN%d TSR: %08x\n", priv->port, regval);
 
   return (regval & CAN_ALL_MAILBOXES) != 0;
 }
@@ -1042,7 +1042,7 @@ static bool can_txempty(FAR struct can_dev_s *dev)
   /* Return true if all mailboxes are available */
 
   regval = can_getreg(priv, STM32_CAN_TSR_OFFSET);
-  canllvdbg("CAN%d TSR: %08x\n", priv->port, regval);
+  canllinfo("CAN%d TSR: %08x\n", priv->port, regval);
 
   return (regval & CAN_ALL_MAILBOXES) == CAN_ALL_MAILBOXES;
 }
@@ -1394,7 +1394,7 @@ static int can_bittiming(FAR struct stm32_can_s *priv)
   uint32_t ts1;
   uint32_t ts2;
 
-  canllvdbg("CAN%d PCLK1: %d baud: %d\n",
+  canllinfo("CAN%d PCLK1: %d baud: %d\n",
             priv->port, STM32_PCLK1_FREQUENCY, priv->baud);
 
   /* Try to get CAN_BIT_QUANTA quanta in one bit_time.
@@ -1447,7 +1447,7 @@ static int can_bittiming(FAR struct stm32_can_s *priv)
       DEBUGASSERT(brp >= 1 && brp <= CAN_BTR_BRP_MAX);
     }
 
-  canllvdbg("TS1: %d TS2: %d BRP: %d\n", ts1, ts2, brp);
+  canllinfo("TS1: %d TS2: %d BRP: %d\n", ts1, ts2, brp);
 
   /* Configure bit timing.  This also does the following, less obvious
    * things.  Unless loopback mode is enabled, it:
@@ -1490,7 +1490,7 @@ static int can_cellinit(FAR struct stm32_can_s *priv)
   uint32_t regval;
   int ret;
 
-  canllvdbg("CAN%d\n", priv->port);
+  canllinfo("CAN%d\n", priv->port);
 
   /* Exit from sleep mode */
 
@@ -1616,7 +1616,7 @@ static int can_filterinit(FAR struct stm32_can_s *priv)
   uint32_t regval;
   uint32_t bitmask;
 
-  canllvdbg("CAN%d filter: %d\n", priv->port, priv->filter);
+  canllinfo("CAN%d filter: %d\n", priv->port, priv->filter);
 
   /* Get the bitmask associated with the filter used by this CAN block */
 
@@ -1706,7 +1706,7 @@ FAR struct can_dev_s *stm32_caninitialize(int port)
 {
   FAR struct can_dev_s *dev = NULL;
 
-  canvdbg("CAN%d\n", port);
+  caninfo("CAN%d\n", port);
 
   /* NOTE:  Peripherical clocking for CAN1 and/or CAN2 was already provided
    * by stm32_clockconfig() early in the reset sequence.
diff --git a/arch/arm/src/stm32/stm32_dac.c b/arch/arm/src/stm32/stm32_dac.c
index 4c1a985c32..9f879f3166 100644
--- a/arch/arm/src/stm32/stm32_dac.c
+++ b/arch/arm/src/stm32/stm32_dac.c
@@ -1114,7 +1114,7 @@ FAR struct dac_dev_s *stm32_dacinitialize(int intf)
 #ifdef CONFIG_STM32_DAC1
   if (intf == 1)
     {
-      avdbg("DAC1 Selected\n");
+      ainfo("DAC1 Selected\n");
       dev = &g_dac1dev;
     }
   else
@@ -1122,7 +1122,7 @@ FAR struct dac_dev_s *stm32_dacinitialize(int intf)
 #ifdef CONFIG_STM32_DAC2
   if (intf == 2)
     {
-      avdbg("DAC2 Selected\n");
+      ainfo("DAC2 Selected\n");
       dev = &g_dac2dev;
     }
   else
diff --git a/arch/arm/src/stm32/stm32_dma2d.c b/arch/arm/src/stm32/stm32_dma2d.c
index e951e8916d..213e4bfa67 100644
--- a/arch/arm/src/stm32/stm32_dma2d.c
+++ b/arch/arm/src/stm32/stm32_dma2d.c
@@ -138,10 +138,10 @@
 
 #ifdef CONFIG_STM32_DMA2D_REGDEBUG
 #  define regdbg       dbg
-#  define regvdbg      vdbg
+#  define reginfo      info
 #else
 #  define regdbg(x...)
-#  define regvdbg(x...)
+#  define reginfo(x...)
 #endif
 
 /* check clut support */
@@ -408,7 +408,7 @@ static void stm32_dma2d_control(uint32_t setbits, uint32_t clrbits)
 {
   uint32_t   cr;
 
-  gvdbg("setbits=%08x, clrbits=%08x\n", setbits, clrbits);
+  ginfo("setbits=%08x, clrbits=%08x\n", setbits, clrbits);
 
   cr = getreg32(STM32_DMA2D_CR);
   cr &= ~clrbits;
@@ -429,7 +429,7 @@ static int stm32_dma2dirq(int irq, void *context)
   uint32_t regval = getreg32(STM32_DMA2D_ISR);
   FAR struct stm32_interrupt_s *priv = &g_interrupt;
 
-  regvdbg("irq = %d, regval = %08x\n", irq, regval);
+  reginfo("irq = %d, regval = %08x\n", irq, regval);
 
   if (regval & DMA2D_ISR_TCIF)
     {
@@ -558,9 +558,9 @@ static int stm32_dma2d_loadclut(uintptr_t pfcreg)
 
       regval  = getreg32(pfcreg);
       regval |= DMA2D_xGPFCCR_START;
-      regvdbg("set regval=%08x\n", regval);
+      reginfo("set regval=%08x\n", regval);
       putreg32(regval, pfcreg);
-      regvdbg("configured regval=%08x\n", getreg32(pfcreg));
+      reginfo("configured regval=%08x\n", getreg32(pfcreg));
     }
 
   leave_critical_section(flags);
@@ -632,7 +632,7 @@ static uint32_t stm32_dma2d_memaddress(FAR const struct stm32_dma2d_s *layer,
 
   offset = xpos * DMA2D_PF_BYPP(layer->pinfo.bpp) + layer->pinfo.stride * ypos;
 
-  gvdbg("%p\n", ((uint32_t) pinfo->fbmem) + offset);
+  ginfo("%p\n", ((uint32_t) pinfo->fbmem) + offset);
   return ((uint32_t) pinfo->fbmem) + offset;
 }
 
@@ -655,7 +655,7 @@ static fb_coord_t stm32_dma2d_lineoffset(FAR const struct stm32_dma2d_s *layer,
 {
   /* offset at the end of each line in the context to the area layer */
 
-  gvdbg("%d\n", layer->vinfo.xres - area->xres);
+  ginfo("%d\n", layer->vinfo.xres - area->xres);
   return layer->vinfo.xres - area->xres;
 }
 
@@ -677,7 +677,7 @@ static fb_coord_t stm32_dma2d_lineoffset(FAR const struct stm32_dma2d_s *layer,
 
 static int stm32_dma2d_pixelformat(uint8_t fmt, uint8_t *fmtmap)
 {
-  gvdbg("fmt=%d, fmtmap=%p\n", fmt, fmtmap);
+  ginfo("fmt=%d, fmtmap=%p\n", fmt, fmtmap);
 
   /* Map to the controller known format
    *
@@ -736,7 +736,7 @@ static int stm32_dma2d_pixelformat(uint8_t fmt, uint8_t *fmtmap)
 
 static int stm32_dma2d_bpp(uint8_t fmt, uint8_t *bpp)
 {
-  gvdbg("fmt=%d, bpp=%p\n", fmt, bpp);
+  ginfo("fmt=%d, bpp=%p\n", fmt, bpp);
 
   switch (fmt)
     {
@@ -937,7 +937,7 @@ static void stm32_dma2d_linit(FAR struct stm32_dma2d_s *layer,
 {
   FAR struct dma2d_layer_s *priv = &layer->dma2d;
 
-  gvdbg("layer=%p, lid=%d, fmt=%02x\n", layer, lid, fmt);
+  ginfo("layer=%p, lid=%d, fmt=%02x\n", layer, lid, fmt);
 
   /* initialize the layer interface */
 
@@ -985,7 +985,7 @@ static void stm32_dma2d_lfifo(FAR const struct stm32_dma2d_s *layer, int lid,
                               fb_coord_t xpos, fb_coord_t ypos,
                               FAR const struct ltdc_area_s *area)
 {
-  gvdbg("layer=%p, lid=%d, xpos=%d, ypos=%d, area=%p\n",
+  ginfo("layer=%p, lid=%d, xpos=%d, ypos=%d, area=%p\n",
             layer, lid, xpos, ypos, area);
 
   putreg32(stm32_dma2d_memaddress(layer, xpos, ypos), stm32_mar_layer_t[lid]);
@@ -1006,7 +1006,7 @@ static void stm32_dma2d_lfifo(FAR const struct stm32_dma2d_s *layer, int lid,
 static void stm32_dma2d_lcolor(FAR const struct stm32_dma2d_s *layer,
                                int lid, uint32_t color)
 {
-  gvdbg("layer=%p, lid=%d, color=%08x\n", layer, lid, color);
+  ginfo("layer=%p, lid=%d, color=%08x\n", layer, lid, color);
   putreg32(color, stm32_color_layer_t[lid]);
 }
 
@@ -1027,7 +1027,7 @@ static void stm32_dma2d_llnr(FAR struct stm32_dma2d_s *layer,
 {
   uint32_t nlrreg;
 
-  gvdbg("pixel per line: %d, number of lines: %d\n", area->xres, area->yres);
+  ginfo("pixel per line: %d, number of lines: %d\n", area->xres, area->yres);
 
   nlrreg = getreg32(STM32_DMA2D_NLR);
   nlrreg = (DMA2D_NLR_PL(area->xres) | DMA2D_NLR_NL(area->yres));
@@ -1047,7 +1047,7 @@ static void stm32_dma2d_llnr(FAR struct stm32_dma2d_s *layer,
 
 static int stm32_dma2d_loutpfc(FAR const struct stm32_dma2d_s *layer)
 {
-  gvdbg("layer=%p\n", layer);
+  ginfo("layer=%p\n", layer);
 
   /* CLUT format isn't supported by the dma2d controller */
 
@@ -1083,7 +1083,7 @@ static void stm32_dma2d_lpfc(FAR const struct stm32_dma2d_s *layer,
 {
   uint32_t   pfccrreg;
 
-  gvdbg("layer=%p, lid=%d, blendmode=%08x\n", layer, lid, blendmode);
+  ginfo("layer=%p, lid=%d, blendmode=%08x\n", layer, lid, blendmode);
 
   /* Set color format */
 
@@ -1172,7 +1172,7 @@ static int stm32_dma2dgetvideoinfo(FAR struct dma2d_layer_s *layer,
 {
   FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer;
 
-  gvdbg("layer=%p, vinfo=%p\n", layer, vinfo);
+  ginfo("layer=%p, vinfo=%p\n", layer, vinfo);
 
   if (stm32_dma2d_lvalidate(priv) && vinfo)
     {
@@ -1209,7 +1209,7 @@ static int stm32_dma2dgetplaneinfo(FAR struct dma2d_layer_s *layer, int planeno,
 {
   FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer;
 
-  gvdbg("layer=%p, planeno=%d, pinfo=%p\n", layer, planeno, pinfo);
+  ginfo("layer=%p, planeno=%d, pinfo=%p\n", layer, planeno, pinfo);
 
   if (stm32_dma2d_lvalidate(priv) && pinfo && planeno == 0)
     {
@@ -1244,7 +1244,7 @@ static int stm32_dma2dgetlid(FAR struct dma2d_layer_s *layer, int *lid)
 {
   FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer;
 
-  gvdbg("layer=%p, lid=%p\n", layer, lid);
+  ginfo("layer=%p, lid=%p\n", layer, lid);
 
   if (stm32_dma2d_lvalidate(priv) && lid)
     {
@@ -1282,7 +1282,7 @@ static int stm32_dma2dsetclut(FAR struct dma2d_layer_s *layer,
   int   ret;
   FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer;
 
-  gvdbg("layer=%p, cmap=%p\n", layer, cmap);
+  ginfo("layer=%p, cmap=%p\n", layer, cmap);
 
   if (stm32_dma2d_lvalidate(priv) && cmap)
     {
@@ -1349,7 +1349,7 @@ static int stm32_dma2dsetclut(FAR struct dma2d_layer_s *layer,
               clut888[offset + 1] = cmap->green[n];
               clut888[offset + 2] = cmap->red[n];
 
-              regvdbg("n=%d, red=%02x, green=%02x, blue=%02x\n", n,
+              reginfo("n=%d, red=%02x, green=%02x, blue=%02x\n", n,
                         clut888[offset], clut888[offset + 1],
                         clut888[offset + 2]);
 #else
@@ -1358,7 +1358,7 @@ static int stm32_dma2dsetclut(FAR struct dma2d_layer_s *layer,
                         (uint32_t)DMA2D_CLUT_GREEN(cmap->green[n]) |
                         (uint32_t)DMA2D_CLUT_BLUE(cmap->blue[n]);
 
-              regvdbg("n=%d, alpha=%02x, red=%02x, green=%02x, blue=%02x\n", n,
+              reginfo("n=%d, alpha=%02x, red=%02x, green=%02x, blue=%02x\n", n,
                         DMA2D_CLUT_ALPHA(cmap->alpha[n]),
                         DMA2D_CLUT_RED(cmap->red[n]),
                         DMA2D_CLUT_GREEN(cmap->green[n]),
@@ -1401,7 +1401,7 @@ static int stm32_dma2dgetclut(FAR struct dma2d_layer_s *layer,
   int ret;
   FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer;
 
-  gvdbg("layer=%p, cmap=%p\n", layer, cmap);
+  ginfo("layer=%p, cmap=%p\n", layer, cmap);
 
   if (stm32_dma2d_lvalidate(priv) && cmap)
     {
@@ -1438,7 +1438,7 @@ static int stm32_dma2dgetclut(FAR struct dma2d_layer_s *layer,
               cmap->green[n]  = clut888[offset + 1];
               cmap->red[n]    = clut888[offset + 2];
 
-              regvdbg("n=%d, red=%02x, green=%02x, blue=%02x\n", n,
+              reginfo("n=%d, red=%02x, green=%02x, blue=%02x\n", n,
                         clut888[offset], clut888[offset + 1],
                         clut888[offset + 2]);
 #else
@@ -1447,7 +1447,7 @@ static int stm32_dma2dgetclut(FAR struct dma2d_layer_s *layer,
               cmap->green[n]  = (uint8_t)DMA2D_CMAP_GREEN(clut[n]);
               cmap->blue[n]   = (uint8_t)DMA2D_CMAP_BLUE(clut[n]);
 
-              regvdbg("n=%d, alpha=%02x, red=%02x, green=%02x, blue=%02x\n", n,
+              reginfo("n=%d, alpha=%02x, red=%02x, green=%02x, blue=%02x\n", n,
                         DMA2D_CMAP_ALPHA(clut[n]), DMA2D_CMAP_RED(clut[n]),
                         DMA2D_CMAP_GREEN(clut[n]), DMA2D_CMAP_BLUE(clut[n]));
 #endif
@@ -1491,7 +1491,7 @@ static int stm32_dma2dsetalpha(FAR struct dma2d_layer_s *layer, uint8_t alpha)
 {
   FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer;
 
-  gvdbg("layer=%p, alpha=%02x\n", layer, alpha);
+  ginfo("layer=%p, alpha=%02x\n", layer, alpha);
 
   if (stm32_dma2d_lvalidate(priv))
     {
@@ -1526,7 +1526,7 @@ static int stm32_dma2dgetalpha(FAR struct dma2d_layer_s *layer, uint8_t *alpha)
 {
   FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer;
 
-  gvdbg("layer=%p, alpha=%p\n", layer, alpha);
+  ginfo("layer=%p, alpha=%p\n", layer, alpha);
 
   if (stm32_dma2d_lvalidate(priv))
     {
@@ -1577,7 +1577,7 @@ static int stm32_dma2dsetblendmode(FAR struct dma2d_layer_s *layer,
 {
   FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer;
 
-  gvdbg("layer=%p, mode=%08x\n", layer, mode);
+  ginfo("layer=%p, mode=%08x\n", layer, mode);
 
   if (stm32_dma2d_lvalidate(priv))
     {
@@ -1613,7 +1613,7 @@ static int stm32_dma2dgetblendmode(FAR struct dma2d_layer_s *layer,
 {
   FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer;
 
-  gvdbg("layer=%p, mode=%p\n", layer, mode);
+  ginfo("layer=%p, mode=%p\n", layer, mode);
 
   if (stm32_dma2d_lvalidate(priv) && mode)
     {
@@ -1661,7 +1661,7 @@ static int stm32_dma2dblit(FAR struct dma2d_layer_s *dest,
   FAR struct stm32_dma2d_s * destlayer = (FAR struct stm32_dma2d_s *)dest;
   FAR struct stm32_dma2d_s * srclayer = (FAR struct stm32_dma2d_s *)src;
 
-  gvdbg("dest=%p, destxpos=%d, destypos=%d, src=%p, srcarea=%p\n",
+  ginfo("dest=%p, destxpos=%d, destypos=%d, src=%p, srcarea=%p\n",
             dest, destxpos, destypos, src, srcarea);
 
   if (stm32_dma2d_lvalidatesize(destlayer, destxpos, destypos, srcarea) &&
@@ -1772,7 +1772,7 @@ static int stm32_dma2dblend(FAR struct dma2d_layer_s *dest,
   FAR struct stm32_dma2d_s * forelayer = (FAR struct stm32_dma2d_s *)fore;
   FAR struct stm32_dma2d_s * backlayer = (FAR struct stm32_dma2d_s *)back;
 
-  gvdbg("dest=%p, destxpos=%d, destypos=%d, "
+  ginfo("dest=%p, destxpos=%d, destypos=%d, "
         "fore=%p, forexpos=%d, foreypos=%d, "
         "back=%p, backarea=%p\n",
         dest, destxpos, destypos, fore, forexpos, foreypos, back, backarea);
@@ -1874,7 +1874,7 @@ static int stm32_dma2dfillarea(FAR struct dma2d_layer_s *layer,
   int ret;
   FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer;
 
-  gvdbg("layer=%p, area=%p, color=%08x\n", layer, area, color);
+  ginfo("layer=%p, area=%p, color=%08x\n", layer, area, color);
 
   if (stm32_dma2d_lvalidatesize(priv, area->xpos, area->ypos, area))
     {
@@ -1989,7 +1989,7 @@ FAR struct dma2d_layer_s *up_dma2dcreatelayer(fb_coord_t width,
   uint8_t    bpp = 0;
   FAR struct stm32_dma2d_s *layer = NULL;
 
-  gvdbg("width=%d, height=%d, fmt=%02x \n", width, height, fmt);
+  ginfo("width=%d, height=%d, fmt=%02x \n", width, height, fmt);
 
   /* Validate if pixel format supported */
 
@@ -2265,7 +2265,7 @@ FAR struct dma2d_layer_s * stm32_dma2dinitltdc(FAR struct stm32_ltdc_s *layer)
   uint8_t    fmt = 0;
   FAR struct stm32_ltdc_dma2d_s *priv;
 
-  gvdbg("layer=%p\n", layer);
+  ginfo("layer=%p\n", layer);
   DEBUGASSERT(layer && layer->lid >= 0 && layer->lid < DMA2D_SHADOW_LAYER);
 
   ret = stm32_dma2d_pixelformat(layer->vinfo.fmt, &fmt);
diff --git a/arch/arm/src/stm32/stm32_eth.c b/arch/arm/src/stm32/stm32_eth.c
index c7a4abc044..481538aedd 100644
--- a/arch/arm/src/stm32/stm32_eth.c
+++ b/arch/arm/src/stm32/stm32_eth.c
@@ -1012,7 +1012,7 @@ static int stm32_transmit(FAR struct stm32_ethmac_s *priv)
   txdesc  = priv->txhead;
   txfirst = txdesc;
 
-  nllvdbg("d_len: %d d_buf: %p txhead: %p tdes0: %08x\n",
+  nllinfo("d_len: %d d_buf: %p txhead: %p tdes0: %08x\n",
           priv->dev.d_len, priv->dev.d_buf, txdesc, txdesc->tdes0);
 
   DEBUGASSERT(txdesc && (txdesc->tdes0 & ETH_TDES0_OWN) == 0);
@@ -1029,7 +1029,7 @@ static int stm32_transmit(FAR struct stm32_ethmac_s *priv)
       bufcount = (priv->dev.d_len + (CONFIG_STM32_ETH_BUFSIZE-1)) / CONFIG_STM32_ETH_BUFSIZE;
       lastsize = priv->dev.d_len - (bufcount - 1) * CONFIG_STM32_ETH_BUFSIZE;
 
-      nllvdbg("bufcount: %d lastsize: %d\n", bufcount, lastsize);
+      nllinfo("bufcount: %d lastsize: %d\n", bufcount, lastsize);
 
       /* Set the first segment bit in the first TX descriptor */
 
@@ -1139,7 +1139,7 @@ static int stm32_transmit(FAR struct stm32_ethmac_s *priv)
 
   priv->inflight++;
 
-  nllvdbg("txhead: %p txtail: %p inflight: %d\n",
+  nllinfo("txhead: %p txtail: %p inflight: %d\n",
           priv->txhead, priv->txtail, priv->inflight);
 
   /* If all TX descriptors are in-flight, then we have to disable receive interrupts
@@ -1438,7 +1438,7 @@ static void stm32_freesegment(FAR struct stm32_ethmac_s *priv,
   struct eth_rxdesc_s *rxdesc;
   int i;
 
-  nllvdbg("rxfirst: %p segments: %d\n", rxfirst, segments);
+  nllinfo("rxfirst: %p segments: %d\n", rxfirst, segments);
 
   /* Set OWN bit in RX descriptors.  This gives the buffers back to DMA */
 
@@ -1496,7 +1496,7 @@ static int stm32_recvframe(FAR struct stm32_ethmac_s *priv)
   uint8_t *buffer;
   int i;
 
-  nllvdbg("rxhead: %p rxcurr: %p segments: %d\n",
+  nllinfo("rxhead: %p rxcurr: %p segments: %d\n",
           priv->rxhead, priv->rxcurr, priv->segments);
 
   /* Check if there are free buffers.  We cannot receive new frames in this
@@ -1562,7 +1562,7 @@ static int stm32_recvframe(FAR struct stm32_ethmac_s *priv)
               rxcurr = priv->rxcurr;
             }
 
-          nllvdbg("rxhead: %p rxcurr: %p segments: %d\n",
+          nllinfo("rxhead: %p rxcurr: %p segments: %d\n",
               priv->rxhead, priv->rxcurr, priv->segments);
 
           /* Check if any errors are reported in the frame */
@@ -1601,7 +1601,7 @@ static int stm32_recvframe(FAR struct stm32_ethmac_s *priv)
               priv->rxhead   = (struct eth_rxdesc_s *)rxdesc->rdes3;
               stm32_freesegment(priv, rxcurr, priv->segments);
 
-              nllvdbg("rxhead: %p d_buf: %p d_len: %d\n",
+              nllinfo("rxhead: %p d_buf: %p d_len: %d\n",
                       priv->rxhead, dev->d_buf, dev->d_len);
 
               return OK;
@@ -1628,7 +1628,7 @@ static int stm32_recvframe(FAR struct stm32_ethmac_s *priv)
 
   priv->rxhead = rxdesc;
 
-  nllvdbg("rxhead: %p rxcurr: %p segments: %d\n",
+  nllinfo("rxhead: %p rxcurr: %p segments: %d\n",
           priv->rxhead, priv->rxcurr, priv->segments);
 
   return -EAGAIN;
@@ -1698,7 +1698,7 @@ static void stm32_receive(FAR struct stm32_ethmac_s *priv)
 #ifdef CONFIG_NET_IPv4
       if (BUF->type == HTONS(ETHTYPE_IP))
         {
-          nllvdbg("IPv4 frame\n");
+          nllinfo("IPv4 frame\n");
 
           /* Handle ARP on input then give the IPv4 packet to the network
            * layer
@@ -1738,7 +1738,7 @@ static void stm32_receive(FAR struct stm32_ethmac_s *priv)
 #ifdef CONFIG_NET_IPv6
       if (BUF->type == HTONS(ETHTYPE_IP6))
         {
-          nllvdbg("Iv6 frame\n");
+          nllinfo("Iv6 frame\n");
 
           /* Give the IPv6 packet to the network layer */
 
@@ -1775,7 +1775,7 @@ static void stm32_receive(FAR struct stm32_ethmac_s *priv)
 #ifdef CONFIG_NET_ARP
       if (BUF->type == htons(ETHTYPE_ARP))
         {
-          nllvdbg("ARP frame\n");
+          nllinfo("ARP frame\n");
 
           /* Handle ARP packet */
 
@@ -1834,7 +1834,7 @@ static void stm32_freeframe(FAR struct stm32_ethmac_s *priv)
   struct eth_txdesc_s *txdesc;
   int i;
 
-  nllvdbg("txhead: %p txtail: %p inflight: %d\n",
+  nllinfo("txhead: %p txtail: %p inflight: %d\n",
           priv->txhead, priv->txtail, priv->inflight);
 
   /* Scan for "in-flight" descriptors owned by the CPU */
@@ -1850,7 +1850,7 @@ static void stm32_freeframe(FAR struct stm32_ethmac_s *priv)
            * TX descriptors.
            */
 
-          nllvdbg("txtail: %p tdes0: %08x tdes2: %08x tdes3: %08x\n",
+          nllinfo("txtail: %p tdes0: %08x tdes2: %08x tdes3: %08x\n",
                   txdesc, txdesc->tdes0, txdesc->tdes2, txdesc->tdes3);
 
           DEBUGASSERT(txdesc->tdes2 != 0);
@@ -1903,7 +1903,7 @@ static void stm32_freeframe(FAR struct stm32_ethmac_s *priv)
 
       priv->txtail = txdesc;
 
-      nllvdbg("txhead: %p txtail: %p inflight: %d\n",
+      nllinfo("txhead: %p txtail: %p inflight: %d\n",
               priv->txhead, priv->txtail, priv->inflight);
     }
 }
@@ -2545,7 +2545,7 @@ static int stm32_ifdown(struct net_driver_s *dev)
 
 static inline void stm32_txavail_process(FAR struct stm32_ethmac_s *priv)
 {
-  nvdbg("ifup: %d\n", priv->ifup);
+  ninfo("ifup: %d\n", priv->ifup);
 
   /* Ignore the notification if the interface is not yet up */
 
@@ -2712,7 +2712,7 @@ static int stm32_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
   uint32_t temp;
   uint32_t registeraddress;
 
-  nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
           mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
   /* Add the MAC address to the hardware multicast hash table */
@@ -2769,7 +2769,7 @@ static int stm32_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac)
   uint32_t temp;
   uint32_t registeraddress;
 
-  nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
           mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
   /* Remove the MAC address to the hardware multicast hash table */
@@ -3236,7 +3236,7 @@ static inline int stm32_dm9161(FAR struct stm32_ethmac_s *priv)
       up_systemreset();
     }
 
-  nvdbg("PHY ID1: 0x%04X\n", phyval);
+  ninfo("PHY ID1: 0x%04X\n", phyval);
 
   /* Now check the "DAVICOM Specified Configuration Register (DSCR)", Register 16 */
 
@@ -3393,7 +3393,7 @@ static int stm32_phyinit(FAR struct stm32_ethmac_s *priv)
 
   /* Remember the selected speed and duplex modes */
 
-  nvdbg("PHYSR[%d]: %04x\n", CONFIG_STM32_PHYSR, phyval);
+  ninfo("PHYSR[%d]: %04x\n", CONFIG_STM32_PHYSR, phyval);
 
   /* Different PHYs present speed and mode information in different ways.  IF
    * This CONFIG_STM32_PHYSR_ALTCONFIG is selected, this indicates that the PHY
@@ -3853,7 +3853,7 @@ static void stm32_macaddress(FAR struct stm32_ethmac_s *priv)
   FAR struct net_driver_s *dev = &priv->dev;
   uint32_t regval;
 
-  nllvdbg("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  nllinfo("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
           dev->d_ifname,
           dev->d_mac.ether_addr_octet[0], dev->d_mac.ether_addr_octet[1],
           dev->d_mac.ether_addr_octet[2], dev->d_mac.ether_addr_octet[3],
@@ -3921,7 +3921,7 @@ static void stm32_ipv6multicast(FAR struct stm32_ethmac_s *priv)
   mac[4] = tmp16 & 0xff;
   mac[5] = tmp16 >> 8;
 
-  nvdbg("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  ninfo("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n",
         mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
   (void)stm32_addmac(dev, mac);
@@ -4059,12 +4059,12 @@ static int stm32_ethconfig(FAR struct stm32_ethmac_s *priv)
 
   /* Reset the Ethernet block */
 
-  nllvdbg("Reset the Ethernet block\n");
+  nllinfo("Reset the Ethernet block\n");
   stm32_ethreset(priv);
 
   /* Initialize the PHY */
 
-  nllvdbg("Initialize the PHY\n");
+  nllinfo("Initialize the PHY\n");
   ret = stm32_phyinit(priv);
   if (ret < 0)
     {
@@ -4073,7 +4073,7 @@ static int stm32_ethconfig(FAR struct stm32_ethmac_s *priv)
 
   /* Initialize the MAC and DMA */
 
-  nllvdbg("Initialize the MAC and DMA\n");
+  nllinfo("Initialize the MAC and DMA\n");
   ret = stm32_macconfig(priv);
   if (ret < 0)
     {
@@ -4094,7 +4094,7 @@ static int stm32_ethconfig(FAR struct stm32_ethmac_s *priv)
 
   /* Enable normal MAC operation */
 
-  nllvdbg("Enable normal operation\n");
+  nllinfo("Enable normal operation\n");
   return stm32_macenable(priv);
 }
 
@@ -4130,7 +4130,7 @@ int stm32_ethinitialize(int intf)
 {
   struct stm32_ethmac_s *priv;
 
-  nvdbg("intf: %d\n", intf);
+  ninfo("intf: %d\n", intf);
 
   /* Get the interface structure associated with this interface number. */
 
diff --git a/arch/arm/src/stm32/stm32_i2c.c b/arch/arm/src/stm32/stm32_i2c.c
index 6d06098b01..e1d7e3cade 100644
--- a/arch/arm/src/stm32/stm32_i2c.c
+++ b/arch/arm/src/stm32/stm32_i2c.c
@@ -166,10 +166,10 @@
 
 #ifdef CONFIG_DEBUG_I2C
 #  define i2cdbg dbg
-#  define i2cvdbg vdbg
+#  define i2cinfo info
 #else
 #  define i2cdbg(x...)
-#  define i2cvdbg(x...)
+#  define i2cinfo(x...)
 #endif
 
 /* I2C event trace logic.  NOTE:  trace uses the internal, non-standard, low-level
@@ -693,7 +693,7 @@ static inline int stm32_i2c_sem_waitdone(FAR struct stm32_i2c_priv_s *priv)
 
   while (priv->intstate != INTSTATE_DONE && elapsed < timeout);
 
-  i2cvdbg("intstate: %d elapsed: %ld threshold: %ld status: %08x\n",
+  i2cinfo("intstate: %d elapsed: %ld threshold: %ld status: %08x\n",
           priv->intstate, (long)elapsed, (long)timeout, priv->status);
 
   /* Set the interrupt state back to IDLE */
@@ -766,7 +766,7 @@ static inline void stm32_i2c_sem_waitstop(FAR struct stm32_i2c_priv_s *priv)
    * still pending.
    */
 
-  i2cvdbg("Timeout with CR1: %04x SR1: %04x\n", cr1, sr1);
+  i2cinfo("Timeout with CR1: %04x SR1: %04x\n", cr1, sr1);
 }
 
 /************************************************************************************
diff --git a/arch/arm/src/stm32/stm32_i2c_alt.c b/arch/arm/src/stm32/stm32_i2c_alt.c
index da50a9c263..cc0aa02120 100644
--- a/arch/arm/src/stm32/stm32_i2c_alt.c
+++ b/arch/arm/src/stm32/stm32_i2c_alt.c
@@ -173,10 +173,10 @@
 
 #ifdef CONFIG_DEBUG_I2C
 #  define i2cdbg dbg
-#  define i2cvdbg vdbg
+#  define i2cinfo info
 #else
 #  define i2cdbg(x...)
-#  define i2cvdbg(x...)
+#  define i2cinfo(x...)
 #endif
 
 /* I2C event trace logic.  NOTE:  trace uses the internal, non-standard, low-level
@@ -701,7 +701,7 @@ static int stm32_i2c_sem_waitdone(FAR struct stm32_i2c_priv_s *priv)
 
   while (priv->intstate != INTSTATE_DONE && elapsed < timeout);
 
-  i2cvdbg("intstate: %d elapsed: %ld threshold: %ld status: %08x\n",
+  i2cinfo("intstate: %d elapsed: %ld threshold: %ld status: %08x\n",
           priv->intstate, (long)elapsed, (long)timeout, priv->status);
 
   /* Set the interrupt state back to IDLE */
@@ -774,7 +774,7 @@ static inline void stm32_i2c_sem_waitstop(FAR struct stm32_i2c_priv_s *priv)
    * still pending.
    */
 
-  i2cvdbg("Timeout with CR1: %04x SR1: %04x\n", cr1, sr1);
+  i2cinfo("Timeout with CR1: %04x SR1: %04x\n", cr1, sr1);
 }
 
 /************************************************************************************
@@ -1208,7 +1208,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv)
 {
   uint32_t status;
 
-  i2cvdbg("I2C ISR called\n");
+  i2cinfo("I2C ISR called\n");
 
   /* Get state of the I2C controller (register SR1 only)
    *
@@ -1252,7 +1252,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv)
 
   if (priv->dcnt == -1 && priv->msgc > 0)
     {
-      i2cvdbg("Switch to new message\n");
+      i2cinfo("Switch to new message\n");
 
       /* Get current message to process data and copy to private structure */
 
@@ -1261,7 +1261,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv)
       priv->total_msg_len = priv->msgv->length;   /* Set total msg length */
       priv->flags         = priv->msgv->flags;    /* Copy flags to private struct */
 
-      i2cvdbg("Current flags %i\n", priv->flags);
+      i2cinfo("Current flags %i\n", priv->flags);
 
       /* Decrease counter to indicate the number of messages left to process */
 
@@ -1314,7 +1314,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv)
     {
       /* Start bit is set */
 
-      i2cvdbg("Entering address handling, status = %i\n", status);
+      i2cinfo("Entering address handling, status = %i\n", status);
 
       /* Check for empty message (for robustness) */
 
@@ -1326,7 +1326,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv)
 
           if (priv->total_msg_len == 1 && (priv->flags & I2C_M_READ))
             {
-              i2cvdbg("short read N=1: setting NACK\n");
+              i2cinfo("short read N=1: setting NACK\n");
 
               /* Set POS bit to zero (can be up from a previous 2 byte receive) */
 
@@ -1339,7 +1339,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv)
             }
           else if (priv->total_msg_len == 2 && (priv->flags & I2C_M_READ))
             {
-              i2cvdbg("short read N=2: setting POS and ACK bits\n");
+              i2cinfo("short read N=2: setting POS and ACK bits\n");
 
               stm32_i2c_modifyreg(priv, STM32_I2C_CR1_OFFSET, 0, I2C_CR1_POS);
               stm32_i2c_modifyreg(priv, STM32_I2C_CR1_OFFSET, 0, I2C_CR1_ACK);
@@ -1349,7 +1349,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv)
             {
               /* Enable ACK after address byte */
 
-              i2cvdbg("setting ACK\n");
+              i2cinfo("setting ACK\n");
 
               /* Set POS bit to zero (can be up from a previous 2 byte receive) */
 
@@ -1369,7 +1369,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv)
                            (priv->flags & I2C_M_TEN) ?
                            0 :((priv->msgv->addr << 1) | (priv->flags & I2C_M_READ)));
 
-          i2cvdbg("Address sent. Addr=%#02x Write/Read bit=%i\n",
+          i2cinfo("Address sent. Addr=%#02x Write/Read bit=%i\n",
                   priv->msgv->addr, (priv->flags & I2C_M_READ));
 
           /* Flag that address has just been sent */
@@ -1428,15 +1428,15 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv)
 
   else if ((status & I2C_SR1_ADDR) == 0 && priv->check_addr_ACK)
     {
-      i2cvdbg("Invalid Address. Setting stop bit and clearing message\n");
-      i2cvdbg("status %i\n", status);
+      i2cinfo("Invalid Address. Setting stop bit and clearing message\n");
+      i2cinfo("status %i\n", status);
 
       /* Set condition to terminate msg chain transmission as address is invalid. */
 
       priv->dcnt = -1;
       priv->msgc = 0;
 
-      i2cvdbg("dcnt %i , msgc %i\n", priv->dcnt, priv->msgc);
+      i2cinfo("dcnt %i , msgc %i\n", priv->dcnt, priv->msgc);
 
       /* Reset flag to check for valid address */
 
@@ -1482,8 +1482,8 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv)
           stm32_i2c_modifyreg(priv, STM32_I2C_CR2_OFFSET, 0, I2C_CR2_ITBUFEN);
           stm32_i2c_sendstop(priv);
 
-          i2cvdbg("Address ACKed beginning data reception\n");
-          i2cvdbg("short read N=1: programming stop bit\n");
+          i2cinfo("Address ACKed beginning data reception\n");
+          i2cinfo("short read N=1: programming stop bit\n");
           priv->dcnt--;
 
           /* Trace */
@@ -1498,8 +1498,8 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv)
 
           stm32_i2c_modifyreg(priv, STM32_I2C_CR1_OFFSET, I2C_CR1_ACK, 0);
 
-          i2cvdbg("Address ACKed beginning data reception\n");
-          i2cvdbg("short read N=2: programming NACK\n");
+          i2cinfo("Address ACKed beginning data reception\n");
+          i2cinfo("short read N=2: programming NACK\n");
 
           /* Trace */
 
@@ -1507,7 +1507,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv)
         }
       else
         {
-          i2cvdbg("Address ACKed beginning data reception\n");
+          i2cinfo("Address ACKed beginning data reception\n");
 
           /* Trace */
 
@@ -1530,7 +1530,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv)
        * transmit the next byte.
        */
 
-      i2cvdbg("Entering write mode dcnt = %i msgc = %i\n",
+      i2cinfo("Entering write mode dcnt = %i msgc = %i\n",
               priv->dcnt, priv->msgc);
 
       /* Clear ADDR flag by reading SR2 and adding it to status */
@@ -1567,12 +1567,12 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv)
               /* If last message send stop bit */
 
               stm32_i2c_sendstop(priv);
-              i2cvdbg("Stop sent dcnt = %i msgc = %i\n", priv->dcnt, priv->msgc);
+              i2cinfo("Stop sent dcnt = %i msgc = %i\n", priv->dcnt, priv->msgc);
 
               /* Decrease counter to get to next message */
 
               priv->dcnt--;
-              i2cvdbg("dcnt %i\n", priv->dcnt);
+              i2cinfo("dcnt %i\n", priv->dcnt);
               stm32_i2c_traceevent(priv, I2CEVENT_WRITE_STOP, priv->dcnt);
             }
 
@@ -1586,13 +1586,13 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv)
             {
               stm32_i2c_sendstart(priv);
 
-              i2cvdbg("Restart detected!\n");
-              i2cvdbg("Nextflag %i\n", priv->msgv[0].flags);
+              i2cinfo("Restart detected!\n");
+              i2cinfo("Nextflag %i\n", priv->msgv[0].flags);
 
               /* Decrease counter to get to next message */
 
               priv->dcnt--;
-              i2cvdbg("dcnt %i\n", priv->dcnt);
+              i2cinfo("dcnt %i\n", priv->dcnt);
               stm32_i2c_traceevent(priv, I2CEVENT_WRITE_RESTART, priv->dcnt);
             }
 
@@ -1654,7 +1654,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv)
        * (RXNE is set) then the driver can read from the data register.
        */
 
-      i2cvdbg("Entering read mode dcnt = %i msgc = %i, status %i\n",
+      i2cinfo("Entering read mode dcnt = %i msgc = %i, status %i\n",
               priv->dcnt, priv->msgc, status);
 
       /* Implementation of method 2 for receiving data following
@@ -1665,7 +1665,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv)
 
       if (priv->dcnt == 0 && priv->total_msg_len == 1)
         {
-          i2cvdbg("short read N=1: Read data from data register(DR)\n");
+          i2cinfo("short read N=1: Read data from data register(DR)\n");
 
           *priv->ptr++ = stm32_i2c_getreg(priv, STM32_I2C_DR_OFFSET);
           priv->dcnt--;
@@ -1676,12 +1676,12 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv)
 
       else if (priv->dcnt == 2 && priv->total_msg_len == 2 && !(status & I2C_SR1_BTF))
         {
-          i2cvdbg("short read N=2: DR full, SR empty. Waiting for more bytes.\n");
+          i2cinfo("short read N=2: DR full, SR empty. Waiting for more bytes.\n");
           stm32_i2c_traceevent(priv, I2CEVENT_READ_SR_EMPTY, 0);
         }
       else if (priv->dcnt == 2 && priv->total_msg_len == 2 && (status & I2C_SR1_BTF))
         {
-          i2cvdbg("short read N=2: DR and SR full setting stop bit and reading twice\n");
+          i2cinfo("short read N=2: DR and SR full setting stop bit and reading twice\n");
 
           stm32_i2c_sendstop(priv);
           *priv->ptr++ = stm32_i2c_getreg(priv, STM32_I2C_DR_OFFSET);
@@ -1708,7 +1708,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv)
            * this should be able to handle it).
            */
 
-          i2cvdbg("DR full, SR empty. Waiting for more bytes.\n");
+          i2cinfo("DR full, SR empty. Waiting for more bytes.\n");
           stm32_i2c_traceevent(priv, I2CEVENT_READ_SR_EMPTY, 0);
         }
       else if (priv->dcnt >= 4 && priv->total_msg_len >= 3 && (status & I2C_SR1_BTF))
@@ -1717,7 +1717,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv)
            * RXNE(receive buffer not empty) flag.
            */
 
-          i2cvdbg("Read data from data register(DR)\n");
+          i2cinfo("Read data from data register(DR)\n");
           *priv->ptr++ = stm32_i2c_getreg(priv, STM32_I2C_DR_OFFSET);
 
           /* Decrease current message length */
@@ -1732,8 +1732,8 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv)
            * This coincides with EV7_2 in the reference manual.
            */
 
-          i2cvdbg("Program NACK\n");
-          i2cvdbg("Read data from data register(DR) dcnt=3\n");
+          i2cinfo("Program NACK\n");
+          i2cinfo("Read data from data register(DR) dcnt=3\n");
 
           stm32_i2c_traceevent(priv, I2CEVENT_READ_3, priv->dcnt);
 
@@ -1753,10 +1753,10 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv)
         }
       else if (priv->dcnt == 2 && (status & I2C_SR1_BTF) && priv->total_msg_len >= 3)
         {
-          i2cvdbg("Program stop\n");
-          i2cvdbg("Read data from data register(DR) dcnt=2\n");
-          i2cvdbg("Read data from data register(SR) dcnt=1\n");
-          i2cvdbg("Setting condition to stop ISR dcnt = -1\n");
+          i2cinfo("Program stop\n");
+          i2cinfo("Read data from data register(DR) dcnt=2\n");
+          i2cinfo("Read data from data register(SR) dcnt=1\n");
+          i2cinfo("Setting condition to stop ISR dcnt = -1\n");
 
           stm32_i2c_traceevent(priv, I2CEVENT_READ_3, priv->dcnt);
 
@@ -1853,7 +1853,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv)
 
   if (priv->dcnt == -1 && priv->msgc == 0)
     {
-      i2cvdbg("Shutting down I2C ISR\n");
+      i2cinfo("Shutting down I2C ISR\n");
 
       stm32_i2c_traceevent(priv, I2CEVENT_ISR_SHUTDOWN, 0);
 
diff --git a/arch/arm/src/stm32/stm32_idle.c b/arch/arm/src/stm32/stm32_idle.c
index 0786f2ac99..64e08a1b04 100644
--- a/arch/arm/src/stm32/stm32_idle.c
+++ b/arch/arm/src/stm32/stm32_idle.c
@@ -101,7 +101,7 @@ static void up_idlepm(void)
 
       /* Perform board-specific, state-dependent logic here */
 
-      llvdbg("newstate= %d oldstate=%d\n", newstate, oldstate);
+      llinfo("newstate= %d oldstate=%d\n", newstate, oldstate);
 
       /* Then force the global state change */
 
diff --git a/arch/arm/src/stm32/stm32_iwdg.c b/arch/arm/src/stm32/stm32_iwdg.c
index 80d45be729..85af854ef4 100644
--- a/arch/arm/src/stm32/stm32_iwdg.c
+++ b/arch/arm/src/stm32/stm32_iwdg.c
@@ -113,10 +113,10 @@
 
 #ifdef CONFIG_DEBUG_WATCHDOG
 #  define wddbg    lldbg
-#  define wdvdbg   llvdbg
+#  define wdinfo   llinfo
 #else
 #  define wddbg(x...)
-#  define wdvdbg(x...)
+#  define wdinfo(x...)
 #endif
 
 /****************************************************************************
@@ -339,7 +339,7 @@ static int stm32_start(FAR struct watchdog_lowerhalf_s *lower)
   FAR struct stm32_lowerhalf_s *priv = (FAR struct stm32_lowerhalf_s *)lower;
   irqstate_t flags;
 
-  wdvdbg("Entry: started=%d\n");
+  wdinfo("Entry: started=%d\n");
   DEBUGASSERT(priv);
 
   /* Have we already been started? */
@@ -394,7 +394,7 @@ static int stm32_stop(FAR struct watchdog_lowerhalf_s *lower)
 {
   /* There is no way to disable the IDWG timer once it has been started */
 
-  wdvdbg("Entry\n");
+  wdinfo("Entry\n");
   return -ENOSYS;
 }
 
@@ -420,7 +420,7 @@ static int stm32_keepalive(FAR struct watchdog_lowerhalf_s *lower)
   FAR struct stm32_lowerhalf_s *priv = (FAR struct stm32_lowerhalf_s *)lower;
   irqstate_t flags;
 
-  wdvdbg("Entry\n");
+  wdinfo("Entry\n");
 
   /* Reload the IWDG timer */
 
@@ -455,7 +455,7 @@ static int stm32_getstatus(FAR struct watchdog_lowerhalf_s *lower,
   uint32_t ticks;
   uint32_t elapsed;
 
-  wdvdbg("Entry\n");
+  wdinfo("Entry\n");
   DEBUGASSERT(priv);
 
   /* Return the status bit */
@@ -484,10 +484,10 @@ static int stm32_getstatus(FAR struct watchdog_lowerhalf_s *lower,
 
   status->timeleft = priv->timeout - elapsed;
 
-  wdvdbg("Status     :\n");
-  wdvdbg("  flags    : %08x\n", status->flags);
-  wdvdbg("  timeout  : %d\n", status->timeout);
-  wdvdbg("  timeleft : %d\n", status->timeleft);
+  wdinfo("Status     :\n");
+  wdinfo("  flags    : %08x\n", status->flags);
+  wdinfo("  timeout  : %d\n", status->timeout);
+  wdinfo("  timeleft : %d\n", status->timeleft);
   return OK;
 }
 
@@ -516,7 +516,7 @@ static int stm32_settimeout(FAR struct watchdog_lowerhalf_s *lower,
   int prescaler;
   int shift;
 
-  wdvdbg("Entry: timeout=%d\n", timeout);
+  wdinfo("Entry: timeout=%d\n", timeout);
   DEBUGASSERT(priv);
 
   /* Can this timeout be represented? */
@@ -631,7 +631,7 @@ static int stm32_settimeout(FAR struct watchdog_lowerhalf_s *lower,
     }
 #endif
 
-  wdvdbg("prescaler=%d fiwdg=%d reload=%d\n", prescaler, fiwdg, reload);
+  wdinfo("prescaler=%d fiwdg=%d reload=%d\n", prescaler, fiwdg, reload);
 
   return OK;
 }
@@ -662,7 +662,7 @@ void stm32_iwdginitialize(FAR const char *devpath, uint32_t lsifreq)
 {
   FAR struct stm32_lowerhalf_s *priv = &g_wdgdev;
 
-  wdvdbg("Entry: devpath=%s lsifreq=%d\n", devpath, lsifreq);
+  wdinfo("Entry: devpath=%s lsifreq=%d\n", devpath, lsifreq);
 
   /* NOTE we assume that clocking to the IWDG has already been provided by
    * the RCC initialization logic.
@@ -682,7 +682,7 @@ void stm32_iwdginitialize(FAR const char *devpath, uint32_t lsifreq)
    */
 
   stm32_rcc_enablelsi();
-  wdvdbg("RCC CSR: %08x\n", getreg32(STM32_RCC_CSR));
+  wdinfo("RCC CSR: %08x\n", getreg32(STM32_RCC_CSR));
 
   /* Select an arbitrary initial timeout value.  But don't start the watchdog
    * yet. NOTE: If the "Hardware watchdog" feature is enabled through the
diff --git a/arch/arm/src/stm32/stm32_ltdc.c b/arch/arm/src/stm32/stm32_ltdc.c
index 8ae8e890fd..678aceda7e 100644
--- a/arch/arm/src/stm32/stm32_ltdc.c
+++ b/arch/arm/src/stm32/stm32_ltdc.c
@@ -284,10 +284,10 @@
 
 #ifdef CONFIG_STM32_LTDC_REGDEBUG
 #  define regdbg       dbg
-#  define regvdbg      vdbg
+#  define reginfo      info
 #else
 #  define regdbg(x...)
-#  define regvdbg(x...)
+#  define reginfo(x...)
 #endif
 
 /* Preallocated LTDC framebuffers */
@@ -942,13 +942,13 @@ static void stm32_ltdc_gpioconfig(void)
 {
   int i;
 
-  gvdbg("Configuring pins\n");
+  ginfo("Configuring pins\n");
 
   /* Configure each pin */
 
   for (i = 0; i < STM32_LTDC_NPINCONFIGS; i++)
     {
-      regvdbg("set gpio%d = %08x\n", i, g_ltdcpins[i]);
+      reginfo("set gpio%d = %08x\n", i, g_ltdcpins[i]);
       stm32_configgpio(g_ltdcpins[i]);
     }
 }
@@ -972,51 +972,51 @@ static void stm32_ltdc_periphconfig(void)
 
   /* Configure APB2 LTDC clock external */
 
-  regvdbg("configured RCC_APB2ENR=%08x\n", getreg32(STM32_RCC_APB2ENR));
+  reginfo("configured RCC_APB2ENR=%08x\n", getreg32(STM32_RCC_APB2ENR));
 
   /* Configure the SAI PLL external to provide the LCD_CLK */
 
-  regvdbg("configured RCC_PLLSAI=%08x\n", getreg32(STM32_RCC_PLLSAICFGR));
+  reginfo("configured RCC_PLLSAI=%08x\n", getreg32(STM32_RCC_PLLSAICFGR));
 
   /* Configure dedicated clock external */
 
-  regvdbg("configured RCC_DCKCFGR=%08x\n", getreg32(STM32_RCC_DCKCFGR));
+  reginfo("configured RCC_DCKCFGR=%08x\n", getreg32(STM32_RCC_DCKCFGR));
 
   /* Configure LTDC_SSCR */
 
   regval = (STM32_LTDC_SSCR_VSH | STM32_LTDC_SSCR_HSW);
-  regvdbg("set LTDC_SSCR=%08x\n", regval);
+  reginfo("set LTDC_SSCR=%08x\n", regval);
   putreg32(regval, STM32_LTDC_SSCR);
-  regvdbg("configured LTDC_SSCR=%08x\n", getreg32(STM32_LTDC_SSCR));
+  reginfo("configured LTDC_SSCR=%08x\n", getreg32(STM32_LTDC_SSCR));
 
   /* Configure LTDC_BPCR */
 
   regval = (STM32_LTDC_BPCR_AVBP | STM32_LTDC_BPCR_AHBP);
-  regvdbg("set LTDC_BPCR=%08x\n", regval);
+  reginfo("set LTDC_BPCR=%08x\n", regval);
   putreg32(regval, STM32_LTDC_BPCR);
-  regvdbg("configured LTDC_BPCR=%08x\n", getreg32(STM32_LTDC_BPCR));
+  reginfo("configured LTDC_BPCR=%08x\n", getreg32(STM32_LTDC_BPCR));
 
   /* Configure LTDC_AWCR */
 
   regval = (STM32_LTDC_AWCR_AAH | STM32_LTDC_AWCR_AAW);
-  regvdbg("set LTDC_AWCR=%08x\n", regval);
+  reginfo("set LTDC_AWCR=%08x\n", regval);
   putreg32(regval, STM32_LTDC_AWCR);
-  regvdbg("configured LTDC_AWCR=%08x\n", getreg32(STM32_LTDC_AWCR));
+  reginfo("configured LTDC_AWCR=%08x\n", getreg32(STM32_LTDC_AWCR));
 
   /* Configure LTDC_TWCR */
 
   regval = (STM32_LTDC_TWCR_TOTALH | STM32_LTDC_TWCR_TOTALW);
-  regvdbg("set LTDC_TWCR=%08x\n", regval);
+  reginfo("set LTDC_TWCR=%08x\n", regval);
   putreg32(regval, STM32_LTDC_TWCR);
-  regvdbg("configured LTDC_TWCR=%08x\n", getreg32(STM32_LTDC_TWCR));
+  reginfo("configured LTDC_TWCR=%08x\n", getreg32(STM32_LTDC_TWCR));
 
   /* Configure LTDC_GCR */
 
   regval = (STM32_LTDC_GCR_PCPOL | STM32_LTDC_GCR_DEPOL
            | STM32_LTDC_GCR_VSPOL | STM32_LTDC_GCR_HSPOL);
-  regvdbg("set LTDC_GCR=%08x\n", regval);
+  reginfo("set LTDC_GCR=%08x\n", regval);
   putreg32(regval, STM32_LTDC_GCR);
-  regvdbg("configured LTDC_GCR=%08x\n", getreg32(STM32_LTDC_GCR));
+  reginfo("configured LTDC_GCR=%08x\n", getreg32(STM32_LTDC_GCR));
 }
 
 /****************************************************************************
@@ -1032,9 +1032,9 @@ static void stm32_ltdc_periphconfig(void)
 
 static void stm32_ltdc_bgcolor(uint32_t rgb)
 {
-  regvdbg("set LTDC_BCCR=%08x\n", rgb);
+  reginfo("set LTDC_BCCR=%08x\n", rgb);
   putreg32(rgb, STM32_LTDC_BCCR);
-  regvdbg("configured LTDC_BCCR=%08x\n", getreg32(STM32_LTDC_BCCR));
+  reginfo("configured LTDC_BCCR=%08x\n", getreg32(STM32_LTDC_BCCR));
 }
 
 /****************************************************************************
@@ -1073,9 +1073,9 @@ static void stm32_ltdc_dither(bool enable,
                 LTDC_GCR_DGW(0) | LTDC_GCR_DBW(0));
   regval |= (LTDC_GCR_DRW(red) | LTDC_GCR_DGW(green) | LTDC_GCR_DBW(blue));
 
-  regvdbg("set LTDC_GCR=%08x\n", regval);
+  reginfo("set LTDC_GCR=%08x\n", regval);
   putreg32(regval, STM32_LTDC_GCR);
-  regvdbg("configured LTDC_GCR=%08x\n", getreg32(STM32_LTDC_GCR));
+  reginfo("configured LTDC_GCR=%08x\n", getreg32(STM32_LTDC_GCR));
 }
 
 /****************************************************************************
@@ -1090,9 +1090,9 @@ static void stm32_ltdc_linepos(void)
 {
   /* Configure LTDC_LIPCR */
 
-  regvdbg("set LTDC_LIPCR=%08x\n", STM32_LTDC_LIPCR_LIPOS);
+  reginfo("set LTDC_LIPCR=%08x\n", STM32_LTDC_LIPCR_LIPOS);
   putreg32(STM32_LTDC_LIPCR_LIPOS, STM32_LTDC_LIPCR);
-  regvdbg("configured LTDC_LIPCR=%08x\n", getreg32(STM32_LTDC_LIPCR));
+  reginfo("configured LTDC_LIPCR=%08x\n", getreg32(STM32_LTDC_LIPCR));
 }
 
 /****************************************************************************
@@ -1114,9 +1114,9 @@ static void stm32_ltdc_irqctrl(uint32_t setirqs, uint32_t clrirqs)
   regval = getreg32(STM32_LTDC_IER);
   regval &= ~clrirqs;
   regval |= setirqs;
-  regvdbg("set LTDC_IER=%08x\n", regval);
+  reginfo("set LTDC_IER=%08x\n", regval);
   putreg32(regval, STM32_LTDC_IER);
-  regvdbg("configured LTDC_IER=%08x\n", getreg32(STM32_LTDC_IER));
+  reginfo("configured LTDC_IER=%08x\n", getreg32(STM32_LTDC_IER));
 }
 
 /****************************************************************************
@@ -1133,7 +1133,7 @@ static int stm32_ltdcirq(int irq, void *context)
 
   uint32_t regval = getreg32(STM32_LTDC_ISR);
 
-  regvdbg("irq = %d, regval = %08x\n", irq, regval);
+  reginfo("irq = %d, regval = %08x\n", irq, regval);
 
   if (regval & LTDC_ISR_RRIF)
     {
@@ -1255,9 +1255,9 @@ static int stm32_ltdc_reload(uint8_t value, bool waitvblank)
    * immediately reload is set.
    */
 
-  regvdbg("set LTDC_SRCR=%08x\n", value);
+  reginfo("set LTDC_SRCR=%08x\n", value);
   putreg32(value, STM32_LTDC_SRCR);
-  regvdbg("configured LTDC_SRCR=%08x\n", getreg32(STM32_LTDC_SRCR));
+  reginfo("configured LTDC_SRCR=%08x\n", getreg32(STM32_LTDC_SRCR));
 
   if (waitvblank & (value == LTDC_SRCR_VBR))
     {
@@ -1354,7 +1354,7 @@ static void stm32_lcd_enable(bool enable)
   uint32_t    regval;
 
   regval = getreg32(STM32_LTDC_GCR);
-  regvdbg("get LTDC_GCR=%08x\n", regval);
+  reginfo("get LTDC_GCR=%08x\n", regval);
 
   if (enable == true)
     {
@@ -1365,9 +1365,9 @@ static void stm32_lcd_enable(bool enable)
       regval &= ~LTDC_GCR_LTDCEN;
     }
 
-  regvdbg("set LTDC_GCR=%08x\n", regval);
+  reginfo("set LTDC_GCR=%08x\n", regval);
   putreg32(regval, STM32_LTDC_GCR);
-  regvdbg("configured LTDC_GCR=%08x\n", getreg32(STM32_LTDC_GCR));
+  reginfo("configured LTDC_GCR=%08x\n", getreg32(STM32_LTDC_GCR));
 }
 
 /****************************************************************************
@@ -1392,7 +1392,7 @@ static void stm32_ltdc_lclutenable(FAR struct stm32_layer_s *layer, bool enable)
   uint32_t    regval;
 
   regval = getreg32(stm32_cr_layer_t[layer->state.lid]);
-  regvdbg("get LTDC_L%dCR=%08x\n", layer->state.lid + 1, regval);
+  reginfo("get LTDC_L%dCR=%08x\n", layer->state.lid + 1, regval);
 
   /* Disable the clut support during update the color table */
 
@@ -1405,7 +1405,7 @@ static void stm32_ltdc_lclutenable(FAR struct stm32_layer_s *layer, bool enable)
       regval &= ~LTDC_LxCR_CLUTEN;
     }
 
-  regvdbg("set LTDC_L%dCR=%08x\n", layer->state.lid + 1, regval);
+  reginfo("set LTDC_L%dCR=%08x\n", layer->state.lid + 1, regval);
   putreg32(regval, stm32_cr_layer_t[layer->state.lid]);
 }
 #endif
@@ -1615,7 +1615,7 @@ static void stm32_ltdc_larea(struct stm32_layer_s *layer)
   FAR struct stm32_ltdc_s *priv = &layer->state;
   FAR struct ltdc_area_s *area = &priv->area;
 
-  regvdbg("xpos = %d, ypos = %d, xres = %d, yres = %d\n",
+  reginfo("xpos = %d, ypos = %d, xres = %d, yres = %d\n",
         area->xpos, area->ypos, area->xres, area->yres);
 
   lxpos = area->xpos + (STM32_LTDC_LxWHPCR_WHSTPOS + 1);
@@ -1633,9 +1633,9 @@ static void stm32_ltdc_larea(struct stm32_layer_s *layer)
 
   /* Configure LxWHPCR / LxWVPCR register */
 
-  regvdbg("set LTDC_L%dWHPCR=%08x\n", priv->lid + 1, whpcr);
+  reginfo("set LTDC_L%dWHPCR=%08x\n", priv->lid + 1, whpcr);
   putreg32(whpcr, stm32_whpcr_layer_t[priv->lid]);
-  regvdbg("set LTDC_L%dWVPCR=%08x\n", priv->lid + 1, wvpcr);
+  reginfo("set LTDC_L%dWVPCR=%08x\n", priv->lid + 1, wvpcr);
   putreg32(wvpcr, stm32_wvpcr_layer_t[priv->lid]);
 
   /* Configure framebuffer */
@@ -1664,7 +1664,7 @@ static void stm32_ltdc_lpixelformat(FAR struct stm32_layer_s *layer)
 {
   /* Configure PFCR register */
 
-  regvdbg("set LTDC_L%dPFCR=%08x\n", layer->state.lid + 1,
+  reginfo("set LTDC_L%dPFCR=%08x\n", layer->state.lid + 1,
             stm32_fmt_layer_t[layer->state.lid]);
   putreg32(stm32_fmt_layer_t[layer->state.lid],
             stm32_pfcr_layer_t[layer->state.lid]);
@@ -1698,7 +1698,7 @@ static inline void stm32_ltdc_lframebuffer(FAR struct stm32_layer_s *layer)
   offset = priv->xpos * STM32_LTDC_Lx_BYPP(pinfo->bpp) +
             pinfo->stride * priv->ypos;
 
-  regvdbg("set LTDC_L%dCFBAR=%08x\n", priv->lid + 1, pinfo->fbmem + offset);
+  reginfo("set LTDC_L%dCFBAR=%08x\n", priv->lid + 1, pinfo->fbmem + offset);
   putreg32((uint32_t)pinfo->fbmem + offset, stm32_cfbar_layer_t[priv->lid]);
 
   /* Configure LxCFBLR register */
@@ -1708,12 +1708,12 @@ static inline void stm32_ltdc_lframebuffer(FAR struct stm32_layer_s *layer)
   cfblr = LTDC_LxCFBLR_CFBP(pinfo->stride) |
           LTDC_LxCFBLR_CFBLL(area->xres * STM32_LTDC_Lx_BYPP(pinfo->bpp) + 3);
 
-  regvdbg("set LTDC_L%dCFBLR=%08x\n", priv->lid + 1, cfblr);
+  reginfo("set LTDC_L%dCFBLR=%08x\n", priv->lid + 1, cfblr);
   putreg32(cfblr, stm32_cfblr_layer_t[priv->lid]);
 
   /* Configure LxCFBLNR register */
 
-  regvdbg("set LTDC_L%dCFBLNR=%08x\n", priv->lid + 1, area->yres);
+  reginfo("set LTDC_L%dCFBLNR=%08x\n", priv->lid + 1, area->yres);
   putreg32(area->yres, stm32_cfblnr_layer_t[priv->lid]);
 }
 
@@ -1733,7 +1733,7 @@ static inline void stm32_ltdc_lframebuffer(FAR struct stm32_layer_s *layer)
 static void stm32_ltdc_lalpha(FAR struct stm32_layer_s *layer)
 {
   uint8_t opac = stm32_ltdc_lgetopac(layer);
-  regvdbg("set LTDC_L%dCACR=%02x\n", layer->state.lid + 1, opac);
+  reginfo("set LTDC_L%dCACR=%02x\n", layer->state.lid + 1, opac);
   putreg32(opac, stm32_cacr_layer_t[layer->state.lid]);
 
   /* Clear the constant alpha operation flag */
@@ -1760,7 +1760,7 @@ static void stm32_ltdc_lalpha(FAR struct stm32_layer_s *layer)
 static void stm32_ltdc_lblendmode(FAR struct stm32_layer_s *layer,
                                     uint8_t bf1, uint8_t bf2)
 {
-  regvdbg("set LTDC_L%dBFCR=%08x\n", layer->state.lid + 1,
+  reginfo("set LTDC_L%dBFCR=%08x\n", layer->state.lid + 1,
           (LTDC_LxBFCR_BF1(bf1) | LTDC_LxBFCR_BF2(bf2)));
   putreg32((LTDC_LxBFCR_BF1(bf1) | LTDC_LxBFCR_BF2(bf2)),
            stm32_bfcr_layer_t[layer->state.lid]);
@@ -1785,7 +1785,7 @@ static void stm32_ltdc_lblendmode(FAR struct stm32_layer_s *layer,
 
 static void stm32_ltdc_lcolor(FAR struct stm32_layer_s *layer, uint32_t argb)
 {
-  regvdbg("set LTDC_L%dDCCR=%08x\n", layer->state.lid + 1, argb);
+  reginfo("set LTDC_L%dDCCR=%08x\n", layer->state.lid + 1, argb);
   putreg32(argb, stm32_dccr_layer_t[layer->state.lid]);
 
   /* Clear the color operation flag */
@@ -1816,7 +1816,7 @@ static void stm32_ltdc_lcolorkey(FAR struct stm32_layer_s *layer)
     {
       /* Set colorkey */
 
-      regvdbg("set LTDC_L%dCKCR=%08x\n",
+      reginfo("set LTDC_L%dCKCR=%08x\n",
             layer->state.lid + 1, layer->state.colorkey);
       putreg32(layer->state.colorkey, stm32_ckcr_layer_t[layer->state.lid]);
 
@@ -1831,7 +1831,7 @@ static void stm32_ltdc_lcolorkey(FAR struct stm32_layer_s *layer)
       regval &= ~LTDC_LxCR_COLKEN;
     }
 
-  regvdbg("set LTDC_L%dCR=%08x\n", layer->state.lid + 1, regval);
+  reginfo("set LTDC_L%dCR=%08x\n", layer->state.lid + 1, regval);
   putreg32(regval, stm32_cr_layer_t[layer->state.lid]);
 
   /* Clear the colorkey operation flag */
@@ -1903,7 +1903,7 @@ static void stm32_ltdc_lclut(FAR struct stm32_layer_s *layer,
 #endif
 
 
-      regvdbg("set LTDC_L%dCLUTWR = %08x, cmap->first = %d, cmap->len = %d\n",
+      reginfo("set LTDC_L%dCLUTWR = %08x, cmap->first = %d, cmap->len = %d\n",
              layer->state.lid + 1, regval, cmap->first, cmap->len);
       putreg32(regval, stm32_clutwr_layer_t[layer->state.lid]);
     }
@@ -1950,7 +1950,7 @@ static void stm32_ltdc_lenable(FAR struct stm32_layer_s *layer)
       regval &= ~LTDC_LxCR_LEN;
     }
 
-  regvdbg("set LTDC_L%dCR=%08x\n", layer->state.lid + 1, regval);
+  reginfo("set LTDC_L%dCR=%08x\n", layer->state.lid + 1, regval);
   putreg32(regval, stm32_cr_layer_t[layer->state.lid]);
 
   /* Clear the enable operation flag */
@@ -1985,7 +1985,7 @@ static void stm32_ltdc_lclear(FAR struct stm32_layer_s *layer,
       uint8_t *dest = (uint8_t *)priv->pinfo.fbmem;
       int i;
 
-      gvdbg("Clearing display: BPP=%d color=%04x framebuffer=%08x size=%d\n",
+      ginfo("Clearing display: BPP=%d color=%04x framebuffer=%08x size=%d\n",
             priv->pinfo.bpp, color, dest, priv->pinfo.fblen);
 
       for (i = 0; i < priv->pinfo.fblen; i += sizeof(uint8_t))
@@ -2003,7 +2003,7 @@ static void stm32_ltdc_lclear(FAR struct stm32_layer_s *layer,
       uint16_t *dest = (uint16_t *)priv->pinfo.fbmem;
       int i;
 
-      gvdbg("Clearing display: BPP=%d color=%04x framebuffer=%08x size=%d\n",
+      ginfo("Clearing display: BPP=%d color=%04x framebuffer=%08x size=%d\n",
             priv->pinfo.bpp, color, dest, priv->pinfo.fblen);
 
       for (i = 0; i < priv->pinfo.fblen; i += sizeof(uint16_t))
@@ -2024,7 +2024,7 @@ static void stm32_ltdc_lclear(FAR struct stm32_layer_s *layer,
       uint8_t b;
       int i;
 
-      gvdbg("Clearing display: BPP=%d color=%04x framebuffer=%08x size=%d\n",
+      ginfo("Clearing display: BPP=%d color=%04x framebuffer=%08x size=%d\n",
             priv->pinfo.bpp, color, dest, priv->pinfo.fblen);
 
       r = (uint8_t) color;
@@ -2048,7 +2048,7 @@ static void stm32_ltdc_lclear(FAR struct stm32_layer_s *layer,
       uint32_t *dest = (uint32_t *)priv->pinfo.fbmem;
       int i;
 
-      gvdbg("Clearing display: BPP=%d color=%04x framebuffer=%08x size=%d\n",
+      ginfo("Clearing display: BPP=%d color=%04x framebuffer=%08x size=%d\n",
             priv->pinfo.bpp, color, dest, priv->pinfo.fblen);
 
       for (i = 0; i < priv->pinfo.fblen; i += sizeof(uint32_t))
@@ -2191,7 +2191,7 @@ static void stm32_ltdc_linit(int lid)
 static int stm32_getvideoinfo(struct fb_vtable_s *vtable,
                                  struct fb_videoinfo_s *vinfo)
 {
-  gvdbg("vtable=%p vinfo=%p\n", vtable, vinfo);
+  ginfo("vtable=%p vinfo=%p\n", vtable, vinfo);
   if (vtable)
     {
       FAR struct ltdc_layer_s *ltdc;
@@ -2226,7 +2226,7 @@ static int stm32_getvideoinfo(struct fb_vtable_s *vtable,
 static int stm32_getplaneinfo(struct fb_vtable_s *vtable, int planeno,
                                  struct fb_planeinfo_s *pinfo)
 {
-  gvdbg("vtable=%p planeno=%d pinfo=%p\n", vtable, planeno, pinfo);
+  ginfo("vtable=%p planeno=%d pinfo=%p\n", vtable, planeno, pinfo);
   if (vtable)
     {
       FAR struct ltdc_layer_s *ltdc;
@@ -2315,7 +2315,7 @@ static int stm32_putcmap(struct fb_vtable_s *vtable,
 static int stm32_lgetvideoinfo(struct ltdc_layer_s *layer,
                                  struct fb_videoinfo_s *vinfo)
 {
-  gvdbg("layer=%p vinfo=%p\n", layer, vinfo);
+  ginfo("layer=%p vinfo=%p\n", layer, vinfo);
   FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)layer;
 
   if (stm32_ltdc_lvalidate(priv))
@@ -2349,7 +2349,7 @@ static int stm32_lgetvideoinfo(struct ltdc_layer_s *layer,
 static int stm32_lgetplaneinfo(struct ltdc_layer_s *layer, int planeno,
                                  struct fb_planeinfo_s *pinfo)
 {
-  gvdbg("layer=%p planeno=%d pinfo=%p\n", layer, planeno, pinfo);
+  ginfo("layer=%p planeno=%d pinfo=%p\n", layer, planeno, pinfo);
   FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)layer;
 
   if (stm32_ltdc_lvalidate(priv) && planeno == 0)
@@ -2386,7 +2386,7 @@ static int stm32_setclut(struct ltdc_layer_s *layer,
 {
   int   ret;
   FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)layer;
-  gvdbg("layer=%p cmap=%p\n", layer, cmap);
+  ginfo("layer=%p cmap=%p\n", layer, cmap);
 
   if (stm32_ltdc_lvalidate(priv) && cmap)
     {
@@ -2444,7 +2444,7 @@ static int stm32_getclut(struct ltdc_layer_s *layer,
 {
   int   ret;
   FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)layer;
-  gvdbg("layer=%p cmap=%p\n", layer, cmap);
+  ginfo("layer=%p cmap=%p\n", layer, cmap);
 
   if (priv == &LAYER_L1 || priv == &LAYER_L2)
     {
@@ -2489,7 +2489,7 @@ static int stm32_getclut(struct ltdc_layer_s *layer,
               cmap->green[n]  = clut888[offset + 1];
               cmap->red[n]    = clut888[offset + 2];
 
-              regvdbg("n=%d, red=%02x, green=%02x, blue=%02x\n", n,
+              reginfo("n=%d, red=%02x, green=%02x, blue=%02x\n", n,
                       clut888[offset], clut888[offset + 1],
                       clut888[offset + 2]);
 # else
@@ -2498,7 +2498,7 @@ static int stm32_getclut(struct ltdc_layer_s *layer,
               cmap->green[n]  = (uint8_t)LTDC_CMAP_GREEN(clut[n]);
               cmap->blue[n]   = (uint8_t)LTDC_CMAP_BLUE(clut[n]);
 
-              regvdbg("n=%d, alpha=%02x, red=%02x, green=%02x, blue=%02x\n", n,
+              reginfo("n=%d, alpha=%02x, red=%02x, green=%02x, blue=%02x\n", n,
                       DMA2D_CMAP_ALPHA(clut[n]), DMA2D_CMAP_RED(clut[n]),
                       DMA2D_CMAP_GREEN(clut[n]), DMA2D_CMAP_BLUE(clut[n]));
 # endif
@@ -2542,7 +2542,7 @@ static int stm32_getlid(FAR struct ltdc_layer_s *layer, int *lid,
 {
   FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)layer;
 
-  gvdbg("flag = %08x\n", flag);
+  ginfo("flag = %08x\n", flag);
 
   if (stm32_ltdc_lvalidate(priv))
     {
@@ -2617,7 +2617,7 @@ static int stm32_getlid(FAR struct ltdc_layer_s *layer, int *lid,
 static int stm32_setcolor(FAR struct ltdc_layer_s *layer, uint32_t argb)
 {
   FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)layer;
-  gvdbg("layer = %p, argb = %08x\n", layer, argb);
+  ginfo("layer = %p, argb = %08x\n", layer, argb);
 
   if (stm32_ltdc_lvalidate(priv))
     {
@@ -2652,7 +2652,7 @@ static int stm32_setcolor(FAR struct ltdc_layer_s *layer, uint32_t argb)
 static int stm32_getcolor(FAR struct ltdc_layer_s *layer, uint32_t *argb)
 {
   FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)layer;
-  gvdbg("layer = %p, argb = %p\n", layer, argb);
+  ginfo("layer = %p, argb = %p\n", layer, argb);
 
   if (stm32_ltdc_lvalidate(priv))
     {
@@ -2688,7 +2688,7 @@ static int stm32_getcolor(FAR struct ltdc_layer_s *layer, uint32_t *argb)
 static int stm32_setcolorkey(FAR struct ltdc_layer_s *layer, uint32_t rgb)
 {
   FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)layer;
-  gvdbg("layer = %p, argb = %08x\n", layer, rgb);
+  ginfo("layer = %p, argb = %08x\n", layer, rgb);
 
   if (stm32_ltdc_lvalidate(priv))
     {
@@ -2723,7 +2723,7 @@ static int stm32_setcolorkey(FAR struct ltdc_layer_s *layer, uint32_t rgb)
 static int stm32_getcolorkey(FAR struct ltdc_layer_s *layer, uint32_t *rgb)
 {
   FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)layer;
-  gvdbg("layer = %p, argb = %p\n", layer, rgb);
+  ginfo("layer = %p, argb = %p\n", layer, rgb);
 
   if (stm32_ltdc_lvalidate(priv))
     {
@@ -2763,7 +2763,7 @@ static int stm32_getcolorkey(FAR struct ltdc_layer_s *layer, uint32_t *rgb)
 static int stm32_setalpha(FAR struct ltdc_layer_s *layer, uint8_t alpha)
 {
   FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)layer;
-  gvdbg("layer = %p, alpha = %02x\n", layer, alpha);
+  ginfo("layer = %p, alpha = %02x\n", layer, alpha);
 
   if (stm32_ltdc_lvalidate(priv))
     {
@@ -2798,7 +2798,7 @@ static int stm32_setalpha(FAR struct ltdc_layer_s *layer, uint8_t alpha)
 static int stm32_getalpha(FAR struct ltdc_layer_s *layer, uint8_t *alpha)
 {
   FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)layer;
-  gvdbg("layer = %p, alpha = %p\n", layer, alpha);
+  ginfo("layer = %p, alpha = %p\n", layer, alpha);
 
   if (stm32_ltdc_lvalidate(priv))
     {
@@ -2857,7 +2857,7 @@ static int stm32_setblendmode(FAR struct ltdc_layer_s *layer, uint32_t mode)
 {
   FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)layer;
   uint32_t   blendmode = mode;
-  gvdbg("layer = %p, mode = %08x\n", layer, mode);
+  ginfo("layer = %p, mode = %08x\n", layer, mode);
 
   if (stm32_ltdc_lvalidate(priv))
     {
@@ -2964,7 +2964,7 @@ static int stm32_setblendmode(FAR struct ltdc_layer_s *layer, uint32_t mode)
 static int stm32_getblendmode(FAR struct ltdc_layer_s *layer, uint32_t *mode)
 {
   FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)layer;
-  gvdbg("layer = %p, mode = %p\n", layer, mode);
+  ginfo("layer = %p, mode = %p\n", layer, mode);
 
   if (stm32_ltdc_lvalidate(priv))
     {
@@ -3011,7 +3011,7 @@ static int stm32_setarea(FAR struct ltdc_layer_s *layer,
                         fb_coord_t srcypos)
 {
   FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)layer;
-  gvdbg("layer = %p, area = %p, srcxpos = %d, srcypos = %d\n",
+  ginfo("layer = %p, area = %p, srcxpos = %d, srcypos = %d\n",
             layer, area, srcxpos, srcypos);
 
   if (stm32_ltdc_lvalidate(priv))
@@ -3066,7 +3066,7 @@ static int stm32_getarea(FAR struct ltdc_layer_s *layer,
                         fb_coord_t *srcxpos, fb_coord_t *srcypos)
 {
   FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)layer;
-  gvdbg("layer = %p, area = %p, srcxpos = %p, srcypos = %p\n",
+  ginfo("layer = %p, area = %p, srcxpos = %p, srcypos = %p\n",
             layer, area, srcxpos, srcypos);
 
   if (stm32_ltdc_lvalidate(priv))
@@ -3131,7 +3131,7 @@ static int stm32_update(FAR struct ltdc_layer_s *layer, uint32_t mode)
   FAR struct stm32_layer_s *inactive = &LAYER(!g_lactive);
 #endif
 
-  gvdbg("layer = %p, mode = %08x\n", layer, mode);
+  ginfo("layer = %p, mode = %08x\n", layer, mode);
 
   if (stm32_ltdc_lvalidate(priv))
     {
@@ -3272,7 +3272,7 @@ static int stm32_blit(FAR struct ltdc_layer_s *dest,
 {
   FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)dest;
 
-  gvdbg("dest = %p, destxpos = %d, destypos = %d, src = %p, srcarea = %p\n",
+  ginfo("dest = %p, destxpos = %d, destypos = %d, src = %p, srcarea = %p\n",
         dest, destxpos, destypos, src, srcarea);
 
   if (stm32_ltdc_lvalidate(priv))
@@ -3325,7 +3325,7 @@ static int stm32_blend(FAR struct ltdc_layer_s *dest,
 {
   FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)dest;
 
-  gvdbg("dest=%p, destxpos=%d, destypos=%d, "
+  ginfo("dest=%p, destxpos=%d, destypos=%d, "
         "fore=%p, forexpos=%d foreypos=%d, "
         "back=%p, backarea=%p\n",
         dest, destxpos, destypos, fore, forexpos, foreypos, back, backarea);
@@ -3370,7 +3370,7 @@ static int stm32_fillarea(FAR struct ltdc_layer_s *layer,
                             uint32_t color)
 {
   FAR struct stm32_layer_s *priv = (FAR struct stm32_layer_s *)layer;
-  gvdbg("layer = %p, area = %p, color = %08x\n", layer, area, color);
+  ginfo("layer = %p, area = %p, color = %08x\n", layer, area, color);
 
   if (stm32_ltdc_lvalidate(priv))
     {
@@ -3407,7 +3407,7 @@ static int stm32_fillarea(FAR struct ltdc_layer_s *layer,
 
 FAR struct ltdc_layer_s *stm32_ltdcgetlayer(int lid)
 {
-  gvdbg("lid: %d\n", lid);
+  ginfo("lid: %d\n", lid);
   if (lid == LTDC_LAYER_L1 || lid == LTDC_LAYER_L2)
     {
       return (FAR struct ltdc_layer_s *) &LAYER(lid);
@@ -3447,16 +3447,16 @@ int stm32_ltdcinitialize(void)
 
   stm32_lcd_enable(false);
 
-  gvdbg("Configuring the LCD controller\n");
+  ginfo("Configuring the LCD controller\n");
 
   /* Configure LCD periphery */
 
-  gvdbg("Configure lcd periphery\n");
+  ginfo("Configure lcd periphery\n");
   stm32_ltdc_periphconfig();
 
   /* Configure global ltdc register */
 
-  gvdbg("Configure global register\n");
+  ginfo("Configure global register\n");
   stm32_global_configure();
 
 #ifdef CONFIG_STM32_DMA2D
@@ -3472,7 +3472,7 @@ int stm32_ltdcinitialize(void)
 
   /* Initialize ltdc layer */
 
-  gvdbg("Initialize ltdc layer\n");
+  ginfo("Initialize ltdc layer\n");
   stm32_ltdc_linit(LTDC_LAYER_L1);
 #ifdef CONFIG_STM32_LTDC_L2
   stm32_ltdc_linit(LTDC_LAYER_L2);
@@ -3493,12 +3493,12 @@ int stm32_ltdcinitialize(void)
 
   /* Reload shadow register */
 
-  gvdbg("Reload shadow register\n");
+  ginfo("Reload shadow register\n");
   stm32_ltdc_reload(LTDC_SRCR_IMR, false);
 
   /* Turn the LCD on */
 
-  gvdbg("Enabling the display\n");
+  ginfo("Enabling the display\n");
   stm32_lcd_enable(true);
 
   /* Set initialized state */
@@ -3524,7 +3524,7 @@ int stm32_ltdcinitialize(void)
 
 struct fb_vtable_s *stm32_ltdcgetvplane(int vplane)
 {
-  gvdbg("vplane: %d\n", vplane);
+  ginfo("vplane: %d\n", vplane);
 
   if (vplane == 0)
     {
diff --git a/arch/arm/src/stm32/stm32_otgfsdev.c b/arch/arm/src/stm32/stm32_otgfsdev.c
index 81fb004fbc..2d347ad870 100644
--- a/arch/arm/src/stm32/stm32_otgfsdev.c
+++ b/arch/arm/src/stm32/stm32_otgfsdev.c
@@ -1218,7 +1218,7 @@ static void stm32_epin_request(FAR struct stm32_usbdev_s *priv,
       return;
     }
 
-  ullvdbg("EP%d req=%p: len=%d xfrd=%d zlp=%d\n",
+  ullinfo("EP%d req=%p: len=%d xfrd=%d zlp=%d\n",
           privep->epphy, privreq, privreq->req.len,
           privreq->req.xfrd, privep->zlp);
 
@@ -1484,7 +1484,7 @@ static void stm32_epout_complete(FAR struct stm32_usbdev_s *priv,
       return;
     }
 
-  ullvdbg("EP%d: len=%d xfrd=%d\n",
+  ullinfo("EP%d: len=%d xfrd=%d\n",
           privep->epphy, privreq->req.len, privreq->req.xfrd);
 
   /* Return the completed read request to the class driver and mark the state
@@ -1519,7 +1519,7 @@ static inline void stm32_ep0out_receive(FAR struct stm32_ep_s *privep, int bcnt)
   DEBUGASSERT(privep && privep->ep.priv);
   priv = (FAR struct stm32_usbdev_s *)privep->ep.priv;
 
-  ullvdbg("EP0: bcnt=%d\n", bcnt);
+  ullinfo("EP0: bcnt=%d\n", bcnt);
   usbtrace(TRACE_READ(EP0), bcnt);
 
   /* Verify that an OUT SETUP request as received before this data was
@@ -1612,7 +1612,7 @@ static inline void stm32_epout_receive(FAR struct stm32_ep_s *privep, int bcnt)
       return;
     }
 
-  ullvdbg("EP%d: len=%d xfrd=%d\n", privep->epphy, privreq->req.len, privreq->req.xfrd);
+  ullinfo("EP%d: len=%d xfrd=%d\n", privep->epphy, privreq->req.len, privreq->req.xfrd);
   usbtrace(TRACE_READ(privep->epphy), bcnt);
 
   /* Get the number of bytes to transfer from the RxFIFO */
@@ -1696,7 +1696,7 @@ static void stm32_epout_request(FAR struct stm32_usbdev_s *priv,
               return;
             }
 
-          ullvdbg("EP%d: len=%d\n", privep->epphy, privreq->req.len);
+          ullinfo("EP%d: len=%d\n", privep->epphy, privreq->req.len);
 
           /* Ignore any attempt to receive a zero length packet (this really
            * should not happen.
@@ -2490,7 +2490,7 @@ static inline void stm32_ep0out_setup(struct stm32_usbdev_s *priv)
   ctrlreq.index = GETUINT16(priv->ctrlreq.index);
   ctrlreq.len   = GETUINT16(priv->ctrlreq.len);
 
-  ullvdbg("type=%02x req=%02x value=%04x index=%04x len=%04x\n",
+  ullinfo("type=%02x req=%02x value=%04x index=%04x len=%04x\n",
           ctrlreq.type, ctrlreq.req, ctrlreq.value, ctrlreq.index, ctrlreq.len);
 
   /* Check for a standard request */
@@ -4334,7 +4334,7 @@ static int stm32_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *
   if (!req || !req->callback || !req->buf || !ep)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
-      ullvdbg("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep);
+      ullinfo("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep);
       return -EINVAL;
     }
 #endif
diff --git a/arch/arm/src/stm32/stm32_otgfshost.c b/arch/arm/src/stm32/stm32_otgfshost.c
index 81f6ded269..ba0d451d43 100644
--- a/arch/arm/src/stm32/stm32_otgfshost.c
+++ b/arch/arm/src/stm32/stm32_otgfshost.c
@@ -1938,7 +1938,7 @@ static void stm32_in_next(FAR struct stm32_usbhost_s *priv,
 
   /* The transfer is complete, with or without an error */
 
-  uvdbg("Transfer complete:  %d\n", result);
+  uinfo("Transfer complete:  %d\n", result);
 
   /* Extract the callback information */
 
@@ -2224,7 +2224,7 @@ static void stm32_out_next(FAR struct stm32_usbhost_s *priv,
 
   /* The transfer is complete, with or without an error */
 
-  uvdbg("Transfer complete:  %d\n", result);
+  uinfo("Transfer complete:  %d\n", result);
 
   /* Extract the callback information */
 
@@ -2370,7 +2370,7 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv,
   /* AND the two to get the set of enabled, pending HC interrupts */
 
   pending &= regval;
-  ullvdbg("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending);
+  ullinfo("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending);
 
   /* Check for a pending ACK response received/transmitted (ACK) interrupt */
 
@@ -2631,7 +2631,7 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv,
   /* AND the two to get the set of enabled, pending HC interrupts */
 
   pending &= regval;
-  ullvdbg("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending);
+  ullinfo("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending);
 
   /* Check for a pending ACK response received/transmitted (ACK) interrupt */
 
@@ -2949,7 +2949,7 @@ static inline void stm32_gint_rxflvlisr(FAR struct stm32_usbhost_s *priv)
   /* Read and pop the next status from the Rx FIFO */
 
   grxsts = stm32_getreg(STM32_OTGFS_GRXSTSP);
-  ullvdbg("GRXSTS: %08x\n", grxsts);
+  ullinfo("GRXSTS: %08x\n", grxsts);
 
   /* Isolate the channel number/index in the status word */
 
@@ -3102,7 +3102,7 @@ static inline void stm32_gint_nptxfeisr(FAR struct stm32_usbhost_s *priv)
 
   /* Write the next group of packets into the Tx FIFO */
 
-  ullvdbg("HNPTXSTS: %08x chidx: %d avail: %d buflen: %d xfrd: %d wrsize: %d\n",
+  ullinfo("HNPTXSTS: %08x chidx: %d avail: %d buflen: %d xfrd: %d wrsize: %d\n",
            regval, chidx, avail, chan->buflen, chan->xfrd, wrsize);
 
   stm32_gint_wrpacket(priv, chan->buffer, chidx, wrsize);
@@ -3190,7 +3190,7 @@ static inline void stm32_gint_ptxfeisr(FAR struct stm32_usbhost_s *priv)
 
   /* Write the next group of packets into the Tx FIFO */
 
-  ullvdbg("HPTXSTS: %08x chidx: %d avail: %d buflen: %d xfrd: %d wrsize: %d\n",
+  ullinfo("HPTXSTS: %08x chidx: %d avail: %d buflen: %d xfrd: %d wrsize: %d\n",
            regval, chidx, avail, chan->buflen, chan->xfrd, wrsize);
 
   stm32_gint_wrpacket(priv, chan->buffer, chidx, wrsize);
@@ -3760,7 +3760,7 @@ static int stm32_wait(FAR struct usbhost_connection_s *conn,
           *hport = connport;
           leave_critical_section(flags);
 
-          uvdbg("RHport Connected: %s\n", connport->connected ? "YES" : "NO");
+          uinfo("RHport Connected: %s\n", connport->connected ? "YES" : "NO");
           return OK;
         }
 
@@ -3777,7 +3777,7 @@ static int stm32_wait(FAR struct usbhost_connection_s *conn,
           *hport = connport;
           leave_critical_section(flags);
 
-          uvdbg("Hub port Connected: %s\n", connport->connected ? "YES" : "NO");
+          uinfo("Hub port Connected: %s\n", connport->connected ? "YES" : "NO");
           return OK;
         }
 #endif
@@ -3897,7 +3897,7 @@ static int stm32_enumerate(FAR struct usbhost_connection_s *conn,
 
   /* Then let the common usbhost_enumerate do the real enumeration. */
 
-  uvdbg("Enumerate the device\n");
+  uinfo("Enumerate the device\n");
   priv->smstate = SMSTATE_ENUM;
   ret = usbhost_enumerate(hport, &hport->devclass);
 
@@ -4312,7 +4312,7 @@ static int stm32_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
 
   DEBUGASSERT(priv != NULL && ep0info != NULL && req != NULL);
   usbhost_vtrace2(OTGFS_VTRACE2_CTRLIN, req->type, req->req);
-  uvdbg("type:%02x req:%02x value:%02x%02x index:%02x%02x len:%02x%02x\n",
+  uinfo("type:%02x req:%02x value:%02x%02x index:%02x%02x len:%02x%02x\n",
         req->type, req->req, req->value[1], req->value[0],
         req->index[1], req->index[0], req->len[1], req->len[0]);
 
@@ -4397,7 +4397,7 @@ static int stm32_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
 
   DEBUGASSERT(priv != NULL && ep0info != NULL && req != NULL);
   usbhost_vtrace2(OTGFS_VTRACE2_CTRLOUT, req->type, req->req);
-  uvdbg("type:%02x req:%02x value:%02x%02x index:%02x%02x len:%02x%02x\n",
+  uinfo("type:%02x req:%02x value:%02x%02x index:%02x%02x len:%02x%02x\n",
         req->type, req->req, req->value[1], req->value[0],
         req->index[1], req->index[0], req->len[1], req->len[0]);
 
@@ -4515,7 +4515,7 @@ static ssize_t stm32_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep
   unsigned int chidx = (unsigned int)ep;
   ssize_t nbytes;
 
-  uvdbg("chidx: %d buflen: %d\n",  (unsigned int)ep, buflen);
+  uinfo("chidx: %d buflen: %d\n",  (unsigned int)ep, buflen);
 
   DEBUGASSERT(priv && buffer && chidx < STM32_MAX_TX_FIFOS && buflen > 0);
 
@@ -4582,7 +4582,7 @@ static int stm32_asynch(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep,
   unsigned int chidx = (unsigned int)ep;
   int ret;
 
-  uvdbg("chidx: %d buflen: %d\n",  (unsigned int)ep, buflen);
+  uinfo("chidx: %d buflen: %d\n",  (unsigned int)ep, buflen);
 
   DEBUGASSERT(priv && buffer && chidx < STM32_MAX_TX_FIFOS && buflen > 0);
 
@@ -4632,7 +4632,7 @@ static int stm32_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep)
   unsigned int chidx = (unsigned int)ep;
   irqstate_t flags;
 
-  uvdbg("chidx: %u: %d\n",  chidx);
+  uinfo("chidx: %u: %d\n",  chidx);
 
   DEBUGASSERT(priv && chidx < STM32_MAX_TX_FIFOS);
   chan = &priv->chan[chidx];
@@ -4727,7 +4727,7 @@ static int stm32_connect(FAR struct usbhost_driver_s *drvr,
   /* Set the connected/disconnected flag */
 
   hport->connected = connected;
-  ullvdbg("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO");
+  ullinfo("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO");
 
   /* Report the connection event */
 
diff --git a/arch/arm/src/stm32/stm32_otghsdev.c b/arch/arm/src/stm32/stm32_otghsdev.c
index 07e9f0af1c..7df1b921ce 100644
--- a/arch/arm/src/stm32/stm32_otghsdev.c
+++ b/arch/arm/src/stm32/stm32_otghsdev.c
@@ -1218,7 +1218,7 @@ static void stm32_epin_request(FAR struct stm32_usbdev_s *priv,
       return;
     }
 
-  ullvdbg("EP%d req=%p: len=%d xfrd=%d zlp=%d\n",
+  ullinfo("EP%d req=%p: len=%d xfrd=%d zlp=%d\n",
           privep->epphy, privreq, privreq->req.len,
           privreq->req.xfrd, privep->zlp);
 
@@ -1484,7 +1484,7 @@ static void stm32_epout_complete(FAR struct stm32_usbdev_s *priv,
       return;
     }
 
-  ullvdbg("EP%d: len=%d xfrd=%d\n",
+  ullinfo("EP%d: len=%d xfrd=%d\n",
           privep->epphy, privreq->req.len, privreq->req.xfrd);
 
   /* Return the completed read request to the class driver and mark the state
@@ -1519,7 +1519,7 @@ static inline void stm32_ep0out_receive(FAR struct stm32_ep_s *privep, int bcnt)
   DEBUGASSERT(privep && privep->ep.priv);
   priv = (FAR struct stm32_usbdev_s *)privep->ep.priv;
 
-  ullvdbg("EP0: bcnt=%d\n", bcnt);
+  ullinfo("EP0: bcnt=%d\n", bcnt);
   usbtrace(TRACE_READ(EP0), bcnt);
 
   /* Verify that an OUT SETUP request as received before this data was
@@ -1612,7 +1612,7 @@ static inline void stm32_epout_receive(FAR struct stm32_ep_s *privep, int bcnt)
       return;
     }
 
-  ullvdbg("EP%d: len=%d xfrd=%d\n", privep->epphy, privreq->req.len, privreq->req.xfrd);
+  ullinfo("EP%d: len=%d xfrd=%d\n", privep->epphy, privreq->req.len, privreq->req.xfrd);
   usbtrace(TRACE_READ(privep->epphy), bcnt);
 
   /* Get the number of bytes to transfer from the RxFIFO */
@@ -1696,7 +1696,7 @@ static void stm32_epout_request(FAR struct stm32_usbdev_s *priv,
               return;
             }
 
-          ullvdbg("EP%d: len=%d\n", privep->epphy, privreq->req.len);
+          ullinfo("EP%d: len=%d\n", privep->epphy, privreq->req.len);
 
           /* Ignore any attempt to receive a zero length packet (this really
            * should not happen.
@@ -2490,7 +2490,7 @@ static inline void stm32_ep0out_setup(struct stm32_usbdev_s *priv)
   ctrlreq.index = GETUINT16(priv->ctrlreq.index);
   ctrlreq.len   = GETUINT16(priv->ctrlreq.len);
 
-  ullvdbg("type=%02x req=%02x value=%04x index=%04x len=%04x\n",
+  ullinfo("type=%02x req=%02x value=%04x index=%04x len=%04x\n",
           ctrlreq.type, ctrlreq.req, ctrlreq.value, ctrlreq.index, ctrlreq.len);
 
   /* Check for a standard request */
@@ -4334,7 +4334,7 @@ static int stm32_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *
   if (!req || !req->callback || !req->buf || !ep)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
-      ullvdbg("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep);
+      ullinfo("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep);
       return -EINVAL;
     }
 #endif
diff --git a/arch/arm/src/stm32/stm32_otghshost.c b/arch/arm/src/stm32/stm32_otghshost.c
index 4c6252a029..4a81571791 100644
--- a/arch/arm/src/stm32/stm32_otghshost.c
+++ b/arch/arm/src/stm32/stm32_otghshost.c
@@ -1938,7 +1938,7 @@ static void stm32_in_next(FAR struct stm32_usbhost_s *priv,
 
   /* The transfer is complete, with or without an error */
 
-  uvdbg("Transfer complete:  %d\n", result);
+  uinfo("Transfer complete:  %d\n", result);
 
   /* Extract the callback information */
 
@@ -2224,7 +2224,7 @@ static void stm32_out_next(FAR struct stm32_usbhost_s *priv,
 
   /* The transfer is complete, with or without an error */
 
-  uvdbg("Transfer complete:  %d\n", result);
+  uinfo("Transfer complete:  %d\n", result);
 
   /* Extract the callback information */
 
@@ -2370,7 +2370,7 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv,
   /* AND the two to get the set of enabled, pending HC interrupts */
 
   pending &= regval;
-  ullvdbg("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending);
+  ullinfo("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending);
 
   /* Check for a pending ACK response received/transmitted (ACK) interrupt */
 
@@ -2631,7 +2631,7 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv,
   /* AND the two to get the set of enabled, pending HC interrupts */
 
   pending &= regval;
-  ullvdbg("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending);
+  ullinfo("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending);
 
   /* Check for a pending ACK response received/transmitted (ACK) interrupt */
 
@@ -2949,7 +2949,7 @@ static inline void stm32_gint_rxflvlisr(FAR struct stm32_usbhost_s *priv)
   /* Read and pop the next status from the Rx FIFO */
 
   grxsts = stm32_getreg(STM32_OTGHS_GRXSTSP);
-  ullvdbg("GRXSTS: %08x\n", grxsts);
+  ullinfo("GRXSTS: %08x\n", grxsts);
 
   /* Isolate the channel number/index in the status word */
 
@@ -3102,7 +3102,7 @@ static inline void stm32_gint_nptxfeisr(FAR struct stm32_usbhost_s *priv)
 
   /* Write the next group of packets into the Tx FIFO */
 
-  ullvdbg("HNPTXSTS: %08x chidx: %d avail: %d buflen: %d xfrd: %dwrsize: %d\n",
+  ullinfo("HNPTXSTS: %08x chidx: %d avail: %d buflen: %d xfrd: %dwrsize: %d\n",
            regval, chidx, avail, chan->buflen, chan->xfrd, wrsize);
 
   stm32_gint_wrpacket(priv, chan->buffer, chidx, wrsize);
@@ -3190,7 +3190,7 @@ static inline void stm32_gint_ptxfeisr(FAR struct stm32_usbhost_s *priv)
 
   /* Write the next group of packets into the Tx FIFO */
 
-  ullvdbg("HPTXSTS: %08x chidx: %d avail: %d buflen: %d xfrd: %d wrsize: %d\n",
+  ullinfo("HPTXSTS: %08x chidx: %d avail: %d buflen: %d xfrd: %d wrsize: %d\n",
            regval, chidx, avail, chan->buflen, chan->xfrd, wrsize);
 
   stm32_gint_wrpacket(priv, chan->buffer, chidx, wrsize);
@@ -3760,7 +3760,7 @@ static int stm32_wait(FAR struct usbhost_connection_s *conn,
           *hport = connport;
           leave_critical_section(flags);
 
-          uvdbg("RHport Connected: %s\n", connport->connected ? "YES" : "NO");
+          uinfo("RHport Connected: %s\n", connport->connected ? "YES" : "NO");
           return OK;
         }
 
@@ -3777,7 +3777,7 @@ static int stm32_wait(FAR struct usbhost_connection_s *conn,
           *hport = connport;
           leave_critical_section(flags);
 
-          uvdbg("Hub port Connected: %s\n", connport->connected ? "YES" : "NO");
+          uinfo("Hub port Connected: %s\n", connport->connected ? "YES" : "NO");
           return OK;
         }
 #endif
@@ -3897,7 +3897,7 @@ static int stm32_enumerate(FAR struct usbhost_connection_s *conn,
 
   /* Then let the common usbhost_enumerate do the real enumeration. */
 
-  uvdbg("Enumerate the device\n");
+  uinfo("Enumerate the device\n");
   priv->smstate = SMSTATE_ENUM;
   ret = usbhost_enumerate(hport, &hport->devclass);
 
@@ -4312,7 +4312,7 @@ static int stm32_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
 
   DEBUGASSERT(priv != NULL && ep0info != NULL && req != NULL);
   usbhost_vtrace2(OTGHS_VTRACE2_CTRLIN, req->type, req->req);
-  uvdbg("type:%02x req:%02x value:%02x%02x index:%02x%02x len:%02x%02x\n",
+  uinfo("type:%02x req:%02x value:%02x%02x index:%02x%02x len:%02x%02x\n",
         req->type, req->req, req->value[1], req->value[0],
         req->index[1], req->index[0], req->len[1], req->len[0]);
 
@@ -4397,7 +4397,7 @@ static int stm32_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
 
   DEBUGASSERT(priv != NULL && ep0info != NULL && req != NULL);
   usbhost_vtrace2(OTGHS_VTRACE2_CTRLOUT, req->type, req->req);
-  uvdbg("type:%02x req:%02x value:%02x%02x index:%02x%02x len:%02x%02x\n",
+  uinfo("type:%02x req:%02x value:%02x%02x index:%02x%02x len:%02x%02x\n",
         req->type, req->req, req->value[1], req->value[0],
         req->index[1], req->index[0], req->len[1], req->len[0]);
 
@@ -4515,7 +4515,7 @@ static ssize_t stm32_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep
   unsigned int chidx = (unsigned int)ep;
   ssize_t nbytes;
 
-  uvdbg("chidx: %d buflen: %d\n",  (unsigned int)ep, buflen);
+  uinfo("chidx: %d buflen: %d\n",  (unsigned int)ep, buflen);
 
   DEBUGASSERT(priv && buffer && chidx < STM32_MAX_TX_FIFOS && buflen > 0);
 
@@ -4582,7 +4582,7 @@ static int stm32_asynch(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep,
   unsigned int chidx = (unsigned int)ep;
   int ret;
 
-  uvdbg("chidx: %d buflen: %d\n",  (unsigned int)ep, buflen);
+  uinfo("chidx: %d buflen: %d\n",  (unsigned int)ep, buflen);
 
   DEBUGASSERT(priv && buffer && chidx < STM32_MAX_TX_FIFOS && buflen > 0);
 
@@ -4632,7 +4632,7 @@ static int stm32_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep)
   unsigned int chidx = (unsigned int)ep;
   irqstate_t flags;
 
-  uvdbg("chidx: %u: %d\n",  chidx);
+  uinfo("chidx: %u: %d\n",  chidx);
 
   DEBUGASSERT(priv && chidx < STM32_MAX_TX_FIFOS);
   chan = &priv->chan[chidx];
@@ -4727,7 +4727,7 @@ static int stm32_connect(FAR struct usbhost_driver_s *drvr,
   /* Set the connected/disconnected flag */
 
   hport->connected = connected;
-  ullvdbg("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO");
+  ullinfo("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO");
 
   /* Report the connection event */
 
diff --git a/arch/arm/src/stm32/stm32_procfs_ccm.c b/arch/arm/src/stm32/stm32_procfs_ccm.c
index 231f37dd9c..816f37977e 100644
--- a/arch/arm/src/stm32/stm32_procfs_ccm.c
+++ b/arch/arm/src/stm32/stm32_procfs_ccm.c
@@ -142,7 +142,7 @@ static int ccm_open(FAR struct file *filep, FAR const char *relpath,
 {
   FAR struct ccm_file_s *priv;
 
-  fvdbg("Open '%s'\n", relpath);
+  finfo("Open '%s'\n", relpath);
 
   /* PROCFS is read-only.  Any attempt to open with any kind of write
    * access is not permitted.
@@ -214,7 +214,7 @@ static ssize_t ccm_read(FAR struct file *filep, FAR char *buffer,
   struct mallinfo mem;
   off_t offset = filep->f_pos;
 
-  fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen);
+  finfo("buffer=%p buflen=%d\n", buffer, (int)buflen);
 
   /* Recover our private data from the struct file instance */
 
@@ -273,7 +273,7 @@ static int ccm_dup(FAR const struct file *oldp, FAR struct file *newp)
   FAR struct ccm_file_s *oldpriv;
   FAR struct ccm_file_s *newpriv;
 
-  fvdbg("Dup %p->%p\n", oldp, newp);
+  finfo("Dup %p->%p\n", oldp, newp);
 
   /* Recover our private data from the old struct file instance */
 
diff --git a/arch/arm/src/stm32/stm32_pwm.c b/arch/arm/src/stm32/stm32_pwm.c
index be70eb8007..0af0465bff 100644
--- a/arch/arm/src/stm32/stm32_pwm.c
+++ b/arch/arm/src/stm32/stm32_pwm.c
@@ -125,19 +125,19 @@
 #  define pwmdbg              dbg
 #  define pwmlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define pwmvdbg           vdbg
-#    define pwmllvdbg         llvdbg
+#    define pwminfo           info
+#    define pwmllinfo         llinfo
 #    define pwm_dumpgpio(p,m) stm32_dumpgpio(p,m)
 #  else
-#    define pwmvdbg(x...)
-#    define pwmllvdbg(x...)
+#    define pwminfo(x...)
+#    define pwmllinfo(x...)
 #    define pwm_dumpgpio(p,m)
 #  endif
 #else
 #  define pwmdbg(x...)
 #  define pwmlldbg(x...)
-#  define pwmvdbg(x...)
-#  define pwmllvdbg(x...)
+#  define pwminfo(x...)
+#  define pwmllinfo(x...)
 #  define pwm_dumpgpio(p,m)
 #endif
 
@@ -972,23 +972,23 @@ static void pwm_putreg(struct stm32_pwmtimer_s *priv, int offset, uint16_t value
 #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);
-  pwmvdbg("  CR1: %04x CR2:  %04x SMCR:  %04x DIER:  %04x\n",
+  pwminfo("%s:\n", msg);
+  pwminfo("  CR1: %04x CR2:  %04x SMCR:  %04x DIER:  %04x\n",
           pwm_getreg(priv, STM32_GTIM_CR1_OFFSET),
           pwm_getreg(priv, STM32_GTIM_CR2_OFFSET),
           pwm_getreg(priv, STM32_GTIM_SMCR_OFFSET),
           pwm_getreg(priv, STM32_GTIM_DIER_OFFSET));
-  pwmvdbg("   SR: %04x EGR:  %04x CCMR1: %04x CCMR2: %04x\n",
+  pwminfo("   SR: %04x EGR:  %04x CCMR1: %04x CCMR2: %04x\n",
           pwm_getreg(priv, STM32_GTIM_SR_OFFSET),
           pwm_getreg(priv, STM32_GTIM_EGR_OFFSET),
           pwm_getreg(priv, STM32_GTIM_CCMR1_OFFSET),
           pwm_getreg(priv, STM32_GTIM_CCMR2_OFFSET));
-  pwmvdbg(" CCER: %04x CNT:  %04x PSC:   %04x ARR:   %04x\n",
+  pwminfo(" CCER: %04x CNT:  %04x PSC:   %04x ARR:   %04x\n",
           pwm_getreg(priv, STM32_GTIM_CCER_OFFSET),
           pwm_getreg(priv, STM32_GTIM_CNT_OFFSET),
           pwm_getreg(priv, STM32_GTIM_PSC_OFFSET),
           pwm_getreg(priv, STM32_GTIM_ARR_OFFSET));
-  pwmvdbg(" CCR1: %04x CCR2: %04x CCR3:  %04x CCR4:  %04x\n",
+  pwminfo(" CCR1: %04x CCR2: %04x CCR3:  %04x CCR4:  %04x\n",
           pwm_getreg(priv, STM32_GTIM_CCR1_OFFSET),
           pwm_getreg(priv, STM32_GTIM_CCR2_OFFSET),
           pwm_getreg(priv, STM32_GTIM_CCR3_OFFSET),
@@ -996,7 +996,7 @@ static void pwm_dumpregs(struct stm32_pwmtimer_s *priv, FAR const char *msg)
 #if defined(CONFIG_STM32_TIM1_PWM) || defined(CONFIG_STM32_TIM8_PWM)
   if (priv->timtype == TIMTYPE_ADVANCED)
     {
-      pwmvdbg("  RCR: %04x BDTR: %04x DCR:   %04x DMAR:  %04x\n",
+      pwminfo("  RCR: %04x BDTR: %04x DCR:   %04x DMAR:  %04x\n",
           pwm_getreg(priv, STM32_ATIM_RCR_OFFSET),
           pwm_getreg(priv, STM32_ATIM_BDTR_OFFSET),
           pwm_getreg(priv, STM32_ATIM_DCR_OFFSET),
@@ -1005,7 +1005,7 @@ static void pwm_dumpregs(struct stm32_pwmtimer_s *priv, FAR const char *msg)
   else
 #endif
     {
-      pwmvdbg("  DCR: %04x DMAR: %04x\n",
+      pwminfo("  DCR: %04x DMAR: %04x\n",
           pwm_getreg(priv, STM32_GTIM_DCR_OFFSET),
           pwm_getreg(priv, STM32_GTIM_DMAR_OFFSET));
     }
@@ -1068,14 +1068,14 @@ static int pwm_timer(FAR struct stm32_pwmtimer_s *priv,
   DEBUGASSERT(priv != NULL && info != NULL);
 
 #if defined(CONFIG_PWM_MULTICHAN)
-  pwmvdbg("TIM%u frequency: %u\n",
+  pwminfo("TIM%u frequency: %u\n",
           priv->timid, info->frequency);
 #elif defined(CONFIG_PWM_PULSECOUNT)
-  pwmvdbg("TIM%u channel: %u frequency: %u duty: %08x count: %u\n",
+  pwminfo("TIM%u channel: %u frequency: %u duty: %08x count: %u\n",
           priv->timid, priv->channels[0].channel, info->frequency,
           info->duty, info->count);
 #else
-  pwmvdbg("TIM%u channel: %u frequency: %u duty: %08x\n",
+  pwminfo("TIM%u channel: %u frequency: %u duty: %08x\n",
           priv->timid, priv->channels[0].channel, info->frequency, info->duty);
 #endif
 
@@ -1146,7 +1146,7 @@ static int pwm_timer(FAR struct stm32_pwmtimer_s *priv,
       reload = 65535;
     }
 
-  pwmvdbg("TIM%u PCLK: %u frequency: %u TIMCLK: %u prescaler: %u reload: %u\n",
+  pwminfo("TIM%u PCLK: %u frequency: %u TIMCLK: %u prescaler: %u reload: %u\n",
           priv->timid, priv->pclk, info->frequency, timclk, prescaler, reload);
 
   /* Set up the timer CR1 register:
@@ -1352,7 +1352,7 @@ static int pwm_timer(FAR struct stm32_pwmtimer_s *priv,
 
       ccr = b16toi(duty * reload + b16HALF);
 
-      pwmvdbg("ccr: %u\n", ccr);
+      pwminfo("ccr: %u\n", ccr);
 
       switch (mode)
         {
@@ -1667,7 +1667,7 @@ static  int pwm_update_duty(FAR struct stm32_pwmtimer_s *priv, uint8_t channel,
 
   DEBUGASSERT(priv != NULL);
 
-  pwmvdbg("TIM%u channel: %u duty: %08x\n",
+  pwminfo("TIM%u channel: %u duty: %08x\n",
           priv->timid, channel, duty);
 
 #ifndef CONFIG_PWM_MULTICHAN
@@ -1686,7 +1686,7 @@ static  int pwm_update_duty(FAR struct stm32_pwmtimer_s *priv, uint8_t channel,
 
   ccr = b16toi(duty * reload + b16HALF);
 
-  pwmvdbg("ccr: %u\n", ccr);
+  pwminfo("ccr: %u\n", ccr);
 
   switch (channel)
     {
@@ -1795,7 +1795,7 @@ static int pwm_interrupt(struct stm32_pwmtimer_s *priv)
 
   /* Now all of the time critical stuff is done so we can do some debug output */
 
-  pwmllvdbg("Update interrupt SR: %04x prev: %u curr: %u count: %u\n",
+  pwmllinfo("Update interrupt SR: %04x prev: %u curr: %u count: %u\n",
             regval, priv->prev, priv->curr, priv->count);
 
   return OK;
@@ -2030,7 +2030,7 @@ static int pwm_setup(FAR struct pwm_lowerhalf_s *dev)
   uint32_t pincfg;
   int i;
 
-  pwmvdbg("TIM%u\n", priv->timid);
+  pwminfo("TIM%u\n", priv->timid);
   pwm_dumpregs(priv, "Initially");
 
   /* Enable APB1/2 clocking for timer. */
@@ -2047,7 +2047,7 @@ static int pwm_setup(FAR struct pwm_lowerhalf_s *dev)
           continue;
         }
 
-      pwmvdbg("pincfg: %08x\n", pincfg);
+      pwminfo("pincfg: %08x\n", pincfg);
 
       stm32_configgpio(pincfg);
       pwm_dumpgpio(pincfg, "PWM setup");
@@ -2078,7 +2078,7 @@ static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev)
   uint32_t pincfg;
   int i;
 
-  pwmvdbg("TIM%u\n", priv->timid);
+  pwminfo("TIM%u\n", priv->timid);
 
   /* Make sure that the output has been stopped */
 
@@ -2098,7 +2098,7 @@ static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev)
           continue;
         }
 
-      pwmvdbg("pincfg: %08x\n", pincfg);
+      pwminfo("pincfg: %08x\n", pincfg);
 
       pincfg &= (GPIO_PORT_MASK | GPIO_PIN_MASK);
 
@@ -2233,7 +2233,7 @@ static int pwm_stop(FAR struct pwm_lowerhalf_s *dev)
   uint32_t regval;
   irqstate_t flags;
 
-  pwmvdbg("TIM%u\n", priv->timid);
+  pwminfo("TIM%u\n", priv->timid);
 
   /* Disable interrupts momentary to stop any ongoing timer processing and
    * to prevent any concurrent access to the reset register.
@@ -2360,7 +2360,7 @@ static int pwm_stop(FAR struct pwm_lowerhalf_s *dev)
   putreg32(regval, regaddr);
   leave_critical_section(flags);
 
-  pwmvdbg("regaddr: %08x resetbit: %08x\n", regaddr, resetbit);
+  pwminfo("regaddr: %08x resetbit: %08x\n", regaddr, resetbit);
   pwm_dumpregs(priv, "After stop");
   return OK;
 }
@@ -2388,7 +2388,7 @@ static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, int cmd, unsigned long arg
 
   /* There are no platform-specific ioctl commands */
 
-  pwmvdbg("TIM%u\n", priv->timid);
+  pwminfo("TIM%u\n", priv->timid);
 #endif
   return -ENOTTY;
 }
@@ -2418,7 +2418,7 @@ FAR struct pwm_lowerhalf_s *stm32_pwminitialize(int timer)
 {
   FAR struct stm32_pwmtimer_s *lower;
 
-  pwmvdbg("TIM%u\n", timer);
+  pwminfo("TIM%u\n", timer);
 
   switch (timer)
     {
diff --git a/arch/arm/src/stm32/stm32_qencoder.c b/arch/arm/src/stm32/stm32_qencoder.c
index 1d554be642..4b438a7e72 100644
--- a/arch/arm/src/stm32/stm32_qencoder.c
+++ b/arch/arm/src/stm32/stm32_qencoder.c
@@ -634,23 +634,23 @@ static void stm32_putreg32(FAR struct stm32_lowerhalf_s *priv, int offset, uint3
 #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);
-  snvdbg("  CR1: %04x CR2:  %04x SMCR:  %04x DIER:  %04x\n",
+  sninfo("%s:\n", msg);
+  sninfo("  CR1: %04x CR2:  %04x SMCR:  %04x DIER:  %04x\n",
          stm32_getreg16(priv, STM32_GTIM_CR1_OFFSET),
          stm32_getreg16(priv, STM32_GTIM_CR2_OFFSET),
          stm32_getreg16(priv, STM32_GTIM_SMCR_OFFSET),
          stm32_getreg16(priv, STM32_GTIM_DIER_OFFSET));
-  snvdbg("   SR: %04x EGR:  %04x CCMR1: %04x CCMR2: %04x\n",
+  sninfo("   SR: %04x EGR:  %04x CCMR1: %04x CCMR2: %04x\n",
          stm32_getreg16(priv, STM32_GTIM_SR_OFFSET),
          stm32_getreg16(priv, STM32_GTIM_EGR_OFFSET),
          stm32_getreg16(priv, STM32_GTIM_CCMR1_OFFSET),
          stm32_getreg16(priv, STM32_GTIM_CCMR2_OFFSET));
-  snvdbg(" CCER: %04x CNT:  %04x PSC:   %04x ARR:   %04x\n",
+  sninfo(" CCER: %04x CNT:  %04x PSC:   %04x ARR:   %04x\n",
          stm32_getreg16(priv, STM32_GTIM_CCER_OFFSET),
          stm32_getreg16(priv, STM32_GTIM_CNT_OFFSET),
          stm32_getreg16(priv, STM32_GTIM_PSC_OFFSET),
          stm32_getreg16(priv, STM32_GTIM_ARR_OFFSET));
-  snvdbg(" CCR1: %04x CCR2: %04x CCR3:  %04x CCR4:  %04x\n",
+  sninfo(" CCR1: %04x CCR2: %04x CCR3:  %04x CCR4:  %04x\n",
          stm32_getreg16(priv, STM32_GTIM_CCR1_OFFSET),
          stm32_getreg16(priv, STM32_GTIM_CCR2_OFFSET),
          stm32_getreg16(priv, STM32_GTIM_CCR3_OFFSET),
@@ -658,7 +658,7 @@ static void stm32_dumpregs(FAR struct stm32_lowerhalf_s *priv, FAR const char *m
 #if defined(CONFIG_STM32_TIM1_QE) || defined(CONFIG_STM32_TIM8_QE)
   if (priv->config->timid == 1 || priv->config->timid == 8)
     {
-      snvdbg("  RCR: %04x BDTR: %04x DCR:   %04x DMAR:  %04x\n",
+      sninfo("  RCR: %04x BDTR: %04x DCR:   %04x DMAR:  %04x\n",
              stm32_getreg16(priv, STM32_ATIM_RCR_OFFSET),
              stm32_getreg16(priv, STM32_ATIM_BDTR_OFFSET),
              stm32_getreg16(priv, STM32_ATIM_DCR_OFFSET),
@@ -667,7 +667,7 @@ static void stm32_dumpregs(FAR struct stm32_lowerhalf_s *priv, FAR const char *m
   else
 #endif
     {
-      snvdbg("  DCR: %04x DMAR: %04x\n",
+      sninfo("  DCR: %04x DMAR: %04x\n",
              stm32_getreg16(priv, STM32_GTIM_DCR_OFFSET),
              stm32_getreg16(priv, STM32_GTIM_DMAR_OFFSET));
     }
@@ -1125,7 +1125,7 @@ static int stm32_shutdown(FAR struct qe_lowerhalf_s *lower)
   putreg32(regval, regaddr);
   leave_critical_section(flags);
 
-  snvdbg("regaddr: %08x resetbit: %08x\n", regaddr, resetbit);
+  sninfo("regaddr: %08x resetbit: %08x\n", regaddr, resetbit);
   stm32_dumpregs(priv, "After stop");
 
   /* Put the TI1 GPIO pin back to its default state */
@@ -1203,7 +1203,7 @@ static int stm32_reset(FAR struct qe_lowerhalf_s *lower)
 #ifdef HAVE_16BIT_TIMERS
   irqstate_t flags;
 
-  snvdbg("Resetting position to zero\n");
+  sninfo("Resetting position to zero\n");
   DEBUGASSERT(lower && priv->inuse);
 
   /* Reset the timer and the counter.  Interrupts are disabled to make this atomic
@@ -1215,7 +1215,7 @@ static int stm32_reset(FAR struct qe_lowerhalf_s *lower)
   priv->position = 0;
   leave_critical_section(flags);
 #else
-  snvdbg("Resetting position to zero\n");
+  sninfo("Resetting position to zero\n");
   DEBUGASSERT(lower && priv->inuse);
 
   /* Reset the counter to zero */
diff --git a/arch/arm/src/stm32/stm32_rng.c b/arch/arm/src/stm32/stm32_rng.c
index 5726f43ef9..11477eb893 100644
--- a/arch/arm/src/stm32/stm32_rng.c
+++ b/arch/arm/src/stm32/stm32_rng.c
@@ -102,7 +102,7 @@ static int stm32_rnginitialize()
 {
   uint32_t regval;
 
-  vdbg("Initializing RNG\n");
+  info("Initializing RNG\n");
 
   memset(&g_rngdev, 0, sizeof(struct rng_dev_s));
 
@@ -112,7 +112,7 @@ static int stm32_rnginitialize()
     {
       /* We could not attach the ISR to the interrupt */
 
-      vdbg("Could not attach IRQ.\n");
+      info("Could not attach IRQ.\n");
 
       return -EAGAIN;
     }
diff --git a/arch/arm/src/stm32/stm32_rtcc.c b/arch/arm/src/stm32/stm32_rtcc.c
index 7d403ba504..3b0877775a 100644
--- a/arch/arm/src/stm32/stm32_rtcc.c
+++ b/arch/arm/src/stm32/stm32_rtcc.c
@@ -127,14 +127,14 @@
 
 #ifdef CONFIG_DEBUG_RTC
 #  define rtcdbg    dbg
-#  define rtcvdbg   vdbg
+#  define rtcinfo   info
 #  define rtclldbg  lldbg
-#  define rtcllvdbg llvdbg
+#  define rtcllinfo llinfo
 #else
 #  define rtcdbg(x...)
-#  define rtcvdbg(x...)
+#  define rtcinfo(x...)
 #  define rtclldbg(x...)
-#  define rtcllvdbg(x...)
+#  define rtcllinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/arch/arm/src/stm32/stm32_sdio.c b/arch/arm/src/stm32/stm32_sdio.c
index 386eddefeb..7244877af6 100644
--- a/arch/arm/src/stm32/stm32_sdio.c
+++ b/arch/arm/src/stm32/stm32_sdio.c
@@ -596,7 +596,7 @@ static inline void stm32_setclkcr(uint32_t clkcr)
   regval |=  clkcr;
   putreg32(regval, STM32_SDIO_CLKCR);
 
-  fvdbg("CLKCR: %08x PWR: %08x\n",
+  finfo("CLKCR: %08x PWR: %08x\n",
         getreg32(STM32_SDIO_CLKCR), getreg32(STM32_SDIO_POWER));
 }
 
@@ -1582,7 +1582,7 @@ static void stm32_reset(FAR struct sdio_dev_s *dev)
   stm32_setpwrctrl(SDIO_POWER_PWRCTRL_ON);
   leave_critical_section(flags);
 
-  fvdbg("CLCKR: %08x POWER: %08x\n",
+  finfo("CLCKR: %08x POWER: %08x\n",
         getreg32(STM32_SDIO_CLKCR), getreg32(STM32_SDIO_POWER));
 }
 
@@ -1795,7 +1795,7 @@ static int stm32_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t arg)
   cmdidx  = (cmd & MMCSD_CMDIDX_MASK) >> MMCSD_CMDIDX_SHIFT;
   regval |= cmdidx | SDIO_CMD_CPSMEN;
 
-  fvdbg("cmd: %08x arg: %08x regval: %08x\n", cmd, arg, regval);
+  finfo("cmd: %08x arg: %08x regval: %08x\n", cmd, arg, regval);
 
   /* Write the SDIO CMD */
 
@@ -2471,7 +2471,7 @@ static void stm32_callbackenable(FAR struct sdio_dev_s *dev,
 {
   struct stm32_dev_s *priv = (struct stm32_dev_s *)dev;
 
-  fvdbg("eventset: %02x\n", eventset);
+  finfo("eventset: %02x\n", eventset);
   DEBUGASSERT(priv != NULL);
 
   priv->cbevents = eventset;
@@ -2507,7 +2507,7 @@ static int stm32_registercallback(FAR struct sdio_dev_s *dev,
 
   /* Disable callbacks and register this callback and is argument */
 
-  fvdbg("Register %p(%p)\n", callback, arg);
+  finfo("Register %p(%p)\n", callback, arg);
   DEBUGASSERT(priv != NULL);
 
   priv->cbevents = 0;
@@ -2743,7 +2743,7 @@ static void stm32_callback(void *arg)
   /* Is a callback registered? */
 
   DEBUGASSERT(priv != NULL);
-  fvdbg("Callback %p(%p) cbevents: %02x cdstatus: %02x\n",
+  finfo("Callback %p(%p) cbevents: %02x cdstatus: %02x\n",
         priv->callback, priv->cbarg, priv->cbevents, priv->cdstatus);
 
   if (priv->callback)
@@ -2788,14 +2788,14 @@ static void stm32_callback(void *arg)
         {
           /* Yes.. queue it */
 
-           fvdbg("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg);
+           finfo("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg);
           (void)work_queue(HPWORK, &priv->cbwork, (worker_t)priv->callback, priv->cbarg, 0);
         }
       else
         {
           /* No.. then just call the callback here */
 
-          fvdbg("Callback to %p(%p)\n", priv->callback, priv->cbarg);
+          finfo("Callback to %p(%p)\n", priv->callback, priv->cbarg);
           priv->callback(priv->cbarg);
         }
     }
@@ -2925,7 +2925,7 @@ void sdio_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot)
 
   leave_critical_section(flags);
 
-  fvdbg("cdstatus OLD: %02x NEW: %02x\n", cdstatus, priv->cdstatus);
+  finfo("cdstatus OLD: %02x NEW: %02x\n", cdstatus, priv->cdstatus);
 
   /* Perform any requested callback if the status has changed */
 
@@ -2967,7 +2967,7 @@ void sdio_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect)
     {
       priv->cdstatus &= ~SDIO_STATUS_WRPROTECTED;
     }
-  fvdbg("cdstatus: %02x\n", priv->cdstatus);
+  finfo("cdstatus: %02x\n", priv->cdstatus);
   leave_critical_section(flags);
 }
 #endif /* CONFIG_STM32_SDIO */
diff --git a/arch/arm/src/stm32/stm32_spi.c b/arch/arm/src/stm32/stm32_spi.c
index 86d99da736..6c3f7eea90 100644
--- a/arch/arm/src/stm32/stm32_spi.c
+++ b/arch/arm/src/stm32/stm32_spi.c
@@ -167,13 +167,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
@@ -1052,7 +1052,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
        * faster.
        */
 
-      spivdbg("Frequency %d->%d\n", frequency, actual);
+      spiinfo("Frequency %d->%d\n", frequency, actual);
 
       priv->frequency = frequency;
       priv->actual    = actual;
@@ -1082,7 +1082,7 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode)
   uint16_t setbits;
   uint16_t clrbits;
 
-  spivdbg("mode=%d\n", mode);
+  spiinfo("mode=%d\n", mode);
 
   /* Has the mode changed? */
 
@@ -1147,7 +1147,7 @@ static void spi_setbits(FAR struct spi_dev_s *dev, int nbits)
   uint16_t setbits;
   uint16_t clrbits;
 
-  spivdbg("nbits=%d\n", nbits);
+  spiinfo("nbits=%d\n", nbits);
 
   /* Has the number of bits changed? */
 
@@ -1222,7 +1222,7 @@ static uint16_t spi_send(FAR struct spi_dev_s *dev, uint16_t wd)
 
   regval = spi_getreg(priv, STM32_SPI_SR_OFFSET);
 
-  spivdbg("Sent: %04x Return: %04x Status: %02x\n", wd, ret, regval);
+  spiinfo("Sent: %04x Return: %04x Status: %02x\n", wd, ret, regval);
   UNUSED(regval);
 
   return ret;
@@ -1260,7 +1260,7 @@ static void spi_exchange_nodma(FAR struct spi_dev_s *dev, FAR const void *txbuff
   FAR struct stm32_spidev_s *priv = (FAR struct stm32_spidev_s *)dev;
   DEBUGASSERT(priv && priv->spibase);
 
-  spivdbg("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords);
+  spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords);
 
   /* 8- or 16-bit mode? */
 
@@ -1373,7 +1373,7 @@ static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
       static uint16_t rxdummy = 0xffff;
       static const uint16_t txdummy = 0xffff;
 
-      spivdbg("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords);
+      spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords);
       DEBUGASSERT(priv && priv->spibase);
 
       /* Setup DMAs */
@@ -1416,7 +1416,7 @@ static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
 #ifndef CONFIG_SPI_EXCHANGE
 static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *txbuffer, size_t nwords)
 {
-  spivdbg("txbuffer=%p nwords=%d\n", txbuffer, nwords);
+  spiinfo("txbuffer=%p nwords=%d\n", txbuffer, nwords);
   return spi_exchange(dev, txbuffer, NULL, nwords);
 }
 #endif
@@ -1443,7 +1443,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *txbuffer, si
 #ifndef CONFIG_SPI_EXCHANGE
 static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *rxbuffer, size_t nwords)
 {
-  spivdbg("rxbuffer=%p nwords=%d\n", rxbuffer, nwords);
+  spiinfo("rxbuffer=%p nwords=%d\n", rxbuffer, nwords);
   return spi_exchange(dev, NULL, rxbuffer, nwords);
 }
 #endif
diff --git a/arch/arm/src/stm32/stm32_usbdev.c b/arch/arm/src/stm32/stm32_usbdev.c
index 27f75be899..5f352dc26c 100644
--- a/arch/arm/src/stm32/stm32_usbdev.c
+++ b/arch/arm/src/stm32/stm32_usbdev.c
@@ -1367,7 +1367,7 @@ static int stm32_wrrequest(struct stm32_usbdev_s *priv, struct stm32_ep_s *prive
     }
 
   epno = USB_EPNO(privep->ep.eplog);
-  ullvdbg("epno=%d req=%p: len=%d xfrd=%d nullpkt=%d\n",
+  ullinfo("epno=%d req=%p: len=%d xfrd=%d nullpkt=%d\n",
           epno, privreq, privreq->req.len, privreq->req.xfrd, privep->txnullpkt);
   UNUSED(epno);
 
@@ -1458,7 +1458,7 @@ static inline int stm32_ep0_rdrequest(struct stm32_usbdev_s *priv)
 
   pmalen  = stm32_geteprxcount(EP0);
 
-  ullvdbg("EP0: pmalen=%d\n", pmalen);
+  ullinfo("EP0: pmalen=%d\n", pmalen);
   usbtrace(TRACE_READ(EP0), pmalen);
 
   /* Read the data into our special buffer for SETUP data */
@@ -1510,7 +1510,7 @@ static int stm32_rdrequest(struct stm32_usbdev_s *priv, struct stm32_ep_s *prive
       return -ENOENT;
     }
 
-  ullvdbg("EP%d: len=%d xfrd=%d\n", epno, privreq->req.len, privreq->req.xfrd);
+  ullinfo("EP%d: len=%d xfrd=%d\n", epno, privreq->req.len, privreq->req.xfrd);
 
   /* Ignore any attempt to receive a zero length packet */
 
@@ -1768,7 +1768,7 @@ static void stm32_ep0setup(struct stm32_usbdev_s *priv)
       index.w = GETUINT16(priv->ctrl.index);
       len.w   = GETUINT16(priv->ctrl.len);
 
-      ullvdbg("SETUP: type=%02x req=%02x value=%04x index=%04x len=%04x\n",
+      ullinfo("SETUP: type=%02x req=%02x value=%04x index=%04x len=%04x\n",
               priv->ctrl.type, priv->ctrl.req, value.w, index.w, len.w);
 
       /* Is this an setup with OUT and data of length > 0 */
@@ -1959,7 +1959,7 @@ static void stm32_ep0setup(struct stm32_usbdev_s *priv)
           {
             /* Special case recipient=device test mode */
 
-            ullvdbg("test mode: %d\n", index.w);
+            ullinfo("test mode: %d\n", index.w);
           }
         else if ((priv->ctrl.type & USB_REQ_RECIPIENT_MASK) != USB_REQ_RECIPIENT_ENDPOINT)
           {
diff --git a/arch/arm/src/stm32/stm32_wwdg.c b/arch/arm/src/stm32/stm32_wwdg.c
index 5cab6ce92b..dd20476f57 100644
--- a/arch/arm/src/stm32/stm32_wwdg.c
+++ b/arch/arm/src/stm32/stm32_wwdg.c
@@ -89,10 +89,10 @@
 
 #ifdef CONFIG_DEBUG_WATCHDOG
 #  define wddbg    lldbg
-#  define wdvdbg   llvdbg
+#  define wdinfo   llinfo
 #else
 #  define wddbg(x...)
-#  define wdvdbg(x...)
+#  define wdinfo(x...)
 #endif
 
 /****************************************************************************
@@ -348,7 +348,7 @@ static int stm32_start(FAR struct watchdog_lowerhalf_s *lower)
 {
   FAR struct stm32_lowerhalf_s *priv = (FAR struct stm32_lowerhalf_s *)lower;
 
-  wdvdbg("Entry\n");
+  wdinfo("Entry\n");
   DEBUGASSERT(priv);
 
   /* The watchdog is always disabled after a reset. It is enabled by setting
@@ -383,7 +383,7 @@ static int stm32_stop(FAR struct watchdog_lowerhalf_s *lower)
    * except by a reset.
    */
 
-  wdvdbg("Entry\n");
+  wdinfo("Entry\n");
   return -ENOSYS;
 }
 
@@ -414,7 +414,7 @@ static int stm32_keepalive(FAR struct watchdog_lowerhalf_s *lower)
 {
   FAR struct stm32_lowerhalf_s *priv = (FAR struct stm32_lowerhalf_s *)lower;
 
-  wdvdbg("Entry\n");
+  wdinfo("Entry\n");
   DEBUGASSERT(priv);
 
   /* Write to T[6:0] bits to configure the counter value, no need to do
@@ -448,7 +448,7 @@ static int stm32_getstatus(FAR struct watchdog_lowerhalf_s *lower,
   uint32_t elapsed;
   uint16_t reload;
 
-  wdvdbg("Entry\n");
+  wdinfo("Entry\n");
   DEBUGASSERT(priv);
 
   /* Return the status bit */
@@ -474,10 +474,10 @@ static int stm32_getstatus(FAR struct watchdog_lowerhalf_s *lower,
   elapsed = priv->reload - reload;
   status->timeleft = (priv->timeout * elapsed) / (priv->reload + 1);
 
-  wdvdbg("Status     :\n");
-  wdvdbg("  flags    : %08x\n", status->flags);
-  wdvdbg("  timeout  : %d\n", status->timeout);
-  wdvdbg("  timeleft : %d\n", status->flags);
+  wdinfo("Status     :\n");
+  wdinfo("  flags    : %08x\n", status->flags);
+  wdinfo("  timeout  : %d\n", status->timeout);
+  wdinfo("  timeleft : %d\n", status->flags);
   return OK;
 }
 
@@ -507,7 +507,7 @@ static int stm32_settimeout(FAR struct watchdog_lowerhalf_s *lower,
   int wdgtb;
 
   DEBUGASSERT(priv);
-  wdvdbg("Entry: timeout=%d\n", timeout);
+  wdinfo("Entry: timeout=%d\n", timeout);
 
   /* Can this timeout be represented? */
 
@@ -562,7 +562,7 @@ static int stm32_settimeout(FAR struct watchdog_lowerhalf_s *lower,
        */
 
 #if 0
-      wdvdbg("wdgtb=%d fwwdg=%d reload=%d timout=%d\n",
+      wdinfo("wdgtb=%d fwwdg=%d reload=%d timout=%d\n",
              wdgtb, fwwdg, reload,  1000 * (reload + 1) / fwwdg);
 #endif
       if (reload <= WWDG_CR_T_MAX || wdgtb == 3)
@@ -595,7 +595,7 @@ static int stm32_settimeout(FAR struct watchdog_lowerhalf_s *lower,
   priv->fwwdg  = fwwdg;
   priv->reload = reload;
 
-  wdvdbg("wdgtb=%d fwwdg=%d reload=%d timout=%d\n",
+  wdinfo("wdgtb=%d fwwdg=%d reload=%d timout=%d\n",
          wdgtb, fwwdg, reload, priv->timeout);
 
   /* Set WDGTB[1:0] bits according to calculated value */
@@ -644,7 +644,7 @@ static xcpt_t stm32_capture(FAR struct watchdog_lowerhalf_s *lower,
   uint16_t regval;
 
   DEBUGASSERT(priv);
-  wdvdbg("Entry: handler=%p\n", handler);
+  wdinfo("Entry: handler=%p\n", handler);
 
   /* Get the old handler return value */
 
@@ -708,7 +708,7 @@ static int stm32_ioctl(FAR struct watchdog_lowerhalf_s *lower, int cmd,
   int ret = -ENOTTY;
 
   DEBUGASSERT(priv);
-  wdvdbg("Entry: cmd=%d arg=%ld\n", cmd, arg);
+  wdinfo("Entry: cmd=%d arg=%ld\n", cmd, arg);
 
   /* WDIOC_MINTIME: Set the minimum ping time.  If two keepalive ioctls
    * are received within this time, a reset event will be generated.
@@ -761,7 +761,7 @@ void stm32_wwdginitialize(FAR const char *devpath)
 {
   FAR struct stm32_lowerhalf_s *priv = &g_wdgdev;
 
-  wdvdbg("Entry: devpath=%s\n", devpath);
+  wdinfo("Entry: devpath=%s\n", devpath);
 
   /* NOTE we assume that clocking to the IWDG has already been provided by
    * the RCC initialization logic.
diff --git a/arch/arm/src/stm32/stm32f30xxx_i2c.c b/arch/arm/src/stm32/stm32f30xxx_i2c.c
index 15b0cb63bb..643ca1ecd8 100644
--- a/arch/arm/src/stm32/stm32f30xxx_i2c.c
+++ b/arch/arm/src/stm32/stm32f30xxx_i2c.c
@@ -158,10 +158,10 @@
 
 #ifdef CONFIG_DEBUG_I2C
 #  define i2cdbg dbg
-#  define i2cvdbg vdbg
+#  define i2cinfo info
 #else
 #  define i2cdbg(x...)
-#  define i2cvdbg(x...)
+#  define i2cinfo(x...)
 #endif
 
 /* I2C event trace logic.  NOTE:  trace uses the internal, non-standard, low-level
@@ -727,7 +727,7 @@ static inline int stm32_i2c_sem_waitdone(FAR struct stm32_i2c_priv_s *priv)
 
   while (priv->intstate != INTSTATE_DONE && elapsed < timeout);
 
-  i2cvdbg("intstate: %d elapsed: %ld threshold: %ld status: %08x\n",
+  i2cinfo("intstate: %d elapsed: %ld threshold: %ld status: %08x\n",
           priv->intstate, (long)elapsed, (long)timeout, priv->status);
 
   /* Set the interrupt state back to IDLE */
@@ -881,7 +881,7 @@ static inline void stm32_i2c_sem_waitstop(FAR struct stm32_i2c_priv_s *priv)
    * still pending.
    */
 
-  i2cvdbg("Timeout with CR: %04x SR: %04x\n", cr, sr);
+  i2cinfo("Timeout with CR: %04x SR: %04x\n", cr, sr);
 }
 
 /************************************************************************************
diff --git a/arch/arm/src/stm32/stm32f40xxx_dma.c b/arch/arm/src/stm32/stm32f40xxx_dma.c
index 41d2436859..0ca3bc31ce 100644
--- a/arch/arm/src/stm32/stm32f40xxx_dma.c
+++ b/arch/arm/src/stm32/stm32f40xxx_dma.c
@@ -869,7 +869,7 @@ bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr)
   uint32_t transfer_size, burst_length;
   uint32_t mend;
 
-  dmavdbg("stm32_dmacapable: 0x%08x/%u 0x%08x\n", maddr, count, ccr);
+  dmainfo("stm32_dmacapable: 0x%08x/%u 0x%08x\n", maddr, count, ccr);
 
   /* Verify that the address conforms to the memory transfer size.
    * Transfers to/from memory performed by the DMA controller are
@@ -899,13 +899,13 @@ bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr)
         break;
 
       default:
-        dmavdbg("stm32_dmacapable: bad transfer size in CCR\n");
+        dmainfo("stm32_dmacapable: bad transfer size in CCR\n");
         return false;
     }
 
   if ((maddr & (transfer_size - 1)) != 0)
     {
-      dmavdbg("stm32_dmacapable: transfer unaligned\n");
+      dmainfo("stm32_dmacapable: transfer unaligned\n");
       return false;
     }
 
@@ -937,13 +937,13 @@ bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr)
             break;
 
           default:
-          dmavdbg("stm32_dmacapable: bad burst size in CCR\n");
+          dmainfo("stm32_dmacapable: bad burst size in CCR\n");
             return false;
         }
 
       if ((maddr & (burst_length - 1)) != 0)
         {
-          dmavdbg("stm32_dmacapable: burst crosses 1KiB\n");
+          dmainfo("stm32_dmacapable: burst crosses 1KiB\n");
           return false;
         }
     }
@@ -952,7 +952,7 @@ bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr)
 
   if ((maddr & STM32_REGION_MASK) != (mend & STM32_REGION_MASK))
     {
-      dmavdbg("stm32_dmacapable: transfer crosses memory region\n");
+      dmainfo("stm32_dmacapable: transfer crosses memory region\n");
       return false;
     }
 
@@ -973,7 +973,7 @@ bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr)
         if (maddr >= STM32_CCMRAM_BASE &&
             (maddr - STM32_CCMRAM_BASE) < 65536)
           {
-            dmavdbg("stm32_dmacapable: transfer targets CCMRAM\n");
+            dmainfo("stm32_dmacapable: transfer targets CCMRAM\n");
             return false;
           }
         break;
@@ -981,11 +981,11 @@ bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr)
       default:
         /* Everything else is unsupported by DMA */
 
-        dmavdbg("stm32_dmacapable: transfer targets unknown/unsupported region\n");
+        dmainfo("stm32_dmacapable: transfer targets unknown/unsupported region\n");
         return false;
     }
 
-    dmavdbg("stm32_dmacapable: transfer OK\n");
+    dmainfo("stm32_dmacapable: transfer OK\n");
   return true;
 }
 #endif
diff --git a/arch/arm/src/stm32/stm32f40xxx_rtcc.c b/arch/arm/src/stm32/stm32f40xxx_rtcc.c
index d89134fd46..0f79fc1709 100644
--- a/arch/arm/src/stm32/stm32f40xxx_rtcc.c
+++ b/arch/arm/src/stm32/stm32f40xxx_rtcc.c
@@ -135,14 +135,14 @@
 
 #ifdef CONFIG_DEBUG_RTC
 #  define rtcdbg             dbg
-#  define rtcvdbg            vdbg
+#  define rtcinfo            info
 #  define rtclldbg           lldbg
-#  define rtcllvdbg          llvdbg
+#  define rtcllinfo          llinfo
 #else
 #  define rtcdbg(x...)
-#  define rtcvdbg(x...)
+#  define rtcinfo(x...)
 #  define rtclldbg(x...)
-#  define rtcllvdbg(x...)
+#  define rtcllinfo(x...)
 #endif
 
 /************************************************************************************
@@ -792,7 +792,7 @@ static int rtchw_set_alrmar(rtc_alarmreg_t alarmreg)
   /* Set the RTC Alarm register */
 
   putreg32(alarmreg, STM32_RTC_ALRMAR);
-  rtcvdbg("  TR: %08x ALRMAR: %08x\n",
+  rtcinfo("  TR: %08x ALRMAR: %08x\n",
           getreg32(STM32_RTC_TR), getreg32(STM32_RTC_ALRMAR));
 
   /* Enable RTC alarm */
@@ -829,7 +829,7 @@ static int rtchw_set_alrmbr(rtc_alarmreg_t alarmreg)
   /* Set the RTC Alarm register */
 
   putreg32(alarmreg, STM32_RTC_ALRMBR);
-  rtcvdbg("  TR: %08x ALRMBR: %08x\n",
+  rtcinfo("  TR: %08x ALRMBR: %08x\n",
           getreg32(STM32_RTC_TR), getreg32(STM32_RTC_ALRMBR));
 
   /* Enable RTC alarm B */
@@ -1409,7 +1409,7 @@ int stm32_rtc_setalarm(FAR struct alm_setalarm_s *alminfo)
 #endif
 
       default:
-        rtcvdbg("ERROR: Invalid ALARM%d\n", alminfo->as_id);
+        rtcinfo("ERROR: Invalid ALARM%d\n", alminfo->as_id);
         break;
     }
 
@@ -1507,7 +1507,7 @@ int stm32_rtc_cancelalarm(enum alm_id_e alarmid)
 #endif
 
       default:
-        rtcvdbg("ERROR: Invalid ALARM%d\n", alarmid);
+        rtcinfo("ERROR: Invalid ALARM%d\n", alarmid);
         break;
     }
 
diff --git a/arch/arm/src/stm32f7/stm32_dma.c b/arch/arm/src/stm32f7/stm32_dma.c
index eab3412fbe..1b7f821d33 100644
--- a/arch/arm/src/stm32f7/stm32_dma.c
+++ b/arch/arm/src/stm32f7/stm32_dma.c
@@ -871,7 +871,7 @@ bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr)
   uint32_t transfer_size, burst_length;
   uint32_t mend;
 
-  dmavdbg("stm32_dmacapable: 0x%08x/%u 0x%08x\n", maddr, count, ccr);
+  dmainfo("stm32_dmacapable: 0x%08x/%u 0x%08x\n", maddr, count, ccr);
 
   /* Verify that the address conforms to the memory transfer size.
    * Transfers to/from memory performed by the DMA controller are
@@ -901,13 +901,13 @@ bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr)
         break;
 
       default:
-        dmavdbg("stm32_dmacapable: bad transfer size in CCR\n");
+        dmainfo("stm32_dmacapable: bad transfer size in CCR\n");
         return false;
     }
 
   if ((maddr & (transfer_size - 1)) != 0)
     {
-      dmavdbg("stm32_dmacapable: transfer unaligned\n");
+      dmainfo("stm32_dmacapable: transfer unaligned\n");
       return false;
     }
 
@@ -939,13 +939,13 @@ bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr)
             break;
 
           default:
-          dmavdbg("stm32_dmacapable: bad burst size in CCR\n");
+          dmainfo("stm32_dmacapable: bad burst size in CCR\n");
             return false;
         }
 
       if ((maddr & (burst_length - 1)) != 0)
         {
-          dmavdbg("stm32_dmacapable: burst crosses 1KiB\n");
+          dmainfo("stm32_dmacapable: burst crosses 1KiB\n");
           return false;
         }
     }
@@ -954,7 +954,7 @@ bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr)
 
   if ((maddr & STM32_REGION_MASK) != (mend & STM32_REGION_MASK))
     {
-      dmavdbg("stm32_dmacapable: transfer crosses memory region\n");
+      dmainfo("stm32_dmacapable: transfer crosses memory region\n");
       return false;
     }
 
@@ -975,7 +975,7 @@ bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr)
         if (maddr >= STM32_CCMRAM_BASE &&
             (maddr - STM32_CCMRAM_BASE) < 65536)
           {
-            dmavdbg("stm32_dmacapable: transfer targets CCMRAM\n");
+            dmainfo("stm32_dmacapable: transfer targets CCMRAM\n");
             return false;
           }
         break;
@@ -983,11 +983,11 @@ bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr)
       default:
         /* Everything else is unsupported by DMA */
 
-        dmavdbg("stm32_dmacapable: transfer targets unknown/unsupported region\n");
+        dmainfo("stm32_dmacapable: transfer targets unknown/unsupported region\n");
         return false;
     }
 
-    dmavdbg("stm32_dmacapable: transfer OK\n");
+    dmainfo("stm32_dmacapable: transfer OK\n");
   return true;
 }
 #endif
diff --git a/arch/arm/src/stm32f7/stm32_ethernet.c b/arch/arm/src/stm32f7/stm32_ethernet.c
index 4e6664ade1..1123d0b0a9 100644
--- a/arch/arm/src/stm32f7/stm32_ethernet.c
+++ b/arch/arm/src/stm32f7/stm32_ethernet.c
@@ -1060,7 +1060,7 @@ static int stm32_transmit(struct stm32_ethmac_s *priv)
   txdesc  = priv->txhead;
   txfirst = txdesc;
 
-  nllvdbg("d_len: %d d_buf: %p txhead: %p tdes0: %08x\n",
+  nllinfo("d_len: %d d_buf: %p txhead: %p tdes0: %08x\n",
           priv->dev.d_len, priv->dev.d_buf, txdesc, txdesc->tdes0);
 
   DEBUGASSERT(txdesc && (txdesc->tdes0 & ETH_TDES0_OWN) == 0);
@@ -1082,7 +1082,7 @@ static int stm32_transmit(struct stm32_ethmac_s *priv)
       bufcount = (priv->dev.d_len + (ALIGNED_BUFSIZE-1)) / ALIGNED_BUFSIZE;
       lastsize = priv->dev.d_len - (bufcount - 1) * ALIGNED_BUFSIZE;
 
-      nllvdbg("bufcount: %d lastsize: %d\n", bufcount, lastsize);
+      nllinfo("bufcount: %d lastsize: %d\n", bufcount, lastsize);
 
       /* Set the first segment bit in the first TX descriptor */
 
@@ -1209,7 +1209,7 @@ static int stm32_transmit(struct stm32_ethmac_s *priv)
 
   priv->inflight++;
 
-  nllvdbg("txhead: %p txtail: %p inflight: %d\n",
+  nllinfo("txhead: %p txtail: %p inflight: %d\n",
           priv->txhead, priv->txtail, priv->inflight);
 
   /* If all TX descriptors are in-flight, then we have to disable receive interrupts
@@ -1508,7 +1508,7 @@ static void stm32_freesegment(struct stm32_ethmac_s *priv,
   struct eth_rxdesc_s *rxdesc;
   int i;
 
-  nllvdbg("rxfirst: %p segments: %d\n", rxfirst, segments);
+  nllinfo("rxfirst: %p segments: %d\n", rxfirst, segments);
 
   /* Give the freed RX buffers back to the Ethernet MAC to be refilled */
 
@@ -1580,7 +1580,7 @@ static int stm32_recvframe(struct stm32_ethmac_s *priv)
   uint8_t *buffer;
   int i;
 
-  nllvdbg("rxhead: %p rxcurr: %p segments: %d\n",
+  nllinfo("rxhead: %p rxcurr: %p segments: %d\n",
           priv->rxhead, priv->rxcurr, priv->segments);
 
   /* Check if there are free buffers.  We cannot receive new frames in this
@@ -1652,7 +1652,7 @@ static int stm32_recvframe(struct stm32_ethmac_s *priv)
               rxcurr = priv->rxcurr;
             }
 
-          nllvdbg("rxhead: %p rxcurr: %p segments: %d\n",
+          nllinfo("rxhead: %p rxcurr: %p segments: %d\n",
               priv->rxhead, priv->rxcurr, priv->segments);
 
           /* Check if any errors are reported in the frame */
@@ -1705,7 +1705,7 @@ static int stm32_recvframe(struct stm32_ethmac_s *priv)
               arch_invalidate_dcache((uintptr_t)dev->d_buf,
                                      (uintptr_t)dev->d_buf + dev->d_len);
 
-              nllvdbg("rxhead: %p d_buf: %p d_len: %d\n",
+              nllinfo("rxhead: %p d_buf: %p d_len: %d\n",
                       priv->rxhead, dev->d_buf, dev->d_len);
 
               /* Return success */
@@ -1739,7 +1739,7 @@ static int stm32_recvframe(struct stm32_ethmac_s *priv)
 
   priv->rxhead = rxdesc;
 
-  nllvdbg("rxhead: %p rxcurr: %p segments: %d\n",
+  nllinfo("rxhead: %p rxcurr: %p segments: %d\n",
           priv->rxhead, priv->rxcurr, priv->segments);
 
   return -EAGAIN;
@@ -1799,7 +1799,7 @@ static void stm32_receive(struct stm32_ethmac_s *priv)
 #ifdef CONFIG_NET_IPv4
       if (BUF->type == HTONS(ETHTYPE_IP))
         {
-          nllvdbg("IPv4 frame\n");
+          nllinfo("IPv4 frame\n");
 
           /* Handle ARP on input then give the IPv4 packet to the network
            * layer
@@ -1839,7 +1839,7 @@ static void stm32_receive(struct stm32_ethmac_s *priv)
 #ifdef CONFIG_NET_IPv6
       if (BUF->type == HTONS(ETHTYPE_IP6))
         {
-          nllvdbg("Iv6 frame\n");
+          nllinfo("Iv6 frame\n");
 
           /* Give the IPv6 packet to the network layer */
 
@@ -1876,7 +1876,7 @@ static void stm32_receive(struct stm32_ethmac_s *priv)
 #ifdef CONFIG_NET_ARP
       if (BUF->type == htons(ETHTYPE_ARP))
         {
-          nllvdbg("ARP frame\n");
+          nllinfo("ARP frame\n");
 
           /* Handle ARP packet */
 
@@ -1935,7 +1935,7 @@ static void stm32_freeframe(struct stm32_ethmac_s *priv)
   struct eth_txdesc_s *txdesc;
   int i;
 
-  nllvdbg("txhead: %p txtail: %p inflight: %d\n",
+  nllinfo("txhead: %p txtail: %p inflight: %d\n",
           priv->txhead, priv->txtail, priv->inflight);
 
   /* Scan for "in-flight" descriptors owned by the CPU */
@@ -1956,7 +1956,7 @@ static void stm32_freeframe(struct stm32_ethmac_s *priv)
            * TX descriptors.
            */
 
-          nllvdbg("txtail: %p tdes0: %08x tdes2: %08x tdes3: %08x\n",
+          nllinfo("txtail: %p tdes0: %08x tdes2: %08x tdes3: %08x\n",
                   txdesc, txdesc->tdes0, txdesc->tdes2, txdesc->tdes3);
 
           DEBUGASSERT(txdesc->tdes2 != 0);
@@ -2021,7 +2021,7 @@ static void stm32_freeframe(struct stm32_ethmac_s *priv)
 
       priv->txtail = txdesc;
 
-      nllvdbg("txhead: %p txtail: %p inflight: %d\n",
+      nllinfo("txhead: %p txtail: %p inflight: %d\n",
               priv->txhead, priv->txtail, priv->inflight);
     }
 }
@@ -2563,12 +2563,12 @@ static int stm32_ifup(struct net_driver_s *dev)
   int ret;
 
 #ifdef CONFIG_NET_IPv4
-  nvdbg("Bringing up: %d.%d.%d.%d\n",
+  ninfo("Bringing up: %d.%d.%d.%d\n",
         dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
         (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 #endif
 #ifdef CONFIG_NET_IPv6
-  nvdbg("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
+  ninfo("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
         dev->d_ipv6addr[0], dev->d_ipv6addr[1], dev->d_ipv6addr[2],
         dev->d_ipv6addr[3], dev->d_ipv6addr[4], dev->d_ipv6addr[5],
         dev->d_ipv6addr[6], dev->d_ipv6addr[7]);
@@ -2616,7 +2616,7 @@ static int stm32_ifdown(struct net_driver_s *dev)
   struct stm32_ethmac_s *priv = (struct stm32_ethmac_s *)dev->d_private;
   irqstate_t flags;
 
-  nvdbg("Taking the network down\n");
+  ninfo("Taking the network down\n");
 
   /* Disable the Ethernet interrupt */
 
@@ -2661,7 +2661,7 @@ static int stm32_ifdown(struct net_driver_s *dev)
 
 static inline void stm32_txavail_process(struct stm32_ethmac_s *priv)
 {
-  nvdbg("ifup: %d\n", priv->ifup);
+  ninfo("ifup: %d\n", priv->ifup);
 
   /* Ignore the notification if the interface is not yet up */
 
@@ -2829,7 +2829,7 @@ static int stm32_addmac(struct net_driver_s *dev, const uint8_t *mac)
   uint32_t temp;
   uint32_t registeraddress;
 
-  nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
           mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
   /* Add the MAC address to the hardware multicast hash table */
@@ -2886,7 +2886,7 @@ static int stm32_rmmac(struct net_driver_s *dev, const uint8_t *mac)
   uint32_t temp;
   uint32_t registeraddress;
 
-  nllvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  nllinfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
           mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
   /* Remove the MAC address to the hardware multicast hash table */
@@ -3267,7 +3267,7 @@ static int stm32_phyread(uint16_t phydevaddr, uint16_t phyregaddr, uint16_t *val
         }
     }
 
-  nvdbg("MII transfer timed out: phydevaddr: %04x phyregaddr: %04x\n",
+  ninfo("MII transfer timed out: phydevaddr: %04x phyregaddr: %04x\n",
         phydevaddr, phyregaddr);
 
   return -ETIMEDOUT;
@@ -3326,7 +3326,7 @@ static int stm32_phywrite(uint16_t phydevaddr, uint16_t phyregaddr, uint16_t val
         }
     }
 
-  nvdbg("MII transfer timed out: phydevaddr: %04x phyregaddr: %04x value: %04x\n",
+  ninfo("MII transfer timed out: phydevaddr: %04x phyregaddr: %04x value: %04x\n",
         phydevaddr, phyregaddr, value);
 
   return -ETIMEDOUT;
@@ -3374,7 +3374,7 @@ static inline int stm32_dm9161(struct stm32_ethmac_s *priv)
       up_systemreset();
     }
 
-  nvdbg("PHY ID1: 0x%04X\n", phyval);
+  ninfo("PHY ID1: 0x%04X\n", phyval);
 
   /* Now check the "DAVICOM Specified Configuration Register (DSCR)", Register 16 */
 
@@ -3531,7 +3531,7 @@ static int stm32_phyinit(struct stm32_ethmac_s *priv)
 
   /* Remember the selected speed and duplex modes */
 
-  nvdbg("PHYSR[%d]: %04x\n", CONFIG_STM32F7_PHYSR, phyval);
+  ninfo("PHYSR[%d]: %04x\n", CONFIG_STM32F7_PHYSR, phyval);
 
   /* Different PHYs present speed and mode information in different ways.  IF
    * This CONFIG_STM32F7_PHYSR_ALTCONFIG is selected, this indicates that the PHY
@@ -3613,7 +3613,7 @@ static int stm32_phyinit(struct stm32_ethmac_s *priv)
 #endif
 #endif
 
-  nvdbg("Duplex: %s Speed: %d MBps\n",
+  ninfo("Duplex: %s Speed: %d MBps\n",
         priv->fduplex ? "FULL" : "HALF",
         priv->mbps100 ? 100 : 10);
 
@@ -3973,7 +3973,7 @@ static void stm32_macaddress(struct stm32_ethmac_s *priv)
   struct net_driver_s *dev = &priv->dev;
   uint32_t regval;
 
-  nllvdbg("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  nllinfo("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
           dev->d_ifname,
           dev->d_mac.ether_addr_octet[0], dev->d_mac.ether_addr_octet[1],
           dev->d_mac.ether_addr_octet[2], dev->d_mac.ether_addr_octet[3],
@@ -4041,7 +4041,7 @@ static void stm32_ipv6multicast(struct stm32_ethmac_s *priv)
   mac[4] = tmp16 & 0xff;
   mac[5] = tmp16 >> 8;
 
-  nvdbg("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  ninfo("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n",
         mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
   (void)stm32_addmac(dev, mac);
@@ -4179,12 +4179,12 @@ static int stm32_ethconfig(struct stm32_ethmac_s *priv)
 
   /* Reset the Ethernet block */
 
-  nllvdbg("Reset the Ethernet block\n");
+  nllinfo("Reset the Ethernet block\n");
   stm32_ethreset(priv);
 
   /* Initialize the PHY */
 
-  nllvdbg("Initialize the PHY\n");
+  nllinfo("Initialize the PHY\n");
   ret = stm32_phyinit(priv);
   if (ret < 0)
     {
@@ -4193,7 +4193,7 @@ static int stm32_ethconfig(struct stm32_ethmac_s *priv)
 
   /* Initialize the MAC and DMA */
 
-  nllvdbg("Initialize the MAC and DMA\n");
+  nllinfo("Initialize the MAC and DMA\n");
   ret = stm32_macconfig(priv);
   if (ret < 0)
     {
@@ -4217,7 +4217,7 @@ static int stm32_ethconfig(struct stm32_ethmac_s *priv)
 
   /* Enable normal MAC operation */
 
-  nllvdbg("Enable normal operation\n");
+  nllinfo("Enable normal operation\n");
   return stm32_macenable(priv);
 }
 
@@ -4253,7 +4253,7 @@ int stm32_ethinitialize(int intf)
 {
   struct stm32_ethmac_s *priv;
 
-  nvdbg("intf: %d\n", intf);
+  ninfo("intf: %d\n", intf);
 
   /* Get the interface structure associated with this interface number. */
 
diff --git a/arch/arm/src/stm32f7/stm32_procfs_dtcm.c b/arch/arm/src/stm32f7/stm32_procfs_dtcm.c
index af6f467fef..59faa89318 100644
--- a/arch/arm/src/stm32f7/stm32_procfs_dtcm.c
+++ b/arch/arm/src/stm32f7/stm32_procfs_dtcm.c
@@ -147,7 +147,7 @@ static int dtcm_open(FAR struct file *filep, FAR const char *relpath,
 {
   FAR struct dtcm_file_s *priv;
 
-  fvdbg("Open '%s'\n", relpath);
+  finfo("Open '%s'\n", relpath);
 
   /* PROCFS is read-only.  Any attempt to open with any kind of write
    * access is not permitted.
@@ -219,7 +219,7 @@ static ssize_t dtcm_read(FAR struct file *filep, FAR char *buffer,
   struct mallinfo mem;
   off_t offset = filep->f_pos;
 
-  fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen);
+  finfo("buffer=%p buflen=%d\n", buffer, (int)buflen);
 
   /* Recover our private data from the struct file instance */
 
@@ -278,7 +278,7 @@ static int dtcm_dup(FAR const struct file *oldp, FAR struct file *newp)
   FAR struct dtcm_file_s *oldpriv;
   FAR struct dtcm_file_s *newpriv;
 
-  fvdbg("Dup %p->%p\n", oldp, newp);
+  finfo("Dup %p->%p\n", oldp, newp);
 
   /* Recover our private data from the old struct file instance */
 
diff --git a/arch/arm/src/stm32l4/stm32l4_can.c b/arch/arm/src/stm32l4/stm32l4_can.c
index 81efb677d2..3781de996e 100644
--- a/arch/arm/src/stm32l4/stm32l4_can.c
+++ b/arch/arm/src/stm32l4/stm32l4_can.c
@@ -87,14 +87,14 @@
 
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
-#  define canvdbg   vdbg
+#  define caninfo   info
 #  define canlldbg  lldbg
-#  define canllvdbg llvdbg
+#  define canllinfo llinfo
 #else
 #  define candbg(x...)
-#  define canvdbg(x...)
+#  define caninfo(x...)
 #  define canlldbg(x...)
-#  define canllvdbg(x...)
+#  define canllinfo(x...)
 #endif
 
 #if !defined(CONFIG_DEBUG) || !defined(CONFIG_DEBUG_CAN)
@@ -514,7 +514,7 @@ static void can_reset(FAR struct can_dev_s *dev)
   uint32_t regbit = 0;
   irqstate_t flags;
 
-  canllvdbg("CAN%d\n", priv->port);
+  canllinfo("CAN%d\n", priv->port);
 
   /* Get the bits in the AHB1RSTR1 register needed to reset this CAN device */
 
@@ -569,7 +569,7 @@ static int can_setup(FAR struct can_dev_s *dev)
   FAR struct stm32l4_can_s *priv = dev->cd_priv;
   int ret;
 
-  canllvdbg("CAN%d RX0 irq: %d TX irq: %d\n", priv->port, priv->canrx0, priv->cantx);
+  canllinfo("CAN%d RX0 irq: %d TX irq: %d\n", priv->port, priv->canrx0, priv->cantx);
 
   /* CAN cell initialization */
 
@@ -639,7 +639,7 @@ static void can_shutdown(FAR struct can_dev_s *dev)
 {
   FAR struct stm32l4_can_s *priv = dev->cd_priv;
 
-  canllvdbg("CAN%d\n", priv->port);
+  canllinfo("CAN%d\n", priv->port);
 
   /* Disable the RX FIFO 0 and TX interrupts */
 
@@ -675,7 +675,7 @@ static void can_rxint(FAR struct can_dev_s *dev, bool enable)
   FAR struct stm32l4_can_s *priv = dev->cd_priv;
   uint32_t regval;
 
-  canllvdbg("CAN%d enable: %d\n", priv->port, enable);
+  canllinfo("CAN%d enable: %d\n", priv->port, enable);
 
   /* Enable/disable the FIFO 0 message pending interrupt */
 
@@ -711,7 +711,7 @@ static void can_txint(FAR struct can_dev_s *dev, bool enable)
   FAR struct stm32l4_can_s *priv = dev->cd_priv;
   uint32_t regval;
 
-  canllvdbg("CAN%d enable: %d\n", priv->port, enable);
+  canllinfo("CAN%d enable: %d\n", priv->port, enable);
 
   /* Support only disabling the transmit mailbox interrupt */
 
@@ -796,7 +796,7 @@ static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg)
   int dlc;
   int txmb;
 
-  canllvdbg("CAN%d ID: %d DLC: %d\n", priv->port, msg->cm_hdr.ch_id, msg->cm_hdr.ch_dlc);
+  canllinfo("CAN%d ID: %d DLC: %d\n", priv->port, msg->cm_hdr.ch_id, msg->cm_hdr.ch_dlc);
 
   /* Select one empty transmit mailbox */
 
@@ -949,7 +949,7 @@ static bool can_txready(FAR struct can_dev_s *dev)
   /* Return true if any mailbox is available */
 
   regval = can_getreg(priv, STM32L4_CAN_TSR_OFFSET);
-  canllvdbg("CAN%d TSR: %08x\n", priv->port, regval);
+  canllinfo("CAN%d TSR: %08x\n", priv->port, regval);
 
   if ((regval & CAN_ALL_MAILBOXES) != 0)
     {
@@ -985,7 +985,7 @@ static bool can_txempty(FAR struct can_dev_s *dev)
   /* Return true if all mailboxes are available */
 
   regval = can_getreg(priv, STM32L4_CAN_TSR_OFFSET);
-  canllvdbg("CAN%d TSR: %08x\n", priv->port, regval);
+  canllinfo("CAN%d TSR: %08x\n", priv->port, regval);
 
   if ((regval & CAN_ALL_MAILBOXES) == CAN_ALL_MAILBOXES)
     {
@@ -1260,7 +1260,7 @@ static int can_bittiming(struct stm32l4_can_s *priv)
   uint32_t ts1;
   uint32_t ts2;
 
-  canllvdbg("CAN%d PCLK1: %d baud: %d\n",
+  canllinfo("CAN%d PCLK1: %d baud: %d\n",
             priv->port, STM32L4_PCLK1_FREQUENCY, priv->baud);
 
   /* Try to get CAN_BIT_QUANTA quanta in one bit_time.
@@ -1314,7 +1314,7 @@ static int can_bittiming(struct stm32l4_can_s *priv)
       DEBUGASSERT(brp >= 1 && brp <= CAN_BTR_BRP_MAX);
     }
 
-  canllvdbg("TS1: %d TS2: %d BRP: %d\n", ts1, ts2, brp);
+  canllinfo("TS1: %d TS2: %d BRP: %d\n", ts1, ts2, brp);
 
   /* Configure bit timing.  This also does the following, less obvious
    * things.  Unless loopback mode is enabled, it:
@@ -1357,7 +1357,7 @@ static int can_cellinit(struct stm32l4_can_s *priv)
   uint32_t regval;
   int ret;
 
-  canllvdbg("CAN%d\n", priv->port);
+  canllinfo("CAN%d\n", priv->port);
 
   /* Exit from sleep mode */
 
@@ -1486,7 +1486,7 @@ static int can_filterinit(struct stm32l4_can_s *priv)
   uint32_t regval;
   uint32_t bitmask;
 
-  canllvdbg("CAN%d filter: %d\n", priv->port, priv->filter);
+  canllinfo("CAN%d filter: %d\n", priv->port, priv->filter);
 
   /* Get the bitmask associated with the filter used by this CAN block */
 
@@ -1565,7 +1565,7 @@ FAR struct can_dev_s *stm32l4_caninitialize(int port)
 {
   struct can_dev_s *dev = NULL;
 
-  canvdbg("CAN%d\n", port);
+  caninfo("CAN%d\n", port);
 
   /* NOTE:  Peripherical clocking for CAN1 and/or CAN2 was already provided
    * by stm32l4_clockconfig() early in the reset sequence.
diff --git a/arch/arm/src/stm32l4/stm32l4_i2c.c b/arch/arm/src/stm32l4/stm32l4_i2c.c
index 452b125e36..08bc407719 100644
--- a/arch/arm/src/stm32l4/stm32l4_i2c.c
+++ b/arch/arm/src/stm32l4/stm32l4_i2c.c
@@ -150,10 +150,10 @@
 
 #ifdef CONFIG_DEBUG_I2C
 #  define i2cdbg dbg
-#  define i2cvdbg vdbg
+#  define i2cinfo info
 #else
 #  define i2cdbg(x...)
-#  define i2cvdbg(x...)
+#  define i2cinfo(x...)
 #endif
 
 /* I2C event trace logic.  NOTE:  trace uses the internal, non-standard, low-level
@@ -671,7 +671,7 @@ static inline int stm32l4_i2c_sem_waitdone(FAR struct stm32l4_i2c_priv_s *priv)
 
   while (priv->intstate != INTSTATE_DONE && elapsed < timeout);
 
-  i2cvdbg("intstate: %d elapsed: %ld threshold: %ld status: %08x\n",
+  i2cinfo("intstate: %d elapsed: %ld threshold: %ld status: %08x\n",
           priv->intstate, (long)elapsed, (long)timeout, priv->status);
 
   /* Set the interrupt state back to IDLE */
@@ -825,7 +825,7 @@ static inline void stm32l4_i2c_sem_waitstop(FAR struct stm32l4_i2c_priv_s *priv)
    * still pending.
    */
 
-  i2cvdbg("Timeout with CR: %04x SR: %04x\n", cr, sr);
+  i2cinfo("Timeout with CR: %04x SR: %04x\n", cr, sr);
 }
 
 /************************************************************************************
diff --git a/arch/arm/src/stm32l4/stm32l4_idle.c b/arch/arm/src/stm32l4/stm32l4_idle.c
index 7cf0734c22..00cceb1470 100644
--- a/arch/arm/src/stm32l4/stm32l4_idle.c
+++ b/arch/arm/src/stm32l4/stm32l4_idle.c
@@ -101,7 +101,7 @@ static void up_idlepm(void)
 
       /* Perform board-specific, state-dependent logic here */
 
-      llvdbg("newstate= %d oldstate=%d\n", newstate, oldstate);
+      llinfo("newstate= %d oldstate=%d\n", newstate, oldstate);
 
       /* Then force the global state change */
 
diff --git a/arch/arm/src/stm32l4/stm32l4_qspi.c b/arch/arm/src/stm32l4/stm32l4_qspi.c
index 723ce2841f..06c136014e 100644
--- a/arch/arm/src/stm32l4/stm32l4_qspi.c
+++ b/arch/arm/src/stm32l4/stm32l4_qspi.c
@@ -103,13 +103,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define qspidbg lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define qspivdbg lldbg
+#    define qspiinfo lldbg
 #  else
-#    define qspivdbg(x...)
+#    define qspiinfo(x...)
 #  endif
 #else
 #  define qspidbg(x...)
-#  define qspivdbg(x...)
+#  define qspiinfo(x...)
 #endif
 
 #define DMA_INITIAL      0
@@ -509,7 +509,7 @@ static inline void qspi_putreg(struct stm32l4_qspidev_s *priv, uint32_t value,
 static void qspi_dumpregs(struct stm32l4_qspidev_s *priv, const char *msg)
 {
   uint32_t regval;
-  qspivdbg("%s:\n", msg);
+  qspiinfo("%s:\n", msg);
 
 #if 0
   /* this extra verbose output may be helpful in some cases; you'll need
@@ -517,8 +517,8 @@ static void qspi_dumpregs(struct stm32l4_qspidev_s *priv, const char *msg)
    */
 
   regval = getreg32(priv->base + STM32L4_QUADSPI_CR_OFFSET);    /* Control Register */
-  qspivdbg("CR:%08x\n",regval);
-  qspivdbg("  EN:%1d ABORT:%1d DMAEN:%1d TCEN:%1d SSHIFT:%1d\n"
+  qspiinfo("CR:%08x\n",regval);
+  qspiinfo("  EN:%1d ABORT:%1d DMAEN:%1d TCEN:%1d SSHIFT:%1d\n"
            "  FTHRES: %d\n"
            "  TEIE:%1d TCIE:%1d FTIE:%1d SMIE:%1d TOIE:%1d APMS:%1d PMM:%1d\n"
            "  PRESCALER: %d\n",
@@ -539,16 +539,16 @@ static void qspi_dumpregs(struct stm32l4_qspidev_s *priv, const char *msg)
       );
 
   regval = getreg32(priv->base + STM32L4_QUADSPI_DCR_OFFSET);   /* Device Configuration Register */
-  qspivdbg("DCR:%08x\n",regval);
-  qspivdbg("  CKMODE:%1d CSHT:%d FSIZE:%d\n",
+  qspiinfo("DCR:%08x\n",regval);
+  qspiinfo("  CKMODE:%1d CSHT:%d FSIZE:%d\n",
       (regval&QSPI_DCR_CKMODE)?1:0,
       (regval&QSPI_DCR_CSHT_MASK)>>QSPI_DCR_CSHT_SHIFT,
       (regval&QSPI_DCR_FSIZE_MASK)>>QSPI_DCR_FSIZE_SHIFT
       );
 
   regval = getreg32(priv->base + STM32L4_QUADSPI_CCR_OFFSET);   /* Communication Configuration Register */
-  qspivdbg("CCR:%08x\n",regval);
-  qspivdbg("   INST:%02x IMODE:%d ADMODE:%d ADSIZE:%d ABMODE:%d\n"
+  qspiinfo("CCR:%08x\n",regval);
+  qspiinfo("   INST:%02x IMODE:%d ADMODE:%d ADSIZE:%d ABMODE:%d\n"
            "   ABSIZE:%d DCYC:%d DMODE:%d FMODE:%d\n"
            "   SIOO:%1d DDRM:%1d\n",
       (regval&QSPI_CCR_INSTRUCTION_MASK)>>QSPI_CCR_INSTRUCTION_SHIFT,
@@ -565,8 +565,8 @@ static void qspi_dumpregs(struct stm32l4_qspidev_s *priv, const char *msg)
       );
 
   regval = getreg32(priv->base + STM32L4_QUADSPI_SR_OFFSET);    /* Status Register */
-  qspivdbg("SR:%08x\n",regval);
-  qspivdbg("  TEF:%1d TCF:%1d FTF:%1d SMF:%1d TOF:%1d BUSY:%1d FLEVEL:%d\n",
+  qspiinfo("SR:%08x\n",regval);
+  qspiinfo("  TEF:%1d TCF:%1d FTF:%1d SMF:%1d TOF:%1d BUSY:%1d FLEVEL:%d\n",
       (regval&QSPI_SR_TEF)?1:0,
       (regval&QSPI_SR_TCF)?1:0,
       (regval&QSPI_SR_FTF)?1:0,
@@ -577,17 +577,17 @@ static void qspi_dumpregs(struct stm32l4_qspidev_s *priv, const char *msg)
       );
 
 #else
-  qspivdbg("    CR:%08x   DCR:%08x   CCR:%08x    SR:%08x\n",
+  qspiinfo("    CR:%08x   DCR:%08x   CCR:%08x    SR:%08x\n",
           getreg32(priv->base + STM32L4_QUADSPI_CR_OFFSET),     /* Control Register */
           getreg32(priv->base + STM32L4_QUADSPI_DCR_OFFSET),    /* Device Configuration Register */
           getreg32(priv->base + STM32L4_QUADSPI_CCR_OFFSET),    /* Communication Configuration Register */
           getreg32(priv->base + STM32L4_QUADSPI_SR_OFFSET));    /* Status Register */
-  qspivdbg("   DLR:%08x   ABR:%08x PSMKR:%08x PSMAR:%08x\n",
+  qspiinfo("   DLR:%08x   ABR:%08x PSMKR:%08x PSMAR:%08x\n",
           getreg32(priv->base + STM32L4_QUADSPI_DLR_OFFSET),    /* Data Length Register */
           getreg32(priv->base + STM32L4_QUADSPI_ABR_OFFSET),    /* Alternate Bytes Register */
           getreg32(priv->base + STM32L4_QUADSPI_PSMKR_OFFSET),  /* Polling Status mask Register */
           getreg32(priv->base + STM32L4_QUADSPI_PSMAR_OFFSET)); /* Polling Status match Register */
-  qspivdbg("   PIR:%08x  LPTR:%08x\n",
+  qspiinfo("   PIR:%08x  LPTR:%08x\n",
           getreg32(priv->base + STM32L4_QUADSPI_PIR_OFFSET),    /* Polling Interval Register */
           getreg32(priv->base + STM32L4_QUADSPI_LPTR_OFFSET));  /* Low-Power Timeout Register */
   (void)regval;
@@ -599,25 +599,25 @@ static void qspi_dumpregs(struct stm32l4_qspidev_s *priv, const char *msg)
 static void qspi_dumpgpioconfig(const char *msg)
 {
   uint32_t regval;
-  qspivdbg("%s:\n", msg);
+  qspiinfo("%s:\n", msg);
 
   regval = getreg32(STM32L4_GPIOE_MODER);
-  qspivdbg("E_MODER:%08x\n",regval);
+  qspiinfo("E_MODER:%08x\n",regval);
 
   regval = getreg32(STM32L4_GPIOE_OTYPER);
-  qspivdbg("E_OTYPER:%08x\n",regval);
+  qspiinfo("E_OTYPER:%08x\n",regval);
 
   regval = getreg32(STM32L4_GPIOE_OSPEED);
-  qspivdbg("E_OSPEED:%08x\n",regval);
+  qspiinfo("E_OSPEED:%08x\n",regval);
 
   regval = getreg32(STM32L4_GPIOE_PUPDR);
-  qspivdbg("E_PUPDR:%08x\n",regval);
+  qspiinfo("E_PUPDR:%08x\n",regval);
 
   regval = getreg32(STM32L4_GPIOE_AFRL);
-  qspivdbg("E_AFRL:%08x\n",regval);
+  qspiinfo("E_AFRL:%08x\n",regval);
 
   regval = getreg32(STM32L4_GPIOE_AFRH);
-  qspivdbg("E_AFRH:%08x\n",regval);
+  qspiinfo("E_AFRH:%08x\n",regval);
 }
 #endif
 
@@ -729,20 +729,20 @@ static int qspi_setupxctnfromcmd(struct qspi_xctnspec_s *xctn,
   DEBUGASSERT(xctn != NULL && cmdinfo != NULL);
 
 #ifdef CONFIG_DEBUG_SPI
-  qspivdbg("Transfer:\n");
-  qspivdbg("  flags: %02x\n", cmdinfo->flags);
-  qspivdbg("  cmd: %04x\n", cmdinfo->cmd);
+  qspiinfo("Transfer:\n");
+  qspiinfo("  flags: %02x\n", cmdinfo->flags);
+  qspiinfo("  cmd: %04x\n", cmdinfo->cmd);
 
   if (QSPICMD_ISADDRESS(cmdinfo->flags))
     {
-      qspivdbg("  address/length: %08lx/%d\n",
+      qspiinfo("  address/length: %08lx/%d\n",
               (unsigned long)cmdinfo->addr, cmdinfo->addrlen);
     }
 
   if (QSPICMD_ISDATA(cmdinfo->flags))
     {
-      qspivdbg("  %s Data:\n", QSPICMD_ISWRITE(cmdinfo->flags) ? "Write" : "Read");
-      qspivdbg("    buffer/length: %p/%d\n", cmdinfo->buffer, cmdinfo->buflen);
+      qspiinfo("  %s Data:\n", QSPICMD_ISWRITE(cmdinfo->flags) ? "Write" : "Read");
+      qspiinfo("    buffer/length: %p/%d\n", cmdinfo->buffer, cmdinfo->buflen);
     }
 #endif
 
@@ -853,13 +853,13 @@ static int qspi_setupxctnfrommem(struct qspi_xctnspec_s *xctn,
   DEBUGASSERT(xctn != NULL && meminfo != NULL);
 
 #ifdef CONFIG_DEBUG_SPI
-  qspivdbg("Transfer:\n");
-  qspivdbg("  flags: %02x\n", meminfo->flags);
-  qspivdbg("  cmd: %04x\n", meminfo->cmd);
-  qspivdbg("  address/length: %08lx/%d\n",
+  qspiinfo("Transfer:\n");
+  qspiinfo("  flags: %02x\n", meminfo->flags);
+  qspiinfo("  cmd: %04x\n", meminfo->cmd);
+  qspiinfo("  address/length: %08lx/%d\n",
           (unsigned long)meminfo->addr, meminfo->addrlen);
-  qspivdbg("  %s Data:\n", QSPIMEM_ISWRITE(meminfo->flags) ? "Write" : "Read");
-  qspivdbg("    buffer/length: %p/%d\n", meminfo->buffer, meminfo->buflen);
+  qspiinfo("  %s Data:\n", QSPIMEM_ISWRITE(meminfo->flags) ? "Write" : "Read");
+  qspiinfo("    buffer/length: %p/%d\n", meminfo->buffer, meminfo->buflen);
 #endif
 
   DEBUGASSERT(meminfo->cmd < 256);
@@ -1705,7 +1705,7 @@ static int qspi_lock(struct qspi_dev_s *dev, bool lock)
 {
   struct stm32l4_qspidev_s *priv = (struct stm32l4_qspidev_s *)dev;
 
-  qspivdbg("lock=%d\n", lock);
+  qspiinfo("lock=%d\n", lock);
   if (lock)
     {
       /* Take the semaphore (perhaps waiting) */
@@ -1758,7 +1758,7 @@ static uint32_t qspi_setfrequency(struct qspi_dev_s *dev, uint32_t frequency)
       return 0;
     }
 
-  qspivdbg("frequency=%d\n", frequency);
+  qspiinfo("frequency=%d\n", frequency);
   DEBUGASSERT(priv);
 
   /* Wait till BUSY flag reset */
@@ -1810,14 +1810,14 @@ static uint32_t qspi_setfrequency(struct qspi_dev_s *dev, uint32_t frequency)
   /* Calculate the new actual frequency */
 
   actual = STL32L4_QSPI_CLOCK / prescaler;
-  qspivdbg("prescaler=%d actual=%d\n", prescaler, actual);
+  qspiinfo("prescaler=%d actual=%d\n", prescaler, actual);
 
   /* Save the frequency setting */
 
   priv->frequency = frequency;
   priv->actual    = actual;
 
-  qspivdbg("Frequency %d->%d\n", frequency, actual);
+  qspiinfo("Frequency %d->%d\n", frequency, actual);
   return actual;
 }
 
@@ -1850,7 +1850,7 @@ static void qspi_setmode(struct qspi_dev_s *dev, enum qspi_mode_e mode)
     return;
   }
   
-  qspivdbg("mode=%d\n", mode);
+  qspiinfo("mode=%d\n", mode);
 
   /* Has the mode changed? */
 
@@ -1880,14 +1880,14 @@ static void qspi_setmode(struct qspi_dev_s *dev, enum qspi_mode_e mode)
 
         case QSPIDEV_MODE1: /* CPOL=0; CPHA=1 */
         case QSPIDEV_MODE2: /* CPOL=1; CPHA=0 */
-          qspivdbg("unsupported mode=%d\n", mode);
+          qspiinfo("unsupported mode=%d\n", mode);
         default:
           DEBUGASSERT(FALSE);
           return;
         }
 
       qspi_putreg(priv, regval, STM32L4_QUADSPI_DCR);
-      qspivdbg("DCR=%08x\n", regval);
+      qspiinfo("DCR=%08x\n", regval);
 
       /* Save the mode so that subsequent re-configurations will be faster */
 
@@ -1917,7 +1917,7 @@ static void qspi_setbits(struct qspi_dev_s *dev, int nbits)
 
   if (8 != nbits)
     {
-      qspivdbg("unsupported nbits=%d\n", nbits);
+      qspiinfo("unsupported nbits=%d\n", nbits);
       DEBUGASSERT(FALSE);
     }
 }
@@ -2456,7 +2456,7 @@ struct qspi_dev_s *stm32l4_qspi_initialize(int intf)
 
   /* The STM32L4 has only a single QSPI port */
 
-  qspivdbg("intf: %d\n", intf);
+  qspiinfo("intf: %d\n", intf);
   DEBUGASSERT(intf == 0);
 
   /* Select the QSPI interface */
diff --git a/arch/arm/src/stm32l4/stm32l4_rng.c b/arch/arm/src/stm32l4/stm32l4_rng.c
index b82c42fdc2..2a27348bee 100644
--- a/arch/arm/src/stm32l4/stm32l4_rng.c
+++ b/arch/arm/src/stm32l4/stm32l4_rng.c
@@ -107,7 +107,7 @@ static const struct file_operations g_rngops =
 
 static int stm32l4_rnginitialize(void)
 {
-  vdbg("Initializing RNG\n");
+  info("Initializing RNG\n");
 
   memset(&g_rngdev, 0, sizeof(struct rng_dev_s));
 
@@ -117,7 +117,7 @@ static int stm32l4_rnginitialize(void)
     {
       /* We could not attach the ISR to the interrupt */
 
-      vdbg("Could not attach IRQ.\n");
+      info("Could not attach IRQ.\n");
 
       return -EAGAIN;
     }
diff --git a/arch/arm/src/stm32l4/stm32l4_rtcc.c b/arch/arm/src/stm32l4/stm32l4_rtcc.c
index eab4fa45e8..2c349abfd9 100644
--- a/arch/arm/src/stm32l4/stm32l4_rtcc.c
+++ b/arch/arm/src/stm32l4/stm32l4_rtcc.c
@@ -120,14 +120,14 @@
 
 #ifdef CONFIG_DEBUG_RTC
 #  define rtcdbg    dbg
-#  define rtcvdbg   vdbg
+#  define rtcinfo   info
 #  define rtclldbg  lldbg
-#  define rtcllvdbg llvdbg
+#  define rtcllinfo llinfo
 #else
 #  define rtcdbg(x...)
-#  define rtcvdbg(x...)
+#  define rtcinfo(x...)
 #  define rtclldbg(x...)
-#  define rtcllvdbg(x...)
+#  define rtcllinfo(x...)
 #endif
 
 /************************************************************************************
@@ -750,7 +750,7 @@ static int rtchw_set_alrmar(rtc_alarmreg_t alarmreg)
 
   putreg32(alarmreg, STM32L4_RTC_ALRMAR);
   putreg32(0, STM32L4_RTC_ALRMASSR);
-  rtcvdbg("  TR: %08x ALRMAR: %08x\n",
+  rtcinfo("  TR: %08x ALRMAR: %08x\n",
           getreg32(STM32L4_RTC_TR), getreg32(STM32L4_RTC_ALRMAR));
 
   /* Enable RTC alarm A */
@@ -796,7 +796,7 @@ static int rtchw_set_alrmbr(rtc_alarmreg_t alarmreg)
 
   putreg32(alarmreg, STM32L4_RTC_ALRMBR);
   putreg32(0, STM32L4_RTC_ALRMBSSR);
-  rtcvdbg("  TR: %08x ALRMBR: %08x\n",
+  rtcinfo("  TR: %08x ALRMBR: %08x\n",
           getreg32(STM32L4_RTC_TR), getreg32(STM32L4_RTC_ALRMBR));
 
   /* Enable RTC alarm B */
@@ -1309,7 +1309,7 @@ int stm32l4_rtc_setalarm(FAR struct alm_setalarm_s *alminfo)
         break;
 
       default:
-        rtcvdbg("ERROR: Invalid ALARM%d\n", alminfo->as_id);
+        rtcinfo("ERROR: Invalid ALARM%d\n", alminfo->as_id);
         break;
     }
 
@@ -1409,7 +1409,7 @@ int stm32l4_rtc_cancelalarm(enum alm_id_e alarmid)
         break;
 
       default:
-        rtcvdbg("ERROR: Invalid ALARM%d\n", alarmid);
+        rtcinfo("ERROR: Invalid ALARM%d\n", alarmid);
         break;
     }
 
diff --git a/arch/arm/src/stm32l4/stm32l4_spi.c b/arch/arm/src/stm32l4/stm32l4_spi.c
index acb9a9ba5a..712ed7c915 100644
--- a/arch/arm/src/stm32l4/stm32l4_spi.c
+++ b/arch/arm/src/stm32l4/stm32l4_spi.c
@@ -148,13 +148,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
@@ -1020,7 +1020,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
        * faster.
        */
 
-      spivdbg("Frequency %d->%d\n", frequency, actual);
+      spiinfo("Frequency %d->%d\n", frequency, actual);
 
       priv->frequency = frequency;
       priv->actual    = actual;
@@ -1050,7 +1050,7 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode)
   uint16_t setbits;
   uint16_t clrbits;
 
-  spivdbg("mode=%d\n", mode);
+  spiinfo("mode=%d\n", mode);
 
   /* Has the mode changed? */
 
@@ -1117,7 +1117,7 @@ static void spi_setbits(FAR struct spi_dev_s *dev, int nbits)
   uint16_t clrbits1, clrbits2;
   int savbits = nbits;
 
-  spivdbg("nbits=%d\n", nbits);
+  spiinfo("nbits=%d\n", nbits);
 
   /* Has the number of bits changed? */
 
@@ -1220,11 +1220,11 @@ static uint16_t spi_send(FAR struct spi_dev_s *dev, uint16_t wd)
 
   if (spi_16bitmode(priv))
     {
-      spivdbg("Sent: %04x Return: %04x Status: %02x\n", wd, ret, regval);
+      spiinfo("Sent: %04x Return: %04x Status: %02x\n", wd, ret, regval);
     }
   else
     {
-      spivdbg("Sent: %02x Return: %02x Status: %02x\n", wd, ret, regval);
+      spiinfo("Sent: %02x Return: %02x Status: %02x\n", wd, ret, regval);
     }
 
   UNUSED(regval);
@@ -1263,7 +1263,7 @@ static void spi_exchange_nodma(FAR struct spi_dev_s *dev, FAR const void *txbuff
   FAR struct stm32l4_spidev_s *priv = (FAR struct stm32l4_spidev_s *)dev;
   DEBUGASSERT(priv && priv->spibase);
 
-  spivdbg("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords);
+  spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords);
 
   /* 8- or 16-bit mode? */
 
@@ -1376,7 +1376,7 @@ static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
       static uint16_t rxdummy = 0xffff;
       static const uint16_t txdummy = 0xffff;
 
-      spivdbg("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords);
+      spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords);
       DEBUGASSERT(priv && priv->spibase);
 
       /* Setup DMAs */
@@ -1419,7 +1419,7 @@ static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
 #ifndef CONFIG_SPI_EXCHANGE
 static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *txbuffer, size_t nwords)
 {
-  spivdbg("txbuffer=%p nwords=%d\n", txbuffer, nwords);
+  spiinfo("txbuffer=%p nwords=%d\n", txbuffer, nwords);
   return spi_exchange(dev, txbuffer, NULL, nwords);
 }
 #endif
@@ -1446,7 +1446,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *txbuffer, si
 #ifndef CONFIG_SPI_EXCHANGE
 static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *rxbuffer, size_t nwords)
 {
-  spivdbg("rxbuffer=%p nwords=%d\n", rxbuffer, nwords);
+  spiinfo("rxbuffer=%p nwords=%d\n", rxbuffer, nwords);
   return spi_exchange(dev, NULL, rxbuffer, nwords);
 }
 #endif
diff --git a/arch/arm/src/tiva/lm3s_ethernet.c b/arch/arm/src/tiva/lm3s_ethernet.c
index 0acaeb3c07..4776e39e71 100644
--- a/arch/arm/src/tiva/lm3s_ethernet.c
+++ b/arch/arm/src/tiva/lm3s_ethernet.c
@@ -333,7 +333,7 @@ static void tiva_ethreset(struct tiva_driver_s *priv)
   regval  = getreg32(TIVA_SYSCON_RCGC2);
   regval |= (SYSCON_RCGC2_EMAC0 | SYSCON_RCGC2_EPHY0);
   putreg32(regval, TIVA_SYSCON_RCGC2);
-  nllvdbg("RCGC2: %08x\n", regval);
+  nllinfo("RCGC2: %08x\n", regval);
 
   /* Put the Ethernet controller into the reset state */
 
@@ -349,7 +349,7 @@ static void tiva_ethreset(struct tiva_driver_s *priv)
 
   regval &= ~(SYSCON_SRCR2_EMAC0 | SYSCON_SRCR2_EPHY0);
   putreg32(regval, TIVA_SYSCON_SRCR2);
-  nllvdbg("SRCR2: %08x\n", regval);
+  nllinfo("SRCR2: %08x\n", regval);
 
   /* Wait just a bit, again.  If we touch the ethernet too soon, we may busfault. */
 
@@ -495,7 +495,7 @@ static int tiva_transmit(struct tiva_driver_s *priv)
        */
 
       pktlen     = priv->ld_dev.d_len;
-      nllvdbg("Sending packet, pktlen: %d\n", pktlen);
+      nllinfo("Sending packet, pktlen: %d\n", pktlen);
       DEBUGASSERT(pktlen > ETH_HDRLEN);
 
       dbuf       = priv->ld_dev.d_buf;
@@ -584,7 +584,7 @@ static int tiva_txpoll(struct net_driver_s *dev)
    * the field d_len is set to a value > 0.
    */
 
-  nllvdbg("Poll result: d_len=%d\n", priv->ld_dev.d_len);
+  nllinfo("Poll result: d_len=%d\n", priv->ld_dev.d_len);
   if (priv->ld_dev.d_len > 0)
     {
       DEBUGASSERT((tiva_ethin(priv, TIVA_MAC_TR_OFFSET) & MAC_TR_NEWTX) == 0);
@@ -672,7 +672,7 @@ static void tiva_receive(struct tiva_driver_s *priv)
 
       regval = tiva_ethin(priv, TIVA_MAC_DATA_OFFSET);
       pktlen = (int)(regval & 0x0000ffff);
-      nllvdbg("Receiving packet, pktlen: %d\n", pktlen);
+      nllinfo("Receiving packet, pktlen: %d\n", pktlen);
 
       /* Check if the pktlen is valid.  It should be large enough to hold
        * an Ethernet header and small enough to fit entirely in the I/O
@@ -770,7 +770,7 @@ static void tiva_receive(struct tiva_driver_s *priv)
 #ifdef CONFIG_NET_IPv4
       if (ETHBUF->type == HTONS(ETHTYPE_IP))
         {
-          nllvdbg("IPv4 frame\n");
+          nllinfo("IPv4 frame\n");
           NETDEV_RXIPV4(&priv->ld_dev);
 
           /* Handle ARP on input then give the IPv4 packet to the network
@@ -811,7 +811,7 @@ static void tiva_receive(struct tiva_driver_s *priv)
 #ifdef CONFIG_NET_IPv6
       if (ETHBUF->type == HTONS(ETHTYPE_IP6))
         {
-          nllvdbg("Iv6 frame\n");
+          nllinfo("Iv6 frame\n");
           NETDEV_RXIPV6(&priv->ld_dev);
 
           /* Give the IPv6 packet to the network layer */
@@ -850,7 +850,7 @@ static void tiva_receive(struct tiva_driver_s *priv)
 #ifdef CONFIG_NET_ARP
       if (ETHBUF->type == htons(ETHTYPE_ARP))
         {
-          nllvdbg("ARP packet received (%02x)\n", ETHBUF->type);
+          nllinfo("ARP packet received (%02x)\n", ETHBUF->type);
           NETDEV_RXARP(&priv->ld_dev);
 
           arp_arpin(&priv->ld_dev);
@@ -1125,7 +1125,7 @@ static int tiva_ifup(struct net_driver_s *dev)
 
   div = SYSCLK_FREQUENCY / 2 / TIVA_MAX_MDCCLK;
   tiva_ethout(priv, TIVA_MAC_MDV_OFFSET, div);
-  nllvdbg("MDV:   %08x\n", div);
+  nllinfo("MDV:   %08x\n", div);
 
   /* Then configure the Ethernet Controller for normal operation
    *
@@ -1137,7 +1137,7 @@ static int tiva_ifup(struct net_driver_s *dev)
   regval &= ~TIVA_TCTCL_CLRBITS;
   regval |= TIVA_TCTCL_SETBITS;
   tiva_ethout(priv, TIVA_MAC_TCTL_OFFSET, regval);
-  nllvdbg("TCTL:  %08x\n", regval);
+  nllinfo("TCTL:  %08x\n", regval);
 
   /* Setup the receive control register (Disable multicast frames, disable
    * promiscuous mode, disable bad CRC rejection).
@@ -1147,7 +1147,7 @@ static int tiva_ifup(struct net_driver_s *dev)
   regval &= ~TIVA_RCTCL_CLRBITS;
   regval |= TIVA_RCTCL_SETBITS;
   tiva_ethout(priv, TIVA_MAC_RCTL_OFFSET, regval);
-  nllvdbg("RCTL:  %08x\n", regval);
+  nllinfo("RCTL:  %08x\n", regval);
 
   /* Setup the time stamp configuration register */
 
@@ -1159,7 +1159,7 @@ static int tiva_ifup(struct net_driver_s *dev)
   regval &= ~(MAC_TS_EN);
 #endif
   tiva_ethout(priv, TIVA_MAC_TS_OFFSET, regval);
-  nllvdbg("TS:    %08x\n", regval);
+  nllinfo("TS:    %08x\n", regval);
 #endif
 
   /* Wait for the link to come up.  This following is not very conservative
diff --git a/arch/arm/src/tiva/tiva_adclib.c b/arch/arm/src/tiva/tiva_adclib.c
index 64fb93552d..cb561682ed 100644
--- a/arch/arm/src/tiva/tiva_adclib.c
+++ b/arch/arm/src/tiva/tiva_adclib.c
@@ -209,7 +209,7 @@ void tiva_adc_one_time_init(uint32_t clock, uint8_t sample_rate)
   static bool one_time_init = false;
 
 #ifdef CONFIG_DEBUG_ANALOG
-  avdbg("setting clock=%d MHz sample rate=%d\n",
+  ainfo("setting clock=%d MHz sample rate=%d\n",
          clock, sample_rate);
 #endif
 
@@ -219,7 +219,7 @@ void tiva_adc_one_time_init(uint32_t clock, uint8_t sample_rate)
 
   if (one_time_init == false)
     {
-      avdbg("performing ADC one-time initialization...\n");
+      ainfo("performing ADC one-time initialization...\n");
       /* set clock */
 
       tiva_adc_clock(clock);
@@ -238,7 +238,7 @@ void tiva_adc_one_time_init(uint32_t clock, uint8_t sample_rate)
 #ifdef CONFIG_DEBUG_ANALOG
   else
     {
-      avdbg("one time initialization previously completed\n");
+      ainfo("one time initialization previously completed\n");
     }
 #endif
 }
@@ -257,7 +257,7 @@ void tiva_adc_configure(struct tiva_adc_cfg_s *cfg)
   uint8_t s;
   uint8_t c;
 
-  avdbg("configure ADC%d...\n", cfg->adc);
+  ainfo("configure ADC%d...\n", cfg->adc);
 
   /* Configure each SSE */
 
@@ -270,7 +270,7 @@ void tiva_adc_configure(struct tiva_adc_cfg_s *cfg)
 #ifdef CONFIG_DEBUG_ANALOG
       else
         {
-          avdbg("ADC%d SSE%d has no configuration\n", cfg->adc, s);
+          ainfo("ADC%d SSE%d has no configuration\n", cfg->adc, s);
         }
 #endif
     }
@@ -298,9 +298,9 @@ void tiva_adc_configure(struct tiva_adc_cfg_s *cfg)
 void tiva_adc_sse_cfg(uint8_t adc, uint8_t sse,
                       struct tiva_adc_sse_cfg_s *ssecfg)
 {
-  avdbg("configure ADC%d SSE%d...\n", adc, sse);
+  ainfo("configure ADC%d SSE%d...\n", adc, sse);
 #ifdef CONFIG_DEBUG_ANALOG
-  avdbg("priority=%d trigger=%d...\n", ssecfg->priority, ssecfg->trigger);
+  ainfo("priority=%d trigger=%d...\n", ssecfg->priority, ssecfg->trigger);
 #endif
 
   uint8_t priority = ssecfg->priority;
@@ -327,7 +327,7 @@ void tiva_adc_sse_cfg(uint8_t adc, uint8_t sse,
 void tiva_adc_step_cfg(struct tiva_adc_step_cfg_s *stepcfg)
 {
 #ifdef CONFIG_DEBUG_ANALOG
-  avdbg("  shold=0x%02x flags=0x%02x ain=%d...\n",
+  ainfo("  shold=0x%02x flags=0x%02x ain=%d...\n",
         stepcfg->shold, stepcfg->flags, stepcfg->ain);
 #endif
 
@@ -341,7 +341,7 @@ void tiva_adc_step_cfg(struct tiva_adc_step_cfg_s *stepcfg)
   uint8_t  ain   = stepcfg->ain;
   uint32_t gpio  = ain2gpio[stepcfg->ain];
 
-  avdbg("configure ADC%d SSE%d STEP%d...\n", adc, sse, step);
+  ainfo("configure ADC%d SSE%d STEP%d...\n", adc, sse, step);
 
   /* Configure the AIN GPIO for analog input if not flagged to be muxed to
    * the internal temperature sensor
@@ -410,7 +410,7 @@ void tiva_adc_irq_attach(uint8_t adc, uint8_t sse, xcpt_t isr)
   int irq = sse2irq[SSE_IDX(adc, sse)];
 
 #ifdef CONFIG_DEBUG_ANALOG
-  avdbg("assigning ISR=0x%p to ADC%d SSE%d IRQ=0x%02x...\n",
+  ainfo("assigning ISR=0x%p to ADC%d SSE%d IRQ=0x%02x...\n",
         isr, adc, sse, irq);
 #endif
 
@@ -682,7 +682,7 @@ uint32_t tiva_adc_int_status(uint8_t adc)
 
 uint8_t tiva_adc_sse_enable(uint8_t adc, uint8_t sse, bool state)
 {
-  avdbg("ADC%d SSE%d=%01d\n", adc, sse, state);
+  ainfo("ADC%d SSE%d=%01d\n", adc, sse, state);
 
   uintptr_t actssreg = TIVA_ADC_ACTSS(adc);
   if (state == true)
@@ -867,7 +867,7 @@ uint8_t tiva_adc_sse_data(uint8_t adc, uint8_t sse, int32_t *buf)
       ssfstatreg = getreg32(TIVA_ADC_BASE(adc) + TIVA_ADC_SSFSTAT(sse));
     }
 
-  avdbg("fifo=%d\n", fifo_count);
+  ainfo("fifo=%d\n", fifo_count);
 
   return fifo_count;
 }
@@ -1086,20 +1086,20 @@ void tiva_adc_dump_reg_cfg(uint8_t adc, uint8_t sse)
 
   /* Dump register contents */
 
-  avdbg("CC     [0x%08x]=0x%08x\n", ccreg, cc);
-  avdbg("PC     [0x%08x]=0x%08x\n", pcreg, pc);
-  avdbg("ACTSS  [0x%08x]=0x%08x\n", actssreg, actss);
-  avdbg("SSPRI  [0x%08x]=0x%08x\n", ssprireg, sspri);
-  avdbg("EMUX   [0x%08x]=0x%08x\n", emuxreg, emux);
-  avdbg("SSMUX  [0x%08x]=0x%08x\n", ssmuxreg, ssmux);
+  ainfo("CC     [0x%08x]=0x%08x\n", ccreg, cc);
+  ainfo("PC     [0x%08x]=0x%08x\n", pcreg, pc);
+  ainfo("ACTSS  [0x%08x]=0x%08x\n", actssreg, actss);
+  ainfo("SSPRI  [0x%08x]=0x%08x\n", ssprireg, sspri);
+  ainfo("EMUX   [0x%08x]=0x%08x\n", emuxreg, emux);
+  ainfo("SSMUX  [0x%08x]=0x%08x\n", ssmuxreg, ssmux);
 #ifdef CONFIG_ARCH_CHIP_TM4C129
-  avdbg("SSEMUX [0x%08x]=0x%08x\n", ssemuxreg, ssemux);
+  ainfo("SSEMUX [0x%08x]=0x%08x\n", ssemuxreg, ssemux);
 #endif
-  avdbg("SSOP   [0x%08x]=0x%08x\n", ssopreg, ssop);
+  ainfo("SSOP   [0x%08x]=0x%08x\n", ssopreg, ssop);
 #ifdef CONFIG_EXPERIMENTAL
-  avdbg("SSTSH  [0x%08x]=0x%08x\n", sstshreg, sstsh);
+  ainfo("SSTSH  [0x%08x]=0x%08x\n", sstshreg, sstsh);
 #endif
-  avdbg("SSCTL  [0x%08x]=0x%08x\n", ssctlreg, ssctl);
+  ainfo("SSCTL  [0x%08x]=0x%08x\n", ssctlreg, ssctl);
 
 }
 #endif /* CONFIG_DEBUG_ANALOG */
diff --git a/arch/arm/src/tiva/tiva_adclow.c b/arch/arm/src/tiva/tiva_adclow.c
index 7a0b5509ce..6b9273dc68 100644
--- a/arch/arm/src/tiva/tiva_adclow.c
+++ b/arch/arm/src/tiva/tiva_adclow.c
@@ -327,7 +327,7 @@ static int tiva_adc1_sse3_interrupt(int irq, void *context)
 
 static void tiva_adc_irqinitialize(struct tiva_adc_cfg_s *cfg)
 {
-  avdbg("initialize irqs for ADC%d...\n", cfg->adc);
+  ainfo("initialize irqs for ADC%d...\n", cfg->adc);
 
 #ifdef CONFIG_TIVA_ADC0
   if (cfg->adc == 0)
@@ -411,7 +411,7 @@ static int tiva_adc_bind(FAR struct adc_dev_s *dev,
 
 static void tiva_adc_reset(struct adc_dev_s *dev)
 {
-  avdbg("Resetting...\n");
+  ainfo("Resetting...\n");
 
   struct tiva_adc_s *priv = (struct tiva_adc_s *)dev->ad_priv;
   struct tiva_adc_sse_s *sse;
@@ -443,7 +443,7 @@ static void tiva_adc_reset(struct adc_dev_s *dev)
 
 static int tiva_adc_setup(struct adc_dev_s *dev)
 {
-  avdbg("Setup\n");
+  ainfo("Setup\n");
 
   struct tiva_adc_s *priv = (struct tiva_adc_s *)dev->ad_priv;
   struct tiva_adc_sse_s *sse;
@@ -477,7 +477,7 @@ static int tiva_adc_setup(struct adc_dev_s *dev)
 static void tiva_adc_shutdown(struct adc_dev_s *dev)
 {
   struct tiva_adc_s *priv = (struct tiva_adc_s *)dev->ad_priv;
-  avdbg("Shutdown\n");
+  ainfo("Shutdown\n");
 
   DEBUGASSERT(priv->ena);
 
@@ -512,7 +512,7 @@ static void tiva_adc_shutdown(struct adc_dev_s *dev)
 
 static void tiva_adc_rxint(struct adc_dev_s *dev, bool enable)
 {
-  avdbg("RXINT=%d\n", enable);
+  ainfo("RXINT=%d\n", enable);
 
   struct tiva_adc_s *priv = (struct tiva_adc_s *)dev->ad_priv;
   struct tiva_adc_sse_s *sse;
@@ -552,7 +552,7 @@ static int tiva_adc_ioctl(struct adc_dev_s *dev, int cmd, unsigned long arg)
 {
   int ret = OK;
 
-  avdbg("cmd=%d arg=%ld\n", cmd, arg);
+  ainfo("cmd=%d arg=%ld\n", cmd, arg);
 
   switch (cmd)
     {
@@ -704,7 +704,7 @@ static void tiva_adc_read(void *arg)
           priv->cb->au_receive(dev,
                                tiva_adc_get_ain(sse->adc, sse->num, i),
                                buf[i]);
-          avdbg("AIN%d = 0x%04x\n",
+          ainfo("AIN%d = 0x%04x\n",
                 tiva_adc_get_ain(sse->adc, sse->num, i), buf[i]);
         }
     }
@@ -832,9 +832,9 @@ static struct tiva_adc_s *tiva_adc_struct_init(struct tiva_adc_cfg_s *cfg)
     }
 
 tiva_adc_struct_init_error:
-  avdbg("Invalid ADC device number: expected=%d actual=%d\n",
+  ainfo("Invalid ADC device number: expected=%d actual=%d\n",
         0, cfg->adc);
-  avdbg("ADC%d (CONFIG_TIVA_ADC%d) must be enabled in Kconfig first!",
+  ainfo("ADC%d (CONFIG_TIVA_ADC%d) must be enabled in Kconfig first!",
         cfg->adc, cfg->adc);
   return NULL;
 
@@ -872,7 +872,7 @@ int tiva_adc_initialize(const char *devpath, struct tiva_adc_cfg_s *cfg,
   struct tiva_adc_s *adc;
   int ret = 0;
 
-  avdbg("initializing...\n");
+  ainfo("initializing...\n");
 
   /* Initialize the private ADC device data structure */
 
@@ -916,11 +916,11 @@ int tiva_adc_initialize(const char *devpath, struct tiva_adc_cfg_s *cfg,
       return -ENODEV;
     }
 
-  avdbg("adc_dev_s=0x%08x\n", adc->dev);
+  ainfo("adc_dev_s=0x%08x\n", adc->dev);
 
   /* Register the ADC driver */
 
-  avdbg("Register the ADC driver at %s\n", devpath);
+  ainfo("Register the ADC driver at %s\n", devpath);
 
   ret = adc_register(devpath, adc->dev);
   if (ret < 0)
@@ -943,7 +943,7 @@ int tiva_adc_initialize(const char *devpath, struct tiva_adc_cfg_s *cfg,
 
 void tiva_adc_lock(FAR struct tiva_adc_s *priv, int sse)
 {
-  avdbg("Locking...\n");
+  ainfo("Locking...\n");
 
   struct tiva_adc_sse_s *s = g_sses[SSE_IDX(priv->devno, sse)];
   int ret;
@@ -964,7 +964,7 @@ void tiva_adc_lock(FAR struct tiva_adc_s *priv, int sse)
 #ifdef CONFIG_DEBUG_ANALOG
       if (loop_count % 1000)
         {
-          avdbg("loop=%d\n");
+          ainfo("loop=%d\n");
         }
       ++loop_count;
 #endif
@@ -982,7 +982,7 @@ void tiva_adc_lock(FAR struct tiva_adc_s *priv, int sse)
 
 void tiva_adc_unlock(FAR struct tiva_adc_s *priv, int sse)
 {
-  avdbg("Unlocking\n");
+  ainfo("Unlocking\n");
   struct tiva_adc_sse_s *s = g_sses[SSE_IDX(priv->devno, sse)];
   sem_post(&s->exclsem);
 }
@@ -1002,33 +1002,33 @@ void tiva_adc_unlock(FAR struct tiva_adc_s *priv, int sse)
 static void tiva_adc_runtimeobj_ptrs(void)
 {
 #  ifdef CONFIG_TIVA_ADC0
-  avdbg("ADC0 [struct]       [global value]   [array value]\n");
-  avdbg("     adc_dev_s      dev0=0x%08x   g_devs[0]=0x%08x\n",
+  ainfo("ADC0 [struct]       [global value]   [array value]\n");
+  ainfo("     adc_dev_s      dev0=0x%08x   g_devs[0]=0x%08x\n",
         &dev0, g_devs[0]);
-  avdbg("     tiva_adc_s     adc0=0x%08x   g_adcs[0]=0x%08x\n",
+  ainfo("     tiva_adc_s     adc0=0x%08x   g_adcs[0]=0x%08x\n",
         &adc0, g_adcs[0]);
-  avdbg("     tiva_adc_sse_s sse0=0x%08x   g_sses[0,0]=0x%08x\n",
+  ainfo("     tiva_adc_sse_s sse0=0x%08x   g_sses[0,0]=0x%08x\n",
         &sse00, g_sses[SSE_IDX(0, 0)]);
-  avdbg("     tiva_adc_sse_s sse1=0x%08x   g_sses[0,1]=0x%08x\n",
+  ainfo("     tiva_adc_sse_s sse1=0x%08x   g_sses[0,1]=0x%08x\n",
         &sse01, g_sses[SSE_IDX(0, 1)]);
-  avdbg("     tiva_adc_sse_s sse2=0x%08x   g_sses[0,2]=0x%08x\n",
+  ainfo("     tiva_adc_sse_s sse2=0x%08x   g_sses[0,2]=0x%08x\n",
         &sse02, g_sses[SSE_IDX(0, 2)]);
-  avdbg("     tiva_adc_sse_s sse3=0x%08x   g_sses[0,3]=0x%08x\n",
+  ainfo("     tiva_adc_sse_s sse3=0x%08x   g_sses[0,3]=0x%08x\n",
         &sse03, g_sses[SSE_IDX(0, 3)]);
 #  endif
 #  ifdef CONFIG_TIVA_ADC1
-  avdbg("ADC1 [struct]       [global value]   [array value]\n");
-  avdbg("     adc_dev_s      dev1=0x%08x   g_devs[1]=0x%08x\n",
+  ainfo("ADC1 [struct]       [global value]   [array value]\n");
+  ainfo("     adc_dev_s      dev1=0x%08x   g_devs[1]=0x%08x\n",
         &dev1, g_devs[1]);
-  avdbg("     tiva_adc_s     adc1=0x%08x   g_adcs[1]=0x%08x\n",
+  ainfo("     tiva_adc_s     adc1=0x%08x   g_adcs[1]=0x%08x\n",
         &adc1, g_adcs[1]);
-  avdbg("     tiva_adc_sse_s sse0=0x%08x   g_sses[1,0]=0x%08x\n",
+  ainfo("     tiva_adc_sse_s sse0=0x%08x   g_sses[1,0]=0x%08x\n",
         &sse10, g_sses[SSE_IDX(1, 0)]);
-  avdbg("     tiva_adc_sse_s sse1=0x%08x   g_sses[1,1]=0x%08x\n",
+  ainfo("     tiva_adc_sse_s sse1=0x%08x   g_sses[1,1]=0x%08x\n",
         &sse11, g_sses[SSE_IDX(1, 1)]);
-  avdbg("     tiva_adc_sse_s sse2=0x%08x   g_sses[1,2]=0x%08x\n",
+  ainfo("     tiva_adc_sse_s sse2=0x%08x   g_sses[1,2]=0x%08x\n",
         &sse12, g_sses[SSE_IDX(1, 2)]);
-  avdbg("     tiva_adc_sse_s sse3=0x%08x   g_sses[1,3]=0x%08x\n",
+  ainfo("     tiva_adc_sse_s sse3=0x%08x   g_sses[1,3]=0x%08x\n",
         &sse13, g_sses[SSE_IDX(1, 3)]);
 #  endif
 }
@@ -1038,24 +1038,24 @@ static void tiva_adc_runtimeobj_vals(void)
   struct tiva_adc_sse_s *sse;
   uint8_t s;
 #  ifdef CONFIG_TIVA_ADC0
-  avdbg("ADC0 [0x%08x] cfg=%d ena=%d devno=%d\n",
+  ainfo("ADC0 [0x%08x] cfg=%d ena=%d devno=%d\n",
          &adc0, adc0.cfg, adc0.ena, adc0.devno);
 
   for (s = 0; s < 4; ++s)
     {
       sse = g_sses[SSE_IDX(0, s)];
-      avdbg("SSE%d [0x%08x] adc=%d cfg=%d ena=%d num=%d\n",
+      ainfo("SSE%d [0x%08x] adc=%d cfg=%d ena=%d num=%d\n",
              s, sse, sse->adc, sse->cfg, sse->ena, sse->num);
     }
 #  endif
 #  ifdef CONFIG_TIVA_ADC1
-  avdbg("ADC1 [0x%08x] cfg=%d ena=%d devno=%d\n",
+  ainfo("ADC1 [0x%08x] cfg=%d ena=%d devno=%d\n",
          &adc1, adc1.cfg, adc1.ena, adc1.devno);
 
   for (s = 0; s < 4; ++s)
     {
       sse = g_sses[SSE_IDX(1, s)];
-      avdbg("SSE%d [0x%08x] adc=%d cfg=%d ena=%d num=%d\n",
+      ainfo("SSE%d [0x%08x] adc=%d cfg=%d ena=%d num=%d\n",
              s, sse, sse->adc, sse->cfg, sse->ena, sse->num);
     }
 #  endif
@@ -1072,15 +1072,15 @@ static void tiva_adc_runtimeobj_vals(void)
 static void tiva_adc_dump_dev(void)
 {
 #  ifdef CONFIG_TIVA_ADC0
-  avdbg("adc_ops_s  g_adcops=0x%08x adc0.dev->ad_ops=0x%08x\n",
+  ainfo("adc_ops_s  g_adcops=0x%08x adc0.dev->ad_ops=0x%08x\n",
          &g_adcops, adc0.dev->ad_ops);
-  avdbg("tiva_adc_s adc0=0x%08x      adc0.dev->ad_priv=0x%08x\n",
+  ainfo("tiva_adc_s adc0=0x%08x      adc0.dev->ad_priv=0x%08x\n",
          &adc0, adc0.dev->ad_priv);
 #  endif
 #  ifdef CONFIG_TIVA_ADC1
-  avdbg("adc_ops_s  g_adcops=0x%08x adc1.dev->ad_ops=0x%08x\n",
+  ainfo("adc_ops_s  g_adcops=0x%08x adc1.dev->ad_ops=0x%08x\n",
          &g_adcops, adc1.dev->ad_ops);
-  avdbg("tiva_adc_s adc1=0x%08x      adc1.dev->ad_priv=0x%08x\n",
+  ainfo("tiva_adc_s adc1=0x%08x      adc1.dev->ad_priv=0x%08x\n",
          &adc1, adc1.dev->ad_priv);
 #  endif
 }
diff --git a/arch/arm/src/tiva/tiva_flash.c b/arch/arm/src/tiva/tiva_flash.c
index 0dd70dd1dc..c606b18887 100644
--- a/arch/arm/src/tiva/tiva_flash.c
+++ b/arch/arm/src/tiva/tiva_flash.c
@@ -146,7 +146,7 @@ static int tiva_erase(FAR struct mtd_dev_s *dev, off_t startblock,
     {
       pageaddr = TIVA_VIRTUAL_BASE + curpage * TIVA_FLASH_PAGESIZE;
 
-      fvdbg("Erase page at %08x\n", pageaddr);
+      finfo("Erase page at %08x\n", pageaddr);
 
       /* set page address */
 
diff --git a/arch/arm/src/tiva/tiva_gpio.c b/arch/arm/src/tiva/tiva_gpio.c
index 6ce03bdae5..4acbc6076e 100644
--- a/arch/arm/src/tiva/tiva_gpio.c
+++ b/arch/arm/src/tiva/tiva_gpio.c
@@ -734,13 +734,13 @@ static inline void tiva_interrupt(uint32_t pinset)
 
 #ifdef CONFIG_DEBUG_GPIO
   uint32_t regval;
-  gpiovdbg("reg expected actual: [interrupt type=%d]\n", inttype);
+  gpioinfo("reg expected actual: [interrupt type=%d]\n", inttype);
   regval = (getreg32(base+TIVA_GPIO_IS_OFFSET) & pin) ? pin : 0;
-  gpiovdbg("IS  0x%08x 0x%08x\n", isset, regval);
+  gpioinfo("IS  0x%08x 0x%08x\n", isset, regval);
   regval = (getreg32(base+TIVA_GPIO_IBE_OFFSET) & pin) ? pin : 0;
-  gpiovdbg("IBE 0x%08x 0x%08x\n", ibeset, regval);
+  gpioinfo("IBE 0x%08x 0x%08x\n", ibeset, regval);
   regval = (getreg32(base+TIVA_GPIO_IEV_OFFSET) & pin) ? pin : 0;
-  gpiovdbg("IEV 0x%08x 0x%08x\n", ievset, regval);
+  gpioinfo("IEV 0x%08x 0x%08x\n", ievset, regval);
 #endif
 }
 #endif
@@ -988,14 +988,14 @@ void tiva_gpio_lockport(uint32_t pinset, bool lock)
   if (lock)
     {
 #ifdef CONFIG_DEBUG_GPIO
-      gpiovdbg("  locking port=%d pin=%d\n", port, pinno);
+      gpioinfo("  locking port=%d pin=%d\n", port, pinno);
 #endif
       modifyreg32(base + TIVA_GPIO_CR_OFFSET, pinmask, 0);
     }
   else
     {
 #ifdef CONFIG_DEBUG_GPIO
-      gpiovdbg("unlocking port=%d pin=%d\n", port, pinno);
+      gpioinfo("unlocking port=%d pin=%d\n", port, pinno);
 #endif
       modifyreg32(base + TIVA_GPIO_CR_OFFSET, 0, pinmask);
     }
diff --git a/arch/arm/src/tiva/tiva_gpio.h b/arch/arm/src/tiva/tiva_gpio.h
index 12b466042e..94a90937ff 100644
--- a/arch/arm/src/tiva/tiva_gpio.h
+++ b/arch/arm/src/tiva/tiva_gpio.h
@@ -328,13 +328,13 @@
 #ifdef CONFIG_DEBUG_GPIO
 # define gpiodbg(format, ...)    dbg(format, ##__VA_ARGS__)
 # define gpiolldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
-# define gpiovdbg(format, ...)   vdbg(format, ##__VA_ARGS__)
-# define gpiollvdbg(format, ...) llvdbg(format, ##__VA_ARGS__)
+# define gpioinfo(format, ...)   info(format, ##__VA_ARGS__)
+# define gpiollinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 # define gpiodbg(x...)
 # define gpiolldbg(x...)
-# define gpiovdbg(x...)
-# define gpiollvdbg(x...)
+# define gpioinfo(x...)
+# define gpiollinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/arch/arm/src/tiva/tiva_gpioirq.c b/arch/arm/src/tiva/tiva_gpioirq.c
index 33b5fa0e3a..8931988a93 100644
--- a/arch/arm/src/tiva/tiva_gpioirq.c
+++ b/arch/arm/src/tiva/tiva_gpioirq.c
@@ -293,7 +293,7 @@ static int tiva_gpioporthandler(uint8_t port, void *context)
   uint8_t   pin;                                   /* Pin number */
 
   tiva_gpioirqclear(port, 0xff);
-  gpiollvdbg("mis=0b%08b\n", mis & 0xff);
+  gpiollinfo("mis=0b%08b\n", mis & 0xff);
 
   /* Now process each IRQ pending in the MIS */
 
@@ -303,7 +303,7 @@ static int tiva_gpioporthandler(uint8_t port, void *context)
         {
           if (((mis >> pin) & 1) != 0)
             {
-              gpiollvdbg("port=%d pin=%d irq=%p index=%d\n",
+              gpiollinfo("port=%d pin=%d irq=%p index=%d\n",
                          port, pin,
                          g_gpioportirqvector[TIVA_GPIO_IRQ_IDX(port, pin)],
                          TIVA_GPIO_IRQ_IDX(port, pin));
@@ -560,7 +560,7 @@ int tiva_gpioirqinitialize(void)
       g_gpioportirqvector[i] = irq_unexpected_isr;
     }
 
-  gpiovdbg("tiva_gpioirqinitialize isr=%d/%d irq_unexpected_isr=%p\n",
+  gpioinfo("tiva_gpioirqinitialize isr=%d/%d irq_unexpected_isr=%p\n",
            i, TIVA_NIRQ_PINS, irq_unexpected_isr);
 
   /* Then attach each GPIO interrupt handlers and enable corresponding GPIO
@@ -692,7 +692,7 @@ xcpt_t tiva_gpioirqattach(uint32_t pinset, xcpt_t isr)
        * to the unexpected interrupt handler.
        */
 
-      gpiovdbg("assign port=%d pin=%d function=%p to idx=%d\n",
+      gpioinfo("assign port=%d pin=%d function=%p to idx=%d\n",
                port, pinno, isr, TIVA_GPIO_IRQ_IDX(port, pinno));
 
       if (isr == NULL)
@@ -737,7 +737,7 @@ void tiva_gpioportirqattach(uint8_t port, xcpt_t isr)
        * to the unexpected interrupt handler.
        */
 
-      gpiovdbg("assign function=%p to port=%d\n", isr, port);
+      gpioinfo("assign function=%p to port=%d\n", isr, port);
 
       if (isr == NULL)
         {
diff --git a/arch/arm/src/tiva/tiva_i2c.c b/arch/arm/src/tiva/tiva_i2c.c
index 28450836f8..bf19f58248 100644
--- a/arch/arm/src/tiva/tiva_i2c.c
+++ b/arch/arm/src/tiva/tiva_i2c.c
@@ -123,10 +123,10 @@
 
 #ifdef CONFIG_DEBUG_I2C
 #  define i2cdbg dbg
-#  define i2cvdbg vdbg
+#  define i2cinfo info
 #else
 #  define i2cdbg(x...)
-#  define i2cvdbg(x...)
+#  define i2cinfo(x...)
 #endif
 
 #ifndef CONFIG_DEBUG
@@ -865,7 +865,7 @@ static inline int tiva_i2c_sem_waitdone(struct tiva_i2c_priv_s *priv)
 
   while (priv->intstate != INTSTATE_DONE && elapsed < timeout);
 
-  i2cvdbg("intstate: %d elapsed: %ld threshold: %ld status: %08x\n",
+  i2cinfo("intstate: %d elapsed: %ld threshold: %ld status: %08x\n",
           priv->intstate, (long)elapsed, (long)timeout, status);
 
   /* Set the interrupt state back to IDLE */
@@ -1676,7 +1676,7 @@ static int tiva_i2c_initialize(struct tiva_i2c_priv_s *priv, uint32_t frequency)
   uint32_t regval;
   int ret;
 
-  i2cvdbg("I2C%d: refs=%d\n", config->devno, priv->refs);
+  i2cinfo("I2C%d: refs=%d\n", config->devno, priv->refs);
 
   /* Enable power and clocking to the I2C peripheral.
    *
@@ -1692,12 +1692,12 @@ static int tiva_i2c_initialize(struct tiva_i2c_priv_s *priv, uint32_t frequency)
   tiva_i2c_enablepwr(config->devno);
   tiva_i2c_enableclk(config->devno);
 
-  i2cvdbg("I2C%d: RCGI2C[%08x]=%08x\n",
+  i2cinfo("I2C%d: RCGI2C[%08x]=%08x\n",
           config->devno, TIVA_SYSCON_RCGCI2C, getreg32(TIVA_SYSCON_RCGCI2C));
 #else
   modifyreg32(TIVA_SYSCON_RCGC1, 0, priv->rcgbit);
 
-  i2cvdbg("I2C%d: RCGC1[%08x]=%08x\n",
+  i2cinfo("I2C%d: RCGC1[%08x]=%08x\n",
           config->devno, TIVA_SYSCON_RCGC1, getreg32(TIVA_SYSCON_RCGC1));
 #endif
 
@@ -1713,13 +1713,13 @@ static int tiva_i2c_initialize(struct tiva_i2c_priv_s *priv, uint32_t frequency)
 
   /* Configure pins */
 
-  i2cvdbg("I2C%d: SCL=%08x SDA=%08x\n",
+  i2cinfo("I2C%d: SCL=%08x SDA=%08x\n",
           config->devno, config->scl_pin, config->sda_pin);
 
   ret = tiva_configgpio(config->scl_pin);
   if (ret < 0)
     {
-      i2cvdbg("I2C%d: tiva_configgpio(%08x) failed: %d\n",
+      i2cinfo("I2C%d: tiva_configgpio(%08x) failed: %d\n",
               config->scl_pin, ret);
       return ret;
     }
@@ -1727,7 +1727,7 @@ static int tiva_i2c_initialize(struct tiva_i2c_priv_s *priv, uint32_t frequency)
   ret = tiva_configgpio(config->sda_pin);
   if (ret < 0)
     {
-      i2cvdbg("I2C%d: tiva_configgpio(%08x) failed: %d\n",
+      i2cinfo("I2C%d: tiva_configgpio(%08x) failed: %d\n",
               config->sda_pin, ret);
       tiva_configgpio(MKI2C_INPUT(config->scl_pin));
       return ret;
@@ -1779,7 +1779,7 @@ static int tiva_i2c_uninitialize(struct tiva_i2c_priv_s *priv)
 {
   uint32_t regval;
 
-  i2cvdbg("I2C%d: refs=%d\n", priv->config->devno, priv->refs);
+  i2cinfo("I2C%d: refs=%d\n", priv->config->devno, priv->refs);
 
   /* Disable I2C */
 
@@ -1823,7 +1823,7 @@ static void tiva_i2c_setclock(struct tiva_i2c_priv_s *priv, uint32_t frequency)
   uint32_t regval;
   uint32_t tmp;
 
-  i2cvdbg("I2C%d: frequency: %u\n", priv->config->devno, frequency);
+  i2cinfo("I2C%d: frequency: %u\n", priv->config->devno, frequency);
 
   /* Has the I2C bus frequency changed? */
 
@@ -1876,7 +1876,7 @@ static int tiva_i2c_transfer(struct i2c_master_s *dev, struct i2c_msg_s *msgv,
   int ret = OK;
 
   DEBUGASSERT(priv && priv->config && msgv && msgc > 0);
-  i2cvdbg("I2C%d: msgc=%d\n", priv->config->devno, msgc);
+  i2cinfo("I2C%d: msgc=%d\n", priv->config->devno, msgc);
 
   tiva_i2c_sem_wait(priv);   /* Ensure that address or flags don't change meanwhile */
 
@@ -2027,7 +2027,7 @@ static int tiva_i2c_reset(FAR struct i2c_master_s * dev)
   int ret = ERROR;
 
   DEBUGASSERT(priv && priv->config);
-  i2cvdbg("I2C%d:\n", priv->config->devno);
+  i2cinfo("I2C%d:\n", priv->config->devno);
 
   /* Our caller must own a ref */
 
@@ -2144,7 +2144,7 @@ struct i2c_master_s *tiva_i2cbus_initialize(int port)
   const struct tiva_i2c_config_s *config;
   int flags;
 
-  i2cvdbg("I2C%d: Initialize\n", port);
+  i2cinfo("I2C%d: Initialize\n", port);
 
   /* Get I2C private structure */
 
@@ -2267,7 +2267,7 @@ int tiva_i2cbus_uninitialize(struct i2c_master_s *dev)
 
   DEBUGASSERT(priv && priv->config && priv->refs > 0);
 
-  i2cvdbg("I2C%d: Uninitialize\n", priv->config->devno);
+  i2cinfo("I2C%d: Uninitialize\n", priv->config->devno);
 
   /* Decrement reference count and check for underflow */
 
diff --git a/arch/arm/src/tiva/tiva_ssi.c b/arch/arm/src/tiva/tiva_ssi.c
index 451db9fdf9..b4147b1567 100644
--- a/arch/arm/src/tiva/tiva_ssi.c
+++ b/arch/arm/src/tiva/tiva_ssi.c
@@ -74,10 +74,10 @@
 
 #ifdef SSI_DEBUG
 #  define ssidbg  lldbg
-#  define ssivdbg llvdbg
+#  define ssiinfo llinfo
 #else
 #  define ssidbg(x...)
-#  define ssivdbg(x...)
+#  define ssiinfo(x...)
 #endif
 
 /* How many SSI modules does this chip support? The LM3S6918 supports 2 SSI
@@ -462,7 +462,7 @@ static uint32_t ssi_disable(struct tiva_ssidev_s *priv)
   retval = ssi_getreg(priv, TIVA_SSI_CR1_OFFSET);
   regval = (retval & ~SSI_CR1_SSE);
   ssi_putreg(priv, TIVA_SSI_CR1_OFFSET, regval);
-  ssivdbg("CR1: %08x\n", regval);
+  ssiinfo("CR1: %08x\n", regval);
   return retval;
 }
 
@@ -489,7 +489,7 @@ static void ssi_enable(struct tiva_ssidev_s *priv, uint32_t enable)
   regval &= ~SSI_CR1_SSE;
   regval  |= (enable & SSI_CR1_SSE);
   ssi_putreg(priv, TIVA_SSI_CR1_OFFSET, regval);
-  ssivdbg("CR1: %08x\n", regval);
+  ssiinfo("CR1: %08x\n", regval);
 }
 
 /****************************************************************************
@@ -538,14 +538,14 @@ static void ssi_semtake(sem_t *sem)
 
 static void ssi_txnull(struct tiva_ssidev_s *priv)
 {
-  ssivdbg("TX: ->0xffff\n");
+  ssiinfo("TX: ->0xffff\n");
   ssi_putreg(priv, TIVA_SSI_DR_OFFSET, 0xffff);
 }
 
 static void ssi_txuint16(struct tiva_ssidev_s *priv)
 {
   uint16_t *ptr    = (uint16_t *)priv->txbuffer;
-  ssivdbg("TX: %p->%04x\n", ptr, *ptr);
+  ssiinfo("TX: %p->%04x\n", ptr, *ptr);
   ssi_putreg(priv, TIVA_SSI_DR_OFFSET, (uint32_t)(*ptr++));
   priv->txbuffer = (void *)ptr;
 }
@@ -553,7 +553,7 @@ static void ssi_txuint16(struct tiva_ssidev_s *priv)
 static void ssi_txuint8(struct tiva_ssidev_s *priv)
 {
   uint8_t *ptr   = (uint8_t *)priv->txbuffer;
-  ssivdbg("TX: %p->%02x\n", ptr, *ptr);
+  ssiinfo("TX: %p->%02x\n", ptr, *ptr);
   ssi_putreg(priv, TIVA_SSI_DR_OFFSET, (uint32_t)(*ptr++));
   priv->txbuffer = (void *)ptr;
 }
@@ -579,7 +579,7 @@ static void ssi_rxnull(struct tiva_ssidev_s *priv)
 {
 #if defined(SSI_DEBUG) && defined(CONFIG_DEBUG_INFO)
   uint32_t regval  = ssi_getreg(priv, TIVA_SSI_DR_OFFSET);
-  ssivdbg("RX: discard %04x\n", regval);
+  ssiinfo("RX: discard %04x\n", regval);
 #else
   (void)ssi_getreg(priv, TIVA_SSI_DR_OFFSET);
 #endif
@@ -589,7 +589,7 @@ static void ssi_rxuint16(struct tiva_ssidev_s *priv)
 {
   uint16_t *ptr    = (uint16_t *)priv->rxbuffer;
   *ptr           = (uint16_t)ssi_getreg(priv, TIVA_SSI_DR_OFFSET);
-  ssivdbg("RX: %p<-%04x\n", ptr, *ptr);
+  ssiinfo("RX: %p<-%04x\n", ptr, *ptr);
   priv->rxbuffer = (void *)(++ptr);
 }
 
@@ -597,7 +597,7 @@ static void ssi_rxuint8(struct tiva_ssidev_s *priv)
 {
   uint8_t *ptr   = (uint8_t *)priv->rxbuffer;
   *ptr           = (uint8_t)ssi_getreg(priv, TIVA_SSI_DR_OFFSET);
-  ssivdbg("RX: %p<-%02x\n", ptr, *ptr);
+  ssiinfo("RX: %p<-%02x\n", ptr, *ptr);
   priv->rxbuffer = (void *)(++ptr);
 }
 
@@ -882,7 +882,7 @@ static int ssi_transfer(struct tiva_ssidev_s *priv, const void *txbuffer,
 
 #ifndef CONFIG_SSI_POLLWAIT
   flags = enter_critical_section();
-  ssivdbg("ntxwords: %d nrxwords: %d nwords: %d SR: %08x\n",
+  ssiinfo("ntxwords: %d nrxwords: %d nwords: %d SR: %08x\n",
           priv->ntxwords, priv->nrxwords, priv->nwords,
           ssi_getreg(priv, TIVA_SSI_SR_OFFSET));
 
@@ -896,7 +896,7 @@ static int ssi_transfer(struct tiva_ssidev_s *priv, const void *txbuffer,
 
   ssi_performrx(priv);
 
-  ssivdbg("ntxwords: %d nrxwords: %d nwords: %d SR: %08x IM: %08x\n",
+  ssiinfo("ntxwords: %d nrxwords: %d nwords: %d SR: %08x IM: %08x\n",
           priv->ntxwords, priv->nrxwords, priv->nwords,
           ssi_getreg(priv, TIVA_SSI_SR_OFFSET),
           ssi_getreg(priv, TIVA_SSI_IM_OFFSET));
@@ -906,7 +906,7 @@ static int ssi_transfer(struct tiva_ssidev_s *priv, const void *txbuffer,
    * with the transfer, so it should be safe with no timeout.
    */
 
-  ssivdbg("Waiting for transfer complete\n");
+  ssiinfo("Waiting for transfer complete\n");
   leave_critical_section(flags);
   do
     {
@@ -1029,7 +1029,7 @@ static int ssi_interrupt(int irq, void *context)
     }
 #endif
 
-  ssivdbg("ntxwords: %d nrxwords: %d nwords: %d SR: %08x\n",
+  ssiinfo("ntxwords: %d nrxwords: %d nwords: %d SR: %08x\n",
           priv->ntxwords, priv->nrxwords, priv->nwords,
           ssi_getreg(priv, TIVA_SSI_SR_OFFSET));
 
@@ -1041,7 +1041,7 @@ static int ssi_interrupt(int irq, void *context)
 
   ssi_performrx(priv);
 
-  ssivdbg("ntxwords: %d nrxwords: %d nwords: %d SR: %08x IM: %08x\n",
+  ssiinfo("ntxwords: %d nrxwords: %d nwords: %d SR: %08x IM: %08x\n",
           priv->ntxwords, priv->nrxwords, priv->nwords,
           ssi_getreg(priv, TIVA_SSI_SR_OFFSET),
           ssi_getreg(priv, TIVA_SSI_IM_OFFSET));
@@ -1207,7 +1207,7 @@ static uint32_t ssi_setfrequencyinternal(struct tiva_ssidev_s *priv,
       regval &= ~SSI_CR0_SCR_MASK;
       regval |= (scr << SSI_CR0_SCR_SHIFT);
       ssi_putreg(priv, TIVA_SSI_CR0_OFFSET, regval);
-      ssivdbg("CR0: %08x CPSR: %08x\n", regval, cpsdvsr);
+      ssiinfo("CR0: %08x CPSR: %08x\n", regval, cpsdvsr);
 
       /* Calcluate the actual frequency */
 
@@ -1298,7 +1298,7 @@ static void ssi_setmodeinternal(struct tiva_ssidev_s *priv, enum spi_mode_e mode
       regval &= ~(SSI_CR0_FRF_MASK | SSI_CR0_SPH | SSI_CR0_SPO);
       regval |= modebits;
       ssi_putreg(priv, TIVA_SSI_CR0_OFFSET, regval);
-      ssivdbg("CR0: %08x\n", regval);
+      ssiinfo("CR0: %08x\n", regval);
 
       /* Save the mode so that subsequent re-configuratins will be faster */
 
@@ -1348,7 +1348,7 @@ static void ssi_setbitsinternal(struct tiva_ssidev_s *priv, int nbits)
       regval &= ~SSI_CR0_DSS_MASK;
       regval |= ((nbits - 1) << SSI_CR0_DSS_SHIFT);
       ssi_putreg(priv, TIVA_SSI_CR0_OFFSET, regval);
-      ssivdbg("CR0: %08x\n", regval);
+      ssiinfo("CR0: %08x\n", regval);
 
       priv->nbits = nbits;
     }
diff --git a/arch/arm/src/tiva/tiva_timer.h b/arch/arm/src/tiva/tiva_timer.h
index 0f262bc73e..6ae90d8292 100644
--- a/arch/arm/src/tiva/tiva_timer.h
+++ b/arch/arm/src/tiva/tiva_timer.h
@@ -135,10 +135,10 @@
 
 #ifdef CONFIG_DEBUG_TIMER
 #  define timdbg  lldbg
-#  define timvdbg llvdbg
+#  define timinfo llinfo
 #else
 #  define timdbg(x...)
-#  define timvdbg(x...)
+#  define timinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/arch/arm/src/tiva/tiva_timerlib.c b/arch/arm/src/tiva/tiva_timerlib.c
index fd6b5805db..b71fc1f35b 100644
--- a/arch/arm/src/tiva/tiva_timerlib.c
+++ b/arch/arm/src/tiva/tiva_timerlib.c
@@ -1776,7 +1776,7 @@ TIMER_HANDLE tiva_gptm_configure(const struct tiva_gptmconfig_s *config)
 
       priv->clkin = ALTCLK_FREQUENCY;
 #else
-       timvdbg("tiva_gptm_configure: Error: alternate clock only available on TM4C129 devices\n");
+       timinfo("tiva_gptm_configure: Error: alternate clock only available on TM4C129 devices\n");
        return (TIMER_HANDLE)NULL;
 #endif /* CONFIG_ARCH_CHIP_TM4C129 */
     }
@@ -2564,7 +2564,7 @@ uint32_t tiva_timer32_remaining(TIMER_HANDLE handle)
   uint32_t interval;
   uint32_t remaining;
 
-  timvdbg("Entry\n");
+  timinfo("Entry\n");
 
   DEBUGASSERT(priv && priv->attr && priv->config &&
               priv->config->mode != TIMER16_MODE);
diff --git a/arch/arm/src/tiva/tiva_timerlow32.c b/arch/arm/src/tiva/tiva_timerlow32.c
index ac3ac065f5..8840ba55d6 100644
--- a/arch/arm/src/tiva/tiva_timerlow32.c
+++ b/arch/arm/src/tiva/tiva_timerlow32.c
@@ -200,7 +200,7 @@ static uint32_t tiva_ticks2usec(struct tiva_lowerhalf_s *priv, uint32_t ticks)
 
 static void tiva_timeout(struct tiva_lowerhalf_s *priv, uint32_t timeout)
 {
-  timvdbg("Entry: timeout=%d\n", timeout);
+  timinfo("Entry: timeout=%d\n", timeout);
 
   /* Save the desired timeout value */
 
@@ -215,7 +215,7 @@ static void tiva_timeout(struct tiva_lowerhalf_s *priv, uint32_t timeout)
   timeout  = tiva_ticks2usec(priv, priv->clkticks);
   priv->adjustment = priv->timeout - timeout;
 
-  timvdbg("clkin=%d clkticks=%d timeout=%d, adjustment=%d\n",
+  timinfo("clkin=%d clkticks=%d timeout=%d, adjustment=%d\n",
           priv->clkin, priv->clkticks, priv->timeout, priv->adjustment);
 }
 
@@ -237,7 +237,7 @@ static void tiva_timer_handler(TIMER_HANDLE handle, void *arg, uint32_t status)
 {
   struct tiva_lowerhalf_s *priv = (struct tiva_lowerhalf_s *)arg;
 
-  timvdbg("Entry: status=%08x\n", status);
+  timinfo("Entry: status=%08x\n", status);
   DEBUGASSERT(arg && status);
 
   /* Check if the timeout interrupt is pending */
@@ -276,7 +276,7 @@ static void tiva_timer_handler(TIMER_HANDLE handle, void *arg, uint32_t status)
           /* No handler or the handler returned false.. stop the timer */
 
           tiva_timer32_stop(priv->handle);
-          timvdbg("Stopped\n");
+          timinfo("Stopped\n");
         }
     }
 }
@@ -300,7 +300,7 @@ static int tiva_start(struct timer_lowerhalf_s *lower)
 {
   struct tiva_lowerhalf_s *priv = (struct tiva_lowerhalf_s *)lower;
 
-  timvdbg("Entry: started %d\n", priv->started);
+  timinfo("Entry: started %d\n", priv->started);
 
   /* Has the timer already been started? */
 
@@ -337,7 +337,7 @@ static int tiva_stop(struct timer_lowerhalf_s *lower)
 {
   struct tiva_lowerhalf_s *priv = (struct tiva_lowerhalf_s *)lower;
 
-  timvdbg("Entry: started %d\n", priv->started);
+  timinfo("Entry: started %d\n", priv->started);
 
   /* Has the timer already been started? */
 
@@ -377,7 +377,7 @@ static int tiva_getstatus(struct timer_lowerhalf_s *lower,
   struct tiva_lowerhalf_s *priv = (struct tiva_lowerhalf_s *)lower;
   uint32_t remaining;
 
-  timvdbg("Entry\n");
+  timinfo("Entry\n");
   DEBUGASSERT(priv);
 
   /* Return the status bit */
@@ -402,9 +402,9 @@ static int tiva_getstatus(struct timer_lowerhalf_s *lower,
   remaining = tiva_timer32_remaining(priv->handle);
   status->timeleft = tiva_ticks2usec(priv, remaining);
 
-  timvdbg("  flags    : %08x\n", status->flags);
-  timvdbg("  timeout  : %d\n",   status->timeout);
-  timvdbg("  timeleft : %d\n",   status->timeleft);
+  timinfo("  flags    : %08x\n", status->flags);
+  timinfo("  timeout  : %d\n",   status->timeout);
+  timinfo("  timeleft : %d\n",   status->timeleft);
   return OK;
 }
 
@@ -435,7 +435,7 @@ static int tiva_settimeout(struct timer_lowerhalf_s *lower, uint32_t timeout)
       return -EPERM;
     }
 
-  timvdbg("Entry: timeout=%d\n", timeout);
+  timinfo("Entry: timeout=%d\n", timeout);
 
   /* Calculate the the new time settings */
 
@@ -476,7 +476,7 @@ static tccb_t tiva_sethandler(struct timer_lowerhalf_s *lower,
   flags = enter_critical_section();
 
   DEBUGASSERT(priv);
-  timvdbg("Entry: handler=%p\n", handler);
+  timinfo("Entry: handler=%p\n", handler);
 
   /* Get the old handler return value */
 
@@ -516,7 +516,7 @@ static int tiva_ioctl(struct timer_lowerhalf_s *lower, int cmd,
   int ret = -ENOTTY;
 
   DEBUGASSERT(priv);
-  timvdbg("Entry: cmd=%d arg=%ld\n", cmd, arg);
+  timinfo("Entry: cmd=%d arg=%ld\n", cmd, arg);
 
   return ret;
 }
@@ -557,7 +557,7 @@ int tiva_timer_initialize(FAR const char *devpath,
   void *drvr;
   int ret;
 
-  timvdbg("\n");
+  timinfo("\n");
   DEBUGASSERT(devpath);
 
   /* Allocate an instance of the lower half state structure */
diff --git a/arch/arm/src/tiva/tm4c_ethernet.c b/arch/arm/src/tiva/tm4c_ethernet.c
index eeb36a32ec..5a77fc5c4b 100644
--- a/arch/arm/src/tiva/tm4c_ethernet.c
+++ b/arch/arm/src/tiva/tm4c_ethernet.c
@@ -1051,7 +1051,7 @@ static int tiva_transmit(FAR struct tiva_ethmac_s *priv)
   txdesc  = priv->txhead;
   txfirst = txdesc;
 
-  nvdbg("d_len: %d d_buf: %p txhead: %p tdes0: %08x\n",
+  ninfo("d_len: %d d_buf: %p txhead: %p tdes0: %08x\n",
         priv->dev.d_len, priv->dev.d_buf, txdesc, txdesc->tdes0);
 
   DEBUGASSERT(txdesc && (txdesc->tdes0 & EMAC_TDES0_OWN) == 0);
@@ -1068,7 +1068,7 @@ static int tiva_transmit(FAR struct tiva_ethmac_s *priv)
       bufcount = (priv->dev.d_len + (OPTIMAL_EMAC_BUFSIZE-1)) / OPTIMAL_EMAC_BUFSIZE;
       lastsize = priv->dev.d_len - (bufcount - 1) * OPTIMAL_EMAC_BUFSIZE;
 
-      nvdbg("bufcount: %d lastsize: %d\n", bufcount, lastsize);
+      ninfo("bufcount: %d lastsize: %d\n", bufcount, lastsize);
 
       /* Set the first segment bit in the first TX descriptor */
 
@@ -1178,7 +1178,7 @@ static int tiva_transmit(FAR struct tiva_ethmac_s *priv)
 
   priv->inflight++;
 
-  nvdbg("txhead: %p txtail: %p inflight: %d\n",
+  ninfo("txhead: %p txtail: %p inflight: %d\n",
         priv->txhead, priv->txtail, priv->inflight);
 
   /* If all TX descriptors are in-flight, then we have to disable receive interrupts
@@ -1477,7 +1477,7 @@ static void tiva_freesegment(FAR struct tiva_ethmac_s *priv,
   struct emac_rxdesc_s *rxdesc;
   int i;
 
-  nvdbg("rxfirst: %p segments: %d\n", rxfirst, segments);
+  ninfo("rxfirst: %p segments: %d\n", rxfirst, segments);
 
   /* Set OWN bit in RX descriptors.  This gives the buffers back to DMA */
 
@@ -1535,7 +1535,7 @@ static int tiva_recvframe(FAR struct tiva_ethmac_s *priv)
   uint8_t *buffer;
   int i;
 
-  nvdbg("rxhead: %p rxcurr: %p segments: %d\n",
+  ninfo("rxhead: %p rxcurr: %p segments: %d\n",
         priv->rxhead, priv->rxcurr, priv->segments);
 
   /* Check if there are free buffers.  We cannot receive new frames in this
@@ -1601,7 +1601,7 @@ static int tiva_recvframe(FAR struct tiva_ethmac_s *priv)
               rxcurr = priv->rxcurr;
             }
 
-          nvdbg("rxhead: %p rxcurr: %p segments: %d\n",
+          ninfo("rxhead: %p rxcurr: %p segments: %d\n",
                 priv->rxhead, priv->rxcurr, priv->segments);
 
           /* Check if any errors are reported in the frame */
@@ -1640,7 +1640,7 @@ static int tiva_recvframe(FAR struct tiva_ethmac_s *priv)
               priv->rxhead   = (struct emac_rxdesc_s *)rxdesc->rdes3;
               tiva_freesegment(priv, rxcurr, priv->segments);
 
-              nvdbg("rxhead: %p d_buf: %p d_len: %d\n",
+              ninfo("rxhead: %p d_buf: %p d_len: %d\n",
                     priv->rxhead, dev->d_buf, dev->d_len);
 
               return OK;
@@ -1667,7 +1667,7 @@ static int tiva_recvframe(FAR struct tiva_ethmac_s *priv)
 
   priv->rxhead = rxdesc;
 
-  nvdbg("rxhead: %p rxcurr: %p segments: %d\n",
+  ninfo("rxhead: %p rxcurr: %p segments: %d\n",
         priv->rxhead, priv->rxcurr, priv->segments);
 
   return -EAGAIN;
@@ -1721,7 +1721,7 @@ static void tiva_receive(FAR struct tiva_ethmac_s *priv)
 #ifdef CONFIG_NET_IPv4
       if (BUF->type == HTONS(ETHTYPE_IP))
         {
-          nllvdbg("IPv4 frame\n");
+          nllinfo("IPv4 frame\n");
 
           /* Handle ARP on input then give the IPv4 packet to the network
            * layer
@@ -1760,7 +1760,7 @@ static void tiva_receive(FAR struct tiva_ethmac_s *priv)
 #ifdef CONFIG_NET_IPv6
       if (BUF->type == HTONS(ETHTYPE_IP6))
         {
-          nllvdbg("IPv6 frame\n");
+          nllinfo("IPv6 frame\n");
 
           /* Give the IPv6 packet to the network layer */
 
@@ -1797,7 +1797,7 @@ static void tiva_receive(FAR struct tiva_ethmac_s *priv)
 #ifdef CONFIG_NET_ARP
       if (BUF->type == htons(ETHTYPE_ARP))
         {
-          nvdbg("ARP frame\n");
+          ninfo("ARP frame\n");
 
           /* Handle ARP packet */
 
@@ -1856,7 +1856,7 @@ static void tiva_freeframe(FAR struct tiva_ethmac_s *priv)
   FAR struct emac_txdesc_s *txdesc;
   int i;
 
-  nvdbg("txhead: %p txtail: %p inflight: %d\n",
+  ninfo("txhead: %p txtail: %p inflight: %d\n",
         priv->txhead, priv->txtail, priv->inflight);
 
   /* Scan for "in-flight" descriptors owned by the CPU */
@@ -1872,7 +1872,7 @@ static void tiva_freeframe(FAR struct tiva_ethmac_s *priv)
            * TX descriptors.
            */
 
-          nvdbg("txtail: %p tdes0: %08x tdes2: %08x tdes3: %08x\n",
+          ninfo("txtail: %p tdes0: %08x tdes2: %08x tdes3: %08x\n",
                 txdesc, txdesc->tdes0, txdesc->tdes2, txdesc->tdes3);
 
           DEBUGASSERT(txdesc->tdes2 != 0);
@@ -1925,7 +1925,7 @@ static void tiva_freeframe(FAR struct tiva_ethmac_s *priv)
 
       priv->txtail = txdesc;
 
-      nvdbg("txhead: %p txtail: %p inflight: %d\n",
+      ninfo("txhead: %p txtail: %p inflight: %d\n",
             priv->txhead, priv->txtail, priv->inflight);
     }
 }
@@ -2541,7 +2541,7 @@ static int tiva_ifdown(struct net_driver_s *dev)
   FAR struct tiva_ethmac_s *priv = (FAR struct tiva_ethmac_s *)dev->d_private;
   irqstate_t flags;
 
-  nvdbg("Taking the network down\n");
+  ninfo("Taking the network down\n");
 
   /* Disable the Ethernet interrupt */
 
@@ -2586,7 +2586,7 @@ static int tiva_ifdown(struct net_driver_s *dev)
 
 static inline void tiva_txavail_process(FAR struct tiva_ethmac_s *priv)
 {
-  nvdbg("ifup: %d\n", priv->ifup);
+  ninfo("ifup: %d\n", priv->ifup);
 
   /* Ignore the notification if the interface is not yet up */
 
@@ -2753,7 +2753,7 @@ static int tiva_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
   uint32_t temp;
   uint32_t registeraddress;
 
-  nvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  ninfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
         mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
   /* Add the MAC address to the hardware multicast hash table */
@@ -2810,7 +2810,7 @@ static int tiva_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac)
   uint32_t temp;
   uint32_t registeraddress;
 
-  nvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  ninfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
         mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
   /* Remove the MAC address to the hardware multicast hash table */
@@ -3416,7 +3416,7 @@ static int tiva_phyinit(FAR struct tiva_ethmac_s *priv)
 
   /* Remember the selected speed and duplex modes */
 
-  nvdbg("PHYSR[%d]: %04x\n", CONFIG_TIVA_PHYSR, phyval);
+  ninfo("PHYSR[%d]: %04x\n", CONFIG_TIVA_PHYSR, phyval);
 
   /* Different PHYs present speed and mode information in different ways.  IF
    * This CONFIG_TIVA_PHYSR_ALTCONFIG is selected, this indicates that the PHY
@@ -3599,7 +3599,7 @@ static inline void tiva_phy_initialize(FAR struct tiva_ethmac_s *priv)
 {
   /* Enable the clock to the PHY module */
 
-  nllvdbg("Enable EPHY clocking\n");
+  nllinfo("Enable EPHY clocking\n");
   tiva_ephy_enableclk();
 
   /* What until the PREPHY register indicates that the PHY is ready before
@@ -3611,7 +3611,7 @@ static inline void tiva_phy_initialize(FAR struct tiva_ethmac_s *priv)
 
   /* Enable power to the Ethernet PHY */
 
-  nllvdbg("Enable EPHY power\n");
+  nllinfo("Enable EPHY power\n");
   tiva_ephy_enablepwr();
 
   /* What until the PREPHY register indicates that the PHY registers are ready
@@ -3621,11 +3621,11 @@ static inline void tiva_phy_initialize(FAR struct tiva_ethmac_s *priv)
   while (!tiva_ephy_periphrdy());
   up_udelay(250);
 
-  nllvdbg("RCGCEPHY: %08x PCEPHY: %08x PREPHY: %08x\n",
+  nllinfo("RCGCEPHY: %08x PCEPHY: %08x PREPHY: %08x\n",
           getreg32(TIVA_SYSCON_RCGCEPHY),
           getreg32(TIVA_SYSCON_PCEPHY),
           getreg32(TIVA_SYSCON_PREPHY));
-  nllvdbg("Configure PHY GPIOs\n");
+  nllinfo("Configure PHY GPIOs\n");
 
 #ifdef CONFIG_TIVA_PHY_INTERNAL
   /* Integrated PHY:
@@ -3931,7 +3931,7 @@ static void tiva_macaddress(FAR struct tiva_ethmac_s *priv)
   FAR struct net_driver_s *dev = &priv->dev;
   uint32_t regval;
 
-  nvdbg("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  ninfo("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
         dev->d_ifname,
         dev->d_mac.ether_addr_octet[0], dev->d_mac.ether_addr_octet[1],
         dev->d_mac.ether_addr_octet[2], dev->d_mac.ether_addr_octet[3],
@@ -3999,7 +3999,7 @@ static void tiva_ipv6multicast(FAR struct tiva_ethmac_s *priv)
   mac[4] = tmp16 & 0xff;
   mac[5] = tmp16 >> 8;
 
-  nvdbg("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  ninfo("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n",
         mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
   (void)tiva_addmac(dev, mac);
@@ -4129,12 +4129,12 @@ static int tive_emac_configure(FAR struct tiva_ethmac_s *priv)
 
   /* Reset the Ethernet block */
 
-  nvdbg("Reset the Ethernet block\n");
+  ninfo("Reset the Ethernet block\n");
   tiva_ethreset(priv);
 
   /* Initialize the PHY */
 
-  nvdbg("Initialize the PHY\n");
+  ninfo("Initialize the PHY\n");
   ret = tiva_phyinit(priv);
   if (ret < 0)
     {
@@ -4143,7 +4143,7 @@ static int tive_emac_configure(FAR struct tiva_ethmac_s *priv)
 
   /* Initialize the MAC and DMA */
 
-  nvdbg("Initialize the MAC and DMA\n");
+  ninfo("Initialize the MAC and DMA\n");
   ret = tiva_macconfig(priv);
   if (ret < 0)
     {
@@ -4164,7 +4164,7 @@ static int tive_emac_configure(FAR struct tiva_ethmac_s *priv)
 
   /* Enable normal MAC operation */
 
-  nvdbg("Enable normal operation\n");
+  ninfo("Enable normal operation\n");
   return tiva_macenable(priv);
 }
 
@@ -4201,7 +4201,7 @@ int tiva_ethinitialize(int intf)
   struct tiva_ethmac_s *priv;
   uint32_t regval;
 
-  nllvdbg("intf: %d\n", intf);
+  nllinfo("intf: %d\n", intf);
 
   /* Get the interface structure associated with this interface number. */
 
@@ -4247,7 +4247,7 @@ int tiva_ethinitialize(int intf)
    *   bringing it a fully functional state.
    */
 
-  nllvdbg("Enable EMAC clocking\n");
+  nllinfo("Enable EMAC clocking\n");
   tiva_emac_enablepwr();   /* Ethernet MAC Power Control */
   tiva_emac_enableclk();   /* Ethernet MAC Run Mode Clock Gating Control */
 
@@ -4260,7 +4260,7 @@ int tiva_ethinitialize(int intf)
 
   /* Show all EMAC clocks */
 
-  nllvdbg("RCGCEMAC: %08x PCEMAC: %08x PREMAC: %08x MOSCCTL: %08x\n",
+  nllinfo("RCGCEMAC: %08x PCEMAC: %08x PREMAC: %08x MOSCCTL: %08x\n",
           getreg32(TIVA_SYSCON_RCGCEMAC),
           getreg32(TIVA_SYSCON_PCEMAC),
           getreg32(TIVA_SYSCON_PREMAC),
@@ -4309,7 +4309,7 @@ int tiva_ethinitialize(int intf)
 
   /* Register the device with the OS so that socket IOCTLs can be performed */
 
-  nllvdbg("Registering Ethernet device\n");
+  nllinfo("Registering Ethernet device\n");
   return netdev_register(&priv->dev, NET_LL_ETHERNET);
 }
 
@@ -4411,7 +4411,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
   xcpt_t oldhandler;
 
   DEBUGASSERT(intf);
-  nvdbg("%s: handler=%p\n", intf, handler);
+  ninfo("%s: handler=%p\n", intf, handler);
 
   /* Get the interface structure associated with this interface. */
 
diff --git a/arch/avr/src/at90usb/at90usb_usbdev.c b/arch/avr/src/at90usb/at90usb_usbdev.c
index 7bfe6639b4..98a8d2cd2f 100644
--- a/arch/avr/src/at90usb/at90usb_usbdev.c
+++ b/arch/avr/src/at90usb/at90usb_usbdev.c
@@ -1399,7 +1399,7 @@ static inline void avr_ep0setup(void)
   index = GETUINT16(ctrl.index);
   len   = GETUINT16(ctrl.len);
 
-  ullvdbg("type=%02x req=%02x value=%04x index=%04x len=%04x\n",
+  ullinfo("type=%02x req=%02x value=%04x index=%04x len=%04x\n",
           ctrl.type, ctrl.req, value, index, len);
 
   /* Dispatch any non-standard requests */
@@ -1596,7 +1596,7 @@ static inline void avr_ep0setup(void)
 #ifdef CONFIG_USBDEV_SELFPOWERED
                 if (value == USB_FEATURE_TESTMODE)
                   {
-                    ullvdbg("test mode: %d\n", index);
+                    ullinfo("test mode: %d\n", index);
                   }
                 else if (value == USB_FEATURE_REMOTEWAKEUP)
                   {
@@ -2386,7 +2386,7 @@ static int avr_epsubmit(FAR struct usbdev_ep_s *ep,
   if (!req || !req->callback || !req->buf || !ep)
     {
       usbtrace(TRACE_DEVERROR(AVR_TRACEERR_INVALIDPARMS), 0);
-      ullvdbg("req=%p callback=%p buf=%p ep=%p\n",
+      ullinfo("req=%p callback=%p buf=%p ep=%p\n",
               req, req->callback, req->buf, ep);
       return -EINVAL;
     }
diff --git a/arch/avr/src/avr/up_spi.c b/arch/avr/src/avr/up_spi.c
index 94de828c15..0e78443012 100644
--- a/arch/avr/src/avr/up_spi.c
+++ b/arch/avr/src/avr/up_spi.c
@@ -74,14 +74,14 @@
 #ifdef SPI_DEBUG
 #  define spidbg  lldbg
 #  ifdef SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/arch/hc/src/m9s12/m9s12_ethernet.c b/arch/hc/src/m9s12/m9s12_ethernet.c
index ad3e1ef6b8..4b9dbfeef7 100644
--- a/arch/hc/src/m9s12/m9s12_ethernet.c
+++ b/arch/hc/src/m9s12/m9s12_ethernet.c
@@ -294,7 +294,7 @@ static void emac_receive(FAR struct emac_driver_s *priv)
 #ifdef CONFIG_NET_IPv4
       if (BUF->type == HTONS(ETHTYPE_IP))
         {
-          nllvdbg("IPv4 frame\n");
+          nllinfo("IPv4 frame\n");
 
           /* Handle ARP on input then give the IPv4 packet to the network
            * layer
@@ -334,7 +334,7 @@ static void emac_receive(FAR struct emac_driver_s *priv)
 #ifdef CONFIG_NET_IPv6
       if (BUF->type == HTONS(ETHTYPE_IP6))
         {
-          nllvdbg("Iv6 frame\n");
+          nllinfo("Iv6 frame\n");
 
           /* Give the IPv6 packet to the network layer */
 
diff --git a/arch/mips/src/mips32/up_schedulesigaction.c b/arch/mips/src/mips32/up_schedulesigaction.c
index 1c8612ffd9..86cba18c74 100644
--- a/arch/mips/src/mips32/up_schedulesigaction.c
+++ b/arch/mips/src/mips32/up_schedulesigaction.c
@@ -163,7 +163,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
 
               up_savestate(tcb->xcp.regs);
 
-              svdbg("PC/STATUS Saved: %08x/%08x New: %08x/%08x\n",
+              sinfo("PC/STATUS Saved: %08x/%08x New: %08x/%08x\n",
                     tcb->xcp.saved_epc, tcb->xcp.saved_status,
                     g_current_regs[REG_EPC], g_current_regs[REG_STATUS]);
             }
@@ -196,7 +196,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
           status                    |= CP0_STATUS_IM_SWINTS;
           tcb->xcp.regs[REG_STATUS]  = status;
 
-          svdbg("PC/STATUS Saved: %08x/%08x New: %08x/%08x\n",
+          sinfo("PC/STATUS Saved: %08x/%08x New: %08x/%08x\n",
                 tcb->xcp.saved_epc, tcb->xcp.saved_status,
                 tcb->xcp.regs[REG_EPC], tcb->xcp.regs[REG_STATUS]);
         }
diff --git a/arch/mips/src/mips32/up_sigdeliver.c b/arch/mips/src/mips32/up_sigdeliver.c
index a841a941b8..5237a697b7 100644
--- a/arch/mips/src/mips32/up_sigdeliver.c
+++ b/arch/mips/src/mips32/up_sigdeliver.c
@@ -127,7 +127,7 @@ void up_sigdeliver(void)
    * errno that is needed by the user logic (it is probably EINTR).
    */
 
-  svdbg("Resuming EPC: %08x STATUS: %08x\n", regs[REG_EPC], regs[REG_STATUS]);
+  sinfo("Resuming EPC: %08x STATUS: %08x\n", regs[REG_EPC], regs[REG_STATUS]);
 
   (void)up_irq_save();
   rtcb->pterrno = saved_errno;
diff --git a/arch/mips/src/mips32/up_vfork.c b/arch/mips/src/mips32/up_vfork.c
index dda54ae179..552ffa335a 100644
--- a/arch/mips/src/mips32/up_vfork.c
+++ b/arch/mips/src/mips32/up_vfork.c
@@ -123,26 +123,26 @@ pid_t up_vfork(const struct vfork_s *context)
   uint32_t stackutil;
   int ret;
 
-  svdbg("s0:%08x s1:%08x s2:%08x s3:%08x s4:%08x\n",
+  sinfo("s0:%08x s1:%08x s2:%08x s3:%08x s4:%08x\n",
         context->s0, context->s1, context->s2, context->s3, context->s4);
 #ifdef CONFIG_MIPS32_FRAMEPOINTER
-  svdbg("s5:%08x s6:%08x s7:%08x\n",
+  sinfo("s5:%08x s6:%08x s7:%08x\n",
         context->s5, context->s6, context->s7);
 #ifdef MIPS32_SAVE_GP
-  svdbg("fp:%08x sp:%08x ra:%08x gp:%08x\n",
+  sinfo("fp:%08x sp:%08x ra:%08x gp:%08x\n",
         context->fp, context->sp, context->ra, context->gp);
 #else
-  svdbg("fp:%08x sp:%08x ra:%08x\n",
+  sinfo("fp:%08x sp:%08x ra:%08x\n",
         context->fp context->sp, context->ra);
 #endif
 #else
-  svdbg("s5:%08x s6:%08x s7:%08x s8:%08x\n",
+  sinfo("s5:%08x s6:%08x s7:%08x s8:%08x\n",
         context->s5, context->s6, context->s7, context->s8);
 #ifdef MIPS32_SAVE_GP
-  svdbg("sp:%08x ra:%08x gp:%08x\n",
+  sinfo("sp:%08x ra:%08x gp:%08x\n",
         context->sp, context->ra, context->gp);
 #else
-  svdbg("sp:%08x ra:%08x\n",
+  sinfo("sp:%08x ra:%08x\n",
         context->sp, context->ra);
 #endif
 #endif
@@ -156,7 +156,7 @@ pid_t up_vfork(const struct vfork_s *context)
       return (pid_t)ERROR;
     }
 
-  svdbg("Parent=%p Child=%p\n", parent, child);
+  sinfo("Parent=%p Child=%p\n", parent, child);
 
   /* Get the size of the parent task's stack.  Due to alignment operations,
    * the adjusted stack size may be smaller than the stack size originally
@@ -185,7 +185,7 @@ pid_t up_vfork(const struct vfork_s *context)
   DEBUGASSERT((uint32_t)parent->adj_stack_ptr > context->sp);
   stackutil = (uint32_t)parent->adj_stack_ptr - context->sp;
 
-  svdbg("stacksize:%d stackutil:%d\n", stacksize, stackutil);
+  sinfo("stacksize:%d stackutil:%d\n", stacksize, stackutil);
 
   /* Make some feeble effort to perserve the stack contents.  This is
    * feeble because the stack surely contains invalid pointers and other
@@ -211,14 +211,14 @@ pid_t up_vfork(const struct vfork_s *context)
       newfp = context->fp;
     }
 
-  svdbg("Old stack base:%08x SP:%08x FP:%08x\n",
+  sinfo("Old stack base:%08x SP:%08x FP:%08x\n",
         parent->adj_stack_ptr, context->sp, context->fp);
-  svdbg("New stack base:%08x SP:%08x FP:%08x\n",
+  sinfo("New stack base:%08x SP:%08x FP:%08x\n",
         child->cmn.adj_stack_ptr, newsp, newfp);
 #else
-  svdbg("Old stack base:%08x SP:%08x\n",
+  sinfo("Old stack base:%08x SP:%08x\n",
         parent->adj_stack_ptr, context->sp);
-  svdbg("New stack base:%08x SP:%08x\n",
+  sinfo("New stack base:%08x SP:%08x\n",
         child->cmn.adj_stack_ptr, newsp);
 #endif
 
diff --git a/arch/mips/src/pic32mx/pic32mx-ethernet.c b/arch/mips/src/pic32mx/pic32mx-ethernet.c
index 4c11f5c660..a5c7e48390 100644
--- a/arch/mips/src/pic32mx/pic32mx-ethernet.c
+++ b/arch/mips/src/pic32mx/pic32mx-ethernet.c
@@ -1428,7 +1428,7 @@ static void pic32mx_rxdone(struct pic32mx_driver_s *priv)
 #ifdef CONFIG_NET_IPv4
           if (BUF->type == HTONS(ETHTYPE_IP))
             {
-              nllvdbg("IPv4 frame\n");
+              nllinfo("IPv4 frame\n");
               NETDEV_RXIPV4(&priv->pd_dev);
 
               /* Handle ARP on input then give the IPv4 packet to the network
@@ -1470,7 +1470,7 @@ static void pic32mx_rxdone(struct pic32mx_driver_s *priv)
 #ifdef CONFIG_NET_IPv6
           if (BUF->type == HTONS(ETHTYPE_IP6))
             {
-              nllvdbg("Iv6 frame\n");
+              nllinfo("Iv6 frame\n");
               NETDEV_RXIPV6(&priv->pd_dev);
 
               /* Give the IPv6 packet to the network layer */
@@ -2751,12 +2751,12 @@ static inline int pic32mx_phyinit(struct pic32mx_driver_s *priv)
        */
 
        phyreg = (unsigned int)pic32mx_phyread(phyaddr, MII_PHYID1);
-       nvdbg("Addr: %d PHY ID1: %04x\n", phyaddr, phyreg);
+       ninfo("Addr: %d PHY ID1: %04x\n", phyaddr, phyreg);
 
        if (phyreg == PIC32MX_PHYID1)
         {
           phyreg = pic32mx_phyread(phyaddr, MII_PHYID2);
-          nvdbg("Addr: %d PHY ID2: %04x\n", phyaddr, phyreg);
+          ninfo("Addr: %d PHY ID2: %04x\n", phyaddr, phyreg);
 
           if (phyreg == PIC32MX_PHYID2)
             {
@@ -2774,7 +2774,7 @@ static inline int pic32mx_phyinit(struct pic32mx_driver_s *priv)
       ndbg("No PHY detected\n");
       return -ENODEV;
     }
-  nvdbg("phyaddr: %d\n", phyaddr);
+  ninfo("phyaddr: %d\n", phyaddr);
 
   /* Save the discovered PHY device address */
 
diff --git a/arch/mips/src/pic32mx/pic32mx-exception.c b/arch/mips/src/pic32mx/pic32mx-exception.c
index 1b30e58985..71b76180cb 100644
--- a/arch/mips/src/pic32mx/pic32mx-exception.c
+++ b/arch/mips/src/pic32mx/pic32mx-exception.c
@@ -106,83 +106,83 @@ uint32_t *pic32mx_exception(uint32_t *regs)
   switch (cause & CP0_CAUSE_EXCCODE_MASK)
     {
     case CP0_CAUSE_EXCCODE_INT:      /* Interrupt */
-      llvdbg("EXCEPTION: Interrupt"
+      llinfo("EXCEPTION: Interrupt"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_TLBL:     /* TLB exception (load or instruction fetch) */
-      llvdbg("EXCEPTION: TLB exception (load or instruction fetch)"
+      llinfo("EXCEPTION: TLB exception (load or instruction fetch)"
              " CAUSE: %08x EPC:%08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_TLBS:     /* TLB exception (store) */
-      llvdbg("EXCEPTION: TLB exception (store)"
+      llinfo("EXCEPTION: TLB exception (store)"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_ADEL:     /* Address error exception (load or instruction fetch) */
-      llvdbg("EXCEPTION: Address error exception (load or instruction fetch)"
+      llinfo("EXCEPTION: Address error exception (load or instruction fetch)"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_ADES:     /* Address error exception (store) */
-      llvdbg("EXCEPTION: Address error exception (store)"
+      llinfo("EXCEPTION: Address error exception (store)"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_IBE:      /* Bus error exception (instruction fetch) */
-      llvdbg("EXCEPTION: Bus error exception (instruction fetch)"
+      llinfo("EXCEPTION: Bus error exception (instruction fetch)"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_DBE:      /* Bus error exception (data reference: load or store) */
-      llvdbg("EXCEPTION: Bus error exception (data reference: load or store)"
+      llinfo("EXCEPTION: Bus error exception (data reference: load or store)"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_SYS:      /* Syscall exception */
-      llvdbg("EXCEPTION: Syscall exception"
+      llinfo("EXCEPTION: Syscall exception"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_BP:       /* Breakpoint exception */
-      llvdbg("EXCEPTION: Breakpoint exception"
+      llinfo("EXCEPTION: Breakpoint exception"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_RI:       /* Reserved instruction exception */
-      llvdbg("EXCEPTION: Reserved instruction exception"
+      llinfo("EXCEPTION: Reserved instruction exception"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_CPU:      /* Coprocessor Unusable exception */
-      llvdbg("EXCEPTION: Coprocessor Unusable exception"
+      llinfo("EXCEPTION: Coprocessor Unusable exception"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_OV:       /* Arithmetic Overflow exception */
-      llvdbg("EXCEPTION: Arithmetic Overflow exception"
+      llinfo("EXCEPTION: Arithmetic Overflow exception"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_TR:       /* Trap exception */
-      llvdbg("EXCEPTION: Trap exception"
+      llinfo("EXCEPTION: Trap exception"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_FPE:      /* Floating point exception */
-      llvdbg("EXCEPTION: Floating point exception"
+      llinfo("EXCEPTION: Floating point exception"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_C2E:      /* Precise Coprocessor 2 exceptions */
-      llvdbg("EXCEPTION: Precise Coprocessor 2 exceptions"
+      llinfo("EXCEPTION: Precise Coprocessor 2 exceptions"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_MDMX:     /* MDMX Unusable (MIPS64) */
-      llvdbg("EXCEPTION: MDMX Unusable (MIPS64)"
+      llinfo("EXCEPTION: MDMX Unusable (MIPS64)"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_WATCH:    /* WatchHi/WatchLo address */
-      llvdbg("EXCEPTION: WatchHi/WatchLo address"
+      llinfo("EXCEPTION: WatchHi/WatchLo address"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_MCHECK:   /* Machine check */
-      llvdbg("EXCEPTION: Machine check"
+      llinfo("EXCEPTION: Machine check"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_CACHEERR: /* Cache error */
-      llvdbg("EXCEPTION: Cache error"
+      llinfo("EXCEPTION: Cache error"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     default:
-      llvdbg("EXCEPTION: Unknown"
+      llinfo("EXCEPTION: Unknown"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     }
diff --git a/arch/mips/src/pic32mx/pic32mx-spi.c b/arch/mips/src/pic32mx/pic32mx-spi.c
index a4388914b1..2477936dfd 100644
--- a/arch/mips/src/pic32mx/pic32mx-spi.c
+++ b/arch/mips/src/pic32mx/pic32mx-spi.c
@@ -77,13 +77,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /****************************************************************************
@@ -476,7 +476,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
   uint32_t actual;
   uint32_t regval;
 
-  spivdbg("Old frequency: %d actual: %d New frequency: %d\n",
+  spiinfo("Old frequency: %d actual: %d New frequency: %d\n",
           priv->frequency, priv->actual, frequency);
 
   /* Check if the requested frequency is the same as the frequency selection */
@@ -511,7 +511,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
   /* Save the new BRG value */
 
   spi_putreg(priv, PIC32MX_SPI_BRG_OFFSET, regval);
-  spivdbg("PBCLOCK: %d frequency: %d divisor: %d BRG: %d\n",
+  spiinfo("PBCLOCK: %d frequency: %d divisor: %d BRG: %d\n",
           BOARD_PBCLOCK, frequency, divisor, regval);
 
   /* Calculate the new actual frequency.
@@ -550,7 +550,7 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode)
   FAR struct pic32mx_dev_s *priv = (FAR struct pic32mx_dev_s *)dev;
   uint32_t regval;
 
-  spivdbg("Old mode: %d New mode: %d\n", priv->mode, mode);
+  spiinfo("Old mode: %d New mode: %d\n", priv->mode, mode);
 
   /* Has the mode changed? */
 
@@ -612,7 +612,7 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode)
         }
 
       spi_putreg(priv, PIC32MX_SPI_CON_OFFSET, regval);
-      spivdbg("CON: %08x\n", regval);
+      spiinfo("CON: %08x\n", regval);
 
       /* Save the mode so that subsequent re-configuratins will be faster */
 
@@ -641,7 +641,7 @@ static void spi_setbits(FAR struct spi_dev_s *dev, int nbits)
   uint32_t setting;
   uint32_t regval;
 
-  spivdbg("Old nbits: %d New nbits: %d\n", priv->nbits, nbits);
+  spiinfo("Old nbits: %d New nbits: %d\n", priv->nbits, nbits);
 
   /* Has the number of bits changed? */
 
@@ -673,7 +673,7 @@ static void spi_setbits(FAR struct spi_dev_s *dev, int nbits)
       regval &= ~SPI_CON_MODE_MASK;
       regval |= setting;
       regval = spi_getreg(priv, PIC32MX_SPI_CON_OFFSET);
-      spivdbg("CON: %08x\n", regval);
+      spiinfo("CON: %08x\n", regval);
 
       /* Save the selection so the subsequence re-configurations will be faster */
 
@@ -701,7 +701,7 @@ static uint16_t spi_send(FAR struct spi_dev_s *dev, uint16_t wd)
 {
   FAR struct pic32mx_dev_s *priv = (FAR struct pic32mx_dev_s *)dev;
 
-  spivdbg("wd: %04x\n", wd);
+  spiinfo("wd: %04x\n", wd);
 
   /* Write the data to transmitted to the SPI Data Register */
 
@@ -754,7 +754,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size
   uint32_t regval;
   uint8_t data;
 
-  spivdbg("nwords: %d\n", nwords);
+  spiinfo("nwords: %d\n", nwords);
   while (nwords)
     {
       /* Write the data to transmitted to the SPI Data Register */
@@ -809,7 +809,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw
   FAR struct pic32mx_dev_s *priv = (FAR struct pic32mx_dev_s *)dev;
   FAR uint8_t *ptr = (FAR uint8_t *)buffer;
 
-  spivdbg("nwords: %d\n", nwords);
+  spiinfo("nwords: %d\n", nwords);
   while (nwords)
     {
       /* Write some dummy data to the SPI Data Register in order to clock the
@@ -864,7 +864,7 @@ FAR struct spi_dev_s *pic32mx_spibus_initialize(int port)
   irqstate_t flags;
   uint32_t regval;
 
-  spivdbg("port: %d\n", port);
+  spiinfo("port: %d\n", port);
 
   /* Select the SPI state structure for this port */
 
@@ -952,7 +952,7 @@ FAR struct spi_dev_s *pic32mx_spibus_initialize(int port)
   regval |= (SPI_CON_ENHBUF | SPI_CON_RTXISEL_HALF | SPI_CON_STXISEL_HALF);
 #endif
   spi_putreg(priv, PIC32MX_SPI_CON_OFFSET, regval);
-  spivdbg("CON: %08x\n", regval);
+  spiinfo("CON: %08x\n", regval);
 
   /* Set the initial SPI configuration */
 
diff --git a/arch/mips/src/pic32mx/pic32mx-usbdev.c b/arch/mips/src/pic32mx/pic32mx-usbdev.c
index ca07c9eb56..0cf450fd01 100644
--- a/arch/mips/src/pic32mx/pic32mx-usbdev.c
+++ b/arch/mips/src/pic32mx/pic32mx-usbdev.c
@@ -291,9 +291,9 @@
 
 #  define regdbg lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define regvdbg lldbg
+#    define reginfo lldbg
 #  else
-#    define regvdbg(x...)
+#    define reginfo(x...)
 #  endif
 
 #else
@@ -301,7 +301,7 @@
 #  define pic32mx_getreg(addr)      getreg16(addr)
 #  define pic32mx_putreg(val,addr)  putreg16(val,addr)
 #  define regdbg(x...)
-#  define regvdbg(x...)
+#  define reginfo(x...)
 
 #endif
 
@@ -311,15 +311,15 @@
 
 #  define bdtdbg lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define bdtvdbg lldbg
+#    define bdtinfo lldbg
 #  else
-#    define bdtvdbg(x...)
+#    define bdtinfo(x...)
 #  endif
 
 #else
 
 #  define bdtdbg(x...)
-#  define bdtvdbg(x...)
+#  define bdtinfo(x...)
 
 #endif
 
@@ -908,10 +908,10 @@ static void pic32mx_wrcomplete(struct pic32mx_usbdev_s *priv,
   epno   = USB_EPNO(privep->ep.eplog);
 
 #ifdef CONFIG_USBDEV_NOWRITEAHEAD
-  ullvdbg("EP%d: len=%d xfrd=%d inflight=%d\n",
+  ullinfo("EP%d: len=%d xfrd=%d inflight=%d\n",
           epno, privreq->req.len, privreq->req.xfrd, privreq->inflight[0]);
 #else
-  ullvdbg("EP%d: len=%d xfrd=%d inflight={%d, %d}\n",
+  ullinfo("EP%d: len=%d xfrd=%d inflight={%d, %d}\n",
           epno, privreq->req.len, privreq->req.xfrd,
           privreq->inflight[0], privreq->inflight[1]);
 #endif
@@ -1224,7 +1224,7 @@ static int pic32mx_wrstart(struct pic32mx_usbdev_s *priv,
       bytesleft = privreq->req.len;
     }
 
-  ullvdbg("epno=%d req=%p: len=%d xfrd=%d index=%d nullpkt=%d\n",
+  ullinfo("epno=%d req=%p: len=%d xfrd=%d index=%d nullpkt=%d\n",
           epno, privreq, privreq->req.len, xfrd, index, privep->txnullpkt);
 
   /* Get the number of bytes left to be sent in the packet */
@@ -1338,7 +1338,7 @@ static int pic32mx_rdcomplete(struct pic32mx_usbdev_s *priv,
   bdtout = privep->bdtout;
   epno   = USB_EPNO(privep->ep.eplog);
 
-  ullvdbg("EP%d: len=%d xfrd=%d\n",
+  ullinfo("EP%d: len=%d xfrd=%d\n",
           epno, privreq->req.len, privreq->req.xfrd);
   bdtdbg("EP%d BDT OUT [%p] {%08x, %08x}\n",
          epno, bdtout, bdtout->status, bdtout->addr);
@@ -1626,7 +1626,7 @@ static int pic32mx_rdrequest(struct pic32mx_usbdev_s *priv,
       return OK;
     }
 
-  ullvdbg("EP%d: len=%d\n", USB_EPNO(privep->ep.eplog), privreq->req.len);
+  ullinfo("EP%d: len=%d\n", USB_EPNO(privep->ep.eplog), privreq->req.len);
 
   /* Ignore any attempt to receive a zero length packet */
 
@@ -1915,7 +1915,7 @@ static void pic32mx_ep0setup(struct pic32mx_usbdev_s *priv)
   index.w = GETUINT16(priv->ctrl.index);
   len.w   = GETUINT16(priv->ctrl.len);
 
-  ullvdbg("SETUP: type=%02x req=%02x value=%04x index=%04x len=%04x\n",
+  ullinfo("SETUP: type=%02x req=%02x value=%04x index=%04x len=%04x\n",
           priv->ctrl.type, priv->ctrl.req, value.w, index.w, len.w);
 
   /* Dispatch any non-standard requests */
@@ -2159,7 +2159,7 @@ static void pic32mx_ep0setup(struct pic32mx_usbdev_s *priv)
               {
                 /* Special case recipient=device test mode */
 
-                ullvdbg("test mode: %d\n", index.w);
+                ullinfo("test mode: %d\n", index.w);
               }
             else
               {
diff --git a/arch/mips/src/pic32mz/pic32mz-ethernet.c b/arch/mips/src/pic32mz/pic32mz-ethernet.c
index 7d531efde9..4118fc7567 100644
--- a/arch/mips/src/pic32mz/pic32mz-ethernet.c
+++ b/arch/mips/src/pic32mz/pic32mz-ethernet.c
@@ -1445,7 +1445,7 @@ static void pic32mz_rxdone(struct pic32mz_driver_s *priv)
 #ifdef CONFIG_NET_IPv4
           if (BUF->type == HTONS(ETHTYPE_IP))
             {
-              nllvdbg("IPv4 frame\n");
+              nllinfo("IPv4 frame\n");
               NETDEV_RXIPV4(&priv->pd_dev);
 
               /* Handle ARP on input then give the IPv4 packet to the network
@@ -1487,7 +1487,7 @@ static void pic32mz_rxdone(struct pic32mz_driver_s *priv)
 #ifdef CONFIG_NET_IPv6
           if (BUF->type == HTONS(ETHTYPE_IP6))
             {
-              nllvdbg("Iv6 frame\n");
+              nllinfo("Iv6 frame\n");
               NETDEV_RXIPV6(&priv->pd_dev);
 
               /* Give the IPv6 packet to the network layer */
@@ -2774,12 +2774,12 @@ static inline int pic32mz_phyinit(struct pic32mz_driver_s *priv)
        */
 
        phyreg = (unsigned int)pic32mz_phyread(phyaddr, MII_PHYID1);
-       nvdbg("Addr: %d PHY ID1: %04x EXPECT: %04x\n", phyaddr, phyreg, PIC32MZ_PHYID1);
+       ninfo("Addr: %d PHY ID1: %04x EXPECT: %04x\n", phyaddr, phyreg, PIC32MZ_PHYID1);
 
        if (phyreg == PIC32MZ_PHYID1)
         {
           phyreg = pic32mz_phyread(phyaddr, MII_PHYID2);
-          nvdbg("Addr: %d PHY ID2: %04x EXPECT: %04x\n", phyaddr, phyreg, PIC32MZ_PHYID2);
+          ninfo("Addr: %d PHY ID2: %04x EXPECT: %04x\n", phyaddr, phyreg, PIC32MZ_PHYID2);
 
           if (phyreg == PIC32MZ_PHYID2)
             {
@@ -2797,7 +2797,7 @@ static inline int pic32mz_phyinit(struct pic32mz_driver_s *priv)
       ndbg("No PHY detected\n");
       return -ENODEV;
     }
-  nvdbg("phyaddr: %d\n", phyaddr);
+  ninfo("phyaddr: %d\n", phyaddr);
 
   /* Save the discovered PHY device address */
 
diff --git a/arch/mips/src/pic32mz/pic32mz-exception.c b/arch/mips/src/pic32mz/pic32mz-exception.c
index c2ae2d8ed6..1c1a0b8512 100644
--- a/arch/mips/src/pic32mz/pic32mz-exception.c
+++ b/arch/mips/src/pic32mz/pic32mz-exception.c
@@ -106,83 +106,83 @@ uint32_t *pic32mz_exception(uint32_t *regs)
   switch (cause & CP0_CAUSE_EXCCODE_MASK)
     {
     case CP0_CAUSE_EXCCODE_INT:      /* Interrupt */
-      llvdbg("EXCEPTION: Interrupt"
+      llinfo("EXCEPTION: Interrupt"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_TLBL:     /* TLB exception (load or instruction fetch) */
-      llvdbg("EXCEPTION: TLB exception (load or instruction fetch)"
+      llinfo("EXCEPTION: TLB exception (load or instruction fetch)"
              " CAUSE: %08x EPC:%08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_TLBS:     /* TLB exception (store) */
-      llvdbg("EXCEPTION: TLB exception (store)"
+      llinfo("EXCEPTION: TLB exception (store)"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_ADEL:     /* Address error exception (load or instruction fetch) */
-      llvdbg("EXCEPTION: Address error exception (load or instruction fetch)"
+      llinfo("EXCEPTION: Address error exception (load or instruction fetch)"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_ADES:     /* Address error exception (store) */
-      llvdbg("EXCEPTION: Address error exception (store)"
+      llinfo("EXCEPTION: Address error exception (store)"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_IBE:      /* Bus error exception (instruction fetch) */
-      llvdbg("EXCEPTION: Bus error exception (instruction fetch)"
+      llinfo("EXCEPTION: Bus error exception (instruction fetch)"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_DBE:      /* Bus error exception (data reference: load or store) */
-      llvdbg("EXCEPTION: Bus error exception (data reference: load or store)"
+      llinfo("EXCEPTION: Bus error exception (data reference: load or store)"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_SYS:      /* Syscall exception */
-      llvdbg("EXCEPTION: Syscall exception"
+      llinfo("EXCEPTION: Syscall exception"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_BP:       /* Breakpoint exception */
-      llvdbg("EXCEPTION: Breakpoint exception"
+      llinfo("EXCEPTION: Breakpoint exception"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_RI:       /* Reserved instruction exception */
-      llvdbg("EXCEPTION: Reserved instruction exception"
+      llinfo("EXCEPTION: Reserved instruction exception"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_CPU:      /* Coprocessor Unusable exception */
-      llvdbg("EXCEPTION: Coprocessor Unusable exception"
+      llinfo("EXCEPTION: Coprocessor Unusable exception"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_OV:       /* Arithmetic Overflow exception */
-      llvdbg("EXCEPTION: Arithmetic Overflow exception"
+      llinfo("EXCEPTION: Arithmetic Overflow exception"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_TR:       /* Trap exception */
-      llvdbg("EXCEPTION: Trap exception"
+      llinfo("EXCEPTION: Trap exception"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_FPE:      /* Floating point exception */
-      llvdbg("EXCEPTION: Floating point exception"
+      llinfo("EXCEPTION: Floating point exception"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_C2E:      /* Precise Coprocessor 2 exceptions */
-      llvdbg("EXCEPTION: Precise Coprocessor 2 exceptions"
+      llinfo("EXCEPTION: Precise Coprocessor 2 exceptions"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_MDMX:     /* MDMX Unusable (MIPS64) */
-      llvdbg("EXCEPTION: MDMX Unusable (MIPS64)"
+      llinfo("EXCEPTION: MDMX Unusable (MIPS64)"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_WATCH:    /* WatchHi/WatchLo address */
-      llvdbg("EXCEPTION: WatchHi/WatchLo address"
+      llinfo("EXCEPTION: WatchHi/WatchLo address"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_MCHECK:   /* Machine check */
-      llvdbg("EXCEPTION: Machine check"
+      llinfo("EXCEPTION: Machine check"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_CACHEERR: /* Cache error */
-      llvdbg("EXCEPTION: Cache error"
+      llinfo("EXCEPTION: Cache error"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     default:
-      llvdbg("EXCEPTION: Unknown"
+      llinfo("EXCEPTION: Unknown"
              " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     }
diff --git a/arch/mips/src/pic32mz/pic32mz-spi.c b/arch/mips/src/pic32mz/pic32mz-spi.c
index 022eaebc3c..344a1d3e71 100644
--- a/arch/mips/src/pic32mz/pic32mz-spi.c
+++ b/arch/mips/src/pic32mz/pic32mz-spi.c
@@ -72,13 +72,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /****************************************************************************
@@ -652,7 +652,7 @@ static void spi_exchange8(FAR struct pic32mz_dev_s *priv,
   uint32_t regval;
   uint8_t data;
 
-  spivdbg("nbytes: %d\n", nbytes);
+  spiinfo("nbytes: %d\n", nbytes);
   while (nbytes)
     {
       /* Write the data to transmitted to the SPI Data Register */
@@ -723,7 +723,7 @@ static void spi_exchange16(FAR struct pic32mz_dev_s *priv,
   uint32_t regval;
   uint16_t data;
 
-  spivdbg("nwords: %d\n", nwords);
+  spiinfo("nwords: %d\n", nwords);
   while (nwords)
     {
       /* Write the data to transmitted to the SPI Data Register */
@@ -837,7 +837,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
   uint32_t actual;
   uint32_t regval;
 
-  spivdbg("Old frequency: %d actual: %d New frequency: %d\n",
+  spiinfo("Old frequency: %d actual: %d New frequency: %d\n",
           priv->frequency, priv->actual, frequency);
 
   /* Check if the requested frequency is the same as the frequency selection */
@@ -872,7 +872,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
   /* Save the new BRG value */
 
   spi_putreg(priv, PIC32MZ_SPI_BRG_OFFSET, regval);
-  spivdbg("PBCLOCK: %d frequency: %d divisor: %d BRG: %d\n",
+  spiinfo("PBCLOCK: %d frequency: %d divisor: %d BRG: %d\n",
           BOARD_PBCLOCK, frequency, divisor, regval);
 
   /* Calculate the new actual frequency.
@@ -911,7 +911,7 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode)
   FAR struct pic32mz_dev_s *priv = (FAR struct pic32mz_dev_s *)dev;
   uint32_t regval;
 
-  spivdbg("Old mode: %d New mode: %d\n", priv->mode, mode);
+  spiinfo("Old mode: %d New mode: %d\n", priv->mode, mode);
 
   /* Has the mode changed? */
 
@@ -973,7 +973,7 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode)
         }
 
       spi_putreg(priv, PIC32MZ_SPI_CON_OFFSET, regval);
-      spivdbg("CON: %08x\n", regval);
+      spiinfo("CON: %08x\n", regval);
 
       /* Save the mode so that subsequent re-configuratins will be faster */
 
@@ -1002,7 +1002,7 @@ static void spi_setbits(FAR struct spi_dev_s *dev, int nbits)
   uint32_t setting;
   uint32_t regval;
 
-  spivdbg("Old nbits: %d New nbits: %d\n", priv->nbits, nbits);
+  spiinfo("Old nbits: %d New nbits: %d\n", priv->nbits, nbits);
 
   /* Has the number of bits changed? */
 
@@ -1033,7 +1033,7 @@ static void spi_setbits(FAR struct spi_dev_s *dev, int nbits)
       regval &= ~SPI_CON_MODE_MASK;
       regval |= setting;
       regval = spi_getreg(priv, PIC32MZ_SPI_CON_OFFSET);
-      spivdbg("CON: %08x\n", regval);
+      spiinfo("CON: %08x\n", regval);
 
       /* Save the selection so the subsequence re-configurations will be
        * faster
@@ -1075,7 +1075,7 @@ static uint16_t spi_send(FAR struct spi_dev_s *dev, uint16_t wd)
       rxword = 0;
       spi_exchange16(priv, &txword, &rxword, 1);
 
-      spivdbg("Sent %04x received %04x\n", txword, rxword);
+      spiinfo("Sent %04x received %04x\n", txword, rxword);
       return rxword;
     }
   else
@@ -1089,7 +1089,7 @@ static uint16_t spi_send(FAR struct spi_dev_s *dev, uint16_t wd)
       rxbyte = (uint8_t)0;
       spi_exchange8(priv, &txbyte, &rxbyte, 1);
 
-      spivdbg("Sent %02x received %02x\n", txbyte, rxbyte);
+      spiinfo("Sent %02x received %02x\n", txbyte, rxbyte);
       return (uint16_t)rxbyte;
     }
 }
@@ -1222,7 +1222,7 @@ FAR struct spi_dev_s *pic32mz_spibus_initialize(int port)
   irqstate_t flags;
   uint32_t regval;
 
-  spivdbg("port: %d\n", port);
+  spiinfo("port: %d\n", port);
 
   /* Select the SPI state structure and SDI PPS register for this port */
 
@@ -1354,7 +1354,7 @@ FAR struct spi_dev_s *pic32mz_spibus_initialize(int port)
   regval |= (SPI_CON_ENHBUF | SPI_CON_SRXISEL_HALF | SPI_CON_STXISEL_HALF);
 #endif
   spi_putreg(priv, PIC32MZ_SPI_CON_OFFSET, regval);
-  spivdbg("CON: %08x\n", regval);
+  spiinfo("CON: %08x\n", regval);
 
   /* Set the initial SPI configuration */
 
diff --git a/arch/sim/src/board_lcd.c b/arch/sim/src/board_lcd.c
index 1058f7959f..d3dc5a54b1 100644
--- a/arch/sim/src/board_lcd.c
+++ b/arch/sim/src/board_lcd.c
@@ -116,7 +116,7 @@
 #endif
 
 #ifdef CONFIG_DEBUG_LCD
-# define lcddbg(format, ...)  vdbg(format, ##__VA_ARGS__)
+# define lcddbg(format, ...)  info(format, ##__VA_ARGS__)
 #else
 # define lcddbg(x...)
 #endif
@@ -294,7 +294,7 @@ static int sim_getvideoinfo(FAR struct lcd_dev_s *dev,
                               FAR struct fb_videoinfo_s *vinfo)
 {
   DEBUGASSERT(dev && vinfo);
-  gvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n",
+  ginfo("fmt: %d xres: %d yres: %d nplanes: %d\n",
          g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes);
   memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s));
   return OK;
@@ -312,7 +312,7 @@ static int sim_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
                               FAR struct lcd_planeinfo_s *pinfo)
 {
   DEBUGASSERT(dev && pinfo && planeno == 0);
-  gvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
+  ginfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
   memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s));
   return OK;
 }
@@ -328,7 +328,7 @@ static int sim_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
 
 static int sim_getpower(struct lcd_dev_s *dev)
 {
-  gvdbg("power: %d\n", 0);
+  ginfo("power: %d\n", 0);
   return g_lcddev.power;
 }
 
@@ -344,7 +344,7 @@ static int sim_getpower(struct lcd_dev_s *dev)
 
 static int sim_setpower(struct lcd_dev_s *dev, int power)
 {
-  gvdbg("power: %d\n", power);
+  ginfo("power: %d\n", power);
   DEBUGASSERT(power <= CONFIG_LCD_MAXPOWER);
 
   /* Set new power level */
@@ -363,7 +363,7 @@ static int sim_setpower(struct lcd_dev_s *dev, int power)
 
 static int sim_getcontrast(struct lcd_dev_s *dev)
 {
-  gvdbg("Not implemented\n");
+  ginfo("Not implemented\n");
   return -ENOSYS;
 }
 
@@ -377,7 +377,7 @@ static int sim_getcontrast(struct lcd_dev_s *dev)
 
 static int sim_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
 {
-  gvdbg("contrast: %d\n", contrast);
+  ginfo("contrast: %d\n", contrast);
   return -ENOSYS;
 }
 
@@ -397,7 +397,7 @@ static int sim_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
 
 int board_lcd_initialize(void)
 {
-  gvdbg("Initializing\n");
+  ginfo("Initializing\n");
   return OK;
 }
 
diff --git a/arch/sim/src/up_netdriver.c b/arch/sim/src/up_netdriver.c
index c785f49746..908cff3236 100644
--- a/arch/sim/src/up_netdriver.c
+++ b/arch/sim/src/up_netdriver.c
@@ -213,7 +213,7 @@ void netdriver_loop(void)
 #ifdef CONFIG_NET_IPv4
           if (eth->type == HTONS(ETHTYPE_IP) && is_ours)
             {
-              nllvdbg("IPv4 frame\n");
+              nllinfo("IPv4 frame\n");
 
               /* Handle ARP on input then give the IPv4 packet to the network
                * layer
@@ -254,7 +254,7 @@ void netdriver_loop(void)
 #ifdef CONFIG_NET_IPv6
           if (eth->type == HTONS(ETHTYPE_IP6) && is_ours)
             {
-              nllvdbg("Iv6 frame\n");
+              nllinfo("Iv6 frame\n");
 
               /* Give the IPv6 packet to the network layer */
 
diff --git a/arch/sim/src/up_spiflash.c b/arch/sim/src/up_spiflash.c
index 30f603b1ac..517081af9d 100644
--- a/arch/sim/src/up_spiflash.c
+++ b/arch/sim/src/up_spiflash.c
@@ -71,13 +71,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /* Define the FLASH SIZE in bytes */
@@ -479,7 +479,7 @@ static uint16_t spiflash_send(FAR struct spi_dev_s *dev, uint16_t wd)
 static void spiflash_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
                               FAR void *rxbuffer, size_t nwords)
 {
-  spivdbg("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords);
+  spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords);
 
   /* 8-bit mode */
 
@@ -536,7 +536,7 @@ static void spiflash_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffe
 #ifndef CONFIG_SPI_EXCHANGE
 static void spiflash_sndblock(FAR struct spi_dev_s *dev, FAR const void *txbuffer, size_t nwords)
 {
-  spivdbg("txbuffer=%p nwords=%d\n", txbuffer, nwords);
+  spiinfo("txbuffer=%p nwords=%d\n", txbuffer, nwords);
   return spiflash_exchange(dev, txbuffer, NULL, nwords);
 }
 #endif
@@ -565,7 +565,7 @@ static void spiflash_sndblock(FAR struct spi_dev_s *dev, FAR const void *txbuffe
 static void spiflash_recvblock(FAR struct spi_dev_s *dev, FAR void *rxbuffer,
                                size_t nwords)
 {
-  spivdbg("rxbuffer=%p nwords=%d\n", rxbuffer, nwords);
+  spiinfo("rxbuffer=%p nwords=%d\n", rxbuffer, nwords);
   return spiflash_exchange(dev, NULL, rxbuffer, nwords);
 }
 #endif
diff --git a/arch/sim/src/up_touchscreen.c b/arch/sim/src/up_touchscreen.c
index 4b4e598f45..93218e45bb 100644
--- a/arch/sim/src/up_touchscreen.c
+++ b/arch/sim/src/up_touchscreen.c
@@ -194,7 +194,7 @@ static void up_notify(FAR struct up_dev_s *priv)
    * that the read data is available.
    */
 
-  ivdbg("contact=%d nwaiters=%d\n", priv->sample.contact, priv->nwaiters);
+  iinfo("contact=%d nwaiters=%d\n", priv->sample.contact, priv->nwaiters);
   if (priv->nwaiters > 0)
     {
       /* After posting this semaphore, we need to exit because the touchscreen
@@ -217,7 +217,7 @@ static void up_notify(FAR struct up_dev_s *priv)
       if (fds)
         {
           fds->revents |= POLLIN;
-          ivdbg("Report events: %02x\n", fds->revents);
+          iinfo("Report events: %02x\n", fds->revents);
           sem_post(fds->sem);
         }
     }
@@ -235,7 +235,7 @@ static int up_sample(FAR struct up_dev_s *priv,
 
   /* Is there new touchscreen sample data available? */
 
-  ivdbg("penchange=%d contact=%d id=%d\n",
+  iinfo("penchange=%d contact=%d id=%d\n",
         priv->penchange, sample->contact, priv->id);
 
   if (priv->penchange)
@@ -263,7 +263,7 @@ static int up_sample(FAR struct up_dev_s *priv,
        }
 
       priv->penchange = false;
-      ivdbg("penchange=%d contact=%d id=%d\n",
+      iinfo("penchange=%d contact=%d id=%d\n",
              priv->penchange, priv->sample.contact, priv->id);
 
       ret = OK;
@@ -308,11 +308,11 @@ static int up_waitsample(FAR struct up_dev_s *priv,
     {
       /* Wait for a change in the touchscreen state */
 
-      ivdbg("Waiting...\n");
+      iinfo("Waiting...\n");
       priv->nwaiters++;
       ret = sem_wait(&priv->waitsem);
       priv->nwaiters--;
-      ivdbg("Awakened...\n");
+      iinfo("Awakened...\n");
 
       if (ret < 0)
         {
@@ -357,7 +357,7 @@ errout:
 
 static int up_open(FAR struct file *filep)
 {
-  ivdbg("Opening...\n");
+  iinfo("Opening...\n");
   return OK;
 }
 
@@ -367,7 +367,7 @@ static int up_open(FAR struct file *filep)
 
 static int up_close(FAR struct file *filep)
 {
-  ivdbg("Closing...\n");
+  iinfo("Closing...\n");
   return OK;
 }
 
@@ -383,7 +383,7 @@ static ssize_t up_read(FAR struct file *filep, FAR char *buffer, size_t len)
   struct up_sample_s         sample;
   int                        ret;
 
-  ivdbg("len=%d\n", len);
+  iinfo("len=%d\n", len);
 
   DEBUGASSERT(filep);
   inode = filep->f_inode;
@@ -480,7 +480,7 @@ static ssize_t up_read(FAR struct file *filep, FAR char *buffer, size_t len)
   ret = SIZEOF_TOUCH_SAMPLE_S(1);
 
 errout:
-  ivdbg("Returning %d\n", ret);
+  iinfo("Returning %d\n", ret);
   sem_post(&priv->devsem);
   return ret;
 }
@@ -495,7 +495,7 @@ static int up_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
   FAR struct up_dev_s *priv;
   int                       ret;
 
-  ivdbg("cmd: %d arg: %ld\n", cmd, arg);
+  iinfo("cmd: %d arg: %ld\n", cmd, arg);
   DEBUGASSERT(filep);
   inode = filep->f_inode;
 
@@ -539,7 +539,7 @@ static int up_poll(FAR struct file *filep, FAR struct pollfd *fds,
   int                  ret;
   int                  i;
 
-  ivdbg("setup: %d\n", (int)setup);
+  iinfo("setup: %d\n", (int)setup);
   DEBUGASSERT(filep && fds);
   inode = filep->f_inode;
 
@@ -648,7 +648,7 @@ int board_tsc_setup(int minor)
   char devname[DEV_NAMELEN];
   int ret;
 
-  ivdbg("minor: %d\n", minor);
+  iinfo("minor: %d\n", minor);
 
   /* Debug-only sanity checks */
 
@@ -665,7 +665,7 @@ int board_tsc_setup(int minor)
   /* Register the device as an input device */
 
   (void)snprintf(devname, DEV_NAMELEN, DEV_FORMAT, minor);
-  ivdbg("Registering %s\n", devname);
+  iinfo("Registering %s\n", devname);
 
   ret = register_driver(devname, &up_fops, 0666, priv);
   if (ret < 0)
@@ -732,7 +732,7 @@ void board_tsc_teardown(void)
   /* Un-register the device */
 
   (void)snprintf(devname, DEV_NAMELEN, DEV_FORMAT, priv->minor);
-  ivdbg("Un-registering %s\n", devname);
+  iinfo("Un-registering %s\n", devname);
 
   ret = unregister_driver(devname);
   if (ret < 0)
@@ -755,8 +755,8 @@ int up_buttonevent(int x, int y, int buttons)
   FAR struct up_dev_s *priv = (FAR struct up_dev_s *)&g_simtouchscreen;
   bool                 pendown;  /* true: pen is down */
 
-  ivdbg("x=%d y=%d buttons=%02x\n", x, y, buttons);
-  ivdbg("contact=%d nwaiters=%d\n", priv->sample.contact, priv->nwaiters);
+  iinfo("x=%d y=%d buttons=%02x\n", x, y, buttons);
+  iinfo("contact=%d nwaiters=%d\n", priv->sample.contact, priv->nwaiters);
 
   /* Any button press will count as pendown. */
 
diff --git a/arch/z16/src/z16f/z16f_espi.c b/arch/z16/src/z16f/z16f_espi.c
index 96e7c487ba..d20c71a756 100644
--- a/arch/z16/src/z16f/z16f_espi.c
+++ b/arch/z16/src/z16f/z16f_espi.c
@@ -72,13 +72,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg    lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg (void)
+#    define spiinfo (void)
 #  endif
 #else
 #  define spidbg    (void)
-#  define spivdbg   (void)
+#  define spiinfo   (void)
 #endif
 
 /****************************************************************************
@@ -330,11 +330,11 @@ static void spi_putreg16(FAR struct z16f_spi_s *priv, uint16_t regval,
 #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);
-  spivdbg("   DCR: %02x  CTL: %02x MODE: %02x STAT: %02x\n",
+  spiinfo("%s:\n", msg);
+  spiinfo("   DCR: %02x  CTL: %02x MODE: %02x STAT: %02x\n",
           getreg8(Z16F_ESPI_DCR),  getreg8(Z16F_ESPI_CTL),
           getreg8(Z16F_ESPI_MODE), getreg8(Z16F_ESPI_STAT));
-  spivdbg(" STATE: %02x   BR: %02x %02x\n",
+  spiinfo(" STATE: %02x   BR: %02x %02x\n",
           getreg8(Z16F_ESPI_STATE),  getreg8(Z16F_ESPI_BRH),
           getreg8(Z16F_ESPI_BRL));
 }
@@ -395,7 +395,7 @@ static int spi_lock(FAR struct spi_dev_s *dev, bool lock)
 {
   FAR struct z16f_spi_s *priv = (FAR struct z16f_spi_s *)dev;
 
-  spivdbg("lock=%d\n", lock);
+  spiinfo("lock=%d\n", lock);
   if (lock)
     {
       /* Take the semaphore (perhaps waiting) */
@@ -438,7 +438,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
   uint32_t actual;
   uint32_t brg;
 
-  spivdbg("frequency=%d\n", frequency);
+  spiinfo("frequency=%d\n", frequency);
 
   /* Check if the requested frequency is the same as the frequency selection */
 
@@ -469,7 +469,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
   /* Calculate the new actual frequency */
 
   actual = (BOARD_SYSTEM_FREQUENCY >> 1) / brg;
-  spivdbg("BR=%04x actual=%ld\n", (unsigned int)brg, (long)actual);
+  spiinfo("BR=%04x actual=%ld\n", (unsigned int)brg, (long)actual);
 
   /* Save the frequency setting */
 
@@ -500,7 +500,7 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode)
   FAR struct z16f_spi_s *priv = (FAR struct z16f_spi_s *)dev;
   uint8_t regval;
 
-  spivdbg("mode=%d\n", mode);
+  spiinfo("mode=%d\n", mode);
 
   /* Has the mode changed? */
 
@@ -542,7 +542,7 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode)
         }
 
       spi_putreg8(priv, regval, Z16F_ESPI_CTL);
-      spivdbg("ESPI CTL: %02x\n", regval);
+      spiinfo("ESPI CTL: %02x\n", regval);
 
       /* Save the mode so that subsequent re-configurations will be faster */
 
@@ -570,7 +570,7 @@ static void spi_setbits(FAR struct spi_dev_s *dev, int nbits)
   FAR struct z16f_spi_s *priv = (FAR struct z16f_spi_s *)dev;
   uint8_t regval;
 
-  spivdbg("nbits=%d\n", nbits);
+  spiinfo("nbits=%d\n", nbits);
   DEBUGASSERT(priv && nbits > 0 && nbits <= 8);
 
   /* Has the number of bits changed? */
@@ -590,7 +590,7 @@ static void spi_setbits(FAR struct spi_dev_s *dev, int nbits)
         }
 
       spi_putreg8(priv, regval, Z16F_ESPI_MODE);
-      spivdbg("ESPI MODE: %02x\n", regval);
+      spiinfo("ESPI MODE: %02x\n", regval);
 
       /* Save the selection so the subsequence re-configurations will be faster */
 
@@ -628,7 +628,7 @@ static uint16_t spi_send(FAR struct spi_dev_s *dev, uint16_t wd)
   rxbyte = (uint8_t)0;
   spi_exchange(dev, &txbyte, &rxbyte, 1);
 
-  spivdbg("Sent %02x received %02x\n", txbyte, rxbyte);
+  spiinfo("Sent %02x received %02x\n", txbyte, rxbyte);
   return (uint16_t)rxbyte;
 }
 
@@ -661,7 +661,7 @@ static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
   FAR uint8_t *rxptr = rxbuffer;
   FAR const uint8_t *txptr = txbuffer;
 
-  spivdbg("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords);
+  spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords);
 
   /* Make sure that any previous transfer is flushed from the hardware */
 
@@ -823,7 +823,7 @@ FAR struct spi_dev_s *z16_spibus_initialize(int port)
   irqstate_t flags;
   uint8_t regval;
 
-  spivdbg("port: %d\n", port);
+  spiinfo("port: %d\n", port);
   DEBUGASSERT(port == 0);
 
   /* Check if we have already initialized the ESPI */
diff --git a/arch/z80/src/ez80/ez80_emac.c b/arch/z80/src/ez80/ez80_emac.c
index 0584aa0464..364ebfa95e 100644
--- a/arch/z80/src/ez80/ez80_emac.c
+++ b/arch/z80/src/ez80/ez80_emac.c
@@ -700,16 +700,16 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
     }
 
 dumpregs:
-  nvdbg("Am79c874 MII registers (FIAD=%lx)\n", CONFIG_EZ80_FIAD);
-  nvdbg("  MII_MCR:         %04x\n", ez80emac_miiread(priv, MII_MCR));
-  nvdbg("  MII_MSR:         %04x\n", ez80emac_miiread(priv, MII_MSR));
-  nvdbg("  MII_PHYID1:      %04x\n", ez80emac_miiread(priv, MII_PHYID1));
-  nvdbg("  MII_PHYID2:      %04x\n", ez80emac_miiread(priv, MII_PHYID2));
-  nvdbg("  MII_ADVERTISE:   %04x\n", ez80emac_miiread(priv, MII_ADVERTISE));
-  nvdbg("  MII_LPA:         %04x\n", ez80emac_miiread(priv, MII_LPA));
-  nvdbg("  MII_EXPANSION:   %04x\n", ez80emac_miiread(priv, MII_EXPANSION));
-  nvdbg("  MII_DIAGNOSTICS: %04x\n", ez80emac_miiread(priv, MII_AM79C874_DIAGNOSTIC));
-  nvdbg("EMAC CFG1:         %02x\n", inp(EZ80_EMAC_CFG1));
+  ninfo("Am79c874 MII registers (FIAD=%lx)\n", CONFIG_EZ80_FIAD);
+  ninfo("  MII_MCR:         %04x\n", ez80emac_miiread(priv, MII_MCR));
+  ninfo("  MII_MSR:         %04x\n", ez80emac_miiread(priv, MII_MSR));
+  ninfo("  MII_PHYID1:      %04x\n", ez80emac_miiread(priv, MII_PHYID1));
+  ninfo("  MII_PHYID2:      %04x\n", ez80emac_miiread(priv, MII_PHYID2));
+  ninfo("  MII_ADVERTISE:   %04x\n", ez80emac_miiread(priv, MII_ADVERTISE));
+  ninfo("  MII_LPA:         %04x\n", ez80emac_miiread(priv, MII_LPA));
+  ninfo("  MII_EXPANSION:   %04x\n", ez80emac_miiread(priv, MII_EXPANSION));
+  ninfo("  MII_DIAGNOSTICS: %04x\n", ez80emac_miiread(priv, MII_AM79C874_DIAGNOSTIC));
+  ninfo("EMAC CFG1:         %02x\n", inp(EZ80_EMAC_CFG1));
   return ret;
 }
 #else
@@ -838,15 +838,15 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
   mcr |= MII_MCR_ANENABLE;
   ez80emac_miiwrite(priv, MII_MCR, mcr);
 
-  nvdbg("MII registers (FIAD=%lx)\n", CONFIG_EZ80_FIAD);
-  nvdbg("  MII_MCR:       %04x\n", ez80emac_miiread(priv, MII_MCR));
-  nvdbg("  MII_MSR:       %04x\n", ez80emac_miiread(priv, MII_MSR));
-  nvdbg("  MII_PHYID1:    %04x\n", ez80emac_miiread(priv, MII_PHYID1));
-  nvdbg("  MII_PHYID2:    %04x\n", ez80emac_miiread(priv, MII_PHYID2));
-  nvdbg("  MII_ADVERTISE: %04x\n", ez80emac_miiread(priv, MII_ADVERTISE));
-  nvdbg("  MII_LPA:       %04x\n", ez80emac_miiread(priv, MII_LPA));
-  nvdbg("  MII_EXPANSION: %04x\n", ez80emac_miiread(priv, MII_EXPANSION));
-  nvdbg("EMAC CFG1:         %02x\n", inp(EZ80_EMAC_CFG11));
+  ninfo("MII registers (FIAD=%lx)\n", CONFIG_EZ80_FIAD);
+  ninfo("  MII_MCR:       %04x\n", ez80emac_miiread(priv, MII_MCR));
+  ninfo("  MII_MSR:       %04x\n", ez80emac_miiread(priv, MII_MSR));
+  ninfo("  MII_PHYID1:    %04x\n", ez80emac_miiread(priv, MII_PHYID1));
+  ninfo("  MII_PHYID2:    %04x\n", ez80emac_miiread(priv, MII_PHYID2));
+  ninfo("  MII_ADVERTISE: %04x\n", ez80emac_miiread(priv, MII_ADVERTISE));
+  ninfo("  MII_LPA:       %04x\n", ez80emac_miiread(priv, MII_LPA));
+  ninfo("  MII_EXPANSION: %04x\n", ez80emac_miiread(priv, MII_EXPANSION));
+  ninfo("EMAC CFG1:         %02x\n", inp(EZ80_EMAC_CFG11));
   return OK;
 }
 #endif
@@ -960,7 +960,7 @@ static int ez80emac_transmit(struct ez80emac_driver_s *priv)
    * handler and, therefore, may be suspended when debug output is generated!
    */
 
-  nllvdbg("txnext=%p {%06x, %u, %04x} trp=%02x%02x\n",
+  nllinfo("txnext=%p {%06x, %u, %04x} trp=%02x%02x\n",
           priv->txnext, priv->txnext->np, priv->txnext->pktsize, priv->txnext->stat,
           inp(EZ80_EMAC_TRP_H), inp(EZ80_EMAC_TRP_L));
 
@@ -1039,9 +1039,9 @@ static int ez80emac_transmit(struct ez80emac_driver_s *priv)
   outp(EZ80_EMAC_PTMR, EMAC_PTMR);
   leave_critical_section(flags);
 
-  nllvdbg("txdesc=%p {%06x, %u, %04x}\n",
+  nllinfo("txdesc=%p {%06x, %u, %04x}\n",
           txdesc, txdesc->np, txdesc->pktsize, txdesc->stat);
-  nllvdbg("txnext=%p {%06x, %u, %04x} trp=%02x%02x\n",
+  nllinfo("txnext=%p {%06x, %u, %04x} trp=%02x%02x\n",
           txnext, txnext->np, txnext->pktsize, txnext->stat,
           inp(EZ80_EMAC_TRP_H), inp(EZ80_EMAC_TRP_L));
 
@@ -1082,7 +1082,7 @@ static int ez80emac_txpoll(struct net_driver_s *dev)
    * the field d_len is set to a value > 0.
    */
 
-  nvdbg("Poll result: d_len=%d\n", priv->dev.d_len);
+  ninfo("Poll result: d_len=%d\n", priv->dev.d_len);
   if (priv->dev.d_len > 0)
     {
       /* Look up the destination MAC address and add it to the Ethernet
@@ -1197,7 +1197,7 @@ static int ez80emac_receive(struct ez80emac_driver_s *priv)
    */
 
   rwp = ez80emac_rwp();
-  nvdbg("rxnext=%p {%06x, %u, %04x} rrp=%06x rwp=%06x blkslft=%02x\n",
+  ninfo("rxnext=%p {%06x, %u, %04x} rrp=%06x rwp=%06x blkslft=%02x\n",
         rxdesc, rxdesc->np, rxdesc->pktsize, rxdesc->stat,
         ez80emac_rrp(), rwp,
         inp(EZ80_EMAC_BLKSLFT_H), inp(EZ80_EMAC_BLKSLFT_L));
@@ -1222,7 +1222,7 @@ static int ez80emac_receive(struct ez80emac_driver_s *priv)
 
       if ((rxdesc->stat & EMAC_RXDESC_OK) == 0)
         {
-          nvdbg("Skipping bad RX pkt: %04x\n", rxdesc->stat);
+          ninfo("Skipping bad RX pkt: %04x\n", rxdesc->stat);
           EMAC_STAT(priv, rx_errors);
           EMAC_STAT(priv, rx_nok);
           continue;
@@ -1234,7 +1234,7 @@ static int ez80emac_receive(struct ez80emac_driver_s *priv)
 
       if (rxdesc->pktsize > CONFIG_NET_ETH_MTU)
         {
-          nvdbg("Truncated oversize RX pkt: %d->%d\n", rxdesc->pktsize, CONFIG_NET_ETH_MTU);
+          ninfo("Truncated oversize RX pkt: %d->%d\n", rxdesc->pktsize, CONFIG_NET_ETH_MTU);
           pktlen = CONFIG_NET_ETH_MTU;
         }
       else
@@ -1252,7 +1252,7 @@ static int ez80emac_receive(struct ez80emac_driver_s *priv)
      if ((FAR uint8_t*)(psrc + pktlen) > (FAR uint8_t*)priv->rxendp1)
         {
           int nbytes = (int)((FAR uint8_t*)priv->rxendp1 - (FAR uint8_t*)psrc);
-          nvdbg("RX wraps after %d bytes\n", nbytes + SIZEOF_EMACSDESC);
+          ninfo("RX wraps after %d bytes\n", nbytes + SIZEOF_EMACSDESC);
 
           memcpy(pdest, psrc, nbytes);
           memcpy(&pdest[nbytes], priv->rxstart, pktlen - nbytes);
@@ -1288,7 +1288,7 @@ static int ez80emac_receive(struct ez80emac_driver_s *priv)
       outp(EZ80_EMAC_RRP_L, (uint8_t)((uint24_t)rxdesc & 0xff));
       outp(EZ80_EMAC_RRP_H, (uint8_t)(((uint24_t)rxdesc >> 8) & 0xff));
 
-      nvdbg("rxnext=%p {%06x, %u, %04x} rrp=%06x rwp=%06x blkslft=%02x\n",
+      ninfo("rxnext=%p {%06x, %u, %04x} rrp=%06x rwp=%06x blkslft=%02x\n",
             rxdesc, rxdesc->np, rxdesc->pktsize, rxdesc->stat,
             ez80emac_rrp(), rwp,
             inp(EZ80_EMAC_BLKSLFT_H), inp(EZ80_EMAC_BLKSLFT_L));
@@ -1304,7 +1304,7 @@ static int ez80emac_receive(struct ez80emac_driver_s *priv)
 #ifdef CONFIG_NET_IPv4
       if (ETHBUF->type == HTONS(ETHTYPE_IP))
         {
-          nllvdbg("IPv4 frame\n");
+          nllinfo("IPv4 frame\n");
 
           /* Handle ARP on input then give the IPv4 packet to the network
            * layer
@@ -1345,7 +1345,7 @@ static int ez80emac_receive(struct ez80emac_driver_s *priv)
 #ifdef CONFIG_NET_IPv6
       if (ETHBUF->type == HTONS(ETHTYPE_IP6))
         {
-          nllvdbg("Iv6 frame\n");
+          nllinfo("Iv6 frame\n");
 
           /* Give the IPv6 packet to the network layer */
 
@@ -1383,7 +1383,7 @@ static int ez80emac_receive(struct ez80emac_driver_s *priv)
 #ifdef CONFIG_NET_ARP
       if (ETHBUF->type == htons(ETHTYPE_ARP))
         {
-          nvdbg("ARP packet received (%02x)\n", ETHBUF->type);
+          ninfo("ARP packet received (%02x)\n", ETHBUF->type);
           EMAC_STAT(priv, rx_arp);
 
           arp_arpin(&priv->dev);
@@ -1448,7 +1448,7 @@ static int ez80emac_txinterrupt(int irq, FAR void *context)
 
   /* All events are packet/control frame transmit complete events */
 
-  nvdbg("txhead=%p {%06x, %u, %04x} trp=%02x%02x istat=%02x\n",
+  ninfo("txhead=%p {%06x, %u, %04x} trp=%02x%02x istat=%02x\n",
         txhead, txhead->np, txhead->pktsize, txhead->stat,
         inp(EZ80_EMAC_TRP_H), inp(EZ80_EMAC_TRP_L), istat);
 
@@ -1471,7 +1471,7 @@ static int ez80emac_txinterrupt(int irq, FAR void *context)
       txhead = (FAR struct ez80emac_desc_s *)txhead->np;
       if (txhead)
         {
-          nvdbg("txhead=%p {%06x, %u, %04x} trp=%02x%02x\n",
+          ninfo("txhead=%p {%06x, %u, %04x} trp=%02x%02x\n",
                 txhead, txhead->np, txhead->pktsize, txhead->stat,
                 inp(EZ80_EMAC_TRP_H), inp(EZ80_EMAC_TRP_L));
         }
@@ -1484,7 +1484,7 @@ static int ez80emac_txinterrupt(int irq, FAR void *context)
   priv->txhead = txhead;
   if (!priv->txhead)
     {
-      nvdbg("No pending Tx.. Stopping XMIT function.\n");
+      ninfo("No pending Tx.. Stopping XMIT function.\n");
 
       /* Stop the Tx poll timer. (It will get restarted when we have
        * something to send
@@ -2009,7 +2009,7 @@ static int ez80_emacinitialize(void)
   priv->txnext->pktsize = 0;
   priv->txnext->stat    = 0;
 
-  nvdbg("txnext=%p {%06x, %u, %04x} tlbp=%02x%02x trp=%02x%02x\n",
+  ninfo("txnext=%p {%06x, %u, %04x} tlbp=%02x%02x trp=%02x%02x\n",
         priv->txnext, priv->txnext->np, priv->txnext->pktsize, priv->txnext->stat,
         inp(EZ80_EMAC_TLBP_H), inp(EZ80_EMAC_TLBP_L),
         inp(EZ80_EMAC_TRP_H), inp(EZ80_EMAC_TRP_L));
@@ -2030,7 +2030,7 @@ static int ez80_emacinitialize(void)
   priv->rxnext->pktsize = 0;
   priv->rxnext->stat    = 0;
 
-  nvdbg("rxnext=%p {%06x, %u, %04x} bp=%02x%02x\n",
+  ninfo("rxnext=%p {%06x, %u, %04x} bp=%02x%02x\n",
         priv->rxnext, priv->rxnext->np, priv->rxnext->pktsize, priv->rxnext->stat,
         inp(EZ80_EMAC_BP_H), inp(EZ80_EMAC_BP_L));
 
@@ -2050,7 +2050,7 @@ static int ez80_emacinitialize(void)
   outp(EZ80_EMAC_RRP_L, (uint8_t)(addr & 0xff));
   outp(EZ80_EMAC_RRP_H, (uint8_t)((addr >> 8) & 0xff));
 
-  nvdbg("rrp=%02x%02x rwp=%02x%02x\n",
+  ninfo("rrp=%02x%02x rwp=%02x%02x\n",
         inp(EZ80_EMAC_RRP_H), inp(EZ80_EMAC_RRP_L),
         inp(EZ80_EMAC_RWP_H), inp(EZ80_EMAC_RWP_L));
 
@@ -2063,7 +2063,7 @@ static int ez80_emacinitialize(void)
   outp(EZ80_EMAC_RHBP_H, (uint8_t)((addr >> 8) & 0xff));
   priv->rxendp1 = (FAR struct ez80emac_desc_s *)addr;
 
-  nvdbg("rxendp1=%p rhbp=%02x%02x\n",
+  ninfo("rxendp1=%p rhbp=%02x%02x\n",
         priv->rxendp1,
         inp(EZ80_EMAC_RHBP_H), inp(EZ80_EMAC_RHBP_L));
 
@@ -2072,7 +2072,7 @@ static int ez80_emacinitialize(void)
    */
 
   outp(EZ80_EMAC_BUFSZ, EMAC_BUFSZ);
-  nvdbg("bufsz=%02x blksleft=%02x%02x\n",
+  ninfo("bufsz=%02x blksleft=%02x%02x\n",
         inp(EZ80_EMAC_BUFSZ), inp(EZ80_EMAC_BLKSLFT_H), inp(EZ80_EMAC_BLKSLFT_L));
 
   /* Software reset */
@@ -2084,7 +2084,7 @@ static int ez80_emacinitialize(void)
   regval &= ~EMAC_RST_SRST;
   outp(EZ80_EMAC_RST, regval);
 
-  nvdbg("After soft reset: rwp=%02x%02x trp=%02x%02x\n",
+  ninfo("After soft reset: rwp=%02x%02x trp=%02x%02x\n",
         inp(EZ80_EMAC_RWP_H), inp(EZ80_EMAC_RWP_L),
         inp(EZ80_EMAC_TRP_H), inp(EZ80_EMAC_TRP_L));
 
diff --git a/audio/audio.c b/audio/audio.c
index a1f0db3834..e8caf0a4b8 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -146,7 +146,7 @@ static int audio_open(FAR struct file *filep)
   uint8_t tmp;
   int ret;
 
-  audvdbg("crefs: %d\n", upper->crefs);
+  audinfo("crefs: %d\n", upper->crefs);
 
   /* Get exclusive access to the device structures */
 
@@ -198,7 +198,7 @@ static int audio_close(FAR struct file *filep)
   FAR struct audio_upperhalf_s *upper = inode->i_private;
   int ret;
 
-  audvdbg("crefs: %d\n", upper->crefs);
+  audinfo("crefs: %d\n", upper->crefs);
 
   /* Get exclusive access to the device structures */
 
@@ -228,7 +228,7 @@ static int audio_close(FAR struct file *filep)
       /* Disable the Audio device */
 
       DEBUGASSERT(lower->ops->shutdown != NULL);
-      audvdbg("calling shutdown: %d\n");
+      audinfo("calling shutdown: %d\n");
 
       lower->ops->shutdown(lower);
     }
@@ -358,7 +358,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 #endif
   int ret;
 
-  audvdbg("cmd: %d arg: %ld\n", cmd, arg);
+  audinfo("cmd: %d arg: %ld\n", cmd, arg);
 
   /* Get exclusive access to the device structures */
 
@@ -382,7 +382,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
           FAR struct audio_caps_s *caps = (FAR struct audio_caps_s *)((uintptr_t)arg);
           DEBUGASSERT(lower->ops->getcaps != NULL);
 
-          audvdbg("AUDIOIOC_GETCAPS: Device=%d\n", caps->ac_type);
+          audinfo("AUDIOIOC_GETCAPS: Device=%d\n", caps->ac_type);
 
           /* Call the lower-half driver capabilities handler */
 
@@ -396,7 +396,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
             (FAR const struct audio_caps_desc_s *)((uintptr_t)arg);
           DEBUGASSERT(lower->ops->configure != NULL);
 
-          audvdbg("AUDIOIOC_INITIALIZE: Device=%d\n", caps->caps.ac_type);
+          audinfo("AUDIOIOC_INITIALIZE: Device=%d\n", caps->caps.ac_type);
 
           /* Call the lower-half driver configure handler */
 
@@ -412,7 +412,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
         {
           DEBUGASSERT(lower->ops->shutdown != NULL);
 
-          audvdbg("AUDIOIOC_SHUTDOWN\n");
+          audinfo("AUDIOIOC_SHUTDOWN\n");
 
           /* Call the lower-half driver initialize handler */
           ret = lower->ops->shutdown(lower);
@@ -427,7 +427,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case AUDIOIOC_START:
         {
-          audvdbg("AUDIOIOC_START\n");
+          audinfo("AUDIOIOC_START\n");
           DEBUGASSERT(lower->ops->start != NULL);
 
           /* Start the audio stream */
@@ -449,7 +449,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 #ifndef CONFIG_AUDIO_EXCLUDE_STOP
       case AUDIOIOC_STOP:
         {
-          audvdbg("AUDIOIOC_STOP\n");
+          audinfo("AUDIOIOC_STOP\n");
           DEBUGASSERT(lower->ops->stop != NULL);
 
           if (upper->started)
@@ -475,7 +475,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case AUDIOIOC_PAUSE:
         {
-          audvdbg("AUDIOIOC_PAUSE\n");
+          audinfo("AUDIOIOC_PAUSE\n");
           DEBUGASSERT(lower->ops->pause != NULL);
 
           if (upper->started)
@@ -497,7 +497,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case AUDIOIOC_RESUME:
         {
-          audvdbg("AUDIOIOC_RESUME\n");
+          audinfo("AUDIOIOC_RESUME\n");
           DEBUGASSERT(lower->ops->resume != NULL);
 
           if (upper->started)
@@ -521,7 +521,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case AUDIOIOC_ALLOCBUFFER:
         {
-          audvdbg("AUDIOIOC_ALLOCBUFFER\n");
+          audinfo("AUDIOIOC_ALLOCBUFFER\n");
 
           bufdesc = (FAR struct audio_buf_desc_s *) arg;
           if (lower->ops->allocbuffer)
@@ -544,7 +544,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case AUDIOIOC_FREEBUFFER:
         {
-          audvdbg("AUDIOIOC_FREEBUFFER\n");
+          audinfo("AUDIOIOC_FREEBUFFER\n");
 
           bufdesc = (FAR struct audio_buf_desc_s *) arg;
           if (lower->ops->freebuffer)
@@ -569,7 +569,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case AUDIOIOC_ENQUEUEBUFFER:
         {
-          audvdbg("AUDIOIOC_ENQUEUEBUFFER\n");
+          audinfo("AUDIOIOC_ENQUEUEBUFFER\n");
 
           DEBUGASSERT(lower->ops->enqueuebuffer != NULL);
 
@@ -585,7 +585,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case AUDIOIOC_REGISTERMQ:
         {
-          audvdbg("AUDIOIOC_REGISTERMQ\n");
+          audinfo("AUDIOIOC_REGISTERMQ\n");
 
           upper->usermq = (mqd_t) arg;
           ret = OK;
@@ -599,7 +599,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case AUDIOIOC_UNREGISTERMQ:
         {
-          audvdbg("AUDIOIOC_UNREGISTERMQ\n");
+          audinfo("AUDIOIOC_UNREGISTERMQ\n");
 
           upper->usermq = NULL;
           ret = OK;
@@ -613,7 +613,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case AUDIOIOC_RESERVE:
         {
-          audvdbg("AUDIOIOC_RESERVE\n");
+          audinfo("AUDIOIOC_RESERVE\n");
           DEBUGASSERT(lower->ops->reserve != NULL);
 
           /* Call lower-half to perform the reservation */
@@ -633,7 +633,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case AUDIOIOC_RELEASE:
         {
-          audvdbg("AUDIOIOC_RELEASE\n");
+          audinfo("AUDIOIOC_RELEASE\n");
           DEBUGASSERT(lower->ops->release != NULL);
 
           /* Call lower-half to perform the release */
@@ -650,7 +650,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       default:
         {
-          audvdbg("Forwarding unrecognized cmd: %d arg: %ld\n", cmd, arg);
+          audinfo("Forwarding unrecognized cmd: %d arg: %ld\n", cmd, arg);
           DEBUGASSERT(lower->ops->ioctl != NULL);
           ret = lower->ops->ioctl(lower, cmd, arg);
         }
@@ -704,7 +704,7 @@ static inline void audio_dequeuebuffer(FAR struct audio_upperhalf_s *upper,
 {
   struct audio_msg_s    msg;
 
-  audllvdbg("Entry\n");
+  audllinfo("Entry\n");
 
   /* Send a dequeue message to the user if a message queue is registered */
 
@@ -742,7 +742,7 @@ static inline void audio_complete(FAR struct audio_upperhalf_s *upper,
 {
   struct audio_msg_s    msg;
 
-  audllvdbg("Entry\n");
+  audllinfo("Entry\n");
 
   /* Send a dequeue message to the user if a message queue is registered */
 
@@ -791,7 +791,7 @@ static void audio_callback(FAR void *handle, uint16_t reason,
 {
   FAR struct audio_upperhalf_s *upper = (FAR struct audio_upperhalf_s *)handle;
 
-  audllvdbg("Entry\n");
+  audllinfo("Entry\n");
 
   /* Perform operation based on reason code */
 
@@ -995,7 +995,7 @@ int audio_register(FAR const char *name, FAR struct audio_lowerhalf_s *dev)
   dev->upper = audio_callback;
   dev->priv = upper;
 
-  audvdbg("Registering %s\n", path);
+  audinfo("Registering %s\n", path);
   return register_driver(path, &g_audioops, 0666, upper);
 }
 
diff --git a/audio/pcm_decode.c b/audio/pcm_decode.c
index d57d5dbb9b..f650045dd5 100644
--- a/audio/pcm_decode.c
+++ b/audio/pcm_decode.c
@@ -432,7 +432,7 @@ static bool pcm_parsewav(FAR struct pcm_decode_s *priv, uint8_t *data)
 static void pcm_subsample_configure(FAR struct pcm_decode_s *priv,
                                     uint8_t subsample)
 {
-  audvdbg("subsample: %d\n", subsample);
+  audinfo("subsample: %d\n", subsample);
 
   /* Three possibilities:
    *
@@ -448,7 +448,7 @@ static void pcm_subsample_configure(FAR struct pcm_decode_s *priv,
 
       if (subsample != AUDIO_SUBSAMPLE_NONE)
         {
-          audvdbg("Start sub-sampling\n");
+          audinfo("Start sub-sampling\n");
 
           /* Save the current subsample setting. Subsampling will begin on
            * then next audio buffer that we receive.
@@ -466,7 +466,7 @@ static void pcm_subsample_configure(FAR struct pcm_decode_s *priv,
 
   else if (subsample == AUDIO_SUBSAMPLE_NONE)
     {
-      audvdbg("Stop sub-sampling\n");
+      audinfo("Stop sub-sampling\n");
 
       /* Indicate that we are in normal play mode.  This will take effect
        * when the next audio buffer is received.
@@ -758,7 +758,7 @@ static int pcm_configure(FAR struct audio_lowerhalf_s *dev,
   lower = priv->lower;
   DEBUGASSERT(lower && lower->ops->configure);
 
-  audvdbg("Defer to lower configure\n");
+  audinfo("Defer to lower configure\n");
 #ifdef CONFIG_AUDIO_MULTI_SESSION
   return lower->ops->configure(lower, session, caps);
 #else
@@ -796,7 +796,7 @@ static int pcm_shutdown(FAR struct audio_lowerhalf_s *dev)
   lower = priv->lower;
   DEBUGASSERT(lower && lower->ops->start);
 
-  audvdbg("Defer to lower shutdown\n");
+  audinfo("Defer to lower shutdown\n");
   return lower->ops->shutdown(lower);
 }
 
@@ -827,7 +827,7 @@ static int pcm_start(FAR struct audio_lowerhalf_s *dev)
   lower = priv->lower;
   DEBUGASSERT(lower && lower->ops->start);
 
-  audvdbg("Defer to lower start\n");
+  audinfo("Defer to lower start\n");
 #ifdef CONFIG_AUDIO_MULTI_SESSION
   return lower->ops->start(lower, session);
 #else
@@ -866,7 +866,7 @@ static int pcm_stop(FAR struct audio_lowerhalf_s *dev)
   lower = priv->lower;
   DEBUGASSERT(lower && lower->ops->stop);
 
-  audvdbg("Defer to lower stop\n");
+  audinfo("Defer to lower stop\n");
 #ifdef CONFIG_AUDIO_MULTI_SESSION
   return lower->ops->stop(lower, session);
 #else
@@ -900,7 +900,7 @@ static int pcm_pause(FAR struct audio_lowerhalf_s *dev)
   lower = priv->lower;
   DEBUGASSERT(lower && lower->ops->pause);
 
-  audvdbg("Defer to lower pause\n");
+  audinfo("Defer to lower pause\n");
 #ifdef CONFIG_AUDIO_MULTI_SESSION
   return lower->ops->pause(lower, session);
 #else
@@ -933,7 +933,7 @@ static int pcm_resume(FAR struct audio_lowerhalf_s *dev)
   lower = priv->lower;
   DEBUGASSERT(lower && lower->ops->resume);
 
-  audvdbg("Defer to lower resume\n");
+  audinfo("Defer to lower resume\n");
 #ifdef CONFIG_AUDIO_MULTI_SESSION
   return lower->ops->resume(lower, session);
 #else
@@ -967,7 +967,7 @@ static int pcm_allocbuffer(FAR struct audio_lowerhalf_s *dev,
   lower = priv->lower;
   DEBUGASSERT(lower && lower->ops->allocbuffer);
 
-  audvdbg("Defer to lower allocbuffer\n");
+  audinfo("Defer to lower allocbuffer\n");
   return lower->ops->allocbuffer(lower, apb);
 }
 
@@ -994,7 +994,7 @@ static int pcm_freebuffer(FAR struct audio_lowerhalf_s *dev,
   lower = priv->lower;
   DEBUGASSERT(lower && lower->ops->freebuffer);
 
-  audvdbg("Defer to lower freebuffer, apb=%p\n", apb);
+  audinfo("Defer to lower freebuffer, apb=%p\n", apb);
   return lower->ops->freebuffer(lower, apb);
 }
 
@@ -1026,7 +1026,7 @@ static int pcm_enqueuebuffer(FAR struct audio_lowerhalf_s *dev,
   int ret;
 
   DEBUGASSERT(priv);
-  audvdbg("Received buffer %p, streaming=%d\n", apb, priv->streaming);
+  audinfo("Received buffer %p, streaming=%d\n", apb, priv->streaming);
 
   lower = priv->lower;
   DEBUGASSERT(lower && lower->ops->enqueuebuffer && lower->ops->configure);
@@ -1046,7 +1046,7 @@ static int pcm_enqueuebuffer(FAR struct audio_lowerhalf_s *dev,
         }
 
 #ifndef CONFIG_AUDIO_EXCLUDE_FFORWARD
-      audvdbg("Received: apb=%p curbyte=%d nbytes=%d flags=%04x\n",
+      audinfo("Received: apb=%p curbyte=%d nbytes=%d flags=%04x\n",
               apb, apb->curbyte, apb->nbytes, apb->flags);
 
       /* Perform any necessary sub-sampling operations */
@@ -1056,7 +1056,7 @@ static int pcm_enqueuebuffer(FAR struct audio_lowerhalf_s *dev,
 
       /* Then give the audio buffer to the lower driver */
 
-      audvdbg("Pass to lower enqueuebuffer: apb=%p curbyte=%d nbytes=%d\n",
+      audinfo("Pass to lower enqueuebuffer: apb=%p curbyte=%d nbytes=%d\n",
               apb, apb->curbyte, apb->nbytes);
 
       return lower->ops->enqueuebuffer(lower, apb);
@@ -1069,7 +1069,7 @@ static int pcm_enqueuebuffer(FAR struct audio_lowerhalf_s *dev,
    */
 
   bytesleft = apb->nbytes - apb->curbyte;
-  audvdbg("curbyte=%d nbytes=%d nmaxbytes=%d bytesleft=%d\n",
+  audinfo("curbyte=%d nbytes=%d nmaxbytes=%d bytesleft=%d\n",
           apb->curbyte, apb->nbytes, apb->nmaxbytes, bytesleft);
 
   if (bytesleft >= sizeof(struct wav_header_s))
@@ -1109,7 +1109,7 @@ static int pcm_enqueuebuffer(FAR struct audio_lowerhalf_s *dev,
           apb->curbyte += sizeof(struct wav_header_s);
 
 #ifndef CONFIG_AUDIO_EXCLUDE_FFORWARD
-          audvdbg("Begin streaming: apb=%p curbyte=%d nbytes=%d\n",
+          audinfo("Begin streaming: apb=%p curbyte=%d nbytes=%d\n",
                   apb, apb->curbyte, apb->nbytes);
 
           /* Perform any necessary sub-sampling operations */
@@ -1119,7 +1119,7 @@ static int pcm_enqueuebuffer(FAR struct audio_lowerhalf_s *dev,
 
           /* Then give the audio buffer to the lower driver */
 
-          audvdbg("Pass to lower enqueuebuffer: apb=%p curbyte=%d nbytes=%d\n",
+          audinfo("Pass to lower enqueuebuffer: apb=%p curbyte=%d nbytes=%d\n",
                   apb, apb->curbyte, apb->nbytes);
 
           ret = lower->ops->enqueuebuffer(lower, apb);
@@ -1186,7 +1186,7 @@ static int pcm_cancelbuffer(FAR struct audio_lowerhalf_s *dev,
   lower = priv->lower;
   DEBUGASSERT(lower && lower->ops->cancelbuffer);
 
-  audvdbg("Defer to lower cancelbuffer, apb=%p\n", apb);
+  audinfo("Defer to lower cancelbuffer, apb=%p\n", apb);
   return lower->ops->cancelbuffer(lower, apb);
 }
 
@@ -1211,7 +1211,7 @@ static int pcm_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd,
   lower = priv->lower;
   DEBUGASSERT(lower && lower->ops->ioctl);
 
-  audvdbg("Defer to lower ioctl, cmd=%d arg=%ld\n");
+  audinfo("Defer to lower ioctl, cmd=%d arg=%ld\n");
   return lower->ops->ioctl(lower, cmd, arg);
 }
 
@@ -1256,7 +1256,7 @@ static int pcm_reserve(FAR struct audio_lowerhalf_s *dev)
   lower = priv->lower;
   DEBUGASSERT(lower && lower->ops->reserve);
 
-  audvdbg("Defer to lower reserve\n");
+  audinfo("Defer to lower reserve\n");
 #ifdef CONFIG_AUDIO_MULTI_SESSION
   ret = lower->ops->reserve(lower, &priv->session);
 
@@ -1298,7 +1298,7 @@ static int pcm_release(FAR struct audio_lowerhalf_s *dev)
   lower = priv->lower;
   DEBUGASSERT(lower && lower->ops->release);
 
-  audvdbg("Defer to lower release\n");
+  audinfo("Defer to lower release\n");
 #ifdef CONFIG_AUDIO_MULTI_SESSION
   return lower->ops->release(lower, session);
 #else
diff --git a/binfmt/binfmt_copyargv.c b/binfmt/binfmt_copyargv.c
index 2fee46d047..612c0ec005 100644
--- a/binfmt/binfmt_copyargv.c
+++ b/binfmt/binfmt_copyargv.c
@@ -119,7 +119,7 @@ int binfmt_copyargv(FAR struct binary_s *bin, FAR char * const *argv)
             }
         }
 
-      bvdbg("args=%d argsize=%lu\n", nargs, (unsigned long)argsize);
+      binfo("args=%d argsize=%lu\n", nargs, (unsigned long)argsize);
 
       /* Allocate the argv array and an argument buffer */
 
diff --git a/binfmt/binfmt_execmodule.c b/binfmt/binfmt_execmodule.c
index 971c47123c..03b10c89ab 100644
--- a/binfmt/binfmt_execmodule.c
+++ b/binfmt/binfmt_execmodule.c
@@ -109,7 +109,7 @@ static void exec_ctors(FAR void *arg)
 
   for (i = 0; i < binp->nctors; i++)
     {
-      bvdbg("Calling ctor %d at %p\n", i, (FAR void *)ctor);
+      binfo("Calling ctor %d at %p\n", i, (FAR void *)ctor);
 
       (*ctor)();
       ctor++;
@@ -155,7 +155,7 @@ int exec_module(FAR const struct binary_s *binp)
     }
 #endif
 
-  bvdbg("Executing %s\n", binp->filename);
+  binfo("Executing %s\n", binp->filename);
 
   /* Allocate a TCB for the new task. */
 
diff --git a/binfmt/binfmt_loadmodule.c b/binfmt/binfmt_loadmodule.c
index 1b614838e6..3e73a01fb6 100644
--- a/binfmt/binfmt_loadmodule.c
+++ b/binfmt/binfmt_loadmodule.c
@@ -120,7 +120,7 @@ static int load_absmodule(FAR struct binary_s *bin)
   FAR struct binfmt_s *binfmt;
   int ret = -ENOENT;
 
-  bvdbg("Loading %s\n", bin->filename);
+  binfo("Loading %s\n", bin->filename);
 
   /* Disabling pre-emption should be sufficient protection while accessing
    * the list of registered binary format handlers.
@@ -142,7 +142,7 @@ static int load_absmodule(FAR struct binary_s *bin)
         {
           /* Successfully loaded -- break out with ret == 0 */
 
-          bvdbg("Successfully loaded module %s\n", bin->filename);
+          binfo("Successfully loaded module %s\n", bin->filename);
 
           /* Save the unload method for use by unload_module */
 
diff --git a/binfmt/binfmt_schedunload.c b/binfmt/binfmt_schedunload.c
index f9da1349f6..5a459d79ae 100644
--- a/binfmt/binfmt_schedunload.c
+++ b/binfmt/binfmt_schedunload.c
@@ -284,7 +284,7 @@ int schedule_unload(pid_t pid, FAR struct binary_s *bin)
       /* The errno value will get trashed by the following debug output */
 
       errorcode = get_errno();
-      bvdbg("ERROR: sigprocmask failed: %d\n", ret);
+      binfo("ERROR: sigprocmask failed: %d\n", ret);
       goto errout;
     }
 
@@ -310,7 +310,7 @@ int schedule_unload(pid_t pid, FAR struct binary_s *bin)
       /* The errno value will get trashed by the following debug output */
 
       errorcode = get_errno();
-      bvdbg("ERROR: sigaction failed: %d\n" , ret);
+      binfo("ERROR: sigaction failed: %d\n" , ret);
 
       /* Emergency removal from the list */
 
diff --git a/binfmt/binfmt_unloadmodule.c b/binfmt/binfmt_unloadmodule.c
index 887d6d66c0..05e459d658 100644
--- a/binfmt/binfmt_unloadmodule.c
+++ b/binfmt/binfmt_unloadmodule.c
@@ -108,7 +108,7 @@ static inline int exec_dtors(FAR struct binary_s *binp)
 
   for (i = 0; i < binp->ndtors; i++)
     {
-      bvdbg("Calling dtor %d at %p\n", i, (FAR void *)dtor);
+      binfo("Calling dtor %d at %p\n", i, (FAR void *)dtor);
 
       (*dtor)();
       dtor++;
@@ -187,7 +187,7 @@ int unload_module(FAR struct binary_s *binp)
 
       if (binp->mapped)
         {
-          bvdbg("Unmapping address space: %p\n", binp->mapped);
+          binfo("Unmapping address space: %p\n", binp->mapped);
 
           munmap(binp->mapped, binp->mapsize);
         }
@@ -198,7 +198,7 @@ int unload_module(FAR struct binary_s *binp)
         {
           if (binp->alloc[i])
             {
-              bvdbg("Freeing alloc[%d]: %p\n", i, binp->alloc[i]);
+              binfo("Freeing alloc[%d]: %p\n", i, binp->alloc[i]);
               kumm_free((FAR void *)binp->alloc[i]);
             }
         }
diff --git a/binfmt/builtin.c b/binfmt/builtin.c
index 537556136b..695be24ef5 100644
--- a/binfmt/builtin.c
+++ b/binfmt/builtin.c
@@ -95,7 +95,7 @@ static int builtin_loadbinary(struct binary_s *binp)
   int index;
   int ret;
 
-  bvdbg("Loading file: %s\n", binp->filename);
+  binfo("Loading file: %s\n", binp->filename);
 
   /* Open the binary file for reading (only) */
 
@@ -171,7 +171,7 @@ int builtin_initialize(void)
 
   /* Register ourselves as a binfmt loader */
 
-  bvdbg("Registering Builtin Loader\n");
+  binfo("Registering Builtin Loader\n");
 
   ret = register_binfmt(&g_builtin_binfmt);
   if (ret != 0)
diff --git a/binfmt/elf.c b/binfmt/elf.c
index 45154b0d4d..92f8b9b9e0 100644
--- a/binfmt/elf.c
+++ b/binfmt/elf.c
@@ -73,7 +73,7 @@
 #endif
 
 #ifdef CONFIG_ELF_DUMPBUFFER
-# define elf_dumpbuffer(m,b,n) bvdbgdumpbuffer(m,b,n)
+# define elf_dumpbuffer(m,b,n) binfodumpbuffer(m,b,n)
 #else
 # define elf_dumpbuffer(m,b,n)
 #endif
@@ -229,7 +229,7 @@ static int elf_loadbinary(FAR struct binary_s *binp)
   struct elf_loadinfo_s loadinfo;  /* Contains globals for libelf */
   int                   ret;
 
-  bvdbg("Loading file: %s\n", binp->filename);
+  binfo("Loading file: %s\n", binp->filename);
 
   /* Initialize the ELF library to load the program binary. */
 
@@ -338,7 +338,7 @@ int elf_initialize(void)
 
   /* Register ourselves as a binfmt loader */
 
-  bvdbg("Registering ELF\n");
+  binfo("Registering ELF\n");
 
   ret = register_binfmt(&g_elfbinfmt);
   if (ret != 0)
diff --git a/binfmt/libelf/libelf_bind.c b/binfmt/libelf/libelf_bind.c
index 1890b78c73..7d63fa87a3 100644
--- a/binfmt/libelf/libelf_bind.c
+++ b/binfmt/libelf/libelf_bind.c
@@ -68,7 +68,7 @@
 #endif
 
 #ifdef CONFIG_ELF_DUMPBUFFER
-# define elf_dumpbuffer(m,b,n) bvdbgdumpbuffer(m,b,n)
+# define elf_dumpbuffer(m,b,n) binfodumpbuffer(m,b,n)
 #else
 # define elf_dumpbuffer(m,b,n)
 #endif
diff --git a/binfmt/libelf/libelf_ctors.c b/binfmt/libelf/libelf_ctors.c
index 95f3884135..7d7a872027 100644
--- a/binfmt/libelf/libelf_ctors.c
+++ b/binfmt/libelf/libelf_ctors.c
@@ -121,7 +121,7 @@ int elf_loadctors(FAR struct elf_loadinfo_s *loadinfo)
        * static constructor section.
        */
 
-      bvdbg("elf_findsection .ctors section failed: %d\n", ctoridx);
+      binfo("elf_findsection .ctors section failed: %d\n", ctoridx);
       return ret == -ENOENT ? OK : ret;
     }
 
@@ -138,7 +138,7 @@ int elf_loadctors(FAR struct elf_loadinfo_s *loadinfo)
   ctorsize         = shdr->sh_size;
   loadinfo->nctors = ctorsize / sizeof(binfmt_ctor_t);
 
-  bvdbg("ctoridx=%d ctorsize=%d sizeof(binfmt_ctor_t)=%d nctors=%d\n",
+  binfo("ctoridx=%d ctorsize=%d sizeof(binfmt_ctor_t)=%d nctors=%d\n",
         ctoridx, ctorsize,  sizeof(binfmt_ctor_t), loadinfo->nctors);
 
   /* Check if there are any constructors.  It is not an error if there
@@ -191,7 +191,7 @@ int elf_loadctors(FAR struct elf_loadinfo_s *loadinfo)
             {
               FAR uintptr_t *ptr = (uintptr_t *)((FAR void *)(&loadinfo->ctors)[i]);
 
-              bvdbg("ctor %d: %08lx + %08lx = %08lx\n",
+              binfo("ctor %d: %08lx + %08lx = %08lx\n",
                     i, *ptr, (unsigned long)loadinfo->textalloc,
                     (unsigned long)(*ptr + loadinfo->textalloc));
 
diff --git a/binfmt/libelf/libelf_dtors.c b/binfmt/libelf/libelf_dtors.c
index 1f4cdab7e3..75a6264b3c 100644
--- a/binfmt/libelf/libelf_dtors.c
+++ b/binfmt/libelf/libelf_dtors.c
@@ -121,7 +121,7 @@ int elf_loaddtors(FAR struct elf_loadinfo_s *loadinfo)
        * static destructor section.
        */
 
-      bvdbg("elf_findsection .dtors section failed: %d\n", dtoridx);
+      binfo("elf_findsection .dtors section failed: %d\n", dtoridx);
       return ret == -ENOENT ? OK : ret;
     }
 
@@ -138,7 +138,7 @@ int elf_loaddtors(FAR struct elf_loadinfo_s *loadinfo)
   dtorsize         = shdr->sh_size;
   loadinfo->ndtors = dtorsize / sizeof(binfmt_dtor_t);
 
-  bvdbg("dtoridx=%d dtorsize=%d sizeof(binfmt_dtor_t)=%d ndtors=%d\n",
+  binfo("dtoridx=%d dtorsize=%d sizeof(binfmt_dtor_t)=%d ndtors=%d\n",
         dtoridx, dtorsize,  sizeof(binfmt_dtor_t), loadinfo->ndtors);
 
   /* Check if there are any destructors.  It is not an error if there
@@ -191,7 +191,7 @@ int elf_loaddtors(FAR struct elf_loadinfo_s *loadinfo)
             {
               FAR uintptr_t *ptr = (uintptr_t *)((FAR void *)(&loadinfo->dtors)[i]);
 
-              bvdbg("dtor %d: %08lx + %08lx = %08lx\n",
+              binfo("dtor %d: %08lx + %08lx = %08lx\n",
                     i, *ptr, (unsigned long)loadinfo->textalloc,
                     (unsigned long)(*ptr + loadinfo->textalloc));
 
diff --git a/binfmt/libelf/libelf_init.c b/binfmt/libelf/libelf_init.c
index 5ed774d3b0..fdbe328d60 100644
--- a/binfmt/libelf/libelf_init.c
+++ b/binfmt/libelf/libelf_init.c
@@ -65,7 +65,7 @@
 #endif
 
 #ifdef CONFIG_ELF_DUMPBUFFER
-# define elf_dumpbuffer(m,b,n) bvdbgdumpbuffer(m,b,n)
+# define elf_dumpbuffer(m,b,n) binfodumpbuffer(m,b,n)
 #else
 # define elf_dumpbuffer(m,b,n)
 #endif
@@ -145,7 +145,7 @@ int elf_init(FAR const char *filename, FAR struct elf_loadinfo_s *loadinfo)
 {
   int ret;
 
-  bvdbg("filename: %s loadinfo: %p\n", filename, loadinfo);
+  binfo("filename: %s loadinfo: %p\n", filename, loadinfo);
 
   /* Clear the load info structure */
 
diff --git a/binfmt/libelf/libelf_load.c b/binfmt/libelf/libelf_load.c
index b5cef6c6e9..e8f19766ee 100644
--- a/binfmt/libelf/libelf_load.c
+++ b/binfmt/libelf/libelf_load.c
@@ -156,7 +156,7 @@ static inline int elf_loadfile(FAR struct elf_loadinfo_s *loadinfo)
 
   /* Read each section into memory that is marked SHF_ALLOC + SHT_NOBITS */
 
-  bvdbg("Loaded sections:\n");
+  binfo("Loaded sections:\n");
   text = (FAR uint8_t *)loadinfo->textalloc;
   data = (FAR uint8_t *)loadinfo->dataalloc;
 
@@ -212,7 +212,7 @@ static inline int elf_loadfile(FAR struct elf_loadinfo_s *loadinfo)
 
       /* Update sh_addr to point to copy in memory */
 
-      bvdbg("%d. %08lx->%08lx\n", i,
+      binfo("%d. %08lx->%08lx\n", i,
             (unsigned long)shdr->sh_addr, (unsigned long)*pptr);
 
       shdr->sh_addr = (uintptr_t)*pptr;
@@ -250,7 +250,7 @@ int elf_load(FAR struct elf_loadinfo_s *loadinfo)
 #endif
   int ret;
 
-  bvdbg("loadinfo: %p\n", loadinfo);
+  binfo("loadinfo: %p\n", loadinfo);
   DEBUGASSERT(loadinfo && loadinfo->filfd >= 0);
 
   /* Load section headers into memory */
@@ -335,7 +335,7 @@ int elf_load(FAR struct elf_loadinfo_s *loadinfo)
   exidx = elf_findsection(loadinfo, CONFIG_ELF_EXIDX_SECTNAME);
   if (exidx < 0)
     {
-      bvdbg("elf_findsection: Exception Index section not found: %d\n", exidx);
+      binfo("elf_findsection: Exception Index section not found: %d\n", exidx);
     }
   else
     {
diff --git a/binfmt/libelf/libelf_read.c b/binfmt/libelf/libelf_read.c
index 420c8f1808..d0b801768b 100644
--- a/binfmt/libelf/libelf_read.c
+++ b/binfmt/libelf/libelf_read.c
@@ -115,7 +115,7 @@ int elf_read(FAR struct elf_loadinfo_s *loadinfo, FAR uint8_t *buffer,
   ssize_t nbytes;      /* Number of bytes read */
   off_t   rpos;        /* Position returned by lseek */
 
-  bvdbg("Read %ld bytes from offset %ld\n", (long)readsize, (long)offset);
+  binfo("Read %ld bytes from offset %ld\n", (long)readsize, (long)offset);
 
   /* Loop until all of the requested data has been read. */
 
diff --git a/binfmt/libelf/libelf_sections.c b/binfmt/libelf/libelf_sections.c
index 26189d7247..a34bac2eb8 100644
--- a/binfmt/libelf/libelf_sections.c
+++ b/binfmt/libelf/libelf_sections.c
@@ -270,7 +270,7 @@ int elf_findsection(FAR struct elf_loadinfo_s *loadinfo,
 
       /* Check if the name of this section is 'sectname' */
 
-      bvdbg("%d. Comparing \"%s\" and .\"%s\"\n",
+      binfo("%d. Comparing \"%s\" and .\"%s\"\n",
             i, loadinfo->iobuffer, sectname);
 
       if (strcmp((FAR const char *)loadinfo->iobuffer, sectname) == 0)
diff --git a/binfmt/libelf/libelf_symbols.c b/binfmt/libelf/libelf_symbols.c
index 1769481558..e63531a085 100644
--- a/binfmt/libelf/libelf_symbols.c
+++ b/binfmt/libelf/libelf_symbols.c
@@ -286,7 +286,7 @@ int elf_symvalue(FAR struct elf_loadinfo_s *loadinfo, FAR Elf32_Sym *sym,
       {
         /* st_value already holds the correct value */
 
-        bvdbg("SHN_ABS: st_value=%08lx\n", (long)sym->st_value);
+        binfo("SHN_ABS: st_value=%08lx\n", (long)sym->st_value);
         return OK;
       }
 
@@ -322,7 +322,7 @@ int elf_symvalue(FAR struct elf_loadinfo_s *loadinfo, FAR Elf32_Sym *sym,
 
         /* Yes... add the exported symbol value to the ELF symbol table entry */
 
-        bvdbg("SHN_ABS: name=%s %08x+%08x=%08x\n",
+        binfo("SHN_ABS: name=%s %08x+%08x=%08x\n",
               loadinfo->iobuffer, sym->st_value, symbol->sym_value,
               sym->st_value + symbol->sym_value);
 
@@ -334,7 +334,7 @@ int elf_symvalue(FAR struct elf_loadinfo_s *loadinfo, FAR Elf32_Sym *sym,
       {
         secbase = loadinfo->shdr[sym->st_shndx].sh_addr;
 
-        bvdbg("Other: %08x+%08x=%08x\n",
+        binfo("Other: %08x+%08x=%08x\n",
               sym->st_value, secbase, sym->st_value + secbase);
 
         sym->st_value += secbase;
diff --git a/binfmt/libelf/libelf_verify.c b/binfmt/libelf/libelf_verify.c
index 015d9d39fe..4e79991433 100644
--- a/binfmt/libelf/libelf_verify.c
+++ b/binfmt/libelf/libelf_verify.c
@@ -95,7 +95,7 @@ int elf_verifyheader(FAR const Elf32_Ehdr *ehdr)
 
   if (memcmp(ehdr->e_ident, g_elfmagic, EI_MAGIC_SIZE) != 0)
     {
-      bvdbg("Not ELF magic {%02x, %02x, %02x, %02x}\n",
+      binfo("Not ELF magic {%02x, %02x, %02x, %02x}\n",
             ehdr->e_ident[0], ehdr->e_ident[1], ehdr->e_ident[2], ehdr->e_ident[3]);
       return -ENOEXEC;
     }
diff --git a/binfmt/libnxflat/libnxflat_bind.c b/binfmt/libnxflat/libnxflat_bind.c
index ef45aa204d..25f251685d 100644
--- a/binfmt/libnxflat/libnxflat_bind.c
+++ b/binfmt/libnxflat/libnxflat_bind.c
@@ -67,7 +67,7 @@
 #endif
 
 #ifdef CONFIG_NXFLAT_DUMPBUFFER
-# define nxflat_dumpbuffer(m,b,n) bvdbgdumpbuffer(m,b,n)
+# define nxflat_dumpbuffer(m,b,n) binfodumpbuffer(m,b,n)
 #else
 # define nxflat_dumpbuffer(m,b,n)
 #endif
@@ -104,15 +104,15 @@ static inline int nxflat_bindrel32i(FAR struct nxflat_loadinfo_s *loadinfo,
 {
   FAR uint32_t *addr;
 
-  bvdbg("NXFLAT_RELOC_TYPE_REL32I Offset: %08x I-Space: %p\n",
+  binfo("NXFLAT_RELOC_TYPE_REL32I Offset: %08x I-Space: %p\n",
         offset, loadinfo->ispace + sizeof(struct nxflat_hdr_s));
 
   if (offset < loadinfo->dsize)
     {
       addr = (FAR uint32_t *)(offset + loadinfo->dspace->region);
-      bvdbg("  Before: %08x\n", *addr);
+      binfo("  Before: %08x\n", *addr);
      *addr += (uint32_t)(loadinfo->ispace + sizeof(struct nxflat_hdr_s));
-      bvdbg("  After: %08x\n", *addr);
+      binfo("  After: %08x\n", *addr);
       return OK;
     }
   else
@@ -143,15 +143,15 @@ static inline int nxflat_bindrel32d(FAR struct nxflat_loadinfo_s *loadinfo,
 {
   FAR uint32_t *addr;
 
-  bvdbg("NXFLAT_RELOC_TYPE_REL32D Offset: %08x D-Space: %p\n",
+  binfo("NXFLAT_RELOC_TYPE_REL32D Offset: %08x D-Space: %p\n",
         offset, loadinfo->dspace->region);
 
   if (offset < loadinfo->dsize)
     {
       addr = (FAR uint32_t *)(offset + loadinfo->dspace->region);
-      bvdbg("  Before: %08x\n", *addr);
+      binfo("  Before: %08x\n", *addr);
      *addr += (uint32_t)(loadinfo->dspace->region);
-      bvdbg("  After: %08x\n", *addr);
+      binfo("  After: %08x\n", *addr);
       return OK;
     }
   else
@@ -185,15 +185,15 @@ static inline int nxflat_bindrel32id(FAR struct nxflat_loadinfo_s *loadinfo,
 {
   FAR uint32_t *addr;
 
-  bvdbg("NXFLAT_RELOC_TYPE_REL32D Offset: %08x D-Space: %p\n",
+  binfo("NXFLAT_RELOC_TYPE_REL32D Offset: %08x D-Space: %p\n",
         offset, loadinfo->dspace->region);
 
   if (offset < loadinfo->dsize)
     {
       addr = (FAR uint32_t *)(offset + loadinfo->dspace->region);
-      bvdbg("  Before: %08x\n", *addr);
+      binfo("  Before: %08x\n", *addr);
      *addr += ((uint32_t)loadinfo->ispace - (uint32_t)(loadinfo->dspace->region));
-      bvdbg("  After: %08x\n", *addr);
+      binfo("  After: %08x\n", *addr);
       return OK;
     }
   else
@@ -237,7 +237,7 @@ static inline int nxflat_gotrelocs(FAR struct nxflat_loadinfo_s *loadinfo)
 
   offset  = ntohl(hdr->h_relocstart);
   nrelocs = ntohs(hdr->h_reloccount);
-  bvdbg("offset: %08lx nrelocs: %d\n", (long)offset, nrelocs);
+  binfo("offset: %08lx nrelocs: %d\n", (long)offset, nrelocs);
 
   /* The value of the relocation list that we get from the header is a
    * file offset.  We will have to convert this to an offset into the
@@ -251,7 +251,7 @@ static inline int nxflat_gotrelocs(FAR struct nxflat_loadinfo_s *loadinfo)
 
   relocs = (FAR struct nxflat_reloc_s *)
         (offset - loadinfo->isize + loadinfo->dspace->region);
-  bvdbg("isize: %08lx dpsace: %p relocs: %p\n",
+  binfo("isize: %08lx dpsace: %p relocs: %p\n",
         (long)loadinfo->isize, loadinfo->dspace->region, relocs);
 
   /* All relocations are performed within the D-Space allocation.  If
@@ -405,7 +405,7 @@ static inline int nxflat_bindimports(FAR struct nxflat_loadinfo_s *loadinfo,
 
   offset   = ntohl(hdr->h_importsymbols);
   nimports = ntohs(hdr->h_importcount);
-  bvdbg("Imports offset: %08x nimports: %d\n", offset, nimports);
+  binfo("Imports offset: %08x nimports: %d\n", offset, nimports);
 
   /* The import[] table resides within the D-Space allocation.  If
    * CONFIG_ARCH_ADDRENV=y, then that D-Space allocation lies in an address
@@ -450,7 +450,7 @@ static inline int nxflat_bindimports(FAR struct nxflat_loadinfo_s *loadinfo,
 
       for (i = 0; i < nimports; i++)
         {
-          bvdbg("Import[%d] (%08p) offset: %08x func: %08x\n",
+          binfo("Import[%d] (%08p) offset: %08x func: %08x\n",
                 i, &imports[i], imports[i].i_funcname, imports[i].i_funcaddress);
 
           /* Get a pointer to the imported symbol name.  The name itself
@@ -484,7 +484,7 @@ static inline int nxflat_bindimports(FAR struct nxflat_loadinfo_s *loadinfo,
 
           imports[i].i_funcaddress =  (uint32_t)symbol->sym_value;
 
-          bvdbg("Bound import[%d] (%08p) to export '%s' (%08x)\n",
+          binfo("Bound import[%d] (%08p) to export '%s' (%08x)\n",
                 i, &imports[i], symname, imports[i].i_funcaddress);
         }
     }
diff --git a/binfmt/libnxflat/libnxflat_init.c b/binfmt/libnxflat/libnxflat_init.c
index c66cbe1189..af8fd102d2 100644
--- a/binfmt/libnxflat/libnxflat_init.c
+++ b/binfmt/libnxflat/libnxflat_init.c
@@ -63,7 +63,7 @@
 #endif
 
 #ifdef CONFIG_NXFLAT_DUMPBUFFER
-# define nxflat_dumpbuffer(m,b,n) bvdbgdumpbuffer(m,b,n)
+# define nxflat_dumpbuffer(m,b,n) binfodumpbuffer(m,b,n)
 #else
 # define nxflat_dumpbuffer(m,b,n)
 #endif
@@ -100,7 +100,7 @@ int nxflat_init(const char *filename, struct nxflat_loadinfo_s *loadinfo)
   uint32_t bssend;
   int      ret;
 
-  bvdbg("filename: %s loadinfo: %p\n", filename, loadinfo);
+  binfo("filename: %s loadinfo: %p\n", filename, loadinfo);
 
   /* Clear the load info structure */
 
diff --git a/binfmt/libnxflat/libnxflat_load.c b/binfmt/libnxflat/libnxflat_load.c
index a3e49d3ce1..8e5dea7062 100644
--- a/binfmt/libnxflat/libnxflat_load.c
+++ b/binfmt/libnxflat/libnxflat_load.c
@@ -154,7 +154,7 @@ int nxflat_load(struct nxflat_loadinfo_s *loadinfo)
       return -errno;
     }
 
-  bvdbg("Mapped ISpace (%d bytes) at %08x\n", loadinfo->isize, loadinfo->ispace);
+  binfo("Mapped ISpace (%d bytes) at %08x\n", loadinfo->isize, loadinfo->ispace);
 
   /* The following call allocate D-Space memory and will provide a pointer
    * to the allocated (but still uninitialized) D-Space memory.
@@ -167,7 +167,7 @@ int nxflat_load(struct nxflat_loadinfo_s *loadinfo)
       return ret;
     }
 
-  bvdbg("Allocated DSpace (%d bytes) at %p\n",
+  binfo("Allocated DSpace (%d bytes) at %p\n",
         loadinfo->dsize, loadinfo->dspace->region);
 
   /* If CONFIG_ARCH_ADDRENV=y, then the D-Space allocation lies in an address
@@ -197,7 +197,7 @@ int nxflat_load(struct nxflat_loadinfo_s *loadinfo)
       goto errout;
     }
 
-  bvdbg("TEXT: %08x Entry point offset: %08x Data offset: %08x\n",
+  binfo("TEXT: %08x Entry point offset: %08x Data offset: %08x\n",
       loadinfo->ispace, loadinfo->entryoffs, doffset);
 
   /* Restore the original address environment */
diff --git a/binfmt/libnxflat/libnxflat_read.c b/binfmt/libnxflat/libnxflat_read.c
index 023b7c07e4..bb3d4b5b16 100644
--- a/binfmt/libnxflat/libnxflat_read.c
+++ b/binfmt/libnxflat/libnxflat_read.c
@@ -114,7 +114,7 @@ int nxflat_read(struct nxflat_loadinfo_s *loadinfo, char *buffer, int readsize,
   int     bytesleft;   /* Number of bytes of .data left to read */
   int     bytesread;   /* Total number of bytes read */
 
-  bvdbg("Read %d bytes from offset %d\n", readsize, offset);
+  binfo("Read %d bytes from offset %d\n", readsize, offset);
 
   /* Seek to the position in the object file where the initialized
    * data is saved.
diff --git a/binfmt/nxflat.c b/binfmt/nxflat.c
index 7eac76e65b..d2df7c1d11 100644
--- a/binfmt/nxflat.c
+++ b/binfmt/nxflat.c
@@ -65,7 +65,7 @@
 #endif
 
 #ifdef CONFIG_NXFLAT_DUMPBUFFER
-# define nxflat_dumpbuffer(m,b,n) bvdbgdumpbuffer(m,b,n)
+# define nxflat_dumpbuffer(m,b,n) binfodumpbuffer(m,b,n)
 #else
 # define nxflat_dumpbuffer(m,b,n)
 #endif
@@ -151,7 +151,7 @@ static int nxflat_loadbinary(struct binary_s *binp)
   struct nxflat_loadinfo_s loadinfo;  /* Contains globals for libnxflat */
   int                      ret;
 
-  bvdbg("Loading file: %s\n", binp->filename);
+  binfo("Loading file: %s\n", binp->filename);
 
   /* Initialize the xflat library to load the program binary. */
 
@@ -252,7 +252,7 @@ int nxflat_initialize(void)
 
   /* Register ourselves as a binfmt loader */
 
-  bvdbg("Registering NXFLAT\n");
+  binfo("Registering NXFLAT\n");
   ret = register_binfmt(&g_nxflatbinfmt);
   if (ret != 0)
     {
diff --git a/binfmt/pcode.c b/binfmt/pcode.c
index 6023622440..74b42e4ca5 100644
--- a/binfmt/pcode.c
+++ b/binfmt/pcode.c
@@ -169,7 +169,7 @@ static int pcode_mount_testfs(void)
 
   /* Create a ROM disk for the ROMFS filesystem */
 
-  bvdbg("Registering romdisk at /dev/ram%d\n", CONFIG_PCODE_TEST_DEVMINOR);
+  binfo("Registering romdisk at /dev/ram%d\n", CONFIG_PCODE_TEST_DEVMINOR);
   ret = romdisk_register(CONFIG_PCODE_TEST_DEVMINOR, (FAR uint8_t *)romfs_img,
                          NSECTORS(ROMFS_IMG_LEN), SECTORSIZE);
   if (ret < 0)
@@ -180,7 +180,7 @@ static int pcode_mount_testfs(void)
 
   /* Mount the test file system */
 
-  bvdbg("Mounting ROMFS filesystem at target=%s with source=%s\n",
+  binfo("Mounting ROMFS filesystem at target=%s with source=%s\n",
          CONFIG_PCODE_TEST_MOUNTPOINT, CONFIG_PCODE_TEST_DEVPATH);
 
   ret = mount(CONFIG_PCODE_TEST_DEVPATH, CONFIG_PCODE_TEST_MOUNTPOINT,
@@ -259,7 +259,7 @@ static int pcode_proxy(int argc, char **argv)
   sem_post(&g_pcode_handoff.exclsem);
   DEBUGASSERT(binp && fullpath);
 
-  bvdbg("Executing %s\n", fullpath);
+  binfo("Executing %s\n", fullpath);
 
   /* Set-up the on-exit handler that will unload the module on exit */
 
@@ -310,7 +310,7 @@ static int pcode_load(struct binary_s *binp)
   int fd;
   int ret;
 
-  bvdbg("Loading file: %s\n", binp->filename);
+  binfo("Loading file: %s\n", binp->filename);
 
   /* Open the binary file for reading (only) */
 
@@ -479,7 +479,7 @@ int pcode_initialize(void)
 
   /* Register ourselves as a binfmt loader */
 
-  bvdbg("Registering P-Code Loader\n");
+  binfo("Registering P-Code Loader\n");
 
   ret = register_binfmt(&g_pcode_binfmt);
   if (ret != 0)
diff --git a/configs/arduino-due/src/sam_autoleds.c b/configs/arduino-due/src/sam_autoleds.c
index 8f14011c9c..9708b777fa 100644
--- a/configs/arduino-due/src/sam_autoleds.c
+++ b/configs/arduino-due/src/sam_autoleds.c
@@ -101,10 +101,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/arduino-due/src/sam_mmcsd.c b/configs/arduino-due/src/sam_mmcsd.c
index 23787dd7dd..c0437411a9 100644
--- a/configs/arduino-due/src/sam_mmcsd.c
+++ b/configs/arduino-due/src/sam_mmcsd.c
@@ -254,7 +254,7 @@ int sam_sdinitialize(int minor)
 
   /* Get the SPI driver instance for the SD chip select */
 
-  fvdbg("Initializing bit bang SPI for the MMC/SD slot\n");
+  finfo("Initializing bit bang SPI for the MMC/SD slot\n");
 
   spi = sam_mmcsd_spiinitialize();
   if (!spi)
@@ -263,11 +263,11 @@ int sam_sdinitialize(int minor)
       return -ENODEV;
     }
 
-  fvdbg("Successfully initialized bit bang SPI for the MMC/SD slot\n");
+  finfo("Successfully initialized bit bang SPI for the MMC/SD slot\n");
 
   /* Bind the SPI device for the chip select to the slot */
 
-  fvdbg("Binding bit bang SPI device to MMC/SD slot %d\n",
+  finfo("Binding bit bang SPI device to MMC/SD slot %d\n",
         SAM34_MMCSDSLOTNO);
 
   ret = mmcsd_spislotinitialize(minor, SAM34_MMCSDSLOTNO, spi);
@@ -278,7 +278,7 @@ int sam_sdinitialize(int minor)
       return ret;
     }
 
-  fvdbg("Successfuly bound  bit bang SPI device to MMC/SD slot %d\n",
+  finfo("Successfuly bound  bit bang SPI device to MMC/SD slot %d\n",
         SAM34_MMCSDSLOTNO);
 
   return OK;
diff --git a/configs/arduino-due/src/sam_touchscreen.c b/configs/arduino-due/src/sam_touchscreen.c
index d2a2c408ff..13ea83febe 100644
--- a/configs/arduino-due/src/sam_touchscreen.c
+++ b/configs/arduino-due/src/sam_touchscreen.c
@@ -266,7 +266,7 @@ static int tsc_attach(FAR struct ads7843e_config_s *state, xcpt_t isr)
 {
   /* Attach the XPT2046 interrupt */
 
-  ivdbg("Attaching %p to IRQ %d\n", isr, SAM_TSC_IRQ);
+  iinfo("Attaching %p to IRQ %d\n", isr, SAM_TSC_IRQ);
   return irq_attach(SAM_TSC_IRQ, isr);
 }
 
@@ -274,7 +274,7 @@ static void tsc_enable(FAR struct ads7843e_config_s *state, bool enable)
 {
   /* Attach and enable, or detach and disable */
 
-  ivdbg("IRQ:%d enable:%d\n", SAM_TSC_IRQ, enable);
+  iinfo("IRQ:%d enable:%d\n", SAM_TSC_IRQ, enable);
   if (enable)
     {
       sam_gpioirqenable(SAM_TSC_IRQ);
@@ -300,7 +300,7 @@ static bool tsc_pendown(FAR struct ads7843e_config_s *state)
   /* The /PENIRQ value is active low */
 
   bool pendown = !sam_gpioread(GPIO_TSC_IRQ);
-  ivdbg("pendown:%d\n", pendown);
+  iinfo("pendown:%d\n", pendown);
   return pendown;
 }
 
diff --git a/configs/arduino-due/src/sam_userleds.c b/configs/arduino-due/src/sam_userleds.c
index 50360f678f..eecc9fae4e 100644
--- a/configs/arduino-due/src/sam_userleds.c
+++ b/configs/arduino-due/src/sam_userleds.c
@@ -61,10 +61,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/cc3200-launchpad/src/cc3200_autoleds.c b/configs/cc3200-launchpad/src/cc3200_autoleds.c
index 6fe52de306..6155f84550 100644
--- a/configs/cc3200-launchpad/src/cc3200_autoleds.c
+++ b/configs/cc3200-launchpad/src/cc3200_autoleds.c
@@ -93,10 +93,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /* Dump GPIO registers */
diff --git a/configs/cloudctrl/src/stm32_autoleds.c b/configs/cloudctrl/src/stm32_autoleds.c
index 98d7af6d8f..9e1f000078 100644
--- a/configs/cloudctrl/src/stm32_autoleds.c
+++ b/configs/cloudctrl/src/stm32_autoleds.c
@@ -64,10 +64,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /* The following definitions map the encoded LED setting to GPIO settings */
diff --git a/configs/cloudctrl/src/stm32_spi.c b/configs/cloudctrl/src/stm32_spi.c
index 4695aa3a4a..dadb3fa8be 100644
--- a/configs/cloudctrl/src/stm32_spi.c
+++ b/configs/cloudctrl/src/stm32_spi.c
@@ -67,13 +67,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/cloudctrl/src/stm32_usb.c b/configs/cloudctrl/src/stm32_usb.c
index 10ecdec7ca..49f25d4330 100644
--- a/configs/cloudctrl/src/stm32_usb.c
+++ b/configs/cloudctrl/src/stm32_usb.c
@@ -107,13 +107,13 @@ static int usbhost_waiter(int argc, char *argv[])
 {
   struct usbhost_hubport_s *hport;
 
-  uvdbg("Running\n");
+  uinfo("Running\n");
   for (;;)
     {
       /* Wait for the device to change state */
 
       DEBUGVERIFY(CONN_WAIT(g_usbconn, &hport));
-      uvdbg("%s\n", hport->connected ? "connected" : "disconnected");
+      uinfo("%s\n", hport->connected ? "connected" : "disconnected");
 
       /* Did we just become connected? */
 
@@ -177,7 +177,7 @@ int stm32_usbhost_initialize(void)
    * that we care about:
    */
 
-  uvdbg("Register class drivers\n");
+  uinfo("Register class drivers\n");
 
 #ifdef CONFIG_USBHOST_MSC
   /* Register the USB mass storage class */
@@ -201,13 +201,13 @@ int stm32_usbhost_initialize(void)
 
   /* Then get an instance of the USB host interface */
 
-  uvdbg("Initialize USB host\n");
+  uinfo("Initialize USB host\n");
   g_usbconn = stm32_otgfshost_initialize(0);
   if (g_usbconn)
     {
       /* Start a thread to handle device connection. */
 
-      uvdbg("Start usbhost_waiter\n");
+      uinfo("Start usbhost_waiter\n");
 
       pid = task_create("usbhost", CONFIG_USBHOST_DEFPRIO,
                         CONFIG_USBHOST_STACKSIZE,
diff --git a/configs/cloudctrl/src/stm32_userleds.c b/configs/cloudctrl/src/stm32_userleds.c
index 43f847554c..e7bc159243 100644
--- a/configs/cloudctrl/src/stm32_userleds.c
+++ b/configs/cloudctrl/src/stm32_userleds.c
@@ -64,10 +64,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/compal_e99/src/ssd1783.c b/configs/compal_e99/src/ssd1783.c
index e33cbd4f80..b858fef0c2 100644
--- a/configs/compal_e99/src/ssd1783.c
+++ b/configs/compal_e99/src/ssd1783.c
@@ -78,7 +78,7 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-# define lcddbg(format, ...)  vdbg(format, ##__VA_ARGS__)
+# define lcddbg(format, ...)  info(format, ##__VA_ARGS__)
 #else
 # define lcddbg(x...)
 #endif
@@ -307,7 +307,7 @@ int lcd_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer,
 int lcd_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
     size_t npixels)
 {
-  gvdbg("Not implemented\n");
+  ginfo("Not implemented\n");
   return -ENOSYS;
 }
 
@@ -322,7 +322,7 @@ int lcd_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
 static int lcd_getvideoinfo(FAR struct lcd_dev_s *dev,
     FAR struct fb_videoinfo_s *vinfo)
 {
-  DEBUGASSERT(dev && vinfo);gvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n",
+  DEBUGASSERT(dev && vinfo);ginfo("fmt: %d xres: %d yres: %d nplanes: %d\n",
       g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes);
   memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s));
   return OK;
@@ -339,7 +339,7 @@ static int lcd_getvideoinfo(FAR struct lcd_dev_s *dev,
 static int lcd_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
     FAR struct lcd_planeinfo_s *pinfo)
 {
-  DEBUGASSERT(dev && pinfo && planeno == 0);gvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
+  DEBUGASSERT(dev && pinfo && planeno == 0);ginfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
   memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s));
   return OK;
 }
@@ -355,7 +355,7 @@ static int lcd_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
 
 static int lcd_getpower(struct lcd_dev_s *dev)
 {
-  gvdbg("power: %d\n", 0);
+  ginfo("power: %d\n", 0);
   return g_lcddev.power;
 }
 
@@ -376,7 +376,7 @@ static int lcd_setpower(struct lcd_dev_s *dev, int power)
     return OK;
   }
 
-  gvdbg("power: %d\n", power);
+  ginfo("power: %d\n", power);
   DEBUGASSERT(power <= CONFIG_LCD_MAXPOWER);
 
   /* Set new power level */
@@ -405,7 +405,7 @@ static int lcd_setpower(struct lcd_dev_s *dev, int power)
     }
     else
     {
-      gvdbg("powering LCD off...\n");
+      ginfo("powering LCD off...\n");
       /* Switch pin from PWL to LT */
       reg &= ~ASCONF_PWL_ENA;
       putreg8(reg, ASIC_CONF_REG);
@@ -426,7 +426,7 @@ static int lcd_setpower(struct lcd_dev_s *dev, int power)
 
 static int lcd_getcontrast(struct lcd_dev_s *dev)
 {
-  gvdbg("Not implemented\n");
+  ginfo("Not implemented\n");
   return -ENOSYS;
 }
 
@@ -440,7 +440,7 @@ static int lcd_getcontrast(struct lcd_dev_s *dev)
 
 static int lcd_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
 {
-  gvdbg("Not implemented\n");
+  ginfo("Not implemented\n");
   return -ENOSYS;
 }
 
@@ -453,7 +453,7 @@ static int lcd_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
  **************************************************************************************/
 static inline void lcd_initialize(void)
 {
-  gvdbg("%s: initializing LCD.\n",__FUNCTION__);
+  ginfo("%s: initializing LCD.\n",__FUNCTION__);
   calypso_reset_set(RESET_EXT, 0);
   usleep(5000);
   uwire_init();
@@ -478,7 +478,7 @@ static inline void lcd_initialize(void)
 
 int board_lcd_initialize(void)
 {
-  gvdbg("Initializing\n");
+  ginfo("Initializing\n");
 
   lcd_initialize();
 
diff --git a/configs/demo9s12ne64/src/m9s12_leds.c b/configs/demo9s12ne64/src/m9s12_leds.c
index 069f9cd5a1..56c0df885f 100644
--- a/configs/demo9s12ne64/src/m9s12_leds.c
+++ b/configs/demo9s12ne64/src/m9s12_leds.c
@@ -56,10 +56,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/demo9s12ne64/src/m9s12_spi.c b/configs/demo9s12ne64/src/m9s12_spi.c
index b418635021..3d029f14ea 100644
--- a/configs/demo9s12ne64/src/m9s12_spi.c
+++ b/configs/demo9s12ne64/src/m9s12_spi.c
@@ -62,14 +62,14 @@
 #ifdef SPI_DEBUG
 #  define spidbg  lldbg
 #  ifdef SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/dk-tm4c129x/src/tm4c_ssi.c b/configs/dk-tm4c129x/src/tm4c_ssi.c
index 0712075703..6b5dbe5d0b 100644
--- a/configs/dk-tm4c129x/src/tm4c_ssi.c
+++ b/configs/dk-tm4c129x/src/tm4c_ssi.c
@@ -70,10 +70,10 @@
 /* Dump GPIO registers */
 
 #if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO)
-#  define ssivdbg lldbg
+#  define ssiinfo lldbg
 #  define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m)
 #else
-#  define ssivdbg(x...)
+#  define ssiinfo(x...)
 #  define ssi_dumpgpio(m)
 #endif
 
diff --git a/configs/dk-tm4c129x/src/tm4c_timer.c b/configs/dk-tm4c129x/src/tm4c_timer.c
index e6cfe3e13c..2249293279 100644
--- a/configs/dk-tm4c129x/src/tm4c_timer.c
+++ b/configs/dk-tm4c129x/src/tm4c_timer.c
@@ -102,7 +102,7 @@ int tiva_timer_configure(void)
 {
   int ret;
 
-  timvdbg("Registering TIMER%d at %s\n", GPTM, CONFIG_DK_TM4C129X_TIMER_DEVNAME);
+  timinfo("Registering TIMER%d at %s\n", GPTM, CONFIG_DK_TM4C129X_TIMER_DEVNAME);
 
   ret = tiva_timer_register(CONFIG_DK_TM4C129X_TIMER_DEVNAME, GPTM, ALTCLK);
   if (ret < 0)
diff --git a/configs/dk-tm4c129x/src/tm4c_userleds.c b/configs/dk-tm4c129x/src/tm4c_userleds.c
index a4b66564c4..7d894ede63 100644
--- a/configs/dk-tm4c129x/src/tm4c_userleds.c
+++ b/configs/dk-tm4c129x/src/tm4c_userleds.c
@@ -72,10 +72,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/ea3131/src/lpc31_fillpage.c b/configs/ea3131/src/lpc31_fillpage.c
index 3ca97433cf..91bad2c867 100644
--- a/configs/ea3131/src/lpc31_fillpage.c
+++ b/configs/ea3131/src/lpc31_fillpage.c
@@ -244,7 +244,7 @@ static inline void lpc31_initsrc(void)
       char devname[16];
 #endif
 
-      pgllvdbg("Initializing %s\n", CONFIG_PAGING_BINPATH);
+      pgllinfo("Initializing %s\n", CONFIG_PAGING_BINPATH);
 
       /* No, do we need to mount an SD device? */
 
@@ -300,7 +300,7 @@ static inline void lpc31_initsrc(void)
     {
       /* No... the initialize now */
 
-      pgllvdbg("Initializing\n");
+      pgllinfo("Initializing\n");
 
       /* First get an instance of the SPI device interface */
 
@@ -327,7 +327,7 @@ static inline void lpc31_initsrc(void)
       ret = MTD_IOCTL(g_pgsrc.mtd, MTDIOC_GEOMETRY, (unsigned long)&g_pgsrc.geo);
       DEBUGASSERT(ret >= 0);
       capacity = g_pgsrc.geo.erasesize*g_pgsrc.geo.neraseblocks;
-      pgllvdbg("capacity: %d\n", capacity);
+      pgllinfo("capacity: %d\n", capacity);
       DEBUGASSERT(capacity >= (CONFIG_EA3131_PAGING_BINOFFSET + PG_TEXT_VSIZE));
 #endif
 
diff --git a/configs/ea3131/src/lpc31_leds.c b/configs/ea3131/src/lpc31_leds.c
index 0e4216cdc7..3b509575c3 100644
--- a/configs/ea3131/src/lpc31_leds.c
+++ b/configs/ea3131/src/lpc31_leds.c
@@ -61,10 +61,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/ea3131/src/lpc31_spi.c b/configs/ea3131/src/lpc31_spi.c
index cda79ac9e6..fead540055 100644
--- a/configs/ea3131/src/lpc31_spi.c
+++ b/configs/ea3131/src/lpc31_spi.c
@@ -67,14 +67,14 @@
 #ifdef SPI_DEBUG
 #  define spidbg  lldbg
 #  ifdef SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/ea3131/src/lpc31_usbhost.c b/configs/ea3131/src/lpc31_usbhost.c
index 4c7b500233..9ab9dd7ffa 100644
--- a/configs/ea3131/src/lpc31_usbhost.c
+++ b/configs/ea3131/src/lpc31_usbhost.c
@@ -104,7 +104,7 @@ static int ehci_waiter(int argc, char *argv[])
 {
   FAR struct usbhost_hubport_s *hport;
 
-  uvdbg("ehci_waiter:  Running\n");
+  uinfo("ehci_waiter:  Running\n");
   for (;;)
     {
       /* Wait for the device to change state */
@@ -262,7 +262,7 @@ int lpc31_usbhost_initialize(void)
 
 void lpc31_usbhost_vbusdrive(int rhport, bool enable)
 {
-  uvdbg("RHPort%d: enable=%d\n", rhport+1, enable);
+  uinfo("RHPort%d: enable=%d\n", rhport+1, enable);
 
   /* The LPC3131 has only a single root hub port */
 
diff --git a/configs/ea3152/src/lpc31_fillpage.c b/configs/ea3152/src/lpc31_fillpage.c
index 647960cfa3..b964927c37 100644
--- a/configs/ea3152/src/lpc31_fillpage.c
+++ b/configs/ea3152/src/lpc31_fillpage.c
@@ -244,7 +244,7 @@ static inline void lpc31_initsrc(void)
       char devname[16];
 #endif
 
-      pgllvdbg("Initializing %s\n", CONFIG_PAGING_BINPATH);
+      pgllinfo("Initializing %s\n", CONFIG_PAGING_BINPATH);
 
       /* No, do we need to mount an SD device? */
 
@@ -300,7 +300,7 @@ static inline void lpc31_initsrc(void)
     {
       /* No... the initialize now */
 
-      pgllvdbg("Initializing\n");
+      pgllinfo("Initializing\n");
 
       /* First get an instance of the SPI device interface */
 
@@ -327,7 +327,7 @@ static inline void lpc31_initsrc(void)
       ret = MTD_IOCTL(g_pgsrc.mtd, MTDIOC_GEOMETRY, (unsigned long)&g_pgsrc.geo);
       DEBUGASSERT(ret >= 0);
       capacity = g_pgsrc.geo.erasesize*g_pgsrc.geo.neraseblocks;
-      pgllvdbg("capacity: %d\n", capacity);
+      pgllinfo("capacity: %d\n", capacity);
       DEBUGASSERT(capacity >= (CONFIG_EA3152_PAGING_BINOFFSET + PG_TEXT_VSIZE));
 #endif
 
diff --git a/configs/ea3152/src/lpc31_leds.c b/configs/ea3152/src/lpc31_leds.c
index e33b3503f4..429c87abcd 100644
--- a/configs/ea3152/src/lpc31_leds.c
+++ b/configs/ea3152/src/lpc31_leds.c
@@ -61,10 +61,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/ea3152/src/lpc31_spi.c b/configs/ea3152/src/lpc31_spi.c
index 5e81cc398d..68153a0655 100644
--- a/configs/ea3152/src/lpc31_spi.c
+++ b/configs/ea3152/src/lpc31_spi.c
@@ -67,14 +67,14 @@
 #ifdef SPI_DEBUG
 #  define spidbg  lldbg
 #  ifdef SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/eagle100/src/lm_leds.c b/configs/eagle100/src/lm_leds.c
index de942a61d0..9cd7ef8325 100644
--- a/configs/eagle100/src/lm_leds.c
+++ b/configs/eagle100/src/lm_leds.c
@@ -61,10 +61,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /* Dump GPIO registers */
diff --git a/configs/eagle100/src/lm_ssi.c b/configs/eagle100/src/lm_ssi.c
index adc5ad59ed..87b347b0d1 100644
--- a/configs/eagle100/src/lm_ssi.c
+++ b/configs/eagle100/src/lm_ssi.c
@@ -67,14 +67,14 @@
 #ifdef SSI_DEBUG
 #  define ssidbg  lldbg
 #  ifdef SSI_VERBOSE
-#    define ssivdbg lldbg
+#    define ssiinfo lldbg
 #  else
-#    define ssivdbg(x...)
+#    define ssiinfo(x...)
 #  endif
 #else
 #  undef SSI_VERBOSE
 #  define ssidbg(x...)
-#  define ssivdbg(x...)
+#  define ssiinfo(x...)
 #endif
 
 /* Dump GPIO registers */
diff --git a/configs/efm32-g8xx-stk/src/efm32_autoleds.c b/configs/efm32-g8xx-stk/src/efm32_autoleds.c
index f699d030da..54a4df6f3d 100644
--- a/configs/efm32-g8xx-stk/src/efm32_autoleds.c
+++ b/configs/efm32-g8xx-stk/src/efm32_autoleds.c
@@ -65,10 +65,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /* The following definitions map the encoded LED setting to GPIO settings */
diff --git a/configs/efm32-g8xx-stk/src/efm32_userleds.c b/configs/efm32-g8xx-stk/src/efm32_userleds.c
index 44908623d0..556556454f 100644
--- a/configs/efm32-g8xx-stk/src/efm32_userleds.c
+++ b/configs/efm32-g8xx-stk/src/efm32_userleds.c
@@ -65,10 +65,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/efm32gg-stk3700/src/efm32_autoleds.c b/configs/efm32gg-stk3700/src/efm32_autoleds.c
index f55229cfb8..6fb6fb00ae 100644
--- a/configs/efm32gg-stk3700/src/efm32_autoleds.c
+++ b/configs/efm32gg-stk3700/src/efm32_autoleds.c
@@ -99,10 +99,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/efm32gg-stk3700/src/efm32_userleds.c b/configs/efm32gg-stk3700/src/efm32_userleds.c
index a392099770..ab25dda6a8 100644
--- a/configs/efm32gg-stk3700/src/efm32_userleds.c
+++ b/configs/efm32gg-stk3700/src/efm32_userleds.c
@@ -76,10 +76,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/ekk-lm3s9b96/src/lm_leds.c b/configs/ekk-lm3s9b96/src/lm_leds.c
index fb7fea3f8a..a70dd50dc2 100644
--- a/configs/ekk-lm3s9b96/src/lm_leds.c
+++ b/configs/ekk-lm3s9b96/src/lm_leds.c
@@ -62,10 +62,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /* Dump GPIO registers */
diff --git a/configs/ekk-lm3s9b96/src/lm_ssi.c b/configs/ekk-lm3s9b96/src/lm_ssi.c
index e2a26bc1b5..c8cd2a16d7 100644
--- a/configs/ekk-lm3s9b96/src/lm_ssi.c
+++ b/configs/ekk-lm3s9b96/src/lm_ssi.c
@@ -66,14 +66,14 @@
 #ifdef SSI_DEBUG
 #  define ssidbg  lldbg
 #  ifdef SSI_VERBOSE
-#    define ssivdbg lldbg
+#    define ssiinfo lldbg
 #  else
-#    define ssivdbg(x...)
+#    define ssiinfo(x...)
 #  endif
 #else
 #  undef SSI_VERBOSE
 #  define ssidbg(x...)
-#  define ssivdbg(x...)
+#  define ssiinfo(x...)
 #endif
 
 /* Dump GPIO registers */
diff --git a/configs/fire-stm32v2/src/stm32_autoleds.c b/configs/fire-stm32v2/src/stm32_autoleds.c
index 0aa9f273c7..c64c9f2f59 100644
--- a/configs/fire-stm32v2/src/stm32_autoleds.c
+++ b/configs/fire-stm32v2/src/stm32_autoleds.c
@@ -63,10 +63,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /* The following definitions map the encoded LED setting to GPIO settings.
diff --git a/configs/fire-stm32v2/src/stm32_enc28j60.c b/configs/fire-stm32v2/src/stm32_enc28j60.c
index 40d7954b69..2094f35aab 100644
--- a/configs/fire-stm32v2/src/stm32_enc28j60.c
+++ b/configs/fire-stm32v2/src/stm32_enc28j60.c
@@ -206,7 +206,7 @@ void up_netinitialize(void)
       return;
     }
 
-  nllvdbg("Bound SPI port %d to ENC28J60 device %d\n",
+  nllinfo("Bound SPI port %d to ENC28J60 device %d\n",
         ENC28J60_SPI_PORTNO, ENC28J60_DEVNO);
 }
 
diff --git a/configs/fire-stm32v2/src/stm32_mmcsd.c b/configs/fire-stm32v2/src/stm32_mmcsd.c
index 356be40d55..a356d8eeb9 100644
--- a/configs/fire-stm32v2/src/stm32_mmcsd.c
+++ b/configs/fire-stm32v2/src/stm32_mmcsd.c
@@ -97,7 +97,7 @@ int stm32_sdinitialize(int minor)
       return -ENODEV;
     }
 
-  fvdbg("Initialized SDIO slot %d\n", STM32_MMCSDSLOTNO);
+  finfo("Initialized SDIO slot %d\n", STM32_MMCSDSLOTNO);
 
   /* Now bind the SDIO interface to the MMC/SD driver */
 
@@ -108,7 +108,7 @@ int stm32_sdinitialize(int minor)
               STM32_MMCSDSLOTNO, minor);
     }
 
-  fvdbg("Bound SDIO slot %d to the MMC/SD driver, minor=%d\n",
+  finfo("Bound SDIO slot %d to the MMC/SD driver, minor=%d\n",
          STM32_MMCSDSLOTNO, minor);
 
   /* Then let's guess and say that there is a card in the slot.  I need to check to
diff --git a/configs/fire-stm32v2/src/stm32_spi.c b/configs/fire-stm32v2/src/stm32_spi.c
index e5f0497957..541f79ed84 100644
--- a/configs/fire-stm32v2/src/stm32_spi.c
+++ b/configs/fire-stm32v2/src/stm32_spi.c
@@ -65,14 +65,14 @@
 #ifdef SPI_DEBUG
 #  define spidbg  lldbg
 #  ifdef SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/fire-stm32v2/src/stm32_userleds.c b/configs/fire-stm32v2/src/stm32_userleds.c
index 05c8830eef..7092d02577 100644
--- a/configs/fire-stm32v2/src/stm32_userleds.c
+++ b/configs/fire-stm32v2/src/stm32_userleds.c
@@ -63,10 +63,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/freedom-kl25z/src/kl_adxl345.c b/configs/freedom-kl25z/src/kl_adxl345.c
index 0b68d7a832..a6fab92a64 100644
--- a/configs/freedom-kl25z/src/kl_adxl345.c
+++ b/configs/freedom-kl25z/src/kl_adxl345.c
@@ -183,7 +183,7 @@ static int adxl345_attach(FAR struct adxl345_config_s *state,
 {
   FAR struct kl_adxl345config_s *priv = (FAR struct kl_adxl345config_s *)state;
 
-  snvdbg("Saving handler %p\n", handler);
+  sninfo("Saving handler %p\n", handler);
   DEBUGASSERT(priv);
 
   /* Just save the handler and its argument.  We will use it when interrupts
@@ -264,7 +264,7 @@ int adxl345_archinitialize(int minor)
 
   if (!g_adxl345config.handle)
     {
-      snvdbg("Initializing\n");
+      sninfo("Initializing\n");
 
       /* Configure the ADXL345 interrupt pin as an input */
 
diff --git a/configs/freedom-kl25z/src/kl_led.c b/configs/freedom-kl25z/src/kl_led.c
index b9731da3e6..7480fab438 100644
--- a/configs/freedom-kl25z/src/kl_led.c
+++ b/configs/freedom-kl25z/src/kl_led.c
@@ -88,13 +88,13 @@
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledvdbg lldbg
+#    define ledinfo lldbg
 #  else
-#    define ledvdbg(x...)
+#    define ledinfo(x...)
 #  endif
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /* Dump GPIO registers */
diff --git a/configs/freedom-kl25z/src/kl_spi.c b/configs/freedom-kl25z/src/kl_spi.c
index 522e9d3387..7b5562c94b 100644
--- a/configs/freedom-kl25z/src/kl_spi.c
+++ b/configs/freedom-kl25z/src/kl_spi.c
@@ -60,13 +60,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /****************************************************************************
@@ -164,7 +164,7 @@ void weak_function kl_spidev_initialize(void)
 void kl_spi0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
                    bool selected)
 {
-  spivdbg("devid: %d CS: %s\n",
+  spiinfo("devid: %d CS: %s\n",
            (int)devid, selected ? "assert" : "de-assert");
 
 #ifdef CONFIG_ADXL345_SPI
@@ -190,7 +190,7 @@ void kl_spi0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
 void kl_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
                    bool selected)
 {
-  spivdbg("devid: %d CS: %s\n",
+  spiinfo("devid: %d CS: %s\n",
            (int)devid, selected ? "assert" : "de-assert");
 }
 #endif
diff --git a/configs/freedom-kl25z/src/kl_tsi.c b/configs/freedom-kl25z/src/kl_tsi.c
index e030caa9e8..9f7f1f70cc 100644
--- a/configs/freedom-kl25z/src/kl_tsi.c
+++ b/configs/freedom-kl25z/src/kl_tsi.c
@@ -135,7 +135,7 @@ static void tsi_calibrate(void)
       while (!(getreg32(KL_TSI_GENCS) & TSI_GENCS_EOSF));
 
       g_defcap[i] = getreg32(KL_TSI_DATA) & TSI_DATA_TSICNT_MASK;
-      ivdbg("Sensor %d = %d\n", i+1, g_defcap[i]);
+      iinfo("Sensor %d = %d\n", i+1, g_defcap[i]);
     }
 }
 
@@ -187,7 +187,7 @@ static ssize_t tsi_read(FAR struct file *filep, FAR char *buf, size_t buflen)
 
   g_currdelta = (uint16_t)deltacap;
 
-  ivdbg("Delta for g_channel %d = %d\n", g_channel, g_currdelta);
+  iinfo("Delta for g_channel %d = %d\n", g_channel, g_currdelta);
 
   buf[0] = g_currdelta & 0xff;
   buf[1] = (g_currdelta & 0xff00) >> 8;
diff --git a/configs/freedom-kl25z/src/kl_wifi.c b/configs/freedom-kl25z/src/kl_wifi.c
index 461a681f88..fa59ac10ae 100644
--- a/configs/freedom-kl25z/src/kl_wifi.c
+++ b/configs/freedom-kl25z/src/kl_wifi.c
@@ -204,7 +204,7 @@ static void wl_enable_irq(FAR struct cc3000_config_s *state, bool enable)
 
   /* Attach and enable, or detach and disable */
 
-  ivdbg("enable:%d\n", enable);
+  iinfo("enable:%d\n", enable);
   if (enable)
     {
       (void)kl_gpioirqattach(GPIO_WIFI_INT, priv->handler);
@@ -219,7 +219,7 @@ static void wl_enable_irq(FAR struct cc3000_config_s *state, bool enable)
 
 static void wl_enable_power(FAR struct cc3000_config_s *state, bool enable)
 {
-  ivdbg("enable:%d\n", enable);
+  iinfo("enable:%d\n", enable);
 
   /* Active high enable */
 
@@ -228,7 +228,7 @@ static void wl_enable_power(FAR struct cc3000_config_s *state, bool enable)
 
 static void wl_select(FAR struct cc3000_config_s *state, bool enable)
 {
-  ivdbg("enable:%d\n", enable);
+  iinfo("enable:%d\n", enable);
 
   /* Active high enable */
 
diff --git a/configs/freedom-kl26z/src/kl_led.c b/configs/freedom-kl26z/src/kl_led.c
index 5cdf989dd5..bc42e95e46 100644
--- a/configs/freedom-kl26z/src/kl_led.c
+++ b/configs/freedom-kl26z/src/kl_led.c
@@ -88,13 +88,13 @@
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledvdbg lldbg
+#    define ledinfo lldbg
 #  else
-#    define ledvdbg(x...)
+#    define ledinfo(x...)
 #  endif
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /* Dump GPIO registers */
diff --git a/configs/freedom-kl26z/src/kl_spi.c b/configs/freedom-kl26z/src/kl_spi.c
index f155b381a9..c54e51d5d1 100644
--- a/configs/freedom-kl26z/src/kl_spi.c
+++ b/configs/freedom-kl26z/src/kl_spi.c
@@ -60,13 +60,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /****************************************************************************
@@ -155,7 +155,7 @@ void weak_function kl_spidev_initialize(void)
 void kl_spi0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
                    bool selected)
 {
-  spivdbg("devid: %d CS: %s\n",
+  spiinfo("devid: %d CS: %s\n",
            (int)devid, selected ? "assert" : "de-assert");
 }
 #endif
@@ -164,7 +164,7 @@ void kl_spi0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
 void kl_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
                    bool selected)
 {
-  spivdbg("devid: %d CS: %s\n",
+  spiinfo("devid: %d CS: %s\n",
            (int)devid, selected ? "assert" : "de-assert");
 }
 #endif
diff --git a/configs/freedom-kl26z/src/kl_tsi.c b/configs/freedom-kl26z/src/kl_tsi.c
index 95392082e0..1d4a283772 100644
--- a/configs/freedom-kl26z/src/kl_tsi.c
+++ b/configs/freedom-kl26z/src/kl_tsi.c
@@ -135,7 +135,7 @@ static void tsi_calibrate(void)
       while (!(getreg32(KL_TSI_GENCS) & TSI_GENCS_EOSF));
 
       g_defcap[i] = getreg32(KL_TSI_DATA) & TSI_DATA_TSICNT_MASK;
-      ivdbg("Sensor %d = %d\n", i+1, g_defcap[i]);
+      iinfo("Sensor %d = %d\n", i+1, g_defcap[i]);
     }
 }
 
@@ -187,7 +187,7 @@ static ssize_t tsi_read(FAR struct file *filep, FAR char *buf, size_t buflen)
 
   g_currdelta = (uint16_t)deltacap;
 
-  ivdbg("Delta for g_channel %d = %d\n", g_channel, g_currdelta);
+  iinfo("Delta for g_channel %d = %d\n", g_channel, g_currdelta);
 
   buf[0] = g_currdelta & 0xff;
   buf[1] = (g_currdelta & 0xff00) >> 8;
diff --git a/configs/hymini-stm32v/src/stm32_appinit.c b/configs/hymini-stm32v/src/stm32_appinit.c
index 4a7b220633..bff825036b 100644
--- a/configs/hymini-stm32v/src/stm32_appinit.c
+++ b/configs/hymini-stm32v/src/stm32_appinit.c
@@ -216,7 +216,7 @@ int board_app_initialize(uintptr_t arg)
   /* Use SD card detect pin to check if a card is inserted */
 
   cd_status = !stm32_gpioread(GPIO_SD_CD);
-  vdbg("Card detect : %hhu\n", cd_status);
+  info("Card detect : %hhu\n", cd_status);
 
   sdio_mediachange(g_sdiodev, cd_status);
 #endif
diff --git a/configs/hymini-stm32v/src/stm32_leds.c b/configs/hymini-stm32v/src/stm32_leds.c
index edc3c0d78b..19b6158e85 100644
--- a/configs/hymini-stm32v/src/stm32_leds.c
+++ b/configs/hymini-stm32v/src/stm32_leds.c
@@ -63,10 +63,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /* The following definitions map the encoded LED setting to GPIO settings */
diff --git a/configs/hymini-stm32v/src/stm32_r61505u.c b/configs/hymini-stm32v/src/stm32_r61505u.c
index be67d14ac9..579ff1f2ec 100644
--- a/configs/hymini-stm32v/src/stm32_r61505u.c
+++ b/configs/hymini-stm32v/src/stm32_r61505u.c
@@ -94,7 +94,7 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-# define lcddbg(format, ...)  vdbg(format, ##__VA_ARGS__)
+# define lcddbg(format, ...)  info(format, ##__VA_ARGS__)
 #else
 # define lcddbg(x...)
 #endif
@@ -562,7 +562,7 @@ static int lcd_getvideoinfo(FAR struct lcd_dev_s *dev,
                             FAR struct fb_videoinfo_s *vinfo)
 {
   DEBUGASSERT(dev && vinfo);
-  gvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n",
+  ginfo("fmt: %d xres: %d yres: %d nplanes: %d\n",
         g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes);
 
   memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s));
@@ -581,7 +581,7 @@ static int lcd_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
                             FAR struct lcd_planeinfo_s *pinfo)
 {
   DEBUGASSERT(dev && pinfo && planeno == 0);
-  gvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
+  ginfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
 
   memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s));
   return OK;
@@ -598,7 +598,7 @@ static int lcd_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
 
 static int lcd_getpower(struct lcd_dev_s *dev)
 {
-  gvdbg("power: %d\n", 0);
+  ginfo("power: %d\n", 0);
   return g_lcddev.power;
 }
 
@@ -618,7 +618,7 @@ static int lcd_setpower(struct lcd_dev_s *dev, int power)
       return OK;
     }
 
-  gvdbg("power: %d\n", power);
+  ginfo("power: %d\n", power);
   DEBUGASSERT(power <= CONFIG_LCD_MAXPOWER);
 
   /* Set new power level */
@@ -639,7 +639,7 @@ static int lcd_setpower(struct lcd_dev_s *dev, int power)
           duty = LCD_BL_TIMER_PERIOD - 1;
         }
 
-      gvdbg("PWM duty: %d\n", duty);
+      ginfo("PWM duty: %d\n", duty);
       putreg16((uint16_t)duty, STM32_TIM3_CCR2);
 #endif
       /* TODO turn the display on */
@@ -648,7 +648,7 @@ static int lcd_setpower(struct lcd_dev_s *dev, int power)
     {
       /* FIXME: Turn display off ? */
 
-      gvdbg("Force PWM to 0\n");
+      ginfo("Force PWM to 0\n");
       putreg16((uint16_t)0, STM32_TIM3_CCR2);
     }
 
@@ -666,7 +666,7 @@ static int lcd_setpower(struct lcd_dev_s *dev, int power)
 
 static int lcd_getcontrast(struct lcd_dev_s *dev)
 {
-  gvdbg("Not implemented\n");
+  ginfo("Not implemented\n");
   return -ENOSYS;
 }
 
@@ -680,7 +680,7 @@ static int lcd_getcontrast(struct lcd_dev_s *dev)
 
 static int lcd_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
 {
-  gvdbg("Not implemented\n");
+  ginfo("Not implemented\n");
   return -ENOSYS;
 }
 
@@ -921,7 +921,7 @@ int board_lcd_initialize(void)
 {
   unsigned short id;
 
-  gvdbg("Initializing\n");
+  ginfo("Initializing\n");
 
   /* Configure GPIO pins and configure the FSMC to support the LCD */
 
diff --git a/configs/hymini-stm32v/src/stm32_spi.c b/configs/hymini-stm32v/src/stm32_spi.c
index 0f1852dd06..5e9d4c5748 100644
--- a/configs/hymini-stm32v/src/stm32_spi.c
+++ b/configs/hymini-stm32v/src/stm32_spi.c
@@ -66,14 +66,14 @@
 #ifdef SPI_DEBUG
 #  define spidbg  lldbg
 #  ifdef SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
@@ -102,7 +102,7 @@ void stm32_spidev_initialize(void)
 
 #ifdef CONFIG_STM32_SPI1
   /* Configure the SPI-based touch screen CS GPIO */
-  spivdbg("Configure GPIO for SPI1/CS\n");
+  spiinfo("Configure GPIO for SPI1/CS\n");
   stm32_configgpio(GPIO_TS_CS);
 #endif
 }
diff --git a/configs/hymini-stm32v/src/stm32_ssd1289.c b/configs/hymini-stm32v/src/stm32_ssd1289.c
index 6d7662261c..2aa36b2ab1 100644
--- a/configs/hymini-stm32v/src/stm32_ssd1289.c
+++ b/configs/hymini-stm32v/src/stm32_ssd1289.c
@@ -105,10 +105,10 @@
 /* Debug ******************************************************************************/
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg         dbg
-#  define lcdvdbg        vdbg
+#  define lcdinfo        info
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 /**************************************************************************************
@@ -482,7 +482,7 @@ int board_lcd_initialize(void)
 
   if (!g_ssd1289drvr)
     {
-      lcdvdbg("Initializing\n");
+      lcdinfo("Initializing\n");
 
       init_lcd_backlight();
 
diff --git a/configs/hymini-stm32v/src/stm32_ts.c b/configs/hymini-stm32v/src/stm32_ts.c
index 1344c245cd..6edda3f41e 100644
--- a/configs/hymini-stm32v/src/stm32_ts.c
+++ b/configs/hymini-stm32v/src/stm32_ts.c
@@ -95,7 +95,7 @@ static xcpt_t tc_isr;
 /* Attach the ADS7843E interrupt handler to the GPIO interrupt */
 static int hymini_ts_irq_attach(FAR struct ads7843e_config_s *state, xcpt_t isr)
 {
-  ivdbg("hymini_ts_irq_attach\n");
+  iinfo("hymini_ts_irq_attach\n");
 
   tc_isr = isr;
   stm32_gpiosetevent(GPIO_TS_IRQ, true, true, true, isr);
@@ -106,7 +106,7 @@ static int hymini_ts_irq_attach(FAR struct ads7843e_config_s *state, xcpt_t isr)
 static void hymini_ts_irq_enable(FAR struct ads7843e_config_s *state,
     bool enable)
 {
-  illvdbg("%d\n", enable);
+  illinfo("%d\n", enable);
 
   stm32_gpiosetevent(GPIO_TS_IRQ, true, true, true, enable? tc_isr:NULL);
 }
diff --git a/configs/kwikstik-k40/src/k40_lcd.c b/configs/kwikstik-k40/src/k40_lcd.c
index bd955fb4fa..e9d4b00420 100644
--- a/configs/kwikstik-k40/src/k40_lcd.c
+++ b/configs/kwikstik-k40/src/k40_lcd.c
@@ -61,7 +61,7 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-# define lcddbg(format, ...)  vdbg(format, ##__VA_ARGS__)
+# define lcddbg(format, ...)  info(format, ##__VA_ARGS__)
 #else
 # define lcddbg(x...)
 #endif
@@ -98,7 +98,7 @@
 
 int board_lcd_initialize(void)
 {
-  gvdbg("Initializing\n");
+  ginfo("Initializing\n");
 #warning "Missing logic"
   return OK;
 }
diff --git a/configs/kwikstik-k40/src/k40_leds.c b/configs/kwikstik-k40/src/k40_leds.c
index 2e724ccc4d..57d275ab21 100644
--- a/configs/kwikstik-k40/src/k40_leds.c
+++ b/configs/kwikstik-k40/src/k40_leds.c
@@ -53,10 +53,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/kwikstik-k40/src/k40_spi.c b/configs/kwikstik-k40/src/k40_spi.c
index 7b14ea57b8..2a80ab0024 100644
--- a/configs/kwikstik-k40/src/k40_spi.c
+++ b/configs/kwikstik-k40/src/k40_spi.c
@@ -62,14 +62,14 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
 #  ifdef CONFIG_DEBUG_SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef CONFIG_DEBUG_SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/launchxl-tms57004/src/tms570_autoleds.c b/configs/launchxl-tms57004/src/tms570_autoleds.c
index f3cd9fbaed..e99f81bcfa 100644
--- a/configs/launchxl-tms57004/src/tms570_autoleds.c
+++ b/configs/launchxl-tms57004/src/tms570_autoleds.c
@@ -99,10 +99,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/lincoln60/src/lpc17_leds.c b/configs/lincoln60/src/lpc17_leds.c
index 2a7a9f0001..27b46bfbc0 100644
--- a/configs/lincoln60/src/lpc17_leds.c
+++ b/configs/lincoln60/src/lpc17_leds.c
@@ -67,13 +67,13 @@
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledvdbg lldbg
+#    define ledinfo lldbg
 #  else
-#    define ledvdbg(x...)
+#    define ledinfo(x...)
 #  endif
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /* Dump GPIO registers */
diff --git a/configs/lm3s6432-s2e/src/lm_leds.c b/configs/lm3s6432-s2e/src/lm_leds.c
index fd763e59d6..5ee88cc12b 100644
--- a/configs/lm3s6432-s2e/src/lm_leds.c
+++ b/configs/lm3s6432-s2e/src/lm_leds.c
@@ -61,10 +61,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /* Dump GPIO registers */
diff --git a/configs/lm3s6432-s2e/src/lm_ssi.c b/configs/lm3s6432-s2e/src/lm_ssi.c
index 66882e7f10..7df29e56ad 100644
--- a/configs/lm3s6432-s2e/src/lm_ssi.c
+++ b/configs/lm3s6432-s2e/src/lm_ssi.c
@@ -65,14 +65,14 @@
 #ifdef SSI_DEBUG
 #  define ssidbg  lldbg
 #  ifdef SSI_VERBOSE
-#    define ssivdbg lldbg
+#    define ssiinfo lldbg
 #  else
-#    define ssivdbg(x...)
+#    define ssiinfo(x...)
 #  endif
 #else
 #  undef SSI_VERBOSE
 #  define ssidbg(x...)
-#  define ssivdbg(x...)
+#  define ssiinfo(x...)
 #endif
 
 /* Dump GPIO registers */
diff --git a/configs/lm3s6965-ek/src/lm_leds.c b/configs/lm3s6965-ek/src/lm_leds.c
index 8a0b5659a9..2ff29036b1 100644
--- a/configs/lm3s6965-ek/src/lm_leds.c
+++ b/configs/lm3s6965-ek/src/lm_leds.c
@@ -61,10 +61,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /* Dump GPIO registers */
diff --git a/configs/lm3s6965-ek/src/lm_oled.c b/configs/lm3s6965-ek/src/lm_oled.c
index d2bd61374d..db662fd1a1 100644
--- a/configs/lm3s6965-ek/src/lm_oled.c
+++ b/configs/lm3s6965-ek/src/lm_oled.c
@@ -73,7 +73,7 @@
 #endif
 
 #ifdef CONFIG_LCD_RITDEBUG
-#  define ritdbg(format, ...) vdbg(format, ##__VA_ARGS__)
+#  define ritdbg(format, ...) info(format, ##__VA_ARGS__)
 #  define oleddc_dumpgpio(m)  tiva_dumpgpio(OLEDDC_GPIO, m)
 #  define oledcs_dumpgpio(m)  tiva_dumpgpio(OLEDCS_GPIO, m)
 #else
@@ -127,7 +127,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
         }
      else
         {
-          gllvdbg("Bound SSI port 0 to OLED %d\n", devno);
+          gllinfo("Bound SSI port 0 to OLED %d\n", devno);
 
           /* And turn the OLED on (CONFIG_LCD_MAXPOWER should be 1) */
 
diff --git a/configs/lm3s6965-ek/src/lm_ssi.c b/configs/lm3s6965-ek/src/lm_ssi.c
index 5b105fed34..256d3a5482 100644
--- a/configs/lm3s6965-ek/src/lm_ssi.c
+++ b/configs/lm3s6965-ek/src/lm_ssi.c
@@ -67,14 +67,14 @@
 #ifdef SSI_DEBUG
 #  define ssidbg  lldbg
 #  ifdef SSI_VERBOSE
-#    define ssivdbg lldbg
+#    define ssiinfo lldbg
 #  else
-#    define ssivdbg(x...)
+#    define ssiinfo(x...)
 #  endif
 #else
 #  undef SSI_VERBOSE
 #  define ssidbg(x...)
-#  define ssivdbg(x...)
+#  define ssiinfo(x...)
 #endif
 
 /* Dump GPIO registers */
diff --git a/configs/lm3s8962-ek/src/lm_leds.c b/configs/lm3s8962-ek/src/lm_leds.c
index 5cc7a82f29..d7d6c3cd57 100644
--- a/configs/lm3s8962-ek/src/lm_leds.c
+++ b/configs/lm3s8962-ek/src/lm_leds.c
@@ -61,10 +61,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /* Dump GPIO registers */
diff --git a/configs/lm3s8962-ek/src/lm_oled.c b/configs/lm3s8962-ek/src/lm_oled.c
index f29657e76b..42871d17b3 100644
--- a/configs/lm3s8962-ek/src/lm_oled.c
+++ b/configs/lm3s8962-ek/src/lm_oled.c
@@ -72,7 +72,7 @@
 #endif
 
 #ifdef CONFIG_LCD_RITDEBUG
-#  define ritdbg(format, ...) vdbg(format, ##__VA_ARGS__)
+#  define ritdbg(format, ...) info(format, ##__VA_ARGS__)
 #  define oleddc_dumpgpio(m)  tiva_dumpgpio(OLEDDC_GPIO, m)
 #  define oledcs_dumpgpio(m)  tiva_dumpgpio(OLEDCS_GPIO, m)
 #else
@@ -126,7 +126,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
         }
      else
         {
-          gllvdbg("Bound SSI port 0 to OLED %d\n", devno);
+          gllinfo("Bound SSI port 0 to OLED %d\n", devno);
 
           /* And turn the OLED on (CONFIG_LCD_MAXPOWER should be 1) */
 
diff --git a/configs/lm3s8962-ek/src/lm_ssi.c b/configs/lm3s8962-ek/src/lm_ssi.c
index fc9a1efb24..1149704dc8 100644
--- a/configs/lm3s8962-ek/src/lm_ssi.c
+++ b/configs/lm3s8962-ek/src/lm_ssi.c
@@ -67,14 +67,14 @@
 #ifdef SSI_DEBUG
 #  define ssidbg  lldbg
 #  ifdef SSI_VERBOSE
-#    define ssivdbg lldbg
+#    define ssiinfo lldbg
 #  else
-#    define ssivdbg(x...)
+#    define ssiinfo(x...)
 #  endif
 #else
 #  undef SSI_VERBOSE
 #  define ssidbg(x...)
-#  define ssivdbg(x...)
+#  define ssiinfo(x...)
 #endif
 
 /* Dump GPIO registers */
diff --git a/configs/lm4f120-launchpad/src/lm4f_autoleds.c b/configs/lm4f120-launchpad/src/lm4f_autoleds.c
index 309ee4526a..89684e1c24 100644
--- a/configs/lm4f120-launchpad/src/lm4f_autoleds.c
+++ b/configs/lm4f120-launchpad/src/lm4f_autoleds.c
@@ -103,10 +103,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /* Dump GPIO registers */
diff --git a/configs/lm4f120-launchpad/src/lm4f_ssi.c b/configs/lm4f120-launchpad/src/lm4f_ssi.c
index 5d3686df43..e23385e207 100644
--- a/configs/lm4f120-launchpad/src/lm4f_ssi.c
+++ b/configs/lm4f120-launchpad/src/lm4f_ssi.c
@@ -71,10 +71,10 @@
 /* Dump GPIO registers */
 
 #if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO)
-#  define ssivdbg lldbg
+#  define ssiinfo lldbg
 #  define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m)
 #else
-#  define ssivdbg(x...)
+#  define ssiinfo(x...)
 #  define ssi_dumpgpio(m)
 #endif
 
diff --git a/configs/lpc4330-xplorer/src/lpc43_autoleds.c b/configs/lpc4330-xplorer/src/lpc43_autoleds.c
index d3bb157ed6..85a537e3d6 100644
--- a/configs/lpc4330-xplorer/src/lpc43_autoleds.c
+++ b/configs/lpc4330-xplorer/src/lpc43_autoleds.c
@@ -98,15 +98,15 @@
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
 #    define LED_VERBOSE 1
-#    define ledvdbg lldbg
+#    define ledinfo lldbg
 #  else
 #    undef LED_VERBOSE
-#    define ledvdbg(x...)
+#    define ledinfo(x...)
 #  endif
 #else
 #  undef LED_VERBOSE
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/lpc4330-xplorer/src/lpc43_userleds.c b/configs/lpc4330-xplorer/src/lpc43_userleds.c
index c056405f1d..d296cdf275 100644
--- a/configs/lpc4330-xplorer/src/lpc43_userleds.c
+++ b/configs/lpc4330-xplorer/src/lpc43_userleds.c
@@ -75,15 +75,15 @@
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
 #    define LED_VERBOSE 1
-#    define ledvdbg lldbg
+#    define ledinfo lldbg
 #  else
 #    undef LED_VERBOSE
-#    define ledvdbg(x...)
+#    define ledinfo(x...)
 #  endif
 #else
 #  undef LED_VERBOSE
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/lpc4357-evb/src/lpc43_autoleds.c b/configs/lpc4357-evb/src/lpc43_autoleds.c
index 56bfcd9943..1ff5dc954b 100644
--- a/configs/lpc4357-evb/src/lpc43_autoleds.c
+++ b/configs/lpc4357-evb/src/lpc43_autoleds.c
@@ -95,15 +95,15 @@
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
 #    define LED_VERBOSE 1
-#    define ledvdbg lldbg
+#    define ledinfo lldbg
 #  else
 #    undef LED_VERBOSE
-#    define ledvdbg(x...)
+#    define ledinfo(x...)
 #  endif
 #else
 #  undef LED_VERBOSE
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/lpc4357-evb/src/lpc43_userleds.c b/configs/lpc4357-evb/src/lpc43_userleds.c
index 5c05bac6ef..e7d4f672a0 100644
--- a/configs/lpc4357-evb/src/lpc43_userleds.c
+++ b/configs/lpc4357-evb/src/lpc43_userleds.c
@@ -86,15 +86,15 @@
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
 #    define LED_VERBOSE 1
-#    define ledvdbg lldbg
+#    define ledinfo lldbg
 #  else
 #    undef LED_VERBOSE
-#    define ledvdbg(x...)
+#    define ledinfo(x...)
 #  endif
 #else
 #  undef LED_VERBOSE
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/lpc4370-link2/src/lpc43_autoleds.c b/configs/lpc4370-link2/src/lpc43_autoleds.c
index 198750faad..147a18316f 100644
--- a/configs/lpc4370-link2/src/lpc43_autoleds.c
+++ b/configs/lpc4370-link2/src/lpc43_autoleds.c
@@ -67,15 +67,15 @@
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
 #    define LED_VERBOSE 1
-#    define ledvdbg lldbg
+#    define ledinfo lldbg
 #  else
 #    undef LED_VERBOSE
-#    define ledvdbg(x...)
+#    define ledinfo(x...)
 #  endif
 #else
 #  undef LED_VERBOSE
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/lpc4370-link2/src/lpc43_userleds.c b/configs/lpc4370-link2/src/lpc43_userleds.c
index 855c716996..1469e52ed6 100644
--- a/configs/lpc4370-link2/src/lpc43_userleds.c
+++ b/configs/lpc4370-link2/src/lpc43_userleds.c
@@ -68,15 +68,15 @@
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
 #    define LED_VERBOSE 1
-#    define ledvdbg lldbg
+#    define ledinfo lldbg
 #  else
 #    undef LED_VERBOSE
-#    define ledvdbg(x...)
+#    define ledinfo(x...)
 #  endif
 #else
 #  undef LED_VERBOSE
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/lpcxpresso-lpc1115/src/lpc11_leds.c b/configs/lpcxpresso-lpc1115/src/lpc11_leds.c
index 537468ca39..0c1abf192c 100644
--- a/configs/lpcxpresso-lpc1115/src/lpc11_leds.c
+++ b/configs/lpcxpresso-lpc1115/src/lpc11_leds.c
@@ -63,13 +63,13 @@
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledvdbg lldbg
+#    define ledinfo lldbg
 #  else
-#    define ledvdbg(x...)
+#    define ledinfo(x...)
 #  endif
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c b/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c
index b88d9088e7..0cc48e117a 100644
--- a/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c
+++ b/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c
@@ -66,14 +66,14 @@
 #ifdef SSP_DEBUG
 #  define sspdbg  lldbg
 #  ifdef SSP_VERBOSE
-#    define sspvdbg lldbg
+#    define sspinfo lldbg
 #  else
-#    define sspvdbg(x...)
+#    define sspinfo(x...)
 #  endif
 #else
 #  undef SSP_VERBOSE
 #  define sspdbg(x...)
-#  define sspvdbg(x...)
+#  define sspinfo(x...)
 #endif
 
 /* Dump GPIO registers */
diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_leds.c b/configs/lpcxpresso-lpc1768/src/lpc17_leds.c
index 142ff6f9b8..d454e1db75 100644
--- a/configs/lpcxpresso-lpc1768/src/lpc17_leds.c
+++ b/configs/lpcxpresso-lpc1768/src/lpc17_leds.c
@@ -63,13 +63,13 @@
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledvdbg lldbg
+#    define ledinfo lldbg
 #  else
-#    define ledvdbg(x...)
+#    define ledinfo(x...)
 #  endif
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_oled.c b/configs/lpcxpresso-lpc1768/src/lpc17_oled.c
index 8f180748fe..c61b67fb4b 100644
--- a/configs/lpcxpresso-lpc1768/src/lpc17_oled.c
+++ b/configs/lpcxpresso-lpc1768/src/lpc17_oled.c
@@ -85,7 +85,7 @@
 #endif
 
 #ifdef CONFIG_DEBUG_LCD
-#  define ugdbg(format, ...)  vdbg(format, ##__VA_ARGS__)
+#  define ugdbg(format, ...)  info(format, ##__VA_ARGS__)
 #  define oleddc_dumpgpio(m)  lpc17_dumpgpio(LPCXPRESSO_OLED_POWER, m)
 #  define oledcs_dumpgpio(m)  lpc17_dumpgpio(LPCXPRESSO_OLED_CS, m)
 #else
@@ -141,7 +141,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
         }
      else
         {
-          gllvdbg("Bound SPI port 1 to OLED %d\n", devno);
+          gllinfo("Bound SPI port 1 to OLED %d\n", devno);
 
           /* And turn the OLED on (dim) */
 
@@ -209,7 +209,7 @@ int lpc17_ssp1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
 #ifdef CONFIG_UG9664HSWAG01_POWER
 void ug_power(unsigned int devno, bool on)
 {
-  gllvdbg("power %s\n", on ? "ON" : "OFF");
+  gllinfo("power %s\n", on ? "ON" : "OFF");
   (void)lpc17_gpiowrite(LPCXPRESSO_OLED_POWER, on);
 }
 #endif
diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c b/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c
index 9de1a6b86c..632200a77f 100644
--- a/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c
+++ b/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c
@@ -66,14 +66,14 @@
 #ifdef SSP_DEBUG
 #  define sspdbg  lldbg
 #  ifdef SSP_VERBOSE
-#    define sspvdbg lldbg
+#    define sspinfo lldbg
 #  else
-#    define sspvdbg(x...)
+#    define sspinfo(x...)
 #  endif
 #else
 #  undef SSP_VERBOSE
 #  define sspdbg(x...)
-#  define sspvdbg(x...)
+#  define sspinfo(x...)
 #endif
 
 /* Dump GPIO registers */
diff --git a/configs/maple/src/stm32_lcd.c b/configs/maple/src/stm32_lcd.c
index c878032d9b..567b5d5a56 100644
--- a/configs/maple/src/stm32_lcd.c
+++ b/configs/maple/src/stm32_lcd.c
@@ -84,7 +84,7 @@
 #endif
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg(format, ...)  vdbg(format, ##__VA_ARGS__)
+#  define lcddbg(format, ...)  info(format, ##__VA_ARGS__)
 #else
 #  define lcddbg(x...)
 #endif
diff --git a/configs/maple/src/stm32_leds.c b/configs/maple/src/stm32_leds.c
index 7e2453d802..e372dca1d8 100644
--- a/configs/maple/src/stm32_leds.c
+++ b/configs/maple/src/stm32_leds.c
@@ -63,10 +63,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
@@ -79,7 +79,7 @@
 
 static inline void set_led(bool v)
 {
-  ledvdbg("Turn LED %s\n", v? "on":"off");
+  ledinfo("Turn LED %s\n", v? "on":"off");
   stm32_gpiowrite(GPIO_LED, v);
 }
 
@@ -105,7 +105,7 @@ void board_autoled_initialize(void)
 
 void board_autoled_on(int led)
 {
-  ledvdbg("board_autoled_on(%d)\n", led);
+  ledinfo("board_autoled_on(%d)\n", led);
   switch (led)
     {
     case LED_STARTED:
@@ -134,7 +134,7 @@ void board_autoled_on(int led)
 
 void board_autoled_off(int led)
 {
-  ledvdbg("board_autoled_off(%d)\n", led);
+  ledinfo("board_autoled_off(%d)\n", led);
 
   switch (led)
     {
diff --git a/configs/maple/src/stm32_spi.c b/configs/maple/src/stm32_spi.c
index aa9c3a03f9..90df022c7f 100644
--- a/configs/maple/src/stm32_spi.c
+++ b/configs/maple/src/stm32_spi.c
@@ -69,13 +69,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/mbed/src/lpc17_leds.c b/configs/mbed/src/lpc17_leds.c
index 5c2d80b50c..2262ac0de7 100644
--- a/configs/mbed/src/lpc17_leds.c
+++ b/configs/mbed/src/lpc17_leds.c
@@ -67,13 +67,13 @@
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledvdbg lldbg
+#    define ledinfo lldbg
 #  else
-#    define ledvdbg(x...)
+#    define ledinfo(x...)
 #  endif
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /* Dump GPIO registers */
diff --git a/configs/mcu123-lpc214x/src/lpc2148_spi1.c b/configs/mcu123-lpc214x/src/lpc2148_spi1.c
index c74dfba0cf..aeddd22b97 100644
--- a/configs/mcu123-lpc214x/src/lpc2148_spi1.c
+++ b/configs/mcu123-lpc214x/src/lpc2148_spi1.c
@@ -91,13 +91,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /* Clocking */
@@ -502,7 +502,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw
        * and (3) there are more bytes to be sent.
        */
 
-      spivdbg("TX: rxpending: %d nwords: %d\n", rxpending, nwords);
+      spiinfo("TX: rxpending: %d nwords: %d\n", rxpending, nwords);
       while ((getreg8(LPC214X_SPI1_SR) & LPC214X_SPI1SR_TNF) &&
              (rxpending < LPC214X_SPI1_FIFOSZ) && nwords)
         {
@@ -513,7 +513,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw
 
       /* Now, read the RX data from the RX FIFO while the RX FIFO is not empty */
 
-      spivdbg("RX: rxpending: %d\n", rxpending);
+      spiinfo("RX: rxpending: %d\n", rxpending);
       while (getreg8(LPC214X_SPI1_SR) & LPC214X_SPI1SR_RNE)
         {
           *ptr++ = (uint8_t)getreg16(LPC214X_SPI1_DR);
diff --git a/configs/mikroe-stm32f4/src/stm32_mio283qt2.c b/configs/mikroe-stm32f4/src/stm32_mio283qt2.c
index 2a7fdd6976..9cb05cddb4 100644
--- a/configs/mikroe-stm32f4/src/stm32_mio283qt2.c
+++ b/configs/mikroe-stm32f4/src/stm32_mio283qt2.c
@@ -121,10 +121,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg       dbg
-#  define lcdvdbg      vdbg
+#  define lcdinfo      info
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 /**************************************************************************************
@@ -502,7 +502,7 @@ int board_lcd_initialize(void)
 
   if (!g_stm32f4_lcd.drvr)
     {
-      lcdvdbg("Initializing\n");
+      lcdinfo("Initializing\n");
 
       /* Hold the LCD in reset (active low)  */
 
diff --git a/configs/mikroe-stm32f4/src/stm32_mio283qt9a.c b/configs/mikroe-stm32f4/src/stm32_mio283qt9a.c
index c8754ae76f..e6336e3145 100644
--- a/configs/mikroe-stm32f4/src/stm32_mio283qt9a.c
+++ b/configs/mikroe-stm32f4/src/stm32_mio283qt9a.c
@@ -122,10 +122,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg       dbg
-#  define lcdvdbg      vdbg
+#  define lcdinfo      info
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 /**************************************************************************************
@@ -503,7 +503,7 @@ int board_lcd_initialize(void)
 
   if (!g_stm32f4_lcd.drvr)
     {
-      lcdvdbg("Initializing\n");
+      lcdinfo("Initializing\n");
 
       /* Hold the LCD in reset (active low)  */
 
diff --git a/configs/mikroe-stm32f4/src/stm32_qencoder.c b/configs/mikroe-stm32f4/src/stm32_qencoder.c
index bcbb5dc438..e2014a7530 100644
--- a/configs/mikroe-stm32f4/src/stm32_qencoder.c
+++ b/configs/mikroe-stm32f4/src/stm32_qencoder.c
@@ -145,7 +145,7 @@ int qe_devinit(void)
     {
       /* Initialize a quadrature encoder interface. */
 
-      snvdbg("Initializing the quadrature encoder using TIM%d\n", TIMID);
+      sninfo("Initializing the quadrature encoder using TIM%d\n", TIMID);
       ret = stm32_qeinitialize("/dev/qe0", TIMID);
       if (ret < 0)
         {
diff --git a/configs/mikroe-stm32f4/src/stm32_spi.c b/configs/mikroe-stm32f4/src/stm32_spi.c
index f56a075849..6c445f2c82 100644
--- a/configs/mikroe-stm32f4/src/stm32_spi.c
+++ b/configs/mikroe-stm32f4/src/stm32_spi.c
@@ -71,14 +71,14 @@
 #ifdef SPI_DEBUG
 #  define spidbg  lldbg
 #  ifdef SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
@@ -150,7 +150,7 @@ void weak_function stm32_spidev_initialize(void)
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
 
-  spivdbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
 #if defined(CONFIG_VS1053)
   if (devid == SPIDEV_AUDIO_DATA)
diff --git a/configs/mikroe-stm32f4/src/stm32_touchscreen.c b/configs/mikroe-stm32f4/src/stm32_touchscreen.c
index b9bba5f57a..9965812de8 100644
--- a/configs/mikroe-stm32f4/src/stm32_touchscreen.c
+++ b/configs/mikroe-stm32f4/src/stm32_touchscreen.c
@@ -623,7 +623,7 @@ static void tc_notify(FAR struct tc_dev_s *priv)
       if (fds)
         {
           fds->revents |= POLLIN;
-          ivdbg("Report events: %02x\n", fds->revents);
+          iinfo("Report events: %02x\n", fds->revents);
           sem_post(fds->sem);
         }
     }
@@ -899,7 +899,7 @@ static void tc_worker(FAR void *arg)
             priv->newy  = value / CONFIG_TOUCHSCREEN_AVG_SAMPLES;
             priv->value = 0;
             priv->sampcount = 0;
-            ivdbg("Y=%d\n", priv->newy);
+            iinfo("Y=%d\n", priv->newy);
 
             /* Configure YU and YD with drive voltages and disable XR drive.  Note that
              * this is configuring the DRIVEA and DRIVEB outputs to enable the on-board
@@ -978,7 +978,7 @@ static void tc_worker(FAR void *arg)
               }
 
             newx  = value / CONFIG_TOUCHSCREEN_AVG_SAMPLES;
-            ivdbg("X=%d\n", newx);
+            iinfo("X=%d\n", newx);
 
             /* Samples are available */
 
@@ -1335,14 +1335,14 @@ errout:
 static int tc_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 {
 #if 1
-  ivdbg("cmd: %d arg: %ld\n", cmd, arg);
+  iinfo("cmd: %d arg: %ld\n", cmd, arg);
   return -ENOTTY; /* None yet supported */
 #else
   FAR struct inode *inode;
   FAR struct tc_dev_s *priv;
   int ret;
 
-  ivdbg("cmd: %d arg: %ld\n", cmd, arg);
+  iinfo("cmd: %d arg: %ld\n", cmd, arg);
   DEBUGASSERT(filep);
   inode = filep->f_inode;
 
@@ -1389,7 +1389,7 @@ static int tc_poll(FAR struct file *filep, FAR struct pollfd *fds,
   int                       ret;
   int                       i;
 
-  ivdbg("setup: %d\n", (int)setup);
+  iinfo("setup: %d\n", (int)setup);
   DEBUGASSERT(filep && fds);
   inode = filep->f_inode;
 
@@ -1501,7 +1501,7 @@ int board_tsc_setup(int minor)
 #endif
   int ret;
 
-  ivdbg("minor: %d\n", minor);
+  iinfo("minor: %d\n", minor);
   DEBUGASSERT(minor >= 0 && minor < 100);
 
   /* If we only have one touchscreen, check if we already did init */
@@ -1547,7 +1547,7 @@ int board_tsc_setup(int minor)
   /* Register the device as an input device */
 
   (void)snprintf(devname, DEV_NAMELEN, DEV_FORMAT, minor);
-  ivdbg("Registering %s\n", devname);
+  iinfo("Registering %s\n", devname);
 
   ret = register_driver(devname, &tc_fops, 0666, priv);
   if (ret < 0)
diff --git a/configs/mikroe-stm32f4/src/stm32_usb.c b/configs/mikroe-stm32f4/src/stm32_usb.c
index 876fb19d9b..81e25dd12b 100644
--- a/configs/mikroe-stm32f4/src/stm32_usb.c
+++ b/configs/mikroe-stm32f4/src/stm32_usb.c
@@ -106,13 +106,13 @@ static int usbhost_waiter(int argc, char *argv[])
 {
   struct usbhost_hubport_s *hport;
 
-  uvdbg("Running\n");
+  uinfo("Running\n");
   for (;;)
     {
       /* Wait for the device to change state */
 
       DEBUGVERIFY(CONN_WAIT(g_usbconn, &hport));
-      uvdbg("%s\n", hport->connected ? "connected" : "disconnected");
+      uinfo("%s\n", hport->connected ? "connected" : "disconnected");
 
       /* Did we just become connected? */
 
@@ -176,7 +176,7 @@ int stm32_usbhost_initialize(void)
    * that we care about:
    */
 
-  uvdbg("Register class drivers\n");
+  uinfo("Register class drivers\n");
 
 #ifdef CONFIG_USBHOST_MSC
   /* Register the USB host Mass Storage Class */
@@ -200,13 +200,13 @@ int stm32_usbhost_initialize(void)
 
   /* Then get an instance of the USB host interface */
 
-  uvdbg("Initialize USB host\n");
+  uinfo("Initialize USB host\n");
   g_usbconn = stm32_otgfshost_initialize(0);
   if (g_usbconn)
     {
       /* Start a thread to handle device connection. */
 
-      uvdbg("Start usbhost_waiter\n");
+      uinfo("Start usbhost_waiter\n");
 
       pid = task_create("usbhost", CONFIG_USBHOST_DEFPRIO,
                         CONFIG_USBHOST_STACKSIZE,
diff --git a/configs/mikroe-stm32f4/src/stm32_vs1053.c b/configs/mikroe-stm32f4/src/stm32_vs1053.c
index 08e9269512..7311ae07ed 100644
--- a/configs/mikroe-stm32f4/src/stm32_vs1053.c
+++ b/configs/mikroe-stm32f4/src/stm32_vs1053.c
@@ -200,7 +200,7 @@ void up_vs1053initialize(FAR struct spi_dev_s* spi)
       auddbg("up_vs1053initialize: Failed to register VS1053 Audio device\n");
     }
 
-  audllvdbg("Bound SPI port to VS1053 device %s\n", name);
+  audllinfo("Bound SPI port to VS1053 device %s\n", name);
 }
 
 #endif /* CONFIG_VS1053 */
diff --git a/configs/mirtoo/src/pic32_leds.c b/configs/mirtoo/src/pic32_leds.c
index 636d513953..65622c8bac 100644
--- a/configs/mirtoo/src/pic32_leds.c
+++ b/configs/mirtoo/src/pic32_leds.c
@@ -96,15 +96,15 @@
 #if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS)
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledvdbg lldbg
+#    define ledinfo lldbg
 #  else
-#    define ledvdbg(x...)
+#    define ledinfo(x...)
 #  endif
 #else
 #  undef CONFIG_DEBUG_LEDS
 #  undef CONFIG_DEBUG_INFO
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/mirtoo/src/pic32_spi2.c b/configs/mirtoo/src/pic32_spi2.c
index 682ebfc88e..23f7578ff4 100644
--- a/configs/mirtoo/src/pic32_spi2.c
+++ b/configs/mirtoo/src/pic32_spi2.c
@@ -99,10 +99,10 @@
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
-#  define spivdbg llvdbg
+#  define spiinfo llinfo
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/moteino-mega/src/avr_leds.c b/configs/moteino-mega/src/avr_leds.c
index 8fb2a91176..526f57c900 100644
--- a/configs/moteino-mega/src/avr_leds.c
+++ b/configs/moteino-mega/src/avr_leds.c
@@ -64,13 +64,13 @@
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledvdbg lldbg
+#    define ledinfo lldbg
 #  else
-#    define ledvdbg(x...)
+#    define ledinfo(x...)
 #  endif
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/ne64badge/src/m9s12_buttons.c b/configs/ne64badge/src/m9s12_buttons.c
index f362b5d520..7871ecbb60 100644
--- a/configs/ne64badge/src/m9s12_buttons.c
+++ b/configs/ne64badge/src/m9s12_buttons.c
@@ -63,14 +63,14 @@
 #ifdef BUTTON_DEBUG
 #  define btndbg  lldbg
 #  ifdef BUTTON_VERBOSE
-#    define btnvdbg lldbg
+#    define btninfo lldbg
 #  else
-#    define btnvdbg(x...)
+#    define btninfo(x...)
 #  endif
 #else
 #  undef BUTTON_VERBOSE
 #  define btndbg(x...)
-#  define btnvdbg(x...)
+#  define btninfo(x...)
 #endif
 
 /* Dump GPIO registers */
diff --git a/configs/ne64badge/src/m9s12_leds.c b/configs/ne64badge/src/m9s12_leds.c
index db498825a7..9fa059af1f 100644
--- a/configs/ne64badge/src/m9s12_leds.c
+++ b/configs/ne64badge/src/m9s12_leds.c
@@ -59,13 +59,13 @@
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledvdbg lldbg
+#    define ledinfo lldbg
 #  else
-#    define ledvdbg(x...)
+#    define ledinfo(x...)
 #  endif
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /* Dump GPIO registers */
diff --git a/configs/ne64badge/src/m9s12_spi.c b/configs/ne64badge/src/m9s12_spi.c
index bb4e3bc696..b76b8509b9 100644
--- a/configs/ne64badge/src/m9s12_spi.c
+++ b/configs/ne64badge/src/m9s12_spi.c
@@ -62,14 +62,14 @@
 #ifdef SPI_DEBUG
 #  define spidbg  lldbg
 #  ifdef SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/nucleo-144/src/stm32_autoleds.c b/configs/nucleo-144/src/stm32_autoleds.c
index c0822d6f7b..74334025a7 100644
--- a/configs/nucleo-144/src/stm32_autoleds.c
+++ b/configs/nucleo-144/src/stm32_autoleds.c
@@ -60,10 +60,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 #define ArraySize(x) (sizeof((x)) / sizeof((x)[0]))
diff --git a/configs/nucleo-144/src/stm32_sdio.c b/configs/nucleo-144/src/stm32_sdio.c
index 21c5d2eafd..84c34feae8 100644
--- a/configs/nucleo-144/src/stm32_sdio.c
+++ b/configs/nucleo-144/src/stm32_sdio.c
@@ -135,7 +135,7 @@ int stm32_sdio_initialize(void)
   /* Mount the SDIO-based MMC/SD block driver */
   /* First, get an instance of the SDIO interface */
 
-  fvdbg("Initializing SDIO slot %d\n", SDIO_SLOTNO);
+  finfo("Initializing SDIO slot %d\n", SDIO_SLOTNO);
 
   g_sdio_dev = sdio_initialize(SDIO_SLOTNO);
   if (!g_sdio_dev)
@@ -146,7 +146,7 @@ int stm32_sdio_initialize(void)
 
   /* Now bind the SDIO interface to the MMC/SD driver */
 
-  fvdbg("Bind SDIO to the MMC/SD driver, minor=%d\n", SDIO_MINOR);
+  finfo("Bind SDIO to the MMC/SD driver, minor=%d\n", SDIO_MINOR);
 
   ret = mmcsd_slotinitialize(SDIO_MINOR, g_sdio_dev);
   if (ret != OK)
@@ -155,13 +155,13 @@ int stm32_sdio_initialize(void)
       return ret;
     }
 
-  fvdbg("Successfully bound SDIO to the MMC/SD driver\n");
+  finfo("Successfully bound SDIO to the MMC/SD driver\n");
 
 #ifdef HAVE_NCD
   /* Use SD card detect pin to check if a card is g_sd_inserted */
 
   cd_status = !stm32_gpioread(GPIO_SDIO_NCD);
-  fvdbg("Card detect : %d\n", cd_status);
+  finfo("Card detect : %d\n", cd_status);
 
   sdio_mediachange(g_sdio_dev, cd_status);
 #else
diff --git a/configs/nucleo-144/src/stm32_spi.c b/configs/nucleo-144/src/stm32_spi.c
index 906815d532..498a664539 100644
--- a/configs/nucleo-144/src/stm32_spi.c
+++ b/configs/nucleo-144/src/stm32_spi.c
@@ -64,14 +64,14 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
 #  ifdef SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 #define ArraySize(x) (sizeof((x)) / sizeof((x)[0]))
diff --git a/configs/nucleo-144/src/stm32_userleds.c b/configs/nucleo-144/src/stm32_userleds.c
index 235cb6ef99..98d8020f63 100644
--- a/configs/nucleo-144/src/stm32_userleds.c
+++ b/configs/nucleo-144/src/stm32_userleds.c
@@ -62,10 +62,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 #define ArraySize(x) (sizeof((x)) / sizeof((x)[0]))
diff --git a/configs/nucleo-f303re/src/stm32_autoleds.c b/configs/nucleo-f303re/src/stm32_autoleds.c
index d90d9ae09d..ef1b3cdb07 100644
--- a/configs/nucleo-f303re/src/stm32_autoleds.c
+++ b/configs/nucleo-f303re/src/stm32_autoleds.c
@@ -63,10 +63,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/nucleo-f303re/src/stm32_can.c b/configs/nucleo-f303re/src/stm32_can.c
index 430be9c69d..c99a6773d5 100644
--- a/configs/nucleo-f303re/src/stm32_can.c
+++ b/configs/nucleo-f303re/src/stm32_can.c
@@ -61,14 +61,14 @@
 
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
-#  define canvdbg   vdbg
+#  define caninfo   info
 #  define canlldbg  lldbg
-#  define canllvdbg llvdbg
+#  define canllinfo llinfo
 #else
 #  define candbg(x...)
-#  define canvdbg(x...)
+#  define caninfo(x...)
 #  define canlldbg(x...)
-#  define canllvdbg(x...)
+#  define canllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/nucleo-f303re/src/stm32_pwm.c b/configs/nucleo-f303re/src/stm32_pwm.c
index 57e734d78b..58c8942f46 100644
--- a/configs/nucleo-f303re/src/stm32_pwm.c
+++ b/configs/nucleo-f303re/src/stm32_pwm.c
@@ -62,14 +62,14 @@
 
 #ifdef CONFIG_DEBUG_PWM
 #  define pwmdbg    dbg
-#  define pwmvdbg   vdbg
+#  define pwminfo   info
 #  define pwmlldbg  lldbg
-#  define pwmllvdbg llvdbg
+#  define pwmllinfo llinfo
 #else
 #  define pwmdbg(x...)
-#  define pwmvdbg(x...)
+#  define pwminfo(x...)
 #  define pwmlldbg(x...)
-#  define pwmllvdbg(x...)
+#  define pwmllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/nucleo-f303re/src/stm32_spi.c b/configs/nucleo-f303re/src/stm32_spi.c
index 51297ba426..d9bb2000b9 100644
--- a/configs/nucleo-f303re/src/stm32_spi.c
+++ b/configs/nucleo-f303re/src/stm32_spi.c
@@ -68,14 +68,14 @@
 #ifdef SPI_DEBUG
 #  define spidbg lldbg
 #  ifdef SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/nucleo-f303re/src/stm32_ssd1351.c b/configs/nucleo-f303re/src/stm32_ssd1351.c
index 417c4f4e8b..e58561c53d 100644
--- a/configs/nucleo-f303re/src/stm32_ssd1351.c
+++ b/configs/nucleo-f303re/src/stm32_ssd1351.c
@@ -75,10 +75,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg(format, ...)  dbg(format, ##__VA_ARGS__)
-#  define lcdvdbg(format, ...) vdbg(format, ##__VA_ARGS__)
+#  define lcdinfo(format, ...) info(format, ##__VA_ARGS__)
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 /****************************************************************************
@@ -127,7 +127,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
         }
      else
         {
-          lcdvdbg("Bound SPI port 1 to OLED %d\n", devno);
+          lcdinfo("Bound SPI port 1 to OLED %d\n", devno);
 
           /* And turn the OLED on */
 
diff --git a/configs/nucleo-f303re/src/stm32_userleds.c b/configs/nucleo-f303re/src/stm32_userleds.c
index 8521294c7e..f7bc8dff30 100644
--- a/configs/nucleo-f303re/src/stm32_userleds.c
+++ b/configs/nucleo-f303re/src/stm32_userleds.c
@@ -62,10 +62,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/nucleo-f4x1re/src/stm32_ajoystick.c b/configs/nucleo-f4x1re/src/stm32_ajoystick.c
index 61eaccf244..b412069d54 100644
--- a/configs/nucleo-f4x1re/src/stm32_ajoystick.c
+++ b/configs/nucleo-f4x1re/src/stm32_ajoystick.c
@@ -179,7 +179,7 @@ static FAR void *g_ajoyarg;
 
 static ajoy_buttonset_t ajoy_supported(FAR const struct ajoy_lowerhalf_s *lower)
 {
-  ivdbg("Supported: %02x\n", AJOY_SUPPORTED);
+  iinfo("Supported: %02x\n", AJOY_SUPPORTED);
   return (ajoy_buttonset_t)AJOY_SUPPORTED;
 }
 
@@ -249,7 +249,7 @@ static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower,
           sample->as_x = (int16_t)tmp;
           have |= 1;
 
-          ivdbg("X sample: %ld -> %d\n", (long)tmp, (int)sample->as_x);
+          iinfo("X sample: %ld -> %d\n", (long)tmp, (int)sample->as_x);
         }
 
 #ifdef CONFIG_ADC_DMA
@@ -259,7 +259,7 @@ static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower,
           sample->as_y = (int16_t)tmp;
           have |= 2;
 
-          ivdbg("Y sample: %ld -> %d\n", (long)tmp, (int)sample->as_y);
+          iinfo("Y sample: %ld -> %d\n", (long)tmp, (int)sample->as_y);
         }
 #endif
     }
@@ -280,7 +280,7 @@ static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower,
   /* Sample the discrete button inputs */
 
   sample->as_buttons = ajoy_buttons(lower);
-  ivdbg("Returning: %02x\n", sample->as_buttons);
+  iinfo("Returning: %02x\n", sample->as_buttons);
   return OK;
 }
 
@@ -311,7 +311,7 @@ static ajoy_buttonset_t ajoy_buttons(FAR const struct ajoy_lowerhalf_s *lower)
         }
     }
 
-  ivdbg("Returning: %02x\n", ret);
+  iinfo("Returning: %02x\n", ret);
   return ret;
 }
 
@@ -340,7 +340,7 @@ static void ajoy_enable(FAR const struct ajoy_lowerhalf_s *lower,
   flags = enter_critical_section();
   ajoy_disable();
 
-  illvdbg("press: %02x release: %02x handler: %p arg: %p\n",
+  illinfo("press: %02x release: %02x handler: %p arg: %p\n",
           press, release, handler, arg);
 
   /* If no events are indicated or if no handler is provided, then this
@@ -372,7 +372,7 @@ static void ajoy_enable(FAR const struct ajoy_lowerhalf_s *lower,
                falling = ((press & bit) != 0);
                rising  = ((release & bit) != 0);
 
-               illvdbg("GPIO %d: rising: %d falling: %d\n",
+               illinfo("GPIO %d: rising: %d falling: %d\n",
                         i, rising, falling);
 
                (void)stm32_gpiosetevent(g_joygpio[i], rising, falling,
@@ -453,7 +453,7 @@ int board_ajoy_initialize(void)
 #ifndef NO_JOYSTICK_ADC
   int fd;
 
-  ivdbg("Initialize ADC driver: /dev/adc0\n");
+  iinfo("Initialize ADC driver: /dev/adc0\n");
 
   /* Initialize ADC.  We will need this to read the ADC inputs */
 
@@ -501,7 +501,7 @@ int board_ajoy_initialize(void)
 
   /* Register the joystick device as /dev/ajoy0 */
 
-  ivdbg("Initialize joystick driver: /dev/ajoy0\n");
+  iinfo("Initialize joystick driver: /dev/ajoy0\n");
 
   ret = ajoy_register("/dev/ajoy0", &g_ajoylower);
   if (ret < 0)
diff --git a/configs/nucleo-f4x1re/src/stm32_autoleds.c b/configs/nucleo-f4x1re/src/stm32_autoleds.c
index ae2ac5e56d..cfec1f4e6e 100644
--- a/configs/nucleo-f4x1re/src/stm32_autoleds.c
+++ b/configs/nucleo-f4x1re/src/stm32_autoleds.c
@@ -64,10 +64,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/nucleo-f4x1re/src/stm32_spi.c b/configs/nucleo-f4x1re/src/stm32_spi.c
index ab5faa739e..b2f268afbc 100644
--- a/configs/nucleo-f4x1re/src/stm32_spi.c
+++ b/configs/nucleo-f4x1re/src/stm32_spi.c
@@ -69,13 +69,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/nucleo-f4x1re/src/stm32_userleds.c b/configs/nucleo-f4x1re/src/stm32_userleds.c
index 3348ac4e51..7aaa9954c5 100644
--- a/configs/nucleo-f4x1re/src/stm32_userleds.c
+++ b/configs/nucleo-f4x1re/src/stm32_userleds.c
@@ -64,10 +64,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/nucleo-f4x1re/src/stm32_wireless.c b/configs/nucleo-f4x1re/src/stm32_wireless.c
index 7b90d024c6..2ed8a1bd69 100644
--- a/configs/nucleo-f4x1re/src/stm32_wireless.c
+++ b/configs/nucleo-f4x1re/src/stm32_wireless.c
@@ -197,7 +197,7 @@ static void wl_enable_irq(FAR struct cc3000_config_s *state, bool enable)
 
   /* Attach and enable, or detach and disable */
 
-  ivdbg("enable:%d\n", enable);
+  iinfo("enable:%d\n", enable);
   if (enable)
     {
       (void)stm32_gpiosetevent(GPIO_WIFI_INT, false, true, false, priv->handler);
@@ -210,7 +210,7 @@ static void wl_enable_irq(FAR struct cc3000_config_s *state, bool enable)
 
 static void wl_enable_power(FAR struct cc3000_config_s *state, bool enable)
 {
-  ivdbg("enable:%d\n", enable);
+  iinfo("enable:%d\n", enable);
 
   /* Active high enable */
 
@@ -219,7 +219,7 @@ static void wl_enable_power(FAR struct cc3000_config_s *state, bool enable)
 
 static void wl_select(FAR struct cc3000_config_s *state, bool enable)
 {
-  ivdbg("enable:%d\n", enable);
+  iinfo("enable:%d\n", enable);
 
   /* Active high enable */
 
diff --git a/configs/nucleo-l476rg/src/stm32_ajoystick.c b/configs/nucleo-l476rg/src/stm32_ajoystick.c
index bd57040a78..460440323e 100644
--- a/configs/nucleo-l476rg/src/stm32_ajoystick.c
+++ b/configs/nucleo-l476rg/src/stm32_ajoystick.c
@@ -178,7 +178,7 @@ static FAR void *g_ajoyarg;
 
 static ajoy_buttonset_t ajoy_supported(FAR const struct ajoy_lowerhalf_s *lower)
 {
-  ivdbg("Supported: %02x\n", AJOY_SUPPORTED);
+  iinfo("Supported: %02x\n", AJOY_SUPPORTED);
   return (ajoy_buttonset_t)AJOY_SUPPORTED;
 }
 
@@ -248,7 +248,7 @@ static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower,
           sample->as_x = (int16_t)tmp;
           have |= 1;
 
-          ivdbg("X sample: %ld -> %d\n", (long)tmp, (int)sample->as_x);
+          iinfo("X sample: %ld -> %d\n", (long)tmp, (int)sample->as_x);
         }
 
 #ifdef CONFIG_ADC_DMA
@@ -258,7 +258,7 @@ static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower,
           sample->as_y = (int16_t)tmp;
           have |= 2;
 
-          ivdbg("Y sample: %ld -> %d\n", (long)tmp, (int)sample->as_y);
+          iinfo("Y sample: %ld -> %d\n", (long)tmp, (int)sample->as_y);
         }
 #endif
     }
@@ -279,7 +279,7 @@ static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower,
   /* Sample the discrete button inputs */
 
   sample->as_buttons = ajoy_buttons(lower);
-  ivdbg("Returning: %02x\n", sample->as_buttons);
+  iinfo("Returning: %02x\n", sample->as_buttons);
   return OK;
 }
 
@@ -310,7 +310,7 @@ static ajoy_buttonset_t ajoy_buttons(FAR const struct ajoy_lowerhalf_s *lower)
         }
     }
 
-  ivdbg("Returning: %02x\n", ret);
+  iinfo("Returning: %02x\n", ret);
   return ret;
 }
 
@@ -339,7 +339,7 @@ static void ajoy_enable(FAR const struct ajoy_lowerhalf_s *lower,
   flags = enter_critical_section();
   ajoy_disable();
 
-  illvdbg("press: %02x release: %02x handler: %p arg: %p\n",
+  illinfo("press: %02x release: %02x handler: %p arg: %p\n",
           press, release, handler, arg);
 
   /* If no events are indicated or if no handler is provided, then this
@@ -371,7 +371,7 @@ static void ajoy_enable(FAR const struct ajoy_lowerhalf_s *lower,
                falling = ((press & bit) != 0);
                rising  = ((release & bit) != 0);
 
-               illvdbg("GPIO %d: rising: %d falling: %d\n",
+               illinfo("GPIO %d: rising: %d falling: %d\n",
                         i, rising, falling);
 
                (void)stm32_gpiosetevent(g_joygpio[i], rising, falling,
@@ -452,7 +452,7 @@ int board_ajoy_initialize(void)
 #ifndef NO_JOYSTICK_ADC
   int fd;
 
-  ivdbg("Initialize ADC driver: /dev/adc0\n");
+  iinfo("Initialize ADC driver: /dev/adc0\n");
 
   /* Initialize ADC.  We will need this to read the ADC inputs */
 
@@ -500,7 +500,7 @@ int board_ajoy_initialize(void)
 
   /* Register the joystick device as /dev/ajoy0 */
 
-  ivdbg("Initialize joystick driver: /dev/ajoy0\n");
+  iinfo("Initialize joystick driver: /dev/ajoy0\n");
 
   ret = ajoy_register("/dev/ajoy0", &g_ajoylower);
   if (ret < 0)
diff --git a/configs/nucleo-l476rg/src/stm32_autoleds.c b/configs/nucleo-l476rg/src/stm32_autoleds.c
index 0c8dc4d328..af2a75424d 100644
--- a/configs/nucleo-l476rg/src/stm32_autoleds.c
+++ b/configs/nucleo-l476rg/src/stm32_autoleds.c
@@ -64,10 +64,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/nucleo-l476rg/src/stm32_spi.c b/configs/nucleo-l476rg/src/stm32_spi.c
index 0c941a28b6..b86dd6091a 100644
--- a/configs/nucleo-l476rg/src/stm32_spi.c
+++ b/configs/nucleo-l476rg/src/stm32_spi.c
@@ -69,13 +69,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/nucleo-l476rg/src/stm32_userleds.c b/configs/nucleo-l476rg/src/stm32_userleds.c
index 1a7af72a34..fab0f27850 100644
--- a/configs/nucleo-l476rg/src/stm32_userleds.c
+++ b/configs/nucleo-l476rg/src/stm32_userleds.c
@@ -64,10 +64,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/nucleo-l476rg/src/stm32_wireless.c b/configs/nucleo-l476rg/src/stm32_wireless.c
index 228749c5e5..10c4c28c1b 100644
--- a/configs/nucleo-l476rg/src/stm32_wireless.c
+++ b/configs/nucleo-l476rg/src/stm32_wireless.c
@@ -197,7 +197,7 @@ static void wl_enable_irq(FAR struct cc3000_config_s *state, bool enable)
 
   /* Attach and enable, or detach and disable */
 
-  ivdbg("enable:%d\n", enable);
+  iinfo("enable:%d\n", enable);
   if (enable)
     {
       (void)stm32_gpiosetevent(GPIO_WIFI_INT, false, true, false, priv->handler);
@@ -210,7 +210,7 @@ static void wl_enable_irq(FAR struct cc3000_config_s *state, bool enable)
 
 static void wl_enable_power(FAR struct cc3000_config_s *state, bool enable)
 {
-  ivdbg("enable:%d\n", enable);
+  iinfo("enable:%d\n", enable);
 
   /* Active high enable */
 
@@ -219,7 +219,7 @@ static void wl_enable_power(FAR struct cc3000_config_s *state, bool enable)
 
 static void wl_select(FAR struct cc3000_config_s *state, bool enable)
 {
-  ivdbg("enable:%d\n", enable);
+  iinfo("enable:%d\n", enable);
 
   /* Active high enable */
 
diff --git a/configs/nutiny-nuc120/src/nuc_led.c b/configs/nutiny-nuc120/src/nuc_led.c
index 2815f7dac0..bb797e8ce2 100644
--- a/configs/nutiny-nuc120/src/nuc_led.c
+++ b/configs/nutiny-nuc120/src/nuc_led.c
@@ -83,13 +83,13 @@
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledvdbg lldbg
+#    define ledinfo lldbg
 #  else
-#    define ledvdbg(x...)
+#    define ledinfo(x...)
 #  endif
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /* Dump GPIO registers */
diff --git a/configs/olimex-lpc-h3131/src/lpc31_leds.c b/configs/olimex-lpc-h3131/src/lpc31_leds.c
index 4ba0c58407..ac0659ab42 100644
--- a/configs/olimex-lpc-h3131/src/lpc31_leds.c
+++ b/configs/olimex-lpc-h3131/src/lpc31_leds.c
@@ -63,10 +63,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/olimex-lpc-h3131/src/lpc31_mmcsd.c b/configs/olimex-lpc-h3131/src/lpc31_mmcsd.c
index 9b974f083f..9e243a9a61 100644
--- a/configs/olimex-lpc-h3131/src/lpc31_mmcsd.c
+++ b/configs/olimex-lpc-h3131/src/lpc31_mmcsd.c
@@ -76,7 +76,7 @@ int lpc31_mmcsd_initialize(int slot, int minor)
 
   /* First, get an instance of the SDIO interface */
 
-  fvdbg("Initializing SDIO slot %d\n", slot);
+  finfo("Initializing SDIO slot %d\n", slot);
   sdio = sdio_initialize(slot);
   if (!sdio)
     {
@@ -86,7 +86,7 @@ int lpc31_mmcsd_initialize(int slot, int minor)
 
   /* Now bind the SPI interface to the MMC/SD driver */
 
-  fvdbg("Bind SDIO to the MMC/SD driver, minor=%d\n", minor);
+  finfo("Bind SDIO to the MMC/SD driver, minor=%d\n", minor);
   ret = mmcsd_slotinitialize(minor, sdio);
   if (ret != OK)
     {
@@ -94,7 +94,7 @@ int lpc31_mmcsd_initialize(int slot, int minor)
       return ret;
     }
 
-  fvdbg("Successfully bound SDIO to the MMC/SD driver\n");
+  finfo("Successfully bound SDIO to the MMC/SD driver\n");
 
   /* Then let's guess and say that there is a card in the slot.  I need to check to
    * see if the LPC-H3131 board supports a GPIO to detect if there is a card in
diff --git a/configs/olimex-lpc-h3131/src/lpc31_spi.c b/configs/olimex-lpc-h3131/src/lpc31_spi.c
index 91145242ed..d664922543 100644
--- a/configs/olimex-lpc-h3131/src/lpc31_spi.c
+++ b/configs/olimex-lpc-h3131/src/lpc31_spi.c
@@ -67,14 +67,14 @@
 #ifdef SPI_DEBUG
 #  define spidbg  lldbg
 #  ifdef SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/olimex-lpc-h3131/src/lpc31_usbhost.c b/configs/olimex-lpc-h3131/src/lpc31_usbhost.c
index f333af6049..cb98d49c06 100644
--- a/configs/olimex-lpc-h3131/src/lpc31_usbhost.c
+++ b/configs/olimex-lpc-h3131/src/lpc31_usbhost.c
@@ -104,7 +104,7 @@ static int ehci_waiter(int argc, char *argv[])
 {
   FAR struct usbhost_hubport_s *hport;
 
-  uvdbg("ehci_waiter:  Running\n");
+  uinfo("ehci_waiter:  Running\n");
   for (;;)
     {
       /* Wait for the device to change state */
@@ -261,7 +261,7 @@ int lpc31_usbhost_initialize(void)
 
 void lpc31_usbhost_vbusdrive(int rhport, bool enable)
 {
-  uvdbg("RHPort%d: enable=%d\n", rhport+1, enable);
+  uinfo("RHPort%d: enable=%d\n", rhport+1, enable);
 
   /* The LPC3131 has only a single root hub port */
 
diff --git a/configs/olimex-lpc1766stk/src/lpc17_can.c b/configs/olimex-lpc1766stk/src/lpc17_can.c
index ca0f8b05f1..7a5e6f7941 100644
--- a/configs/olimex-lpc1766stk/src/lpc17_can.c
+++ b/configs/olimex-lpc1766stk/src/lpc17_can.c
@@ -78,14 +78,14 @@
 
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
-#  define canvdbg   vdbg
+#  define caninfo   info
 #  define canlldbg  lldbg
-#  define canllvdbg llvdbg
+#  define canllinfo llinfo
 #else
 #  define candbg(x...)
-#  define canvdbg(x...)
+#  define caninfo(x...)
 #  define canlldbg(x...)
-#  define canllvdbg(x...)
+#  define canllinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/olimex-lpc1766stk/src/lpc17_hidmouse.c b/configs/olimex-lpc1766stk/src/lpc17_hidmouse.c
index 8c8f6f38ad..4bbd85984d 100644
--- a/configs/olimex-lpc1766stk/src/lpc17_hidmouse.c
+++ b/configs/olimex-lpc1766stk/src/lpc17_hidmouse.c
@@ -64,10 +64,10 @@
 #  define idbg    udbg
 #  undef  illdbg
 #  define illdbg  ulldbg
-#  undef  ivdbg
-#  define ivdbg   uvdbg
-#  undef  illvdbg
-#  define illvdbg ullvdbg
+#  undef  iinfo
+#  define iinfo   uinfo
+#  undef  illinfo
+#  define illinfo ullinfo
 #endif
 
 /****************************************************************************
diff --git a/configs/olimex-lpc1766stk/src/lpc17_lcd.c b/configs/olimex-lpc1766stk/src/lpc17_lcd.c
index 0c084ede73..3b2299f960 100644
--- a/configs/olimex-lpc1766stk/src/lpc17_lcd.c
+++ b/configs/olimex-lpc1766stk/src/lpc17_lcd.c
@@ -89,7 +89,7 @@
 #endif
 
 #ifdef CONFIG_LCD_NOKIADBG
-#  define lcddbg(format, ...) vdbg(format, ##__VA_ARGS__)
+#  define lcddbg(format, ...) info(format, ##__VA_ARGS__)
 #  define lcd_dumpgpio(m)     lpc17_dumpgpio(LPC1766STK_LCD_RST, m)
 #else
 #  define lcddbg(x...)
@@ -227,7 +227,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
         }
      else
         {
-          gllvdbg("Bound SSP port 0 to LCD %d\n", devno);
+          gllinfo("Bound SSP port 0 to LCD %d\n", devno);
 
           /* And turn the LCD on (CONFIG_LCD_MAXPOWER should be 1) */
 
diff --git a/configs/olimex-lpc1766stk/src/lpc17_leds.c b/configs/olimex-lpc1766stk/src/lpc17_leds.c
index 4e7c3ff866..1fce6e0512 100644
--- a/configs/olimex-lpc1766stk/src/lpc17_leds.c
+++ b/configs/olimex-lpc1766stk/src/lpc17_leds.c
@@ -65,13 +65,13 @@
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledvdbg lldbg
+#    define ledinfo lldbg
 #  else
-#    define ledvdbg(x...)
+#    define ledinfo(x...)
 #  endif
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /* Dump GPIO registers */
diff --git a/configs/olimex-lpc1766stk/src/lpc17_ssp.c b/configs/olimex-lpc1766stk/src/lpc17_ssp.c
index 14d426ed37..5fe86c7f05 100644
--- a/configs/olimex-lpc1766stk/src/lpc17_ssp.c
+++ b/configs/olimex-lpc1766stk/src/lpc17_ssp.c
@@ -83,14 +83,14 @@
 #ifdef CONFIG_SSP_DEBUG
 #  define sspdbg  lldbg
 #  ifdef CONFIG_SSP_VERBOSE
-#    define sspvdbg lldbg
+#    define sspinfo lldbg
 #  else
-#    define sspvdbg(x...)
+#    define sspinfo(x...)
 #  endif
 #else
 #  undef CONFIG_SSP_VERBOSE
 #  define sspdbg(x...)
-#  define sspvdbg(x...)
+#  define sspinfo(x...)
 #endif
 
 /* Dump GPIO registers */
diff --git a/configs/olimex-stm32-h405/src/stm32_autoleds.c b/configs/olimex-stm32-h405/src/stm32_autoleds.c
index 430076db4a..5a928b269f 100644
--- a/configs/olimex-stm32-h405/src/stm32_autoleds.c
+++ b/configs/olimex-stm32-h405/src/stm32_autoleds.c
@@ -61,10 +61,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/olimex-stm32-h405/src/stm32_can.c b/configs/olimex-stm32-h405/src/stm32_can.c
index 6443bdb88d..4cc0324e6b 100644
--- a/configs/olimex-stm32-h405/src/stm32_can.c
+++ b/configs/olimex-stm32-h405/src/stm32_can.c
@@ -70,14 +70,14 @@
 
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
-#  define canvdbg   vdbg
+#  define caninfo   info
 #  define canlldbg  lldbg
-#  define canllvdbg llvdbg
+#  define canllinfo llinfo
 #else
 #  define candbg(x...)
-#  define canvdbg(x...)
+#  define caninfo(x...)
 #  define canlldbg(x...)
-#  define canllvdbg(x...)
+#  define canllinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/olimex-stm32-h405/src/stm32_userleds.c b/configs/olimex-stm32-h405/src/stm32_userleds.c
index 910b53b47d..f1ab8ed283 100644
--- a/configs/olimex-stm32-h405/src/stm32_userleds.c
+++ b/configs/olimex-stm32-h405/src/stm32_userleds.c
@@ -58,10 +58,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/olimex-stm32-h407/src/stm32_autoleds.c b/configs/olimex-stm32-h407/src/stm32_autoleds.c
index 7e7bf697cb..67d5a75497 100644
--- a/configs/olimex-stm32-h407/src/stm32_autoleds.c
+++ b/configs/olimex-stm32-h407/src/stm32_autoleds.c
@@ -64,10 +64,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/olimex-stm32-h407/src/stm32_can.c b/configs/olimex-stm32-h407/src/stm32_can.c
index 521c444511..d00cf068c8 100644
--- a/configs/olimex-stm32-h407/src/stm32_can.c
+++ b/configs/olimex-stm32-h407/src/stm32_can.c
@@ -70,14 +70,14 @@
 
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
-#  define canvdbg   vdbg
+#  define caninfo   info
 #  define canlldbg  lldbg
-#  define canllvdbg llvdbg
+#  define canllinfo llinfo
 #else
 #  define candbg(x...)
-#  define canvdbg(x...)
+#  define caninfo(x...)
 #  define canlldbg(x...)
-#  define canllvdbg(x...)
+#  define canllinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/olimex-stm32-h407/src/stm32_sdio.c b/configs/olimex-stm32-h407/src/stm32_sdio.c
index 919c503252..53598f5e80 100644
--- a/configs/olimex-stm32-h407/src/stm32_sdio.c
+++ b/configs/olimex-stm32-h407/src/stm32_sdio.c
@@ -134,7 +134,7 @@ int stm32_sdio_initialize(void)
   /* Mount the SDIO-based MMC/SD block driver */
   /* First, get an instance of the SDIO interface */
 
-  fvdbg("Initializing SDIO slot %d\n", SDIO_SLOTNO);
+  finfo("Initializing SDIO slot %d\n", SDIO_SLOTNO);
 
   g_sdio_dev = sdio_initialize(SDIO_SLOTNO);
   if (!g_sdio_dev)
@@ -145,7 +145,7 @@ int stm32_sdio_initialize(void)
 
   /* Now bind the SDIO interface to the MMC/SD driver */
 
-  fvdbg("Bind SDIO to the MMC/SD driver, minor=%d\n", SDIO_MINOR);
+  finfo("Bind SDIO to the MMC/SD driver, minor=%d\n", SDIO_MINOR);
 
   ret = mmcsd_slotinitialize(SDIO_MINOR, g_sdio_dev);
   if (ret != OK)
@@ -154,13 +154,13 @@ int stm32_sdio_initialize(void)
       return ret;
     }
 
-  fvdbg("Successfully bound SDIO to the MMC/SD driver\n");
+  finfo("Successfully bound SDIO to the MMC/SD driver\n");
 
 #ifdef HAVE_NCD
   /* Use SD card detect pin to check if a card is g_sd_inserted */
 
   cd_status = !stm32_gpioread(GPIO_SDIO_NCD);
-  fvdbg("Card detect : %d\n", cd_status);
+  finfo("Card detect : %d\n", cd_status);
 
   sdio_mediachange(g_sdio_dev, cd_status);
 #else
diff --git a/configs/olimex-stm32-h407/src/stm32_usb.c b/configs/olimex-stm32-h407/src/stm32_usb.c
index 22b246af38..adee4357b4 100644
--- a/configs/olimex-stm32-h407/src/stm32_usb.c
+++ b/configs/olimex-stm32-h407/src/stm32_usb.c
@@ -103,13 +103,13 @@ static int usbhost_waiter(int argc, char *argv[])
 {
   struct usbhost_hubport_s *hport;
 
-  uvdbg("Running\n");
+  uinfo("Running\n");
   for (;;)
     {
       /* Wait for the device to change state */
 
       DEBUGVERIFY(CONN_WAIT(g_usbconn, &hport));
-      uvdbg("%s\n", hport->connected ? "connected" : "disconnected");
+      uinfo("%s\n", hport->connected ? "connected" : "disconnected");
 
       /* Did we just become connected? */
 
@@ -173,7 +173,7 @@ int stm32_usbhost_initialize(void)
    * that we care about:
    */
 
-  uvdbg("Register class drivers\n");
+  uinfo("Register class drivers\n");
 
 #ifdef CONFIG_USBHOST_HUB
   /* Initialize USB hub class support */
@@ -207,13 +207,13 @@ int stm32_usbhost_initialize(void)
 
   /* Then get an instance of the USB host interface */
 
-  uvdbg("Initialize USB host\n");
+  uinfo("Initialize USB host\n");
   g_usbconn = stm32_otghshost_initialize(0);
   if (g_usbconn)
     {
       /* Start a thread to handle device connection. */
 
-      uvdbg("Start usbhost_waiter\n");
+      uinfo("Start usbhost_waiter\n");
 
       pid = task_create("usbhost", CONFIG_STM32H407_USBHOST_PRIO,
                         CONFIG_STM32H407_USBHOST_STACKSIZE,
diff --git a/configs/olimex-stm32-h407/src/stm32_userleds.c b/configs/olimex-stm32-h407/src/stm32_userleds.c
index e771326ba5..02719fb94e 100644
--- a/configs/olimex-stm32-h407/src/stm32_userleds.c
+++ b/configs/olimex-stm32-h407/src/stm32_userleds.c
@@ -63,10 +63,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/olimex-stm32-p107/src/stm32_can.c b/configs/olimex-stm32-p107/src/stm32_can.c
index 690417f9f5..635d3ad5ff 100644
--- a/configs/olimex-stm32-p107/src/stm32_can.c
+++ b/configs/olimex-stm32-p107/src/stm32_can.c
@@ -66,14 +66,14 @@
 
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
-#  define canvdbg   vdbg
+#  define caninfo   info
 #  define canlldbg  lldbg
-#  define canllvdbg llvdbg
+#  define canllinfo llinfo
 #else
 #  define candbg(x...)
-#  define canvdbg(x...)
+#  define caninfo(x...)
 #  define canlldbg(x...)
-#  define canllvdbg(x...)
+#  define canllinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/olimex-stm32-p107/src/stm32_encx24j600.c b/configs/olimex-stm32-p107/src/stm32_encx24j600.c
index 9f37781990..39f3d012f0 100644
--- a/configs/olimex-stm32-p107/src/stm32_encx24j600.c
+++ b/configs/olimex-stm32-p107/src/stm32_encx24j600.c
@@ -195,7 +195,7 @@ void up_netinitialize(void)
       return;
     }
 
-  nllvdbg("Bound SPI port %d to ENCX24J600 device %d\n",
+  nllinfo("Bound SPI port %d to ENCX24J600 device %d\n",
           ENCX24J600_SPI_PORTNO, ENCX24J600_DEVNO);
 }
 
diff --git a/configs/olimex-stm32-p107/src/stm32_spi.c b/configs/olimex-stm32-p107/src/stm32_spi.c
index 8fea7b1ac9..372cd50450 100644
--- a/configs/olimex-stm32-p107/src/stm32_spi.c
+++ b/configs/olimex-stm32-p107/src/stm32_spi.c
@@ -66,14 +66,14 @@
 #ifdef SPI_DEBUG
 #  define spidbg  lldbg
 #  ifdef SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/olimex-stm32-p207/src/stm32_autoleds.c b/configs/olimex-stm32-p207/src/stm32_autoleds.c
index 8c3628b977..291759f60b 100644
--- a/configs/olimex-stm32-p207/src/stm32_autoleds.c
+++ b/configs/olimex-stm32-p207/src/stm32_autoleds.c
@@ -61,10 +61,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /* The following definitions map the encoded LED setting to GPIO settings */
diff --git a/configs/olimex-stm32-p207/src/stm32_can.c b/configs/olimex-stm32-p207/src/stm32_can.c
index 9728422aea..49fe8e8128 100644
--- a/configs/olimex-stm32-p207/src/stm32_can.c
+++ b/configs/olimex-stm32-p207/src/stm32_can.c
@@ -70,14 +70,14 @@
 
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
-#  define canvdbg   vdbg
+#  define caninfo   info
 #  define canlldbg  lldbg
-#  define canllvdbg llvdbg
+#  define canllinfo llinfo
 #else
 #  define candbg(x...)
-#  define canvdbg(x...)
+#  define caninfo(x...)
 #  define canlldbg(x...)
-#  define canllvdbg(x...)
+#  define canllinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/olimex-stm32-p207/src/stm32_usb.c b/configs/olimex-stm32-p207/src/stm32_usb.c
index c9b2c968aa..3f00e5a991 100644
--- a/configs/olimex-stm32-p207/src/stm32_usb.c
+++ b/configs/olimex-stm32-p207/src/stm32_usb.c
@@ -105,13 +105,13 @@ static int usbhost_waiter(int argc, char *argv[])
 {
   struct usbhost_hubport_s *hport;
 
-  uvdbg("Running\n");
+  uinfo("Running\n");
   for (;;)
     {
       /* Wait for the device to change state */
 
       DEBUGVERIFY(CONN_WAIT(g_usbconn, &hport));
-      uvdbg("%s\n", hport->connected ? "connected" : "disconnected");
+      uinfo("%s\n", hport->connected ? "connected" : "disconnected");
 
       /* Did we just become connected? */
 
@@ -177,7 +177,7 @@ int stm32_usbhost_initialize(void)
    * that we care about:
    */
 
-  uvdbg("Register class drivers\n");
+  uinfo("Register class drivers\n");
 
 #ifdef CONFIG_USBHOST_HUB
   /* Initialize USB hub class support */
@@ -211,13 +211,13 @@ int stm32_usbhost_initialize(void)
 
   /* Then get an instance of the USB host interface */
 
-  uvdbg("Initialize USB host\n");
+  uinfo("Initialize USB host\n");
   g_usbconn = stm32_otgfshost_initialize(0);
   if (g_usbconn)
     {
       /* Start a thread to handle device connection. */
 
-      uvdbg("Start usbhost_waiter\n");
+      uinfo("Start usbhost_waiter\n");
 
       pid = task_create("usbhost", CONFIG_USBHOST_DEFPRIO,
                         CONFIG_USBHOST_STACKSIZE,
diff --git a/configs/olimex-stm32-p207/src/stm32_userleds.c b/configs/olimex-stm32-p207/src/stm32_userleds.c
index 7d01e00343..ba1f3d8cc7 100644
--- a/configs/olimex-stm32-p207/src/stm32_userleds.c
+++ b/configs/olimex-stm32-p207/src/stm32_userleds.c
@@ -58,10 +58,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/olimex-strp711/src/str71_enc28j60.c b/configs/olimex-strp711/src/str71_enc28j60.c
index d36f61000a..bd98539b2e 100644
--- a/configs/olimex-strp711/src/str71_enc28j60.c
+++ b/configs/olimex-strp711/src/str71_enc28j60.c
@@ -245,7 +245,7 @@ void up_netinitialize(void)
       return;
     }
 
-  nllvdbg("Bound SPI port %d to ENC28J60 device %d\n",
+  nllinfo("Bound SPI port %d to ENC28J60 device %d\n",
         ENC28J60_SPI_PORTNO, ENC28J60_DEVNO);
 }
 #endif /* CONFIG_ENC28J60 */
diff --git a/configs/olimexino-stm32/src/stm32_can.c b/configs/olimexino-stm32/src/stm32_can.c
index 00e5c374de..ebec02cda0 100644
--- a/configs/olimexino-stm32/src/stm32_can.c
+++ b/configs/olimexino-stm32/src/stm32_can.c
@@ -69,14 +69,14 @@
 
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
-#  define canvdbg   vdbg
+#  define caninfo   info
 #  define canlldbg  lldbg
-#  define canllvdbg llvdbg
+#  define canllinfo llinfo
 #else
 #  define candbg(x...)
-#  define canvdbg(x...)
+#  define caninfo(x...)
 #  define canlldbg(x...)
-#  define canllvdbg(x...)
+#  define canllinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/olimexino-stm32/src/stm32_leds.c b/configs/olimexino-stm32/src/stm32_leds.c
index 5cdf82be88..ff823e5262 100644
--- a/configs/olimexino-stm32/src/stm32_leds.c
+++ b/configs/olimexino-stm32/src/stm32_leds.c
@@ -61,13 +61,13 @@
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledvdbg lldbg
+#    define ledinfo lldbg
 #  else
-#    define ledvdbg(x...)
+#    define ledinfo(x...)
 #  endif
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /* Dump GPIO registers */
diff --git a/configs/olimexino-stm32/src/stm32_spi.c b/configs/olimexino-stm32/src/stm32_spi.c
index 59dc0db892..99b404326d 100644
--- a/configs/olimexino-stm32/src/stm32_spi.c
+++ b/configs/olimexino-stm32/src/stm32_spi.c
@@ -67,14 +67,14 @@
 #ifdef SPI_DEBUG
 #  define spidbg  lldbg
 #  ifdef SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/open1788/src/lpc17_autoleds.c b/configs/open1788/src/lpc17_autoleds.c
index 5edb1e3114..3f16d5cd06 100644
--- a/configs/open1788/src/lpc17_autoleds.c
+++ b/configs/open1788/src/lpc17_autoleds.c
@@ -141,13 +141,13 @@
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledvdbg lldbg
+#    define ledinfo lldbg
 #  else
-#    define ledvdbg(x...)
+#    define ledinfo(x...)
 #  endif
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /* Dump GPIO registers */
diff --git a/configs/open1788/src/lpc17_ssp.c b/configs/open1788/src/lpc17_ssp.c
index a3a54c4a10..c957a2442f 100644
--- a/configs/open1788/src/lpc17_ssp.c
+++ b/configs/open1788/src/lpc17_ssp.c
@@ -66,13 +66,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define sspdbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define sspvdbg lldbg
+#    define sspinfo lldbg
 #  else
-#    define sspvdbg(x...)
+#    define sspinfo(x...)
 #  endif
 #else
 #  define sspdbg(x...)
-#  define sspvdbg(x...)
+#  define sspinfo(x...)
 #endif
 
 /* Dump GPIO registers */
diff --git a/configs/open1788/src/lpc17_touchscreen.c b/configs/open1788/src/lpc17_touchscreen.c
index 1232507936..097ec3550f 100644
--- a/configs/open1788/src/lpc17_touchscreen.c
+++ b/configs/open1788/src/lpc17_touchscreen.c
@@ -175,7 +175,7 @@ static int tsc_attach(FAR struct ads7843e_config_s *state, xcpt_t handler)
 
 static void tsc_enable(FAR struct ads7843e_config_s *state, bool enable)
 {
-  ivdbg("enable:%d\n", enable);
+  iinfo("enable:%d\n", enable);
   if (enable)
     {
       /* Enable PENIRQ interrupts.  NOTE: The pin interrupt is enabled from worker thread
@@ -227,7 +227,7 @@ static bool tsc_busy(FAR struct ads7843e_config_s *state)
 #if defined(CONFIG_DEBUG_INPUT) && defined(CONFIG_DEBUG_INFO)
   if (busy != last)
     {
-      ivdbg("busy:%d\n", busy);
+      iinfo("busy:%d\n", busy);
       last = busy;
     }
 #endif
@@ -245,7 +245,7 @@ static bool tsc_pendown(FAR struct ads7843e_config_s *state)
    */
 
   bool pendown = !lpc17_gpioread(GPIO_TC_PENIRQ);
-  ivdbg("pendown:%d\n", pendown);
+  iinfo("pendown:%d\n", pendown);
   return pendown;
 }
 
diff --git a/configs/open1788/src/lpc17_userleds.c b/configs/open1788/src/lpc17_userleds.c
index bbc0569a0a..b7f1ca5d5b 100644
--- a/configs/open1788/src/lpc17_userleds.c
+++ b/configs/open1788/src/lpc17_userleds.c
@@ -67,13 +67,13 @@
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledvdbg lldbg
+#    define ledinfo lldbg
 #  else
-#    define ledvdbg(x...)
+#    define ledinfo(x...)
 #  endif
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /* Dump GPIO registers */
diff --git a/configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c b/configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c
index 9a3bfd8ce3..517bfee6a9 100644
--- a/configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c
+++ b/configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c
@@ -141,10 +141,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg         dbg
-#  define lcdvdbg        vdbg
+#  define lcdinfo        info
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 /****************************************************************************
@@ -242,8 +242,8 @@ static void lcd_dumpstate(FAR const char *msg)
   int row;
   int column;
 
-  lcdvdbg("%s:\n", msg);
-  lcdvdbg("  currow: %d curcol: %d\n",
+  lcdinfo("%s:\n", msg);
+  lcdinfo("  currow: %d curcol: %d\n",
           g_lcd1602.currow, g_lcd1602.curcol);
 
   for (row = 0, column = 0; row < LCD_NROWS; )
@@ -252,7 +252,7 @@ static void lcd_dumpstate(FAR const char *msg)
       buffer[column] = isprint(ch) ? ch : '.';
       if (++column >= LCD_NCOLUMNS)
         {
-          lcdvdbg("  [%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c]\n",
+          lcdinfo("  [%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c]\n",
                   buffer[0],  buffer[1],  buffer[2],  buffer[3],
                   buffer[4],  buffer[5],  buffer[6],  buffer[7],
                   buffer[8],  buffer[9],  buffer[10], buffer[11],
@@ -273,8 +273,8 @@ static void lcd_dumpstate(FAR const char *msg)
 static void lcd_dumpstream(FAR const char *msg,
                            FAR const struct lcd_instream_s *stream)
 {
-  lcdvdbg("%s:\n", msg);
-  lcdvdbg("  nget: %d nbytes: %d\n",
+  lcdinfo("%s:\n", msg);
+  lcdinfo("  nget: %d nbytes: %d\n",
           stream->stream.nget, stream->nbytes);
   lib_dumpbuffer("STREAM", stream->buffer, stream->nbytes);
 }
@@ -437,7 +437,7 @@ static void lcd_appendch(uint8_t ch)
 
 static void lcd_action(enum slcdcode_e code, uint8_t count)
 {
-  lcdvdbg("Action: %d count: %d\n", code, count);
+  lcdinfo("Action: %d count: %d\n", code, count);
   lcd_dumpstate("BEFORE ACTION");
 
   switch (code)
@@ -719,7 +719,7 @@ static ssize_t lcd_write(FAR struct file *filep,  FAR const char *buffer,
   memset(&state, 0, sizeof(struct slcdstate_s));
   while ((result = slcd_decode(&instream.stream, &state, &ch, &count)) != SLCDRET_EOF)
     {
-      lcdvdbg("slcd_decode returned result=%d char=%d count=%d\n",
+      lcdinfo("slcd_decode returned result=%d char=%d count=%d\n",
               result, ch, count);
 
       if (result == SLCDRET_CHAR)          /* A normal character was returned */
@@ -796,7 +796,7 @@ static int lcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
         {
           FAR struct slcd_attributes_s *attr = (FAR struct slcd_attributes_s *)((uintptr_t)arg);
 
-          lcdvdbg("SLCDIOC_GETATTRIBUTES:\n");
+          lcdinfo("SLCDIOC_GETATTRIBUTES:\n");
 
           if (!attr)
             {
@@ -822,7 +822,7 @@ static int lcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
         {
           FAR struct slcd_curpos_s *curpos = (FAR struct slcd_curpos_s *)((uintptr_t)arg);
 
-          lcdvdbg("SLCDIOC_CURPOS: row=%d column=%d\n", g_lcd1602.currow, g_lcd1602.curcol);
+          lcdinfo("SLCDIOC_CURPOS: row=%d column=%d\n", g_lcd1602.currow, g_lcd1602.curcol);
 
           if (!curpos)
             {
@@ -890,7 +890,7 @@ int up_lcd1602_initialize(void)
 
   if (!g_lcd1602.initialized)
     {
-      lcdvdbg("Initializing\n");
+      lcdinfo("Initializing\n");
 
       /* PMP Master mode configuration */
       /* Make sure that interrupts are disabled */
diff --git a/configs/pcduino-a10/src/a1x_leds.c b/configs/pcduino-a10/src/a1x_leds.c
index 39af605278..ee13572a7a 100644
--- a/configs/pcduino-a10/src/a1x_leds.c
+++ b/configs/pcduino-a10/src/a1x_leds.c
@@ -96,10 +96,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/pic32mx-starterkit/src/pic32mx_leds.c b/configs/pic32mx-starterkit/src/pic32mx_leds.c
index 9beeb57b64..07480043b5 100644
--- a/configs/pic32mx-starterkit/src/pic32mx_leds.c
+++ b/configs/pic32mx-starterkit/src/pic32mx_leds.c
@@ -100,15 +100,15 @@
 #if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS)
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledvdbg lldbg
+#    define ledinfo lldbg
 #  else
-#    define ledvdbg(x...)
+#    define ledinfo(x...)
 #  endif
 #else
 #  undef CONFIG_DEBUG_LEDS
 #  undef CONFIG_DEBUG_INFO
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/pic32mx-starterkit/src/pic32mx_spi.c b/configs/pic32mx-starterkit/src/pic32mx_spi.c
index a9e2df2e6a..234f740d9e 100644
--- a/configs/pic32mx-starterkit/src/pic32mx_spi.c
+++ b/configs/pic32mx-starterkit/src/pic32mx_spi.c
@@ -67,14 +67,14 @@
 #ifdef CONFIG_SPI_DEBUG
 #  define spidbg  lldbg
 #  ifdef CONFIG_SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef CONFIG_SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/pic32mx7mmb/src/pic32_leds.c b/configs/pic32mx7mmb/src/pic32_leds.c
index cf74cd0bff..c329b3a379 100644
--- a/configs/pic32mx7mmb/src/pic32_leds.c
+++ b/configs/pic32mx7mmb/src/pic32_leds.c
@@ -103,15 +103,15 @@
 #if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS)
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledvdbg lldbg
+#    define ledinfo lldbg
 #  else
-#    define ledvdbg(x...)
+#    define ledinfo(x...)
 #  endif
 #else
 #  undef CONFIG_DEBUG_LEDS
 #  undef CONFIG_DEBUG_INFO
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/pic32mx7mmb/src/pic32_mio283qt2.c b/configs/pic32mx7mmb/src/pic32_mio283qt2.c
index 642d30aca4..11b156e5f8 100644
--- a/configs/pic32mx7mmb/src/pic32_mio283qt2.c
+++ b/configs/pic32mx7mmb/src/pic32_mio283qt2.c
@@ -140,10 +140,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg       dbg
-#  define lcdvdbg      vdbg
+#  define lcdinfo      info
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 #ifdef CONFIG_LCD_MIO283QT2
@@ -430,7 +430,7 @@ int board_lcd_initialize(void)
 
   if (!g_pic32mx7mmb_lcd.drvr)
     {
-      lcdvdbg("Initializing\n");
+      lcdinfo("Initializing\n");
 
       /* Hold the LCD in reset (active low)  */
 
diff --git a/configs/pic32mx7mmb/src/pic32_spi.c b/configs/pic32mx7mmb/src/pic32_spi.c
index f89b06d93b..84a5db8b16 100644
--- a/configs/pic32mx7mmb/src/pic32_spi.c
+++ b/configs/pic32mx7mmb/src/pic32_spi.c
@@ -82,10 +82,10 @@
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
-#  define spivdbg llvdbg
+#  define spiinfo llinfo
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/pic32mx7mmb/src/pic32_touchscreen.c b/configs/pic32mx7mmb/src/pic32_touchscreen.c
index 333325622e..1d07e0a06c 100644
--- a/configs/pic32mx7mmb/src/pic32_touchscreen.c
+++ b/configs/pic32mx7mmb/src/pic32_touchscreen.c
@@ -509,7 +509,7 @@ static void tc_notify(FAR struct tc_dev_s *priv)
       if (fds)
         {
           fds->revents |= POLLIN;
-          ivdbg("Report events: %02x\n", fds->revents);
+          iinfo("Report events: %02x\n", fds->revents);
           sem_post(fds->sem);
         }
     }
@@ -771,7 +771,7 @@ static void tc_worker(FAR void *arg)
           {
             value      = MAX_ADC - value;
             priv->newy = (value + priv->value) >> 1;
-            ivdbg("Y-=%d Y+=%d[%d] Y=%d\n", priv->value, value, MAX_ADC - value, priv->newy);
+            iinfo("Y-=%d Y+=%d[%d] Y=%d\n", priv->value, value, MAX_ADC - value, priv->newy);
 
             /* Start X+ sampling */
 
@@ -857,7 +857,7 @@ static void tc_worker(FAR void *arg)
 
             value = MAX_ADC - value;
             newx  = (value + priv->value) >> 1;
-            ivdbg("X+=%d X-=%d[%d] X=%d\n", priv->value, value, MAX_ADC - value, newx);
+            iinfo("X+=%d X-=%d[%d] X=%d\n", priv->value, value, MAX_ADC - value, newx);
 
             /* Samples are available */
 
@@ -1204,14 +1204,14 @@ errout:
 static int tc_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 {
 #if 1
-  ivdbg("cmd: %d arg: %ld\n", cmd, arg);
+  iinfo("cmd: %d arg: %ld\n", cmd, arg);
   return -ENOTTY; /* None yet supported */
 #else
   FAR struct inode         *inode;
   FAR struct tc_dev_s *priv;
   int                       ret;
 
-  ivdbg("cmd: %d arg: %ld\n", cmd, arg);
+  iinfo("cmd: %d arg: %ld\n", cmd, arg);
   DEBUGASSERT(filep);
   inode = filep->f_inode;
 
@@ -1258,7 +1258,7 @@ static int tc_poll(FAR struct file *filep, FAR struct pollfd *fds,
   int                       ret;
   int                       i;
 
-  ivdbg("setup: %d\n", (int)setup);
+  iinfo("setup: %d\n", (int)setup);
   DEBUGASSERT(filep && fds);
   inode = filep->f_inode;
 
@@ -1367,7 +1367,7 @@ int board_tsc_setup(int minor)
   char devname[DEV_NAMELEN];
   int ret;
 
-  ivdbg("minor: %d\n", minor);
+  iinfo("minor: %d\n", minor);
   DEBUGASSERT(minor >= 0 && minor < 100);
 
   /* Configure all touchscreen pins as inputs, undriven */
@@ -1403,7 +1403,7 @@ int board_tsc_setup(int minor)
   /* Register the device as an input device */
 
   (void)snprintf(devname, DEV_NAMELEN, DEV_FORMAT, minor);
-  ivdbg("Registering %s\n", devname);
+  iinfo("Registering %s\n", devname);
 
   ret = register_driver(devname, &tc_fops, 0666, priv);
   if (ret < 0)
diff --git a/configs/pic32mz-starterkit/src/pic32mz_autoleds.c b/configs/pic32mz-starterkit/src/pic32mz_autoleds.c
index 5435b1327e..f8aa219476 100644
--- a/configs/pic32mz-starterkit/src/pic32mz_autoleds.c
+++ b/configs/pic32mz-starterkit/src/pic32mz_autoleds.c
@@ -96,15 +96,15 @@
 #if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS)
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledvdbg lldbg
+#    define ledinfo lldbg
 #  else
-#    define ledvdbg(x...)
+#    define ledinfo(x...)
 #  endif
 #else
 #  undef CONFIG_DEBUG_LEDS
 #  undef CONFIG_DEBUG_INFO
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/pic32mz-starterkit/src/pic32mz_spi.c b/configs/pic32mz-starterkit/src/pic32mz_spi.c
index 5a0b2599c6..04020e78d9 100644
--- a/configs/pic32mz-starterkit/src/pic32mz_spi.c
+++ b/configs/pic32mz-starterkit/src/pic32mz_spi.c
@@ -61,14 +61,14 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
 #  ifdef CONFIG_SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef CONFIG_SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/pic32mz-starterkit/src/pic32mz_userleds.c b/configs/pic32mz-starterkit/src/pic32mz_userleds.c
index e785dc5708..a2bfc39e51 100644
--- a/configs/pic32mz-starterkit/src/pic32mz_userleds.c
+++ b/configs/pic32mz-starterkit/src/pic32mz_userleds.c
@@ -76,15 +76,15 @@
 #if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS)
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledvdbg lldbg
+#    define ledinfo lldbg
 #  else
-#    define ledvdbg(x...)
+#    define ledinfo(x...)
 #  endif
 #else
 #  undef CONFIG_DEBUG_LEDS
 #  undef CONFIG_DEBUG_INFO
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/sabre-6quad/src/imx_autoleds.c b/configs/sabre-6quad/src/imx_autoleds.c
index 692dbdd152..65c45ef2cd 100644
--- a/configs/sabre-6quad/src/imx_autoleds.c
+++ b/configs/sabre-6quad/src/imx_autoleds.c
@@ -88,10 +88,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/sam3u-ek/src/sam_lcd.c b/configs/sam3u-ek/src/sam_lcd.c
index 759209fbaa..4aa0e28d22 100644
--- a/configs/sam3u-ek/src/sam_lcd.c
+++ b/configs/sam3u-ek/src/sam_lcd.c
@@ -160,17 +160,17 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_LCD_REGDEBUG
-#  define regdbg(format, ...)  vdbg(format, ##__VA_ARGS__)
+#  define regdbg(format, ...)  info(format, ##__VA_ARGS__)
 #else
 #  define regdbg(x...)
 #endif
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg(format, ...)  dbg(format, ##__VA_ARGS__)
-#  define lcdvdbg(format, ...) vdbg(format, ##__VA_ARGS__)
+#  define lcdinfo(format, ...) info(format, ##__VA_ARGS__)
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 /* Graphics Capbilities ***************************************************************/
@@ -544,7 +544,7 @@ static void sam_lcdon(void)
 {
   /* Display ON Setting */
 
-  lcdvdbg("ON\n");
+  lcdinfo("ON\n");
   sam_putreg(HX8347_R90H, 0x7f);      /* SAP=0111 1111 */
   sam_putreg(HX8347_R26H, 0x04);      /* GON=0 DTE=0 D=01 */
   up_mdelay(100);
@@ -564,7 +564,7 @@ static void sam_lcdon(void)
 
 static void sam_lcdoff(void)
 {
-  lcdvdbg("OFF\n");
+  lcdinfo("OFF\n");
   sam_putreg(HX8347_R90H, 0x00);      /* SAP=0000 0000 */
   sam_putreg(HX8347_R26H, 0x00);      /* GON=0 DTE=0 D=00 */
 }
@@ -613,7 +613,7 @@ static int sam_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer,
 
   /* Buffer must be provided and aligned to a 16-bit address boundary */
 
-  lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0);
 
 #ifdef CONFIG_LCD_PORTRAIT
@@ -679,7 +679,7 @@ static int sam_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
 
   /* Buffer must be provided and aligned to a 16-bit address boundary */
 
-  lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0);
 
 #ifdef CONFIG_LCD_PORTRAIT
@@ -730,7 +730,7 @@ static int sam_getvideoinfo(FAR struct lcd_dev_s *dev,
                             FAR struct fb_videoinfo_s *vinfo)
 {
   DEBUGASSERT(dev && vinfo);
-  lcdvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n",
+  lcdinfo("fmt: %d xres: %d yres: %d nplanes: %d\n",
           g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes);
   memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s));
   return OK;
@@ -748,7 +748,7 @@ static int sam_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
                             FAR struct lcd_planeinfo_s *pinfo)
 {
   DEBUGASSERT(dev && pinfo && planeno == 0);
-  lcdvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
+  lcdinfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
   memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s));
   return OK;
 }
@@ -766,7 +766,7 @@ static int sam_getpower(struct lcd_dev_s *dev)
 {
   struct sam_dev_s *priv = (struct sam_dev_s *)dev;
   DEBUGASSERT(dev);
-  lcdvdbg("power: %d\n", priv->power);
+  lcdinfo("power: %d\n", priv->power);
   return priv->power;
 }
 
@@ -790,7 +790,7 @@ static int sam_setpower(struct lcd_dev_s *dev, int power)
   struct sam_dev_s *priv = (struct sam_dev_s *)dev;
   unsigned int i;
 
-  lcdvdbg("power: %d\n", power);
+  lcdinfo("power: %d\n", power);
   DEBUGASSERT(power <= CONFIG_LCD_MAXPOWER);
 
   /* Switch off backlight */
@@ -834,7 +834,7 @@ static int sam_setpower(struct lcd_dev_s *dev, int power)
 
 static int sam_getcontrast(struct lcd_dev_s *dev)
 {
-  lcdvdbg("Not implemented\n");
+  lcdinfo("Not implemented\n");
   return -ENOSYS;
 }
 
@@ -848,7 +848,7 @@ static int sam_getcontrast(struct lcd_dev_s *dev)
 
 static int sam_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
 {
-  lcdvdbg("contrast: %d\n", contrast);
+  lcdinfo("contrast: %d\n", contrast);
   return -ENOSYS;
 }
 
@@ -874,7 +874,7 @@ int board_lcd_initialize(void)
   uint32_t regval;
   unsigned int i;
 
-  lcdvdbg("Initializing\n");
+  lcdinfo("Initializing\n");
 
   /* Enable LCD EXTCS2 pins */
 
@@ -943,7 +943,7 @@ int board_lcd_initialize(void)
 
 #ifdef CONFIG_DEBUG_LCD
   hxregval = sam_getreg(HX8347_R67H);
-  lcdvdbg("Chip ID: %04x\n", hxregval);
+  lcdinfo("Chip ID: %04x\n", hxregval);
   if (hxregval != HX8347_CHIPID)
     {
       lcddbg("Bad chip ID: %04x Expected: %04x\n", hxregval, HX8347_CHIPID);
@@ -1049,7 +1049,7 @@ int board_lcd_initialize(void)
 
 FAR struct lcd_dev_s *board_lcd_getdev(int lcddev)
 {
-  lcdvdbg("lcddev: %d\n", lcddev);
+  lcdinfo("lcddev: %d\n", lcddev);
   return lcddev == 0 ? &g_lcddev_s.dev : NULL;
 }
 
diff --git a/configs/sam3u-ek/src/sam_leds.c b/configs/sam3u-ek/src/sam_leds.c
index 54c70f108b..8d702f5f20 100644
--- a/configs/sam3u-ek/src/sam_leds.c
+++ b/configs/sam3u-ek/src/sam_leds.c
@@ -64,10 +64,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 #define LED_OFF        0
diff --git a/configs/sam3u-ek/src/sam_mmcsd.c b/configs/sam3u-ek/src/sam_mmcsd.c
index 2d44104cb0..c411e2f359 100644
--- a/configs/sam3u-ek/src/sam_mmcsd.c
+++ b/configs/sam3u-ek/src/sam_mmcsd.c
@@ -112,7 +112,7 @@ bool sam_cardinserted(unsigned char slot)
     {
 #ifdef GPIO_MCI_CD
       bool inserted = sam_gpioread(GPIO_MCI_CD);
-      fvdbg("inserted: %s\n", inserted ? "NO" : "YES");
+      finfo("inserted: %s\n", inserted ? "NO" : "YES");
       return !inserted;
 #else
       return true;
@@ -135,7 +135,7 @@ bool sam_writeprotected(unsigned char slot)
     {
 #ifdef GPIO_MCI_WP
       bool protected = sam_gpioread(GPIO_MCI_WP);
-      fvdbg("protected: %s\n", inserted ? "YES" : "NO");
+      finfo("protected: %s\n", inserted ? "YES" : "NO");
       return protected;
 #else
       return false;
diff --git a/configs/sam3u-ek/src/sam_spi.c b/configs/sam3u-ek/src/sam_spi.c
index 014dff6635..39fb1da061 100644
--- a/configs/sam3u-ek/src/sam_spi.c
+++ b/configs/sam3u-ek/src/sam_spi.c
@@ -67,14 +67,14 @@
 #ifdef SPI_DEBUG
 #  define spidbg  lldbg
 #  ifdef SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/sam3u-ek/src/sam_touchscreen.c b/configs/sam3u-ek/src/sam_touchscreen.c
index eb32f3e766..8b7b042a70 100644
--- a/configs/sam3u-ek/src/sam_touchscreen.c
+++ b/configs/sam3u-ek/src/sam_touchscreen.c
@@ -156,7 +156,7 @@ static int tsc_attach(FAR struct ads7843e_config_s *state, xcpt_t isr)
 {
   /* Attach the ADS7843E interrupt */
 
-  ivdbg("Attaching %p to IRQ %d\n", isr, SAM_TCS_IRQ);
+  iinfo("Attaching %p to IRQ %d\n", isr, SAM_TCS_IRQ);
   return irq_attach(SAM_TCS_IRQ, isr);
 }
 
@@ -164,7 +164,7 @@ static void tsc_enable(FAR struct ads7843e_config_s *state, bool enable)
 {
   /* Attach and enable, or detach and disable */
 
-  ivdbg("IRQ:%d enable:%d\n", SAM_TCS_IRQ, enable);
+  iinfo("IRQ:%d enable:%d\n", SAM_TCS_IRQ, enable);
   if (enable)
     {
       sam_gpioirqenable(SAM_TCS_IRQ);
@@ -194,7 +194,7 @@ static bool tsc_busy(FAR struct ads7843e_config_s *state)
 #if defined(CONFIG_DEBUG_INPUT) && defined(CONFIG_DEBUG_INFO)
   if (busy != last)
     {
-      ivdbg("busy:%d\n", busy);
+      iinfo("busy:%d\n", busy);
       last = busy;
     }
 #endif
@@ -207,7 +207,7 @@ static bool tsc_pendown(FAR struct ads7843e_config_s *state)
   /* The /PENIRQ value is active low */
 
   bool pendown = !sam_gpioread(GPIO_TCS_IRQ);
-  ivdbg("pendown:%d\n", pendown);
+  iinfo("pendown:%d\n", pendown);
   return pendown;
 }
 
diff --git a/configs/sam4e-ek/src/sam_ads7843e.c b/configs/sam4e-ek/src/sam_ads7843e.c
index 82e2ee0ceb..6487c39b29 100644
--- a/configs/sam4e-ek/src/sam_ads7843e.c
+++ b/configs/sam4e-ek/src/sam_ads7843e.c
@@ -153,7 +153,7 @@ static int tsc_attach(FAR struct ads7843e_config_s *state, xcpt_t isr)
 {
   /* Attach the ADS7843E interrupt */
 
-  ivdbg("Attaching %p to IRQ %d\n", isr, SAM_TCS_IRQ);
+  iinfo("Attaching %p to IRQ %d\n", isr, SAM_TCS_IRQ);
   return irq_attach(SAM_TCS_IRQ, isr);
 }
 
@@ -161,7 +161,7 @@ static void tsc_enable(FAR struct ads7843e_config_s *state, bool enable)
 {
   /* Attach and enable, or detach and disable */
 
-  ivdbg("IRQ:%d enable:%d\n", SAM_TCS_IRQ, enable);
+  iinfo("IRQ:%d enable:%d\n", SAM_TCS_IRQ, enable);
   if (enable)
     {
       sam_gpioirqenable(SAM_TCS_IRQ);
@@ -191,7 +191,7 @@ static bool tsc_busy(FAR struct ads7843e_config_s *state)
 #if defined(CONFIG_DEBUG_INPUT) && defined(CONFIG_DEBUG_INFO)
   if (busy != last)
     {
-      ivdbg("busy:%d\n", busy);
+      iinfo("busy:%d\n", busy);
       last = busy;
     }
 #endif
@@ -204,7 +204,7 @@ static bool tsc_pendown(FAR struct ads7843e_config_s *state)
   /* The /PENIRQ value is active low */
 
   bool pendown = !sam_gpioread(GPIO_TCS_IRQ);
-  ivdbg("pendown:%d\n", pendown);
+  iinfo("pendown:%d\n", pendown);
   return pendown;
 }
 
diff --git a/configs/sam4e-ek/src/sam_ethernet.c b/configs/sam4e-ek/src/sam_ethernet.c
index 1e48b109b8..301cd94c37 100644
--- a/configs/sam4e-ek/src/sam_ethernet.c
+++ b/configs/sam4e-ek/src/sam_ethernet.c
@@ -205,7 +205,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
 
   DEBUGASSERT(intf);
 
-  nvdbg("%s: handler=%p\n", intf, handler);
+  ninfo("%s: handler=%p\n", intf, handler);
   phydbg("EMAC: devname=%s\n", SAM34_EMAC_DEVNAME);
 
   if (strcmp(intf, SAM34_EMAC_DEVNAME) == 0)
diff --git a/configs/sam4e-ek/src/sam_hsmci.c b/configs/sam4e-ek/src/sam_hsmci.c
index 8577c0a318..89f332e51f 100644
--- a/configs/sam4e-ek/src/sam_hsmci.c
+++ b/configs/sam4e-ek/src/sam_hsmci.c
@@ -194,7 +194,7 @@ bool sam_cardinserted(int slotno)
   /* Get the state of the GPIO pin */
 
   removed = sam_gpioread(GPIO_MCI_CD);
-  fllvdbg("Slot %d inserted: %s\n", slotno, removed ? "NO" : "YES");
+  fllinfo("Slot %d inserted: %s\n", slotno, removed ? "NO" : "YES");
 
   return !removed;
 }
diff --git a/configs/sam4e-ek/src/sam_ili9325.c b/configs/sam4e-ek/src/sam_ili9325.c
index adb614c364..1aee4173ae 100644
--- a/configs/sam4e-ek/src/sam_ili9325.c
+++ b/configs/sam4e-ek/src/sam_ili9325.c
@@ -270,10 +270,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg              dbg
-#  define lcdvdbg             vdbg
+#  define lcdinfo             info
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 /************************************************************************************
@@ -703,7 +703,7 @@ static int sam_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer,
 
   /* Buffer must be provided and aligned to a 16-bit address boundary */
 
-  lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0);
 
   /* Set the cursor position */
@@ -818,7 +818,7 @@ static int sam_getvideoinfo(FAR struct lcd_dev_s *dev,
                             FAR struct fb_videoinfo_s *vinfo)
 {
   DEBUGASSERT(dev && vinfo);
-  lcdvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n",
+  lcdinfo("fmt: %d xres: %d yres: %d nplanes: %d\n",
           g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes);
   memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s));
   return OK;
@@ -836,7 +836,7 @@ static int sam_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
                               FAR struct lcd_planeinfo_s *pinfo)
 {
   DEBUGASSERT(dev && pinfo && planeno == 0);
-  lcdvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
+  lcdinfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
   memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s));
   return OK;
 }
@@ -854,7 +854,7 @@ static int sam_getpower(struct lcd_dev_s *dev)
 {
   FAR struct sam_dev_s *priv = (FAR struct sam_dev_s *)dev;
 
-  lcdvdbg("power: %d\n", 0);
+  lcdinfo("power: %d\n", 0);
   return priv->power;
 }
 
@@ -871,7 +871,7 @@ static int sam_setpower(struct lcd_dev_s *dev, int power)
 {
   FAR struct sam_dev_s *priv = (FAR struct sam_dev_s *)dev;
 
-  lcdvdbg("power: %d\n", power);
+  lcdinfo("power: %d\n", power);
   DEBUGASSERT((unsigned)power <= CONFIG_LCD_MAXPOWER);
 
   /* Set new power level */
@@ -910,7 +910,7 @@ static int sam_setpower(struct lcd_dev_s *dev, int power)
 
 static int sam_getcontrast(struct lcd_dev_s *dev)
 {
-  lcdvdbg("Not implemented\n");
+  lcdinfo("Not implemented\n");
   return -ENOSYS;
 }
 
@@ -924,7 +924,7 @@ static int sam_getcontrast(struct lcd_dev_s *dev)
 
 static int sam_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
 {
-  lcdvdbg("contrast: %d\n", contrast);
+  lcdinfo("contrast: %d\n", contrast);
   return -ENOSYS;
 }
 
@@ -1286,7 +1286,7 @@ static inline int sam_lcd_initialize(void)
   /* Check the LCD ID */
 
   id = sam_read_reg(ILI9325_DEVICE_CODE_REG);
-  lcdvdbg("LCD ID: %04x\n", id);
+  lcdinfo("LCD ID: %04x\n", id);
 
   /* Initialize the LCD hardware */
 
@@ -1319,7 +1319,7 @@ int board_lcd_initialize(void)
   FAR struct sam_dev_s *priv = &g_lcddev;
   int ret;
 
-  lcdvdbg("Initializing\n");
+  lcdinfo("Initializing\n");
 
   /* Configure all LCD pins pins (backlight is initially off) */
 
diff --git a/configs/sam4e-ek/src/sam_ili9341.c b/configs/sam4e-ek/src/sam_ili9341.c
index 2cfdc8df12..48d755e43b 100644
--- a/configs/sam4e-ek/src/sam_ili9341.c
+++ b/configs/sam4e-ek/src/sam_ili9341.c
@@ -273,10 +273,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg              dbg
-#  define lcdvdbg             vdbg
+#  define lcdinfo             info
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 /************************************************************************************
@@ -503,7 +503,7 @@ static void sam_setwindow(sam_color_t row, sam_color_t col,
 {
   uint8_t buffer[4];
 
-  lcdvdbg("row=%d col=%d width=%d height=%d\n", row, col, width, height);
+  lcdinfo("row=%d col=%d width=%d height=%d\n", row, col, width, height);
 
   /* Set Column Address Position */
 
@@ -654,7 +654,7 @@ static void sam_set_backlight(unsigned int power)
   unsigned int level;
   int i;
 
-  lcdvdbg("power=%d\n", power);
+  lcdinfo("power=%d\n", power);
 
   /* Scale the power setting to the range 1...BKL_LEVELS */
 
@@ -696,7 +696,7 @@ static void sam_set_backlight(unsigned int power)
 
 static int sam_poweroff(FAR struct sam_dev_s *priv)
 {
-  lcdvdbg("OFF\n");
+  lcdinfo("OFF\n");
 
   /* Turn the display off */
 
@@ -739,7 +739,7 @@ static int sam_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer,
 
   /* Buffer must be provided and aligned to a 16-bit address boundary */
 
-  lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
 
 #if defined(CONFIG_SAM4EEK_LCD_RGB565)
   DEBUGASSERT(src && ((uintptr_t)src & 1) == 0);
@@ -797,7 +797,7 @@ static int sam_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
 
   /* Buffer must be provided and aligned to a 16-bit address boundary */
 
-  lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
 
 #if defined(CONFIG_SAM4EEK_LCD_RGB565)
   DEBUGASSERT(dest && ((uintptr_t)dest & 1) == 0);
@@ -840,7 +840,7 @@ static int sam_getvideoinfo(FAR struct lcd_dev_s *dev,
                             FAR struct fb_videoinfo_s *vinfo)
 {
   DEBUGASSERT(dev && vinfo);
-  lcdvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n",
+  lcdinfo("fmt: %d xres: %d yres: %d nplanes: %d\n",
           g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes);
   memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s));
   return OK;
@@ -858,7 +858,7 @@ static int sam_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
                               FAR struct lcd_planeinfo_s *pinfo)
 {
   DEBUGASSERT(dev && pinfo && planeno == 0);
-  lcdvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
+  lcdinfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
   memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s));
   return OK;
 }
@@ -876,7 +876,7 @@ static int sam_getpower(struct lcd_dev_s *dev)
 {
   FAR struct sam_dev_s *priv = (FAR struct sam_dev_s *)dev;
 
-  lcdvdbg("power: %d\n", 0);
+  lcdinfo("power: %d\n", 0);
   return priv->power;
 }
 
@@ -893,7 +893,7 @@ static int sam_setpower(struct lcd_dev_s *dev, int power)
 {
   FAR struct sam_dev_s *priv = (FAR struct sam_dev_s *)dev;
 
-  lcdvdbg("power: %d\n", power);
+  lcdinfo("power: %d\n", power);
   DEBUGASSERT((unsigned)power <= CONFIG_LCD_MAXPOWER);
 
   /* Set new power level */
@@ -930,7 +930,7 @@ static int sam_setpower(struct lcd_dev_s *dev, int power)
 
 static int sam_getcontrast(struct lcd_dev_s *dev)
 {
-  lcdvdbg("Not implemented\n");
+  lcdinfo("Not implemented\n");
   return -ENOSYS;
 }
 
@@ -944,7 +944,7 @@ static int sam_getcontrast(struct lcd_dev_s *dev)
 
 static int sam_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
 {
-  lcdvdbg("contrast: %d\n", contrast);
+  lcdinfo("contrast: %d\n", contrast);
   return -ENOSYS;
 }
 
@@ -1198,7 +1198,7 @@ int board_lcd_initialize(void)
   FAR struct sam_dev_s *priv = &g_lcddev;
   int ret;
 
-  lcdvdbg("Initializing\n");
+  lcdinfo("Initializing\n");
 
   /* Configure all LCD pins pins (backlight is initially off) */
 
diff --git a/configs/sam4e-ek/src/sam_leds.c b/configs/sam4e-ek/src/sam_leds.c
index 12eb79fec7..747428abac 100644
--- a/configs/sam4e-ek/src/sam_leds.c
+++ b/configs/sam4e-ek/src/sam_leds.c
@@ -104,10 +104,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/sam4e-ek/src/sam_spi.c b/configs/sam4e-ek/src/sam_spi.c
index 01b3860828..42e92ac917 100644
--- a/configs/sam4e-ek/src/sam_spi.c
+++ b/configs/sam4e-ek/src/sam_spi.c
@@ -67,14 +67,14 @@
 #ifdef SPI_DEBUG
 #  define spidbg  lldbg
 #  ifdef SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/sam4l-xplained/src/sam_autoleds.c b/configs/sam4l-xplained/src/sam_autoleds.c
index 7ffe5a3771..91d59db7e5 100644
--- a/configs/sam4l-xplained/src/sam_autoleds.c
+++ b/configs/sam4l-xplained/src/sam_autoleds.c
@@ -87,10 +87,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/sam4l-xplained/src/sam_mmcsd.c b/configs/sam4l-xplained/src/sam_mmcsd.c
index bc5fd368c7..c752a35622 100644
--- a/configs/sam4l-xplained/src/sam_mmcsd.c
+++ b/configs/sam4l-xplained/src/sam_mmcsd.c
@@ -94,7 +94,7 @@ int sam_sdinitialize(int minor)
 
   /* Get the SPI driver instance for the SD chip select */
 
-  fvdbg("Initializing SPI chip select %d\n", SD_CSNO);
+  finfo("Initializing SPI chip select %d\n", SD_CSNO);
 
   spi = sam_spibus_initialize(SD_CSNO);
   if (!spi)
@@ -103,11 +103,11 @@ int sam_sdinitialize(int minor)
       return -ENODEV;
     }
 
-  fvdbg("Successfully initialized SPI chip select %d\n", SD_CSNO);
+  finfo("Successfully initialized SPI chip select %d\n", SD_CSNO);
 
   /* Bind the SPI device for the chip select to the slot */
 
-  fvdbg("Binding SPI chip select %d to MMC/SD slot %d\n",
+  finfo("Binding SPI chip select %d to MMC/SD slot %d\n",
           SD_CSNO, SAM34_MMCSDSLOTNO);
 
   ret = mmcsd_spislotinitialize(minor, SAM34_MMCSDSLOTNO, spi);
@@ -118,7 +118,7 @@ int sam_sdinitialize(int minor)
       return ret;
     }
 
-  fvdbg("Successfuly bound SPI chip select %d to MMC/SD slot %d\n",
+  finfo("Successfuly bound SPI chip select %d to MMC/SD slot %d\n",
         SD_CSNO, SAM34_MMCSDSLOTNO);
 
   return OK;
diff --git a/configs/sam4l-xplained/src/sam_slcd.c b/configs/sam4l-xplained/src/sam_slcd.c
index 26c8474c04..844d438821 100644
--- a/configs/sam4l-xplained/src/sam_slcd.c
+++ b/configs/sam4l-xplained/src/sam_slcd.c
@@ -252,10 +252,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg              dbg
-#  define lcdvdbg             vdbg
+#  define lcdinfo             info
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 /****************************************************************************
@@ -408,13 +408,13 @@ static const struct slcd_pixel_s g_einfo[SLCD_NE] =
 #if defined(CONFIG_DEBUG_LCD) && defined(CONFIG_DEBUG_INFO)
 static void slcd_dumpstate(FAR const char *msg)
 {
-  lcdvdbg("%s:\n", msg);
-  lcdvdbg("  curpos: %d\n",
+  lcdinfo("%s:\n", msg);
+  lcdinfo("  curpos: %d\n",
           g_slcdstate.curpos);
-  lcdvdbg("  Display: [%c%c%c%c%c]\n",
+  lcdinfo("  Display: [%c%c%c%c%c]\n",
           g_slcdstate.buffer[0], g_slcdstate.buffer[1], g_slcdstate.buffer[2],
           g_slcdstate.buffer[3], g_slcdstate.buffer[4]);
-  lcdvdbg("  Options: [%d%d%d%d%d]\n",
+  lcdinfo("  Options: [%d%d%d%d%d]\n",
           g_slcdstate.options[0], g_slcdstate.options[1], g_slcdstate.options[2],
           g_slcdstate.options[3], g_slcdstate.options[4]);
 }
@@ -427,20 +427,20 @@ static void slcd_dumpstate(FAR const char *msg)
 #if defined(CONFIG_DEBUG_LCD) && defined(CONFIG_DEBUG_INFO)
 static void slcd_dumpslcd(FAR const char *msg)
 {
-  lcdvdbg("%s:\n", msg);
-  lcdvdbg("    CFG: %08x    TIM: %08x    SR: %08x\n",
+  lcdinfo("%s:\n", msg);
+  lcdinfo("    CFG: %08x    TIM: %08x    SR: %08x\n",
           getreg32(SAM_LCDCA_CFG), getreg32(SAM_LCDCA_TIM),
           getreg32(SAM_LCDCA_SR));
-  lcdvdbg("    DR0: %02x %08x DR1: %02x %08x\n",
+  lcdinfo("    DR0: %02x %08x DR1: %02x %08x\n",
           getreg32(SAM_LCDCA_DRH0), getreg32(SAM_LCDCA_DRL0),
           getreg32(SAM_LCDCA_DRH1), getreg32(SAM_LCDCA_DRL1));
-  lcdvdbg("    DR2: %02x %08x DR3: %02x %08x\n",
+  lcdinfo("    DR2: %02x %08x DR3: %02x %08x\n",
           getreg32(SAM_LCDCA_DRH2), getreg32(SAM_LCDCA_DRL2),
           getreg32(SAM_LCDCA_DRH3), getreg32(SAM_LCDCA_DRL3));
-  lcdvdbg("   BCFG: %08x CSRCFG: %08x CMCFG: %08x ACMCFG: %08x\n",
+  lcdinfo("   BCFG: %08x CSRCFG: %08x CMCFG: %08x ACMCFG: %08x\n",
           getreg32(SAM_LCDCA_BCFG), getreg32(SAM_LCDCA_CSRCFG),
           getreg32(SAM_LCDCA_CMCFG), getreg32(SAM_LCDCA_ACMCFG));
-  lcdvdbg(" ABMCFG: %08x    IMR: %08x   VER: %08x\n",
+  lcdinfo(" ABMCFG: %08x    IMR: %08x   VER: %08x\n",
           getreg32(SAM_LCDCA_ABMCFG), getreg32(SAM_LCDCA_IMR),
           getreg32(SAM_LCDCA_VERSION));
 }
@@ -453,7 +453,7 @@ static void slcd_dumpslcd(FAR const char *msg)
 #if 0 /* Not used */
 static void slcd_clear(void)
 {
-  lvdbg("Clearing\n");
+  linfo("Clearing\n");
 
   /* Clear display memory */
 
@@ -611,7 +611,7 @@ static int slcd_setcontrast(unsigned int contrast)
   regval |= LCDCA_CFG_FCST(scontrast);
   putreg32(regval, SAM_LCDCA_CFG);
 
-  lcdvdbg("contrast: %d CFG: %08x\n", contrast, getreg32(SAM_LCDCA_CFG));
+  lcdinfo("contrast: %d CFG: %08x\n", contrast, getreg32(SAM_LCDCA_CFG));
   return ret;
 }
 
@@ -666,7 +666,7 @@ static void slcd_writech(uint8_t ch, uint8_t curpos, uint8_t options)
 
 static void slcd_action(enum slcdcode_e code, uint8_t count)
 {
-  lcdvdbg("Action: %d count: %d\n", code, count);
+  lcdinfo("Action: %d count: %d\n", code, count);
   slcd_dumpstate("BEFORE ACTION");
 
   switch (code)
@@ -918,7 +918,7 @@ static ssize_t slcd_write(FAR struct file *filep,
   options = 0;
   while ((result = slcd_decode(&instream.stream, &state, &ch, &count)) != SLCDRET_EOF)
     {
-      lcdvdbg("slcd_decode returned result=%d char=%d count=%d\n",
+      lcdinfo("slcd_decode returned result=%d char=%d count=%d\n",
               result, ch, count);
 
       if (result == SLCDRET_CHAR)          /* A normal character was returned */
@@ -970,7 +970,7 @@ static ssize_t slcd_write(FAR struct file *filep,
 
           else if (ch < 128)
             {
-              lcdvdbg("ch: %c[%02x] options: %02x\n", ch, ch, options);
+              lcdinfo("ch: %c[%02x] options: %02x\n", ch, ch, options);
 
               /* Write the character at the current cursor position */
 
@@ -1021,7 +1021,7 @@ static int slcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
         {
           FAR struct slcd_attributes_s *attr = (FAR struct slcd_attributes_s *)((uintptr_t)arg);
 
-          lcdvdbg("SLCDIOC_GETATTRIBUTES:\n");
+          lcdinfo("SLCDIOC_GETATTRIBUTES:\n");
 
           if (!attr)
             {
@@ -1046,7 +1046,7 @@ static int slcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
         {
           FAR struct slcd_curpos_s *curpos = (FAR struct slcd_curpos_s *)((uintptr_t)arg);
 
-          lcdvdbg("SLCDIOC_CURPOS: row=0 column=%d\n", g_slcdstate.curpos);
+          lcdinfo("SLCDIOC_CURPOS: row=0 column=%d\n", g_slcdstate.curpos);
 
           if (!curpos)
             {
@@ -1065,7 +1065,7 @@ static int slcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case SLCDIOC_SETBAR:
         {
-          lcdvdbg("SLCDIOC_SETBAR: arg=0x%02lx\n", arg);
+          lcdinfo("SLCDIOC_SETBAR: arg=0x%02lx\n", arg);
 
           if ((arg & 1) != 0)
             {
@@ -1120,7 +1120,7 @@ static int slcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
             }
 
           *contrast = (int)slcd_getcontrast();
-          lcdvdbg("SLCDIOC_GETCONTRAST: contrast=%d\n", *contrast);
+          lcdinfo("SLCDIOC_GETCONTRAST: contrast=%d\n", *contrast);
         }
         break;
 
@@ -1131,7 +1131,7 @@ static int slcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case SLCDIOC_SETCONTRAST:
         {
-          lcdvdbg("SLCDIOC_SETCONTRAST: arg=%ld\n", arg);
+          lcdinfo("SLCDIOC_SETCONTRAST: arg=%ld\n", arg);
 
           if (arg > SLCD_MAXCONTRAST)
             {
@@ -1197,7 +1197,7 @@ int sam_slcd_initialize(void)
 
   if (!g_slcdstate.initialized)
     {
-      lcdvdbg("Initializing\n");
+      lcdinfo("Initializing\n");
 
       /* Configure LCD GPIO pins */
 
diff --git a/configs/sam4l-xplained/src/sam_spi.c b/configs/sam4l-xplained/src/sam_spi.c
index 8c45e010e3..1c74d8e9f8 100644
--- a/configs/sam4l-xplained/src/sam_spi.c
+++ b/configs/sam4l-xplained/src/sam_spi.c
@@ -62,14 +62,14 @@
 #ifdef SPI_DEBUG
 #  define spidbg  lldbg
 #  ifdef SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/sam4l-xplained/src/sam_ug2832hsweg04.c b/configs/sam4l-xplained/src/sam_ug2832hsweg04.c
index 1d60b6710c..8cf093533b 100644
--- a/configs/sam4l-xplained/src/sam_ug2832hsweg04.c
+++ b/configs/sam4l-xplained/src/sam_ug2832hsweg04.c
@@ -118,10 +118,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg(format, ...)   dbg(format, ##__VA_ARGS__)
-#  define lcdvdbg(format, ...)  vdbg(format, ##__VA_ARGS__)
+#  define lcdinfo(format, ...)  info(format, ##__VA_ARGS__)
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 /****************************************************************************
@@ -170,7 +170,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
         }
      else
         {
-          lcdvdbg("Bound SPI port 1 to OLED %d\n", devno);
+          lcdinfo("Bound SPI port 1 to OLED %d\n", devno);
 
           /* And turn the OLED on */
 
diff --git a/configs/sam4l-xplained/src/sam_userleds.c b/configs/sam4l-xplained/src/sam_userleds.c
index 0b5a832d2b..8e5ab2e699 100644
--- a/configs/sam4l-xplained/src/sam_userleds.c
+++ b/configs/sam4l-xplained/src/sam_userleds.c
@@ -72,10 +72,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/sam4s-xplained-pro/src/sam_autoleds.c b/configs/sam4s-xplained-pro/src/sam_autoleds.c
index 455d572b4b..aabf3fca5e 100644
--- a/configs/sam4s-xplained-pro/src/sam_autoleds.c
+++ b/configs/sam4s-xplained-pro/src/sam_autoleds.c
@@ -80,10 +80,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/sam4s-xplained-pro/src/sam_hsmci.c b/configs/sam4s-xplained-pro/src/sam_hsmci.c
index eedc7a475a..40cfd428d0 100644
--- a/configs/sam4s-xplained-pro/src/sam_hsmci.c
+++ b/configs/sam4s-xplained-pro/src/sam_hsmci.c
@@ -207,7 +207,7 @@ bool sam_cardinserted(int slotno)
   /* Get the state of the GPIO pin */
 
   removed = sam_gpioread(GPIO_MCI_CD);
-  fllvdbg("Slot %d inserted: %s\n", slotno, removed ? "NO" : "YES");
+  fllinfo("Slot %d inserted: %s\n", slotno, removed ? "NO" : "YES");
 
   return !removed;
 }
diff --git a/configs/sam4s-xplained-pro/src/sam_tc.c b/configs/sam4s-xplained-pro/src/sam_tc.c
index fd8a930d58..06a5ae8668 100644
--- a/configs/sam4s-xplained-pro/src/sam_tc.c
+++ b/configs/sam4s-xplained-pro/src/sam_tc.c
@@ -110,17 +110,17 @@
 #  define tcdbg                 dbg
 #  define tclldbg               lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define tcvdbg              vdbg
-#    define tcllvdbg            llvdbg
+#    define tcinfo              info
+#    define tcllinfo            llinfo
 #  else
-#    define tcvdbg(x...)
-#    define tcllvdbg(x...)
+#    define tcinfo(x...)
+#    define tcllinfo(x...)
 #  endif
 #else
 #  define tcdbg(x...)
 #  define tclldbg(x...)
-#  define tcvdbg(x...)
-#  define tcllvdbg(x...)
+#  define tcinfo(x...)
+#  define tcllinfo(x...)
 #endif
 
 /****************************************************************************
@@ -168,37 +168,37 @@ int sam_timerinitialize(void)
   /* Initialize and register the timer devices */
 
 #if defined(CONFIG_SAM34_TC0)
-  tcvdbg("Initializing %s...\n", CONFIG_TIMER0_DEVPATH);
+  tcinfo("Initializing %s...\n", CONFIG_TIMER0_DEVPATH);
   sam_tcinitialize(CONFIG_TIMER0_DEVPATH, SAM_IRQ_TC0);
 #endif
 
 #if defined(CONFIG_SAM34_TC1)
-  tcvdbg("Initializing %s...\n", CONFIG_TIMER1_DEVPATH);
+  tcinfo("Initializing %s...\n", CONFIG_TIMER1_DEVPATH);
   sam_tcinitialize(CONFIG_TIMER1_DEVPATH, SAM_IRQ_TC1);
 #endif
 
 #if defined(CONFIG_SAM34_TC2)
-  tcvdbg("Initializing %s...\n", CONFIG_TIMER2_DEVPATH);
+  tcinfo("Initializing %s...\n", CONFIG_TIMER2_DEVPATH);
   sam_tcinitialize(CONFIG_TIMER2_DEVPATH, SAM_IRQ_TC2);
 #endif
 
 #if defined(CONFIG_SAM34_TC3)
-  tcvdbg("Initializing %s...\n", CONFIG_TIMER3_DEVPATH);
+  tcinfo("Initializing %s...\n", CONFIG_TIMER3_DEVPATH);
   sam_tcinitialize(CONFIG_TIMER3_DEVPATH, SAM_IRQ_TC3);
 #endif
 
 #if defined(CONFIG_SAM34_TC4)
-  tcvdbg("Initializing %s...\n", CONFIG_TIMER4_DEVPATH);
+  tcinfo("Initializing %s...\n", CONFIG_TIMER4_DEVPATH);
   sam_tcinitialize(CONFIG_TIMER4_DEVPATH, SAM_IRQ_TC4);
 #endif
 
 #if defined(CONFIG_SAM34_TC5)
-  tcvdbg("Initializing %s...\n", CONFIG_TIMER5_DEVPATH);
+  tcinfo("Initializing %s...\n", CONFIG_TIMER5_DEVPATH);
   sam_tcinitialize(CONFIG_TIMER5_DEVPATH, SAM_IRQ_TC5);
 #endif
 
 #if defined(CONFIG_SAM34_RTT)
-  tcvdbg("Initializing %s...\n", CONFIG_RTT_DEVPATH);
+  tcinfo("Initializing %s...\n", CONFIG_RTT_DEVPATH);
   sam_rttinitialize(CONFIG_RTT_DEVPATH);
 #endif
 
@@ -206,7 +206,7 @@ int sam_timerinitialize(void)
     !defined(CONFIG_SUPPRESS_TIMER_INTS)
   /* System Timer Initialization */
 
-  tcvdbg("Opening %s\n", CONFIG_SAM4S_XPLAINED_PRO_SCHED_TIMER_DEVPATH);
+  tcinfo("Opening %s\n", CONFIG_SAM4S_XPLAINED_PRO_SCHED_TIMER_DEVPATH);
 
   fd = open(CONFIG_SAM4S_XPLAINED_PRO_SCHED_TIMER_DEVPATH, O_RDONLY);
   if (fd < 0)
@@ -218,7 +218,7 @@ int sam_timerinitialize(void)
 
   /* Set the timeout */
 
-  tcvdbg("Interval = %d us.\n",  (unsigned long)USEC_PER_TICK);
+  tcinfo("Interval = %d us.\n",  (unsigned long)USEC_PER_TICK);
   ret = ioctl(fd, TCIOC_SETTIMEOUT, (unsigned long)USEC_PER_TICK);
   if (ret < 0)
     {
@@ -242,7 +242,7 @@ int sam_timerinitialize(void)
 
   /* Start the timer */
 
-  tcvdbg("Starting.\n");
+  tcinfo("Starting.\n");
   ret = ioctl(fd, TCIOC_START, 0);
   if (ret < 0)
     {
@@ -254,7 +254,7 @@ int sam_timerinitialize(void)
 #if defined(CONFIG_SCHED_CPULOAD) && defined(CONFIG_SCHED_CPULOAD_EXTCLK)
   /* CPU Load initialization */
 
-  tcvdbg("Opening %s\n", CONFIG_SAM4S_XPLAINED_PRO_CPULOAD_TIMER_DEVPATH);
+  tcinfo("Opening %s\n", CONFIG_SAM4S_XPLAINED_PRO_CPULOAD_TIMER_DEVPATH);
 
   fd = open(CONFIG_SAM4S_XPLAINED_PRO_CPULOAD_TIMER_DEVPATH, O_RDONLY);
   if (fd < 0)
@@ -266,7 +266,7 @@ int sam_timerinitialize(void)
 
   /* Set the timeout */
 
-  tcvdbg("Interval = %d us.\n",  (unsigned long)1000000 / CONFIG_SCHED_CPULOAD_TICKSPERSEC);
+  tcinfo("Interval = %d us.\n",  (unsigned long)1000000 / CONFIG_SCHED_CPULOAD_TICKSPERSEC);
 
   ret = ioctl(fd, TCIOC_SETTIMEOUT,
              (unsigned long)1000000 / CONFIG_SCHED_CPULOAD_TICKSPERSEC);
@@ -293,7 +293,7 @@ int sam_timerinitialize(void)
 
   /* Start the timer */
 
-  tcvdbg("Starting.\n");
+  tcinfo("Starting.\n");
   ret = ioctl(fd, TCIOC_START, 0);
   if (ret < 0)
     {
diff --git a/configs/sam4s-xplained-pro/src/sam_userleds.c b/configs/sam4s-xplained-pro/src/sam_userleds.c
index 3176b35d00..aa67cc33a1 100644
--- a/configs/sam4s-xplained-pro/src/sam_userleds.c
+++ b/configs/sam4s-xplained-pro/src/sam_userleds.c
@@ -62,10 +62,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/sam4s-xplained-pro/src/sam_wdt.c b/configs/sam4s-xplained-pro/src/sam_wdt.c
index 3b987ed3f7..e0f845e337 100644
--- a/configs/sam4s-xplained-pro/src/sam_wdt.c
+++ b/configs/sam4s-xplained-pro/src/sam_wdt.c
@@ -93,17 +93,17 @@
 #  define wdgdbg                 dbg
 #  define wdglldbg               lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define wdgvdbg              vdbg
-#    define wdgllvdbg            llvdbg
+#    define wdginfo              info
+#    define wdgllinfo            llinfo
 #  else
-#    define wdgvdbg(x...)
-#    define wdgllvdbg(x...)
+#    define wdginfo(x...)
+#    define wdgllinfo(x...)
 #  endif
 #else
 #  define wdgdbg(x...)
 #  define wdglldbg(x...)
-#  define wdgvdbg(x...)
-#  define wdgllvdbg(x...)
+#  define wdginfo(x...)
+#  define wdgllinfo(x...)
 #endif
 
 /************************************************************************************
@@ -124,7 +124,7 @@ static int wdog_daemon(int argc, char *argv[])
 
   /* Open the watchdog device for reading */
 
-  wdgvdbg("Opening.\n");
+  wdginfo("Opening.\n");
   fd = open(CONFIG_WATCHDOG_DEVPATH, O_RDONLY);
   if (fd < 0)
     {
@@ -134,7 +134,7 @@ static int wdog_daemon(int argc, char *argv[])
 
   /* Start the watchdog timer. */
 
-  wdgvdbg("Starting.\n");
+  wdginfo("Starting.\n");
   ret = ioctl(fd, WDIOC_START, 0);
   if (ret < 0)
     {
@@ -147,7 +147,7 @@ static int wdog_daemon(int argc, char *argv[])
     {
       usleep((CONFIG_WDT_THREAD_INTERVAL)*1000);
 
-      wdgvdbg("ping\n");
+      wdginfo("ping\n");
       ret = ioctl(fd, WDIOC_KEEPALIVE, 0);
       if (ret < 0)
         {
@@ -181,12 +181,12 @@ int sam_watchdog_initialize(void)
 
   /* Initialize tha register the watchdog timer device */
 
-  wdgvdbg("Initializing Watchdog driver...\n");
+  wdginfo("Initializing Watchdog driver...\n");
   sam_wdtinitialize(CONFIG_WATCHDOG_DEVPATH);
 
   /* Open the watchdog device */
 
-  wdgvdbg("Opening.\n");
+  wdginfo("Opening.\n");
   fd = open(CONFIG_WATCHDOG_DEVPATH, O_RDONLY);
   if (fd < 0)
     {
@@ -196,7 +196,7 @@ int sam_watchdog_initialize(void)
 
   /* Set the watchdog timeout */
 
-  wdgvdbg("Timeout = %d.\n", CONFIG_WDT_TIMEOUT);
+  wdginfo("Timeout = %d.\n", CONFIG_WDT_TIMEOUT);
   ret = ioctl(fd, WDIOC_SETTIMEOUT, (unsigned long)CONFIG_WDT_TIMEOUT);
   if (ret < 0)
     {
@@ -206,7 +206,7 @@ int sam_watchdog_initialize(void)
 
   /* Set the watchdog minimum time */
 
-  wdgvdbg("MinTime = %d.\n", CONFIG_WDT_MINTIME);
+  wdginfo("MinTime = %d.\n", CONFIG_WDT_MINTIME);
   ret = ioctl(fd, WDIOC_MINTIME, (unsigned long)CONFIG_WDT_MINTIME);
   if (ret < 0)
     {
diff --git a/configs/sam4s-xplained/src/sam_autoleds.c b/configs/sam4s-xplained/src/sam_autoleds.c
index c5bbda1f79..fd1a2a448a 100644
--- a/configs/sam4s-xplained/src/sam_autoleds.c
+++ b/configs/sam4s-xplained/src/sam_autoleds.c
@@ -79,10 +79,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/sam4s-xplained/src/sam_userleds.c b/configs/sam4s-xplained/src/sam_userleds.c
index c2f694d6c4..e501a0db3e 100644
--- a/configs/sam4s-xplained/src/sam_userleds.c
+++ b/configs/sam4s-xplained/src/sam_userleds.c
@@ -61,10 +61,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/sama5d2-xult/src/sam_autoleds.c b/configs/sama5d2-xult/src/sam_autoleds.c
index 2f6cd07bfc..4336f047fd 100644
--- a/configs/sama5d2-xult/src/sam_autoleds.c
+++ b/configs/sama5d2-xult/src/sam_autoleds.c
@@ -95,10 +95,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/sama5d2-xult/src/sam_userleds.c b/configs/sama5d2-xult/src/sam_userleds.c
index fe55247be6..bc29bcb7b6 100644
--- a/configs/sama5d2-xult/src/sam_userleds.c
+++ b/configs/sama5d2-xult/src/sam_userleds.c
@@ -71,10 +71,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/sama5d3-xplained/src/sam_ajoystick.c b/configs/sama5d3-xplained/src/sam_ajoystick.c
index d05f46eeaf..e1e1a1c485 100644
--- a/configs/sama5d3-xplained/src/sam_ajoystick.c
+++ b/configs/sama5d3-xplained/src/sam_ajoystick.c
@@ -161,7 +161,7 @@ static FAR void *g_ajoyarg;
 
 static ajoy_buttonset_t ajoy_supported(FAR const struct ajoy_lowerhalf_s *lower)
 {
-  ivdbg("Supported: %02x\n", AJOY_SUPPORTED);
+  iinfo("Supported: %02x\n", AJOY_SUPPORTED);
   return (ajoy_buttonset_t)AJOY_SUPPORTED;
 }
 
@@ -220,7 +220,7 @@ static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower,
           sample->as_x = (int16_t)tmp;
           have |= 1;
 
-          ivdbg("X sample: %ld -> %d\n", (long)tmp, (int)sample->as_x);
+          iinfo("X sample: %ld -> %d\n", (long)tmp, (int)sample->as_x);
         }
 
       if ((have & 2) == 0 && ptr->am_channel == 1)
@@ -229,7 +229,7 @@ static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower,
           sample->as_y = (int16_t)tmp;
           have |= 2;
 
-          ivdbg("Y sample: %ld -> %d\n", (long)tmp, (int)sample->as_y);
+          iinfo("Y sample: %ld -> %d\n", (long)tmp, (int)sample->as_y);
         }
     }
 
@@ -243,7 +243,7 @@ static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower,
   /* Sample the discrete button inputs */
 
   sample->as_buttons = ajoy_buttons(lower);
-  ivdbg("Returning: %02x\n", AJOY_SUPPORTED);
+  iinfo("Returning: %02x\n", AJOY_SUPPORTED);
   return OK;
 }
 
@@ -274,7 +274,7 @@ static ajoy_buttonset_t ajoy_buttons(FAR const struct ajoy_lowerhalf_s *lower)
         }
     }
 
-  ivdbg("Returning: %02x\n", ret);
+  iinfo("Returning: %02x\n", ret);
   return ret;
 }
 
@@ -301,7 +301,7 @@ static void ajoy_enable(FAR const struct ajoy_lowerhalf_s *lower,
   flags = enter_critical_section();
   ajoy_disable();
 
-  illvdbg("press: %02x release: %02x handler: %p arg: %p\n",
+  illinfo("press: %02x release: %02x handler: %p arg: %p\n",
           press, release, handler, arg);
 
   /* If no events are indicated or if no handler is provided, then this
diff --git a/configs/sama5d3-xplained/src/sam_autoleds.c b/configs/sama5d3-xplained/src/sam_autoleds.c
index e618b20723..208761c25c 100644
--- a/configs/sama5d3-xplained/src/sam_autoleds.c
+++ b/configs/sama5d3-xplained/src/sam_autoleds.c
@@ -97,10 +97,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/sama5d3-xplained/src/sam_can.c b/configs/sama5d3-xplained/src/sam_can.c
index 9fc10f9d2b..390bd02e74 100644
--- a/configs/sama5d3-xplained/src/sam_can.c
+++ b/configs/sama5d3-xplained/src/sam_can.c
@@ -74,14 +74,14 @@
 
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
-#  define canvdbg   vdbg
+#  define caninfo   info
 #  define canlldbg  lldbg
-#  define canllvdbg llvdbg
+#  define canllinfo llinfo
 #else
 #  define candbg(x...)
-#  define canvdbg(x...)
+#  define caninfo(x...)
 #  define canlldbg(x...)
-#  define canllvdbg(x...)
+#  define canllinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/sama5d3-xplained/src/sam_ethernet.c b/configs/sama5d3-xplained/src/sam_ethernet.c
index 3a820b3101..bcab38459f 100644
--- a/configs/sama5d3-xplained/src/sam_ethernet.c
+++ b/configs/sama5d3-xplained/src/sam_ethernet.c
@@ -276,7 +276,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
 
   DEBUGASSERT(intf);
 
-  nvdbg("%s: handler=%p\n", intf, handler);
+  ninfo("%s: handler=%p\n", intf, handler);
 #ifdef CONFIG_SAMA5_EMACA
   phydbg("EMAC: devname=%s\n", SAMA5_EMAC_DEVNAME);
 #endif
diff --git a/configs/sama5d3-xplained/src/sam_hsmci.c b/configs/sama5d3-xplained/src/sam_hsmci.c
index 4ba3e529d1..2db5dd8d16 100644
--- a/configs/sama5d3-xplained/src/sam_hsmci.c
+++ b/configs/sama5d3-xplained/src/sam_hsmci.c
@@ -154,7 +154,7 @@ bool sam_cardinserted_internal(struct sam_hsmci_state_s *state)
   /* Get the state of the PIO pin */
 
   inserted = sam_pioread(state->pincfg);
-  fllvdbg("Slot %d inserted: %s\n", state->slotno, inserted ? "NO" : "YES");
+  fllinfo("Slot %d inserted: %s\n", state->slotno, inserted ? "NO" : "YES");
   return !inserted;
 }
 
diff --git a/configs/sama5d3-xplained/src/sam_spi.c b/configs/sama5d3-xplained/src/sam_spi.c
index 24672d8c33..903f8b93aa 100644
--- a/configs/sama5d3-xplained/src/sam_spi.c
+++ b/configs/sama5d3-xplained/src/sam_spi.c
@@ -67,14 +67,14 @@
 #ifdef SPI_DEBUG
 #  define spidbg  lldbg
 #  ifdef SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/sama5d3-xplained/src/sam_usb.c b/configs/sama5d3-xplained/src/sam_usb.c
index ac747277ff..2b1a7267f9 100644
--- a/configs/sama5d3-xplained/src/sam_usb.c
+++ b/configs/sama5d3-xplained/src/sam_usb.c
@@ -115,13 +115,13 @@ static int usbhost_waiter(struct usbhost_connection_s *dev)
 {
   struct usbhost_hubport_s *hport;
 
-  uvdbg("Running\n");
+  uinfo("Running\n");
   for (;;)
     {
       /* Wait for the device to change state */
 
       DEBUGVERIFY(CONN_WAIT(dev, &hport));
-      uvdbg("%s\n", hport->connected ? "connected" : "disconnected");
+      uinfo("%s\n", hport->connected ? "connected" : "disconnected");
 
       /* Did we just become connected? */
 
@@ -415,7 +415,7 @@ void sam_usbhost_vbusdrive(int rhport, bool enable)
 {
   pio_pinset_t pinset = 0;
 
-  uvdbg("RHPort%d: enable=%d\n", rhport+1, enable);
+  uinfo("RHPort%d: enable=%d\n", rhport+1, enable);
 
   /* Pick the PIO configuration associated with the selected root hub port */
 
diff --git a/configs/sama5d3-xplained/src/sam_userleds.c b/configs/sama5d3-xplained/src/sam_userleds.c
index df91027790..c8464c6ad0 100644
--- a/configs/sama5d3-xplained/src/sam_userleds.c
+++ b/configs/sama5d3-xplained/src/sam_userleds.c
@@ -73,10 +73,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/sama5d3x-ek/src/sam_at24.c b/configs/sama5d3x-ek/src/sam_at24.c
index ea59b48b33..39a57464a5 100644
--- a/configs/sama5d3x-ek/src/sam_at24.c
+++ b/configs/sama5d3x-ek/src/sam_at24.c
@@ -102,7 +102,7 @@ int sam_at24_automount(int minor)
     {
       /* No.. Get the I2C bus driver */
 
-      fvdbg("Initialize TWI%d\n", AT24_BUS);
+      finfo("Initialize TWI%d\n", AT24_BUS);
       i2c = sam_i2cbus_initialize(AT24_BUS);
       if (!i2c)
         {
@@ -112,7 +112,7 @@ int sam_at24_automount(int minor)
 
       /* Now bind the I2C interface to the AT24 I2C EEPROM driver */
 
-      fvdbg("Bind the AT24 EEPROM driver to TWI%d\n", AT24_BUS);
+      finfo("Bind the AT24 EEPROM driver to TWI%d\n", AT24_BUS);
       mtd = at24c_initialize(i2c);
       if (!mtd)
         {
@@ -124,7 +124,7 @@ int sam_at24_automount(int minor)
 #if defined(CONFIG_SAMA5D3xEK_AT24_FTL)
       /* And finally, use the FTL layer to wrap the MTD driver as a block driver */
 
-      fvdbg("Initialize the FTL layer to create /dev/mtdblock%d\n", AT24_MINOR);
+      finfo("Initialize the FTL layer to create /dev/mtdblock%d\n", AT24_MINOR);
       ret = ftl_initialize(AT24_MINOR, mtd);
       if (ret < 0)
         {
@@ -135,7 +135,7 @@ int sam_at24_automount(int minor)
 #elif defined(CONFIG_SAMA5D3xEK_AT24_NXFFS)
       /* Initialize to provide NXFFS on the MTD interface */
 
-      fvdbg("Initialize the NXFFS file system\n");
+      finfo("Initialize the NXFFS file system\n");
       ret = nxffs_initialize(mtd);
       if (ret < 0)
         {
@@ -145,7 +145,7 @@ int sam_at24_automount(int minor)
 
       /* Mount the file system at /mnt/at24 */
 
-      fvdbg("Mount the NXFFS file system at /dev/at24\n");
+      finfo("Mount the NXFFS file system at /dev/at24\n");
       ret = mount(NULL, "/mnt/at24", "nxffs", 0, NULL);
       if (ret < 0)
         {
diff --git a/configs/sama5d3x-ek/src/sam_autoleds.c b/configs/sama5d3x-ek/src/sam_autoleds.c
index 1c893146b7..6859ff0772 100644
--- a/configs/sama5d3x-ek/src/sam_autoleds.c
+++ b/configs/sama5d3x-ek/src/sam_autoleds.c
@@ -97,10 +97,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/sama5d3x-ek/src/sam_can.c b/configs/sama5d3x-ek/src/sam_can.c
index d904d12d83..e6cc5093e3 100644
--- a/configs/sama5d3x-ek/src/sam_can.c
+++ b/configs/sama5d3x-ek/src/sam_can.c
@@ -74,14 +74,14 @@
 
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
-#  define canvdbg   vdbg
+#  define caninfo   info
 #  define canlldbg  lldbg
-#  define canllvdbg llvdbg
+#  define canllinfo llinfo
 #else
 #  define candbg(x...)
-#  define canvdbg(x...)
+#  define caninfo(x...)
 #  define canlldbg(x...)
-#  define canllvdbg(x...)
+#  define canllinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/sama5d3x-ek/src/sam_ethernet.c b/configs/sama5d3x-ek/src/sam_ethernet.c
index 324633eaaf..57e304d75d 100644
--- a/configs/sama5d3x-ek/src/sam_ethernet.c
+++ b/configs/sama5d3x-ek/src/sam_ethernet.c
@@ -276,7 +276,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
 
   DEBUGASSERT(intf);
 
-  nvdbg("%s: handler=%p\n", intf, handler);
+  ninfo("%s: handler=%p\n", intf, handler);
 #ifdef CONFIG_SAMA5_EMACA
   phydbg("EMAC: devname=%s\n", SAMA5_EMAC_DEVNAME);
 #endif
diff --git a/configs/sama5d3x-ek/src/sam_hsmci.c b/configs/sama5d3x-ek/src/sam_hsmci.c
index a999da2f9a..693563f5ca 100644
--- a/configs/sama5d3x-ek/src/sam_hsmci.c
+++ b/configs/sama5d3x-ek/src/sam_hsmci.c
@@ -154,7 +154,7 @@ bool sam_cardinserted_internal(struct sam_hsmci_state_s *state)
   /* Get the state of the PIO pin */
 
   inserted = sam_pioread(state->pincfg);
-  fllvdbg("Slot %d inserted: %s\n", state->slotno, inserted ? "NO" : "YES");
+  fllinfo("Slot %d inserted: %s\n", state->slotno, inserted ? "NO" : "YES");
   return !inserted;
 }
 
diff --git a/configs/sama5d3x-ek/src/sam_ov2640.c b/configs/sama5d3x-ek/src/sam_ov2640.c
index ad55d0a4a6..f7015f2a3b 100644
--- a/configs/sama5d3x-ek/src/sam_ov2640.c
+++ b/configs/sama5d3x-ek/src/sam_ov2640.c
@@ -196,7 +196,7 @@ static inline int ov2640_camera_initialize(void)
   /* Configure and enable the PCK1 output */
 
   actual = sam_pck_configure(PCK1, PCKSRC_MCK, OV2640_FREQUENCY);
-  gvdbg("Desired PCK1 frequency: %ld Actual: %ld\n",
+  ginfo("Desired PCK1 frequency: %ld Actual: %ld\n",
         (long)OV2640_FREQUENCY, (long)actual);
   UNUSED(actual);
 
diff --git a/configs/sama5d3x-ek/src/sam_spi.c b/configs/sama5d3x-ek/src/sam_spi.c
index 9a0ba344a8..2ffa429913 100644
--- a/configs/sama5d3x-ek/src/sam_spi.c
+++ b/configs/sama5d3x-ek/src/sam_spi.c
@@ -67,14 +67,14 @@
 #ifdef SPI_DEBUG
 #  define spidbg  lldbg
 #  ifdef SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/sama5d3x-ek/src/sam_usb.c b/configs/sama5d3x-ek/src/sam_usb.c
index b9883e8561..a3a774f036 100644
--- a/configs/sama5d3x-ek/src/sam_usb.c
+++ b/configs/sama5d3x-ek/src/sam_usb.c
@@ -115,13 +115,13 @@ static int usbhost_waiter(struct usbhost_connection_s *dev)
 {
   struct usbhost_hubport_s *hport;
 
-  uvdbg("Running\n");
+  uinfo("Running\n");
   for (;;)
     {
       /* Wait for the device to change state */
 
       DEBUGVERIFY(CONN_WAIT(dev, &hport));
-      uvdbg("%s\n", hport->connected ? "connected" : "disconnected");
+      uinfo("%s\n", hport->connected ? "connected" : "disconnected");
 
       /* Did we just become connected? */
 
@@ -413,7 +413,7 @@ void sam_usbhost_vbusdrive(int rhport, bool enable)
 {
   pio_pinset_t pinset = 0;
 
-  uvdbg("RHPort%d: enable=%d\n", rhport+1, enable);
+  uinfo("RHPort%d: enable=%d\n", rhport+1, enable);
 
   /* Pick the PIO configuration associated with the selected root hub port */
 
diff --git a/configs/sama5d3x-ek/src/sam_userleds.c b/configs/sama5d3x-ek/src/sam_userleds.c
index 4a4438da07..d98ef8955a 100644
--- a/configs/sama5d3x-ek/src/sam_userleds.c
+++ b/configs/sama5d3x-ek/src/sam_userleds.c
@@ -73,10 +73,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/sama5d3x-ek/src/sam_wm8904.c b/configs/sama5d3x-ek/src/sam_wm8904.c
index 5639a5a402..70707a3aee 100644
--- a/configs/sama5d3x-ek/src/sam_wm8904.c
+++ b/configs/sama5d3x-ek/src/sam_wm8904.c
@@ -157,13 +157,13 @@ static int wm8904_attach(FAR const struct wm8904_lower_s *lower,
        * new handler will called via wm8904_interrupt() when the interrupt occurs.
        */
 
-      audvdbg("Attaching %p\n", isr);
+      audinfo("Attaching %p\n", isr);
       g_wm8904info.handler = isr;
       g_wm8904info.arg = arg;
     }
   else
     {
-      audvdbg("Detaching %p\n", g_wm8904info.handler);
+      audinfo("Detaching %p\n", g_wm8904info.handler);
       (void)wm8904_enable(lower, false);
       g_wm8904info.handler = NULL;
       g_wm8904info.arg = NULL;
@@ -187,13 +187,13 @@ static bool wm8904_enable(FAR const struct wm8904_lower_s *lower, bool enable)
 
       if (enable && g_wm8904info.handler)
         {
-          audvdbg("Enabling\n");
+          audinfo("Enabling\n");
           sam_pioirqenable(IRQ_INT_WM8904);
           enabled = true;
         }
       else
         {
-          audvdbg("Disabling\n");
+          audinfo("Disabling\n");
           sam_pioirqdisable(IRQ_INT_WM8904);
           enabled = false;
         }
@@ -208,7 +208,7 @@ static int wm8904_interrupt(int irq, FAR void *context)
 {
   /* Just forward the interrupt to the WM8904 driver */
 
-  audvdbg("handler %p\n", g_wm8904info.handler);
+  audinfo("handler %p\n", g_wm8904info.handler);
   if (g_wm8904info.handler)
     {
       return g_wm8904info.handler(&g_wm8904info.lower, g_wm8904info.arg);
diff --git a/configs/sama5d4-ek/src/sam_autoleds.c b/configs/sama5d4-ek/src/sam_autoleds.c
index 9f7e836ee1..773800694d 100644
--- a/configs/sama5d4-ek/src/sam_autoleds.c
+++ b/configs/sama5d4-ek/src/sam_autoleds.c
@@ -102,10 +102,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/sama5d4-ek/src/sam_automount.c b/configs/sama5d4-ek/src/sam_automount.c
index e4890687cb..89b8b20fcc 100644
--- a/configs/sama5d4-ek/src/sam_automount.c
+++ b/configs/sama5d4-ek/src/sam_automount.c
@@ -285,7 +285,7 @@ void sam_automount_initialize(void)
 {
   FAR void *handle;
 
-  fvdbg("Initializing automounter(s)\n");
+  finfo("Initializing automounter(s)\n");
 
 #ifdef CONFIG_SAMA5D4EK_HSMCI0_AUTOMOUNT
   /* Initialize the HSMCI0 auto-mounter */
diff --git a/configs/sama5d4-ek/src/sam_ethernet.c b/configs/sama5d4-ek/src/sam_ethernet.c
index 8b90c71248..87b2a91dc8 100644
--- a/configs/sama5d4-ek/src/sam_ethernet.c
+++ b/configs/sama5d4-ek/src/sam_ethernet.c
@@ -245,7 +245,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
 
   DEBUGASSERT(intf);
 
-  nvdbg("%s: handler=%p\n", intf, handler);
+  ninfo("%s: handler=%p\n", intf, handler);
 #ifdef CONFIG_SAMA5_EMAC0
   phydbg("EMAC0: devname=%s\n", SAMA5_EMAC0_DEVNAME);
 #endif
diff --git a/configs/sama5d4-ek/src/sam_hsmci.c b/configs/sama5d4-ek/src/sam_hsmci.c
index fe74bcf528..c3fbf9671c 100644
--- a/configs/sama5d4-ek/src/sam_hsmci.c
+++ b/configs/sama5d4-ek/src/sam_hsmci.c
@@ -167,7 +167,7 @@ bool sam_cardinserted_internal(struct sam_hsmci_state_s *state)
   /* Get the state of the PIO pin */
 
   inserted = sam_pioread(state->cdcfg);
-  fllvdbg("Slot %d inserted: %s\n", state->slotno, inserted ? "NO" : "YES");
+  fllinfo("Slot %d inserted: %s\n", state->slotno, inserted ? "NO" : "YES");
   return !inserted;
 }
 
diff --git a/configs/sama5d4-ek/src/sam_maxtouch.c b/configs/sama5d4-ek/src/sam_maxtouch.c
index 391e7b0b80..c725f1f17b 100644
--- a/configs/sama5d4-ek/src/sam_maxtouch.c
+++ b/configs/sama5d4-ek/src/sam_maxtouch.c
@@ -163,13 +163,13 @@ static int mxt_attach(FAR const struct mxt_lower_s *lower, mxt_handler_t isr,
        * new handler will called via mxt_interrupt() when the interrupt occurs.
        */
 
-      ivdbg("Attaching %p\n", isr);
+      iinfo("Attaching %p\n", isr);
       g_mxtinfo.handler = isr;
       g_mxtinfo.arg = arg;
     }
   else
     {
-      ivdbg("Detaching %p\n", g_mxtinfo.handler);
+      iinfo("Detaching %p\n", g_mxtinfo.handler);
       mxt_enable(lower, false);
       g_mxtinfo.handler = NULL;
       g_mxtinfo.arg = NULL;
diff --git a/configs/sama5d4-ek/src/sam_spi.c b/configs/sama5d4-ek/src/sam_spi.c
index a56c477507..c0efcfa1ce 100644
--- a/configs/sama5d4-ek/src/sam_spi.c
+++ b/configs/sama5d4-ek/src/sam_spi.c
@@ -67,14 +67,14 @@
 #ifdef SPI_DEBUG
 #  define spidbg  lldbg
 #  ifdef SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/sama5d4-ek/src/sam_usb.c b/configs/sama5d4-ek/src/sam_usb.c
index c043e057a9..c0cf5af788 100644
--- a/configs/sama5d4-ek/src/sam_usb.c
+++ b/configs/sama5d4-ek/src/sam_usb.c
@@ -115,13 +115,13 @@ static int usbhost_waiter(struct usbhost_connection_s *dev)
 {
   struct usbhost_hubport_s *hport;
 
-  uvdbg("Running\n");
+  uinfo("Running\n");
   for (;;)
     {
       /* Wait for the device to change state */
 
       DEBUGVERIFY(CONN_WAIT(dev, &hport));
-      uvdbg("%s\n", hport->connected ? "connected" : "disconnected");
+      uinfo("%s\n", hport->connected ? "connected" : "disconnected");
 
       /* Did we just become connected? */
 
@@ -414,7 +414,7 @@ void sam_usbhost_vbusdrive(int rhport, bool enable)
 {
   pio_pinset_t pinset = 0;
 
-  uvdbg("RHPort%d: enable=%d\n", rhport+1, enable);
+  uinfo("RHPort%d: enable=%d\n", rhport+1, enable);
 
   /* Pick the PIO configuration associated with the selected root hub port */
 
diff --git a/configs/sama5d4-ek/src/sam_userleds.c b/configs/sama5d4-ek/src/sam_userleds.c
index 5cf7b0d9d6..04bcc1a260 100644
--- a/configs/sama5d4-ek/src/sam_userleds.c
+++ b/configs/sama5d4-ek/src/sam_userleds.c
@@ -77,10 +77,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/sama5d4-ek/src/sam_wm8904.c b/configs/sama5d4-ek/src/sam_wm8904.c
index de0a2194d5..951adc9c86 100644
--- a/configs/sama5d4-ek/src/sam_wm8904.c
+++ b/configs/sama5d4-ek/src/sam_wm8904.c
@@ -157,13 +157,13 @@ static int wm8904_attach(FAR const struct wm8904_lower_s *lower,
        * new handler will called via wm8904_interrupt() when the interrupt occurs.
        */
 
-      audvdbg("Attaching %p\n", isr);
+      audinfo("Attaching %p\n", isr);
       g_wm8904info.handler = isr;
       g_wm8904info.arg = arg;
     }
   else
     {
-      audvdbg("Detaching %p\n", g_wm8904info.handler);
+      audinfo("Detaching %p\n", g_wm8904info.handler);
       (void)wm8904_enable(lower, false);
       g_wm8904info.handler = NULL;
       g_wm8904info.arg = NULL;
@@ -187,13 +187,13 @@ static bool wm8904_enable(FAR const struct wm8904_lower_s *lower, bool enable)
 
       if (enable && g_wm8904info.handler)
         {
-          audvdbg("Enabling\n");
+          audinfo("Enabling\n");
           sam_pioirqenable(IRQ_INT_WM8904);
           enabled = true;
         }
       else
         {
-          audvdbg("Disabling\n");
+          audinfo("Disabling\n");
           sam_pioirqdisable(IRQ_INT_WM8904);
           enabled = false;
         }
@@ -208,7 +208,7 @@ static int wm8904_interrupt(int irq, FAR void *context)
 {
   /* Just forward the interrupt to the WM8904 driver */
 
-  audvdbg("handler %p\n", g_wm8904info.handler);
+  audinfo("handler %p\n", g_wm8904info.handler);
   if (g_wm8904info.handler)
     {
       return g_wm8904info.handler(&g_wm8904info.lower, g_wm8904info.arg);
diff --git a/configs/samd20-xplained/src/sam_autoleds.c b/configs/samd20-xplained/src/sam_autoleds.c
index b9e3b9f7a1..ff0b699ba2 100644
--- a/configs/samd20-xplained/src/sam_autoleds.c
+++ b/configs/samd20-xplained/src/sam_autoleds.c
@@ -87,10 +87,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/samd20-xplained/src/sam_mmcsd.c b/configs/samd20-xplained/src/sam_mmcsd.c
index b183eda742..ef37c260b8 100644
--- a/configs/samd20-xplained/src/sam_mmcsd.c
+++ b/configs/samd20-xplained/src/sam_mmcsd.c
@@ -95,7 +95,7 @@ int sam_sdinitialize(int port, int minor)
 
   /* Get the SPI driver instance for the SD chip select */
 
-  fvdbg("Initializing SERCOM SPI%d\n", port);
+  finfo("Initializing SERCOM SPI%d\n", port);
 
   spi = sam_spibus_initialize(port);
   if (!spi)
@@ -104,11 +104,11 @@ int sam_sdinitialize(int port, int minor)
       return -ENODEV;
     }
 
-  fvdbg("Successfully initialized SPI%d\n", port);
+  finfo("Successfully initialized SPI%d\n", port);
 
   /* Bind the SPI device for the chip select to the slot */
 
-  fvdbg("Binding SPI%d to MMC/SD slot %d\n", port, SAMDL_MMCSDSLOTNO);
+  finfo("Binding SPI%d to MMC/SD slot %d\n", port, SAMDL_MMCSDSLOTNO);
 
   ret = mmcsd_spislotinitialize(minor, SAMDL_MMCSDSLOTNO, spi);
   if (ret < 0)
@@ -118,7 +118,7 @@ int sam_sdinitialize(int port, int minor)
       return ret;
     }
 
-  fvdbg("Successfuly bound SPI%d to MMC/SD slot %d\n",
+  finfo("Successfuly bound SPI%d to MMC/SD slot %d\n",
         port, SAMDL_MMCSDSLOTNO);
 
   return OK;
diff --git a/configs/samd20-xplained/src/sam_spi.c b/configs/samd20-xplained/src/sam_spi.c
index 21a9f681fa..d6fb6d6329 100644
--- a/configs/samd20-xplained/src/sam_spi.c
+++ b/configs/samd20-xplained/src/sam_spi.c
@@ -65,14 +65,14 @@
 #ifdef SPI_DEBUG
 #  define spidbg  lldbg
 #  ifdef SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/samd20-xplained/src/sam_ug2832hsweg04.c b/configs/samd20-xplained/src/sam_ug2832hsweg04.c
index ee1f37d0f6..900c6aefbd 100644
--- a/configs/samd20-xplained/src/sam_ug2832hsweg04.c
+++ b/configs/samd20-xplained/src/sam_ug2832hsweg04.c
@@ -148,10 +148,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg(format, ...)   dbg(format, ##__VA_ARGS__)
-#  define lcdvdbg(format, ...)  vdbg(format, ##__VA_ARGS__)
+#  define lcdinfo(format, ...)  info(format, ##__VA_ARGS__)
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 /****************************************************************************
@@ -200,7 +200,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
         }
      else
         {
-          lcdvdbg("Bound SPI port 1 to OLED %d\n", devno);
+          lcdinfo("Bound SPI port 1 to OLED %d\n", devno);
 
           /* And turn the OLED on */
 
diff --git a/configs/samd20-xplained/src/sam_userleds.c b/configs/samd20-xplained/src/sam_userleds.c
index 04f9352b41..fe9157aea7 100644
--- a/configs/samd20-xplained/src/sam_userleds.c
+++ b/configs/samd20-xplained/src/sam_userleds.c
@@ -72,10 +72,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/samd21-xplained/src/sam_autoleds.c b/configs/samd21-xplained/src/sam_autoleds.c
index aa6d62a635..b1ce7f5236 100644
--- a/configs/samd21-xplained/src/sam_autoleds.c
+++ b/configs/samd21-xplained/src/sam_autoleds.c
@@ -87,10 +87,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/samd21-xplained/src/sam_mmcsd.c b/configs/samd21-xplained/src/sam_mmcsd.c
index f763f44c0a..e6e3922b5e 100644
--- a/configs/samd21-xplained/src/sam_mmcsd.c
+++ b/configs/samd21-xplained/src/sam_mmcsd.c
@@ -95,7 +95,7 @@ int sam_sdinitialize(int port, int minor)
 
   /* Get the SPI driver instance for the SD chip select */
 
-  fvdbg("Initializing SERCOM SPI%d\n", port);
+  finfo("Initializing SERCOM SPI%d\n", port);
 
   spi = sam_spibus_initialize(port);
   if (!spi)
@@ -104,11 +104,11 @@ int sam_sdinitialize(int port, int minor)
       return -ENODEV;
     }
 
-  fvdbg("Successfully initialized SPI%d\n", port);
+  finfo("Successfully initialized SPI%d\n", port);
 
   /* Bind the SPI device for the chip select to the slot */
 
-  fvdbg("Binding SPI%d to MMC/SD slot %d\n", port, SAMDL_MMCSDSLOTNO);
+  finfo("Binding SPI%d to MMC/SD slot %d\n", port, SAMDL_MMCSDSLOTNO);
 
   ret = mmcsd_spislotinitialize(minor, SAMDL_MMCSDSLOTNO, spi);
   if (ret < 0)
@@ -118,7 +118,7 @@ int sam_sdinitialize(int port, int minor)
       return ret;
     }
 
-  fvdbg("Successfuly bound SPI%d to MMC/SD slot %d\n",
+  finfo("Successfuly bound SPI%d to MMC/SD slot %d\n",
         port, SAMDL_MMCSDSLOTNO);
 
   return OK;
diff --git a/configs/samd21-xplained/src/sam_spi.c b/configs/samd21-xplained/src/sam_spi.c
index 6352367dcc..d4ad01a64f 100644
--- a/configs/samd21-xplained/src/sam_spi.c
+++ b/configs/samd21-xplained/src/sam_spi.c
@@ -65,14 +65,14 @@
 #ifdef SPI_DEBUG
 #  define spidbg  lldbg
 #  ifdef SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/samd21-xplained/src/sam_ug2832hsweg04.c b/configs/samd21-xplained/src/sam_ug2832hsweg04.c
index b5cfcf26e7..481c7ec50d 100644
--- a/configs/samd21-xplained/src/sam_ug2832hsweg04.c
+++ b/configs/samd21-xplained/src/sam_ug2832hsweg04.c
@@ -148,10 +148,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg(format, ...)   dbg(format, ##__VA_ARGS__)
-#  define lcdvdbg(format, ...)  vdbg(format, ##__VA_ARGS__)
+#  define lcdinfo(format, ...)  info(format, ##__VA_ARGS__)
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 /****************************************************************************
@@ -200,7 +200,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
         }
      else
         {
-          lcdvdbg("Bound SPI port 1 to OLED %d\n", devno);
+          lcdinfo("Bound SPI port 1 to OLED %d\n", devno);
 
           /* And turn the OLED on */
 
diff --git a/configs/samd21-xplained/src/sam_userleds.c b/configs/samd21-xplained/src/sam_userleds.c
index 8edefcc077..78aa6e6d0b 100644
--- a/configs/samd21-xplained/src/sam_userleds.c
+++ b/configs/samd21-xplained/src/sam_userleds.c
@@ -72,10 +72,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/same70-xplained/src/sam_autoleds.c b/configs/same70-xplained/src/sam_autoleds.c
index 5c726c2b12..005c93bb3d 100644
--- a/configs/same70-xplained/src/sam_autoleds.c
+++ b/configs/same70-xplained/src/sam_autoleds.c
@@ -87,10 +87,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/same70-xplained/src/sam_ethernet.c b/configs/same70-xplained/src/sam_ethernet.c
index de5b5b6c6e..12c5846344 100644
--- a/configs/same70-xplained/src/sam_ethernet.c
+++ b/configs/same70-xplained/src/sam_ethernet.c
@@ -217,7 +217,7 @@ int sam_emac0_setmac(void)
       ndbg("ERROR: Failed to release the I2C interface: %d\n", ret);
     }
 
-  nvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  ninfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
         mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
   /* Now configure the EMAC driver to use this MAC address */
@@ -309,7 +309,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
 
   DEBUGASSERT(intf);
 
-  nvdbg("%s: handler=%p\n", intf, handler);
+  ninfo("%s: handler=%p\n", intf, handler);
   phydbg("EMAC0: devname=%s\n", SAMV7_EMAC0_DEVNAME);
 
   if (strcmp(intf, SAMV7_EMAC0_DEVNAME) == 0)
diff --git a/configs/same70-xplained/src/sam_hsmci.c b/configs/same70-xplained/src/sam_hsmci.c
index 6c134309de..7d02dd8cc1 100644
--- a/configs/same70-xplained/src/sam_hsmci.c
+++ b/configs/same70-xplained/src/sam_hsmci.c
@@ -129,7 +129,7 @@ bool sam_cardinserted_internal(struct sam_hsmci_state_s *state)
   /* Get the state of the PIO pin */
 
   inserted = sam_gpioread(state->cdcfg);
-  fllvdbg("Slot %d inserted: %s\n", state->slotno, inserted ? "NO" : "YES");
+  fllinfo("Slot %d inserted: %s\n", state->slotno, inserted ? "NO" : "YES");
   return !inserted;
 }
 
diff --git a/configs/same70-xplained/src/sam_mcan.c b/configs/same70-xplained/src/sam_mcan.c
index d0430ed1ce..1b0d2ef011 100644
--- a/configs/same70-xplained/src/sam_mcan.c
+++ b/configs/same70-xplained/src/sam_mcan.c
@@ -72,14 +72,14 @@
 
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
-#  define canvdbg   vdbg
+#  define caninfo   info
 #  define canlldbg  lldbg
-#  define canllvdbg llvdbg
+#  define canllinfo llinfo
 #else
 #  define candbg(x...)
-#  define canvdbg(x...)
+#  define caninfo(x...)
 #  define canlldbg(x...)
-#  define canllvdbg(x...)
+#  define canllinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/same70-xplained/src/sam_spi.c b/configs/same70-xplained/src/sam_spi.c
index df0ba7b489..7357f3a6fd 100644
--- a/configs/same70-xplained/src/sam_spi.c
+++ b/configs/same70-xplained/src/sam_spi.c
@@ -67,14 +67,14 @@
 #ifdef SPI_DEBUG
 #  define spidbg  lldbg
 #  ifdef SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/saml21-xplained/src/sam_autoleds.c b/configs/saml21-xplained/src/sam_autoleds.c
index 5d8fe4eed7..80b43043a4 100644
--- a/configs/saml21-xplained/src/sam_autoleds.c
+++ b/configs/saml21-xplained/src/sam_autoleds.c
@@ -87,10 +87,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/saml21-xplained/src/sam_mmcsd.c b/configs/saml21-xplained/src/sam_mmcsd.c
index a8ca098282..c86b61e440 100644
--- a/configs/saml21-xplained/src/sam_mmcsd.c
+++ b/configs/saml21-xplained/src/sam_mmcsd.c
@@ -95,7 +95,7 @@ int sam_sdinitialize(int port, int minor)
 
   /* Get the SPI driver instance for the SD chip select */
 
-  fvdbg("Initializing SERCOM SPI%d\n", port);
+  finfo("Initializing SERCOM SPI%d\n", port);
 
   spi = sam_spibus_initialize(port);
   if (!spi)
@@ -104,11 +104,11 @@ int sam_sdinitialize(int port, int minor)
       return -ENODEV;
     }
 
-  fvdbg("Successfully initialized SPI%d\n", port);
+  finfo("Successfully initialized SPI%d\n", port);
 
   /* Bind the SPI device for the chip select to the slot */
 
-  fvdbg("Binding SPI%d to MMC/SD slot %d\n", port, SAMDL_MMCSDSLOTNO);
+  finfo("Binding SPI%d to MMC/SD slot %d\n", port, SAMDL_MMCSDSLOTNO);
 
   ret = mmcsd_spislotinitialize(minor, SAMDL_MMCSDSLOTNO, spi);
   if (ret < 0)
@@ -118,7 +118,7 @@ int sam_sdinitialize(int port, int minor)
       return ret;
     }
 
-  fvdbg("Successfuly bound SPI%d to MMC/SD slot %d\n",
+  finfo("Successfuly bound SPI%d to MMC/SD slot %d\n",
         port, SAMDL_MMCSDSLOTNO);
 
   return OK;
diff --git a/configs/saml21-xplained/src/sam_spi.c b/configs/saml21-xplained/src/sam_spi.c
index 00eea22563..2fd0c0923d 100644
--- a/configs/saml21-xplained/src/sam_spi.c
+++ b/configs/saml21-xplained/src/sam_spi.c
@@ -65,14 +65,14 @@
 #ifdef SPI_DEBUG
 #  define spidbg  lldbg
 #  ifdef SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/saml21-xplained/src/sam_ug2832hsweg04.c b/configs/saml21-xplained/src/sam_ug2832hsweg04.c
index 3e67622d16..9ab22a7984 100644
--- a/configs/saml21-xplained/src/sam_ug2832hsweg04.c
+++ b/configs/saml21-xplained/src/sam_ug2832hsweg04.c
@@ -148,10 +148,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg(format, ...)   dbg(format, ##__VA_ARGS__)
-#  define lcdvdbg(format, ...)  vdbg(format, ##__VA_ARGS__)
+#  define lcdinfo(format, ...)  info(format, ##__VA_ARGS__)
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 /****************************************************************************
@@ -200,7 +200,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
         }
      else
         {
-          lcdvdbg("Bound SPI port 1 to OLED %d\n", devno);
+          lcdinfo("Bound SPI port 1 to OLED %d\n", devno);
 
           /* And turn the OLED on */
 
diff --git a/configs/saml21-xplained/src/sam_userleds.c b/configs/saml21-xplained/src/sam_userleds.c
index 81e118456a..35b4fdc099 100644
--- a/configs/saml21-xplained/src/sam_userleds.c
+++ b/configs/saml21-xplained/src/sam_userleds.c
@@ -72,10 +72,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/samv71-xult/src/sam_autoleds.c b/configs/samv71-xult/src/sam_autoleds.c
index 58cc34f1ed..3381fe8cc6 100644
--- a/configs/samv71-xult/src/sam_autoleds.c
+++ b/configs/samv71-xult/src/sam_autoleds.c
@@ -103,10 +103,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/samv71-xult/src/sam_ethernet.c b/configs/samv71-xult/src/sam_ethernet.c
index e0ff9354f4..86639b2894 100644
--- a/configs/samv71-xult/src/sam_ethernet.c
+++ b/configs/samv71-xult/src/sam_ethernet.c
@@ -221,7 +221,7 @@ int sam_emac0_setmac(void)
       ndbg("ERROR: Failed to release the I2C interface: %d\n", ret);
     }
 
-  nvdbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  ninfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
         mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
   /* Now configure the EMAC driver to use this MAC address */
@@ -313,7 +313,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
 
   DEBUGASSERT(intf);
 
-  nvdbg("%s: handler=%p\n", intf, handler);
+  ninfo("%s: handler=%p\n", intf, handler);
   phydbg("EMAC0: devname=%s\n", SAMV7_EMAC0_DEVNAME);
 
   if (strcmp(intf, SAMV7_EMAC0_DEVNAME) == 0)
diff --git a/configs/samv71-xult/src/sam_hsmci.c b/configs/samv71-xult/src/sam_hsmci.c
index f4e26ff016..7389e166c6 100644
--- a/configs/samv71-xult/src/sam_hsmci.c
+++ b/configs/samv71-xult/src/sam_hsmci.c
@@ -129,7 +129,7 @@ bool sam_cardinserted_internal(struct sam_hsmci_state_s *state)
   /* Get the state of the PIO pin */
 
   inserted = sam_gpioread(state->cdcfg);
-  fllvdbg("Slot %d inserted: %s\n", state->slotno, inserted ? "NO" : "YES");
+  fllinfo("Slot %d inserted: %s\n", state->slotno, inserted ? "NO" : "YES");
   return !inserted;
 }
 
diff --git a/configs/samv71-xult/src/sam_ili9488.c b/configs/samv71-xult/src/sam_ili9488.c
index cf36e89294..14e12ca690 100644
--- a/configs/samv71-xult/src/sam_ili9488.c
+++ b/configs/samv71-xult/src/sam_ili9488.c
@@ -302,10 +302,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg              dbg
-#  define lcdvdbg             vdbg
+#  define lcdinfo             info
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 #ifdef CONFIG_DEBUG_DMA
@@ -674,7 +674,7 @@ static int sam_setwindow(FAR struct sam_dev_s *priv, sam_color_t row,
   uint16_t buffer[4];
   int ret;
 
-  lcdvdbg("row=%d col=%d width=%d height=%d\n", row, col, width, height);
+  lcdinfo("row=%d col=%d width=%d height=%d\n", row, col, width, height);
 
   /* Set Column Address Position */
 
@@ -770,7 +770,7 @@ static void sam_disable_backlight(void)
 
 static int sam_set_backlight(unsigned int power)
 {
-  lcdvdbg("power=%d\n", power);
+  lcdinfo("power=%d\n", power);
 
   /* PWM support is not yet available.  Backlight is currently just
    * configured as a GPIO output.
@@ -803,7 +803,7 @@ static int sam_poweroff(FAR struct sam_dev_s *priv)
 {
   int ret;
 
-  lcdvdbg("OFF\n");
+  lcdinfo("OFF\n");
 
   /* Turn the display off */
 
@@ -1152,7 +1152,7 @@ static int sam_putrun(fb_coord_t row, fb_coord_t col,
 
   /* Buffer must be provided and aligned to a 16-bit address boundary */
 
-  lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0);
 
   /* Determine the refresh window area */
@@ -1193,7 +1193,7 @@ static int sam_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
 
   /* Buffer must be provided and aligned to a 16-bit address boundary */
 
-  lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0);
 
   /* Determine the refresh window area */
@@ -1223,7 +1223,7 @@ static int sam_getvideoinfo(FAR struct lcd_dev_s *dev,
                             FAR struct fb_videoinfo_s *vinfo)
 {
   DEBUGASSERT(dev && vinfo);
-  lcdvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n",
+  lcdinfo("fmt: %d xres: %d yres: %d nplanes: %d\n",
           g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres,
           g_videoinfo.nplanes);
 
@@ -1243,7 +1243,7 @@ static int sam_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
                               FAR struct lcd_planeinfo_s *pinfo)
 {
   DEBUGASSERT(dev && pinfo && planeno == 0);
-  lcdvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
+  lcdinfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
   memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s));
   return OK;
 }
@@ -1262,7 +1262,7 @@ static int sam_getpower(struct lcd_dev_s *dev)
 {
   FAR struct sam_dev_s *priv = (FAR struct sam_dev_s *)dev;
 
-  lcdvdbg("power: %d\n", 0);
+  lcdinfo("power: %d\n", 0);
   return priv->power;
 }
 
@@ -1281,7 +1281,7 @@ static int sam_setpower(struct lcd_dev_s *dev, int power)
   FAR struct sam_dev_s *priv = (FAR struct sam_dev_s *)dev;
   int ret;
 
-  lcdvdbg("power: %d\n", power);
+  lcdinfo("power: %d\n", power);
   DEBUGASSERT((unsigned)power <= CONFIG_LCD_MAXPOWER);
 
   /* Set new power level */
@@ -1340,7 +1340,7 @@ static int sam_setpower(struct lcd_dev_s *dev, int power)
 
 static int sam_getcontrast(struct lcd_dev_s *dev)
 {
-  lcdvdbg("Not implemented\n");
+  lcdinfo("Not implemented\n");
   return -ENOSYS;
 }
 
@@ -1354,7 +1354,7 @@ static int sam_getcontrast(struct lcd_dev_s *dev)
 
 static int sam_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
 {
-  lcdvdbg("contrast: %d\n", contrast);
+  lcdinfo("contrast: %d\n", contrast);
   return -ENOSYS;
 }
 
@@ -1480,7 +1480,7 @@ static inline int sam_lcd_initialize(void)
     }
 
   id = ((uint16_t)buffer[2] << 8) | ((uint16_t)buffer[3] & 0xff);
-  lcdvdbg("ID: %04x\n", id);
+  lcdinfo("ID: %04x\n", id);
 
   if (id != ILI9488_DEVICE_CODE)
     {
@@ -1556,7 +1556,7 @@ int board_lcd_initialize(void)
   FAR struct sam_dev_s *priv = &g_lcddev;
   int ret;
 
-  lcdvdbg("Initializing\n");
+  lcdinfo("Initializing\n");
 
   /* Configure all LCD pins pins (backlight is initially off) */
 
diff --git a/configs/samv71-xult/src/sam_maxtouch.c b/configs/samv71-xult/src/sam_maxtouch.c
index e9512e98d3..d085ee6a33 100644
--- a/configs/samv71-xult/src/sam_maxtouch.c
+++ b/configs/samv71-xult/src/sam_maxtouch.c
@@ -162,13 +162,13 @@ static int mxt_attach(FAR const struct mxt_lower_s *lower, mxt_handler_t isr,
        * new handler will called via mxt_interrupt() when the interrupt occurs.
        */
 
-      ivdbg("Attaching %p\n", isr);
+      iinfo("Attaching %p\n", isr);
       g_mxtinfo.handler = isr;
       g_mxtinfo.arg = arg;
     }
   else
     {
-      ivdbg("Detaching %p\n", g_mxtinfo.handler);
+      iinfo("Detaching %p\n", g_mxtinfo.handler);
       mxt_enable(lower, false);
       g_mxtinfo.handler = NULL;
       g_mxtinfo.arg = NULL;
diff --git a/configs/samv71-xult/src/sam_mcan.c b/configs/samv71-xult/src/sam_mcan.c
index dd4e8e7c3a..3a46d55d9f 100644
--- a/configs/samv71-xult/src/sam_mcan.c
+++ b/configs/samv71-xult/src/sam_mcan.c
@@ -72,14 +72,14 @@
 
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
-#  define canvdbg   vdbg
+#  define caninfo   info
 #  define canlldbg  lldbg
-#  define canllvdbg llvdbg
+#  define canllinfo llinfo
 #else
 #  define candbg(x...)
-#  define canvdbg(x...)
+#  define caninfo(x...)
 #  define canlldbg(x...)
-#  define canllvdbg(x...)
+#  define canllinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/samv71-xult/src/sam_spi.c b/configs/samv71-xult/src/sam_spi.c
index 03dd5ead1e..0edc2f45a2 100644
--- a/configs/samv71-xult/src/sam_spi.c
+++ b/configs/samv71-xult/src/sam_spi.c
@@ -67,14 +67,14 @@
 #ifdef SPI_DEBUG
 #  define spidbg  lldbg
 #  ifdef SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/samv71-xult/src/sam_wm8904.c b/configs/samv71-xult/src/sam_wm8904.c
index dff1f69519..f7b3dfc847 100644
--- a/configs/samv71-xult/src/sam_wm8904.c
+++ b/configs/samv71-xult/src/sam_wm8904.c
@@ -157,13 +157,13 @@ static int wm8904_attach(FAR const struct wm8904_lower_s *lower,
        * new handler will called via wm8904_interrupt() when the interrupt occurs.
        */
 
-      audvdbg("Attaching %p\n", isr);
+      audinfo("Attaching %p\n", isr);
       g_wm8904info.handler = isr;
       g_wm8904info.arg = arg;
     }
   else
     {
-      audvdbg("Detaching %p\n", g_wm8904info.handler);
+      audinfo("Detaching %p\n", g_wm8904info.handler);
       (void)wm8904_enable(lower, false);
       g_wm8904info.handler = NULL;
       g_wm8904info.arg = NULL;
@@ -187,13 +187,13 @@ static bool wm8904_enable(FAR const struct wm8904_lower_s *lower, bool enable)
 
       if (enable && g_wm8904info.handler)
         {
-          audvdbg("Enabling\n");
+          audinfo("Enabling\n");
           sam_gpioirqenable(IRQ_INT_WM8904);
           enabled = true;
         }
       else
         {
-          audvdbg("Disabling\n");
+          audinfo("Disabling\n");
           sam_gpioirqdisable(IRQ_INT_WM8904);
           enabled = false;
         }
@@ -208,7 +208,7 @@ static int wm8904_interrupt(int irq, FAR void *context)
 {
   /* Just forward the interrupt to the WM8904 driver */
 
-  audvdbg("handler %p\n", g_wm8904info.handler);
+  audinfo("handler %p\n", g_wm8904info.handler);
   if (g_wm8904info.handler)
     {
       return g_wm8904info.handler(&g_wm8904info.lower, g_wm8904info.arg);
diff --git a/configs/shenzhou/src/stm32_autoleds.c b/configs/shenzhou/src/stm32_autoleds.c
index ff2496cc2c..4d521f68e2 100644
--- a/configs/shenzhou/src/stm32_autoleds.c
+++ b/configs/shenzhou/src/stm32_autoleds.c
@@ -63,10 +63,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /* The following definitions map the encoded LED setting to GPIO settings */
diff --git a/configs/shenzhou/src/stm32_can.c b/configs/shenzhou/src/stm32_can.c
index fa05af42fa..b1e6120512 100644
--- a/configs/shenzhou/src/stm32_can.c
+++ b/configs/shenzhou/src/stm32_can.c
@@ -67,14 +67,14 @@
 
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
-#  define canvdbg   vdbg
+#  define caninfo   info
 #  define canlldbg  lldbg
-#  define canllvdbg llvdbg
+#  define canllinfo llinfo
 #else
 #  define candbg(x...)
-#  define canvdbg(x...)
+#  define caninfo(x...)
 #  define canlldbg(x...)
-#  define canllvdbg(x...)
+#  define canllinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/shenzhou/src/stm32_ili93xx.c b/configs/shenzhou/src/stm32_ili93xx.c
index f6f95c6d5d..e92b29042f 100644
--- a/configs/shenzhou/src/stm32_ili93xx.c
+++ b/configs/shenzhou/src/stm32_ili93xx.c
@@ -372,10 +372,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg              dbg
-#  define lcdvdbg             vdbg
+#  define lcdinfo             info
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 /************************************************************************************
@@ -870,7 +870,7 @@ static int stm32_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffe
 
   /* Buffer must be provided and aligned to a 16-bit address boundary */
 
-  lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0);
 
   /* Write the run to GRAM */
@@ -979,7 +979,7 @@ static int stm32_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
 
   /* Buffer must be provided and aligned to a 16-bit address boundary */
 
-  lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0);
 
   /* Configure according to the LCD type.  Kind of silly with only one LCD type */
@@ -1106,7 +1106,7 @@ static int stm32_getvideoinfo(FAR struct lcd_dev_s *dev,
                               FAR struct fb_videoinfo_s *vinfo)
 {
   DEBUGASSERT(dev && vinfo);
-  lcdvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n",
+  lcdinfo("fmt: %d xres: %d yres: %d nplanes: %d\n",
           g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes);
   memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s));
   return OK;
@@ -1124,7 +1124,7 @@ static int stm32_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
                               FAR struct lcd_planeinfo_s *pinfo)
 {
   DEBUGASSERT(dev && pinfo && planeno == 0);
-  lcdvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
+  lcdinfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
   memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s));
   return OK;
 }
@@ -1142,7 +1142,7 @@ static int stm32_getpower(struct lcd_dev_s *dev)
 {
   FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev;
 
-  lcdvdbg("power: %d\n", 0);
+  lcdinfo("power: %d\n", 0);
   return priv->power;
 }
 
@@ -1180,7 +1180,7 @@ static int stm32_setpower(struct lcd_dev_s *dev, int power)
 {
   FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev;
 
-  lcdvdbg("power: %d\n", power);
+  lcdinfo("power: %d\n", power);
   DEBUGASSERT((unsigned)power <= CONFIG_LCD_MAXPOWER);
 
   /* Set new power level */
@@ -1280,7 +1280,7 @@ static int stm32_setpower(struct lcd_dev_s *dev, int power)
 
 static int stm32_getcontrast(struct lcd_dev_s *dev)
 {
-  lcdvdbg("Not implemented\n");
+  lcdinfo("Not implemented\n");
   return -ENOSYS;
 }
 
@@ -1294,7 +1294,7 @@ static int stm32_getcontrast(struct lcd_dev_s *dev)
 
 static int stm32_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
 {
-  lcdvdbg("contrast: %d\n", contrast);
+  lcdinfo("contrast: %d\n", contrast);
   return -ENOSYS;
 }
 
@@ -1880,7 +1880,7 @@ int board_lcd_initialize(void)
   int ret;
   int i;
 
-  lcdvdbg("Initializing\n");
+  lcdinfo("Initializing\n");
 
   /* Configure GPIO pins.  The initial state of priv->output is false, so
    * we need to configure pins for output initially.
diff --git a/configs/shenzhou/src/stm32_mmcsd.c b/configs/shenzhou/src/stm32_mmcsd.c
index a585e31ad3..6307bf3391 100644
--- a/configs/shenzhou/src/stm32_mmcsd.c
+++ b/configs/shenzhou/src/stm32_mmcsd.c
@@ -95,7 +95,7 @@ int stm32_sdinitialize(int minor)
 
   /* Get the SPI port */
 
-  fvdbg("Initializing SPI port %d\n", STM32_MMCSDSPIPORTNO);
+  finfo("Initializing SPI port %d\n", STM32_MMCSDSPIPORTNO);
 
   spi = stm32_spibus_initialize(STM32_MMCSDSPIPORTNO);
   if (!spi)
@@ -104,11 +104,11 @@ int stm32_sdinitialize(int minor)
       return -ENODEV;
     }
 
-  fvdbg("Successfully initialized SPI port %d\n", STM32_MMCSDSPIPORTNO);
+  finfo("Successfully initialized SPI port %d\n", STM32_MMCSDSPIPORTNO);
 
   /* Bind the SPI port to the slot */
 
-  fvdbg("Binding SPI port %d to MMC/SD slot %d\n",
+  finfo("Binding SPI port %d to MMC/SD slot %d\n",
           STM32_MMCSDSPIPORTNO, STM32_MMCSDSLOTNO);
 
   ret = mmcsd_spislotinitialize(minor, STM32_MMCSDSLOTNO, spi);
@@ -119,7 +119,7 @@ int stm32_sdinitialize(int minor)
       return ret;
     }
 
-  fvdbg("Successfuly bound SPI port %d to MMC/SD slot %d\n",
+  finfo("Successfuly bound SPI port %d to MMC/SD slot %d\n",
         STM32_MMCSDSPIPORTNO, STM32_MMCSDSLOTNO);
 #endif
   return OK;
diff --git a/configs/shenzhou/src/stm32_spi.c b/configs/shenzhou/src/stm32_spi.c
index 5e2ba81dbb..6992fc3835 100644
--- a/configs/shenzhou/src/stm32_spi.c
+++ b/configs/shenzhou/src/stm32_spi.c
@@ -66,13 +66,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/shenzhou/src/stm32_ssd1289.c b/configs/shenzhou/src/stm32_ssd1289.c
index 5501067f0c..221e0821ec 100644
--- a/configs/shenzhou/src/stm32_ssd1289.c
+++ b/configs/shenzhou/src/stm32_ssd1289.c
@@ -90,10 +90,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg         dbg
-#  define lcdvdbg        vdbg
+#  define lcdinfo        info
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 /************************************************************************************
@@ -548,7 +548,7 @@ int board_lcd_initialize(void)
 
   if (!priv->drvr)
     {
-      lcdvdbg("Initializing\n");
+      lcdinfo("Initializing\n");
 
       /* Configure GPIO pins */
 
diff --git a/configs/shenzhou/src/stm32_touchscreen.c b/configs/shenzhou/src/stm32_touchscreen.c
index abfe6ebdd7..df3943812e 100644
--- a/configs/shenzhou/src/stm32_touchscreen.c
+++ b/configs/shenzhou/src/stm32_touchscreen.c
@@ -181,7 +181,7 @@ static void tsc_enable(FAR struct ads7843e_config_s *state, bool enable)
 
   /* Attach and enable, or detach and disable */
 
-  ivdbg("enable:%d\n", enable);
+  iinfo("enable:%d\n", enable);
   if (enable)
     {
       (void)stm32_gpiosetevent(GPIO_TP_INT, true, true, false,
@@ -220,7 +220,7 @@ static bool tsc_pendown(FAR struct ads7843e_config_s *state)
    */
 
   bool pendown = !stm32_gpioread(GPIO_TP_INT);
-  ivdbg("pendown:%d\n", pendown);
+  iinfo("pendown:%d\n", pendown);
   return pendown;
 }
 
diff --git a/configs/shenzhou/src/stm32_usb.c b/configs/shenzhou/src/stm32_usb.c
index 80ed3c53dd..c63e80cda0 100644
--- a/configs/shenzhou/src/stm32_usb.c
+++ b/configs/shenzhou/src/stm32_usb.c
@@ -106,13 +106,13 @@ static int usbhost_waiter(int argc, char *argv[])
 {
   struct usbhost_hubport_s *hport;
 
-  uvdbg("Running\n");
+  uinfo("Running\n");
   for (;;)
     {
       /* Wait for the device to change state */
 
       DEBUGVERIFY(CONN_WAIT(g_usbconn, &hport));
-      uvdbg("%s\n", hport->connected ? "connected" : "disconnected");
+      uinfo("%s\n", hport->connected ? "connected" : "disconnected");
 
       /* Did we just become connected? */
 
@@ -176,7 +176,7 @@ int stm32_usbhost_initialize(void)
    * that we care about:
    */
 
-  uvdbg("Register class drivers\n");
+  uinfo("Register class drivers\n");
 
 #ifdef CONFIG_USBHOST_MSC
   /* Register the USB mass storage class class */
@@ -200,13 +200,13 @@ int stm32_usbhost_initialize(void)
 
   /* Then get an instance of the USB host interface */
 
-  uvdbg("Initialize USB host\n");
+  uinfo("Initialize USB host\n");
   g_usbconn = stm32_otgfshost_initialize(0);
   if (g_usbconn)
     {
       /* Start a thread to handle device connection. */
 
-      uvdbg("Start usbhost_waiter\n");
+      uinfo("Start usbhost_waiter\n");
 
       pid = task_create("usbhost", CONFIG_USBHOST_DEFPRIO,
                         CONFIG_USBHOST_STACKSIZE,
diff --git a/configs/shenzhou/src/stm32_userleds.c b/configs/shenzhou/src/stm32_userleds.c
index 0f56906f61..3cf360d7fb 100644
--- a/configs/shenzhou/src/stm32_userleds.c
+++ b/configs/shenzhou/src/stm32_userleds.c
@@ -63,10 +63,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/sim/src/sim_touchscreen.c b/configs/sim/src/sim_touchscreen.c
index c6afc35528..d52b4133d9 100644
--- a/configs/sim/src/sim_touchscreen.c
+++ b/configs/sim/src/sim_touchscreen.c
@@ -107,7 +107,7 @@ int board_tsc_setup(int minor)
    * X11 window to support the mouse-driven touchscreen simulation.
    */
 
-  ivdbg("Initializing framebuffer\n");
+  iinfo("Initializing framebuffer\n");
   ret = up_fbinitialize(0);
   if (ret < 0)
     {
@@ -125,7 +125,7 @@ int board_tsc_setup(int minor)
 
   /* Then open NX */
 
-  ivdbg("Open NX\n");
+  iinfo("Open NX\n");
   g_simtc.hnx = nx_open(dev);
   if (!g_simtc.hnx)
     {
@@ -147,7 +147,7 @@ int board_tsc_setup(int minor)
 
   /* Set the background to the configured background color */
 
-  ivdbg("Set background color=%d\n", CONFIG_EXAMPLES_TOUCHSCREEN_BGCOLOR);
+  iinfo("Set background color=%d\n", CONFIG_EXAMPLES_TOUCHSCREEN_BGCOLOR);
 
   color = CONFIG_EXAMPLES_TOUCHSCREEN_BGCOLOR;
   ret = nx_setbgcolor(g_simtc.hnx, &color);
diff --git a/configs/spark/src/stm32_autoleds.c b/configs/spark/src/stm32_autoleds.c
index e2368c9f6c..8ccf2f3141 100644
--- a/configs/spark/src/stm32_autoleds.c
+++ b/configs/spark/src/stm32_autoleds.c
@@ -65,10 +65,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /* The following definitions map the encoded LED setting to bit sets used to
diff --git a/configs/spark/src/stm32_composite.c b/configs/spark/src/stm32_composite.c
index 2720de1af4..8893c12c92 100644
--- a/configs/spark/src/stm32_composite.c
+++ b/configs/spark/src/stm32_composite.c
@@ -140,7 +140,7 @@ static int stm32_composite_initialize(void)
 
   /* Get the SPI port */
 
-  fvdbg("Initializing SPI port %d\n", CONFIG_SPARK_FLASH_SPI);
+  finfo("Initializing SPI port %d\n", CONFIG_SPARK_FLASH_SPI);
 
   spi = stm32_spibus_initialize(CONFIG_SPARK_FLASH_SPI);
   if (!spi)
@@ -150,11 +150,11 @@ static int stm32_composite_initialize(void)
       return -ENODEV;
     }
 
-  fvdbg("Successfully initialized SPI port %d\n", CONFIG_SPARK_FLASH_SPI);
+  finfo("Successfully initialized SPI port %d\n", CONFIG_SPARK_FLASH_SPI);
 
   /* Now bind the SPI interface to the SST25 SPI FLASH driver */
 
-  fvdbg("Bind SPI to the SPI flash driver\n");
+  finfo("Bind SPI to the SPI flash driver\n");
   mtd = sst25_initialize(spi);
   if (!mtd)
     {
@@ -163,7 +163,7 @@ static int stm32_composite_initialize(void)
     }
   else
     {
-      fvdbg("Successfully bound SPI port %d to the SPI FLASH driver\n",
+      finfo("Successfully bound SPI port %d to the SPI FLASH driver\n",
             CONFIG_SPARK_FLASH_SPI);
     }
 
diff --git a/configs/spark/src/stm32_spi.c b/configs/spark/src/stm32_spi.c
index 0dd71f1c16..bdbb5b229a 100644
--- a/configs/spark/src/stm32_spi.c
+++ b/configs/spark/src/stm32_spi.c
@@ -71,14 +71,14 @@
 #ifdef SPI_DEBUG
 #  define spidbg  lldbg
 #  ifdef SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/spark/src/stm32_userleds.c b/configs/spark/src/stm32_userleds.c
index 1d97b97416..995feb06f3 100644
--- a/configs/spark/src/stm32_userleds.c
+++ b/configs/spark/src/stm32_userleds.c
@@ -64,10 +64,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/spark/src/stm32_wireless.c b/configs/spark/src/stm32_wireless.c
index 912670b916..3feb345e5a 100644
--- a/configs/spark/src/stm32_wireless.c
+++ b/configs/spark/src/stm32_wireless.c
@@ -197,7 +197,7 @@ static void wl_enable_irq(FAR struct cc3000_config_s *state, bool enable)
 
   /* Attach and enable, or detach and disable */
 
-  ivdbg("enable:%d\n", enable);
+  iinfo("enable:%d\n", enable);
   if (enable)
     {
       (void)stm32_gpiosetevent(GPIO_WIFI_INT, false, true, false, priv->handler);
@@ -210,7 +210,7 @@ static void wl_enable_irq(FAR struct cc3000_config_s *state, bool enable)
 
 static void wl_enable_power(FAR struct cc3000_config_s *state, bool enable)
 {
-  ivdbg("enable:%d\n", enable);
+  iinfo("enable:%d\n", enable);
 
   /* Active high enable */
 
@@ -219,7 +219,7 @@ static void wl_enable_power(FAR struct cc3000_config_s *state, bool enable)
 
 static void wl_select(FAR struct cc3000_config_s *state, bool enable)
 {
-  ivdbg("enable:%d\n", enable);
+  iinfo("enable:%d\n", enable);
 
   /* Active high enable */
 
diff --git a/configs/stm3210e-eval/src/stm32_can.c b/configs/stm3210e-eval/src/stm32_can.c
index 2efb493ca1..c29c5b2a17 100644
--- a/configs/stm3210e-eval/src/stm32_can.c
+++ b/configs/stm3210e-eval/src/stm32_can.c
@@ -67,14 +67,14 @@
 
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
-#  define canvdbg   vdbg
+#  define caninfo   info
 #  define canlldbg  lldbg
-#  define canllvdbg llvdbg
+#  define canllinfo llinfo
 #else
 #  define candbg(x...)
-#  define canvdbg(x...)
+#  define caninfo(x...)
 #  define canlldbg(x...)
-#  define canllvdbg(x...)
+#  define canllinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/stm3210e-eval/src/stm32_djoystick.c b/configs/stm3210e-eval/src/stm32_djoystick.c
index a8d9001f7e..8e367c5e3a 100644
--- a/configs/stm3210e-eval/src/stm32_djoystick.c
+++ b/configs/stm3210e-eval/src/stm32_djoystick.c
@@ -120,7 +120,7 @@ static const struct djoy_lowerhalf_s g_djoylower =
 
 static djoy_buttonset_t djoy_supported(FAR const struct djoy_lowerhalf_s *lower)
 {
-  ivdbg("Supported: %02x\n", DJOY_SUPPORTED);
+  iinfo("Supported: %02x\n", DJOY_SUPPORTED);
   return (djoy_buttonset_t)DJOY_SUPPORTED;
 }
 
@@ -148,7 +148,7 @@ static djoy_buttonset_t djoy_sample(FAR const struct djoy_lowerhalf_s *lower)
          }
     }
 
-  ivdbg("Retuning: %02x\n", DJOY_SUPPORTED);
+  iinfo("Retuning: %02x\n", DJOY_SUPPORTED);
   return ret;
 }
 
@@ -177,7 +177,7 @@ static void djoy_enable(FAR const struct djoy_lowerhalf_s *lower,
   flags = enter_critical_section();
   djoy_disable();
 
-  illvdbg("press: %02x release: %02x handler: %p arg: %p\n",
+  illinfo("press: %02x release: %02x handler: %p arg: %p\n",
           press, release, handler, arg);
 
   /* If no events are indicated or if no handler is provided, then this
@@ -209,7 +209,7 @@ static void djoy_enable(FAR const struct djoy_lowerhalf_s *lower,
                falling = ((press & bit) != 0);
                rising  = ((release & bit) != 0);
 
-               illvdbg("GPIO %d: rising: %d falling: %d\n",
+               illinfo("GPIO %d: rising: %d falling: %d\n",
                         i, rising, falling);
 
                (void)stm32_gpiosetevent(g_joygpio[i], rising, falling,
diff --git a/configs/stm3210e-eval/src/stm32_idle.c b/configs/stm3210e-eval/src/stm32_idle.c
index aba327a64c..c6352c221b 100644
--- a/configs/stm3210e-eval/src/stm32_idle.c
+++ b/configs/stm3210e-eval/src/stm32_idle.c
@@ -290,7 +290,7 @@ static void stm32_idlepm(void)
 
   if (newstate != oldstate)
     {
-      llvdbg("newstate= %d oldstate=%d\n", newstate, oldstate);
+      llinfo("newstate= %d oldstate=%d\n", newstate, oldstate);
 
       sched_lock();
 
diff --git a/configs/stm3210e-eval/src/stm32_lcd.c b/configs/stm3210e-eval/src/stm32_lcd.c
index f86e722872..b6aab70639 100644
--- a/configs/stm3210e-eval/src/stm32_lcd.c
+++ b/configs/stm3210e-eval/src/stm32_lcd.c
@@ -312,7 +312,7 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-# define lcddbg(format, ...)  vdbg(format, ##__VA_ARGS__)
+# define lcddbg(format, ...)  info(format, ##__VA_ARGS__)
 #else
 # define lcddbg(x...)
 #endif
@@ -952,7 +952,7 @@ static int stm3210e_getvideoinfo(FAR struct lcd_dev_s *dev,
                               FAR struct fb_videoinfo_s *vinfo)
 {
   DEBUGASSERT(dev && vinfo);
-  gvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n",
+  ginfo("fmt: %d xres: %d yres: %d nplanes: %d\n",
          g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes);
   memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s));
   return OK;
@@ -970,7 +970,7 @@ static int stm3210e_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno
                               FAR struct lcd_planeinfo_s *pinfo)
 {
   DEBUGASSERT(dev && pinfo && planeno == 0);
-  gvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
+  ginfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
   memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s));
   return OK;
 }
@@ -986,7 +986,7 @@ static int stm3210e_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno
 
 static int stm3210e_getpower(struct lcd_dev_s *dev)
 {
-  gvdbg("power: %d\n", 0);
+  ginfo("power: %d\n", 0);
   return g_lcddev.power;
 }
 
@@ -1038,7 +1038,7 @@ static int stm3210e_poweroff(void)
 
 static int stm3210e_setpower(struct lcd_dev_s *dev, int power)
 {
-  gvdbg("power: %d\n", power);
+  ginfo("power: %d\n", power);
   DEBUGASSERT((unsigned)power <= CONFIG_LCD_MAXPOWER);
 
   /* Set new power level */
@@ -1114,7 +1114,7 @@ static int stm3210e_setpower(struct lcd_dev_s *dev, int power)
 
 static int stm3210e_getcontrast(struct lcd_dev_s *dev)
 {
-  gvdbg("Not implemented\n");
+  ginfo("Not implemented\n");
   return -ENOSYS;
 }
 
@@ -1128,7 +1128,7 @@ static int stm3210e_getcontrast(struct lcd_dev_s *dev)
 
 static int stm3210e_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
 {
-  gvdbg("contrast: %d\n", contrast);
+  ginfo("contrast: %d\n", contrast);
   return -ENOSYS;
 }
 
@@ -1786,7 +1786,7 @@ int board_lcd_initialize(void)
   int ret;
 #endif
 
-  gvdbg("Initializing\n");
+  ginfo("Initializing\n");
 
   /* Register to receive power management callbacks */
 
diff --git a/configs/stm3210e-eval/src/stm32_leds.c b/configs/stm3210e-eval/src/stm32_leds.c
index 5d228edb1c..99d86cf97f 100644
--- a/configs/stm3210e-eval/src/stm32_leds.c
+++ b/configs/stm3210e-eval/src/stm32_leds.c
@@ -63,10 +63,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /* The following definitions map the encoded LED setting to GPIO settings */
diff --git a/configs/stm3210e-eval/src/stm32_spi.c b/configs/stm3210e-eval/src/stm32_spi.c
index b64df8d679..934137ee57 100644
--- a/configs/stm3210e-eval/src/stm32_spi.c
+++ b/configs/stm3210e-eval/src/stm32_spi.c
@@ -65,14 +65,14 @@
 #ifdef SPI_DEBUG
 #  define spidbg  lldbg
 #  ifdef SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/stm3220g-eval/src/stm32_autoleds.c b/configs/stm3220g-eval/src/stm32_autoleds.c
index b59ade2cd1..02d3ff18af 100644
--- a/configs/stm3220g-eval/src/stm32_autoleds.c
+++ b/configs/stm3220g-eval/src/stm32_autoleds.c
@@ -64,10 +64,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /* The following definitions map the encoded LED setting to GPIO settings */
diff --git a/configs/stm3220g-eval/src/stm32_can.c b/configs/stm3220g-eval/src/stm32_can.c
index 1c9b4fda77..192ccfa228 100644
--- a/configs/stm3220g-eval/src/stm32_can.c
+++ b/configs/stm3220g-eval/src/stm32_can.c
@@ -75,14 +75,14 @@
 
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
-#  define canvdbg   vdbg
+#  define caninfo   info
 #  define canlldbg  lldbg
-#  define canllvdbg llvdbg
+#  define canllinfo llinfo
 #else
 #  define candbg(x...)
-#  define canvdbg(x...)
+#  define caninfo(x...)
 #  define canlldbg(x...)
-#  define canllvdbg(x...)
+#  define canllinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/stm3220g-eval/src/stm32_lcd.c b/configs/stm3220g-eval/src/stm32_lcd.c
index bb572f7eda..3ea0d3dcd4 100644
--- a/configs/stm3220g-eval/src/stm32_lcd.c
+++ b/configs/stm3220g-eval/src/stm32_lcd.c
@@ -266,10 +266,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg              dbg
-#  define lcdvdbg             vdbg
+#  define lcdinfo             info
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 /**************************************************************************************
@@ -586,7 +586,7 @@ static int stm3220g_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *bu
 
   /* Buffer must be provided and aligned to a 16-bit address boundary */
 
-  lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0);
 
   /* Write the run to GRAM. */
@@ -704,7 +704,7 @@ static int stm3220g_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
 
   /* Buffer must be provided and aligned to a 16-bit address boundary */
 
-  lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0);
 
   /* Configure according to the LCD type.  Kind of silly with only one LCD type. */
@@ -830,7 +830,7 @@ static int stm3220g_getvideoinfo(FAR struct lcd_dev_s *dev,
                                  FAR struct fb_videoinfo_s *vinfo)
 {
   DEBUGASSERT(dev && vinfo);
-  lcdvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n",
+  lcdinfo("fmt: %d xres: %d yres: %d nplanes: %d\n",
           g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes);
   memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s));
   return OK;
@@ -848,7 +848,7 @@ static int stm3220g_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno
                               FAR struct lcd_planeinfo_s *pinfo)
 {
   DEBUGASSERT(dev && pinfo && planeno == 0);
-  lcdvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
+  lcdinfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
   memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s));
   return OK;
 }
@@ -864,7 +864,7 @@ static int stm3220g_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno
 
 static int stm3220g_getpower(struct lcd_dev_s *dev)
 {
-  lcdvdbg("power: %d\n", 0);
+  lcdinfo("power: %d\n", 0);
   return g_lcddev.power;
 }
 
@@ -900,7 +900,7 @@ static int stm3220g_poweroff(void)
 
 static int stm3220g_setpower(struct lcd_dev_s *dev, int power)
 {
-  lcdvdbg("power: %d\n", power);
+  lcdinfo("power: %d\n", power);
   DEBUGASSERT((unsigned)power <= CONFIG_LCD_MAXPOWER);
 
   /* Set new power level */
@@ -934,7 +934,7 @@ static int stm3220g_setpower(struct lcd_dev_s *dev, int power)
 
 static int stm3220g_getcontrast(struct lcd_dev_s *dev)
 {
-  lcdvdbg("Not implemented\n");
+  lcdinfo("Not implemented\n");
   return -ENOSYS;
 }
 
@@ -948,7 +948,7 @@ static int stm3220g_getcontrast(struct lcd_dev_s *dev)
 
 static int stm3220g_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
 {
-  lcdvdbg("contrast: %d\n", contrast);
+  lcdinfo("contrast: %d\n", contrast);
   return -ENOSYS;
 }
 
@@ -1134,7 +1134,7 @@ static inline void stm3220g_lcdinitialize(void)
 
 int board_lcd_initialize(void)
 {
-  lcdvdbg("Initializing\n");
+  lcdinfo("Initializing\n");
 
   /* Configure GPIO pins and configure the FSMC to support the LCD */
 
diff --git a/configs/stm3220g-eval/src/stm32_spi.c b/configs/stm3220g-eval/src/stm32_spi.c
index 5f6332c7fc..ba00efe80d 100644
--- a/configs/stm3220g-eval/src/stm32_spi.c
+++ b/configs/stm3220g-eval/src/stm32_spi.c
@@ -65,14 +65,14 @@
 #ifdef SPI_DEBUG
 #  define spidbg  lldbg
 #  ifdef SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/stm3220g-eval/src/stm32_stmpe811.c b/configs/stm3220g-eval/src/stm32_stmpe811.c
index c3fcf6de4b..b8832734c8 100644
--- a/configs/stm3220g-eval/src/stm32_stmpe811.c
+++ b/configs/stm3220g-eval/src/stm32_stmpe811.c
@@ -211,7 +211,7 @@ static int stmpe811_attach(FAR struct stmpe811_config_s *state, xcpt_t isr)
 {
   FAR struct stm32_stmpe811config_s *priv = (FAR struct stm32_stmpe811config_s *)state;
 
-  ivdbg("Saving handler %p\n", isr);
+  iinfo("Saving handler %p\n", isr);
   DEBUGASSERT(priv);
 
   /* Just save the handler.  We will use it when EXTI interruptsare enabled */
@@ -286,7 +286,7 @@ int board_tsc_setup(int minor)
 
   if (!g_stmpe811config.handle)
     {
-      ivdbg("Initializing\n");
+      iinfo("Initializing\n");
 
       /* Configure the STMPE811 interrupt pin as an input */
 
diff --git a/configs/stm3220g-eval/src/stm32_usb.c b/configs/stm3220g-eval/src/stm32_usb.c
index 3d0e183b61..e4ecae395d 100644
--- a/configs/stm3220g-eval/src/stm32_usb.c
+++ b/configs/stm3220g-eval/src/stm32_usb.c
@@ -106,13 +106,13 @@ static int usbhost_waiter(int argc, char *argv[])
 {
   struct usbhost_hubport_s *hport;
 
-  uvdbg("Running\n");
+  uinfo("Running\n");
   for (;;)
     {
       /* Wait for the device to change state */
 
       DEBUGVERIFY(CONN_WAIT(g_usbconn, &hport));
-      uvdbg("%s\n", hport->connected ? "connected" : "disconnected");
+      uinfo("%s\n", hport->connected ? "connected" : "disconnected");
 
       /* Did we just become connected? */
 
@@ -176,7 +176,7 @@ int stm32_usbhost_initialize(void)
    * that we care about:
    */
 
-  uvdbg("Register class drivers\n");
+  uinfo("Register class drivers\n");
 
 #ifdef CONFIG_USBHOST_MSC
   /* Register the USB mass storage class class */
@@ -200,13 +200,13 @@ int stm32_usbhost_initialize(void)
 
   /* Then get an instance of the USB host interface */
 
-  uvdbg("Initialize USB host\n");
+  uinfo("Initialize USB host\n");
   g_usbconn = stm32_otgfshost_initialize(0);
   if (g_usbconn)
     {
       /* Start a thread to handle device connection. */
 
-      uvdbg("Start usbhost_waiter\n");
+      uinfo("Start usbhost_waiter\n");
 
       pid = task_create("usbhost", CONFIG_USBHOST_DEFPRIO,
                         CONFIG_USBHOST_STACKSIZE,
diff --git a/configs/stm3220g-eval/src/stm32_userleds.c b/configs/stm3220g-eval/src/stm32_userleds.c
index fe667383cc..3eda42599a 100644
--- a/configs/stm3220g-eval/src/stm32_userleds.c
+++ b/configs/stm3220g-eval/src/stm32_userleds.c
@@ -63,10 +63,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/stm3240g-eval/src/stm32_autoleds.c b/configs/stm3240g-eval/src/stm32_autoleds.c
index 49a2692fb0..a20e979628 100644
--- a/configs/stm3240g-eval/src/stm32_autoleds.c
+++ b/configs/stm3240g-eval/src/stm32_autoleds.c
@@ -64,10 +64,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /* The following definitions map the encoded LED setting to GPIO settings */
diff --git a/configs/stm3240g-eval/src/stm32_can.c b/configs/stm3240g-eval/src/stm32_can.c
index 40a29e50d8..e4071bf0d6 100644
--- a/configs/stm3240g-eval/src/stm32_can.c
+++ b/configs/stm3240g-eval/src/stm32_can.c
@@ -75,14 +75,14 @@
 
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
-#  define canvdbg   vdbg
+#  define caninfo   info
 #  define canlldbg  lldbg
-#  define canllvdbg llvdbg
+#  define canllinfo llinfo
 #else
 #  define candbg(x...)
-#  define canvdbg(x...)
+#  define caninfo(x...)
 #  define canlldbg(x...)
-#  define canllvdbg(x...)
+#  define canllinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/stm3240g-eval/src/stm32_lcd.c b/configs/stm3240g-eval/src/stm32_lcd.c
index 4c4491e047..89e7bd508c 100644
--- a/configs/stm3240g-eval/src/stm32_lcd.c
+++ b/configs/stm3240g-eval/src/stm32_lcd.c
@@ -266,10 +266,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg              dbg
-#  define lcdvdbg             vdbg
+#  define lcdinfo             info
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 /**************************************************************************************
@@ -585,7 +585,7 @@ static int stm3240g_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *bu
 
   /* Buffer must be provided and aligned to a 16-bit address boundary */
 
-  lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0);
 
   /* Write the run to GRAM. */
@@ -703,7 +703,7 @@ static int stm3240g_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
 
   /* Buffer must be provided and aligned to a 16-bit address boundary */
 
-  lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0);
 
   /* Configure according to the LCD type.  Kind of silly with only one LCD type. */
@@ -829,7 +829,7 @@ static int stm3240g_getvideoinfo(FAR struct lcd_dev_s *dev,
                                  FAR struct fb_videoinfo_s *vinfo)
 {
   DEBUGASSERT(dev && vinfo);
-  lcdvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n",
+  lcdinfo("fmt: %d xres: %d yres: %d nplanes: %d\n",
           g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes);
   memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s));
   return OK;
@@ -847,7 +847,7 @@ static int stm3240g_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno
                               FAR struct lcd_planeinfo_s *pinfo)
 {
   DEBUGASSERT(dev && pinfo && planeno == 0);
-  lcdvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
+  lcdinfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
   memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s));
   return OK;
 }
@@ -863,7 +863,7 @@ static int stm3240g_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno
 
 static int stm3240g_getpower(struct lcd_dev_s *dev)
 {
-  lcdvdbg("power: %d\n", 0);
+  lcdinfo("power: %d\n", 0);
   return g_lcddev.power;
 }
 
@@ -899,7 +899,7 @@ static int stm3240g_poweroff(void)
 
 static int stm3240g_setpower(struct lcd_dev_s *dev, int power)
 {
-  lcdvdbg("power: %d\n", power);
+  lcdinfo("power: %d\n", power);
   DEBUGASSERT((unsigned)power <= CONFIG_LCD_MAXPOWER);
 
   /* Set new power level */
@@ -933,7 +933,7 @@ static int stm3240g_setpower(struct lcd_dev_s *dev, int power)
 
 static int stm3240g_getcontrast(struct lcd_dev_s *dev)
 {
-  lcdvdbg("Not implemented\n");
+  lcdinfo("Not implemented\n");
   return -ENOSYS;
 }
 
@@ -947,7 +947,7 @@ static int stm3240g_getcontrast(struct lcd_dev_s *dev)
 
 static int stm3240g_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
 {
-  lcdvdbg("contrast: %d\n", contrast);
+  lcdinfo("contrast: %d\n", contrast);
   return -ENOSYS;
 }
 
@@ -1133,7 +1133,7 @@ static inline void stm3240g_lcdinitialize(void)
 
 int board_lcd_initialize(void)
 {
-  lcdvdbg("Initializing\n");
+  lcdinfo("Initializing\n");
 
   /* Configure GPIO pins and configure the FSMC to support the LCD */
 
diff --git a/configs/stm3240g-eval/src/stm32_spi.c b/configs/stm3240g-eval/src/stm32_spi.c
index 5e247d8c35..04ec6d37f6 100644
--- a/configs/stm3240g-eval/src/stm32_spi.c
+++ b/configs/stm3240g-eval/src/stm32_spi.c
@@ -65,14 +65,14 @@
 #ifdef SPI_DEBUG
 #  define spidbg  lldbg
 #  ifdef SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/stm3240g-eval/src/stm32_stmpe811.c b/configs/stm3240g-eval/src/stm32_stmpe811.c
index 30b06c1250..87a4a3e4b9 100644
--- a/configs/stm3240g-eval/src/stm32_stmpe811.c
+++ b/configs/stm3240g-eval/src/stm32_stmpe811.c
@@ -211,7 +211,7 @@ static int stmpe811_attach(FAR struct stmpe811_config_s *state, xcpt_t isr)
 {
   FAR struct stm32_stmpe811config_s *priv = (FAR struct stm32_stmpe811config_s *)state;
 
-  ivdbg("Saving handler %p\n", isr);
+  iinfo("Saving handler %p\n", isr);
   DEBUGASSERT(priv);
 
   /* Just save the handler.  We will use it when EXTI interruptsare enabled */
@@ -286,7 +286,7 @@ int board_tsc_setup(int minor)
 
   if (!g_stmpe811config.handle)
     {
-      ivdbg("Initializing\n");
+      iinfo("Initializing\n");
 
       /* Configure the STMPE811 interrupt pin as an input */
 
diff --git a/configs/stm3240g-eval/src/stm32_usb.c b/configs/stm3240g-eval/src/stm32_usb.c
index 449c80af8e..d4943f02ce 100644
--- a/configs/stm3240g-eval/src/stm32_usb.c
+++ b/configs/stm3240g-eval/src/stm32_usb.c
@@ -106,13 +106,13 @@ static int usbhost_waiter(int argc, char *argv[])
 {
   struct usbhost_hubport_s *hport;
 
-  uvdbg("Running\n");
+  uinfo("Running\n");
   for (;;)
     {
       /* Wait for the device to change state */
 
       DEBUGVERIFY(CONN_WAIT(g_usbconn, &hport));
-      uvdbg("%s\n", hport->connected ? "connected" : "disconnected");
+      uinfo("%s\n", hport->connected ? "connected" : "disconnected");
 
       /* Did we just become connected? */
 
@@ -176,7 +176,7 @@ int stm32_usbhost_initialize(void)
    * that we care about:
    */
 
-  uvdbg("Register class drivers\n");
+  uinfo("Register class drivers\n");
 
 #ifdef CONFIG_USBHOST_MSC
   /* Register the USB mass storage class class */
@@ -200,13 +200,13 @@ int stm32_usbhost_initialize(void)
 
   /* Then get an instance of the USB host interface */
 
-  uvdbg("Initialize USB host\n");
+  uinfo("Initialize USB host\n");
   g_usbconn = stm32_otgfshost_initialize(0);
   if (g_usbconn)
     {
       /* Start a thread to handle device connection. */
 
-      uvdbg("Start usbhost_waiter\n");
+      uinfo("Start usbhost_waiter\n");
 
       pid = task_create("usbhost", CONFIG_USBHOST_DEFPRIO,
                         CONFIG_USBHOST_STACKSIZE,
diff --git a/configs/stm3240g-eval/src/stm32_userleds.c b/configs/stm3240g-eval/src/stm32_userleds.c
index dfe40d9bdb..dd3d70ea52 100644
--- a/configs/stm3240g-eval/src/stm32_userleds.c
+++ b/configs/stm3240g-eval/src/stm32_userleds.c
@@ -63,10 +63,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/stm32_tiny/src/stm32_leds.c b/configs/stm32_tiny/src/stm32_leds.c
index 0b0e464368..21329e76e9 100644
--- a/configs/stm32_tiny/src/stm32_leds.c
+++ b/configs/stm32_tiny/src/stm32_leds.c
@@ -62,10 +62,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
@@ -78,7 +78,7 @@
 
 static inline void set_led(bool v)
 {
-  ledvdbg("Turn LED %s\n", v? "on":"off");
+  ledinfo("Turn LED %s\n", v? "on":"off");
   stm32_gpiowrite(GPIO_LED, v);
 }
 
@@ -103,7 +103,7 @@ void board_autoled_initialize(void)
 
 void board_autoled_on(int led)
 {
-  ledvdbg("board_autoled_on(%d)\n",led);
+  ledinfo("board_autoled_on(%d)\n",led);
   switch (led)
     {
     case LED_STARTED:
diff --git a/configs/stm32_tiny/src/stm32_spi.c b/configs/stm32_tiny/src/stm32_spi.c
index 4a20fe6a1a..a5867cd70a 100644
--- a/configs/stm32_tiny/src/stm32_spi.c
+++ b/configs/stm32_tiny/src/stm32_spi.c
@@ -68,13 +68,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
@@ -104,7 +104,7 @@ void stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32_SPI2
 #  ifdef CONFIG_WL_NRF24L01
   /* Configure the SPI-based NRF24L01 chip select GPIO */
-  spivdbg("Configure GPIO for SPI2/CS\n");
+  spiinfo("Configure GPIO for SPI2/CS\n");
   stm32_configgpio(GPIO_NRF24L01_CS);
 #  endif
 #endif
@@ -153,7 +153,7 @@ void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sele
   {
 #ifdef CONFIG_WL_NRF24L01
     case SPIDEV_WIRELESS:
-      spivdbg("nRF24L01 device %s\n", selected ? "asserted" : "de-asserted");
+      spiinfo("nRF24L01 device %s\n", selected ? "asserted" : "de-asserted");
 
       /* Set the GPIO low to select and high to de-select */
 
diff --git a/configs/stm32_tiny/src/stm32_wireless.c b/configs/stm32_tiny/src/stm32_wireless.c
index 5a8b6b0da9..81e51afc85 100644
--- a/configs/stm32_tiny/src/stm32_wireless.c
+++ b/configs/stm32_tiny/src/stm32_wireless.c
@@ -79,7 +79,7 @@ static xcpt_t g_isr;
 
 static int stm32tiny_wl_irq_attach(xcpt_t isr)
 {
-  vdbg("Attach IRQ\n");
+  info("Attach IRQ\n");
   g_isr = isr;
   stm32_gpiosetevent(GPIO_NRF24L01_IRQ, false, true, false, g_isr);
   return OK;
@@ -87,7 +87,7 @@ static int stm32tiny_wl_irq_attach(xcpt_t isr)
 
 static void stm32tiny_wl_chip_enable(bool enable)
 {
-  vdbg("CE:%d\n", enable);
+  info("CE:%d\n", enable);
   stm32_gpiowrite(GPIO_NRF24L01_CE, enable);
 }
 
diff --git a/configs/stm32f103-minimum/src/stm32_autoleds.c b/configs/stm32f103-minimum/src/stm32_autoleds.c
index 73e84298bf..5be7c7c885 100644
--- a/configs/stm32f103-minimum/src/stm32_autoleds.c
+++ b/configs/stm32f103-minimum/src/stm32_autoleds.c
@@ -62,10 +62,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
@@ -74,7 +74,7 @@
 
 static inline void set_led(bool v)
 {
-  ledvdbg("Turn LED %s\n", v? "on":"off");
+  ledinfo("Turn LED %s\n", v? "on":"off");
   stm32_gpiowrite(GPIO_LED, !v);
 }
 
@@ -100,7 +100,7 @@ void board_autoled_initialize(void)
 
 void board_autoled_on(int led)
 {
-  ledvdbg("board_autoled_on(%d)\n",led);
+  ledinfo("board_autoled_on(%d)\n",led);
 
   switch (led)
     {
diff --git a/configs/stm32f103-minimum/src/stm32_spi.c b/configs/stm32f103-minimum/src/stm32_spi.c
index 78f9a96265..6781b25ed8 100644
--- a/configs/stm32f103-minimum/src/stm32_spi.c
+++ b/configs/stm32f103-minimum/src/stm32_spi.c
@@ -68,13 +68,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/stm32f3discovery/src/stm32_autoleds.c b/configs/stm32f3discovery/src/stm32_autoleds.c
index 5012ccdd14..f62159c156 100644
--- a/configs/stm32f3discovery/src/stm32_autoleds.c
+++ b/configs/stm32f3discovery/src/stm32_autoleds.c
@@ -62,10 +62,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/stm32f3discovery/src/stm32_qencoder.c b/configs/stm32f3discovery/src/stm32_qencoder.c
index 88a45c0722..c3773e552c 100644
--- a/configs/stm32f3discovery/src/stm32_qencoder.c
+++ b/configs/stm32f3discovery/src/stm32_qencoder.c
@@ -145,7 +145,7 @@ int qe_devinit(void)
     {
       /* Initialize a quadrature encoder interface. */
 
-      snvdbg("Initializing the quadrature encoder using TIM%d\n", TIMID);
+      sninfo("Initializing the quadrature encoder using TIM%d\n", TIMID);
       ret = stm32_qeinitialize("/dev/qe0", TIMID);
       if (ret < 0)
         {
diff --git a/configs/stm32f3discovery/src/stm32_spi.c b/configs/stm32f3discovery/src/stm32_spi.c
index 6c8b28869e..2a9f8e1464 100644
--- a/configs/stm32f3discovery/src/stm32_spi.c
+++ b/configs/stm32f3discovery/src/stm32_spi.c
@@ -66,14 +66,14 @@
 #ifdef SPI_DEBUG
 #  define spidbg  lldbg
 #  ifdef SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/stm32f3discovery/src/stm32_userleds.c b/configs/stm32f3discovery/src/stm32_userleds.c
index 68e9105f67..1dbe43d762 100644
--- a/configs/stm32f3discovery/src/stm32_userleds.c
+++ b/configs/stm32f3discovery/src/stm32_userleds.c
@@ -61,10 +61,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/stm32f429i-disco/src/stm32_autoleds.c b/configs/stm32f429i-disco/src/stm32_autoleds.c
index ccc969c027..6c417c9856 100644
--- a/configs/stm32f429i-disco/src/stm32_autoleds.c
+++ b/configs/stm32f429i-disco/src/stm32_autoleds.c
@@ -64,10 +64,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /* The following definitions map the encoded LED setting to GPIO settings */
diff --git a/configs/stm32f429i-disco/src/stm32_ili93414ws.c b/configs/stm32f429i-disco/src/stm32_ili93414ws.c
index 58dad6eae2..b83d16b061 100644
--- a/configs/stm32f429i-disco/src/stm32_ili93414ws.c
+++ b/configs/stm32f429i-disco/src/stm32_ili93414ws.c
@@ -136,10 +136,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg       dbg
-#  define lcdvdbg      vdbg
+#  define lcdinfo      info
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 /****************************************************************************
@@ -1021,7 +1021,7 @@ static int stm32_ili93414ws_sendcmd(
 
   stm32_ili93414ws_set8bitmode(priv);
 
-  lcdvdbg("cmd=%04x\n", bw);
+  lcdinfo("cmd=%04x\n", bw);
   stm32_ili93414ws_cmddata(lcd, true);
   ret = stm32_ili93414ws_sendblock(priv, &bw, 1);
   stm32_ili93414ws_cmddata(lcd, false);
@@ -1055,7 +1055,7 @@ static int stm32_ili93414ws_sendparam(FAR struct ili9341_lcd_s *lcd,
 
   stm32_ili93414ws_set8bitmode(priv);
 
-  lcdvdbg("param=%04x\n", bw);
+  lcdinfo("param=%04x\n", bw);
   return stm32_ili93414ws_sendblock(priv, &bw, 1);
 }
 
@@ -1081,7 +1081,7 @@ static int stm32_ili93414ws_sendgram(FAR struct ili9341_lcd_s *lcd,
 {
   FAR struct ili93414ws_lcd_s *priv = (FAR struct ili93414ws_lcd_s *)lcd;
 
-  lcdvdbg("wd=%p, nwords=%d\n", wd, nwords);
+  lcdinfo("wd=%p, nwords=%d\n", wd, nwords);
 
   /* Set to 16-bit mode transfer mode, spi device is in disabled state */
 
@@ -1117,7 +1117,7 @@ static int stm32_ili93414ws_recvparam(FAR struct ili9341_lcd_s *lcd,
   stm32_ili93414ws_set8bitmode(priv);
 #endif
 
-  lcdvdbg("param=%04x\n", param);
+  lcdinfo("param=%04x\n", param);
   return stm32_ili93414ws_recvblock(priv, (uint16_t*)param, 1);
 }
 
@@ -1143,7 +1143,7 @@ static int stm32_ili93414ws_recvgram(FAR struct ili9341_lcd_s *lcd,
 {
   FAR struct ili93414ws_lcd_s *priv = (FAR struct ili93414ws_lcd_s *)lcd;
 
-  lcdvdbg("wd=%p, nwords=%d\n", wd, nwords);
+  lcdinfo("wd=%p, nwords=%d\n", wd, nwords);
 
   /* Set to 16-bit mode in disabled state */
 
@@ -1176,7 +1176,7 @@ FAR struct ili9341_lcd_s *stm32_ili93414ws_initialize(void)
 
   lcddbg("initialize ili9341 4-wire serial subdriver\n");
 
-  lcdvdbg("initialize spi device: %d\n", ILI93414WS_SPI_DEVICE);
+  lcdinfo("initialize spi device: %d\n", ILI93414WS_SPI_DEVICE);
   spi = stm32_spi5initialize();
 
   if (spi)
@@ -1236,7 +1236,7 @@ FAR struct ili9341_lcd_s *stm32_ili93414ws_initialize(void)
 
   /* Configure to bidirectional transfer mode */
 
-  lcdvdbg("Configure spi device %d to bidirectional transfer mode\n",
+  lcdinfo("Configure spi device %d to bidirectional transfer mode\n",
             ILI93414WS_SPI_DEVICE);
 
   stm32_ili93414ws_spiconfig(&priv->dev);
diff --git a/configs/stm32f429i-disco/src/stm32_lcd.c b/configs/stm32f429i-disco/src/stm32_lcd.c
index 2f527abc81..40edd632c4 100644
--- a/configs/stm32f429i-disco/src/stm32_lcd.c
+++ b/configs/stm32f429i-disco/src/stm32_lcd.c
@@ -336,25 +336,25 @@ static int stm32_ili9341_initialize(void)
 
   /* Reset the lcd display to the default state */
 
-  vdbg("ili9341 LCD driver: Software Reset\n");
+  info("ili9341 LCD driver: Software Reset\n");
   lcd->sendcmd(lcd, ILI9341_SOFTWARE_RESET);
   up_mdelay(5);
 
-  vdbg("ili9341 LCD driver: set Memory Access Control %08x\n",
+  info("ili9341 LCD driver: set Memory Access Control %08x\n",
         STM32_ILI9341_MADCTL_PARAM);
   lcd->sendcmd(lcd, ILI9341_MEMORY_ACCESS_CONTROL);
   lcd->sendparam(lcd, STM32_ILI9341_MADCTL_PARAM);
 
   /* Pixel Format */
 
-  vdbg("ili9341 LCD driver: Set Pixel Format: %02x\n",
+  info("ili9341 LCD driver: Set Pixel Format: %02x\n",
           STM32_ILI9341_PIXSET_PARAM);
   lcd->sendcmd(lcd, ILI9341_PIXEL_FORMAT_SET);
   lcd->sendparam(lcd, STM32_ILI9341_PIXSET_PARAM);
 
   /* Select column */
 
-  vdbg("ili9341 LCD driver: Set Column Address\n");
+  info("ili9341 LCD driver: Set Column Address\n");
   lcd->sendcmd(lcd, ILI9341_COLUMN_ADDRESS_SET);
   lcd->sendparam(lcd, 0);
   lcd->sendparam(lcd, 0);
@@ -363,7 +363,7 @@ static int stm32_ili9341_initialize(void)
 
   /* Select page */
 
-  vdbg("ili9341 LCD driver: Set Page Address\n");
+  info("ili9341 LCD driver: Set Page Address\n");
   lcd->sendcmd(lcd, ILI9341_PAGE_ADDRESS_SET);
   lcd->sendparam(lcd, 0);
   lcd->sendparam(lcd, 0);
@@ -372,14 +372,14 @@ static int stm32_ili9341_initialize(void)
 
   /* RGB Interface signal control */
 
-  vdbg("ili9341 LCD driver: Set RGB Interface signal control: %02x\n",
+  info("ili9341 LCD driver: Set RGB Interface signal control: %02x\n",
           STM32_ILI9341_IFMODE_PARAM);
   lcd->sendcmd(lcd, ILI9341_RGB_SIGNAL_CONTROL);
   lcd->sendparam(lcd, STM32_ILI9341_IFMODE_PARAM);
 
   /* Interface control */
 
-  vdbg("ili9341 LCD driver: Set Interface control: %d:%d:%d\n",
+  info("ili9341 LCD driver: Set Interface control: %d:%d:%d\n",
           STM32_ILI9341_IFCTL_PARAM1,
           STM32_ILI9341_IFCTL_PARAM2,
           STM32_ILI9341_IFCTL_PARAM3);
@@ -391,13 +391,13 @@ static int stm32_ili9341_initialize(void)
 
   /* Sleep out set to the end */
 
-  vdbg("ili9341 LCD driver: Sleep Out\n");
+  info("ili9341 LCD driver: Sleep Out\n");
   lcd->sendcmd(lcd, ILI9341_SLEEP_OUT);
   up_mdelay(5); /* 120? */
 
   /* Display on */
 
-  vdbg("ili9341 LCD driver: Display On\n");
+  info("ili9341 LCD driver: Display On\n");
   lcd->sendcmd(lcd, ILI9341_DISPLAY_ON);
 
   /* Deselect spi device */
diff --git a/configs/stm32f429i-disco/src/stm32_spi.c b/configs/stm32f429i-disco/src/stm32_spi.c
index 5021da5108..f0d4890eec 100644
--- a/configs/stm32f429i-disco/src/stm32_spi.c
+++ b/configs/stm32f429i-disco/src/stm32_spi.c
@@ -68,14 +68,14 @@
 #ifdef SPI_DEBUG
 #  define spidbg  lldbg
 #  ifdef SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/stm32f429i-disco/src/stm32_usb.c b/configs/stm32f429i-disco/src/stm32_usb.c
index 291c025730..0295efd903 100644
--- a/configs/stm32f429i-disco/src/stm32_usb.c
+++ b/configs/stm32f429i-disco/src/stm32_usb.c
@@ -102,13 +102,13 @@ static int usbhost_waiter(int argc, char *argv[])
 {
   struct usbhost_hubport_s *hport;
 
-  uvdbg("Running\n");
+  uinfo("Running\n");
   for (;;)
     {
       /* Wait for the device to change state */
 
       DEBUGVERIFY(CONN_WAIT(g_usbconn, &hport));
-      uvdbg("%s\n", hport->connected ? "connected" : "disconnected");
+      uinfo("%s\n", hport->connected ? "connected" : "disconnected");
 
       /* Did we just become connected? */
 
@@ -172,7 +172,7 @@ int stm32_usbhost_initialize(void)
    * that we care about:
    */
 
-  uvdbg("Register class drivers\n");
+  uinfo("Register class drivers\n");
 
 #ifdef CONFIG_USBHOST_HUB
   /* Initialize USB hub class support */
@@ -206,13 +206,13 @@ int stm32_usbhost_initialize(void)
 
   /* Then get an instance of the USB host interface */
 
-  uvdbg("Initialize USB host\n");
+  uinfo("Initialize USB host\n");
   g_usbconn = stm32_otghshost_initialize(0);
   if (g_usbconn)
     {
       /* Start a thread to handle device connection. */
 
-      uvdbg("Start usbhost_waiter\n");
+      uinfo("Start usbhost_waiter\n");
 
       pid = task_create("usbhost", CONFIG_STM32F429IDISCO_USBHOST_PRIO,
                         CONFIG_STM32F429IDISCO_USBHOST_STACKSIZE,
diff --git a/configs/stm32f429i-disco/src/stm32_userleds.c b/configs/stm32f429i-disco/src/stm32_userleds.c
index 39a13c477e..11513057f8 100644
--- a/configs/stm32f429i-disco/src/stm32_userleds.c
+++ b/configs/stm32f429i-disco/src/stm32_userleds.c
@@ -64,10 +64,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/stm32f4discovery/src/stm32_autoleds.c b/configs/stm32f4discovery/src/stm32_autoleds.c
index 69d78d70bb..70888d40a3 100644
--- a/configs/stm32f4discovery/src/stm32_autoleds.c
+++ b/configs/stm32f4discovery/src/stm32_autoleds.c
@@ -64,10 +64,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /* The following definitions map the encoded LED setting to GPIO settings */
diff --git a/configs/stm32f4discovery/src/stm32_ethernet.c b/configs/stm32f4discovery/src/stm32_ethernet.c
index b3bf643434..e9d53a9a49 100644
--- a/configs/stm32f4discovery/src/stm32_ethernet.c
+++ b/configs/stm32f4discovery/src/stm32_ethernet.c
@@ -217,7 +217,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
   xcpt_t oldhandler;
   irqstate_t flags;
 
-  nvdbg("%s: handler=%p\n", intf, handler);
+  ninfo("%s: handler=%p\n", intf, handler);
   phydbg("ETHMAC: devname=%s\n", STM32_ETHMAC_DEVNAME);
 
   DEBUGASSERT(intf);
diff --git a/configs/stm32f4discovery/src/stm32_qencoder.c b/configs/stm32f4discovery/src/stm32_qencoder.c
index 823c846cf7..3ff1a64656 100644
--- a/configs/stm32f4discovery/src/stm32_qencoder.c
+++ b/configs/stm32f4discovery/src/stm32_qencoder.c
@@ -145,7 +145,7 @@ int qe_devinit(void)
     {
       /* Initialize a quadrature encoder interface. */
 
-      snvdbg("Initializing the quadrature encoder using TIM%d\n", TIMID);
+      sninfo("Initializing the quadrature encoder using TIM%d\n", TIMID);
       ret = stm32_qeinitialize("/dev/qe0", TIMID);
       if (ret < 0)
         {
diff --git a/configs/stm32f4discovery/src/stm32_sdio.c b/configs/stm32f4discovery/src/stm32_sdio.c
index 7d28442cf3..9ba6931767 100644
--- a/configs/stm32f4discovery/src/stm32_sdio.c
+++ b/configs/stm32f4discovery/src/stm32_sdio.c
@@ -134,7 +134,7 @@ int stm32_sdio_initialize(void)
   /* Mount the SDIO-based MMC/SD block driver */
   /* First, get an instance of the SDIO interface */
 
-  fvdbg("Initializing SDIO slot %d\n", SDIO_SLOTNO);
+  finfo("Initializing SDIO slot %d\n", SDIO_SLOTNO);
 
   g_sdio_dev = sdio_initialize(SDIO_SLOTNO);
   if (!g_sdio_dev)
@@ -145,7 +145,7 @@ int stm32_sdio_initialize(void)
 
   /* Now bind the SDIO interface to the MMC/SD driver */
 
-  fvdbg("Bind SDIO to the MMC/SD driver, minor=%d\n", SDIO_MINOR);
+  finfo("Bind SDIO to the MMC/SD driver, minor=%d\n", SDIO_MINOR);
 
   ret = mmcsd_slotinitialize(SDIO_MINOR, g_sdio_dev);
   if (ret != OK)
@@ -154,13 +154,13 @@ int stm32_sdio_initialize(void)
       return ret;
     }
 
-  fvdbg("Successfully bound SDIO to the MMC/SD driver\n");
+  finfo("Successfully bound SDIO to the MMC/SD driver\n");
 
 #ifdef HAVE_NCD
   /* Use SD card detect pin to check if a card is g_sd_inserted */
 
   cd_status = !stm32_gpioread(GPIO_SDIO_NCD);
-  fvdbg("Card detect : %d\n", cd_status);
+  finfo("Card detect : %d\n", cd_status);
 
   sdio_mediachange(g_sdio_dev, cd_status);
 #else
diff --git a/configs/stm32f4discovery/src/stm32_spi.c b/configs/stm32f4discovery/src/stm32_spi.c
index f057b874d4..62713692ef 100644
--- a/configs/stm32f4discovery/src/stm32_spi.c
+++ b/configs/stm32f4discovery/src/stm32_spi.c
@@ -67,14 +67,14 @@
 #ifdef SPI_DEBUG
 #  define spidbg  lldbg
 #  ifdef SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/stm32f4discovery/src/stm32_ssd1289.c b/configs/stm32f4discovery/src/stm32_ssd1289.c
index a9ceb9f90a..dbb1642ec2 100644
--- a/configs/stm32f4discovery/src/stm32_ssd1289.c
+++ b/configs/stm32f4discovery/src/stm32_ssd1289.c
@@ -111,10 +111,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg         dbg
-#  define lcdvdbg        vdbg
+#  define lcdinfo        info
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 /**************************************************************************************
@@ -355,7 +355,7 @@ int board_lcd_initialize(void)
 
   if (!g_ssd1289drvr)
     {
-      lcdvdbg("Initializing\n");
+      lcdinfo("Initializing\n");
 
       /* Configure GPIO pins and configure the FSMC to support the LCD */
 
diff --git a/configs/stm32f4discovery/src/stm32_ssd1351.c b/configs/stm32f4discovery/src/stm32_ssd1351.c
index 26e77e8ee0..a40f72bebc 100644
--- a/configs/stm32f4discovery/src/stm32_ssd1351.c
+++ b/configs/stm32f4discovery/src/stm32_ssd1351.c
@@ -75,10 +75,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg(format, ...)  dbg(format, ##__VA_ARGS__)
-#  define lcdvdbg(format, ...) vdbg(format, ##__VA_ARGS__)
+#  define lcdinfo(format, ...) info(format, ##__VA_ARGS__)
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 /****************************************************************************
@@ -127,7 +127,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
         }
      else
         {
-          lcdvdbg("Bound SPI port 1 to OLED %d\n", devno);
+          lcdinfo("Bound SPI port 1 to OLED %d\n", devno);
 
           /* And turn the OLED on */
 
diff --git a/configs/stm32f4discovery/src/stm32_ug2864ambag01.c b/configs/stm32f4discovery/src/stm32_ug2864ambag01.c
index 24e5c84034..b3a82051f4 100644
--- a/configs/stm32f4discovery/src/stm32_ug2864ambag01.c
+++ b/configs/stm32f4discovery/src/stm32_ug2864ambag01.c
@@ -97,10 +97,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg(format, ...)   dbg(format, ##__VA_ARGS__)
-#  define lcdvdbg(format, ...)  vdbg(format, ##__VA_ARGS__)
+#  define lcdinfo(format, ...)  info(format, ##__VA_ARGS__)
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 /****************************************************************************
@@ -149,7 +149,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
         }
      else
         {
-          lcdvdbg("Bound SPI port 1 to OLED %d\n", devno);
+          lcdinfo("Bound SPI port 1 to OLED %d\n", devno);
 
           /* And turn the OLED on */
 
diff --git a/configs/stm32f4discovery/src/stm32_ug2864hsweg01.c b/configs/stm32f4discovery/src/stm32_ug2864hsweg01.c
index 78c24bc368..1366879530 100644
--- a/configs/stm32f4discovery/src/stm32_ug2864hsweg01.c
+++ b/configs/stm32f4discovery/src/stm32_ug2864hsweg01.c
@@ -97,10 +97,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg(format, ...)   dbg(format, ##__VA_ARGS__)
-#  define lcdvdbg(format, ...)  vdbg(format, ##__VA_ARGS__)
+#  define lcdinfo(format, ...)  info(format, ##__VA_ARGS__)
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 /****************************************************************************
@@ -149,7 +149,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
         }
      else
         {
-          lcdvdbg("Bound SPI port 1 to OLED %d\n", devno);
+          lcdinfo("Bound SPI port 1 to OLED %d\n", devno);
 
           /* And turn the OLED on */
 
diff --git a/configs/stm32f4discovery/src/stm32_usb.c b/configs/stm32f4discovery/src/stm32_usb.c
index 24f35f726a..11a722aa13 100644
--- a/configs/stm32f4discovery/src/stm32_usb.c
+++ b/configs/stm32f4discovery/src/stm32_usb.c
@@ -102,13 +102,13 @@ static int usbhost_waiter(int argc, char *argv[])
 {
   struct usbhost_hubport_s *hport;
 
-  uvdbg("Running\n");
+  uinfo("Running\n");
   for (;;)
     {
       /* Wait for the device to change state */
 
       DEBUGVERIFY(CONN_WAIT(g_usbconn, &hport));
-      uvdbg("%s\n", hport->connected ? "connected" : "disconnected");
+      uinfo("%s\n", hport->connected ? "connected" : "disconnected");
 
       /* Did we just become connected? */
 
@@ -175,7 +175,7 @@ int stm32_usbhost_initialize(void)
    * that we care about:
    */
 
-  uvdbg("Register class drivers\n");
+  uinfo("Register class drivers\n");
 
 #ifdef CONFIG_USBHOST_HUB
   /* Initialize USB hub class support */
@@ -229,13 +229,13 @@ int stm32_usbhost_initialize(void)
 
   /* Then get an instance of the USB host interface */
 
-  uvdbg("Initialize USB host\n");
+  uinfo("Initialize USB host\n");
   g_usbconn = stm32_otgfshost_initialize(0);
   if (g_usbconn)
     {
       /* Start a thread to handle device connection. */
 
-      uvdbg("Start usbhost_waiter\n");
+      uinfo("Start usbhost_waiter\n");
 
       pid = task_create("usbhost", CONFIG_STM32F4DISCO_USBHOST_PRIO,
                         CONFIG_STM32F4DISCO_USBHOST_STACKSIZE,
diff --git a/configs/stm32f4discovery/src/stm32_userleds.c b/configs/stm32f4discovery/src/stm32_userleds.c
index 93a7d8c35b..1359e81689 100644
--- a/configs/stm32f4discovery/src/stm32_userleds.c
+++ b/configs/stm32f4discovery/src/stm32_userleds.c
@@ -65,10 +65,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/stm32f4discovery/src/stm32_zerocross.c b/configs/stm32f4discovery/src/stm32_zerocross.c
index 2315476448..e31ebbd066 100644
--- a/configs/stm32f4discovery/src/stm32_zerocross.c
+++ b/configs/stm32f4discovery/src/stm32_zerocross.c
@@ -111,7 +111,7 @@ static void zcross_enable(FAR const struct zc_lowerhalf_s *lower,
   flags = enter_critical_section();
   zcross_disable();
 
-  snllvdbg("handler: %p arg: %p\n", handler, arg);
+  snllinfo("handler: %p arg: %p\n", handler, arg);
 
   if (handler)
     {
diff --git a/configs/stm32f746g-disco/src/stm32_autoleds.c b/configs/stm32f746g-disco/src/stm32_autoleds.c
index 4f3a3573bc..5cb07a6939 100644
--- a/configs/stm32f746g-disco/src/stm32_autoleds.c
+++ b/configs/stm32f746g-disco/src/stm32_autoleds.c
@@ -59,10 +59,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/stm32f746g-disco/src/stm32_spi.c b/configs/stm32f746g-disco/src/stm32_spi.c
index 38f62be076..3530c3c5d7 100644
--- a/configs/stm32f746g-disco/src/stm32_spi.c
+++ b/configs/stm32f746g-disco/src/stm32_spi.c
@@ -64,14 +64,14 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
 #  ifdef SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/stm32f746g-disco/src/stm32_userleds.c b/configs/stm32f746g-disco/src/stm32_userleds.c
index 0bccc352d6..5107c78900 100644
--- a/configs/stm32f746g-disco/src/stm32_userleds.c
+++ b/configs/stm32f746g-disco/src/stm32_userleds.c
@@ -57,10 +57,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/stm32l476vg-disco/src/stm32_autoleds.c b/configs/stm32l476vg-disco/src/stm32_autoleds.c
index 21f8aaac78..4114e983a5 100644
--- a/configs/stm32l476vg-disco/src/stm32_autoleds.c
+++ b/configs/stm32l476vg-disco/src/stm32_autoleds.c
@@ -64,10 +64,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/stm32l476vg-disco/src/stm32_spi.c b/configs/stm32l476vg-disco/src/stm32_spi.c
index 612bd76c65..ed1d224c7b 100644
--- a/configs/stm32l476vg-disco/src/stm32_spi.c
+++ b/configs/stm32l476vg-disco/src/stm32_spi.c
@@ -69,13 +69,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/stm32l476vg-disco/src/stm32_userleds.c b/configs/stm32l476vg-disco/src/stm32_userleds.c
index f7d0822b4f..da3d0a389c 100644
--- a/configs/stm32l476vg-disco/src/stm32_userleds.c
+++ b/configs/stm32l476vg-disco/src/stm32_userleds.c
@@ -64,10 +64,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/stm32ldiscovery/src/stm32_autoleds.c b/configs/stm32ldiscovery/src/stm32_autoleds.c
index 10b717725c..d59ffbea7d 100644
--- a/configs/stm32ldiscovery/src/stm32_autoleds.c
+++ b/configs/stm32ldiscovery/src/stm32_autoleds.c
@@ -79,10 +79,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/stm32ldiscovery/src/stm32_lcd.c b/configs/stm32ldiscovery/src/stm32_lcd.c
index cc6ff19d43..e90f9b018b 100644
--- a/configs/stm32ldiscovery/src/stm32_lcd.c
+++ b/configs/stm32ldiscovery/src/stm32_lcd.c
@@ -263,10 +263,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg              dbg
-#  define lcdvdbg             vdbg
+#  define lcdinfo             info
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 /****************************************************************************
@@ -443,16 +443,16 @@ static uint32_t g_slcdgpio[BOARD_SLCD_NGPIOS] =
 #if defined(CONFIG_DEBUG_LCD) && defined(CONFIG_DEBUG_INFO)
 static void slcd_dumpstate(FAR const char *msg)
 {
-  lcdvdbg("%s:\n", msg);
-  lcdvdbg("  curpos: %d\n",
+  lcdinfo("%s:\n", msg);
+  lcdinfo("  curpos: %d\n",
           g_slcdstate.curpos);
-  lcdvdbg("  Display: [%c%c%c%c%c%c]\n",
+  lcdinfo("  Display: [%c%c%c%c%c%c]\n",
           g_slcdstate.buffer[0], g_slcdstate.buffer[1], g_slcdstate.buffer[2],
           g_slcdstate.buffer[3], g_slcdstate.buffer[4], g_slcdstate.buffer[5]);
-  lcdvdbg("  Options: [%d%d%d%d%d%d]\n",
+  lcdinfo("  Options: [%d%d%d%d%d%d]\n",
           g_slcdstate.options[0], g_slcdstate.options[1], g_slcdstate.options[2],
           g_slcdstate.options[3], g_slcdstate.options[4], g_slcdstate.options[5]);
-  lcdvdbg("  Bar:     %02x %02x\n",
+  lcdinfo("  Bar:     %02x %02x\n",
           g_slcdstate.bar[0], g_slcdstate.bar[1]);
 }
 #endif
@@ -464,11 +464,11 @@ static void slcd_dumpstate(FAR const char *msg)
 #if defined(CONFIG_DEBUG_LCD) && defined(CONFIG_DEBUG_INFO)
 static void slcd_dumpslcd(FAR const char *msg)
 {
-  lcdvdbg("%s:\n", msg);
-  lcdvdbg("  CR: %08x FCR: %08x SR: %08x CLR: %08x\n",
+  lcdinfo("%s:\n", msg);
+  lcdinfo("  CR: %08x FCR: %08x SR: %08x CLR: %08x\n",
           getreg32(STM32_LCD_CR), getreg32(STM32_LCD_FCR),
           getreg32(STM32_LCD_SR), getreg32(STM32_LCD_CLR));
-  lcdvdbg("  RAM0L: %08x RAM1L: %08x RAM2L: %08x RAM3L: %08x\n",
+  lcdinfo("  RAM0L: %08x RAM1L: %08x RAM2L: %08x RAM3L: %08x\n",
           getreg32(STM32_LCD_RAM0L), getreg32(STM32_LCD_RAM1L),
           getreg32(STM32_LCD_RAM2L), getreg32(STM32_LCD_RAM3L));
 }
@@ -482,7 +482,7 @@ static void slcd_clear(void)
 {
   uint32_t regaddr;
 
-  lvdbg("Clearing\n");
+  linfo("Clearing\n");
 
   /* Make sure that any previous transfer is complete.  The firmware sets
    * the UDR each it modifies the LCD_RAM. The UDR bit stays set until the
@@ -565,7 +565,7 @@ static int slcd_setcontrast(uint8_t contrast)
   regval |= contrast << LCD_FCR_CC_SHIFT;
   putreg32(regval, STM32_LCD_FCR);
 
-  lcdvdbg("contrast: %d FCR: %08x\n",
+  lcdinfo("contrast: %d FCR: %08x\n",
           getreg32(STM32_LCD_FCR), contrast);
 
   return ret;
@@ -579,7 +579,7 @@ static void slcd_writebar(void)
 {
   uint32_t regval;
 
-  lcdvdbg("bar: %02x %02x\n", g_slcdstate.bar[0], g_slcdstate.bar[1]);
+  lcdinfo("bar: %02x %02x\n", g_slcdstate.bar[0], g_slcdstate.bar[1]);
   slcd_dumpslcd("BEFORE WRITE");
 
   /* Make sure that any previous transfer is complete.  The firmware sets
@@ -695,7 +695,7 @@ static inline void slcd_writemem(uint16_t segset, int curpos)
   int i;
   int j;
 
-  lcdvdbg("segset: %04x curpos: %d\n", segset, curpos);
+  lcdinfo("segset: %04x curpos: %d\n", segset, curpos);
   slcd_dumpslcd("BEFORE WRITE");
 
   /* Isolate the least significant bits
@@ -714,7 +714,7 @@ static inline void slcd_writemem(uint16_t segset, int curpos)
       segments[j] = (segset >> i) & 0x0f;
     }
 
-  lcdvdbg("segments: %02x %02x %02x %02x\n",
+  lcdinfo("segments: %02x %02x %02x %02x\n",
           segments[0], segments[1], segments[2], segments[3]);
 
   /* Make sure that any previous transfer is complete.  The firmware sets
@@ -859,7 +859,7 @@ static void slcd_writech(uint8_t ch, uint8_t curpos, uint8_t options)
       segset |= 0x0020;
     }
 
-  lcdvdbg("ch: [%c] options: %02x segset: %04x\n", ch, options, segset);
+  lcdinfo("ch: [%c] options: %02x segset: %04x\n", ch, options, segset);
 
   /* Decode the value and write it to the SLCD segment memory */
 
@@ -879,7 +879,7 @@ static void slcd_writech(uint8_t ch, uint8_t curpos, uint8_t options)
 
 static void slcd_appendch(uint8_t ch, uint8_t options)
 {
-  lcdvdbg("ch: [%c] options: %02x\n", ch, options);
+  lcdinfo("ch: [%c] options: %02x\n", ch, options);
 
   /* Write the character at the current cursor position */
 
@@ -898,7 +898,7 @@ static void slcd_appendch(uint8_t ch, uint8_t options)
 
 static void slcd_action(enum slcdcode_e code, uint8_t count)
 {
-  lcdvdbg("Action: %d count: %d\n", code, count);
+  lcdinfo("Action: %d count: %d\n", code, count);
   slcd_dumpstate("BEFORE ACTION");
 
   switch (code)
@@ -1152,7 +1152,7 @@ static ssize_t slcd_write(FAR struct file *filep,
   memset(&state, 0, sizeof(struct slcdstate_s));
   result = slcd_decode(&instream.stream, &state, &prev, &count);
 
-  lcdvdbg("slcd_decode returned result=%d char=%d count=%d\n",
+  lcdinfo("slcd_decode returned result=%d char=%d count=%d\n",
            result, prev, count);
 
   switch (result)
@@ -1176,7 +1176,7 @@ static ssize_t slcd_write(FAR struct file *filep,
 
   while ((result = slcd_decode(&instream.stream, &state, &ch, &count)) != SLCDRET_EOF)
     {
-      lcdvdbg("slcd_decode returned result=%d char=%d count=%d\n",
+      lcdinfo("slcd_decode returned result=%d char=%d count=%d\n",
               result, ch, count);
 
       if (result == SLCDRET_CHAR)          /* A normal character was returned */
@@ -1329,7 +1329,7 @@ static int slcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
         {
           FAR struct slcd_attributes_s *attr = (FAR struct slcd_attributes_s *)((uintptr_t)arg);
 
-          lcdvdbg("SLCDIOC_GETATTRIBUTES:\n");
+          lcdinfo("SLCDIOC_GETATTRIBUTES:\n");
 
           if (!attr)
             {
@@ -1354,7 +1354,7 @@ static int slcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
         {
           FAR struct slcd_curpos_s *curpos = (FAR struct slcd_curpos_s *)((uintptr_t)arg);
 
-          lcdvdbg("SLCDIOC_CURPOS: row=0 column=%d\n", g_slcdstate.curpos);
+          lcdinfo("SLCDIOC_CURPOS: row=0 column=%d\n", g_slcdstate.curpos);
 
           if (!curpos)
             {
@@ -1373,7 +1373,7 @@ static int slcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case SLCDIOC_SETBAR:
         {
-          lcdvdbg("SLCDIOC_SETBAR: arg=0x%02lx\n", arg);
+          lcdinfo("SLCDIOC_SETBAR: arg=0x%02lx\n", arg);
 
           /* Format the bar */
 
@@ -1421,7 +1421,7 @@ static int slcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
             }
 
           *contrast = (int)slcd_getcontrast();
-          lcdvdbg("SLCDIOC_GETCONTRAST: contrast=%d\n", *contrast);
+          lcdinfo("SLCDIOC_GETCONTRAST: contrast=%d\n", *contrast);
         }
         break;
 
@@ -1432,7 +1432,7 @@ static int slcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case SLCDIOC_SETCONTRAST:
         {
-          lcdvdbg("SLCDIOC_SETCONTRAST: arg=%ld\n", arg);
+          lcdinfo("SLCDIOC_SETCONTRAST: arg=%ld\n", arg);
 
           if (arg > SLCD_MAXCONTRAST)
             {
@@ -1498,7 +1498,7 @@ int stm32_slcd_initialize(void)
 
   if (!g_slcdstate.initialized)
     {
-      lcdvdbg("Initializing\n");
+      lcdinfo("Initializing\n");
 
       /* Configure LCD GPIO pins */
 
@@ -1515,7 +1515,7 @@ int stm32_slcd_initialize(void)
 
       stm32_rcc_enablelse();
 
-      lcdvdbg("APB1ENR: %08x CSR: %08x\n",
+      lcdinfo("APB1ENR: %08x CSR: %08x\n",
               getreg32(STM32_RCC_APB1ENR), getreg32(STM32_RCC_CSR));
 
       /* Set the LCD prescaler and divider values */
@@ -1527,7 +1527,7 @@ int stm32_slcd_initialize(void)
 
       /* Wait for the FCRSF flag to be set */
 
-      lcdvdbg("Wait for FCRSF, FSR: %08x SR: %08x\n",
+      lcdinfo("Wait for FCRSF, FSR: %08x SR: %08x\n",
               getreg32(STM32_LCD_FCR), getreg32(STM32_LCD_SR));
 
       while ((getreg32(STM32_LCD_SR) & LCD_SR_FCRSF) == 0);
@@ -1564,7 +1564,7 @@ int stm32_slcd_initialize(void)
 
       /* Wait Until the LCD FCR register is synchronized */
 
-      lcdvdbg("Wait for FCRSF, FSR: %08x SR: %08x\n",
+      lcdinfo("Wait for FCRSF, FSR: %08x SR: %08x\n",
               getreg32(STM32_LCD_FCR), getreg32(STM32_LCD_SR));
 
       while ((getreg32(STM32_LCD_SR) & LCD_SR_FCRSF) == 0);
@@ -1575,7 +1575,7 @@ int stm32_slcd_initialize(void)
 
       /* Wait Until the LCD is enabled and the LCD booster is ready */
 
-      lcdvdbg("Wait for LCD_SR_ENS and LCD_SR_RDY, CR: %08x SR: %08x\n",
+      lcdinfo("Wait for LCD_SR_ENS and LCD_SR_RDY, CR: %08x SR: %08x\n",
               getreg32(STM32_LCD_CR), getreg32(STM32_LCD_SR));
 
       while ((getreg32(STM32_LCD_SR) & (LCD_SR_ENS | LCD_SR_RDY)) != (LCD_SR_ENS | LCD_SR_RDY));
diff --git a/configs/stm32ldiscovery/src/stm32_qencoder.c b/configs/stm32ldiscovery/src/stm32_qencoder.c
index e765750692..c1336ac6fc 100644
--- a/configs/stm32ldiscovery/src/stm32_qencoder.c
+++ b/configs/stm32ldiscovery/src/stm32_qencoder.c
@@ -146,7 +146,7 @@ int qe_devinit(void)
     {
       /* Initialize a quadrature encoder interface. */
 
-      snvdbg("Initializing the quadrature encoder using TIM%d\n", TIMID);
+      sninfo("Initializing the quadrature encoder using TIM%d\n", TIMID);
       ret = stm32_qeinitialize("/dev/qe0", TIMID);
       if (ret < 0)
         {
diff --git a/configs/stm32ldiscovery/src/stm32_spi.c b/configs/stm32ldiscovery/src/stm32_spi.c
index b56ed221fb..deb88a0339 100644
--- a/configs/stm32ldiscovery/src/stm32_spi.c
+++ b/configs/stm32ldiscovery/src/stm32_spi.c
@@ -67,14 +67,14 @@
 #ifdef SPI_DEBUG
 #  define spidbg  lldbg
 #  ifdef SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/stm32ldiscovery/src/stm32_userleds.c b/configs/stm32ldiscovery/src/stm32_userleds.c
index 759b78a803..8ba7f81ecd 100644
--- a/configs/stm32ldiscovery/src/stm32_userleds.c
+++ b/configs/stm32ldiscovery/src/stm32_userleds.c
@@ -61,10 +61,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/stm32vldiscovery/src/stm32_leds.c b/configs/stm32vldiscovery/src/stm32_leds.c
index 65158af6d1..e4392c1c93 100644
--- a/configs/stm32vldiscovery/src/stm32_leds.c
+++ b/configs/stm32vldiscovery/src/stm32_leds.c
@@ -64,10 +64,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/sure-pic32mx/src/pic32mx_autoleds.c b/configs/sure-pic32mx/src/pic32mx_autoleds.c
index 9f1619e5c8..f03ebd1f09 100644
--- a/configs/sure-pic32mx/src/pic32mx_autoleds.c
+++ b/configs/sure-pic32mx/src/pic32mx_autoleds.c
@@ -91,15 +91,15 @@
 #if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS)
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledvdbg lldbg
+#    define ledinfo lldbg
 #  else
-#    define ledvdbg(x...)
+#    define ledinfo(x...)
 #  endif
 #else
 #  undef CONFIG_DEBUG_LEDS
 #  undef CONFIG_DEBUG_INFO
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/sure-pic32mx/src/pic32mx_lcd1602.c b/configs/sure-pic32mx/src/pic32mx_lcd1602.c
index afd1f1696c..7c6480505c 100644
--- a/configs/sure-pic32mx/src/pic32mx_lcd1602.c
+++ b/configs/sure-pic32mx/src/pic32mx_lcd1602.c
@@ -145,10 +145,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg         dbg
-#  define lcdvdbg        vdbg
+#  define lcdinfo        info
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 /****************************************************************************
@@ -251,8 +251,8 @@ static void lcd_dumpstate(FAR const char *msg)
   int row;
   int column;
 
-  lcdvdbg("%s:\n", msg);
-  lcdvdbg("  currow: %d curcol: %d\n",
+  lcdinfo("%s:\n", msg);
+  lcdinfo("  currow: %d curcol: %d\n",
           g_lcd1602.currow, g_lcd1602.curcol);
 
   for (row = 0, column = 0; row < LCD_NROWS; )
@@ -261,7 +261,7 @@ static void lcd_dumpstate(FAR const char *msg)
       buffer[column] = isprint(ch) ? ch : '.';
       if (++column >= LCD_NCOLUMNS)
         {
-          lcdvdbg("  [%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c]\n",
+          lcdinfo("  [%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c]\n",
                   buffer[0],  buffer[1],  buffer[2],  buffer[3],
                   buffer[4],  buffer[5],  buffer[6],  buffer[7],
                   buffer[8],  buffer[9],  buffer[10], buffer[11],
@@ -282,8 +282,8 @@ static void lcd_dumpstate(FAR const char *msg)
 static void lcd_dumpstream(FAR const char *msg,
                            FAR const struct lcd_instream_s *stream)
 {
-  lcdvdbg("%s:\n", msg);
-  lcdvdbg("  nget: %d nbytes: %d\n",
+  lcdinfo("%s:\n", msg);
+  lcdinfo("  nget: %d nbytes: %d\n",
           stream->stream.nget, stream->nbytes);
   lib_dumpbuffer("STREAM", stream->buffer, stream->nbytes);
 }
@@ -592,7 +592,7 @@ static void lcd_appendch(uint8_t ch)
 
 static void lcd_action(enum slcdcode_e code, uint8_t count)
 {
-  lcdvdbg("Action: %d count: %d\n", code, count);
+  lcdinfo("Action: %d count: %d\n", code, count);
   lcd_dumpstate("BEFORE ACTION");
 
   switch (code)
@@ -874,7 +874,7 @@ static ssize_t lcd_write(FAR struct file *filep,  FAR const char *buffer,
   memset(&state, 0, sizeof(struct slcdstate_s));
   while ((result = slcd_decode(&instream.stream, &state, &ch, &count)) != SLCDRET_EOF)
     {
-      lcdvdbg("slcd_decode returned result=%d char=%d count=%d\n",
+      lcdinfo("slcd_decode returned result=%d char=%d count=%d\n",
               result, ch, count);
 
       if (result == SLCDRET_CHAR)          /* A normal character was returned */
@@ -951,7 +951,7 @@ static int lcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
         {
           FAR struct slcd_attributes_s *attr = (FAR struct slcd_attributes_s *)((uintptr_t)arg);
 
-          lcdvdbg("SLCDIOC_GETATTRIBUTES:\n");
+          lcdinfo("SLCDIOC_GETATTRIBUTES:\n");
 
           if (!attr)
             {
@@ -977,7 +977,7 @@ static int lcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
         {
           FAR struct slcd_curpos_s *curpos = (FAR struct slcd_curpos_s *)((uintptr_t)arg);
 
-          lcdvdbg("SLCDIOC_CURPOS: row=%d column=%d\n", g_lcd1602.currow, g_lcd1602.curcol);
+          lcdinfo("SLCDIOC_CURPOS: row=%d column=%d\n", g_lcd1602.currow, g_lcd1602.curcol);
 
           if (!curpos)
             {
@@ -1004,7 +1004,7 @@ static int lcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
             }
 
           *brightness = (int)g_lcd1602.brightness;
-          lcdvdbg("SLCDIOC_GETCONTRAST: brightness=%d\n", *brightness);
+          lcdinfo("SLCDIOC_GETCONTRAST: brightness=%d\n", *brightness);
         }
         break;
 
@@ -1015,7 +1015,7 @@ static int lcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case SLCDIOC_SETBRIGHTNESS:
         {
-          lcdvdbg("SLCDIOC_SETCONTRAST: arg=%ld\n", arg);
+          lcdinfo("SLCDIOC_SETCONTRAST: arg=%ld\n", arg);
 
           if (arg > CONFIG_LCD_MAXPOWER)
             {
@@ -1079,7 +1079,7 @@ int up_lcd1602_initialize(void)
 
   if (!g_lcd1602.initialized)
     {
-      lcdvdbg("Initializing\n");
+      lcdinfo("Initializing\n");
 
       /* Configure GPIO pins */
 
diff --git a/configs/sure-pic32mx/src/pic32mx_spi.c b/configs/sure-pic32mx/src/pic32mx_spi.c
index a959d083f4..28207c49ef 100644
--- a/configs/sure-pic32mx/src/pic32mx_spi.c
+++ b/configs/sure-pic32mx/src/pic32mx_spi.c
@@ -132,13 +132,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
@@ -203,7 +203,7 @@ void weak_function pic32mx_spidev_initialize(void)
 #ifdef CONFIG_PIC32MX_SPI2
 void pic32mx_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spivdbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
   /* The SD card chip select is pulled high and active low */
 
@@ -263,7 +263,7 @@ uint8_t pic32mx_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
     }
 #endif
 
-  spivdbg("Returning %d\n", ret);
+  spiinfo("Returning %d\n", ret);
   return ret;
 }
 #endif
diff --git a/configs/teensy-2.0/src/at90usb_leds.c b/configs/teensy-2.0/src/at90usb_leds.c
index ad564a2cda..19aa4eb5a9 100644
--- a/configs/teensy-2.0/src/at90usb_leds.c
+++ b/configs/teensy-2.0/src/at90usb_leds.c
@@ -64,13 +64,13 @@
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledvdbg lldbg
+#    define ledinfo lldbg
 #  else
-#    define ledvdbg(x...)
+#    define ledinfo(x...)
 #  endif
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/teensy-2.0/src/at90usb_spi.c b/configs/teensy-2.0/src/at90usb_spi.c
index 77422d601e..015ace6b4d 100644
--- a/configs/teensy-2.0/src/at90usb_spi.c
+++ b/configs/teensy-2.0/src/at90usb_spi.c
@@ -89,14 +89,14 @@
 #ifdef CONFIG_SPI_DEBUG
 #  define sspdbg  lldbg
 #  ifdef CONFIG_SPI_VERBOSE
-#    define sspvdbg lldbg
+#    define sspinfo lldbg
 #  else
-#    define sspvdbg(x...)
+#    define sspinfo(x...)
 #  endif
 #else
 #  undef CONFIG_SPI_VERBOSE
 #  define sspdbg(x...)
-#  define sspvdbg(x...)
+#  define sspinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/teensy-3.x/src/k20_spi.c b/configs/teensy-3.x/src/k20_spi.c
index edd63b4135..8e3c3fb222 100644
--- a/configs/teensy-3.x/src/k20_spi.c
+++ b/configs/teensy-3.x/src/k20_spi.c
@@ -62,14 +62,14 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
 #  ifdef CONFIG_DEBUG_SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef CONFIG_DEBUG_SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/teensy-lc/src/kl_led.c b/configs/teensy-lc/src/kl_led.c
index 4c417a76e6..783df86163 100644
--- a/configs/teensy-lc/src/kl_led.c
+++ b/configs/teensy-lc/src/kl_led.c
@@ -63,13 +63,13 @@
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledvdbg lldbg
+#    define ledinfo lldbg
 #  else
-#    define ledvdbg(x...)
+#    define ledinfo(x...)
 #  endif
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/teensy-lc/src/kl_spi.c b/configs/teensy-lc/src/kl_spi.c
index 0b2a1d3cc5..2dcb86c62c 100644
--- a/configs/teensy-lc/src/kl_spi.c
+++ b/configs/teensy-lc/src/kl_spi.c
@@ -60,13 +60,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /****************************************************************************
@@ -155,7 +155,7 @@ void weak_function kl_spidev_initialize(void)
 void kl_spi0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
                    bool selected)
 {
-  spivdbg("devid: %d CS: %s\n",
+  spiinfo("devid: %d CS: %s\n",
            (int)devid, selected ? "assert" : "de-assert");
 }
 #endif
@@ -164,7 +164,7 @@ void kl_spi0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
 void kl_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
                    bool selected)
 {
-  spivdbg("devid: %d CS: %s\n",
+  spiinfo("devid: %d CS: %s\n",
            (int)devid, selected ? "assert" : "de-assert");
 }
 #endif
diff --git a/configs/tm4c123g-launchpad/src/tm4c_autoleds.c b/configs/tm4c123g-launchpad/src/tm4c_autoleds.c
index 4189f7297a..918de86f7d 100644
--- a/configs/tm4c123g-launchpad/src/tm4c_autoleds.c
+++ b/configs/tm4c123g-launchpad/src/tm4c_autoleds.c
@@ -103,10 +103,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /* Dump GPIO registers */
diff --git a/configs/tm4c123g-launchpad/src/tm4c_ssi.c b/configs/tm4c123g-launchpad/src/tm4c_ssi.c
index f49c9f9eb5..52c049f984 100644
--- a/configs/tm4c123g-launchpad/src/tm4c_ssi.c
+++ b/configs/tm4c123g-launchpad/src/tm4c_ssi.c
@@ -70,10 +70,10 @@
 /* Dump GPIO registers */
 
 #if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO)
-#  define ssivdbg lldbg
+#  define ssiinfo lldbg
 #  define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m)
 #else
-#  define ssivdbg(x...)
+#  define ssiinfo(x...)
 #  define ssi_dumpgpio(m)
 #endif
 
diff --git a/configs/tm4c1294-launchpad/src/tm4c_timer.c b/configs/tm4c1294-launchpad/src/tm4c_timer.c
index 0d661307c3..39b20919cb 100644
--- a/configs/tm4c1294-launchpad/src/tm4c_timer.c
+++ b/configs/tm4c1294-launchpad/src/tm4c_timer.c
@@ -101,7 +101,7 @@ int tiva_timer_configure(void)
 {
   int ret;
 
-  timvdbg("Registering TIMER%d at %s\n",
+  timinfo("Registering TIMER%d at %s\n",
           GPTM, CONFIG_TM4C1294_LAUNCHPAD_TIMER_DEVNAME);
 
   ret = tiva_timer_register(CONFIG_TM4C1294_LAUNCHPAD_TIMER_DEVNAME,
diff --git a/configs/tm4c1294-launchpad/src/tm4c_userleds.c b/configs/tm4c1294-launchpad/src/tm4c_userleds.c
index 743fcce239..d5c79ef522 100644
--- a/configs/tm4c1294-launchpad/src/tm4c_userleds.c
+++ b/configs/tm4c1294-launchpad/src/tm4c_userleds.c
@@ -73,10 +73,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/twr-k60n512/src/k60_leds.c b/configs/twr-k60n512/src/k60_leds.c
index b8274c1eb3..5e7cc58e65 100644
--- a/configs/twr-k60n512/src/k60_leds.c
+++ b/configs/twr-k60n512/src/k60_leds.c
@@ -125,10 +125,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/twr-k60n512/src/k60_spi.c b/configs/twr-k60n512/src/k60_spi.c
index 8aa48e369b..2e08636ce6 100644
--- a/configs/twr-k60n512/src/k60_spi.c
+++ b/configs/twr-k60n512/src/k60_spi.c
@@ -62,14 +62,14 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
 #  ifdef CONFIG_DEBUG_SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef CONFIG_DEBUG_SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/u-blox-c027/src/lpc17_leds.c b/configs/u-blox-c027/src/lpc17_leds.c
index bd92242ddc..0b141fe6c8 100644
--- a/configs/u-blox-c027/src/lpc17_leds.c
+++ b/configs/u-blox-c027/src/lpc17_leds.c
@@ -63,13 +63,13 @@
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledvdbg lldbg
+#    define ledinfo lldbg
 #  else
-#    define ledvdbg(x...)
+#    define ledinfo(x...)
 #  endif
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/u-blox-c027/src/lpc17_ssp.c b/configs/u-blox-c027/src/lpc17_ssp.c
index 640732aa47..2655f043be 100644
--- a/configs/u-blox-c027/src/lpc17_ssp.c
+++ b/configs/u-blox-c027/src/lpc17_ssp.c
@@ -66,14 +66,14 @@
 #ifdef SSP_DEBUG
 #  define sspdbg  lldbg
 #  ifdef SSP_VERBOSE
-#    define sspvdbg lldbg
+#    define sspinfo lldbg
 #  else
-#    define sspvdbg(x...)
+#    define sspinfo(x...)
 #  endif
 #else
 #  undef SSP_VERBOSE
 #  define sspdbg(x...)
-#  define sspvdbg(x...)
+#  define sspinfo(x...)
 #endif
 
 /* Dump GPIO registers */
diff --git a/configs/u-blox-c027/src/lpc17_ubxmdm.c b/configs/u-blox-c027/src/lpc17_ubxmdm.c
index a6615e54aa..0bcd837b4a 100644
--- a/configs/u-blox-c027/src/lpc17_ubxmdm.c
+++ b/configs/u-blox-c027/src/lpc17_ubxmdm.c
@@ -63,14 +63,14 @@
 
 #ifdef CONFIG_MODEM_U_BLOX_DEBUG
 #  define m_dbg    dbg
-#  define m_vdbg   vdbg
+#  define m_info   info
 #  define m_vlldbg  lldbg
-#  define m_vllvdbg llvdbg
+#  define m_vllinfo llinfo
 #else
 #  define m_dbg(x...)
-#  define m_vdbg(x...)
+#  define m_info(x...)
 #  define m_lldbg(x...)
-#  define m_llvdbg(x...)
+#  define m_llinfo(x...)
 #endif
 
 #define UBXMDM_REGISTER_COUNT                           \
diff --git a/configs/ubw32/src/pic32_leds.c b/configs/ubw32/src/pic32_leds.c
index fdcf200f9f..d6d492cda5 100644
--- a/configs/ubw32/src/pic32_leds.c
+++ b/configs/ubw32/src/pic32_leds.c
@@ -100,15 +100,15 @@
 #if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS)
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledvdbg lldbg
+#    define ledinfo lldbg
 #  else
-#    define ledvdbg(x...)
+#    define ledinfo(x...)
 #  endif
 #else
 #  undef CONFIG_DEBUG_LEDS
 #  undef CONFIG_DEBUG_INFO
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/us7032evb1/shterm/shterm.c b/configs/us7032evb1/shterm/shterm.c
index 83284d493b..0913f61dcf 100644
--- a/configs/us7032evb1/shterm/shterm.c
+++ b/configs/us7032evb1/shterm/shterm.c
@@ -63,7 +63,7 @@
 #define DEFAULT_BAUD 9600
 
 #define dbg(format, ...)  if (debug > 0) printconsole(format, ##__VA_ARGS__)
-#define vdbg(format, ...) if (debug > 1) printconsole(format, ##__VA_ARGS__)
+#define info(format, ...) if (debug > 1) printconsole(format, ##__VA_ARGS__)
 
 /****************************************************************************
  * Private Types
diff --git a/configs/viewtool-stm32f107/src/stm32_can.c b/configs/viewtool-stm32f107/src/stm32_can.c
index c6d0616ee3..8e3a6b38a0 100644
--- a/configs/viewtool-stm32f107/src/stm32_can.c
+++ b/configs/viewtool-stm32f107/src/stm32_can.c
@@ -66,14 +66,14 @@
 
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
-#  define canvdbg   vdbg
+#  define caninfo   info
 #  define canlldbg  lldbg
-#  define canllvdbg llvdbg
+#  define canllinfo llinfo
 #else
 #  define candbg(x...)
-#  define canvdbg(x...)
+#  define caninfo(x...)
 #  define canlldbg(x...)
-#  define canllvdbg(x...)
+#  define canllinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/viewtool-stm32f107/src/stm32_leds.c b/configs/viewtool-stm32f107/src/stm32_leds.c
index 7a565bf5b7..49cac84523 100644
--- a/configs/viewtool-stm32f107/src/stm32_leds.c
+++ b/configs/viewtool-stm32f107/src/stm32_leds.c
@@ -59,10 +59,10 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
-#  define ledvdbg llvdbg
+#  define ledinfo llinfo
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/viewtool-stm32f107/src/stm32_mmcsd.c b/configs/viewtool-stm32f107/src/stm32_mmcsd.c
index 0ca39d6b06..bc10a38cee 100644
--- a/configs/viewtool-stm32f107/src/stm32_mmcsd.c
+++ b/configs/viewtool-stm32f107/src/stm32_mmcsd.c
@@ -104,7 +104,7 @@ int stm32_sdinitialize(int minor)
       return -ENODEV;
     }
 
-  fvdbg("Initialized SDIO slot %d\n", STM32_MMCSDSLOTNO);
+  finfo("Initialized SDIO slot %d\n", STM32_MMCSDSLOTNO);
 
   /* Now bind the SDIO interface to the MMC/SD driver */
 
@@ -115,7 +115,7 @@ int stm32_sdinitialize(int minor)
               STM32_MMCSDSLOTNO, minor);
     }
 
-  fvdbg("Bound SDIO slot %d to the MMC/SD driver, minor=%d\n",
+  finfo("Bound SDIO slot %d to the MMC/SD driver, minor=%d\n",
          STM32_MMCSDSLOTNO, minor);
 
   /* Then let's guess and say that there is a card in the slot.  I need to check to
diff --git a/configs/viewtool-stm32f107/src/stm32_spi.c b/configs/viewtool-stm32f107/src/stm32_spi.c
index 6f9cca78b2..398416010b 100644
--- a/configs/viewtool-stm32f107/src/stm32_spi.c
+++ b/configs/viewtool-stm32f107/src/stm32_spi.c
@@ -65,14 +65,14 @@
 #ifdef SPI_DEBUG
 #  define spidbg  lldbg
 #  ifdef SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/viewtool-stm32f107/src/stm32_ssd1289.c b/configs/viewtool-stm32f107/src/stm32_ssd1289.c
index 8c83d34ea9..69fe2590a0 100644
--- a/configs/viewtool-stm32f107/src/stm32_ssd1289.c
+++ b/configs/viewtool-stm32f107/src/stm32_ssd1289.c
@@ -105,10 +105,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg         dbg
-#  define lcdvdbg        vdbg
+#  define lcdinfo        info
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 /**************************************************************************************
@@ -548,7 +548,7 @@ int board_lcd_initialize(void)
 
   if (!g_ssd1289drvr)
     {
-      lcdvdbg("Initializing\n");
+      lcdinfo("Initializing\n");
 
       /* Initialize the backlight */
 
diff --git a/configs/viewtool-stm32f107/src/stm32_touchscreen.c b/configs/viewtool-stm32f107/src/stm32_touchscreen.c
index 7106fcdc96..85b7295427 100644
--- a/configs/viewtool-stm32f107/src/stm32_touchscreen.c
+++ b/configs/viewtool-stm32f107/src/stm32_touchscreen.c
@@ -173,12 +173,12 @@ static int tsc_attach(FAR struct ads7843e_config_s *state, xcpt_t isr)
        * be attached when the interrupt is next enabled.
        */
 
-      ivdbg("Attaching %p\n", isr);
+      iinfo("Attaching %p\n", isr);
       priv->handler = isr;
     }
   else
     {
-      ivdbg("Detaching %p\n", priv->handler);
+      iinfo("Detaching %p\n", priv->handler);
       tsc_enable(state, false);
       priv->handler = NULL;
     }
@@ -228,7 +228,7 @@ static bool tsc_pendown(FAR struct ads7843e_config_s *state)
   /* The /PENIRQ value is active low */
 
   bool pendown = !stm32_gpioread(GPIO_LCDTP_IRQ);
-  ivdbg("pendown=%d\n", pendown);
+  iinfo("pendown=%d\n", pendown);
   return pendown;
 }
 
diff --git a/configs/zkit-arm-1769/src/lpc17_can.c b/configs/zkit-arm-1769/src/lpc17_can.c
index 4d63da365b..89e5550973 100644
--- a/configs/zkit-arm-1769/src/lpc17_can.c
+++ b/configs/zkit-arm-1769/src/lpc17_can.c
@@ -71,14 +71,14 @@
 
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
-#  define canvdbg   vdbg
+#  define caninfo   info
 #  define canlldbg  lldbg
-#  define canllvdbg llvdbg
+#  define canllinfo llinfo
 #else
 #  define candbg(x...)
-#  define canvdbg(x...)
+#  define caninfo(x...)
 #  define canlldbg(x...)
-#  define canllvdbg(x...)
+#  define canllinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/zkit-arm-1769/src/lpc17_lcd.c b/configs/zkit-arm-1769/src/lpc17_lcd.c
index 80da662a76..a196c48e61 100644
--- a/configs/zkit-arm-1769/src/lpc17_lcd.c
+++ b/configs/zkit-arm-1769/src/lpc17_lcd.c
@@ -78,14 +78,14 @@
 #ifdef LCD_DEBUG
 #  define leddbg  lldbg
 #  ifdef LCD_VERBOSE
-#    define ledvdbg lldbg
+#    define ledinfo lldbg
 #  else
-#    define ledvdbg(x...)
+#    define ledinfo(x...)
 #  endif
 #else
 #  undef LCD_VERBOSE
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
@@ -141,7 +141,7 @@ FAR struct lcd_dev_s *board_lcd_getdev(int lcddev)
     }
   else
     {
-      gllvdbg("Bound SSI port 0 to OLCD %d\n", lcddev);
+      gllinfo("Bound SSI port 0 to OLCD %d\n", lcddev);
 
       /* And turn the OLCD on (CONFIG_LCD_MAXPOWER should be 1) */
       (void)g_lcddev->setpower(g_lcddev, CONFIG_LCD_MAXPOWER);
diff --git a/configs/zkit-arm-1769/src/lpc17_leds.c b/configs/zkit-arm-1769/src/lpc17_leds.c
index a96f0678fb..75f62c931a 100644
--- a/configs/zkit-arm-1769/src/lpc17_leds.c
+++ b/configs/zkit-arm-1769/src/lpc17_leds.c
@@ -69,13 +69,13 @@
 #ifdef CONFIG_DEBUG_LEDS
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledvdbg lldbg
+#    define ledinfo lldbg
 #  else
-#    define ledvdbg(x...)
+#    define ledinfo(x...)
 #  endif
 #else
 #  define leddbg(x...)
-#  define ledvdbg(x...)
+#  define ledinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/configs/zkit-arm-1769/src/lpc17_spi.c b/configs/zkit-arm-1769/src/lpc17_spi.c
index 98a2cc7839..8a74fa0880 100644
--- a/configs/zkit-arm-1769/src/lpc17_spi.c
+++ b/configs/zkit-arm-1769/src/lpc17_spi.c
@@ -68,13 +68,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /* Dump GPIO registers */
diff --git a/configs/zkit-arm-1769/src/lpc17_ssp.c b/configs/zkit-arm-1769/src/lpc17_ssp.c
index fdf95550a5..b0e65a378b 100644
--- a/configs/zkit-arm-1769/src/lpc17_ssp.c
+++ b/configs/zkit-arm-1769/src/lpc17_ssp.c
@@ -68,13 +68,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define sspdbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define sspvdbg lldbg
+#    define sspinfo lldbg
 #  else
-#    define sspvdbg(x...)
+#    define sspinfo(x...)
 #  endif
 #else
 #  define sspdbg(x...)
-#  define sspvdbg(x...)
+#  define sspinfo(x...)
 #endif
 
 /* Dump GPIO registers */
diff --git a/configs/zp214xpa/src/lpc2148_spi1.c b/configs/zp214xpa/src/lpc2148_spi1.c
index 1b621d9263..06d4853c87 100644
--- a/configs/zp214xpa/src/lpc2148_spi1.c
+++ b/configs/zp214xpa/src/lpc2148_spi1.c
@@ -92,13 +92,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /* Clocking */
@@ -546,7 +546,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw
        * and (3) there are more bytes to be sent.
        */
 
-      spivdbg("TX: rxpending: %d nwords: %d\n", rxpending, nwords);
+      spiinfo("TX: rxpending: %d nwords: %d\n", rxpending, nwords);
       while ((getreg8(LPC214X_SPI1_SR) & LPC214X_SPI1SR_TNF) &&
              (rxpending < LPC214X_SPI1_FIFOSZ) && nwords)
         {
@@ -557,7 +557,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw
 
       /* Now, read the RX data from the RX FIFO while the RX FIFO is not empty */
 
-      spivdbg("RX: rxpending: %d\n", rxpending);
+      spiinfo("RX: rxpending: %d\n", rxpending);
       while (getreg8(LPC214X_SPI1_SR) & LPC214X_SPI1SR_RNE)
         {
           *ptr++ = (uint8_t)getreg16(LPC214X_SPI1_DR);
diff --git a/configs/zp214xpa/src/lpc2148_ug2864ambag01.c b/configs/zp214xpa/src/lpc2148_ug2864ambag01.c
index c857b43ba8..ed20003a58 100644
--- a/configs/zp214xpa/src/lpc2148_ug2864ambag01.c
+++ b/configs/zp214xpa/src/lpc2148_ug2864ambag01.c
@@ -101,10 +101,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg(format, ...)   dbg(format, ##__VA_ARGS__)
-#  define lcdvdbg(format, ...)  vdbg(format, ##__VA_ARGS__)
+#  define lcdinfo(format, ...)  info(format, ##__VA_ARGS__)
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 /****************************************************************************
@@ -143,7 +143,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
   regval32 = getreg32(RESET_DIR_REGISTER);
   putreg32(regval32 | bits32, RESET_DIR_REGISTER);
 
-  lcdvdbg("RESET Pin Config: PINSEL1: %08x PIN: %08x DIR: %08x\n",
+  lcdinfo("RESET Pin Config: PINSEL1: %08x PIN: %08x DIR: %08x\n",
           getreg32(LPC214X_PINSEL1), getreg32(RESET_PIN_REGISTER),
           getreg32(RESET_DIR_REGISTER));
 
@@ -152,7 +152,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
   up_mdelay(20);
   putreg32(bits32, RESET_SET_REGISTER);
 
-  lcdvdbg("RESET release: PIN: %08x DIR: %08x\n",
+  lcdinfo("RESET release: PIN: %08x DIR: %08x\n",
           getreg32(RESET_PIN_REGISTER), getreg32(RESET_DIR_REGISTER));
 
   /* Get the SPI1 port interface */
@@ -173,7 +173,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
         }
      else
         {
-          lcdvdbg("Bound SPI port 1 to OLED %d\n", devno);
+          lcdinfo("Bound SPI port 1 to OLED %d\n", devno);
 
           /* And turn the OLED on */
 
diff --git a/crypto/crypto.c b/crypto/crypto.c
index 401417d874..e7c5594eb1 100644
--- a/crypto/crypto.c
+++ b/crypto/crypto.c
@@ -85,7 +85,7 @@ int up_cryptoinitialize(void)
     }
   else
     {
-      cryptllvdbg("crypto test OK\n");
+      cryptllinfo("crypto test OK\n");
     }
 #endif
 
diff --git a/drivers/analog/adc.c b/drivers/analog/adc.c
index 3dc8a4e42c..92dd84d2b2 100644
--- a/drivers/analog/adc.c
+++ b/drivers/analog/adc.c
@@ -233,7 +233,7 @@ static ssize_t adc_read(FAR struct file *filep, FAR char *buffer, size_t buflen)
   int                   ret   = 0;
   int                   msglen;
 
-  avdbg("buflen: %d\n", (int)buflen);
+  ainfo("buflen: %d\n", (int)buflen);
 
   if (buflen % 5 == 0)
     msglen = 5;
@@ -351,7 +351,7 @@ return_with_irqdisabled:
       leave_critical_section(flags);
     }
 
-  avdbg("Returning: %d\n", ret);
+  ainfo("Returning: %d\n", ret);
   return ret;
 }
 
diff --git a/drivers/analog/pga11x.c b/drivers/analog/pga11x.c
index 355cd9b041..ec991e0d06 100644
--- a/drivers/analog/pga11x.c
+++ b/drivers/analog/pga11x.c
@@ -112,13 +112,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg dbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg dbg
+#    define spiinfo dbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /****************************************************************************
@@ -138,7 +138,7 @@
 
 static void pga11x_configure(FAR struct spi_dev_s *spi)
 {
-  spivdbg("MODE: %d BITS: 8 Frequency: %d\n",
+  spiinfo("MODE: %d BITS: 8 Frequency: %d\n",
           CONFIG_PGA11X_SPIMODE, CONFIG_PGA11X_SPIFREQUENCY);
 
   /* Call the setfrequency, setbits, and setmode methods to make sure that
@@ -164,7 +164,7 @@ static void pga11x_configure(FAR struct spi_dev_s *spi)
 
 static void pga11x_lock(FAR struct spi_dev_s *spi)
 {
-  spivdbg("Locking\n");
+  spiinfo("Locking\n");
 
   /* On SPI busses where there are multiple devices, it will be necessary to
    * lock SPI to have exclusive access to the busses for a sequence of
@@ -198,7 +198,7 @@ static void pga11x_lock(FAR struct spi_dev_s *spi)
 
 static inline void pga11x_unlock(FAR struct spi_dev_s *spi)
 {
-  spivdbg("Unlocking\n");
+  spiinfo("Unlocking\n");
 
   SPI_LOCK(spi, false);
 }
@@ -223,7 +223,7 @@ static inline void pga11x_unlock(FAR struct spi_dev_s *spi)
 
 static void pga11x_send16(FAR struct spi_dev_s *spi, uint16_t word)
 {
-  spivdbg("Send %04x\n", word);
+  spiinfo("Send %04x\n", word);
 
   /* The logical interface is 16-bits wide.  However, this driver uses a
    * 8-bit configuration for greaer portability.
@@ -265,7 +265,7 @@ static uint16_t pga11x_recv16(FAR struct spi_dev_s *spi)
 
   msb = SPI_SEND(spi, SPI_DUMMY);
   lsb = SPI_SEND(spi, SPI_DUMMY);
-  spivdbg("Received %02x %02x\n", msb, lsb);
+  spiinfo("Received %02x %02x\n", msb, lsb);
 
   return ((uint16_t)msb << 8) | (uint16_t)lsb;
 }
@@ -293,7 +293,7 @@ static uint16_t pga11x_recv16(FAR struct spi_dev_s *spi)
 #ifndef CONFIG_PGA11X_DAISYCHAIN
 static void pga11x_write(FAR struct spi_dev_s *spi, uint16_t cmd)
 {
-  spivdbg("cmd %04x\n", cmd);
+  spiinfo("cmd %04x\n", cmd);
 
   /* Lock, select, send the 16-bit command, de-select, and un-lock. */
 
@@ -306,7 +306,7 @@ static void pga11x_write(FAR struct spi_dev_s *spi, uint16_t cmd)
 #else
 static void pga11x_write(FAR struct spi_dev_s *spi, uint16_t u1cmd, uint16_t u2cmd)
 {
-  spivdbg("U1 cmd: %04x U2 cmd: %04x\n", u1cmd, u2cmd);
+  spiinfo("U1 cmd: %04x U2 cmd: %04x\n", u1cmd, u2cmd);
 
   /* Lock, select, send the U2 16-bit command, the U1 16-bit command, de-select,
    * and un-lock.
@@ -343,7 +343,7 @@ static void pga11x_write(FAR struct spi_dev_s *spi, uint16_t u1cmd, uint16_t u2c
 
 PGA11X_HANDLE pga11x_initialize(FAR struct spi_dev_s *spi)
 {
-  spivdbg("Entry\n");
+  spiinfo("Entry\n");
 
   /* No Special state is required, just return the SPI driver instance as
    * the handle.  This gives us a place to extend functionality in the
@@ -380,7 +380,7 @@ int pga11x_select(PGA11X_HANDLE handle,
   uint16_t cmd;
 
   DEBUGASSERT(handle && settings);
-  spivdbg("channel: %d gain: %d\n", settings->channel, settings->gain);
+  spiinfo("channel: %d gain: %d\n", settings->channel, settings->gain);
 
   /* Format the command */
 
@@ -398,8 +398,8 @@ int pga11x_select(PGA11X_HANDLE handle,
   uint16_t u2cmd;
 
   DEBUGASSERT(handle && settings);
-  spivdbg("U1 channel: %d gain: %d\n", settings->u1.channel, settings->u1.gain);
-  spivdbg("U1 channel: %d gain: %d\n", settings->u1.channel, settings->u1.gain);
+  spiinfo("U1 channel: %d gain: %d\n", settings->u1.channel, settings->u1.gain);
+  spiinfo("U1 channel: %d gain: %d\n", settings->u1.channel, settings->u1.gain);
 
   /* Format the commands */
 
@@ -445,7 +445,7 @@ int pga11x_uselect(PGA11X_HANDLE handle, int pos,
   uint16_t u1cmd;
   uint16_t u2cmd;
 
-  spivdbg("channel: %d gain: %d\n", settings->channel, settings->gain);
+  spiinfo("channel: %d gain: %d\n", settings->channel, settings->gain);
   DEBUGASSERT(handle);
 
   /* Format the commands */
@@ -498,7 +498,7 @@ int pga11x_read(PGA11X_HANDLE handle, FAR struct pga11x_settings_s *settings)
   uint16_t u1value;
   uint16_t u2value;
 
-  spivdbg("Entry\n");
+  spiinfo("Entry\n");
   DEBUGASSERT(handle && settings);
 
   /* Lock the bus and read the configuration */
@@ -526,7 +526,7 @@ int pga11x_read(PGA11X_HANDLE handle, FAR struct pga11x_settings_s *settings)
 
   /* Decode the returned value */
 
-  spivdbg("Returning %04x %04x\n", u2value, u1value);
+  spiinfo("Returning %04x %04x\n", u2value, u1value);
   settings->u1.channel = (uint8_t)((u1value & PGA11X_CHAN_MASK) >> PGA11X_CHAN_SHIFT);
   settings->u1.gain    = (uint8_t)((u1value & PGA11X_GAIN_MASK) >> PGA11X_GAIN_SHIFT);
   settings->u2.channel = (uint8_t)((u2value & PGA11X_CHAN_MASK) >> PGA11X_CHAN_SHIFT);
@@ -536,7 +536,7 @@ int pga11x_read(PGA11X_HANDLE handle, FAR struct pga11x_settings_s *settings)
   FAR struct spi_dev_s *spi = (FAR struct spi_dev_s *)handle;
   uint16_t value;
 
-  spivdbg("Entry\n");
+  spiinfo("Entry\n");
   DEBUGASSERT(handle);
 
   /* Lock the bus and read the configuration */
@@ -561,7 +561,7 @@ int pga11x_read(PGA11X_HANDLE handle, FAR struct pga11x_settings_s *settings)
 
   /* Decode the returned value */
 
-  spivdbg("Returning: %04x\n", value);
+  spiinfo("Returning: %04x\n", value);
   settings->channel = (uint8_t)((value & PGA11X_CHAN_MASK) >> PGA11X_CHAN_SHIFT);
   settings->gain    = (uint8_t)((value & PGA11X_GAIN_MASK) >> PGA11X_GAIN_SHIFT);
   return OK;
@@ -633,7 +633,7 @@ int pga11x_shutdown(PGA11X_HANDLE handle)
 {
   FAR struct spi_dev_s *spi = (FAR struct spi_dev_s *)handle;
 
-  spivdbg("Entry\n");
+  spiinfo("Entry\n");
   DEBUGASSERT(handle);
 
   /* Enter shutdown mode by issuing an SDN_EN command */
@@ -669,7 +669,7 @@ int pga11x_ushutdown(PGA11X_HANDLE handle, int pos)
 {
   FAR struct spi_dev_s *spi = (FAR struct spi_dev_s *)handle;
 
-  spivdbg("Entry\n");
+  spiinfo("Entry\n");
   DEBUGASSERT(handle);
 
   /* Enter shutdown mode by issuing an SDN_EN command */
@@ -709,7 +709,7 @@ int pga11x_enable(PGA11X_HANDLE handle)
 {
   FAR struct spi_dev_s *spi = (FAR struct spi_dev_s *)handle;
 
-  spivdbg("Entry\n");
+  spiinfo("Entry\n");
   DEBUGASSERT(handle);
 
   /* Lock the bus and send the shutdown disable command.  Shutdown mode is
@@ -748,7 +748,7 @@ int pga11x_uenable(PGA11X_HANDLE handle, int pos)
 {
   FAR struct spi_dev_s *spi = (FAR struct spi_dev_s *)handle;
 
-  spivdbg("Entry\n");
+  spiinfo("Entry\n");
   DEBUGASSERT(handle);
 
   /* Enter shutdown mode by issuing an SDN_EN command */
diff --git a/drivers/audio/audio_null.c b/drivers/audio/audio_null.c
index f5a1337f5c..393eaa1399 100644
--- a/drivers/audio/audio_null.c
+++ b/drivers/audio/audio_null.c
@@ -178,7 +178,7 @@ static const struct audio_ops_s g_audioops =
 static int null_getcaps(FAR struct audio_lowerhalf_s *dev, int type,
                           FAR struct audio_caps_s *caps)
 {
-  audvdbg("type=%d\n", type);
+  audinfo("type=%d\n", type);
 
   /* Validate the structure */
 
@@ -324,7 +324,7 @@ static int null_getcaps(FAR struct audio_lowerhalf_s *dev, int type,
    * proper Audio device type.
    */
 
-  audvdbg("Return %d\n", caps->ac_len);
+  audinfo("Return %d\n", caps->ac_len);
   return caps->ac_len;
 }
 
@@ -345,14 +345,14 @@ static int null_configure(FAR struct audio_lowerhalf_s *dev,
                           FAR const struct audio_caps_s *caps)
 #endif
 {
-  audvdbg("ac_type: %d\n", caps->ac_type);
+  audinfo("ac_type: %d\n", caps->ac_type);
 
   /* Process the configure operation */
 
   switch (caps->ac_type)
     {
     case AUDIO_TYPE_FEATURE:
-      audvdbg("  AUDIO_TYPE_FEATURE\n");
+      audinfo("  AUDIO_TYPE_FEATURE\n");
 
       /* Process based on Feature Unit */
 
@@ -360,17 +360,17 @@ static int null_configure(FAR struct audio_lowerhalf_s *dev,
         {
 #ifndef CONFIG_AUDIO_EXCLUDE_VOLUME
         case AUDIO_FU_VOLUME:
-          audvdbg("    Volume: %d\n", caps->ac_controls.hw[0]);
+          audinfo("    Volume: %d\n", caps->ac_controls.hw[0]);
           break;
 #endif  /* CONFIG_AUDIO_EXCLUDE_VOLUME */
 
 #ifndef CONFIG_AUDIO_EXCLUDE_TONE
         case AUDIO_FU_BASS:
-          audvdbg("    Bass: %d\n", caps->ac_controls.b[0]);
+          audinfo("    Bass: %d\n", caps->ac_controls.b[0]);
           break;
 
         case AUDIO_FU_TREBLE:
-          audvdbg("    Treble: %d\n", caps->ac_controls.b[0]);
+          audinfo("    Treble: %d\n", caps->ac_controls.b[0]);
           break;
 #endif  /* CONFIG_AUDIO_EXCLUDE_TONE */
 
@@ -381,18 +381,18 @@ static int null_configure(FAR struct audio_lowerhalf_s *dev,
       break;
 
     case AUDIO_TYPE_OUTPUT:
-      audvdbg("  AUDIO_TYPE_OUTPUT:\n");
-      audvdbg("    Number of channels: %u\n", caps->ac_channels);
-      audvdbg("    Sample rate:        %u\n", caps->ac_controls.hw[0]);
-      audvdbg("    Sample width:       %u\n", caps->ac_controls.b[2]);
+      audinfo("  AUDIO_TYPE_OUTPUT:\n");
+      audinfo("    Number of channels: %u\n", caps->ac_channels);
+      audinfo("    Sample rate:        %u\n", caps->ac_controls.hw[0]);
+      audinfo("    Sample width:       %u\n", caps->ac_controls.b[2]);
       break;
 
     case AUDIO_TYPE_PROCESSING:
-      audvdbg("  AUDIO_TYPE_PROCESSING:\n");
+      audinfo("  AUDIO_TYPE_PROCESSING:\n");
       break;
     }
 
-  audvdbg("Return OK\n");
+  audinfo("Return OK\n");
   return OK;
 }
 
@@ -406,7 +406,7 @@ static int null_configure(FAR struct audio_lowerhalf_s *dev,
 
 static int null_shutdown(FAR struct audio_lowerhalf_s *dev)
 {
-  audvdbg("Return OK\n");
+  audinfo("Return OK\n");
   return OK;
 }
 
@@ -425,7 +425,7 @@ static void *null_workerthread(pthread_addr_t pvarg)
   int msglen;
   int prio;
 
-  audvdbg("Entry\n");
+  audinfo("Entry\n");
 
   /* Loop as long as we are supposed to be running */
 
@@ -486,7 +486,7 @@ static void *null_workerthread(pthread_addr_t pvarg)
   priv->dev.upper(priv->dev.priv, AUDIO_CALLBACK_COMPLETE, NULL, OK);
 #endif
 
-  audvdbg("Exit\n");
+  audinfo("Exit\n");
   return NULL;
 }
 
@@ -511,7 +511,7 @@ static int null_start(FAR struct audio_lowerhalf_s *dev)
   FAR void *value;
   int ret;
 
-  audvdbg("Entry\n");
+  audinfo("Entry\n");
 
   /* Create a message queue for the worker thread */
 
@@ -535,7 +535,7 @@ static int null_start(FAR struct audio_lowerhalf_s *dev)
 
   if (priv->threadid != 0)
     {
-      audvdbg("Joining old thread\n");
+      audinfo("Joining old thread\n");
       pthread_join(priv->threadid, &value);
     }
 
@@ -546,7 +546,7 @@ static int null_start(FAR struct audio_lowerhalf_s *dev)
   (void)pthread_attr_setschedparam(&tattr, &sparam);
   (void)pthread_attr_setstacksize(&tattr, CONFIG_AUDIO_NULL_WORKER_STACKSIZE);
 
-  audvdbg("Starting worker thread\n");
+  audinfo("Starting worker thread\n");
   ret = pthread_create(&priv->threadid, &tattr, null_workerthread,
                        (pthread_addr_t)priv);
   if (ret != OK)
@@ -556,10 +556,10 @@ static int null_start(FAR struct audio_lowerhalf_s *dev)
   else
     {
       pthread_setname_np(priv->threadid, "null audio");
-      audvdbg("Created worker thread\n");
+      audinfo("Created worker thread\n");
     }
 
-  audvdbg("Return %d\n", ret);
+  audinfo("Return %d\n", ret);
   return ret;
 }
 
@@ -597,7 +597,7 @@ static int null_stop(FAR struct audio_lowerhalf_s *dev)
   pthread_join(priv->threadid, &value);
   priv->threadid = 0;
 
-  audvdbg("Return OK\n");
+  audinfo("Return OK\n");
   return OK;
 }
 #endif
@@ -616,7 +616,7 @@ static int null_pause(FAR struct audio_lowerhalf_s *dev, FAR void *session)
 static int null_pause(FAR struct audio_lowerhalf_s *dev)
 #endif
 {
-  audvdbg("Return OK\n");
+  audinfo("Return OK\n");
   return OK;
 }
 #endif /* CONFIG_AUDIO_EXCLUDE_PAUSE_RESUME */
@@ -635,7 +635,7 @@ static int null_resume(FAR struct audio_lowerhalf_s *dev, FAR void *session)
 static int null_resume(FAR struct audio_lowerhalf_s *dev)
 #endif
 {
-  audvdbg("Return OK\n");
+  audinfo("Return OK\n");
   return OK;
 }
 #endif /* CONFIG_AUDIO_EXCLUDE_PAUSE_RESUME */
@@ -653,7 +653,7 @@ static int null_enqueuebuffer(FAR struct audio_lowerhalf_s *dev,
   FAR struct null_dev_s *priv = (FAR struct null_dev_s *)dev;
   bool done;
 
-  audvdbg("apb=%p curbyte=%d nbytes=%d\n", apb, apb->curbyte, apb->nbytes);
+  audinfo("apb=%p curbyte=%d nbytes=%d\n", apb, apb->curbyte, apb->nbytes);
 
   /* Say that we consumed all of the data */
 
@@ -688,7 +688,7 @@ static int null_enqueuebuffer(FAR struct audio_lowerhalf_s *dev,
 #endif
     }
 
-  audvdbg("Return OK\n");
+  audinfo("Return OK\n");
   return OK;
 }
 
@@ -702,7 +702,7 @@ static int null_enqueuebuffer(FAR struct audio_lowerhalf_s *dev,
 static int null_cancelbuffer(FAR struct audio_lowerhalf_s *dev,
                              FAR struct ap_buffer_s *apb)
 {
-  audvdbg("apb=%p curbyte=%d nbytes=%d, return OK\n",
+  audinfo("apb=%p curbyte=%d nbytes=%d, return OK\n",
           apb, apb->curbyte, apb->nbytes);
 
   return OK;
@@ -722,7 +722,7 @@ static int null_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd,
   FAR struct ap_buffer_info_s *bufinfo;
 #endif
 
-  audvdbg("cmd=%d arg=%ld\n");
+  audinfo("cmd=%d arg=%ld\n");
 
   /* Deal with ioctls passed from the upper-half driver */
 
@@ -734,7 +734,7 @@ static int null_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd,
 
       case AUDIOIOC_HWRESET:
         {
-          audvdbg("AUDIOIOC_HWRESET:\n");
+          audinfo("AUDIOIOC_HWRESET:\n");
         }
         break;
 
@@ -743,7 +743,7 @@ static int null_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd,
 #ifdef CONFIG_AUDIO_DRIVER_SPECIFIC_BUFFERS
       case AUDIOIOC_GETBUFFERINFO:
         {
-          audvdbg("AUDIOIOC_GETBUFFERINFO:\n");
+          audinfo("AUDIOIOC_GETBUFFERINFO:\n");
           bufinfo              = (FAR struct ap_buffer_info_s *) arg;
           bufinfo->buffer_size = CONFIG_AUDIO_NULL_BUFFER_SIZE;
           bufinfo->nbuffers    = CONFIG_AUDIO_NULL_NUM_BUFFERS;
@@ -755,7 +755,7 @@ static int null_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd,
         break;
     }
 
-  audvdbg("Return OK\n");
+  audinfo("Return OK\n");
   return OK;
 }
 
@@ -773,7 +773,7 @@ static int null_reserve(FAR struct audio_lowerhalf_s *dev,
 static int null_reserve(FAR struct audio_lowerhalf_s *dev)
 #endif
 {
-  audvdbg("Return OK\n");
+  audinfo("Return OK\n");
   return OK;
 }
 
diff --git a/drivers/audio/i2schar.c b/drivers/audio/i2schar.c
index a047171428..8e11dd1149 100644
--- a/drivers/audio/i2schar.c
+++ b/drivers/audio/i2schar.c
@@ -89,16 +89,16 @@
 #  define i2sdbg         dbg
 #  define i2slldbg       lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define i2svdbg      dbg
-#    define i2sllvdbg    lldbg
+#    define i2sinfo      dbg
+#    define i2sllinfo    lldbg
 #  else
-#    define i2svdbg(x...)
+#    define i2sinfo(x...)
 #  endif
 #else
 #  define i2sdbg(x...)
 #  define i2slldbg(x...)
-#  define i2svdbg(x...)
-#  define i2sllvdbg(x...)
+#  define i2sinfo(x...)
+#  define i2sllinfo(x...)
 #endif
 
 /****************************************************************************
@@ -174,7 +174,7 @@ static void i2schar_rxcallback(FAR struct i2s_dev_s *dev,
   FAR struct i2schar_dev_s *priv = (FAR struct i2schar_dev_s *)arg;
 
   DEBUGASSERT(priv && apb);
-  i2svdbg("apb=%p nbytes=%d result=%d\n", apb, apb->nbytes, result);
+  i2sinfo("apb=%p nbytes=%d result=%d\n", apb, apb->nbytes, result);
 
   /* REVISIT: If you want this to actually do something other than
    * test I2S data transfer, then this is the point where you would
@@ -185,7 +185,7 @@ static void i2schar_rxcallback(FAR struct i2s_dev_s *dev,
    * now.
    */
 
-  i2svdbg("Freeing apb=%p crefs=%d\n", apb, apb->crefs);
+  i2sinfo("Freeing apb=%p crefs=%d\n", apb, apb->crefs);
   apb_free(apb);
 }
 
@@ -209,7 +209,7 @@ static void i2schar_txcallback(FAR struct i2s_dev_s *dev,
   FAR struct i2schar_dev_s *priv = (FAR struct i2schar_dev_s *)arg;
 
   DEBUGASSERT(priv && apb);
-  i2svdbg("apb=%p nbytes=%d result=%d\n", apb, apb->nbytes, result);
+  i2sinfo("apb=%p nbytes=%d result=%d\n", apb, apb->nbytes, result);
 
   /* REVISIT: If you want this to actually do something other than
    * test I2S data transfer, then this is the point where you would
@@ -220,7 +220,7 @@ static void i2schar_txcallback(FAR struct i2s_dev_s *dev,
    * now.
    */
 
-  i2svdbg("Freeing apb=%p crefs=%d\n", apb, apb->crefs);
+  i2sinfo("Freeing apb=%p crefs=%d\n", apb, apb->crefs);
   apb_free(apb);
 }
 
@@ -241,7 +241,7 @@ static ssize_t i2schar_read(FAR struct file *filep, FAR char *buffer,
   size_t nbytes;
   int ret;
 
-  i2svdbg("buffer=%p buflen=%d\n", buffer, (int)buflen);
+  i2sinfo("buffer=%p buflen=%d\n", buffer, (int)buflen);
 
   /* Get our private data structure */
 
@@ -316,7 +316,7 @@ static ssize_t i2schar_write(FAR struct file *filep, FAR const char *buffer,
   size_t nbytes;
   int ret;
 
-  i2svdbg("buffer=%p buflen=%d\n", buffer, (int)buflen);
+  i2sinfo("buffer=%p buflen=%d\n", buffer, (int)buflen);
 
   /* Get our private data structure */
 
diff --git a/drivers/audio/vs1053.c b/drivers/audio/vs1053.c
index 68167ca31e..3af6418b79 100644
--- a/drivers/audio/vs1053.c
+++ b/drivers/audio/vs1053.c
@@ -329,7 +329,7 @@ static void vs1053_writereg(FAR struct vs1053_struct_s *dev, uint8_t reg, uint16
 
   /* Select the AUDIO_CTRL device on the SPI bus */
 
-  audvdbg("Write Reg %d = 0x%0X\n", reg, val);
+  audinfo("Write Reg %d = 0x%0X\n", reg, val);
 
   SPI_SELECT(spi, SPIDEV_AUDIO_CTRL, true);
 
@@ -365,7 +365,7 @@ static int vs1053_setfrequency(FAR struct vs1053_struct_s *dev, uint32_t freq)
   uint16_t  reg;
   uint8_t   timeout;
 
-  audvdbg("Entry\n");
+  audinfo("Entry\n");
 
   /* Calculate the clock divisor based on the input frequency */
 
@@ -375,7 +375,7 @@ static int vs1053_setfrequency(FAR struct vs1053_struct_s *dev, uint32_t freq)
 
   if (factor > 50.0)
     {
-      audvdbg("Frequency too high!  Limiting to XTALI * 5\n");
+      audinfo("Frequency too high!  Limiting to XTALI * 5\n");
       factor = 50.0;
       return -EINVAL;
     }
@@ -566,7 +566,7 @@ static void vs1053_setbass(FAR struct vs1053_struct_s *dev)
 static int vs1053_getcaps(FAR struct audio_lowerhalf_s *lower, int type,
             FAR struct audio_caps_s *pCaps)
 {
-  audvdbg("Entry\n");
+  audinfo("Entry\n");
 
   /* Validate the structure */
 
@@ -769,7 +769,7 @@ static int vs1053_configure(FAR struct audio_lowerhalf_s *lower,
   FAR struct vs1053_struct_s *dev = (struct vs1053_struct_s *) lower;
 #endif
 
-  audvdbg("Entry\n");
+  audinfo("Entry\n");
 
   /* Process the configure operation */
 
@@ -924,7 +924,7 @@ static int vs1053_shutdown(FAR struct audio_lowerhalf_s *lower)
   FAR struct vs1053_struct_s *dev = (struct vs1053_struct_s *) lower;
   FAR struct spi_dev_s  *spi = dev->spi;
 
-  audvdbg("Entry\n");
+  audinfo("Entry\n");
   vs1053_spi_lock(spi, dev->spi_freq);            /* Lock the device */
   vs1053_setfrequency(dev, CONFIG_VS1053_XTALI);  /* Reduce speed to minimum */
   vs1053_writereg(dev, VS1053_SCI_VOL, 0xFEFE);   /* Power down the DAC outputs */
@@ -1630,7 +1630,7 @@ static int vs1053_enqueuebuffer(FAR struct audio_lowerhalf_s *lower,
   struct audio_msg_s  term_msg;
   int ret;
 
-  audvdbg("Entry\n");
+  audinfo("Entry\n");
 
   /* Lock access to the apbq */
 
diff --git a/drivers/audio/wm8904.c b/drivers/audio/wm8904.c
index a437c137e8..de116ac9b9 100644
--- a/drivers/audio/wm8904.c
+++ b/drivers/audio/wm8904.c
@@ -304,11 +304,11 @@ uint16_t wm8904_readreg(FAR struct wm8904_dev_s *priv, uint8_t regaddr)
            */
 
           regval = ((uint16_t)data[0] << 8) | (uint16_t)data[1];
-          audvdbg("Read: %02x -> %04x\n", regaddr, regval);
+          audinfo("Read: %02x -> %04x\n", regaddr, regval);
           return regval;
         }
 
-      audvdbg("retries=%d regaddr=%02x\n", retries, regaddr);
+      audinfo("retries=%d regaddr=%02x\n", retries, regaddr);
     }
 
   /* No error indication is returned on a failure... just return zero */
@@ -377,11 +377,11 @@ static void wm8904_writereg(FAR struct wm8904_dev_s *priv, uint8_t regaddr,
            * return the value read.
            */
 
-          audvdbg("Write: %02x <- %04x\n", regaddr, regval);
+          audinfo("Write: %02x <- %04x\n", regaddr, regval);
           return;
         }
 
-      audvdbg("retries=%d regaddr=%02x\n", retries, regaddr);
+      audinfo("retries=%d regaddr=%02x\n", retries, regaddr);
     }
 }
 
@@ -439,7 +439,7 @@ static void wm8904_setvolume(FAR struct wm8904_dev_s *priv, uint16_t volume,
   uint32_t rightlevel;
   uint16_t regval;
 
-  audvdbg("volume=%u mute=%u\n", volume, mute);
+  audinfo("volume=%u mute=%u\n", volume, mute);
 
 #ifndef CONFIG_AUDIO_EXCLUDE_BALANCE
   /* Calculate the left channel volume level {0..1000} */
@@ -514,7 +514,7 @@ static void wm8904_setvolume(FAR struct wm8904_dev_s *priv, uint16_t volume,
 #ifndef CONFIG_AUDIO_EXCLUDE_TONE
 static void wm8904_setbass(FAR struct wm8904_dev_s *priv, uint8_t bass)
 {
-  audvdbg("bass=%u\n", bass);
+  audinfo("bass=%u\n", bass);
 #warning Missing logic
 }
 #endif /* CONFIG_AUDIO_EXCLUDE_TONE */
@@ -532,7 +532,7 @@ static void wm8904_setbass(FAR struct wm8904_dev_s *priv, uint8_t bass)
 #ifndef CONFIG_AUDIO_EXCLUDE_TONE
 static void wm8904_settreble(FAR struct wm8904_dev_s *priv, uint8_t treble)
 {
-  audvdbg("treble=%u\n", treble);
+  audinfo("treble=%u\n", treble);
 #warning Missing logic
 }
 #endif /* CONFIG_AUDIO_EXCLUDE_TONE */
@@ -658,7 +658,7 @@ static void wm8904_setbitrate(FAR struct wm8904_dev_s *priv)
   regval = WM8904_LRCLK_DIR | WM8904_LRCLK_RATE(framelen << 1);
   wm8904_writereg(priv, WM8904_AIF3, regval);
 
-  audvdbg("sample rate=%u nchannels=%u bpsamp=%u framelen=%d fout=%lu\n",
+  audinfo("sample rate=%u nchannels=%u bpsamp=%u framelen=%d fout=%lu\n",
           priv->samprate, priv->nchannels, priv->bpsamp, framelen,
           (unsigned long)fout);
 
@@ -815,10 +815,10 @@ static void wm8904_setbitrate(FAR struct wm8904_dev_s *priv)
   tmp64 = ((uint64_t)fvco << 16) / (g_fllratio[fllndx] * fref);
   nk    = (b16_t)tmp64;
 
-  audvdbg("mclk=%lu fref=%lu fvco=%lu fout=%lu divndx=%u\n",
+  audinfo("mclk=%lu fref=%lu fvco=%lu fout=%lu divndx=%u\n",
           (unsigned long)priv->lower->mclk, (unsigned long)fref,
           (unsigned long)fvco, (unsigned long)fout, divndx);
-  audvdbg("N.K=%08lx outdiv=%u fllratio=%u\n",
+  audinfo("N.K=%08lx outdiv=%u fllratio=%u\n",
           (unsigned long)nk, outdiv, g_fllratio[fllndx]);
 
   /* Save the actual bit rate that we are using.  This will be used by the
@@ -961,7 +961,7 @@ static int wm8904_getcaps(FAR struct audio_lowerhalf_s *dev, int type,
   /* Validate the structure */
 
   DEBUGASSERT(caps && caps->ac_len >= sizeof(struct audio_caps_s));
-  audvdbg("type=%d ac_type=%d\n", type, caps->ac_type);
+  audinfo("type=%d ac_type=%d\n", type, caps->ac_type);
 
   /* Fill in the caller's structure based on requested info */
 
@@ -1129,14 +1129,14 @@ static int wm8904_configure(FAR struct audio_lowerhalf_s *dev,
   int ret = OK;
 
   DEBUGASSERT(priv && caps);
-  audvdbg("ac_type: %d\n", caps->ac_type);
+  audinfo("ac_type: %d\n", caps->ac_type);
 
   /* Process the configure operation */
 
   switch (caps->ac_type)
     {
     case AUDIO_TYPE_FEATURE:
-      audvdbg("  AUDIO_TYPE_FEATURE\n");
+      audinfo("  AUDIO_TYPE_FEATURE\n");
 
       /* Process based on Feature Unit */
 
@@ -1148,7 +1148,7 @@ static int wm8904_configure(FAR struct audio_lowerhalf_s *dev,
             /* Set the volume */
 
             uint16_t volume = caps->ac_controls.hw[0];
-            audvdbg("    Volume: %d\n", volume);
+            audinfo("    Volume: %d\n", volume);
 
             if (volume >= 0 && volume <= 1000)
               {
@@ -1172,7 +1172,7 @@ static int wm8904_configure(FAR struct audio_lowerhalf_s *dev,
              */
 
             uint8_t bass = caps->ac_controls.b[0];
-            audvdbg("    Bass: %d\n", bass);
+            audinfo("    Bass: %d\n", bass);
 
             if (bass <= 100)
               {
@@ -1192,7 +1192,7 @@ static int wm8904_configure(FAR struct audio_lowerhalf_s *dev,
              */
 
             uint8_t treble = caps->ac_controls.b[0];
-            audvdbg("    Treble: %d\n", treble);
+            audinfo("    Treble: %d\n", treble);
 
             if (treble <= 100)
               {
@@ -1215,10 +1215,10 @@ static int wm8904_configure(FAR struct audio_lowerhalf_s *dev,
 
     case AUDIO_TYPE_OUTPUT:
       {
-        audvdbg("  AUDIO_TYPE_OUTPUT:\n");
-        audvdbg("    Number of channels: %u\n", caps->ac_channels);
-        audvdbg("    Sample rate:        %u\n", caps->ac_controls.hw[0]);
-        audvdbg("    Sample width:       %u\n", caps->ac_controls.b[2]);
+        audinfo("  AUDIO_TYPE_OUTPUT:\n");
+        audinfo("    Number of channels: %u\n", caps->ac_channels);
+        audinfo("    Sample rate:        %u\n", caps->ac_controls.hw[0]);
+        audinfo("    Sample width:       %u\n", caps->ac_controls.b[2]);
 
         /* Verify that all of the requested values are supported */
 
@@ -1308,7 +1308,7 @@ static void  wm8904_senddone(FAR struct i2s_dev_s *i2s,
   int ret;
 
   DEBUGASSERT(i2s && priv && priv->running && apb);
-  audvdbg("apb=%p inflight=%d result=%d\n", apb, priv->inflight, result);
+  audinfo("apb=%p inflight=%d result=%d\n", apb, priv->inflight, result);
 
   /* We do not place any restriction on the context in which this function
    * is called.  It may be called from an interrupt handler.  Therefore, the
@@ -1377,7 +1377,7 @@ static void wm8904_returnbuffers(FAR struct wm8904_dev_s *priv)
       apb = (FAR struct ap_buffer_s *)dq_remfirst(&priv->doneq);
       leave_critical_section(flags);
 
-      audvdbg("Returning: apb=%p curbyte=%d nbytes=%d flags=%04x\n",
+      audinfo("Returning: apb=%p curbyte=%d nbytes=%d flags=%04x\n",
               apb, apb->curbyte, apb->nbytes, apb->flags);
 
       /* Are we returning the final buffer in the stream? */
@@ -1395,7 +1395,7 @@ static void wm8904_returnbuffers(FAR struct wm8904_dev_s *priv)
            * worker thread to exit (if it is not already terminating).
            */
 
-          audvdbg("Terminating\n");
+          audinfo("Terminating\n");
           priv->terminating = true;
         }
 
@@ -1454,7 +1454,7 @@ static int wm8904_sendbuffer(FAR struct wm8904_dev_s *priv)
       /* Take next buffer from the queue of pending transfers */
 
       apb = (FAR struct ap_buffer_s *)dq_remfirst(&priv->pendq);
-      audvdbg("Sending apb=%p, size=%d inflight=%d\n",
+      audinfo("Sending apb=%p, size=%d inflight=%d\n",
               apb, apb->nbytes, priv->inflight);
 
       /* Increment the number of buffers in-flight before sending in order
@@ -1526,7 +1526,7 @@ static int wm8904_start(FAR struct audio_lowerhalf_s *dev)
   FAR void *value;
   int ret;
 
-  audvdbg("Entry\n");
+  audinfo("Entry\n");
 
   /* Exit reduced power modes of operation */
   /* REVISIT */
@@ -1553,7 +1553,7 @@ static int wm8904_start(FAR struct audio_lowerhalf_s *dev)
 
   if (priv->threadid != 0)
     {
-      audvdbg("Joining old thread\n");
+      audinfo("Joining old thread\n");
       pthread_join(priv->threadid, &value);
     }
 
@@ -1564,7 +1564,7 @@ static int wm8904_start(FAR struct audio_lowerhalf_s *dev)
   (void)pthread_attr_setschedparam(&tattr, &sparam);
   (void)pthread_attr_setstacksize(&tattr, CONFIG_WM8904_WORKER_STACKSIZE);
 
-  audvdbg("Starting worker thread\n");
+  audinfo("Starting worker thread\n");
   ret = pthread_create(&priv->threadid, &tattr, wm8904_workerthread,
                        (pthread_addr_t)priv);
   if (ret != OK)
@@ -1574,7 +1574,7 @@ static int wm8904_start(FAR struct audio_lowerhalf_s *dev)
   else
     {
       pthread_setname_np(priv->threadid, "wm8904");
-      audvdbg("Created worker thread\n");
+      audinfo("Created worker thread\n");
     }
 
   return ret;
@@ -1694,7 +1694,7 @@ static int wm8904_enqueuebuffer(FAR struct audio_lowerhalf_s *dev,
   struct audio_msg_s  term_msg;
   int ret;
 
-  audvdbg("Enqueueing: apb=%p curbyte=%d nbytes=%d flags=%04x\n",
+  audinfo("Enqueueing: apb=%p curbyte=%d nbytes=%d flags=%04x\n",
           apb, apb->curbyte, apb->nbytes, apb->flags);
 
   /* Take a reference on the new audio buffer */
@@ -1744,7 +1744,7 @@ static int wm8904_enqueuebuffer(FAR struct audio_lowerhalf_s *dev,
 static int wm8904_cancelbuffer(FAR struct audio_lowerhalf_s *dev,
                                FAR struct ap_buffer_s *apb)
 {
-  audvdbg("apb=%p\n", apb);
+  audinfo("apb=%p\n", apb);
   return OK;
 }
 
@@ -1777,7 +1777,7 @@ static int wm8904_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd,
            * registers back in their default state.
            */
 
-          audvdbg("AUDIOIOC_HWRESET:\n");
+          audinfo("AUDIOIOC_HWRESET:\n");
         }
         break;
 
@@ -1786,7 +1786,7 @@ static int wm8904_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd,
 #ifdef CONFIG_AUDIO_DRIVER_SPECIFIC_BUFFERS
       case AUDIOIOC_GETBUFFERINFO:
         {
-          audvdbg("AUDIOIOC_GETBUFFERINFO:\n");
+          audinfo("AUDIOIOC_GETBUFFERINFO:\n");
           bufinfo              = (FAR struct ap_buffer_info_s *) arg;
           bufinfo->buffer_size = CONFIG_WM8904_BUFFER_SIZE;
           bufinfo->nbuffers    = CONFIG_WM8904_NUM_BUFFERS;
@@ -1795,7 +1795,7 @@ static int wm8904_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd,
 #endif
 
       default:
-        audvdbg("Ignored\n");
+        audinfo("Ignored\n");
         break;
     }
 
@@ -1908,7 +1908,7 @@ static void wm8904_interrupt_work(FAR void *arg)
   /* Sample the interrupt status */
 
   regval = wm8904_readreg(priv, WM8904_INT_STATUS);
-  audvdbg("INT_STATUS: %04x\n", regval);
+  audinfo("INT_STATUS: %04x\n", regval);
 
   /* Check for the FLL lock interrupt.  We are sloppy here since at
    * present, only the FLL lock interrupt is used.
@@ -1994,7 +1994,7 @@ static void *wm8904_workerthread(pthread_addr_t pvarg)
   int msglen;
   int prio;
 
-  audvdbg("Entry\n");
+  audinfo("Entry\n");
 
 #ifndef CONFIG_AUDIO_EXCLUDE_STOP
   priv->terminating = false;
@@ -2055,7 +2055,7 @@ static void *wm8904_workerthread(pthread_addr_t pvarg)
            */
 
           case AUDIO_MSG_DATA_REQUEST:
-            audvdbg("AUDIO_MSG_DATA_REQUEST\n");
+            audinfo("AUDIO_MSG_DATA_REQUEST\n");
             break;
 
           /* Stop the playback */
@@ -2064,7 +2064,7 @@ static void *wm8904_workerthread(pthread_addr_t pvarg)
           case AUDIO_MSG_STOP:
             /* Indicate that we are terminating */
 
-            audvdbg("AUDIO_MSG_STOP: Terminating\n");
+            audinfo("AUDIO_MSG_STOP: Terminating\n");
             priv->terminating = true;
             break;
 #endif
@@ -2074,13 +2074,13 @@ static void *wm8904_workerthread(pthread_addr_t pvarg)
            */
 
           case AUDIO_MSG_ENQUEUE:
-            audvdbg("AUDIO_MSG_ENQUEUE\n");
+            audinfo("AUDIO_MSG_ENQUEUE\n");
             break;
 
           /* We will wake up from the I2S callback with this message */
 
           case AUDIO_MSG_COMPLETE:
-            audvdbg("AUDIO_MSG_COMPLETE\n");
+            audinfo("AUDIO_MSG_COMPLETE\n");
             wm8904_returnbuffers(priv);
             break;
 
@@ -2132,7 +2132,7 @@ static void *wm8904_workerthread(pthread_addr_t pvarg)
   priv->dev.upper(priv->dev.priv, AUDIO_CALLBACK_COMPLETE, NULL, OK);
 #endif
 
-  audvdbg("Exit\n");
+  audinfo("Exit\n");
   return NULL;
 }
 
diff --git a/drivers/can.c b/drivers/can.c
index 2454f06c2d..3e5e0750be 100644
--- a/drivers/can.c
+++ b/drivers/can.c
@@ -101,14 +101,14 @@
 
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
-#  define canvdbg   vdbg
+#  define caninfo   info
 #  define canlldbg  lldbg
-#  define canllvdbg llvdbg
+#  define canllinfo llinfo
 #else
 #  define candbg(x...)
-#  define canvdbg(x...)
+#  define caninfo(x...)
 #  define canlldbg(x...)
-#  define canllvdbg(x...)
+#  define canllinfo(x...)
 #endif
 
 /* Timing Definitions *******************************************************/
@@ -296,7 +296,7 @@ static void can_txready_work(FAR void *arg)
   irqstate_t flags;
   int ret;
 
-  canllvdbg("xmit head: %d queue: %d tail: %d\n",
+  canllinfo("xmit head: %d queue: %d tail: %d\n",
             dev->cd_xmit.tx_head, dev->cd_xmit.tx_queue,
             dev->cd_xmit.tx_tail);
 
@@ -348,7 +348,7 @@ static int can_open(FAR struct file *filep)
   uint8_t               tmp;
   int                   ret   = OK;
 
-  canvdbg("ocount: %d\n", dev->cd_ocount);
+  caninfo("ocount: %d\n", dev->cd_ocount);
 
   /* If the port is the middle of closing, wait until the close is finished */
 
@@ -431,7 +431,7 @@ static int can_close(FAR struct file *filep)
   irqstate_t            flags;
   int                   ret = OK;
 
-  canvdbg("ocount: %d\n", dev->cd_ocount);
+  caninfo("ocount: %d\n", dev->cd_ocount);
 
   if (sem_wait(&dev->cd_closesem) != OK)
     {
@@ -510,7 +510,7 @@ static ssize_t can_read(FAR struct file *filep, FAR char *buffer,
   irqstate_t            flags;
   int                   ret   = 0;
 
-  canvdbg("buflen: %d\n", buflen);
+  caninfo("buflen: %d\n", buflen);
 
   /* The caller must provide enough memory to catch the smallest possible
    * message.  This is not a system error condition, but we won't permit
@@ -649,7 +649,7 @@ static int can_xmit(FAR struct can_dev_s *dev)
   int tmpndx;
   int ret = -EBUSY;
 
-  canllvdbg("xmit head: %d queue: %d tail: %d\n",
+  canllinfo("xmit head: %d queue: %d tail: %d\n",
             dev->cd_xmit.tx_head, dev->cd_xmit.tx_queue, dev->cd_xmit.tx_tail);
 
   /* If there is nothing to send, then just disable interrupts and return */
@@ -732,7 +732,7 @@ static ssize_t can_write(FAR struct file *filep, FAR const char *buffer,
   int                      msglen;
   int                      ret   = 0;
 
-  canvdbg("buflen: %d\n", buflen);
+  caninfo("buflen: %d\n", buflen);
 
   /* Interrupts must disabled throughout the following */
 
@@ -915,7 +915,7 @@ static int can_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
   FAR struct can_dev_s *dev   = inode->i_private;
   int                   ret   = OK;
 
-  canvdbg("cmd: %d arg: %ld\n", cmd, arg);
+  caninfo("cmd: %d arg: %ld\n", cmd, arg);
 
   /* Handle built-in ioctl commands */
 
@@ -986,7 +986,7 @@ int can_register(FAR const char *path, FAR struct can_dev_s *dev)
 
   /* Register the CAN device */
 
-  canvdbg("Registering %s\n", path);
+  caninfo("Registering %s\n", path);
   return register_driver(path, &g_canops, 0666, dev);
 }
 
@@ -1018,7 +1018,7 @@ int can_receive(FAR struct can_dev_s *dev, FAR struct can_hdr_s *hdr,
   int                      err = -ENOMEM;
   int                      i;
 
-  canllvdbg("ID: %d DLC: %d\n", hdr->ch_id, hdr->ch_dlc);
+  canllinfo("ID: %d DLC: %d\n", hdr->ch_id, hdr->ch_dlc);
 
   /* Check if adding this new message would over-run the drivers ability to
    * enqueue read data.
@@ -1203,7 +1203,7 @@ int can_txdone(FAR struct can_dev_s *dev)
 {
   int ret = -ENOENT;
 
-  canllvdbg("xmit head: %d queue: %d tail: %d\n",
+  canllinfo("xmit head: %d queue: %d tail: %d\n",
             dev->cd_xmit.tx_head, dev->cd_xmit.tx_queue, dev->cd_xmit.tx_tail);
 
   /* Verify that the xmit FIFO is not empty */
@@ -1307,7 +1307,7 @@ int can_txready(FAR struct can_dev_s *dev)
 {
   int ret = -ENOENT;
 
-  canllvdbg("xmit head: %d queue: %d tail: %d waiters: %d\n",
+  canllinfo("xmit head: %d queue: %d tail: %d waiters: %d\n",
             dev->cd_xmit.tx_head, dev->cd_xmit.tx_queue, dev->cd_xmit.tx_tail,
             dev->cd_ntxwaiters);
 
diff --git a/drivers/eeprom/spi_xx25xx.c b/drivers/eeprom/spi_xx25xx.c
index 1f9335b856..67a38b9784 100644
--- a/drivers/eeprom/spi_xx25xx.c
+++ b/drivers/eeprom/spi_xx25xx.c
@@ -388,7 +388,7 @@ static void ee25xx_waitwritecomplete(struct ee25xx_dev_s *priv)
     }
   while ((status & EE25XX_SR_WIP) != 0);
 
-  fvdbg("Complete\n");
+  finfo("Complete\n");
 }
 
 /****************************************************************************
diff --git a/drivers/i2c/i2c_driver.c b/drivers/i2c/i2c_driver.c
index ac53f0f1f1..e6571b0006 100644
--- a/drivers/i2c/i2c_driver.c
+++ b/drivers/i2c/i2c_driver.c
@@ -67,10 +67,10 @@
 
 #ifdef CONFIG_DEBUG_I2C
 #  define i2cdbg dbg
-#  define i2cvdbg vdbg
+#  define i2cinfo info
 #else
 #  define i2cdbg(x...)
-#  define i2cvdbg(x...)
+#  define i2cinfo(x...)
 #endif
 
 /****************************************************************************
@@ -254,7 +254,7 @@ static int i2cdrvr_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
   FAR struct i2c_transfer_s *transfer;
   int ret;
 
-  i2cvdbg("cmd=%d arg=%lu\n", cmd, arg);
+  i2cinfo("cmd=%d arg=%lu\n", cmd, arg);
 
   /* Get our private data structure */
 
diff --git a/drivers/input/ads7843e.c b/drivers/input/ads7843e.c
index 22b7606e63..2097c0774c 100644
--- a/drivers/input/ads7843e.c
+++ b/drivers/input/ads7843e.c
@@ -279,7 +279,7 @@ static uint16_t ads7843e_sendcmd(FAR struct ads7843e_dev_s *priv, uint8_t cmd)
   result = ((uint16_t)buffer[0] << 8) | (uint16_t)buffer[1];
   result = result >> 4;
 
-  ivdbg("cmd:%02x response:%04x\n", cmd, result);
+  iinfo("cmd:%02x response:%04x\n", cmd, result);
   return result;
 }
 
@@ -319,7 +319,7 @@ static void ads7843e_notify(FAR struct ads7843e_dev_s *priv)
       if (fds)
         {
           fds->revents |= POLLIN;
-          ivdbg("Report events: %02x\n", fds->revents);
+          iinfo("Report events: %02x\n", fds->revents);
           sem_post(fds->sem);
         }
     }
@@ -416,7 +416,7 @@ static int ads7843e_waitsample(FAR struct ads7843e_dev_s *priv,
     {
       /* Wait for a change in the ADS7843E state */
 
-      ivdbg("Waiting..\n");
+      iinfo("Waiting..\n");
       priv->nwaiters++;
       ret = sem_wait(&priv->waitsem);
       priv->nwaiters--;
@@ -434,7 +434,7 @@ static int ads7843e_waitsample(FAR struct ads7843e_dev_s *priv,
         }
     }
 
-  ivdbg("Sampled\n");
+  iinfo("Sampled\n");
 
   /* Re-acquire the semaphore that manages mutually exclusive access to
    * the device structure.  We may have to wait here.  But we have our sample.
@@ -749,7 +749,7 @@ static int ads7843e_open(FAR struct file *filep)
   uint8_t                   tmp;
   int                       ret;
 
-  ivdbg("Opening\n");
+  iinfo("Opening\n");
 
   DEBUGASSERT(filep);
   inode = filep->f_inode;
@@ -791,7 +791,7 @@ errout_with_sem:
   sem_post(&priv->devsem);
   return ret;
 #else
-  ivdbg("Opening\n");
+  iinfo("Opening\n");
   return OK;
 #endif
 }
@@ -807,7 +807,7 @@ static int ads7843e_close(FAR struct file *filep)
   FAR struct ads7843e_dev_s *priv;
   int                       ret;
 
-  ivdbg("Closing\n");
+  iinfo("Closing\n");
   DEBUGASSERT(filep);
   inode = filep->f_inode;
 
@@ -837,7 +837,7 @@ static int ads7843e_close(FAR struct file *filep)
 
   sem_post(&priv->devsem);
 #endif
-  ivdbg("Closing\n");
+  iinfo("Closing\n");
   return OK;
 }
 
@@ -853,7 +853,7 @@ static ssize_t ads7843e_read(FAR struct file *filep, FAR char *buffer, size_t le
   struct ads7843e_sample_s   sample;
   int                        ret;
 
-  ivdbg("buffer:%p len:%d\n", buffer, len);
+  iinfo("buffer:%p len:%d\n", buffer, len);
   DEBUGASSERT(filep);
   inode = filep->f_inode;
 
@@ -896,7 +896,7 @@ static ssize_t ads7843e_read(FAR struct file *filep, FAR char *buffer, size_t le
        * option, then just return an error.
        */
 
-      ivdbg("Sample data is not available\n");
+      iinfo("Sample data is not available\n");
       if (filep->f_oflags & O_NONBLOCK)
         {
           ret = -EAGAIN;
@@ -957,16 +957,16 @@ static ssize_t ads7843e_read(FAR struct file *filep, FAR char *buffer, size_t le
       report->point[0].flags  = TOUCH_MOVE | TOUCH_ID_VALID | TOUCH_POS_VALID;
     }
 
-  ivdbg("  id:      %d\n", report->point[0].id);
-  ivdbg("  flags:   %02x\n", report->point[0].flags);
-  ivdbg("  x:       %d\n", report->point[0].x);
-  ivdbg("  y:       %d\n", report->point[0].y);
+  iinfo("  id:      %d\n", report->point[0].id);
+  iinfo("  flags:   %02x\n", report->point[0].flags);
+  iinfo("  x:       %d\n", report->point[0].x);
+  iinfo("  y:       %d\n", report->point[0].y);
 
   ret = SIZEOF_TOUCH_SAMPLE_S(1);
 
 errout:
   sem_post(&priv->devsem);
-  ivdbg("Returning: %d\n", ret);
+  iinfo("Returning: %d\n", ret);
   return ret;
 }
 
@@ -980,7 +980,7 @@ static int ads7843e_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
   FAR struct ads7843e_dev_s *priv;
   int                       ret;
 
-  ivdbg("cmd: %d arg: %ld\n", cmd, arg);
+  iinfo("cmd: %d arg: %ld\n", cmd, arg);
   DEBUGASSERT(filep);
   inode = filep->f_inode;
 
@@ -1040,7 +1040,7 @@ static int ads7843e_poll(FAR struct file *filep, FAR struct pollfd *fds,
   int ret;
   int i;
 
-  ivdbg("setup: %d\n", (int)setup);
+  iinfo("setup: %d\n", (int)setup);
   DEBUGASSERT(filep && fds);
   inode = filep->f_inode;
 
@@ -1156,7 +1156,7 @@ int ads7843e_register(FAR struct spi_dev_s *spi,
 #endif
   int ret;
 
-  ivdbg("spi: %p minor: %d\n", spi, minor);
+  iinfo("spi: %p minor: %d\n", spi, minor);
 
   /* Debug-only sanity checks */
 
@@ -1219,7 +1219,7 @@ int ads7843e_register(FAR struct spi_dev_s *spi,
   /* Register the device as an input device */
 
   (void)snprintf(devname, DEV_NAMELEN, DEV_FORMAT, minor);
-  ivdbg("Registering %s\n", devname);
+  iinfo("Registering %s\n", devname);
 
   ret = register_driver(devname, &ads7843e_fops, 0666, priv);
   if (ret < 0)
diff --git a/drivers/input/ajoystick.c b/drivers/input/ajoystick.c
index 6c916d9f39..b0ce4f15ae 100644
--- a/drivers/input/ajoystick.c
+++ b/drivers/input/ajoystick.c
@@ -352,7 +352,7 @@ static void ajoy_sample(FAR struct ajoy_upperhalf_s *priv)
                   fds->revents |= (fds->events & POLLIN);
                   if (fds->revents != 0)
                     {
-                      ivdbg("Report events: %02x\n", fds->revents);
+                      iinfo("Report events: %02x\n", fds->revents);
                       sem_post(fds->sem);
                     }
                 }
@@ -414,7 +414,7 @@ static int ajoy_open(FAR struct file *filep)
   ret = ajoy_takesem(&priv->au_exclsem);
   if (ret < 0)
     {
-      ivdbg("ERROR: ajoy_takesem failed: %d\n", ret);
+      iinfo("ERROR: ajoy_takesem failed: %d\n", ret);
       return ret;
     }
 
@@ -423,7 +423,7 @@ static int ajoy_open(FAR struct file *filep)
   opriv = (FAR struct ajoy_open_s *)kmm_zalloc(sizeof(struct ajoy_open_s));
   if (!opriv)
     {
-      ivdbg("ERROR: Failled to allocate open structure\n");
+      iinfo("ERROR: Failled to allocate open structure\n");
       ret = -ENOMEM;
       goto errout_with_sem;
     }
@@ -502,7 +502,7 @@ static int ajoy_close(FAR struct file *filep)
   ret = ajoy_takesem(&priv->au_exclsem);
   if (ret < 0)
     {
-      ivdbg("ERROR: ajoy_takesem failed: %d\n", ret);
+      iinfo("ERROR: ajoy_takesem failed: %d\n", ret);
       return ret;
     }
 
@@ -515,7 +515,7 @@ static int ajoy_close(FAR struct file *filep)
   DEBUGASSERT(curr);
   if (!curr)
     {
-      ivdbg("ERROR: Failed to find open entry\n");
+      iinfo("ERROR: Failed to find open entry\n");
       ret = -ENOENT;
       goto errout_with_exclsem;
     }
@@ -570,7 +570,7 @@ static ssize_t ajoy_read(FAR struct file *filep, FAR char *buffer,
 
   if (len < sizeof(struct ajoy_sample_s))
     {
-      ivdbg("ERROR: buffer too small: %lu\n", (unsigned long)len);
+      iinfo("ERROR: buffer too small: %lu\n", (unsigned long)len);
       return -EINVAL;
     }
 
@@ -579,7 +579,7 @@ static ssize_t ajoy_read(FAR struct file *filep, FAR char *buffer,
   ret = ajoy_takesem(&priv->au_exclsem);
   if (ret < 0)
     {
-      ivdbg("ERROR: ajoy_takesem failed: %d\n", ret);
+      iinfo("ERROR: ajoy_takesem failed: %d\n", ret);
       return ret;
     }
 
@@ -620,7 +620,7 @@ static int ajoy_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
   ret = ajoy_takesem(&priv->au_exclsem);
   if (ret < 0)
     {
-      ivdbg("ERROR: ajoy_takesem failed: %d\n", ret);
+      iinfo("ERROR: ajoy_takesem failed: %d\n", ret);
       return ret;
     }
 
@@ -720,7 +720,7 @@ static int ajoy_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 #endif
 
     default:
-      ivdbg("ERROR: Unrecognized command: %ld\n", cmd);
+      iinfo("ERROR: Unrecognized command: %ld\n", cmd);
       ret = -ENOTTY;
       break;
     }
@@ -754,7 +754,7 @@ static int ajoy_poll(FAR struct file *filep, FAR struct pollfd *fds,
   ret = ajoy_takesem(&priv->au_exclsem);
   if (ret < 0)
     {
-      ivdbg("ERROR: ajoy_takesem failed: %d\n", ret);
+      iinfo("ERROR: ajoy_takesem failed: %d\n", ret);
       return ret;
     }
 
@@ -782,7 +782,7 @@ static int ajoy_poll(FAR struct file *filep, FAR struct pollfd *fds,
 
       if (i >= CONFIG_AJOYSTICK_NPOLLWAITERS)
         {
-          ivdbg("ERROR: Too man poll waiters\n");
+          iinfo("ERROR: Too man poll waiters\n");
           fds->priv    = NULL;
           ret          = -EBUSY;
           goto errout_with_dusem;
@@ -797,7 +797,7 @@ static int ajoy_poll(FAR struct file *filep, FAR struct pollfd *fds,
 #ifdef CONFIG_DEBUG
       if (!slot)
         {
-          ivdbg("ERROR: Poll slot not found\n");
+          iinfo("ERROR: Poll slot not found\n");
           ret = -EIO;
           goto errout_with_dusem;
         }
@@ -856,7 +856,7 @@ int ajoy_register(FAR const char *devname,
 
   if (!priv)
     {
-      ivdbg("ERROR: Failed to allocate device structure\n");
+      iinfo("ERROR: Failed to allocate device structure\n");
       return -ENOMEM;
     }
 
@@ -878,7 +878,7 @@ int ajoy_register(FAR const char *devname,
   ret = register_driver(devname, &ajoy_fops, 0666, priv);
   if (ret < 0)
     {
-      ivdbg("ERROR: register_driver failed: %d\n", ret);
+      iinfo("ERROR: register_driver failed: %d\n", ret);
       goto errout_with_priv;
     }
 
diff --git a/drivers/input/button_lower.c b/drivers/input/button_lower.c
index 868e1681a6..ae338d542d 100644
--- a/drivers/input/button_lower.c
+++ b/drivers/input/button_lower.c
@@ -98,7 +98,7 @@ static FAR void *g_btnarg;
 
 static btn_buttonset_t btn_supported(FAR const struct btn_lowerhalf_s *lower)
 {
-  ivdbg("NUM_BUTTONS: %02x\n", NUM_BUTTONS);
+  iinfo("NUM_BUTTONS: %02x\n", NUM_BUTTONS);
   return (btn_buttonset_t)((1 << NUM_BUTTONS) - 1);
 }
 
@@ -138,7 +138,7 @@ static void btn_enable(FAR const struct btn_lowerhalf_s *lower,
   flags = enter_critical_section();
   btn_disable();
 
-  illvdbg("press: %02x release: %02x handler: %p arg: %p\n",
+  illinfo("press: %02x release: %02x handler: %p arg: %p\n",
           press, release, handler, arg);
 
   /* If no events are indicated or if no handler is provided, then this
diff --git a/drivers/input/button_upper.c b/drivers/input/button_upper.c
index 07c11307e0..98adf18b7a 100644
--- a/drivers/input/button_upper.c
+++ b/drivers/input/button_upper.c
@@ -348,7 +348,7 @@ static void btn_sample(FAR struct btn_upperhalf_s *priv)
                   fds->revents |= (fds->events & POLLIN);
                   if (fds->revents != 0)
                     {
-                      ivdbg("Report events: %02x\n", fds->revents);
+                      iinfo("Report events: %02x\n", fds->revents);
                       sem_post(fds->sem);
                     }
                 }
@@ -410,7 +410,7 @@ static int btn_open(FAR struct file *filep)
   ret = btn_takesem(&priv->bu_exclsem);
   if (ret < 0)
     {
-      ivdbg("ERROR: btn_takesem failed: %d\n", ret);
+      iinfo("ERROR: btn_takesem failed: %d\n", ret);
       return ret;
     }
 
@@ -419,7 +419,7 @@ static int btn_open(FAR struct file *filep)
   opriv = (FAR struct btn_open_s *)kmm_zalloc(sizeof(struct btn_open_s));
   if (!opriv)
     {
-      ivdbg("ERROR: Failled to allocate open structure\n");
+      iinfo("ERROR: Failled to allocate open structure\n");
       ret = -ENOMEM;
       goto errout_with_sem;
     }
@@ -498,7 +498,7 @@ static int btn_close(FAR struct file *filep)
   ret = btn_takesem(&priv->bu_exclsem);
   if (ret < 0)
     {
-      ivdbg("ERROR: btn_takesem failed: %d\n", ret);
+      iinfo("ERROR: btn_takesem failed: %d\n", ret);
       return ret;
     }
 
@@ -511,7 +511,7 @@ static int btn_close(FAR struct file *filep)
   DEBUGASSERT(curr);
   if (!curr)
     {
-      ivdbg("ERROR: Failed to find open entry\n");
+      iinfo("ERROR: Failed to find open entry\n");
       ret = -ENOENT;
       goto errout_with_exclsem;
     }
@@ -566,7 +566,7 @@ static ssize_t btn_read(FAR struct file *filep, FAR char *buffer,
 
   if (len < sizeof(btn_buttonset_t))
     {
-      ivdbg("ERROR: buffer too small: %lu\n", (unsigned long)len);
+      iinfo("ERROR: buffer too small: %lu\n", (unsigned long)len);
       return -EINVAL;
     }
 
@@ -575,7 +575,7 @@ static ssize_t btn_read(FAR struct file *filep, FAR char *buffer,
   ret = btn_takesem(&priv->bu_exclsem);
   if (ret < 0)
     {
-      ivdbg("ERROR: btn_takesem failed: %d\n", ret);
+      iinfo("ERROR: btn_takesem failed: %d\n", ret);
       return ret;
     }
 
@@ -612,7 +612,7 @@ static int btn_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
   ret = btn_takesem(&priv->bu_exclsem);
   if (ret < 0)
     {
-      ivdbg("ERROR: btn_takesem failed: %d\n", ret);
+      iinfo("ERROR: btn_takesem failed: %d\n", ret);
       return ret;
     }
 
@@ -712,7 +712,7 @@ static int btn_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 #endif
 
     default:
-      ivdbg("ERROR: Unrecognized command: %ld\n", cmd);
+      iinfo("ERROR: Unrecognized command: %ld\n", cmd);
       ret = -ENOTTY;
       break;
     }
@@ -746,7 +746,7 @@ static int btn_poll(FAR struct file *filep, FAR struct pollfd *fds,
   ret = btn_takesem(&priv->bu_exclsem);
   if (ret < 0)
     {
-      ivdbg("ERROR: btn_takesem failed: %d\n", ret);
+      iinfo("ERROR: btn_takesem failed: %d\n", ret);
       return ret;
     }
 
@@ -774,7 +774,7 @@ static int btn_poll(FAR struct file *filep, FAR struct pollfd *fds,
 
       if (i >= CONFIG_BUTTONS_NPOLLWAITERS)
         {
-          ivdbg("ERROR: Too man poll waiters\n");
+          iinfo("ERROR: Too man poll waiters\n");
           fds->priv    = NULL;
           ret          = -EBUSY;
           goto errout_with_dusem;
@@ -789,7 +789,7 @@ static int btn_poll(FAR struct file *filep, FAR struct pollfd *fds,
 #ifdef CONFIG_DEBUG
       if (!slot)
         {
-          ivdbg("ERROR: Poll slot not found\n");
+          iinfo("ERROR: Poll slot not found\n");
           ret = -EIO;
           goto errout_with_dusem;
         }
@@ -847,7 +847,7 @@ int btn_register(FAR const char *devname,
 
   if (!priv)
     {
-      ivdbg("ERROR: Failed to allocate device structure\n");
+      iinfo("ERROR: Failed to allocate device structure\n");
       return -ENOMEM;
     }
 
@@ -869,7 +869,7 @@ int btn_register(FAR const char *devname,
   ret = register_driver(devname, &btn_fops, 0666, priv);
   if (ret < 0)
     {
-      ivdbg("ERROR: register_driver failed: %d\n", ret);
+      iinfo("ERROR: register_driver failed: %d\n", ret);
       goto errout_with_priv;
     }
 
diff --git a/drivers/input/djoystick.c b/drivers/input/djoystick.c
index 5ea4cd7d28..a20451c13e 100644
--- a/drivers/input/djoystick.c
+++ b/drivers/input/djoystick.c
@@ -352,7 +352,7 @@ static void djoy_sample(FAR struct djoy_upperhalf_s *priv)
                   fds->revents |= (fds->events & POLLIN);
                   if (fds->revents != 0)
                     {
-                      illvdbg("Report events: %02x\n", fds->revents);
+                      illinfo("Report events: %02x\n", fds->revents);
                       sem_post(fds->sem);
                     }
                 }
@@ -414,7 +414,7 @@ static int djoy_open(FAR struct file *filep)
   ret = djoy_takesem(&priv->du_exclsem);
   if (ret < 0)
     {
-      ivdbg("ERROR: djoy_takesem failed: %d\n", ret);
+      iinfo("ERROR: djoy_takesem failed: %d\n", ret);
       return ret;
     }
 
@@ -423,7 +423,7 @@ static int djoy_open(FAR struct file *filep)
   opriv = (FAR struct djoy_open_s *)kmm_zalloc(sizeof(struct djoy_open_s));
   if (!opriv)
     {
-      ivdbg("ERROR: Failled to allocate open structure\n");
+      iinfo("ERROR: Failled to allocate open structure\n");
       ret = -ENOMEM;
       goto errout_with_sem;
     }
@@ -502,7 +502,7 @@ static int djoy_close(FAR struct file *filep)
   ret = djoy_takesem(&priv->du_exclsem);
   if (ret < 0)
     {
-      ivdbg("ERROR: djoy_takesem failed: %d\n", ret);
+      iinfo("ERROR: djoy_takesem failed: %d\n", ret);
       return ret;
     }
 
@@ -515,7 +515,7 @@ static int djoy_close(FAR struct file *filep)
   DEBUGASSERT(curr);
   if (!curr)
     {
-      ivdbg("ERROR: Failed to find open entry\n");
+      iinfo("ERROR: Failed to find open entry\n");
       ret = -ENOENT;
       goto errout_with_exclsem;
     }
@@ -568,7 +568,7 @@ static ssize_t djoy_read(FAR struct file *filep, FAR char *buffer,
 
   if (len < sizeof(djoy_buttonset_t))
     {
-      ivdbg("ERROR: buffer too small: %lu\n", (unsigned long)len);
+      iinfo("ERROR: buffer too small: %lu\n", (unsigned long)len);
       return -EINVAL;
     }
 
@@ -577,7 +577,7 @@ static ssize_t djoy_read(FAR struct file *filep, FAR char *buffer,
   ret = djoy_takesem(&priv->du_exclsem);
   if (ret < 0)
     {
-      ivdbg("ERROR: djoy_takesem failed: %d\n", ret);
+      iinfo("ERROR: djoy_takesem failed: %d\n", ret);
       return ret;
     }
 
@@ -616,7 +616,7 @@ static int djoy_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
   ret = djoy_takesem(&priv->du_exclsem);
   if (ret < 0)
     {
-      ivdbg("ERROR: djoy_takesem failed: %d\n", ret);
+      iinfo("ERROR: djoy_takesem failed: %d\n", ret);
       return ret;
     }
 
@@ -716,7 +716,7 @@ static int djoy_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 #endif
 
     default:
-      ivdbg("ERROR: Unrecognized command: %ld\n", cmd);
+      iinfo("ERROR: Unrecognized command: %ld\n", cmd);
       ret = -ENOTTY;
       break;
     }
@@ -750,7 +750,7 @@ static int djoy_poll(FAR struct file *filep, FAR struct pollfd *fds,
   ret = djoy_takesem(&priv->du_exclsem);
   if (ret < 0)
     {
-      ivdbg("ERROR: djoy_takesem failed: %d\n", ret);
+      iinfo("ERROR: djoy_takesem failed: %d\n", ret);
       return ret;
     }
 
@@ -778,7 +778,7 @@ static int djoy_poll(FAR struct file *filep, FAR struct pollfd *fds,
 
       if (i >= CONFIG_DJOYSTICK_NPOLLWAITERS)
         {
-          ivdbg("ERROR: Too man poll waiters\n");
+          iinfo("ERROR: Too man poll waiters\n");
           fds->priv    = NULL;
           ret          = -EBUSY;
           goto errout_with_dusem;
@@ -793,7 +793,7 @@ static int djoy_poll(FAR struct file *filep, FAR struct pollfd *fds,
 #ifdef CONFIG_DEBUG
       if (!slot)
         {
-          ivdbg("ERROR: Poll slot not found\n");
+          iinfo("ERROR: Poll slot not found\n");
           ret = -EIO;
           goto errout_with_dusem;
         }
@@ -852,7 +852,7 @@ int djoy_register(FAR const char *devname,
 
   if (!priv)
     {
-      ivdbg("ERROR: Failed to allocate device structure\n");
+      iinfo("ERROR: Failed to allocate device structure\n");
       return -ENOMEM;
     }
 
@@ -874,7 +874,7 @@ int djoy_register(FAR const char *devname,
   ret = register_driver(devname, &djoy_fops, 0666, priv);
   if (ret < 0)
     {
-      ivdbg("ERROR: register_driver failed: %d\n", ret);
+      iinfo("ERROR: register_driver failed: %d\n", ret);
       sem_destroy(&priv->du_exclsem);
       kmm_free(priv);
     }
diff --git a/drivers/input/max11802.c b/drivers/input/max11802.c
index 2c3c1f7813..1acee40807 100644
--- a/drivers/input/max11802.c
+++ b/drivers/input/max11802.c
@@ -244,7 +244,7 @@ static uint16_t max11802_sendcmd(FAR struct max11802_dev_s *priv,
   *tags = result & 0xF;
   result >>= 4; /* Get rid of tags */
 
-  ivdbg("cmd:%02x response:%04x\n", cmd, result);
+  iinfo("cmd:%02x response:%04x\n", cmd, result);
   return result;
 }
 
@@ -284,7 +284,7 @@ static void max11802_notify(FAR struct max11802_dev_s *priv)
       if (fds)
         {
           fds->revents |= POLLIN;
-          ivdbg("Report events: %02x\n", fds->revents);
+          iinfo("Report events: %02x\n", fds->revents);
           sem_post(fds->sem);
         }
     }
@@ -381,7 +381,7 @@ static int max11802_waitsample(FAR struct max11802_dev_s *priv,
     {
       /* Wait for a change in the MAX11802 state */
 
-      ivdbg("Waiting..\n");
+      iinfo("Waiting..\n");
       priv->nwaiters++;
       ret = sem_wait(&priv->waitsem);
       priv->nwaiters--;
@@ -399,7 +399,7 @@ static int max11802_waitsample(FAR struct max11802_dev_s *priv,
         }
     }
 
-  ivdbg("Sampled\n");
+  iinfo("Sampled\n");
 
   /* Re-acquire the semaphore that manages mutually exclusive access to
    * the device structure.  We may have to wait here.  But we have our
@@ -540,11 +540,11 @@ static void max11802_worker(FAR void *arg)
 
   if (pendown)
     {
-      ivdbg("\nPD\n");
+      iinfo("\nPD\n");
     }
   else
     {
-      ivdbg("\nPU\n");
+      iinfo("\nPU\n");
     }
 
   if (!pendown)
@@ -559,7 +559,7 @@ static void max11802_worker(FAR void *arg)
        * reported).
        */
 
-      ivdbg("\nPC%d\n", priv->sample.contact);
+      iinfo("\nPC%d\n", priv->sample.contact);
 
       if (priv->sample.contact == CONTACT_NONE ||
           priv->sample.contact == CONTACT_UP)
@@ -589,7 +589,7 @@ static void max11802_worker(FAR void *arg)
        * again later.
        */
 
-       ivdbg("Previous pen up event still in buffer\n");
+       iinfo("Previous pen up event still in buffer\n");
        max11802_notify(priv);
        wd_start(priv->wdog, MAX11802_WDOG_DELAY, max11802_wdog, 1,
                 (uint32_t)priv);
@@ -636,7 +636,7 @@ static void max11802_worker(FAR void *arg)
 
       if ((tags & 0x03) != 0)
         {
-          ivdbg("Touch ended before measurement\n");
+          iinfo("Touch ended before measurement\n");
           goto ignored;
         }
 
@@ -755,7 +755,7 @@ static int max11802_open(FAR struct file *filep)
   uint8_t                   tmp;
   int                       ret;
 
-  ivdbg("Opening\n");
+  iinfo("Opening\n");
 
   DEBUGASSERT(filep);
   inode = filep->f_inode;
@@ -797,7 +797,7 @@ errout_with_sem:
   sem_post(&priv->devsem);
   return ret;
 #else
-  ivdbg("Opening\n");
+  iinfo("Opening\n");
   return OK;
 #endif
 }
@@ -813,7 +813,7 @@ static int max11802_close(FAR struct file *filep)
   FAR struct max11802_dev_s *priv;
   int                       ret;
 
-  ivdbg("Closing\n");
+  iinfo("Closing\n");
   DEBUGASSERT(filep);
   inode = filep->f_inode;
 
@@ -843,7 +843,7 @@ static int max11802_close(FAR struct file *filep)
 
   sem_post(&priv->devsem);
 #endif
-  ivdbg("Closing\n");
+  iinfo("Closing\n");
   return OK;
 }
 
@@ -860,7 +860,7 @@ static ssize_t max11802_read(FAR struct file *filep, FAR char *buffer,
   struct max11802_sample_s   sample;
   int                        ret;
 
-  ivdbg("buffer:%p len:%d\n", buffer, len);
+  iinfo("buffer:%p len:%d\n", buffer, len);
   DEBUGASSERT(filep);
   inode = filep->f_inode;
 
@@ -903,7 +903,7 @@ static ssize_t max11802_read(FAR struct file *filep, FAR char *buffer,
        * option, then just return an error.
        */
 
-      ivdbg("Sample data is not available\n");
+      iinfo("Sample data is not available\n");
       if (filep->f_oflags & O_NONBLOCK)
         {
           ret = -EAGAIN;
@@ -964,16 +964,16 @@ static ssize_t max11802_read(FAR struct file *filep, FAR char *buffer,
       report->point[0].flags  = TOUCH_MOVE | TOUCH_ID_VALID | TOUCH_POS_VALID;
     }
 
-  ivdbg("  id:      %d\n", report->point[0].id);
-  ivdbg("  flags:   %02x\n", report->point[0].flags);
-  ivdbg("  x:       %d\n", report->point[0].x);
-  ivdbg("  y:       %d\n", report->point[0].y);
+  iinfo("  id:      %d\n", report->point[0].id);
+  iinfo("  flags:   %02x\n", report->point[0].flags);
+  iinfo("  x:       %d\n", report->point[0].x);
+  iinfo("  y:       %d\n", report->point[0].y);
 
   ret = SIZEOF_TOUCH_SAMPLE_S(1);
 
 errout:
   sem_post(&priv->devsem);
-  ivdbg("Returning: %d\n", ret);
+  iinfo("Returning: %d\n", ret);
   return ret;
 }
 
@@ -987,7 +987,7 @@ static int max11802_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
   FAR struct max11802_dev_s *priv;
   int                       ret;
 
-  ivdbg("cmd: %d arg: %ld\n", cmd, arg);
+  iinfo("cmd: %d arg: %ld\n", cmd, arg);
   DEBUGASSERT(filep);
   inode = filep->f_inode;
 
@@ -1047,7 +1047,7 @@ static int max11802_poll(FAR struct file *filep, FAR struct pollfd *fds,
   int ret;
   int i;
 
-  ivdbg("setup: %d\n", (int)setup);
+  iinfo("setup: %d\n", (int)setup);
   DEBUGASSERT(filep && fds);
   inode = filep->f_inode;
 
@@ -1159,7 +1159,7 @@ int max11802_register(FAR struct spi_dev_s *spi,
 #endif
   int ret;
 
-  ivdbg("spi: %p minor: %d\n", spi, minor);
+  iinfo("spi: %p minor: %d\n", spi, minor);
 
   /* Debug-only sanity checks */
 
@@ -1253,7 +1253,7 @@ int max11802_register(FAR struct spi_dev_s *spi,
   /* Register the device as an input device */
 
   (void)snprintf(devname, DEV_NAMELEN, DEV_FORMAT, minor);
-  ivdbg("Registering %s\n", devname);
+  iinfo("Registering %s\n", devname);
 
   ret = register_driver(devname, &max11802_fops, 0666, priv);
   if (ret < 0)
diff --git a/drivers/input/mxt.c b/drivers/input/mxt.c
index cd761ec271..f09455b4c9 100644
--- a/drivers/input/mxt.c
+++ b/drivers/input/mxt.c
@@ -312,7 +312,7 @@ static int mxt_getreg(FAR struct mxt_dev_s *priv, uint16_t regaddr,
 
   for (retries = 1; retries <= 3; retries++)
     {
-      ivdbg("retries=%d regaddr=%04x buflen=%d\n", retries, regaddr, buflen);
+      iinfo("retries=%d regaddr=%04x buflen=%d\n", retries, regaddr, buflen);
 
       /* Set up to write the address */
 
@@ -386,7 +386,7 @@ static int mxt_putreg(FAR struct mxt_dev_s *priv, uint16_t regaddr,
 
   for (retries = 1; retries <= 3; retries++)
     {
-      ivdbg("retries=%d regaddr=%04x buflen=%d\n", retries, regaddr, buflen);
+      iinfo("retries=%d regaddr=%04x buflen=%d\n", retries, regaddr, buflen);
 
       /* Set up to write the address */
 
@@ -611,7 +611,7 @@ static void mxt_notify(FAR struct mxt_dev_s *priv)
       if (fds)
         {
           fds->revents |= POLLIN;
-          ivdbg("Report events: %02x\n", fds->revents);
+          iinfo("Report events: %02x\n", fds->revents);
           sem_post(fds->sem);
         }
     }
@@ -796,7 +796,7 @@ static void mxt_touch_event(FAR struct mxt_dev_s *priv,
   pressure = msg->body[5];
 
   status = msg->body[0];
-  ivdbg("ndx=%u status=%02x pos(%u,%u) area=%u pressure=%u\n",
+  iinfo("ndx=%u status=%02x pos(%u,%u) area=%u pressure=%u\n",
         ndx, status, x, y, area, pressure);
 
   /* The normal sequence that we would see for a touch would be something
@@ -1017,7 +1017,7 @@ static void mxt_worker(FAR void *arg)
                   ((uint32_t)msg.body[2] << 8) |
                   ((uint32_t)msg.body[3] << 16);
 
-          ivdbg("T6: status: %02x checksum: %06lx\n",
+          iinfo("T6: status: %02x checksum: %06lx\n",
                 status, (unsigned long)chksum);
 
           retries = 0;
@@ -1049,7 +1049,7 @@ static void mxt_worker(FAR void *arg)
 
       else if (msg.id != 0xff)
         {
-          ivdbg("Ignored: id=%u message={%02x %02x %02x %02x %02x %02x %02x}\n",
+          iinfo("Ignored: id=%u message={%02x %02x %02x %02x %02x %02x %02x}\n",
                 msg.id, msg.body[0], msg.body[1], msg.body[2], msg.body[3],
                 msg.body[4], msg.body[5], msg.body[6]);
 
@@ -1490,7 +1490,7 @@ static int mxt_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
   FAR struct mxt_dev_s *priv;
   int                       ret;
 
-  ivdbg("cmd: %d arg: %ld\n", cmd, arg);
+  iinfo("cmd: %d arg: %ld\n", cmd, arg);
   DEBUGASSERT(filep);
   inode = filep->f_inode;
 
@@ -1551,7 +1551,7 @@ static int mxt_poll(FAR struct file *filep, FAR struct pollfd *fds,
   int                       ret;
   int                       i;
 
-  ivdbg("setup: %d\n", (int)setup);
+  iinfo("setup: %d\n", (int)setup);
   DEBUGASSERT(filep && fds);
   inode = filep->f_inode;
 
@@ -1697,7 +1697,7 @@ static int mxt_getobjtab(FAR struct mxt_dev_s *priv)
           idmax  = 0;
         }
 
-      ivdbg("%2d. type %2d addr %04x size: %d instances: %d IDs: %u-%u\n",
+      iinfo("%2d. type %2d addr %04x size: %d instances: %d IDs: %u-%u\n",
             i, object->type, MXT_GETUINT16(object->addr), object->size + 1,
             object->ninstances + 1, idmin, idmax);
 
@@ -1799,10 +1799,10 @@ static int mxt_hwinitialize(FAR struct mxt_dev_s *priv)
 
   info->ysize = regval;
 
-  ivdbg("Family: %u variant: %u version: %u.%u.%02x\n",
+  iinfo("Family: %u variant: %u version: %u.%u.%02x\n",
         info->family, info->variant, info->version >> 4, info->version & 0x0f,
         info->build);
-  ivdbg("Matrix size: (%u,%u) objects: %u\n",
+  iinfo("Matrix size: (%u,%u) objects: %u\n",
         info->xsize, info->ysize, info->nobjects);
 
   /* How many multi touch "slots" */
@@ -1863,7 +1863,7 @@ int mxt_register(FAR struct i2c_master_s *i2c,
   char devname[DEV_NAMELEN];
   int ret;
 
-  ivdbg("i2c: %p minor: %d\n", i2c, minor);
+  iinfo("i2c: %p minor: %d\n", i2c, minor);
 
   /* Debug-only sanity checks */
 
@@ -1913,7 +1913,7 @@ int mxt_register(FAR struct i2c_master_s *i2c,
   /* Register the device as an input device */
 
   (void)snprintf(devname, DEV_NAMELEN, DEV_FORMAT, minor);
-  ivdbg("Registering %s\n", devname);
+  iinfo("Registering %s\n", devname);
 
   ret = register_driver(devname, &mxt_fops, 0666, priv);
   if (ret < 0)
diff --git a/drivers/input/stmpe811_base.c b/drivers/input/stmpe811_base.c
index 224b9eaefc..b491fe5b2e 100644
--- a/drivers/input/stmpe811_base.c
+++ b/drivers/input/stmpe811_base.c
@@ -226,7 +226,7 @@ static int stmpe811_checkid(FAR struct stmpe811_dev_s *priv)
   devid = stmpe811_getreg8(priv, STMPE811_CHIP_ID);
   devid = (uint32_t)(devid << 8);
   devid |= (uint32_t)stmpe811_getreg8(priv, STMPE811_CHIP_ID+1);
-  ivdbg("devid: %04x\n", devid);
+  iinfo("devid: %04x\n", devid);
 
   if (devid != (uint16_t)CHIP_ID)
     {
diff --git a/drivers/input/stmpe811_tsc.c b/drivers/input/stmpe811_tsc.c
index 55dce44272..60362da51c 100644
--- a/drivers/input/stmpe811_tsc.c
+++ b/drivers/input/stmpe811_tsc.c
@@ -196,7 +196,7 @@ static void stmpe811_notify(FAR struct stmpe811_dev_s *priv)
       if (fds)
         {
           fds->revents |= POLLIN;
-          ivdbg("Report events: %02x\n", fds->revents);
+          iinfo("Report events: %02x\n", fds->revents);
           sem_post(fds->sem);
         }
     }
@@ -464,7 +464,7 @@ static ssize_t stmpe811_read(FAR struct file *filep, FAR char *buffer, size_t le
   struct stmpe811_sample_s   sample;
   int                        ret;
 
-  ivdbg("len=%d\n", len);
+  iinfo("len=%d\n", len);
   DEBUGASSERT(filep);
   inode = filep->f_inode;
 
@@ -589,7 +589,7 @@ static int stmpe811_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
   FAR struct stmpe811_dev_s *priv;
   int                        ret;
 
-  ivdbg("cmd: %d arg: %ld\n", cmd, arg);
+  iinfo("cmd: %d arg: %ld\n", cmd, arg);
   DEBUGASSERT(filep);
   inode = filep->f_inode;
 
@@ -653,7 +653,7 @@ static int stmpe811_poll(FAR struct file *filep, FAR struct pollfd *fds,
   int                        ret;
   int                        i;
 
-  ivdbg("setup: %d\n", (int)setup);
+  iinfo("setup: %d\n", (int)setup);
   DEBUGASSERT(filep && fds);
   inode = filep->f_inode;
 
@@ -805,7 +805,7 @@ static inline void stmpe811_tscinitialize(FAR struct stmpe811_dev_s *priv)
 {
   uint8_t regval;
 
-  ivdbg("Initializing touchscreen controller\n");
+  iinfo("Initializing touchscreen controller\n");
 
   /* Enable TSC and ADC functions */
 
@@ -898,7 +898,7 @@ int stmpe811_register(STMPE811_HANDLE handle, int minor)
   char devname[DEV_NAMELEN];
   int ret;
 
-  ivdbg("handle=%p minor=%d\n", handle, minor);
+  iinfo("handle=%p minor=%d\n", handle, minor);
   DEBUGASSERT(priv);
 
   /* Get exclusive access to the device structure */
diff --git a/drivers/input/tsc2007.c b/drivers/input/tsc2007.c
index a27042400f..8ab76b8e7e 100644
--- a/drivers/input/tsc2007.c
+++ b/drivers/input/tsc2007.c
@@ -278,7 +278,7 @@ static void tsc2007_notify(FAR struct tsc2007_dev_s *priv)
       if (fds)
         {
           fds->revents |= POLLIN;
-          ivdbg("Report events: %02x\n", fds->revents);
+          iinfo("Report events: %02x\n", fds->revents);
           sem_post(fds->sem);
         }
     }
@@ -550,7 +550,7 @@ static int tsc2007_transfer(FAR struct tsc2007_dev_s *priv, uint8_t cmd)
    */
 
    ret = (unsigned int)data12[0] << 4 | (unsigned int)data12[1] >> 4;
-   ivdbg("data: 0x%04x\n", ret);
+   iinfo("data: 0x%04x\n", ret);
    return ret;
 }
 
@@ -680,7 +680,7 @@ static void tsc2007_worker(FAR void *arg)
           pressure = (x * config->rxplate * (z2 - z1)) / z1;
           pressure = (pressure + 2048) >> 12;
 
-          ivdbg("Position: (%d,%4d) pressure: %u z1/2: (%d,%d)\n",
+          iinfo("Position: (%d,%4d) pressure: %u z1/2: (%d,%d)\n",
                 x, y, pressure, z1, z2);
 
           /* Ignore out of range caculcations */
@@ -1031,7 +1031,7 @@ static int tsc2007_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
   FAR struct tsc2007_dev_s *priv;
   int                       ret;
 
-  ivdbg("cmd: %d arg: %ld\n", cmd, arg);
+  iinfo("cmd: %d arg: %ld\n", cmd, arg);
   DEBUGASSERT(filep);
   inode = filep->f_inode;
 
@@ -1107,7 +1107,7 @@ static int tsc2007_poll(FAR struct file *filep, FAR struct pollfd *fds,
   int                       ret;
   int                       i;
 
-  ivdbg("setup: %d\n", (int)setup);
+  iinfo("setup: %d\n", (int)setup);
   DEBUGASSERT(filep && fds);
   inode = filep->f_inode;
 
@@ -1225,7 +1225,7 @@ int tsc2007_register(FAR struct i2c_master_s *dev,
 #endif
   int ret;
 
-  ivdbg("dev: %p minor: %d\n", dev, minor);
+  iinfo("dev: %p minor: %d\n", dev, minor);
 
   /* Debug-only sanity checks */
 
@@ -1283,7 +1283,7 @@ int tsc2007_register(FAR struct i2c_master_s *dev,
   /* Register the device as an input device */
 
   (void)snprintf(devname, DEV_NAMELEN, DEV_FORMAT, minor);
-  ivdbg("Registering %s\n", devname);
+  iinfo("Registering %s\n", devname);
 
   ret = register_driver(devname, &tsc2007_fops, 0666, priv);
   if (ret < 0)
diff --git a/drivers/lcd/ili9341.c b/drivers/lcd/ili9341.c
index 1c19187ab5..e802057f46 100644
--- a/drivers/lcd/ili9341.c
+++ b/drivers/lcd/ili9341.c
@@ -371,10 +371,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg       dbg
-#  define lcdvdbg      vdbg
+#  define lcdinfo      info
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 /****************************************************************************
@@ -791,11 +791,11 @@ static int ili9341_hwinitialize(FAR struct ili9341_dev_s *dev)
 
   /* Reset the lcd display to the default state */
 
-  lcdvdbg("ili9341 LCD driver: Software Reset\n");
+  lcdinfo("ili9341 LCD driver: Software Reset\n");
   lcd->sendcmd(lcd, ILI9341_SOFTWARE_RESET);
   up_mdelay(5);
 
-  lcdvdbg("ili9341 LCD driver: set Memory Access Control: %04x\n", dev->orient);
+  lcdinfo("ili9341 LCD driver: set Memory Access Control: %04x\n", dev->orient);
   lcd->sendcmd(lcd, ILI9341_MEMORY_ACCESS_CONTROL);
   lcd->sendparam(lcd, dev->orient);
 
@@ -809,13 +809,13 @@ static int ili9341_hwinitialize(FAR struct ili9341_dev_s *dev)
 
   /* 16 bit RGB565 */
 
-  lcdvdbg("ili9341 LCD driver: Set Pixel Format: %04x\n",
+  lcdinfo("ili9341 LCD driver: Set Pixel Format: %04x\n",
       ILI9341_PIXSET_16BITMCU_PARAM1);
   lcd->sendparam(lcd, ILI9341_PIXSET_16BITMCU_PARAM1);
 
   /* 18 bit RGB666, add settings here */
 
-  lcdvdbg("ili9341 LCD driver: Set Interface control\n");
+  lcdinfo("ili9341 LCD driver: Set Interface control\n");
   lcd->sendcmd(lcd, ILI9341_INTERFACE_CONTROL);
   lcd->sendparam(lcd, ILI9341_IFCTL_PARAM1);
   lcd->sendparam(lcd, ILI9341_IFCTL_PARAM2);
@@ -823,7 +823,7 @@ static int ili9341_hwinitialize(FAR struct ili9341_dev_s *dev)
 
   /* Sleep out */
 
-  lcdvdbg("ili9341 LCD driver: Sleep Out\n");
+  lcdinfo("ili9341 LCD driver: Sleep Out\n");
   lcd->sendcmd(lcd, ILI9341_SLEEP_OUT);
   up_mdelay(120);
 
@@ -948,7 +948,7 @@ static int ili9341_getvideoinfo(FAR struct lcd_dev_s *dev,
       vinfo->yres = ili9341_getyres(priv);
       vinfo->nplanes = 1;
 
-      lcdvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n",
+      lcdinfo("fmt: %d xres: %d yres: %d nplanes: %d\n",
       vinfo->fmt, vinfo->xres, vinfo->yres, vinfo->nplanes);
 
       return OK;
@@ -989,7 +989,7 @@ static int ili9341_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
       pinfo->bpp    = priv->bpp;
       pinfo->buffer = (FAR uint8_t *)priv->runbuffer;  /* Run scratch buffer */
 
-      lcdvdbg("planeno: %d bpp: %d\n", planeno, pinfo->bpp);
+      lcdinfo("planeno: %d bpp: %d\n", planeno, pinfo->bpp);
 
       return OK;
     }
@@ -1103,7 +1103,7 @@ static int ili9341_setpower(FAR struct lcd_dev_s *dev, int power)
 
 static int ili9341_getcontrast(struct lcd_dev_s *dev)
 {
-  lcdvdbg("Not implemented\n");
+  lcdinfo("Not implemented\n");
   return -ENOSYS;
 }
 
@@ -1125,7 +1125,7 @@ static int ili9341_getcontrast(struct lcd_dev_s *dev)
 
 static int ili9341_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
 {
-  lcdvdbg("contrast: %d\n", contrast);
+  lcdinfo("contrast: %d\n", contrast);
   return -ENOSYS;
 }
 
diff --git a/drivers/lcd/memlcd.c b/drivers/lcd/memlcd.c
index e960e27612..32bdd216a1 100644
--- a/drivers/lcd/memlcd.c
+++ b/drivers/lcd/memlcd.c
@@ -113,10 +113,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg(format, ...)  dbg(format, ##__VA_ARGS__)
-#  define lcdvdbg(format, ...) vdbg(format, ##__VA_ARGS__)
+#  define lcdinfo(format, ...) info(format, ##__VA_ARGS__)
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 /****************************************************************************
@@ -408,7 +408,7 @@ static int memlcd_putrun(fb_coord_t row, fb_coord_t col,
   int i;
 
   DEBUGASSERT(buffer);
-  lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
 
 #ifdef CONFIG_NX_PACKEDMSFIRST
   usrmask = MS_BIT;
@@ -499,7 +499,7 @@ static int memlcd_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t * buffer,
   int i;
 
   DEBUGASSERT(buffer);
-  lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
 
 #ifdef CONFIG_NX_PACKEDMSFIRST
   usrmask = MS_BIT;
@@ -557,7 +557,7 @@ static int memlcd_getvideoinfo(FAR struct lcd_dev_s *dev,
                                FAR struct fb_videoinfo_s *vinfo)
 {
   DEBUGASSERT(dev && vinfo);
-  lcdvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n",
+  lcdinfo("fmt: %d xres: %d yres: %d nplanes: %d\n",
           g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres,
           g_videoinfo.nplanes);
   memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s));
@@ -576,7 +576,7 @@ static int memlcd_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
                                FAR struct lcd_planeinfo_s *pinfo)
 {
   DEBUGASSERT(pinfo && planeno == 0);
-  lcdvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
+  lcdinfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
   memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s));
   return OK;
 }
diff --git a/drivers/lcd/mio283qt2.c b/drivers/lcd/mio283qt2.c
index c725a9dab1..49ff6f5884 100644
--- a/drivers/lcd/mio283qt2.c
+++ b/drivers/lcd/mio283qt2.c
@@ -241,10 +241,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg              dbg
-#  define lcdvdbg             vdbg
+#  define lcdinfo             info
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 /**************************************************************************************
@@ -534,7 +534,7 @@ static int mio283qt2_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *b
 
   /* Buffer must be provided and aligned to a 16-bit address boundary */
 
-  lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0);
 
   /* Select the LCD */
@@ -584,7 +584,7 @@ static int mio283qt2_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
 
   /* Buffer must be provided and aligned to a 16-bit address boundary */
 
-  lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0);
 
   /* Select the LCD */
@@ -632,7 +632,7 @@ static int mio283qt2_getvideoinfo(FAR struct lcd_dev_s *dev,
                                   FAR struct fb_videoinfo_s *vinfo)
 {
   DEBUGASSERT(dev && vinfo);
-  lcdvdbg("fmt: %d xres: %d yres: %d nplanes: 1\n",
+  lcdinfo("fmt: %d xres: %d yres: %d nplanes: 1\n",
           MIO283QT2_COLORFMT, MIO283QT2_XRES, MIO283QT2_XRES);
 
   vinfo->fmt     = MIO283QT2_COLORFMT;  /* Color format: RGB16-565: RRRR RGGG GGGB BBBB */
@@ -656,7 +656,7 @@ static int mio283qt2_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planen
   FAR struct mio283qt2_dev_s *priv = (FAR struct mio283qt2_dev_s *)dev;
 
   DEBUGASSERT(dev && pinfo && planeno == 0);
-  lcdvdbg("planeno: %d bpp: %d\n", planeno, MIO283QT2_BPP);
+  lcdinfo("planeno: %d bpp: %d\n", planeno, MIO283QT2_BPP);
 
   pinfo->putrun = mio283qt2_putrun;               /* Put a run into LCD memory */
   pinfo->getrun = mio283qt2_getrun;               /* Get a run from LCD memory */
@@ -676,7 +676,7 @@ static int mio283qt2_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planen
 
 static int mio283qt2_getpower(FAR struct lcd_dev_s *dev)
 {
-  lcdvdbg("power: %d\n", 0);
+  lcdinfo("power: %d\n", 0);
   return g_lcddev.power;
 }
 
@@ -727,7 +727,7 @@ static int mio283qt2_setpower(FAR struct lcd_dev_s *dev, int power)
   FAR struct mio283qt2_dev_s *priv = (FAR struct mio283qt2_dev_s *)dev;
   FAR struct mio283qt2_lcd_s *lcd  = priv->lcd;
 
-  lcdvdbg("power: %d\n", power);
+  lcdinfo("power: %d\n", power);
   DEBUGASSERT((unsigned)power <= CONFIG_LCD_MAXPOWER);
 
   /* Set new power level */
@@ -778,7 +778,7 @@ static int mio283qt2_setpower(FAR struct lcd_dev_s *dev, int power)
 
 static int mio283qt2_getcontrast(FAR struct lcd_dev_s *dev)
 {
-  lcdvdbg("Not implemented\n");
+  lcdinfo("Not implemented\n");
   return -ENOSYS;
 }
 
@@ -792,7 +792,7 @@ static int mio283qt2_getcontrast(FAR struct lcd_dev_s *dev)
 
 static int mio283qt2_setcontrast(FAR struct lcd_dev_s *dev, unsigned int contrast)
 {
-  lcdvdbg("contrast: %d\n", contrast);
+  lcdinfo("contrast: %d\n", contrast);
   return -ENOSYS;
 }
 
@@ -955,7 +955,7 @@ FAR struct lcd_dev_s *mio283qt2_lcdinitialize(FAR struct mio283qt2_lcd_s *lcd)
 {
   int ret;
 
-  lcdvdbg("Initializing\n");
+  lcdinfo("Initializing\n");
 
   /* If we ccould support multiple MIO283QT2 devices, this is where we would allocate
    * a new driver data structure... but we can't.  Why not?  Because of a bad should
diff --git a/drivers/lcd/mio283qt9a.c b/drivers/lcd/mio283qt9a.c
index 0770cc852e..a474a899de 100644
--- a/drivers/lcd/mio283qt9a.c
+++ b/drivers/lcd/mio283qt9a.c
@@ -140,10 +140,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg              dbg
-#  define lcdvdbg             vdbg
+#  define lcdinfo             info
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 /**************************************************************************************
@@ -498,7 +498,7 @@ static int mio283qt9a_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer
 
   /* Buffer must be provided and aligned to a 16-bit address boundary */
 
-  lcdvdbg("mio283qt9a_getrun row: %d col: %d npixels: %d\n", row, col, npixels);
+  lcdinfo("mio283qt9a_getrun row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0);
 
   /* Read the run from GRAM. */
@@ -543,7 +543,7 @@ static int mio283qt9a_getvideoinfo(FAR struct lcd_dev_s *dev,
                                    FAR struct fb_videoinfo_s *vinfo)
 {
   DEBUGASSERT(dev && vinfo);
-  lcdvdbg("fmt: %d xres: %d yres: %d nplanes: 1\n",
+  lcdinfo("fmt: %d xres: %d yres: %d nplanes: 1\n",
           MIO283QT9A_COLORFMT, MIO283QT9A_XRES, MIO283QT9A_YRES);
 
   vinfo->fmt     = MIO283QT9A_COLORFMT;  /* Color format: RGB16-565: RRRR RGGG GGGB BBBB */
@@ -567,7 +567,7 @@ static int mio283qt9a_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int plane
   FAR struct mio283qt9a_dev_s *priv = (FAR struct mio283qt9a_dev_s *)dev;
 
   DEBUGASSERT(dev && pinfo && planeno == 0);
-  lcdvdbg("planeno: %d bpp: %d\n", planeno, MIO283QT9A_BPP);
+  lcdinfo("planeno: %d bpp: %d\n", planeno, MIO283QT9A_BPP);
 
   pinfo->putrun = mio283qt9a_putrun;               /* Put a run into LCD memory */
   pinfo->getrun = mio283qt9a_getrun;               /* Get a run from LCD memory */
@@ -588,7 +588,7 @@ static int mio283qt9a_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int plane
 
 static int mio283qt9a_getpower(FAR struct lcd_dev_s *dev)
 {
-  lcdvdbg("getpower: %d\n", 0);
+  lcdinfo("getpower: %d\n", 0);
   return g_lcddev.power;
 }
 
@@ -604,7 +604,7 @@ static int mio283qt9a_getpower(FAR struct lcd_dev_s *dev)
 static int mio283qt9a_poweroff(FAR struct mio283qt9a_lcd_s *lcd)
 {
   /* Select the LCD */
-  lcdvdbg("mio283qt9a_poweroff\n");
+  lcdinfo("mio283qt9a_poweroff\n");
 
   lcd->select(lcd);
 
@@ -640,7 +640,7 @@ static int mio283qt9a_setpower(FAR struct lcd_dev_s *dev, int power)
   FAR struct mio283qt9a_dev_s *priv = (FAR struct mio283qt9a_dev_s *)dev;
   FAR struct mio283qt9a_lcd_s *lcd  = priv->lcd;
 
-  lcdvdbg("setpower: %d\n", power);
+  lcdinfo("setpower: %d\n", power);
   DEBUGASSERT((unsigned)power <= CONFIG_LCD_MAXPOWER);
 
   /* Set new power level */
@@ -687,7 +687,7 @@ static int mio283qt9a_setpower(FAR struct lcd_dev_s *dev, int power)
 
 static int mio283qt9a_getcontrast(FAR struct lcd_dev_s *dev)
 {
-  lcdvdbg("Not implemented\n");
+  lcdinfo("Not implemented\n");
   return -ENOSYS;
 }
 
@@ -701,7 +701,7 @@ static int mio283qt9a_getcontrast(FAR struct lcd_dev_s *dev)
 
 static int mio283qt9a_setcontrast(FAR struct lcd_dev_s *dev, unsigned int contrast)
 {
-  lcdvdbg("contrast: %d\n", contrast);
+  lcdinfo("contrast: %d\n", contrast);
   return -ENOSYS;
 }
 
@@ -739,7 +739,7 @@ static inline int mio283qt9a_hwinitialize(FAR struct mio283qt9a_dev_s *priv)
   id_c = lcd->read(lcd);
   id_d = lcd->read(lcd);
 
-  lcdvdbg("LCD ID: %04x %04x %04x %04x\n", id_a, id_b, id_c, id_d);
+  lcdinfo("LCD ID: %04x %04x %04x %04x\n", id_a, id_b, id_c, id_d);
   UNUSED(id_a);
   UNUSED(id_b);
 
@@ -781,38 +781,38 @@ static inline int mio283qt9a_hwinitialize(FAR struct mio283qt9a_dev_s *priv)
       id_b = lcd->read(lcd);
       id_c = lcd->read(lcd);
       id_d = lcd->read(lcd);
-      lcdvdbg("LCD man ID: %02x, version: %02x, driver ID: %02x\n", id_b, id_c, id_d);
+      lcdinfo("LCD man ID: %02x, version: %02x, driver ID: %02x\n", id_b, id_c, id_d);
 
       id_a = mio283qt9a_readreg(lcd, 0x09); /* Read display status */
       id_b = lcd->read(lcd);
       id_c = lcd->read(lcd);
       id_d = lcd->read(lcd);
       id_e = lcd->read(lcd);
-      lcdvdbg("Display status %02x, %02x, %02x, %02x, %02x\n", id_a, id_b, id_c, id_d, id_e);
+      lcdinfo("Display status %02x, %02x, %02x, %02x, %02x\n", id_a, id_b, id_c, id_d, id_e);
 
       id_a = mio283qt9a_readreg(lcd, 0x0a); /* Read power status */
       id_b = lcd->read(lcd);
-      lcdvdbg("Power status %02x, %02x\n", id_a, id_b);
+      lcdinfo("Power status %02x, %02x\n", id_a, id_b);
 
       id_a = mio283qt9a_readreg(lcd, 0x0b); /* Read MADCTL */
       id_b = lcd->read(lcd);
-      lcdvdbg("MADCTL %02x, %02x\n", id_a, id_b);
+      lcdinfo("MADCTL %02x, %02x\n", id_a, id_b);
 
       id_a = mio283qt9a_readreg(lcd, 0x0c); /* Read pixel format */
       id_b = lcd->read(lcd);
-      lcdvdbg("Pixel format %02x, %02x\n", id_a, id_b);
+      lcdinfo("Pixel format %02x, %02x\n", id_a, id_b);
 
       id_a = mio283qt9a_readreg(lcd, 0x0d); /* Read image format */
       id_b = lcd->read(lcd);
-      lcdvdbg("Image format %02x, %02x\n", id_a, id_b);
+      lcdinfo("Image format %02x, %02x\n", id_a, id_b);
 
       id_a = mio283qt9a_readreg(lcd, 0x0e);  /* read signal mode */
       id_b = lcd->read(lcd);
-      lcdvdbg("Signal mode %02x, %02x\n", id_a, id_b);
+      lcdinfo("Signal mode %02x, %02x\n", id_a, id_b);
 
       id_a = mio283qt9a_readreg(lcd, 0x0f);  /* read self diag */
       id_b = lcd->read(lcd);
-      lcdvdbg("Self diag %02x, %02x\n", id_a, id_b);
+      lcdinfo("Self diag %02x, %02x\n", id_a, id_b);
 #endif
       ret = OK;
     }
@@ -849,7 +849,7 @@ FAR struct lcd_dev_s *mio283qt9a_lcdinitialize(FAR struct mio283qt9a_lcd_s *lcd)
   FAR struct mio283qt9a_dev_s *priv;
   int ret;
 
-  lcdvdbg("Initializing\n");
+  lcdinfo("Initializing\n");
 
   /* If we could support multiple MIO283QT9A devices, this is where we would allocate
    * a new driver data structure... but we can't.  Why not?  Because of a bad should
diff --git a/drivers/lcd/nokia6100.c b/drivers/lcd/nokia6100.c
index 51cb39fe10..8a21afa396 100644
--- a/drivers/lcd/nokia6100.c
+++ b/drivers/lcd/nokia6100.c
@@ -308,7 +308,7 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_LCD_REGDEBUG
-# define lcddbg(format, ...) llvdbg(format, ##__VA_ARGS__)
+# define lcddbg(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 # define lcddbg(x...)
 #endif
@@ -866,7 +866,7 @@ static int nokia_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffe
   FAR struct spi_dev_s *spi = priv->spi;
   uint16_t cmd[3];
 
-  gvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  ginfo("row: %d col: %d npixels: %d\n", row, col, npixels);
 
 #if NOKIA_XBIAS > 0
   col += NOKIA_XBIAS;
@@ -917,7 +917,7 @@ static int nokia_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffe
 static int nokia_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
                         size_t npixels)
 {
-  gvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  ginfo("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0);
 
   /* At present, this is a write-only LCD driver */
@@ -938,7 +938,7 @@ static int nokia_getvideoinfo(FAR struct lcd_dev_s *dev,
                               FAR struct fb_videoinfo_s *vinfo)
 {
   DEBUGASSERT(dev && vinfo);
-  gvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n",
+  ginfo("fmt: %d xres: %d yres: %d nplanes: %d\n",
          g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes);
   memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s));
   return OK;
@@ -956,7 +956,7 @@ static int nokia_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
                               FAR struct lcd_planeinfo_s *pinfo)
 {
   DEBUGASSERT(dev && pinfo && planeno == 0);
-  gvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
+  ginfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
   memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s));
   return OK;
 }
@@ -973,7 +973,7 @@ static int nokia_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
 static int nokia_getpower(struct lcd_dev_s *dev)
 {
   struct nokia_dev_s *priv = (struct nokia_dev_s *)dev;
-  gvdbg("power: %d\n", priv->power);
+  ginfo("power: %d\n", priv->power);
   return priv->power;
 }
 
@@ -991,7 +991,7 @@ static int nokia_setpower(struct lcd_dev_s *dev, int power)
   struct nokia_dev_s *priv = (struct nokia_dev_s *)dev;
   int ret;
 
-  gvdbg("power: %d\n", power);
+  ginfo("power: %d\n", power);
   DEBUGASSERT(power <= CONFIG_LCD_MAXPOWER);
 
   /* Set new power level.  The backlight power is controlled outside of the LCD
@@ -1017,7 +1017,7 @@ static int nokia_setpower(struct lcd_dev_s *dev, int power)
 static int nokia_getcontrast(struct lcd_dev_s *dev)
 {
   struct nokia_dev_s *priv = (struct nokia_dev_s *)dev;
-  gvdbg("contrast: %d\n", priv->contrast);
+  ginfo("contrast: %d\n", priv->contrast);
   return priv->contrast;
 }
 
@@ -1056,7 +1056,7 @@ static int nokia_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
 #endif
     }
 
-  gvdbg("contrast: %d\n", contrast);
+  ginfo("contrast: %d\n", contrast);
   return -ENOSYS;
 }
 
@@ -1169,7 +1169,7 @@ FAR struct lcd_dev_s *nokia_lcdinitialize(FAR struct spi_dev_s *spi, unsigned in
 {
   struct nokia_dev_s *priv = &g_lcddev;
 
-  gvdbg("Initializing\n");
+  ginfo("Initializing\n");
   DEBUGASSERT(devno == 0);
 
   /* Initialize the driver data structure */
diff --git a/drivers/lcd/p14201.c b/drivers/lcd/p14201.c
index 7cb7ad299d..dbc54f547c 100644
--- a/drivers/lcd/p14201.c
+++ b/drivers/lcd/p14201.c
@@ -180,7 +180,7 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_LCD_RITDEBUG
-#  define ritdbg(format, ...)  vdbg(format, ##__VA_ARGS__)
+#  define ritdbg(format, ...)  info(format, ##__VA_ARGS__)
 #else
 #  define ritdbg(x...)
 #endif
@@ -990,7 +990,7 @@ static int rit_getvideoinfo(FAR struct lcd_dev_s *dev,
                               FAR struct fb_videoinfo_s *vinfo)
 {
   DEBUGASSERT(dev && vinfo);
-  gvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n",
+  ginfo("fmt: %d xres: %d yres: %d nplanes: %d\n",
         g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes);
   memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s));
   return OK;
@@ -1008,7 +1008,7 @@ static int rit_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
                               FAR struct lcd_planeinfo_s *pinfo)
 {
   DEBUGASSERT(pinfo && planeno == 0);
-  gvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
+  ginfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
   memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s));
   return OK;
 }
@@ -1027,7 +1027,7 @@ static int rit_getpower(FAR struct lcd_dev_s *dev)
   FAR struct rit_dev_s *priv = (FAR struct rit_dev_s *)dev;
   DEBUGASSERT(priv);
 
-  gvdbg("power: %s\n", priv->on ? "ON" : "OFF");
+  ginfo("power: %s\n", priv->on ? "ON" : "OFF");
   return priv->on ? CONFIG_LCD_MAXPOWER : 0;
 }
 
@@ -1045,7 +1045,7 @@ static int rit_setpower(struct lcd_dev_s *dev, int power)
   struct rit_dev_s *priv = (struct rit_dev_s *)dev;
   DEBUGASSERT(priv && (unsigned)power <= CONFIG_LCD_MAXPOWER && priv->spi);
 
-  gvdbg("power: %d\n", power);
+  ginfo("power: %d\n", power);
 
   /* Select the SD1329 controller */
 
@@ -1090,7 +1090,7 @@ static int rit_getcontrast(struct lcd_dev_s *dev)
 {
   struct rit_dev_s *priv = (struct rit_dev_s *)dev;
 
-  gvdbg("contrast: %d\n", priv->contrast);
+  ginfo("contrast: %d\n", priv->contrast);
   return priv->contrast;
 }
 
@@ -1107,7 +1107,7 @@ static int rit_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
   struct rit_dev_s *priv = (struct rit_dev_s *)dev;
   uint8_t cmd[3];
 
-  gvdbg("contrast: %d\n", contrast);
+  ginfo("contrast: %d\n", contrast);
   DEBUGASSERT(contrast <= CONFIG_LCD_MAXCONTRAST);
 
   /* Select the SD1329 controller */
@@ -1156,7 +1156,7 @@ FAR struct lcd_dev_s *rit_initialize(FAR struct spi_dev_s *spi, unsigned int dev
   FAR struct rit_dev_s *priv = (FAR struct rit_dev_s *)&g_oleddev;
   DEBUGASSERT(devno == 0 && spi);
 
-  gvdbg("Initializing devno: %d\n", devno);
+  ginfo("Initializing devno: %d\n", devno);
 
   /* Driver state data */
 
diff --git a/drivers/lcd/pcf8574_lcd_backpack.c b/drivers/lcd/pcf8574_lcd_backpack.c
index a8e288c6cc..8cda5412ec 100644
--- a/drivers/lcd/pcf8574_lcd_backpack.c
+++ b/drivers/lcd/pcf8574_lcd_backpack.c
@@ -80,10 +80,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg            dbg
-#  define lcdvdbg           vdbg
+#  define lcdinfo           info
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 #define MAX_OPENCNT     (255)                  /* Limit of uint8_t */
@@ -185,7 +185,7 @@ static void pca8574_write(FAR struct pcf8574_lcd_dev_s *priv, uint8_t data)
   ret = i2c_write(priv->i2c, &config, &data, 1);
   if (ret < 0)
     {
-      lcdvdbg("pca8574_write() failed: %d\n", ret);
+      lcdinfo("pca8574_write() failed: %d\n", ret);
       return;
     }
 
@@ -222,7 +222,7 @@ static int pca8574_read(FAR struct pcf8574_lcd_dev_s *priv, uint8_t* data)
   ret = i2c_read(priv->i2c, &config, data, 1);
   if (ret < 0)
     {
-      lcdvdbg("pca8574_read() failed: %d\n", ret);
+      lcdinfo("pca8574_read() failed: %d\n", ret);
     }
 
   return ret;
@@ -704,7 +704,7 @@ static void lcd_scroll_up(FAR struct pcf8574_lcd_dev_s *priv)
   data = (uint8_t *)malloc(priv->cfg.cols);
   if (NULL == data)
     {
-       lcdvdbg("Failed to allocate buffer in lcd_scroll_up()\n");
+       lcdinfo("Failed to allocate buffer in lcd_scroll_up()\n");
       return;
     }
 
@@ -1428,7 +1428,7 @@ static int pcf8574_lcd_ioctl(FAR struct file *filep, int cmd,
           FAR struct pcf8574_lcd_dev_s *priv = (FAR struct pcf8574_lcd_dev_s *)inode->i_private;
           FAR struct slcd_attributes_s *attr = (FAR struct slcd_attributes_s *)((uintptr_t)arg);
 
-          lcdvdbg("SLCDIOC_GETATTRIBUTES:\n");
+          lcdinfo("SLCDIOC_GETATTRIBUTES:\n");
 
           if (!attr)
             {
@@ -1578,13 +1578,13 @@ int pcf8574_lcd_backpack_register(FAR const char *devpath,
 
   if (cfg->rows < 1 || cfg->rows > 4)
     {
-      lcdvdbg("Display rows must be 1-4\n");
+      lcdinfo("Display rows must be 1-4\n");
       return -EINVAL;
     }
 
   if ((cfg->cols < 1 || cfg->cols > 64) || (cfg->rows == 4 && cfg->cols > 32))
     {
-      lcdvdbg("Display cols must be 1-64, and may not be part of a 4x40 configuration\n");
+      lcdinfo("Display cols must be 1-64, and may not be part of a 4x40 configuration\n");
       return -EINVAL;
     }
 
@@ -1593,7 +1593,7 @@ int pcf8574_lcd_backpack_register(FAR const char *devpath,
   priv = (FAR struct pcf8574_lcd_dev_s *)kmm_malloc(sizeof(struct pcf8574_lcd_dev_s));
   if (!priv)
     {
-      lcdvdbg("Failed to allocate instance\n");
+      lcdinfo("Failed to allocate instance\n");
       return -ENOMEM;
     }
 
@@ -1613,10 +1613,10 @@ int pcf8574_lcd_backpack_register(FAR const char *devpath,
   ret = register_driver(devpath, &g_pcf8574_lcd_fops, 0666, priv);
   if (ret < 0)
     {
-      lcdvdbg("Failed to register driver: %d\n", ret);
+      lcdinfo("Failed to register driver: %d\n", ret);
       kmm_free(priv);
     }
 
-  lcdvdbg("pcf8574_lcd_backpack driver loaded successfully!\n");
+  lcdinfo("pcf8574_lcd_backpack driver loaded successfully!\n");
   return ret;
 }
diff --git a/drivers/lcd/ra8875.c b/drivers/lcd/ra8875.c
index ed1897ef62..309a7fb546 100644
--- a/drivers/lcd/ra8875.c
+++ b/drivers/lcd/ra8875.c
@@ -176,10 +176,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg  dbg
-#  define lcdvdbg vdbg
+#  define lcdinfo info
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 /**************************************************************************************
@@ -334,7 +334,7 @@ static void ra8875_putreg(FAR struct ra8875_lcd_s *lcd, uint8_t regaddr,
 {
   /* Set the index register to the register address and write the register contents */
 
-  lcdvdbg("putreg 0x%02x = 0x%02x\n", regaddr, regval);
+  lcdinfo("putreg 0x%02x = 0x%02x\n", regaddr, regval);
 
   lcd->write_reg(lcd, regaddr, regval);
 }
@@ -352,7 +352,7 @@ static void ra8875_putreg16(FAR struct ra8875_lcd_s *lcd, uint8_t regaddr,
 {
   /* Set the index register to the register address and write the register contents */
 
-  lcdvdbg("putreg 0x%02x = 0x%04x\n", regaddr, regval);
+  lcdinfo("putreg 0x%02x = 0x%04x\n", regaddr, regval);
 
   lcd->write_reg16(lcd, regaddr, regval);
 }
@@ -373,7 +373,7 @@ static uint8_t ra8875_readreg(FAR struct ra8875_lcd_s *lcd, uint8_t regaddr)
 
   regval = lcd->read_reg(lcd, regaddr);
 
-  lcdvdbg("readreg 0x%02x = 0x%02x\n", regaddr, regval);
+  lcdinfo("readreg 0x%02x = 0x%02x\n", regaddr, regval);
   return regval;
 }
 #endif
@@ -533,13 +533,13 @@ static inline void ra8875_setforeground(FAR struct ra8875_lcd_s *lcd, uint16_t c
 
 static void ra8875_clearmem(FAR struct ra8875_lcd_s *lcd)
 {
-  lcdvdbg("clearmem start\n");
+  lcdinfo("clearmem start\n");
   ra8875_putreg(lcd, RA8875_MCLR, RA8875_MCLR_CLEAR | RA8875_MCLR_FULL);
 
   /* Wait for operation to finish */
 
   ra8875_waitreg(lcd, RA8875_MCLR, RA8875_MCLR_CLEAR);
-  lcdvdbg("clearmem done\n");
+  lcdinfo("clearmem done\n");
 }
 
 /**************************************************************************************
@@ -829,7 +829,7 @@ static int ra8875_getvideoinfo(FAR struct lcd_dev_s *dev,
                                FAR struct fb_videoinfo_s *vinfo)
 {
   DEBUGASSERT(dev && vinfo);
-  lcdvdbg("fmt: %d xres: %d yres: %d nplanes: 1\n",
+  lcdinfo("fmt: %d xres: %d yres: %d nplanes: 1\n",
           RA8875_COLORFMT, RA8875_XRES, RA8875_YRES);
 
   vinfo->fmt     = RA8875_COLORFMT;    /* Color format: RGB16-565: RRRR RGGG GGGB BBBB */
@@ -853,7 +853,7 @@ static int ra8875_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
   FAR struct ra8875_dev_s *priv = (FAR struct ra8875_dev_s *)dev;
 
   DEBUGASSERT(dev && pinfo && planeno == 0);
-  lcdvdbg("planeno: %d bpp: %d\n", planeno, RA8875_BPP);
+  lcdinfo("planeno: %d bpp: %d\n", planeno, RA8875_BPP);
 
   pinfo->putrun = ra8875_putrun;                  /* Put a run into LCD memory */
   pinfo->getrun = ra8875_getrun;                  /* Get a run from LCD memory */
@@ -873,7 +873,7 @@ static int ra8875_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
 
 static int ra8875_getpower(FAR struct lcd_dev_s *dev)
 {
-  lcdvdbg("power: %d\n", 0);
+  lcdinfo("power: %d\n", 0);
   return g_lcddev.power;
 }
 
@@ -917,7 +917,7 @@ static int ra8875_setpower(FAR struct lcd_dev_s *dev, int power)
   FAR struct ra8875_dev_s *priv = (FAR struct ra8875_dev_s *)dev;
   FAR struct ra8875_lcd_s *lcd  = priv->lcd;
 
-  lcdvdbg("power: %d\n", power);
+  lcdinfo("power: %d\n", power);
   DEBUGASSERT((unsigned)power <= CONFIG_LCD_MAXPOWER);
 
   /* Set new power level */
@@ -960,7 +960,7 @@ static int ra8875_setpower(FAR struct lcd_dev_s *dev, int power)
 
 static int ra8875_getcontrast(FAR struct lcd_dev_s *dev)
 {
-  lcdvdbg("Not implemented\n");
+  lcdinfo("Not implemented\n");
   return -ENOSYS;
 }
 
@@ -974,7 +974,7 @@ static int ra8875_getcontrast(FAR struct lcd_dev_s *dev)
 
 static int ra8875_setcontrast(FAR struct lcd_dev_s *dev, unsigned int contrast)
 {
-  lcdvdbg("contrast: %d\n", contrast);
+  lcdinfo("contrast: %d\n", contrast);
   return -ENOSYS;
 }
 
@@ -993,7 +993,7 @@ static inline int ra8875_hwinitialize(FAR struct ra8875_dev_s *priv)
 
   /* REVISIT: Maybe some of these values needs to be configurable?? */
 
-  lcdvdbg("hwinitialize\n");
+  lcdinfo("hwinitialize\n");
 
   /* Reset */
 
@@ -1076,7 +1076,7 @@ static inline int ra8875_hwinitialize(FAR struct ra8875_dev_s *priv)
   priv->shadow_w_curh = 0;
   priv->shadow_w_curv = 0;
 
-  lcdvdbg("hwinitialize done\n");
+  lcdinfo("hwinitialize done\n");
   return OK;
 }
 
@@ -1098,7 +1098,7 @@ FAR struct lcd_dev_s *ra8875_lcdinitialize(FAR struct ra8875_lcd_s *lcd)
 {
   int ret;
 
-  lcdvdbg("Initializing\n");
+  lcdinfo("Initializing\n");
 
   /* If we could support multiple RA8875 devices, this is where we would allocate
    * a new driver data structure... but we can't.  Why not?  Because of a bad should
@@ -1130,7 +1130,7 @@ FAR struct lcd_dev_s *ra8875_lcdinitialize(FAR struct ra8875_lcd_s *lcd)
 
       ra8875_poweroff(lcd);
 
-      lcdvdbg("Initialized\n");
+      lcdinfo("Initialized\n");
 
       return &g_lcddev.dev;
     }
diff --git a/drivers/lcd/skeleton.c b/drivers/lcd/skeleton.c
index 0c38ac441e..f0bd831137 100644
--- a/drivers/lcd/skeleton.c
+++ b/drivers/lcd/skeleton.c
@@ -90,7 +90,7 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_LCD_SKELDEBUG
-# define skeldbg(format, ...)  vdbg(format, ##__VA_ARGS__)
+# define skeldbg(format, ...)  info(format, ##__VA_ARGS__)
 #else
 # define skeldbg(x...)
 #endif
@@ -230,7 +230,7 @@ static int skel_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer
 {
   /* Buffer must be provided and aligned to a 16-bit address boundary */
 
-  gvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  ginfo("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0);
 
   /* Set up to write the run. */
@@ -259,7 +259,7 @@ static int skel_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
 {
   /* Buffer must be provided and aligned to a 16-bit address boundary */
 
-  gvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  ginfo("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0);
 
 #warning "Missing logic"
@@ -278,7 +278,7 @@ static int skel_getvideoinfo(FAR struct lcd_dev_s *dev,
                               FAR struct fb_videoinfo_s *vinfo)
 {
   DEBUGASSERT(dev && vinfo);
-  gvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n",
+  ginfo("fmt: %d xres: %d yres: %d nplanes: %d\n",
          g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes);
   memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s));
   return OK;
@@ -296,7 +296,7 @@ static int skel_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
                               FAR struct lcd_planeinfo_s *pinfo)
 {
   DEBUGASSERT(dev && pinfo && planeno == 0);
-  gvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
+  ginfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
   memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s));
   return OK;
 }
@@ -313,7 +313,7 @@ static int skel_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
 static int skel_getpower(struct lcd_dev_s *dev)
 {
   struct skel_dev_s *priv = (struct skel_dev_s *)dev;
-  gvdbg("power: %d\n", 0);
+  ginfo("power: %d\n", 0);
 #warning "Missing logic"
   return 0;
 }
@@ -331,7 +331,7 @@ static int skel_setpower(struct lcd_dev_s *dev, int power)
 {
   struct skel_dev_s *priv = (struct skel_dev_s *)dev;
 
-  gvdbg("power: %d\n", power);
+  ginfo("power: %d\n", power);
   DEBUGASSERT(power <= CONFIG_LCD_MAXPOWER);
 
   /* Set new power level */
@@ -350,7 +350,7 @@ static int skel_setpower(struct lcd_dev_s *dev, int power)
 
 static int skel_getcontrast(struct lcd_dev_s *dev)
 {
-  gvdbg("Not implemented\n");
+  ginfo("Not implemented\n");
 #warning "Missing logic"
   return -ENOSYS;
 }
@@ -365,7 +365,7 @@ static int skel_getcontrast(struct lcd_dev_s *dev)
 
 static int skel_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
 {
-  gvdbg("contrast: %d\n", contrast);
+  ginfo("contrast: %d\n", contrast);
 #warning "Missing logic"
   return -ENOSYS;
 }
@@ -386,7 +386,7 @@ static int skel_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
 
 FAR struct lcd_dev_s *up_oledinitialize(FAR struct spi_dev_s *spi)
 {
-  gvdbg("Initializing\n");
+  ginfo("Initializing\n");
 
   /* Configure GPIO pins */
 #warning "Missing logic"
diff --git a/drivers/lcd/ssd1289.c b/drivers/lcd/ssd1289.c
index 6ef171b306..8c4800d5fe 100644
--- a/drivers/lcd/ssd1289.c
+++ b/drivers/lcd/ssd1289.c
@@ -230,10 +230,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg  dbg
-#  define lcdvdbg vdbg
+#  define lcdinfo info
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 /**************************************************************************************
@@ -846,7 +846,7 @@ static int ssd1289_getvideoinfo(FAR struct lcd_dev_s *dev,
                                  FAR struct fb_videoinfo_s *vinfo)
 {
   DEBUGASSERT(dev && vinfo);
-  lcdvdbg("fmt: %d xres: %d yres: %d nplanes: 1\n",
+  lcdinfo("fmt: %d xres: %d yres: %d nplanes: 1\n",
           SSD1289_COLORFMT, SSD1289_XRES, SSD1289_YRES);
 
   vinfo->fmt     = SSD1289_COLORFMT;    /* Color format: RGB16-565: RRRR RGGG GGGB BBBB */
@@ -870,7 +870,7 @@ static int ssd1289_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
   FAR struct ssd1289_dev_s *priv = (FAR struct ssd1289_dev_s *)dev;
 
   DEBUGASSERT(dev && pinfo && planeno == 0);
-  lcdvdbg("planeno: %d bpp: %d\n", planeno, SSD1289_BPP);
+  lcdinfo("planeno: %d bpp: %d\n", planeno, SSD1289_BPP);
 
   pinfo->putrun = ssd1289_putrun;                 /* Put a run into LCD memory */
   pinfo->getrun = ssd1289_getrun;                 /* Get a run from LCD memory */
@@ -890,7 +890,7 @@ static int ssd1289_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
 
 static int ssd1289_getpower(FAR struct lcd_dev_s *dev)
 {
-  lcdvdbg("power: %d\n", 0);
+  lcdinfo("power: %d\n", 0);
   return g_lcddev.power;
 }
 
@@ -933,7 +933,7 @@ static int ssd1289_setpower(FAR struct lcd_dev_s *dev, int power)
   FAR struct ssd1289_dev_s *priv = (FAR struct ssd1289_dev_s *)dev;
   FAR struct ssd1289_lcd_s *lcd  = priv->lcd;
 
-  lcdvdbg("power: %d\n", power);
+  lcdinfo("power: %d\n", power);
   DEBUGASSERT((unsigned)power <= CONFIG_LCD_MAXPOWER);
 
   /* Set new power level */
@@ -974,7 +974,7 @@ static int ssd1289_setpower(FAR struct lcd_dev_s *dev, int power)
 
 static int ssd1289_getcontrast(FAR struct lcd_dev_s *dev)
 {
-  lcdvdbg("Not implemented\n");
+  lcdinfo("Not implemented\n");
   return -ENOSYS;
 }
 
@@ -988,7 +988,7 @@ static int ssd1289_getcontrast(FAR struct lcd_dev_s *dev)
 
 static int ssd1289_setcontrast(FAR struct lcd_dev_s *dev, unsigned int contrast)
 {
-  lcdvdbg("contrast: %d\n", contrast);
+  lcdinfo("contrast: %d\n", contrast);
   return -ENOSYS;
 }
 
@@ -1302,7 +1302,7 @@ FAR struct lcd_dev_s *ssd1289_lcdinitialize(FAR struct ssd1289_lcd_s *lcd)
 {
   int ret;
 
-  lcdvdbg("Initializing\n");
+  lcdinfo("Initializing\n");
 
   /* If we ccould support multiple SSD1289 devices, this is where we would allocate
    * a new driver data structure... but we can't.  Why not?  Because of a bad should
diff --git a/drivers/lcd/ssd1306.h b/drivers/lcd/ssd1306.h
index 6c008e7a9b..fb71377279 100644
--- a/drivers/lcd/ssd1306.h
+++ b/drivers/lcd/ssd1306.h
@@ -213,10 +213,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg(format, ...)     dbg(format, ##__VA_ARGS__)
-#  define lcdvdbg(format, ...)    vdbg(format, ##__VA_ARGS__)
+#  define lcdinfo(format, ...)    info(format, ##__VA_ARGS__)
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 /**************************************************************************************
diff --git a/drivers/lcd/ssd1306_base.c b/drivers/lcd/ssd1306_base.c
index db94d9ea83..345b5f5695 100644
--- a/drivers/lcd/ssd1306_base.c
+++ b/drivers/lcd/ssd1306_base.c
@@ -272,7 +272,7 @@ static int ssd1306_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buf
   int pixlen;
   uint8_t i;
 
-  lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer);
 
   /* Clip the run to the display */
@@ -480,7 +480,7 @@ static int ssd1306_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
   int pixlen;
   uint8_t i;
 
-  lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer);
 
   /* Clip the run to the display */
@@ -625,7 +625,7 @@ static int ssd1306_getvideoinfo(FAR struct lcd_dev_s *dev,
                                 FAR struct fb_videoinfo_s *vinfo)
 {
   DEBUGASSERT(dev && vinfo);
-  lcdvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n",
+  lcdinfo("fmt: %d xres: %d yres: %d nplanes: %d\n",
           g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes);
   memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s));
   return OK;
@@ -643,7 +643,7 @@ static int ssd1306_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
                                 FAR struct lcd_planeinfo_s *pinfo)
 {
   DEBUGASSERT(pinfo && planeno == 0);
-  lcdvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
+  lcdinfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
   memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s));
   return OK;
 }
@@ -662,7 +662,7 @@ static int ssd1306_getpower(FAR struct lcd_dev_s *dev)
   FAR struct ssd1306_dev_s *priv = (FAR struct ssd1306_dev_s *)dev;
   DEBUGASSERT(priv);
 
-  lcdvdbg("power: %s\n", priv->on ? "ON" : "OFF");
+  lcdinfo("power: %s\n", priv->on ? "ON" : "OFF");
   return priv->on ? CONFIG_LCD_MAXPOWER : 0;
 }
 
@@ -680,7 +680,7 @@ static int ssd1306_setpower(FAR struct lcd_dev_s *dev, int power)
   struct ssd1306_dev_s *priv = (struct ssd1306_dev_s *)dev;
   DEBUGASSERT(priv && (unsigned)power <= CONFIG_LCD_MAXPOWER);
 
-  lcdvdbg("power: %d [%d]\n", power, priv->on ? CONFIG_LCD_MAXPOWER : 0);
+  lcdinfo("power: %d [%d]\n", power, priv->on ? CONFIG_LCD_MAXPOWER : 0);
 
   /* Lock and select device */
 
@@ -720,7 +720,7 @@ static int ssd1306_getcontrast(struct lcd_dev_s *dev)
   struct ssd1306_dev_s *priv = (struct ssd1306_dev_s *)dev;
   DEBUGASSERT(priv);
 
-  lcdvdbg("contrast: %d\n", priv->contrast);
+  lcdinfo("contrast: %d\n", priv->contrast);
   return priv->contrast;
 }
 
@@ -737,7 +737,7 @@ static int ssd1306_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
   struct ssd1306_dev_s *priv = (struct ssd1306_dev_s *)dev;
   unsigned int scaled;
 
-  lcdvdbg("contrast: %d\n", contrast);
+  lcdinfo("contrast: %d\n", contrast);
   DEBUGASSERT(priv);
 
   /* Verify the contrast value */
@@ -812,7 +812,7 @@ FAR struct lcd_dev_s *ssd1306_initialize(FAR struct i2c_master_s *dev, unsigned
 {
   FAR struct ssd1306_dev_s  *priv = &g_oleddev;
 
-  lcdvdbg("Initializing\n");
+  lcdinfo("Initializing\n");
   DEBUGASSERT(spi && devno == 0);
 
 #ifdef CONFIG_LCD_SSD1306_SPI
diff --git a/drivers/lcd/ssd1306_spi.c b/drivers/lcd/ssd1306_spi.c
index b17466c40e..f40a59cdf8 100644
--- a/drivers/lcd/ssd1306_spi.c
+++ b/drivers/lcd/ssd1306_spi.c
@@ -63,7 +63,7 @@
 
 static inline void ssd1306_configspi(FAR struct spi_dev_s *spi)
 {
-  lcdvdbg("Mode: %d Bits: 8 Frequency: %d\n",
+  lcdinfo("Mode: %d Bits: 8 Frequency: %d\n",
           CONFIG_SSD1306_SPIMODE, CONFIG_SSD1306_FREQUENCY);
 
   /* Configure SPI for the SSD1306 */
diff --git a/drivers/lcd/ssd1351.c b/drivers/lcd/ssd1351.c
index c56cc2b682..00908cee66 100644
--- a/drivers/lcd/ssd1351.c
+++ b/drivers/lcd/ssd1351.c
@@ -821,7 +821,7 @@ static int ssd1351_getvideoinfo(FAR struct lcd_dev_s *dev,
   vinfo->yres    = SSD1351_YRES;
   vinfo->nplanes = 1;
 
-  gvdbg("fmt: %u xres: %u yres: %u nplanes: %u\n",
+  ginfo("fmt: %u xres: %u yres: %u nplanes: %u\n",
         vinfo->fmt, vinfo->xres, vinfo->yres, vinfo->nplanes);
   return OK;
 }
@@ -847,7 +847,7 @@ static int ssd1351_getplaneinfo(FAR struct lcd_dev_s *dev,
   pinfo->buffer = (uint8_t *)priv->runbuffer;
   pinfo->bpp    = SSD1351_BPP;
 
-  gvdbg("planeno: %u bpp: %u\n", planeno, pinfo->bpp);
+  ginfo("planeno: %u bpp: %u\n", planeno, pinfo->bpp);
   return OK;
 }
 
@@ -868,7 +868,7 @@ static int ssd1351_getpower(FAR struct lcd_dev_s *dev)
   /* Sanity check */
 
   DEBUGASSERT(priv != NULL);
-  gvdbg("power: %d\n", priv->power);
+  ginfo("power: %d\n", priv->power);
 
   return priv->power;
 }
@@ -890,7 +890,7 @@ static int ssd1351_setpower(FAR struct lcd_dev_s *dev, int power)
   /* Sanity check */
 
   DEBUGASSERT(priv != NULL && (unsigned int)power <= LCD_FULL_ON);
-  gvdbg("power: %d\n", power);
+  ginfo("power: %d\n", power);
 
   /* Select and lock the device */
 
diff --git a/drivers/lcd/st7565.c b/drivers/lcd/st7565.c
index 62736e38c3..6350e0bda7 100644
--- a/drivers/lcd/st7565.c
+++ b/drivers/lcd/st7565.c
@@ -179,7 +179,7 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_LCD_ST7565DEBUG
-#  define st7565dbg(format, ...)  vdbg(format, ##__VA_ARGS__)
+#  define st7565dbg(format, ...)  info(format, ##__VA_ARGS__)
 #else
 #  define st7565dbg(x...)
 #endif
@@ -475,7 +475,7 @@ static int st7565_putrun(fb_coord_t row, fb_coord_t col,
   uint8_t i;
   int pixlen;
 
-  gvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  ginfo("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer);
 
   /* Clip the run to the display */
@@ -627,7 +627,7 @@ static int st7565_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t * buffer,
   uint8_t i;
   int pixlen;
 
-  gvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  ginfo("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer);
 
   /* Clip the run to the display */
@@ -736,7 +736,7 @@ static int st7565_getvideoinfo(FAR struct lcd_dev_s *dev,
                                FAR struct fb_videoinfo_s *vinfo)
 {
   DEBUGASSERT(dev && vinfo);
-  gvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n",
+  ginfo("fmt: %d xres: %d yres: %d nplanes: %d\n",
         g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres,
         g_videoinfo.nplanes);
   memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s));
@@ -755,7 +755,7 @@ static int st7565_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
                                FAR struct lcd_planeinfo_s *pinfo)
 {
   DEBUGASSERT(dev && pinfo && planeno == 0);
-  gvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
+  ginfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
   memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s));
   return OK;
 }
@@ -773,7 +773,7 @@ static int st7565_getpower(struct lcd_dev_s *dev)
 {
   struct st7565_dev_s *priv = (struct st7565_dev_s *)dev;
   DEBUGASSERT(priv);
-  gvdbg("powered: %s\n", priv->power_level);
+  ginfo("powered: %s\n", priv->power_level);
   return priv->power_level;
 }
 
@@ -791,7 +791,7 @@ static int st7565_setpower(struct lcd_dev_s *dev, int power)
   struct st7565_dev_s *priv = (struct st7565_dev_s *)dev;
 
   DEBUGASSERT(priv && (unsigned)power <= CONFIG_LCD_MAXPOWER);
-  gvdbg("power: %s powered: %s\n", power, priv->power_level);
+  ginfo("power: %s powered: %s\n", power, priv->power_level);
 
   /* Select and lock the device */
 
@@ -859,7 +859,7 @@ static int st7565_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
 {
   struct st7565_dev_s *priv = (struct st7565_dev_s *)dev;
 
-  gvdbg("contrast: %d\n", contrast);
+  ginfo("contrast: %d\n", contrast);
   DEBUGASSERT(priv);
 
   if (contrast > 255)
@@ -974,7 +974,7 @@ FAR struct lcd_dev_s *st7565_initialize(FAR struct st7565_lcd_s *lcd,
 
   FAR struct st7565_dev_s *priv = &g_st7565dev;
 
-  gvdbg("Initializing\n");
+  ginfo("Initializing\n");
   DEBUGASSERT(lcd && devno == 0);
 
   /* Save the reference to the SPI device */
diff --git a/drivers/lcd/st7567.c b/drivers/lcd/st7567.c
index 4447b1ef4e..004f0deae4 100644
--- a/drivers/lcd/st7567.c
+++ b/drivers/lcd/st7567.c
@@ -209,7 +209,7 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_LCD_ST7567DEBUG
-# define st7567dbg(format, ...)  vdbg(format, ##__VA_ARGS__)
+# define st7567dbg(format, ...)  info(format, ##__VA_ARGS__)
 #else
 # define st7567dbg(x...)
 #endif
@@ -439,7 +439,7 @@ static int st7567_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buff
   uint8_t i;
   int pixlen;
 
-  gvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  ginfo("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer);
 
   /* Clip the run to the display */
@@ -587,7 +587,7 @@ static int st7567_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
   uint8_t i;
   int     pixlen;
 
-  gvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  ginfo("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer);
 
   /* Clip the run to the display */
@@ -698,7 +698,7 @@ static int st7567_getvideoinfo(FAR struct lcd_dev_s *dev,
                               FAR struct fb_videoinfo_s *vinfo)
 {
   DEBUGASSERT(dev && vinfo);
-  gvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n",
+  ginfo("fmt: %d xres: %d yres: %d nplanes: %d\n",
          g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes);
   memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s));
   return OK;
@@ -716,7 +716,7 @@ static int st7567_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
                               FAR struct lcd_planeinfo_s *pinfo)
 {
   DEBUGASSERT(dev && pinfo && planeno == 0);
-  gvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
+  ginfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
   memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s));
   return OK;
 }
@@ -734,7 +734,7 @@ static int st7567_getpower(struct lcd_dev_s *dev)
 {
   struct st7567_dev_s *priv = (struct st7567_dev_s *)dev;
   DEBUGASSERT(priv);
-  gvdbg("powered: %s\n", st7567_powerstring(priv->powered));
+  ginfo("powered: %s\n", st7567_powerstring(priv->powered));
   return priv->powered;
 }
 
@@ -752,7 +752,7 @@ static int st7567_setpower(struct lcd_dev_s *dev, int power)
   struct st7567_dev_s *priv = (struct st7567_dev_s *)dev;
 
   DEBUGASSERT(priv && (unsigned)power <= CONFIG_LCD_MAXPOWER);
-  gvdbg("power: %s powered: %s\n",
+  ginfo("power: %s powered: %s\n",
         st7567_powerstring(power), st7567_powerstring(priv->powered));
 
   /* Select and lock the device */
@@ -806,7 +806,7 @@ static int st7567_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
 {
   struct st7567_dev_s *priv = (struct st7567_dev_s *)dev;
 
-  gvdbg("contrast: %d\n", contrast);
+  ginfo("contrast: %d\n", contrast);
   DEBUGASSERT(priv);
 
   if (contrast > 255)
@@ -915,7 +915,7 @@ FAR struct lcd_dev_s *st7567_initialize(FAR struct spi_dev_s *spi, unsigned int
 
   FAR struct st7567_dev_s  *priv = &g_st7567dev;
 
-  gvdbg("Initializing\n");
+  ginfo("Initializing\n");
   DEBUGASSERT(spi && devno == 0);
 
   /* Save the reference to the SPI device */
diff --git a/drivers/lcd/ug-2864ambag01.c b/drivers/lcd/ug-2864ambag01.c
index ab53fbc024..7019ddbc5a 100644
--- a/drivers/lcd/ug-2864ambag01.c
+++ b/drivers/lcd/ug-2864ambag01.c
@@ -264,10 +264,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg(format, ...)      dbg(format, ##__VA_ARGS__)
-#  define lcdvdbg(format, ...)     vdbg(format, ##__VA_ARGS__)
+#  define lcdinfo(format, ...)     info(format, ##__VA_ARGS__)
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 /**************************************************************************************
@@ -487,7 +487,7 @@ static int ug2864ambag01_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_
   int pixlen;
   uint8_t i;
 
-  lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer);
 
   /* Clip the run to the display */
@@ -697,7 +697,7 @@ static int ug2864ambag01_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buf
   int pixlen;
   uint8_t i;
 
-  lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer);
 
   /* Clip the run to the display */
@@ -842,7 +842,7 @@ static int ug2864ambag01_getvideoinfo(FAR struct lcd_dev_s *dev,
                               FAR struct fb_videoinfo_s *vinfo)
 {
   DEBUGASSERT(dev && vinfo);
-  lcdvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n",
+  lcdinfo("fmt: %d xres: %d yres: %d nplanes: %d\n",
           g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes);
   memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s));
   return OK;
@@ -860,7 +860,7 @@ static int ug2864ambag01_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int pl
                               FAR struct lcd_planeinfo_s *pinfo)
 {
   DEBUGASSERT(pinfo && planeno == 0);
-  lcdvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
+  lcdinfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
   memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s));
   return OK;
 }
@@ -879,7 +879,7 @@ static int ug2864ambag01_getpower(FAR struct lcd_dev_s *dev)
   FAR struct ug2864ambag01_dev_s *priv = (FAR struct ug2864ambag01_dev_s *)dev;
   DEBUGASSERT(priv);
 
-  lcdvdbg("power: %s\n", priv->on ? "ON" : "OFF");
+  lcdinfo("power: %s\n", priv->on ? "ON" : "OFF");
   return priv->on ? CONFIG_LCD_MAXPOWER : 0;
 }
 
@@ -897,7 +897,7 @@ static int ug2864ambag01_setpower(struct lcd_dev_s *dev, int power)
   struct ug2864ambag01_dev_s *priv = (struct ug2864ambag01_dev_s *)dev;
   DEBUGASSERT(priv && (unsigned)power <= CONFIG_LCD_MAXPOWER && priv->spi);
 
-  lcdvdbg("power: %d [%d]\n", power, priv->on ? CONFIG_LCD_MAXPOWER : 0);
+  lcdinfo("power: %d [%d]\n", power, priv->on ? CONFIG_LCD_MAXPOWER : 0);
 
   /* Lock and select device */
 
@@ -939,7 +939,7 @@ static int ug2864ambag01_getcontrast(struct lcd_dev_s *dev)
   struct ug2864ambag01_dev_s *priv = (struct ug2864ambag01_dev_s *)dev;
   DEBUGASSERT(priv);
 
-  lcdvdbg("contrast: %d\n", priv->contrast);
+  lcdinfo("contrast: %d\n", priv->contrast);
   return priv->contrast;
 }
 
@@ -956,7 +956,7 @@ static int ug2864ambag01_setcontrast(struct lcd_dev_s *dev, unsigned int contras
   struct ug2864ambag01_dev_s *priv = (struct ug2864ambag01_dev_s *)dev;
   unsigned int scaled;
 
-  lcdvdbg("contrast: %d\n", contrast);
+  lcdinfo("contrast: %d\n", contrast);
   DEBUGASSERT(priv);
 
   /* Verify the contrast value */
@@ -1029,7 +1029,7 @@ FAR struct lcd_dev_s *ug2864ambag01_initialize(FAR struct spi_dev_s *spi, unsign
 {
   FAR struct ug2864ambag01_dev_s  *priv = &g_oleddev;
 
-  lcdvdbg("Initializing\n");
+  lcdinfo("Initializing\n");
   DEBUGASSERT(spi && devno == 0);
 
   /* Save the reference to the SPI device */
diff --git a/drivers/lcd/ug-9664hswag01.c b/drivers/lcd/ug-9664hswag01.c
index 89e7ba5a62..9fa03989f6 100644
--- a/drivers/lcd/ug-9664hswag01.c
+++ b/drivers/lcd/ug-9664hswag01.c
@@ -224,7 +224,7 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-# define lcddbg(format, ...)  vdbg(format, ##__VA_ARGS__)
+# define lcddbg(format, ...)  info(format, ##__VA_ARGS__)
 #else
 # define lcddbg(x...)
 #endif
@@ -484,7 +484,7 @@ static int ug_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer,
   uint8_t i;
   int     pixlen;
 
-  gvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  ginfo("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer);
 
   /* Clip the run to the display */
@@ -681,7 +681,7 @@ static int ug_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
   uint8_t i;
   int     pixlen;
 
-  gvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  ginfo("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer);
 
   /* Clip the run to the display */
@@ -824,7 +824,7 @@ static int ug_getvideoinfo(FAR struct lcd_dev_s *dev,
                               FAR struct fb_videoinfo_s *vinfo)
 {
   DEBUGASSERT(dev && vinfo);
-  gvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n",
+  ginfo("fmt: %d xres: %d yres: %d nplanes: %d\n",
          g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes);
   memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s));
   return OK;
@@ -842,7 +842,7 @@ static int ug_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
                               FAR struct lcd_planeinfo_s *pinfo)
 {
   DEBUGASSERT(dev && pinfo && planeno == 0);
-  gvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
+  ginfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
   memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s));
   return OK;
 }
@@ -860,7 +860,7 @@ static int ug_getpower(struct lcd_dev_s *dev)
 {
   struct ug_dev_s *priv = (struct ug_dev_s *)dev;
   DEBUGASSERT(priv);
-  gvdbg("powered: %s\n", ug_powerstring(priv->powered));
+  ginfo("powered: %s\n", ug_powerstring(priv->powered));
   return priv->powered;
 }
 
@@ -878,7 +878,7 @@ static int ug_setpower(struct lcd_dev_s *dev, int power)
   struct ug_dev_s *priv = (struct ug_dev_s *)dev;
 
   DEBUGASSERT(priv && (unsigned)power <= CONFIG_LCD_MAXPOWER);
-  gvdbg("power: %s powered: %s\n",
+  ginfo("power: %s powered: %s\n",
         ug_powerstring(power), ug_powerstring(priv->powered));
 
   /* Select and lock the device */
@@ -947,7 +947,7 @@ static int ug_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
 {
   struct ug_dev_s *priv = (struct ug_dev_s *)dev;
 
-  gvdbg("contrast: %d\n", contrast);
+  ginfo("contrast: %d\n", contrast);
   DEBUGASSERT(priv);
 
   if (contrast > 255)
@@ -1056,7 +1056,7 @@ FAR struct lcd_dev_s *ug_initialize(FAR struct spi_dev_s *spi, unsigned int devn
 
   FAR struct ug_dev_s  *priv = &g_ugdev;
 
-  gvdbg("Initializing\n");
+  ginfo("Initializing\n");
   DEBUGASSERT(spi && devno == 0);
 
   /* Save the reference to the SPI device */
diff --git a/drivers/leds/rgbled.c b/drivers/leds/rgbled.c
index 27e7a1a9eb..4760abf207 100644
--- a/drivers/leds/rgbled.c
+++ b/drivers/leds/rgbled.c
@@ -74,14 +74,14 @@
 
 #ifdef CONFIG_DEBUG_RGBLED
 #  define pwmdbg    dbg
-#  define pwmvdbg   vdbg
+#  define pwminfo   info
 #  define pwmlldbg  lldbg
-#  define pwmllvdbg llvdbg
+#  define pwmllinfo llinfo
 #else
 #  define pwmdbg(x...)
-#  define pwmvdbg(x...)
+#  define pwminfo(x...)
 #  define pwmlldbg(x...)
-#  define pwmllvdbg(x...)
+#  define pwmllinfo(x...)
 #endif
 
 /****************************************************************************
@@ -150,7 +150,7 @@ static int rgbled_open(FAR struct file *filep)
   uint8_t                     tmp;
   int                         ret;
 
-  pwmvdbg("crefs: %d\n", upper->crefs);
+  pwminfo("crefs: %d\n", upper->crefs);
 
   /* Get exclusive access to the device structures */
 
@@ -201,7 +201,7 @@ static int rgbled_close(FAR struct file *filep)
   FAR struct rgbled_upperhalf_s *upper = inode->i_private;
   int                         ret;
 
-  pwmvdbg("crefs: %d\n", upper->crefs);
+  pwminfo("crefs: %d\n", upper->crefs);
 
   /* Get exclusive access to the device structures */
 
@@ -410,7 +410,7 @@ int rgbled_register(FAR const char *path, FAR struct pwm_lowerhalf_s *ledr,
 
   /* Register the PWM device */
 
-  pwmvdbg("Registering %s\n", path);
+  pwminfo("Registering %s\n", path);
   return register_driver(path, &g_rgbledops, 0666, upper);
 }
 
diff --git a/drivers/leds/userled_lower.c b/drivers/leds/userled_lower.c
index 69e349f64d..32cff16e10 100644
--- a/drivers/leds/userled_lower.c
+++ b/drivers/leds/userled_lower.c
@@ -88,7 +88,7 @@ static const struct userled_lowerhalf_s g_userled_lower =
 
 static userled_set_t userled_supported(FAR const struct userled_lowerhalf_s *lower)
 {
-  ivdbg("BOARD_NLEDS: %02x\n", BOARD_NLEDS);
+  iinfo("BOARD_NLEDS: %02x\n", BOARD_NLEDS);
   return (userled_set_t)((1 << BOARD_NLEDS) - 1);
 }
 
diff --git a/drivers/leds/userled_upper.c b/drivers/leds/userled_upper.c
index e0843100e7..43954bd63a 100644
--- a/drivers/leds/userled_upper.c
+++ b/drivers/leds/userled_upper.c
@@ -69,13 +69,13 @@
 #ifdef CONFIG_DEBUG_LEDS
 #  define ddbg lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define dvdbg lldbg
+#    define dinfo lldbg
 #  else
-#    define dvdbg(x...)
+#    define dinfo(x...)
 #  endif
 #else
 #  define ddbg(x...)
-#  define dvdbg(x...)
+#  define dinfo(x...)
 #endif
 
 /****************************************************************************
@@ -197,7 +197,7 @@ static int userled_open(FAR struct file *filep)
   ret = userled_takesem(&priv->lu_exclsem);
   if (ret < 0)
     {
-      dvdbg("ERROR: userled_takesem failed: %d\n", ret);
+      dinfo("ERROR: userled_takesem failed: %d\n", ret);
       return ret;
     }
 
@@ -206,7 +206,7 @@ static int userled_open(FAR struct file *filep)
   opriv = (FAR struct userled_open_s *)kmm_zalloc(sizeof(struct userled_open_s));
   if (!opriv)
     {
-      dvdbg("ERROR: Failled to allocate open structure\n");
+      dinfo("ERROR: Failled to allocate open structure\n");
       ret = -ENOMEM;
       goto errout_with_sem;
     }
@@ -274,7 +274,7 @@ static int userled_close(FAR struct file *filep)
   ret = userled_takesem(&priv->lu_exclsem);
   if (ret < 0)
     {
-      dvdbg("ERROR: userled_takesem failed: %d\n", ret);
+      dinfo("ERROR: userled_takesem failed: %d\n", ret);
       return ret;
     }
 
@@ -287,7 +287,7 @@ static int userled_close(FAR struct file *filep)
   DEBUGASSERT(curr);
   if (!curr)
     {
-      dvdbg("ERROR: Failed to find open entry\n");
+      dinfo("ERROR: Failed to find open entry\n");
       ret = -ENOENT;
       goto errout_with_exclsem;
     }
@@ -339,7 +339,7 @@ static ssize_t userled_write(FAR struct file *filep, FAR const char *buffer,
 
   if (len < sizeof(userled_set_t))
     {
-      dvdbg("ERROR: buffer too small: %lu\n", (unsigned long)len);
+      dinfo("ERROR: buffer too small: %lu\n", (unsigned long)len);
       return -EINVAL;
     }
 
@@ -356,7 +356,7 @@ static ssize_t userled_write(FAR struct file *filep, FAR const char *buffer,
   ret = userled_takesem(&priv->lu_exclsem);
   if (ret < 0)
     {
-      dvdbg("ERROR: userled_takesem failed: %d\n", ret);
+      dinfo("ERROR: userled_takesem failed: %d\n", ret);
       return ret;
     }
 
@@ -391,7 +391,7 @@ static int userled_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
   ret = userled_takesem(&priv->lu_exclsem);
   if (ret < 0)
     {
-      dvdbg("ERROR: userled_takesem failed: %d\n", ret);
+      dinfo("ERROR: userled_takesem failed: %d\n", ret);
       return ret;
     }
 
@@ -521,7 +521,7 @@ static int userled_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
       break;
 
     default:
-      dvdbg("ERROR: Unrecognized command: %ld\n", cmd);
+      dinfo("ERROR: Unrecognized command: %ld\n", cmd);
       ret = -ENOTTY;
       break;
     }
@@ -569,7 +569,7 @@ int userled_register(FAR const char *devname,
 
   if (!priv)
     {
-      dvdbg("ERROR: Failed to allocate device structure\n");
+      dinfo("ERROR: Failed to allocate device structure\n");
       return -ENOMEM;
     }
 
@@ -590,7 +590,7 @@ int userled_register(FAR const char *devname,
   ret = register_driver(devname, &userled_fops, 0666, priv);
   if (ret < 0)
     {
-      dvdbg("ERROR: register_driver failed: %d\n", ret);
+      dinfo("ERROR: register_driver failed: %d\n", ret);
       goto errout_with_priv;
     }
 
diff --git a/drivers/mmcsd/mmcsd.h b/drivers/mmcsd/mmcsd.h
index b9dba016bf..fb52726d4e 100644
--- a/drivers/mmcsd/mmcsd.h
+++ b/drivers/mmcsd/mmcsd.h
@@ -87,7 +87,7 @@ extern "C" {
 #endif
 
 #ifdef CONFIG_MMCSD_DUMPALL
-#  define mmcsd_dumpbuffer(m,b,l) fvdbgdumpbuffer(m,b,l)
+#  define mmcsd_dumpbuffer(m,b,l) finfodumpbuffer(m,b,l)
 #else
 #  define mmcsd_dumpbuffer(m,b,l)
 #endif
diff --git a/drivers/mmcsd/mmcsd_debug.c b/drivers/mmcsd/mmcsd_debug.c
index fdea1dfdaf..817c0272c1 100644
--- a/drivers/mmcsd/mmcsd_debug.c
+++ b/drivers/mmcsd/mmcsd_debug.c
@@ -87,90 +87,90 @@ void mmcsd_dmpcsd(FAR const uint8_t *csd, uint8_t cardtype)
   bool mmc = (cardtype == MMCSD_CARDTYPE_MMC);
   bool sd2 = (MMCSD_CSD_CSDSTRUCT(csd) == 1);
 
-  fvdbg("CSD\n");
-  fvdbg("  CSD_STRUCTURE:           1.%d\n",   MMCSD_CSD_CSDSTRUCT(csd));
+  finfo("CSD\n");
+  finfo("  CSD_STRUCTURE:           1.%d\n",   MMCSD_CSD_CSDSTRUCT(csd));
   if (mmc)
     {
-      fvdbg("  MMC SPEC_VERS:           %d\n", MMC_CSD_SPECVERS(csd));
+      finfo("  MMC SPEC_VERS:           %d\n", MMC_CSD_SPECVERS(csd));
     }
 
-  fvdbg("  TAAC:\n",
+  finfo("  TAAC:\n",
       sd2 ? SD20_CSD_TAC_TIMEVALUE(csd) : MMCSD_CSD_TAAC_TIMEVALUE(csd));
-  fvdbg("    TIME_VALUE:            0x%02x\n",
+  finfo("    TIME_VALUE:            0x%02x\n",
       sd2 ? SD20_CSD_TAC_TIMEVALUE(csd) : MMCSD_CSD_TAAC_TIMEVALUE(csd));
-  fvdbg("    TIME_UNIT:             0x%02x\n",
+  finfo("    TIME_UNIT:             0x%02x\n",
       sd2 ? SD20_CSD_TAC_TIMEUNIT(csd) : MMCSD_CSD_TAAC_TIMEUNIT(csd));
-  fvdbg("  NSAC:                    0x%02x\n",
+  finfo("  NSAC:                    0x%02x\n",
       sd2 ? SD20_CSD_NSAC(csd) : MMCSD_CSD_NSAC(csd));
-  fvdbg("  TRAN_SPEED:\n");
-  fvdbg("    TIME_VALUE:            0x%02x\n",
+  finfo("  TRAN_SPEED:\n");
+  finfo("    TIME_VALUE:            0x%02x\n",
       sd2 ? SD20_CSD_TRANSPEED_TIMEVALUE(csd) : MMCSD_CSD_TRANSPEED_TIMEVALUE(csd));
-  fvdbg("    RATE_UNIT:             0x%02x\n",
+  finfo("    RATE_UNIT:             0x%02x\n",
       sd2 ? SD20_CSD_TRANSPEED_TRANSFERRATEUNIT(csd) : MMCSD_CSD_TRANSPEED_TRANSFERRATEUNIT(csd));
-  fvdbg("  CCC:                     0x%03x\n",
+  finfo("  CCC:                     0x%03x\n",
       sd2 ? SD20_CSD_CCC(csd) : MMCSD_CSD_CCC(csd));
-  fvdbg("  READ_BL_LEN:             %d\n",
+  finfo("  READ_BL_LEN:             %d\n",
       sd2 ? SD20_CSD_READBLLEN(csd) : MMCSD_CSD_READBLLEN(csd));
-  fvdbg("  READ_BL_PARTIAL:         %d\n",
+  finfo("  READ_BL_PARTIAL:         %d\n",
       sd2 ? SD20_CSD_READBLPARTIAL(csd) : MMCSD_CSD_READBLPARTIAL(csd));
-  fvdbg("  WRITE_BLK_MISALIGN:      %d\n",
+  finfo("  WRITE_BLK_MISALIGN:      %d\n",
       sd2 ? SD20_CSD_WRITEBLKMISALIGN(csd) : MMCSD_CSD_WRITEBLKMISALIGN(csd));
-  fvdbg("  READ_BLK_MISALIGN:       %d\n",
+  finfo("  READ_BLK_MISALIGN:       %d\n",
       sd2 ? SD20_CSD_READBLKMISALIGN(csd) : MMCSD_CSD_READBLKMISALIGN(csd));
-  fvdbg("  DSR_IMP:                 %d\n",
+  finfo("  DSR_IMP:                 %d\n",
       sd2 ? SD20_CSD_DSRIMP(csd) : MMCSD_CSD_DSRIMP(csd));
-  fvdbg("  C_SIZE:                  %d\n",
+  finfo("  C_SIZE:                  %d\n",
       sd2 ? SD20_CSD_CSIZE(csd) : MMCSD_CSD_CSIZE(csd));
-  fvdbg("  VDD_R_CURR_MIN:          %d\n",
+  finfo("  VDD_R_CURR_MIN:          %d\n",
       sd2 ? SD20_CSD_VDDRCURRMIN(csd) : MMCSD_CSD_VDDRCURRMIN(csd));
-  fvdbg("  VDD_R_CURR_MAX:          %d\n",
+  finfo("  VDD_R_CURR_MAX:          %d\n",
       sd2 ? SD20_CSD_VDDRCURRMAX(csd) : MMCSD_CSD_VDDRCURRMAX(csd));
-  fvdbg("  VDD_W_CURR_MIN:          %d\n",
+  finfo("  VDD_W_CURR_MIN:          %d\n",
       sd2 ? SD20_CSD_VDDWCURRMIN(csd) : MMCSD_CSD_VDDWCURRMIN(csd));
-  fvdbg("  VDD_W_CURR_MAX:          %d\n",
+  finfo("  VDD_W_CURR_MAX:          %d\n",
       sd2 ? SD20_CSD_VDDWCURRMAX(csd) : MMCSD_CSD_VDDWCURRMAX(csd));
-  fvdbg("  C_SIZE_MULT:             %d\n",
+  finfo("  C_SIZE_MULT:             %d\n",
       sd2 ? SD20_CSD_CSIZEMULT(csd) : MMCSD_CSD_CSIZEMULT(csd));
   if (mmc)
     {
-      fvdbg("  MMC SECTOR_SIZE:        %d\n", MMC_CSD_SECTORSIZE(csd));
-      fvdbg("  MMC ER_GRP_SIZE:        %d\n", MMC_CSD_ERGRPSIZE(csd));
-      fvdbg("  MMC WP_GRP_SIZE:        %d\n",  MMC_CSD_WPGRPSIZE(csd));
-      fvdbg("  MMC DFLT_ECC:           %d\n",  MMC_CSD_DFLTECC(csd));
+      finfo("  MMC SECTOR_SIZE:        %d\n", MMC_CSD_SECTORSIZE(csd));
+      finfo("  MMC ER_GRP_SIZE:        %d\n", MMC_CSD_ERGRPSIZE(csd));
+      finfo("  MMC WP_GRP_SIZE:        %d\n",  MMC_CSD_WPGRPSIZE(csd));
+      finfo("  MMC DFLT_ECC:           %d\n",  MMC_CSD_DFLTECC(csd));
     }
   else
     {
-      fvdbg("  SD ER_BLK_EN:            %d\n",
+      finfo("  SD ER_BLK_EN:            %d\n",
           sd2 ? SD20_CSD_SDERBLKEN(csd) : SD_CSD_SDERBLKEN(csd));
-      fvdbg("  SD SECTOR_SIZE:          %d\n",
+      finfo("  SD SECTOR_SIZE:          %d\n",
           sd2 ? SD20_CSD_SECTORSIZE(csd) : SD_CSD_SECTORSIZE(csd));
-      fvdbg("  SD WP_GRP_SIZE:          %d\n",
+      finfo("  SD WP_GRP_SIZE:          %d\n",
           sd2 ? SD_CSD_WPGRPSIZE(csd) : SD_CSD_WPGRPSIZE(csd));
     }
-  fvdbg("  WP_GRP_EN:               %d\n",
+  finfo("  WP_GRP_EN:               %d\n",
       sd2 ? SD20_WPGRPEN(csd) : MMCSD_WPGRPEN(csd));
-  fvdbg("  R2W_FACTOR:              %d\n",
+  finfo("  R2W_FACTOR:              %d\n",
       sd2 ? SD20_CSD_R2WFACTOR(csd) : MMCSD_CSD_R2WFACTOR(csd));
-  fvdbg("  WRITE_BL_LEN:            %d\n",
+  finfo("  WRITE_BL_LEN:            %d\n",
       sd2 ? SD20_CSD_WRITEBLLEN(csd) : MMCSD_CSD_WRITEBLLEN(csd));
-  fvdbg("  WRITE_BL_PARTIAL:        %d\n",
+  finfo("  WRITE_BL_PARTIAL:        %d\n",
       sd2 ? SD20_CSD_WRITEBLPARTIAL(csd) : MMCSD_CSD_WRITEBLPARTIAL(csd));
-  fvdbg("  FILE_FORMAT_GROUP:       %d\n",
+  finfo("  FILE_FORMAT_GROUP:       %d\n",
       sd2 ? SD20_CSD_FILEFORMATGRP(csd) : MMCSD_CSD_FILEFORMATGRP(csd));
-  fvdbg("  COPY:                    %d\n",
+  finfo("  COPY:                    %d\n",
       sd2 ? SD20_CSD_COPY(csd) : MMCSD_CSD_COPY(csd));
-  fvdbg("  PERM_WRITE_PROTECT:      %d\n",
+  finfo("  PERM_WRITE_PROTECT:      %d\n",
       sd2 ? SD20_CSD_PERMWRITEPROTECT(csd) : MMCSD_CSD_PERMWRITEPROTECT(csd));
-  fvdbg("  TMP_WRITE_PROTECT:       %d\n",
+  finfo("  TMP_WRITE_PROTECT:       %d\n",
       sd2 ?SD20_CSD_TMPWRITEPROTECT(csd) : MMCSD_CSD_TMPWRITEPROTECT(csd));
-  fvdbg("  FILE_FORMAT:             %d\n",
+  finfo("  FILE_FORMAT:             %d\n",
       sd2 ? SD20_CSD_FILEFORMAT(csd) : MMCSD_CSD_FILEFORMAT(csd));
   if (mmc)
     {
-      fvdbg("  MMC ECC:                 %d\n",
+      finfo("  MMC ECC:                 %d\n",
           sd2 ? MMC_CSD_ECC(csd) : MMC_CSD_ECC(csd));
     }
-  fvdbg("  CRC:                     %02x\n",
+  finfo("  CRC:                     %02x\n",
       sd2 ? SD20_CSD_CRC(csd) : MMCSD_CSD_CRC(csd));
 }
 #endif
diff --git a/drivers/mmcsd/mmcsd_sdio.c b/drivers/mmcsd/mmcsd_sdio.c
index 53d59985df..1471208a59 100644
--- a/drivers/mmcsd/mmcsd_sdio.c
+++ b/drivers/mmcsd/mmcsd_sdio.c
@@ -413,7 +413,7 @@ static int mmcsd_recvR1(FAR struct mmcsd_state_s *priv, uint32_t cmd)
            * indication for later use.
            */
 
-          fvdbg("ERROR: R1=%08x\n", r1);
+          finfo("ERROR: R1=%08x\n", r1);
           priv->locked = ((r1 & MMCSD_R1_CARDISLOCKED) != 0);
           ret = -EIO;
         }
@@ -767,69 +767,69 @@ static void mmcsd_decodeCSD(FAR struct mmcsd_state_s *priv, uint32_t csd[4])
   decoded.mmcecc           = (csd[3] >> 8)  & 3;
   decoded.crc              = (csd[3] >> 1)  & 0x7f;
 
-  fvdbg("CSD:\n");
-  fvdbg("  CSD_STRUCTURE: %d SPEC_VERS: %d (MMC)\n",
+  finfo("CSD:\n");
+  finfo("  CSD_STRUCTURE: %d SPEC_VERS: %d (MMC)\n",
         decoded.csdstructure, decoded.mmcspecvers);
-  fvdbg("  TAAC {TIME_UNIT: %d TIME_VALUE: %d} NSAC: %d\n",
+  finfo("  TAAC {TIME_UNIT: %d TIME_VALUE: %d} NSAC: %d\n",
         decoded.taac.timeunit, decoded.taac.timevalue, decoded.nsac);
-  fvdbg("  TRAN_SPEED {TRANSFER_RATE_UNIT: %d TIME_VALUE: %d}\n",
+  finfo("  TRAN_SPEED {TRANSFER_RATE_UNIT: %d TIME_VALUE: %d}\n",
         decoded.transpeed.transferrateunit, decoded.transpeed.timevalue);
-  fvdbg("  CCC: %d\n", decoded.ccc);
-  fvdbg("  READ_BL_LEN: %d READ_BL_PARTIAL: %d\n",
+  finfo("  CCC: %d\n", decoded.ccc);
+  finfo("  READ_BL_LEN: %d READ_BL_PARTIAL: %d\n",
         decoded.readbllen, decoded.readblpartial);
-  fvdbg("  WRITE_BLK_MISALIGN: %d READ_BLK_MISALIGN: %d\n",
+  finfo("  WRITE_BLK_MISALIGN: %d READ_BLK_MISALIGN: %d\n",
         decoded.writeblkmisalign, decoded.readblkmisalign);
-  fvdbg("  DSR_IMP: %d\n",
+  finfo("  DSR_IMP: %d\n",
         decoded.dsrimp);
 
   if (IS_BLOCK(priv->type))
     {
-      fvdbg("  SD Block Addressing:\n");
-      fvdbg("    C_SIZE: %d SD_ER_BLK_EN: %d\n",
+      finfo("  SD Block Addressing:\n");
+      finfo("    C_SIZE: %d SD_ER_BLK_EN: %d\n",
             decoded.u.sdblock.csize, decoded.u.sdblock.sderblen);
-      fvdbg("    SD_SECTOR_SIZE: %d SD_WP_GRP_SIZE: %d\n",
+      finfo("    SD_SECTOR_SIZE: %d SD_WP_GRP_SIZE: %d\n",
             decoded.u.sdblock.sdsectorsize, decoded.u.sdblock.sdwpgrpsize);
     }
   else if (IS_SD(priv->type))
     {
-      fvdbg("  SD Byte Addressing:\n");
-      fvdbg("    C_SIZE: %d C_SIZE_MULT: %d\n",
+      finfo("  SD Byte Addressing:\n");
+      finfo("    C_SIZE: %d C_SIZE_MULT: %d\n",
             decoded.u.sdbyte.csize, decoded.u.sdbyte.csizemult);
-      fvdbg("    VDD_R_CURR_MIN: %d VDD_R_CURR_MAX: %d\n",
+      finfo("    VDD_R_CURR_MIN: %d VDD_R_CURR_MAX: %d\n",
             decoded.u.sdbyte.vddrcurrmin, decoded.u.sdbyte.vddrcurrmax);
-      fvdbg("    VDD_W_CURR_MIN: %d VDD_W_CURR_MAX: %d\n",
+      finfo("    VDD_W_CURR_MIN: %d VDD_W_CURR_MAX: %d\n",
             decoded.u.sdbyte.vddwcurrmin, decoded.u.sdbyte.vddwcurrmax);
-      fvdbg("    SD_ER_BLK_EN: %d SD_SECTOR_SIZE: %d (SD) SD_WP_GRP_SIZE: %d\n",
+      finfo("    SD_ER_BLK_EN: %d SD_SECTOR_SIZE: %d (SD) SD_WP_GRP_SIZE: %d\n",
             decoded.u.sdbyte.sderblen, decoded.u.sdbyte.sdsectorsize, decoded.u.sdbyte.sdwpgrpsize);
     }
 #ifdef CONFIG_MMCSD_MMCSUPPORT
   else if (IS_MMC(priv->type))
     {
-      fvdbg("  MMC:\n");
-      fvdbg("    C_SIZE: %d C_SIZE_MULT: %d\n",
+      finfo("  MMC:\n");
+      finfo("    C_SIZE: %d C_SIZE_MULT: %d\n",
             decoded.u.mmc.csize, decoded.u.mmc.csizemult);
-      fvdbg("    VDD_R_CURR_MIN: %d VDD_R_CURR_MAX: %d\n",
+      finfo("    VDD_R_CURR_MIN: %d VDD_R_CURR_MAX: %d\n",
             decoded.u.mmc.vddrcurrmin, decoded.u.mmc.vddrcurrmax);
-      fvdbg("    VDD_W_CURR_MIN: %d VDD_W_CURR_MAX: %d\n",
+      finfo("    VDD_W_CURR_MIN: %d VDD_W_CURR_MAX: %d\n",
             decoded.u.mmc.vddwcurrmin, decoded.u.mmc.vddwcurrmax);
-      fvdbg("    MMC_SECTOR_SIZE: %d MMC_ER_GRP_SIZE: %d MMC_WP_GRP_SIZE: %d\n",
+      finfo("    MMC_SECTOR_SIZE: %d MMC_ER_GRP_SIZE: %d MMC_WP_GRP_SIZE: %d\n",
             decoded.u.mmc.er.mmc22.sectorsize, decoded.u.mmc.er.mmc22.ergrpsize,
             decoded.u.mmc.mmcwpgrpsize);
     }
 #endif
 
-  fvdbg("  WP_GRP_EN: %d MMC DFLT_ECC: %d (MMC) R2W_FACTOR: %d\n",
+  finfo("  WP_GRP_EN: %d MMC DFLT_ECC: %d (MMC) R2W_FACTOR: %d\n",
         decoded.wpgrpen, decoded.mmcdfltecc, decoded.r2wfactor);
-  fvdbg("  WRITE_BL_LEN: %d WRITE_BL_PARTIAL: %d\n",
+  finfo("  WRITE_BL_LEN: %d WRITE_BL_PARTIAL: %d\n",
         decoded.writebllen, decoded.writeblpartial);
-  fvdbg("  FILE_FORMAT_GROUP: %d COPY: %d\n",
+  finfo("  FILE_FORMAT_GROUP: %d COPY: %d\n",
         decoded.fileformatgrp, decoded.copy);
-  fvdbg("  PERM_WRITE_PROTECT: %d TMP_WRITE_PROTECT: %d\n",
+  finfo("  PERM_WRITE_PROTECT: %d TMP_WRITE_PROTECT: %d\n",
         decoded.permwriteprotect, decoded.tmpwriteprotect);
-  fvdbg("  FILE_FORMAT: %d ECC: %d (MMC) CRC: %d\n",
+  finfo("  FILE_FORMAT: %d ECC: %d (MMC) CRC: %d\n",
         decoded.fileformat, decoded.mmcecc, decoded.crc);
 
-  fvdbg("Capacity: %luKb, Block size: %db, nblocks: %d wrprotect: %d\n",
+  finfo("Capacity: %luKb, Block size: %db, nblocks: %d wrprotect: %d\n",
          (unsigned long)(priv->capacity / 1024), priv->blocksize,
          priv->nblocks, priv->wrprotect);
 #endif
@@ -893,7 +893,7 @@ static void mmcsd_decodeCID(FAR struct mmcsd_state_s *priv, uint32_t cid[4])
   decoded.mdt    = (cid[3] >> 8) & 0x0fff;
   decoded.crc    = (cid[3] >> 1) & 0x7f;
 
-  fvdbg("mid: %02x oid: %04x pnm: %s prv: %d psn: %d mdt: %02x crc: %02x\n",
+  finfo("mid: %02x oid: %04x pnm: %s prv: %d psn: %d mdt: %02x crc: %02x\n",
       decoded.mid, decoded.oid, decoded.pnm, decoded.prv,
       decoded.psn, decoded.mdt, decoded.crc);
 }
@@ -955,12 +955,12 @@ struct mmcsd_scr_s decoded;
 #if defined(CONFIG_DEBUG) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
   decoded.mfgdata   = scr[1];  /* Might be byte reversed! */
 
-  fvdbg("SCR:\n");
-  fvdbg("  SCR_STRUCTURE: %d SD_VERSION: %d\n",
+  finfo("SCR:\n");
+  finfo("  SCR_STRUCTURE: %d SD_VERSION: %d\n",
         decoded.scrversion, decoded.sdversion);
-  fvdbg("  DATA_STATE_AFTER_ERASE: %d SD_SECURITY: %d SD_BUS_WIDTHS: %x\n",
+  finfo("  DATA_STATE_AFTER_ERASE: %d SD_SECURITY: %d SD_BUS_WIDTHS: %x\n",
         decoded.erasestate, decoded.security, decoded.buswidth);
-  fvdbg("  Manufacturing data: %08x\n",
+  finfo("  Manufacturing data: %08x\n",
         decoded.mfgdata);
 #endif
 }
@@ -1288,7 +1288,7 @@ static ssize_t mmcsd_readsingle(FAR struct mmcsd_state_s *priv,
   off_t offset;
   int ret;
 
-  fvdbg("startblock=%d\n", startblock);
+  finfo("startblock=%d\n", startblock);
   DEBUGASSERT(priv != NULL && buffer != NULL);
 
   /* Check if the card is locked */
@@ -1342,7 +1342,7 @@ static ssize_t mmcsd_readsingle(FAR struct mmcsd_state_s *priv,
       offset = startblock << priv->blockshift;
     }
 
-  fvdbg("offset=%d\n", offset);
+  finfo("offset=%d\n", offset);
 
   /* Select the block size for the card */
 
@@ -1365,7 +1365,7 @@ static ssize_t mmcsd_readsingle(FAR struct mmcsd_state_s *priv,
       ret = SDIO_DMARECVSETUP(priv->dev, buffer, priv->blocksize);
       if (ret != OK)
         {
-          fvdbg("SDIO_DMARECVSETUP: error %d\n", ret);
+          finfo("SDIO_DMARECVSETUP: error %d\n", ret);
           return ret;
         }
     }
@@ -1422,7 +1422,7 @@ static ssize_t mmcsd_readmultiple(FAR struct mmcsd_state_s *priv,
   off_t  offset;
   int ret;
 
-  fvdbg("startblock=%d nblocks=%d\n", startblock, nblocks);
+  finfo("startblock=%d nblocks=%d\n", startblock, nblocks);
   DEBUGASSERT(priv != NULL && buffer != NULL && nblocks > 1);
 
   /* Check if the card is locked */
@@ -1476,7 +1476,7 @@ static ssize_t mmcsd_readmultiple(FAR struct mmcsd_state_s *priv,
     {
       offset = startblock << priv->blockshift;
     }
-  fvdbg("nbytes=%d byte offset=%d\n", nbytes, offset);
+  finfo("nbytes=%d byte offset=%d\n", nbytes, offset);
 
   /* Select the block size for the card */
 
@@ -1499,7 +1499,7 @@ static ssize_t mmcsd_readmultiple(FAR struct mmcsd_state_s *priv,
       ret = SDIO_DMARECVSETUP(priv->dev, buffer, nbytes);
       if (ret != OK)
         {
-          fvdbg("SDIO_DMARECVSETUP: error %d\n", ret);
+          finfo("SDIO_DMARECVSETUP: error %d\n", ret);
           return ret;
         }
     }
@@ -1625,7 +1625,7 @@ static ssize_t mmcsd_writesingle(FAR struct mmcsd_state_s *priv,
   off_t offset;
   int ret;
 
-  fvdbg("startblock=%d\n", startblock);
+  finfo("startblock=%d\n", startblock);
   DEBUGASSERT(priv != NULL && buffer != NULL);
 
   /* Check if the card is locked or write protected (either via software or
@@ -1681,7 +1681,7 @@ static ssize_t mmcsd_writesingle(FAR struct mmcsd_state_s *priv,
       offset = startblock << priv->blockshift;
     }
 
-  fvdbg("offset=%d\n", offset);
+  finfo("offset=%d\n", offset);
 
   /* Select the block size for the card */
 
@@ -1713,7 +1713,7 @@ static ssize_t mmcsd_writesingle(FAR struct mmcsd_state_s *priv,
       ret = SDIO_DMASENDSETUP(priv->dev, buffer, priv->blocksize);
       if (ret != OK)
         {
-          fvdbg("SDIO_DMASENDSETUP: error %d\n", ret);
+          finfo("SDIO_DMASENDSETUP: error %d\n", ret);
           return ret;
         }
     }
@@ -1768,7 +1768,7 @@ static ssize_t mmcsd_writemultiple(FAR struct mmcsd_state_s *priv,
   size_t nbytes;
   int ret;
 
-  fvdbg("startblock=%d nblocks=%d\n", startblock, nblocks);
+  finfo("startblock=%d nblocks=%d\n", startblock, nblocks);
   DEBUGASSERT(priv != NULL && buffer != NULL && nblocks > 1);
 
   /* Check if the card is locked or write protected (either via software or
@@ -1825,7 +1825,7 @@ static ssize_t mmcsd_writemultiple(FAR struct mmcsd_state_s *priv,
       offset = startblock << priv->blockshift;
     }
 
-  fvdbg("nbytes=%d byte offset=%d\n", nbytes, offset);
+  finfo("nbytes=%d byte offset=%d\n", nbytes, offset);
 
   /* Select the block size for the card */
 
@@ -1876,7 +1876,7 @@ static ssize_t mmcsd_writemultiple(FAR struct mmcsd_state_s *priv,
       ret = SDIO_DMASENDSETUP(priv->dev, buffer, nbytes);
       if (ret != OK)
         {
-          fvdbg("SDIO_DMASENDSETUP: error %d\n", ret);
+          finfo("SDIO_DMASENDSETUP: error %d\n", ret);
           return ret;
         }
     }
@@ -2003,7 +2003,7 @@ static int mmcsd_open(FAR struct inode *inode)
 {
   FAR struct mmcsd_state_s *priv;
 
-  fvdbg("Entry\n");
+  finfo("Entry\n");
   DEBUGASSERT(inode && inode->i_private);
   priv = (FAR struct mmcsd_state_s *)inode->i_private;
 
@@ -2027,7 +2027,7 @@ static int mmcsd_close(FAR struct inode *inode)
 {
   FAR struct mmcsd_state_s *priv;
 
-  fvdbg("Entry\n");
+  finfo("Entry\n");
   DEBUGASSERT(inode && inode->i_private);
   priv = (FAR struct mmcsd_state_s *)inode->i_private;
 
@@ -2061,7 +2061,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
 
   DEBUGASSERT(inode && inode->i_private);
   priv = (FAR struct mmcsd_state_s *)inode->i_private;
-  fvdbg("startsector: %d nsectors: %d sectorsize: %d\n",
+  finfo("startsector: %d nsectors: %d sectorsize: %d\n",
         startsector, nsectors, priv->blocksize);
 
   if (nsectors > 0)
@@ -2137,7 +2137,7 @@ static ssize_t mmcsd_write(FAR struct inode *inode, FAR const unsigned char *buf
   DEBUGASSERT(inode && inode->i_private);
   priv = (FAR struct mmcsd_state_s *)inode->i_private;
 
-  fvdbg("sector: %lu nsectors: %u sectorsize: %u\n",
+  finfo("sector: %lu nsectors: %u sectorsize: %u\n",
         (unsigned long)startsector, nsectors, priv->blocksize);
 
   mmcsd_takesem(priv);
@@ -2200,7 +2200,7 @@ static int mmcsd_geometry(FAR struct inode *inode, struct geometry *geometry)
   FAR struct mmcsd_state_s *priv;
   int ret = -EINVAL;
 
-  fvdbg("Entry\n");
+  finfo("Entry\n");
   DEBUGASSERT(inode && inode->i_private);
 
   if (geometry)
@@ -2213,7 +2213,7 @@ static int mmcsd_geometry(FAR struct inode *inode, struct geometry *geometry)
         {
           /* No.. return ENODEV */
 
-          fvdbg("IS_EMPTY\n");
+          finfo("IS_EMPTY\n");
           ret = -ENODEV;
         }
       else
@@ -2230,10 +2230,10 @@ static int mmcsd_geometry(FAR struct inode *inode, struct geometry *geometry)
           geometry->geo_nsectors      = priv->nblocks;
           geometry->geo_sectorsize    = priv->blocksize;
 
-          fvdbg("available: true mediachanged: %s writeenabled: %s\n",
+          finfo("available: true mediachanged: %s writeenabled: %s\n",
                  geometry->geo_mediachanged ? "true" : "false",
                  geometry->geo_writeenabled ? "true" : "false");
-          fvdbg("nsectors: %lu sectorsize: %d\n",
+          finfo("nsectors: %lu sectorsize: %d\n",
                  (long)geometry->geo_nsectors, geometry->geo_sectorsize);
 
           priv->mediachanged = false;
@@ -2258,7 +2258,7 @@ static int mmcsd_ioctl(FAR struct inode *inode, int cmd, unsigned long arg)
   FAR struct mmcsd_state_s *priv;
   int ret;
 
-  fvdbg("Entry\n");
+  finfo("Entry\n");
   DEBUGASSERT(inode && inode->i_private);
   priv  = (FAR struct mmcsd_state_s *)inode->i_private;
 
@@ -2269,7 +2269,7 @@ static int mmcsd_ioctl(FAR struct inode *inode, int cmd, unsigned long arg)
     {
     case BIOC_PROBE: /* Check for media in the slot */
       {
-        fvdbg("BIOC_PROBE\n");
+        finfo("BIOC_PROBE\n");
 
         /* Probe the MMC/SD slot for media */
 
@@ -2283,7 +2283,7 @@ static int mmcsd_ioctl(FAR struct inode *inode, int cmd, unsigned long arg)
 
     case BIOC_EJECT: /* Media has been removed from the slot */
       {
-        fvdbg("BIOC_EJECT\n");
+        finfo("BIOC_EJECT\n");
 
         /* Process the removal of the card */
 
@@ -2330,7 +2330,7 @@ static void mmcsd_mediachange(FAR void *arg)
 {
   FAR struct mmcsd_state_s *priv = (FAR struct mmcsd_state_s *)arg;
 
-  fvdbg("arg: %p\n", arg);
+  finfo("arg: %p\n", arg);
   DEBUGASSERT(priv);
 
   /* Is there a card present in the slot? */
@@ -2411,7 +2411,7 @@ static int mmcsd_widebus(FAR struct mmcsd_state_s *priv)
       ret = mmcsd_recvR1(priv, SD_ACMD42);
       if (ret != OK)
         {
-          fvdbg("WARNING: SD card does not support ACMD42: %d\n", ret);
+          finfo("WARNING: SD card does not support ACMD42: %d\n", ret);
           return ret;
         }
 
@@ -2438,7 +2438,7 @@ static int mmcsd_widebus(FAR struct mmcsd_state_s *priv)
 
       /* Configure the SDIO peripheral */
 
-      fvdbg("Wide bus operation selected\n");
+      finfo("Wide bus operation selected\n");
       SDIO_WIDEBUS(priv->dev, true);
       priv->widebus = true;
 
@@ -2454,7 +2454,7 @@ static int mmcsd_widebus(FAR struct mmcsd_state_s *priv)
 
 #else /* CONFIG_SDIO_WIDTH_D1_ONLY */
 
-  fvdbg("Wide-bus operation is disabled\n");
+  finfo("Wide-bus operation is disabled\n");
   return -ENOSYS;
 
 #endif /* CONFIG_SDIO_WIDTH_D1_ONLY */
@@ -2615,7 +2615,7 @@ static int mmcsd_sdinitialize(FAR struct mmcsd_state_s *priv)
       return ret;
     }
 
-  fvdbg("RCA: %04x\n", priv->rca);
+  finfo("RCA: %04x\n", priv->rca);
 
   /* This should have caused a transition to standby state. However, this will
    * not be reflected in the present R1 status.  R1/6 contains the state of
@@ -2729,7 +2729,7 @@ static int mmcsd_cardidentify(FAR struct mmcsd_state_s *priv)
 
   if (!SDIO_PRESENT(priv->dev))
     {
-      fvdbg("No card present\n");
+      finfo("No card present\n");
       return -ENODEV;
     }
 
@@ -2779,7 +2779,7 @@ static int mmcsd_cardidentify(FAR struct mmcsd_state_s *priv)
       if (((response & MMCSD_R7VOLTAGE_MASK) == MMCSD_R7VOLTAGE_27) &&
           ((response & MMCSD_R7ECHO_MASK) ==  MMCSD_R7CHECKPATTERN))
         {
-          fvdbg("SD V2.x card\n");
+          finfo("SD V2.x card\n");
           priv->type = MMCSD_CARDTYPE_SDV2;
           sdcapacity = MMCSD_ACMD41_HIGHCAPACITY;
         }
@@ -2844,10 +2844,10 @@ static int mmcsd_cardidentify(FAR struct mmcsd_state_s *priv)
                    * an SD V2.x (via CMD8), then this must be SD V1.x
                    */
 
-                  fvdbg("R3: %08x\n", response);
+                  finfo("R3: %08x\n", response);
                   if (priv->type == MMCSD_CARDTYPE_UNKNOWN)
                     {
-                      fvdbg("SD V1.x card\n");
+                      finfo("SD V1.x card\n");
                       priv->type = MMCSD_CARDTYPE_SDV1;
                     }
 
@@ -2869,7 +2869,7 @@ static int mmcsd_cardidentify(FAR struct mmcsd_state_s *priv)
 
                       if ((response & MMCSD_R3_HIGHCAPACITY) != 0)
                         {
-                          fvdbg("SD V2.x card with block addressing\n");
+                          finfo("SD V2.x card with block addressing\n");
                           DEBUGASSERT(priv->type == MMCSD_CARDTYPE_SDV2);
                           priv->type |= MMCSD_CARDTYPE_BLOCK;
                         }
@@ -2977,7 +2977,7 @@ static int mmcsd_probe(FAR struct mmcsd_state_s *priv)
 {
   int ret;
 
-  fvdbg("type: %d probed: %d\n", priv->type, priv->probed);
+  finfo("type: %d probed: %d\n", priv->type, priv->probed);
 
   /* If we have reliable card detection events and if we have
    * already probed the card, then we don't need to do anything
@@ -3045,7 +3045,7 @@ static int mmcsd_probe(FAR struct mmcsd_state_s *priv)
             {
               /* Yes...  */
 
-              fvdbg("Capacity: %lu Kbytes\n", (unsigned long)(priv->capacity / 1024));
+              finfo("Capacity: %lu Kbytes\n", (unsigned long)(priv->capacity / 1024));
               priv->mediachanged = true;
 
               /* Set up to receive asynchronous, media removal events */
@@ -3066,7 +3066,7 @@ static int mmcsd_probe(FAR struct mmcsd_state_s *priv)
     {
       /* There is no card in the slot */
 
-      fvdbg("No card\n");
+      finfo("No card\n");
 #ifdef CONFIG_MMCSD_HAVECARDDETECT
       SDIO_CALLBACKENABLE(priv->dev, SDIOMEDIA_INSERTED);
 #endif
@@ -3088,7 +3088,7 @@ static int mmcsd_probe(FAR struct mmcsd_state_s *priv)
 
 static int mmcsd_removed(FAR struct mmcsd_state_s *priv)
 {
-  fvdbg("type: %d present: %d\n", priv->type, SDIO_PRESENT(priv->dev));
+  finfo("type: %d present: %d\n", priv->type, SDIO_PRESENT(priv->dev));
 
   /* Forget the card geometry, pretend the slot is empty (it might not
    * be), and that the card has never been initialized.
@@ -3131,7 +3131,7 @@ static int mmcsd_hwinitialize(FAR struct mmcsd_state_s *priv)
   /* Does this architecture support DMA with the MMC/SD device? */
 
   priv->dma = SDIO_DMASUPPORTED(priv->dev);
-  fvdbg("DMA supported: %d\n", priv->dma);
+  finfo("DMA supported: %d\n", priv->dma);
 #endif
 
   /* Attach and prepare MMC/SD interrupts */
@@ -3143,7 +3143,7 @@ static int mmcsd_hwinitialize(FAR struct mmcsd_state_s *priv)
       return -EBUSY;
     }
 
-  fvdbg("Attached MMC/SD interrupts\n");
+  finfo("Attached MMC/SD interrupts\n");
 
   /* Register a callback so that we get informed if media is inserted or
    * removed from the slot (Initially all callbacks are disabled).
@@ -3174,7 +3174,7 @@ static int mmcsd_hwinitialize(FAR struct mmcsd_state_s *priv)
       ret = mmcsd_probe(priv);
       if (ret != OK)
         {
-          fvdbg("Slot not empty, but initialization failed: %d\n", ret);
+          finfo("Slot not empty, but initialization failed: %d\n", ret);
 
           /* NOTE: The failure to initialize a card does not mean that
            * initialization has failed! A card could be installed in the slot
@@ -3247,7 +3247,7 @@ int mmcsd_slotinitialize(int minor, FAR struct sdio_dev_s *dev)
   char devname[16];
   int ret = -ENOMEM;
 
-  fvdbg("minor: %d\n", minor);
+  finfo("minor: %d\n", minor);
 
   /* Sanity check */
 
@@ -3293,7 +3293,7 @@ int mmcsd_slotinitialize(int minor, FAR struct sdio_dev_s *dev)
 
               SDIO_CALLBACKENABLE(priv->dev, SDIOMEDIA_INSERTED);
 
-              fvdbg("MMC/SD slot is empty\n");
+              finfo("MMC/SD slot is empty\n");
             }
           else
             {
diff --git a/drivers/mmcsd/mmcsd_spi.c b/drivers/mmcsd/mmcsd_spi.c
index 9a44011f42..bcd67e555b 100644
--- a/drivers/mmcsd/mmcsd_spi.c
+++ b/drivers/mmcsd/mmcsd_spi.c
@@ -535,7 +535,7 @@ static uint32_t mmcsd_sendcmd(FAR struct mmcsd_slot_s *slot,
             return (uint32_t)-1;
           }
 
-        fvdbg("CMD%d[%08x] R1B=%02x\n",
+        finfo("CMD%d[%08x] R1B=%02x\n",
               cmd->cmd & 0x3f, arg, response);
       }
       break;
@@ -544,7 +544,7 @@ static uint32_t mmcsd_sendcmd(FAR struct mmcsd_slot_s *slot,
 
     case MMCSD_CMDRESP_R1:
       {
-        fvdbg("CMD%d[%08x] R1=%02x\n",
+        finfo("CMD%d[%08x] R1=%02x\n",
               cmd->cmd & 0x3f, arg, response);
       }
       break;
@@ -556,7 +556,7 @@ static uint32_t mmcsd_sendcmd(FAR struct mmcsd_slot_s *slot,
         result  = ((uint32_t)(response & 0xff) << 8);
         result |= SPI_SEND(spi, 0xff) & 0xff;
 
-        fvdbg("CMD%d[%08x] R2=%04x\n",
+        finfo("CMD%d[%08x] R2=%04x\n",
               cmd->cmd & 0x3f, arg, result);
       }
       break;
@@ -570,7 +570,7 @@ static uint32_t mmcsd_sendcmd(FAR struct mmcsd_slot_s *slot,
         slot->ocr |= ((uint32_t)(SPI_SEND(spi, 0xff) & 0xff) << 8);
         slot->ocr |= SPI_SEND(spi, 0xff) & 0xff;
 
-        fvdbg("CMD%d[%08x] R1=%02x OCR=%08x\n",
+        finfo("CMD%d[%08x] R1=%02x OCR=%08x\n",
               cmd->cmd & 0x3f, arg, response, slot->ocr);
       }
       break;
@@ -585,7 +585,7 @@ static uint32_t mmcsd_sendcmd(FAR struct mmcsd_slot_s *slot,
         slot->r7 |= ((uint32_t)(SPI_SEND(spi, 0xff) & 0xff) << 8);
         slot->r7 |= SPI_SEND(spi, 0xff) & 0xff;
 
-        fvdbg("CMD%d[%08x] R1=%02x R7=%08x\n",
+        finfo("CMD%d[%08x] R1=%02x R7=%08x\n",
               cmd->cmd & 0x3f, arg, response, slot->r7);
       }
       break;
@@ -609,7 +609,7 @@ static void mmcsd_setblklen(FAR struct mmcsd_slot_s *slot, uint32_t length)
 {
   uint32_t response;
 
-  fvdbg("Set block length to %d\n", length);
+  finfo("Set block length to %d\n", length);
   response = mmcsd_sendcmd(slot, &g_cmd16, length);
   if (response != MMCSD_SPIR1_OK)
     {
@@ -750,11 +750,11 @@ static void mmcsd_decodecsd(FAR struct mmcsd_slot_s *slot, uint8_t *csd)
       slot->twrite   = SD_WRITEACCESS;
     }
 
-  fvdbg("SPI Frequency\n");
-  fvdbg("  Maximum:         %d Hz\n", maxfrequency);
-  fvdbg("  Actual:          %d Hz\n", frequency);
-  fvdbg("Read access time:  %d ticks\n", slot->taccess);
-  fvdbg("Write access time: %d ticks\n", slot->twrite);
+  finfo("SPI Frequency\n");
+  finfo("  Maximum:         %d Hz\n", maxfrequency);
+  finfo("  Actual:          %d Hz\n", frequency);
+  finfo("Read access time:  %d ticks\n", slot->taccess);
+  finfo("Write access time: %d ticks\n", slot->twrite);
 
   /* Get the physical geometry of the card: sector size and number of
    * sectors. The card's total capacity is computed from
@@ -822,8 +822,8 @@ static void mmcsd_decodecsd(FAR struct mmcsd_slot_s *slot, uint8_t *csd)
   slot->sectorsize = 1 << readbllen;
 #endif
   slot->nsectors   = csize << csizemult;
-  fvdbg("Sector size:       %d\n", SECTORSIZE(slot));
-  fvdbg("Number of sectors: %d\n", slot->nsectors);
+  finfo("Sector size:       %d\n", SECTORSIZE(slot));
+  finfo("Number of sectors: %d\n", slot->nsectors);
 }
 
 /****************************************************************************
@@ -889,7 +889,7 @@ static int mmcsd_getcardinfo(FAR struct mmcsd_slot_s *slot, uint8_t *buffer,
   for (i = 0; i < 8; i++)
     {
       response = SPI_SEND(spi, 0xff);
-      fvdbg("%d. SPI send returned %02x\n", i, response);
+      finfo("%d. SPI send returned %02x\n", i, response);
 
       /* If a read operation fails and the card cannot provide the requested
        * data, it will send a data error token instead.  The 4 least
@@ -1029,7 +1029,7 @@ static int mmcsd_open(FAR struct inode *inode)
   FAR struct spi_dev_s *spi;
   int ret;
 
-  fvdbg("Entry\n");
+  finfo("Entry\n");
 
 #ifdef CONFIG_DEBUG
   if (!inode || !inode->i_private)
@@ -1067,7 +1067,7 @@ static int mmcsd_open(FAR struct inode *inode)
           ret = mmcsd_mediainitialize(slot);
           if (ret < 0)
             {
-              fvdbg("Failed to initialize card\n");
+              finfo("Failed to initialize card\n");
               goto errout_with_sem;
             }
         }
@@ -1093,7 +1093,7 @@ errout_with_sem:
 
 static int mmcsd_close(FAR struct inode *inode)
 {
-  fvdbg("Entry\n");
+  finfo("Entry\n");
   return OK;
 }
 
@@ -1114,7 +1114,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
   uint8_t  response;
   int    i;
 
-  fvdbg("start_sector=%d nsectors=%d\n", start_sector, nsectors);
+  finfo("start_sector=%d nsectors=%d\n", start_sector, nsectors);
 
 #ifdef CONFIG_DEBUG
   if (!buffer)
@@ -1166,12 +1166,12 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
   if (IS_BLOCK(slot->type))
     {
       offset = start_sector;
-      fvdbg("nbytes=%d sector offset=%d\n", nbytes, offset);
+      finfo("nbytes=%d sector offset=%d\n", nbytes, offset);
     }
   else
     {
       offset = start_sector * SECTORSIZE(slot);
-      fvdbg("nbytes=%d byte offset=%d\n", nbytes, offset);
+      finfo("nbytes=%d byte offset=%d\n", nbytes, offset);
     }
 
   /* Select the slave */
@@ -1239,7 +1239,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
   SPI_SEND(spi, 0xff);
   mmcsd_semgive(slot);
 
-  fvdbg("Read %d bytes:\n", nbytes);
+  finfo("Read %d bytes:\n", nbytes);
   mmcsd_dumpbuffer("Read buffer", buffer, nbytes);
   return nsectors;
 
@@ -1268,7 +1268,7 @@ static ssize_t mmcsd_write(FAR struct inode *inode, const unsigned char *buffer,
   uint8_t response;
   int i;
 
-  fvdbg("start_sector=%d nsectors=%d\n", start_sector, nsectors);
+  finfo("start_sector=%d nsectors=%d\n", start_sector, nsectors);
 
 #ifdef CONFIG_DEBUG
   if (!buffer)
@@ -1328,12 +1328,12 @@ static ssize_t mmcsd_write(FAR struct inode *inode, const unsigned char *buffer,
   if (IS_BLOCK(slot->type))
     {
       offset = start_sector;
-      fvdbg("nbytes=%d sector offset=%d\n", nbytes, offset);
+      finfo("nbytes=%d sector offset=%d\n", nbytes, offset);
     }
   else
     {
       offset = start_sector * SECTORSIZE(slot);
-      fvdbg("nbytes=%d byte offset=%d\n", nbytes, offset);
+      finfo("nbytes=%d byte offset=%d\n", nbytes, offset);
     }
 
   mmcsd_dumpbuffer("Write buffer", buffer, nbytes);
@@ -1519,11 +1519,11 @@ static int mmcsd_geometry(FAR struct inode *inode, struct geometry *geometry)
   slot->state &= ~MMCSD_SLOTSTATUS_MEDIACHGD;
   mmcsd_semgive(slot);
 
-  fvdbg("geo_available:     %d\n", geometry->geo_available);
-  fvdbg("geo_mediachanged:  %d\n", geometry->geo_mediachanged);
-  fvdbg("geo_writeenabled:  %d\n", geometry->geo_writeenabled);
-  fvdbg("geo_nsectors:      %d\n", geometry->geo_nsectors);
-  fvdbg("geo_sectorsize:    %d\n", geometry->geo_sectorsize);
+  finfo("geo_available:     %d\n", geometry->geo_available);
+  finfo("geo_mediachanged:  %d\n", geometry->geo_mediachanged);
+  finfo("geo_writeenabled:  %d\n", geometry->geo_writeenabled);
+  finfo("geo_nsectors:      %d\n", geometry->geo_nsectors);
+  finfo("geo_sectorsize:    %d\n", geometry->geo_sectorsize);
 
   return OK;
 }
@@ -1601,14 +1601,14 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
        * show IDLE STATE
        */
 
-      fvdbg("Send CMD0\n");
+      finfo("Send CMD0\n");
       SPI_SELECT(spi, SPIDEV_MMCSD, true);
       result = mmcsd_sendcmd(slot, &g_cmd0, 0);
       if (result == MMCSD_SPIR1_IDLESTATE)
         {
           /* Break out of the loop with card selected */
 
-          fvdbg("Card is in IDLE state\n");
+          finfo("Card is in IDLE state\n");
           break;
         }
 
@@ -1633,7 +1633,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
    * MMC.
    */
 
-  fvdbg("Send CMD8\n");
+  finfo("Send CMD8\n");
   result = mmcsd_sendcmd(slot, &g_cmd8, 0x1aa);
   if (result == MMCSD_SPIR1_IDLESTATE)
     {
@@ -1650,7 +1650,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
           elapsed = 0;
           do
             {
-              fvdbg("%d. Send CMD55/ACMD41\n", elapsed);
+              finfo("%d. Send CMD55/ACMD41\n", elapsed);
               result = mmcsd_sendcmd(slot, &g_cmd55, 0);
               if (result == MMCSD_SPIR1_IDLESTATE || result == MMCSD_SPIR1_OK)
                 {
@@ -1669,13 +1669,13 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
 
           if (elapsed < MMCSD_DELAY_1SEC)
            {
-             fvdbg("Send CMD58\n");
+             finfo("Send CMD58\n");
 
              SPI_SEND(spi, 0xff);
              result = mmcsd_sendcmd(slot, &g_cmd58, 0);
              if (result == MMCSD_SPIR1_OK)
                {
-                  fvdbg("OCR: %08x\n", slot->ocr);
+                  finfo("OCR: %08x\n", slot->ocr);
                   if ((slot->ocr & MMCSD_OCR_CCS) != 0)
                     {
                       fdbg("Identified SD ver2 card/with block access\n");
@@ -1697,7 +1697,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
     {
       /* Both the MMC card and the SD card support CMD55 */
 
-      fvdbg("Send CMD55/ACMD41\n");
+      finfo("Send CMD55/ACMD41\n");
       result = mmcsd_sendcmd(slot, &g_cmd55, 0);
       if (result == MMCSD_SPIR1_IDLESTATE || result == MMCSD_SPIR1_OK)
         {
@@ -1719,7 +1719,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
         {
           if (IS_SD(slot->type))
             {
-              fvdbg("%d. Send CMD55/ACMD41\n", elapsed);
+              finfo("%d. Send CMD55/ACMD41\n", elapsed);
               result = mmcsd_sendcmd(slot, &g_cmd55, 0);
               if (result == MMCSD_SPIR1_IDLESTATE || result == MMCSD_SPIR1_OK)
                 {
@@ -1732,7 +1732,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
             }
           else
             {
-              fvdbg("%d. Send CMD1\n", i);
+              finfo("%d. Send CMD1\n", i);
               result = mmcsd_sendcmd(slot, &g_cmd1, 0);
               if (result == MMCSD_SPIR1_OK)
                 {
@@ -1765,7 +1765,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
 
   /* Read CSD. CSD must always be valid */
 
-  fvdbg("Get CSD\n");
+  finfo("Get CSD\n");
   result = mmcsd_getcsd(slot, csd);
   if (result != OK)
     {
@@ -1879,7 +1879,7 @@ static void mmcsd_mediachanged(void *arg)
       ret = mmcsd_mediainitialize(slot);
       if (ret == 0)
         {
-          fvdbg("mmcsd_mediainitialize returned OK\n");
+          finfo("mmcsd_mediainitialize returned OK\n");
           slot->state |= MMCSD_SLOTSTATUS_MEDIACHGD;
         }
     }
@@ -1954,7 +1954,7 @@ int mmcsd_spislotinitialize(int minor, int slotno, FAR struct spi_dev_s *spi)
   mmcsd_semgive(slot);
   if (ret == 0)
     {
-      fvdbg("mmcsd_mediainitialize returned OK\n");
+      finfo("mmcsd_mediainitialize returned OK\n");
       slot->state |= MMCSD_SLOTSTATUS_MEDIACHGD;
     }
 
diff --git a/drivers/modem/u-blox.c b/drivers/modem/u-blox.c
index 05e4453ba9..6fedc5645a 100644
--- a/drivers/modem/u-blox.c
+++ b/drivers/modem/u-blox.c
@@ -59,14 +59,14 @@
 
 #ifdef CONFIG_MODEM_U_BLOX_DEBUG
 #  define m_dbg    dbg
-#  define m_vdbg   vdbg
+#  define m_info   info
 #  define m_vlldbg  lldbg
-#  define m_vllvdbg llvdbg
+#  define m_vllinfo llinfo
 #else
 #  define m_dbg(x...)
-#  define m_vdbg(x...)
+#  define m_info(x...)
 #  define m_lldbg(x...)
-#  define m_llvdbg(x...)
+#  define m_llinfo(x...)
 #endif
 
 /****************************************************************************
@@ -149,7 +149,7 @@ static int ubxmdm_ioctl(FAR struct file* filep,
   int                       ret;
   FAR struct ubxmdm_status* status;
 
-  m_vdbg("cmd: %d arg: %ld\n", cmd, arg);
+  m_info("cmd: %d arg: %ld\n", cmd, arg);
   DEBUGASSERT(upper && lower);
 
   switch (cmd)
@@ -235,7 +235,7 @@ static int ubxmdm_ioctl(FAR struct file* filep,
        */
 
     default:
-      m_vdbg("Forwarding unrecognized cmd: %d arg: %ld\n", cmd, arg);
+      m_info("Forwarding unrecognized cmd: %d arg: %ld\n", cmd, arg);
 
       if (lower->ops->ioctl)
         {
@@ -326,7 +326,7 @@ void ubxmdm_unregister(FAR void *handle)
   lower = upper->lower;
   DEBUGASSERT(upper && lower);
 
-  m_vdbg("Unregistering: %s\n", upper->path);
+  m_info("Unregistering: %s\n", upper->path);
 
   DEBUGASSERT(lower->ops->poweroff);
   (void) lower->ops->poweroff(lower);
diff --git a/drivers/mtd/at24xx.c b/drivers/mtd/at24xx.c
index 76d2cf2659..a7b38883e5 100644
--- a/drivers/mtd/at24xx.c
+++ b/drivers/mtd/at24xx.c
@@ -302,7 +302,7 @@ static ssize_t at24c_read_internal(FAR struct at24c_dev_s *priv, off_t offset,
   uint8_t buf[AT24XX_ADDRSIZE];
   uint16_t at24addr;
 
-  fvdbg("offset: %lu nbytes: %lu address: %02x\n",
+  finfo("offset: %lu nbytes: %lu address: %02x\n",
         (unsigned long)offset, (unsigned long)nbytes, address);
 
   /* "Random Read: A Random Read requires a dummy byte write sequence to load in the
@@ -329,7 +329,7 @@ static ssize_t at24c_read_internal(FAR struct at24c_dev_s *priv, off_t offset,
 
   while (at24c_i2c_write(priv, at24addr, buf, AT24XX_ADDRSIZE) < 0)
     {
-      fvdbg("wait\n");
+      finfo("wait\n");
       usleep(1000);
     }
 
@@ -356,7 +356,7 @@ static ssize_t at24c_bread(FAR struct mtd_dev_s *dev, off_t startblock,
   nblocks    *= (CONFIG_AT24XX_MTD_BLOCKSIZE / AT24XX_PAGESIZE);
 #endif
 
-  fvdbg("startblock: %08lx nblocks: %lu\n",
+  finfo("startblock: %08lx nblocks: %lu\n",
         (unsigned long)startblock, (unsigned long)nblocks);
 
   if (startblock >= priv->npages)
@@ -427,7 +427,7 @@ static ssize_t at24c_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, size_t
       nblocks = priv->npages - startblock;
     }
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   while (blocksleft-- > 0)
     {
@@ -445,7 +445,7 @@ static ssize_t at24c_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, size_t
 
       while (at24c_i2c_write(priv, at24addr, buf, AT24XX_ADDRSIZE) < 0)
         {
-          fvdbg("wait\n");
+          finfo("wait\n");
           usleep(1000);
         }
 
@@ -474,7 +474,7 @@ static ssize_t at24c_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes
   size_t  memsize;
   uint8_t addr;
 
-  fvdbg("offset: %lu nbytes: %lu\n", (unsigned long)offset, (unsigned long)nbytes);
+  finfo("offset: %lu nbytes: %lu\n", (unsigned long)offset, (unsigned long)nbytes);
 
   /* Don't permit reads beyond the end of the memory region */
 
@@ -520,7 +520,7 @@ static int at24c_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
   FAR struct at24c_dev_s *priv = (FAR struct at24c_dev_s *)dev;
   int ret = -EINVAL; /* Assume good command with bad parameters */
 
-  fvdbg("cmd: %d \n", cmd);
+  finfo("cmd: %d \n", cmd);
 
   switch (cmd)
     {
@@ -561,7 +561,7 @@ static int at24c_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
 #endif
               ret               = OK;
 
-              fvdbg("blocksize: %d erasesize: %d neraseblocks: %d\n",
+              finfo("blocksize: %d erasesize: %d neraseblocks: %d\n",
                     geo->blocksize, geo->erasesize, geo->neraseblocks);
             }
         }
@@ -610,7 +610,7 @@ FAR struct mtd_dev_s *at24c_initialize(FAR struct i2c_master_s *dev)
   FAR struct at24c_dev_s *priv;
 
 #ifdef CONFIG_AT24XX_MULTI
-  fvdbg("dev: %p address: %02x\n", dev, address);
+  finfo("dev: %p address: %02x\n", dev, address);
 
   /* Allocate a state structure (we allocate the structure instead of using
    * a fixed, static allocation so that we can handle multiple FLASH devices.
@@ -627,7 +627,7 @@ FAR struct mtd_dev_s *at24c_initialize(FAR struct i2c_master_s *dev)
     }
 
 #else
-  fvdbg("dev: %p\n", dev);
+  finfo("dev: %p\n", dev);
 
   /* If only a signal AT24 part is supported then a statically allocated state
    * structure is used.
@@ -669,7 +669,7 @@ FAR struct mtd_dev_s *at24c_initialize(FAR struct i2c_master_s *dev)
 
   /* Return the implementation-specific state structure as the MTD device */
 
-  fvdbg("Return %p\n", priv);
+  finfo("Return %p\n", priv);
   return (FAR struct mtd_dev_s *)priv;
 }
 
diff --git a/drivers/mtd/at25.c b/drivers/mtd/at25.c
index e085ca8b89..9b1efde666 100644
--- a/drivers/mtd/at25.c
+++ b/drivers/mtd/at25.c
@@ -213,7 +213,7 @@ static inline int at25_readid(struct at25_dev_s *priv)
   uint16_t manufacturer;
   uint16_t memory;
 
-  fvdbg("priv: %p\n", priv);
+  finfo("priv: %p\n", priv);
 
   /* Lock the SPI bus, configure the bus, and select this FLASH part. */
 
@@ -231,7 +231,7 @@ static inline int at25_readid(struct at25_dev_s *priv)
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
   at25_unlock(priv->dev);
 
-  fvdbg("manufacturer: %02x memory: %02x\n",
+  finfo("manufacturer: %02x memory: %02x\n",
         manufacturer, memory);
 
   /* Check for a valid manufacturer and memory type */
@@ -295,7 +295,7 @@ static void at25_waitwritecomplete(struct at25_dev_s *priv)
       fdbg("ERROR: Write error, status: 0x%02x\n", status);
     }
 
-  fvdbg("Complete, status: 0x%02x\n", status);
+  finfo("Complete, status: 0x%02x\n", status);
 }
 
 /************************************************************************************
@@ -307,7 +307,7 @@ static void at25_writeenable(struct at25_dev_s *priv)
   SPI_SELECT(priv->dev, SPIDEV_FLASH, true);
   (void)SPI_SEND(priv->dev, AT25_WREN);
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
-  fvdbg("Enabled\n");
+  finfo("Enabled\n");
 }
 
 /************************************************************************************
@@ -318,7 +318,7 @@ static inline void at25_sectorerase(struct at25_dev_s *priv, off_t sector)
 {
   off_t offset = sector << priv->sectorshift;
 
-  fvdbg("sector: %08lx\n", (long)sector);
+  finfo("sector: %08lx\n", (long)sector);
 
   /* Wait for any preceding write to complete.  We could simplify things by
    * perform this wait at the end of each write operation (rather than at
@@ -352,7 +352,7 @@ static inline void at25_sectorerase(struct at25_dev_s *priv, off_t sector)
   /* Deselect the FLASH */
 
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
-  fvdbg("Erased\n");
+  finfo("Erased\n");
 }
 
 /************************************************************************************
@@ -361,7 +361,7 @@ static inline void at25_sectorerase(struct at25_dev_s *priv, off_t sector)
 
 static inline int at25_bulkerase(struct at25_dev_s *priv)
 {
-  fvdbg("priv: %p\n", priv);
+  finfo("priv: %p\n", priv);
 
   /* Wait for any preceding write to complete.  We could simplify things by
    * perform this wait at the end of each write operation (rather than at
@@ -386,7 +386,7 @@ static inline int at25_bulkerase(struct at25_dev_s *priv)
   /* Deselect the FLASH */
 
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
-  fvdbg("Return: OK\n");
+  finfo("Return: OK\n");
   return OK;
 }
 
@@ -399,7 +399,7 @@ static inline void at25_pagewrite(struct at25_dev_s *priv, FAR const uint8_t *bu
 {
   off_t offset = page << 8;
 
-  fvdbg("page: %08lx offset: %08lx\n", (long)page, (long)offset);
+  finfo("page: %08lx offset: %08lx\n", (long)page, (long)offset);
 
   /* Wait for any preceding write to complete.  We could simplify things by
    * perform this wait at the end of each write operation (rather than at
@@ -434,7 +434,7 @@ static inline void at25_pagewrite(struct at25_dev_s *priv, FAR const uint8_t *bu
   /* Deselect the FLASH: Chip Select high */
 
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
-  fvdbg("Written\n");
+  finfo("Written\n");
 }
 
 /************************************************************************************
@@ -446,7 +446,7 @@ static int at25_erase(FAR struct mtd_dev_s *dev, off_t startblock, size_t nblock
   FAR struct at25_dev_s *priv = (FAR struct at25_dev_s *)dev;
   size_t blocksleft = nblocks;
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* Lock access to the SPI bus until we complete the erase */
 
@@ -473,7 +473,7 @@ static ssize_t at25_bread(FAR struct mtd_dev_s *dev, off_t startblock, size_t nb
   FAR struct at25_dev_s *priv = (FAR struct at25_dev_s *)dev;
   ssize_t nbytes;
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* On this device, we can handle the block read just like the byte-oriented read */
 
@@ -496,7 +496,7 @@ static ssize_t at25_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, size_t n
   FAR struct at25_dev_s *priv = (FAR struct at25_dev_s *)dev;
   size_t blocksleft = nblocks;
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* Lock the SPI bus and write each page to FLASH */
 
@@ -522,7 +522,7 @@ static ssize_t at25_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes,
 {
   FAR struct at25_dev_s *priv = (FAR struct at25_dev_s *)dev;
 
-  fvdbg("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes);
+  finfo("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes);
 
   /* Wait for any preceding write to complete.  We could simplify things by
    * perform this wait at the end of each write operation (rather than at
@@ -556,7 +556,7 @@ static ssize_t at25_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes,
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
   at25_unlock(priv->dev);
 
-  fvdbg("return nbytes: %d\n", (int)nbytes);
+  finfo("return nbytes: %d\n", (int)nbytes);
   return nbytes;
 }
 
@@ -569,7 +569,7 @@ static int at25_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
   FAR struct at25_dev_s *priv = (FAR struct at25_dev_s *)dev;
   int ret = -EINVAL; /* Assume good command with bad parameters */
 
-  fvdbg("cmd: %d \n", cmd);
+  finfo("cmd: %d \n", cmd);
 
   switch (cmd)
     {
@@ -592,7 +592,7 @@ static int at25_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
               geo->neraseblocks = priv->nsectors;
               ret               = OK;
 
-              fvdbg("blocksize: %d erasesize: %d neraseblocks: %d\n",
+              finfo("blocksize: %d erasesize: %d neraseblocks: %d\n",
                     geo->blocksize, geo->erasesize, geo->neraseblocks);
             }
         }
@@ -614,7 +614,7 @@ static int at25_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
         break;
     }
 
-  fvdbg("return %d\n", ret);
+  finfo("return %d\n", ret);
   return ret;
 }
 
@@ -637,7 +637,7 @@ FAR struct mtd_dev_s *at25_initialize(FAR struct spi_dev_s *dev)
   FAR struct at25_dev_s *priv;
   int ret;
 
-  fvdbg("dev: %p\n", dev);
+  finfo("dev: %p\n", dev);
 
   /* Allocate a state structure (we allocate the structure instead of using
    * a fixed, static allocation so that we can handle multiple FLASH devices.
@@ -695,6 +695,6 @@ FAR struct mtd_dev_s *at25_initialize(FAR struct spi_dev_s *dev)
 
   /* Return the implementation-specific state structure as the MTD device */
 
-  fvdbg("Return %p\n", priv);
+  finfo("Return %p\n", priv);
   return (FAR struct mtd_dev_s *)priv;
 }
diff --git a/drivers/mtd/at45db.c b/drivers/mtd/at45db.c
index a76994d5e4..4fac5863b3 100644
--- a/drivers/mtd/at45db.c
+++ b/drivers/mtd/at45db.c
@@ -341,7 +341,7 @@ static inline int at45db_rdid(FAR struct at45db_dev_s *priv)
   uint8_t capacity;
   uint8_t devid[3];
 
-  fvdbg("priv: %p\n", priv);
+  finfo("priv: %p\n", priv);
 
   /* Configure the bus, and select this FLASH part. (The caller should already have
    * locked the bus for exclusive access)
@@ -360,7 +360,7 @@ static inline int at45db_rdid(FAR struct at45db_dev_s *priv)
 
   SPI_SELECT(priv->spi, SPIDEV_FLASH, false);
 
-  fvdbg("manufacturer: %02x devid1: %02x devid2: %02x\n",
+  finfo("manufacturer: %02x devid1: %02x devid2: %02x\n",
         devid[0], devid[1], devid[2]);
 
   /* Check for a valid manufacturer and memory family */
@@ -474,7 +474,7 @@ static inline void at45db_pgerase(FAR struct at45db_dev_s *priv, off_t sector)
   uint8_t erasecmd[4];
   off_t offset = sector << priv->pageshift;
 
-  fvdbg("sector: %08lx\n", (long)sector);
+  finfo("sector: %08lx\n", (long)sector);
 
   /* Higher performance write logic:  We leave the chip busy after write and erase
    * operations.  This improves write and erase performance because we do not have
@@ -514,7 +514,7 @@ static inline void at45db_pgerase(FAR struct at45db_dev_s *priv, off_t sector)
 #ifndef CONFIG_AT45DB_PREWAIT
   at45db_waitbusy(priv);
 #endif
-  fvdbg("Erased\n");
+  finfo("Erased\n");
 }
 
 /************************************************************************************
@@ -523,7 +523,7 @@ static inline void at45db_pgerase(FAR struct at45db_dev_s *priv, off_t sector)
 
 static inline int at32db_chiperase(FAR struct at45db_dev_s *priv)
 {
-  fvdbg("priv: %p\n", priv);
+  finfo("priv: %p\n", priv);
 
   /* Higher performance write logic:  We leave the chip busy after write and erase
    * operations.  This improves write and erase performance because we do not have
@@ -569,7 +569,7 @@ static inline void at45db_pgwrite(FAR struct at45db_dev_s *priv,
   uint8_t wrcmd [4];
   off_t offset = page << priv->pageshift;
 
-  fvdbg("page: %08lx offset: %08lx\n", (long)page, (long)offset);
+  finfo("page: %08lx offset: %08lx\n", (long)page, (long)offset);
 
   /* We assume that sectors are not write protected */
 
@@ -601,7 +601,7 @@ static inline void at45db_pgwrite(FAR struct at45db_dev_s *priv,
 #ifndef CONFIG_AT45DB_PREWAIT
   at45db_waitbusy(priv);
 #endif
-  fvdbg("Written\n");
+  finfo("Written\n");
 }
 
 /************************************************************************************
@@ -613,7 +613,7 @@ static int at45db_erase(FAR struct mtd_dev_s *mtd, off_t startblock, size_t nblo
   FAR struct at45db_dev_s *priv = (FAR struct at45db_dev_s *)mtd;
   size_t pgsleft = nblocks;
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* Take the lock so that we have exclusive access to the bus, then power up the
    * FLASH device.
@@ -669,7 +669,7 @@ static ssize_t at45db_bwrite(FAR struct mtd_dev_s *mtd, off_t startblock,
   FAR struct at45db_dev_s *priv = (FAR struct at45db_dev_s *)mtd;
   size_t pgsleft = nblocks;
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* Take the lock so that we have exclusive access to the bus, then power up the
    * FLASH device.
@@ -703,7 +703,7 @@ static ssize_t at45db_read(FAR struct mtd_dev_s *mtd, off_t offset, size_t nbyte
   FAR struct at45db_dev_s *priv = (FAR struct at45db_dev_s *)mtd;
   uint8_t rdcmd [5];
 
-  fvdbg("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes);
+  finfo("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes);
 
   /* Set up for the read */
 
@@ -741,7 +741,7 @@ static ssize_t at45db_read(FAR struct mtd_dev_s *mtd, off_t offset, size_t nbyte
   at45db_pwrdown(priv);
   at45db_unlock(priv);
 
-  fvdbg("return nbytes: %d\n", (int)nbytes);
+  finfo("return nbytes: %d\n", (int)nbytes);
   return nbytes;
 }
 
@@ -754,7 +754,7 @@ static int at45db_ioctl(FAR struct mtd_dev_s *mtd, int cmd, unsigned long arg)
   FAR struct at45db_dev_s *priv = (FAR struct at45db_dev_s *)mtd;
   int ret = -EINVAL; /* Assume good command with bad parameters */
 
-  fvdbg("cmd: %d \n", cmd);
+  finfo("cmd: %d \n", cmd);
 
   switch (cmd)
     {
@@ -777,7 +777,7 @@ static int at45db_ioctl(FAR struct mtd_dev_s *mtd, int cmd, unsigned long arg)
               geo->neraseblocks = priv->npages;
               ret               = OK;
 
-              fvdbg("blocksize: %d erasesize: %d neraseblocks: %d\n",
+              finfo("blocksize: %d erasesize: %d neraseblocks: %d\n",
                     geo->blocksize, geo->erasesize, geo->neraseblocks);
             }
         }
@@ -806,7 +806,7 @@ static int at45db_ioctl(FAR struct mtd_dev_s *mtd, int cmd, unsigned long arg)
         break;
     }
 
-  fvdbg("return %d\n", ret);
+  finfo("return %d\n", ret);
   return ret;
 }
 
@@ -830,7 +830,7 @@ FAR struct mtd_dev_s *at45db_initialize(FAR struct spi_dev_s *spi)
   uint8_t sr;
   int ret;
 
-  fvdbg("spi: %p\n", spi);
+  finfo("spi: %p\n", spi);
 
   /* Allocate a state structure (we allocate the structure instead of using a fixed,
    * static allocation so that we can handle multiple FLASH devices.  The current
@@ -906,7 +906,7 @@ FAR struct mtd_dev_s *at45db_initialize(FAR struct spi_dev_s *spi)
   mtd_register(&priv->mtd, "at45db");
 #endif
 
-  fvdbg("Return %p\n", priv);
+  finfo("Return %p\n", priv);
   return (FAR struct mtd_dev_s *)priv;
 
   /* On any failure, we need free memory allocations and release the lock that
diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c
index b18767f013..cf22b4477d 100644
--- a/drivers/mtd/ftl.c
+++ b/drivers/mtd/ftl.c
@@ -133,7 +133,7 @@ static const struct block_operations g_bops =
 
 static int ftl_open(FAR struct inode *inode)
 {
-  fvdbg("Entry\n");
+  finfo("Entry\n");
   return OK;
 }
 
@@ -146,7 +146,7 @@ static int ftl_open(FAR struct inode *inode)
 
 static int ftl_close(FAR struct inode *inode)
 {
-  fvdbg("Entry\n");
+  finfo("Entry\n");
   return OK;
 }
 
@@ -187,7 +187,7 @@ static ssize_t ftl_read(FAR struct inode *inode, unsigned char *buffer,
 {
   FAR struct ftl_struct_s *dev;
 
-  fvdbg("sector: %d nsectors: %d\n", start_sector, nsectors);
+  finfo("sector: %d nsectors: %d\n", start_sector, nsectors);
 
   DEBUGASSERT(inode && inode->i_private);
 
@@ -271,7 +271,7 @@ static ssize_t ftl_flush(FAR void *priv, FAR const uint8_t *buffer,
           nbytes = dev->geo.erasesize - offset;
         }
 
-      fvdbg("Copy %d bytes into erase block=%d at offset=%d\n",
+      finfo("Copy %d bytes into erase block=%d at offset=%d\n",
              nbytes, eraseblock, offset);
 
       memcpy(dev->eblock + offset, buffer, nbytes);
@@ -315,7 +315,7 @@ static ssize_t ftl_flush(FAR void *priv, FAR const uint8_t *buffer,
 
       /* Write a full erase back to flash */
 
-      fvdbg("Write %d bytes into erase block=%d at offset=0\n",
+      finfo("Write %d bytes into erase block=%d at offset=0\n",
              dev->geo.erasesize, alignedblock);
 
       nxfrd = MTD_BWRITE(dev->mtd, alignedblock, dev->blkper, buffer);
@@ -358,7 +358,7 @@ static ssize_t ftl_flush(FAR void *priv, FAR const uint8_t *buffer,
       /* Copy the user data at the beginning the buffered erase block */
 
       nbytes = remaining * dev->geo.blocksize;
-      fvdbg("Copy %d bytes into erase block=%d at offset=0\n",
+      finfo("Copy %d bytes into erase block=%d at offset=0\n",
              nbytes, alignedblock);
       memcpy(dev->eblock, buffer, nbytes);
 
@@ -389,7 +389,7 @@ static ssize_t ftl_write(FAR struct inode *inode, const unsigned char *buffer,
 {
   struct ftl_struct_s *dev;
 
-  fvdbg("sector: %d nsectors: %d\n", start_sector, nsectors);
+  finfo("sector: %d nsectors: %d\n", start_sector, nsectors);
 
   DEBUGASSERT(inode && inode->i_private);
   dev = (struct ftl_struct_s *)inode->i_private;
@@ -412,7 +412,7 @@ static int ftl_geometry(FAR struct inode *inode, struct geometry *geometry)
 {
   struct ftl_struct_s *dev;
 
-  fvdbg("Entry\n");
+  finfo("Entry\n");
 
   DEBUGASSERT(inode);
   if (geometry)
@@ -428,9 +428,9 @@ static int ftl_geometry(FAR struct inode *inode, struct geometry *geometry)
       geometry->geo_nsectors      = dev->geo.neraseblocks * dev->blkper;
       geometry->geo_sectorsize    = dev->geo.blocksize;
 
-      fvdbg("available: true mediachanged: false writeenabled: %s\n",
+      finfo("available: true mediachanged: false writeenabled: %s\n",
             geometry->geo_writeenabled ? "true" : "false");
-      fvdbg("nsectors: %d sectorsize: %d\n",
+      finfo("nsectors: %d sectorsize: %d\n",
             geometry->geo_nsectors, geometry->geo_sectorsize);
 
       return OK;
@@ -451,7 +451,7 @@ static int ftl_ioctl(FAR struct inode *inode, int cmd, unsigned long arg)
   struct ftl_struct_s *dev ;
   int ret;
 
-  fvdbg("Entry\n");
+  finfo("Entry\n");
   DEBUGASSERT(inode && inode->i_private);
 
   /* Only one block driver ioctl command is supported by this driver (and
diff --git a/drivers/mtd/hamming.c b/drivers/mtd/hamming.c
index 95d4a5a699..087bd472be 100644
--- a/drivers/mtd/hamming.c
+++ b/drivers/mtd/hamming.c
@@ -301,11 +301,11 @@ static int hamming_verify256(FAR uint8_t *data, FAR const uint8_t *original)
 
   /* There are bit errors */
 
-  fvdbg("Read:       %02x %02x %02x\n",
+  finfo("Read:       %02x %02x %02x\n",
         original[0], original[1], original[2]);
-  fvdbg("Computed:   %02x %02x %02x\n",
+  finfo("Computed:   %02x %02x %02x\n",
         computed[0], computed[1], computed[2]);
-  fvdbg("Correction: %02x %02x %02x\n",
+  finfo("Correction: %02x %02x %02x\n",
         correction[0], correction[1], correction[2]);
 
   /* If there is a single bit error, there are 11 bits set to 1 */
diff --git a/drivers/mtd/is25xp.c b/drivers/mtd/is25xp.c
index 0c685d3ef0..e26f859b49 100644
--- a/drivers/mtd/is25xp.c
+++ b/drivers/mtd/is25xp.c
@@ -248,7 +248,7 @@ static inline int is25xp_readid(struct is25xp_dev_s *priv)
   uint16_t memory;
   uint16_t capacity;
 
-  fvdbg("priv: %p\n", priv);
+  finfo("priv: %p\n", priv);
 
   /* Lock the SPI bus, configure the bus, and select this FLASH part. */
 
@@ -267,7 +267,7 @@ static inline int is25xp_readid(struct is25xp_dev_s *priv)
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
   is25xp_unlock(priv->dev);
 
-  fvdbg("manufacturer: %02x memory: %02x capacity: %02x\n",
+  finfo("manufacturer: %02x memory: %02x capacity: %02x\n",
         manufacturer, memory, capacity);
 
   /* Check for a valid manufacturer and memory type */
@@ -383,7 +383,7 @@ static void is25xp_waitwritecomplete(struct is25xp_dev_s *priv)
 
   priv->lastwaswrite = false;
 
-  fvdbg("Complete\n");
+  finfo("Complete\n");
 }
 
 /************************************************************************************
@@ -403,7 +403,7 @@ static void is25xp_writeenable(struct is25xp_dev_s *priv)
   /* Deselect the FLASH */
 
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
-  fvdbg("Enabled\n");
+  finfo("Enabled\n");
 }
 
 /************************************************************************************
@@ -438,7 +438,7 @@ static void is25xp_sectorerase(struct is25xp_dev_s *priv, off_t sector, uint8_t
 
   offset = sector << priv->sectorshift;
 
-  fvdbg("sector: %08lx\n", (long)sector);
+  finfo("sector: %08lx\n", (long)sector);
 
   /* Wait for any preceding write to complete.  We could simplify things by
    * perform this wait at the end of each write operation (rather than at
@@ -475,7 +475,7 @@ static void is25xp_sectorerase(struct is25xp_dev_s *priv, off_t sector, uint8_t
   /* Deselect the FLASH */
 
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
-  fvdbg("Erased\n");
+  finfo("Erased\n");
 }
 
 /************************************************************************************
@@ -484,7 +484,7 @@ static void is25xp_sectorerase(struct is25xp_dev_s *priv, off_t sector, uint8_t
 
 static inline int is25xp_bulkerase(struct is25xp_dev_s *priv)
 {
-  fvdbg("priv: %p\n", priv);
+  finfo("priv: %p\n", priv);
 
   /* Wait for any preceding write to complete.  We could simplify things by
    * perform this wait at the end of each write operation (rather than at
@@ -511,7 +511,7 @@ static inline int is25xp_bulkerase(struct is25xp_dev_s *priv)
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
   is25xp_waitwritecomplete(priv);
 
-  fvdbg("Return: OK\n");
+  finfo("Return: OK\n");
   return OK;
 }
 
@@ -524,7 +524,7 @@ static inline void is25xp_pagewrite(struct is25xp_dev_s *priv, FAR const uint8_t
 {
   off_t offset = page << priv->pageshift;
 
-  fvdbg("page: %08lx offset: %08lx\n", (long)page, (long)offset);
+  finfo("page: %08lx offset: %08lx\n", (long)page, (long)offset);
 
   /* Wait for any preceding write to complete.  We could simplify things by
    * perform this wait at the end of each write operation (rather than at
@@ -560,7 +560,7 @@ static inline void is25xp_pagewrite(struct is25xp_dev_s *priv, FAR const uint8_t
   /* Deselect the FLASH: Chip Select high */
 
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
-  fvdbg("Written\n");
+  finfo("Written\n");
 }
 
 /************************************************************************************
@@ -571,7 +571,7 @@ static inline void is25xp_pagewrite(struct is25xp_dev_s *priv, FAR const uint8_t
 static inline void is25xp_bytewrite(struct is25xp_dev_s *priv, FAR const uint8_t *buffer,
                                      off_t offset, uint16_t count)
 {
-  fvdbg("offset: %08lx  count:%d\n", (long)offset, count);
+  finfo("offset: %08lx  count:%d\n", (long)offset, count);
 
   /* Wait for any preceding write to complete.  We could simplify things by
    * perform this wait at the end of each write operation (rather than at
@@ -607,7 +607,7 @@ static inline void is25xp_bytewrite(struct is25xp_dev_s *priv, FAR const uint8_t
   /* Deselect the FLASH: Chip Select high */
 
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
-  fvdbg("Written\n");
+  finfo("Written\n");
 }
 #endif
 
@@ -620,7 +620,7 @@ static int is25xp_erase(FAR struct mtd_dev_s *dev, off_t startblock, size_t nblo
   FAR struct is25xp_dev_s *priv = (FAR struct is25xp_dev_s *)dev;
   size_t blocksleft = nblocks;
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* Lock access to the SPI bus until we complete the erase */
 
@@ -697,7 +697,7 @@ static ssize_t is25xp_bread(FAR struct mtd_dev_s *dev, off_t startblock, size_t
   FAR struct is25xp_dev_s *priv = (FAR struct is25xp_dev_s *)dev;
   ssize_t nbytes;
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* On this device, we can handle the block read just like the byte-oriented read */
 
@@ -721,7 +721,7 @@ static ssize_t is25xp_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, size_t
   size_t blocksleft = nblocks;
   size_t pagesize = 1 << priv->pageshift;
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* Lock the SPI bus and write each page to FLASH */
 
@@ -746,7 +746,7 @@ static ssize_t is25xp_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbyte
 {
   FAR struct is25xp_dev_s *priv = (FAR struct is25xp_dev_s *)dev;
 
-  fvdbg("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes);
+  finfo("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes);
 
   /* Wait for any preceding write to complete.  We could simplify things by
    * perform this wait at the end of each write operation (rather than at
@@ -782,7 +782,7 @@ static ssize_t is25xp_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbyte
 
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
   is25xp_unlock(priv->dev);
-  fvdbg("return nbytes: %d\n", (int)nbytes);
+  finfo("return nbytes: %d\n", (int)nbytes);
   return nbytes;
 }
 
@@ -802,7 +802,7 @@ static ssize_t is25xp_write(FAR struct mtd_dev_s *dev, off_t offset, size_t nbyt
   int    pagesize;
   int    bytestowrite;
 
-  fvdbg("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes);
+  finfo("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes);
 
   /* We must test if the offset + count crosses one or more pages
    * and perform individual writes.  The devices can only write in
@@ -869,7 +869,7 @@ static int is25xp_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
   FAR struct is25xp_dev_s *priv = (FAR struct is25xp_dev_s *)dev;
   int ret = -EINVAL; /* Assume good command with bad parameters */
 
-  fvdbg("cmd: %d \n", cmd);
+  finfo("cmd: %d \n", cmd);
 
   switch (cmd)
     {
@@ -893,7 +893,7 @@ static int is25xp_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
 
               ret = OK;
 
-              fvdbg("blocksize: %d erasesize: %d neraseblocks: %d\n",
+              finfo("blocksize: %d erasesize: %d neraseblocks: %d\n",
                     geo->blocksize, geo->erasesize, geo->neraseblocks);
             }
         }
@@ -915,7 +915,7 @@ static int is25xp_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
         break;
     }
 
-  fvdbg("return %d\n", ret);
+  finfo("return %d\n", ret);
   return ret;
 }
 
@@ -938,7 +938,7 @@ FAR struct mtd_dev_s *is25xp_initialize(FAR struct spi_dev_s *dev)
   FAR struct is25xp_dev_s *priv;
   int ret;
 
-  fvdbg("dev: %p\n", dev);
+  finfo("dev: %p\n", dev);
 
   /* Allocate a state structure (we allocate the structure instead of using
    * a fixed, static allocation so that we can handle multiple FLASH devices.
@@ -996,7 +996,7 @@ FAR struct mtd_dev_s *is25xp_initialize(FAR struct spi_dev_s *dev)
 
   /* Return the implementation-specific state structure as the MTD device */
 
-  fvdbg("Return %p\n", priv);
+  finfo("Return %p\n", priv);
   return (FAR struct mtd_dev_s *)priv;
 }
 
diff --git a/drivers/mtd/m25px.c b/drivers/mtd/m25px.c
index f117c10d91..c1b523541b 100644
--- a/drivers/mtd/m25px.c
+++ b/drivers/mtd/m25px.c
@@ -312,7 +312,7 @@ static inline int m25p_readid(struct m25p_dev_s *priv)
   uint16_t memory;
   uint16_t capacity;
 
-  fvdbg("priv: %p\n", priv);
+  finfo("priv: %p\n", priv);
 
   /* Lock the SPI bus, configure the bus, and select this FLASH part. */
 
@@ -331,7 +331,7 @@ static inline int m25p_readid(struct m25p_dev_s *priv)
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
   m25p_unlock(priv->dev);
 
-  fvdbg("manufacturer: %02x memory: %02x capacity: %02x\n",
+  finfo("manufacturer: %02x memory: %02x capacity: %02x\n",
         manufacturer, memory, capacity);
 
   /* Check for a valid manufacturer and memory type */
@@ -460,7 +460,7 @@ static void m25p_waitwritecomplete(struct m25p_dev_s *priv)
     }
   while ((status & M25P_SR_WIP) != 0);
 
-  fvdbg("Complete\n");
+  finfo("Complete\n");
 }
 
 /************************************************************************************
@@ -480,7 +480,7 @@ static void m25p_writeenable(struct m25p_dev_s *priv)
   /* Deselect the FLASH */
 
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
-  fvdbg("Enabled\n");
+  finfo("Enabled\n");
 }
 
 /************************************************************************************
@@ -502,7 +502,7 @@ static void m25p_sectorerase(struct m25p_dev_s *priv, off_t sector, uint8_t type
       offset = sector << priv->sectorshift;
     }
 
-  fvdbg("sector: %08lx\n", (long)sector);
+  finfo("sector: %08lx\n", (long)sector);
 
   /* Wait for any preceding write to complete.  We could simplify things by
    * perform this wait at the end of each write operation (rather than at
@@ -538,7 +538,7 @@ static void m25p_sectorerase(struct m25p_dev_s *priv, off_t sector, uint8_t type
   /* Deselect the FLASH */
 
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
-  fvdbg("Erased\n");
+  finfo("Erased\n");
 }
 
 /************************************************************************************
@@ -547,7 +547,7 @@ static void m25p_sectorerase(struct m25p_dev_s *priv, off_t sector, uint8_t type
 
 static inline int m25p_bulkerase(struct m25p_dev_s *priv)
 {
-  fvdbg("priv: %p\n", priv);
+  finfo("priv: %p\n", priv);
 
   /* Wait for any preceding write to complete.  We could simplify things by
    * perform this wait at the end of each write operation (rather than at
@@ -572,7 +572,7 @@ static inline int m25p_bulkerase(struct m25p_dev_s *priv)
   /* Deselect the FLASH */
 
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
-  fvdbg("Return: OK\n");
+  finfo("Return: OK\n");
   return OK;
 }
 
@@ -585,7 +585,7 @@ static inline void m25p_pagewrite(struct m25p_dev_s *priv, FAR const uint8_t *bu
 {
   off_t offset = page << priv->pageshift;
 
-  fvdbg("page: %08lx offset: %08lx\n", (long)page, (long)offset);
+  finfo("page: %08lx offset: %08lx\n", (long)page, (long)offset);
 
   /* Wait for any preceding write to complete.  We could simplify things by
    * perform this wait at the end of each write operation (rather than at
@@ -620,7 +620,7 @@ static inline void m25p_pagewrite(struct m25p_dev_s *priv, FAR const uint8_t *bu
   /* Deselect the FLASH: Chip Select high */
 
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
-  fvdbg("Written\n");
+  finfo("Written\n");
 }
 
 /************************************************************************************
@@ -631,7 +631,7 @@ static inline void m25p_pagewrite(struct m25p_dev_s *priv, FAR const uint8_t *bu
 static inline void m25p_bytewrite(struct m25p_dev_s *priv, FAR const uint8_t *buffer,
                                   off_t offset, uint16_t count)
 {
-  fvdbg("offset: %08lx  count:%d\n", (long)offset, count);
+  finfo("offset: %08lx  count:%d\n", (long)offset, count);
 
   /* Wait for any preceding write to complete.  We could simplify things by
    * perform this wait at the end of each write operation (rather than at
@@ -666,7 +666,7 @@ static inline void m25p_bytewrite(struct m25p_dev_s *priv, FAR const uint8_t *bu
   /* Deselect the FLASH: Chip Select high */
 
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
-  fvdbg("Written\n");
+  finfo("Written\n");
 }
 #endif
 
@@ -679,7 +679,7 @@ static int m25p_erase(FAR struct mtd_dev_s *dev, off_t startblock, size_t nblock
   FAR struct m25p_dev_s *priv = (FAR struct m25p_dev_s *)dev;
   size_t blocksleft = nblocks;
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* Lock access to the SPI bus until we complete the erase */
 
@@ -747,7 +747,7 @@ static ssize_t m25p_bread(FAR struct mtd_dev_s *dev, off_t startblock, size_t nb
   FAR struct m25p_dev_s *priv = (FAR struct m25p_dev_s *)dev;
   ssize_t nbytes;
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* On this device, we can handle the block read just like the byte-oriented read */
 
@@ -771,7 +771,7 @@ static ssize_t m25p_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, size_t n
   size_t blocksleft = nblocks;
   size_t pagesize = 1 << priv->pageshift;
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* Lock the SPI bus and write each page to FLASH */
 
@@ -796,7 +796,7 @@ static ssize_t m25p_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes,
 {
   FAR struct m25p_dev_s *priv = (FAR struct m25p_dev_s *)dev;
 
-  fvdbg("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes);
+  finfo("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes);
 
   /* Wait for any preceding write to complete.  We could simplify things by
    * perform this wait at the end of each write operation (rather than at
@@ -829,7 +829,7 @@ static ssize_t m25p_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes,
 
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
   m25p_unlock(priv->dev);
-  fvdbg("return nbytes: %d\n", (int)nbytes);
+  finfo("return nbytes: %d\n", (int)nbytes);
   return nbytes;
 }
 
@@ -849,7 +849,7 @@ static ssize_t m25p_write(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes
   int    pagesize;
   int    bytestowrite;
 
-  fvdbg("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes);
+  finfo("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes);
 
   /* We must test if the offset + count crosses one or more pages
    * and perform individual writes.  The devices can only write in
@@ -914,7 +914,7 @@ static int m25p_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
   FAR struct m25p_dev_s *priv = (FAR struct m25p_dev_s *)dev;
   int ret = -EINVAL; /* Assume good command with bad parameters */
 
-  fvdbg("cmd: %d \n", cmd);
+  finfo("cmd: %d \n", cmd);
 
   switch (cmd)
     {
@@ -949,7 +949,7 @@ static int m25p_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
 
               ret = OK;
 
-              fvdbg("blocksize: %d erasesize: %d neraseblocks: %d\n",
+              finfo("blocksize: %d erasesize: %d neraseblocks: %d\n",
                     geo->blocksize, geo->erasesize, geo->neraseblocks);
             }
         }
@@ -971,7 +971,7 @@ static int m25p_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
         break;
     }
 
-  fvdbg("return %d\n", ret);
+  finfo("return %d\n", ret);
   return ret;
 }
 
@@ -994,7 +994,7 @@ FAR struct mtd_dev_s *m25p_initialize(FAR struct spi_dev_s *dev)
   FAR struct m25p_dev_s *priv;
   int ret;
 
-  fvdbg("dev: %p\n", dev);
+  finfo("dev: %p\n", dev);
 
   /* Allocate a state structure (we allocate the structure instead of using
    * a fixed, static allocation so that we can handle multiple FLASH devices.
@@ -1045,6 +1045,6 @@ FAR struct mtd_dev_s *m25p_initialize(FAR struct spi_dev_s *dev)
 
   /* Return the implementation-specific state structure as the MTD device */
 
-  fvdbg("Return %p\n", priv);
+  finfo("Return %p\n", priv);
   return (FAR struct mtd_dev_s *)priv;
 }
diff --git a/drivers/mtd/mtd_nand.c b/drivers/mtd/mtd_nand.c
index 7797cd22ba..206cf97e54 100644
--- a/drivers/mtd/mtd_nand.c
+++ b/drivers/mtd/mtd_nand.c
@@ -207,7 +207,7 @@ static int nand_checkblock(FAR struct nand_dev_s *nand, off_t block)
   nandscheme_readbadblockmarker(scheme, spare, &marker);
   if (marker != 0xff)
     {
-      fvdbg("Page 0 block %d marker=%02x\n", block, marker);
+      finfo("Page 0 block %d marker=%02x\n", block, marker);
       return BADBLOCK;
     }
 
@@ -223,7 +223,7 @@ static int nand_checkblock(FAR struct nand_dev_s *nand, off_t block)
   nandscheme_readbadblockmarker(scheme, spare, &marker);
   if (marker != 0xff)
     {
-      fvdbg("Page 1 block %d marker=%02x\n", block, marker);
+      finfo("Page 1 block %d marker=%02x\n", block, marker);
       return BADBLOCK;
     }
 
@@ -275,7 +275,7 @@ static int nand_devscan(FAR struct nand_dev_s *nand)
 
   /* Initialize block statuses */
 
-  fvdbg("Retrieving bad block information. nblocks=%d\n", nblocks);
+  finfo("Retrieving bad block information. nblocks=%d\n", nblocks);
 
   /* Retrieve block status from their first page spare area */
 
@@ -293,13 +293,13 @@ static int nand_devscan(FAR struct nand_dev_s *nand)
 #if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
           if (ngood > 0)
             {
-              fvdbg("Good blocks: %u - %u\n", good, good + ngood);
+              finfo("Good blocks: %u - %u\n", good, good + ngood);
               ngood = 0;
             }
 #endif
           if (ret == BADBLOCK)
             {
-              fvdbg("Block %u is bad\n", (unsigned int)block);
+              finfo("Block %u is bad\n", (unsigned int)block);
             }
           else
             {
@@ -323,7 +323,7 @@ static int nand_devscan(FAR struct nand_dev_s *nand)
 #if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
   if (ngood > 0)
     {
-      fvdbg("Good blocks: %u - %u\n", good, good + ngood);
+      finfo("Good blocks: %u - %u\n", good, good + ngood);
     }
 #endif
 
@@ -360,7 +360,7 @@ static uint32_t nand_chipid(struct nand_raw_s *raw)
   id[3] = READ_DATA8(raw);
   id[4] = READ_DATA8(raw);
 
-  fvdbg("Chip ID: %02x %02x %02x %02x %02x\n",
+  finfo("Chip ID: %02x %02x %02x %02x %02x\n",
         id[0], id[1], id[2], id[3], id[4]);
 
   return  (uint32_t)id[0]        |
@@ -394,7 +394,7 @@ static int nand_eraseblock(FAR struct nand_dev_s *nand, off_t block,
   FAR struct nand_raw_s *raw;
   int ret;
 
-  /* fvdbg("Block %d\n", block); */
+  /* finfo("Block %d\n", block); */
   DEBUGASSERT(nand && nand->raw);
 
 #ifdef CONFIG_MTD_NAND_BLOCKCHECK
@@ -404,7 +404,7 @@ static int nand_eraseblock(FAR struct nand_dev_s *nand, off_t block,
 
       if (nand_checkblock(nand, block) != GOODBLOCK)
         {
-          fvdbg("Block is BAD\n");
+          finfo("Block is BAD\n");
           return -EAGAIN;
         }
     }
@@ -460,7 +460,7 @@ static int nand_eraseblock(FAR struct nand_dev_s *nand, off_t block,
 static int nand_readpage(FAR struct nand_dev_s *nand, off_t block,
                          unsigned int page, FAR uint8_t *data)
 {
-  fvdbg("block=%d page=%d data=%p\n", (int)block, page, data);
+  finfo("block=%d page=%d data=%p\n", (int)block, page, data);
 
 #ifdef CONFIG_MTD_NAND_BLOCKCHECK
   /* Check that the block is not BAD if data is requested */
@@ -562,7 +562,7 @@ static int nand_erase(struct mtd_dev_s *dev, off_t startblock,
   size_t blocksleft = nblocks;
   int ret;
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* Lock access to the NAND until we complete the erase */
 
@@ -609,7 +609,7 @@ static ssize_t nand_bread(struct mtd_dev_s *dev, off_t startpage,
   off_t block;
   int ret;
 
-  fvdbg("startpage: %ld npages: %d\n", (long)startpage, (int)npages);
+  finfo("startpage: %ld npages: %d\n", (long)startpage, (int)npages);
   DEBUGASSERT(nand && nand->raw);
 
   /* Retrieve the model */
@@ -705,7 +705,7 @@ static ssize_t nand_bwrite(struct mtd_dev_s *dev, off_t startpage,
   off_t block;
   int ret;
 
-  fvdbg("startpage: %08lx npages: %d\n", (long)startpage, (int)npages);
+  finfo("startpage: %08lx npages: %d\n", (long)startpage, (int)npages);
   DEBUGASSERT(nand && nand->raw);
 
   /* Retrieve the model */
@@ -864,7 +864,7 @@ FAR struct mtd_dev_s *nand_initialize(FAR struct nand_raw_s *raw)
   struct onfi_pgparam_s onfi;
   int ret;
 
-  fvdbg("cmdaddr=%p addraddr=%p dataaddr=%p\n",
+  finfo("cmdaddr=%p addraddr=%p dataaddr=%p\n",
         (FAR void *)raw->cmdaddr, (FAR void *)raw->addraddr,
         (FAR void *)raw->dataaddr);
 
@@ -885,7 +885,7 @@ FAR struct mtd_dev_s *nand_initialize(FAR struct nand_raw_s *raw)
     {
       uint32_t chipid;
 
-      fvdbg("Failed to get ONFI page parameters: %d\n", ret);
+      finfo("Failed to get ONFI page parameters: %d\n", ret);
 
       /* If the ONFI model is not supported, determine the NAND
        * model from a lookup of known FLASH parts.
@@ -904,7 +904,7 @@ FAR struct mtd_dev_s *nand_initialize(FAR struct nand_raw_s *raw)
       FAR struct nand_model_s *model = &raw->model;
       uint64_t size;
 
-      fvdbg("Found ONFI compliant NAND FLASH\n");
+      finfo("Found ONFI compliant NAND FLASH\n");
 
       /* Construct the NAND model structure */
 
diff --git a/drivers/mtd/mtd_nandecc.c b/drivers/mtd/mtd_nandecc.c
index 55286b7460..7820feb481 100644
--- a/drivers/mtd/mtd_nandecc.c
+++ b/drivers/mtd/mtd_nandecc.c
@@ -97,7 +97,7 @@ int nandecc_readpage(FAR struct nand_dev_s *nand, off_t block,
   unsigned int sparesize;
   int ret;
 
-  fvdbg("block=%d page=%d data=%p spare=%d\n", (int)block, page, data, spare);
+  finfo("block=%d page=%d data=%p spare=%d\n", (int)block, page, data, spare);
 
   /* Get convenience pointers */
 
@@ -189,7 +189,7 @@ int nandecc_writepage(FAR struct nand_dev_s *nand, off_t block,
   unsigned int sparesize;
   int ret;
 
-  fvdbg("block=%d page=%d data=%p spare=%d\n", (int)block, page, data, spare);
+  finfo("block=%d page=%d data=%p spare=%d\n", (int)block, page, data, spare);
 
   /* Get convenience pointers */
 
diff --git a/drivers/mtd/mtd_nandmodel.c b/drivers/mtd/mtd_nandmodel.c
index f2dd2c259f..cd3c324c9c 100644
--- a/drivers/mtd/mtd_nandmodel.c
+++ b/drivers/mtd/mtd_nandmodel.c
@@ -92,13 +92,13 @@ int nandmodel_find(FAR const struct nand_model_s *modeltab, size_t size,
   id2 = (uint8_t)(chipid >> 8);
   id4 = (uint8_t)(chipid >> 24);
 
-  fvdbg("NAND ID is 0x%08x\n", (int)chipid);
+  finfo("NAND ID is 0x%08x\n", (int)chipid);
 
   for (i = 0; i < size; i++)
     {
       if (modeltab[i].devid == id2)
         {
-          fvdbg("NAND Model found: ID2=0x%02x ID4=0x%02x\n", id2, id4);
+          finfo("NAND Model found: ID2=0x%02x ID4=0x%02x\n", id2, id4);
           found = true;
 
           if (model)
@@ -155,11 +155,11 @@ int nandmodel_find(FAR const struct nand_model_s *modeltab, size_t size,
                     }
                 }
 
-              fvdbg("  devid:     0x%02x\n",  model->devid);
-              fvdbg("  devsize:   %d (MB)\n", model->devsize);
-              fvdbg("  blocksize: %d (KB)\n", model->blocksize);
-              fvdbg("  pagesize:  %d (B)\n",  model->pagesize);
-              fvdbg("  options:   0x%02x\n",  model->options);
+              finfo("  devid:     0x%02x\n",  model->devid);
+              finfo("  devsize:   %d (MB)\n", model->devsize);
+              finfo("  blocksize: %d (KB)\n", model->blocksize);
+              finfo("  pagesize:  %d (B)\n",  model->pagesize);
+              finfo("  options:   0x%02x\n",  model->options);
             }
           break;
         }
@@ -205,7 +205,7 @@ int nandmodel_translate(FAR const struct nand_model_s *model, off_t address,
 
   if ((address + size) > nandmodel_getdevbytesize(model))
     {
-      fvdbg("nandmodel_translate: out-of-bounds access.\n");
+      finfo("nandmodel_translate: out-of-bounds access.\n");
       return -ESPIPE;
     }
 
diff --git a/drivers/mtd/mtd_onfi.c b/drivers/mtd/mtd_onfi.c
index aa4c6a09c0..3f1b9f43a6 100644
--- a/drivers/mtd/mtd_onfi.c
+++ b/drivers/mtd/mtd_onfi.c
@@ -273,7 +273,7 @@ int onfi_read(uintptr_t cmdaddr, uintptr_t addraddr, uintptr_t dataaddr,
   uint8_t parmtab[ONFI_PARAM_TABLE_SIZE];
   int i;
 
-  fvdbg("cmdaddr=%08x addraddr=%08x dataaddr=%08x\n",
+  finfo("cmdaddr=%08x addraddr=%08x dataaddr=%08x\n",
         (int)cmdaddr, (int)addraddr, (int)dataaddr);
 
   if (!onfi_compatible(cmdaddr, addraddr, dataaddr))
@@ -356,16 +356,16 @@ int onfi_read(uintptr_t cmdaddr, uintptr_t addraddr, uintptr_t dataaddr,
 
   onfi->model = *(FAR uint8_t *)(parmtab + 49);
 
-  fvdbg("Returning:\n");
-  fvdbg("  manufacturer:  0x%02x\n", onfi->manufacturer);
-  fvdbg("  buswidth:      %d\n",     onfi->buswidth);
-  fvdbg("  luns:          %d\n",     onfi->luns);
-  fvdbg("  eccsize:       %d\n",     onfi->eccsize);
-  fvdbg("  model:         0x%02s\n", onfi->model);
-  fvdbg("  sparesize:     %d\n",     onfi->sparesize);
-  fvdbg("  pagesperblock: %d\n",     onfi->pagesperblock);
-  fvdbg("  blocksperlun:  %d\n",     onfi->blocksperlun);
-  fvdbg("  pagesize:      %d\n",     onfi->pagesize);
+  finfo("Returning:\n");
+  finfo("  manufacturer:  0x%02x\n", onfi->manufacturer);
+  finfo("  buswidth:      %d\n",     onfi->buswidth);
+  finfo("  luns:          %d\n",     onfi->luns);
+  finfo("  eccsize:       %d\n",     onfi->eccsize);
+  finfo("  model:         0x%02s\n", onfi->model);
+  finfo("  sparesize:     %d\n",     onfi->sparesize);
+  finfo("  pagesperblock: %d\n",     onfi->pagesperblock);
+  finfo("  blocksperlun:  %d\n",     onfi->blocksperlun);
+  finfo("  pagesize:      %d\n",     onfi->pagesize);
   return OK;
 }
 
@@ -455,7 +455,7 @@ bool onfi_ebidetect(uintptr_t cmdaddr, uintptr_t addraddr,
   uint8_t ids[4];
   uint8_t i;
 
-  fvdbg("cmdaddr=%08x addraddr=%08x dataaddr=%08x\n",
+  finfo("cmdaddr=%08x addraddr=%08x dataaddr=%08x\n",
         (int)cmdaddr, (int)addraddr, (int)dataaddr);
 
   /* Send Reset command */
diff --git a/drivers/mtd/mtd_partition.c b/drivers/mtd/mtd_partition.c
index f6a148c753..60e29870fe 100644
--- a/drivers/mtd/mtd_partition.c
+++ b/drivers/mtd/mtd_partition.c
@@ -479,7 +479,7 @@ static int part_procfs_open(FAR struct file *filep, FAR const char *relpath,
 {
   FAR struct part_procfs_file_s *attr;
 
-  fvdbg("Open '%s'\n", relpath);
+  finfo("Open '%s'\n", relpath);
 
   /* PROCFS is read-only.  Any attempt to open with any kind of write
    * access is not permitted.
@@ -550,7 +550,7 @@ static ssize_t part_procfs_read(FAR struct file *filep, FAR char *buffer,
   uint8_t x;
 #endif
 
-  fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen);
+  finfo("buffer=%p buflen=%d\n", buffer, (int)buflen);
 
   /* Recover our private data from the struct file instance */
 
@@ -702,7 +702,7 @@ static int part_procfs_dup(FAR const struct file *oldp, FAR struct file *newp)
   FAR struct part_procfs_file_s *oldattr;
   FAR struct part_procfs_file_s *newattr;
 
-  fvdbg("Dup %p->%p\n", oldp, newp);
+  finfo("Dup %p->%p\n", oldp, newp);
 
   /* Recover our private data from the old struct file instance */
 
diff --git a/drivers/mtd/mtd_procfs.c b/drivers/mtd/mtd_procfs.c
index bc3071c7e0..e604a19b97 100644
--- a/drivers/mtd/mtd_procfs.c
+++ b/drivers/mtd/mtd_procfs.c
@@ -139,7 +139,7 @@ static int mtd_open(FAR struct file *filep, FAR const char *relpath,
 {
   FAR struct mtd_file_s *attr;
 
-  fvdbg("Open '%s'\n", relpath);
+  finfo("Open '%s'\n", relpath);
 
   /* PROCFS is read-only.  Any attempt to open with any kind of write
    * access is not permitted.
@@ -201,7 +201,7 @@ static ssize_t mtd_read(FAR struct file *filep, FAR char *buffer,
   ssize_t total = 0;
   ssize_t ret;
 
-  fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen);
+  finfo("buffer=%p buflen=%d\n", buffer, (int)buflen);
 
   /* Recover our private data from the struct file instance */
 
@@ -266,7 +266,7 @@ static int mtd_dup(FAR const struct file *oldp, FAR struct file *newp)
   FAR struct mtd_file_s *oldattr;
   FAR struct mtd_file_s *newattr;
 
-  fvdbg("Dup %p->%p\n", oldp, newp);
+  finfo("Dup %p->%p\n", oldp, newp);
 
   /* Recover our private data from the old struct file instance */
 
diff --git a/drivers/mtd/mtd_rwbuffer.c b/drivers/mtd/mtd_rwbuffer.c
index 0e05a7c92b..28d05c619d 100644
--- a/drivers/mtd/mtd_rwbuffer.c
+++ b/drivers/mtd/mtd_rwbuffer.c
@@ -174,7 +174,7 @@ static int mtd_erase(FAR struct mtd_dev_s *dev, off_t block, size_t nblocks)
   size_t nsectors;
   int ret;
 
-  fvdbg("block: %08lx nsectors: %lu\n",
+  finfo("block: %08lx nsectors: %lu\n",
         (unsigned long)block, (unsigned int)nsectors);
 
   /* Convert to logical sectors and sector numbers */
@@ -253,7 +253,7 @@ static int mtd_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
   FAR struct mtd_rwbuffer_s *priv = (FAR struct mtd_rwbuffer_s *)dev;
   int ret = -EINVAL; /* Assume good command with bad parameters */
 
-  fvdbg("cmd: %d \n", cmd);
+  finfo("cmd: %d \n", cmd);
 
   switch (cmd)
     {
@@ -276,7 +276,7 @@ static int mtd_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
               geo->neraseblocks = priv->rwb.nblocks / priv->spb;
               ret               = OK;
 
-              fvdbg("blocksize: %d erasesize: %d neraseblocks: %d\n",
+              finfo("blocksize: %d erasesize: %d neraseblocks: %d\n",
                     geo->blocksize, geo->erasesize, geo->neraseblocks);
             }
         }
@@ -309,7 +309,7 @@ static int mtd_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
         break;
     }
 
-  fvdbg("return %d\n", ret);
+  finfo("return %d\n", ret);
   return ret;
 }
 
@@ -337,7 +337,7 @@ FAR struct mtd_dev_s *mtd_rwb_initialize(FAR struct mtd_dev_s *mtd)
   struct mtd_geometry_s geo;
   int ret;
 
-  fvdbg("mtd: %p\n", mtd);
+  finfo("mtd: %p\n", mtd);
   DEBUGASSERT(mtd && mtd->ioctl);
 
   /* Get the device geometry */
@@ -418,7 +418,7 @@ FAR struct mtd_dev_s *mtd_rwb_initialize(FAR struct mtd_dev_s *mtd)
 
   /* Return the implementation-specific state structure as the MTD device */
 
-  fvdbg("Return %p\n", priv);
+  finfo("Return %p\n", priv);
   return &priv->mtd;
 }
 
diff --git a/drivers/mtd/n25qxxx.c b/drivers/mtd/n25qxxx.c
index d79f2877b9..f0db0481a6 100644
--- a/drivers/mtd/n25qxxx.c
+++ b/drivers/mtd/n25qxxx.c
@@ -391,7 +391,7 @@ static int n25qxxx_command(FAR struct qspi_dev_s *qspi, uint8_t cmd)
 {
   struct qspi_cmdinfo_s cmdinfo;
 
-  fvdbg("CMD: %02x\n", cmd);
+  finfo("CMD: %02x\n", cmd);
 
   cmdinfo.flags   = 0;
   cmdinfo.addrlen = 0;
@@ -412,7 +412,7 @@ static int n25qxxx_command_address(FAR struct qspi_dev_s *qspi, uint8_t cmd,
 {
   struct qspi_cmdinfo_s cmdinfo;
 
-  fvdbg("CMD: %02x Address: %04lx addrlen=%d\n", cmd, (unsigned long)addr, addrlen);
+  finfo("CMD: %02x Address: %04lx addrlen=%d\n", cmd, (unsigned long)addr, addrlen);
 
   cmdinfo.flags   = QSPICMD_ADDRESS;
   cmdinfo.addrlen = addrlen;
@@ -433,7 +433,7 @@ static int n25qxxx_command_read(FAR struct qspi_dev_s *qspi, uint8_t cmd,
 {
   struct qspi_cmdinfo_s cmdinfo;
 
-  fvdbg("CMD: %02x buflen: %lu\n", cmd, (unsigned long)buflen);
+  finfo("CMD: %02x buflen: %lu\n", cmd, (unsigned long)buflen);
 
   cmdinfo.flags   = QSPICMD_READDATA;
   cmdinfo.addrlen = 0;
@@ -454,7 +454,7 @@ static int n25qxxx_command_write(FAR struct qspi_dev_s *qspi, uint8_t cmd,
 {
   struct qspi_cmdinfo_s cmdinfo;
 
-  fvdbg("CMD: %02x buflen: %lu\n", cmd, (unsigned long)buflen);
+  finfo("CMD: %02x buflen: %lu\n", cmd, (unsigned long)buflen);
 
   cmdinfo.flags   = QSPICMD_WRITEDATA;
   cmdinfo.addrlen = 0;
@@ -567,7 +567,7 @@ static inline int n25qxxx_readid(struct n25qxxx_dev_s *priv)
 
   n25qxxx_unlock(priv->qspi);
 
-  fvdbg("Manufacturer: %02x Device Type %02x, Capacity: %02x\n",
+  finfo("Manufacturer: %02x Device Type %02x, Capacity: %02x\n",
         priv->cmdbuf[0], priv->cmdbuf[1], priv->cmdbuf[2]);
 
   /* Check for a recognized memory device type */
@@ -795,7 +795,7 @@ static int n25qxxx_erase_sector(struct n25qxxx_dev_s *priv, off_t sector)
   off_t address;
   uint8_t status;
 
-  fvdbg("sector: %08lx\n", (unsigned long)sector);
+  finfo("sector: %08lx\n", (unsigned long)sector);
 
   /* Check that the flash is ready and unprotected */
 
@@ -872,7 +872,7 @@ static int n25qxxx_read_byte(FAR struct n25qxxx_dev_s *priv, FAR uint8_t *buffer
 {
   struct qspi_meminfo_s meminfo;
 
-  fvdbg("address: %08lx nbytes: %d\n", (long)address, (int)buflen);
+  finfo("address: %08lx nbytes: %d\n", (long)address, (int)buflen);
 
   meminfo.flags   = QSPIMEM_READ | QSPIMEM_QUADIO;
   meminfo.addrlen = 3;
@@ -898,7 +898,7 @@ static int n25qxxx_write_page(struct n25qxxx_dev_s *priv, FAR const uint8_t *buf
   int ret;
   int i;
 
-  fvdbg("address: %08lx buflen: %u\n", (unsigned long)address, (unsigned)buflen);
+  finfo("address: %08lx buflen: %u\n", (unsigned long)address, (unsigned)buflen);
 
   npages   = (buflen >> priv->pageshift);
   pagesize = (1 << priv->pageshift);
@@ -1008,7 +1008,7 @@ static FAR uint8_t *n25qxxx_read_cache(struct n25qxxx_dev_s *priv, off_t sector)
 
   shift    = priv->sectorshift - N25QXXX_SECTOR512_SHIFT;
   esectno  = sector >> shift;
-  fvdbg("sector: %ld esectno: %d shift=%d\n", sector, esectno, shift);
+  finfo("sector: %ld esectno: %d shift=%d\n", sector, esectno, shift);
 
   /* Check if the requested erase block is already in the cache */
 
@@ -1076,7 +1076,7 @@ static void n25qxxx_erase_cache(struct n25qxxx_dev_s *priv, off_t sector)
   if (!IS_ERASED(priv))
     {
       off_t esectno  = sector >> (priv->sectorshift - N25QXXX_SECTOR512_SHIFT);
-      fvdbg("sector: %ld esectno: %d\n", sector, esectno);
+      finfo("sector: %ld esectno: %d\n", sector, esectno);
 
       DEBUGVERIFY(n25qxxx_erase_sector(priv, esectno));
       SET_ERASED(priv);
@@ -1120,7 +1120,7 @@ static int n25qxxx_write_cache(FAR struct n25qxxx_dev_s *priv,
       if (!IS_ERASED(priv))
         {
           off_t esectno  = sector >> (priv->sectorshift - N25QXXX_SECTOR512_SHIFT);
-          fvdbg("sector: %ld esectno: %d\n", sector, esectno);
+          finfo("sector: %ld esectno: %d\n", sector, esectno);
 
           ret = n25qxxx_erase_sector(priv, esectno);
           if (ret < 0)
@@ -1161,7 +1161,7 @@ static int n25qxxx_erase(FAR struct mtd_dev_s *dev, off_t startblock, size_t nbl
   int ret;
 #endif
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* Lock access to the SPI bus until we complete the erase */
 
@@ -1206,7 +1206,7 @@ static ssize_t n25qxxx_bread(FAR struct mtd_dev_s *dev, off_t startblock,
 #endif
   ssize_t nbytes;
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* On this device, we can handle the block read just like the byte-oriented read */
 
@@ -1239,7 +1239,7 @@ static ssize_t n25qxxx_bwrite(FAR struct mtd_dev_s *dev, off_t startblock,
   FAR struct n25qxxx_dev_s *priv = (FAR struct n25qxxx_dev_s *)dev;
   int ret = (int)nblocks;
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* Lock the QuadSPI bus and write all of the pages to FLASH */
 
@@ -1276,7 +1276,7 @@ static ssize_t n25qxxx_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbyt
   FAR struct n25qxxx_dev_s *priv = (FAR struct n25qxxx_dev_s *)dev;
   int ret;
 
-  fvdbg("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes);
+  finfo("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes);
 
   /* Lock the QuadSPI bus and select this FLASH part */
 
@@ -1290,7 +1290,7 @@ static ssize_t n25qxxx_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbyt
       return (ssize_t)ret;
     }
 
-  fvdbg("return nbytes: %d\n", (int)nbytes);
+  finfo("return nbytes: %d\n", (int)nbytes);
   return (ssize_t)nbytes;
 }
 
@@ -1303,7 +1303,7 @@ static int n25qxxx_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
   FAR struct n25qxxx_dev_s *priv = (FAR struct n25qxxx_dev_s *)dev;
   int ret = -EINVAL; /* Assume good command with bad parameters */
 
-  fvdbg("cmd: %d \n", cmd);
+  finfo("cmd: %d \n", cmd);
 
   switch (cmd)
     {
@@ -1334,7 +1334,7 @@ static int n25qxxx_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
 #endif
               ret               = OK;
 
-              fvdbg("blocksize: %d erasesize: %d neraseblocks: %d\n",
+              finfo("blocksize: %d erasesize: %d neraseblocks: %d\n",
                     geo->blocksize, geo->erasesize, geo->neraseblocks);
             }
         }
@@ -1375,7 +1375,7 @@ static int n25qxxx_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
         break;
     }
 
-  fvdbg("return %d\n", ret);
+  finfo("return %d\n", ret);
   return ret;
 }
 
@@ -1401,7 +1401,7 @@ FAR struct mtd_dev_s *n25qxxx_initialize(FAR struct qspi_dev_s *qspi, bool unpro
   FAR struct n25qxxx_dev_s *priv;
   int ret;
 
-  fvdbg("qspi: %p\n", qspi);
+  finfo("qspi: %p\n", qspi);
   DEBUGASSERT(qspi != NULL);
 
   /* Allocate a state structure (we allocate the structure instead of using
@@ -1496,7 +1496,7 @@ FAR struct mtd_dev_s *n25qxxx_initialize(FAR struct qspi_dev_s *qspi, bool unpro
 
   /* Return the implementation-specific state structure as the MTD device */
 
-  fvdbg("Return %p\n", priv);
+  finfo("Return %p\n", priv);
   return (FAR struct mtd_dev_s *)priv;
 
 errout_with_readbuf:
diff --git a/drivers/mtd/ramtron.c b/drivers/mtd/ramtron.c
index 89e0ade859..84f8828276 100644
--- a/drivers/mtd/ramtron.c
+++ b/drivers/mtd/ramtron.c
@@ -368,7 +368,7 @@ static inline int ramtron_readid(struct ramtron_dev_s *priv)
   uint16_t part;
   int i;
 
-  fvdbg("priv: %p\n", priv);
+  finfo("priv: %p\n", priv);
 
   /* Lock the SPI bus, configure the bus, and select this FLASH part. */
 
@@ -418,7 +418,7 @@ static inline int ramtron_readid(struct ramtron_dev_s *priv)
       UNUSED(manufacturer); /* Eliminate warnings when debug is off */
       UNUSED(memory);       /* Eliminate warnings when debug is off */
 
-      fvdbg("RAMTRON %s of size %d bytes (mf:%02x mem:%02x cap:%02x part:%02x)\n",
+      finfo("RAMTRON %s of size %d bytes (mf:%02x mem:%02x cap:%02x part:%02x)\n",
             priv->part->name, priv->part->size, manufacturer, memory, capacity, part);
 
       priv->sectorshift = RAMTRON_EMULATE_SECTOR_SHIFT;
@@ -429,7 +429,7 @@ static inline int ramtron_readid(struct ramtron_dev_s *priv)
       return OK;
     }
 
-  fvdbg("RAMTRON device not found\n");
+  finfo("RAMTRON device not found\n");
   return -ENODEV;
 }
 
@@ -471,7 +471,7 @@ static int ramtron_waitwritecomplete(struct ramtron_dev_s *priv)
 
   if (retries > 0)
     {
-      fvdbg("Complete\n");
+      finfo("Complete\n");
       retries = OK;
     }
   else
@@ -500,7 +500,7 @@ static void ramtron_writeenable(struct ramtron_dev_s *priv)
   /* Deselect the FLASH */
 
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
-  fvdbg("Enabled\n");
+  finfo("Enabled\n");
 }
 
 /************************************************************************************
@@ -529,7 +529,7 @@ static inline int ramtron_pagewrite(struct ramtron_dev_s *priv, FAR const uint8_
 {
   off_t offset = page << priv->pageshift;
 
-  fvdbg("page: %08lx offset: %08lx\n", (long)page, (long)offset);
+  finfo("page: %08lx offset: %08lx\n", (long)page, (long)offset);
 
 #ifndef RAMTRON_WRITEWAIT
   /* Wait for any preceding write to complete.  We could simplify things by
@@ -564,7 +564,7 @@ static inline int ramtron_pagewrite(struct ramtron_dev_s *priv, FAR const uint8_
   /* Deselect the FLASH: Chip Select high */
 
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
-  fvdbg("Written\n");
+  finfo("Written\n");
 
 #ifdef RAMTRON_WRITEWAIT
   /* Wait for write completion now so we can report any errors to the caller. Thus
@@ -583,8 +583,8 @@ static inline int ramtron_pagewrite(struct ramtron_dev_s *priv, FAR const uint8_
 
 static int ramtron_erase(FAR struct mtd_dev_s *dev, off_t startblock, size_t nblocks)
 {
-  fvdbg("startblock: %08lx nblocks: %d\n", (unsigned long)startblock, (int)nblocks);
-  fvdbg("On RAMTRON devices erasing makes no sense, returning as OK\n");
+  finfo("startblock: %08lx nblocks: %d\n", (unsigned long)startblock, (int)nblocks);
+  finfo("On RAMTRON devices erasing makes no sense, returning as OK\n");
   return (int)nblocks;
 }
 
@@ -598,7 +598,7 @@ static ssize_t ramtron_bread(FAR struct mtd_dev_s *dev, off_t startblock,
   FAR struct ramtron_dev_s *priv = (FAR struct ramtron_dev_s *)dev;
   ssize_t nbytes;
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* On this device, we can handle the block read just like the byte-oriented read */
 
@@ -622,7 +622,7 @@ static ssize_t ramtron_bwrite(FAR struct mtd_dev_s *dev, off_t startblock,
   FAR struct ramtron_dev_s *priv = (FAR struct ramtron_dev_s *)dev;
   size_t blocksleft = nblocks;
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* Lock the SPI bus and write each page to FLASH */
 
@@ -653,7 +653,7 @@ static ssize_t ramtron_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbyt
   uint8_t status;
 #endif
 
-  fvdbg("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes);
+  finfo("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes);
 
 #ifndef RAMTRON_WRITEWAIT
   /* Wait for any preceding write to complete.  We could simplify things by
@@ -704,7 +704,7 @@ static ssize_t ramtron_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbyt
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
   ramtron_unlock(priv->dev);
 
-  fvdbg("return nbytes: %d\n", (int)nbytes);
+  finfo("return nbytes: %d\n", (int)nbytes);
   return nbytes;
 }
 
@@ -717,7 +717,7 @@ static int ramtron_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
   FAR struct ramtron_dev_s *priv = (FAR struct ramtron_dev_s *)dev;
   int ret = -EINVAL; /* Assume good command with bad parameters */
 
-  fvdbg("cmd: %d \n", cmd);
+  finfo("cmd: %d \n", cmd);
 
   switch (cmd)
     {
@@ -740,14 +740,14 @@ static int ramtron_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
               geo->neraseblocks = priv->nsectors;
               ret               = OK;
 
-              fvdbg("blocksize: %d erasesize: %d neraseblocks: %d\n",
+              finfo("blocksize: %d erasesize: %d neraseblocks: %d\n",
                     geo->blocksize, geo->erasesize, geo->neraseblocks);
             }
         }
         break;
 
       case MTDIOC_BULKERASE:
-        fvdbg("BULDERASE: Makes no sense in ramtron. Let's confirm operation as OK\n");
+        finfo("BULDERASE: Makes no sense in ramtron. Let's confirm operation as OK\n");
         ret = OK;
         break;
 
@@ -757,7 +757,7 @@ static int ramtron_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
           if (arg > 0 && arg <= RAMTRON_INIT_CLK_MAX)
             {
               priv->speed = arg;
-              fvdbg("set bus speed to %lu\n", priv->speed);
+              finfo("set bus speed to %lu\n", priv->speed);
               ret = OK;
             }
         }
@@ -770,7 +770,7 @@ static int ramtron_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
         break;
     }
 
-  fvdbg("return %d\n", ret);
+  finfo("return %d\n", ret);
   return ret;
 }
 
@@ -792,7 +792,7 @@ FAR struct mtd_dev_s *ramtron_initialize(FAR struct spi_dev_s *dev)
 {
   FAR struct ramtron_dev_s *priv;
 
-  fvdbg("dev: %p\n", dev);
+  finfo("dev: %p\n", dev);
 
   /* Allocate a state structure (we allocate the structure instead of using
    * a fixed, static allocation so that we can handle multiple FLASH devices.
@@ -838,6 +838,6 @@ FAR struct mtd_dev_s *ramtron_initialize(FAR struct spi_dev_s *dev)
 
   /* Return the implementation-specific state structure as the MTD device */
 
-  fvdbg("Return %p\n", priv);
+  finfo("Return %p\n", priv);
   return (FAR struct mtd_dev_s *)priv;
 }
diff --git a/drivers/mtd/s25fl1.c b/drivers/mtd/s25fl1.c
index 5a89c0d9e8..ae9a47cbe4 100644
--- a/drivers/mtd/s25fl1.c
+++ b/drivers/mtd/s25fl1.c
@@ -443,7 +443,7 @@ static int s25fl1_command(FAR struct qspi_dev_s *qspi, uint8_t cmd)
 {
   struct qspi_cmdinfo_s cmdinfo;
 
-  fvdbg("CMD: %02x\n", cmd);
+  finfo("CMD: %02x\n", cmd);
 
   cmdinfo.flags   = 0;
   cmdinfo.addrlen = 0;
@@ -464,7 +464,7 @@ static int s25fl1_command_address(FAR struct qspi_dev_s *qspi, uint8_t cmd,
 {
   struct qspi_cmdinfo_s cmdinfo;
 
-  fvdbg("CMD: %02x Address: %04lx addrlen=%d\n", cmd, (unsigned long)addr, addrlen);
+  finfo("CMD: %02x Address: %04lx addrlen=%d\n", cmd, (unsigned long)addr, addrlen);
 
   cmdinfo.flags   = QSPICMD_ADDRESS;
   cmdinfo.addrlen = addrlen;
@@ -485,7 +485,7 @@ static int s25fl1_command_read(FAR struct qspi_dev_s *qspi, uint8_t cmd,
 {
   struct qspi_cmdinfo_s cmdinfo;
 
-  fvdbg("CMD: %02x buflen: %lu\n", cmd, (unsigned long)buflen);
+  finfo("CMD: %02x buflen: %lu\n", cmd, (unsigned long)buflen);
 
   cmdinfo.flags   = QSPICMD_READDATA;
   cmdinfo.addrlen = 0;
@@ -506,7 +506,7 @@ static int s25fl1_command_write(FAR struct qspi_dev_s *qspi, uint8_t cmd,
 {
   struct qspi_cmdinfo_s cmdinfo;
 
-  fvdbg("CMD: %02x buflen: %lu\n", cmd, (unsigned long)buflen);
+  finfo("CMD: %02x buflen: %lu\n", cmd, (unsigned long)buflen);
 
   cmdinfo.flags   = QSPICMD_WRITEDATA;
   cmdinfo.addrlen = 0;
@@ -613,7 +613,7 @@ static inline int s25fl1_readid(struct s25fl1_dev_s *priv)
 
   s25fl1_unlock(priv->qspi);
 
-  fvdbg("Manufacturer: %02x Device Type %02x, Capacity: %02x",
+  finfo("Manufacturer: %02x Device Type %02x, Capacity: %02x",
         priv->cmdbuf[0], priv->cmdbuf[1], priv->cmdbuf[2]);
 
   /* Check for a recognized memory device type */
@@ -830,7 +830,7 @@ static int s25fl1_erase_sector(struct s25fl1_dev_s *priv, off_t sector)
   off_t address;
   uint8_t status;
 
-  fvdbg("sector: %08lx\n", (unsigned long)sector);
+  finfo("sector: %08lx\n", (unsigned long)sector);
 
   /* Check that the flash is ready and unprotected */
 
@@ -906,7 +906,7 @@ static int s25fl1_read_byte(FAR struct s25fl1_dev_s *priv, FAR uint8_t *buffer,
 {
   struct qspi_meminfo_s meminfo;
 
-  fvdbg("address: %08lx nbytes: %d\n", (long)address, (int)buflen);
+  finfo("address: %08lx nbytes: %d\n", (long)address, (int)buflen);
 
 #ifdef CONFIG_S25FL1_SCRAMBLE
   meminfo.flags   = QSPIMEM_READ | QSPIMEM_QUADIO | QSPIMEM_SCRAMBLE;
@@ -939,7 +939,7 @@ static int s25fl1_write_page(struct s25fl1_dev_s *priv, FAR const uint8_t *buffe
   int ret;
   int i;
 
-  fvdbg("address: %08lx buflen: %u\n", (unsigned long)address, (unsigned)buflen);
+  finfo("address: %08lx buflen: %u\n", (unsigned long)address, (unsigned)buflen);
 
   npages   = (buflen >> priv->pageshift);
   pagesize = (1 << priv->pageshift);
@@ -1055,7 +1055,7 @@ static FAR uint8_t *s25fl1_read_cache(struct s25fl1_dev_s *priv, off_t sector)
 
   shift    = priv->sectorshift - S25FL1_SECTOR512_SHIFT;
   esectno  = sector >> shift;
-  fvdbg("sector: %ld esectno: %d shift=%d\n", sector, esectno, shift);
+  finfo("sector: %ld esectno: %d shift=%d\n", sector, esectno, shift);
 
   /* Check if the requested erase block is already in the cache */
 
@@ -1123,7 +1123,7 @@ static void s25fl1_erase_cache(struct s25fl1_dev_s *priv, off_t sector)
   if (!IS_ERASED(priv))
     {
       off_t esectno  = sector >> (priv->sectorshift - S25FL1_SECTOR512_SHIFT);
-      fvdbg("sector: %ld esectno: %d\n", sector, esectno);
+      finfo("sector: %ld esectno: %d\n", sector, esectno);
 
       DEBUGVERIFY(s25fl1_erase_sector(priv, esectno));
       SET_ERASED(priv);
@@ -1167,7 +1167,7 @@ static int s25fl1_write_cache(FAR struct s25fl1_dev_s *priv,
       if (!IS_ERASED(priv))
         {
           off_t esectno  = sector >> (priv->sectorshift - S25FL1_SECTOR512_SHIFT);
-          fvdbg("sector: %ld esectno: %d\n", sector, esectno);
+          finfo("sector: %ld esectno: %d\n", sector, esectno);
 
           ret = s25fl1_erase_sector(priv, esectno);
           if (ret < 0)
@@ -1208,7 +1208,7 @@ static int s25fl1_erase(FAR struct mtd_dev_s *dev, off_t startblock, size_t nblo
   int ret;
 #endif
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* Lock access to the SPI bus until we complete the erase */
 
@@ -1252,7 +1252,7 @@ static ssize_t s25fl1_bread(FAR struct mtd_dev_s *dev, off_t startblock,
 #endif
   ssize_t nbytes;
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* On this device, we can handle the block read just like the byte-oriented read */
 
@@ -1285,7 +1285,7 @@ static ssize_t s25fl1_bwrite(FAR struct mtd_dev_s *dev, off_t startblock,
   FAR struct s25fl1_dev_s *priv = (FAR struct s25fl1_dev_s *)dev;
   int ret = (int)nblocks;
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* Lock the QuadSPI bus and write all of the pages to FLASH */
 
@@ -1322,7 +1322,7 @@ static ssize_t s25fl1_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbyte
   FAR struct s25fl1_dev_s *priv = (FAR struct s25fl1_dev_s *)dev;
   int ret;
 
-  fvdbg("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes);
+  finfo("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes);
 
   /* Lock the QuadSPI bus and select this FLASH part */
 
@@ -1336,7 +1336,7 @@ static ssize_t s25fl1_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbyte
       return (ssize_t)ret;
     }
 
-  fvdbg("return nbytes: %d\n", (int)nbytes);
+  finfo("return nbytes: %d\n", (int)nbytes);
   return (ssize_t)nbytes;
 }
 
@@ -1349,7 +1349,7 @@ static int s25fl1_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
   FAR struct s25fl1_dev_s *priv = (FAR struct s25fl1_dev_s *)dev;
   int ret = -EINVAL; /* Assume good command with bad parameters */
 
-  fvdbg("cmd: %d \n", cmd);
+  finfo("cmd: %d \n", cmd);
 
   switch (cmd)
     {
@@ -1380,7 +1380,7 @@ static int s25fl1_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
 #endif
               ret               = OK;
 
-              fvdbg("blocksize: %d erasesize: %d neraseblocks: %d\n",
+              finfo("blocksize: %d erasesize: %d neraseblocks: %d\n",
                     geo->blocksize, geo->erasesize, geo->neraseblocks);
             }
         }
@@ -1421,7 +1421,7 @@ static int s25fl1_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
         break;
     }
 
-  fvdbg("return %d\n", ret);
+  finfo("return %d\n", ret);
   return ret;
 }
 
@@ -1447,7 +1447,7 @@ FAR struct mtd_dev_s *s25fl1_initialize(FAR struct qspi_dev_s *qspi, bool unprot
   FAR struct s25fl1_dev_s *priv;
   int ret;
 
-  fvdbg("qspi: %p\n", qspi);
+  finfo("qspi: %p\n", qspi);
   DEBUGASSERT(qspi != NULL);
 
   /* Allocate a state structure (we allocate the structure instead of using
@@ -1547,7 +1547,7 @@ FAR struct mtd_dev_s *s25fl1_initialize(FAR struct qspi_dev_s *qspi, bool unprot
 
   /* Return the implementation-specific state structure as the MTD device */
 
-  fvdbg("Return %p\n", priv);
+  finfo("Return %p\n", priv);
   return (FAR struct mtd_dev_s *)priv;
 
 errout_with_readbuf:
diff --git a/drivers/mtd/sector512.c b/drivers/mtd/sector512.c
index 3705efb769..11f317c256 100644
--- a/drivers/mtd/sector512.c
+++ b/drivers/mtd/sector512.c
@@ -155,7 +155,7 @@ static FAR uint8_t *s512_cacheread(struct s512_dev_s *priv, off_t sector512)
   /* Get the erase block containing this sector */
 
   eblockno = sector512 / priv->stdperblock;
-  fvdbg("sector512: %lu eblockno: %lu\n",
+  finfo("sector512: %lu eblockno: %lu\n",
         (unsigned long)sector512, (unsigned long)eblockno);
 
   /* Check if the requested erase block is already in the cache */
@@ -251,7 +251,7 @@ static int s512_erase(FAR struct mtd_dev_s *dev, off_t sector512, size_t nsector
   size_t eblockno;
   int ret;
 
-  fvdbg("sector512: %08lx nsectors: %lu\n",
+  finfo("sector512: %08lx nsectors: %lu\n",
         (unsigned long)sector512, (unsigned int)nsectors);
 
   while (sectorsleft-- > 0)
@@ -276,7 +276,7 @@ static int s512_erase(FAR struct mtd_dev_s *dev, off_t sector512, size_t nsector
       if (!IS_ERASED(priv))
         {
           eblockno  = sector512 / priv->stdperblock;
-          fvdbg("sector512: %lu eblockno: %lu\n",
+          finfo("sector512: %lu eblockno: %lu\n",
                 (unsigned long)sector512, (unsigned long)eblockno);
 
           ret = priv->dev->erase(priv->dev, eblockno, 1);
@@ -320,7 +320,7 @@ static ssize_t s512_bread(FAR struct mtd_dev_s *dev, off_t sector512,
   ssize_t remaining;
   ssize_t result = nsectors;
 
-  fvdbg("sector512: %08lx nsectors: %d\n", (long)sector512, (int)nsectors);
+  finfo("sector512: %08lx nsectors: %d\n", (long)sector512, (int)nsectors);
 
   /* Read each 512 byte sector from the block via the erase block cache */
 
@@ -369,7 +369,7 @@ static ssize_t s512_bwrite(FAR struct mtd_dev_s *dev, off_t sector512, size_t ns
   ssize_t result;
   off_t eblockno;
 
-  fvdbg("sector512: %08lx nsectors: %d\n", (long)sector512, (int)nsectors);
+  finfo("sector512: %08lx nsectors: %d\n", (long)sector512, (int)nsectors);
 
   FAR uint8_t *dest;
 
@@ -399,7 +399,7 @@ static ssize_t s512_bwrite(FAR struct mtd_dev_s *dev, off_t sector512, size_t ns
       if (!IS_ERASED(priv))
         {
           eblockno  = sector512 / priv->stdperblock;
-          fvdbg("sector512: %lu eblockno: %lu\n",
+          finfo("sector512: %lu eblockno: %lu\n",
                 (unsigned long)sector512, (unsigned long)eblockno);
 
           result = priv->dev->erase(priv->dev, eblockno, 1);
@@ -445,7 +445,7 @@ static ssize_t s512_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes,
   off_t sectoffset;
   off_t sector;
 
-  fvdbg("offset: %08lx nbytes: %lu\n",
+  finfo("offset: %08lx nbytes: %lu\n",
         (unsigned long)offset, (unsigned long)nbytes);
 
   /* Convert the offset into 512 byte sector address and a byte offset */
@@ -488,7 +488,7 @@ static ssize_t s512_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes,
       buffer += xfrsize;
     }
 
-  fvdbg("return nbytes: %d\n", (int)nbytes);
+  finfo("return nbytes: %d\n", (int)nbytes);
   return nbytes;
 }
 
@@ -501,7 +501,7 @@ static int s512_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
   FAR struct s512_dev_s *priv = (FAR struct s512_dev_s *)dev;
   int ret = -EINVAL; /* Assume good command with bad parameters */
 
-  fvdbg("cmd: %d \n", cmd);
+  finfo("cmd: %d \n", cmd);
 
   switch (cmd)
     {
@@ -524,7 +524,7 @@ static int s512_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
               geo->neraseblocks = priv->neblocks * priv->stdperblock;
               ret               = OK;
 
-              fvdbg("blocksize: %d erasesize: %d neraseblocks: %d\n",
+              finfo("blocksize: %d erasesize: %d neraseblocks: %d\n",
                     geo->blocksize, geo->erasesize, geo->neraseblocks);
             }
         }
@@ -550,7 +550,7 @@ static int s512_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
         break;
     }
 
-  fvdbg("return %d\n", ret);
+  finfo("return %d\n", ret);
   return ret;
 }
 
@@ -578,7 +578,7 @@ FAR struct mtd_dev_s *s512_initialize(FAR struct mtd_dev_s *mtd)
   FAR struct mtd_geometry_s geo;
   int ret;
 
-  fvdbg("mtd: %p\n", mtd);
+  finfo("mtd: %p\n", mtd);
 
   /* Get the device geometry */
 
@@ -643,6 +643,6 @@ FAR struct mtd_dev_s *s512_initialize(FAR struct mtd_dev_s *mtd)
 
   /* Return the implementation-specific state structure as the MTD device */
 
-  fvdbg("Return %p\n", priv);
+  finfo("Return %p\n", priv);
   return &priv->mtd;
 }
diff --git a/drivers/mtd/smart.c b/drivers/mtd/smart.c
index 50804cc3ab..7e54bf71fa 100644
--- a/drivers/mtd/smart.c
+++ b/drivers/mtd/smart.c
@@ -441,7 +441,7 @@ static const struct file_operations g_fops =
 
 static int smart_open(FAR struct inode *inode)
 {
-  fvdbg("Entry\n");
+  finfo("Entry\n");
   return OK;
 }
 
@@ -454,7 +454,7 @@ static int smart_open(FAR struct inode *inode)
 
 static int smart_close(FAR struct inode *inode)
 {
-  fvdbg("Entry\n");
+  finfo("Entry\n");
   return OK;
 }
 
@@ -767,7 +767,7 @@ static ssize_t smart_reload(struct smart_struct_s *dev, FAR uint8_t *buffer,
 
   /* Read the full erase block into the buffer */
 
-  fvdbg("Read %d blocks starting at block %d\n", mtdBlocks, mtdStartBlock);
+  finfo("Read %d blocks starting at block %d\n", mtdBlocks, mtdStartBlock);
   nread = MTD_BREAD(dev->mtd, mtdStartBlock, mtdBlocks, buffer);
   if (nread != mtdBlocks)
     {
@@ -790,7 +790,7 @@ static ssize_t smart_read(FAR struct inode *inode, unsigned char *buffer,
 {
   FAR struct smart_struct_s *dev;
 
-  fvdbg("SMART: sector: %d nsectors: %d\n", start_sector, nsectors);
+  finfo("SMART: sector: %d nsectors: %d\n", start_sector, nsectors);
 
   DEBUGASSERT(inode && inode->i_private);
 #ifdef CONFIG_SMARTFS_MULTI_ROOT_DIRS
@@ -826,7 +826,7 @@ static ssize_t smart_write(FAR struct inode *inode,
   int    ret;
   off_t  mtdstartblock, mtdblockcount;
 
-  fvdbg("sector: %d nsectors: %d\n", start_sector, nsectors);
+  finfo("sector: %d nsectors: %d\n", start_sector, nsectors);
 
   DEBUGASSERT(inode && inode->i_private);
 #ifdef CONFIG_SMARTFS_MULTI_ROOT_DIRS
@@ -851,7 +851,7 @@ static ssize_t smart_write(FAR struct inode *inode,
   mtdblockcount = nsectors * dev->mtdBlksPerSector;
   mtdBlksPerErase = dev->mtdBlksPerSector * dev->sectorsPerBlk;
 
-  fvdbg("mtdsector: %d mtdnsectors: %d\n", mtdstartblock, mtdblockcount);
+  finfo("mtdsector: %d mtdnsectors: %d\n", mtdstartblock, mtdblockcount);
 
   /* Start at first block to be written */
 
@@ -933,7 +933,7 @@ static int smart_geometry(FAR struct inode *inode, struct geometry *geometry)
   FAR struct smart_struct_s *dev;
   uint32_t  erasesize;
 
-  fvdbg("Entry\n");
+  finfo("Entry\n");
 
   DEBUGASSERT(inode);
   if (geometry)
@@ -956,9 +956,9 @@ static int smart_geometry(FAR struct inode *inode, struct geometry *geometry)
                                     dev->sectorsize;
       geometry->geo_sectorsize    = dev->sectorsize;
 
-      fvdbg("available: true mediachanged: false writeenabled: %s\n",
+      finfo("available: true mediachanged: false writeenabled: %s\n",
             geometry->geo_writeenabled ? "true" : "false");
-      fvdbg("nsectors: %d sectorsize: %d\n",
+      finfo("nsectors: %d sectorsize: %d\n",
             geometry->geo_nsectors, geometry->geo_sectorsize);
 
       return OK;
@@ -1767,7 +1767,7 @@ static int smart_set_wear_level(FAR struct smart_struct_s *dev, uint16_t block,
           smart_find_wear_minmax(dev);
 
           if (oldlevel != dev->minwearlevel)
-              fvdbg("##### New min wear level = %d\n", dev->minwearlevel);
+              finfo("##### New min wear level = %d\n", dev->minwearlevel);
         }
     }
 
@@ -1807,7 +1807,7 @@ static int smart_scan(FAR struct smart_struct_s *dev)
   FAR struct smart_multiroot_device_s *rootdirdev;
 #endif
 
-  fvdbg("Entry\n");
+  finfo("Entry\n");
 
   /* Find the sector size on the volume by reading headers from
    * sectors of decreasing size.  On a formatted volume, the sector
@@ -1909,7 +1909,7 @@ static int smart_scan(FAR struct smart_struct_s *dev)
 
   for (sector = 0; sector < totalsectors; sector++)
     {
-      fvdbg("Scan sector %d\n", sector);
+      finfo("Scan sector %d\n", sector);
 
       /* Calculate the read address for this sector */
 
@@ -2373,7 +2373,7 @@ static inline int smart_getformat(FAR struct smart_struct_s *dev,
 {
   int ret;
 
-  fvdbg("Entry\n");
+  finfo("Entry\n");
   DEBUGASSERT(fmt);
 
   /* Test if we know the format status or not.  If we don't know the
@@ -2630,7 +2630,7 @@ static int smart_relocate_static_data(FAR struct smart_struct_s *dev, uint16_t b
       nextsector = dev->freecount[x];
       newsector = dev->releasecount[x];
 #endif
-      fvdbg("Moving block %d, wear %d, free %d, released %d to block %d, wear %d\n",
+      finfo("Moving block %d, wear %d, free %d, released %d to block %d, wear %d\n",
               x, smart_get_wear_level(dev, x),
               nextsector, newsector,
               block, smart_get_wear_level(dev, block));
@@ -2842,7 +2842,7 @@ static inline int smart_llformat(FAR struct smart_struct_s *dev, unsigned long a
   uint8_t     sectsize, prerelease;
   uint16_t    sectorsize;
 
-  fvdbg("Entry\n");
+  finfo("Entry\n");
 
   /* Get the sector size from the provided arg */
 
@@ -3747,11 +3747,11 @@ static int smart_garbagecollect(FAR struct smart_struct_s *dev)
 #endif
 
 #ifdef CONFIG_MTD_SMART_PACK_COUNTS
-          fvdbg("Collecting block %d, free=%d released=%d, totalfree=%d, totalrelease=%d\n",
+          finfo("Collecting block %d, free=%d released=%d, totalfree=%d, totalrelease=%d\n",
               collectblock, smart_get_count(dev, dev->freecount, collectblock),
               smart_get_count(dev, dev->releasecount, collectblock), dev->freesectors, dev->releasesectors);
 #else
-          fvdbg("Collecting block %d, free=%d released=%d\n",
+          finfo("Collecting block %d, free=%d released=%d\n",
               collectblock, dev->freecount[collectblock],
               dev->releasecount[collectblock]);
 #endif
@@ -4088,7 +4088,7 @@ static int smart_write_alloc_sector(FAR struct smart_struct_s *dev,
   /* Write the header to the physical sector location */
 
 #ifndef CONFIG_MTD_SMART_ENABLE_CRC
-  fvdbg("Write MTD block %d\n", physical * dev->mtdBlksPerSector);
+  finfo("Write MTD block %d\n", physical * dev->mtdBlksPerSector);
   ret = MTD_BWRITE(dev->mtd, physical * dev->mtdBlksPerSector, 1,
       (FAR uint8_t *) dev->rwbuffer);
   if (ret != 1)
@@ -4191,7 +4191,7 @@ static int smart_writesector(FAR struct smart_struct_s *dev,
   FAR struct  smart_allocsector_s *allocsector;
 #endif
 
-  fvdbg("Entry\n");
+  finfo("Entry\n");
   req = (FAR struct smart_read_write_s *) arg;
   DEBUGASSERT(req->offset <= dev->sectorsize);
   DEBUGASSERT(req->offset+req->count <= dev->sectorsize);
@@ -4216,7 +4216,7 @@ static int smart_writesector(FAR struct smart_struct_s *dev,
       /* Subtract dev->minwearlevel from all wear levels */
 
       offset = dev->minwearlevel;
-      fvdbg("Reducing wear level bits by %d\n", offset);
+      finfo("Reducing wear level bits by %d\n", offset);
       for (x = 0; x < dev->geo.neraseblocks; x++)
         {
           smart_set_wear_level(dev, x, smart_get_wear_level(dev, x) - offset);
@@ -4462,7 +4462,7 @@ static int smart_writesector(FAR struct smart_struct_s *dev,
       ret = smart_bytewrite(dev, offset, 1, &byte);
       if (ret != 1)
         {
-          fvdbg("Error committing physical sector %d\n", physsector);
+          finfo("Error committing physical sector %d\n", physsector);
           ret = -EIO;
           goto errout;
         }
@@ -4592,7 +4592,7 @@ static int smart_readsector(FAR struct smart_struct_s *dev,
   struct smart_sect_header_s header;
 #endif
 
-  fvdbg("Entry\n");
+  finfo("Entry\n");
   req = (FAR struct smart_read_write_s *) arg;
   DEBUGASSERT(req->offset < dev->sectorsize);
   DEBUGASSERT(req->offset+req->count+ sizeof(struct smart_sect_header_s) <=
@@ -4677,7 +4677,7 @@ static int smart_readsector(FAR struct smart_struct_s *dev,
           sizeof(struct smart_sect_header_s), (FAR uint8_t *) &header);
   if (ret != sizeof(struct smart_sect_header_s))
     {
-      fvdbg("Error reading sector %d header\n", physsector);
+      finfo("Error reading sector %d header\n", physsector);
       ret = -EIO;
       goto errout;
     }
@@ -4891,7 +4891,7 @@ static inline int smart_allocsector(FAR struct smart_struct_s *dev,
   /* Find a free physical sector */
 
   physicalsector = smart_findfreephyssector(dev, FALSE);
-  fvdbg("Alloc: log=%d, phys=%d, erase block=%d, free=%d, released=%d\n",
+  finfo("Alloc: log=%d, phys=%d, erase block=%d, free=%d, released=%d\n",
           logsector, physicalsector, physicalsector /
           dev->sectorsPerBlk, dev->freesectors, dev->releasecount);
 
@@ -5083,7 +5083,7 @@ static int smart_ioctl(FAR struct inode *inode, int cmd, unsigned long arg)
   FAR struct mtd_smart_debug_data_s *debug_data;
 #endif
 
-  fvdbg("Entry\n");
+  finfo("Entry\n");
   DEBUGASSERT(inode && inode->i_private);
 
 #ifdef CONFIG_SMARTFS_MULTI_ROOT_DIRS
diff --git a/drivers/mtd/sst25.c b/drivers/mtd/sst25.c
index 61a79a63b5..24105a01b7 100644
--- a/drivers/mtd/sst25.c
+++ b/drivers/mtd/sst25.c
@@ -309,7 +309,7 @@ static inline int sst25_readid(struct sst25_dev_s *priv)
   uint16_t memory;
   uint16_t capacity;
 
-  fvdbg("priv: %p\n", priv);
+  finfo("priv: %p\n", priv);
 
   /* Lock the SPI bus, configure the bus, and select this FLASH part. */
 
@@ -328,7 +328,7 @@ static inline int sst25_readid(struct sst25_dev_s *priv)
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
   sst25_unlock(priv->dev);
 
-  fvdbg("manufacturer: %02x memory: %02x capacity: %02x\n",
+  finfo("manufacturer: %02x memory: %02x capacity: %02x\n",
         manufacturer, memory, capacity);
 
   /* Check for a valid manufacturer and memory type */
@@ -486,7 +486,7 @@ static void sst25_sectorerase(struct sst25_dev_s *priv, off_t sector)
 {
   off_t address = sector << priv->sectorshift;
 
-  fvdbg("sector: %08lx\n", (long)sector);
+  finfo("sector: %08lx\n", (long)sector);
 
   /* Wait for any preceding write or erase operation to complete. */
 
@@ -523,7 +523,7 @@ static void sst25_sectorerase(struct sst25_dev_s *priv, off_t sector)
 
 static inline int sst25_chiperase(struct sst25_dev_s *priv)
 {
-  fvdbg("priv: %p\n", priv);
+  finfo("priv: %p\n", priv);
 
   /* Wait for any preceding write or erase operation to complete. */
 
@@ -537,7 +537,7 @@ static inline int sst25_chiperase(struct sst25_dev_s *priv)
 
   sst25_cmd(priv, SST25_CE);
 
-  fvdbg("Return: OK\n");
+  finfo("Return: OK\n");
   return OK;
 }
 
@@ -550,7 +550,7 @@ static void sst25_byteread(FAR struct sst25_dev_s *priv, FAR uint8_t *buffer,
 {
   uint8_t status;
 
-  fvdbg("address: %08lx nbytes: %d\n", (long)address, (int)nbytes);
+  finfo("address: %08lx nbytes: %d\n", (long)address, (int)nbytes);
 
   /* Wait for any preceding write or erase operation to complete. */
 
@@ -601,7 +601,7 @@ static void sst25_bytewrite(struct sst25_dev_s *priv, FAR const uint8_t *buffer,
 {
   uint8_t status;
 
-  fvdbg("address: %08lx nwords: %d\n", (long)address, (int)nbytes);
+  finfo("address: %08lx nwords: %d\n", (long)address, (int)nbytes);
   DEBUGASSERT(priv && buffer);
 
   /* Write each byte individually */
@@ -663,7 +663,7 @@ static void sst25_wordwrite(struct sst25_dev_s *priv, FAR const uint8_t *buffer,
   size_t nwords = (nbytes + 1) >> 1;
   uint8_t status;
 
-  fvdbg("address: %08lx nwords: %d\n", (long)address, (int)nwords);
+  finfo("address: %08lx nwords: %d\n", (long)address, (int)nwords);
   DEBUGASSERT(priv && buffer);
 
   /* Loop until all of the bytes have been written */
@@ -834,7 +834,7 @@ static FAR uint8_t *sst25_cacheread(struct sst25_dev_s *priv, off_t sector)
 
   shift    = priv->sectorshift - SST25_SECTOR_SHIFT;
   esectno  = sector >> shift;
-  fvdbg("sector: %ld esectno: %d shift=%d\n", sector, esectno, shift);
+  finfo("sector: %ld esectno: %d shift=%d\n", sector, esectno, shift);
 
   /* Check if the requested erase block is already in the cache */
 
@@ -890,7 +890,7 @@ static void sst25_cacheerase(struct sst25_dev_s *priv, off_t sector)
   if (!IS_ERASED(priv))
     {
       off_t esectno  = sector >> (priv->sectorshift - SST25_SECTOR_SHIFT);
-      fvdbg("sector: %ld esectno: %d\n", sector, esectno);
+      finfo("sector: %ld esectno: %d\n", sector, esectno);
 
       sst25_sectorerase(priv, esectno);
       SET_ERASED(priv);
@@ -932,7 +932,7 @@ static void sst25_cachewrite(FAR struct sst25_dev_s *priv, FAR const uint8_t *bu
       if (!IS_ERASED(priv))
         {
           off_t esectno  = sector >> (priv->sectorshift - SST25_SECTOR_SHIFT);
-          fvdbg("sector: %ld esectno: %d\n", sector, esectno);
+          finfo("sector: %ld esectno: %d\n", sector, esectno);
 
           sst25_sectorerase(priv, esectno);
           SET_ERASED(priv);
@@ -967,7 +967,7 @@ static int sst25_erase(FAR struct mtd_dev_s *dev, off_t startblock, size_t nbloc
   FAR struct sst25_dev_s *priv = (FAR struct sst25_dev_s *)dev;
   size_t blocksleft = nblocks;
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* Lock access to the SPI bus until we complete the erase */
 
@@ -1006,7 +1006,7 @@ static ssize_t sst25_bread(FAR struct mtd_dev_s *dev, off_t startblock, size_t n
 #ifdef CONFIG_SST25_SECTOR512
   ssize_t nbytes;
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* On this device, we can handle the block read just like the byte-oriented read */
 
@@ -1021,7 +1021,7 @@ static ssize_t sst25_bread(FAR struct mtd_dev_s *dev, off_t startblock, size_t n
   FAR struct sst25_dev_s *priv = (FAR struct sst25_dev_s *)dev;
   ssize_t nbytes;
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* On this device, we can handle the block read just like the byte-oriented read */
 
@@ -1047,7 +1047,7 @@ static ssize_t sst25_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, size_t
 #else
   FAR struct sst25_dev_s *priv = (FAR struct sst25_dev_s *)dev;
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* Lock the SPI bus and write all of the pages to FLASH */
 
@@ -1077,7 +1077,7 @@ static ssize_t sst25_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes
 {
   FAR struct sst25_dev_s *priv = (FAR struct sst25_dev_s *)dev;
 
-  fvdbg("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes);
+  finfo("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes);
 
   /* Lock the SPI bus and select this FLASH part */
 
@@ -1085,7 +1085,7 @@ static ssize_t sst25_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes
   sst25_byteread(priv, buffer, offset, nbytes);
   sst25_unlock(priv->dev);
 
-  fvdbg("return nbytes: %d\n", (int)nbytes);
+  finfo("return nbytes: %d\n", (int)nbytes);
   return nbytes;
 }
 
@@ -1098,7 +1098,7 @@ static int sst25_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
   FAR struct sst25_dev_s *priv = (FAR struct sst25_dev_s *)dev;
   int ret = -EINVAL; /* Assume good command with bad parameters */
 
-  fvdbg("cmd: %d \n", cmd);
+  finfo("cmd: %d \n", cmd);
 
   switch (cmd)
     {
@@ -1127,7 +1127,7 @@ static int sst25_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
 #endif
               ret               = OK;
 
-              fvdbg("blocksize: %d erasesize: %d neraseblocks: %d\n",
+              finfo("blocksize: %d erasesize: %d neraseblocks: %d\n",
                     geo->blocksize, geo->erasesize, geo->neraseblocks);
             }
         }
@@ -1149,7 +1149,7 @@ static int sst25_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
         break;
     }
 
-  fvdbg("return %d\n", ret);
+  finfo("return %d\n", ret);
   return ret;
 }
 
@@ -1172,7 +1172,7 @@ FAR struct mtd_dev_s *sst25_initialize(FAR struct spi_dev_s *dev)
   FAR struct sst25_dev_s *priv;
   int ret;
 
-  fvdbg("dev: %p\n", dev);
+  finfo("dev: %p\n", dev);
 
   /* Allocate a state structure (we allocate the structure instead of using
    * a fixed, static allocation so that we can handle multiple FLASH devices.
@@ -1242,6 +1242,6 @@ FAR struct mtd_dev_s *sst25_initialize(FAR struct spi_dev_s *dev)
 
   /* Return the implementation-specific state structure as the MTD device */
 
-  fvdbg("Return %p\n", priv);
+  finfo("Return %p\n", priv);
   return (FAR struct mtd_dev_s *)priv;
 }
diff --git a/drivers/mtd/sst25xx.c b/drivers/mtd/sst25xx.c
index ebbcfd33f2..ee6f6a55fa 100644
--- a/drivers/mtd/sst25xx.c
+++ b/drivers/mtd/sst25xx.c
@@ -259,7 +259,7 @@ static inline int sst25xx_readid(struct sst25xx_dev_s *priv)
   uint16_t memory;
   uint16_t capacity;
 
-  fvdbg("priv: %p\n", priv);
+  finfo("priv: %p\n", priv);
 
   /* Lock the SPI bus, configure the bus, and select this FLASH part. */
 
@@ -279,7 +279,7 @@ static inline int sst25xx_readid(struct sst25xx_dev_s *priv)
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
   sst25xx_unlock(priv->dev);
 
-  fvdbg("manufacturer: %02x memory: %02x capacity: %02x\n",
+  finfo("manufacturer: %02x memory: %02x capacity: %02x\n",
         manufacturer, memory, capacity);
 
   /* Check for a valid manufacturer and memory type */
@@ -356,7 +356,7 @@ static void sst25xx_waitwritecomplete(struct sst25xx_dev_s *priv)
 
   priv->lastwaswrite = false;
 
-  fvdbg("Complete\n");
+  finfo("Complete\n");
 }
 
 /************************************************************************************
@@ -376,7 +376,7 @@ static void sst25xx_writeenable(struct sst25xx_dev_s *priv)
   /* Deselect the FLASH */
 
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
-  fvdbg("Enabled\n");
+  finfo("Enabled\n");
 }
 
 /************************************************************************************
@@ -416,7 +416,7 @@ static void sst25xx_sectorerase(struct sst25xx_dev_s *priv, off_t sector, uint8_
 
   offset = sector << priv->sectorshift;
 
-  fvdbg("sector: %08lx\n", (long)sector);
+  finfo("sector: %08lx\n", (long)sector);
 
   /* Wait for any preceding write to complete.  We could simplify things by
    * perform this wait at the end of each write operation (rather than at
@@ -453,7 +453,7 @@ static void sst25xx_sectorerase(struct sst25xx_dev_s *priv, off_t sector, uint8_
   /* Deselect the FLASH */
 
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
-  fvdbg("Erased\n");
+  finfo("Erased\n");
 }
 
 /************************************************************************************
@@ -462,7 +462,7 @@ static void sst25xx_sectorerase(struct sst25xx_dev_s *priv, off_t sector, uint8_
 
 static inline int sst25xx_bulkerase(struct sst25xx_dev_s *priv)
 {
-  fvdbg("priv: %p\n", priv);
+  finfo("priv: %p\n", priv);
 
   /* Wait for any preceding write to complete.  We could simplify things by
    * perform this wait at the end of each write operation (rather than at
@@ -489,7 +489,7 @@ static inline int sst25xx_bulkerase(struct sst25xx_dev_s *priv)
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
   sst25xx_waitwritecomplete(priv);
 
-  fvdbg("Return: OK\n");
+  finfo("Return: OK\n");
   return OK;
 }
 
@@ -502,7 +502,7 @@ static inline void sst25xx_pagewrite(struct sst25xx_dev_s *priv, FAR const uint8
 {
   off_t offset = page << priv->pageshift;
 
-  fvdbg("page: %08lx offset: %08lx\n", (long)page, (long)offset);
+  finfo("page: %08lx offset: %08lx\n", (long)page, (long)offset);
 
   /* Wait for any preceding write to complete.  We could simplify things by
    * perform this wait at the end of each write operation (rather than at
@@ -538,7 +538,7 @@ static inline void sst25xx_pagewrite(struct sst25xx_dev_s *priv, FAR const uint8
   /* Deselect the FLASH: Chip Select high */
 
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
-  fvdbg("Written\n");
+  finfo("Written\n");
 }
 
 /************************************************************************************
@@ -549,7 +549,7 @@ static inline void sst25xx_pagewrite(struct sst25xx_dev_s *priv, FAR const uint8
 static inline void sst25xx_bytewrite(struct sst25xx_dev_s *priv, FAR const uint8_t *buffer,
                                      off_t offset, uint16_t count)
 {
-  fvdbg("offset: %08lx  count:%d\n", (long)offset, count);
+  finfo("offset: %08lx  count:%d\n", (long)offset, count);
 
   /* Wait for any preceding write to complete.  We could simplify things by
    * perform this wait at the end of each write operation (rather than at
@@ -585,7 +585,7 @@ static inline void sst25xx_bytewrite(struct sst25xx_dev_s *priv, FAR const uint8
   /* Deselect the FLASH: Chip Select high */
 
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
-  fvdbg("Written\n");
+  finfo("Written\n");
 }
 #endif
 
@@ -598,7 +598,7 @@ static int sst25xx_erase(FAR struct mtd_dev_s *dev, off_t startblock, size_t nbl
   FAR struct sst25xx_dev_s *priv = (FAR struct sst25xx_dev_s *)dev;
   size_t blocksleft = nblocks;
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* Lock access to the SPI bus until we complete the erase */
 
@@ -675,7 +675,7 @@ static ssize_t sst25xx_bread(FAR struct mtd_dev_s *dev, off_t startblock, size_t
   FAR struct sst25xx_dev_s *priv = (FAR struct sst25xx_dev_s *)dev;
   ssize_t nbytes;
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* On this device, we can handle the block read just like the byte-oriented read */
 
@@ -699,7 +699,7 @@ static ssize_t sst25xx_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, size_
   size_t blocksleft = nblocks;
   size_t pagesize = 1 << priv->pageshift;
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* Lock the SPI bus and write each page to FLASH */
 
@@ -724,7 +724,7 @@ static ssize_t sst25xx_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbyt
 {
   FAR struct sst25xx_dev_s *priv = (FAR struct sst25xx_dev_s *)dev;
 
-  fvdbg("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes);
+  finfo("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes);
 
   /* Wait for any preceding write to complete.  We could simplify things by
    * perform this wait at the end of each write operation (rather than at
@@ -760,7 +760,7 @@ static ssize_t sst25xx_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbyt
 
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
   sst25xx_unlock(priv->dev);
-  fvdbg("return nbytes: %d\n", (int)nbytes);
+  finfo("return nbytes: %d\n", (int)nbytes);
   return nbytes;
 }
 
@@ -780,7 +780,7 @@ static ssize_t sst25xx_write(FAR struct mtd_dev_s *dev, off_t offset, size_t nby
   int    pagesize;
   int    bytestowrite;
 
-  fvdbg("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes);
+  finfo("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes);
 
   /* We must test if the offset + count crosses one or more pages
    * and perform individual writes.  The devices can only write in
@@ -847,7 +847,7 @@ static int sst25xx_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
   FAR struct sst25xx_dev_s *priv = (FAR struct sst25xx_dev_s *)dev;
   int ret = -EINVAL; /* Assume good command with bad parameters */
 
-  fvdbg("cmd: %d \n", cmd);
+  finfo("cmd: %d \n", cmd);
 
   switch (cmd)
     {
@@ -871,7 +871,7 @@ static int sst25xx_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
 
               ret = OK;
 
-              fvdbg("blocksize: %d erasesize: %d neraseblocks: %d\n",
+              finfo("blocksize: %d erasesize: %d neraseblocks: %d\n",
                     geo->blocksize, geo->erasesize, geo->neraseblocks);
             }
         }
@@ -893,7 +893,7 @@ static int sst25xx_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
         break;
     }
 
-  fvdbg("return %d\n", ret);
+  finfo("return %d\n", ret);
   return ret;
 }
 
@@ -916,7 +916,7 @@ FAR struct mtd_dev_s *sst25xx_initialize(FAR struct spi_dev_s *dev)
   FAR struct sst25xx_dev_s *priv;
   int ret;
 
-  fvdbg("dev: %p\n", dev);
+  finfo("dev: %p\n", dev);
 
   /* Allocate a state structure (we allocate the structure instead of using
    * a fixed, static allocation so that we can handle multiple FLASH devices.
@@ -974,6 +974,6 @@ FAR struct mtd_dev_s *sst25xx_initialize(FAR struct spi_dev_s *dev)
 
   /* Return the implementation-specific state structure as the MTD device */
 
-  fvdbg("Return %p\n", priv);
+  finfo("Return %p\n", priv);
   return (FAR struct mtd_dev_s *)priv;
 }
diff --git a/drivers/mtd/sst26.c b/drivers/mtd/sst26.c
index 94226064cc..16d867c0ab 100644
--- a/drivers/mtd/sst26.c
+++ b/drivers/mtd/sst26.c
@@ -210,13 +210,13 @@
 #ifdef CONFIG_SST26_DEBUG
 # define sstdbg(format, ...)    dbg(format, ##__VA_ARGS__)
 # define sstlldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
-# define sstvdbg(format, ...)   vdbg(format, ##__VA_ARGS__)
-# define sstllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__)
+# define sstinfo(format, ...)   info(format, ##__VA_ARGS__)
+# define sstllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 # define sstdbg(x...)
 # define sstlldbg(x...)
-# define sstvdbg(x...)
-# define sstllvdbg(x...)
+# define sstinfo(x...)
+# define sstllinfo(x...)
 #endif
 
 /************************************************************************************
@@ -321,7 +321,7 @@ static inline int sst26_readid(struct sst26_dev_s *priv)
   uint16_t memory;
   uint16_t capacity;
 
-  sstvdbg("priv: %p\n", priv);
+  sstinfo("priv: %p\n", priv);
 
   /* Lock the SPI bus, configure the bus, and select this FLASH part. */
 
@@ -416,7 +416,7 @@ static void sst26_waitwritecomplete(struct sst26_dev_s *priv)
     }
   while ((status & SST26_SR_WIP) != 0);
 
-  sstvdbg("Complete\n");
+  sstinfo("Complete\n");
 }
 
 /************************************************************************************
@@ -439,7 +439,7 @@ static void sst26_globalunlock(struct sst26_dev_s *priv)
 
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
 
-  sstvdbg("Device unlocked.\n");
+  sstinfo("Device unlocked.\n");
 }
 
 /************************************************************************************
@@ -460,7 +460,7 @@ static void sst26_writeenable(struct sst26_dev_s *priv)
 
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
 
-  sstvdbg("Enabled\n");
+  sstinfo("Enabled\n");
 }
 
 /************************************************************************************
@@ -473,7 +473,7 @@ static void sst26_sectorerase(struct sst26_dev_s *priv, off_t sector, uint8_t ty
 
   offset = sector << priv->sectorshift;
 
-  sstvdbg("sector: %08lx\n", (long)sector);
+  sstinfo("sector: %08lx\n", (long)sector);
 
   /* Send write enable instruction */
 
@@ -504,7 +504,7 @@ static void sst26_sectorerase(struct sst26_dev_s *priv, off_t sector, uint8_t ty
 
   sst26_waitwritecomplete(priv);
 
-  sstvdbg("Erased\n");
+  sstinfo("Erased\n");
 }
 
 /************************************************************************************
@@ -513,7 +513,7 @@ static void sst26_sectorerase(struct sst26_dev_s *priv, off_t sector, uint8_t ty
 
 static inline int sst26_chiperase(struct sst26_dev_s *priv)
 {
-  sstvdbg("priv: %p\n", priv);
+  sstinfo("priv: %p\n", priv);
 
   /* Send write enable instruction */
 
@@ -533,7 +533,7 @@ static inline int sst26_chiperase(struct sst26_dev_s *priv)
 
   sst26_waitwritecomplete(priv);
 
-  sstvdbg("Return: OK\n");
+  sstinfo("Return: OK\n");
   return OK;
 }
 
@@ -546,7 +546,7 @@ static inline void sst26_pagewrite(struct sst26_dev_s *priv,
 {
   off_t offset = page << priv->pageshift;
 
-  sstvdbg("page: %08lx offset: %08lx\n", (long)page, (long)offset);
+  sstinfo("page: %08lx offset: %08lx\n", (long)page, (long)offset);
 
   /* Enable the write access to the FLASH */
 
@@ -576,7 +576,7 @@ static inline void sst26_pagewrite(struct sst26_dev_s *priv,
 
   sst26_waitwritecomplete(priv);
 
-  sstvdbg("Written\n");
+  sstinfo("Written\n");
 }
 
 /************************************************************************************
@@ -588,7 +588,7 @@ static inline void sst26_bytewrite(struct sst26_dev_s *priv,
                                    FAR const uint8_t *buffer, off_t offset,
                                    uint16_t count)
 {
-  sstvdbg("offset: %08lx  count:%d\n", (long)offset, count);
+  sstinfo("offset: %08lx  count:%d\n", (long)offset, count);
 
   /* Enable the write access to the FLASH */
 
@@ -619,7 +619,7 @@ static inline void sst26_bytewrite(struct sst26_dev_s *priv,
 
   sst26_waitwritecomplete(priv);
 
-  sstvdbg("Written\n");
+  sstinfo("Written\n");
 }
 #endif
 
@@ -634,7 +634,7 @@ static int sst26_erase(FAR struct mtd_dev_s *dev, off_t startblock, size_t nbloc
   FAR struct sst26_dev_s *priv = (FAR struct sst26_dev_s *)dev;
   size_t blocksleft = nblocks;
 
-  sstvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  sstinfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* Lock access to the SPI bus until we complete the erase */
 
@@ -664,7 +664,7 @@ static ssize_t sst26_bread(FAR struct mtd_dev_s *dev, off_t startblock,
   FAR struct sst26_dev_s *priv = (FAR struct sst26_dev_s *)dev;
   ssize_t nbytes;
 
-  sstvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  sstinfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* On this device, we can handle the block read just like the byte-oriented read */
 
@@ -689,7 +689,7 @@ static ssize_t sst26_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, size_t
   size_t blocksleft = nblocks;
   size_t pagesize = 1 << priv->pageshift;
 
-  sstvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  sstinfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* Lock the SPI bus and write each page to FLASH */
 
@@ -714,7 +714,7 @@ static ssize_t sst26_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes
 {
   FAR struct sst26_dev_s *priv = (FAR struct sst26_dev_s *)dev;
 
-  sstvdbg("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes);
+  sstinfo("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes);
 
   /* Lock the SPI bus and select this FLASH part */
 
@@ -743,7 +743,7 @@ static ssize_t sst26_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes
 
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
   sst26_unlock(priv->dev);
-  sstvdbg("return nbytes: %d\n", (int)nbytes);
+  sstinfo("return nbytes: %d\n", (int)nbytes);
   return nbytes;
 }
 
@@ -763,7 +763,7 @@ static ssize_t sst26_write(FAR struct mtd_dev_s *dev, off_t offset, size_t nbyte
   int    pagesize;
   int    bytestowrite;
 
-  sstvdbg("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes);
+  sstinfo("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes);
 
   /* We must test if the offset + count crosses one or more pages
    * and perform individual writes.  The devices can only write in
@@ -830,7 +830,7 @@ static int sst26_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
   FAR struct sst26_dev_s *priv = (FAR struct sst26_dev_s *)dev;
   int ret = -EINVAL; /* Assume good command with bad parameters */
 
-  sstvdbg("cmd: %d \n", cmd);
+  sstinfo("cmd: %d \n", cmd);
 
   switch (cmd)
     {
@@ -854,7 +854,7 @@ static int sst26_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
 
               ret = OK;
 
-              sstvdbg("blocksize: %d erasesize: %d neraseblocks: %d\n",
+              sstinfo("blocksize: %d erasesize: %d neraseblocks: %d\n",
                       geo->blocksize, geo->erasesize, geo->neraseblocks);
             }
         }
@@ -876,7 +876,7 @@ static int sst26_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
         break;
     }
 
-  sstvdbg("return %d\n", ret);
+  sstinfo("return %d\n", ret);
   return ret;
 }
 
@@ -899,7 +899,7 @@ FAR struct mtd_dev_s *sst26_initialize_spi(FAR struct spi_dev_s *dev)
   FAR struct sst26_dev_s *priv;
   int ret;
 
-  sstvdbg("dev: %p\n", dev);
+  sstinfo("dev: %p\n", dev);
 
   /* Allocate a state structure (we allocate the structure instead of using
    * a fixed, static allocation so that we can handle multiple FLASH devices.
@@ -956,6 +956,6 @@ FAR struct mtd_dev_s *sst26_initialize_spi(FAR struct spi_dev_s *dev)
 
   /* Return the implementation-specific state structure as the MTD device */
 
-  sstvdbg("Return %p\n", priv);
+  sstinfo("Return %p\n", priv);
   return (FAR struct mtd_dev_s *)priv;
 }
diff --git a/drivers/mtd/sst39vf.c b/drivers/mtd/sst39vf.c
index 5386427587..53a12f0a02 100644
--- a/drivers/mtd/sst39vf.c
+++ b/drivers/mtd/sst39vf.c
@@ -814,8 +814,8 @@ FAR struct mtd_dev_s *sst39vf_initialize(void)
 
   /* Now see if we can suport the part */
 
-  fvdbg("Manufacturer: %02x\n", manufacturer);
-  fvdbg("Chip ID:      %04x\n", chipid);
+  finfo("Manufacturer: %02x\n", manufacturer);
+  finfo("Chip ID:      %04x\n", chipid);
 
   if (manufacturer != SST_MANUFACTURER_ID)
     {
diff --git a/drivers/mtd/w25.c b/drivers/mtd/w25.c
index 09a7c015d2..0f3696ffd8 100644
--- a/drivers/mtd/w25.c
+++ b/drivers/mtd/w25.c
@@ -333,7 +333,7 @@ static inline int w25_readid(struct w25_dev_s *priv)
   uint16_t memory;
   uint16_t capacity;
 
-  fvdbg("priv: %p\n", priv);
+  finfo("priv: %p\n", priv);
 
   /* Lock the SPI bus, configure the bus, and select this FLASH part. */
 
@@ -352,7 +352,7 @@ static inline int w25_readid(struct w25_dev_s *priv)
   SPI_SELECT(priv->spi, SPIDEV_FLASH, false);
   w25_unlock(priv->spi);
 
-  fvdbg("manufacturer: %02x memory: %02x capacity: %02x\n",
+  finfo("manufacturer: %02x memory: %02x capacity: %02x\n",
         manufacturer, memory, capacity);
 
   /* Check for a valid manufacturer and memory type */
@@ -557,7 +557,7 @@ static void w25_sectorerase(struct w25_dev_s *priv, off_t sector)
 {
   off_t address = sector << W25_SECTOR_SHIFT;
 
-  fvdbg("sector: %08lx\n", (long)sector);
+  finfo("sector: %08lx\n", (long)sector);
 
   /* Wait for any preceding write or erase operation to complete. */
 
@@ -594,7 +594,7 @@ static void w25_sectorerase(struct w25_dev_s *priv, off_t sector)
 
 static inline int w25_chiperase(struct w25_dev_s *priv)
 {
-  fvdbg("priv: %p\n", priv);
+  finfo("priv: %p\n", priv);
 
   /* Wait for any preceding write or erase operation to complete. */
 
@@ -615,7 +615,7 @@ static inline int w25_chiperase(struct w25_dev_s *priv)
   /* Deselect the FLASH */
 
   SPI_SELECT(priv->spi, SPIDEV_FLASH, false);
-  fvdbg("Return: OK\n");
+  finfo("Return: OK\n");
   return OK;
 }
 
@@ -628,7 +628,7 @@ static void w25_byteread(FAR struct w25_dev_s *priv, FAR uint8_t *buffer,
 {
   uint8_t status;
 
-  fvdbg("address: %08lx nbytes: %d\n", (long)address, (int)nbytes);
+  finfo("address: %08lx nbytes: %d\n", (long)address, (int)nbytes);
 
   /* Wait for any preceding write or erase operation to complete. */
 
@@ -682,7 +682,7 @@ static void w25_pagewrite(struct w25_dev_s *priv, FAR const uint8_t *buffer,
 {
   uint8_t status;
 
-  fvdbg("address: %08lx nwords: %d\n", (long)address, (int)nbytes);
+  finfo("address: %08lx nwords: %d\n", (long)address, (int)nbytes);
   DEBUGASSERT(priv && buffer && (address & 0xff) == 0 &&
              (nbytes & 0xff) == 0);
 
@@ -739,7 +739,7 @@ static void w25_pagewrite(struct w25_dev_s *priv, FAR const uint8_t *buffer,
 static inline void w25_bytewrite(struct w25_dev_s *priv, FAR const uint8_t *buffer,
                                   off_t offset, uint16_t count)
 {
-  fvdbg("offset: %08lx  count:%d\n", (long)offset, count);
+  finfo("offset: %08lx  count:%d\n", (long)offset, count);
 
   /* Wait for any preceding write to complete.  We could simplify things by
    * perform this wait at the end of each write operation (rather than at
@@ -774,7 +774,7 @@ static inline void w25_bytewrite(struct w25_dev_s *priv, FAR const uint8_t *buff
   /* Deselect the FLASH: Chip Select high */
 
   SPI_SELECT(priv->spi, SPIDEV_FLASH, false);
-  fvdbg("Written\n");
+  finfo("Written\n");
 }
 #endif /* defined(CONFIG_MTD_BYTE_WRITE) && !defined(CONFIG_W25_READONLY) */
 
@@ -823,7 +823,7 @@ static FAR uint8_t *w25_cacheread(struct w25_dev_s *priv, off_t sector)
 
   shift    = W25_SECTOR_SHIFT - W25_SECTOR512_SHIFT;
   esectno  = sector >> shift;
-  fvdbg("sector: %ld esectno: %d shift=%d\n", sector, esectno, shift);
+  finfo("sector: %ld esectno: %d shift=%d\n", sector, esectno, shift);
 
   /* Check if the requested erase block is already in the cache */
 
@@ -879,7 +879,7 @@ static void w25_cacheerase(struct w25_dev_s *priv, off_t sector)
   if (!IS_ERASED(priv))
     {
       off_t esectno  = sector >> (W25_SECTOR_SHIFT - W25_SECTOR512_SHIFT);
-      fvdbg("sector: %ld esectno: %d\n", sector, esectno);
+      finfo("sector: %ld esectno: %d\n", sector, esectno);
 
       w25_sectorerase(priv, esectno);
       SET_ERASED(priv);
@@ -921,7 +921,7 @@ static void w25_cachewrite(FAR struct w25_dev_s *priv, FAR const uint8_t *buffer
       if (!IS_ERASED(priv))
         {
           off_t esectno  = sector >> (W25_SECTOR_SHIFT - W25_SECTOR512_SHIFT);
-          fvdbg("sector: %ld esectno: %d\n", sector, esectno);
+          finfo("sector: %ld esectno: %d\n", sector, esectno);
 
           w25_sectorerase(priv, esectno);
           SET_ERASED(priv);
@@ -956,7 +956,7 @@ static int w25_erase(FAR struct mtd_dev_s *dev, off_t startblock, size_t nblocks
   FAR struct w25_dev_s *priv = (FAR struct w25_dev_s *)dev;
   size_t blocksleft = nblocks;
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* Lock access to the SPI bus until we complete the erase */
 
@@ -994,7 +994,7 @@ static ssize_t w25_bread(FAR struct mtd_dev_s *dev, off_t startblock, size_t nbl
 {
   ssize_t nbytes;
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* On this device, we can handle the block read just like the byte-oriented read */
 
@@ -1027,7 +1027,7 @@ static ssize_t w25_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, size_t nb
 #else
   FAR struct w25_dev_s *priv = (FAR struct w25_dev_s *)dev;
 
-  fvdbg("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
+  finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks);
 
   /* Lock the SPI bus and write all of the pages to FLASH */
 
@@ -1054,7 +1054,7 @@ static ssize_t w25_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes,
 {
   FAR struct w25_dev_s *priv = (FAR struct w25_dev_s *)dev;
 
-  fvdbg("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes);
+  finfo("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes);
 
   /* Lock the SPI bus and select this FLASH part */
 
@@ -1062,7 +1062,7 @@ static ssize_t w25_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes,
   w25_byteread(priv, buffer, offset, nbytes);
   w25_unlock(priv->spi);
 
-  fvdbg("return nbytes: %d\n", (int)nbytes);
+  finfo("return nbytes: %d\n", (int)nbytes);
   return nbytes;
 }
 
@@ -1081,7 +1081,7 @@ static ssize_t w25_write(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes,
   int    index;
   int    bytestowrite;
 
-  fvdbg("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes);
+  finfo("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes);
 
   /* We must test if the offset + count crosses one or more pages
    * and perform individual writes.  The devices can only write in
@@ -1145,7 +1145,7 @@ static int w25_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
   FAR struct w25_dev_s *priv = (FAR struct w25_dev_s *)dev;
   int ret = -EINVAL; /* Assume good command with bad parameters */
 
-  fvdbg("cmd: %d \n", cmd);
+  finfo("cmd: %d \n", cmd);
 
   switch (cmd)
     {
@@ -1174,7 +1174,7 @@ static int w25_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
 #endif
               ret               = OK;
 
-              fvdbg("blocksize: %d erasesize: %d neraseblocks: %d\n",
+              finfo("blocksize: %d erasesize: %d neraseblocks: %d\n",
                     geo->blocksize, geo->erasesize, geo->neraseblocks);
             }
         }
@@ -1196,7 +1196,7 @@ static int w25_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
         break;
     }
 
-  fvdbg("return %d\n", ret);
+  finfo("return %d\n", ret);
   return ret;
 }
 
@@ -1219,7 +1219,7 @@ FAR struct mtd_dev_s *w25_initialize(FAR struct spi_dev_s *spi)
   FAR struct w25_dev_s *priv;
   int ret;
 
-  fvdbg("spi: %p\n", spi);
+  finfo("spi: %p\n", spi);
 
   /* Allocate a state structure (we allocate the structure instead of using
    * a fixed, static allocation so that we can handle multiple FLASH devices.
@@ -1292,6 +1292,6 @@ FAR struct mtd_dev_s *w25_initialize(FAR struct spi_dev_s *spi)
 
   /* Return the implementation-specific state structure as the MTD device */
 
-  fvdbg("Return %p\n", priv);
+  finfo("Return %p\n", priv);
   return (FAR struct mtd_dev_s *)priv;
 }
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index be6a890d1b..c10782fbe6 100644
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -467,7 +467,7 @@ static void cs89x0_receive(FAR struct cs89x0_driver_s *cs89x0, uint16_t isq)
 #ifdef CONFIG_NET_IPv4
   if (BUF->type == HTONS(ETHTYPE_IP))
     {
-      nllvdbg("IPv4 frame\n");
+      nllinfo("IPv4 frame\n");
       NETDEV_RXIPV4(&priv->cs_dev);
 
       /* Handle ARP on input then give the IPv4 packet to the network
@@ -508,7 +508,7 @@ static void cs89x0_receive(FAR struct cs89x0_driver_s *cs89x0, uint16_t isq)
 #ifdef CONFIG_NET_IPv6
   if (BUF->type == HTONS(ETHTYPE_IP6))
     {
-      nllvdbg("Iv6 frame\n");
+      nllinfo("Iv6 frame\n");
       NETDEV_RXIPV6(&priv->cs_dev);
 
       /* Give the IPv6 packet to the network layer */
@@ -561,7 +561,7 @@ static void cs89x0_receive(FAR struct cs89x0_driver_s *cs89x0, uint16_t isq)
   else
 #endif
     {
-      nllvdbg("Unrecognized packet type %02x\n", BUF->type);
+      nllinfo("Unrecognized packet type %02x\n", BUF->type);
       NETDEV_RXDROPPED(&priv->cs_dev);
     }
 }
@@ -690,7 +690,7 @@ static int cs89x0_interrupt(int irq, FAR void *context)
 
   while ((isq = cs89x0_getreg(dev, CS89x0_ISQ_OFFSET)) != 0)
     {
-      nvdbg("ISQ: %04x\n", isq);
+      ninfo("ISQ: %04x\n", isq);
       switch (isq & ISQ_EVENTMASK)
         {
         case ISQ_RXEVENT:
diff --git a/drivers/net/dm90x0.c b/drivers/net/dm90x0.c
index c1807b5303..798bb3e38f 100644
--- a/drivers/net/dm90x0.c
+++ b/drivers/net/dm90x0.c
@@ -433,7 +433,7 @@ static void putreg(int reg, uint8_t value)
 
 static void read8(FAR uint8_t *ptr, int len)
 {
-  nvdbg("Read %d bytes (8-bit mode)\n", len);
+  ninfo("Read %d bytes (8-bit mode)\n", len);
   for (; len > 0; len--)
     {
       *ptr++ = DM9X_DATA;
@@ -444,7 +444,7 @@ static void read16(FAR uint8_t *ptr, int len)
 {
   FAR uint16_t *ptr16 = (FAR uint16_t *)ptr;
 
-  nvdbg("Read %d bytes (16-bit mode)\n", len);
+  ninfo("Read %d bytes (16-bit mode)\n", len);
   for (; len > 0; len -= sizeof(uint16_t))
     {
       *ptr16++ = DM9X_DATA;
@@ -455,7 +455,7 @@ static void read32(FAR uint8_t *ptr, int len)
 {
   FAR uint32_t *ptr32 = (FAR uint32_t *)ptr;
 
-  nvdbg("Read %d bytes (32-bit mode)\n", len);
+  ninfo("Read %d bytes (32-bit mode)\n", len);
   for (; len > 0; len -= sizeof(uint32_t))
     {
       *ptr32++ = DM9X_DATA;
@@ -481,7 +481,7 @@ static void read32(FAR uint8_t *ptr, int len)
 
 static void discard8(int len)
 {
-  nvdbg("Discard %d bytes (8-bit mode)\n", len);
+  ninfo("Discard %d bytes (8-bit mode)\n", len);
   for (; len > 0; len--)
     {
       DM9X_DATA;
@@ -490,7 +490,7 @@ static void discard8(int len)
 
 static void discard16(int len)
 {
-  nvdbg("Discard %d bytes (16-bit mode)\n", len);
+  ninfo("Discard %d bytes (16-bit mode)\n", len);
   for (; len > 0; len -= sizeof(uint16_t))
     {
       DM9X_DATA;
@@ -499,7 +499,7 @@ static void discard16(int len)
 
 static void discard32(int len)
 {
-  nvdbg("Discard %d bytes (32-bit mode)\n", len);
+  ninfo("Discard %d bytes (32-bit mode)\n", len);
   for (; len > 0; len -= sizeof(uint32_t))
     {
       DM9X_DATA;
@@ -525,7 +525,7 @@ static void discard32(int len)
 
 static void write8(FAR const uint8_t *ptr, int len)
 {
-  nvdbg("Write %d bytes (8-bit mode)\n", len);
+  ninfo("Write %d bytes (8-bit mode)\n", len);
 
   for (; len > 0; len--)
     {
@@ -537,7 +537,7 @@ static void write16(const uint8_t *ptr, int len)
 {
   FAR uint16_t *ptr16 = (FAR uint16_t *)ptr;
 
-  nvdbg("Write %d bytes (16-bit mode)\n", len);
+  ninfo("Write %d bytes (16-bit mode)\n", len);
 
   for (; len > 0; len -= sizeof(uint16_t))
     {
@@ -549,7 +549,7 @@ static void write32(FAR const uint8_t *ptr, int len)
 {
   FAR uint32_t *ptr32 = (FAR uint32_t *)ptr;
 
-  nvdbg("Write %d bytes (32-bit mode)\n", len);
+  ninfo("Write %d bytes (32-bit mode)\n", len);
 
   for (; len > 0; len -= sizeof(uint32_t))
     {
@@ -831,7 +831,7 @@ static void dm9x_receive(FAR struct dm9x_driver_s *dm9x)
   bool bchecksumready;
   uint8_t rxbyte;
 
-  nvdbg("Packet received\n");
+  ninfo("Packet received\n");
 
   do
     {
@@ -902,7 +902,7 @@ static void dm9x_receive(FAR struct dm9x_driver_s *dm9x)
 #ifdef CONFIG_NET_IPv4
           if (BUF->type == HTONS(ETHTYPE_IP))
             {
-              nllvdbg("IPv4 frame\n");
+              nllinfo("IPv4 frame\n");
               NETDEV_RXIPV4(&priv->dm_dev);
 
               /* Handle ARP on input then give the IPv4 packet to the network
@@ -943,7 +943,7 @@ static void dm9x_receive(FAR struct dm9x_driver_s *dm9x)
 #ifdef CONFIG_NET_IPv6
           if (BUF->type == HTONS(ETHTYPE_IP6))
             {
-              nllvdbg("Iv6 frame\n");
+              nllinfo("Iv6 frame\n");
               NETDEV_RXIPV6(&priv->dm_dev);
 
               /* Give the IPv6 packet to the network layer */
@@ -1004,7 +1004,7 @@ static void dm9x_receive(FAR struct dm9x_driver_s *dm9x)
       dm9x->ncrxpackets++;
     }
   while ((rxbyte & 0x01) == DM9X_PKTRDY && dm9x->ncrxpackets < DM9X_CRXTHRES);
-  nvdbg("All RX packets processed\n");
+  ninfo("All RX packets processed\n");
 }
 
 /****************************************************************************
@@ -1027,7 +1027,7 @@ static void dm9x_txdone(struct dm9x_driver_s *dm9x)
 {
   int  nsr;
 
-  nvdbg("TX done\n");
+  ninfo("TX done\n");
 
   /* Another packet has completed transmission.  Decrement the count of
    * of pending TX transmissions.
@@ -1110,7 +1110,7 @@ static int dm9x_interrupt(int irq, FAR void *context)
 
   isr = getreg(DM9X_ISR);
   putreg(DM9X_ISR, isr);
-  nvdbg("Interrupt status: %02x\n", isr);
+  ninfo("Interrupt status: %02x\n", isr);
 
   /* Check for link status change */
 
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index e7f3e2385c..6f605554eb 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -602,7 +602,7 @@ static void e1000_receive(struct e1000_dev *e1000)
 #ifdef CONFIG_NET_IPv4
       if (BUF->type == HTONS(ETHTYPE_IP))
         {
-          nllvdbg("IPv4 frame\n");
+          nllinfo("IPv4 frame\n");
 
           /* Handle ARP on input then give the IPv4 packet to the network
            * layer
@@ -642,7 +642,7 @@ static void e1000_receive(struct e1000_dev *e1000)
 #ifdef CONFIG_NET_IPv6
       if (BUF->type == HTONS(ETHTYPE_IP6))
         {
-          nllvdbg("Iv6 frame\n");
+          nllinfo("Iv6 frame\n");
 
           /* Give the IPv6 packet to the network layer */
 
diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c
index df1fe7db47..225cf13d7a 100644
--- a/drivers/net/enc28j60.c
+++ b/drivers/net/enc28j60.c
@@ -1092,7 +1092,7 @@ static int enc_transmit(FAR struct enc_driver_s *priv)
 
   /* Increment statistics */
 
-  nllvdbg("Sending packet, pktlen: %d\n", priv->dev.d_len);
+  nllinfo("Sending packet, pktlen: %d\n", priv->dev.d_len);
   NETDEV_TXPACKETS(&priv->dev);
 
   /* Verify that the hardware is ready to send another packet.  The driver
@@ -1180,7 +1180,7 @@ static int enc_txpoll(struct net_driver_s *dev)
    * the field d_len is set to a value > 0.
    */
 
-  nllvdbg("Poll result: d_len=%d\n", priv->dev.d_len);
+  nllinfo("Poll result: d_len=%d\n", priv->dev.d_len);
   if (priv->dev.d_len > 0)
     {
       /* Look up the destination MAC address and add it to the Ethernet
@@ -1388,7 +1388,7 @@ static void enc_rxdispatch(FAR struct enc_driver_s *priv)
 #ifdef CONFIG_NET_IPv4
   if (BUF->type == HTONS(ETHTYPE_IP))
     {
-      nllvdbg("IPv4 frame\n");
+      nllinfo("IPv4 frame\n");
       NETDEV_RXIPV4(&priv->dev);
 
       /* Handle ARP on input then give the IPv4 packet to the network
@@ -1429,7 +1429,7 @@ static void enc_rxdispatch(FAR struct enc_driver_s *priv)
 #ifdef CONFIG_NET_IPv6
   if (BUF->type == HTONS(ETHTYPE_IP6))
     {
-      nllvdbg("Iv6 frame\n");
+      nllinfo("Iv6 frame\n");
       NETDEV_RXIPV6(&priv->dev);
 
       /* Give the IPv6 packet to the network layer */
@@ -1467,7 +1467,7 @@ static void enc_rxdispatch(FAR struct enc_driver_s *priv)
 #ifdef CONFIG_NET_ARP
   if (BUF->type == htons(ETHTYPE_ARP))
     {
-      nllvdbg("ARP packet received (%02x)\n", BUF->type);
+      nllinfo("ARP packet received (%02x)\n", BUF->type);
       NETDEV_RXARP(&priv->dev);
 
       arp_arpin(&priv->dev);
@@ -1543,7 +1543,7 @@ static void enc_pktif(FAR struct enc_driver_s *priv)
   pktlen        = (uint16_t)rsv[3] << 8 | (uint16_t)rsv[2];
   rxstat        = (uint16_t)rsv[5] << 8 | (uint16_t)rsv[4];
 
-  nllvdbg("Receiving packet, nextpkt: %04x pktlen: %d rxstat: %04x\n",
+  nllinfo("Receiving packet, nextpkt: %04x pktlen: %d rxstat: %04x\n",
           priv->nextpkt, pktlen, rxstat);
 
   /* Check if the packet was received OK */
@@ -1647,7 +1647,7 @@ static void enc_irqworker(FAR void *arg)
        * settings.
        */
 
-      nllvdbg("EIR: %02x\n", eir);
+      nllinfo("EIR: %02x\n", eir);
 
       /* DMAIF: The DMA interrupt indicates that the DMA module has completed
        * its memory copy or checksum calculation. Additionally, this interrupt
@@ -1767,7 +1767,7 @@ static void enc_irqworker(FAR void *arg)
           uint8_t pktcnt = enc_rdbreg(priv, ENC_EPKTCNT);
           if (pktcnt > 0)
             {
-              nllvdbg("EPKTCNT: %02x\n", pktcnt);
+              nllinfo("EPKTCNT: %02x\n", pktcnt);
 
               /* Handle packet receipt */
 
@@ -2336,7 +2336,7 @@ static int enc_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac)
 
 static void enc_pwrsave(FAR struct enc_driver_s *priv)
 {
-  nllvdbg("Set PWRSV\n");
+  nllinfo("Set PWRSV\n");
 
   /* 1. Turn off packet reception by clearing ECON1.RXEN. */
 
@@ -2396,7 +2396,7 @@ static void enc_pwrsave(FAR struct enc_driver_s *priv)
 
 static void enc_pwrfull(FAR struct enc_driver_s *priv)
 {
-  nllvdbg("Clear PWRSV\n");
+  nllinfo("Clear PWRSV\n");
 
   /* 1. Wake-up by clearing ECON2.PWRSV. */
 
@@ -2528,7 +2528,7 @@ static int enc_reset(FAR struct enc_driver_s *priv)
       return -ENODEV;
     }
 
-  nllvdbg("Rev ID: %02x\n", regval);
+  nllinfo("Rev ID: %02x\n", regval);
 
   /* Set filter mode: unicast OR broadcast AND crc valid */
 
diff --git a/drivers/net/encx24j600.c b/drivers/net/encx24j600.c
index c341c5486f..b0fa6b430a 100644
--- a/drivers/net/encx24j600.c
+++ b/drivers/net/encx24j600.c
@@ -1165,7 +1165,7 @@ static int enc_txpoll(struct net_driver_s *dev)
    * the field d_len is set to a value > 0.
    */
 
-  nllvdbg("Poll result: d_len=%d\n", priv->dev.d_len);
+  nllinfo("Poll result: d_len=%d\n", priv->dev.d_len);
 
   if (priv->dev.d_len > 0)
     {
@@ -1331,7 +1331,7 @@ static void enc_rxldpkt(FAR struct enc_driver_s *priv,
 {
   DEBUGASSERT(priv != NULL && descr != NULL);
 
-  nllvdbg("load packet @%04x len: %d\n", descr->addr, descr->len);
+  nllinfo("load packet @%04x len: %d\n", descr->addr, descr->len);
 
   /* Set the rx data pointer to the start of the received packet (ERXRDPT) */
 
@@ -1403,7 +1403,7 @@ static void enc_rxrmpkt(FAR struct enc_driver_s *priv, FAR struct enc_descr_s *d
 {
   uint16_t addr;
 
-  nllvdbg("free descr: %p\n", descr);
+  nllinfo("free descr: %p\n", descr);
 
   /* If it is the last descriptor in the queue, advance ERXTAIL.
    * This way it is possible that gaps occcur. Maybe pending packets
@@ -1420,7 +1420,7 @@ static void enc_rxrmpkt(FAR struct enc_driver_s *priv, FAR struct enc_descr_s *d
 
           DEBUGASSERT(addr >= PKTMEM_RX_START &&  addr < PKTMEM_RX_END);
 
-          nllvdbg("ERXTAIL %04x\n", addr);
+          nllinfo("ERXTAIL %04x\n", addr);
 
           enc_wrreg(priv, ENC_ERXTAIL, addr);
 
@@ -1490,7 +1490,7 @@ static void enc_rxdispatch(FAR struct enc_driver_s *priv)
 #ifdef CONFIG_NET_IPv4
       if (BUF->type == HTONS(ETHTYPE_IP))
         {
-          nllvdbg("IPv4 frame\n");
+          nllinfo("IPv4 frame\n");
           NETDEV_RXIPV4(&priv->dev);
 
           /* Handle ARP on input then give the IPv4 packet to the network
@@ -1540,7 +1540,7 @@ static void enc_rxdispatch(FAR struct enc_driver_s *priv)
 #ifdef CONFIG_NET_IPv6
       if (BUF->type == HTONS(ETHTYPE_IP6))
         {
-          nllvdbg("Iv6 frame\n");
+          nllinfo("Iv6 frame\n");
           NETDEV_RXIPV6(&priv->dev);
 
           /* Give the IPv6 packet to the network layer */
@@ -1587,7 +1587,7 @@ static void enc_rxdispatch(FAR struct enc_driver_s *priv)
 #ifdef CONFIG_NET_ARP
       if (BUF->type == htons(ETHTYPE_ARP))
         {
-          nllvdbg("ARP packet received (%02x)\n", BUF->type);
+          nllinfo("ARP packet received (%02x)\n", BUF->type);
           NETDEV_RXARP(&priv->dev);
 
           arp_arpin(&priv->dev);
@@ -1684,7 +1684,7 @@ static void enc_pktif(FAR struct enc_driver_s *priv)
       rxstat        = (uint32_t)rsv[7] << 24 | (uint32_t)rsv[6] << 16 |
                       (uint32_t)rsv[5] << 8  | (uint32_t)rsv[4];
 
-      nllvdbg("Receiving packet, nextpkt: %04x pktlen: %d rxstat: %08x pktcnt: %d\n",
+      nllinfo("Receiving packet, nextpkt: %04x pktlen: %d rxstat: %08x pktcnt: %d\n",
              priv->nextpkt, pktlen, rxstat, pktcnt);
 
       /* We enqueue the packet first and remove it later if its faulty.
@@ -1859,7 +1859,7 @@ static void enc_irqworker(FAR void *arg)
        * settings.
        */
 
-      nllvdbg("EIR: %04x\n", eir);
+      nllinfo("EIR: %04x\n", eir);
 
       if ((eir & EIR_DMAIF) != 0) /* DMA interrupt */
         {
@@ -2420,7 +2420,7 @@ static int enc_rxavail(struct net_driver_s *dev)
 
   if (!sq_empty(&priv->rxqueue))
     {
-      nllvdbg("RX queue not empty, trying to dispatch\n");
+      nllinfo("RX queue not empty, trying to dispatch\n");
       enc_rxdispatch(priv);
     }
 
@@ -2546,7 +2546,7 @@ static void enc_pwrsave(FAR struct enc_driver_s *priv)
 {
   uint16_t regval;
 
-  nllvdbg("Set PWRSV\n");
+  nllinfo("Set PWRSV\n");
 
   /* 1. Turn off AES */
 
@@ -2597,7 +2597,7 @@ static void enc_ldmacaddr(FAR struct enc_driver_s *priv)
   uint16_t regval;
   uint8_t *mac = priv->dev.d_mac.ether_addr_octet;
 
-  nvdbg("Using ENCX24J600's built in MAC address\n");
+  ninfo("Using ENCX24J600's built in MAC address\n");
 
   regval = enc_rdreg(priv, ENC_MAADR1);
   mac[0] = regval & 0xff;
@@ -2648,7 +2648,7 @@ static void enc_setmacaddr(FAR struct enc_driver_s *priv)
     {
       /* There is a user defined mac address. Write it to the ENCXJ600 */
 
-      nvdbg("Using an user defined MAC address\n");
+      ninfo("Using an user defined MAC address\n");
 
       enc_wrreg(priv, ENC_MAADR1, (uint16_t)mac[1] << 8 | (uint16_t)mac[0]);
       enc_wrreg(priv, ENC_MAADR2, (uint16_t)mac[3] << 8 | (uint16_t)mac[2]);
@@ -2728,7 +2728,7 @@ static int enc_reset(FAR struct enc_driver_s *priv)
   int ret;
   uint16_t regval;
 
-  nllvdbg("Reset\n");
+  nllinfo("Reset\n");
 
   do
     {
@@ -2793,7 +2793,7 @@ static int enc_reset(FAR struct enc_driver_s *priv)
     }
   while ((regval & PHSTAT1_ANDONE) != 0);
 
-  nllvdbg("Auto-negotation completed\n");
+  nllinfo("Auto-negotation completed\n");
 
 #endif
 
diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c
index 9cbdba7022..f6ad670b2c 100644
--- a/drivers/net/ftmac100.c
+++ b/drivers/net/ftmac100.c
@@ -285,7 +285,7 @@ static int ftmac100_transmit(FAR struct ftmac100_driver_s *priv)
   int len = priv->ft_dev.d_len;
 //irqstate_t flags;
 //flags = enter_critical_section();
-//nvdbg("flags=%08x\n", flags);
+//ninfo("flags=%08x\n", flags);
 
   txdes = ftmac100_current_txdes(priv);
 
@@ -307,7 +307,7 @@ static int ftmac100_transmit(FAR struct ftmac100_driver_s *priv)
                     FTMAC100_TXDES1_TXBUF_SIZE(len));
   txdes->txdes0 |= FTMAC100_TXDES0_TXDMA_OWN;
 
-  nvdbg("ftmac100_transmit[%x]: copy %08x to %08x %04x\n",
+  ninfo("ftmac100_transmit[%x]: copy %08x to %08x %04x\n",
         priv->tx_pointer, priv->ft_dev.d_buf, txdes->txdes2, len);
 
   priv->tx_pointer = (priv->tx_pointer + 1) & (CONFIG_FTMAC100_TX_DESC - 1);
@@ -422,7 +422,7 @@ static void ftmac100_reset(FAR struct ftmac100_driver_s *priv)
 {
   FAR struct ftmac100_register_s *iobase = (FAR struct ftmac100_register_s *)priv->iobase;
 
-  nvdbg("%s(): iobase=%p\n", __func__, iobase);
+  ninfo("%s(): iobase=%p\n", __func__, iobase);
 
   putreg32 (FTMAC100_MACCR_SW_RST, &iobase->maccr);
 
@@ -472,7 +472,7 @@ static void ftmac100_init(FAR struct ftmac100_driver_s *priv)
 
   kmem = memalign(RX_BUF_SIZE, CONFIG_FTMAC100_RX_DESC * RX_BUF_SIZE);
 
-  nvdbg("KMEM=%08x\n", kmem);
+  ninfo("KMEM=%08x\n", kmem);
 
   for (i = 0; i < CONFIG_FTMAC100_RX_DESC; i++)
     {
@@ -502,7 +502,7 @@ static void ftmac100_init(FAR struct ftmac100_driver_s *priv)
 
   /* transmit ring */
 
-  nvdbg("priv=%08x txdes=%08x rxdes=%08x\n", priv, txdes, rxdes);
+  ninfo("priv=%08x txdes=%08x rxdes=%08x\n", priv, txdes, rxdes);
 
   putreg32 ((unsigned int)txdes, &iobase->txr_badr);
 
@@ -568,7 +568,7 @@ static uint32_t ftmac100_mdio_read(FAR struct ftmac100_register_s *iobase, int r
   for (i = 0; i < 10; i++)
     {
       phycr = getreg32(&iobase->phycr);
-      nvdbg("%02x %d phycr=%08x\n", reg, i, phycr);
+      ninfo("%02x %d phycr=%08x\n", reg, i, phycr);
 
       if ((phycr & FTMAC100_PHYCR_MIIRD) == 0)
         {
@@ -603,7 +603,7 @@ static void ftmac100_set_mac(FAR struct ftmac100_driver_s *priv,
   unsigned int maddr = mac[0] << 8 | mac[1];
   unsigned int laddr = mac[2] << 24 | mac[3] << 16 | mac[4] << 8 | mac[5];
 
-  nvdbg("%s(%x %x)\n", __func__, maddr, laddr);
+  ninfo("%s(%x %x)\n", __func__, maddr, laddr);
 
   putreg32(maddr, &iobase->mac_madr);
   putreg32(laddr, &iobase->mac_ladr);
@@ -656,7 +656,7 @@ static void ftmac100_receive(FAR struct ftmac100_driver_s *priv)
 
       if (!found)
         {
-          nvdbg("\nNOT FOUND\nCurrent RX %d rxdes0=%08x\n",
+          ninfo("\nNOT FOUND\nCurrent RX %d rxdes0=%08x\n",
                 priv->rx_pointer, rxdes->rxdes0);
           return;
         }
@@ -664,7 +664,7 @@ static void ftmac100_receive(FAR struct ftmac100_driver_s *priv)
       len = FTMAC100_RXDES0_RFL(rxdes->rxdes0);
       data = (uint8_t *)rxdes->rxdes2;
 
-      nvdbg ("RX buffer %d (%08x), %x received (%d)\n",
+      ninfo ("RX buffer %d (%08x), %x received (%d)\n",
              priv->rx_pointer, data, len, (rxdes->rxdes0 & FTMAC100_RXDES0_LRS));
 
       /* Copy the data data from the hardware to priv->ft_dev.d_buf.  Set
@@ -685,7 +685,7 @@ static void ftmac100_receive(FAR struct ftmac100_driver_s *priv)
 #ifdef CONFIG_NET_IPv4
       if (BUF->type == HTONS(ETHTYPE_IP))
         {
-          nllvdbg("IPv4 frame\n");
+          nllinfo("IPv4 frame\n");
 
           /* Handle ARP on input then give the IPv4 packet to the network
            * layer
@@ -725,7 +725,7 @@ static void ftmac100_receive(FAR struct ftmac100_driver_s *priv)
 #ifdef CONFIG_NET_IPv6
       if (BUF->type == HTONS(ETHTYPE_IP6))
         {
-          nllvdbg("Iv6 frame\n");
+          nllinfo("Iv6 frame\n");
 
           /* Give the IPv6 packet to the network layer */
 
@@ -835,7 +835,7 @@ static void ftmac100_txdone(FAR struct ftmac100_driver_s *priv)
    * disable further Tx interrupts.
    */
 
-  nvdbg("txpending=%d\n", priv->tx_pending);
+  ninfo("txpending=%d\n", priv->tx_pending);
 
   /* Cancel the TX timeout */
 
@@ -884,7 +884,7 @@ static inline void ftmac100_interrupt_process(FAR struct ftmac100_driver_s *priv
   status = getreg32 (&iobase->isr);
 #endif
 
-  nvdbg("status=%08x(%08x) BASE=%p ISR=%p PHYCR=%p\n",
+  ninfo("status=%08x(%08x) BASE=%p ISR=%p PHYCR=%p\n",
         status, getreg32(&iobase->isr), iobase, &iobase->isr, &iobase->phycr);
 
   if (!status)
@@ -913,7 +913,7 @@ static inline void ftmac100_interrupt_process(FAR struct ftmac100_driver_s *priv
 
   if (status & (FTMAC100_INT_XPKT_OK))
     {
-      nvdbg("\n\nTXDONE\n\n");
+      ninfo("\n\nTXDONE\n\n");
       ftmac100_txdone(priv);
     }
 
@@ -931,27 +931,27 @@ static inline void ftmac100_interrupt_process(FAR struct ftmac100_driver_s *priv
           priv->ft_bifup = false;
         }
 
-      nvdbg("Link: %s\n", priv->ft_bifup ? "UP" : "DOWN");
+      ninfo("Link: %s\n", priv->ft_bifup ? "UP" : "DOWN");
       ftmac100_mdio_read(iobase, 5);
     }
 
 #if 0
 #define REG(x) (*(volatile uint32_t *)(x))
-  nvdbg("\n=============================================================\n");
-  nvdbg("TM CNTL=%08x INTRS=%08x MASK=%08x LOAD=%08x COUNT=%08x M1=%08x\n",
+  ninfo("\n=============================================================\n");
+  ninfo("TM CNTL=%08x INTRS=%08x MASK=%08x LOAD=%08x COUNT=%08x M1=%08x\n",
         REG(0x98400030), REG(0x98400034), REG(0x98400038), REG(0x98400004),
         REG(0x98400000), REG(0x98400008));
-  nvdbg("IRQ STATUS=%08x MASK=%08x MODE=%08x LEVEL=%08x\n",
+  ninfo("IRQ STATUS=%08x MASK=%08x MODE=%08x LEVEL=%08x\n",
         REG(0x98800014), REG(0x98800004), REG(0x9880000C), REG(0x98800010));
-  nvdbg("FIQ STATUS=%08x MASK=%08x MODE=%08x LEVEL=%08x\n", REG(0x98800034),
+  ninfo("FIQ STATUS=%08x MASK=%08x MODE=%08x LEVEL=%08x\n", REG(0x98800034),
         REG(0x98800024), REG(0x9880002C), REG(0x98800020));
-  nvdbg("=============================================================\n");
+  ninfo("=============================================================\n");
 #endif
 
 out:
   putreg32 (INT_MASK_ALL_ENABLED, &iobase->imr);
 
-  nvdbg("ISR-done\n");
+  ninfo("ISR-done\n");
 }
 
 /****************************************************************************
@@ -1034,7 +1034,7 @@ static int ftmac100_interrupt(int irq, FAR void *context)
 
   /* TODO: Determine if a TX transfer just completed */
 
-  nvdbg("===> status=%08x\n", priv->status);
+  ninfo("===> status=%08x\n", priv->status);
 
   if (priv->status & (FTMAC100_INT_XPKT_OK))
     {
@@ -1043,7 +1043,7 @@ static int ftmac100_interrupt(int irq, FAR void *context)
        * expiration and the deferred interrupt processing.
        */
 
-      nvdbg("\n\nTXDONE 0\n\n");
+      ninfo("\n\nTXDONE 0\n\n");
       wd_cancel(priv->ft_txtimeout);
     }
 
@@ -1087,7 +1087,7 @@ static inline void ftmac100_txtimeout_process(FAR struct ftmac100_driver_s *priv
 {
   /* Then reset the hardware */
 
-  nvdbg("TXTIMEOUT\n");
+  ninfo("TXTIMEOUT\n");
 
   /* Then poll the network for new XMIT data */
 
@@ -1658,7 +1658,7 @@ static void ftmac100_ipv6multicast(FAR struct ftmac100_driver_s *priv)
   mac[4] = tmp16 & 0xff;
   mac[5] = tmp16 >> 8;
 
-  nvdbg("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  ninfo("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n",
         mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
   (void)ftmac100_addmac(dev, mac);
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index 5b275474d0..c963f9e7b8 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -187,7 +187,7 @@ static int lo_txpoll(FAR struct net_driver_s *dev)
 #ifdef CONFIG_NET_IPv4
       if ((IPv4BUF->vhl & IP_VERSION_MASK) == IPv4_VERSION)
         {
-          nllvdbg("IPv4 frame\n");
+          nllinfo("IPv4 frame\n");
           NETDEV_RXIPV4(&priv->lo_dev);
           ipv4_input(&priv->lo_dev);
         }
@@ -196,7 +196,7 @@ static int lo_txpoll(FAR struct net_driver_s *dev)
 #ifdef CONFIG_NET_IPv6
       if ((IPv6BUF->vtc & IP_VERSION_MASK) == IPv6_VERSION)
         {
-          nllvdbg("Iv6 frame\n");
+          nllinfo("Iv6 frame\n");
           NETDEV_RXIPV6(&priv->lo_dev);
           ipv6_input(&priv->lo_dev);
         }
diff --git a/drivers/net/phy_notify.c b/drivers/net/phy_notify.c
index e59f58c364..73cf2af033 100644
--- a/drivers/net/phy_notify.c
+++ b/drivers/net/phy_notify.c
@@ -360,7 +360,7 @@ int phy_notify_subscribe(FAR const char *intf, pid_t pid, int signo,
   FAR struct phy_notify_s *client;
   DEBUGASSERT(intf);
 
-  nvdbg("%s: PID=%d signo=%d arg=%p\n", intf, pid, signo, arg);
+  ninfo("%s: PID=%d signo=%d arg=%p\n", intf, pid, signo, arg);
 
   /* The special value pid == 0 means to use the pid of the current task. */
 
@@ -439,7 +439,7 @@ int phy_notify_unsubscribe(FAR const char *intf, pid_t pid)
 {
   FAR struct phy_notify_s *client;
 
-  nvdbg("%s: PID=%d\n", intf, pid);
+  ninfo("%s: PID=%d\n", intf, pid);
 
   /* Find the client entry for this interface */
 
diff --git a/drivers/net/skeleton.c b/drivers/net/skeleton.c
index 6194fbce34..4b49514da3 100644
--- a/drivers/net/skeleton.c
+++ b/drivers/net/skeleton.c
@@ -334,7 +334,7 @@ static void skel_receive(FAR struct skel_driver_s *priv)
 #ifdef CONFIG_NET_IPv4
       if (BUF->type == HTONS(ETHTYPE_IP))
         {
-          nllvdbg("IPv4 frame\n");
+          nllinfo("IPv4 frame\n");
           NETDEV_RXIPV4(&priv->sk_dev);
 
           /* Handle ARP on input then give the IPv4 packet to the network
@@ -375,7 +375,7 @@ static void skel_receive(FAR struct skel_driver_s *priv)
 #ifdef CONFIG_NET_IPv6
       if (BUF->type == HTONS(ETHTYPE_IP6))
         {
-          nllvdbg("Iv6 frame\n");
+          nllinfo("Iv6 frame\n");
           NETDEV_RXIPV6(&priv->sk_dev);
 
           /* Give the IPv6 packet to the network layer */
@@ -1152,7 +1152,7 @@ static void skel_ipv6multicast(FAR struct skel_driver_s *priv)
   mac[4] = tmp16 & 0xff;
   mac[5] = tmp16 >> 8;
 
-  nvdbg("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  ninfo("IPv6 Multicast: %02x:%02x:%02x:%02x:%02x:%02x\n",
         mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
   (void)skel_addmac(dev, mac);
diff --git a/drivers/net/slip.c b/drivers/net/slip.c
index 3691580341..98cd0117e4 100644
--- a/drivers/net/slip.c
+++ b/drivers/net/slip.c
@@ -287,7 +287,7 @@ static int slip_transmit(FAR struct slip_driver_s *priv)
 
   /* Increment statistics */
 
-  nvdbg("Sending packet size %d\n", priv->dev.d_len);
+  ninfo("Sending packet size %d\n", priv->dev.d_len);
   NETDEV_TXPACKETS(&priv->dev);
 
   /* Send an initial END character to flush out any data that may have
@@ -555,7 +555,7 @@ static inline void slip_receive(FAR struct slip_driver_s *priv)
    * packet if we run out of room.
    */
 
-  nvdbg("Receiving packet\n");
+  ninfo("Receiving packet\n");
   for (; ; )
     {
       /* Get the next character in the stream. */
@@ -572,7 +572,7 @@ static inline void slip_receive(FAR struct slip_driver_s *priv)
 
         case SLIP_END:
           {
-            nvdbg("END\n");
+            ninfo("END\n");
 
             /* A minor optimization: if there is no data in the packet,
              * ignore it. This is meant to avoid bothering IP with all the
@@ -582,7 +582,7 @@ static inline void slip_receive(FAR struct slip_driver_s *priv)
 
             if (priv->rxlen > 0)
               {
-                nvdbg("Received packet size %d\n", priv->rxlen);
+                ninfo("Received packet size %d\n", priv->rxlen);
                 return;
               }
           }
@@ -595,7 +595,7 @@ static inline void slip_receive(FAR struct slip_driver_s *priv)
 
         case SLIP_ESC:
           {
-            nvdbg("ESC\n");
+            ninfo("ESC\n");
             ch = slip_getc(priv);
 
             /* if "ch" is not one of these two, then we have a protocol
@@ -606,12 +606,12 @@ static inline void slip_receive(FAR struct slip_driver_s *priv)
             switch (ch)
               {
               case SLIP_ESC_END:
-                nvdbg("ESC-END\n");
+                ninfo("ESC-END\n");
                 ch = SLIP_END;
                 break;
 
                case SLIP_ESC_ESC:
-                nvdbg("ESC-ESC\n");
+                ninfo("ESC-ESC\n");
                 ch = SLIP_ESC;
                 break;
 
@@ -677,7 +677,7 @@ static int slip_rxtask(int argc, FAR char *argv[])
     {
       /* Wait for the next character to be available on the input stream. */
 
-      nvdbg("Waiting...\n");
+      ninfo("Waiting...\n");
       ch = slip_getc(priv);
 
       /* Ignore any input that we receive before the interface is up. */
diff --git a/drivers/net/telnet.c b/drivers/net/telnet.c
index bdf6fcf82e..27c313038a 100644
--- a/drivers/net/telnet.c
+++ b/drivers/net/telnet.c
@@ -234,7 +234,7 @@ static inline void telnet_dumpbuffer(FAR const char *msg,
   * defined or the following does nothing.
   */
 
-  nvdbgdumpbuffer(msg, (FAR const uint8_t*)buffer, nbytes);
+  ninfodumpbuffer(msg, (FAR const uint8_t*)buffer, nbytes);
 }
 #endif
 
@@ -277,12 +277,12 @@ static ssize_t telnet_receive(FAR struct telnet_dev_s *priv, FAR const char *src
   int nread;
   uint8_t ch;
 
-  nllvdbg("srclen: %d destlen: %d\n", srclen, destlen);
+  nllinfo("srclen: %d destlen: %d\n", srclen, destlen);
 
   for (nread = 0; srclen > 0 && nread < destlen; srclen--)
     {
       ch = *src++;
-      nllvdbg("ch=%02x state=%d\n", ch, priv->td_state);
+      nllinfo("ch=%02x state=%d\n", ch, priv->td_state);
 
       switch (priv->td_state)
         {
@@ -462,7 +462,7 @@ static int telnet_open(FAR struct file *filep)
   int tmp;
   int ret;
 
-  nllvdbg("td_crefs: %d\n", priv->td_crefs);
+  nllinfo("td_crefs: %d\n", priv->td_crefs);
 
   /* O_NONBLOCK is not supported */
 
@@ -518,7 +518,7 @@ static int telnet_close(FAR struct file *filep)
   FAR char *devpath;
   int ret;
 
-  nllvdbg("td_crefs: %d\n", priv->td_crefs);
+  nllinfo("td_crefs: %d\n", priv->td_crefs);
 
   /* Get exclusive access to the device structures */
 
@@ -608,7 +608,7 @@ static ssize_t telnet_read(FAR struct file *filep, FAR char *buffer, size_t len)
   FAR struct telnet_dev_s *priv = inode->i_private;
   ssize_t ret;
 
-  nllvdbg("len: %d\n", len);
+  nllinfo("len: %d\n", len);
 
   /* First, handle the case where there are still valid bytes left in the
    * I/O buffer from the last time that read was called.  NOTE:  Much of
@@ -681,7 +681,7 @@ static ssize_t telnet_write(FAR struct file *filep, FAR const char *buffer, size
   char ch;
   bool eol;
 
-  nllvdbg("len: %d\n", len);
+  nllinfo("len: %d\n", len);
 
   /* Process each character from the user buffer */
 
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 9435f4a617..96de54844c 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -425,7 +425,7 @@ static void tun_receive(FAR struct tun_device_s *priv)
   /* We only accept IP packets of the configured type and ARP packets */
 
 #if defined(CONFIG_NET_IPv4)
-  nllvdbg("IPv4 frame\n");
+  nllinfo("IPv4 frame\n");
   NETDEV_RXIPV4(&priv->dev);
 
   /* Give the IPv4 packet to the network layer */
@@ -448,7 +448,7 @@ static void tun_receive(FAR struct tun_device_s *priv)
     }
 
 #elif defined(CONFIG_NET_IPv6)
-  nllvdbg("Iv6 frame\n");
+  nllinfo("Iv6 frame\n");
   NETDEV_RXIPV6(&priv->dev);
 
   /* Give the IPv6 packet to the network layer */
diff --git a/drivers/net/vnet.c b/drivers/net/vnet.c
index eec509ec87..a21fa91d12 100644
--- a/drivers/net/vnet.c
+++ b/drivers/net/vnet.c
@@ -332,7 +332,7 @@ void rtos_vnet_recv(struct rgmp_vnet *rgmp_vnet, char *data, int len)
 #ifdef CONFIG_NET_IPv4
       if (BUF->type == HTONS(ETHTYPE_IP))
         {
-          nllvdbg("IPv4 frame\n");
+          nllinfo("IPv4 frame\n");
 
           /* Handle ARP on input then give the IPv4 packet to the network
            * layer
@@ -372,7 +372,7 @@ void rtos_vnet_recv(struct rgmp_vnet *rgmp_vnet, char *data, int len)
 #ifdef CONFIG_NET_IPv6
       if (BUF->type == HTONS(ETHTYPE_IP6))
         {
-          nllvdbg("Iv6 frame\n");
+          nllinfo("Iv6 frame\n");
 
           /* Give the IPv6 packet to the network layer */
 
diff --git a/drivers/pipes/pipe_common.c b/drivers/pipes/pipe_common.c
index 862d244527..1541fecd46 100644
--- a/drivers/pipes/pipe_common.c
+++ b/drivers/pipes/pipe_common.c
@@ -135,7 +135,7 @@ static void pipecommon_pollnotify(FAR struct pipe_dev_s *dev,
 
           if (fds->revents != 0)
             {
-              fvdbg("Report events: %02x\n", fds->revents);
+              finfo("Report events: %02x\n", fds->revents);
               sem_post(fds->sem);
             }
         }
diff --git a/drivers/pwm.c b/drivers/pwm.c
index b07e44ae2c..103b78755a 100644
--- a/drivers/pwm.c
+++ b/drivers/pwm.c
@@ -72,14 +72,14 @@
 
 #ifdef CONFIG_DEBUG_PWM
 #  define pwmdbg    dbg
-#  define pwmvdbg   vdbg
+#  define pwminfo   info
 #  define pwmlldbg  lldbg
-#  define pwmllvdbg llvdbg
+#  define pwmllinfo llinfo
 #else
 #  define pwmdbg(x...)
-#  define pwmvdbg(x...)
+#  define pwminfo(x...)
 #  define pwmlldbg(x...)
-#  define pwmllvdbg(x...)
+#  define pwmllinfo(x...)
 #endif
 
 /****************************************************************************
@@ -152,23 +152,23 @@ static void pwm_dump(FAR const char *msg, FAR const struct pwm_info_s *info,
   int i;
 #endif
 
-  pwmvdbg("%s: frequency: %d", msg, info->frequency);
+  pwminfo("%s: frequency: %d", msg, info->frequency);
 
 #ifdef CONFIG_PWM_MULTICHAN
   for (i = 0; i < CONFIG_PWM_NCHANNELS; i++)
     {
-      pwmvdbg(" channel: %d duty: %08x",
+      pwminfo(" channel: %d duty: %08x",
               info->channels[i].channel, info->channels[i].duty);
     }
 #else
-  pwmvdbg(" duty: %08x", info->duty);
+  pwminfo(" duty: %08x", info->duty);
 #endif
 
 #ifdef CONFIG_PWM_PULSECOUNT
-  pwmvdbg(" count: %d\n", info->count);
+  pwminfo(" count: %d\n", info->count);
 #endif
 
-  pwmvdbg(" started: %d\n", started);
+  pwminfo(" started: %d\n", started);
 }
 
 /****************************************************************************
@@ -186,7 +186,7 @@ static int pwm_open(FAR struct file *filep)
   uint8_t                     tmp;
   int                         ret;
 
-  pwmvdbg("crefs: %d\n", upper->crefs);
+  pwminfo("crefs: %d\n", upper->crefs);
 
   /* Get exclusive access to the device structures */
 
@@ -220,7 +220,7 @@ static int pwm_open(FAR struct file *filep)
       /* Yes.. perform one time hardware initialization. */
 
       DEBUGASSERT(lower->ops->setup != NULL);
-      pwmvdbg("calling setup\n");
+      pwminfo("calling setup\n");
 
       ret = lower->ops->setup(lower);
       if (ret < 0)
@@ -255,7 +255,7 @@ static int pwm_close(FAR struct file *filep)
   FAR struct pwm_upperhalf_s *upper = inode->i_private;
   int                         ret;
 
-  pwmvdbg("crefs: %d\n", upper->crefs);
+  pwminfo("crefs: %d\n", upper->crefs);
 
   /* Get exclusive access to the device structures */
 
@@ -285,7 +285,7 @@ static int pwm_close(FAR struct file *filep)
       /* Disable the PWM device */
 
       DEBUGASSERT(lower->ops->shutdown != NULL);
-      pwmvdbg("calling shutdown: %d\n");
+      pwminfo("calling shutdown: %d\n");
 
       lower->ops->shutdown(lower);
     }
@@ -393,7 +393,7 @@ static int pwm_start(FAR struct pwm_upperhalf_s *upper, unsigned int oflags)
         {
           /* Looks like we won't be waiting after all */
 
-          pwmvdbg("start failed: %d\n", ret);
+          pwminfo("start failed: %d\n", ret);
           upper->started = false;
           upper->waiting = false;
         }
@@ -450,7 +450,7 @@ static int pwm_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
   FAR struct pwm_lowerhalf_s *lower = upper->dev;
   int                         ret;
 
-  pwmvdbg("cmd: %d arg: %ld\n", cmd, arg);
+  pwminfo("cmd: %d arg: %ld\n", cmd, arg);
 
   /* Get exclusive access to the device structures */
 
@@ -540,7 +540,7 @@ static int pwm_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case PWMIOC_STOP:
         {
-          pwmvdbg("PWMIOC_STOP: started: %d\n", upper->started);
+          pwminfo("PWMIOC_STOP: started: %d\n", upper->started);
           DEBUGASSERT(lower->ops->stop != NULL);
 
           if (upper->started)
@@ -561,7 +561,7 @@ static int pwm_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       default:
         {
-          pwmvdbg("Forwarding unrecognized cmd: %d arg: %ld\n", cmd, arg);
+          pwminfo("Forwarding unrecognized cmd: %d arg: %ld\n", cmd, arg);
           DEBUGASSERT(lower->ops->ioctl != NULL);
           ret = lower->ops->ioctl(lower, cmd, arg);
         }
@@ -624,7 +624,7 @@ int pwm_register(FAR const char *path, FAR struct pwm_lowerhalf_s *dev)
 
   /* Register the PWM device */
 
-  pwmvdbg("Registering %s\n", path);
+  pwminfo("Registering %s\n", path);
   return register_driver(path, &g_pwmops, 0666, upper);
 }
 
@@ -670,7 +670,7 @@ void pwm_expired(FAR void *handle)
 {
   FAR struct pwm_upperhalf_s *upper = (FAR struct pwm_upperhalf_s *)handle;
 
-  pwmllvdbg("started: %d waiting: %d\n", upper->started, upper->waiting);
+  pwmllinfo("started: %d waiting: %d\n", upper->started, upper->waiting);
 
   /* Make sure that the PWM is started */
 
diff --git a/drivers/ramdisk.c b/drivers/ramdisk.c
index 09382dadd6..172adde32f 100644
--- a/drivers/ramdisk.c
+++ b/drivers/ramdisk.c
@@ -158,7 +158,7 @@ static const struct block_operations g_bops =
 #ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
 static void rd_destroy(FAR struct rd_struct_s *dev)
 {
-  fvdbg("Destroying RAM disk\n");
+  finfo("Destroying RAM disk\n");
 
   /* We we configured to free the RAM disk memory when unlinked? */
 
@@ -197,7 +197,7 @@ static int rd_open(FAR struct inode *inode)
   dev->rd_crefs++;
   DEBUGASSERT(dev->rd_crefs > 0);
 
-  fvdbg("rd_crefs: %d\n", dev->rd_crefs);
+  finfo("rd_crefs: %d\n", dev->rd_crefs);
   return OK;
 }
 #endif
@@ -221,7 +221,7 @@ static int rd_close(FAR struct inode *inode)
 
   DEBUGASSERT(dev->rd_crefs > 0);
   dev->rd_crefs--;
-  fvdbg("rd_crefs: %d\n", dev->rd_crefs);
+  finfo("rd_crefs: %d\n", dev->rd_crefs);
 
 #ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
   /* Was that the last open reference to the RAM disk? */
@@ -258,13 +258,13 @@ static ssize_t rd_read(FAR struct inode *inode, unsigned char *buffer,
   DEBUGASSERT(inode && inode->i_private);
   dev = (FAR struct rd_struct_s *)inode->i_private;
 
-  fvdbg("sector: %d nsectors: %d sectorsize: %d\n",
+  finfo("sector: %d nsectors: %d sectorsize: %d\n",
         start_sector, dev->rd_sectsize, nsectors);
 
   if (start_sector < dev->rd_nsectors &&
       start_sector + nsectors <= dev->rd_nsectors)
     {
-       fvdbg("Transfer %d bytes from %p\n",
+       finfo("Transfer %d bytes from %p\n",
              nsectors * dev->rd_sectsize,
              &dev->rd_buffer[start_sector * dev->rd_sectsize]);
 
@@ -293,7 +293,7 @@ static ssize_t rd_write(FAR struct inode *inode, const unsigned char *buffer,
   DEBUGASSERT(inode && inode->i_private);
   dev = (struct rd_struct_s *)inode->i_private;
 
-  fvdbg("sector: %d nsectors: %d sectorsize: %d\n",
+  finfo("sector: %d nsectors: %d sectorsize: %d\n",
         start_sector, dev->rd_sectsize, nsectors);
 
   if (!RDFLAG_IS_WRENABLED(dev->rd_flags))
@@ -303,7 +303,7 @@ static ssize_t rd_write(FAR struct inode *inode, const unsigned char *buffer,
   else if (start_sector < dev->rd_nsectors &&
            start_sector + nsectors <= dev->rd_nsectors)
     {
-      fvdbg("Transfer %d bytes from %p\n",
+      finfo("Transfer %d bytes from %p\n",
              nsectors * dev->rd_sectsize,
              &dev->rd_buffer[start_sector * dev->rd_sectsize]);
 
@@ -328,7 +328,7 @@ static int rd_geometry(FAR struct inode *inode, struct geometry *geometry)
 {
   struct rd_struct_s *dev;
 
-  fvdbg("Entry\n");
+  finfo("Entry\n");
 
   DEBUGASSERT(inode);
   if (geometry)
@@ -344,9 +344,9 @@ static int rd_geometry(FAR struct inode *inode, struct geometry *geometry)
       geometry->geo_nsectors      = dev->rd_nsectors;
       geometry->geo_sectorsize    = dev->rd_sectsize;
 
-      fvdbg("available: true mediachanged: false writeenabled: %s\n",
+      finfo("available: true mediachanged: false writeenabled: %s\n",
             geometry->geo_writeenabled ? "true" : "false");
-      fvdbg("nsectors: %d sectorsize: %d\n",
+      finfo("nsectors: %d sectorsize: %d\n",
             geometry->geo_nsectors, geometry->geo_sectorsize);
 
       return OK;
@@ -368,7 +368,7 @@ static int rd_ioctl(FAR struct inode *inode, int cmd, unsigned long arg)
   FAR struct rd_struct_s *dev;
   FAR void **ppv = (void**)((uintptr_t)arg);
 
-  fvdbg("Entry\n");
+  finfo("Entry\n");
 
   /* Only one ioctl command is supported */
 
@@ -378,7 +378,7 @@ static int rd_ioctl(FAR struct inode *inode, int cmd, unsigned long arg)
       dev  = (FAR struct rd_struct_s *)inode->i_private;
       *ppv = (FAR void *)dev->rd_buffer;
 
-      fvdbg("ppv: %p\n", *ppv);
+      finfo("ppv: %p\n", *ppv);
       return OK;
     }
 
@@ -452,7 +452,7 @@ int romdisk_register(int minor, FAR const uint8_t *buffer, uint32_t nsectors,
   char devname[16];
   int ret = -ENOMEM;
 
-  fvdbg("buffer: %p nsectors: %d sectsize: %d\n", buffer, nsectors, sectsize);
+  finfo("buffer: %p nsectors: %d sectsize: %d\n", buffer, nsectors, sectsize);
 
   /* Sanity check */
 
diff --git a/drivers/rwbuffer.c b/drivers/rwbuffer.c
index 764a6ebbc1..3eb4b8338b 100644
--- a/drivers/rwbuffer.c
+++ b/drivers/rwbuffer.c
@@ -161,11 +161,11 @@ static void rwb_wrflush(struct rwbuffer_s *rwb)
 {
   int ret;
 
-  fvdbg("Timeout!\n");
+  finfo("Timeout!\n");
 
   if (rwb->wrnblocks > 0)
     {
-      fvdbg("Flushing: blockstart=0x%08lx nblocks=%d from buffer=%p\n",
+      finfo("Flushing: blockstart=0x%08lx nblocks=%d from buffer=%p\n",
       (long)rwb->wrblockstart, rwb->wrnblocks, rwb->wrbuffer);
 
       /* Flush cache.  On success, the flush method will return the number
@@ -252,7 +252,7 @@ static ssize_t rwb_writebuffer(FAR struct rwbuffer_s *rwb,
   if (((startblock != rwb->wrexpectedblock) && (rwb->wrnblocks)) ||
       ((rwb->wrnblocks + nblocks) > rwb->wrmaxblocks))
     {
-      fvdbg("writebuffer miss, expected: %08x, given: %08x\n",
+      finfo("writebuffer miss, expected: %08x, given: %08x\n",
             rwb->wrexpectedblock, startblock);
 
       /* Flush the write buffer */
@@ -271,13 +271,13 @@ static ssize_t rwb_writebuffer(FAR struct rwbuffer_s *rwb,
 
   if (rwb->wrnblocks == 0)
     {
-      fvdbg("Fresh cache starting at block: 0x%08x\n", startblock);
+      finfo("Fresh cache starting at block: 0x%08x\n", startblock);
       rwb->wrblockstart = startblock;
     }
 
   /* Add data to cache */
 
-  fvdbg("writebuffer: copying %d bytes from %p to %p\n",
+  finfo("writebuffer: copying %d bytes from %p to %p\n",
         nblocks * rwb->blocksize, wrbuffer,
         &rwb->wrbuffer[rwb->wrnblocks * rwb->blocksize]);
   memcpy(&rwb->wrbuffer[rwb->wrnblocks * rwb->blocksize],
@@ -413,7 +413,7 @@ int rwb_invalidate_writebuffer(FAR struct rwbuffer_s *rwb,
       off_t wrbend;
       off_t invend;
 
-      fvdbg("startblock=%d blockcount=%p\n", startblock, blockcount);
+      finfo("startblock=%d blockcount=%p\n", startblock, blockcount);
 
       rwb_semtake(&rwb->wrsem);
 
@@ -549,7 +549,7 @@ int rwb_invalidate_readahead(FAR struct rwbuffer_s *rwb,
       off_t rhbend;
       off_t invend;
 
-      fvdbg("startblock=%d blockcount=%p\n", startblock, blockcount);
+      finfo("startblock=%d blockcount=%p\n", startblock, blockcount);
 
       rwb_semtake(&rwb->rhsem);
 
@@ -651,7 +651,7 @@ int rwb_initialize(FAR struct rwbuffer_s *rwb)
 #ifdef CONFIG_DRVR_WRITEBUFFER
   if (rwb->wrmaxblocks > 0)
     {
-      fvdbg("Initialize the write buffer\n");
+      finfo("Initialize the write buffer\n");
 
       /* Initialize the write buffer access semaphore */
 
@@ -675,14 +675,14 @@ int rwb_initialize(FAR struct rwbuffer_s *rwb)
             }
         }
 
-      fvdbg("Write buffer size: %d bytes\n", allocsize);
+      finfo("Write buffer size: %d bytes\n", allocsize);
     }
 #endif /* CONFIG_DRVR_WRITEBUFFER */
 
 #ifdef CONFIG_DRVR_READAHEAD
   if (rwb->rhmaxblocks > 0)
     {
-      fvdbg("Initialize the read-ahead buffer\n");
+      finfo("Initialize the read-ahead buffer\n");
 
       /* Initialize the read-ahead buffer access semaphore */
 
@@ -706,7 +706,7 @@ int rwb_initialize(FAR struct rwbuffer_s *rwb)
             }
         }
 
-      fvdbg("Read-ahead buffer size: %d bytes\n", allocsize);
+      finfo("Read-ahead buffer size: %d bytes\n", allocsize);
     }
 #endif /* CONFIG_DRVR_READAHEAD */
 
@@ -753,7 +753,7 @@ ssize_t rwb_read(FAR struct rwbuffer_s *rwb, off_t startblock,
   size_t remaining;
   int ret = OK;
 
-  fvdbg("startblock=%ld nblocks=%ld rdbuffer=%p\n",
+  finfo("startblock=%ld nblocks=%ld rdbuffer=%p\n",
         (long)startblock, (long)nblocks, rdbuffer);
 
 #ifdef CONFIG_DRVR_WRITEBUFFER
@@ -880,7 +880,7 @@ ssize_t rwb_write(FAR struct rwbuffer_s *rwb, off_t startblock,
 #ifdef CONFIG_DRVR_WRITEBUFFER
   if (rwb->wrmaxblocks > 0)
     {
-      fvdbg("startblock=%d wrbuffer=%p\n", startblock, wrbuffer);
+      finfo("startblock=%d wrbuffer=%p\n", startblock, wrbuffer);
 
       /* Use the block cache unless the buffer size is bigger than block cache */
 
diff --git a/drivers/sensors/adxl345_base.c b/drivers/sensors/adxl345_base.c
index 4cf667807d..a1cdeeecdb 100644
--- a/drivers/sensors/adxl345_base.c
+++ b/drivers/sensors/adxl345_base.c
@@ -125,7 +125,7 @@ static ssize_t adxl345_read(FAR struct file *filep, FAR char *buffer, size_t len
   struct adxl345_sample_s   sample;
   int                       ret;
 
-  snvdbg("len=%d\n", len);
+  sninfo("len=%d\n", len);
   DEBUGASSERT(filep);
   inode = filep->f_inode;
 
@@ -196,7 +196,7 @@ int adxl345_register(ADXL345_HANDLE handle, int minor)
   char devname[DEV_NAMELEN];
   int ret;
 
-  snvdbg("handle=%p minor=%d\n", handle, minor);
+  sninfo("handle=%p minor=%d\n", handle, minor);
   DEBUGASSERT(priv);
 
   /* Get exclusive access to the device structure */
@@ -329,7 +329,7 @@ static int adxl345_checkid(FAR struct adxl345_dev_s *priv)
   /* Read device ID  */
 
   devid = adxl345_getreg8(priv, ADXL345_DEVID);
-  snvdbg("devid: %04x\n", devid);
+  sninfo("devid: %04x\n", devid);
 
   if (devid != (uint16_t) DEVID)
     {
diff --git a/drivers/sensors/bmp180.c b/drivers/sensors/bmp180.c
index 2124066fe9..113ad049cc 100644
--- a/drivers/sensors/bmp180.c
+++ b/drivers/sensors/bmp180.c
@@ -314,7 +314,7 @@ static int bmp180_checkid(FAR struct bmp180_dev_s *priv)
   /* Read device ID */
 
   devid = bmp180_getreg8(priv, BMP180_DEVID);
-  snvdbg("devid: 0x%02x\n", devid);
+  sninfo("devid: 0x%02x\n", devid);
 
   if (devid != (uint16_t) DEVID)
     {
@@ -421,8 +421,8 @@ static void bmp180_read_press_temp(FAR struct bmp180_dev_s *priv)
   priv->bmp180_upress |= bmp180_getreg8(priv, BMP180_ADC_OUT_XLSB);
   priv->bmp180_upress = priv->bmp180_upress >> (8 - (oss >> 6));
 
-  snvdbg("Uncompensated temperature = %d\n", priv->bmp180_utemp);
-  snvdbg("Uncompensated pressure = %d\n", priv->bmp180_upress);
+  sninfo("Uncompensated temperature = %d\n", priv->bmp180_utemp);
+  sninfo("Uncompensated pressure = %d\n", priv->bmp180_upress);
 }
 
 /****************************************************************************
@@ -470,7 +470,7 @@ static int bmp180_getpressure(FAR struct bmp180_dev_s *priv)
   x2 = (priv->bmp180_cal_mc << 11) / (x1 + priv->bmp180_cal_md);
   b5 = x1 + x2;
   temp = (b5 + 8) >> 4;
-  snvdbg("Compensated temperature = %d\n", temp);
+  sninfo("Compensated temperature = %d\n", temp);
 
   /* Calculate true pressure */
 
@@ -500,7 +500,7 @@ static int bmp180_getpressure(FAR struct bmp180_dev_s *priv)
 
   press = press + ((x1 + x2 + 3791) >> 4);
 
-  snvdbg("Compressed pressure = %d\n", press);
+  sninfo("Compressed pressure = %d\n", press);
   return press;
 }
 
@@ -633,7 +633,7 @@ int bmp180_register(FAR const char *devpath, FAR struct i2c_master_s *i2c)
       kmm_free(priv);
     }
 
-  snvdbg("BMP180 driver loaded successfully!\n");
+  sninfo("BMP180 driver loaded successfully!\n");
   return ret;
 }
 
diff --git a/drivers/sensors/lsm9ds1.c b/drivers/sensors/lsm9ds1.c
index 10f902aeaa..e6ea884414 100644
--- a/drivers/sensors/lsm9ds1.c
+++ b/drivers/sensors/lsm9ds1.c
@@ -673,7 +673,7 @@ static int lsm9ds1_readreg8(FAR struct lsm9ds1_dev_s *priv, uint8_t regaddr,
       return ret;
     }
 
-  snvdbg("addr: %02x value: %02x\n", regaddr, *regval);
+  sninfo("addr: %02x value: %02x\n", regaddr, *regval);
   return OK;
 }
 
@@ -716,7 +716,7 @@ static int lsm9ds1_writereg8(FAR struct lsm9ds1_dev_s *priv, uint8_t regaddr,
       return ret;
     }
 
-  snvdbg("addr: %02x value: %02x\n", regaddr, regval);
+  sninfo("addr: %02x value: %02x\n", regaddr, regval);
   return OK;
 }
 
diff --git a/drivers/sensors/qencoder.c b/drivers/sensors/qencoder.c
index 34cb029d4c..69053bd357 100644
--- a/drivers/sensors/qencoder.c
+++ b/drivers/sensors/qencoder.c
@@ -128,7 +128,7 @@ static int qe_open(FAR struct file *filep)
   uint8_t                     tmp;
   int                         ret;
 
-  snvdbg("crefs: %d\n", upper->crefs);
+  sninfo("crefs: %d\n", upper->crefs);
 
   /* Get exclusive access to the device structures */
 
@@ -162,7 +162,7 @@ static int qe_open(FAR struct file *filep)
       /* Yes.. perform one time hardware initialization. */
 
       DEBUGASSERT(lower->ops->setup != NULL);
-      snvdbg("calling setup\n");
+      sninfo("calling setup\n");
 
       ret = lower->ops->setup(lower);
       if (ret < 0)
@@ -197,7 +197,7 @@ static int qe_close(FAR struct file *filep)
   FAR struct qe_upperhalf_s *upper = inode->i_private;
   int                         ret;
 
-  snvdbg("crefs: %d\n", upper->crefs);
+  sninfo("crefs: %d\n", upper->crefs);
 
   /* Get exclusive access to the device structures */
 
@@ -227,7 +227,7 @@ static int qe_close(FAR struct file *filep)
       /* Disable the PWM device */
 
       DEBUGASSERT(lower->ops->shutdown != NULL);
-      snvdbg("calling shutdown: %d\n");
+      sninfo("calling shutdown: %d\n");
 
       lower->ops->shutdown(lower);
     }
@@ -284,7 +284,7 @@ static int qe_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
   FAR struct qe_lowerhalf_s *lower = upper->lower;
   int                        ret;
 
-  snvdbg("cmd: %d arg: %ld\n", cmd, arg);
+  sninfo("cmd: %d arg: %ld\n", cmd, arg);
   DEBUGASSERT(upper && lower);
 
   /* Get exclusive access to the device structures */
@@ -326,7 +326,7 @@ static int qe_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       default:
         {
-          snvdbg("Forwarding unrecognized cmd: %d arg: %ld\n", cmd, arg);
+          sninfo("Forwarding unrecognized cmd: %d arg: %ld\n", cmd, arg);
           DEBUGASSERT(lower->ops->ioctl != NULL);
           ret = lower->ops->ioctl(lower, cmd, arg);
         }
@@ -382,7 +382,7 @@ int qe_register(FAR const char *devpath, FAR struct qe_lowerhalf_s *lower)
 
   /* Register the PWM device */
 
-  snvdbg("Registering %s\n", devpath);
+  sninfo("Registering %s\n", devpath);
   return register_driver(devpath, &g_qeops, 0666, upper);
 }
 
diff --git a/drivers/sensors/zerocross.c b/drivers/sensors/zerocross.c
index 980ffdd86c..8ac7665275 100644
--- a/drivers/sensors/zerocross.c
+++ b/drivers/sensors/zerocross.c
@@ -244,7 +244,7 @@ static int zc_open(FAR struct file *filep)
   ret = sem_wait(&priv->exclsem);
   if (ret < 0)
     {
-      snvdbg("ERROR: sem_wait failed: %d\n", ret);
+      sninfo("ERROR: sem_wait failed: %d\n", ret);
       return ret;
     }
 
@@ -253,7 +253,7 @@ static int zc_open(FAR struct file *filep)
   opriv = (FAR struct zc_open_s *)kmm_zalloc(sizeof(struct zc_open_s));
   if (!opriv)
     {
-      snvdbg("ERROR: Failled to allocate open structure\n");
+      sninfo("ERROR: Failled to allocate open structure\n");
       ret = -ENOMEM;
       goto errout_with_sem;
     }
@@ -325,7 +325,7 @@ static int zc_close(FAR struct file *filep)
   ret = sem_wait(&priv->exclsem);
   if (ret < 0)
     {
-      snvdbg("ERROR: sem_wait failed: %d\n", ret);
+      sninfo("ERROR: sem_wait failed: %d\n", ret);
       return ret;
     }
 
@@ -338,7 +338,7 @@ static int zc_close(FAR struct file *filep)
   DEBUGASSERT(curr);
   if (!curr)
     {
-      snvdbg("ERROR: Failed to find open entry\n");
+      sninfo("ERROR: Failed to find open entry\n");
       ret = -ENOENT;
       goto errout_with_exclsem;
     }
@@ -414,7 +414,7 @@ static int zc_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
   FAR struct zc_lowerhalf_s *lower;
   int                        ret;
 
-  snvdbg("cmd: %d arg: %ld\n", cmd, arg);
+  sninfo("cmd: %d arg: %ld\n", cmd, arg);
   DEBUGASSERT(filep && filep->f_priv && filep->f_inode);
   opriv = filep->f_priv;
   inode = filep->f_inode;
@@ -467,7 +467,7 @@ static int zc_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       default:
         {
-          snvdbg("Forwarding unrecognized cmd: %d arg: %ld\n", cmd, arg);
+          sninfo("Forwarding unrecognized cmd: %d arg: %ld\n", cmd, arg);
           ret = -ENOTTY;
         }
         break;
@@ -516,7 +516,7 @@ int zc_register(FAR const char *devname, FAR struct zc_lowerhalf_s *lower)
 
   if (!priv)
     {
-      snvdbg("ERROR: Failed to allocate device structure\n");
+      sninfo("ERROR: Failed to allocate device structure\n");
       return -ENOMEM;
     }
 
@@ -535,7 +535,7 @@ int zc_register(FAR const char *devname, FAR struct zc_lowerhalf_s *lower)
   ret = register_driver(devname, &g_zcops, 0666, priv);
   if (ret < 0)
     {
-      snvdbg("ERROR: register_driver failed: %d\n", ret);
+      sninfo("ERROR: register_driver failed: %d\n", ret);
       sem_destroy(&priv->exclsem);
       kmm_free(priv);
     }
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index 2de293d0b0..fe56f46d44 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -178,7 +178,7 @@ static void uart_pollnotify(FAR uart_dev_t *dev, pollevent_t eventset)
 #endif
           if (fds->revents != 0)
             {
-              fvdbg("Report events: %02x\n", fds->revents);
+              finfo("Report events: %02x\n", fds->revents);
               sem_post(fds->sem);
             }
         }
diff --git a/drivers/serial/uart_16550.c b/drivers/serial/uart_16550.c
index c7de1031a3..af730d6d27 100644
--- a/drivers/serial/uart_16550.c
+++ b/drivers/serial/uart_16550.c
@@ -829,7 +829,7 @@ static int u16550_interrupt(int irq, void *context)
               /* Read the modem status register (MSR) to clear */
 
               status = u16550_serialin(priv, UART_MSR_OFFSET);
-              vdbg("MSR: %02x\n", status);
+              info("MSR: %02x\n", status);
               break;
             }
 
@@ -840,7 +840,7 @@ static int u16550_interrupt(int irq, void *context)
               /* Read the line status register (LSR) to clear */
 
               status = u16550_serialin(priv, UART_LSR_OFFSET);
-              vdbg("LSR: %02x\n", status);
+              info("LSR: %02x\n", status);
               break;
             }
 
diff --git a/drivers/spi/spi_bitbang.c b/drivers/spi/spi_bitbang.c
index 4f8bf7c083..78f1e1c88f 100644
--- a/drivers/spi/spi_bitbang.c
+++ b/drivers/spi/spi_bitbang.c
@@ -91,13 +91,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /****************************************************************************
@@ -193,7 +193,7 @@ static int spi_lock(FAR struct spi_dev_s *dev, bool lock)
 {
   FAR struct spi_bitbang_s *priv = (FAR struct spi_bitbang_s *)dev;
 
-  spivdbg("lock=%d\n", lock);
+  spiinfo("lock=%d\n", lock);
   if (lock)
     {
       /* Take the semaphore (perhaps waiting) */
@@ -236,7 +236,7 @@ static void spi_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
 {
   FAR struct spi_bitbang_s *priv = (FAR struct spi_bitbang_s *)dev;
 
-  spivdbg("devid=%d selected=%d\n", devid, selected);
+  spiinfo("devid=%d selected=%d\n", devid, selected);
   DEBUGASSERT(priv && priv->low->select);
   priv->low->select(priv, devid, selected);
 }
@@ -263,7 +263,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
 
   DEBUGASSERT(priv && priv->low->setfrequency);
   actual = priv->low->setfrequency(priv, frequency);
-  spivdbg("frequency=%d holdtime=%d actual=%d\n",
+  spiinfo("frequency=%d holdtime=%d actual=%d\n",
           frequency, priv->holdtime, actual);
   return actual;
 }
@@ -289,7 +289,7 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode)
 
   DEBUGASSERT(priv && priv->low->setmode);
   priv->low->setmode(priv, mode);
-  spivdbg("mode=%d exchange=%p\n", mode, priv->exchange);
+  spiinfo("mode=%d exchange=%p\n", mode, priv->exchange);
 }
 
 /****************************************************************************
@@ -312,11 +312,11 @@ static void spi_setbits(FAR struct spi_dev_s *dev, int nbits)
 #ifdef CONFIG_SPI_BITBANG_VARWIDTH
   FAR struct spi_bitbang_s *priv = (FAR struct spi_bitbang_s *)dev;
 
-  spivdbg("nbits=%d\n", nbits);
+  spiinfo("nbits=%d\n", nbits);
   DEBUGASSERT(priv && nbits > 0 && nbits <= 16);
   priv->nbits = nbits;
 #else
-  spivdbg("nbits=%d\n", nbits);
+  spiinfo("nbits=%d\n", nbits);
   DEBUGASSERT(nbits == 8);
 #endif
 }
@@ -376,7 +376,7 @@ static void spi_exchange(FAR struct spi_dev_s *dev,
   uint16_t dataout;
   uint16_t datain;
 
-  spivdbg("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords);
+  spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords);
   DEBUGASSERT(priv && priv->low && priv->low->exchange);
 
   /* If there is no data source, send 0xff */
diff --git a/drivers/timers/ds3231.c b/drivers/timers/ds3231.c
index 7efaaecb03..cc45f4b29e 100644
--- a/drivers/timers/ds3231.c
+++ b/drivers/timers/ds3231.c
@@ -85,14 +85,14 @@
 
 #ifdef CONFIG_DEBUG_RTC
 #  define rtcdbg    dbg
-#  define rtcvdbg   vdbg
+#  define rtcinfo   info
 #  define rtclldbg  lldbg
-#  define rtcllvdbg llvdbg
+#  define rtcllinfo llinfo
 #else
 #  define rtcdbg(x...)
-#  define rtcvdbg(x...)
+#  define rtcinfo(x...)
 #  define rtclldbg(x...)
-#  define rtcllvdbg(x...)
+#  define rtcllinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/drivers/timers/pcf85263.c b/drivers/timers/pcf85263.c
index 0128e354f2..b513c9f8ac 100644
--- a/drivers/timers/pcf85263.c
+++ b/drivers/timers/pcf85263.c
@@ -85,14 +85,14 @@
 
 #ifdef CONFIG_DEBUG_RTC
 #  define rtcdbg    dbg
-#  define rtcvdbg   vdbg
+#  define rtcinfo   info
 #  define rtclldbg  lldbg
-#  define rtcllvdbg llvdbg
+#  define rtcllinfo llinfo
 #else
 #  define rtcdbg(x...)
-#  define rtcvdbg(x...)
+#  define rtcinfo(x...)
 #  define rtclldbg(x...)
-#  define rtcllvdbg(x...)
+#  define rtcllinfo(x...)
 #endif
 
 /************************************************************************************
diff --git a/drivers/timers/timer.c b/drivers/timers/timer.c
index afdd39a39e..2a976cc22c 100644
--- a/drivers/timers/timer.c
+++ b/drivers/timers/timer.c
@@ -65,14 +65,14 @@
 
 #ifdef CONFIG_DEBUG_TIMER
 #  define tmrdbg    dbg
-#  define tmrvdbg   vdbg
+#  define tmrinfo   info
 #  define tmrlldbg  lldbg
-#  define tmrllvdbg llvdbg
+#  define tmrllinfo llinfo
 #else
 #  define tmrdbg(x...)
-#  define tmrvdbg(x...)
+#  define tmrinfo(x...)
 #  define tmrlldbg(x...)
-#  define tmrllvdbg(x...)
+#  define tmrllinfo(x...)
 #endif
 
 /****************************************************************************
@@ -143,7 +143,7 @@ static int timer_open(FAR struct file *filep)
   uint8_t                          tmp;
   int                              ret;
 
-  tmrvdbg("crefs: %d\n", upper->crefs);
+  tmrinfo("crefs: %d\n", upper->crefs);
 
   /* Increment the count of references to the device.  If this the first
    * time that the driver has been opened for this device, then initialize
@@ -181,7 +181,7 @@ static int timer_close(FAR struct file *filep)
   FAR struct inode *inode = filep->f_inode;
   FAR struct timer_upperhalf_s *upper = inode->i_private;
 
-  tmrvdbg("crefs: %d\n", upper->crefs);
+  tmrinfo("crefs: %d\n", upper->crefs);
 
   /* Decrement the references to the driver.  If the reference count will
    * decrement to 0, then uninitialize the driver.
@@ -240,7 +240,7 @@ static int timer_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
   FAR struct timer_lowerhalf_s *lower = upper->lower;
   int                           ret;
 
-  tmrvdbg("cmd: %d arg: %ld\n", cmd, arg);
+  tmrinfo("cmd: %d arg: %ld\n", cmd, arg);
   DEBUGASSERT(upper && lower);
 
   /* Handle built-in ioctl commands */
@@ -384,7 +384,7 @@ static int timer_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
     default:
       {
-        tmrvdbg("Forwarding unrecognized cmd: %d arg: %ld\n", cmd, arg);
+        tmrinfo("Forwarding unrecognized cmd: %d arg: %ld\n", cmd, arg);
 
         /* An ioctl commands that are not recognized by the "upper-half"
          * driver are forwarded to the lower half driver through this
@@ -443,7 +443,7 @@ FAR void *timer_register(FAR const char *path,
   int ret;
 
   DEBUGASSERT(path && lower);
-  tmrvdbg("Entry: path=%s\n", path);
+  tmrinfo("Entry: path=%s\n", path);
 
   /* Allocate the upper-half data structure */
 
@@ -517,7 +517,7 @@ void timer_unregister(FAR void *handle)
   lower = upper->lower;
   DEBUGASSERT(upper && lower);
 
-  tmrvdbg("Unregistering: %s\n", upper->path);
+  tmrinfo("Unregistering: %s\n", upper->path);
 
   /* Disable the timer */
 
diff --git a/drivers/timers/watchdog.c b/drivers/timers/watchdog.c
index e6bef99ac1..b538d1c55b 100644
--- a/drivers/timers/watchdog.c
+++ b/drivers/timers/watchdog.c
@@ -64,14 +64,14 @@
 
 #ifdef CONFIG_DEBUG_WATCHDOG
 #  define wddbg    dbg
-#  define wdvdbg   vdbg
+#  define wdinfo   info
 #  define wdlldbg  lldbg
-#  define wdllvdbg llvdbg
+#  define wdllinfo llinfo
 #else
 #  define wddbg(x...)
-#  define wdvdbg(x...)
+#  define wdinfo(x...)
 #  define wdlldbg(x...)
-#  define wdllvdbg(x...)
+#  define wdllinfo(x...)
 #endif
 
 /****************************************************************************
@@ -140,7 +140,7 @@ static int wdog_open(FAR struct file *filep)
   uint8_t                          tmp;
   int                              ret;
 
-  wdvdbg("crefs: %d\n", upper->crefs);
+  wdinfo("crefs: %d\n", upper->crefs);
 
   /* Get exclusive access to the device structures */
 
@@ -191,7 +191,7 @@ static int wdog_close(FAR struct file *filep)
   FAR struct watchdog_upperhalf_s *upper = inode->i_private;
   int                              ret;
 
-  wdvdbg("crefs: %d\n", upper->crefs);
+  wdinfo("crefs: %d\n", upper->crefs);
 
   /* Get exclusive access to the device structures */
 
@@ -262,7 +262,7 @@ static int wdog_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
   FAR struct watchdog_lowerhalf_s *lower = upper->lower;
   int                              ret;
 
-  wdvdbg("cmd: %d arg: %ld\n", cmd, arg);
+  wdinfo("cmd: %d arg: %ld\n", cmd, arg);
   DEBUGASSERT(upper && lower);
 
   /* Get exclusive access to the device structures */
@@ -418,7 +418,7 @@ static int wdog_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
     default:
       {
-        wdvdbg("Forwarding unrecognized cmd: %d arg: %ld\n", cmd, arg);
+        wdinfo("Forwarding unrecognized cmd: %d arg: %ld\n", cmd, arg);
 
         /* An ioctl commands that are not recognized by the "upper-half"
          * driver are forwarded to the lower half driver through this
@@ -478,7 +478,7 @@ FAR void *watchdog_register(FAR const char *path,
   int ret;
 
   DEBUGASSERT(path && lower);
-  wdvdbg("Entry: path=%s\n", path);
+  wdinfo("Entry: path=%s\n", path);
 
   /* Allocate the upper-half data structure */
 
@@ -554,7 +554,7 @@ void watchdog_unregister(FAR void *handle)
   lower = upper->lower;
   DEBUGASSERT(upper && lower);
 
-  wdvdbg("Unregistering: %s\n", upper->path);
+  wdinfo("Unregistering: %s\n", upper->path);
 
   /* Disable the watchdog timer */
 
diff --git a/drivers/usbdev/cdcacm.c b/drivers/usbdev/cdcacm.c
index 6767fd8e52..ab48720c21 100644
--- a/drivers/usbdev/cdcacm.c
+++ b/drivers/usbdev/cdcacm.c
@@ -358,7 +358,7 @@ static int cdcacm_sndpacket(FAR struct cdcacm_dev_s *priv)
    * to be sent).
    */
 
-  uvdbg("head=%d tail=%d nwrq=%d empty=%d\n",
+  uinfo("head=%d tail=%d nwrq=%d empty=%d\n",
         priv->serdev.xmit.head, priv->serdev.xmit.tail,
         priv->nwrq, sq_empty(&priv->reqlist));
 
@@ -427,7 +427,7 @@ static inline int cdcacm_recvpacket(FAR struct cdcacm_dev_s *priv,
   uint16_t nexthead;
   uint16_t nbytes = 0;
 
-  uvdbg("head=%d tail=%d nrdq=%d reqlen=%d\n",
+  uinfo("head=%d tail=%d nrdq=%d reqlen=%d\n",
         priv->serdev.recv.head, priv->serdev.recv.tail, priv->nrdq, reqlen);
 
   /* Get the next head index. During the time that RX interrupts are disabled, the
@@ -1276,7 +1276,7 @@ static int cdcacm_setup(FAR struct usbdevclass_driver_s *driver,
   index = GETUINT16(ctrl->index);
   len   = GETUINT16(ctrl->len);
 
-  uvdbg("type=%02x req=%02x value=%04x index=%04x len=%04x\n",
+  uinfo("type=%02x req=%02x value=%04x index=%04x len=%04x\n",
         ctrl->type, ctrl->req, value, index, len);
 
   if ((ctrl->type & USB_REQ_TYPE_MASK) == USB_REQ_TYPE_STANDARD)
@@ -2208,7 +2208,7 @@ static void cdcuart_txint(FAR struct uart_dev_s *dev, bool enable)
    * send the next packet now.
    */
 
-  uvdbg("enable=%d head=%d tail=%d\n",
+  uinfo("enable=%d head=%d tail=%d\n",
         enable, priv->serdev.xmit.head, priv->serdev.xmit.tail);
 
   if (enable && priv->serdev.xmit.head != priv->serdev.xmit.tail)
diff --git a/drivers/usbdev/composite.c b/drivers/usbdev/composite.c
index b0f0c95c9c..7a4f3fdc24 100644
--- a/drivers/usbdev/composite.c
+++ b/drivers/usbdev/composite.c
@@ -431,7 +431,7 @@ static int composite_setup(FAR struct usbdevclass_driver_s *driver,
   index     = GETUINT16(ctrl->index);
   len       = GETUINT16(ctrl->len);
 
-  uvdbg("type=%02x req=%02x value=%04x index=%04x len=%04x\n",
+  uinfo("type=%02x req=%02x value=%04x index=%04x len=%04x\n",
         ctrl->type, ctrl->req, value, index, len);
   UNUSED(index);
 
diff --git a/drivers/usbdev/pl2303.c b/drivers/usbdev/pl2303.c
index 92285c01d1..0a07ebaa66 100644
--- a/drivers/usbdev/pl2303.c
+++ b/drivers/usbdev/pl2303.c
@@ -617,7 +617,7 @@ static int usbclass_sndpacket(FAR struct pl2303_dev_s *priv)
    * to be sent).
    */
 
-  uvdbg("head=%d tail=%d nwrq=%d empty=%d\n",
+  uinfo("head=%d tail=%d nwrq=%d empty=%d\n",
         priv->serdev.xmit.head, priv->serdev.xmit.tail,
         priv->nwrq, sq_empty(&priv->reqlist));
 
@@ -1644,7 +1644,7 @@ static int usbclass_setup(FAR struct usbdevclass_driver_s *driver,
   index = GETUINT16(ctrl->index);
   len   = GETUINT16(ctrl->len);
 
-  uvdbg("type=%02x req=%02x value=%04x index=%04x len=%04x\n",
+  uinfo("type=%02x req=%02x value=%04x index=%04x len=%04x\n",
         ctrl->type, ctrl->req, value, index, len);
 
   switch (ctrl->type & USB_REQ_TYPE_MASK)
@@ -2227,7 +2227,7 @@ static void usbser_txint(FAR struct uart_dev_s *dev, bool enable)
    * send the next packet now.
    */
 
-  uvdbg("enable=%d head=%d tail=%d\n",
+  uinfo("enable=%d head=%d tail=%d\n",
         enable, priv->serdev.xmit.head, priv->serdev.xmit.tail);
 
   if (enable && priv->serdev.xmit.head != priv->serdev.xmit.tail)
diff --git a/drivers/usbdev/usbmsc.c b/drivers/usbdev/usbmsc.c
index 9e646c9509..34873c1a81 100644
--- a/drivers/usbdev/usbmsc.c
+++ b/drivers/usbdev/usbmsc.c
@@ -549,7 +549,7 @@ static int usbmsc_setup(FAR struct usbdevclass_driver_s *driver,
   index = GETUINT16(ctrl->index);
   len   = GETUINT16(ctrl->len);
 
-  uvdbg("type=%02x req=%02x value=%04x index=%04x len=%04x\n",
+  uinfo("type=%02x req=%02x value=%04x index=%04x len=%04x\n",
         ctrl->type, ctrl->req, value, index, len);
 
   if ((ctrl->type & USB_REQ_TYPE_MASK) == USB_REQ_TYPE_STANDARD)
@@ -1652,7 +1652,7 @@ int usbmsc_exportluns(FAR void *handle)
 
   g_usbmsc_handoff = priv;
 
-  uvdbg("Starting SCSI worker thread\n");
+  uinfo("Starting SCSI worker thread\n");
   priv->thpid = kernel_thread("scsid", CONFIG_USBMSC_SCSI_PRIO,
                               CONFIG_USBMSC_SCSI_STACKSIZE,
                               usbmsc_scsi_main, NULL);
@@ -1664,7 +1664,7 @@ int usbmsc_exportluns(FAR void *handle)
 
   /* Wait for the worker thread to run and initialize */
 
-  uvdbg("Waiting for the SCSI worker thread\n");
+  uinfo("Waiting for the SCSI worker thread\n");
   usbmsc_sync_wait(priv);
   DEBUGASSERT(g_usbmsc_handoff == NULL);
 
@@ -1681,7 +1681,7 @@ int usbmsc_exportluns(FAR void *handle)
 
   /* Signal to start the thread */
 
-  uvdbg("Signalling for the SCSI worker thread\n");
+  uinfo("Signalling for the SCSI worker thread\n");
   flags = enter_critical_section();
   priv->theventset |= USBMSC_EVENT_READY;
   usbmsc_scsi_signal(priv);
diff --git a/drivers/usbdev/usbmsc_scsi.c b/drivers/usbdev/usbmsc_scsi.c
index 72bc3a8f97..66f2b586b9 100644
--- a/drivers/usbdev/usbmsc_scsi.c
+++ b/drivers/usbdev/usbmsc_scsi.c
@@ -2622,7 +2622,7 @@ int usbmsc_scsi_main(int argc, char *argv[])
   uint16_t eventset;
   int ret;
 
-  uvdbg("Started\n");
+  uinfo("Started\n");
 
   /* Get the SCSI state data handed off from the initialization logic */
 
@@ -2636,7 +2636,7 @@ int usbmsc_scsi_main(int argc, char *argv[])
    * wait here until we are told to begin.  Start in the NOTINITIALIZED state
    */
 
-  uvdbg("Waiting to be signalled\n");
+  uinfo("Waiting to be signalled\n");
   usbmsc_scsi_lock(priv);
   priv->thstate = USBMSC_STATE_STARTED;
   while ((priv->theventset & USBMSC_EVENT_READY) != 0 &&
@@ -2645,7 +2645,7 @@ int usbmsc_scsi_main(int argc, char *argv[])
       usbmsc_scsi_wait(priv);
     }
 
-  uvdbg("Running\n");
+  uinfo("Running\n");
 
   /* Transition to the INITIALIZED/IDLE state */
 
diff --git a/drivers/usbhost/usbhost_cdcacm.c b/drivers/usbhost/usbhost_cdcacm.c
index 2799356b69..6b7ef9d020 100644
--- a/drivers/usbhost/usbhost_cdcacm.c
+++ b/drivers/usbhost/usbhost_cdcacm.c
@@ -512,7 +512,7 @@ static FAR struct usbhost_cdcacm_s *usbhost_allocclass(void)
     }
 
   leave_critical_section(flags);
-  uvdbg("Allocated: %p\n", entry);
+  uinfo("Allocated: %p\n", entry);
   return (FAR struct usbhost_cdcacm_s *)entry;
 }
 #else
@@ -526,7 +526,7 @@ static FAR struct usbhost_cdcacm_s *usbhost_allocclass(void)
 
   DEBUGASSERT(!up_interrupt_context());
   priv = (FAR struct usbhost_cdcacm_s *)kmm_malloc(sizeof(struct usbhost_cdcacm_s));
-  uvdbg("Allocated: %p\n", priv);
+  uinfo("Allocated: %p\n", priv);
   return priv;
 }
 #endif
@@ -552,7 +552,7 @@ static void usbhost_freeclass(FAR struct usbhost_cdcacm_s *usbclass)
   irqstate_t flags;
   DEBUGASSERT(entry != NULL);
 
-  uvdbg("Freeing: %p\n", entry);
+  uinfo("Freeing: %p\n", entry);
 
   /* Just put the pre-allocated class structure back on the freelist */
 
@@ -570,7 +570,7 @@ static void usbhost_freeclass(FAR struct usbhost_cdcacm_s *usbclass)
    * from an interrupt handler.
    */
 
-  uvdbg("Freeing: %p\n", usbclass);
+  uinfo("Freeing: %p\n", usbclass);
   sched_kfree(usbclass);
 }
 #endif
@@ -743,7 +743,7 @@ static void usbhost_notification_work(FAR void *arg)
           index = usbhost_getle16(inmsg->index);
           len   = usbhost_getle16(inmsg->len);
 
-          uvdbg("type: %02x notification: %02x value: %04x index: %04x len: %04x\n",
+          uinfo("type: %02x notification: %02x value: %04x index: %04x len: %04x\n",
                  inmsg->type, inmsg->notification, value, index, len);
 
           /* We care only about the SerialState notification */
@@ -764,7 +764,7 @@ static void usbhost_notification_work(FAR void *arg)
               priv->dcd = ((state & CDC_UART_RXCARRIER) != 0);
               priv->dsr = ((state & CDC_UART_TXCARRIER) != 0);
 
-              uvdbg("ACM_SERIAL_STATE: DCD=%d DSR=%d\n",
+              uinfo("ACM_SERIAL_STATE: DCD=%d DSR=%d\n",
                     priv->dcd, priv->dsr);
             }
         }
@@ -1224,7 +1224,7 @@ static void usbhost_destroy(FAR void *arg)
   DEBUGASSERT(priv != NULL && priv->usbclass.hport != NULL);
   hport = priv->usbclass.hport;
 
-  uvdbg("crefs: %d\n", priv->crefs);
+  uinfo("crefs: %d\n", priv->crefs);
 
   /* Unregister the serial lower half driver */
 
@@ -1365,7 +1365,7 @@ static int usbhost_cfgdesc(FAR struct usbhost_cdcacm_s *priv,
           {
             FAR struct usb_ifdesc_s *ifdesc = (FAR struct usb_ifdesc_s *)configdesc;
 
-            uvdbg("Interface descriptor: class: %d subclass: %d proto: %d\n",
+            uinfo("Interface descriptor: class: %d subclass: %d proto: %d\n",
                   ifdesc->classid, ifdesc->subclass, ifdesc->protocol);
             DEBUGASSERT(remaining >= USB_SIZEOF_IFDESC);
 
@@ -1411,7 +1411,7 @@ static int usbhost_cfgdesc(FAR struct usbhost_cdcacm_s *priv,
           {
             FAR struct usb_epdesc_s *epdesc = (FAR struct usb_epdesc_s *)configdesc;
 
-            uvdbg("Endpoint descriptor: currif: %02x attr: %02x\n",
+            uinfo("Endpoint descriptor: currif: %02x attr: %02x\n",
                   currif, epdesc->attr);
             DEBUGASSERT(remaining >= USB_SIZEOF_EPDESC);
 
@@ -1448,7 +1448,7 @@ static int usbhost_cfgdesc(FAR struct usbhost_cdcacm_s *priv,
                     boutdesc.interval     = epdesc->interval;
                     boutdesc.mxpacketsize = usbhost_getle16(epdesc->mxpacketsize);
 
-                    uvdbg("Bulk OUT EP addr:%d mxpacketsize:%d\n",
+                    uinfo("Bulk OUT EP addr:%d mxpacketsize:%d\n",
                           boutdesc.addr, boutdesc.mxpacketsize);
                   }
                 else
@@ -1476,7 +1476,7 @@ static int usbhost_cfgdesc(FAR struct usbhost_cdcacm_s *priv,
                     bindesc.xfrtype      = USB_EP_ATTR_XFER_BULK;
                     bindesc.interval     = epdesc->interval;
                     bindesc.mxpacketsize = usbhost_getle16(epdesc->mxpacketsize);
-                    uvdbg("Bulk IN EP addr:%d mxpacketsize:%d\n",
+                    uinfo("Bulk IN EP addr:%d mxpacketsize:%d\n",
                           bindesc.addr, bindesc.mxpacketsize);
                   }
               }
@@ -1520,7 +1520,7 @@ static int usbhost_cfgdesc(FAR struct usbhost_cdcacm_s *priv,
                     iindesc.interval     = epdesc->interval;
                     iindesc.mxpacketsize = usbhost_getle16(epdesc->mxpacketsize);
 
-                    uvdbg("Interrupt IN EP addr:%d mxpacketsize:%d\n",
+                    uinfo("Interrupt IN EP addr:%d mxpacketsize:%d\n",
                           boutdesc.addr, boutdesc.mxpacketsize);
 #else
                     found |= USBHOST_CTRLIF_FOUND;
@@ -1597,7 +1597,7 @@ static int usbhost_cfgdesc(FAR struct usbhost_cdcacm_s *priv,
     }
 #endif
 
-  uvdbg("Endpoints allocated\n");
+  uinfo("Endpoints allocated\n");
   return OK;
 }
 
@@ -2029,7 +2029,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass,
    * driver */
 
   usbhost_mkdevname(priv, devname);
-  uvdbg("Register device: %s\n", devname);
+  uinfo("Register device: %s\n", devname);
 
   ret = uart_register(devname, &priv->uartdev);
   if (ret < 0)
@@ -2045,7 +2045,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass,
     {
       /* Begin monitoring of port status change events */
 
-      uvdbg("Start notification monitoring\n");
+      uinfo("Start notification monitoring\n");
       ret = DRVR_ASYNCH(hport->drvr, priv->intin,
                         (FAR uint8_t *)priv->notification,
                         MAX_NOTIFICATION, usbhost_notification_callback,
@@ -2156,7 +2156,7 @@ static int usbhost_disconnected(struct usbhost_class_s *usbclass)
    * serial driver.
    */
 
-  uvdbg("crefs: %d\n", priv->crefs);
+  uinfo("crefs: %d\n", priv->crefs);
   if (priv->crefs == 1)
     {
       /* Destroy the class instance.  If we are executing from an interrupt
@@ -2168,7 +2168,7 @@ static int usbhost_disconnected(struct usbhost_class_s *usbclass)
         {
           /* Destroy the instance on the worker thread. */
 
-          uvdbg("Queuing destruction: worker %p->%p\n",
+          uinfo("Queuing destruction: worker %p->%p\n",
                 priv->ntwork.worker, usbhost_destroy);
 
           DEBUGASSERT(work_available(&priv->ntwork));
@@ -2204,7 +2204,7 @@ static int usbhost_setup(FAR struct uart_dev_s *uartdev)
   irqstate_t flags;
   int ret;
 
-  uvdbg("Entry\n");
+  uinfo("Entry\n");
   DEBUGASSERT(uartdev && uartdev->priv);
   priv = (FAR struct usbhost_cdcacm_s *)uartdev->priv;
 
@@ -2255,7 +2255,7 @@ static void usbhost_shutdown(FAR struct uart_dev_s *uartdev)
   FAR struct usbhost_cdcacm_s *priv;
   irqstate_t flags;
 
-  uvdbg("Entry\n");
+  uinfo("Entry\n");
   DEBUGASSERT(uartdev && uartdev->priv);
   priv = (FAR struct usbhost_cdcacm_s *)uartdev->priv;
 
@@ -2343,7 +2343,7 @@ static int usbhost_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
   struct usbhost_cdcacm_s *priv;
   int ret;
 
-  uvdbg("Entry\n");
+  uinfo("Entry\n");
   DEBUGASSERT(filep && filep->f_inode);
   inode = filep->f_inode;
 
diff --git a/drivers/usbhost/usbhost_enumerate.c b/drivers/usbhost/usbhost_enumerate.c
index 647d0ab7a9..0bb30d961b 100644
--- a/drivers/usbhost/usbhost_enumerate.c
+++ b/drivers/usbhost/usbhost_enumerate.c
@@ -143,7 +143,7 @@ static inline int usbhost_devdesc(FAR const struct usb_devdesc_s *devdesc,
   id->vid = usbhost_getle16(devdesc->vendor);
   id->pid = usbhost_getle16(devdesc->product);
 
-  uvdbg("class:%d subclass:%04x protocol:%04x vid:%d pid:%d\n",
+  uinfo("class:%d subclass:%04x protocol:%04x vid:%d pid:%d\n",
         id->base, id->subclass, id->proto, id->vid, id->pid);
   return OK;
 }
@@ -169,7 +169,7 @@ static inline int usbhost_configdesc(const uint8_t *configdesc, int cfglen,
   /* Verify that we were passed a configuration descriptor */
 
   cfgdesc = (struct usb_cfgdesc_s *)configdesc;
-  uvdbg("cfg len:%d total len:%d\n", cfgdesc->len, cfglen);
+  uinfo("cfg len:%d total len:%d\n", cfgdesc->len, cfglen);
 
   if (cfgdesc->type != USB_DESC_TYPE_CONFIG)
     {
@@ -200,7 +200,7 @@ static inline int usbhost_configdesc(const uint8_t *configdesc, int cfglen,
           id->base     = ifdesc->classid;
           id->subclass = ifdesc->subclass;
           id->proto    = ifdesc->protocol;
-          uvdbg("class:%d subclass:%d protocol:%d\n",
+          uinfo("class:%d subclass:%d protocol:%d\n",
                 id->base, id->subclass, id->proto);
           return OK;
         }
@@ -235,7 +235,7 @@ static inline int usbhost_classbind(FAR struct usbhost_hubport_s *hport,
   /* Is there is a class implementation registered to support this device. */
 
   reg = usbhost_findclass(id);
-  uvdbg("usbhost_findclass: %p\n", reg);
+  uinfo("usbhost_findclass: %p\n", reg);
   if (reg != NULL)
     {
       /* Yes.. there is a class for this device.  Get an instance of
@@ -244,7 +244,7 @@ static inline int usbhost_classbind(FAR struct usbhost_hubport_s *hport,
 
       ret = -ENOMEM;
       devclass = CLASS_CREATE(reg, hport, id);
-      uvdbg("CLASS_CREATE: %p\n", devclass);
+      uinfo("CLASS_CREATE: %p\n", devclass);
       if (devclass != NULL)
         {
           /* Then bind the newly instantiated class instance */
@@ -266,7 +266,7 @@ static inline int usbhost_classbind(FAR struct usbhost_hubport_s *hport,
         }
     }
 
-  uvdbg("Returning: %d\n", ret);
+  uinfo("Returning: %d\n", ret);
   return ret;
 }
 
@@ -389,7 +389,7 @@ int usbhost_enumerate(FAR struct usbhost_hubport_s *hport,
   /* Extract the correct max packetsize from the device descriptor */
 
   maxpacketsize = ((struct usb_devdesc_s *)buffer)->mxpacketsize;
-  uvdbg("maxpacksetsize: %d\n", maxpacketsize);
+  uinfo("maxpacksetsize: %d\n", maxpacketsize);
 
   /* And reconfigure EP0 with the correct maximum packet size */
 
@@ -481,7 +481,7 @@ int usbhost_enumerate(FAR struct usbhost_hubport_s *hport,
   /* Extract the full size of the configuration data */
 
   cfglen = (unsigned int)usbhost_getle16(((struct usb_cfgdesc_s *)buffer)->totallen);
-  uvdbg("sizeof config data: %d\n", cfglen);
+  uinfo("sizeof config data: %d\n", cfglen);
 
   /* Get all of the configuration descriptor data, index == 0 (Should not be
    * hard-coded!)
diff --git a/drivers/usbhost/usbhost_findclass.c b/drivers/usbhost/usbhost_findclass.c
index b544b60f48..7ae1cad4dc 100644
--- a/drivers/usbhost/usbhost_findclass.c
+++ b/drivers/usbhost/usbhost_findclass.c
@@ -72,7 +72,7 @@
 static bool usbhost_idmatch(const struct usbhost_id_s *classid,
                             const struct usbhost_id_s *devid)
 {
-  uvdbg("Compare to class:%d subclass:%d protocol:%d vid:%04x pid:%04x\n",
+  uinfo("Compare to class:%d subclass:%d protocol:%d vid:%04x pid:%04x\n",
          classid->base, classid->subclass, classid->proto,
          classid->vid, classid->pid);
 
@@ -142,7 +142,7 @@ const struct usbhost_registry_s *usbhost_findclass(const struct usbhost_id_s *id
   int ndx;
 
   DEBUGASSERT(id);
-  uvdbg("Looking for class:%d subclass:%d protocol:%d vid:%04x pid:%04x\n",
+  uinfo("Looking for class:%d subclass:%d protocol:%d vid:%04x pid:%04x\n",
         id->base, id->subclass, id->proto, id->vid, id->pid);
 
   /* g_classregistry is a singly-linked list of class ID information added by
@@ -161,7 +161,7 @@ const struct usbhost_registry_s *usbhost_findclass(const struct usbhost_id_s *id
        * protocol, then try each.
        */
 
-     uvdbg("Checking class:%p nids:%d\n", usbclass, usbclass->nids);
+     uinfo("Checking class:%p nids:%d\n", usbclass, usbclass->nids);
      for (ndx = 0; ndx < usbclass->nids; ndx++)
         {
           /* Did we find a matching ID? */
diff --git a/drivers/usbhost/usbhost_hidkbd.c b/drivers/usbhost/usbhost_hidkbd.c
index e11d02709b..5df339962d 100644
--- a/drivers/usbhost/usbhost_hidkbd.c
+++ b/drivers/usbhost/usbhost_hidkbd.c
@@ -180,10 +180,10 @@
 #  define idbg    udbg
 #  undef  illdbg
 #  define illdbg  ulldbg
-#  undef  ivdbg
-#  define ivdbg   uvdbg
-#  undef  illvdbg
-#  define illvdbg ullvdbg
+#  undef  iinfo
+#  define iinfo   uinfo
+#  undef  illinfo
+#  define illinfo ullinfo
 #endif
 
 /****************************************************************************
@@ -631,7 +631,7 @@ static void usbhost_pollnotify(FAR struct usbhost_state_s *priv)
           fds->revents |= (fds->events & POLLIN);
           if (fds->revents != 0)
             {
-              uvdbg("Report events: %02x\n", fds->revents);
+              uinfo("Report events: %02x\n", fds->revents);
               sem_post(fds->sem);
             }
         }
@@ -664,7 +664,7 @@ static inline FAR struct usbhost_state_s *usbhost_allocclass(void)
 
   DEBUGASSERT(!up_interrupt_context());
   priv = (FAR struct usbhost_state_s *)kmm_malloc(sizeof(struct usbhost_state_s));
-  uvdbg("Allocated: %p\n", priv);
+  uinfo("Allocated: %p\n", priv);
   return priv;
 }
 
@@ -688,7 +688,7 @@ static inline void usbhost_freeclass(FAR struct usbhost_state_s *usbclass)
 
   /* Free the class instance. */
 
-  uvdbg("Freeing: %p\n", usbclass);
+  uinfo("Freeing: %p\n", usbclass);
   sched_kfree(usbclass);
 }
 
@@ -764,11 +764,11 @@ static void usbhost_destroy(FAR void *arg)
   DEBUGASSERT(priv != NULL && priv->usbclass.hport != NULL);
   hport = priv->usbclass.hport;
 
-  uvdbg("crefs: %d\n", priv->crefs);
+  uinfo("crefs: %d\n", priv->crefs);
 
   /* Unregister the driver */
 
-  uvdbg("Unregister driver\n");
+  uinfo("Unregister driver\n");
   usbhost_mkdevname(priv, devname);
   (void)unregister_driver(devname);
 
@@ -965,7 +965,7 @@ static inline void usbhost_encodescancode(FAR struct usbhost_state_s *priv,
       /* Yes the value is within range */
 
       encoded = encoding[scancode - FIRST_ENCODING];
-      ivdbg("  scancode: %02x modifier: %02x encoded: %d\n",
+      iinfo("  scancode: %02x modifier: %02x encoded: %d\n",
             scancode, modifier, encoded);
 
       if (encoded)
@@ -1019,7 +1019,7 @@ static int usbhost_kbdpoll(int argc, char *argv[])
   bool newstate;
   int ret;
 
-  uvdbg("Started\n");
+  uinfo("Started\n");
 
   /* Synchronize with the start-up logic.  Get the private instance, re-start
    * the start-up logic, and wait a bit to make sure that all of the class
@@ -1041,7 +1041,7 @@ static int usbhost_kbdpoll(int argc, char *argv[])
 
   /* Loop here until the device is disconnected */
 
-  uvdbg("Entering poll loop\n");
+  uinfo("Entering poll loop\n");
 
   while (!priv->disconnected)
     {
@@ -1143,7 +1143,7 @@ static int usbhost_kbdpoll(int argc, char *argv[])
                    */
 
                   keycode = usbhost_mapscancode(rpt->key[i], rpt->modifier);
-                  ivdbg("Key %d: %02x keycode:%c modifier: %02x\n",
+                  iinfo("Key %d: %02x keycode:%c modifier: %02x\n",
                          i, rpt->key[i], keycode ? keycode : ' ', rpt->modifier);
 
                   /* Zero at this point means that the key does not map to a
@@ -1390,7 +1390,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
           {
             FAR struct usb_ifdesc_s *ifdesc = (FAR struct usb_ifdesc_s *)configdesc;
 
-            uvdbg("Interface descriptor\n");
+            uinfo("Interface descriptor\n");
             DEBUGASSERT(remaining >= USB_SIZEOF_IFDESC);
 
             /* Did we already find what we needed from a preceding interface? */
@@ -1418,7 +1418,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
         /* HID descriptor */
 
         case USBHID_DESCTYPE_HID:
-            uvdbg("HID descriptor\n");
+            uinfo("HID descriptor\n");
             break;
 
         /* Endpoint descriptor.  We expect one or two interrupt endpoints,
@@ -1429,7 +1429,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
           {
             FAR struct usb_epdesc_s *epdesc = (FAR struct usb_epdesc_s *)configdesc;
 
-            uvdbg("Endpoint descriptor\n");
+            uinfo("Endpoint descriptor\n");
             DEBUGASSERT(remaining >= USB_SIZEOF_EPDESC);
 
             /* Check for an interrupt endpoint. */
@@ -1463,7 +1463,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
                     epoutdesc.xfrtype      = USB_EP_ATTR_XFER_INT;
                     epoutdesc.interval     = epdesc->interval;
                     epoutdesc.mxpacketsize = usbhost_getle16(epdesc->mxpacketsize);
-                    uvdbg("Interrupt OUT EP addr:%d mxpacketsize:%d\n",
+                    uinfo("Interrupt OUT EP addr:%d mxpacketsize:%d\n",
                           epoutdesc.addr, epoutdesc.mxpacketsize);
                   }
                 else
@@ -1491,7 +1491,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
                     epindesc.xfrtype      = USB_EP_ATTR_XFER_INT;
                     epindesc.interval     = epdesc->interval;
                     epindesc.mxpacketsize = usbhost_getle16(epdesc->mxpacketsize);
-                    uvdbg("Interrupt IN EP addr:%d mxpacketsize:%d\n",
+                    uinfo("Interrupt IN EP addr:%d mxpacketsize:%d\n",
                           epindesc.addr, epindesc.mxpacketsize);
                   }
               }
@@ -1501,7 +1501,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
         /* Other descriptors are just ignored for now */
 
         default:
-          uvdbg("Other descriptor: %d\n", desc->type);
+          uinfo("Other descriptor: %d\n", desc->type);
           break;
         }
 
@@ -1543,7 +1543,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
 
   /* Then the optional interrupt OUT endpoint */
 
-  ullvdbg("Found EPOOUT:%s\n",
+  ullinfo("Found EPOOUT:%s\n",
          (found & USBHOST_EPOUTFOUND) != 0 ? "YES" : "NO");
 
   if ((found & USBHOST_EPOUTFOUND) != 0)
@@ -1557,7 +1557,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
         }
     }
 
-  ullvdbg("Endpoints allocated\n");
+  ullinfo("Endpoints allocated\n");
   return OK;
 }
 
@@ -1608,7 +1608,7 @@ static inline int usbhost_devinit(FAR struct usbhost_state_s *priv)
    * memory resources, primarily for the dedicated stack (CONFIG_HIDKBD_STACKSIZE).
    */
 
-  uvdbg("Start poll task\n");
+  uinfo("Start poll task\n");
 
   /* The inputs to a task started by kernel_thread() are very awkard for this
    * purpose.  They are really designed for command line tasks (argc/argv). So
@@ -1641,7 +1641,7 @@ static inline int usbhost_devinit(FAR struct usbhost_state_s *priv)
 
   /* Register the driver */
 
-  uvdbg("Register driver\n");
+  uinfo("Register driver\n");
   usbhost_mkdevname(priv, devname);
   ret = register_driver(devname, &g_hidkbd_fops, 0666, priv);
 
@@ -1991,7 +1991,7 @@ static int usbhost_disconnected(struct usbhost_class_s *usbclass)
    */
 
   priv->disconnected = true;
-  ullvdbg("Disconnected\n");
+  ullinfo("Disconnected\n");
 
   /* Is there a thread waiting for keyboard data that will never come? */
 
@@ -2054,7 +2054,7 @@ static int usbhost_open(FAR struct file *filep)
   irqstate_t flags;
   int ret;
 
-  uvdbg("Entry\n");
+  uinfo("Entry\n");
   DEBUGASSERT(filep && filep->f_inode);
   inode = filep->f_inode;
   priv  = inode->i_private;
@@ -2107,7 +2107,7 @@ static int usbhost_close(FAR struct file *filep)
   FAR struct usbhost_state_s *priv;
   irqstate_t flags;
 
-  uvdbg("Entry\n");
+  uinfo("Entry\n");
   DEBUGASSERT(filep && filep->f_inode);
   inode = filep->f_inode;
   priv  = inode->i_private;
@@ -2201,7 +2201,7 @@ static ssize_t usbhost_read(FAR struct file *filep, FAR char *buffer, size_t len
   unsigned int                tail;
   int                         ret;
 
-  uvdbg("Entry\n");
+  uinfo("Entry\n");
   DEBUGASSERT(filep && filep->f_inode && buffer);
   inode = filep->f_inode;
   priv  = inode->i_private;
@@ -2242,7 +2242,7 @@ static ssize_t usbhost_read(FAR struct file *filep, FAR char *buffer, size_t len
 
           /* Wait for data to be available */
 
-          uvdbg("Waiting...\n");
+          uinfo("Waiting...\n");
 
           priv->waiting = true;
           usbhost_givesem(&priv->exclsem);
@@ -2321,7 +2321,7 @@ static int usbhost_poll(FAR struct file *filep, FAR struct pollfd *fds,
   int                         ret = OK;
   int                         i;
 
-  uvdbg("Entry\n");
+  uinfo("Entry\n");
   DEBUGASSERT(filep && filep->f_inode && fds);
   inode = filep->f_inode;
   priv  = inode->i_private;
diff --git a/drivers/usbhost/usbhost_hidmouse.c b/drivers/usbhost/usbhost_hidmouse.c
index e7d86e6317..b655ee689b 100644
--- a/drivers/usbhost/usbhost_hidmouse.c
+++ b/drivers/usbhost/usbhost_hidmouse.c
@@ -201,10 +201,10 @@
 #  define idbg    udbg
 #  undef  illdbg
 #  define illdbg  ulldbg
-#  undef  ivdbg
-#  define ivdbg   uvdbg
-#  undef  illvdbg
-#  define illvdbg ullvdbg
+#  undef  iinfo
+#  define iinfo   uinfo
+#  undef  illinfo
+#  define illinfo ullinfo
 #endif
 
 /****************************************************************************
@@ -491,7 +491,7 @@ static void usbhost_pollnotify(FAR struct usbhost_state_s *priv)
           fds->revents |= (fds->events & POLLIN);
           if (fds->revents != 0)
             {
-              uvdbg("Report events: %02x\n", fds->revents);
+              uinfo("Report events: %02x\n", fds->revents);
               sem_post(fds->sem);
             }
         }
@@ -524,7 +524,7 @@ static inline FAR struct usbhost_state_s *usbhost_allocclass(void)
 
   DEBUGASSERT(!up_interrupt_context());
   priv = (FAR struct usbhost_state_s *)kmm_malloc(sizeof(struct usbhost_state_s));
-  uvdbg("Allocated: %p\n", priv);
+  uinfo("Allocated: %p\n", priv);
   return priv;
 }
 
@@ -548,7 +548,7 @@ static inline void usbhost_freeclass(FAR struct usbhost_state_s *usbclass)
 
   /* Free the class instance. */
 
-  uvdbg("Freeing: %p\n", usbclass);
+  uinfo("Freeing: %p\n", usbclass);
   sched_kfree(usbclass);
 }
 
@@ -623,13 +623,13 @@ static void usbhost_destroy(FAR void *arg)
   char devname[DEV_NAMELEN];
 
   DEBUGASSERT(priv != NULL && priv->usbclass.hport != NULL);
-  uvdbg("crefs: %d\n", priv->crefs);
+  uinfo("crefs: %d\n", priv->crefs);
 
   hport = priv->usbclass.hport;
 
   /* Unregister the driver */
 
-  uvdbg("Unregister driver\n");
+  uinfo("Unregister driver\n");
   usbhost_mkdevname(priv, devname);
   (void)unregister_driver(devname);
 
@@ -709,7 +709,7 @@ static void usbhost_notify(FAR struct usbhost_state_s *priv)
       if (fds)
         {
           fds->revents |= POLLIN;
-          ivdbg("Report events: %02x\n", fds->revents);
+          iinfo("Report events: %02x\n", fds->revents);
           sem_post(fds->sem);
         }
     }
@@ -1056,7 +1056,7 @@ static int usbhost_mouse_poll(int argc, char *argv[])
   ssize_t nbytes;
   int ret = OK;
 
-  uvdbg("Started\n");
+  uinfo("Started\n");
 
   /* Synchronize with the start-up logic.  Get the private instance, re-start
    * the start-up logic, and wait a bit to make sure that all of the class
@@ -1078,7 +1078,7 @@ static int usbhost_mouse_poll(int argc, char *argv[])
 
   /* Loop here until the device is disconnected */
 
-  uvdbg("Entering poll loop\n");
+  uinfo("Entering poll loop\n");
 
   while (!priv->disconnected)
     {
@@ -1378,7 +1378,7 @@ static int usbhost_waitsample(FAR struct usbhost_state_s *priv,
     {
       /* Wait for a change in the HIDMOUSE state */
 
-      ivdbg("Waiting..\n");
+      iinfo("Waiting..\n");
       priv->nwaiters++;
       ret = sem_wait(&priv->waitsem);
       priv->nwaiters--;
@@ -1404,7 +1404,7 @@ static int usbhost_waitsample(FAR struct usbhost_state_s *priv,
         }
     }
 
-  ivdbg("Sampled\n");
+  iinfo("Sampled\n");
 
   /* Re-acquire the semaphore that manages mutually exclusive access to
    * the device structure.  We may have to wait here.  But we have our sample.
@@ -1509,7 +1509,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
 
         case USB_DESC_TYPE_INTERFACE:
           {
-            uvdbg("Interface descriptor\n");
+            uinfo("Interface descriptor\n");
             DEBUGASSERT(remaining >= USB_SIZEOF_IFDESC);
 
             /* Did we already find what we needed from a preceding interface? */
@@ -1534,7 +1534,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
         /* HID descriptor */
 
         case USBHID_DESCTYPE_HID:
-            uvdbg("HID descriptor\n");
+            uinfo("HID descriptor\n");
             break;
 
         /* Endpoint descriptor.  We expect one or two interrupt endpoints,
@@ -1545,7 +1545,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
           {
             FAR struct usb_epdesc_s *epdesc = (FAR struct usb_epdesc_s *)configdesc;
 
-            uvdbg("Endpoint descriptor\n");
+            uinfo("Endpoint descriptor\n");
             DEBUGASSERT(remaining >= USB_SIZEOF_EPDESC);
 
             /* Check for an interrupt endpoint. */
@@ -1580,7 +1580,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
                     epindesc.interval     = epdesc->interval;
                     epindesc.mxpacketsize = usbhost_getle16(epdesc->mxpacketsize);
 
-                    uvdbg("Interrupt IN EP addr:%d mxpacketsize:%d\n",
+                    uinfo("Interrupt IN EP addr:%d mxpacketsize:%d\n",
                           epindesc.addr, epindesc.mxpacketsize);
                   }
               }
@@ -1590,7 +1590,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
         /* Other descriptors are just ignored for now */
 
         default:
-          uvdbg("Other descriptor: %d\n", desc->type);
+          uinfo("Other descriptor: %d\n", desc->type);
           break;
         }
 
@@ -1628,7 +1628,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
       return ret;
     }
 
-  ullvdbg("Endpoint allocated\n");
+  ullinfo("Endpoint allocated\n");
   return OK;
 }
 
@@ -1679,7 +1679,7 @@ static inline int usbhost_devinit(FAR struct usbhost_state_s *priv)
    * memory resources, primarily for the dedicated stack (CONFIG_HIDMOUSE_STACKSIZE).
    */
 
-  uvdbg("Start poll task\n");
+  uinfo("Start poll task\n");
 
   /* The inputs to a task started by kernel_thread() are very awkward for this
    * purpose.  They are really designed for command line tasks (argc/argv). So
@@ -1712,7 +1712,7 @@ static inline int usbhost_devinit(FAR struct usbhost_state_s *priv)
 
   /* Register the driver */
 
-  uvdbg("Register driver\n");
+  uinfo("Register driver\n");
   usbhost_mkdevname(priv, devname);
   ret = register_driver(devname, &g_hidmouse_fops, 0666, priv);
 
@@ -2062,7 +2062,7 @@ static int usbhost_disconnected(struct usbhost_class_s *usbclass)
    */
 
   priv->disconnected = true;
-  ullvdbg("Disconnected\n");
+  ullinfo("Disconnected\n");
 
   /* Are there a thread(s) waiting for mouse data that will never come? */
 
@@ -2124,7 +2124,7 @@ static int usbhost_open(FAR struct file *filep)
   irqstate_t flags;
   int ret;
 
-  uvdbg("Entry\n");
+  uinfo("Entry\n");
   DEBUGASSERT(filep && filep->f_inode);
   inode = filep->f_inode;
   priv  = inode->i_private;
@@ -2199,7 +2199,7 @@ static int usbhost_close(FAR struct file *filep)
   FAR struct usbhost_state_s *priv;
   irqstate_t flags;
 
-  uvdbg("Entry\n");
+  uinfo("Entry\n");
   DEBUGASSERT(filep && filep->f_inode);
   inode = filep->f_inode;
   priv  = inode->i_private;
@@ -2295,7 +2295,7 @@ static ssize_t usbhost_read(FAR struct file *filep, FAR char *buffer, size_t len
   struct mouse_sample_s       sample;
   int                         ret;
 
-  uvdbg("Entry\n");
+  uinfo("Entry\n");
   DEBUGASSERT(filep && filep->f_inode && buffer);
   inode = filep->f_inode;
   priv  = inode->i_private;
@@ -2392,10 +2392,10 @@ static ssize_t usbhost_read(FAR struct file *filep, FAR char *buffer, size_t len
       report->point[0].flags  = TOUCH_MOVE | TOUCH_ID_VALID | TOUCH_POS_VALID;
     }
 
-  ivdbg("  id:      %d\n", report->point[0].id);
-  ivdbg("  flags:   %02x\n", report->point[0].flags);
-  ivdbg("  x:       %d\n", report->point[0].x);
-  ivdbg("  y:       %d\n", report->point[0].y);
+  iinfo("  id:      %d\n", report->point[0].id);
+  iinfo("  flags:   %02x\n", report->point[0].flags);
+  iinfo("  x:       %d\n", report->point[0].x);
+  iinfo("  y:       %d\n", report->point[0].y);
 
   ret = SIZEOF_TOUCH_SAMPLE_S(1);
 #else
@@ -2414,7 +2414,7 @@ static ssize_t usbhost_read(FAR struct file *filep, FAR char *buffer, size_t len
 
 errout:
   usbhost_givesem(&priv->exclsem);
-  ivdbg("Returning: %d\n", ret);
+  iinfo("Returning: %d\n", ret);
   return (ssize_t)ret;
 }
 
@@ -2451,7 +2451,7 @@ static int usbhost_poll(FAR struct file *filep, FAR struct pollfd *fds,
   int                         ret = OK;
   int                         i;
 
-  uvdbg("Entry\n");
+  uinfo("Entry\n");
   DEBUGASSERT(filep && filep->f_inode && fds);
   inode = filep->f_inode;
   priv  = inode->i_private;
diff --git a/drivers/usbhost/usbhost_hub.c b/drivers/usbhost/usbhost_hub.c
index 7576eb565f..bc6ce5dac0 100644
--- a/drivers/usbhost/usbhost_hub.c
+++ b/drivers/usbhost/usbhost_hub.c
@@ -228,7 +228,7 @@ static struct usbhost_registry_s g_hub =
 
 static void usbhost_hport_deactivate(FAR struct usbhost_hubport_s *hport)
 {
-  uvdbg("Deactivating: %s port %d\n",
+  uinfo("Deactivating: %s port %d\n",
         ROOTHUB(hport) ? "Root" : "Hub", hport->port);
 
   /* Don't free the control pipe of root hub ports! */
@@ -274,7 +274,7 @@ static int usbhost_hport_activate(FAR struct usbhost_hubport_s *hport)
   struct usbhost_epdesc_s epdesc;
   int ret;
 
-  uvdbg("Activating port %d\n", hport->port);
+  uinfo("Activating port %d\n", hport->port);
 
   epdesc.hport        = hport;
   epdesc.addr         = 0;
@@ -384,7 +384,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_class_s *hubclass,
             FAR struct usb_ifdesc_s *ifdesc =
               (FAR struct usb_ifdesc_s *)configdesc;
 
-            uvdbg("Interface descriptor\n");
+            uinfo("Interface descriptor\n");
             DEBUGASSERT(remaining >= USB_SIZEOF_IFDESC);
 
             /* Save the interface number and mark ONLY the interface found */
@@ -401,7 +401,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_class_s *hubclass,
             FAR struct usb_epdesc_s *epdesc =
               (FAR struct usb_epdesc_s *)configdesc;
 
-            uvdbg("Endpoint descriptor\n");
+            uinfo("Endpoint descriptor\n");
             DEBUGASSERT(remaining >= USB_SIZEOF_EPDESC);
 
             /* Check for an interrupt endpoint. */
@@ -415,7 +415,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_class_s *hubclass,
                   {
                     /* It is an OUT interrupt endpoint. Ignore */
 
-                    uvdbg("Interrupt OUT EP addr:%d mxpacketsize:%d\n",
+                    uinfo("Interrupt OUT EP addr:%d mxpacketsize:%d\n",
                           (epdesc->addr & USB_EP_ADDR_NUMBER_MASK),
                           usbhost_getle16(epdesc->mxpacketsize));
                   }
@@ -431,7 +431,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_class_s *hubclass,
                     intindesc.interval     = epdesc->interval;
                     intindesc.mxpacketsize = usbhost_getle16(epdesc->mxpacketsize);
 
-                    uvdbg("Interrupt IN EP: addr=%d interval=%d mxpacketsize=%d\n",
+                    uinfo("Interrupt IN EP: addr=%d interval=%d mxpacketsize=%d\n",
                           intindesc.addr, intindesc.interval, intindesc.mxpacketsize);
                   }
               }
@@ -479,7 +479,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_class_s *hubclass,
       return ret;
     }
 
-  ullvdbg("Endpoint allocated\n");
+  ullinfo("Endpoint allocated\n");
   return OK;
 }
 
@@ -513,7 +513,7 @@ static inline int usbhost_hubdesc(FAR struct usbhost_class_s *hubclass)
   uint16_t hubchar;
   int ret;
 
-  uvdbg("Read hub descriptor\n");
+  uinfo("Read hub descriptor\n");
 
   DEBUGASSERT(hubclass != NULL);
   priv = &((FAR struct usbhost_hubclass_s *)hubclass)->hubpriv;
@@ -550,20 +550,20 @@ static inline int usbhost_hubdesc(FAR struct usbhost_class_s *hubclass)
   priv->pwrondelay  = (2 * hubdesc.pwrondelay);
   priv->ctrlcurrent = hubdesc.ctrlcurrent;
 
-  uvdbg("Hub Descriptor:\n");
-  uvdbg("  bDescLength:         %d\n", hubdesc.len);
-  uvdbg("  bDescriptorType:     0x%02x\n", hubdesc.type);
-  uvdbg("  bNbrPorts:           %d\n", hubdesc.nports);
-  uvdbg("  wHubCharacteristics: 0x%04x\n", usbhost_getle16(hubdesc.characteristics));
-  uvdbg("    lpsm:              %d\n", priv->lpsm);
-  uvdbg("    compounddev:       %s\n", priv->compounddev ? "TRUE" : "FALSE");
-  uvdbg("    ocmode:            %d\n", priv->ocmode);
-  uvdbg("    indicator:         %s\n", priv->indicator ? "TRUE" : "FALSE");
-  uvdbg("  bPwrOn2PwrGood:      %d\n", hubdesc.pwrondelay);
-  uvdbg("    pwrondelay:        %d\n", priv->pwrondelay);
-  uvdbg("  bHubContrCurrent:    %d\n", hubdesc.ctrlcurrent);
-  uvdbg("  DeviceRemovable:     %d\n", hubdesc.devattached);
-  uvdbg("  PortPwrCtrlMask:     %d\n", hubdesc.pwrctrlmask);
+  uinfo("Hub Descriptor:\n");
+  uinfo("  bDescLength:         %d\n", hubdesc.len);
+  uinfo("  bDescriptorType:     0x%02x\n", hubdesc.type);
+  uinfo("  bNbrPorts:           %d\n", hubdesc.nports);
+  uinfo("  wHubCharacteristics: 0x%04x\n", usbhost_getle16(hubdesc.characteristics));
+  uinfo("    lpsm:              %d\n", priv->lpsm);
+  uinfo("    compounddev:       %s\n", priv->compounddev ? "TRUE" : "FALSE");
+  uinfo("    ocmode:            %d\n", priv->ocmode);
+  uinfo("    indicator:         %s\n", priv->indicator ? "TRUE" : "FALSE");
+  uinfo("  bPwrOn2PwrGood:      %d\n", hubdesc.pwrondelay);
+  uinfo("    pwrondelay:        %d\n", priv->pwrondelay);
+  uinfo("  bHubContrCurrent:    %d\n", hubdesc.ctrlcurrent);
+  uinfo("  DeviceRemovable:     %d\n", hubdesc.devattached);
+  uinfo("  PortPwrCtrlMask:     %d\n", hubdesc.pwrctrlmask);
 
   return OK;
 }
@@ -694,7 +694,7 @@ static void usbhost_hub_event(FAR void *arg)
 
   if (priv->disconnected)
     {
-      uvdbg("Disconnected\n");
+      uinfo("Disconnected\n");
       return;
     }
 
@@ -707,7 +707,7 @@ static void usbhost_hub_event(FAR void *arg)
   hport = hubclass->hport;
 
   statuschange = priv->buffer[0];
-  uvdbg("StatusChange: %02x\n", statuschange);
+  uinfo("StatusChange: %02x\n", statuschange);
 
   /* Check for status change on any port */
 
@@ -720,7 +720,7 @@ static void usbhost_hub_event(FAR void *arg)
           continue;
         }
 
-      uvdbg("Port %d status change\n", port);
+      uinfo("Port %d status change\n", port);
 
       /* Port status changed, check what happened */
 
@@ -783,7 +783,7 @@ static void usbhost_hub_event(FAR void *arg)
           uint16_t debouncestable = 0;
           uint16_t connection = 0xffff;
 
-          uvdbg("Port %d status %04x change %04x\n", port, status, change);
+          uinfo("Port %d status %04x change %04x\n", port, status, change);
 
           /* Debounce */
 
@@ -812,7 +812,7 @@ static void usbhost_hub_event(FAR void *arg)
                   debouncestable += 25;
                   if (debouncestable >= 100)
                     {
-                      uvdbg("Port %d debouncestable=%d\n", port, debouncestable);
+                      uinfo("Port %d debouncestable=%d\n", port, debouncestable);
                       break;
                     }
                 }
@@ -847,7 +847,7 @@ static void usbhost_hub_event(FAR void *arg)
             {
               /* Device connected to a port on the hub */
 
-              uvdbg("Connection on port %d\n", port);
+              uinfo("Connection on port %d\n", port);
 
               ctrlreq->type = USBHUB_REQ_TYPE_PORT;
               ctrlreq->req  = USBHUB_REQ_SETFEATURE;
@@ -881,7 +881,7 @@ static void usbhost_hub_event(FAR void *arg)
               status = usbhost_getle16(portstatus.status);
               change = usbhost_getle16(portstatus.change);
 
-              uvdbg("port %d status %04x change %04x after reset\n",
+              uinfo("port %d status %04x change %04x after reset\n",
                     port, status, change);
 
               if ((status & USBHUB_PORT_STAT_RESET)  == 0 &&
@@ -943,7 +943,7 @@ static void usbhost_hub_event(FAR void *arg)
                * resources.
                */
 
-              uvdbg("Disconnection on port %d\n", port);
+              uinfo("Disconnection on port %d\n", port);
 
               /* Free any devices classes connect on this hub port */
 
@@ -1027,13 +1027,13 @@ static void usbhost_disconnect_event(FAR void *arg)
   irqstate_t flags;
   int port;
 
-  uvdbg("Disconnecting\n");
+  uinfo("Disconnecting\n");
 
   DEBUGASSERT(hubclass != NULL && hubclass->hport != NULL);
   priv  = &((FAR struct usbhost_hubclass_s *)hubclass)->hubpriv;
   hport = hubclass->hport;
 
-  uvdbg("Destroying hub on port  %d\n", hport->port);
+  uinfo("Destroying hub on port  %d\n", hport->port);
 
   /* Set an indication to any users of the device that the device is no
    * longer available.
@@ -1453,7 +1453,7 @@ static int usbhost_disconnected(struct usbhost_class_s *hubclass)
   irqstate_t flags;
   int ret;
 
-  uvdbg("Disconnected\n");
+  uinfo("Disconnected\n");
 
   /* Execute the disconnect action from the worker thread. */
 
diff --git a/drivers/usbhost/usbhost_registerclass.c b/drivers/usbhost/usbhost_registerclass.c
index aaf61d0428..a795b88d02 100644
--- a/drivers/usbhost/usbhost_registerclass.c
+++ b/drivers/usbhost/usbhost_registerclass.c
@@ -96,7 +96,7 @@ int usbhost_registerclass(struct usbhost_registry_s *usbclass)
 {
   irqstate_t flags;
 
-  uvdbg("Registering class:%p nids:%d\n", usbclass, usbclass->nids);
+  uinfo("Registering class:%p nids:%d\n", usbclass, usbclass->nids);
 
   /* g_classregistry is a singly-linkedlist of class ID information added by
    * calls to usbhost_registerclass().  Since this list is accessed from USB
diff --git a/drivers/usbhost/usbhost_skeleton.c b/drivers/usbhost/usbhost_skeleton.c
index 9a7ed87de3..a4250031aa 100644
--- a/drivers/usbhost/usbhost_skeleton.c
+++ b/drivers/usbhost/usbhost_skeleton.c
@@ -251,7 +251,7 @@ static inline FAR struct usbhost_state_s *usbhost_allocclass(void)
 
   DEBUGASSERT(!up_interrupt_context());
   priv = (FAR struct usbhost_state_s *)kmm_malloc(sizeof(struct usbhost_state_s));
-  uvdbg("Allocated: %p\n", priv);
+  uinfo("Allocated: %p\n", priv);
   return priv;
 }
 
@@ -277,7 +277,7 @@ static inline void usbhost_freeclass(FAR struct usbhost_state_s *usbclass)
    * executing from an interrupt handler.
    */
 
-  uvdbg("Freeing: %p\n", usbclass);
+  uinfo("Freeing: %p\n", usbclass);
   kmm_free(usbclass);
 }
 
@@ -357,7 +357,7 @@ static void usbhost_destroy(FAR void *arg)
   DEBUGASSERT(hport->drvr);
   drvr = hport->drvr;
 
-  uvdbg("crefs: %d\n", priv->crefs);
+  uinfo("crefs: %d\n", priv->crefs);
 
   /* Unregister the driver */
 
@@ -465,7 +465,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
           {
             FAR struct usb_ifdesc_s *ifdesc = (FAR struct usb_ifdesc_s *)configdesc;
 
-            uvdbg("Interface descriptor\n");
+            uinfo("Interface descriptor\n");
             DEBUGASSERT(remaining >= USB_SIZEOF_IFDESC);
 
             /* Save the interface number and mark ONLY the interface found */
@@ -483,7 +483,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
           {
             FAR struct usb_epdesc_s *epdesc = (FAR struct usb_epdesc_s *)configdesc;
 
-            uvdbg("Endpoint descriptor\n");
+            uinfo("Endpoint descriptor\n");
             DEBUGASSERT(remaining >= USB_SIZEOF_EPDESC);
 
             /* Check for a bulk endpoint. */
@@ -516,7 +516,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
                     boutdesc.xfrtype      = USB_EP_ATTR_XFER_BULK;
                     boutdesc.interval     = epdesc->interval;
                     boutdesc.mxpacketsize = usbhost_getle16(epdesc->mxpacketsize);
-                    uvdbg("Bulk OUT EP addr:%d mxpacketsize:%d\n",
+                    uinfo("Bulk OUT EP addr:%d mxpacketsize:%d\n",
                           boutdesc.addr, boutdesc.mxpacketsize);
                   }
                 else
@@ -544,7 +544,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
                     bindesc.xfrtype      = USB_EP_ATTR_XFER_BULK;
                     bindesc.interval     = epdesc->interval;
                     bindesc.mxpacketsize = usbhost_getle16(epdesc->mxpacketsize);
-                    uvdbg("Bulk IN EP addr:%d mxpacketsize:%d\n",
+                    uinfo("Bulk IN EP addr:%d mxpacketsize:%d\n",
                           bindesc.addr, bindesc.mxpacketsize);
                   }
               }
@@ -600,7 +600,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
       return ret;
     }
 
-  ullvdbg("Endpoints allocated\n");
+  ullinfo("Endpoints allocated\n");
   return OK;
 }
 
@@ -644,7 +644,7 @@ static inline int usbhost_devinit(FAR struct usbhost_state_s *priv)
     {
       char devname[DEV_NAMELEN];
 
-      uvdbg("Register block driver\n");
+      uinfo("Register block driver\n");
       usbhost_mkdevname(priv, devname);
       // ret = register_blockdriver(devname, &g_bops, 0, priv);
     }
@@ -677,7 +677,7 @@ static inline int usbhost_devinit(FAR struct usbhost_state_s *priv)
         {
           /* Ready for normal operation as a block device driver */
 
-          uvdbg("Successfully initialized\n");
+          uinfo("Successfully initialized\n");
           priv->crefs--;
           usbhost_givesem(&priv->exclsem);
         }
@@ -1013,7 +1013,7 @@ static int usbhost_disconnected(struct usbhost_class_s *usbclass)
    * block driver.
    */
 
-  ullvdbg("crefs: %d\n", priv->crefs);
+  ullinfo("crefs: %d\n", priv->crefs);
   if (priv->crefs == 1)
     {
       /* Destroy the class instance.  If we are executing from an interrupt
@@ -1025,7 +1025,7 @@ static int usbhost_disconnected(struct usbhost_class_s *usbclass)
         {
           /* Destroy the instance on the worker thread. */
 
-          uvdbg("Queuing destruction: worker %p->%p\n", priv->work.worker, usbhost_destroy);
+          uinfo("Queuing destruction: worker %p->%p\n", priv->work.worker, usbhost_destroy);
           DEBUGASSERT(priv->work.worker == NULL);
           (void)work_queue(HPWORK, &priv->work, usbhost_destroy, priv, 0);
        }
diff --git a/drivers/usbhost/usbhost_storage.c b/drivers/usbhost/usbhost_storage.c
index a4d5da6002..e3f6a8769a 100644
--- a/drivers/usbhost/usbhost_storage.c
+++ b/drivers/usbhost/usbhost_storage.c
@@ -377,7 +377,7 @@ static inline FAR struct usbhost_state_s *usbhost_allocclass(void)
     }
 
   leave_critical_section(flags);
-  ullvdbg("Allocated: %p\n", entry);
+  ullinfo("Allocated: %p\n", entry);
   return (FAR struct usbhost_state_s *)entry;
 }
 #else
@@ -391,7 +391,7 @@ static inline FAR struct usbhost_state_s *usbhost_allocclass(void)
 
   DEBUGASSERT(!up_interrupt_context());
   priv = (FAR struct usbhost_state_s *)kmm_malloc(sizeof(struct usbhost_state_s));
-  uvdbg("Allocated: %p\n", priv);
+  uinfo("Allocated: %p\n", priv);
   return priv;
 }
 #endif
@@ -417,7 +417,7 @@ static inline void usbhost_freeclass(FAR struct usbhost_state_s *usbclass)
   irqstate_t flags;
   DEBUGASSERT(entry != NULL);
 
-  ullvdbg("Freeing: %p\n", entry);
+  ullinfo("Freeing: %p\n", entry);
 
   /* Just put the pre-allocated class structure back on the freelist */
 
@@ -435,7 +435,7 @@ static inline void usbhost_freeclass(FAR struct usbhost_state_s *usbclass)
    * from an interrupt handler.
    */
 
-  uvdbg("Freeing: %p\n", usbclass);
+  uinfo("Freeing: %p\n", usbclass);
   sched_kfree(usbclass);
 }
 #endif
@@ -506,18 +506,18 @@ static void usbhost_dumpcbw(FAR struct usbmsc_cbw_s *cbw)
 {
   int i;
 
-  uvdbg("CBW:\n");
-  uvdbg("  signature: %08x\n", usbhost_getle32(cbw->signature));
-  uvdbg("  tag:       %08x\n", usbhost_getle32(cbw->tag));
-  uvdbg("  datlen:    %08x\n", usbhost_getle32(cbw->datlen));
-  uvdbg("  flags:     %02x\n", cbw->flags);
-  uvdbg("  lun:       %02x\n", cbw->lun);
-  uvdbg("  cdblen:    %02x\n", cbw->cdblen);
+  uinfo("CBW:\n");
+  uinfo("  signature: %08x\n", usbhost_getle32(cbw->signature));
+  uinfo("  tag:       %08x\n", usbhost_getle32(cbw->tag));
+  uinfo("  datlen:    %08x\n", usbhost_getle32(cbw->datlen));
+  uinfo("  flags:     %02x\n", cbw->flags);
+  uinfo("  lun:       %02x\n", cbw->lun);
+  uinfo("  cdblen:    %02x\n", cbw->cdblen);
 
-  uvdbg("CDB:\n");
+  uinfo("CDB:\n");
   for (i = 0; i < cbw->cdblen; i += 8)
     {
-      uvdbg("  %02x %02x %02x %02x %02x %02x %02x %02x\n",
+      uinfo("  %02x %02x %02x %02x %02x %02x %02x %02x\n",
             cbw->cdb[i],   cbw->cdb[i+1], cbw->cdb[i+2], cbw->cdb[i+3],
             cbw->cdb[i+4], cbw->cdb[i+5], cbw->cdb[i+6], cbw->cdb[i+7]);
     }
@@ -525,11 +525,11 @@ static void usbhost_dumpcbw(FAR struct usbmsc_cbw_s *cbw)
 
 static void usbhost_dumpcsw(FAR struct usbmsc_csw_s *csw)
 {
-  uvdbg("CSW:\n");
-  uvdbg("  signature: %08x\n", usbhost_getle32(csw->signature));
-  uvdbg("  tag:       %08x\n", usbhost_getle32(csw->tag));
-  uvdbg("  residue:   %08x\n", usbhost_getle32(csw->residue));
-  uvdbg("  status:    %02x\n", csw->status);
+  uinfo("CSW:\n");
+  uinfo("  signature: %08x\n", usbhost_getle32(csw->signature));
+  uinfo("  tag:       %08x\n", usbhost_getle32(csw->tag));
+  uinfo("  residue:   %08x\n", usbhost_getle32(csw->residue));
+  uinfo("  status:    %02x\n", csw->status);
 }
 #endif
 
@@ -685,7 +685,7 @@ static inline int usbhost_maxlunreq(FAR struct usbhost_state_s *priv)
    * allocated memory.
    */
 
-  uvdbg("Request maximum logical unit number\n");
+  uinfo("Request maximum logical unit number\n");
 
   memset(req, 0, sizeof(struct usb_ctrlreq_s));
   req->type    = USB_DIR_IN | USB_REQ_TYPE_CLASS | USB_REQ_RECIPIENT_INTERFACE;
@@ -920,7 +920,7 @@ static void usbhost_destroy(FAR void *arg)
   DEBUGASSERT(priv != NULL && priv->usbclass.hport != NULL);
   hport = priv->usbclass.hport;
 
-  uvdbg("crefs: %d\n", priv->crefs);
+  uinfo("crefs: %d\n", priv->crefs);
 
   /* Unregister the block driver */
 
@@ -1046,7 +1046,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
           {
             FAR struct usb_ifdesc_s *ifdesc = (FAR struct usb_ifdesc_s *)configdesc;
 
-            uvdbg("Interface descriptor\n");
+            uinfo("Interface descriptor\n");
             DEBUGASSERT(remaining >= USB_SIZEOF_IFDESC);
 
             /* Save the interface number and mark ONLY the interface found */
@@ -1064,7 +1064,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
           {
             FAR struct usb_epdesc_s *epdesc = (FAR struct usb_epdesc_s *)configdesc;
 
-            uvdbg("Endpoint descriptor\n");
+            uinfo("Endpoint descriptor\n");
             DEBUGASSERT(remaining >= USB_SIZEOF_EPDESC);
 
             /* Check for a bulk endpoint.  We only support the bulk-only
@@ -1100,7 +1100,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
                     boutdesc.interval     = epdesc->interval;
                     boutdesc.mxpacketsize = usbhost_getle16(epdesc->mxpacketsize);
 
-                    uvdbg("Bulk OUT EP addr:%d mxpacketsize:%d\n",
+                    uinfo("Bulk OUT EP addr:%d mxpacketsize:%d\n",
                           boutdesc.addr, boutdesc.mxpacketsize);
                   }
                 else
@@ -1127,7 +1127,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
                     bindesc.xfrtype      = USB_EP_ATTR_XFER_BULK;
                     bindesc.interval     = epdesc->interval;
                     bindesc.mxpacketsize = usbhost_getle16(epdesc->mxpacketsize);
-                    uvdbg("Bulk IN EP addr:%d mxpacketsize:%d\n",
+                    uinfo("Bulk IN EP addr:%d mxpacketsize:%d\n",
                           bindesc.addr, bindesc.mxpacketsize);
                   }
               }
@@ -1185,7 +1185,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
       return ret;
     }
 
-  ullvdbg("Endpoints allocated\n");
+  ullinfo("Endpoints allocated\n");
   return OK;
 }
 
@@ -1234,12 +1234,12 @@ static inline int usbhost_initvolume(FAR struct usbhost_state_s *priv)
 
   /* Request the maximum logical unit number */
 
-  uvdbg("Get max LUN\n");
+  uinfo("Get max LUN\n");
   ret = usbhost_maxlunreq(priv);
 
   for (retries = 0; retries < USBHOST_MAX_RETRIES /* && ret >= 0 */; retries++)
     {
-      uvdbg("Test unit ready, retries=%d\n", retries);
+      uinfo("Test unit ready, retries=%d\n", retries);
 
       /* Wait just a bit */
 
@@ -1268,7 +1268,7 @@ static inline int usbhost_initvolume(FAR struct usbhost_state_s *priv)
            * The returned status is ignored here.
            */
 
-          uvdbg("Request sense\n");
+          uinfo("Request sense\n");
           ret = usbhost_requestsense(priv);
         }
 
@@ -1298,7 +1298,7 @@ static inline int usbhost_initvolume(FAR struct usbhost_state_s *priv)
     {
       /* Get the capacity of the volume */
 
-      uvdbg("Read capacity\n");
+      uinfo("Read capacity\n");
       ret = usbhost_readcapacity(priv);
       if (ret >= 0)
         {
@@ -1319,7 +1319,7 @@ static inline int usbhost_initvolume(FAR struct usbhost_state_s *priv)
     {
       /* Inquiry */
 
-      uvdbg("Inquiry\n");
+      uinfo("Inquiry\n");
       ret = usbhost_inquiry(priv);
       if (ret >= 0)
         {
@@ -1340,7 +1340,7 @@ static inline int usbhost_initvolume(FAR struct usbhost_state_s *priv)
     {
       char devname[DEV_NAMELEN];
 
-      uvdbg("Register block driver\n");
+      uinfo("Register block driver\n");
       usbhost_mkdevname(priv, devname);
       ret = register_blockdriver(devname, &g_bops, 0, priv);
     }
@@ -1830,7 +1830,7 @@ static int usbhost_disconnected(struct usbhost_class_s *usbclass)
    * block driver.
    */
 
-  ullvdbg("crefs: %d\n", priv->crefs);
+  ullinfo("crefs: %d\n", priv->crefs);
   if (priv->crefs == 1)
     {
       /* Destroy the class instance.  If we are executing from an interrupt
@@ -1842,7 +1842,7 @@ static int usbhost_disconnected(struct usbhost_class_s *usbclass)
         {
           /* Destroy the instance on the worker thread. */
 
-          uvdbg("Queuing destruction: worker %p->%p\n", priv->work.worker, usbhost_destroy);
+          uinfo("Queuing destruction: worker %p->%p\n", priv->work.worker, usbhost_destroy);
           DEBUGASSERT(priv->work.worker == NULL);
           (void)work_queue(HPWORK, &priv->work, usbhost_destroy, priv, 0);
        }
@@ -1874,7 +1874,7 @@ static int usbhost_open(FAR struct inode *inode)
   irqstate_t flags;
   int ret;
 
-  uvdbg("Entry\n");
+  uinfo("Entry\n");
   DEBUGASSERT(inode && inode->i_private);
   priv = (FAR struct usbhost_state_s *)inode->i_private;
 
@@ -1923,7 +1923,7 @@ static int usbhost_close(FAR struct inode *inode)
   FAR struct usbhost_state_s *priv;
   irqstate_t flags;
 
-  uvdbg("Entry\n");
+  uinfo("Entry\n");
   DEBUGASSERT(inode && inode->i_private);
   priv = (FAR struct usbhost_state_s *)inode->i_private;
 
@@ -1986,7 +1986,7 @@ static ssize_t usbhost_read(FAR struct inode *inode, unsigned char *buffer,
   DEBUGASSERT(priv->usbclass.hport);
   hport = priv->usbclass.hport;
 
-  uvdbg("startsector: %d nsectors: %d sectorsize: %d\n",
+  uinfo("startsector: %d nsectors: %d sectorsize: %d\n",
         startsector, nsectors, priv->blocksize);
 
   /* Check if the mass storage device is still connected */
@@ -2086,7 +2086,7 @@ static ssize_t usbhost_write(FAR struct inode *inode, const unsigned char *buffe
   FAR struct usbhost_hubport_s *hport;
   ssize_t nbytes;
 
-  uvdbg("sector: %d nsectors: %d sectorsize: %d\n");
+  uinfo("sector: %d nsectors: %d sectorsize: %d\n");
 
   DEBUGASSERT(inode && inode->i_private);
   priv = (FAR struct usbhost_state_s *)inode->i_private;
@@ -2179,7 +2179,7 @@ static int usbhost_geometry(FAR struct inode *inode, struct geometry *geometry)
   FAR struct usbhost_state_s *priv;
   int ret = -EINVAL;
 
-  uvdbg("Entry\n");
+  uinfo("Entry\n");
   DEBUGASSERT(inode && inode->i_private);
 
   /* Check if the mass storage device is still connected */
@@ -2211,7 +2211,7 @@ static int usbhost_geometry(FAR struct inode *inode, struct geometry *geometry)
       geometry->geo_sectorsize    = priv->blocksize;
       usbhost_givesem(&priv->exclsem);
 
-      uvdbg("nsectors: %ld sectorsize: %d\n",
+      uinfo("nsectors: %ld sectorsize: %d\n",
              (long)geometry->geo_nsectors, geometry->geo_sectorsize);
 
       ret = OK;
@@ -2232,7 +2232,7 @@ static int usbhost_ioctl(FAR struct inode *inode, int cmd, unsigned long arg)
   FAR struct usbhost_state_s *priv;
   int ret;
 
-  uvdbg("Entry\n");
+  uinfo("Entry\n");
   DEBUGASSERT(inode && inode->i_private);
   priv  = (FAR struct usbhost_state_s *)inode->i_private;
 
diff --git a/drivers/video/ov2640.c b/drivers/video/ov2640.c
index ebf37f002c..112d3201e3 100644
--- a/drivers/video/ov2640.c
+++ b/drivers/video/ov2640.c
@@ -864,7 +864,7 @@ static int ovr2640_chipid(FAR struct i2c_master_s *i2c)
       return -ENOSYS;
     }
 
-  gvdbg("PID=%02x$02x MID=%02x%02x\n", pidh, pidl, midh, midl);
+  ginfo("PID=%02x$02x MID=%02x%02x\n", pidh, pidl, midh, midl);
   return OK;
 }
 
diff --git a/drivers/wireless/cc3000/cc3000.c b/drivers/wireless/cc3000/cc3000.c
index bc0e2a615c..b14b8a94a6 100644
--- a/drivers/wireless/cc3000/cc3000.c
+++ b/drivers/wireless/cc3000/cc3000.c
@@ -422,7 +422,7 @@ static void cc3000_pollnotify(FAR struct cc3000_dev_s *priv, uint32_t type)
       if (fds)
         {
           fds->revents |= type;
-          nllvdbg("Report events: %02x\n", fds->revents);
+          nllinfo("Report events: %02x\n", fds->revents);
           sem_post(fds->sem);
         }
     }
@@ -623,7 +623,7 @@ static void * cc3000_worker(FAR void *arg)
       if ((cc3000_wait_irq(priv) != -EINTR) && (priv->workertid != -1))
         {
           PROBE(0, 0);
-          nllvdbg("State%d\n", priv->state);
+          nllinfo("State%d\n", priv->state);
           switch (priv->state)
             {
             case eSPI_STATE_POWERUP:
@@ -710,9 +710,9 @@ static void * cc3000_worker(FAR void *arg)
 
                     cc3000_devgive(priv);
 
-                    nllvdbg("Wait On Completion\n");
+                    nllinfo("Wait On Completion\n");
                     sem_wait(priv->wrkwaitsem);
-                    nllvdbg("Completed S:%d irq :%d\n",
+                    nllinfo("Completed S:%d irq :%d\n",
                             priv->state, priv->config->irq_read(priv->config));
 
                     sem_getvalue(&priv->irqsem, &count);
@@ -732,7 +732,7 @@ static void * cc3000_worker(FAR void *arg)
               break;
 
             default:
-              nllvdbg("default: State%d\n", priv->state);
+              nllinfo("default: State%d\n", priv->state);
               break;
             }
         }
@@ -802,7 +802,7 @@ static int cc3000_open(FAR struct file *filep)
 
   CHECK_GUARD(priv);
 
-  nllvdbg("crefs: %d\n", priv->crefs);
+  nllinfo("crefs: %d\n", priv->crefs);
 
   /* Get exclusive access to the driver data structure */
 
@@ -982,7 +982,7 @@ static int cc3000_close(FAR struct file *filep)
 
   CHECK_GUARD(priv);
 
-  nllvdbg("crefs: %d\n", priv->crefs);
+  nllinfo("crefs: %d\n", priv->crefs);
 
   /* Get exclusive access to the driver data structure */
 
@@ -1052,7 +1052,7 @@ static ssize_t cc3000_read(FAR struct file *filep, FAR char *buffer, size_t len)
   int ret;
   ssize_t nread;
 
-  nllvdbg("buffer:%p len:%d\n", buffer, len);
+  nllinfo("buffer:%p len:%d\n", buffer, len);
   DEBUGASSERT(filep);
   inode = filep->f_inode;
 
@@ -1091,7 +1091,7 @@ static ssize_t cc3000_read(FAR struct file *filep, FAR char *buffer, size_t len)
        * option, then just return an error.
        */
 
-      nllvdbg("CC3000 data is not available\n");
+      nllinfo("CC3000 data is not available\n");
       if (filep->f_oflags & O_NONBLOCK)
         {
           nread = -EAGAIN;
@@ -1112,7 +1112,7 @@ static ssize_t cc3000_read(FAR struct file *filep, FAR char *buffer, size_t len)
        * but will be re-enabled while we are waiting.
        */
 
-      nllvdbg("Waiting..\n");
+      nllinfo("Waiting..\n");
       ret = sem_wait(&priv->waitsem);
       priv->nwaiters--;
       sched_unlock();
@@ -1166,7 +1166,7 @@ errout_with_sem:
   cc3000_devgive(priv);
 
 errout_without_sem:
-  nllvdbg("Returning: %d\n", nread);
+  nllinfo("Returning: %d\n", nread);
 #ifndef CONFIG_DISABLE_POLL
   if (nread > 0)
     {
@@ -1198,7 +1198,7 @@ static ssize_t cc3000_write(FAR struct file *filep, FAR const char *usrbuffer, s
 
   size_t tx_len = (len & 1) ? len : len +1;
 
-  nllvdbg("buffer:%p len:%d tx_len:%d\n", buffer, len, tx_len);
+  nllinfo("buffer:%p len:%d tx_len:%d\n", buffer, len, tx_len);
 
   DEBUGASSERT(filep);
   inode = filep->f_inode;
@@ -1263,18 +1263,18 @@ static ssize_t cc3000_write(FAR struct file *filep, FAR const char *usrbuffer, s
     }
   else
     {
-      nllvdbg("Assert CS\n");
+      nllinfo("Assert CS\n");
       priv->state  = eSPI_STATE_WRITE_WAIT_IRQ;
       cc3000_lock_and_select(priv->spi); /* Assert CS */
-      nllvdbg("Wait on IRQ Active\n");
+      nllinfo("Wait on IRQ Active\n");
       ret = cc3000_wait_ready(priv);
-      nllvdbg("IRQ Signaled\n");
+      nllinfo("IRQ Signaled\n");
       if (ret < 0)
         {
           /* This should only happen if the wait was canceled by an signal */
 
           cc3000_deselect_and_unlock(priv->spi);
-          nllvdbg("sem_wait: %d\n", errno);
+          nllinfo("sem_wait: %d\n", errno);
           DEBUGASSERT(errno == EINTR);
           nwritten = ret;
           goto errout_without_sem;
@@ -1284,13 +1284,13 @@ static ssize_t cc3000_write(FAR struct file *filep, FAR const char *usrbuffer, s
     }
 
   priv->state  = eSPI_STATE_WRITE_DONE;
-  nllvdbg("Deassert CS S:eSPI_STATE_WRITE_DONE\n");
+  nllinfo("Deassert CS S:eSPI_STATE_WRITE_DONE\n");
   cc3000_deselect_and_unlock(priv->spi);
   nwritten = tx_len;
   cc3000_devgive(priv);
 
 errout_without_sem:
-  nllvdbg("Returning: %d\n", ret);
+  nllinfo("Returning: %d\n", ret);
   return nwritten;
 }
 
@@ -1304,7 +1304,7 @@ static int cc3000_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
   FAR struct cc3000_dev_s *priv;
   int ret;
 
-  nllvdbg("cmd: %d arg: %ld\n", cmd, arg);
+  nllinfo("cmd: %d arg: %ld\n", cmd, arg);
   DEBUGASSERT(filep);
   inode = filep->f_inode;
 
@@ -1409,7 +1409,7 @@ static int cc3000_poll(FAR struct file *filep, FAR struct pollfd *fds,
   int ret = OK;
   int i;
 
-  nllvdbg("setup: %d\n", (int)setup);
+  nllinfo("setup: %d\n", (int)setup);
   DEBUGASSERT(filep && fds);
   inode = filep->f_inode;
 
@@ -1517,7 +1517,7 @@ int cc3000_register(FAR struct spi_dev_s *spi,
 #endif
   int ret;
 
-  nllvdbg("spi: %p minor: %d\n", spi, minor);
+  nllinfo("spi: %p minor: %d\n", spi, minor);
 
   /* Debug-only sanity checks */
 
@@ -1572,7 +1572,7 @@ int cc3000_register(FAR struct spi_dev_s *spi,
   /* Register the device as an input device */
 
   (void)snprintf(drvname, DEV_NAMELEN, DEV_FORMAT, minor);
-  nllvdbg("Registering %s\n", drvname);
+  nllinfo("Registering %s\n", drvname);
 
   ret = register_driver(drvname, &cc3000_fops, 0666, priv);
   if (ret < 0)
diff --git a/drivers/wireless/cc3000/cc3000drv.c b/drivers/wireless/cc3000/cc3000drv.c
index e192dbf175..d56e66af8a 100644
--- a/drivers/wireless/cc3000/cc3000drv.c
+++ b/drivers/wireless/cc3000/cc3000drv.c
@@ -67,14 +67,14 @@
 #ifdef SPI_DEBUG
 #  define spidbg  lldbg
 #  ifdef SPI_VERBOSE
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  undef SPI_VERBOSE
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /****************************************************************************
@@ -118,7 +118,7 @@ void cc3000_resume(void)
 {
   DEBUGASSERT(spiconf.cc3000fd >= 0 && spiconf.done);
   sem_post(spiconf.done);
-  nllvdbg("Done\n");
+  nllinfo("Done\n");
 }
 
 /****************************************************************************
diff --git a/drivers/wireless/cc3000/evnt_handler.c b/drivers/wireless/cc3000/evnt_handler.c
index b890a9a9b7..82d4943906 100644
--- a/drivers/wireless/cc3000/evnt_handler.c
+++ b/drivers/wireless/cc3000/evnt_handler.c
@@ -924,12 +924,12 @@ void SimpleLinkWaitEvent(uint16_t opcode, void *pRetParams)
    */
 
   tSLInformation.usRxEventOpcode = opcode;
-  nllvdbg("Looking for opcode 0x%x\n", opcode);
+  nllinfo("Looking for opcode 0x%x\n", opcode);
   uint16_t event_type;
 
   do
     {
-      nllvdbg("cc3000_wait\n");
+      nllinfo("cc3000_wait\n");
       tSLInformation.pucReceivedData = cc3000_wait();
       tSLInformation.usEventOrDataReceived = 1;
       STREAM_TO_UINT16((FAR char *)tSLInformation.pucReceivedData,
@@ -937,25 +937,25 @@ void SimpleLinkWaitEvent(uint16_t opcode, void *pRetParams)
 
       if (*tSLInformation.pucReceivedData == HCI_TYPE_EVNT)
         {
-          nllvdbg("Evtn:0x%x\n", event_type);
+          nllinfo("Evtn:0x%x\n", event_type);
         }
 
       if (event_type != opcode)
         {
           if (hci_unsolicited_event_handler() == 1)
             {
-              nllvdbg("Processed Event  0x%x want 0x%x\n", event_type, opcode);
+              nllinfo("Processed Event  0x%x want 0x%x\n", event_type, opcode);
             }
         }
       else
         {
-          nllvdbg("Processing opcode 0x%x\n", opcode);
+          nllinfo("Processing opcode 0x%x\n", opcode);
           hci_event_handler(pRetParams, 0, 0);
         }
     }
   while (tSLInformation.usRxEventOpcode != 0);
 
-  nllvdbg("Done for opcode 0x%x\n", opcode);
+  nllinfo("Done for opcode 0x%x\n", opcode);
 }
 
 /****************************************************************************
@@ -981,7 +981,7 @@ void SimpleLinkWaitData(uint8_t *pBuf, uint8_t *from, uint8_t *fromlen)
    * after the end of current transaction, i.e. only after data will be received
    */
 
-  nllvdbg("Looking for Data\n");
+  nllinfo("Looking for Data\n");
   uint16_t event_type;
   uint16_t opcode = tSLInformation.usRxEventOpcode;
 
@@ -999,15 +999,15 @@ void SimpleLinkWaitData(uint8_t *pBuf, uint8_t *from, uint8_t *fromlen)
       else
         {
           STREAM_TO_UINT16((char *)tSLInformation.pucReceivedData, HCI_EVENT_OPCODE_OFFSET, event_type);
-          nllvdbg("Evtn:0x%x\n", event_type);
+          nllinfo("Evtn:0x%x\n", event_type);
 
           if (hci_unsolicited_event_handler() == 1)
             {
-              nllvdbg("Processed Event  0x%x want Data! Opcode 0x%x\n", event_type, opcode);
+              nllinfo("Processed Event  0x%x want Data! Opcode 0x%x\n", event_type, opcode);
             }
           else
             {
-              nllvdbg("!!!!!opcode 0x%x\n", opcode);
+              nllinfo("!!!!!opcode 0x%x\n", opcode);
             }
 
           UNUSED(event_type);
@@ -1015,6 +1015,6 @@ void SimpleLinkWaitData(uint8_t *pBuf, uint8_t *from, uint8_t *fromlen)
     }
   while (*tSLInformation.pucReceivedData == HCI_TYPE_EVNT);
 
-  nllvdbg("Done for Data 0x%x\n", opcode);
+  nllinfo("Done for Data 0x%x\n", opcode);
   UNUSED(opcode);
 }
diff --git a/drivers/wireless/cc3000/hci.c b/drivers/wireless/cc3000/hci.c
index 6caf64c60d..742f09bae7 100644
--- a/drivers/wireless/cc3000/hci.c
+++ b/drivers/wireless/cc3000/hci.c
@@ -79,7 +79,7 @@ uint16_t hci_command_send(uint16_t usOpcode, uint8_t *pucBuff,
 
   stream = (pucBuff + SPI_HEADER_SIZE);
 
-  nllvdbg("Send 0x%x\n", usOpcode);
+  nllinfo("Send 0x%x\n", usOpcode);
   UINT8_TO_STREAM(stream, HCI_TYPE_CMND);
   stream = UINT16_TO_STREAM(stream, usOpcode);
   UINT8_TO_STREAM(stream, ucArgsLength);
@@ -87,7 +87,7 @@ uint16_t hci_command_send(uint16_t usOpcode, uint8_t *pucBuff,
   /* Update the opcode of the event we will be waiting for */
 
   cc3000_write(pucBuff, ucArgsLength + SIMPLE_LINK_HCI_CMND_HEADER_SIZE);
-  nllvdbg("Send of 0x%x Completed\n", usOpcode);
+  nllinfo("Send of 0x%x Completed\n", usOpcode);
 
   return 0;
 }
diff --git a/drivers/wireless/cc3000/wlan.c b/drivers/wireless/cc3000/wlan.c
index 175d6334b4..3a5bd0f31d 100644
--- a/drivers/wireless/cc3000/wlan.c
+++ b/drivers/wireless/cc3000/wlan.c
@@ -261,7 +261,7 @@ void SpiReceiveHandler(void *pvBuffer)
   STREAM_TO_UINT16((char *)tSLInformation.pucReceivedData,
                    HCI_EVENT_OPCODE_OFFSET, event_type);
 
-  nllvdbg("Evnt:0x%x\n", event_type);
+  nllinfo("Evnt:0x%x\n", event_type);
   UNUSED(event_type);
 
   hci_unsolicited_event_handler();
diff --git a/drivers/wireless/nrf24l01.c b/drivers/wireless/nrf24l01.c
index eb6c3f68c8..90f9cd3bae 100644
--- a/drivers/wireless/nrf24l01.c
+++ b/drivers/wireless/nrf24l01.c
@@ -495,7 +495,7 @@ static int nrf24l01_irqhandler(int irq, FAR void *context)
 {
   FAR struct nrf24l01_dev_s *dev = g_nrf24l01dev;
 
-  wllvdbg("*IRQ*");
+  wllinfo("*IRQ*");
 
 #ifdef CONFIG_WL_NRF24L01_RXSUPPORT
 
@@ -604,7 +604,7 @@ static void nrf24l01_worker(FAR void *arg)
         {
           dev->pfd->revents |= POLLIN;  /* Data available for input */
 
-          wvdbg("Wake up polled fd");
+          winfo("Wake up polled fd");
           sem_post(dev->pfd->sem);
         }
 #endif
@@ -720,11 +720,11 @@ static int dosend(FAR struct nrf24l01_dev_s *dev, FAR const uint8_t *data, size_
       dev->lastxmitcount = (obsvalue & NRF24L01_ARC_CNT_MASK)
           >> NRF24L01_ARC_CNT_SHIFT;
 
-      wvdbg("Transmission OK (lastxmitcount=%d)\n", dev->lastxmitcount);
+      winfo("Transmission OK (lastxmitcount=%d)\n", dev->lastxmitcount);
     }
   else if (status & NRF24L01_MAX_RT)
     {
-      wvdbg("MAX_RT!\n", dev->lastxmitcount);
+      winfo("MAX_RT!\n", dev->lastxmitcount);
       result = -ECOMM;
       dev->lastxmitcount = NRF24L01_XMIT_MAXRT;
 
@@ -758,7 +758,7 @@ static int nrf24l01_open(FAR struct file *filep)
   FAR struct nrf24l01_dev_s *dev;
   int result;
 
-  wvdbg("Opening nRF24L01 dev\n");
+  winfo("Opening nRF24L01 dev\n");
 
   DEBUGASSERT(filep);
   inode = filep->f_inode;
@@ -800,7 +800,7 @@ static int nrf24l01_close(FAR struct file *filep)
   FAR struct inode *inode;
   FAR struct nrf24l01_dev_s *dev;
 
-  wvdbg("Closing nRF24L01 dev\n");
+  winfo("Closing nRF24L01 dev\n");
   DEBUGASSERT(filep);
   inode = filep->f_inode;
 
@@ -885,7 +885,7 @@ static int nrf24l01_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
   FAR struct nrf24l01_dev_s *dev;
   int result = OK;
 
-  wvdbg("cmd: %d arg: %ld\n", cmd, arg);
+  winfo("cmd: %d arg: %ld\n", cmd, arg);
   DEBUGASSERT(filep);
   inode = filep->f_inode;
 
@@ -1117,7 +1117,7 @@ static int nrf24l01_poll(FAR struct file *filep, FAR struct pollfd *fds,
   FAR struct nrf24l01_dev_s *dev;
   int result = OK;
 
-  wvdbg("setup: %d\n", (int)setup);
+  winfo("setup: %d\n", (int)setup);
   DEBUGASSERT(filep && fds);
   inode = filep->f_inode;
 
@@ -1252,7 +1252,7 @@ int nrf24l01_register(FAR struct spi_dev_s *spi, FAR struct nrf24l01_config_s *c
 
   /* Register the device as an input device */
 
-  ivdbg("Registering " DEV_NAME "\n");
+  iinfo("Registering " DEV_NAME "\n");
 
   result = register_driver(DEV_NAME, &nrf24l01_fops, 0666, dev);
   if (result < 0)
diff --git a/fs/binfs/fs_binfs.c b/fs/binfs/fs_binfs.c
index 959b3336dd..1fed2e6c2a 100644
--- a/fs/binfs/fs_binfs.c
+++ b/fs/binfs/fs_binfs.c
@@ -138,7 +138,7 @@ static int binfs_open(FAR struct file *filep, FAR const char *relpath,
 {
   int index;
 
-  fvdbg("Open '%s'\n", relpath);
+  finfo("Open '%s'\n", relpath);
 
   /* BINFS is read-only.  Any attempt to open with any kind of write
    * access is not permitted.
@@ -173,7 +173,7 @@ static int binfs_open(FAR struct file *filep, FAR const char *relpath,
 
 static int binfs_close(FAR struct file *filep)
 {
-  fvdbg("Closing\n");
+  finfo("Closing\n");
   return OK;
 }
 
@@ -185,7 +185,7 @@ static ssize_t binfs_read(FAR struct file *filep, char *buffer, size_t buflen)
 {
   /* Reading is not supported.  Just return end-of-file */
 
-  fvdbg("Read %d bytes from offset %d\n", buflen, filep->f_pos);
+  finfo("Read %d bytes from offset %d\n", buflen, filep->f_pos);
   return 0;
 }
 
@@ -197,7 +197,7 @@ static int binfs_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 {
   int ret;
 
-  fvdbg("cmd: %d arg: %08lx\n", cmd, arg);
+  finfo("cmd: %d arg: %08lx\n", cmd, arg);
 
   /* Only one IOCTL command is supported */
 
@@ -237,7 +237,7 @@ static int binfs_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
 static int binfs_dup(FAR const struct file *oldp, FAR struct file *newp)
 {
-  fvdbg("Dup %p->%p\n", oldp, newp);
+  finfo("Dup %p->%p\n", oldp, newp);
 
   /* Copy the index from the old to the new file structure */
 
@@ -256,7 +256,7 @@ static int binfs_dup(FAR const struct file *oldp, FAR struct file *newp)
 static int binfs_opendir(struct inode *mountpt, const char *relpath,
                          struct fs_dirent_s *dir)
 {
-  fvdbg("relpath: \"%s\"\n", relpath ? relpath : "NULL");
+  finfo("relpath: \"%s\"\n", relpath ? relpath : "NULL");
 
   /* The requested directory must be the volume-relative "root" directory */
 
@@ -294,14 +294,14 @@ static int binfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir)
        * special error -ENOENT
        */
 
-      fvdbg("Entry %d: End of directory\n", index);
+      finfo("Entry %d: End of directory\n", index);
       ret = -ENOENT;
     }
   else
     {
       /* Save the filename and file type */
 
-      fvdbg("Entry %d: \"%s\"\n", index, name);
+      finfo("Entry %d: \"%s\"\n", index, name);
       dir->fd_dir.d_type = DTYPE_FILE;
       strncpy(dir->fd_dir.d_name, name, NAME_MAX+1);
 
@@ -331,7 +331,7 @@ static int binfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir)
 
 static int binfs_rewinddir(struct inode *mountpt, struct fs_dirent_s *dir)
 {
-  fvdbg("Entry\n");
+  finfo("Entry\n");
 
   dir->u.binfs.fb_index = 0;
   return OK;
@@ -351,7 +351,7 @@ static int binfs_rewinddir(struct inode *mountpt, struct fs_dirent_s *dir)
 static int binfs_bind(FAR struct inode *blkdriver, const void *data,
                       void **handle)
 {
-  fvdbg("Entry\n");
+  finfo("Entry\n");
   return OK;
 }
 
@@ -366,7 +366,7 @@ static int binfs_bind(FAR struct inode *blkdriver, const void *data,
 static int binfs_unbind(FAR void *handle, FAR struct inode **blkdriver,
                         unsigned int flags)
 {
-  fvdbg("Entry\n");
+  finfo("Entry\n");
   return OK;
 }
 
@@ -379,7 +379,7 @@ static int binfs_unbind(FAR void *handle, FAR struct inode **blkdriver,
 
 static int binfs_statfs(struct inode *mountpt, struct statfs *buf)
 {
-  fvdbg("Entry\n");
+  finfo("Entry\n");
 
   /* Fill in the statfs info */
 
@@ -402,7 +402,7 @@ static int binfs_statfs(struct inode *mountpt, struct statfs *buf)
 
 static int binfs_stat(struct inode *mountpt, const char *relpath, struct stat *buf)
 {
-  fvdbg("Entry\n");
+  finfo("Entry\n");
 
   /* The requested directory must be the volume-relative "root" directory */
 
diff --git a/fs/fat/fs_configfat.c b/fs/fat/fs_configfat.c
index 8fe7c576f2..5898887ca1 100644
--- a/fs/fat/fs_configfat.c
+++ b/fs/fat/fs_configfat.c
@@ -464,7 +464,7 @@ mkfatfs_tryfat12(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var,
           maxnclusters = FAT_MAXCLUST12;
         }
 
-      fvdbg("nfatsects=%u nclusters=%u (max=%u)\n",
+      finfo("nfatsects=%u nclusters=%u (max=%u)\n",
             config->fc_nfatsects, config->fc_nclusters, maxnclusters);
 
       /* Check if this number of clusters would overflow the maximum for
@@ -535,7 +535,7 @@ mkfatfs_tryfat16(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var,
           maxnclusters = FAT_MAXCLUST16;
         }
 
-      fvdbg("nfatsects=%u nclusters=%u (min=%u max=%u)\n",
+      finfo("nfatsects=%u nclusters=%u (min=%u max=%u)\n",
             config->fc_nfatsects, config->fc_nclusters, FAT_MINCLUST16,
             maxnclusters);
 
@@ -612,7 +612,7 @@ mkfatfs_tryfat32(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var,
           maxnclusters = FAT_MAXCLUST32;
         }
 
-      fvdbg("nfatsects=%u nclusters=%u (max=%u)\n",
+      finfo("nfatsects=%u nclusters=%u (max=%u)\n",
             config->fc_nfatsects, config->fc_nclusters, maxnclusters);
 
       /* Check if this number of clusters would overflow the maximum for
@@ -654,7 +654,7 @@ mkfatfs_selectfat(int fattype, FAR struct fat_format_s *fmt,
 {
   /* Return the appropriate information about the selected file system. */
 
-  fvdbg("Selected FAT%d\n", fattype);
+  finfo("Selected FAT%d\n", fattype);
 
   var->fv_fattype      = fattype;
   var->fv_nclusters    = config->fc_nclusters;
@@ -745,7 +745,7 @@ mkfatfs_clustersearch(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var)
 
   do
     {
-      fvdbg("Configuring with %d sectors/cluster...\n",
+      finfo("Configuring with %d sectors/cluster...\n",
             1 << fmt->ff_clustshift);
 
       /* Check if FAT12 has not been excluded */
diff --git a/fs/fat/fs_fat32.c b/fs/fat/fs_fat32.c
index c9cf80be6e..b35a600eec 100644
--- a/fs/fat/fs_fat32.c
+++ b/fs/fat/fs_fat32.c
@@ -1397,7 +1397,7 @@ static int fat_dup(FAR const struct file *oldp, FAR struct file *newp)
   FAR struct fat_file_s *newff;
   int ret;
 
-  fvdbg("Dup %p->%p\n", oldp, newp);
+  finfo("Dup %p->%p\n", oldp, newp);
 
   /* Sanity checks */
 
diff --git a/fs/fat/fs_fat32util.c b/fs/fat/fs_fat32util.c
index 84f3b8eae7..8e2bcac59e 100644
--- a/fs/fat/fs_fat32util.c
+++ b/fs/fat/fs_fat32util.c
@@ -573,11 +573,11 @@ int fat_mount(struct fat_mountpt_s *fs, bool writeable)
            */
 
           uint8_t part = PART_GETTYPE(i, fs->fs_buffer);
-          fvdbg("Partition %d, offset %d, type %d\n", i, PART_ENTRY(i), part);
+          finfo("Partition %d, offset %d, type %d\n", i, PART_ENTRY(i), part);
 
           if (part == 0)
             {
-              fvdbg("No partition %d\n", i);
+              finfo("No partition %d\n", i);
               continue;
             }
 
@@ -606,13 +606,13 @@ int fat_mount(struct fat_mountpt_s *fs, bool writeable)
             {
               /* Break out of the loop if a valid boot record is found */
 
-              fvdbg("MBR found in partition %d\n", i);
+              finfo("MBR found in partition %d\n", i);
               break;
             }
 
           /* Re-read sector 0 so that we can check the next partition */
 
-          fvdbg("Partition %d is not an MBR\n", i);
+          finfo("Partition %d is not an MBR\n", i);
           ret = fat_hwread(fs, fs->fs_buffer, 0, 1);
           if (ret < 0)
             {
@@ -1875,7 +1875,7 @@ int fat_currentsector(struct fat_mountpt_s *fs, struct fat_file_s *ff,
 
       ff->ff_sectorsincluster = fs->fs_fatsecperclus - sectoroffset;
 
-      fvdbg("position=%d currentsector=%d sectorsincluster=%d\n",
+      finfo("position=%d currentsector=%d sectorsincluster=%d\n",
             position, ff->ff_currentsector, ff->ff_sectorsincluster);
 
       return OK;
diff --git a/fs/mount/fs_automount.c b/fs/mount/fs_automount.c
index e0fea07881..8f2c337c3d 100644
--- a/fs/mount/fs_automount.c
+++ b/fs/mount/fs_automount.c
@@ -191,7 +191,7 @@ static void automount_mount(FAR struct automounter_state_s *priv)
   FAR const struct automount_lower_s *lower = priv->lower;
   int ret;
 
-  fvdbg("Mounting %s\n", lower->mountpoint);
+  finfo("Mounting %s\n", lower->mountpoint);
 
   /* Check if the something is already mounted at the mountpoint. */
 
@@ -268,7 +268,7 @@ static int automount_unmount(FAR struct automounter_state_s *priv)
   FAR const struct automount_lower_s *lower = priv->lower;
   int ret;
 
-  fvdbg("Unmounting %s\n", lower->mountpoint);
+  finfo("Unmounting %s\n", lower->mountpoint);
 
   /* Check if the something is already mounted at the mountpoint. */
 
@@ -295,7 +295,7 @@ static int automount_unmount(FAR struct automounter_state_s *priv)
 
           if (errcode == EBUSY)
             {
-              fvdbg("WARNING: Volume is busy, try again later\n");
+              finfo("WARNING: Volume is busy, try again later\n");
 
               /* Start a timer to retry the umount2 after a delay */
 
@@ -315,7 +315,7 @@ static int automount_unmount(FAR struct automounter_state_s *priv)
 
           else
             {
-              fvdbg("ERROR: umount2 failed: %d\n", errcode);
+              finfo("ERROR: umount2 failed: %d\n", errcode);
               return -errcode;
             }
         }
@@ -363,7 +363,7 @@ static void automount_timeout(int argc, uint32_t arg1, ...)
     (FAR struct automounter_state_s *)((uintptr_t)arg1);
   int ret;
 
-  fllvdbg("Timeout!\n");
+  fllinfo("Timeout!\n");
   DEBUGASSERT(argc == 1 && priv);
 
   /* Check the state of things.  This timeout at the interrupt level and
@@ -372,7 +372,7 @@ static void automount_timeout(int argc, uint32_t arg1, ...)
    * there should be no pending work.
    */
 
-  fllvdbg("inserted=%d\n", priv->inserted);
+  fllinfo("inserted=%d\n", priv->inserted);
   DEBUGASSERT(!priv->inserted && work_available(&priv->work));
 
   /* Queue work to occur immediately. */
@@ -463,7 +463,7 @@ static int automount_interrupt(FAR const struct automount_lower_s *lower,
 
   DEBUGASSERT(lower && priv && priv->lower == lower);
 
-  fllvdbg("inserted=%d\n", inserted);
+  fllinfo("inserted=%d\n", inserted);
 
   /* Cancel any pending work.  We could get called multiple times if, for
    * example there is bounce in the detection mechanism.  Work is performed
@@ -532,7 +532,7 @@ FAR void *automount_initialize(FAR const struct automount_lower_s *lower)
   FAR struct automounter_state_s *priv;
   int ret;
 
-  fvdbg("lower=%p\n", lower);
+  finfo("lower=%p\n", lower);
   DEBUGASSERT(lower);
 
   /* Allocate an auto-mounter state structure */
diff --git a/fs/nfs/nfs_util.c b/fs/nfs/nfs_util.c
index 6e5d8e4526..f811e01480 100644
--- a/fs/nfs/nfs_util.c
+++ b/fs/nfs/nfs_util.c
@@ -241,7 +241,7 @@ tryagain:
       return error;
     }
 
-  fvdbg("NFS_SUCCESS\n");
+  finfo("NFS_SUCCESS\n");
   return OK;
 }
 
diff --git a/fs/nfs/nfs_vfsops.c b/fs/nfs/nfs_vfsops.c
index 6d71a04457..fb23c5a2fa 100644
--- a/fs/nfs/nfs_vfsops.c
+++ b/fs/nfs/nfs_vfsops.c
@@ -390,7 +390,7 @@ static int nfs_filetruncate(FAR struct nfsmount *nmp, struct nfsnode *np)
   int           reqlen;
   int           error;
 
-  fvdbg("Truncating file\n");
+  finfo("Truncating file\n");
 
   /* Create the SETATTR RPC call arguments */
 
@@ -771,7 +771,7 @@ static ssize_t nfs_read(FAR struct file *filep, char *buffer, size_t buflen)
   FAR uint32_t              *ptr;
   int                        error = 0;
 
-  fvdbg("Read %d bytes from offset %d\n", buflen, filep->f_pos);
+  finfo("Read %d bytes from offset %d\n", buflen, filep->f_pos);
 
   /* Sanity checks */
 
@@ -802,7 +802,7 @@ static ssize_t nfs_read(FAR struct file *filep, char *buffer, size_t buflen)
   if (buflen > tmp)
     {
       buflen = tmp;
-      fvdbg("Read size truncated to %d\n", buflen);
+      finfo("Read size truncated to %d\n", buflen);
     }
 
   /* Now loop until we fill the user buffer (or hit the end of the file) */
@@ -852,7 +852,7 @@ static ssize_t nfs_read(FAR struct file *filep, char *buffer, size_t buflen)
 
       /* Perform the read */
 
-      fvdbg("Reading %d bytes\n", readsize);
+      finfo("Reading %d bytes\n", readsize);
       nfs_statistics(NFSPROC_READ);
       error = nfs_request(nmp, NFSPROC_READ,
                           (FAR void *)&nmp->nm_msgbuffer.read, reqlen,
@@ -914,7 +914,7 @@ static ssize_t nfs_read(FAR struct file *filep, char *buffer, size_t buflen)
         }
     }
 
-  fvdbg("Read %d bytes\n", bytesread);
+  finfo("Read %d bytes\n", bytesread);
   nfs_semgive(nmp);
   return bytesread;
 
@@ -947,7 +947,7 @@ static ssize_t nfs_write(FAR struct file *filep, const char *buffer,
   int                    committed = NFSV3WRITE_FILESYNC;
   int                    error;
 
-  fvdbg("Write %d bytes to offset %d\n", buflen, filep->f_pos);
+  finfo("Write %d bytes to offset %d\n", buflen, filep->f_pos);
 
   /* Sanity checks */
 
@@ -1127,7 +1127,7 @@ static int nfs_dup(FAR const struct file *oldp, FAR struct file *newp)
   FAR struct nfsnode *np;
   int error;
 
-  fvdbg("Dup %p->%p\n", oldp, newp);
+  finfo("Dup %p->%p\n", oldp, newp);
 
   /* Sanity checks */
 
@@ -1193,7 +1193,7 @@ static int nfs_opendir(struct inode *mountpt, const char *relpath,
   uint32_t objtype;
   int error;
 
-  fvdbg("relpath: \"%s\"\n", relpath ? relpath : "NULL");
+  finfo("relpath: \"%s\"\n", relpath ? relpath : "NULL");
 
   /* Sanity checks */
 
@@ -1273,7 +1273,7 @@ static int nfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir)
   int reqlen;
   int error = 0;
 
-  fvdbg("Entry\n");
+  finfo("Entry\n");
 
   /* Sanity checks */
 
@@ -1378,7 +1378,7 @@ static int nfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir)
       tmp = *ptr++;
       if (tmp != 0)
         {
-          fvdbg("End of directory\n");
+          finfo("End of directory\n");
           error = ENOENT;
         }
 
@@ -1388,7 +1388,7 @@ static int nfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir)
 
        else
          {
-           fvdbg("No data but not end of directory???\n");
+           finfo("No data but not end of directory???\n");
            error = EAGAIN;
         }
 
@@ -1437,7 +1437,7 @@ static int nfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir)
 
   memcpy(dir->fd_dir.d_name, name, length);
   dir->fd_dir.d_name[length] = '\0';
-  fvdbg("name: \"%s\"\n", dir->fd_dir.d_name);
+  finfo("name: \"%s\"\n", dir->fd_dir.d_name);
 
   /* Get the file attributes associated with this name and return
    * the file type.
@@ -1481,7 +1481,7 @@ static int nfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir)
       dir->fd_dir.d_type = DTYPE_CHR;
       break;
     }
-  fvdbg("type: %d->%d\n", (int)tmp, dir->fd_dir.d_type);
+  finfo("type: %d->%d\n", (int)tmp, dir->fd_dir.d_type);
 
 errout_with_semaphore:
   nfs_semgive(nmp);
@@ -1502,7 +1502,7 @@ errout_with_semaphore:
 
 static int nfs_rewinddir(FAR struct inode *mountpt, FAR struct fs_dirent_s *dir)
 {
-  fvdbg("Entry\n");
+  finfo("Entry\n");
 
   /* Sanity checks */
 
@@ -1780,7 +1780,7 @@ static int nfs_bind(FAR struct inode *blkdriver, FAR const void *data,
           return ENOMEM;
         }
 
-      fvdbg("Connecting\n");
+      finfo("Connecting\n");
 
       /* Translate nfsmnt flags -> rpcclnt flags */
 
@@ -1826,7 +1826,7 @@ static int nfs_bind(FAR struct inode *blkdriver, FAR const void *data,
   *handle = (FAR void *)nmp;
   nfs_semgive(nmp);
 
-  fvdbg("Successfully mounted\n");
+  finfo("Successfully mounted\n");
   return OK;
 
 bad:
@@ -1872,7 +1872,7 @@ static int nfs_unbind(FAR void *handle, FAR struct inode **blkdriver,
   FAR struct nfsmount *nmp = (FAR struct nfsmount *)handle;
   int error;
 
-  fvdbg("Entry\n");
+  finfo("Entry\n");
   DEBUGASSERT(nmp);
 
   /* Get exclusive access to the mount structure */
diff --git a/fs/nfs/rpc_clnt.c b/fs/nfs/rpc_clnt.c
index 0af2b470c7..302f468fbc 100644
--- a/fs/nfs/rpc_clnt.c
+++ b/fs/nfs/rpc_clnt.c
@@ -349,7 +349,7 @@ void rpcclnt_init(void)
   rpc_auth_unix = txdr_unsigned(RPCAUTH_UNIX);
   rpc_auth_null = txdr_unsigned(RPCAUTH_NULL);
 
-  fvdbg("RPC initialized\n");
+  finfo("RPC initialized\n");
 }
 
 /****************************************************************************
@@ -385,7 +385,7 @@ int rpcclnt_connect(struct rpcclnt *rpc)
   uint16_t tport;
   int errval;
 
-  fvdbg("Connecting\n");
+  finfo("Connecting\n");
 
   /* Create the socket */
 
@@ -731,7 +731,7 @@ int rpcclnt_request(FAR struct rpcclnt *rpc, int procnum, int prog,
       error = rpcclnt_send(rpc, procnum, prog, request, reqlen);
       if (error != OK)
         {
-          fvdbg("ERROR rpcclnt_send failed: %d\n", error);
+          finfo("ERROR rpcclnt_send failed: %d\n", error);
         }
 
       /* Wait for the reply from our send */
@@ -741,7 +741,7 @@ int rpcclnt_request(FAR struct rpcclnt *rpc, int procnum, int prog,
           error = rpcclnt_reply(rpc, procnum, prog, response, resplen);
           if (error != OK)
             {
-              fvdbg("ERROR rpcclnt_reply failed: %d\n", error);
+              finfo("ERROR rpcclnt_reply failed: %d\n", error);
             }
         }
 
@@ -785,7 +785,7 @@ int rpcclnt_request(FAR struct rpcclnt *rpc, int procnum, int prog,
   tmp = fxdr_unsigned(uint32_t, replymsg->status);
   if (tmp == RPC_SUCCESS)
     {
-      fvdbg("RPC_SUCCESS\n");
+      finfo("RPC_SUCCESS\n");
     }
   else if (tmp == RPC_PROGMISMATCH)
     {
diff --git a/fs/nxffs/nxffs_cache.c b/fs/nxffs/nxffs_cache.c
index 2a04d6b0a9..32c9756a05 100644
--- a/fs/nxffs/nxffs_cache.c
+++ b/fs/nxffs/nxffs_cache.c
@@ -225,7 +225,7 @@ int nxffs_getc(FAR struct nxffs_volume_s *volume, uint16_t reserve)
           off_t nextblock = volume->ioblock + 1;
           if (nextblock >= volume->nblocks)
             {
-              fvdbg("End of FLASH encountered\n");
+              finfo("End of FLASH encountered\n");
               return -ENOSPC;
             }
 
diff --git a/fs/nxffs/nxffs_dirent.c b/fs/nxffs/nxffs_dirent.c
index 39150b9369..d51e2cabb6 100644
--- a/fs/nxffs/nxffs_dirent.c
+++ b/fs/nxffs/nxffs_dirent.c
@@ -71,7 +71,7 @@ int nxffs_opendir(FAR struct inode *mountpt, FAR const char *relpath,
   struct nxffs_volume_s *volume;
   int ret;
 
-  fvdbg("relpath: \"%s\"\n", relpath ? relpath : "NULL");
+  finfo("relpath: \"%s\"\n", relpath ? relpath : "NULL");
 
   /* Sanity checks */
 
@@ -146,7 +146,7 @@ int nxffs_readdir(FAR struct inode *mountpt, FAR struct fs_dirent_s *dir)
     {
       /* Return the filename and file type */
 
-      fvdbg("Offset %d: \"%s\"\n", entry.hoffset, entry.name);
+      finfo("Offset %d: \"%s\"\n", entry.hoffset, entry.name);
       dir->fd_dir.d_type = DTYPE_FILE;
       strncpy(dir->fd_dir.d_name, entry.name, NAME_MAX+1);
 
@@ -175,7 +175,7 @@ int nxffs_rewinddir(FAR struct inode *mountpt, FAR struct fs_dirent_s *dir)
   FAR struct nxffs_volume_s *volume;
   int ret;
 
-  fvdbg("Entry\n");
+  finfo("Entry\n");
 
   /* Sanity checks */
 
diff --git a/fs/nxffs/nxffs_initialize.c b/fs/nxffs/nxffs_initialize.c
index 5701d31637..19e419a5de 100644
--- a/fs/nxffs/nxffs_initialize.c
+++ b/fs/nxffs/nxffs_initialize.c
@@ -383,7 +383,7 @@ int nxffs_limits(FAR struct nxffs_volume_s *volume)
        * the location of the free FLASH region.
        */
 
-      fvdbg("No inodes found\n");
+      finfo("No inodes found\n");
       noinodes = true;
     }
   else
@@ -391,7 +391,7 @@ int nxffs_limits(FAR struct nxffs_volume_s *volume)
       /* Save the offset to the first inode */
 
       volume->inoffset = entry.hoffset;
-      fvdbg("First inode at offset %d\n", volume->inoffset);
+      finfo("First inode at offset %d\n", volume->inoffset);
 
       /* Discard this entry and set the next offset. */
 
@@ -411,7 +411,7 @@ int nxffs_limits(FAR struct nxffs_volume_s *volume)
           nxffs_freeentry(&entry);
         }
 
-      fvdbg("Last inode before offset %d\n", offset);
+      finfo("Last inode before offset %d\n", offset);
     }
 
   /* No inodes were found after this offset.  Now search for a block of
@@ -435,11 +435,11 @@ int nxffs_limits(FAR struct nxffs_volume_s *volume)
               /* Yes.. the FLASH is full.  Force the offsets to the end of FLASH */
 
               volume->froffset = volume->nblocks * volume->geo.blocksize;
-              fvdbg("Assume no free FLASH, froffset: %d\n", volume->froffset);
+              finfo("Assume no free FLASH, froffset: %d\n", volume->froffset);
               if (noinodes)
                 {
                   volume->inoffset = volume->froffset;
-                  fvdbg("No inodes, inoffset: %d\n", volume->inoffset);
+                  finfo("No inodes, inoffset: %d\n", volume->inoffset);
                 }
 
               return OK;
@@ -468,11 +468,11 @@ int nxffs_limits(FAR struct nxffs_volume_s *volume)
                */
 
               volume->froffset = offset;
-              fvdbg("Free FLASH region begins at offset: %d\n", volume->froffset);
+              finfo("Free FLASH region begins at offset: %d\n", volume->froffset);
               if (noinodes)
                 {
                   volume->inoffset = offset;
-                  fvdbg("First inode at offset %d\n", volume->inoffset);
+                  finfo("First inode at offset %d\n", volume->inoffset);
                 }
 
               return OK;
diff --git a/fs/nxffs/nxffs_inode.c b/fs/nxffs/nxffs_inode.c
index bf4c7f5957..02d609832d 100644
--- a/fs/nxffs/nxffs_inode.c
+++ b/fs/nxffs/nxffs_inode.c
@@ -286,7 +286,7 @@ int nxffs_nextentry(FAR struct nxffs_volume_s *volume, off_t offset,
 
           if (++nerased >= NXFFS_NERASED)
             {
-              fvdbg("No entry found\n");
+              finfo("No entry found\n");
               return -ENOENT;
             }
         }
@@ -337,7 +337,7 @@ int nxffs_nextentry(FAR struct nxffs_volume_s *volume, off_t offset,
               ret = nxffs_rdentry(volume, offset, entry);
               if (ret == OK)
                 {
-                  fvdbg("Found a valid fileheader, offset: %d\n", offset);
+                  finfo("Found a valid fileheader, offset: %d\n", offset);
                   return OK;
                 }
 
@@ -396,7 +396,7 @@ int nxffs_findinode(FAR struct nxffs_volume_s *volume, FAR const char *name,
       ret = nxffs_nextentry(volume, offset, entry);
       if (ret < 0)
         {
-          fvdbg("No inode found: %d\n", -ret);
+          finfo("No inode found: %d\n", -ret);
           return ret;
         }
 
diff --git a/fs/nxffs/nxffs_ioctl.c b/fs/nxffs/nxffs_ioctl.c
index da0752320a..7d6219eaab 100644
--- a/fs/nxffs/nxffs_ioctl.c
+++ b/fs/nxffs/nxffs_ioctl.c
@@ -69,7 +69,7 @@ int nxffs_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
   FAR struct nxffs_volume_s *volume;
   int ret;
 
-  fvdbg("cmd: %d arg: %08lx\n", cmd, arg);
+  finfo("cmd: %d arg: %08lx\n", cmd, arg);
 
   /* Sanity checks */
 
@@ -96,7 +96,7 @@ int nxffs_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
   if (cmd == FIOC_REFORMAT)
     {
-      fvdbg("Reformat command\n");
+      finfo("Reformat command\n");
 
       /* We cannot reformat the volume if there are any open inodes */
 
@@ -114,7 +114,7 @@ int nxffs_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
   else if (cmd == FIOC_OPTIMIZE)
     {
-      fvdbg("Optimize command\n");
+      finfo("Optimize command\n");
 
       /* Pack the volume */
 
diff --git a/fs/nxffs/nxffs_open.c b/fs/nxffs/nxffs_open.c
index 2ac1249e06..a461d2c080 100644
--- a/fs/nxffs/nxffs_open.c
+++ b/fs/nxffs/nxffs_open.c
@@ -726,7 +726,7 @@ static inline int nxffs_rdopen(FAR struct nxffs_volume_s *volume,
       /* Just increment the reference count on the ofile */
 
       ofile->crefs++;
-      fvdbg("crefs: %d\n", ofile->crefs);
+      finfo("crefs: %d\n", ofile->crefs);
     }
 
   /* The file has not yet been opened.
@@ -756,7 +756,7 @@ static inline int nxffs_rdopen(FAR struct nxffs_volume_s *volume,
       ret = nxffs_findinode(volume, name, &ofile->entry);
       if (ret != OK)
         {
-          fvdbg("Inode '%s' not found: %d\n", name, -ret);
+          finfo("Inode '%s' not found: %d\n", name, -ret);
           goto errout_with_ofile;
         }
 
@@ -892,7 +892,7 @@ static inline int nxffs_wrclose(FAR struct nxffs_volume_s *volume,
 
   if (wrfile->truncate && wrfile->ofile.entry.name)
     {
-      fvdbg("Removing old file: %s\n", wrfile->ofile.entry.name);
+      finfo("Removing old file: %s\n", wrfile->ofile.entry.name);
 
       ret = nxffs_rminode(volume, wrfile->ofile.entry.name);
       if (ret < 0)
@@ -1000,7 +1000,7 @@ int nxffs_open(FAR struct file *filep, FAR const char *relpath,
   FAR struct nxffs_ofile_s *ofile = NULL;
   int ret;
 
-  fvdbg("Open '%s'\n", relpath);
+  finfo("Open '%s'\n", relpath);
 
   /* Sanity checks */
 
@@ -1069,7 +1069,7 @@ int nxffs_dup(FAR const struct file *oldp, FAR struct file *newp)
 #endif
   FAR struct nxffs_ofile_s *ofile;
 
-  fvdbg("Dup %p->%p\n", oldp, newp);
+  finfo("Dup %p->%p\n", oldp, newp);
 
   /* Sanity checks */
 
@@ -1126,7 +1126,7 @@ int nxffs_close(FAR struct file *filep)
   FAR struct nxffs_ofile_s *ofile;
   int ret;
 
-  fvdbg("Closing\n");
+  finfo("Closing\n");
 
   /* Sanity checks */
 
diff --git a/fs/nxffs/nxffs_read.c b/fs/nxffs/nxffs_read.c
index c327013d82..36ba8bd055 100644
--- a/fs/nxffs/nxffs_read.c
+++ b/fs/nxffs/nxffs_read.c
@@ -150,7 +150,7 @@ ssize_t nxffs_read(FAR struct file *filep, FAR char *buffer, size_t buflen)
   size_t readsize;
   int ret;
 
-  fvdbg("Read %d bytes from offset %d\n", buflen, filep->f_pos);
+  finfo("Read %d bytes from offset %d\n", buflen, filep->f_pos);
 
   /* Sanity checks */
 
@@ -304,7 +304,7 @@ int nxffs_nextblock(FAR struct nxffs_volume_s *volume, off_t offset,
 
           if (++nerased >= NXFFS_NERASED)
             {
-              fvdbg("No entry found\n");
+              finfo("No entry found\n");
               return -ENOENT;
             }
         }
@@ -358,7 +358,7 @@ int nxffs_nextblock(FAR struct nxffs_volume_s *volume, off_t offset,
               ret = nxffs_rdblkhdr(volume, blkentry->hoffset, &blkentry->datlen);
               if (ret == OK)
                 {
-                  fvdbg("Found a valid data block, offset: %d datlen: %d\n",
+                  finfo("Found a valid data block, offset: %d datlen: %d\n",
                         blkentry->hoffset, blkentry->datlen);
                   return OK;
                 }
diff --git a/fs/nxffs/nxffs_stat.c b/fs/nxffs/nxffs_stat.c
index b1dbdcbaf9..f47c55dbb8 100644
--- a/fs/nxffs/nxffs_stat.c
+++ b/fs/nxffs/nxffs_stat.c
@@ -70,7 +70,7 @@ int nxffs_statfs(FAR struct inode *mountpt, FAR struct statfs *buf)
   FAR struct nxffs_volume_s *volume;
   int ret;
 
-  fvdbg("Entry\n");
+  finfo("Entry\n");
 
   /* Sanity checks */
 
@@ -116,7 +116,7 @@ int nxffs_stat(FAR struct inode *mountpt, FAR const char *relpath,
   struct nxffs_entry_s entry;
   int ret;
 
-  fvdbg("Entry\n");
+  finfo("Entry\n");
 
   /* Sanity checks */
 
diff --git a/fs/nxffs/nxffs_unlink.c b/fs/nxffs/nxffs_unlink.c
index bc42b5a317..9c9dbd4bdc 100644
--- a/fs/nxffs/nxffs_unlink.c
+++ b/fs/nxffs/nxffs_unlink.c
@@ -148,7 +148,7 @@ int nxffs_unlink(FAR struct inode *mountpt, FAR const char *relpath)
   FAR struct nxffs_volume_s *volume;
   int ret;
 
-  fvdbg("Entry\n");
+  finfo("Entry\n");
 
   /* Sanity checks */
 
diff --git a/fs/nxffs/nxffs_write.c b/fs/nxffs/nxffs_write.c
index 423c61c9f6..f07f43da14 100644
--- a/fs/nxffs/nxffs_write.c
+++ b/fs/nxffs/nxffs_write.c
@@ -436,7 +436,7 @@ ssize_t nxffs_write(FAR struct file *filep, FAR const char *buffer, size_t bufle
   ssize_t total;
   int ret;
 
-  fvdbg("Write %d bytes to offset %d\n", buflen, filep->f_pos);
+  finfo("Write %d bytes to offset %d\n", buflen, filep->f_pos);
 
   /* Sanity checks */
 
diff --git a/fs/procfs/fs_procfs.c b/fs/procfs/fs_procfs.c
index 506ab9fcb5..6b0ee4e3c0 100644
--- a/fs/procfs/fs_procfs.c
+++ b/fs/procfs/fs_procfs.c
@@ -322,7 +322,7 @@ static int procfs_open(FAR struct file *filep, FAR const char *relpath,
 {
   int x, ret = -ENOENT;
 
-  fvdbg("Open '%s'\n", relpath);
+  finfo("Open '%s'\n", relpath);
 
   /* Perform the stat based on the procfs_entry operations */
 
@@ -382,7 +382,7 @@ static ssize_t procfs_read(FAR struct file *filep, FAR char *buffer,
   FAR struct procfs_file_s *handler;
   ssize_t ret = 0;
 
-  fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen);
+  finfo("buffer=%p buflen=%d\n", buffer, (int)buflen);
 
   /* Recover our private data from the struct file instance */
 
@@ -406,7 +406,7 @@ static ssize_t procfs_write(FAR struct file *filep, FAR const char *buffer,
   FAR struct procfs_file_s *handler;
   ssize_t ret = 0;
 
-  fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen);
+  finfo("buffer=%p buflen=%d\n", buffer, (int)buflen);
 
   /* Recover our private data from the struct file instance */
 
@@ -429,7 +429,7 @@ static ssize_t procfs_write(FAR struct file *filep, FAR const char *buffer,
 
 static int procfs_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 {
-  fvdbg("cmd: %d arg: %08lx\n", cmd, arg);
+  finfo("cmd: %d arg: %08lx\n", cmd, arg);
 
   /* No IOCTL commands supported */
 
@@ -448,7 +448,7 @@ static int procfs_dup(FAR const struct file *oldp, FAR struct file *newp)
 {
   FAR struct procfs_file_s *oldattr;
 
-  fvdbg("Dup %p->%p\n", oldp, newp);
+  finfo("Dup %p->%p\n", oldp, newp);
 
   /* Recover our private data from the old struct file instance */
 
@@ -476,7 +476,7 @@ static int procfs_opendir(FAR struct inode *mountpt, FAR const char *relpath,
   FAR void *priv = NULL;
   irqstate_t flags;
 
-  fvdbg("relpath: \"%s\"\n", relpath ? relpath : "NULL");
+  finfo("relpath: \"%s\"\n", relpath ? relpath : "NULL");
   DEBUGASSERT(mountpt && relpath && dir && !dir->u.procfs);
 
   /* The relative must be either:
@@ -717,7 +717,7 @@ static int procfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir)
                * error -ENOENT
                */
 
-              fvdbg("Entry %d: End of directory\n", index);
+              finfo("Entry %d: End of directory\n", index);
               ret = -ENOENT;
             }
           else
diff --git a/fs/procfs/fs_procfscpuload.c b/fs/procfs/fs_procfscpuload.c
index 2f54ab841f..02d216e409 100644
--- a/fs/procfs/fs_procfscpuload.c
+++ b/fs/procfs/fs_procfscpuload.c
@@ -138,7 +138,7 @@ static int cpuload_open(FAR struct file *filep, FAR const char *relpath,
 {
   FAR struct cpuload_file_s *attr;
 
-  fvdbg("Open '%s'\n", relpath);
+  finfo("Open '%s'\n", relpath);
 
   /* PROCFS is read-only.  Any attempt to open with any kind of write
    * access is not permitted.
@@ -207,7 +207,7 @@ static ssize_t cpuload_read(FAR struct file *filep, FAR char *buffer,
   off_t offset;
   ssize_t ret;
 
-  fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen);
+  finfo("buffer=%p buflen=%d\n", buffer, (int)buflen);
 
   /* Recover our private data from the struct file instance */
 
@@ -288,7 +288,7 @@ static int cpuload_dup(FAR const struct file *oldp, FAR struct file *newp)
   FAR struct cpuload_file_s *oldattr;
   FAR struct cpuload_file_s *newattr;
 
-  fvdbg("Dup %p->%p\n", oldp, newp);
+  finfo("Dup %p->%p\n", oldp, newp);
 
   /* Recover our private data from the old struct file instance */
 
diff --git a/fs/procfs/fs_procfskmm.c b/fs/procfs/fs_procfskmm.c
index 3424338dc0..4589de4a88 100644
--- a/fs/procfs/fs_procfskmm.c
+++ b/fs/procfs/fs_procfskmm.c
@@ -137,7 +137,7 @@ static int kmm_open(FAR struct file *filep, FAR const char *relpath,
 {
   FAR struct kmm_file_s *procfile;
 
-  fvdbg("Open '%s'\n", relpath);
+  finfo("Open '%s'\n", relpath);
 
   /* PROCFS is read-only.  Any attempt to open with any kind of write
    * access is not permitted.
@@ -208,7 +208,7 @@ static ssize_t kmm_read(FAR struct file *filep, FAR char *buffer,
   size_t totalsize;
   off_t offset;
 
-  fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen);
+  finfo("buffer=%p buflen=%d\n", buffer, (int)buflen);
 
   DEBUGASSERT(filep != NULL && buffer != NULL && buflen > 0);
   offset = filep->f_pos;
@@ -267,7 +267,7 @@ static int kmm_dup(FAR const struct file *oldp, FAR struct file *newp)
   FAR struct kmm_file_s *oldattr;
   FAR struct kmm_file_s *newattr;
 
-  fvdbg("Dup %p->%p\n", oldp, newp);
+  finfo("Dup %p->%p\n", oldp, newp);
 
   /* Recover our private data from the old struct file instance */
 
diff --git a/fs/procfs/fs_procfsproc.c b/fs/procfs/fs_procfsproc.c
index f5f6c0397f..d7cb3f8813 100644
--- a/fs/procfs/fs_procfsproc.c
+++ b/fs/procfs/fs_procfsproc.c
@@ -1013,7 +1013,7 @@ static int proc_open(FAR struct file *filep, FAR const char *relpath,
   unsigned long tmp;
   pid_t pid;
 
-  fvdbg("Open '%s'\n", relpath);
+  finfo("Open '%s'\n", relpath);
 
   /* PROCFS is read-only.  Any attempt to open with any kind of write
    * access is not permitted.
@@ -1137,7 +1137,7 @@ static ssize_t proc_read(FAR struct file *filep, FAR char *buffer,
   irqstate_t flags;
   ssize_t ret;
 
-  fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen);
+  finfo("buffer=%p buflen=%d\n", buffer, (int)buflen);
 
   /* Recover our private data from the struct file instance */
 
@@ -1215,7 +1215,7 @@ static int proc_dup(FAR const struct file *oldp, FAR struct file *newp)
   FAR struct proc_file_s *oldfile;
   FAR struct proc_file_s *newfile;
 
-  fvdbg("Dup %p->%p\n", oldp, newp);
+  finfo("Dup %p->%p\n", oldp, newp);
 
   /* Recover our private data from the old struct file instance */
 
@@ -1259,7 +1259,7 @@ static int proc_opendir(FAR const char *relpath, FAR struct fs_dirent_s *dir)
   FAR char *ptr;
   pid_t pid;
 
-  fvdbg("relpath: \"%s\"\n", relpath ? relpath : "NULL");
+  finfo("relpath: \"%s\"\n", relpath ? relpath : "NULL");
   DEBUGASSERT(relpath && dir && !dir->u.procfs);
 
   /* The relative must be either:
@@ -1415,7 +1415,7 @@ static int proc_readdir(struct fs_dirent_s *dir)
        * error -ENOENT
        */
 
-      fvdbg("Entry %d: End of directory\n", index);
+      finfo("Entry %d: End of directory\n", index);
       ret = -ENOENT;
     }
 
diff --git a/fs/procfs/fs_procfsuptime.c b/fs/procfs/fs_procfsuptime.c
index a1b9b070da..75d7510ed1 100644
--- a/fs/procfs/fs_procfsuptime.c
+++ b/fs/procfs/fs_procfsuptime.c
@@ -140,7 +140,7 @@ static int uptime_open(FAR struct file *filep, FAR const char *relpath,
 {
   FAR struct uptime_file_s *attr;
 
-  fvdbg("Open '%s'\n", relpath);
+  finfo("Open '%s'\n", relpath);
 
   /* PROCFS is read-only.  Any attempt to open with any kind of write
    * access is not permitted.
@@ -222,7 +222,7 @@ static ssize_t uptime_read(FAR struct file *filep, FAR char *buffer,
   unsigned int csec;
 #endif
 
-  fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen);
+  finfo("buffer=%p buflen=%d\n", buffer, (int)buflen);
 
   /* Recover our private data from the struct file instance */
 
@@ -301,7 +301,7 @@ static int uptime_dup(FAR const struct file *oldp, FAR struct file *newp)
   FAR struct uptime_file_s *oldattr;
   FAR struct uptime_file_s *newattr;
 
-  fvdbg("Dup %p->%p\n", oldp, newp);
+  finfo("Dup %p->%p\n", oldp, newp);
 
   /* Recover our private data from the old struct file instance */
 
diff --git a/fs/procfs/fs_skeleton.c b/fs/procfs/fs_skeleton.c
index 052eb1f0f7..55216e8cef 100644
--- a/fs/procfs/fs_skeleton.c
+++ b/fs/procfs/fs_skeleton.c
@@ -163,7 +163,7 @@ static int skel_open(FAR struct file *filep, FAR const char *relpath,
 {
   FAR struct skel_file_s *priv;
 
-  fvdbg("Open '%s'\n", relpath);
+  finfo("Open '%s'\n", relpath);
 
   /* PROCFS is read-only.  Any attempt to open with any kind of write
    * access is not permitted.
@@ -228,7 +228,7 @@ static ssize_t skel_read(FAR struct file *filep, FAR char *buffer,
   FAR struct skel_file_s *priv;
   ssize_t ret;
 
-  fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen);
+  finfo("buffer=%p buflen=%d\n", buffer, (int)buflen);
 
   /* Recover our private data from the struct file instance */
 
@@ -262,7 +262,7 @@ static int skel_dup(FAR const struct file *oldp, FAR struct file *newp)
   FAR struct skel_file_s *oldpriv;
   FAR struct skel_file_s *newpriv;
 
-  fvdbg("Dup %p->%p\n", oldp, newp);
+  finfo("Dup %p->%p\n", oldp, newp);
 
   /* Recover our private data from the old struct file instance */
 
@@ -300,7 +300,7 @@ static int skel_opendir(FAR const char *relpath, FAR struct fs_dirent_s *dir)
 {
   FAR struct skel_level1_s *level1;
 
-  fvdbg("relpath: \"%s\"\n", relpath ? relpath : "NULL");
+  finfo("relpath: \"%s\"\n", relpath ? relpath : "NULL");
   DEBUGASSERT(relpath && dir && !dir->u.procfs);
 
   /* The path refers to the 1st level sbdirectory.  Allocate the level1
@@ -383,7 +383,7 @@ static int skel_readdir(FAR struct fs_dirent_s *dir)
        * error -ENOENT
        */
 
-      fvdbg("Entry %d: End of directory\n", index);
+      finfo("Entry %d: End of directory\n", index);
       ret = -ENOENT;
     }
 
diff --git a/fs/romfs/fs_romfs.c b/fs/romfs/fs_romfs.c
index 804fbb7ed4..91686d32d6 100644
--- a/fs/romfs/fs_romfs.c
+++ b/fs/romfs/fs_romfs.c
@@ -149,7 +149,7 @@ static int romfs_open(FAR struct file *filep, FAR const char *relpath,
   FAR struct romfs_file_s    *rf;
   int                         ret;
 
-  fvdbg("Open '%s'\n", relpath);
+  finfo("Open '%s'\n", relpath);
 
   /* Sanity checks */
 
@@ -285,7 +285,7 @@ static int romfs_close(FAR struct file *filep)
   FAR struct romfs_file_s    *rf;
   int                         ret = OK;
 
-  fvdbg("Closing\n");
+  finfo("Closing\n");
 
   /* Sanity checks */
 
@@ -340,7 +340,7 @@ static ssize_t romfs_read(FAR struct file *filep, FAR char *buffer,
   int                         sectorndx;
   int                         ret;
 
-  fvdbg("Read %d bytes from offset %d\n", buflen, filep->f_pos);
+  finfo("Read %d bytes from offset %d\n", buflen, filep->f_pos);
 
   /* Sanity checks */
 
@@ -404,7 +404,7 @@ static ssize_t romfs_read(FAR struct file *filep, FAR char *buffer,
 
           /* Read all of the sectors directly into user memory */
 
-          fvdbg("Read %d sectors starting with %d\n", nsectors, sector);
+          finfo("Read %d sectors starting with %d\n", nsectors, sector);
           ret = romfs_hwread(rm, userbuffer, sector, nsectors);
           if (ret < 0)
             {
@@ -422,7 +422,7 @@ static ssize_t romfs_read(FAR struct file *filep, FAR char *buffer,
            * it is already there then all is well.
            */
 
-          fvdbg("Read sector %d\n", sector);
+          finfo("Read sector %d\n", sector);
           ret = romfs_filecacheread(rm, rf, sector);
           if (ret < 0)
             {
@@ -446,7 +446,7 @@ static ssize_t romfs_read(FAR struct file *filep, FAR char *buffer,
              sector++;
             }
 
-          fvdbg("Return %d bytes from sector offset %d\n", bytesread, sectorndx);
+          finfo("Return %d bytes from sector offset %d\n", bytesread, sectorndx);
           memcpy(userbuffer, &rf->rf_buffer[sectorndx], bytesread);
         }
 
@@ -477,7 +477,7 @@ static off_t romfs_seek(FAR struct file *filep, off_t offset, int whence)
   off_t                       position;
   int                         ret;
 
-  fvdbg("Seek to offset: %d whence: %d\n", offset, whence);
+  finfo("Seek to offset: %d whence: %d\n", offset, whence);
 
   /* Sanity checks */
 
@@ -537,7 +537,7 @@ static off_t romfs_seek(FAR struct file *filep, off_t offset, int whence)
   /* Set file position and return success */
 
   filep->f_pos = position;
-  fvdbg("New file position: %d\n", filep->f_pos);
+  finfo("New file position: %d\n", filep->f_pos);
 
   romfs_semgive(rm);
   return OK;
@@ -557,7 +557,7 @@ static int romfs_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
   FAR struct romfs_file_s    *rf;
   FAR void                  **ppv = (FAR void**)arg;
 
-  fvdbg("cmd: %d arg: %08lx\n", cmd, arg);
+  finfo("cmd: %d arg: %08lx\n", cmd, arg);
 
   /* Sanity checks */
 
@@ -597,7 +597,7 @@ static int romfs_dup(FAR const struct file *oldp, FAR struct file *newp)
   FAR struct romfs_file_s *newrf;
   int ret;
 
-  fvdbg("Dup %p->%p\n", oldp, newp);
+  finfo("Dup %p->%p\n", oldp, newp);
 
   /* Sanity checks */
 
@@ -691,7 +691,7 @@ static int romfs_opendir(FAR struct inode *mountpt, FAR const char *relpath,
   FAR struct romfs_dirinfo_s  dirinfo;
   int                         ret;
 
-  fvdbg("relpath: '%s'\n", relpath);
+  finfo("relpath: '%s'\n", relpath);
 
   /* Sanity checks */
 
@@ -759,7 +759,7 @@ static int romfs_readdir(FAR struct inode *mountpt,
   uint32_t                    size;
   int                         ret;
 
-  fvdbg("Entry\n");
+  finfo("Entry\n");
 
   /* Sanity checks */
 
@@ -851,7 +851,7 @@ static int romfs_rewinddir(FAR struct inode *mountpt,
   FAR struct romfs_mountpt_s *rm;
   int ret;
 
-  fvdbg("Entry\n");
+  finfo("Entry\n");
 
   /* Sanity checks */
 
@@ -891,7 +891,7 @@ static int romfs_bind(FAR struct inode *blkdriver, FAR const void *data,
   struct romfs_mountpt_s *rm;
   int ret;
 
-  fvdbg("Entry\n");
+  finfo("Entry\n");
 
   /* Open the block driver */
 
@@ -977,7 +977,7 @@ static int romfs_unbind(FAR void *handle, FAR struct inode **blkdriver,
   FAR struct romfs_mountpt_s *rm = (FAR struct romfs_mountpt_s *)handle;
   int ret;
 
-  fvdbg("Entry\n");
+  finfo("Entry\n");
 
 #ifdef CONFIG_DEBUG
   if (!rm)
@@ -1056,7 +1056,7 @@ static int romfs_statfs(FAR struct inode *mountpt, FAR struct statfs *buf)
   FAR struct romfs_mountpt_s *rm;
   int ret;
 
-  fvdbg("Entry\n");
+  finfo("Entry\n");
 
   /* Sanity checks */
 
@@ -1114,7 +1114,7 @@ static int romfs_stat(FAR struct inode *mountpt, FAR const char *relpath,
   FAR struct romfs_dirinfo_s dirinfo;
   int ret;
 
-  fvdbg("Entry\n");
+  finfo("Entry\n");
 
   /* Sanity checks */
 
@@ -1142,7 +1142,7 @@ static int romfs_stat(FAR struct inode *mountpt, FAR const char *relpath,
 
   if (ret < 0)
     {
-      fvdbg("Failed to find directory: %d\n", ret);
+      finfo("Failed to find directory: %d\n", ret);
       goto errout_with_semaphore;
     }
 
@@ -1171,7 +1171,7 @@ static int romfs_stat(FAR struct inode *mountpt, FAR const char *relpath,
     {
       /* Otherwise, pretend like the unsupported node does not exist */
 
-      fvdbg("Unsupported inode: %d\n", dirinfo.rd_next);
+      finfo("Unsupported inode: %d\n", dirinfo.rd_next);
       ret = -ENOENT;
       goto errout_with_semaphore;
     }
diff --git a/fs/romfs/fs_romfsutil.c b/fs/romfs/fs_romfsutil.c
index ade749ffcb..da4b7685cd 100644
--- a/fs/romfs/fs_romfsutil.c
+++ b/fs/romfs/fs_romfsutil.c
@@ -437,7 +437,7 @@ int romfs_filecacheread(struct romfs_mountpt_s *rm, struct romfs_file_s *rf,
 {
   int ret;
 
-  fvdbg("sector: %d cached: %d sectorsize: %d XIP base: %p buffer: %p\n",
+  finfo("sector: %d cached: %d sectorsize: %d XIP base: %p buffer: %p\n",
         sector, rf->rf_cachesector, rm->rm_hwsectorsize,
         rm->rm_xipbase, rf->rf_buffer);
 
@@ -457,13 +457,13 @@ int romfs_filecacheread(struct romfs_mountpt_s *rm, struct romfs_file_s *rf,
            */
 
           rf->rf_buffer = rm->rm_xipbase + sector * rm->rm_hwsectorsize;
-          fvdbg("XIP buffer: %p\n", rf->rf_buffer);
+          finfo("XIP buffer: %p\n", rf->rf_buffer);
         }
       else
         {
           /* In non-XIP mode, we will have to read the new sector. */
 
-          fvdbg("Calling romfs_hwread\n");
+          finfo("Calling romfs_hwread\n");
           ret = romfs_hwread(rm, rf->rf_buffer, sector, 1);
           if (ret < 0)
             {
diff --git a/fs/smartfs/smartfs_procfs.c b/fs/smartfs/smartfs_procfs.c
index 474d85009f..d8fe9995c3 100644
--- a/fs/smartfs/smartfs_procfs.c
+++ b/fs/smartfs/smartfs_procfs.c
@@ -348,7 +348,7 @@ static int smartfs_open(FAR struct file *filep, FAR const char *relpath,
   FAR struct smartfs_file_s *priv;
   int   ret;
 
-  fvdbg("Open '%s'\n", relpath);
+  finfo("Open '%s'\n", relpath);
 
   /* PROCFS is read-only.  Any attempt to open with any kind of write
    * access is not permitted.
@@ -421,7 +421,7 @@ static ssize_t smartfs_read(FAR struct file *filep, FAR char *buffer,
   FAR struct smartfs_file_s *priv;
   ssize_t ret;
 
-  fvdbg("buffer=%p buflen=%d\n", buffer, (int)buflen);
+  finfo("buffer=%p buflen=%d\n", buffer, (int)buflen);
 
   /* Recover our private data from the struct file instance */
 
@@ -506,7 +506,7 @@ static int smartfs_dup(FAR const struct file *oldp, FAR struct file *newp)
   FAR struct smartfs_file_s *oldpriv;
   FAR struct smartfs_file_s *newpriv;
 
-  fvdbg("Dup %p->%p\n", oldp, newp);
+  finfo("Dup %p->%p\n", oldp, newp);
 
   /* Recover our private data from the old struct file instance */
 
@@ -545,7 +545,7 @@ static int smartfs_opendir(FAR const char *relpath, FAR struct fs_dirent_s *dir)
   FAR struct smartfs_level1_s *level1;
   int        ret;
 
-  fvdbg("relpath: \"%s\"\n", relpath ? relpath : "NULL");
+  finfo("relpath: \"%s\"\n", relpath ? relpath : "NULL");
   DEBUGASSERT(relpath && dir && !dir->u.procfs);
 
   /* The path refers to the 1st level subdirectory.  Allocate the level1
@@ -624,7 +624,7 @@ static int smartfs_readdir(struct fs_dirent_s *dir)
        * error -ENOENT
        */
 
-      fvdbg("Entry %d: End of directory\n", index);
+      finfo("Entry %d: End of directory\n", index);
       ret = -ENOENT;
     }
 
diff --git a/fs/smartfs/smartfs_smart.c b/fs/smartfs/smartfs_smart.c
index df65d2bdd0..d7c7694be5 100644
--- a/fs/smartfs/smartfs_smart.c
+++ b/fs/smartfs/smartfs_smart.c
@@ -628,7 +628,7 @@ static int smartfs_sync_internal(struct smartfs_mountpt_s *fs,
 
   if (sf->byteswritten > 0)
     {
-      fvdbg("Syncing sector %d\n", sf->currsector);
+      finfo("Syncing sector %d\n", sf->currsector);
 
       /* Read the existing sector used bytes value */
 
@@ -1218,7 +1218,7 @@ static int smartfs_dup(FAR const struct file *oldp, FAR struct file *newp)
 {
   struct smartfs_ofile_s   *sf;
 
-  fvdbg("Dup %p->%p\n", oldp, newp);
+  finfo("Dup %p->%p\n", oldp, newp);
 
   /* Sanity checks */
 
diff --git a/fs/tmpfs/fs_tmpfs.c b/fs/tmpfs/fs_tmpfs.c
index 09aa6bec70..8bcaffec64 100644
--- a/fs/tmpfs/fs_tmpfs.c
+++ b/fs/tmpfs/fs_tmpfs.c
@@ -1345,7 +1345,7 @@ static int tmpfs_open(FAR struct file *filep, FAR const char *relpath,
   off_t offset;
   int ret;
 
-  fvdbg("filep: %p\n", filep);
+  finfo("filep: %p\n", filep);
   DEBUGASSERT(filep->f_priv == NULL && filep->f_inode != NULL);
 
   /* Get the mountpoint inode reference from the file structure and the
@@ -1489,7 +1489,7 @@ static int tmpfs_close(FAR struct file *filep)
 {
   FAR struct tmpfs_file_s *tfo;
 
-  fvdbg("filep: %p\n", filep);
+  finfo("filep: %p\n", filep);
   DEBUGASSERT(filep->f_priv != NULL && filep->f_inode != NULL);
 
   /* Recover our private data from the struct file instance */
@@ -1543,7 +1543,7 @@ static ssize_t tmpfs_read(FAR struct file *filep, FAR char *buffer,
   off_t startpos;
   off_t endpos;
 
-  fvdbg("filep: %p buffer: %p buflen: %lu\n",
+  finfo("filep: %p buffer: %p buflen: %lu\n",
         filep, buffer, (unsigned long)buflen);
   DEBUGASSERT(filep->f_priv != NULL && filep->f_inode != NULL);
 
@@ -1591,7 +1591,7 @@ static ssize_t tmpfs_write(FAR struct file *filep, FAR const char *buffer,
   off_t endpos;
   int ret;
 
-  fvdbg("filep: %p buffer: %p buflen: %lu\n",
+  finfo("filep: %p buffer: %p buflen: %lu\n",
         filep, buffer, (unsigned long)buflen);
   DEBUGASSERT(filep->f_priv != NULL && filep->f_inode != NULL);
 
@@ -1646,7 +1646,7 @@ static off_t tmpfs_seek(FAR struct file *filep, off_t offset, int whence)
   FAR struct tmpfs_file_s *tfo;
   off_t position;
 
-  fvdbg("filep: %p\n", filep);
+  finfo("filep: %p\n", filep);
   DEBUGASSERT(filep->f_priv != NULL && filep->f_inode != NULL);
 
   /* Recover our private data from the struct file instance */
@@ -1706,7 +1706,7 @@ static int tmpfs_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
   FAR struct tmpfs_file_s *tfo;
   FAR void **ppv = (FAR void**)arg;
 
-  fvdbg("filep: %p cmd: %d arg: %08lx\n", filep, cmd, arg);
+  finfo("filep: %p cmd: %d arg: %08lx\n", filep, cmd, arg);
   DEBUGASSERT(filep->f_priv != NULL && filep->f_inode != NULL);
 
   /* Recover our private data from the struct file instance */
@@ -1739,7 +1739,7 @@ static int tmpfs_dup(FAR const struct file *oldp, FAR struct file *newp)
 {
   FAR struct tmpfs_file_s *tfo;
 
-  fvdbg("Dup %p->%p\n", oldp, newp);
+  finfo("Dup %p->%p\n", oldp, newp);
   DEBUGASSERT(oldp->f_priv != NULL && oldp->f_inode != NULL &&
               newp->f_priv == NULL && newp->f_inode != NULL);
 
@@ -1774,7 +1774,7 @@ static int tmpfs_opendir(FAR struct inode *mountpt, FAR const char *relpath,
   FAR struct tmpfs_directory_s *tdo;
   int ret;
 
-  fvdbg("mountpt: %p relpath: %s dir: %p\n",
+  finfo("mountpt: %p relpath: %s dir: %p\n",
         mountpt, relpath, dir);
   DEBUGASSERT(mountpt != NULL && relpath != NULL && dir != NULL);
 
@@ -1820,7 +1820,7 @@ static int tmpfs_closedir(FAR struct inode *mountpt,
 {
   FAR struct tmpfs_directory_s *tdo;
 
-  fvdbg("mountpt: %p dir: %p\n",  mountpt, dir);
+  finfo("mountpt: %p dir: %p\n",  mountpt, dir);
   DEBUGASSERT(mountpt != NULL && dir != NULL);
 
   /* Get the directory structure from the dir argument */
@@ -1847,7 +1847,7 @@ static int tmpfs_readdir(FAR struct inode *mountpt,
   unsigned int index;
   int ret;
 
-  fvdbg("mountpt: %p dir: %p\n",  mountpt, dir);
+  finfo("mountpt: %p dir: %p\n",  mountpt, dir);
   DEBUGASSERT(mountpt != NULL && dir != NULL);
 
   /* Get the directory structure from the dir argument and lock it */
@@ -1866,7 +1866,7 @@ static int tmpfs_readdir(FAR struct inode *mountpt,
        * -ENOENT
        */
 
-      fvdbg("End of directory\n");
+      finfo("End of directory\n");
       ret = -ENOENT;
     }
   else
@@ -1914,7 +1914,7 @@ static int tmpfs_readdir(FAR struct inode *mountpt,
 static int tmpfs_rewinddir(FAR struct inode *mountpt,
                            FAR struct fs_dirent_s *dir)
 {
-  fvdbg("mountpt: %p dir: %p\n",  mountpt, dir);
+  finfo("mountpt: %p dir: %p\n",  mountpt, dir);
   DEBUGASSERT(mountpt != NULL && dir != NULL);
 
   /* Set the readdir index to zero */
@@ -1933,7 +1933,7 @@ static int tmpfs_bind(FAR struct inode *blkdriver, FAR const void *data,
   FAR struct tmpfs_directory_s *tdo;
   FAR struct tmpfs_s *fs;
 
-  fvdbg("blkdriver: %p data: %p handle: %p\n", blkdriver, data, handle);
+  finfo("blkdriver: %p data: %p handle: %p\n", blkdriver, data, handle);
   DEBUGASSERT(blkdriver == NULL && handle != NULL);
 
   /* Create an instance of the tmpfs file system */
@@ -1985,7 +1985,7 @@ static int tmpfs_unbind(FAR void *handle, FAR struct inode **blkdriver,
   FAR struct tmpfs_directory_s *tdo;
   int ret;
 
-  fvdbg("handle: %p blkdriver: %p flags: %02x\n",
+  finfo("handle: %p blkdriver: %p flags: %02x\n",
         handle, blkdriver, flags);
   DEBUGASSERT(fs != NULL && fs->tfs_root.tde_object != NULL);
 
@@ -2023,7 +2023,7 @@ static int tmpfs_statfs(FAR struct inode *mountpt, FAR struct statfs *buf)
   off_t blkused;
   int ret;
 
-  fvdbg("mountpt: %p buf: %p\n", mountpt, buf);
+  finfo("mountpt: %p buf: %p\n", mountpt, buf);
   DEBUGASSERT(mountpt != NULL && buf != NULL);
 
   /* Get the file system structure from the inode reference. */
@@ -2090,7 +2090,7 @@ static int tmpfs_unlink(FAR struct inode *mountpt, FAR const char *relpath)
   FAR const char *name;
   int ret;
 
-  fvdbg("mountpt: %p relpath: %s\n", mountpt, relpath);
+  finfo("mountpt: %p relpath: %s\n", mountpt, relpath);
   DEBUGASSERT(mountpt != NULL && relpath != NULL);
 
   /* Get the file system structure from the inode reference. */
@@ -2190,7 +2190,7 @@ static int tmpfs_mkdir(FAR struct inode *mountpt, FAR const char *relpath,
   FAR struct tmpfs_s *fs;
   int ret;
 
-  fvdbg("mountpt: %p relpath: %s mode: %04x\n", mountpt, relpath, mode);
+  finfo("mountpt: %p relpath: %s mode: %04x\n", mountpt, relpath, mode);
   DEBUGASSERT(mountpt != NULL && relpath != NULL);
 
   /* Get the file system structure from the inode reference. */
@@ -2221,7 +2221,7 @@ static int tmpfs_rmdir(FAR struct inode *mountpt, FAR const char *relpath)
   FAR const char *name;
   int ret;
 
-  fvdbg("mountpt: %p relpath: %s\n", mountpt, relpath);
+  finfo("mountpt: %p relpath: %s\n", mountpt, relpath);
   DEBUGASSERT(mountpt != NULL && relpath != NULL);
 
   /* Get the file system structure from the inode reference. */
@@ -2322,7 +2322,7 @@ static int tmpfs_rename(FAR struct inode *mountpt, FAR const char *oldrelpath,
   FAR char *copy;
   int ret;
 
-  fvdbg("mountpt: %p oldrelpath: %s newrelpath: %s\n",
+  finfo("mountpt: %p oldrelpath: %s newrelpath: %s\n",
         mountpt, oldrelpath, newrelpath);
   DEBUGASSERT(mountpt != NULL && oldrelpath != NULL && newrelpath != NULL);
 
@@ -2462,7 +2462,7 @@ static int tmpfs_stat(FAR struct inode *mountpt, FAR const char *relpath,
   size_t objsize;
   int ret;
 
-  fvdbg("mountpt=%p relpath=%s buf=%p\n", mountpt, relpath, buf);
+  finfo("mountpt=%p relpath=%s buf=%p\n", mountpt, relpath, buf);
   DEBUGASSERT(mountpt != NULL && relpath != NULL && buf != NULL);
 
   /* Get the file system structure from the inode reference. */
diff --git a/fs/unionfs/fs_unionfs.c b/fs/unionfs/fs_unionfs.c
index b0a0920e83..a61e94acb0 100644
--- a/fs/unionfs/fs_unionfs.c
+++ b/fs/unionfs/fs_unionfs.c
@@ -843,7 +843,7 @@ static int unionfs_open(FAR struct file *filep, FAR const char *relpath,
   DEBUGASSERT(filep != NULL && filep->f_inode != NULL);
   ui = (FAR struct unionfs_inode_s *)filep->f_inode->i_private;
 
-  fvdbg("Opening: ui_nopen=%d\n", ui->ui_nopen);
+  finfo("Opening: ui_nopen=%d\n", ui->ui_nopen);
 
   /* Get exclusive access to the file system data structures */
 
@@ -946,7 +946,7 @@ static int unionfs_close(FAR struct file *filep)
   DEBUGASSERT(um != NULL && um->um_node != NULL && um->um_node->u.i_mops != NULL);
   ops = um->um_node->u.i_mops;
 
-  fvdbg("Closing: ui_nopen=%d\n", ui->ui_nopen);
+  finfo("Closing: ui_nopen=%d\n", ui->ui_nopen);
 
   /* Perform the lower level close operation */
 
@@ -986,7 +986,7 @@ static ssize_t unionfs_read(FAR struct file *filep, FAR char *buffer,
   FAR const struct mountpt_operations *ops;
   int ret = -EPERM;
 
-  fvdbg("buflen: %lu\n", (unsigned long)buflen);
+  finfo("buflen: %lu\n", (unsigned long)buflen);
 
   /* Recover the open file data from the struct file instance */
 
@@ -1034,7 +1034,7 @@ static ssize_t unionfs_write(FAR struct file *filep, FAR const char *buffer,
   FAR const struct mountpt_operations *ops;
   int ret = -EPERM;
 
-  fvdbg("buflen: %lu\n", (unsigned long)buflen);
+  finfo("buflen: %lu\n", (unsigned long)buflen);
 
   /* Recover the open file data from the struct file instance */
 
@@ -1081,7 +1081,7 @@ static off_t unionfs_seek(FAR struct file *filep, off_t offset, int whence)
   FAR const struct mountpt_operations *ops;
   int ret;
 
-  fvdbg("offset: %lu whence: %d\n", (unsigned long)offset, whence);
+  finfo("offset: %lu whence: %d\n", (unsigned long)offset, whence);
 
   /* Recover the open file data from the struct file instance */
 
@@ -1157,7 +1157,7 @@ static int unionfs_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
   FAR const struct mountpt_operations *ops;
   int ret = -ENOTTY;
 
-  fvdbg("cmd: %d arg: %lu\n", cmd, arg);
+  finfo("cmd: %d arg: %lu\n", cmd, arg);
 
   /* Recover the open file data from the struct file instance */
 
@@ -1204,7 +1204,7 @@ static int unionfs_sync(FAR struct file *filep)
   FAR const struct mountpt_operations *ops;
   int ret = -EINVAL;
 
-  fvdbg("Entry\n");
+  finfo("Entry\n");
 
   /* Recover the open file data from the struct file instance */
 
@@ -1252,7 +1252,7 @@ static int unionfs_dup(FAR const struct file *oldp, FAR struct file *newp)
   FAR const struct mountpt_operations *ops;
   int ret = -ENOMEM;
 
-  fvdbg("Entry\n");
+  finfo("Entry\n");
 
   /* Recover the open file data from the struct file instance */
 
@@ -1323,7 +1323,7 @@ static int unionfs_opendir(FAR struct inode *mountpt, FAR const char *relpath,
   FAR struct fs_dirent_s *lowerdir;
   int ret;
 
-  fvdbg("relpath: \"%s\"\n", relpath ? relpath : "NULL");
+  finfo("relpath: \"%s\"\n", relpath ? relpath : "NULL");
 
   /* Recover the filesystem data from the struct inode instance */
 
@@ -1486,7 +1486,7 @@ static int unionfs_closedir(FAR struct inode *mountpt,
   int ret = OK;
   int i;
 
-  fvdbg("Entry\n");
+  finfo("Entry\n");
 
   /* Recover the union file system data from the struct inode instance */
 
@@ -1638,7 +1638,7 @@ static int unionfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir)
   DEBUGASSERT(um->um_node != NULL && um->um_node->u.i_mops != NULL);
   ops = um->um_node->u.i_mops;
 
-  fvdbg("fu_ndx: %d\n", fu->fu_ndx);
+  finfo("fu_ndx: %d\n", fu->fu_ndx);
 
   /* Perform the lower level readdir operation */
 
@@ -1819,7 +1819,7 @@ static int unionfs_rewinddir(struct inode *mountpt, struct fs_dirent_s *dir)
   FAR struct fs_unionfsdir_s *fu;
   int ret;
 
-  fvdbg("Entry\n");
+  finfo("Entry\n");
 
   /* Recover the union file system data from the struct inode instance */
 
@@ -1883,7 +1883,7 @@ static int unionfs_unbind(FAR void *handle, FAR struct inode **blkdriver,
 {
   FAR struct unionfs_inode_s *ui;
 
-  fvdbg("Entry\n");
+  finfo("Entry\n");
 
   /* Recover the union file system data from the struct inode instance */
 
@@ -1929,7 +1929,7 @@ static int unionfs_statfs(FAR struct inode *mountpt, FAR struct statfs *buf)
   uint32_t ratiob16;
   int ret;
 
-  fvdbg("Entry\n");
+  finfo("Entry\n");
 
   /* Recover the union file system data from the struct inode instance */
 
@@ -2065,7 +2065,7 @@ static int unionfs_unlink(FAR struct inode *mountpt,
   struct stat buf;
   int ret;
 
-  fvdbg("relpath: %s\n", relpath);
+  finfo("relpath: %s\n", relpath);
 
   /* Recover the union file system data from the struct inode instance */
 
@@ -2137,7 +2137,7 @@ static int unionfs_mkdir(FAR struct inode *mountpt, FAR const char *relpath,
   int ret2;
   int ret;
 
-  fvdbg("relpath: %s\n", relpath);
+  finfo("relpath: %s\n", relpath);
 
   /* Recover the union file system data from the struct inode instance */
 
@@ -2210,7 +2210,7 @@ static int unionfs_rmdir(FAR struct inode *mountpt, FAR const char *relpath)
   int tmp;
   int ret;
 
-  fvdbg("relpath: %s\n", relpath);
+  finfo("relpath: %s\n", relpath);
 
   /* Recover the union file system data from the struct inode instance */
 
@@ -2285,7 +2285,7 @@ static int unionfs_rename(FAR struct inode *mountpt,
   int tmp;
   int ret = -ENOENT;
 
-  fvdbg("oldrelpath: %s newrelpath\n", oldrelpath, newrelpath);
+  finfo("oldrelpath: %s newrelpath\n", oldrelpath, newrelpath);
 
   /* Recover the union file system data from the struct inode instance */
 
@@ -2359,7 +2359,7 @@ static int unionfs_stat(FAR struct inode *mountpt, FAR const char *relpath,
   FAR struct unionfs_mountpt_s *um;
   int ret;
 
-  fvdbg("relpath: %s\n", relpath);
+  finfo("relpath: %s\n", relpath);
 
   /* Recover the union file system data from the struct inode instance */
 
diff --git a/fs/vfs/fs_epoll.c b/fs/vfs/fs_epoll.c
index 8cd6e227ac..590959b2b7 100644
--- a/fs/vfs/fs_epoll.c
+++ b/fs/vfs/fs_epoll.c
@@ -114,7 +114,7 @@ int epoll_ctl(int epfd, int op, int fd, struct epoll_event *ev)
   switch (op)
     {
       case EPOLL_CTL_ADD:
-        fvdbg("%08x CTL ADD(%d): fd=%d ev=%08x\n",
+        finfo("%08x CTL ADD(%d): fd=%d ev=%08x\n",
               epfd, eph->occupied, fd, ev->events);
 
         eph->evs[eph->occupied].events = ev->events | POLLERR | POLLHUP;
@@ -147,7 +147,7 @@ int epoll_ctl(int epfd, int op, int fd, struct epoll_event *ev)
         {
           int i;
 
-          fvdbg("%08x CTL MOD(%d): fd=%d ev=%08x\n",
+          finfo("%08x CTL MOD(%d): fd=%d ev=%08x\n",
                 epfd, eph->occupied, fd, ev->events);
 
           for (i = 0; i < eph->occupied; i++)
diff --git a/graphics/nxbe/nxbe_getrectangle.c b/graphics/nxbe/nxbe_getrectangle.c
index b4d871bc80..e7ec53d2b0 100644
--- a/graphics/nxbe/nxbe_getrectangle.c
+++ b/graphics/nxbe/nxbe_getrectangle.c
@@ -90,7 +90,7 @@ void nxbe_getrectangle(FAR struct nxbe_window_s *wnd,
 #ifdef CONFIG_DEBUG
   if (!wnd || !rect || !dest || plane >= wnd->be->vinfo.nplanes)
     {
-      gvdbg("Invalid parameters\n");
+      ginfo("Invalid parameters\n");
       return;
     }
 #endif
diff --git a/graphics/nxmu/nx_start.c b/graphics/nxmu/nx_start.c
index 814dc5a70c..18e1aeae3f 100644
--- a/graphics/nxmu/nx_start.c
+++ b/graphics/nxmu/nx_start.c
@@ -135,7 +135,7 @@ int nx_server(int argc, char *argv[])
   /* Then start the server (nx_run does not normally return) */
 
   ret = nx_run(dev);
-  gvdbg("nx_run returned: %d\n", ret);
+  ginfo("nx_run returned: %d\n", ret);
   return EXIT_FAILURE;
 }
 
@@ -174,7 +174,7 @@ int nx_start(void)
 
   /* Start the server kernel thread */
 
-  gvdbg("Starting server task\n");
+  ginfo("Starting server task\n");
   server = kernel_thread("NX Server", CONFIG_NXSTART_SERVERPRIO,
                          CONFIG_NXSTART_SERVERSTACK, nx_server, NULL);
   if (server < 0)
diff --git a/graphics/nxmu/nxmu_server.c b/graphics/nxmu/nxmu_server.c
index a5dad6ec40..3d5822b5bb 100644
--- a/graphics/nxmu/nxmu_server.c
+++ b/graphics/nxmu/nxmu_server.c
@@ -345,7 +345,7 @@ int nx_runinstance(FAR const char *mqname, FAR NX_DRIVERTYPE *dev)
        DEBUGASSERT(nbytes >= sizeof(struct nxsvrmsg_s));
        msg = (FAR struct nxsvrmsg_s *)buffer;
 
-       gvdbg("Received opcode=%d nbytes=%d\n", msg->msgid, nbytes);
+       ginfo("Received opcode=%d nbytes=%d\n", msg->msgid, nbytes);
        switch (msg->msgid)
          {
          /* Messages sent from clients to the NX server *********************/
@@ -531,7 +531,7 @@ int nx_runinstance(FAR const char *mqname, FAR NX_DRIVERTYPE *dev)
             {
               FAR struct nxclimsg_redraw_s *redraw = (FAR struct nxclimsg_redraw_s *)buffer;
               DEBUGASSERT(redraw->wnd == &fe.be.bkgd);
-              gvdbg("Re-draw background rect={(%d,%d),(%d,%d)}\n",
+              ginfo("Re-draw background rect={(%d,%d),(%d,%d)}\n",
                     redraw->rect.pt1.x, redraw->rect.pt1.y,
                     redraw->rect.pt2.x, redraw->rect.pt2.y);
               nxbe_fill(&fe.be.bkgd, &redraw->rect, fe.be.bgcolor);
diff --git a/graphics/nxsu/nx_open.c b/graphics/nxsu/nx_open.c
index 2c646c8b3e..ae0007c247 100644
--- a/graphics/nxsu/nx_open.c
+++ b/graphics/nxsu/nx_open.c
@@ -101,7 +101,7 @@ static void nxsu_bkgdredraw(NXWINDOW hwnd,
   FAR struct nxbe_window_s *wnd = (FAR struct nxbe_window_s *)hwnd;
   FAR struct nxbe_state_s  *be  = wnd->be;
 
-  gvdbg("BG redraw rect={(%d,%d),(%d,%d)}\n",
+  ginfo("BG redraw rect={(%d,%d),(%d,%d)}\n",
         rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y);
   nxbe_fill(wnd, &wnd->bounds, be->bgcolor);
 }
diff --git a/graphics/nxterm/nxterm_kbdin.c b/graphics/nxterm/nxterm_kbdin.c
index 395f6f759f..3ffb75b01d 100644
--- a/graphics/nxterm/nxterm_kbdin.c
+++ b/graphics/nxterm/nxterm_kbdin.c
@@ -393,7 +393,7 @@ void nxterm_kbdin(NXTERM handle, FAR const uint8_t *buffer, uint8_t buflen)
   char ch;
   int ret;
 
-  gvdbg("buflen=%d\n");
+  ginfo("buflen=%d\n");
   DEBUGASSERT(handle);
 
   /* Get the reference to the driver structure from the handle */
diff --git a/graphics/nxterm/nxterm_redraw.c b/graphics/nxterm/nxterm_redraw.c
index e2cbc053c9..b1af8b95cb 100644
--- a/graphics/nxterm/nxterm_redraw.c
+++ b/graphics/nxterm/nxterm_redraw.c
@@ -105,7 +105,7 @@ void nxterm_redraw(NXTERM handle, FAR const struct nxgl_rect_s *rect, bool more)
   int i;
 
   DEBUGASSERT(handle && rect);
-  gvdbg("rect={(%d,%d),(%d,%d)} more=%s\n",
+  ginfo("rect={(%d,%d),(%d,%d)} more=%s\n",
         rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y,
         more ? "true" : "false");
 
diff --git a/graphics/vnc/server/vnc_fbdev.c b/graphics/vnc/server/vnc_fbdev.c
index 7fc1b46f52..aa71ebd5ff 100644
--- a/graphics/vnc/server/vnc_fbdev.c
+++ b/graphics/vnc/server/vnc_fbdev.c
@@ -162,7 +162,7 @@ static int up_getvideoinfo(FAR struct fb_vtable_s *vtable,
   FAR struct vnc_fbinfo_s *fbinfo = (FAR struct vnc_fbinfo_s *)vtable;
   FAR struct vnc_session_s *session;
 
-  gvdbg("vtable=%p vinfo=%p\n", vtable, vinfo);
+  ginfo("vtable=%p vinfo=%p\n", vtable, vinfo);
 
   DEBUGASSERT(fbinfo != NULL && vinfo != NULL);
   if (fbinfo != NULL && vinfo != NULL)
@@ -203,7 +203,7 @@ static int up_getplaneinfo(FAR struct fb_vtable_s *vtable, int planeno,
   FAR struct vnc_fbinfo_s *fbinfo = (FAR struct vnc_fbinfo_s *)vtable;
   FAR struct vnc_session_s *session;
 
-  gvdbg("vtable=%p planeno=%d pinfo=%p\n", vtable, planeno, pinfo);
+  ginfo("vtable=%p planeno=%d pinfo=%p\n", vtable, planeno, pinfo);
 
   DEBUGASSERT(fbinfo != NULL && pinfo != NULL && planeno == 0);
   if (fbinfo != NULL && pinfo != NULL && planeno == 0)
@@ -249,7 +249,7 @@ static int up_getcmap(FAR struct fb_vtable_s *vtable,
   FAR struct vnc_session_s *session;
   int i;
 
-  gvdbg("vtable=%p cmap=%p\n", vtable, cmap);
+  ginfo("vtable=%p cmap=%p\n", vtable, cmap);
 
   DEBUGASSERT(fbinfo != NULL && cmap != NULL);
 
@@ -264,7 +264,7 @@ static int up_getcmap(FAR struct fb_vtable_s *vtable,
           return -ENOTCONN;
         }
 
-      gvdbg("first=%d len=%d\n", vcmap->first, cmap->len);
+      ginfo("first=%d len=%d\n", vcmap->first, cmap->len);
 #warning Missing logic
 
       return OK;
@@ -286,7 +286,7 @@ static int up_putcmap(FAR struct fb_vtable_s *vtable, FAR const struct fb_cmap_s
   FAR struct vnc_session_s *session;
   int i;
 
-  gvdbg("vtable=%p cmap=%p\n", vtable, cmap);
+  ginfo("vtable=%p cmap=%p\n", vtable, cmap);
 
   DEBUGASSERT(fbinfo != NULL && cmap != NULL);
 
@@ -301,7 +301,7 @@ static int up_putcmap(FAR struct fb_vtable_s *vtable, FAR const struct fb_cmap_s
           return -ENOTCONN;
         }
 
-      gvdbg("first=%d len=%d\n", vcmap->first, cmap->len);
+      ginfo("first=%d len=%d\n", vcmap->first, cmap->len);
 #warning Missing logic
 
       return OK;
@@ -324,7 +324,7 @@ static int up_getcursor(FAR struct fb_vtable_s *vtable,
   FAR struct vnc_session_s *session;
   int i;
 
-  gvdbg("vtable=%p attrib=%p\n", vtable, attrib);
+  ginfo("vtable=%p attrib=%p\n", vtable, attrib);
 
   DEBUGASSERT(fbinfo != NULL && attrib != NULL);
 
@@ -360,7 +360,7 @@ static int up_setcursor(FAR struct fb_vtable_s *vtable,
   FAR struct vnc_session_s *session;
   int i;
 
-  gvdbg("vtable=%p settings=%p\n", vtable, settings);
+  ginfo("vtable=%p settings=%p\n", vtable, settings);
 
   DEBUGASSERT(fbinfo != NULL && settings != NULL);
 
@@ -375,7 +375,7 @@ static int up_setcursor(FAR struct fb_vtable_s *vtable,
           return -ENOTCONN;
         }
 
-      gvdbg("flags:   %02x\n", settings->flags);
+      ginfo("flags:   %02x\n", settings->flags);
       if ((settings->flags & FB_CUR_SETPOSITION) != 0)
         {
 #warning Missing logic
@@ -435,7 +435,7 @@ static int vnc_start_server(int display)
 
   /* Start the VNC server kernel thread. */
 
-  gvdbg("Starting the VNC server for display %d\n", display);
+  ginfo("Starting the VNC server for display %d\n", display);
 
   g_fbstartup[display].result = -EBUSY;
   sem_reset(&g_fbstartup[display].fbinit, 0);
@@ -630,7 +630,7 @@ int up_fbinitialize(int display)
   ret = vnc_start_server(display);
   if (ret < 0)
     {
-      gvdbg("ERROR: vnc_start_server() failed: %d\n", ret);
+      ginfo("ERROR: vnc_start_server() failed: %d\n", ret);
       return ret;
     }
 
@@ -639,7 +639,7 @@ int up_fbinitialize(int display)
   ret = vnc_wait_connect(display);
   if (ret < 0)
     {
-      gvdbg("ERROR: vnc_wait_connect() failed: %d\n", ret);
+      ginfo("ERROR: vnc_wait_connect() failed: %d\n", ret);
     }
 
   return ret;
@@ -711,7 +711,7 @@ int vnc_fbinitialize(int display, vnc_kbdout_t kbdout,
   ret = vnc_start_server(display);
   if (ret < 0)
     {
-      gvdbg("ERROR: vnc_start_server() failed: %d\n", ret);
+      ginfo("ERROR: vnc_start_server() failed: %d\n", ret);
       return ret;
     }
 
@@ -720,7 +720,7 @@ int vnc_fbinitialize(int display, vnc_kbdout_t kbdout,
   ret = vnc_wait_start(display);
   if (ret < 0)
     {
-      gvdbg("ERROR: vnc_wait_start() failed: %d\n", ret);
+      ginfo("ERROR: vnc_wait_start() failed: %d\n", ret);
       return ret;
     }
 
diff --git a/graphics/vnc/server/vnc_negotiate.c b/graphics/vnc/server/vnc_negotiate.c
index d70f7c02e0..1541cf2749 100644
--- a/graphics/vnc/server/vnc_negotiate.c
+++ b/graphics/vnc/server/vnc_negotiate.c
@@ -136,7 +136,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
 
   /* Inform the client of the VNC protocol version */
 
-  gvdbg("Send protocol version: %s\n", g_vncproto);
+  ginfo("Send protocol version: %s\n", g_vncproto);
 
   len = strlen(g_vncproto);
   nsent = psock_send(&session->connect, g_vncproto, len, 0);
@@ -152,7 +152,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
 
   /* Receive the echo of the protocol string */
 
-  gvdbg("Receive echo from VNC client\n");
+  ginfo("Receive echo from VNC client\n");
 
   nrecvd = psock_recv(&session->connect, session->inbuf, len, 0);
   if (nrecvd < 0)
@@ -176,7 +176,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
    * any stinkin' security.
    */
 
-  gvdbg("Send SecurityType\n");
+  ginfo("Send SecurityType\n");
 
   sectype = (FAR struct rfb_sectype_s *)session->outbuf;
   rfb_putbe32(sectype->type, RFB_SECTYPE_NONE);
@@ -198,7 +198,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
    * only option offered.
    */
 
-  gvdbg("Send SupportedSecurityTypes\n");
+  ginfo("Send SupportedSecurityTypes\n");
 
   sectypes         = (FAR struct rfb_supported_sectypes_s *)session->outbuf;
   sectypes->ntypes = 1;
@@ -221,7 +221,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
    * type is to be used on the connection.
    */
 
-  gvdbg("Receive SecurityType\n");
+  ginfo("Receive SecurityType\n");
 
   sectype = (FAR struct rfb_selected_sectype_s *)session->inbuf;
 
@@ -242,7 +242,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
 
   DEBUGASSERT(nrecvd == sizeof(struct rfb_selected_sectype_s));
 
-  gvdbg("Send SecurityResult\n");
+  ginfo("Send SecurityResult\n");
 
   secresult = (FAR struct rfb_sectype_result_s *)session->outbuf;
 
@@ -266,7 +266,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
 
       DEBUGASSERT(nsent == sizeof(struct rfb_sectype_result_s));
 
-      gvdbg("Send failure reason\n");
+      ginfo("Send failure reason\n");
 
       secfail = (FAR struct rfb_sectype_fail_s *)session->outbuf;
       len     = strlen(g_nosecurity);
@@ -312,7 +312,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
    * In this implementation, the sharing flag is ignored.
    */
 
-  gvdbg("Receive ClientInit\n");
+  ginfo("Receive ClientInit\n");
 
   nrecvd = psock_recv(&session->connect, session->inbuf,
                       sizeof(struct rfb_clientinit_s), 0);
@@ -344,7 +344,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
    *   Very Low (8 colors) - RGB3 1:1:1 (TrueColor)
    */
 
-  gvdbg("Send ServerInit\n");
+  ginfo("Send ServerInit\n");
 
   serverinit          = (FAR struct rfb_serverinit_s *)session->outbuf;
 
@@ -385,7 +385,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
    * This may override some of our framebuffer settings.
    */
 
-  gvdbg("Receive SetPixelFormat\n");
+  ginfo("Receive SetPixelFormat\n");
 
   setformat = (FAR struct rfb_setpixelformat_s *)session->inbuf;
 
@@ -432,7 +432,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
 
   /* Receive supported encoding types from client. */
 
-  gvdbg("Receive encoding types\n");
+  ginfo("Receive encoding types\n");
 
   encodings = (FAR struct rfb_setencodings_s *)session->inbuf;
 
@@ -498,35 +498,35 @@ int vnc_client_pixelformat(FAR struct vnc_session_s *session,
 
   if (pixelfmt->bpp == 8 && pixelfmt->depth == 6)
     {
-      gvdbg("Client pixel format: RGB8 2:2:2\n");
+      ginfo("Client pixel format: RGB8 2:2:2\n");
       session->colorfmt  = FB_FMT_RGB8_222;
       session->bpp       = 8;
       session->bigendian = false;
     }
   else if (pixelfmt->bpp == 8 && pixelfmt->depth == 8)
     {
-      gvdbg("Client pixel format: RGB8 3:3:2\n");
+      ginfo("Client pixel format: RGB8 3:3:2\n");
       session->colorfmt  = FB_FMT_RGB8_332;
       session->bpp       = 8;
       session->bigendian = false;
     }
   else if (pixelfmt->bpp == 16 && pixelfmt->depth == 15)
     {
-      gvdbg("Client pixel format: RGB16 5:5:5\n");
+      ginfo("Client pixel format: RGB16 5:5:5\n");
       session->colorfmt  = FB_FMT_RGB16_555;
       session->bpp       = 16;
       session->bigendian = (pixelfmt->bigendian != 0) ? true : false;
     }
   else if (pixelfmt->bpp == 16 && pixelfmt->depth == 16)
     {
-      gvdbg("Client pixel format: RGB16 5:6:5\n");
+      ginfo("Client pixel format: RGB16 5:6:5\n");
       session->colorfmt  = FB_FMT_RGB16_565;
       session->bpp       = 16;
       session->bigendian = (pixelfmt->bigendian != 0) ? true : false;
     }
   else if (pixelfmt->bpp == 32 && pixelfmt->depth == 24)
     {
-      gvdbg("Client pixel format: RGB32 8:8:8\n");
+      ginfo("Client pixel format: RGB32 8:8:8\n");
       session->colorfmt  = FB_FMT_RGB32;
       session->bpp       = 32;
       session->bigendian = (pixelfmt->bigendian != 0) ? true : false;
diff --git a/graphics/vnc/server/vnc_raw.c b/graphics/vnc/server/vnc_raw.c
index 1f6149b398..4b4ac83209 100644
--- a/graphics/vnc/server/vnc_raw.c
+++ b/graphics/vnc/server/vnc_raw.c
@@ -491,7 +491,7 @@ int vnc_raw(FAR struct vnc_session_s *session, FAR struct nxgl_rect_s *rect)
                 }
               while (size > 0);
 
-              updvdbg("Sent {(%d, %d),(%d, %d)}\n",
+              updinfo("Sent {(%d, %d),(%d, %d)}\n",
                       x, y, x + updwidth -1, y + updheight - 1);
             }
         }
diff --git a/graphics/vnc/server/vnc_receiver.c b/graphics/vnc/server/vnc_receiver.c
index 6356d6df35..2344ede712 100644
--- a/graphics/vnc/server/vnc_receiver.c
+++ b/graphics/vnc/server/vnc_receiver.c
@@ -138,7 +138,7 @@ int vnc_receiver(FAR struct vnc_session_s *session)
   int ret;
 
   DEBUGASSERT(session);
-  gvdbg("Receiver running for Display %d\n", session->display);
+  ginfo("Receiver running for Display %d\n", session->display);
 
 #ifdef CONFIG_NET_SOCKOPTS
   /* Disable the receive timeout so that we will wait indefinitely for the
@@ -196,7 +196,7 @@ int vnc_receiver(FAR struct vnc_session_s *session)
         {
           case RFB_SETPIXELFMT_MSG:    /* SetPixelFormat */
             {
-              gvdbg("Received SetPixelFormat\n");
+              ginfo("Received SetPixelFormat\n");
 
               /* Read the rest of the SetPixelFormat message */
 
@@ -230,7 +230,7 @@ int vnc_receiver(FAR struct vnc_session_s *session)
               FAR struct rfb_setencodings_s *encodings;
               unsigned int nencodings;
 
-              gvdbg("Received SetEncodings\n");
+              ginfo("Received SetEncodings\n");
 
               /* Read the SetEncodings message without the following
                * encodings.
@@ -278,7 +278,7 @@ int vnc_receiver(FAR struct vnc_session_s *session)
               FAR struct rfb_fbupdatereq_s *update;
               struct nxgl_rect_s rect;
 
-              gvdbg("Received FramebufferUpdateRequest\n");
+              ginfo("Received FramebufferUpdateRequest\n");
 
               /* Read the rest of the SetPixelFormat message */
 
@@ -314,7 +314,7 @@ int vnc_receiver(FAR struct vnc_session_s *session)
             {
               FAR struct rfb_keyevent_s *keyevent;
 
-              gvdbg("Received KeyEvent\n");
+              ginfo("Received KeyEvent\n");
 
               /* Read the rest of the KeyEvent message */
 
@@ -343,7 +343,7 @@ int vnc_receiver(FAR struct vnc_session_s *session)
               FAR struct rfb_pointerevent_s *event;
               uint8_t buttons;
 #endif
-              gvdbg("Received PointerEvent\n");
+              ginfo("Received PointerEvent\n");
 
               /* Read the rest of the PointerEvent message */
 
@@ -397,7 +397,7 @@ int vnc_receiver(FAR struct vnc_session_s *session)
               FAR struct rfb_clientcuttext_s *cuttext;
               uint32_t length;
 
-              gvdbg("Received ClientCutText\n");
+              ginfo("Received ClientCutText\n");
 
               /* Read the ClientCutText message without the following
                * text.
diff --git a/graphics/vnc/server/vnc_rre.c b/graphics/vnc/server/vnc_rre.c
index 6c0c880a04..fa4935f7d4 100644
--- a/graphics/vnc/server/vnc_rre.c
+++ b/graphics/vnc/server/vnc_rre.c
@@ -299,7 +299,7 @@ int vnc_rre(FAR struct vnc_session_s *session, FAR struct nxgl_rect_s *rect)
                 }
 
               DEBUGASSERT(nsent == nbytes);
-              updvdbg("Sent {(%d, %d),(%d, %d)}\n",
+              updinfo("Sent {(%d, %d),(%d, %d)}\n",
                       rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y);
               return nbytes;
             }
diff --git a/graphics/vnc/server/vnc_server.c b/graphics/vnc/server/vnc_server.c
index bbbfe3251c..94b993ccd7 100644
--- a/graphics/vnc/server/vnc_server.c
+++ b/graphics/vnc/server/vnc_server.c
@@ -161,7 +161,7 @@ static int vnc_connect(FAR struct vnc_session_s *session, int port)
   struct sockaddr_in addr;
   int ret;
 
-  gvdbg("Connecting display %d\n", session->display);
+  ginfo("Connecting display %d\n", session->display);
 
   /* Create a listening socket */
 
@@ -197,7 +197,7 @@ static int vnc_connect(FAR struct vnc_session_s *session, int port)
 
   /* Connect to the client */
 
-  gvdbg("Accepting connection for Display %d\n", session->display);
+  ginfo("Accepting connection for Display %d\n", session->display);
 
   ret = psock_accept(&session->listen, NULL, NULL, &session->connect);
   if (ret < 0)
@@ -206,7 +206,7 @@ static int vnc_connect(FAR struct vnc_session_s *session, int port)
       goto errout_with_listener;
     }
 
-  gvdbg("Display %d connected\n", session->display);
+  ginfo("Display %d connected\n", session->display);
   session->state = VNCSERVER_CONNECTED;
   return OK;
 
@@ -257,7 +257,7 @@ int vnc_server(int argc, FAR char *argv[])
       goto errout_with_post;
     }
 
-  gvdbg("Server started for Display %d\n", display);
+  ginfo("Server started for Display %d\n", display);
 
   /* Allocate the framebuffer memory.  We rely on the fact that
    * the KMM allocator will align memory to 32-bits or better.
@@ -310,7 +310,7 @@ int vnc_server(int argc, FAR char *argv[])
       ret = vnc_connect(session, RFB_DISPLAY_PORT(display));
       if (ret >= 0)
         {
-          gvdbg("New VNC connection\n");
+          ginfo("New VNC connection\n");
 
           /* Perform the VNC initialization sequence after the client has
            * sucessfully connected to the server.  Negotiate security,
@@ -350,7 +350,7 @@ int vnc_server(int argc, FAR char *argv[])
            */
 
           ret = vnc_receiver(session);
-          gvdbg("Session terminated with %d\n", ret);
+          ginfo("Session terminated with %d\n", ret);
           UNUSED(ret);
 
           /* Stop the VNC updater thread. */
diff --git a/graphics/vnc/server/vnc_server.h b/graphics/vnc/server/vnc_server.h
index 45d34b5260..07863fbf5b 100644
--- a/graphics/vnc/server/vnc_server.h
+++ b/graphics/vnc/server/vnc_server.h
@@ -188,25 +188,25 @@
 #  ifdef CONFIG_CPP_HAVE_VARARGS
 #    define upddbg(format, ...)    dbg(format, ##__VA_ARGS__)
 #    define updlldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
-#    define updvdbg(format, ...)   vdbg(format, ##__VA_ARGS__)
-#    define updllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__)
+#    define updinfo(format, ...)   info(format, ##__VA_ARGS__)
+#    define updllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #  else
 #   define upddbg                  dbg
 #   define updlldbg                lldbg
-#   define updvdbg                 vdbg
-#   define updllvdbg               llvdbg
+#   define updinfo                 info
+#   define updllinfo               llinfo
 #  endif
 #else
 #  ifdef CONFIG_CPP_HAVE_VARARGS
 #    define upddbg(x...)
 #    define updlldbg(x...)
-#    define updvdbg(x...)
-#    define updllvdbg(x...)
+#    define updinfo(x...)
+#    define updllinfo(x...)
 #  else
 #    define upddbg                 (void)
 #    define updlldbg               (void)
-#    define updvdbg                (void)
-#    define updllvdbg              (void)
+#    define updinfo                (void)
+#    define updllinfo              (void)
 #  endif
 #endif
 
diff --git a/graphics/vnc/server/vnc_updater.c b/graphics/vnc/server/vnc_updater.c
index 0d03aa275c..a466740b23 100644
--- a/graphics/vnc/server/vnc_updater.c
+++ b/graphics/vnc/server/vnc_updater.c
@@ -299,7 +299,7 @@ vnc_remove_queue(FAR struct vnc_session_s *session)
   if (session->nwhupd > 0 && rect->whupd)
     {
       session->nwhupd--;
-      updvdbg("Whole screen update: nwhupd=%d\n", session->nwhupd);
+      updinfo("Whole screen update: nwhupd=%d\n", session->nwhupd);
     }
 
   sched_unlock();
@@ -369,7 +369,7 @@ static FAR void *vnc_updater(FAR void *arg)
   int ret;
 
   DEBUGASSERT(session != NULL);
-  gvdbg("Updater running for Display %d\n", session->display);
+  ginfo("Updater running for Display %d\n", session->display);
 
   /* Loop, processing updates until we are asked to stop.
    * REVISIT: Probably need some kind of signal mechanism to wake up
@@ -386,7 +386,7 @@ static FAR void *vnc_updater(FAR void *arg)
       srcrect = vnc_remove_queue(session);
       DEBUGASSERT(srcrect != NULL);
 
-      updvdbg("Dequeued {(%d, %d),(%d, %d)}\n",
+      updinfo("Dequeued {(%d, %d),(%d, %d)}\n",
               srcrect->rect.pt1.x, srcrect->rect.pt1.y,
               srcrect->rect.pt2.x, srcrect->rect.pt2.y);
 
@@ -442,7 +442,7 @@ int vnc_start_updater(FAR struct vnc_session_s *session)
   struct sched_param param;
   int status;
 
-  gvdbg("Starting updater for Display %d\n", session->display);
+  ginfo("Starting updater for Display %d\n", session->display);
 
   /* Create thread that is gonna send rectangles to the client */
 
@@ -577,7 +577,7 @@ int vnc_update_rectangle(FAR struct vnc_session_s *session,
               FAR struct vnc_fbupdate_s *curr;
               FAR struct vnc_fbupdate_s *next;
 
-              updvdbg("New whole screen update...\n");
+              updinfo("New whole screen update...\n");
 
               curr = (FAR struct vnc_fbupdate_s *)session->updqueue.head;
               sq_init(&session->updqueue);
@@ -619,7 +619,7 @@ int vnc_update_rectangle(FAR struct vnc_session_s *session,
 
           vnc_add_queue(session, update);
 
-          updvdbg("Queued {(%d, %d),(%d, %d)}\n",
+          updinfo("Queued {(%d, %d),(%d, %d)}\n",
                   intersection.pt1.x, intersection.pt1.y,
                   intersection.pt2.x, intersection.pt2.y);
         }
diff --git a/include/debug.h b/include/debug.h
index de212f968d..2f09d73c57 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -70,7 +70,7 @@
  *    directed stdout).  Therefore [a-z]dbg() should not be used in interrupt
  *    handlers.
  *
- * [a-z]vdbg() -- Identical to [a-z]dbg() except that it also requires that
+ * [a-z]info() -- Identical to [a-z]dbg() except that it also requires that
  *    CONFIG_DEBUG_INFO be defined.  This is intended for general debug
  *    output that you would normally want to suppress.
  *
@@ -85,7 +85,7 @@
  *    in low-level code where it is inappropriate to use file descriptors.  For
  *    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
+ * [a-z]llinfo() -- Identical to [a-z]lldbg() except that it also requires that
  *    CONFIG_DEBUG_INFO be defined.  This is intended for general debug
  *    output that you would normally want to suppress.
  */
@@ -127,27 +127,27 @@
 # endif
 
 # ifdef CONFIG_DEBUG_INFO
-#  define vdbg(format, ...) \
+#  define info(format, ...) \
    __arch_syslog(LOG_DEBUG, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
 
 #  ifdef CONFIG_ARCH_LOWPUTC
-#    define llvdbg(format, ...) \
+#    define llinfo(format, ...) \
      __arch_lowsyslog(LOG_DEBUG, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
 #  else
-#    define llvdbg(x...)
+#    define llinfo(x...)
 #  endif
 
 # else /* CONFIG_DEBUG_INFO */
-#  define vdbg(x...)
-#  define llvdbg(x...)
+#  define info(x...)
+#  define llinfo(x...)
 # endif /* CONFIG_DEBUG_INFO */
 
 #else /* CONFIG_DEBUG */
 
 # define dbg(x...)
 # define lldbg(x...)
-# define vdbg(x...)
-# define llvdbg(x...)
+# define info(x...)
+# define llinfo(x...)
 
 #endif /* CONFIG_DEBUG */
 
@@ -156,181 +156,181 @@
 #ifdef CONFIG_DEBUG_MM
 # define mdbg(format, ...)    dbg(format, ##__VA_ARGS__)
 # define mlldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
-# define mvdbg(format, ...)   vdbg(format, ##__VA_ARGS__)
-# define mllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__)
+# define minfo(format, ...)   info(format, ##__VA_ARGS__)
+# define mllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 # define mdbg(x...)
 # define mlldbg(x...)
-# define mvdbg(x...)
-# define mllvdbg(x...)
+# define minfo(x...)
+# define mllinfo(x...)
 #endif
 
 #ifdef CONFIG_DEBUG_SCHED
 # define sdbg(format, ...)    dbg(format, ##__VA_ARGS__)
 # define slldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
-# define svdbg(format, ...)   vdbg(format, ##__VA_ARGS__)
-# define sllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__)
+# define sinfo(format, ...)   info(format, ##__VA_ARGS__)
+# define sllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 # define sdbg(x...)
 # define slldbg(x...)
-# define svdbg(x...)
-# define sllvdbg(x...)
+# define sinfo(x...)
+# define sllinfo(x...)
 #endif
 
 #ifdef CONFIG_DEBUG_PAGING
 # define pgdbg(format, ...)    dbg(format, ##__VA_ARGS__)
 # define pglldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
-# define pgvdbg(format, ...)   vdbg(format, ##__VA_ARGS__)
-# define pgllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__)
+# define pginfo(format, ...)   info(format, ##__VA_ARGS__)
+# define pgllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 # define pgdbg(x...)
 # define pglldbg(x...)
-# define pgvdbg(x...)
-# define pgllvdbg(x...)
+# define pginfo(x...)
+# define pgllinfo(x...)
 #endif
 
 #ifdef CONFIG_DEBUG_DMA
 # define dmadbg(format, ...)    dbg(format, ##__VA_ARGS__)
 # define dmalldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
-# define dmavdbg(format, ...)   vdbg(format, ##__VA_ARGS__)
-# define dmallvdbg(format, ...) llvdbg(format, ##__VA_ARGS__)
+# define dmainfo(format, ...)   info(format, ##__VA_ARGS__)
+# define dmallinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 # define dmadbg(x...)
 # define dmalldbg(x...)
-# define dmavdbg(x...)
-# define dmallvdbg(x...)
+# define dmainfo(x...)
+# define dmallinfo(x...)
 #endif
 
 #ifdef CONFIG_DEBUG_NET
 # define ndbg(format, ...)    dbg(format, ##__VA_ARGS__)
 # define nlldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
-# define nvdbg(format, ...)   vdbg(format, ##__VA_ARGS__)
-# define nllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__)
+# define ninfo(format, ...)   info(format, ##__VA_ARGS__)
+# define nllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 # define ndbg(x...)
 # define nlldbg(x...)
-# define nvdbg(x...)
-# define nllvdbg(x...)
+# define ninfo(x...)
+# define nllinfo(x...)
 #endif
 
 #ifdef CONFIG_DEBUG_USB
 # define udbg(format, ...)    dbg(format, ##__VA_ARGS__)
 # define ulldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
-# define uvdbg(format, ...)   vdbg(format, ##__VA_ARGS__)
-# define ullvdbg(format, ...) llvdbg(format, ##__VA_ARGS__)
+# define uinfo(format, ...)   info(format, ##__VA_ARGS__)
+# define ullinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 # define udbg(x...)
 # define ulldbg(x...)
-# define uvdbg(x...)
-# define ullvdbg(x...)
+# define uinfo(x...)
+# define ullinfo(x...)
 #endif
 
 #ifdef CONFIG_DEBUG_FS
 # define fdbg(format, ...)    dbg(format, ##__VA_ARGS__)
 # define flldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
-# define fvdbg(format, ...)   vdbg(format, ##__VA_ARGS__)
-# define fllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__)
+# define finfo(format, ...)   info(format, ##__VA_ARGS__)
+# define fllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 # define fdbg(x...)
 # define flldbg(x...)
-# define fvdbg(x...)
-# define fllvdbg(x...)
+# define finfo(x...)
+# define fllinfo(x...)
 #endif
 
 #ifdef CONFIG_DEBUG_CRYPTO
 # define cryptdbg(format, ...)    dbg(format, ##__VA_ARGS__)
 # define cryptlldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
-# define cryptvdbg(format, ...)   vdbg(format, ##__VA_ARGS__)
-# define cryptllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__)
+# define cryptinfo(format, ...)   info(format, ##__VA_ARGS__)
+# define cryptllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 # define cryptdbg(x...)
 # define cryptlldbg(x...)
-# define cryptvdbg(x...)
-# define cryptllvdbg(x...)
+# define cryptinfo(x...)
+# define cryptllinfo(x...)
 #endif
 
 #ifdef CONFIG_DEBUG_INPUT
 # define idbg(format, ...)    dbg(format, ##__VA_ARGS__)
 # define illdbg(format, ...)  lldbg(format, ##__VA_ARGS__)
-# define ivdbg(format, ...)   vdbg(format, ##__VA_ARGS__)
-# define illvdbg(format, ...) llvdbg(format, ##__VA_ARGS__)
+# define iinfo(format, ...)   info(format, ##__VA_ARGS__)
+# define illinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 # define idbg(x...)
 # define illdbg(x...)
-# define ivdbg(x...)
-# define illvdbg(x...)
+# define iinfo(x...)
+# define illinfo(x...)
 #endif
 
 #ifdef CONFIG_DEBUG_SENSORS
 # define sndbg(format, ...)    dbg(format, ##__VA_ARGS__)
 # define snlldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
-# define snvdbg(format, ...)   vdbg(format, ##__VA_ARGS__)
-# define snllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__)
+# define sninfo(format, ...)   info(format, ##__VA_ARGS__)
+# define snllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 # define sndbg(x...)
 # define snlldbg(x...)
-# define snvdbg(x...)
-# define snllvdbg(x...)
+# define sninfo(x...)
+# define snllinfo(x...)
 #endif
 
 #ifdef CONFIG_DEBUG_ANALOG
 # define adbg(format, ...)    dbg(format, ##__VA_ARGS__)
 # define alldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
-# define avdbg(format, ...)   vdbg(format, ##__VA_ARGS__)
-# define allvdbg(format, ...) llvdbg(format, ##__VA_ARGS__)
+# define ainfo(format, ...)   info(format, ##__VA_ARGS__)
+# define allinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 # define adbg(x...)
 # define alldbg(x...)
-# define avdbg(x...)
-# define allvdbg(x...)
+# define ainfo(x...)
+# define allinfo(x...)
 #endif
 
 #ifdef CONFIG_DEBUG_GRAPHICS
 # define gdbg(format, ...)    dbg(format, ##__VA_ARGS__)
 # define glldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
-# define gvdbg(format, ...)   vdbg(format, ##__VA_ARGS__)
-# define gllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__)
+# define ginfo(format, ...)   info(format, ##__VA_ARGS__)
+# define gllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 # define gdbg(x...)
 # define glldbg(x...)
-# define gvdbg(x...)
-# define gllvdbg(x...)
+# define ginfo(x...)
+# define gllinfo(x...)
 #endif
 
 #ifdef CONFIG_DEBUG_BINFMT
 # define bdbg(format, ...)    dbg(format, ##__VA_ARGS__)
 # define blldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
-# define bvdbg(format, ...)   vdbg(format, ##__VA_ARGS__)
-# define bllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__)
+# define binfo(format, ...)   info(format, ##__VA_ARGS__)
+# define bllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 # define bdbg(x...)
 # define blldbg(x...)
-# define bvdbg(x...)
-# define bllvdbg(x...)
+# define binfo(x...)
+# define bllinfo(x...)
 #endif
 
 #ifdef CONFIG_DEBUG_LIB
 # define ldbg(format, ...)    dbg(format, ##__VA_ARGS__)
 # define llldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
-# define lvdbg(format, ...)   vdbg(format, ##__VA_ARGS__)
-# define lllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__)
+# define linfo(format, ...)   info(format, ##__VA_ARGS__)
+# define lllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 # define ldbg(x...)
 # define llldbg(x...)
-# define lvdbg(x...)
-# define lllvdbg(x...)
+# define linfo(x...)
+# define lllinfo(x...)
 #endif
 
 #ifdef CONFIG_DEBUG_AUDIO
 # define auddbg(format, ...)    dbg(format, ##__VA_ARGS__)
 # define audlldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
-# define audvdbg(format, ...)   vdbg(format, ##__VA_ARGS__)
-# define audllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__)
+# define audinfo(format, ...)   info(format, ##__VA_ARGS__)
+# define audllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 # define auddbg(x...)
 # define audlldbg(x...)
-# define audvdbg(x...)
-# define audllvdbg(x...)
+# define audinfo(x...)
+# define audllinfo(x...)
 #endif
 
 #else /* CONFIG_CPP_HAVE_VARARGS */
@@ -342,18 +342,18 @@
 #  define lldbg      (void)
 # endif
 # ifndef CONFIG_DEBUG_INFO
-#  define vdbg       (void)
-#  define llvdbg     (void)
+#  define info       (void)
+#  define llinfo     (void)
 # else
 #  ifndef CONFIG_ARCH_LOWPUTC
-#    define llvdbg   (void)
+#    define llinfo   (void)
 #  endif
 # endif
 #else
 # define dbg         (void)
 # define lldbg       (void)
-# define vdbg        (void)
-# define llvdbg      (void)
+# define info        (void)
+# define llinfo      (void)
 #endif
 
 /* Subsystem specific debug */
@@ -361,181 +361,181 @@
 #ifdef CONFIG_DEBUG_MM
 # define mdbg        dbg
 # define mlldbg      lldbg
-# define mvdbg       vdbg
-# define mllvdbg     llvdbg
+# define minfo       info
+# define mllinfo     llinfo
 #else
 # define mdbg        (void)
 # define mlldbg      (void)
-# define mvdbg       (void)
-# define mllvdbg     (void)
+# define minfo       (void)
+# define mllinfo     (void)
 #endif
 
 #ifdef CONFIG_DEBUG_SCHED
 # define sdbg        dbg
 # define slldbg      lldbg
-# define svdbg       vdbg
-# define sllvdbg     llvdbg
+# define sinfo       info
+# define sllinfo     llinfo
 #else
 # define sdbg        (void)
 # define slldbg      (void)
-# define svdbg       (void)
-# define sllvdbg     (void)
+# define sinfo       (void)
+# define sllinfo     (void)
 #endif
 
 #ifdef CONFIG_DEBUG_PAGING
 # define pgdbg       dbg
 # define pglldbg     lldbg
-# define pgvdbg      vdbg
-# define pgllvdbg    llvdbg
+# define pginfo      info
+# define pgllinfo    llinfo
 #else
 # define pgdbg       (void)
 # define pglldbg     (void)
-# define pgvdbg      (void)
-# define pgllvdbg    (void)
+# define pginfo      (void)
+# define pgllinfo    (void)
 #endif
 
 #ifdef CONFIG_DEBUG_DMA
 # define dmadbg      dbg
 # define dmalldbg    lldbg
-# define dmavdbg     vdbg
-# define dmallvdbg   llvdbg
+# define dmainfo     info
+# define dmallinfo   llinfo
 #else
 # define dmadbg      (void)
 # define dmalldbg    (void)
-# define dmavdbg     (void)
-# define dmallvdbg   (void)
+# define dmainfo     (void)
+# define dmallinfo   (void)
 #endif
 
 #ifdef CONFIG_DEBUG_NET
 # define ndbg        dbg
 # define nlldbg      lldbg
-# define nvdbg       vdbg
-# define nllvdbg     llvdbg
+# define ninfo       info
+# define nllinfo     llinfo
 #else
 # define ndbg        (void)
 # define nlldbg      (void)
-# define nvdbg       (void)
-# define nllvdbg     (void)
+# define ninfo       (void)
+# define nllinfo     (void)
 #endif
 
 #ifdef CONFIG_DEBUG_USB
 # define udbg        dbg
 # define ulldbg      lldbg
-# define uvdbg       vdbg
-# define ullvdbg     llvdbg
+# define uinfo       info
+# define ullinfo     llinfo
 #else
 # define udbg        (void)
 # define ulldbg      (void)
-# define uvdbg       (void)
-# define ullvdbg     (void)
+# define uinfo       (void)
+# define ullinfo     (void)
 #endif
 
 #ifdef CONFIG_DEBUG_FS
 # define fdbg        dbg
 # define flldbg      lldbg
-# define fvdbg       vdbg
-# define fllvdbg     llvdbg
+# define finfo       info
+# define fllinfo     llinfo
 #else
 # define fdbg        (void)
 # define flldbg      (void)
-# define fvdbg       (void)
-# define fllvdbg     (void)
+# define finfo       (void)
+# define fllinfo     (void)
 #endif
 
 #ifdef CONFIG_DEBUG_CRYPTO
 # define cryptdbg    dbg
 # define cryptlldbg  lldbg
-# define cryptvdbg   vdbg
-# define cryptllvdbg llvdbg
+# define cryptinfo   info
+# define cryptllinfo llinfo
 #else
 # define cryptdbg    (void)
 # define cryptlldbg  (void)
-# define cryptvdbg   (void)
-# define cryptllvdbg (void)
+# define cryptinfo   (void)
+# define cryptllinfo (void)
 #endif
 
 #ifdef CONFIG_DEBUG_INPUT
 # define idbg        dbg
 # define illdbg      lldbg
-# define ivdbg       vdbg
-# define illvdbg     llvdbg
+# define iinfo       info
+# define illinfo     llinfo
 #else
 # define idbg        (void)
 # define illdbg      (void)
-# define ivdbg       (void)
-# define illvdbg     (void)
+# define iinfo       (void)
+# define illinfo     (void)
 #endif
 
 #ifdef CONFIG_DEBUG_SENSORS
 # define sndbg        dbg
 # define snlldbg      lldbg
-# define snvdbg       vdbg
-# define snllvdbg     llvdbg
+# define sninfo       info
+# define snllinfo     llinfo
 #else
 # define sndbg        (void)
 # define snlldbg      (void)
-# define snvdbg       (void)
-# define snllvdbg     (void)
+# define sninfo       (void)
+# define snllinfo     (void)
 #endif
 
 #ifdef CONFIG_DEBUG_ANALOG
 # define adbg        dbg
 # define alldbg      lldbg
-# define avdbg       vdbg
-# define allvdbg     llvdbg
+# define ainfo       info
+# define allinfo     llinfo
 #else
 # define adbg        (void)
 # define alldbg      (void)
-# define avdbg       (void)
-# define allvdbg     (void)
+# define ainfo       (void)
+# define allinfo     (void)
 #endif
 
 #ifdef CONFIG_DEBUG_GRAPHICS
 # define gdbg        dbg
 # define glldbg      lldbg
-# define gvdbg       vdbg
-# define gllvdbg     llvdbg
+# define ginfo       info
+# define gllinfo     llinfo
 #else
 # define gdbg        (void)
 # define glldbg      (void)
-# define gvdbg       (void)
-# define gllvdbg     (void)
+# define ginfo       (void)
+# define gllinfo     (void)
 #endif
 
 #ifdef CONFIG_DEBUG_BINFMT
 # define bdbg        dbg
 # define blldbg      lldbg
-# define bvdbg       vdbg
-# define bllvdbg     llvdbg
+# define binfo       info
+# define bllinfo     llinfo
 #else
 # define bdbg        (void)
 # define blldbg      (void)
-# define bvdbg       (void)
-# define bllvdbg     (void)
+# define binfo       (void)
+# define bllinfo     (void)
 #endif
 
 #ifdef CONFIG_DEBUG_LIB
 # define ldbg        dbg
 # define llldbg      lldbg
-# define lvdbg       vdbg
-# define lllvdbg     llvdbg
+# define linfo       info
+# define lllinfo     llinfo
 #else
 # define ldbg        (void)
 # define llldbg      (void)
-# define lvdbg       (void)
-# define lllvdbg     (void)
+# define linfo       (void)
+# define lllinfo     (void)
 #endif
 
 #ifdef CONFIG_DEBUG_AUDIO
 # define auddbg      dbg
 # define audlldbg    lldbg
-# define audvdbg     vdbg
-# define audllvdbg   llvdbg
+# define audinfo     info
+# define audllinfo   llinfo
 #else
 # define auddbg      (void)
 # define audlldbg    (void)
-# define audvdbg     (void)
-# define audllvdbg   (void)
+# define audinfo     (void)
+# define audllinfo   (void)
 #endif
 
 #endif /* CONFIG_CPP_HAVE_VARARGS */
@@ -545,111 +545,111 @@
 #ifdef CONFIG_DEBUG
 #  define dbgdumpbuffer(m,b,n) lib_dumpbuffer(m,b,n)
 #  ifdef CONFIG_DEBUG_INFO
-#    define vdbgdumpbuffer(m,b,n) lib_dumpbuffer(m,b,n)
+#    define infodumpbuffer(m,b,n) lib_dumpbuffer(m,b,n)
 #  else
-#   define vdbgdumpbuffer(m,b,n)
+#   define infodumpbuffer(m,b,n)
 #  endif
 #else
 #  define dbgdumpbuffer(m,b,n)
-#  define vdbgdumpbuffer(m,b,n)
+#  define infodumpbuffer(m,b,n)
 # endif
 
 /* Subsystem specific debug */
 
 #ifdef CONFIG_DEBUG_MM
 #  define mdbgdumpbuffer(m,b,n)  dbgdumpbuffer(m,b,n)
-#  define mvdbgdumpbuffer(m,b,n) vdbgdumpbuffer(m,b,n)
+#  define minfodumpbuffer(m,b,n) infodumpbuffer(m,b,n)
 #else
 #  define mdbgdumpbuffer(m,b,n)
-#  define mvdbgdumpbuffer(m,b,n)
+#  define minfodumpbuffer(m,b,n)
 #endif
 
 #ifdef CONFIG_DEBUG_SCHED
 #  define sdbgdumpbuffer(m,b,n)  dbgdumpbuffer(m,b,n)
-#  define svdbgdumpbuffer(m,b,n) vdbgdumpbuffer(m,b,n)
+#  define sinfodumpbuffer(m,b,n) infodumpbuffer(m,b,n)
 #else
 #  define sdbgdumpbuffer(m,b,n)
-#  define svdbgdumpbuffer(m,b,n)
+#  define sinfodumpbuffer(m,b,n)
 #endif
 
 #ifdef CONFIG_DEBUG_PAGING
 #  define pgdbgdumpbuffer(m,b,n)  dbgdumpbuffer(m,b,n)
-#  define pgvdbgdumpbuffer(m,b,n) vdbgdumpbuffer(m,b,n)
+#  define pginfodumpbuffer(m,b,n) infodumpbuffer(m,b,n)
 #else
 #  define pgdbgdumpbuffer(m,b,n)
-#  define pgvdbgdumpbuffer(m,b,n)
+#  define pginfodumpbuffer(m,b,n)
 #endif
 
 #ifdef CONFIG_DEBUG_DMA
 #  define dmadbgdumpbuffer(m,b,n)  dbgdumpbuffer(m,b,n)
-#  define dmavdbgdumpbuffer(m,b,n) vdbgdumpbuffer(m,b,n)
+#  define dmainfodumpbuffer(m,b,n) infodumpbuffer(m,b,n)
 #else
 #  define dmadbgdumpbuffer(m,b,n)
-#  define dmavdbgdumpbuffer(m,b,n)
+#  define dmainfodumpbuffer(m,b,n)
 #endif
 
 #ifdef CONFIG_DEBUG_NET
 #  define ndbgdumpbuffer(m,b,n)  dbgdumpbuffer(m,b,n)
-#  define nvdbgdumpbuffer(m,b,n) vdbgdumpbuffer(m,b,n)
+#  define ninfodumpbuffer(m,b,n) infodumpbuffer(m,b,n)
 #else
 #  define ndbgdumpbuffer(m,b,n)
-#  define nvdbgdumpbuffer(m,b,n)
+#  define ninfodumpbuffer(m,b,n)
 #endif
 
 #ifdef CONFIG_DEBUG_USB
 #  define udbgdumpbuffer(m,b,n)  dbgdumpbuffer(m,b,n)
-#  define uvdbgdumpbuffer(m,b,n) vdbgdumpbuffer(m,b,n)
+#  define uinfodumpbuffer(m,b,n) infodumpbuffer(m,b,n)
 #else
 #  define udbgdumpbuffer(m,b,n)
-#  define uvdbgdumpbuffer(m,b,n)
+#  define uinfodumpbuffer(m,b,n)
 #endif
 
 #ifdef CONFIG_DEBUG_FS
 #  define fdbgdumpbuffer(m,b,n)  dbgdumpbuffer(m,b,n)
-#  define fvdbgdumpbuffer(m,b,n) vdbgdumpbuffer(m,b,n)
+#  define finfodumpbuffer(m,b,n) infodumpbuffer(m,b,n)
 #else
 #  define fdbgdumpbuffer(m,b,n)
-#  define fvdbgdumpbuffer(m,b,n)
+#  define finfodumpbuffer(m,b,n)
 #endif
 
 #ifdef CONFIG_DEBUG_INPUT
 #  define idbgdumpbuffer(m,b,n)  dbgdumpbuffer(m,b,n)
-#  define ivdbgdumpbuffer(m,b,n) vdbgdumpbuffer(m,b,n)
+#  define iinfodumpbuffer(m,b,n) infodumpbuffer(m,b,n)
 #else
 #  define idbgdumpbuffer(m,b,n)
-#  define ivdbgdumpbuffer(m,b,n)
+#  define iinfodumpbuffer(m,b,n)
 #endif
 
 #ifdef CONFIG_DEBUG_GRAPHICS
 #  define gdbgdumpbuffer(m,b,n)  dbgdumpbuffer(m,b,n)
-#  define gvdbgdumpbuffer(m,b,n) vdbgdumpbuffer(m,b,n)
+#  define ginfodumpbuffer(m,b,n) infodumpbuffer(m,b,n)
 #else
 #  define gdbgdumpbuffer(m,b,n)
-#  define gvdbgdumpbuffer(m,b,n)
+#  define ginfodumpbuffer(m,b,n)
 #endif
 
 #ifdef CONFIG_DEBUG_BINFMT
 #  define bdbgdumpbuffer(m,b,n)  dbgdumpbuffer(m,b,n)
-#  define bvdbgdumpbuffer(m,b,n) vdbgdumpbuffer(m,b,n)
+#  define binfodumpbuffer(m,b,n) infodumpbuffer(m,b,n)
 #else
 #  define bdbgdumpbuffer(m,b,n)
-#  define bvdbgdumpbuffer(m,b,n)
+#  define binfodumpbuffer(m,b,n)
 #endif
 
 #ifdef CONFIG_DEBUG_LIB
 #  define ldbgdumpbuffer(m,b,n)  dbgdumpbuffer(m,b,n)
-#  define lvdbgdumpbuffer(m,b,n) vdbgdumpbuffer(m,b,n)
+#  define linfodumpbuffer(m,b,n) infodumpbuffer(m,b,n)
 #else
 #  define ldbgdumpbuffer(m,b,n)
-#  define lvdbgdumpbuffer(m,b,n)
+#  define linfodumpbuffer(m,b,n)
 #endif
 
 #ifdef CONFIG_DEBUG_AUDIO
 #  define auddbgdumpbuffer(m,b,n)  dbgdumpbuffer(m,b,n)
-#  define audvdbgdumpbuffer(m,b,n) vdbgdumpbuffer(m,b,n)
+#  define audinfodumpbuffer(m,b,n) infodumpbuffer(m,b,n)
 #else
 #  define auddbgdumpbuffer(m,b,n)
-#  define audvdbgdumpbuffer(m,b,n)
+#  define audinfodumpbuffer(m,b,n)
 #endif
 
 /****************************************************************************
@@ -692,10 +692,10 @@ int lldbg(const char *format, ...);
 # endif
 
 # ifdef CONFIG_DEBUG_INFO
-int vdbg(const char *format, ...);
+int info(const char *format, ...);
 
 # ifdef CONFIG_ARCH_LOWPUTC
-int llvdbg(const char *format, ...);
+int llinfo(const char *format, ...);
 # endif
 #endif
 #endif /* CONFIG_DEBUG */
diff --git a/include/nuttx/mm/shm.h b/include/nuttx/mm/shm.h
index 1a568e81c4..8c6f90cfaa 100644
--- a/include/nuttx/mm/shm.h
+++ b/include/nuttx/mm/shm.h
@@ -78,18 +78,18 @@
 #ifdef CONFIG_CPP_HAVE_VARARGS
 #  ifdef CONFIG_DEBUG_SHM
 #    define shmdbg(format, ...)       dbg(format, ##__VA_ARGS__)
-#    define shmvdbg(format, ...)      vdbg(format, ##__VA_ARGS__)
+#    define shminfo(format, ...)      info(format, ##__VA_ARGS__)
 #  else
 #    define shmdbg(format, ...)       mdbg(format, ##__VA_ARGS__)
-#    define shmvdbg(format, ...)      mvdbg(format, ##__VA_ARGS__)
+#    define shminfo(format, ...)      minfo(format, ##__VA_ARGS__)
 #  endif
 #else
 #  ifdef CONFIG_DEBUG_SHM
 #    define shmdbg                    dbg
-#    define shmvdbg                   vdbg
+#    define shminfo                   info
 #  else
 #    define shmdbg                    (void)
-#    define shmvdbg                   (void)
+#    define shminfo                   (void)
 #  endif
 #endif
 
diff --git a/include/nuttx/spi/spi_bitbang.c b/include/nuttx/spi/spi_bitbang.c
index e39fa68639..9e424b5aa2 100644
--- a/include/nuttx/spi/spi_bitbang.c
+++ b/include/nuttx/spi/spi_bitbang.c
@@ -77,13 +77,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /****************************************************************************
@@ -273,7 +273,7 @@ static uint32_t spi_setfrequency(FAR struct spi_bitbang_s *priv, uint32_t freque
 static void spi_setmode(FAR struct spi_bitbang_s *priv,
                         enum spi_mode_e mode)
 {
-  spivdbg("mode=%d\n", mode);
+  spiinfo("mode=%d\n", mode);
 
   switch (mode)
     {
diff --git a/include/nuttx/spi/spi_bitbang.h b/include/nuttx/spi/spi_bitbang.h
index 8e91b5345f..95b1a85538 100644
--- a/include/nuttx/spi/spi_bitbang.h
+++ b/include/nuttx/spi/spi_bitbang.h
@@ -64,13 +64,13 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define spivdbg lldbg
+#    define spiinfo lldbg
 #  else
-#    define spivdbg(x...)
+#    define spiinfo(x...)
 #  endif
 #else
 #  define spidbg(x...)
-#  define spivdbg(x...)
+#  define spiinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/include/nuttx/wireless/nrf24l01.h b/include/nuttx/wireless/nrf24l01.h
index 6d2128606b..32dc20db02 100644
--- a/include/nuttx/wireless/nrf24l01.h
+++ b/include/nuttx/wireless/nrf24l01.h
@@ -93,13 +93,13 @@
 #ifdef NRF24L01_DEBUG
 # define wdbg(format, ...)           dbg(format, ##__VA_ARGS__)
 # define wlldbg(format, ...)         lldbg(format, ##__VA_ARGS__)
-# define wvdbg(format, ...)          vdbg(format, ##__VA_ARGS__)
-# define wllvdbg(format, ...)        llvdbg(format, ##__VA_ARGS__)
+# define winfo(format, ...)          info(format, ##__VA_ARGS__)
+# define wllinfo(format, ...)        llinfo(format, ##__VA_ARGS__)
 #else
 # define wdbg(x...)
 # define wlldbg(x...)
-# define wvdbg(x...)
-# define wllvdbg(x...)
+# define winfo(x...)
+# define wllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/libc/audio/lib_buffer.c b/libc/audio/lib_buffer.c
index af4e719879..6ad506aa6e 100644
--- a/libc/audio/lib_buffer.c
+++ b/libc/audio/lib_buffer.c
@@ -174,7 +174,7 @@ void apb_free(FAR struct ap_buffer_s *apb)
 
   if (refcount <= 1)
     {
-      audvdbg("Freeing %p\n", apb);
+      audinfo("Freeing %p\n", apb);
       lib_ufree(apb);
     }
 }
diff --git a/libc/libc.csv b/libc/libc.csv
index cd74cc09a7..cf68eaf776 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_INFO) && defined(CONFIG_ARCH_LOWPUTC)","int","const char *","..."
+"llinfo","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_INFO) && defined(CONFIG_ARCH_LOWPUTC)","int","const char *","..."
 "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_INFO)","int","const char *","..."
+"info","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 821353944f..3e398d90b9 100644
--- a/libc/misc/lib_dbg.c
+++ b/libc/misc/lib_dbg.c
@@ -55,7 +55,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: dbg, lldbg, vdbg
+ * Name: dbg, lldbg, info
  *
  * Description:
  *  If the cross-compiler's pre-processor does not support variable
@@ -91,7 +91,7 @@ int lldbg(const char *format, ...)
 #endif
 
 #ifdef CONFIG_DEBUG_INFO
-int vdbg(const char *format, ...)
+int info(const char *format, ...)
 {
   va_list ap;
   int     ret;
@@ -104,7 +104,7 @@ int vdbg(const char *format, ...)
 }
 
 #ifdef CONFIG_ARCH_LOWPUTC
-int llvdbg(const char *format, ...)
+int llinfo(const char *format, ...)
 {
   va_list ap;
   int     ret;
diff --git a/libc/misc/lib_slcddecode.c b/libc/misc/lib_slcddecode.c
index bba8c7a8dc..92e11a297c 100644
--- a/libc/misc/lib_slcddecode.c
+++ b/libc/misc/lib_slcddecode.c
@@ -93,10 +93,10 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcddbg         dbg
-#  define lcdvdbg        vdbg
+#  define lcdinfo        info
 #else
 #  define lcddbg(x...)
-#  define lcdvdbg(x...)
+#  define lcdinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/libc/netdb/lib_dnsaddserver.c b/libc/netdb/lib_dnsaddserver.c
index ff2436985a..cc689b34c3 100644
--- a/libc/netdb/lib_dnsaddserver.c
+++ b/libc/netdb/lib_dnsaddserver.c
@@ -161,7 +161,7 @@ int dns_add_nameserver(FAR const struct sockaddr *addr, socklen_t addrlen)
   else
 #endif
     {
-      nvdbg("ERROR: Unsupported family: %d\n",
+      ninfo("ERROR: Unsupported family: %d\n",
             g_dns_server.addr.sa_family);
       ret = -ENOSYS;
       goto errout;
@@ -242,7 +242,7 @@ int dns_add_nameserver(FAR const struct sockaddr *addr, socklen_t addrlen)
   else
 #endif
     {
-      nvdbg("ERROR: Unsupported family: %d\n", addr->sa_family);
+      ninfo("ERROR: Unsupported family: %d\n", addr->sa_family);
       return -ENOSYS;
     }
 
@@ -250,7 +250,7 @@ int dns_add_nameserver(FAR const struct sockaddr *addr, socklen_t addrlen)
 
   if (addrlen < copylen)
     {
-      nvdbg("ERROR: Invalid addrlen %ld for family %d\n",
+      ninfo("ERROR: Invalid addrlen %ld for family %d\n",
             (long)addrlen, addr->sa_family);
       return -EINVAL;
     }
diff --git a/libc/netdb/lib_dnsforeach.c b/libc/netdb/lib_dnsforeach.c
index 761cc441f3..3d13dc5a63 100644
--- a/libc/netdb/lib_dnsforeach.c
+++ b/libc/netdb/lib_dnsforeach.c
@@ -276,7 +276,7 @@ int dns_foreach_nameserver(dns_callback_t callback, FAR void *arg)
       else
 #endif
         {
-          nvdbg("ERROR: Unsupported family: %d\n",
+          ninfo("ERROR: Unsupported family: %d\n",
                 g_dns_server.addr.sa_family);
           ret = -ENOSYS;
         }
diff --git a/libc/netdb/lib_dnsquery.c b/libc/netdb/lib_dnsquery.c
index c29437c7b2..1510691438 100644
--- a/libc/netdb/lib_dnsquery.c
+++ b/libc/netdb/lib_dnsquery.c
@@ -254,10 +254,10 @@ static int dns_recv_response(int sd, FAR struct sockaddr *addr,
 
   hdr = (FAR struct dns_header_s *)buffer;
 
-  nvdbg("ID %d\n", htons(hdr->id));
-  nvdbg("Query %d\n", hdr->flags1 & DNS_FLAG1_RESPONSE);
-  nvdbg("Error %d\n", hdr->flags2 & DNS_FLAG2_ERR_MASK);
-  nvdbg("Num questions %d, answers %d, authrr %d, extrarr %d\n",
+  ninfo("ID %d\n", htons(hdr->id));
+  ninfo("Query %d\n", hdr->flags1 & DNS_FLAG1_RESPONSE);
+  ninfo("Error %d\n", hdr->flags2 & DNS_FLAG2_ERR_MASK);
+  ninfo("Num questions %d, answers %d, authrr %d, extrarr %d\n",
         htons(hdr->numquestions), htons(hdr->numanswers),
         htons(hdr->numauthrr), htons(hdr->numextrarr));
 
@@ -317,7 +317,7 @@ static int dns_recv_response(int sd, FAR struct sockaddr *addr,
           /* Compressed name. */
 
           nameptr += 2;
-          nvdbg("Compressed answer\n");
+          ninfo("Compressed answer\n");
         }
       else
         {
@@ -328,7 +328,7 @@ static int dns_recv_response(int sd, FAR struct sockaddr *addr,
 
       ans = (FAR struct dns_answer_s *)nameptr;
 
-      nvdbg("Answer: type=%04x, class=%04x, ttl=%06x, length=%04x \n",
+      ninfo("Answer: type=%04x, class=%04x, ttl=%06x, length=%04x \n",
             htons(ans->type), htons(ans->class),
             (htons(ans->ttl[0]) << 16) | htons(ans->ttl[1]),
             htons(ans->len));
@@ -342,7 +342,7 @@ static int dns_recv_response(int sd, FAR struct sockaddr *addr,
         {
           ans->u.ipv4.s_addr = *(FAR uint32_t *)(nameptr + 10);
 
-          nvdbg("IPv4 address: %d.%d.%d.%d\n",
+          ninfo("IPv4 address: %d.%d.%d.%d\n",
                 (ans->u.ipv4.s_addr      ) & 0xff,
                 (ans->u.ipv4.s_addr >> 8 ) & 0xff,
                 (ans->u.ipv4.s_addr >> 16) & 0xff,
@@ -374,7 +374,7 @@ static int dns_recv_response(int sd, FAR struct sockaddr *addr,
         {
           memcpy(&ans->u.ipv6.s6_addr, nameptr + 10, 16);
 
-          nvdbg("IPv6 address: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
+          ninfo("IPv6 address: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
                 htons(ans->u.ipv6.s6_addr[7]),  htons(ans->u.ipv6.s6_addr[6]),
                 htons(ans->u.ipv6.s6_addr[5]),  htons(ans->u.ipv6.s6_addr[4]),
                 htons(ans->u.ipv6.s6_addr[3]),  htons(ans->u.ipv6.s6_addr[2]),
diff --git a/libc/netdb/lib_gethostbyaddrr.c b/libc/netdb/lib_gethostbyaddrr.c
index 6dcb8e8ab1..78439b1911 100644
--- a/libc/netdb/lib_gethostbyaddrr.c
+++ b/libc/netdb/lib_gethostbyaddrr.c
@@ -309,7 +309,7 @@ int lib_hostfile_lookup(FAR const void *addr, socklen_t len, int type,
           FAR char *hostaddr = host->h_addr;
           if (hostaddr != NULL)
             {
-              nvdbg("Comparing addresses...\n");
+              ninfo("Comparing addresses...\n");
               if (memcmp(addr, hostaddr, len) == 0)
                 {
                    /* We have a match */
diff --git a/libc/netdb/lib_gethostbynamer.c b/libc/netdb/lib_gethostbynamer.c
index 86d46d2054..f6cf659596 100644
--- a/libc/netdb/lib_gethostbynamer.c
+++ b/libc/netdb/lib_gethostbynamer.c
@@ -622,7 +622,7 @@ static int lib_hostfile_lookup(FAR const char *name, FAR struct hostent *host,
         {
           /* We successfully read the entry */
 
-          nvdbg("Comparing %s to %s\n", name, host->h_name);
+          ninfo("Comparing %s to %s\n", name, host->h_name);
 
           /* Check for a host name match */
 
diff --git a/libc/stdio/lib_sscanf.c b/libc/stdio/lib_sscanf.c
index c54fb3f145..cc67145306 100644
--- a/libc/stdio/lib_sscanf.c
+++ b/libc/stdio/lib_sscanf.c
@@ -193,7 +193,7 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap)
   int             base = 10;
   char            tmp[MAXLN];
 
-  lvdbg("vsscanf: buf=\"%s\" fmt=\"%s\"\n", buf, fmt);
+  linfo("vsscanf: buf=\"%s\" fmt=\"%s\"\n", buf, fmt);
 
   /* Remember the start of the input buffer.  We will need this for %n
    * calculations.
@@ -226,14 +226,14 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap)
 
       if (*fmt == '%')
         {
-          lvdbg("vsscanf: Specifier found\n");
+          linfo("vsscanf: Specifier found\n");
 
           /* Check for qualifiers on the conversion specifier */
 
           fmt++;
           for (; *fmt; fmt++)
             {
-              lvdbg("vsscanf: Processing %c\n", *fmt);
+              linfo("vsscanf: Processing %c\n", *fmt);
 
               if (strchr("dibouxcsefgn%", *fmt))
                 {
@@ -264,7 +264,7 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap)
 
           if (*fmt == 's')
             {
-              lvdbg("vsscanf: Performing string conversion\n");
+              linfo("vsscanf: Performing string conversion\n");
 
               /* Get a pointer to the char * value.  We need to do this even
                * if we have reached the end of the input data in order to
@@ -320,7 +320,7 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap)
 
           else if (*fmt == 'c')
             {
-              lvdbg("vsscanf: Performing character conversion\n");
+              linfo("vsscanf: Performing character conversion\n");
 
               /* Get a pointer to the char * value.  We need to do this even
                * if we have reached the end of the input data in order to
@@ -374,7 +374,7 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap)
               FAR int  *pint  = NULL;
               bool sign;
 
-              lvdbg("vsscanf: Performing integer conversion\n");
+              linfo("vsscanf: Performing integer conversion\n");
 
               /* Get a pointer to the integer value.  We need to do this even
                * if we have reached the end of the input data in order to
@@ -461,7 +461,7 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap)
                   strncpy(tmp, buf, width);
                   tmp[width] = '\0';
 
-                  lvdbg("vsscanf: tmp[]=\"%s\"\n", tmp);
+                  linfo("vsscanf: tmp[]=\"%s\"\n", tmp);
 
                   /* Perform the integer conversion */
                   /* Preserve the errno value */
@@ -497,13 +497,13 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap)
 
                       if (lflag)
                         {
-                          lvdbg("vsscanf: Return %ld to 0x%p\n",
+                          linfo("vsscanf: Return %ld to 0x%p\n",
                                 tmplong, plong);
                           *plong = tmplong;
                         }
                       else
                         {
-                          lvdbg("vsscanf: Return %ld to 0x%p\n",
+                          linfo("vsscanf: Return %ld to 0x%p\n",
                                 tmplong, pint);
                           *pint = (int)tmplong;
                         }
@@ -524,7 +524,7 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap)
 #endif
               FAR float    *pf = NULL;
 
-              lvdbg("vsscanf: Performing floating point conversion\n");
+              linfo("vsscanf: Performing floating point conversion\n");
 
               /* Get a pointer to the double value.  We need to do this even
                * if we have reached the end of the input data in order to
@@ -580,7 +580,7 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap)
                   tmp[width] = '\0';
                   buf += width;
 
-                  lvdbg("vsscanf: tmp[]=\"%s\"\n", tmp);
+                  linfo("vsscanf: tmp[]=\"%s\"\n", tmp);
 
                   /* Perform the floating point conversion */
 
@@ -614,13 +614,13 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap)
 #ifdef CONFIG_HAVE_DOUBLE
                       if (lflag)
                         {
-                          lvdbg("vsscanf: Return %f to %p\n", dvalue, pd);
+                          linfo("vsscanf: Return %f to %p\n", dvalue, pd);
                           *pd = dvalue;
                         }
                       else
 #endif
                         {
-                          lvdbg("vsscanf: Return %f to %p\n", dvalue, pf);
+                          linfo("vsscanf: Return %f to %p\n", dvalue, pf);
                           *pf = (float)dvalue;
                         }
 
@@ -634,7 +634,7 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap)
 
           else if (*fmt == 'n')
             {
-              lvdbg("vsscanf: Performing character count\n");
+              linfo("vsscanf: Performing character count\n");
 
               if (!noassign)
                 {
diff --git a/libnx/nxglib/nxglib_splitline.c b/libnx/nxglib/nxglib_splitline.c
index fa2ccc1a0d..c63539b8c1 100644
--- a/libnx/nxglib/nxglib_splitline.c
+++ b/libnx/nxglib/nxglib_splitline.c
@@ -139,7 +139,7 @@ int nxgl_splitline(FAR struct nxgl_vector_s *vector,
   b16_t b16x;
   b16_t b16y;
 
-  gvdbg("vector: (%d,%d)->(%d,%d) linewidth: %d\n",
+  ginfo("vector: (%d,%d)->(%d,%d) linewidth: %d\n",
         vector->pt1.x, vector->pt1.y, vector->pt2.x, vector->pt2.y, linewidth);
 
   /* First, check the linewidth */
@@ -190,7 +190,7 @@ int nxgl_splitline(FAR struct nxgl_vector_s *vector,
       rect->pt1.y = vector->pt1.y - (linewidth >> 1);
       rect->pt2.y = rect->pt1.y + linewidth - 1;
 
-      gvdbg("Horizontal rect: (%d,%d),(%d,%d)\n",
+      ginfo("Horizontal rect: (%d,%d),(%d,%d)\n",
             rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y);
 
       return 2;
@@ -208,7 +208,7 @@ int nxgl_splitline(FAR struct nxgl_vector_s *vector,
       rect->pt1.x = line.pt1.x - (linewidth >> 1);
       rect->pt2.x = rect->pt1.x + linewidth - 1;
 
-      gvdbg("Vertical rect: (%d,%d),(%d,%d)\n",
+      ginfo("Vertical rect: (%d,%d),(%d,%d)\n",
             rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y);
 
       return 2;
@@ -231,7 +231,7 @@ int nxgl_splitline(FAR struct nxgl_vector_s *vector,
       traps[1].bot.x2 = traps[1].bot.x1;
       traps[1].bot.y  = line.pt2.y;
 
-      gvdbg("Vertical traps[1]: (%08x,%08x,%d),(%08x,%08x, %d)\n",
+      ginfo("Vertical traps[1]: (%08x,%08x,%d),(%08x,%08x, %d)\n",
             traps[1].top.x1, traps[1].top.x2, traps[1].top.y,
             traps[1].bot.x1, traps[1].bot.x2, traps[1].bot.y);
 
@@ -277,7 +277,7 @@ int nxgl_splitline(FAR struct nxgl_vector_s *vector,
   sinangle   =  b16sin(angle);
   b16xoffset = (linewidth * sinangle + 1) >> 1;
 
-  gvdbg("height: %d width: %d angle: %08x b16yoffset: %08x b16xoffset: %08x\n",
+  ginfo("height: %d width: %d angle: %08x b16yoffset: %08x b16xoffset: %08x\n",
         iheight, iwidth, angle, b16yoffset, b16xoffset);
 
   /* Now we know all four points of the rotated rectangle */
@@ -307,7 +307,7 @@ int nxgl_splitline(FAR struct nxgl_vector_s *vector,
           quad[2].x = b16x + b16xoffset;
           quad[3].x = b16x - b16xoffset;
 
-          gvdbg("Southeast: quad (%08x,%08x),(%08x,%08x),(%08x,%08x),(%08x,%08x)\n",
+          ginfo("Southeast: quad (%08x,%08x),(%08x,%08x),(%08x,%08x),(%08x,%08x)\n",
                 quad[0].x, quad[0].y, quad[1].x, quad[1].y,
                 quad[2].x, quad[2].y, quad[3].x, quad[3].y);
 
@@ -408,7 +408,7 @@ int nxgl_splitline(FAR struct nxgl_vector_s *vector,
           quad[2].x = b16x - b16xoffset;
           quad[3].x = b16x + b16xoffset;
 
-          gvdbg("Southwest: quad (%08x,%08x),(%08x,%08x),(%08x,%08x),(%08x,%08x)\n",
+          ginfo("Southwest: quad (%08x,%08x),(%08x,%08x),(%08x,%08x),(%08x,%08x)\n",
                 quad[0].x, quad[0].y, quad[1].x, quad[1].y,
                 quad[2].x, quad[2].y, quad[3].x, quad[3].y);
 
@@ -498,13 +498,13 @@ int nxgl_splitline(FAR struct nxgl_vector_s *vector,
           traps[2].bot.y  = b16toi(quad[3].y + b16HALF);
         }
 
-      gvdbg("traps[0]: (%08x,%08x,%d),(%08x,%08x,%d)\n",
+      ginfo("traps[0]: (%08x,%08x,%d),(%08x,%08x,%d)\n",
             traps[0].top.x1, traps[0].top.x2, traps[0].top.y,
             traps[0].bot.x1, traps[0].bot.x2, traps[0].bot.y);
-      gvdbg("traps[1]: (%08x,%08x,%d),(%08x,%08x,%d)\n",
+      ginfo("traps[1]: (%08x,%08x,%d),(%08x,%08x,%d)\n",
             traps[1].top.x1, traps[1].top.x2, traps[1].top.y,
             traps[1].bot.x1, traps[1].bot.x2, traps[1].bot.y);
-      gvdbg("traps[2]: (%08x,%08x,%d),(%08x,%08x,%d)\n",
+      ginfo("traps[2]: (%08x,%08x,%d),(%08x,%08x,%d)\n",
             traps[2].top.x1, traps[2].top.x2, traps[2].top.y,
             traps[2].bot.x1, traps[2].bot.x2, traps[2].bot.y);
 
@@ -523,7 +523,7 @@ int nxgl_splitline(FAR struct nxgl_vector_s *vector,
   traps[1].bot.x2 = traps[1].bot.x1 + itob16(linewidth - 1);
   traps[1].bot.y  = line.pt2.y;
 
-  gvdbg("Horizontal traps[1]: (%08x,%08x,%d),(%08x,%08x, %d)\n",
+  ginfo("Horizontal traps[1]: (%08x,%08x,%d),(%08x,%08x, %d)\n",
         traps[1].top.x1, traps[1].top.x2, traps[1].top.y,
         traps[1].bot.x1, traps[1].bot.x2, traps[1].bot.y);
 
diff --git a/libnx/nxmu/nx_eventhandler.c b/libnx/nxmu/nx_eventhandler.c
index 71172fe6f9..d67860b2fa 100644
--- a/libnx/nxmu/nx_eventhandler.c
+++ b/libnx/nxmu/nx_eventhandler.c
@@ -177,7 +177,7 @@ int nx_eventhandler(NXHANDLE handle)
   /* Dispatch the message appropriately */
 
   msg = (struct nxsvrmsg_s *)buffer;
-  gvdbg("Received msgid=%d\n", msg->msgid);
+  ginfo("Received msgid=%d\n", msg->msgid);
   switch (msg->msgid)
     {
     case NX_CLIMSG_CONNECTED:
diff --git a/libnx/nxmu/nx_getrectangle.c b/libnx/nxmu/nx_getrectangle.c
index a3b9a3a241..4c6f2d22e2 100644
--- a/libnx/nxmu/nx_getrectangle.c
+++ b/libnx/nxmu/nx_getrectangle.c
@@ -104,7 +104,7 @@ int nx_getrectangle(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
 #ifdef CONFIG_DEBUG
   if (!hwnd || !rect || !dest)
     {
-      gvdbg("Invalid parameters\n");
+      ginfo("Invalid parameters\n");
       set_errno(EINVAL);
       return ERROR;
     }
diff --git a/libnx/nxtk/nxtk_events.c b/libnx/nxtk/nxtk_events.c
index d7f33e6ebe..6644366e25 100644
--- a/libnx/nxtk/nxtk_events.c
+++ b/libnx/nxtk/nxtk_events.c
@@ -119,7 +119,7 @@ static void nxtk_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
 
   DEBUGASSERT(hwnd && rect && fwnd->fwcb);
 
-  gvdbg("hwnd=%p rect={(%d,%d),(%d,%d)} more=%d\n",
+  ginfo("hwnd=%p rect={(%d,%d),(%d,%d)} more=%d\n",
         hwnd, rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y, more);
 
   /* The incoming rectangle (rect) is relative to the containing window
@@ -137,7 +137,7 @@ static void nxtk_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
 
       nxtk_containerclip(fwnd, &intersection, rect, &fwnd->fwrect);
 
-      gvdbg("fwrect intersection={(%d,%d),(%d,%d)}\n",
+      ginfo("fwrect intersection={(%d,%d),(%d,%d)}\n",
            intersection.pt1.x, intersection.pt1.y,
            intersection.pt2.x, intersection.pt2.y);
 
@@ -160,7 +160,7 @@ static void nxtk_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
 
       nxtk_containerclip(fwnd, &intersection, rect, &fwnd->tbrect);
 
-      gvdbg("tbrect intersection={(%d,%d),(%d,%d)}\n",
+      ginfo("tbrect intersection={(%d,%d),(%d,%d)}\n",
            intersection.pt1.x, intersection.pt1.y,
            intersection.pt2.x, intersection.pt2.y);
 
@@ -187,7 +187,7 @@ static void nxtk_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
   FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hwnd;
   struct nxgl_size_s subwindowsize;
 
-  gvdbg("hwnd=%p size=(%d,%d) pos=(%d,%d) bounds={(%d,%d),(%d,%d)}\n",
+  ginfo("hwnd=%p size=(%d,%d) pos=(%d,%d) bounds={(%d,%d),(%d,%d)}\n",
         hwnd, size->w, size->h, pos->x, pos->y,
         bounds->pt1.x, bounds->pt1.y, bounds->pt2.x, bounds->pt2.y);
 
diff --git a/libnx/nxtk/nxtk_gettoolbar.c b/libnx/nxtk/nxtk_gettoolbar.c
index 593fcb09a6..3626462dad 100644
--- a/libnx/nxtk/nxtk_gettoolbar.c
+++ b/libnx/nxtk/nxtk_gettoolbar.c
@@ -103,7 +103,7 @@ int nxtk_gettoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
 #ifdef CONFIG_DEBUG
   if (!hfwnd || !rect || !dest)
     {
-      gvdbg("Invalid parameters\n");
+      ginfo("Invalid parameters\n");
       set_errno(EINVAL);
       return ERROR;
     }
diff --git a/libnx/nxtk/nxtk_getwindow.c b/libnx/nxtk/nxtk_getwindow.c
index b229459973..ffb06bf95d 100644
--- a/libnx/nxtk/nxtk_getwindow.c
+++ b/libnx/nxtk/nxtk_getwindow.c
@@ -103,7 +103,7 @@ int nxtk_getwindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
 #ifdef CONFIG_DEBUG
   if (!hfwnd || !rect || !dest)
     {
-      gvdbg("Invalid parameters\n");
+      ginfo("Invalid parameters\n");
       set_errno(EINVAL);
       return ERROR;
     }
diff --git a/mm/mm_gran/mm_gran.h b/mm/mm_gran/mm_gran.h
index 20229216b7..2d1e8a4159 100644
--- a/mm/mm_gran/mm_gran.h
+++ b/mm/mm_gran/mm_gran.h
@@ -64,18 +64,18 @@
 #ifdef CONFIG_CPP_HAVE_VARARGS
 #  ifdef CONFIG_DEBUG_GRAM
 #    define grandbg(format, ...)       dbg(format, ##__VA_ARGS__)
-#    define granvdbg(format, ...)      vdbg(format, ##__VA_ARGS__)
+#    define graninfo(format, ...)      info(format, ##__VA_ARGS__)
 #  else
 #    define grandbg(format, ...)       mdbg(format, ##__VA_ARGS__)
-#    define granvdbg(format, ...)      mvdbg(format, ##__VA_ARGS__)
+#    define graninfo(format, ...)      minfo(format, ##__VA_ARGS__)
 #  endif
 #else
 #  ifdef CONFIG_DEBUG_GRAM
 #    define grandbg                    dbg
-#    define granvdbg                   vdbg
+#    define graninfo                   info
 #  else
 #    define grandbg                    (void)
-#    define granvdbg                   (void)
+#    define graninfo                   (void)
 #  endif
 #endif
 
diff --git a/mm/mm_gran/mm_pgalloc.c b/mm/mm_gran/mm_pgalloc.c
index 474d9e0f4e..72d0531199 100644
--- a/mm/mm_gran/mm_pgalloc.c
+++ b/mm/mm_gran/mm_pgalloc.c
@@ -67,18 +67,18 @@
 #ifdef CONFIG_CPP_HAVE_VARARGS
 #  ifdef CONFIG_DEBUG_PGALLOC
 #    define pgadbg(format, ...)       dbg(format, ##__VA_ARGS__)
-#    define pgavdbg(format, ...)      vdbg(format, ##__VA_ARGS__)
+#    define pgainfo(format, ...)      info(format, ##__VA_ARGS__)
 #  else
 #    define pgadbg(format, ...)       mdbg(format, ##__VA_ARGS__)
-#    define pgavdbg(format, ...)      mvdbg(format, ##__VA_ARGS__)
+#    define pgainfo(format, ...)      minfo(format, ##__VA_ARGS__)
 #  endif
 #else
 #  ifdef CONFIG_DEBUG_PGALLOC
 #    define pgadbg                    dbg
-#    define pgavdbg                   vdbg
+#    define pgainfo                   info
 #  else
 #    define pgadbg                    (void)
-#    define pgavdbg                   (void)
+#    define pgainfo                   (void)
 #  endif
 #endif
 
diff --git a/mm/mm_heap/mm_free.c b/mm/mm_heap/mm_free.c
index 57cb867f8d..4dad12e366 100644
--- a/mm/mm_heap/mm_free.c
+++ b/mm/mm_heap/mm_free.c
@@ -63,7 +63,7 @@ void mm_free(FAR struct mm_heap_s *heap, FAR void *mem)
   FAR struct mm_freenode_s *prev;
   FAR struct mm_freenode_s *next;
 
-  mvdbg("Freeing %p\n", mem);
+  minfo("Freeing %p\n", mem);
 
   /* Protect against attempts to free a NULL reference */
 
diff --git a/mm/mm_heap/mm_mallinfo.c b/mm/mm_heap/mm_mallinfo.c
index f3c8775ba6..3ee276c917 100644
--- a/mm/mm_heap/mm_mallinfo.c
+++ b/mm/mm_heap/mm_mallinfo.c
@@ -88,7 +88,7 @@ int mm_mallinfo(FAR struct mm_heap_s *heap, FAR struct mallinfo *info)
            node < heap->mm_heapend[region];
            node = (FAR struct mm_allocnode_s *)((FAR char *)node + node->size))
         {
-          mvdbg("region=%d node=%p size=%p preceding=%p (%c)\n",
+          minfo("region=%d node=%p size=%p preceding=%p (%c)\n",
                 region, node, node->size, (node->preceding & ~MM_ALLOC_BIT),
                 (node->preceding & MM_ALLOC_BIT) ? 'A' : 'F');
 
@@ -111,7 +111,7 @@ int mm_mallinfo(FAR struct mm_heap_s *heap, FAR struct mallinfo *info)
 
       mm_givesemaphore(heap);
 
-      mvdbg("region=%d node=%p heapend=%p\n", region, node, heap->mm_heapend[region]);
+      minfo("region=%d node=%p heapend=%p\n", region, node, heap->mm_heapend[region]);
       DEBUGASSERT(node == heap->mm_heapend[region]);
       uordblks += SIZEOF_MM_ALLOCNODE; /* account for the tail node */
     }
diff --git a/mm/mm_heap/mm_malloc.c b/mm/mm_heap/mm_malloc.c
index 3f9db86a33..2594ebcda2 100644
--- a/mm/mm_heap/mm_malloc.c
+++ b/mm/mm_heap/mm_malloc.c
@@ -190,7 +190,7 @@ FAR void *mm_malloc(FAR struct mm_heap_s *heap, size_t size)
     }
   else
     {
-      mvdbg("Allocated %p, size %d\n", ret, size);
+      minfo("Allocated %p, size %d\n", ret, size);
     }
 #endif
 
diff --git a/net/arp/arp_arpin.c b/net/arp/arp_arpin.c
index 6945ff666a..c84f4bfa81 100644
--- a/net/arp/arp_arpin.c
+++ b/net/arp/arp_arpin.c
@@ -107,7 +107,7 @@ void arp_arpin(FAR struct net_driver_s *dev)
   switch (arp->ah_opcode)
     {
       case HTONS(ARP_REQUEST):
-        nllvdbg("ARP request for IP %04lx\n", (long)ipaddr);
+        nllinfo("ARP request for IP %04lx\n", (long)ipaddr);
 
         /* ARP request. If it asked for our address, we send out a reply. */
 
@@ -139,7 +139,7 @@ void arp_arpin(FAR struct net_driver_s *dev)
         break;
 
       case HTONS(ARP_REPLY):
-        nllvdbg("ARP reply for IP %04lx\n", (long)ipaddr);
+        nllinfo("ARP reply for IP %04lx\n", (long)ipaddr);
 
         /* ARP reply. We insert or update the ARP table if it was meant
          * for us.
diff --git a/net/arp/arp_out.c b/net/arp/arp_out.c
index 563d601337..8eaaf555a6 100644
--- a/net/arp/arp_out.c
+++ b/net/arp/arp_out.c
@@ -231,7 +231,7 @@ void arp_out(FAR struct net_driver_s *dev)
       tabptr = arp_find(ipaddr);
       if (!tabptr)
         {
-           nllvdbg("ARP request for IP %08lx\n", (unsigned long)ipaddr);
+           nllinfo("ARP request for IP %08lx\n", (unsigned long)ipaddr);
 
           /* The destination address was not in our ARP table, so we
            * overwrite the IP packet with an ARP request.
diff --git a/net/arp/arp_send.c b/net/arp/arp_send.c
index 0fff9041c3..f9ec518d41 100644
--- a/net/arp/arp_send.c
+++ b/net/arp/arp_send.c
@@ -102,7 +102,7 @@ static uint16_t arp_send_interrupt(FAR struct net_driver_s *dev,
 {
   FAR struct arp_send_s *state = (FAR struct arp_send_s *)priv;
 
-  nllvdbg("flags: %04x sent: %d\n", flags, state->snd_sent);
+  nllinfo("flags: %04x sent: %d\n", flags, state->snd_sent);
 
   if (state)
     {
diff --git a/net/devif/devif_callback.c b/net/devif/devif_callback.c
index fc89eaf7d5..4db178e425 100644
--- a/net/devif/devif_callback.c
+++ b/net/devif/devif_callback.c
@@ -410,7 +410,7 @@ uint16_t devif_conn_event(FAR struct net_driver_s *dev, void *pvconn,
            * beginning of the list (which will be ignored on this pass)
            */
 
-          nllvdbg("Call event=%p with flags=%04x\n", list->event, flags);
+          nllinfo("Call event=%p with flags=%04x\n", list->event, flags);
           flags = list->event(dev, pvconn, list->priv, flags);
         }
 
@@ -475,7 +475,7 @@ uint16_t devif_dev_event(FAR struct net_driver_s *dev, void *pvconn,
            * beginning of the list (which will be ignored on this pass)
            */
 
-          nllvdbg("Call event=%p with flags=%04x\n", cb->event, flags);
+          nllinfo("Call event=%p with flags=%04x\n", cb->event, flags);
           flags = cb->event(dev, pvconn, cb->priv, flags);
         }
 
diff --git a/net/icmp/icmp_input.c b/net/icmp/icmp_input.c
index 2d919b8f76..36b0e02e55 100644
--- a/net/icmp/icmp_input.c
+++ b/net/icmp/icmp_input.c
@@ -140,7 +140,7 @@ void icmp_input(FAR struct net_driver_s *dev)
         }
 #endif
 
-      nllvdbg("Outgoing ICMP packet length: %d (%d)\n",
+      nllinfo("Outgoing ICMP packet length: %d (%d)\n",
               dev->d_len, (picmp->len[0] << 8) | picmp->len[1]);
 
 #ifdef CONFIG_NET_STATISTICS
diff --git a/net/icmp/icmp_ping.c b/net/icmp/icmp_ping.c
index 337968bf84..a155d8d2f6 100644
--- a/net/icmp/icmp_ping.c
+++ b/net/icmp/icmp_ping.c
@@ -154,7 +154,7 @@ static uint16_t ping_interrupt(FAR struct net_driver_s *dev, FAR void *conn,
   FAR uint8_t *ptr;
   int i;
 
-  nllvdbg("flags: %04x\n", flags);
+  nllinfo("flags: %04x\n", flags);
 
   if (pstate)
     {
@@ -177,7 +177,7 @@ static uint16_t ping_interrupt(FAR struct net_driver_s *dev, FAR void *conn,
         {
           FAR struct icmp_iphdr_s *icmp = (FAR struct icmp_iphdr_s *)conn;
 
-          nllvdbg("ECHO reply: id=%d seqno=%d\n",
+          nllinfo("ECHO reply: id=%d seqno=%d\n",
                   ntohs(icmp->id), ntohs(icmp->seqno));
 
           if (ntohs(icmp->id) == pstate->png_id)
@@ -236,7 +236,7 @@ static uint16_t ping_interrupt(FAR struct net_driver_s *dev, FAR void *conn,
            * of the ICMP header.
            */
 
-          nllvdbg("Send ECHO request: seqno=%d\n", pstate->png_seqno);
+          nllinfo("Send ECHO request: seqno=%d\n", pstate->png_seqno);
 
           dev->d_sndlen = pstate->png_datlen + 4;
           icmp_send(dev, &pstate->png_addr);
@@ -283,7 +283,7 @@ static uint16_t ping_interrupt(FAR struct net_driver_s *dev, FAR void *conn,
   return flags;
 
 end_wait:
-  nllvdbg("Resuming\n");
+  nllinfo("Resuming\n");
 
   /* Do not allow any further callbacks */
 
@@ -397,7 +397,7 @@ int icmp_ping(in_addr_t addr, uint16_t id, uint16_t seqno, uint16_t datalen,
        * re-enabled when the task restarts.
        */
 
-      nllvdbg("Start time: 0x%08x seqno: %d\n", state.png_time, seqno);
+      nllinfo("Start time: 0x%08x seqno: %d\n", state.png_time, seqno);
       net_lockedwait(&state.png_sem);
 
       icmp_callback_free(dev, state.png_cb);
@@ -411,7 +411,7 @@ int icmp_ping(in_addr_t addr, uint16_t id, uint16_t seqno, uint16_t datalen,
 
   if (!state.png_result)
     {
-      nllvdbg("Return seqno=%d\n", state.png_seqno);
+      nllinfo("Return seqno=%d\n", state.png_seqno);
       return (int)state.png_seqno;
     }
   else
diff --git a/net/icmp/icmp_send.c b/net/icmp/icmp_send.c
index b92e992704..b45d12acc3 100644
--- a/net/icmp/icmp_send.c
+++ b/net/icmp/icmp_send.c
@@ -131,7 +131,7 @@ void icmp_send(FAR struct net_driver_s *dev, FAR in_addr_t *destaddr)
           picmp->icmpchksum = 0xffff;
         }
 
-      nllvdbg("Outgoing ICMP packet length: %d (%d)\n",
+      nllinfo("Outgoing ICMP packet length: %d (%d)\n",
               dev->d_len, (picmp->len[0] << 8) | picmp->len[1]);
 
 #ifdef CONFIG_NET_STATISTICS
diff --git a/net/icmpv6/icmpv6_advertise.c b/net/icmpv6/icmpv6_advertise.c
index c30456d855..5ac4932c4d 100644
--- a/net/icmpv6/icmpv6_advertise.c
+++ b/net/icmpv6/icmpv6_advertise.c
@@ -180,7 +180,7 @@ void icmpv6_advertise(FAR struct net_driver_s *dev,
 
   IFF_SET_NOARP(dev->d_flags);
 
-  nllvdbg("Outgoing ICMPv6 Neighbor Advertise length: %d (%d)\n",
+  nllinfo("Outgoing ICMPv6 Neighbor Advertise length: %d (%d)\n",
           dev->d_len, (icmp->len[0] << 8) | icmp->len[1]);
 
 #ifdef CONFIG_NET_STATISTICS
diff --git a/net/icmpv6/icmpv6_autoconfig.c b/net/icmpv6/icmpv6_autoconfig.c
index 7899f07451..d7f7b2fbb7 100644
--- a/net/icmpv6/icmpv6_autoconfig.c
+++ b/net/icmpv6/icmpv6_autoconfig.c
@@ -119,7 +119,7 @@ static uint16_t icmpv6_router_interrupt(FAR struct net_driver_s *dev,
 {
   FAR struct icmpv6_router_s *state = (FAR struct icmpv6_router_s *)priv;
 
-  nllvdbg("flags: %04x sent: %d\n", flags, state->snd_sent);
+  nllinfo("flags: %04x sent: %d\n", flags, state->snd_sent);
 
   if (state)
     {
@@ -354,7 +354,7 @@ int icmpv6_autoconfig(FAR struct net_driver_s *dev)
   /* Sanity checks */
 
   DEBUGASSERT(dev);
-  nvdbg("Auto-configuring %s\n", dev->d_ifname);
+  ninfo("Auto-configuring %s\n", dev->d_ifname);
 
 #ifdef CONFIG_NET_MULTILINK
   /* Only Ethernet devices are supported for now */
@@ -402,7 +402,7 @@ int icmpv6_autoconfig(FAR struct net_driver_s *dev)
   memcpy(&lladdr[5], dev->d_mac.ether_addr_octet,
         sizeof(struct ether_addr));                 /* 48-bit Ethernet address */
 
-  nvdbg("lladdr=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
+  ninfo("lladdr=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
         lladdr[0], lladdr[1], lladdr[2], lladdr[3],
         lladdr[4], lladdr[6], lladdr[6], lladdr[7]);
 
@@ -493,7 +493,7 @@ int icmpv6_autoconfig(FAR struct net_driver_s *dev)
           break;
         }
 
-      nvdbg("Timed out... retrying %d\n", retries + 1);
+      ninfo("Timed out... retrying %d\n", retries + 1);
     }
 
   /* Check for failures.  Note:  On successful return, the network will be 
diff --git a/net/icmpv6/icmpv6_input.c b/net/icmpv6/icmpv6_input.c
index 3ffc30662e..95fdece263 100644
--- a/net/icmpv6/icmpv6_input.c
+++ b/net/icmpv6/icmpv6_input.c
@@ -312,7 +312,7 @@ void icmpv6_input(FAR struct net_driver_s *dev)
       }
     }
 
-  nllvdbg("Outgoing ICMPv6 packet length: %d (%d)\n",
+  nllinfo("Outgoing ICMPv6 packet length: %d (%d)\n",
           dev->d_len, (icmp->len[0] << 8) | icmp->len[1]);
 
 #ifdef CONFIG_NET_STATISTICS
diff --git a/net/icmpv6/icmpv6_neighbor.c b/net/icmpv6/icmpv6_neighbor.c
index d2de416504..95723eb858 100644
--- a/net/icmpv6/icmpv6_neighbor.c
+++ b/net/icmpv6/icmpv6_neighbor.c
@@ -103,7 +103,7 @@ static uint16_t icmpv6_neighbor_interrupt(FAR struct net_driver_s *dev,
 {
   FAR struct icmpv6_neighbor_s *state = (FAR struct icmpv6_neighbor_s *)priv;
 
-  nllvdbg("flags: %04x sent: %d\n", flags, state->snd_sent);
+  nllinfo("flags: %04x sent: %d\n", flags, state->snd_sent);
 
   if (state)
     {
diff --git a/net/icmpv6/icmpv6_ping.c b/net/icmpv6/icmpv6_ping.c
index 0e9ac3b691..0ed83ec956 100644
--- a/net/icmpv6/icmpv6_ping.c
+++ b/net/icmpv6/icmpv6_ping.c
@@ -164,7 +164,7 @@ static void icmpv6_echo_request(FAR struct net_driver_s *dev,
   uint16_t reqlen;
   int i;
 
-  nllvdbg("Send ECHO request: seqno=%d\n", pstate->png_seqno);
+  nllinfo("Send ECHO request: seqno=%d\n", pstate->png_seqno);
 
   /* Set up the IPv6 header (most is probably already in place) */
 
@@ -217,7 +217,7 @@ static void icmpv6_echo_request(FAR struct net_driver_s *dev,
   dev->d_sndlen = reqlen;
   dev->d_len    = reqlen + IPv6_HDRLEN;
 
-  nllvdbg("Outgoing ICMPv6 Echo Request length: %d (%d)\n",
+  nllinfo("Outgoing ICMPv6 Echo Request length: %d (%d)\n",
           dev->d_len, (icmp->len[0] << 8) | icmp->len[1]);
 
 #ifdef CONFIG_NET_STATISTICS
@@ -253,7 +253,7 @@ static uint16_t ping_interrupt(FAR struct net_driver_s *dev, FAR void *conn,
 {
   FAR struct icmpv6_ping_s *pstate = (struct icmpv6_ping_s *)pvpriv;
 
-  nllvdbg("flags: %04x\n", flags);
+  nllinfo("flags: %04x\n", flags);
 
   if (pstate)
     {
@@ -276,7 +276,7 @@ static uint16_t ping_interrupt(FAR struct net_driver_s *dev, FAR void *conn,
         {
           FAR struct icmpv6_echo_reply_s *reply = ICMPv6ECHOREPLY;
 
-          nllvdbg("ECHO reply: id=%d seqno=%d\n",
+          nllinfo("ECHO reply: id=%d seqno=%d\n",
                   ntohs(reply->id), ntohs(reply->seqno));
 
           if (ntohs(reply->id) == pstate->png_id)
@@ -357,7 +357,7 @@ static uint16_t ping_interrupt(FAR struct net_driver_s *dev, FAR void *conn,
   return flags;
 
 end_wait:
-  nllvdbg("Resuming\n");
+  nllinfo("Resuming\n");
 
   /* Do not allow any further callbacks */
 
@@ -471,7 +471,7 @@ int icmpv6_ping(net_ipv6addr_t addr, uint16_t id, uint16_t seqno,
        * re-enabled when the task restarts.
        */
 
-      nllvdbg("Start time: 0x%08x seqno: %d\n", state.png_time, seqno);
+      nllinfo("Start time: 0x%08x seqno: %d\n", state.png_time, seqno);
       net_lockedwait(&state.png_sem);
 
       icmpv6_callback_free(dev, state.png_cb);
@@ -485,7 +485,7 @@ int icmpv6_ping(net_ipv6addr_t addr, uint16_t id, uint16_t seqno,
 
   if (!state.png_result)
     {
-      nllvdbg("Return seqno=%d\n", state.png_seqno);
+      nllinfo("Return seqno=%d\n", state.png_seqno);
       return (int)state.png_seqno;
     }
   else
diff --git a/net/icmpv6/icmpv6_radvertise.c b/net/icmpv6/icmpv6_radvertise.c
index 09bd4c4857..0b1ed2fea5 100644
--- a/net/icmpv6/icmpv6_radvertise.c
+++ b/net/icmpv6/icmpv6_radvertise.c
@@ -242,7 +242,7 @@ void icmpv6_radvertise(FAR struct net_driver_s *dev)
 
   IFF_SET_NOARP(dev->d_flags);
 
-  nllvdbg("Outgoing ICMPv6 Router Advertise length: %d (%d)\n",
+  nllinfo("Outgoing ICMPv6 Router Advertise length: %d (%d)\n",
           dev->d_len, (icmp->len[0] << 8) | icmp->len[1]);
 
 #ifdef CONFIG_NET_STATISTICS
diff --git a/net/icmpv6/icmpv6_rnotify.c b/net/icmpv6/icmpv6_rnotify.c
index c8e38e3d63..bf1f1beffd 100644
--- a/net/icmpv6/icmpv6_rnotify.c
+++ b/net/icmpv6/icmpv6_rnotify.c
@@ -106,7 +106,7 @@ static void icmpv6_setaddresses(FAR struct net_driver_s *dev,
 
   net_ipv6_pref2mask(preflen, dev->d_ipv6netmask);
 
-  nvdbg("preflen=%d netmask=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
+  ninfo("preflen=%d netmask=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
         preflen, dev->d_ipv6netmask[0], dev->d_ipv6netmask[1],
         dev->d_ipv6netmask[2], dev->d_ipv6netmask[3], dev->d_ipv6netmask[4],
         dev->d_ipv6netmask[5], dev->d_ipv6netmask[6], dev->d_ipv6netmask[7]);
@@ -119,10 +119,10 @@ static void icmpv6_setaddresses(FAR struct net_driver_s *dev,
                            (prefix[i] & dev->d_ipv6netmask[i]);
     }
 
-  nvdbg("prefix=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
+  ninfo("prefix=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
         prefix[0], prefix[1], prefix[2], prefix[3],
         prefix[4], prefix[6], prefix[6], prefix[7]);
-  nvdbg("IP address=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
+  ninfo("IP address=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
         dev->d_ipv6addr[0], dev->d_ipv6addr[1], dev->d_ipv6addr[2],
         dev->d_ipv6addr[3], dev->d_ipv6addr[4], dev->d_ipv6addr[6],
         dev->d_ipv6addr[6], dev->d_ipv6addr[7]);
@@ -131,7 +131,7 @@ static void icmpv6_setaddresses(FAR struct net_driver_s *dev,
 
   net_ipv6addr_copy(dev->d_ipv6draddr, draddr);
 
-  nvdbg("DR address=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
+  ninfo("DR address=%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
         dev->d_ipv6draddr[0], dev->d_ipv6draddr[1], dev->d_ipv6draddr[2],
         dev->d_ipv6draddr[3], dev->d_ipv6draddr[4], dev->d_ipv6draddr[6],
         dev->d_ipv6draddr[6], dev->d_ipv6draddr[7]);
@@ -212,7 +212,7 @@ int icmpv6_rwait_cancel(FAR struct icmpv6_rnotify_s *notify)
   irqstate_t flags;
   int ret = -ENOENT;
 
-  nvdbg("Cancelling...\n");
+  ninfo("Cancelling...\n");
 
   /* Remove our wait structure from the list (we may no longer be at the
    * head of the list).
@@ -243,7 +243,7 @@ int icmpv6_rwait_cancel(FAR struct icmpv6_rnotify_s *notify)
   return ret;
 
 #else
-  nvdbg("Cancelling...\n");
+  ninfo("Cancelling...\n");
 
   /* If there is only one network device, then there can be only one entry
    * in the list of waiters.
@@ -276,7 +276,7 @@ int icmpv6_rwait(FAR struct icmpv6_rnotify_s *notify,
   irqstate_t flags;
   int ret;
 
-  nvdbg("Waiting...\n");
+  ninfo("Waiting...\n");
 
   /* And wait for the Neighbor Advertisement (or a timeout).  Interrupts will
    * be re-enabled while we wait.
@@ -335,7 +335,7 @@ void icmpv6_rnotify(FAR struct net_driver_s *dev, const net_ipv6addr_t draddr,
 #ifdef CONFIG_NETDEV_MULTINIC
   FAR struct icmpv6_rnotify_s *curr;
 
-  nvdbg("Notified\n");
+  ninfo("Notified\n");
 
   /* Find an entry with the matching device name in the list of waiters */
 
@@ -364,7 +364,7 @@ void icmpv6_rnotify(FAR struct net_driver_s *dev, const net_ipv6addr_t draddr,
 #else
   FAR struct icmpv6_rnotify_s *waiter = g_icmpv6_rwaiters;
 
-  nvdbg("Notified\n");
+  ninfo("Notified\n");
 
   if (waiter)
     {
diff --git a/net/icmpv6/icmpv6_rsolicit.c b/net/icmpv6/icmpv6_rsolicit.c
index 58e60fdd3d..81c87ac911 100644
--- a/net/icmpv6/icmpv6_rsolicit.c
+++ b/net/icmpv6/icmpv6_rsolicit.c
@@ -183,7 +183,7 @@ void icmpv6_rsolicit(FAR struct net_driver_s *dev)
    * outgoing packet.
    */
   dev->d_len += netdev_ipv6_hdrlen(dev);
-  nllvdbg("Outgoing ICMPv6 Router Solicitation length: %d (%d)\n",
+  nllinfo("Outgoing ICMPv6 Router Solicitation length: %d (%d)\n",
           dev->d_len, (icmp->len[0] << 8) | icmp->len[1]);
 
 #ifdef CONFIG_NET_STATISTICS
diff --git a/net/icmpv6/icmpv6_solicit.c b/net/icmpv6/icmpv6_solicit.c
index 7e84ccf7d5..08d99190ee 100644
--- a/net/icmpv6/icmpv6_solicit.c
+++ b/net/icmpv6/icmpv6_solicit.c
@@ -211,7 +211,7 @@ void icmpv6_solicit(FAR struct net_driver_s *dev,
    * outgoing packet.
    */
   dev->d_len += netdev_ipv6_hdrlen(dev);
-  nllvdbg("Outgoing ICMPv6 Neighbor Solicitation length: %d (%d)\n",
+  nllinfo("Outgoing ICMPv6 Neighbor Solicitation length: %d (%d)\n",
           dev->d_len, (icmp->len[0] << 8) | icmp->len[1]);
 
 #ifdef CONFIG_NET_STATISTICS
diff --git a/net/igmp/igmp_group.c b/net/igmp/igmp_group.c
index 92b34427b4..b95fe66f7f 100644
--- a/net/igmp/igmp_group.c
+++ b/net/igmp/igmp_group.c
@@ -90,25 +90,25 @@
 #  ifdef IGMP_GRPDEBUG
 #    define grpdbg(format, ...)    ndbg(format, ##__VA_ARGS__)
 #    define grplldbg(format, ...)  nlldbg(format, ##__VA_ARGS__)
-#    define grpvdbg(format, ...)   nvdbg(format, ##__VA_ARGS__)
-#    define grpllvdbg(format, ...) nllvdbg(format, ##__VA_ARGS__)
+#    define grpinfo(format, ...)   ninfo(format, ##__VA_ARGS__)
+#    define grpllinfo(format, ...) nllinfo(format, ##__VA_ARGS__)
 #  else
 #    define grpdbg(x...)
 #    define grplldbg(x...)
-#    define grpvdbg(x...)
-#    define grpllvdbg(x...)
+#    define grpinfo(x...)
+#    define grpllinfo(x...)
 #  endif
 #else
 #  ifdef IGMP_GRPDEBUG
 #    define grpdbg    ndbg
 #    define grplldbg  nlldbg
-#    define grpvdbg   nvdbg
-#    define grpllvdbg nllvdbg
+#    define grpinfo   ninfo
+#    define grpllinfo nllinfo
 #  else
 #    define grpdbg    (void)
 #    define grplldbg  (void)
-#    define grpvdbg   (void)
-#    define grpllvdbg (void)
+#    define grpinfo   (void)
+#    define grpllinfo (void)
 #  endif
 #endif
 
@@ -222,7 +222,7 @@ FAR struct igmp_group_s *igmp_grpalloc(FAR struct net_driver_s *dev,
   FAR struct igmp_group_s *group;
   net_lock_t flags;
 
-  nllvdbg("addr: %08x dev: %p\n", *addr, dev);
+  nllinfo("addr: %08x dev: %p\n", *addr, dev);
   if (up_interrupt_context())
     {
 #if CONFIG_PREALLOC_IGMPGROUPS > 0
diff --git a/net/igmp/igmp_initialize.c b/net/igmp/igmp_initialize.c
index 1a92cb3ecf..84dd6f34c1 100644
--- a/net/igmp/igmp_initialize.c
+++ b/net/igmp/igmp_initialize.c
@@ -84,7 +84,7 @@ in_addr_t g_ipv4_allrouters;
 
 void igmp_initialize(void)
 {
-  nvdbg("IGMP initializing\n");
+  ninfo("IGMP initializing\n");
 
   net_ipaddr(g_ipv4_allrouters, 224, 0, 0, 2);
   net_ipaddr(g_ipv4_allsystems, 224, 0, 0, 1);
@@ -105,7 +105,7 @@ void igmp_initialize(void)
 
 void igmp_devinit(struct net_driver_s *dev)
 {
-  nvdbg("IGMP initializing dev %p\n", dev);
+  ninfo("IGMP initializing dev %p\n", dev);
   DEBUGASSERT(dev->grplist.head == NULL);
 
   /* Add the all systems address to the group */
diff --git a/net/igmp/igmp_input.c b/net/igmp/igmp_input.c
index c2b3c870a3..66b1601bbe 100644
--- a/net/igmp/igmp_input.c
+++ b/net/igmp/igmp_input.c
@@ -117,7 +117,7 @@ void igmp_input(struct net_driver_s *dev)
   in_addr_t grpaddr;
   unsigned int ticks;
 
-  nllvdbg("IGMP message: %04x%04x\n", IGMPBUF->destipaddr[1], IGMPBUF->destipaddr[0]);
+  nllinfo("IGMP message: %04x%04x\n", IGMPBUF->destipaddr[1], IGMPBUF->destipaddr[0]);
 
   /* Verify the message length */
 
@@ -186,7 +186,7 @@ void igmp_input(struct net_driver_s *dev)
 
                 /* This is the general query */
 
-                nllvdbg("General multicast query\n");
+                nllinfo("General multicast query\n");
                 if (IGMPBUF->maxresp == 0)
                   {
                     IGMP_STATINCR(g_netstats.igmp.v1_received);
@@ -216,7 +216,7 @@ void igmp_input(struct net_driver_s *dev)
               }
             else /* if (IGMPBUF->grpaddr != 0) */
               {
-                nllvdbg("Group-specific multicast queury\n");
+                nllinfo("Group-specific multicast queury\n");
 
                 /* We first need to re-lookup the group since we used dest last time.
                  * Use the incoming IPaddress!
@@ -238,7 +238,7 @@ void igmp_input(struct net_driver_s *dev)
 
         else if (group->grpaddr != 0)
           {
-            nllvdbg("Unicast query\n");
+            nllinfo("Unicast query\n");
             IGMP_STATINCR(g_netstats.igmp.ucast_query);
 
             nlldbg("Query to a specific group with the group address as destination\n");
@@ -254,7 +254,7 @@ void igmp_input(struct net_driver_s *dev)
 
       case IGMPv2_MEMBERSHIP_REPORT:
         {
-          nllvdbg("Membership report\n");
+          nllinfo("Membership report\n");
 
           IGMP_STATINCR(g_netstats.igmp.report_received);
           if (!IS_IDLEMEMBER(group->flags))
diff --git a/net/igmp/igmp_join.c b/net/igmp/igmp_join.c
index 83ef65a0f8..c72ebe3f0a 100644
--- a/net/igmp/igmp_join.c
+++ b/net/igmp/igmp_join.c
@@ -129,7 +129,7 @@ int igmp_joingroup(struct net_driver_s *dev, FAR const struct in_addr *grpaddr)
     {
        /* No... allocate a new entry */
 
-       nvdbg("Join to new group: %08x\n", grpaddr->s_addr);
+       ninfo("Join to new group: %08x\n", grpaddr->s_addr);
        group = igmp_grpalloc(dev, &grpaddr->s_addr);
        IGMP_STATINCR(g_netstats.igmp.joins);
 
diff --git a/net/igmp/igmp_leave.c b/net/igmp/igmp_leave.c
index 4035358e8f..5e0019b3a2 100644
--- a/net/igmp/igmp_leave.c
+++ b/net/igmp/igmp_leave.c
@@ -172,7 +172,7 @@ int igmp_leavegroup(struct net_driver_s *dev, FAR const struct in_addr *grpaddr)
 
   /* Return ENOENT if the address is not a member of the group */
 
-  nvdbg("Return -ENOENT\n");
+  ninfo("Return -ENOENT\n");
   return -ENOENT;
 }
 
diff --git a/net/igmp/igmp_mcastmac.c b/net/igmp/igmp_mcastmac.c
index 2172a281ec..88c12a8cb7 100644
--- a/net/igmp/igmp_mcastmac.c
+++ b/net/igmp/igmp_mcastmac.c
@@ -79,7 +79,7 @@ static void igmp_mcastmac(in_addr_t *ip, FAR uint8_t *mac)
   mac[4] = ip4_addr3(*ip);
   mac[5] = ip4_addr4(*ip);
 
-  nvdbg("IP: %08x -> MAC: %02x%02x%02x%02x%02x%02x\n",
+  ninfo("IP: %08x -> MAC: %02x%02x%02x%02x%02x%02x\n",
         *ip, mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 }
 
@@ -99,7 +99,7 @@ void igmp_addmcastmac(FAR struct net_driver_s *dev, FAR in_addr_t *ip)
 {
   uint8_t mcastmac[6];
 
-  nvdbg("Adding: IP %08x\n", *ip);
+  ninfo("Adding: IP %08x\n", *ip);
   if (dev->d_addmac)
     {
       igmp_mcastmac(ip, mcastmac);
@@ -119,7 +119,7 @@ void igmp_removemcastmac(FAR struct net_driver_s *dev, FAR in_addr_t *ip)
 {
   uint8_t mcastmac[6];
 
-  nvdbg("Removing: IP %08x\n", *ip);
+  ninfo("Removing: IP %08x\n", *ip);
   if (dev->d_rmmac)
     {
       igmp_mcastmac(ip, mcastmac);
diff --git a/net/igmp/igmp_poll.c b/net/igmp/igmp_poll.c
index e7dfd10683..a789ba8331 100644
--- a/net/igmp/igmp_poll.c
+++ b/net/igmp/igmp_poll.c
@@ -87,7 +87,7 @@ static inline void igmp_sched_send(FAR struct net_driver_s *dev,
   if (group->msgid == IGMPv2_MEMBERSHIP_REPORT)
     {
       dest = &group->grpaddr;
-      nllvdbg("Send IGMPv2_MEMBERSHIP_REPORT, dest=%08x flags=%02x\n",
+      nllinfo("Send IGMPv2_MEMBERSHIP_REPORT, dest=%08x flags=%02x\n",
                *dest, group->flags);
       IGMP_STATINCR(g_netstats.igmp.report_sched);
       SET_LASTREPORT(group->flags); /* Remember we were the last to report */
@@ -96,7 +96,7 @@ static inline void igmp_sched_send(FAR struct net_driver_s *dev,
     {
       DEBUGASSERT(group->msgid == IGMP_LEAVE_GROUP);
       dest = &g_ipv4_allrouters;
-      nllvdbg("Send IGMP_LEAVE_GROUP, dest=%08x flags=%02x\n",
+      nllinfo("Send IGMP_LEAVE_GROUP, dest=%08x flags=%02x\n",
                *dest, group->flags);
       IGMP_STATINCR(g_netstats.igmp.leave_sched);
     }
@@ -114,7 +114,7 @@ static inline void igmp_sched_send(FAR struct net_driver_s *dev,
 
   if (IS_WAITMSG(group->flags))
     {
-      nllvdbg("Awakening waiter\n");
+      nllinfo("Awakening waiter\n");
       sem_post(&group->sem);
     }
 }
@@ -143,7 +143,7 @@ void igmp_poll(FAR struct net_driver_s *dev)
 {
   FAR struct igmp_group_s *group;
 
-  nllvdbg("Entry\n");
+  nllinfo("Entry\n");
 
   /* Setup the poll operation */
 
diff --git a/net/igmp/igmp_send.c b/net/igmp/igmp_send.c
index d40301495a..b05b2ca40a 100644
--- a/net/igmp/igmp_send.c
+++ b/net/igmp/igmp_send.c
@@ -116,7 +116,7 @@ static uint16_t igmp_chksum(FAR uint8_t *buffer, int buflen)
 void igmp_send(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group,
                FAR in_addr_t *destipaddr)
 {
-  nllvdbg("msgid: %02x destipaddr: %08x\n", group->msgid, (int)*destipaddr);
+  nllinfo("msgid: %02x destipaddr: %08x\n", group->msgid, (int)*destipaddr);
 
   /* The total length to send is the size of the IP and IGMP headers and 4
    * bytes for the ROUTER ALERT (and, eventually, the Ethernet header)
@@ -169,7 +169,7 @@ void igmp_send(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group,
   IGMP_STATINCR(g_netstats.igmp.poll_send);
   IGMP_STATINCR(g_netstats.ipv4.sent);
 
-  nllvdbg("Outgoing IGMP packet length: %d (%d)\n",
+  nllinfo("Outgoing IGMP packet length: %d (%d)\n",
           dev->d_len, (IGMPBUF->len[0] << 8) | IGMPBUF->len[1]);
   igmp_dumppkt(RA, IPIGMP_HDRLEN + RASIZE);
 }
diff --git a/net/igmp/igmp_timer.c b/net/igmp/igmp_timer.c
index 5465a68f72..ef6d75cef0 100644
--- a/net/igmp/igmp_timer.c
+++ b/net/igmp/igmp_timer.c
@@ -75,25 +75,25 @@
 #  ifdef IGMP_GTMRDEBUG
 #    define gtmrdbg(format, ...)    ndbg(format, ##__VA_ARGS__)
 #    define gtmrlldbg(format, ...)  nlldbg(format, ##__VA_ARGS__)
-#    define gtmrvdbg(format, ...)   nvdbg(format, ##__VA_ARGS__)
-#    define gtmrllvdbg(format, ...) nllvdbg(format, ##__VA_ARGS__)
+#    define gtmrinfo(format, ...)   ninfo(format, ##__VA_ARGS__)
+#    define gtmrllinfo(format, ...) nllinfo(format, ##__VA_ARGS__)
 #  else
 #    define gtmrdbg(x...)
 #    define gtmrlldbg(x...)
-#    define gtmrvdbg(x...)
-#    define gtmrllvdbg(x...)
+#    define gtmrinfo(x...)
+#    define gtmrllinfo(x...)
 #  endif
 #else
 #  ifdef IGMP_GTMRDEBUG
 #    define gtmrdbg    ndbg
 #    define gtmrlldbg  nlldbg
-#    define gtmrvdbg   nvdbg
-#    define gtmrllvdbg nllvdbg
+#    define gtmrinfo   ninfo
+#    define gtmrllinfo nllinfo
 #  else
 #    define gtmrdbg    (void)
 #    define gtmrlldbg  (void)
-#    define gtmrvdbg   (void)
-#    define gtmrllvdbg (void)
+#    define gtmrinfo   (void)
+#    define gtmrllinfo (void)
 #  endif
 #endif
 
@@ -119,7 +119,7 @@ static void igmp_timeout(int argc, uint32_t arg, ...)
 
   /* If the state is DELAYING_MEMBER then we send a report for this group */
 
-  nllvdbg("Timeout!\n");
+  nllinfo("Timeout!\n");
   group = (FAR struct igmp_group_s *)arg;
   DEBUGASSERT(argc == 1 && group);
 
diff --git a/net/iob/iob_copyin.c b/net/iob/iob_copyin.c
index c5030c91c5..e671dc2b5e 100644
--- a/net/iob/iob_copyin.c
+++ b/net/iob/iob_copyin.c
@@ -97,7 +97,7 @@ static int iob_copyin_internal(FAR struct iob_s *iob, FAR const uint8_t *src,
   unsigned int avail;
   unsigned int total = len;
 
-  nllvdbg("iob=%p len=%u offset=%u\n", iob, len, offset);
+  nllinfo("iob=%p len=%u offset=%u\n", iob, len, offset);
   DEBUGASSERT(iob && src);
 
   /* The offset must applied to data that is already in the I/O buffer chain */
@@ -130,7 +130,7 @@ static int iob_copyin_internal(FAR struct iob_s *iob, FAR const uint8_t *src,
       dest  = &iob->io_data[iob->io_offset + offset];
       avail = iob->io_len - offset;
 
-      nllvdbg("iob=%p avail=%u len=%u next=%p\n", iob, avail, len, next);
+      nllinfo("iob=%p avail=%u len=%u next=%p\n", iob, avail, len, next);
 
       /* Will the rest of the copy fit into this buffer, overwriting
        * existing data.
@@ -187,7 +187,7 @@ static int iob_copyin_internal(FAR struct iob_s *iob, FAR const uint8_t *src,
       /* Copy from the user buffer to the I/O buffer.  */
 
       memcpy(dest, src, ncopy);
-      nllvdbg("iob=%p Copy %u bytes new len=%u\n",
+      nllinfo("iob=%p Copy %u bytes new len=%u\n",
               iob, ncopy, iob->io_len);
 
       /* Adjust the total length of the copy and the destination address in
@@ -227,7 +227,7 @@ static int iob_copyin_internal(FAR struct iob_s *iob, FAR const uint8_t *src,
           /* Add the new, empty I/O buffer to the end of the buffer chain. */
 
           iob->io_flink = next;
-          nllvdbg("iob=%p added to the chain\n", iob);
+          nllinfo("iob=%p added to the chain\n", iob);
         }
 
       iob = next;
diff --git a/net/iob/iob_free.c b/net/iob/iob_free.c
index 53d8f6fb1d..7762201b3c 100644
--- a/net/iob/iob_free.c
+++ b/net/iob/iob_free.c
@@ -74,7 +74,7 @@ FAR struct iob_s *iob_free(FAR struct iob_s *iob)
   FAR struct iob_s *next = iob->io_flink;
   irqstate_t flags;
 
-  nllvdbg("iob=%p io_pktlen=%u io_len=%u next=%p\n",
+  nllinfo("iob=%p io_pktlen=%u io_len=%u next=%p\n",
           iob, iob->io_pktlen, iob->io_len, next);
 
   /* Copy the data that only exists in the head of a I/O buffer chain into
@@ -104,7 +104,7 @@ FAR struct iob_s *iob_free(FAR struct iob_s *iob)
           DEBUGASSERT(next->io_len == 0 && next->io_flink == NULL);
         }
 
-      nllvdbg("next=%p io_pktlen=%u io_len=%u\n",
+      nllinfo("next=%p io_pktlen=%u io_len=%u\n",
                next, next->io_pktlen, next->io_len);
     }
 
diff --git a/net/iob/iob_trimhead.c b/net/iob/iob_trimhead.c
index 70a5359603..1262eecf09 100644
--- a/net/iob/iob_trimhead.c
+++ b/net/iob/iob_trimhead.c
@@ -78,7 +78,7 @@ FAR struct iob_s *iob_trimhead(FAR struct iob_s *iob, unsigned int trimlen)
 {
   uint16_t pktlen;
 
-  nllvdbg("iob=%p trimlen=%d\n", iob, trimlen);
+  nllinfo("iob=%p trimlen=%d\n", iob, trimlen);
 
   if (iob && trimlen > 0)
     {
@@ -89,7 +89,7 @@ FAR struct iob_s *iob_trimhead(FAR struct iob_s *iob, unsigned int trimlen)
         {
           /* Do we trim this entire I/O buffer away? */
 
-          nllvdbg("iob=%p io_len=%d pktlen=%d trimlen=%d\n",
+          nllinfo("iob=%p io_len=%d pktlen=%d trimlen=%d\n",
                   iob, iob->io_len, pktlen, trimlen);
 
           if (iob->io_len <= trimlen)
@@ -120,7 +120,7 @@ FAR struct iob_s *iob_trimhead(FAR struct iob_s *iob, unsigned int trimlen)
 
               /* Free this entry and set the next I/O buffer as the head */
 
-              nllvdbg("iob=%p: Freeing\n", iob);
+              nllinfo("iob=%p: Freeing\n", iob);
               (void)iob_free(iob);
               iob = next;
             }
diff --git a/net/iob/iob_trimtail.c b/net/iob/iob_trimtail.c
index 6965fe3da5..4ca9407957 100644
--- a/net/iob/iob_trimtail.c
+++ b/net/iob/iob_trimtail.c
@@ -101,7 +101,7 @@ FAR struct iob_s *iob_trimtail(FAR struct iob_s *iob, unsigned int trimlen)
            * I/O buffer away?
            */
 
-          nllvdbg("iob=%p len=%d vs %d\n", last, last->io_len, len);
+          nllinfo("iob=%p len=%d vs %d\n", last, last->io_len, len);
           if (last->io_len <= len)
             {
               /* Yes.. Consume the entire buffer */
diff --git a/net/local/local_recvutils.c b/net/local/local_recvutils.c
index 27272a59db..95845fe0b7 100644
--- a/net/local/local_recvutils.c
+++ b/net/local/local_recvutils.c
@@ -98,7 +98,7 @@ int local_fifo_read(int fd, FAR uint8_t *buf, size_t *len)
               goto errout;
             }
 
-          nvdbg("Ignoring signal\n");
+          ninfo("Ignoring signal\n");
         }
       else if (nread == 0)
         {
diff --git a/net/local/local_sendpacket.c b/net/local/local_sendpacket.c
index c55aa7efbf..0f6942802b 100644
--- a/net/local/local_sendpacket.c
+++ b/net/local/local_sendpacket.c
@@ -104,7 +104,7 @@ static int local_fifo_write(int fd, FAR const uint8_t *buf, size_t len)
               return -errcode;
             }
 
-          nvdbg("Ignoring signal\n");
+          ninfo("Ignoring signal\n");
         }
       else
         {
diff --git a/net/neighbor/neighbor_add.c b/net/neighbor/neighbor_add.c
index 4205f60db2..dd09f93596 100644
--- a/net/neighbor/neighbor_add.c
+++ b/net/neighbor/neighbor_add.c
@@ -76,11 +76,11 @@ void neighbor_add(FAR net_ipv6addr_t ipaddr, FAR struct neighbor_addr_s *addr)
   int     oldest_ndx;
   int     i;
 
-  nllvdbg("Add neighbor: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
+  nllinfo("Add neighbor: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
           ntohs(ipaddr[0]), ntohs(ipaddr[1]), ntohs(ipaddr[2]),
           ntohs(ipaddr[3]), ntohs(ipaddr[4]), ntohs(ipaddr[5]),
           ntohs(ipaddr[6]), ntohs(ipaddr[7]));
-  nllvdbg("  at: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  nllinfo("  at: %02x:%02x:%02x:%02x:%02x:%02x\n",
           addr->na_addr.ether_addr_octet[0],
           addr->na_addr.ether_addr_octet[1],
           addr->na_addr.ether_addr_octet[2],
diff --git a/net/neighbor/neighbor_findentry.c b/net/neighbor/neighbor_findentry.c
index 88b7abf94e..8d9949dff7 100644
--- a/net/neighbor/neighbor_findentry.c
+++ b/net/neighbor/neighbor_findentry.c
@@ -72,7 +72,7 @@ FAR struct neighbor_entry *neighbor_findentry(const net_ipv6addr_t ipaddr)
 {
   int i;
 
-  nllvdbg("Find neighbor: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
+  nllinfo("Find neighbor: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
           ntohs(ipaddr[0]), ntohs(ipaddr[1]), ntohs(ipaddr[2]),
           ntohs(ipaddr[3]), ntohs(ipaddr[4]), ntohs(ipaddr[5]),
           ntohs(ipaddr[6]), ntohs(ipaddr[7]));
@@ -83,7 +83,7 @@ FAR struct neighbor_entry *neighbor_findentry(const net_ipv6addr_t ipaddr)
 
       if (net_ipv6addr_cmp(neighbor->ne_ipaddr, ipaddr))
         {
-          nllvdbg("  at: %02x:%02x:%02x:%02x:%02x:%02x\n",
+          nllinfo("  at: %02x:%02x:%02x:%02x:%02x:%02x\n",
                   neighbor->ne_addr.na_addr.ether_addr_octet[0],
                   neighbor->ne_addr.na_addr.ether_addr_octet[1],
                   neighbor->ne_addr.na_addr.ether_addr_octet[2],
@@ -95,6 +95,6 @@ FAR struct neighbor_entry *neighbor_findentry(const net_ipv6addr_t ipaddr)
         }
     }
 
-  nllvdbg("  Not found\n");
+  nllinfo("  Not found\n");
   return NULL;
 }
diff --git a/net/neighbor/neighbor_lookup.c b/net/neighbor/neighbor_lookup.c
index 39b9f941bb..a0a3e856d7 100644
--- a/net/neighbor/neighbor_lookup.c
+++ b/net/neighbor/neighbor_lookup.c
@@ -76,7 +76,7 @@ FAR const struct neighbor_addr_s *neighbor_lookup(const net_ipv6addr_t ipaddr)
   neighbor = neighbor_findentry(ipaddr);
   if (neighbor != NULL)
     {
-      nllvdbg("Lookup neighbor: %02x:%02x:%02x:%02x:%02x:%02x\n",
+      nllinfo("Lookup neighbor: %02x:%02x:%02x:%02x:%02x:%02x\n",
               neighbor->ne_addr.na_addr.ether_addr_octet[0],
               neighbor->ne_addr.na_addr.ether_addr_octet[1],
               neighbor->ne_addr.na_addr.ether_addr_octet[2],
diff --git a/net/neighbor/neighbor_out.c b/net/neighbor/neighbor_out.c
index 061a45518d..8e40982b9c 100644
--- a/net/neighbor/neighbor_out.c
+++ b/net/neighbor/neighbor_out.c
@@ -227,7 +227,7 @@ void neighbor_out(FAR struct net_driver_s *dev)
       naddr = neighbor_lookup(ipaddr);
       if (!naddr)
         {
-           nllvdbg("IPv6 Neighbor solicitation for IPv6\n");
+           nllinfo("IPv6 Neighbor solicitation for IPv6\n");
 
           /* The destination address was not in our Neighbor Table, so we
            * overwrite the IPv6 packet with an ICMDv6 Neighbor Solicitation
@@ -253,6 +253,6 @@ void neighbor_out(FAR struct net_driver_s *dev)
    */
 
   dev->d_len += netdev_ipv6_hdrlen(dev);
-  nllvdbg("Outgoing IPv6 Packet length: %d (%d)\n",
+  nllinfo("Outgoing IPv6 Packet length: %d (%d)\n",
           dev->d_len, (ip->len[0] << 8) | ip->len[1]);
 }
diff --git a/net/netdev/netdev_ioctl.c b/net/netdev/netdev_ioctl.c
index c4a1a650d0..d12d3bdbbd 100644
--- a/net/netdev/netdev_ioctl.c
+++ b/net/netdev/netdev_ioctl.c
@@ -363,7 +363,7 @@ static int netdev_ifrioctl(FAR struct socket *psock, int cmd,
   FAR struct net_driver_s *dev;
   int ret = -EINVAL;
 
-  nvdbg("cmd: %d\n", cmd);
+  ninfo("cmd: %d\n", cmd);
 
   /* Execute the command */
 
@@ -769,7 +769,7 @@ static int netdev_imsfioctl(FAR struct socket *psock, int cmd,
   FAR struct net_driver_s *dev;
   int ret = -EINVAL;
 
-  nvdbg("cmd: %d\n", cmd);
+  ninfo("cmd: %d\n", cmd);
 
   /* Execute the command */
 
diff --git a/net/pkt/pkt_callback.c b/net/pkt/pkt_callback.c
index 5376b4ce22..e4c4783457 100644
--- a/net/pkt/pkt_callback.c
+++ b/net/pkt/pkt_callback.c
@@ -70,7 +70,7 @@
 uint16_t pkt_callback(FAR struct net_driver_s *dev,
                       FAR struct pkt_conn_s *conn, uint16_t flags)
 {
-  nllvdbg("flags: %04x\n", flags);
+  nllinfo("flags: %04x\n", flags);
 
   /* Some sanity checking */
 
diff --git a/net/pkt/pkt_send.c b/net/pkt/pkt_send.c
index 1310cb9208..70c2a5e2f6 100644
--- a/net/pkt/pkt_send.c
+++ b/net/pkt/pkt_send.c
@@ -93,7 +93,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev,
 {
   FAR struct send_s *pstate = (FAR struct send_s *)pvpriv;
 
-  nllvdbg("flags: %04x sent: %d\n", flags, pstate->snd_sent);
+  nllinfo("flags: %04x sent: %d\n", flags, pstate->snd_sent);
 
   if (pstate)
     {
diff --git a/net/procfs/net_procfs.c b/net/procfs/net_procfs.c
index f65cf040df..3beb1a72ee 100644
--- a/net/procfs/net_procfs.c
+++ b/net/procfs/net_procfs.c
@@ -126,7 +126,7 @@ static int netprocfs_open(FAR struct file *filep, FAR const char *relpath,
   FAR struct netprocfs_file_s *priv;
   FAR struct net_driver_s *dev;
 
-  fvdbg("Open '%s'\n", relpath);
+  finfo("Open '%s'\n", relpath);
 
   /* PROCFS is read-only.  Any attempt to open with any kind of write
    * access is not permitted.
@@ -233,7 +233,7 @@ static ssize_t netprocfs_read(FAR struct file *filep, FAR char *buffer,
   FAR struct netprocfs_file_s *priv;
   ssize_t nreturned;
 
-  fvdbg("buffer=%p buflen=%lu\n", buffer, (unsigned long)buflen);
+  finfo("buffer=%p buflen=%lu\n", buffer, (unsigned long)buflen);
 
   /* Recover our private data from the struct file instance */
 
@@ -282,7 +282,7 @@ static int netprocfs_dup(FAR const struct file *oldp, FAR struct file *newp)
   FAR struct netprocfs_file_s *oldpriv;
   FAR struct netprocfs_file_s *newpriv;
 
-  fvdbg("Dup %p->%p\n", oldp, newp);
+  finfo("Dup %p->%p\n", oldp, newp);
 
   /* Recover our private data from the old struct file instance */
 
@@ -322,7 +322,7 @@ static int netprocfs_opendir(FAR const char *relpath,
   FAR struct netprocfs_level1_s *level1;
   int ndevs;
 
-  fvdbg("relpath: \"%s\"\n", relpath ? relpath : "NULL");
+  finfo("relpath: \"%s\"\n", relpath ? relpath : "NULL");
   DEBUGASSERT(relpath && dir && !dir->u.procfs);
 
   /* "net" is the only value of relpath that is a directory */
@@ -420,7 +420,7 @@ static int netprocfs_readdir(FAR struct fs_dirent_s *dir)
        * error -ENOENT.
        */
 
-      fvdbg("Entry %d: End of directory\n", index);
+      finfo("Entry %d: End of directory\n", index);
       return -ENOENT;
     }
 
@@ -575,7 +575,7 @@ ssize_t netprocfs_read_linegen(FAR struct netprocfs_file_s *priv,
   size_t xfrsize;
   ssize_t nreturned;
 
-  fvdbg("buffer=%p buflen=%lu\n", buffer, (unsigned long)buflen);
+  finfo("buffer=%p buflen=%lu\n", buffer, (unsigned long)buflen);
 
   /* Is there line data already buffered? */
 
diff --git a/net/socket/connect.c b/net/socket/connect.c
index cbd19e1774..8365a5b3d5 100644
--- a/net/socket/connect.c
+++ b/net/socket/connect.c
@@ -185,7 +185,7 @@ static uint16_t psock_connect_interrupt(FAR struct net_driver_s *dev,
 {
   struct tcp_connect_s *pstate = (struct tcp_connect_s *)pvpriv;
 
-  nllvdbg("flags: %04x\n", flags);
+  nllinfo("flags: %04x\n", flags);
 
   /* 'priv' might be null in some race conditions (?) */
 
@@ -261,7 +261,7 @@ static uint16_t psock_connect_interrupt(FAR struct net_driver_s *dev,
           return flags & ~TCP_NEWDATA;
         }
 
-      nllvdbg("Resuming: %d\n", pstate->tc_result);
+      nllinfo("Resuming: %d\n", pstate->tc_result);
 
       /* Stop further callbacks */
 
diff --git a/net/socket/net_checksd.c b/net/socket/net_checksd.c
index 3269b531a9..64a2f4df8e 100644
--- a/net/socket/net_checksd.c
+++ b/net/socket/net_checksd.c
@@ -72,7 +72,7 @@ int net_checksd(int sd, int oflags)
 
   if (!psock || psock->s_crefs <= 0)
     {
-      nvdbg("No valid socket for sd: %d\n", sd);
+      ninfo("No valid socket for sd: %d\n", sd);
       return -EBADF;
     }
 
diff --git a/net/socket/net_close.c b/net/socket/net_close.c
index f03a9caeea..75ddb23b53 100644
--- a/net/socket/net_close.c
+++ b/net/socket/net_close.c
@@ -161,7 +161,7 @@ static uint16_t netclose_interrupt(FAR struct net_driver_s *dev,
 
   DEBUGASSERT(conn != NULL);
 
-  nllvdbg("conn: %p flags: %04x\n", conn, flags);
+  nllinfo("conn: %p flags: %04x\n", conn, flags);
 
   /* TCP_DISCONN_EVENTS:
    *   TCP_CLOSE:    The remote host has closed the connection
@@ -250,7 +250,7 @@ end_wait:
   pstate->cl_cb->event = NULL;
   sem_post(&pstate->cl_sem);
 
-  nllvdbg("Resuming\n");
+  nllinfo("Resuming\n");
   return 0;
 #endif
 }
diff --git a/net/socket/net_monitor.c b/net/socket/net_monitor.c
index 3e6cf0c2ae..2c61a6a673 100644
--- a/net/socket/net_monitor.c
+++ b/net/socket/net_monitor.c
@@ -145,7 +145,7 @@ static uint16_t connection_event(FAR struct net_driver_s *dev,
 
   if (psock)
     {
-      nllvdbg("flags: %04x s_flags: %02x\n", flags, psock->s_flags);
+      nllinfo("flags: %04x s_flags: %02x\n", flags, psock->s_flags);
 
       /* TCP_DISCONN_EVENTS: TCP_CLOSE, TCP_ABORT, TCP_TIMEDOUT, or
        * NETDEV_DOWN.  All loss-of-connection events.
diff --git a/net/socket/net_sendfile.c b/net/socket/net_sendfile.c
index d5fde26023..0ab962d762 100644
--- a/net/socket/net_sendfile.c
+++ b/net/socket/net_sendfile.c
@@ -156,7 +156,7 @@ static uint16_t ack_interrupt(FAR struct net_driver_s *dev, FAR void *pvconn,
 {
   FAR struct sendfile_s *pstate = (FAR struct sendfile_s *)pvpriv;
 
-  nllvdbg("flags: %04x\n", flags);
+  nllinfo("flags: %04x\n", flags);
 
   if ((flags & TCP_ACKDATA) != 0)
     {
@@ -197,7 +197,7 @@ static uint16_t ack_interrupt(FAR struct net_driver_s *dev, FAR void *pvconn,
        */
 
       pstate->snd_acked = tcp_getsequence(tcp->ackno) - pstate->snd_isn;
-      nllvdbg("ACK: acked=%d sent=%d flen=%d\n",
+      nllinfo("ACK: acked=%d sent=%d flen=%d\n",
              pstate->snd_acked, pstate->snd_sent, pstate->snd_flen);
 
       dev->d_sndlen = 0;
@@ -336,7 +336,7 @@ static uint16_t sendfile_interrupt(FAR struct net_driver_s *dev, FAR void *pvcon
     }
 #endif
 
-  nllvdbg("flags: %04x acked: %d sent: %d\n",
+  nllinfo("flags: %04x acked: %d sent: %d\n",
           flags, pstate->snd_acked, pstate->snd_sent);
 
   /* Check for a loss of connection */
@@ -410,7 +410,7 @@ static uint16_t sendfile_interrupt(FAR struct net_driver_s *dev, FAR void *pvcon
            */
 
           seqno = pstate->snd_sent + pstate->snd_isn;
-          nllvdbg("SEND: sndseq %08x->%08x len: %d\n", conn->sndseq, seqno, ret);
+          nllinfo("SEND: sndseq %08x->%08x len: %d\n", conn->sndseq, seqno, ret);
 
           tcp_setsequence(conn->sndseq, seqno);
 
@@ -424,7 +424,7 @@ static uint16_t sendfile_interrupt(FAR struct net_driver_s *dev, FAR void *pvcon
               /* Update the amount of data sent (but not necessarily ACKed) */
 
               pstate->snd_sent += sndlen;
-              nllvdbg("pid: %d SEND: acked=%d sent=%d flen=%d\n", getpid(),
+              nllinfo("pid: %d SEND: acked=%d sent=%d flen=%d\n", getpid(),
                      pstate->snd_acked, pstate->snd_sent, pstate->snd_flen);
             }
         }
diff --git a/net/socket/net_vfcntl.c b/net/socket/net_vfcntl.c
index d6fd76f20b..a58756cb8e 100644
--- a/net/socket/net_vfcntl.c
+++ b/net/socket/net_vfcntl.c
@@ -80,7 +80,7 @@ int net_vfcntl(int sockfd, int cmd, va_list ap)
   int err = 0;
   int ret = 0;
 
-  nvdbg("sockfd=%d cmd=%d\n", sockfd, cmd);
+  ninfo("sockfd=%d cmd=%d\n", sockfd, cmd);
 
   /* Verify that the sockfd corresponds to valid, allocated socket */
 
diff --git a/net/socket/recvfrom.c b/net/socket/recvfrom.c
index 9bc234f541..fc9d8c794d 100644
--- a/net/socket/recvfrom.c
+++ b/net/socket/recvfrom.c
@@ -181,7 +181,7 @@ static size_t recvfrom_newdata(FAR struct net_driver_s *dev,
   /* Copy the new appdata into the user buffer */
 
   memcpy(pstate->rf_buffer, dev->d_appdata, recvlen);
-  nllvdbg("Received %d bytes (of %d)\n", (int)recvlen, (int)dev->d_len);
+  nllinfo("Received %d bytes (of %d)\n", (int)recvlen, (int)dev->d_len);
 
   /* Update the accumulated size of the data read */
 
@@ -227,7 +227,7 @@ static void recvfrom_newpktdata(FAR struct net_driver_s *dev,
   /* Copy the new packet data into the user buffer */
 
   memcpy(pstate->rf_buffer, dev->d_buf, recvlen);
-  nllvdbg("Received %d bytes (of %d)\n", (int)recvlen, (int)dev->d_len);
+  nllinfo("Received %d bytes (of %d)\n", (int)recvlen, (int)dev->d_len);
 
   /* Update the accumulated size of the data read */
 
@@ -378,7 +378,7 @@ static inline void recvfrom_tcpreadahead(struct recvfrom_s *pstate)
        */
 
       recvlen = iob_copyout(pstate->rf_buffer, iob, pstate->rf_buflen, 0);
-      nllvdbg("Received %d bytes (of %d)\n", recvlen, iob->io_pktlen);
+      nllinfo("Received %d bytes (of %d)\n", recvlen, iob->io_pktlen);
 
       /* Update the accumulated size of the data read */
 
@@ -478,7 +478,7 @@ static inline void recvfrom_udpreadahead(struct recvfrom_s *pstate)
           recvlen = iob_copyout(pstate->rf_buffer, iob, pstate->rf_buflen,
                                 src_addr_size + sizeof(uint8_t));
 
-          nllvdbg("Received %d bytes (of %d)\n", recvlen, iob->io_pktlen);
+          nllinfo("Received %d bytes (of %d)\n", recvlen, iob->io_pktlen);
 
           /* Update the accumulated size of the data read */
 
@@ -621,7 +621,7 @@ static uint16_t recvfrom_pktinterrupt(FAR struct net_driver_s *dev,
 {
   struct recvfrom_s *pstate = (struct recvfrom_s *)pvpriv;
 
-  nllvdbg("flags: %04x\n", flags);
+  nllinfo("flags: %04x\n", flags);
 
   /* 'priv' might be null in some race conditions (?) */
 
@@ -636,7 +636,7 @@ static uint16_t recvfrom_pktinterrupt(FAR struct net_driver_s *dev,
 
           /* We are finished. */
 
-          nllvdbg("PKT done\n");
+          nllinfo("PKT done\n");
 
           /* Don't allow any further call backs. */
 
@@ -778,7 +778,7 @@ static uint16_t recvfrom_tcpinterrupt(FAR struct net_driver_s *dev,
 #endif
 #endif
 
-  nllvdbg("flags: %04x\n", flags);
+  nllinfo("flags: %04x\n", flags);
 
   /* 'priv' might be null in some race conditions (?) */
 
@@ -827,7 +827,7 @@ static uint16_t recvfrom_tcpinterrupt(FAR struct net_driver_s *dev,
           if (pstate->rf_recvlen > 0)
 #endif
             {
-              nllvdbg("TCP resume\n");
+              nllinfo("TCP resume\n");
 
               /* The TCP receive buffer is full.  Return now and don't allow
                * any further TCP call backs.
@@ -864,7 +864,7 @@ static uint16_t recvfrom_tcpinterrupt(FAR struct net_driver_s *dev,
 
       else if ((flags & TCP_DISCONN_EVENTS) != 0)
         {
-          nllvdbg("Lost connection\n");
+          nllinfo("Lost connection\n");
 
           /* Stop further callbacks */
 
@@ -924,7 +924,7 @@ static uint16_t recvfrom_tcpinterrupt(FAR struct net_driver_s *dev,
            * callbacks
            */
 
-          nllvdbg("TCP timeout\n");
+          nllinfo("TCP timeout\n");
 
           pstate->rf_cb->flags   = 0;
           pstate->rf_cb->priv    = NULL;
@@ -1122,7 +1122,7 @@ static uint16_t recvfrom_udp_interrupt(FAR struct net_driver_s *dev,
 {
   FAR struct recvfrom_s *pstate = (FAR struct recvfrom_s *)pvpriv;
 
-  nllvdbg("flags: %04x\n", flags);
+  nllinfo("flags: %04x\n", flags);
 
   /* 'priv' might be null in some race conditions (?) */
 
@@ -1150,7 +1150,7 @@ static uint16_t recvfrom_udp_interrupt(FAR struct net_driver_s *dev,
 
           /* We are finished. */
 
-          nllvdbg("UDP done\n");
+          nllinfo("UDP done\n");
 
           /* Save the sender's address in the caller's 'from' location */
 
@@ -1176,7 +1176,7 @@ static uint16_t recvfrom_udp_interrupt(FAR struct net_driver_s *dev,
            * callbacks
            */
 
-          nllvdbg("ERROR: UDP timeout\n");
+          nllinfo("ERROR: UDP timeout\n");
 
           /* Terminate the transfer with an -EAGAIN error */
 
diff --git a/net/tcp/tcp_accept.c b/net/tcp/tcp_accept.c
index ced4f0d659..d2b7d426ed 100644
--- a/net/tcp/tcp_accept.c
+++ b/net/tcp/tcp_accept.c
@@ -246,7 +246,7 @@ int psock_tcp_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
     {
       /* Yes... get the address of the connected client */
 
-      nvdbg("Pending conn=%p\n", state.acpt_newconn);
+      ninfo("Pending conn=%p\n", state.acpt_newconn);
       accept_tcpsender(psock, state.acpt_newconn, addr, addrlen);
     }
 
diff --git a/net/tcp/tcp_appsend.c b/net/tcp/tcp_appsend.c
index a56da75714..924415378e 100644
--- a/net/tcp/tcp_appsend.c
+++ b/net/tcp/tcp_appsend.c
@@ -87,7 +87,7 @@ void tcp_appsend(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
 
   /* Handle the result based on the application response */
 
-  nllvdbg("result: %04x d_sndlen: %d conn->unacked: %d\n",
+  nllinfo("result: %04x d_sndlen: %d conn->unacked: %d\n",
           result, dev->d_sndlen, conn->unacked);
 
   /* Get the IP header length associated with the IP domain configured for
@@ -124,7 +124,7 @@ void tcp_appsend(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
 
       dev->d_sndlen = 0;
       conn->tcpstateflags = TCP_CLOSED;
-      nllvdbg("TCP state: NETDEV_DOWN\n");
+      nllinfo("TCP state: NETDEV_DOWN\n");
     }
 
   /* Check for connection aborted */
@@ -133,7 +133,7 @@ void tcp_appsend(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
     {
       dev->d_sndlen = 0;
       conn->tcpstateflags = TCP_CLOSED;
-      nllvdbg("TCP state: TCP_CLOSED\n");
+      nllinfo("TCP state: TCP_CLOSED\n");
 
       tcp_send(dev, conn, TCP_RST | TCP_ACK, hdrlen);
     }
@@ -145,7 +145,7 @@ void tcp_appsend(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
       conn->tcpstateflags = TCP_FIN_WAIT_1;
       conn->unacked  = 1;
       conn->nrtx     = 0;
-      nllvdbg("TCP state: TCP_FIN_WAIT_1\n");
+      nllinfo("TCP state: TCP_FIN_WAIT_1\n");
 
       dev->d_sndlen  = 0;
       tcp_send(dev, conn, TCP_FIN | TCP_ACK, hdrlen);
@@ -210,7 +210,7 @@ void tcp_rexmit(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
 {
   uint8_t hdrlen;
 
-  nllvdbg("result: %04x d_sndlen: %d conn->unacked: %d\n",
+  nllinfo("result: %04x d_sndlen: %d conn->unacked: %d\n",
           result, dev->d_sndlen, conn->unacked);
 
   /* Get the IP header length associated with the IP domain configured for
diff --git a/net/tcp/tcp_backlog.c b/net/tcp/tcp_backlog.c
index f4bba6cbeb..9a1e6e3bf5 100644
--- a/net/tcp/tcp_backlog.c
+++ b/net/tcp/tcp_backlog.c
@@ -77,7 +77,7 @@ int tcp_backlogcreate(FAR struct tcp_conn_s *conn, int nblg)
   int offset;
   int i;
 
-  nllvdbg("conn=%p nblg=%d\n", conn, nblg);
+  nllinfo("conn=%p nblg=%d\n", conn, nblg);
 
 #ifdef CONFIG_DEBUG
   if (!conn)
@@ -161,7 +161,7 @@ int tcp_backlogdestroy(FAR struct tcp_conn_s *conn)
   FAR struct tcp_blcontainer_s *blc;
   FAR struct tcp_conn_s        *blconn;
 
-  nllvdbg("conn=%p\n", conn);
+  nllinfo("conn=%p\n", conn);
 
 #ifdef CONFIG_DEBUG
   if (!conn)
@@ -222,7 +222,7 @@ int tcp_backlogadd(FAR struct tcp_conn_s *conn, FAR struct tcp_conn_s *blconn)
   FAR struct tcp_blcontainer_s *blc;
   int ret = -EINVAL;
 
-  nllvdbg("conn=%p blconn=%p\n", conn, blconn);
+  nllinfo("conn=%p blconn=%p\n", conn, blconn);
 
 #ifdef CONFIG_DEBUG
   if (!conn)
@@ -321,7 +321,7 @@ FAR struct tcp_conn_s *tcp_backlogremove(FAR struct tcp_conn_s *conn)
         }
     }
 
-  nllvdbg("conn=%p, returning %p\n", conn, blconn);
+  nllinfo("conn=%p, returning %p\n", conn, blconn);
   return blconn;
 }
 
@@ -345,7 +345,7 @@ int tcp_backlogdelete(FAR struct tcp_conn_s *conn,
   FAR struct tcp_blcontainer_s *blc;
   FAR struct tcp_blcontainer_s *prev;
 
-  nllvdbg("conn=%p blconn=%p\n", conn, blconn);
+  nllinfo("conn=%p blconn=%p\n", conn, blconn);
 
 #ifdef CONFIG_DEBUG
   if (!conn)
diff --git a/net/tcp/tcp_callback.c b/net/tcp/tcp_callback.c
index ac43091923..7571821842 100644
--- a/net/tcp/tcp_callback.c
+++ b/net/tcp/tcp_callback.c
@@ -95,7 +95,7 @@ tcp_data_event(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
       uint16_t recvlen;
 #endif
 
-      nllvdbg("No listener on connection\n");
+      nllinfo("No listener on connection\n");
 
 #ifdef CONFIG_NET_TCP_READAHEAD
       /* Save as the packet data as in the read-ahead buffer.  NOTE that
@@ -110,7 +110,7 @@ tcp_data_event(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
            * read-ahead buffers to retain the data -- drop the packet.
            */
 
-         nllvdbg("Dropped %d bytes\n", dev->d_len);
+         nllinfo("Dropped %d bytes\n", dev->d_len);
 
 #ifdef CONFIG_NET_STATISTICS
           g_netstats.tcp.syndrop++;
@@ -152,7 +152,7 @@ uint16_t tcp_callback(FAR struct net_driver_s *dev,
    * explicitly set in the callback.
    */
 
-  nllvdbg("flags: %04x\n", flags);
+  nllinfo("flags: %04x\n", flags);
 
   /* Perform the data callback.  When a data callback is executed from 'list',
    * the input flags are normally returned, however, the implementation
@@ -275,7 +275,7 @@ uint16_t tcp_datahandler(FAR struct tcp_conn_s *conn, FAR uint8_t *buffer,
       return 0;
     }
 
-  nllvdbg("Buffered %d bytes\n", buflen);
+  nllinfo("Buffered %d bytes\n", buflen);
   return buflen;
 }
 #endif /* CONFIG_NET_TCP_READAHEAD */
diff --git a/net/tcp/tcp_conn.c b/net/tcp/tcp_conn.c
index efc6527cc5..d4ff81e8ff 100644
--- a/net/tcp/tcp_conn.c
+++ b/net/tcp/tcp_conn.c
@@ -727,7 +727,7 @@ FAR struct tcp_conn_s *tcp_alloc(uint8_t domain)
 
       while (tmp)
         {
-          nllvdbg("conn: %p state: %02x\n", tmp, tmp->tcpstateflags);
+          nllinfo("conn: %p state: %02x\n", tmp, tmp->tcpstateflags);
 
           /* Is this connection in a state we can sacrifice. */
 
diff --git a/net/tcp/tcp_input.c b/net/tcp/tcp_input.c
index 27ab34e1b3..88286266b2 100644
--- a/net/tcp/tcp_input.c
+++ b/net/tcp/tcp_input.c
@@ -409,7 +409,7 @@ found:
        * be beyond ackseq.
        */
 
-      nllvdbg("sndseq: %08x->%08x unackseq: %08x new unacked: %d\n",
+      nllinfo("sndseq: %08x->%08x unackseq: %08x new unacked: %d\n",
               conn->sndseq, ackseq, unackseq, conn->unacked);
       tcp_setsequence(conn->sndseq, ackseq);
 
@@ -471,7 +471,7 @@ found:
 #endif
             conn->unacked       = 0;
             flags               = TCP_CONNECTED;
-            nllvdbg("TCP state: TCP_ESTABLISHED\n");
+            nllinfo("TCP state: TCP_ESTABLISHED\n");
 
             if (dev->d_len > 0)
               {
@@ -571,7 +571,7 @@ found:
             dev->d_len          = 0;
             dev->d_sndlen       = 0;
 
-            nllvdbg("TCP state: TCP_ESTABLISHED\n");
+            nllinfo("TCP state: TCP_ESTABLISHED\n");
             result = tcp_callback(dev, conn, TCP_CONNECTED | TCP_NEWDATA);
             tcp_appsend(dev, conn, result);
             return;
@@ -584,7 +584,7 @@ found:
         /* The connection is closed after we send the RST */
 
         conn->tcpstateflags = TCP_CLOSED;
-        nllvdbg("Connection failed - TCP state: TCP_CLOSED\n");
+        nllinfo("Connection failed - TCP state: TCP_CLOSED\n");
 
         /* We do not send resets in response to resets. */
 
@@ -640,7 +640,7 @@ found:
             conn->tcpstateflags = TCP_LAST_ACK;
             conn->unacked       = 1;
             conn->nrtx          = 0;
-            nllvdbg("TCP state: TCP_LAST_ACK\n");
+            nllinfo("TCP state: TCP_LAST_ACK\n");
 
             tcp_send(dev, conn, TCP_FIN | TCP_ACK, tcpiplen);
             return;
@@ -748,7 +748,7 @@ found:
         if ((flags & TCP_ACKDATA) != 0)
           {
             conn->tcpstateflags = TCP_CLOSED;
-            nllvdbg("TCP_LAST_ACK TCP state: TCP_CLOSED\n");
+            nllinfo("TCP_LAST_ACK TCP state: TCP_CLOSED\n");
 
             (void)tcp_callback(dev, conn, TCP_CLOSE);
           }
@@ -772,12 +772,12 @@ found:
                 conn->tcpstateflags = TCP_TIME_WAIT;
                 conn->timer         = 0;
                 conn->unacked       = 0;
-                nllvdbg("TCP state: TCP_TIME_WAIT\n");
+                nllinfo("TCP state: TCP_TIME_WAIT\n");
               }
             else
               {
                 conn->tcpstateflags = TCP_CLOSING;
-                nllvdbg("TCP state: TCP_CLOSING\n");
+                nllinfo("TCP state: TCP_CLOSING\n");
               }
 
             net_incr32(conn->rcvseq, 1);
@@ -789,7 +789,7 @@ found:
           {
             conn->tcpstateflags = TCP_FIN_WAIT_2;
             conn->unacked = 0;
-            nllvdbg("TCP state: TCP_FIN_WAIT_2\n");
+            nllinfo("TCP state: TCP_FIN_WAIT_2\n");
             goto drop;
           }
 
@@ -811,7 +811,7 @@ found:
           {
             conn->tcpstateflags = TCP_TIME_WAIT;
             conn->timer         = 0;
-            nllvdbg("TCP state: TCP_TIME_WAIT\n");
+            nllinfo("TCP state: TCP_TIME_WAIT\n");
 
             net_incr32(conn->rcvseq, 1);
             (void)tcp_callback(dev, conn, TCP_CLOSE);
@@ -836,7 +836,7 @@ found:
           {
             conn->tcpstateflags = TCP_TIME_WAIT;
             conn->timer        = 0;
-            nllvdbg("TCP state: TCP_TIME_WAIT\n");
+            nllinfo("TCP state: TCP_TIME_WAIT\n");
           }
 
       default:
diff --git a/net/tcp/tcp_netpoll.c b/net/tcp/tcp_netpoll.c
index 522c00986b..40a5a34c78 100644
--- a/net/tcp/tcp_netpoll.c
+++ b/net/tcp/tcp_netpoll.c
@@ -93,7 +93,7 @@ static uint16_t tcp_poll_interrupt(FAR struct net_driver_s *dev, FAR void *conn,
 {
   FAR struct tcp_poll_s *info = (FAR struct tcp_poll_s *)pvpriv;
 
-  nllvdbg("flags: %04x\n", flags);
+  nllinfo("flags: %04x\n", flags);
 
   DEBUGASSERT(!info || (info->psock && info->fds));
 
diff --git a/net/tcp/tcp_send.c b/net/tcp/tcp_send.c
index 14affd53de..12881bcd3a 100644
--- a/net/tcp/tcp_send.c
+++ b/net/tcp/tcp_send.c
@@ -167,7 +167,7 @@ static inline void tcp_ipv4_sendcomplete(FAR struct net_driver_s *dev,
   ipv4->ipchksum    = 0;
   ipv4->ipchksum    = ~ipv4_chksum(dev);
 
-  nllvdbg("IPv4 length: %d\n", ((int)ipv4->len[0] << 8) + ipv4->len[1]);
+  nllinfo("IPv4 length: %d\n", ((int)ipv4->len[0] << 8) + ipv4->len[1]);
 
 #ifdef CONFIG_NET_STATISTICS
   g_netstats.ipv4.sent++;
@@ -230,7 +230,7 @@ static inline void tcp_ipv6_sendcomplete(FAR struct net_driver_s *dev,
   ipv6->tcf    = 0x00;
   ipv6->flow   = 0x00;
 
-  nllvdbg("IPv6 length: %d\n", ((int)ipv6->len[0] << 8) + ipv6->len[1]);
+  nllinfo("IPv6 length: %d\n", ((int)ipv6->len[0] << 8) + ipv6->len[1]);
 
 #ifdef CONFIG_NET_STATISTICS
   g_netstats.ipv6.sent++;
@@ -277,7 +277,7 @@ static void tcp_sendcomplete(FAR struct net_driver_s *dev,
     }
 #endif /* CONFIG_NET_IPv4 */
 
-  nllvdbg("Outgoing TCP packet length: %d bytes\n", dev->d_len);
+  nllinfo("Outgoing TCP packet length: %d bytes\n", dev->d_len);
 
 #ifdef CONFIG_NET_STATISTICS
   g_netstats.tcp.sent++;
diff --git a/net/tcp/tcp_send_buffered.c b/net/tcp/tcp_send_buffered.c
index af4766c309..538cb29980 100644
--- a/net/tcp/tcp_send_buffered.c
+++ b/net/tcp/tcp_send_buffered.c
@@ -349,7 +349,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev,
     }
 #endif
 
-  nllvdbg("flags: %04x\n", flags);
+  nllinfo("flags: %04x\n", flags);
 
   /* If this packet contains an acknowledgement, then update the count of
    * acknowledged bytes.
@@ -388,7 +388,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev,
       /* Get the ACK number from the TCP header */
 
       ackno = tcp_getsequence(tcp->ackno);
-      nllvdbg("ACK: ackno=%u flags=%04x\n", ackno, flags);
+      nllinfo("ACK: ackno=%u flags=%04x\n", ackno, flags);
 
       /* Look at every write buffer in the unacked_q.  The unacked_q
        * holds write buffers that have been entirely sent, but which
@@ -414,14 +414,14 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev,
               /* Get the sequence number at the end of the data */
 
               lastseq = WRB_SEQNO(wrb) + WRB_PKTLEN(wrb);
-              nllvdbg("ACK: wrb=%p seqno=%u lastseq=%u pktlen=%u ackno=%u\n",
+              nllinfo("ACK: wrb=%p seqno=%u lastseq=%u pktlen=%u ackno=%u\n",
                       wrb, WRB_SEQNO(wrb), lastseq, WRB_PKTLEN(wrb), ackno);
 
               /* Has the entire buffer been ACKed? */
 
               if (ackno >= lastseq)
                 {
-                  nllvdbg("ACK: wrb=%p Freeing write buffer\n", wrb);
+                  nllinfo("ACK: wrb=%p Freeing write buffer\n", wrb);
 
                   /* Yes... Remove the write buffer from ACK waiting queue */
 
@@ -449,7 +449,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev,
                       trimlen = WRB_SENT(wrb);
                     }
 
-                  nllvdbg("ACK: wrb=%p trim %u bytes\n", wrb, trimlen);
+                  nllinfo("ACK: wrb=%p trim %u bytes\n", wrb, trimlen);
 
                   WRB_TRIM(wrb, trimlen);
                   WRB_SEQNO(wrb) = ackno;
@@ -457,7 +457,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev,
 
                   /* Set the new sequence number for what remains */
 
-                  nllvdbg("ACK: wrb=%p seqno=%u pktlen=%u\n",
+                  nllinfo("ACK: wrb=%p seqno=%u pktlen=%u\n",
                           wrb, WRB_SEQNO(wrb), WRB_PKTLEN(wrb));
                 }
             }
@@ -483,7 +483,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev,
               nacked = WRB_SENT(wrb);
             }
 
-          nllvdbg("ACK: wrb=%p seqno=%u nacked=%u sent=%u ackno=%u\n",
+          nllinfo("ACK: wrb=%p seqno=%u nacked=%u sent=%u ackno=%u\n",
                   wrb, WRB_SEQNO(wrb), nacked, WRB_SENT(wrb), ackno);
 
           /* Trim the ACKed bytes from the beginning of the write buffer. */
@@ -492,7 +492,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev,
           WRB_SEQNO(wrb) = ackno;
           WRB_SENT(wrb) -= nacked;
 
-          nllvdbg("ACK: wrb=%p seqno=%u pktlen=%u sent=%u\n",
+          nllinfo("ACK: wrb=%p seqno=%u pktlen=%u sent=%u\n",
                   wrb, WRB_SEQNO(wrb), WRB_PKTLEN(wrb), WRB_SENT(wrb));
         }
     }
@@ -501,7 +501,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev,
 
   else if ((flags & TCP_DISCONN_EVENTS) != 0)
     {
-      nllvdbg("Lost connection: %04x\n", flags);
+      nllinfo("Lost connection: %04x\n", flags);
 
       if (psock->s_conn != NULL)
         {
@@ -523,14 +523,14 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev,
       FAR struct tcp_wrbuffer_s *wrb;
       FAR sq_entry_t *entry;
 
-      nllvdbg("REXMIT: %04x\n", flags);
+      nllinfo("REXMIT: %04x\n", flags);
 
       /* If there is a partially sent write buffer at the head of the
        * write_q?  Has anything been sent from that write buffer?
        */
 
       wrb = (FAR struct tcp_wrbuffer_s *)sq_peek(&conn->write_q);
-      nllvdbg("REXMIT: wrb=%p sent=%u\n", wrb, wrb ? WRB_SENT(wrb) : 0);
+      nllinfo("REXMIT: wrb=%p sent=%u\n", wrb, wrb ? WRB_SENT(wrb) : 0);
 
       if (wrb != NULL && WRB_SENT(wrb) > 0)
         {
@@ -559,7 +559,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev,
             }
 
           WRB_SENT(wrb) = 0;
-          nllvdbg("REXMIT: wrb=%p sent=%u, conn unacked=%d sent=%d\n",
+          nllinfo("REXMIT: wrb=%p sent=%u, conn unacked=%d sent=%d\n",
                   wrb, WRB_SENT(wrb), conn->unacked, conn->sent);
 
           /* Increment the retransmit count on this write buffer. */
@@ -624,7 +624,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev,
             }
 
           WRB_SENT(wrb) = 0;
-          nllvdbg("REXMIT: wrb=%p sent=%u, conn unacked=%d sent=%d\n",
+          nllinfo("REXMIT: wrb=%p sent=%u, conn unacked=%d sent=%d\n",
                   wrb, WRB_SENT(wrb), conn->unacked, conn->sent);
 
           /* Free any write buffers that have exceed the retry count */
@@ -656,7 +656,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev,
                * is pulled from the write_q again.
                */
 
-              nllvdbg("REXMIT: Moving wrb=%p nrtx=%u\n", wrb, WRB_NRTX(wrb));
+              nllinfo("REXMIT: Moving wrb=%p nrtx=%u\n", wrb, WRB_NRTX(wrb));
 
               psock_insert_segment(wrb, &conn->write_q);
             }
@@ -721,7 +721,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev,
               sndlen = conn->winsize;
             }
 
-          nllvdbg("SEND: wrb=%p pktlen=%u sent=%u sndlen=%u\n",
+          nllinfo("SEND: wrb=%p pktlen=%u sent=%u sndlen=%u\n",
                   wrb, WRB_PKTLEN(wrb), WRB_SENT(wrb), sndlen);
 
           /* Set the sequence number for this segment.  If we are
@@ -768,14 +768,14 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev,
           conn->unacked += sndlen;
           conn->sent    += sndlen;
 
-          nllvdbg("SEND: wrb=%p nrtx=%u unacked=%u sent=%u\n",
+          nllinfo("SEND: wrb=%p nrtx=%u unacked=%u sent=%u\n",
                   wrb, WRB_NRTX(wrb), conn->unacked, conn->sent);
 
           /* Increment the count of bytes sent from this write buffer */
 
           WRB_SENT(wrb) += sndlen;
 
-          nllvdbg("SEND: wrb=%p sent=%u pktlen=%u\n",
+          nllinfo("SEND: wrb=%p sent=%u pktlen=%u\n",
                   wrb, WRB_SENT(wrb), WRB_PKTLEN(wrb));
 
           /* Remove the write buffer from the write queue if the
@@ -787,7 +787,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev,
             {
               FAR struct tcp_wrbuffer_s *tmp;
 
-              nllvdbg("SEND: wrb=%p Move to unacked_q\n", wrb);
+              nllinfo("SEND: wrb=%p Move to unacked_q\n", wrb);
 
               tmp = (FAR struct tcp_wrbuffer_s *)sq_remfirst(&conn->write_q);
               DEBUGASSERT(tmp == wrb);
@@ -1056,7 +1056,7 @@ ssize_t psock_tcp_send(FAR struct socket *psock, FAR const void *buf,
        */
 
       sq_addlast(&wrb->wb_node, &conn->write_q);
-      nllvdbg("Queued WRB=%p pktlen=%u write_q(%p,%p)\n",
+      nllinfo("Queued WRB=%p pktlen=%u write_q(%p,%p)\n",
               wrb, WRB_PKTLEN(wrb),
               conn->write_q.head, conn->write_q.tail);
 
diff --git a/net/tcp/tcp_send_unbuffered.c b/net/tcp/tcp_send_unbuffered.c
index 53365e3f68..d043a46250 100644
--- a/net/tcp/tcp_send_unbuffered.c
+++ b/net/tcp/tcp_send_unbuffered.c
@@ -302,7 +302,7 @@ static uint16_t tcpsend_interrupt(FAR struct net_driver_s *dev,
     }
 #endif
 
-  nllvdbg("flags: %04x acked: %d sent: %d\n",
+  nllinfo("flags: %04x acked: %d sent: %d\n",
           flags, pstate->snd_acked, pstate->snd_sent);
 
   /* If this packet contains an acknowledgement, then update the count of
@@ -348,7 +348,7 @@ static uint16_t tcpsend_interrupt(FAR struct net_driver_s *dev,
        */
 
       pstate->snd_acked = tcp_getsequence(tcp->ackno) - pstate->snd_isn;
-      nllvdbg("ACK: acked=%d sent=%d buflen=%d\n",
+      nllinfo("ACK: acked=%d sent=%d buflen=%d\n",
               pstate->snd_acked, pstate->snd_sent, pstate->snd_buflen);
 
       /* Have all of the bytes in the buffer been sent and acknowledged? */
@@ -392,7 +392,7 @@ static uint16_t tcpsend_interrupt(FAR struct net_driver_s *dev,
     {
       /* Report not connected */
 
-      nllvdbg("Lost connection\n");
+      nllinfo("Lost connection\n");
 
       net_lostconnection(pstate->snd_sock, flags);
       pstate->snd_sent = -ENOTCONN;
@@ -526,7 +526,7 @@ static uint16_t tcpsend_interrupt(FAR struct net_driver_s *dev,
            */
 
           seqno = pstate->snd_sent + pstate->snd_isn;
-          nllvdbg("SEND: sndseq %08x->%08x\n", conn->sndseq, seqno);
+          nllinfo("SEND: sndseq %08x->%08x\n", conn->sndseq, seqno);
           tcp_setsequence(conn->sndseq, seqno);
 
 #ifdef NEED_IPDOMAIN_SUPPORT
@@ -554,7 +554,7 @@ static uint16_t tcpsend_interrupt(FAR struct net_driver_s *dev,
               /* Update the amount of data sent (but not necessarily ACKed) */
 
               pstate->snd_sent += sndlen;
-              nllvdbg("SEND: acked=%d sent=%d buflen=%d\n",
+              nllinfo("SEND: acked=%d sent=%d buflen=%d\n",
                       pstate->snd_acked, pstate->snd_sent, pstate->snd_buflen);
 
             }
diff --git a/net/tcp/tcp_timer.c b/net/tcp/tcp_timer.c
index 0ba497bb2a..4d8871e1af 100644
--- a/net/tcp/tcp_timer.c
+++ b/net/tcp/tcp_timer.c
@@ -157,7 +157,7 @@ void tcp_timer(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
           DEBUGASSERT(conn->dev != NULL);
           if (dev != conn->dev)
             {
-              nllvdbg("TCP: TCP_CLOSED pending\n");
+              nllinfo("TCP: TCP_CLOSED pending\n");
             }
           else
 #endif
@@ -168,7 +168,7 @@ void tcp_timer(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
 
               result = tcp_callback(dev, conn, TCP_TIMEDOUT);
 
-              nllvdbg("TCP state: TCP_CLOSED\n");
+              nllinfo("TCP state: TCP_CLOSED\n");
             }
         }
       else
@@ -213,7 +213,7 @@ void tcp_timer(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
               DEBUGASSERT(conn->dev != NULL);
               if (dev != conn->dev)
                 {
-                  nllvdbg("TCP: TCP_CLOSED pending\n");
+                  nllinfo("TCP: TCP_CLOSED pending\n");
                   goto done;
                 }
 #endif
@@ -231,7 +231,7 @@ void tcp_timer(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
                  )
                 {
                   conn->tcpstateflags = TCP_CLOSED;
-                  nllvdbg("TCP state: TCP_CLOSED\n");
+                  nllinfo("TCP state: TCP_CLOSED\n");
 
                   /* We call tcp_callback() with TCP_TIMEDOUT to
                    * inform the application that the connection has
diff --git a/net/udp/udp_callback.c b/net/udp/udp_callback.c
index 86b733f81a..e53e806c51 100644
--- a/net/udp/udp_callback.c
+++ b/net/udp/udp_callback.c
@@ -225,7 +225,7 @@ static uint16_t udp_datahandler(FAR struct net_driver_s *dev, FAR struct udp_con
       return 0;
     }
 
-  nllvdbg("Buffered %d bytes\n", buflen);
+  nllinfo("Buffered %d bytes\n", buflen);
   return buflen;
 }
 #endif /* CONFIG_NET_UDP_READAHEAD */
@@ -255,7 +255,7 @@ net_dataevent(FAR struct net_driver_s *dev, FAR struct udp_conn_s *conn,
    * can have zero-length with UDP_NEWDATA set just to cause an ACK).
    */
 
-  nllvdbg("No receive on connection\n");
+  nllinfo("No receive on connection\n");
 
 #ifdef CONFIG_NET_UDP_READAHEAD
   /* Save as the packet data as in the read-ahead buffer.  NOTE that
@@ -270,7 +270,7 @@ net_dataevent(FAR struct net_driver_s *dev, FAR struct udp_conn_s *conn,
        * read-ahead buffers to retain the data -- drop the packet.
        */
 
-     nllvdbg("Dropped %d bytes\n", dev->d_len);
+     nllinfo("Dropped %d bytes\n", dev->d_len);
 
 #ifdef CONFIG_NET_STATISTICS
       g_netstats.udp.drop++;
@@ -304,7 +304,7 @@ net_dataevent(FAR struct net_driver_s *dev, FAR struct udp_conn_s *conn,
 uint16_t udp_callback(FAR struct net_driver_s *dev,
                       FAR struct udp_conn_s *conn, uint16_t flags)
 {
-  nllvdbg("flags: %04x\n", flags);
+  nllinfo("flags: %04x\n", flags);
 
   /* Some sanity checking */
 
diff --git a/net/udp/udp_netpoll.c b/net/udp/udp_netpoll.c
index 07772b6604..349560b1cc 100644
--- a/net/udp/udp_netpoll.c
+++ b/net/udp/udp_netpoll.c
@@ -93,7 +93,7 @@ static uint16_t udp_poll_interrupt(FAR struct net_driver_s *dev, FAR void *conn,
 {
   FAR struct udp_poll_s *info = (FAR struct udp_poll_s *)pvpriv;
 
-  nllvdbg("flags: %04x\n", flags);
+  nllinfo("flags: %04x\n", flags);
 
   DEBUGASSERT(!info || (info->psock && info->fds));
 
diff --git a/net/udp/udp_psock_sendto.c b/net/udp/udp_psock_sendto.c
index 71fbe55af1..0b001e153b 100644
--- a/net/udp/udp_psock_sendto.c
+++ b/net/udp/udp_psock_sendto.c
@@ -224,7 +224,7 @@ static uint16_t sendto_interrupt(FAR struct net_driver_s *dev, FAR void *conn,
 {
   FAR struct sendto_s *pstate = (FAR struct sendto_s *)pvpriv;
 
-  nllvdbg("flags: %04x\n", flags);
+  nllinfo("flags: %04x\n", flags);
   if (pstate)
     {
       /* If the network device has gone down, then we will have terminate
diff --git a/net/udp/udp_send.c b/net/udp/udp_send.c
index b764fade42..4395da2f8d 100644
--- a/net/udp/udp_send.c
+++ b/net/udp/udp_send.c
@@ -100,7 +100,7 @@ void udp_send(FAR struct net_driver_s *dev, FAR struct udp_conn_s *conn)
 {
   FAR struct udp_hdr_s *udp;
 
-  nllvdbg("UDP payload: %d (%d) bytes\n", dev->d_sndlen, dev->d_len);
+  nllinfo("UDP payload: %d (%d) bytes\n", dev->d_sndlen, dev->d_len);
 
   if (dev->d_sndlen > 0)
     {
@@ -252,7 +252,7 @@ void udp_send(FAR struct net_driver_s *dev, FAR struct udp_conn_s *conn)
         }
 #endif /* CONFIG_NET_UDP_CHECKSUMS */
 
-      nllvdbg("Outgoing UDP packet length: %d\n", dev->d_len);
+      nllinfo("Outgoing UDP packet length: %d\n", dev->d_len);
 
 #ifdef CONFIG_NET_STATISTICS
       g_netstats.udp.sent++;
diff --git a/sched/init/os_bringup.c b/sched/init/os_bringup.c
index 1652a36b7f..7887ab8770 100644
--- a/sched/init/os_bringup.c
+++ b/sched/init/os_bringup.c
@@ -152,7 +152,7 @@ static inline void os_pgworker(void)
    * resolve page faults in other threads
    */
 
-  svdbg("Starting paging thread\n");
+  sinfo("Starting paging thread\n");
 
   g_pgworker = kernel_thread("pgfill", CONFIG_PAGING_DEFPRIO,
                              CONFIG_PAGING_STACKSIZE,
@@ -253,7 +253,7 @@ static inline void os_do_appstart(void)
    * entrypoint from the header at the beginning of the user-space blob.
    */
 
-  svdbg("Starting init thread\n");
+  sinfo("Starting init thread\n");
 
 #ifdef CONFIG_BUILD_PROTECTED
   DEBUGASSERT(USERSPACE->us_entrypoint != NULL);
@@ -287,7 +287,7 @@ static inline void os_do_appstart(void)
    * of the board_initialize() operation.
    */
 
-  svdbg("Starting init task: %s\n", CONFIG_USER_INITPATH);
+  sinfo("Starting init task: %s\n", CONFIG_USER_INITPATH);
 
   ret = exec(CONFIG_USER_INITPATH, NULL, CONFIG_INIT_SYMTAB,
              CONFIG_INIT_NEXPORTS);
diff --git a/sched/module/mod_init.c b/sched/module/mod_init.c
index 6bcf0e152a..d9c55f1599 100644
--- a/sched/module/mod_init.c
+++ b/sched/module/mod_init.c
@@ -65,7 +65,7 @@
 #endif
 
 #ifdef CONFIG_MODULE_DUMPBUFFER
-# define mod_dumpbuffer(m,b,n) svdbgdumpbuffer(m,b,n)
+# define mod_dumpbuffer(m,b,n) sinfodumpbuffer(m,b,n)
 #else
 # define mod_dumpbuffer(m,b,n)
 #endif
@@ -146,7 +146,7 @@ int mod_initialize(FAR const char *filename,
 {
   int ret;
 
-  svdbg("filename: %s loadinfo: %p\n", filename, loadinfo);
+  sinfo("filename: %s loadinfo: %p\n", filename, loadinfo);
 
   /* Clear the load info structure */
 
diff --git a/sched/module/mod_insmod.c b/sched/module/mod_insmod.c
index 7ab65e734d..f7bf1b9a84 100644
--- a/sched/module/mod_insmod.c
+++ b/sched/module/mod_insmod.c
@@ -67,7 +67,7 @@
 #endif
 
 #ifdef CONFIG_MODULE_DUMPBUFFER
-# define mod_dumpbuffer(m,b,n) svdbgdumpbuffer(m,b,n)
+# define mod_dumpbuffer(m,b,n) sinfodumpbuffer(m,b,n)
 #else
 # define mod_dumpbuffer(m,b,n)
 #endif
@@ -191,7 +191,7 @@ int insmod(FAR const char *filename, FAR const char *modulename)
   int ret;
 
   DEBUGASSERT(filename != NULL && modulename != NULL);
-  svdbg("Loading file: %s\n", filename);
+  sinfo("Loading file: %s\n", filename);
 
   /* Get exclusive access to the module registry */
 
diff --git a/sched/module/mod_load.c b/sched/module/mod_load.c
index cce6ac0cb2..de693e575e 100644
--- a/sched/module/mod_load.c
+++ b/sched/module/mod_load.c
@@ -152,7 +152,7 @@ static inline int mod_loadfile(FAR struct mod_loadinfo_s *loadinfo)
 
   /* Read each section into memory that is marked SHF_ALLOC + SHT_NOBITS */
 
-  svdbg("Loaded sections:\n");
+  sinfo("Loaded sections:\n");
   text = (FAR uint8_t *)loadinfo->textalloc;
   data = (FAR uint8_t *)loadinfo->datastart;
 
@@ -208,7 +208,7 @@ static inline int mod_loadfile(FAR struct mod_loadinfo_s *loadinfo)
 
       /* Update sh_addr to point to copy in memory */
 
-      svdbg("%d. %08lx->%08lx\n", i,
+      sinfo("%d. %08lx->%08lx\n", i,
             (unsigned long)shdr->sh_addr, (unsigned long)*pptr);
 
       shdr->sh_addr = (uintptr_t)*pptr;
@@ -242,7 +242,7 @@ int mod_load(FAR struct mod_loadinfo_s *loadinfo)
 {
   int ret;
 
-  svdbg("loadinfo: %p\n", loadinfo);
+  sinfo("loadinfo: %p\n", loadinfo);
   DEBUGASSERT(loadinfo && loadinfo->filfd >= 0);
 
   /* Load section headers into memory */
diff --git a/sched/module/mod_procfs.c b/sched/module/mod_procfs.c
index 411cb1eccd..cb0ec00613 100644
--- a/sched/module/mod_procfs.c
+++ b/sched/module/mod_procfs.c
@@ -171,7 +171,7 @@ static int modprocfs_open(FAR struct file *filep, FAR const char *relpath,
 {
   FAR struct modprocfs_file_s *priv;
 
-  fvdbg("Open '%s'\n", relpath);
+  finfo("Open '%s'\n", relpath);
 
   /* PROCFS is read-only.  Any attempt to open with any kind of write
    * access is not permitted.
@@ -232,7 +232,7 @@ static ssize_t modprocfs_read(FAR struct file *filep, FAR char *buffer,
   FAR struct modprocfs_file_s *priv;
   int ret;
 
-  fvdbg("buffer=%p buflen=%lu\n", buffer, (unsigned long)buflen);
+  finfo("buffer=%p buflen=%lu\n", buffer, (unsigned long)buflen);
 
   /* Recover our private data from the struct file instance */
 
@@ -270,7 +270,7 @@ static int modprocfs_dup(FAR const struct file *oldp, FAR struct file *newp)
   FAR struct modprocfs_file_s *oldpriv;
   FAR struct modprocfs_file_s *newpriv;
 
-  fvdbg("Dup %p->%p\n", oldp, newp);
+  finfo("Dup %p->%p\n", oldp, newp);
 
   /* Recover our private data from the old struct file instance */
 
diff --git a/sched/module/mod_read.c b/sched/module/mod_read.c
index 8cad4adb89..1440f5f5ea 100644
--- a/sched/module/mod_read.c
+++ b/sched/module/mod_read.c
@@ -114,7 +114,7 @@ int mod_read(FAR struct mod_loadinfo_s *loadinfo, FAR uint8_t *buffer,
   ssize_t nbytes;      /* Number of bytes read */
   off_t   rpos;        /* Position returned by lseek */
 
-  svdbg("Read %ld bytes from offset %ld\n", (long)readsize, (long)offset);
+  sinfo("Read %ld bytes from offset %ld\n", (long)readsize, (long)offset);
 
   /* Loop until all of the requested data has been read. */
 
diff --git a/sched/module/mod_sections.c b/sched/module/mod_sections.c
index dcdb4de991..dcfaaf9ae6 100644
--- a/sched/module/mod_sections.c
+++ b/sched/module/mod_sections.c
@@ -262,7 +262,7 @@ int mod_findsection(FAR struct mod_loadinfo_s *loadinfo,
 
       /* Check if the name of this section is 'sectname' */
 
-      svdbg("%d. Comparing \"%s\" and .\"%s\"\n",
+      sinfo("%d. Comparing \"%s\" and .\"%s\"\n",
             i, loadinfo->iobuffer, sectname);
 
       if (strcmp((FAR const char *)loadinfo->iobuffer, sectname) == 0)
diff --git a/sched/module/mod_symbols.c b/sched/module/mod_symbols.c
index bc91a426e3..632b978866 100644
--- a/sched/module/mod_symbols.c
+++ b/sched/module/mod_symbols.c
@@ -281,7 +281,7 @@ int mod_symvalue(FAR struct mod_loadinfo_s *loadinfo, FAR Elf32_Sym *sym)
       {
         /* st_value already holds the correct value */
 
-        svdbg("SHN_ABS: st_value=%08lx\n", (long)sym->st_value);
+        sinfo("SHN_ABS: st_value=%08lx\n", (long)sym->st_value);
         return OK;
       }
 
@@ -321,7 +321,7 @@ int mod_symvalue(FAR struct mod_loadinfo_s *loadinfo, FAR Elf32_Sym *sym)
 
         /* Yes... add the exported symbol value to the ELF symbol table entry */
 
-        svdbg("SHN_ABS: name=%s %08x+%08x=%08x\n",
+        sinfo("SHN_ABS: name=%s %08x+%08x=%08x\n",
               loadinfo->iobuffer, sym->st_value, symbol->sym_value,
               sym->st_value + symbol->sym_value);
 
@@ -333,7 +333,7 @@ int mod_symvalue(FAR struct mod_loadinfo_s *loadinfo, FAR Elf32_Sym *sym)
       {
         secbase = loadinfo->shdr[sym->st_shndx].sh_addr;
 
-        svdbg("Other: %08x+%08x=%08x\n",
+        sinfo("Other: %08x+%08x=%08x\n",
               sym->st_value, secbase, sym->st_value + secbase);
 
         sym->st_value += secbase;
diff --git a/sched/module/mod_verify.c b/sched/module/mod_verify.c
index a46d96f73d..5469edaed0 100644
--- a/sched/module/mod_verify.c
+++ b/sched/module/mod_verify.c
@@ -87,7 +87,7 @@ int mod_verifyheader(FAR const Elf32_Ehdr *ehdr)
 
   if (memcmp(ehdr->e_ident, g_modmagic, EI_MAGIC_SIZE) != 0)
     {
-      svdbg("Not ELF magic {%02x, %02x, %02x, %02x}\n",
+      sinfo("Not ELF magic {%02x, %02x, %02x, %02x}\n",
             ehdr->e_ident[0], ehdr->e_ident[1], ehdr->e_ident[2], ehdr->e_ident[3]);
       return -ENOEXEC;
     }
diff --git a/sched/paging/pg_miss.c b/sched/paging/pg_miss.c
index 945678f99a..ebc10c2953 100644
--- a/sched/paging/pg_miss.c
+++ b/sched/paging/pg_miss.c
@@ -159,7 +159,7 @@ void pg_miss(void)
     {
       /* Reprioritize the page fill worker thread */
 
-      pgllvdbg("New worker priority. %d->%d\n",
+      pgllinfo("New worker priority. %d->%d\n",
                wtcb->sched_priority, ftcb->sched_priority);
       sched_setpriority(wtcb, ftcb->sched_priority);
     }
diff --git a/sched/paging/pg_worker.c b/sched/paging/pg_worker.c
index 08c94fd17c..914ab604ed 100644
--- a/sched/paging/pg_worker.c
+++ b/sched/paging/pg_worker.c
@@ -155,7 +155,7 @@ static void pg_callback(FAR struct tcb_s *tcb, int result)
 {
   /* Verify that g_pftcb is non-NULL */
 
-  pgllvdbg("g_pftcb: %p\n", g_pftcb);
+  pgllinfo("g_pftcb: %p\n", g_pftcb);
   if (g_pftcb)
     {
       FAR struct tcb_s *htcb = (FAR struct tcb_s *)g_waitingforfill.head;
@@ -181,7 +181,7 @@ static void pg_callback(FAR struct tcb_s *tcb, int result)
 
       if (priority > wtcb->sched_priority)
         {
-          pgllvdbg("New worker priority. %d->%d\n",
+          pgllinfo("New worker priority. %d->%d\n",
                    wtcb->sched_priority, priority);
           sched_setpriority(wtcb, priority);
         }
@@ -246,7 +246,7 @@ static inline bool pg_dequeue(void)
       /* Remove the TCB from the head of the list (if any) */
 
       g_pftcb = (FAR struct tcb_s *)dq_remfirst((dq_queue_t *)&g_waitingforfill);
-      pgllvdbg("g_pftcb: %p\n", g_pftcb);
+      pgllinfo("g_pftcb: %p\n", g_pftcb);
       if (g_pftcb != NULL)
         {
           /* Call the architecture-specific function up_checkmapping() to see if
@@ -292,7 +292,7 @@ static inline bool pg_dequeue(void)
 
                   /* Reduce the priority of the page fill worker thread */
 
-                  pgllvdbg("New worker priority. %d->%d\n",
+                  pgllinfo("New worker priority. %d->%d\n",
                            wtcb->sched_priority, priority);
                   sched_setpriority(wtcb, priority);
                 }
@@ -365,7 +365,7 @@ static inline bool pg_startfill(void)
        * a page in-use, un-map it, and make it available.
        */
 
-      pgllvdbg("Call up_allocpage(%p)\n", g_pftcb);
+      pgllinfo("Call up_allocpage(%p)\n", g_pftcb);
       result = up_allocpage(g_pftcb, &vpage);
       DEBUGASSERT(result == OK);
 
@@ -382,7 +382,7 @@ static inline bool pg_startfill(void)
        * status of the fill will be provided by return value from up_fillpage().
        */
 
-      pgllvdbg("Call up_fillpage(%p)\n", g_pftcb);
+      pgllinfo("Call up_fillpage(%p)\n", g_pftcb);
       result = up_fillpage(g_pftcb, vpage);
       DEBUGASSERT(result == OK);
 #else
@@ -395,7 +395,7 @@ static inline bool pg_startfill(void)
        * This callback will probably from interrupt level.
        */
 
-      pgllvdbg("Call up_fillpage(%p)\n", g_pftcb);
+      pgllinfo("Call up_fillpage(%p)\n", g_pftcb);
       result = up_fillpage(g_pftcb, vpage, pg_callback);
       DEBUGASSERT(result == OK);
 
@@ -454,7 +454,7 @@ static inline void pg_alldone(void)
 {
   FAR struct tcb_s *wtcb = this_task();
   g_pftcb = NULL;
-  pgllvdbg("New worker priority. %d->%d\n",
+  pgllinfo("New worker priority. %d->%d\n",
            wtcb->sched_priority, CONFIG_PAGING_DEFPRIO);
   sched_setpriority(wtcb, CONFIG_PAGING_DEFPRIO);
 }
@@ -588,7 +588,7 @@ int pg_worker(int argc, char *argv[])
                * no fill was started).
                */
 
-              pgllvdbg("Calling pg_startfill\n");
+              pgllinfo("Calling pg_startfill\n");
               if (!pg_startfill())
                 {
                   /* No fill was started.  This can mean only that all queued
@@ -596,7 +596,7 @@ int pg_worker(int argc, char *argv[])
                    * nothing more to do.
                    */
 
-                  pgllvdbg("Call pg_alldone()\n");
+                  pgllinfo("Call pg_alldone()\n");
                   pg_alldone();
                 }
             }
@@ -626,7 +626,7 @@ int pg_worker(int argc, char *argv[])
            * g_pftcb).
            */
 
-           pgllvdbg("Calling pg_startfill\n");
+           pgllinfo("Calling pg_startfill\n");
            (void)pg_startfill();
         }
 #else
@@ -641,7 +641,7 @@ int pg_worker(int argc, char *argv[])
            * (false means that no fill was perforemd).
            */
 
-          pgllvdbg("Calling pg_startfill\n");
+          pgllinfo("Calling pg_startfill\n");
           if (!pg_startfill())
             {
               /* Break out of the loop -- there is nothing more to do */
@@ -656,13 +656,13 @@ int pg_worker(int argc, char *argv[])
            * returns true.
            */
 
-          pgllvdbg("Restarting TCB: %p\n", g_pftcb);
+          pgllinfo("Restarting TCB: %p\n", g_pftcb);
           up_unblock_task(g_pftcb);
         }
 
       /* All queued fills have been processed */
 
-      pgllvdbg("Call pg_alldone()\n");
+      pgllinfo("Call pg_alldone()\n");
       pg_alldone();
 #endif
     }
diff --git a/sched/pthread/pthread_completejoin.c b/sched/pthread/pthread_completejoin.c
index 2d9f3530e5..24343cdb3b 100644
--- a/sched/pthread/pthread_completejoin.c
+++ b/sched/pthread/pthread_completejoin.c
@@ -68,7 +68,7 @@ static bool pthread_notifywaiters(FAR struct join_s *pjoin)
   int ntasks_waiting;
   int status;
 
-  svdbg("pjoin=0x%p\n", pjoin);
+  sinfo("pjoin=0x%p\n", pjoin);
 
   /* Are any tasks waiting for our exit value? */
 
@@ -205,7 +205,7 @@ int pthread_completejoin(pid_t pid, FAR void *exit_value)
   FAR struct task_group_s *group = task_getgroup(pid);
   FAR struct join_s *pjoin;
 
-  svdbg("pid=%d exit_value=%p group=%p\n", pid, exit_value, group);
+  sinfo("pid=%d exit_value=%p group=%p\n", pid, exit_value, group);
   DEBUGASSERT(group);
 
   /* First, find thread's structure in the private data set. */
diff --git a/sched/task/task_posixspawn.c b/sched/task/task_posixspawn.c
index 17172086fc..fe13c80ac3 100644
--- a/sched/task/task_posixspawn.c
+++ b/sched/task/task_posixspawn.c
@@ -359,7 +359,7 @@ int posix_spawn(FAR pid_t *pid, FAR const char *path,
 
   DEBUGASSERT(path);
 
-  svdbg("pid=%p path=%s file_actions=%p attr=%p argv=%p\n",
+  sinfo("pid=%p path=%s file_actions=%p attr=%p argv=%p\n",
         pid, path, file_actions, attr, argv);
 
   /* If there are no file actions to be performed and there is no change to
diff --git a/sched/task/task_spawn.c b/sched/task/task_spawn.c
index ef686e03ad..9d4019bf26 100644
--- a/sched/task/task_spawn.c
+++ b/sched/task/task_spawn.c
@@ -350,7 +350,7 @@ int task_spawn(FAR pid_t *pid, FAR const char *name, main_t entry,
 #endif
   int ret;
 
-  svdbg("pid=%p name=%s entry=%p file_actions=%p attr=%p argv=%p\n",
+  sinfo("pid=%p name=%s entry=%p file_actions=%p attr=%p argv=%p\n",
         pid, name, entry, file_actions, attr, argv);
 
   /* If there are no file actions to be performed and there is no change to
diff --git a/sched/task/task_spawnparms.c b/sched/task/task_spawnparms.c
index df0946c2fb..e6d377c473 100644
--- a/sched/task/task_spawnparms.c
+++ b/sched/task/task_spawnparms.c
@@ -83,7 +83,7 @@ static inline int spawn_close(FAR struct spawn_close_file_action_s *action)
 {
   /* The return value from close() is ignored */
 
-  svdbg("Closing fd=%d\n", action->fd);
+  sinfo("Closing fd=%d\n", action->fd);
 
   (void)close(action->fd);
   return OK;
@@ -95,7 +95,7 @@ static inline int spawn_dup2(FAR struct spawn_dup2_file_action_s *action)
 
   /* Perform the dup */
 
-  svdbg("Dup'ing %d->%d\n", action->fd1, action->fd2);
+  sinfo("Dup'ing %d->%d\n", action->fd1, action->fd2);
 
   ret = dup2(action->fd1, action->fd2);
   if (ret < 0)
@@ -116,7 +116,7 @@ static inline int spawn_open(FAR struct spawn_open_file_action_s *action)
 
   /* Open the file */
 
-  svdbg("Open'ing path=%s oflags=%04x mode=%04x\n",
+  sinfo("Open'ing path=%s oflags=%04x mode=%04x\n",
         action->path, action->oflags, action->mode);
 
   fd = open(action->path, action->oflags, action->mode);
@@ -134,7 +134,7 @@ static inline int spawn_open(FAR struct spawn_open_file_action_s *action)
     {
       /* No.. dup2 to get the correct file number */
 
-      svdbg("Dup'ing %d->%d\n", fd, action->fd);
+      sinfo("Dup'ing %d->%d\n", fd, action->fd);
 
       ret = dup2(fd, action->fd);
       if (ret < 0)
@@ -143,7 +143,7 @@ static inline int spawn_open(FAR struct spawn_open_file_action_s *action)
           sdbg("ERROR: dup2 failed: %d\n", ret);
         }
 
-      svdbg("Closing fd=%d\n", fd);
+      sinfo("Closing fd=%d\n", fd);
       close(fd);
     }
 
@@ -246,7 +246,7 @@ int spawn_execattrs(pid_t pid, FAR const posix_spawnattr_t *attr)
 
       if ((attr->flags & POSIX_SPAWN_SETSCHEDULER) == 0)
         {
-          svdbg("Setting priority=%d for pid=%d\n",
+          sinfo("Setting priority=%d for pid=%d\n",
                 param.sched_priority, pid);
 
           (void)sched_setparam(pid, ¶m);
@@ -269,7 +269,7 @@ int spawn_execattrs(pid_t pid, FAR const posix_spawnattr_t *attr)
 
   if ((attr->flags & POSIX_SPAWN_SETSCHEDULER) != 0)
     {
-      svdbg("Setting policy=%d priority=%d for pid=%d\n",
+      sinfo("Setting policy=%d priority=%d for pid=%d\n",
             attr->policy, param.sched_priority, pid);
 
 #ifdef CONFIG_SCHED_SPORADIC
diff --git a/sched/task/task_vfork.c b/sched/task/task_vfork.c
index b2fef61d36..d1978135c5 100644
--- a/sched/task/task_vfork.c
+++ b/sched/task/task_vfork.c
@@ -303,14 +303,14 @@ FAR struct task_tcb_s *task_vforksetup(start_t retaddr)
 
   /* Initialize the task control block.  This calls up_initial_state() */
 
-  svdbg("Child priority=%d start=%p\n", priority, retaddr);
+  sinfo("Child priority=%d start=%p\n", priority, retaddr);
   ret = task_schedsetup(child, priority, retaddr, parent->entry.main, ttype);
   if (ret < OK)
     {
       goto errout_with_tcb;
     }
 
-  svdbg("parent=%p, returning child=%p\n", parent, child);
+  sinfo("parent=%p, returning child=%p\n", parent, child);
   return child;
 
 errout_with_tcb:
@@ -369,7 +369,7 @@ pid_t task_vforkstart(FAR struct task_tcb_s *child)
   int rc;
   int ret;
 
-  svdbg("Starting Child TCB=%p, parent=%p\n", child, this_task());
+  sinfo("Starting Child TCB=%p, parent=%p\n", child, this_task());
   DEBUGASSERT(child);
 
   /* Duplicate the original argument list in the forked child TCB */
diff --git a/sched/wqueue/kwork_hpthread.c b/sched/wqueue/kwork_hpthread.c
index ae3f518be5..e09e825cee 100644
--- a/sched/wqueue/kwork_hpthread.c
+++ b/sched/wqueue/kwork_hpthread.c
@@ -152,7 +152,7 @@ int work_hpstart(void)
 
   /* Start the high-priority, kernel mode worker thread */
 
-  svdbg("Starting high-priority kernel worker thread\n");
+  sinfo("Starting high-priority kernel worker thread\n");
 
   pid = kernel_thread(HPWORKNAME, CONFIG_SCHED_HPWORKPRIORITY,
                       CONFIG_SCHED_HPWORKSTACKSIZE,
diff --git a/sched/wqueue/kwork_lpthread.c b/sched/wqueue/kwork_lpthread.c
index 2a47fbca48..1e5ffb47e9 100644
--- a/sched/wqueue/kwork_lpthread.c
+++ b/sched/wqueue/kwork_lpthread.c
@@ -197,7 +197,7 @@ int work_lpstart(void)
 
   /* Start the low-priority, kernel mode worker thread(s) */
 
-  svdbg("Starting low-priority kernel worker thread(s)\n");
+  sinfo("Starting low-priority kernel worker thread(s)\n");
 
   for (wndx = 0; wndx < CONFIG_SCHED_LPNTHREADS; wndx++)
     {
-- 
GitLab


From a3bb764305e25af17f8834f8d3eff22820e6f31f Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sat, 11 Jun 2016 12:38:37 -0600
Subject: [PATCH 19/91] Add support for a warn() marco that will be between
 dbg() and info() in priority

---
 Kconfig             |  11 +-
 include/debug.h     | 749 +++++++++++++++++++++++++++-----------------
 libc/misc/lib_dbg.c |  39 ++-
 3 files changed, 498 insertions(+), 301 deletions(-)

diff --git a/Kconfig b/Kconfig
index d8eafff5d2..ceea41ec91 100644
--- a/Kconfig
+++ b/Kconfig
@@ -413,9 +413,18 @@ if DEBUG
 
 comment "Debug SYSLOG Output Controls"
 
-config CONFIG_DEBUG_INFO
+config DEBUG_WARNINGS
+	bool "Enable Warnings Output"
+	default n
+	---help---
+		Enables output from warning statements.  Warnings are considered to
+		be potential errors or errors that will not have serious
+		consequences.
+
+config DEBUG_INFO
 	bool "Enable Informational Debug Output"
 	default n
+	depends on DEBUG_WARNINGS
 	---help---
 		Enables verbose "informational" debug output.  If you enable
 		CONFIG_DEBUG_INFO, then very chatty (and often annoying) output
diff --git a/include/debug.h b/include/debug.h
index 2f09d73c57..80d175ed30 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * include/debug.h
  *
- *   Copyright (C) 2007-2011, 2014 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2011, 2014, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -56,11 +56,16 @@
 /* Debug macros to runtime filter the debug messages sent to the console.  In
  * general, there are four forms of the debug macros:
  *
- * [a-z]dbg() -- Outputs messages to the console similar to printf() except
- *    that the output is not buffered.  The first character indicates the
- *    system system (e.g., n=network, f=filesystm, etc.).  If the first
- *    character is missing (i.e., dbg()), then it is common.  The common
- *    dbg() macro is enabled by CONFIG_DEBUG.  Subsystem debug requires an
+ * [a-z]info() -- Outputs messages to the console similar to printf() except
+ *    that the output is not buffered.  Output is only generated if
+ *    CONFIG_DEBUG_INFO is defined.  The info macros are intended for
+ *    verbose "informational" debug output.  If you enable CONFIG_DEBUG_INFO,
+ *    then very chatty (and often annoying) output will be generated.
+ *
+ *    The first character of the macro name indicates the system system
+ *    (e.g., n=network, f=filesystm, etc.).  If the first character is
+ *    missing (i.e., info()), then it is common.  The common info() macro
+ *    is enabled simply with CONFIG_DEBUG_INFO.  Subsystem debug requires an
  *    additional configuration setting to enable it (e.g., CONFIG_DEBUG_NET
  *    for the network, CONFIG_DEBUG_FS for the file system, etc).
  *
@@ -70,41 +75,53 @@
  *    directed stdout).  Therefore [a-z]dbg() should not be used in interrupt
  *    handlers.
  *
- * [a-z]info() -- Identical to [a-z]dbg() except that it also requires that
- *    CONFIG_DEBUG_INFO be defined.  This is intended for general debug
- *    output that you would normally want to suppress.
+ * [a-z]warn() -- Identical to [a-z]info() except that it also requires that
+ *    CONFIG_DEBUG_WARN be defined.  This is intended for important exception
+ *    conditions that are potential errors (or perhaps real errors with non-
+ *    fatal consequences).
+ *
+ * [a-z]dbg() -- Identical to [a-z]info() except that it also requires that
+ *    CONFIG_DEBUG be defined.  This is intended for important error-related
+ *    information that you probably not want to suppress during normal debug
+ *    general debugging.
  *
- * [a-z]lldbg() -- Identical to [a-z]dbg() except this is uses special
+ * [a-z]llinfo() -- Identical to [a-z]dbg() except this is uses special
  *    interfaces provided by architecture-specific logic to talk directly
  *    to the underlying console hardware.  If the architecture provides such
  *    logic, it should define CONFIG_ARCH_LOWPUTC.
  *
- *    [a-z]lldbg() should not be used in normal code because the implementation
+ *    [a-z]llinfo() should not be used in normal code because the implementation
  *    probably disables interrupts and does things that are not consistent with
- *    good real-time performance.  However, [a-z]lldbg() is particularly useful
+ *    good real-time performance.  However, [a-z]llinfo() is particularly useful
  *    in low-level code where it is inappropriate to use file descriptors.  For
- *    example, only [a-z]lldbg() should be used in interrupt handlers.
+ *    example, only [a-z]llinfo() should be used in interrupt handlers.
+ *
+ * [a-z]llwarn() -- Identical to [a-z]llinfo() except that it also requires that
+ *    CONFIG_DEBUG_WARN be defined.  This is intended for important exception
+ *    conditions that are potential errors (or perhaps real errors with non-
+ *    fatal consequences).
  *
- * [a-z]llinfo() -- Identical to [a-z]lldbg() except that it also requires that
- *    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]llinfo() except that it also requires that
+ *    CONFIG_DEBUG be defined. This is intended for important error-related
+ *    information that you probably not want to suppress during normal debug
+ *    general debugging.
  */
 
 #ifdef CONFIG_HAVE_FUNCTIONNAME
-# define EXTRA_FMT "%s: "
-# define EXTRA_ARG ,__FUNCTION__
+#  define EXTRA_FMT "%s: "
+#  define EXTRA_ARG ,__FUNCTION__
 #else
-# define EXTRA_FMT
-# define EXTRA_ARG
+#  define EXTRA_FMT
+#  define EXTRA_ARG
 #endif
 
 /* The actual logger function may be overridden in arch/debug.h if needed. */
 
 #ifndef __arch_syslog
-# define __arch_syslog syslog
+#  define __arch_syslog syslog
 #endif
 #ifndef __arch_lowsyslog
-# define __arch_lowsyslog lowsyslog
+#  define __arch_lowsyslog lowsyslog
 #endif
 
 /* Debug macros will differ depending upon if the toolchain supports
@@ -116,8 +133,8 @@
 /* C-99 style variadic macros are supported */
 
 #ifdef CONFIG_DEBUG
-# define dbg(format, ...) \
-  __arch_syslog(LOG_ERR, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
+#  define dbg(format, ...) \
+   __arch_syslog(LOG_ERR, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
 
 # ifdef CONFIG_ARCH_LOWPUTC
 #  define lldbg(format, ...) \
@@ -125,8 +142,28 @@
 # else
 #  define lldbg(x...)
 # endif
+#else /* CONFIG_DEBUG */
+
+#  define dbg(x...)
+#  define lldbg(x...)
+#endif
+
+#ifdef CONFIG_DEBUG_WARN
+#  define warn(format, ...) \
+   __arch_syslog(LOG_DEBUG, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
+
+#  ifdef CONFIG_ARCH_LOWPUTC
+#    define llwarn(format, ...) \
+     __arch_lowsyslog(LOG_DEBUG, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
+#  else
+#    define llwarn(x...)
+#  endif
+#else /* CONFIG_DEBUG_INFO */
+#  define warn(x...)
+#  define llwarn(x...)
+#endif /* CONFIG_DEBUG_INFO */
 
-# ifdef CONFIG_DEBUG_INFO
+#ifdef CONFIG_DEBUG_INFO
 #  define info(format, ...) \
    __arch_syslog(LOG_DEBUG, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
 
@@ -136,201 +173,251 @@
 #  else
 #    define llinfo(x...)
 #  endif
-
-# else /* CONFIG_DEBUG_INFO */
+#else /* CONFIG_DEBUG_INFO */
 #  define info(x...)
 #  define llinfo(x...)
-# endif /* CONFIG_DEBUG_INFO */
-
-#else /* CONFIG_DEBUG */
-
-# define dbg(x...)
-# define lldbg(x...)
-# define info(x...)
-# define llinfo(x...)
-
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_INFO */
 
 /* Subsystem specific debug */
 
 #ifdef CONFIG_DEBUG_MM
-# define mdbg(format, ...)    dbg(format, ##__VA_ARGS__)
-# define mlldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
-# define minfo(format, ...)   info(format, ##__VA_ARGS__)
-# define mllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
+#  define mdbg(format, ...)    dbg(format, ##__VA_ARGS__)
+#  define mlldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
+#  define mwarn(format, ...)   warn(format, ##__VA_ARGS__)
+#  define mllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
+#  define minfo(format, ...)   info(format, ##__VA_ARGS__)
+#  define mllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
-# define mdbg(x...)
-# define mlldbg(x...)
-# define minfo(x...)
-# define mllinfo(x...)
+#  define mdbg(x...)
+#  define mlldbg(x...)
+#  define mwarn(x...)
+#  define mllwarn(x...)
+#  define minfo(x...)
+#  define mllinfo(x...)
 #endif
 
 #ifdef CONFIG_DEBUG_SCHED
-# define sdbg(format, ...)    dbg(format, ##__VA_ARGS__)
-# define slldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
-# define sinfo(format, ...)   info(format, ##__VA_ARGS__)
-# define sllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
+#  define sdbg(format, ...)    dbg(format, ##__VA_ARGS__)
+#  define slldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
+#  define swarn(format, ...)   warn(format, ##__VA_ARGS__)
+#  define sllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
+#  define sinfo(format, ...)   info(format, ##__VA_ARGS__)
+#  define sllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
-# define sdbg(x...)
-# define slldbg(x...)
-# define sinfo(x...)
-# define sllinfo(x...)
+#  define sdbg(x...)
+#  define slldbg(x...)
+#  define swarn(x...)
+#  define sllwarn(x...)
+#  define sinfo(x...)
+#  define sllinfo(x...)
 #endif
 
 #ifdef CONFIG_DEBUG_PAGING
-# define pgdbg(format, ...)    dbg(format, ##__VA_ARGS__)
-# define pglldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
-# define pginfo(format, ...)   info(format, ##__VA_ARGS__)
-# define pgllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
+#  define pgdbg(format, ...)    dbg(format, ##__VA_ARGS__)
+#  define pglldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
+#  define pgwarn(format, ...)   warn(format, ##__VA_ARGS__)
+#  define pgllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
+#  define pginfo(format, ...)   info(format, ##__VA_ARGS__)
+#  define pgllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
-# define pgdbg(x...)
-# define pglldbg(x...)
-# define pginfo(x...)
-# define pgllinfo(x...)
+#  define pgdbg(x...)
+#  define pglldbg(x...)
+#  define pgwarn(x...)
+#  define pgllwarn(x...)
+#  define pginfo(x...)
+#  define pgllinfo(x...)
 #endif
 
 #ifdef CONFIG_DEBUG_DMA
-# define dmadbg(format, ...)    dbg(format, ##__VA_ARGS__)
-# define dmalldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
-# define dmainfo(format, ...)   info(format, ##__VA_ARGS__)
-# define dmallinfo(format, ...) llinfo(format, ##__VA_ARGS__)
+#  define dmadbg(format, ...)    dbg(format, ##__VA_ARGS__)
+#  define dmalldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
+#  define dmawarn(format, ...)   warn(format, ##__VA_ARGS__)
+#  define dmallwarn(format, ...) llwarn(format, ##__VA_ARGS__)
+#  define dmainfo(format, ...)   info(format, ##__VA_ARGS__)
+#  define dmallinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
-# define dmadbg(x...)
-# define dmalldbg(x...)
-# define dmainfo(x...)
-# define dmallinfo(x...)
+#  define dmadbg(x...)
+#  define dmalldbg(x...)
+#  define dmawarn(x...)
+#  define dmallwarn(x...)
+#  define dmainfo(x...)
+#  define dmallinfo(x...)
 #endif
 
 #ifdef CONFIG_DEBUG_NET
-# define ndbg(format, ...)    dbg(format, ##__VA_ARGS__)
-# define nlldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
-# define ninfo(format, ...)   info(format, ##__VA_ARGS__)
-# define nllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
+#  define ndbg(format, ...)    dbg(format, ##__VA_ARGS__)
+#  define nlldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
+#  define nwarn(format, ...)   warn(format, ##__VA_ARGS__)
+#  define nllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
+#  define ninfo(format, ...)   info(format, ##__VA_ARGS__)
+#  define nllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
-# define ndbg(x...)
-# define nlldbg(x...)
-# define ninfo(x...)
-# define nllinfo(x...)
+#  define ndbg(x...)
+#  define nlldbg(x...)
+#  define nwarn(x...)
+#  define nllwarn(x...)
+#  define ninfo(x...)
+#  define nllinfo(x...)
 #endif
 
 #ifdef CONFIG_DEBUG_USB
-# define udbg(format, ...)    dbg(format, ##__VA_ARGS__)
-# define ulldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
-# define uinfo(format, ...)   info(format, ##__VA_ARGS__)
-# define ullinfo(format, ...) llinfo(format, ##__VA_ARGS__)
+#  define udbg(format, ...)    dbg(format, ##__VA_ARGS__)
+#  define ulldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
+#  define uwarn(format, ...)   warn(format, ##__VA_ARGS__)
+#  define ullwarn(format, ...) llwarn(format, ##__VA_ARGS__)
+#  define uinfo(format, ...)   info(format, ##__VA_ARGS__)
+#  define ullinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
-# define udbg(x...)
-# define ulldbg(x...)
-# define uinfo(x...)
-# define ullinfo(x...)
+#  define udbg(x...)
+#  define ulldbg(x...)
+#  define uwarn(x...)
+#  define ullwarn(x...)
+#  define uinfo(x...)
+#  define ullinfo(x...)
 #endif
 
 #ifdef CONFIG_DEBUG_FS
-# define fdbg(format, ...)    dbg(format, ##__VA_ARGS__)
-# define flldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
-# define finfo(format, ...)   info(format, ##__VA_ARGS__)
-# define fllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
+#  define fdbg(format, ...)    dbg(format, ##__VA_ARGS__)
+#  define flldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
+#  define fwarn(format, ...)   warn(format, ##__VA_ARGS__)
+#  define fllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
+#  define finfo(format, ...)   info(format, ##__VA_ARGS__)
+#  define fllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
-# define fdbg(x...)
-# define flldbg(x...)
-# define finfo(x...)
-# define fllinfo(x...)
+#  define fdbg(x...)
+#  define flldbg(x...)
+#  define fwarn(x...)
+#  define fllwarn(x...)
+#  define finfo(x...)
+#  define fllinfo(x...)
 #endif
 
 #ifdef CONFIG_DEBUG_CRYPTO
-# define cryptdbg(format, ...)    dbg(format, ##__VA_ARGS__)
-# define cryptlldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
-# define cryptinfo(format, ...)   info(format, ##__VA_ARGS__)
-# define cryptllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
+#  define cryptdbg(format, ...)    dbg(format, ##__VA_ARGS__)
+#  define cryptlldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
+#  define cryptwarn(format, ...)   warn(format, ##__VA_ARGS__)
+#  define cryptllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
+#  define cryptinfo(format, ...)   info(format, ##__VA_ARGS__)
+#  define cryptllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
-# define cryptdbg(x...)
-# define cryptlldbg(x...)
-# define cryptinfo(x...)
-# define cryptllinfo(x...)
+#  define cryptdbg(x...)
+#  define cryptlldbg(x...)
+#  define cryptwarn(x...)
+#  define cryptllwarn(x...)
+#  define cryptinfo(x...)
+#  define cryptllinfo(x...)
 #endif
 
 #ifdef CONFIG_DEBUG_INPUT
-# define idbg(format, ...)    dbg(format, ##__VA_ARGS__)
-# define illdbg(format, ...)  lldbg(format, ##__VA_ARGS__)
-# define iinfo(format, ...)   info(format, ##__VA_ARGS__)
-# define illinfo(format, ...) llinfo(format, ##__VA_ARGS__)
+#  define idbg(format, ...)    dbg(format, ##__VA_ARGS__)
+#  define illdbg(format, ...)  lldbg(format, ##__VA_ARGS__)
+#  define iwarn(format, ...)   warn(format, ##__VA_ARGS__)
+#  define illwarn(format, ...) llwarn(format, ##__VA_ARGS__)
+#  define iinfo(format, ...)   info(format, ##__VA_ARGS__)
+#  define illinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
-# define idbg(x...)
-# define illdbg(x...)
-# define iinfo(x...)
-# define illinfo(x...)
+#  define idbg(x...)
+#  define illdbg(x...)
+#  define iwarn(x...)
+#  define illwarn(x...)
+#  define iinfo(x...)
+#  define illinfo(x...)
 #endif
 
 #ifdef CONFIG_DEBUG_SENSORS
-# define sndbg(format, ...)    dbg(format, ##__VA_ARGS__)
-# define snlldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
-# define sninfo(format, ...)   info(format, ##__VA_ARGS__)
-# define snllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
+#  define sndbg(format, ...)    dbg(format, ##__VA_ARGS__)
+#  define snlldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
+#  define snwarn(format, ...)   warn(format, ##__VA_ARGS__)
+#  define snllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
+#  define sninfo(format, ...)   info(format, ##__VA_ARGS__)
+#  define snllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
-# define sndbg(x...)
-# define snlldbg(x...)
-# define sninfo(x...)
-# define snllinfo(x...)
+#  define sndbg(x...)
+#  define snlldbg(x...)
+#  define snwarn(x...)
+#  define snllwarn(x...)
+#  define sninfo(x...)
+#  define snllinfo(x...)
 #endif
 
 #ifdef CONFIG_DEBUG_ANALOG
-# define adbg(format, ...)    dbg(format, ##__VA_ARGS__)
-# define alldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
-# define ainfo(format, ...)   info(format, ##__VA_ARGS__)
-# define allinfo(format, ...) llinfo(format, ##__VA_ARGS__)
+#  define adbg(format, ...)    dbg(format, ##__VA_ARGS__)
+#  define alldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
+#  define awarn(format, ...)   warn(format, ##__VA_ARGS__)
+#  define allwarn(format, ...) llwarn(format, ##__VA_ARGS__)
+#  define ainfo(format, ...)   info(format, ##__VA_ARGS__)
+#  define allinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
-# define adbg(x...)
-# define alldbg(x...)
-# define ainfo(x...)
-# define allinfo(x...)
+#  define adbg(x...)
+#  define alldbg(x...)
+#  define awarn(x...)
+#  define allwarn(x...)
+#  define ainfo(x...)
+#  define allinfo(x...)
 #endif
 
 #ifdef CONFIG_DEBUG_GRAPHICS
-# define gdbg(format, ...)    dbg(format, ##__VA_ARGS__)
-# define glldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
-# define ginfo(format, ...)   info(format, ##__VA_ARGS__)
-# define gllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
+#  define gdbg(format, ...)    dbg(format, ##__VA_ARGS__)
+#  define glldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
+#  define gwarn(format, ...)   warn(format, ##__VA_ARGS__)
+#  define gllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
+#  define ginfo(format, ...)   info(format, ##__VA_ARGS__)
+#  define gllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
-# define gdbg(x...)
-# define glldbg(x...)
-# define ginfo(x...)
-# define gllinfo(x...)
+#  define gdbg(x...)
+#  define glldbg(x...)
+#  define gwarn(x...)
+#  define gllwarn(x...)
+#  define ginfo(x...)
+#  define gllinfo(x...)
 #endif
 
 #ifdef CONFIG_DEBUG_BINFMT
-# define bdbg(format, ...)    dbg(format, ##__VA_ARGS__)
-# define blldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
-# define binfo(format, ...)   info(format, ##__VA_ARGS__)
-# define bllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
+#  define bdbg(format, ...)    dbg(format, ##__VA_ARGS__)
+#  define blldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
+#  define bwarn(format, ...)   warn(format, ##__VA_ARGS__)
+#  define bllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
+#  define binfo(format, ...)   info(format, ##__VA_ARGS__)
+#  define bllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
-# define bdbg(x...)
-# define blldbg(x...)
-# define binfo(x...)
-# define bllinfo(x...)
+#  define bdbg(x...)
+#  define blldbg(x...)
+#  define bwarn(x...)
+#  define bllwarn(x...)
+#  define binfo(x...)
+#  define bllinfo(x...)
 #endif
 
 #ifdef CONFIG_DEBUG_LIB
-# define ldbg(format, ...)    dbg(format, ##__VA_ARGS__)
-# define llldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
-# define linfo(format, ...)   info(format, ##__VA_ARGS__)
-# define lllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
+#  define ldbg(format, ...)    dbg(format, ##__VA_ARGS__)
+#  define llldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
+#  define lwarn(format, ...)   warn(format, ##__VA_ARGS__)
+#  define lllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
+#  define linfo(format, ...)   info(format, ##__VA_ARGS__)
+#  define lllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
-# define ldbg(x...)
-# define llldbg(x...)
-# define linfo(x...)
-# define lllinfo(x...)
+#  define ldbg(x...)
+#  define llldbg(x...)
+#  define lwarn(x...)
+#  define lllwarn(x...)
+#  define linfo(x...)
+#  define lllinfo(x...)
 #endif
 
 #ifdef CONFIG_DEBUG_AUDIO
-# define auddbg(format, ...)    dbg(format, ##__VA_ARGS__)
-# define audlldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
-# define audinfo(format, ...)   info(format, ##__VA_ARGS__)
-# define audllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
+#  define auddbg(format, ...)    dbg(format, ##__VA_ARGS__)
+#  define audlldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
+#  define audwarn(format, ...)   warn(format, ##__VA_ARGS__)
+#  define audllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
+#  define audinfo(format, ...)   info(format, ##__VA_ARGS__)
+#  define audllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
-# define auddbg(x...)
-# define audlldbg(x...)
-# define audinfo(x...)
-# define audllinfo(x...)
+#  define auddbg(x...)
+#  define audlldbg(x...)
+#  define audwarn(x...)
+#  define audllwarn(x...)
+#  define audinfo(x...)
+#  define audllinfo(x...)
 #endif
 
 #else /* CONFIG_CPP_HAVE_VARARGS */
@@ -338,204 +425,272 @@
 /* Variadic macros NOT supported */
 
 #ifdef CONFIG_DEBUG
-# ifndef CONFIG_ARCH_LOWPUTC
-#  define lldbg      (void)
-# endif
-# ifndef CONFIG_DEBUG_INFO
-#  define info       (void)
-#  define llinfo     (void)
-# else
 #  ifndef CONFIG_ARCH_LOWPUTC
-#    define llinfo   (void)
+#    define lldbg     (void)
+#  endif
+#else
+#  define dbg         (void)
+#  define lldbg       (void)
+#endif
+
+#ifdef CONFIG_DEBUG_WARN
+#  ifndef CONFIG_ARCH_LOWPUTC
+#    define llwarn    (void)
+#  endif
+#else
+#  define warn        (void)
+#  define llwarn      (void)
+#endif
+
+#ifdef CONFIG_DEBUG_INFO
+#  ifndef CONFIG_ARCH_LOWPUTC
+#    define llinfo    (void)
 #  endif
-# endif
 #else
-# define dbg         (void)
-# define lldbg       (void)
-# define info        (void)
-# define llinfo      (void)
+#  define info        (void)
+#  define llinfo      (void)
 #endif
 
 /* Subsystem specific debug */
 
 #ifdef CONFIG_DEBUG_MM
-# define mdbg        dbg
-# define mlldbg      lldbg
-# define minfo       info
-# define mllinfo     llinfo
+#  define mdbg        dbg
+#  define mlldbg      lldbg
+#  define mwarn       warn
+#  define mllwarn     llwarn
+#  define minfo       info
+#  define mllinfo     llinfo
 #else
-# define mdbg        (void)
-# define mlldbg      (void)
-# define minfo       (void)
-# define mllinfo     (void)
+#  define mdbg        (void)
+#  define mlldbg      (void)
+#  define mwarn       (void)
+#  define mllwarn     (void)
+#  define minfo       (void)
+#  define mllinfo     (void)
 #endif
 
 #ifdef CONFIG_DEBUG_SCHED
-# define sdbg        dbg
-# define slldbg      lldbg
-# define sinfo       info
-# define sllinfo     llinfo
+#  define sdbg        dbg
+#  define slldbg      lldbg
+#  define swarn       warn
+#  define sllwarn     llwarn
+#  define sinfo       info
+#  define sllinfo     llinfo
 #else
-# define sdbg        (void)
-# define slldbg      (void)
-# define sinfo       (void)
-# define sllinfo     (void)
+#  define sdbg        (void)
+#  define slldbg      (void)
+#  define swarn       (void)
+#  define sllwarn     (void)
+#  define sinfo       (void)
+#  define sllinfo     (void)
 #endif
 
 #ifdef CONFIG_DEBUG_PAGING
-# define pgdbg       dbg
-# define pglldbg     lldbg
-# define pginfo      info
-# define pgllinfo    llinfo
+#  define pgdbg       dbg
+#  define pglldbg     lldbg
+#  define pgwarn      warn
+#  define pgllwarn    llwarn
+#  define pginfo      info
+#  define pgllinfo    llinfo
 #else
-# define pgdbg       (void)
-# define pglldbg     (void)
-# define pginfo      (void)
-# define pgllinfo    (void)
+#  define pgdbg       (void)
+#  define pglldbg     (void)
+#  define pgwarn      (void)
+#  define pgllwarn    (void)
+#  define pginfo      (void)
+#  define pgllinfo    (void)
 #endif
 
 #ifdef CONFIG_DEBUG_DMA
-# define dmadbg      dbg
-# define dmalldbg    lldbg
-# define dmainfo     info
-# define dmallinfo   llinfo
+#  define dmadbg      dbg
+#  define dmalldbg    lldbg
+#  define dmawarn     warn
+#  define dmallwarn   llwarn
+#  define dmainfo     info
+#  define dmallinfo   llinfo
 #else
-# define dmadbg      (void)
-# define dmalldbg    (void)
-# define dmainfo     (void)
-# define dmallinfo   (void)
+#  define dmadbg      (void)
+#  define dmalldbg    (void)
+#  define dmawarn     (void)
+#  define dmallwarn   (void)
+#  define dmainfo     (void)
+#  define dmallinfo   (void)
 #endif
 
 #ifdef CONFIG_DEBUG_NET
-# define ndbg        dbg
-# define nlldbg      lldbg
-# define ninfo       info
-# define nllinfo     llinfo
+#  define ndbg        dbg
+#  define nlldbg      lldbg
+#  define nwarn       warn
+#  define nllwarn     llwarn
+#  define ninfo       info
+#  define nllinfo     llinfo
 #else
-# define ndbg        (void)
-# define nlldbg      (void)
-# define ninfo       (void)
-# define nllinfo     (void)
+#  define ndbg        (void)
+#  define nlldbg      (void)
+#  define nwarn       (void)
+#  define nllwarn     (void)
+#  define ninfo       (void)
+#  define nllinfo     (void)
 #endif
 
 #ifdef CONFIG_DEBUG_USB
-# define udbg        dbg
-# define ulldbg      lldbg
-# define uinfo       info
-# define ullinfo     llinfo
+#  define udbg        dbg
+#  define ulldbg      lldbg
+#  define uwarn       warn
+#  define ullwarn     llwarn
+#  define uinfo       info
+#  define ullinfo     llinfo
 #else
-# define udbg        (void)
-# define ulldbg      (void)
-# define uinfo       (void)
-# define ullinfo     (void)
+#  define udbg        (void)
+#  define ulldbg      (void)
+#  define uwarn       (void)
+#  define ullwarn     (void)
+#  define uinfo       (void)
+#  define ullinfo     (void)
 #endif
 
 #ifdef CONFIG_DEBUG_FS
-# define fdbg        dbg
-# define flldbg      lldbg
-# define finfo       info
-# define fllinfo     llinfo
+#  define fdbg        dbg
+#  define flldbg      lldbg
+#  define fwarn       warn
+#  define fllwarn     llwarn
+#  define finfo       info
+#  define fllinfo     llinfo
 #else
-# define fdbg        (void)
-# define flldbg      (void)
-# define finfo       (void)
-# define fllinfo     (void)
+#  define fdbg        (void)
+#  define flldbg      (void)
+#  define fwarn       (void)
+#  define fllwarn     (void)
+#  define finfo       (void)
+#  define fllinfo     (void)
 #endif
 
 #ifdef CONFIG_DEBUG_CRYPTO
-# define cryptdbg    dbg
-# define cryptlldbg  lldbg
-# define cryptinfo   info
-# define cryptllinfo llinfo
+#  define cryptdbg    dbg
+#  define cryptlldbg  lldbg
+#  define cryptwarn   warn
+#  define cryptllwarn llwarn
+#  define cryptinfo   info
+#  define cryptllinfo llinfo
 #else
-# define cryptdbg    (void)
-# define cryptlldbg  (void)
-# define cryptinfo   (void)
-# define cryptllinfo (void)
+#  define cryptdbg    (void)
+#  define cryptlldbg  (void)
+#  define cryptwarn   (void)
+#  define cryptllwarn (void)
+#  define cryptinfo   (void)
+#  define cryptllinfo (void)
 #endif
 
 #ifdef CONFIG_DEBUG_INPUT
-# define idbg        dbg
-# define illdbg      lldbg
-# define iinfo       info
-# define illinfo     llinfo
+#  define idbg        dbg
+#  define illdbg      lldbg
+#  define iwarn       warn
+#  define illwarn     llwarn
+#  define iinfo       info
+#  define illinfo     llinfo
 #else
-# define idbg        (void)
-# define illdbg      (void)
-# define iinfo       (void)
-# define illinfo     (void)
+#  define idbg        (void)
+#  define illdbg      (void)
+#  define iwarn       (void)
+#  define illwarn     (void)
+#  define iinfo       (void)
+#  define illinfo     (void)
 #endif
 
 #ifdef CONFIG_DEBUG_SENSORS
-# define sndbg        dbg
-# define snlldbg      lldbg
-# define sninfo       info
-# define snllinfo     llinfo
+#  define sndbg       dbg
+#  define snlldbg     lldbg
+#  define snwarn      warn
+#  define snllwarn    llwarn
+#  define sninfo      info
+#  define snllinfo    llinfo
 #else
-# define sndbg        (void)
-# define snlldbg      (void)
-# define sninfo       (void)
-# define snllinfo     (void)
+#  define sndbg       (void)
+#  define snlldbg     (void)
+#  define snwarn      (void)
+#  define snllwarn    (void)
+#  define sninfo      (void)
+#  define snllinfo    (void)
 #endif
 
 #ifdef CONFIG_DEBUG_ANALOG
-# define adbg        dbg
-# define alldbg      lldbg
-# define ainfo       info
-# define allinfo     llinfo
+#  define adbg        dbg
+#  define alldbg      lldbg
+#  define awarn       warn
+#  define allwarn     llwarn
+#  define ainfo       info
+#  define allinfo     llinfo
 #else
-# define adbg        (void)
-# define alldbg      (void)
-# define ainfo       (void)
-# define allinfo     (void)
+#  define adbg        (void)
+#  define alldbg      (void)
+#  define awarn       (void)
+#  define allwarn     (void)
+#  define ainfo       (void)
+#  define allinfo     (void)
 #endif
 
 #ifdef CONFIG_DEBUG_GRAPHICS
-# define gdbg        dbg
-# define glldbg      lldbg
-# define ginfo       info
-# define gllinfo     llinfo
+#  define gdbg        dbg
+#  define glldbg      lldbg
+#  define gwarn       warn
+#  define gllwarn     llwarn
+#  define ginfo       info
+#  define gllinfo     llinfo
 #else
-# define gdbg        (void)
-# define glldbg      (void)
-# define ginfo       (void)
-# define gllinfo     (void)
+#  define gdbg        (void)
+#  define glldbg      (void)
+#  define gwarn       (void)
+#  define gllwarn     (void)
+#  define ginfo       (void)
+#  define gllinfo     (void)
 #endif
 
 #ifdef CONFIG_DEBUG_BINFMT
-# define bdbg        dbg
-# define blldbg      lldbg
-# define binfo       info
-# define bllinfo     llinfo
+#  define bdbg        dbg
+#  define blldbg      lldbg
+#  define bwarn       warn
+#  define bllwarn     llwarn
+#  define binfo       info
+#  define bllinfo     llinfo
 #else
-# define bdbg        (void)
-# define blldbg      (void)
-# define binfo       (void)
-# define bllinfo     (void)
+#  define bdbg        (void)
+#  define blldbg      (void)
+#  define bwarn       (void)
+#  define bllwarn     (void)
+#  define binfo       (void)
+#  define bllinfo     (void)
 #endif
 
 #ifdef CONFIG_DEBUG_LIB
-# define ldbg        dbg
-# define llldbg      lldbg
-# define linfo       info
-# define lllinfo     llinfo
+#  define ldbg        dbg
+#  define llldbg      lldbg
+#  define lwarn       warn
+#  define lllwarn     llwarn
+#  define linfo       info
+#  define lllinfo     llinfo
 #else
-# define ldbg        (void)
-# define llldbg      (void)
-# define linfo       (void)
-# define lllinfo     (void)
+#  define ldbg        (void)
+#  define llldbg      (void)
+#  define lwarn       (void)
+#  define lllwarn     (void)
+#  define linfo       (void)
+#  define lllinfo     (void)
 #endif
 
 #ifdef CONFIG_DEBUG_AUDIO
-# define auddbg      dbg
-# define audlldbg    lldbg
-# define audinfo     info
-# define audllinfo   llinfo
+#  define auddbg      dbg
+#  define audlldbg    lldbg
+#  define audwarn     warn
+#  define audllwarn   llwarn
+#  define audinfo     info
+#  define audllinfo   llinfo
 #else
-# define auddbg      (void)
-# define audlldbg    (void)
-# define audinfo     (void)
-# define audllinfo   (void)
+#  define auddbg      (void)
+#  define audlldbg    (void)
+#  define audwarn     (void)
+#  define audllwarn   (void)
+#  define audinfo     (void)
+#  define audllinfo   (void)
 #endif
 
 #endif /* CONFIG_CPP_HAVE_VARARGS */
@@ -690,15 +845,23 @@ int dbg(const char *format, ...);
 # ifdef CONFIG_ARCH_LOWPUTC
 int lldbg(const char *format, ...);
 # endif
+#endif /* CONFIG_DEBUG */
+
+#ifdef CONFIG_DEBUG_WARN
+int warn(const char *format, ...);
+
+# ifdef CONFIG_ARCH_LOWPUTC
+int llwarn(const char *format, ...);
+# endif
+#endif /* CONFIG_DEBUG_WARN */
 
-# ifdef CONFIG_DEBUG_INFO
+#ifdef CONFIG_DEBUG_INFO
 int info(const char *format, ...);
 
 # ifdef CONFIG_ARCH_LOWPUTC
 int llinfo(const char *format, ...);
 # endif
-#endif
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_INFO */
 #endif /* CONFIG_CPP_HAVE_VARARGS */
 
 #if defined(__cplusplus)
diff --git a/libc/misc/lib_dbg.c b/libc/misc/lib_dbg.c
index 3e398d90b9..ba9bec63ea 100644
--- a/libc/misc/lib_dbg.c
+++ b/libc/misc/lib_dbg.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * libc/misc/lib_dbg.c
  *
- *   Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2011-2012, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -46,10 +46,6 @@
 
 #ifndef CONFIG_CPP_HAVE_VARARGS
 
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -82,13 +78,42 @@ int lldbg(const char *format, ...)
   va_list ap;
   int     ret;
 
+  va_start(ap, format);
+  ret = lowvsyslog(LOG_ERR, format, ap);
+  va_end(ap);
+
+  return ret;
+}
+#endif /* CONFIG_ARCH_LOWPUTC */
+#endif /* CONFIG_DEBUG */
+
+#ifdef CONFIG_DEBUG_WARN
+int warn(const char *format, ...)
+{
+  va_list ap;
+  int     ret;
+
+  va_start(ap, format);
+  ret = vsyslog(LOG_WARNING, format, ap);
+  va_end(ap);
+
+  return ret;
+}
+
+#ifdef CONFIG_ARCH_LOWPUTC
+int llwarn(const char *format, ...)
+{
+  va_list ap;
+  int     ret;
+
   va_start(ap, format);
   ret = lowvsyslog(LOG_DEBUG, format, ap);
   va_end(ap);
 
   return ret;
 }
-#endif
+#endif /* CONFIG_ARCH_LOWPUTC */
+#endif /* CONFIG_DEBUG_INFO */
 
 #ifdef CONFIG_DEBUG_INFO
 int info(const char *format, ...)
@@ -117,5 +142,5 @@ int llinfo(const char *format, ...)
 }
 #endif /* CONFIG_ARCH_LOWPUTC */
 #endif /* CONFIG_DEBUG_INFO */
-#endif /* CONFIG_DEBUG */
+
 #endif /* CONFIG_CPP_HAVE_VARARGS */
-- 
GitLab


From c211ce8be163ab65011d05ba9853817fb2923166 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sat, 11 Jun 2016 12:49:21 -0600
Subject: [PATCH 20/91] DEBUGASSERT() is not enabled with
 CONFIG_DEBUG_ASSERTIONS, not CONFIG_DEBUG

---
 Kconfig          | 15 +++++++++++++--
 include/assert.h | 10 +++++-----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/Kconfig b/Kconfig
index ceea41ec91..b0afa42a9c 100644
--- a/Kconfig
+++ b/Kconfig
@@ -413,7 +413,7 @@ if DEBUG
 
 comment "Debug SYSLOG Output Controls"
 
-config DEBUG_WARNINGS
+config DEBUG_WARN
 	bool "Enable Warnings Output"
 	default n
 	---help---
@@ -424,12 +424,23 @@ config DEBUG_WARNINGS
 config DEBUG_INFO
 	bool "Enable Informational Debug Output"
 	default n
-	depends on DEBUG_WARNINGS
+	depends on DEBUG_WARN
 	---help---
 		Enables verbose "informational" debug output.  If you enable
 		CONFIG_DEBUG_INFO, then very chatty (and often annoying) output
 		will be generated.
 
+config DEBUG_ASSERTIONS
+	bool "Enable Debug Assertions"
+	default n
+	---help---
+		Enables the DEBUGASSERT() macro.  When CONFIG_DEBUG_ASSERTIONS is
+		defined, DEBUGASSERT() will cause the system to halt if the
+		assertion fails.  If CONFIG_DEBUG_ASSERTIONS is not defined
+		DEBUGASSERT() compiled out of the system.  In general, you would
+		set CONFIG_DEBUG_ASSERTIONS=y during debug, but disable the
+		assertions on a final, buckled up system.
+
 comment "Subsystem Debug Options"
 
 config DEBUG_AUDIO
diff --git a/include/assert.h b/include/assert.h
index c636dae9a9..8f218f2cdd 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -52,9 +52,9 @@
 #undef ASSERT       /* Assert if the condition is not true */
 #undef VERIFY       /* Assert if a function returns a negative value */
 #undef PANIC        /* Unconditional abort */
-#undef DEBUGASSERT  /* Like ASSERT, but only if CONFIG_DEBUG is defined */
-#undef DEBUGVERIFY  /* Like VERIFY, but only if CONFIG_DEBUG is defined */
-#undef DEBUGPANIC   /* Like PANIC, but only if CONFIG_DEBUG is defined */
+#undef DEBUGASSERT  /* Like ASSERT, but only if CONFIG_DEBUG_ASSERTIONS is defined */
+#undef DEBUGVERIFY  /* Like VERIFY, but only if CONFIG_DEBUG_ASSERTIONS is defined */
+#undef DEBUGPANIC   /* Like PANIC, but only if CONFIG_DEBUG_ASSERTIONS is defined */
 
 #ifdef CONFIG_HAVE_FILENAME
 
@@ -89,7 +89,7 @@
 
 #endif
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_ASSERTIONS
 
 #  define DEBUGASSERT(f) ASSERT(f)
 #  define DEBUGVERIFY(f) VERIFY(f)
@@ -101,7 +101,7 @@
 #  define DEBUGVERIFY(f) ((void)(f))
 #  define DEBUGPANIC()
 
-#  endif /* CONFIG_DEBUG */
+#  endif /* CONFIG_DEBUG_ASSERTIONS */
 
 /* The C standard states that if NDEBUG is defined, assert will do nothing.
  * Users can define and undefine NDEBUG as they see fit to choose when assert
-- 
GitLab


From 1cdc7467267530e35fc80d2e34a32f7c5b9edd6a Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sat, 11 Jun 2016 14:14:08 -0600
Subject: [PATCH 21/91] Rename CONFIG_DEBUG to CONFIG_DEBUG_FEATURES

---
 Documentation/NuttxPortingGuide.html          |  2 +-
 Documentation/UsbTrace.html                   |  4 +-
 Kconfig                                       |  6 +-
 arch/arm/Kconfig                              |  2 +-
 arch/arm/include/efm32/irq.h                  |  2 +-
 arch/arm/include/kinetis/irq.h                |  2 +-
 arch/arm/include/kl/irq.h                     |  2 +-
 arch/arm/include/lpc11xx/irq.h                |  2 +-
 arch/arm/include/lpc17xx/irq.h                |  2 +-
 arch/arm/include/lpc43xx/irq.h                |  2 +-
 arch/arm/include/nuc1xx/irq.h                 |  2 +-
 arch/arm/include/sam34/irq.h                  |  2 +-
 arch/arm/include/samdl/irq.h                  |  2 +-
 arch/arm/include/samv7/irq.h                  |  2 +-
 arch/arm/include/stm32/irq.h                  |  2 +-
 arch/arm/include/stm32f7/irq.h                |  2 +-
 arch/arm/include/stm32l4/irq.h                |  2 +-
 arch/arm/include/tiva/irq.h                   |  2 +-
 arch/arm/src/arm/up_assert.c                  |  8 +-
 arch/arm/src/arm/up_dataabort.c               |  4 +-
 arch/arm/src/arm/up_head.S                    |  2 +-
 arch/arm/src/arm/up_nommuhead.S               |  4 +-
 arch/arm/src/arm/up_prefetchabort.c           |  4 +-
 arch/arm/src/arm/up_syscall.c                 |  4 +-
 arch/arm/src/arm/up_undefinedinsn.c           |  4 +-
 arch/arm/src/armv6-m/nvic.h                   |  2 +-
 arch/arm/src/armv6-m/up_assert.c              | 12 +--
 arch/arm/src/armv6-m/up_dumpnvic.c            |  4 +-
 arch/arm/src/armv6-m/up_svcall.c              |  4 +-
 arch/arm/src/armv7-a/arm_assert.c             |  8 +-
 arch/arm/src/armv7-a/arm_dataabort.c          |  4 +-
 arch/arm/src/armv7-a/arm_head.S               |  2 +-
 arch/arm/src/armv7-a/arm_pghead.S             |  2 +-
 arch/arm/src/armv7-a/arm_prefetchabort.c      |  4 +-
 arch/arm/src/armv7-a/arm_syscall.c            |  4 +-
 arch/arm/src/armv7-a/arm_undefinedinsn.c      |  4 +-
 arch/arm/src/armv7-m/mpu.h                    |  2 +-
 arch/arm/src/armv7-m/up_assert.c              |  8 +-
 arch/arm/src/armv7-m/up_svcall.c              |  4 +-
 arch/arm/src/armv7-r/arm_assert.c             | 12 +--
 arch/arm/src/armv7-r/arm_dataabort.c          |  4 +-
 arch/arm/src/armv7-r/arm_prefetchabort.c      |  4 +-
 arch/arm/src/armv7-r/arm_syscall.c            |  4 +-
 arch/arm/src/armv7-r/arm_undefinedinsn.c      |  4 +-
 arch/arm/src/armv7-r/mpu.h                    |  2 +-
 arch/arm/src/c5471/c5471_ethernet.c           |  2 +-
 arch/arm/src/common/up_createstack.c          |  2 +-
 arch/arm/src/common/up_exit.c                 |  4 +-
 arch/arm/src/common/up_initialize.c           |  2 +-
 arch/arm/src/dm320/dm320_framebuffer.c        | 22 +++---
 arch/arm/src/dm320/dm320_usbdev.c             | 32 ++++----
 arch/arm/src/efm32/Kconfig                    |  2 +-
 arch/arm/src/efm32/efm32_clockconfig.c        |  2 +-
 arch/arm/src/efm32/efm32_gpio.h               |  2 +-
 arch/arm/src/efm32/efm32_i2c.c                |  2 +-
 arch/arm/src/efm32/efm32_irq.c                |  4 +-
 arch/arm/src/efm32/efm32_leserial.c           |  4 +-
 arch/arm/src/efm32/efm32_pwm.c                |  2 +-
 arch/arm/src/efm32/efm32_rmu.h                |  2 +-
 arch/arm/src/efm32/efm32_rtc_burtc.c          |  2 +-
 arch/arm/src/efm32/efm32_serial.c             |  6 +-
 arch/arm/src/efm32/efm32_spi.c                |  2 +-
 arch/arm/src/efm32/efm32_start.c              |  2 +-
 arch/arm/src/efm32/efm32_timer.c              |  2 +-
 arch/arm/src/efm32/efm32_usbdev.c             | 24 +++---
 arch/arm/src/efm32/efm32_usbhost.c            |  8 +-
 arch/arm/src/imx6/imx_lowputc.c               |  2 +-
 arch/arm/src/imx6/imx_lowputc.h               |  2 +-
 arch/arm/src/kinetis/kinetis_irq.c            |  4 +-
 arch/arm/src/kinetis/kinetis_pwm.c            |  2 +-
 arch/arm/src/kinetis/kinetis_sdhc.c           |  6 +-
 arch/arm/src/kinetis/kinetis_serial.c         | 32 ++++----
 arch/arm/src/kinetis/kinetis_usbdev.c         | 32 ++++----
 arch/arm/src/kl/Make.defs                     |  4 +-
 arch/arm/src/kl/kl_dumpgpio.c                 |  6 +-
 arch/arm/src/kl/kl_irq.c                      |  4 +-
 arch/arm/src/kl/kl_pwm.c                      |  2 +-
 arch/arm/src/kl/kl_spi.c                      |  6 +-
 arch/arm/src/kl/kl_start.c                    |  2 +-
 arch/arm/src/lpc11xx/Kconfig                  |  5 +-
 arch/arm/src/lpc11xx/Make.defs                |  2 +-
 arch/arm/src/lpc11xx/lpc11_gpiodbg.c          |  2 +-
 arch/arm/src/lpc11xx/lpc11_irq.c              |  4 +-
 arch/arm/src/lpc11xx/lpc11_spi.c              |  6 +-
 arch/arm/src/lpc11xx/lpc11_ssp.c              |  6 +-
 arch/arm/src/lpc11xx/lpc11_start.c            |  2 +-
 arch/arm/src/lpc11xx/lpc11_timer.c            |  2 +-
 arch/arm/src/lpc17xx/Kconfig                  | 19 +++--
 arch/arm/src/lpc17xx/lpc176x_rtc.c            |  2 +-
 arch/arm/src/lpc17xx/lpc17_can.c              |  2 +-
 arch/arm/src/lpc17xx/lpc17_ethernet.c         |  6 +-
 arch/arm/src/lpc17xx/lpc17_gpiodbg.c          |  2 +-
 arch/arm/src/lpc17xx/lpc17_irq.c              |  4 +-
 arch/arm/src/lpc17xx/lpc17_mcpwm.c            |  2 +-
 arch/arm/src/lpc17xx/lpc17_pwm.c              |  2 +-
 arch/arm/src/lpc17xx/lpc17_sdcard.c           | 12 +--
 arch/arm/src/lpc17xx/lpc17_spi.c              |  6 +-
 arch/arm/src/lpc17xx/lpc17_ssp.c              |  6 +-
 arch/arm/src/lpc17xx/lpc17_start.c            |  2 +-
 arch/arm/src/lpc17xx/lpc17_timer.c            |  2 +-
 arch/arm/src/lpc17xx/lpc17_usbdev.c           | 22 +++---
 arch/arm/src/lpc214x/Kconfig                  |  2 +-
 arch/arm/src/lpc214x/lpc214x_head.S           |  2 +-
 arch/arm/src/lpc214x/lpc214x_usbdev.c         | 28 +++----
 arch/arm/src/lpc2378/Kconfig                  |  2 +-
 arch/arm/src/lpc2378/lpc23xx_head.S           |  2 +-
 arch/arm/src/lpc31xx/Kconfig                  | 11 +--
 arch/arm/src/lpc31xx/lpc31_ehci.c             |  4 +-
 arch/arm/src/lpc31xx/lpc31_spi.c              |  4 +-
 arch/arm/src/lpc31xx/lpc31_usbdev.c           | 28 +++----
 arch/arm/src/lpc43xx/Kconfig                  |  4 +-
 arch/arm/src/lpc43xx/Make.defs                |  2 +-
 arch/arm/src/lpc43xx/lpc43_debug.c            |  4 +-
 arch/arm/src/lpc43xx/lpc43_ehci.c             |  4 +-
 arch/arm/src/lpc43xx/lpc43_ethernet.c         | 10 +--
 arch/arm/src/lpc43xx/lpc43_gpdma.c            |  2 +-
 arch/arm/src/lpc43xx/lpc43_gpio.h             |  2 +-
 arch/arm/src/lpc43xx/lpc43_irq.c              |  8 +-
 arch/arm/src/lpc43xx/lpc43_pinconfig.h        |  2 +-
 arch/arm/src/lpc43xx/lpc43_rgu.c              |  2 +-
 arch/arm/src/lpc43xx/lpc43_rgu.h              |  2 +-
 arch/arm/src/lpc43xx/lpc43_spi.c              |  2 +-
 arch/arm/src/lpc43xx/lpc43_spifi.c            |  4 +-
 arch/arm/src/lpc43xx/lpc43_ssp.c              |  2 +-
 arch/arm/src/lpc43xx/lpc43_start.c            |  6 +-
 arch/arm/src/lpc43xx/lpc43_usb0dev.c          | 28 +++----
 arch/arm/src/nuc1xx/Make.defs                 |  4 +-
 arch/arm/src/nuc1xx/nuc_dumpgpio.c            |  6 +-
 arch/arm/src/nuc1xx/nuc_gpio.h                |  2 +-
 arch/arm/src/nuc1xx/nuc_irq.c                 |  4 +-
 arch/arm/src/nuc1xx/nuc_start.c               |  2 +-
 arch/arm/src/sam34/Kconfig                    | 14 ++--
 arch/arm/src/sam34/sam4cm_tc.h                |  2 +-
 arch/arm/src/sam34/sam_dmac.c                 |  2 +-
 arch/arm/src/sam34/sam_dmac.h                 |  2 +-
 arch/arm/src/sam34/sam_emac.c                 |  4 +-
 arch/arm/src/sam34/sam_gpio.h                 |  2 +-
 arch/arm/src/sam34/sam_hsmci.c                |  4 +-
 arch/arm/src/sam34/sam_irq.c                  |  4 +-
 arch/arm/src/sam34/sam_rtc.c                  |  2 +-
 arch/arm/src/sam34/sam_rtt.c                  |  6 +-
 arch/arm/src/sam34/sam_spi.c                  |  2 +-
 arch/arm/src/sam34/sam_start.c                |  2 +-
 arch/arm/src/sam34/sam_tc.c                   |  6 +-
 arch/arm/src/sam34/sam_twi.c                  |  2 +-
 arch/arm/src/sam34/sam_udp.c                  | 34 ++++-----
 arch/arm/src/sam34/sam_wdt.c                  |  6 +-
 arch/arm/src/sama5/Kconfig                    | 76 +++++++++----------
 arch/arm/src/sama5/sam_adc.c                  |  2 +-
 arch/arm/src/sama5/sam_adc.h                  |  2 +-
 arch/arm/src/sama5/sam_can.c                  |  4 +-
 arch/arm/src/sama5/sam_dmac.c                 |  2 +-
 arch/arm/src/sama5/sam_dmac.h                 |  2 +-
 arch/arm/src/sama5/sam_ehci.c                 |  4 +-
 arch/arm/src/sama5/sam_emaca.c                |  4 +-
 arch/arm/src/sama5/sam_emacb.c                |  6 +-
 arch/arm/src/sama5/sam_gmac.c                 |  4 +-
 arch/arm/src/sama5/sam_hsmci.c                |  4 +-
 arch/arm/src/sama5/sam_lcd.c                  |  4 +-
 arch/arm/src/sama5/sam_nand.h                 |  2 +-
 arch/arm/src/sama5/sam_ohci.c                 |  4 +-
 arch/arm/src/sama5/sam_pwm.c                  |  2 +-
 arch/arm/src/sama5/sam_rtc.c                  |  2 +-
 arch/arm/src/sama5/sam_spi.c                  |  2 +-
 arch/arm/src/sama5/sam_ssc.c                  | 14 ++--
 arch/arm/src/sama5/sam_tc.h                   |  2 +-
 arch/arm/src/sama5/sam_twi.c                  |  2 +-
 arch/arm/src/sama5/sam_udphs.c                | 34 ++++-----
 arch/arm/src/sama5/sam_wdt.c                  |  6 +-
 arch/arm/src/sama5/sam_xdmac.c                |  4 +-
 arch/arm/src/sama5/sama5d2x_pio.h             |  2 +-
 arch/arm/src/sama5/sama5d3x4x_pio.h           |  2 +-
 arch/arm/src/samdl/Make.defs                  |  2 +-
 arch/arm/src/samdl/sam_dmac.h                 |  2 +-
 arch/arm/src/samdl/sam_irq.c                  |  4 +-
 arch/arm/src/samdl/sam_port.h                 |  2 +-
 arch/arm/src/samdl/sam_sercom.c               | 10 +--
 arch/arm/src/samdl/sam_spi.c                  |  2 +-
 arch/arm/src/samdl/sam_start.c                |  2 +-
 arch/arm/src/samv7/Kconfig                    | 58 +++++++-------
 arch/arm/src/samv7/sam_emac.c                 |  6 +-
 arch/arm/src/samv7/sam_hsmci.c                |  4 +-
 arch/arm/src/samv7/sam_irq.c                  |  4 +-
 arch/arm/src/samv7/sam_mcan.c                 |  6 +-
 arch/arm/src/samv7/sam_qspi.c                 |  2 +-
 arch/arm/src/samv7/sam_rswdt.c                |  6 +-
 arch/arm/src/samv7/sam_spi.c                  |  2 +-
 arch/arm/src/samv7/sam_spi_slave.c            |  2 +-
 arch/arm/src/samv7/sam_ssc.c                  | 14 ++--
 arch/arm/src/samv7/sam_tc.h                   |  2 +-
 arch/arm/src/samv7/sam_twihs.c                |  2 +-
 arch/arm/src/samv7/sam_usbdevhs.c             |  6 +-
 arch/arm/src/samv7/sam_wdt.c                  |  6 +-
 arch/arm/src/samv7/sam_xdmac.c                |  4 +-
 arch/arm/src/samv7/sam_xdmac.h                |  2 +-
 arch/arm/src/stm32/Kconfig                    |  8 +-
 arch/arm/src/stm32/Make.defs                  |  2 +-
 arch/arm/src/stm32/stm32.h                    |  2 +-
 arch/arm/src/stm32/stm32_can.c                |  2 +-
 arch/arm/src/stm32/stm32_dumpgpio.c           |  6 +-
 arch/arm/src/stm32/stm32_eth.c                | 10 +--
 arch/arm/src/stm32/stm32_gpio.h               |  2 +-
 arch/arm/src/stm32/stm32_i2c.c                |  2 +-
 arch/arm/src/stm32/stm32_i2c_alt.c            |  2 +-
 arch/arm/src/stm32/stm32_irq.c                |  4 +-
 arch/arm/src/stm32/stm32_iwdg.c               |  6 +-
 arch/arm/src/stm32/stm32_otgfsdev.c           | 24 +++---
 arch/arm/src/stm32/stm32_otgfshost.c          |  8 +-
 arch/arm/src/stm32/stm32_otghsdev.c           | 24 +++---
 arch/arm/src/stm32/stm32_otghshost.c          |  8 +-
 arch/arm/src/stm32/stm32_pwm.c                |  2 +-
 arch/arm/src/stm32/stm32_qencoder.c           |  2 +-
 arch/arm/src/stm32/stm32_rtcc.c               |  2 +-
 arch/arm/src/stm32/stm32_sdio.c               | 12 +--
 arch/arm/src/stm32/stm32_spi.c                |  2 +-
 arch/arm/src/stm32/stm32_start.c              |  2 +-
 arch/arm/src/stm32/stm32_usbdev.c             | 42 +++++-----
 arch/arm/src/stm32/stm32_usbhost.h            |  2 +-
 arch/arm/src/stm32/stm32_wwdg.c               |  6 +-
 arch/arm/src/stm32/stm32f30xxx_i2c.c          |  2 +-
 arch/arm/src/stm32/stm32f40xxx_rtcc.c         |  2 +-
 arch/arm/src/stm32f7/Kconfig                  |  4 +-
 arch/arm/src/stm32f7/Make.defs                |  2 +-
 arch/arm/src/stm32f7/stm32_dumpgpio.c         |  6 +-
 arch/arm/src/stm32f7/stm32_ethernet.c         | 10 +--
 arch/arm/src/stm32f7/stm32_gpio.h             |  2 +-
 arch/arm/src/stm32f7/stm32_irq.c              |  4 +-
 arch/arm/src/stm32l4/Kconfig                  |  6 +-
 arch/arm/src/stm32l4/Make.defs                |  2 +-
 arch/arm/src/stm32l4/stm32l4.h                |  2 +-
 arch/arm/src/stm32l4/stm32l4_can.c            |  2 +-
 arch/arm/src/stm32l4/stm32l4_gpio.h           |  2 +-
 arch/arm/src/stm32l4/stm32l4_i2c.c            |  2 +-
 arch/arm/src/stm32l4/stm32l4_irq.c            |  4 +-
 arch/arm/src/stm32l4/stm32l4_qspi.c           |  2 +-
 arch/arm/src/stm32l4/stm32l4_rtcc.c           |  2 +-
 arch/arm/src/stm32l4/stm32l4_spi.c            |  2 +-
 arch/arm/src/stm32l4/stm32l4_start.c          |  2 +-
 arch/arm/src/str71x/str71x_decodeirq.c        |  2 +-
 arch/arm/src/str71x/str71x_head.S             |  4 +-
 arch/arm/src/tiva/Kconfig                     | 10 +--
 arch/arm/src/tiva/tiva_adc.h                  |  2 +-
 arch/arm/src/tiva/tiva_dumpgpio.c             |  4 +-
 arch/arm/src/tiva/tiva_gpio.h                 |  2 +-
 arch/arm/src/tiva/tiva_i2c.c                  |  4 +-
 arch/arm/src/tiva/tiva_irq.c                  |  4 +-
 arch/arm/src/tiva/tiva_ssi.c                  |  6 +-
 arch/arm/src/tiva/tiva_start.c                |  2 +-
 arch/arm/src/tiva/tm4c_ethernet.c             | 10 +--
 arch/arm/src/tms570/tms570_boot.c             |  2 +-
 arch/avr/src/at90usb/at90usb_usbdev.c         | 18 ++---
 arch/avr/src/avr/up_createstack.c             |  2 +-
 arch/avr/src/avr/up_dumpstate.c               |  4 +-
 arch/avr/src/avr/up_spi.c                     |  2 +-
 arch/avr/src/avr32/up_createstack.c           |  2 +-
 arch/avr/src/avr32/up_dumpstate.c             |  4 +-
 arch/avr/src/avr32/up_initialstate.c          |  2 +-
 arch/avr/src/common/up_assert.c               |  8 +-
 arch/avr/src/common/up_exit.c                 |  4 +-
 arch/avr/src/common/up_initialize.c           |  2 +-
 arch/hc/src/common/up_createstack.c           |  2 +-
 arch/hc/src/common/up_exit.c                  |  4 +-
 arch/hc/src/common/up_initialize.c            |  2 +-
 arch/hc/src/m9s12/m9s12_assert.c              |  8 +-
 arch/hc/src/m9s12/m9s12_gpio.c                |  2 +-
 arch/hc/src/m9s12/m9s12_start.S               |  2 +-
 arch/mips/src/common/up_createstack.c         |  2 +-
 arch/mips/src/common/up_exit.c                |  4 +-
 arch/mips/src/common/up_initialize.c          |  2 +-
 arch/mips/src/mips32/up_assert.c              |  8 +-
 arch/mips/src/mips32/up_dumpstate.c           |  4 +-
 arch/mips/src/mips32/up_swint0.c              |  2 +-
 arch/mips/src/pic32mx/Kconfig                 |  8 +-
 arch/mips/src/pic32mx/pic32mx-ethernet.c      |  6 +-
 arch/mips/src/pic32mx/pic32mx-exception.c     |  4 +-
 arch/mips/src/pic32mx/pic32mx-gpio.c          |  2 +-
 arch/mips/src/pic32mx/pic32mx-serial.c        |  6 +-
 arch/mips/src/pic32mx/pic32mx-usbdev.c        | 32 ++++----
 arch/mips/src/pic32mz/Kconfig                 | 16 ++--
 arch/mips/src/pic32mz/pic32mz-ethernet.c      |  6 +-
 arch/mips/src/pic32mz/pic32mz-exception.c     |  4 +-
 arch/mips/src/pic32mz/pic32mz-gpio.c          |  2 +-
 arch/mips/src/pic32mz/pic32mz-serial.c        |  6 +-
 arch/sh/src/common/up_assert.c                |  6 +-
 arch/sh/src/common/up_createstack.c           |  2 +-
 arch/sh/src/common/up_exit.c                  |  4 +-
 arch/sh/src/common/up_initialize.c            |  2 +-
 arch/sh/src/m16c/m16c_dumpstate.c             |  4 +-
 arch/sh/src/m16c/m16c_head.S                  |  2 +-
 arch/sh/src/sh1/sh1_dumpstate.c               |  4 +-
 arch/sh/src/sh1/sh1_head.S                    |  6 +-
 arch/sh/src/sh1/sh1_irq.c                     |  2 +-
 arch/sim/src/board_lcd.c                      |  2 +-
 arch/sim/src/up_spiflash.c                    |  2 +-
 arch/x86/src/common/up_assert.c               |  8 +-
 arch/x86/src/common/up_exit.c                 |  4 +-
 arch/x86/src/common/up_initialize.c           |  2 +-
 arch/x86/src/i486/up_createstack.c            |  2 +-
 arch/x86/src/i486/up_regdump.c                |  4 +-
 arch/x86/src/qemu/qemu_fullcontextrestore.S   |  4 +-
 arch/x86/src/qemu/qemu_head.S                 |  2 +-
 arch/x86/src/qemu/qemu_saveusercontext.S      |  4 +-
 arch/z16/src/common/up_assert.c               |  4 +-
 arch/z16/src/common/up_createstack.c          |  2 +-
 arch/z16/src/common/up_exit.c                 |  4 +-
 arch/z16/src/common/up_initialize.c           |  2 +-
 arch/z16/src/common/up_registerdump.c         |  4 +-
 arch/z16/src/common/up_stackdump.c            |  4 +-
 arch/z16/src/z16f/Kconfig                     |  2 +-
 arch/z16/src/z16f/z16f_clkinit.c              |  6 +-
 arch/z16/src/z16f/z16f_espi.c                 |  2 +-
 arch/z80/src/common/up_assert.c               |  4 +-
 arch/z80/src/common/up_createstack.c          |  2 +-
 arch/z80/src/common/up_exit.c                 |  4 +-
 arch/z80/src/common/up_initialize.c           |  2 +-
 arch/z80/src/common/up_stackdump.c            |  4 +-
 arch/z80/src/ez80/ez80_emac.c                 |  6 +-
 arch/z80/src/ez80/ez80_i2c.c                  |  4 +-
 arch/z80/src/ez80/ez80_registerdump.c         |  4 +-
 arch/z80/src/ez80/ez80_spi.c                  |  2 +-
 arch/z80/src/z180/z180_registerdump.c         |  4 +-
 arch/z80/src/z8/z8_registerdump.c             |  4 +-
 arch/z80/src/z80/z80_registerdump.c           |  4 +-
 binfmt/binfmt.h                               |  2 +-
 binfmt/binfmt_dumpmodule.c                    |  2 +-
 binfmt/binfmt_execmodule.c                    |  2 +-
 binfmt/binfmt_loadmodule.c                    |  2 +-
 binfmt/elf.c                                  |  6 +-
 binfmt/libelf/Kconfig                         |  2 +-
 binfmt/libelf/libelf_bind.c                   |  2 +-
 binfmt/libelf/libelf_init.c                   |  2 +-
 binfmt/libnxflat/Kconfig                      |  2 +-
 binfmt/libnxflat/libnxflat_bind.c             |  2 +-
 binfmt/libnxflat/libnxflat_init.c             |  2 +-
 binfmt/libpcode/Kconfig                       |  2 +-
 binfmt/libpcode/README.txt                    |  2 +-
 binfmt/nxflat.c                               |  6 +-
 configs/README.txt                            |  2 +-
 configs/amber/hello/defconfig                 |  2 +-
 configs/arduino-due/README.txt                |  4 +-
 configs/arduino-due/nsh/defconfig             |  2 +-
 configs/arduino-due/src/sam_autoleds.c        |  2 +-
 configs/arduino-due/src/sam_userleds.c        |  2 +-
 configs/arduino-mega2560/hello/defconfig      |  2 +-
 configs/arduino-mega2560/nsh/defconfig        |  2 +-
 configs/avr32dev1/nsh/defconfig               |  2 +-
 configs/avr32dev1/ostest/defconfig            |  2 +-
 configs/c5471evm/httpd/Make.defs              |  4 +-
 configs/c5471evm/httpd/defconfig              |  2 +-
 configs/c5471evm/nettest/Make.defs            |  4 +-
 configs/c5471evm/nettest/defconfig            |  2 +-
 configs/c5471evm/nsh/Make.defs                |  4 +-
 configs/c5471evm/nsh/defconfig                |  2 +-
 configs/cc3200-launchpad/nsh/defconfig        |  2 +-
 .../cc3200-launchpad/src/cc3200_autoleds.c    |  2 +-
 configs/cloudctrl/README.txt                  |  6 +-
 configs/cloudctrl/nsh/defconfig               |  2 +-
 configs/cloudctrl/src/stm32_autoleds.c        |  2 +-
 configs/cloudctrl/src/stm32_spi.c             |  4 +-
 configs/cloudctrl/src/stm32_userleds.c        |  2 +-
 configs/compal_e86/nsh_highram/defconfig      |  2 +-
 configs/compal_e88/nsh_highram/defconfig      |  2 +-
 configs/compal_e99/nsh_compalram/Make.defs    |  4 +-
 configs/compal_e99/nsh_compalram/defconfig    |  2 +-
 configs/compal_e99/nsh_highram/Make.defs      |  4 +-
 configs/compal_e99/nsh_highram/defconfig      |  2 +-
 configs/demo9s12ne64/ostest/defconfig         |  2 +-
 configs/demo9s12ne64/src/m9s12_leds.c         |  2 +-
 configs/demo9s12ne64/src/m9s12_spi.c          |  2 +-
 configs/dk-tm4c129x/ipv6/defconfig            |  2 +-
 configs/dk-tm4c129x/nsh/defconfig             |  2 +-
 configs/dk-tm4c129x/src/tm4c_ssi.c            |  2 +-
 configs/dk-tm4c129x/src/tm4c_userleds.c       |  2 +-
 configs/ea3131/nsh/defconfig                  |  2 +-
 configs/ea3131/pgnsh/defconfig                |  2 +-
 configs/ea3131/src/lpc31_fillpage.c           |  6 +-
 configs/ea3131/src/lpc31_leds.c               |  2 +-
 configs/ea3131/src/lpc31_spi.c                |  2 +-
 configs/ea3131/usbserial/defconfig            |  2 +-
 configs/ea3152/ostest/defconfig               |  2 +-
 configs/ea3152/src/lpc31_fillpage.c           |  6 +-
 configs/ea3152/src/lpc31_leds.c               |  2 +-
 configs/ea3152/src/lpc31_spi.c                |  2 +-
 configs/eagle100/httpd/defconfig              |  2 +-
 configs/eagle100/nettest/defconfig            |  2 +-
 configs/eagle100/nsh/defconfig                |  2 +-
 configs/eagle100/nxflat/defconfig             |  2 +-
 configs/eagle100/src/lm_leds.c                |  2 +-
 configs/eagle100/src/lm_ssi.c                 |  2 +-
 configs/eagle100/thttpd/defconfig             |  2 +-
 configs/efm32-g8xx-stk/nsh/defconfig          |  2 +-
 configs/efm32-g8xx-stk/src/efm32_autoleds.c   |  2 +-
 configs/efm32-g8xx-stk/src/efm32_userleds.c   |  2 +-
 configs/efm32gg-stk3700/nsh/defconfig         |  2 +-
 configs/efm32gg-stk3700/src/efm32_autoleds.c  |  2 +-
 configs/efm32gg-stk3700/src/efm32_userleds.c  |  2 +-
 configs/ekk-lm3s9b96/nsh/defconfig            |  2 +-
 configs/ekk-lm3s9b96/src/lm_leds.c            |  2 +-
 configs/ekk-lm3s9b96/src/lm_ssi.c             |  2 +-
 configs/ez80f910200kitg/ostest/defconfig      |  2 +-
 configs/ez80f910200zco/dhcpd/defconfig        |  2 +-
 configs/ez80f910200zco/httpd/defconfig        |  2 +-
 configs/ez80f910200zco/nettest/defconfig      |  2 +-
 configs/ez80f910200zco/nsh/defconfig          |  2 +-
 configs/ez80f910200zco/poll/defconfig         |  2 +-
 configs/fire-stm32v2/README.txt               |  2 +-
 configs/fire-stm32v2/nsh/defconfig            |  2 +-
 configs/fire-stm32v2/src/stm32_autoleds.c     |  2 +-
 configs/fire-stm32v2/src/stm32_spi.c          |  2 +-
 configs/fire-stm32v2/src/stm32_userleds.c     |  2 +-
 configs/freedom-kl25z/minnsh/defconfig        |  2 +-
 configs/freedom-kl25z/nsh/defconfig           |  2 +-
 configs/freedom-kl25z/src/kl_led.c            |  2 +-
 configs/freedom-kl25z/src/kl_spi.c            |  2 +-
 configs/freedom-kl26z/minnsh/defconfig        |  2 +-
 configs/freedom-kl26z/nsh/defconfig           |  2 +-
 configs/freedom-kl26z/src/kl_led.c            |  2 +-
 configs/freedom-kl26z/src/kl_spi.c            |  2 +-
 configs/hymini-stm32v/README.txt              |  6 +-
 configs/hymini-stm32v/buttons/defconfig       |  2 +-
 configs/hymini-stm32v/nsh/defconfig           |  2 +-
 configs/hymini-stm32v/nsh2/defconfig          |  2 +-
 configs/hymini-stm32v/src/stm32_leds.c        |  2 +-
 configs/hymini-stm32v/src/stm32_spi.c         |  2 +-
 configs/hymini-stm32v/src/stm32_ssd1289.c     |  2 +-
 configs/hymini-stm32v/usbmsc/defconfig        |  2 +-
 configs/hymini-stm32v/usbnsh/defconfig        |  2 +-
 configs/hymini-stm32v/usbserial/defconfig     |  2 +-
 configs/kwikstik-k40/ostest/defconfig         |  2 +-
 configs/kwikstik-k40/src/k40_leds.c           |  2 +-
 configs/kwikstik-k40/src/k40_spi.c            |  2 +-
 configs/launchxl-tms57004/nsh/defconfig       |  2 +-
 .../launchxl-tms57004/src/tms570_autoleds.c   |  2 +-
 configs/lincoln60/README.txt                  |  4 +-
 configs/lincoln60/netnsh/defconfig            |  2 +-
 configs/lincoln60/nsh/defconfig               |  2 +-
 configs/lincoln60/src/lpc17_leds.c            |  2 +-
 configs/lincoln60/thttpd-binfs/defconfig      |  2 +-
 configs/lm3s6432-s2e/nsh/defconfig            |  2 +-
 configs/lm3s6432-s2e/src/lm_leds.c            |  2 +-
 configs/lm3s6432-s2e/src/lm_ssi.c             |  2 +-
 configs/lm3s6965-ek/discover/defconfig        |  2 +-
 configs/lm3s6965-ek/nsh/defconfig             |  2 +-
 configs/lm3s6965-ek/nx/defconfig              |  2 +-
 configs/lm3s6965-ek/src/lm_leds.c             |  2 +-
 configs/lm3s6965-ek/src/lm_oled.c             |  2 +-
 configs/lm3s6965-ek/src/lm_ssi.c              |  2 +-
 configs/lm3s6965-ek/tcpecho/defconfig         |  2 +-
 configs/lm3s8962-ek/nsh/defconfig             |  2 +-
 configs/lm3s8962-ek/nx/defconfig              |  2 +-
 configs/lm3s8962-ek/src/lm_leds.c             |  2 +-
 configs/lm3s8962-ek/src/lm_oled.c             |  2 +-
 configs/lm3s8962-ek/src/lm_ssi.c              |  2 +-
 configs/lm4f120-launchpad/nsh/defconfig       |  2 +-
 configs/lm4f120-launchpad/src/lm4f_autoleds.c |  2 +-
 configs/lm4f120-launchpad/src/lm4f_ssi.c      |  2 +-
 configs/lpc4330-xplorer/README.txt            | 12 +--
 configs/lpc4330-xplorer/nsh/defconfig         |  2 +-
 configs/lpc4330-xplorer/src/lpc43_autoleds.c  |  2 +-
 configs/lpc4330-xplorer/src/lpc43_userleds.c  |  2 +-
 configs/lpc4337-ws/README.txt                 | 12 +--
 configs/lpc4337-ws/nsh/defconfig              |  2 +-
 configs/lpc4357-evb/README.txt                | 12 +--
 configs/lpc4357-evb/nsh/defconfig             |  2 +-
 configs/lpc4357-evb/src/lpc43_autoleds.c      |  2 +-
 configs/lpc4357-evb/src/lpc43_userleds.c      |  2 +-
 configs/lpc4370-link2/README.txt              | 12 +--
 configs/lpc4370-link2/nsh/defconfig           |  2 +-
 configs/lpc4370-link2/src/lpc43_autoleds.c    |  2 +-
 configs/lpc4370-link2/src/lpc43_userleds.c    |  2 +-
 configs/lpcxpresso-lpc1115/minnsh/defconfig   |  2 +-
 configs/lpcxpresso-lpc1115/nsh/defconfig      |  2 +-
 configs/lpcxpresso-lpc1115/src/lpc11_leds.c   |  2 +-
 configs/lpcxpresso-lpc1115/src/lpc11_ssp.c    |  2 +-
 configs/lpcxpresso-lpc1768/README.txt         |  4 +-
 configs/lpcxpresso-lpc1768/dhcpd/defconfig    |  2 +-
 configs/lpcxpresso-lpc1768/nsh/defconfig      |  2 +-
 configs/lpcxpresso-lpc1768/nx/defconfig       |  2 +-
 configs/lpcxpresso-lpc1768/src/lpc17_leds.c   |  2 +-
 configs/lpcxpresso-lpc1768/src/lpc17_oled.c   |  2 +-
 configs/lpcxpresso-lpc1768/src/lpc17_ssp.c    |  2 +-
 configs/lpcxpresso-lpc1768/thttpd/defconfig   |  2 +-
 configs/lpcxpresso-lpc1768/usbmsc/defconfig   |  2 +-
 configs/maple/nsh/defconfig                   |  2 +-
 configs/maple/nx/defconfig                    |  2 +-
 configs/maple/src/stm32_lcd.c                 |  2 +-
 configs/maple/src/stm32_leds.c                |  2 +-
 configs/maple/src/stm32_spi.c                 |  4 +-
 configs/maple/usbnsh/defconfig                |  2 +-
 configs/mbed/README.txt                       |  4 +-
 configs/mbed/hidkbd/defconfig                 |  2 +-
 configs/mbed/nsh/defconfig                    |  2 +-
 configs/mbed/src/lpc17_leds.c                 |  2 +-
 configs/mcu123-lpc214x/composite/Make.defs    |  4 +-
 configs/mcu123-lpc214x/composite/defconfig    |  2 +-
 configs/mcu123-lpc214x/nsh/Make.defs          |  4 +-
 configs/mcu123-lpc214x/nsh/defconfig          |  2 +-
 configs/mcu123-lpc214x/src/lpc2148_spi1.c     |  2 +-
 configs/mcu123-lpc214x/usbmsc/Make.defs       |  4 +-
 configs/mcu123-lpc214x/usbmsc/defconfig       |  2 +-
 configs/mcu123-lpc214x/usbserial/Make.defs    |  4 +-
 configs/mcu123-lpc214x/usbserial/defconfig    |  2 +-
 configs/micropendous3/hello/defconfig         |  2 +-
 configs/mikroe-stm32f4/README.txt             |  6 +-
 configs/mikroe-stm32f4/fulldemo/defconfig     |  2 +-
 configs/mikroe-stm32f4/kostest/defconfig      |  2 +-
 configs/mikroe-stm32f4/nsh/defconfig          |  2 +-
 configs/mikroe-stm32f4/nx/defconfig           |  2 +-
 configs/mikroe-stm32f4/nxlines/defconfig      |  2 +-
 configs/mikroe-stm32f4/nxtext/defconfig       |  2 +-
 configs/mikroe-stm32f4/src/stm32_mio283qt2.c  |  2 +-
 configs/mikroe-stm32f4/src/stm32_mio283qt9a.c |  2 +-
 configs/mikroe-stm32f4/src/stm32_spi.c        |  2 +-
 configs/mikroe-stm32f4/usbnsh/defconfig       |  2 +-
 configs/mirtoo/nsh/defconfig                  |  2 +-
 configs/mirtoo/nxffs/defconfig                |  2 +-
 configs/mirtoo/src/pic32_leds.c               |  2 +-
 configs/mirtoo/src/pic32_spi2.c               |  2 +-
 configs/moteino-mega/hello/defconfig          |  2 +-
 configs/moteino-mega/nsh/defconfig            |  2 +-
 configs/moteino-mega/src/avr_leds.c           |  2 +-
 configs/moxa/nsh/defconfig                    |  2 +-
 configs/mx1ads/ostest/defconfig               |  2 +-
 configs/ne64badge/ostest/defconfig            |  2 +-
 configs/ne64badge/src/m9s12_buttons.c         |  2 +-
 configs/ne64badge/src/m9s12_leds.c            |  2 +-
 configs/ne64badge/src/m9s12_spi.c             |  2 +-
 configs/ntosd-dm320/nettest/defconfig         |  2 +-
 configs/ntosd-dm320/nsh/defconfig             |  2 +-
 configs/ntosd-dm320/poll/defconfig            |  2 +-
 configs/ntosd-dm320/thttpd/defconfig          |  2 +-
 configs/ntosd-dm320/udp/defconfig             |  2 +-
 configs/ntosd-dm320/webserver/defconfig       |  2 +-
 configs/nucleo-144/f746-evalos/defconfig      |  2 +-
 configs/nucleo-144/f746-nsh/defconfig         |  2 +-
 configs/nucleo-144/f767-evalos/defconfig      |  2 +-
 configs/nucleo-144/f767-nsh/defconfig         |  2 +-
 configs/nucleo-144/src/stm32_autoleds.c       |  2 +-
 configs/nucleo-144/src/stm32_userleds.c       |  2 +-
 configs/nucleo-f303re/adc/defconfig           |  2 +-
 configs/nucleo-f303re/can/defconfig           |  2 +-
 configs/nucleo-f303re/nxlines/defconfig       |  2 +-
 configs/nucleo-f303re/pwm/defconfig           |  2 +-
 configs/nucleo-f303re/serialrx/defconfig      |  2 +-
 configs/nucleo-f303re/src/stm32_autoleds.c    |  2 +-
 configs/nucleo-f303re/src/stm32_spi.c         |  2 +-
 configs/nucleo-f303re/src/stm32_userleds.c    |  2 +-
 configs/nucleo-f303re/uavcan/defconfig        |  2 +-
 configs/nucleo-f4x1re/f401-nsh/defconfig      |  2 +-
 configs/nucleo-f4x1re/f411-nsh/defconfig      |  2 +-
 configs/nucleo-f4x1re/src/stm32_autoleds.c    |  2 +-
 configs/nucleo-f4x1re/src/stm32_spi.c         |  2 +-
 configs/nucleo-f4x1re/src/stm32_userleds.c    |  2 +-
 configs/nucleo-l476rg/nsh/defconfig           |  2 +-
 configs/nucleo-l476rg/src/stm32_autoleds.c    |  2 +-
 configs/nucleo-l476rg/src/stm32_spi.c         |  2 +-
 configs/nucleo-l476rg/src/stm32_userleds.c    |  2 +-
 configs/nutiny-nuc120/nsh/defconfig           |  2 +-
 configs/nutiny-nuc120/src/nuc_led.c           |  2 +-
 .../olimex-efm32g880f128-stk/nsh/defconfig    |  2 +-
 configs/olimex-lpc-h3131/nsh/defconfig        |  2 +-
 configs/olimex-lpc-h3131/src/lpc31_leds.c     |  2 +-
 configs/olimex-lpc-h3131/src/lpc31_spi.c      |  2 +-
 configs/olimex-lpc1766stk/README.txt          |  6 +-
 configs/olimex-lpc1766stk/ftpc/defconfig      |  2 +-
 configs/olimex-lpc1766stk/hidkbd/defconfig    |  2 +-
 configs/olimex-lpc1766stk/hidmouse/defconfig  |  2 +-
 configs/olimex-lpc1766stk/nettest/defconfig   |  2 +-
 configs/olimex-lpc1766stk/nsh/defconfig       |  2 +-
 configs/olimex-lpc1766stk/nx/defconfig        |  2 +-
 .../olimex-lpc1766stk/slip-httpd/defconfig    |  2 +-
 configs/olimex-lpc1766stk/src/lpc17_lcd.c     |  2 +-
 configs/olimex-lpc1766stk/src/lpc17_leds.c    |  2 +-
 configs/olimex-lpc1766stk/src/lpc17_ssp.c     |  2 +-
 .../olimex-lpc1766stk/thttpd-binfs/defconfig  |  2 +-
 .../olimex-lpc1766stk/thttpd-nxflat/defconfig |  2 +-
 configs/olimex-lpc1766stk/usbmsc/defconfig    |  2 +-
 configs/olimex-lpc1766stk/usbserial/defconfig |  2 +-
 configs/olimex-lpc1766stk/zmodem/defconfig    |  2 +-
 configs/olimex-lpc2378/nsh/Make.defs          |  4 +-
 configs/olimex-lpc2378/nsh/defconfig          |  2 +-
 .../olimex-stm32-h405/src/stm32_autoleds.c    |  2 +-
 .../olimex-stm32-h405/src/stm32_userleds.c    |  2 +-
 configs/olimex-stm32-h405/usbnsh/defconfig    |  2 +-
 configs/olimex-stm32-h407/nsh/defconfig       |  2 +-
 .../olimex-stm32-h407/src/stm32_autoleds.c    |  2 +-
 .../olimex-stm32-h407/src/stm32_userleds.c    |  2 +-
 configs/olimex-stm32-p107/nsh/defconfig       |  2 +-
 configs/olimex-stm32-p107/src/stm32_spi.c     |  2 +-
 configs/olimex-stm32-p207/nsh/defconfig       |  2 +-
 .../olimex-stm32-p207/src/stm32_autoleds.c    |  2 +-
 .../olimex-stm32-p207/src/stm32_userleds.c    |  2 +-
 configs/olimex-strp711/nettest/Make.defs      |  4 +-
 configs/olimex-strp711/nettest/defconfig      |  2 +-
 configs/olimex-strp711/nsh/Make.defs          |  4 +-
 configs/olimex-strp711/nsh/defconfig          |  2 +-
 configs/olimexino-stm32/can/defconfig         |  2 +-
 configs/olimexino-stm32/composite/defconfig   |  2 +-
 configs/olimexino-stm32/nsh/defconfig         |  2 +-
 configs/olimexino-stm32/smallnsh/defconfig    |  2 +-
 configs/olimexino-stm32/src/stm32_leds.c      |  2 +-
 configs/olimexino-stm32/src/stm32_spi.c       |  2 +-
 configs/olimexino-stm32/tiny/defconfig        |  2 +-
 configs/open1788/README.txt                   |  6 +-
 configs/open1788/knsh/defconfig               |  2 +-
 configs/open1788/nsh/defconfig                |  2 +-
 configs/open1788/nxlines/defconfig            |  2 +-
 configs/open1788/src/lpc17_autoleds.c         |  2 +-
 configs/open1788/src/lpc17_userleds.c         |  2 +-
 configs/p112/ostest/defconfig                 |  2 +-
 configs/pcblogic-pic32mx/README.txt           |  4 +-
 configs/pcblogic-pic32mx/nsh/defconfig        |  2 +-
 .../pcblogic-pic32mx/src/pic32mx_lcd1602.c    |  2 +-
 configs/pcduino-a10/nsh/defconfig             |  2 +-
 configs/pcduino-a10/src/a1x_leds.c            |  2 +-
 configs/pic32mx-starterkit/README.txt         |  4 +-
 configs/pic32mx-starterkit/nsh/defconfig      |  2 +-
 configs/pic32mx-starterkit/nsh2/defconfig     |  2 +-
 configs/pic32mx-starterkit/src/pic32mx_leds.c |  2 +-
 configs/pic32mx-starterkit/src/pic32mx_spi.c  |  2 +-
 configs/pic32mx7mmb/README.txt                |  4 +-
 configs/pic32mx7mmb/nsh/defconfig             |  2 +-
 configs/pic32mx7mmb/src/pic32_leds.c          |  2 +-
 configs/pic32mx7mmb/src/pic32_mio283qt2.c     |  2 +-
 configs/pic32mx7mmb/src/pic32_spi.c           |  2 +-
 configs/pic32mz-starterkit/nsh/Make.defs      |  2 +-
 configs/pic32mz-starterkit/nsh/defconfig      |  2 +-
 .../pic32mz-starterkit/src/pic32mz_autoleds.c |  2 +-
 .../pic32mz-starterkit/src/pic32mz_userleds.c |  2 +-
 configs/pirelli_dpl10/nsh_highram/defconfig   |  2 +-
 configs/qemu-i486/nsh/defconfig               |  2 +-
 configs/qemu-i486/ostest/defconfig            |  2 +-
 configs/rgmp/arm/default/defconfig            |  2 +-
 configs/rgmp/arm/nsh/defconfig                |  2 +-
 configs/rgmp/x86/cxxtest/defconfig            |  2 +-
 configs/rgmp/x86/default/defconfig            |  2 +-
 configs/rgmp/x86/helloxx/defconfig            |  2 +-
 configs/rgmp/x86/nsh/defconfig                |  2 +-
 configs/sabre-6quad/README.txt                |  2 +-
 configs/sabre-6quad/nsh/defconfig             |  2 +-
 configs/sabre-6quad/smp/defconfig             |  2 +-
 configs/sabre-6quad/src/imx_autoleds.c        |  2 +-
 configs/sam3u-ek/README.txt                   |  4 +-
 configs/sam3u-ek/knsh/defconfig               |  2 +-
 configs/sam3u-ek/nsh/defconfig                |  2 +-
 configs/sam3u-ek/nx/defconfig                 |  2 +-
 configs/sam3u-ek/nxwm/defconfig               |  2 +-
 configs/sam3u-ek/src/sam_lcd.c                |  2 +-
 configs/sam3u-ek/src/sam_leds.c               |  2 +-
 configs/sam3u-ek/src/sam_spi.c                |  2 +-
 configs/sam4e-ek/README.txt                   | 12 +--
 configs/sam4e-ek/nsh/defconfig                |  2 +-
 configs/sam4e-ek/nxwm/defconfig               |  2 +-
 configs/sam4e-ek/src/sam_ili9325.c            |  2 +-
 configs/sam4e-ek/src/sam_ili9341.c            |  2 +-
 configs/sam4e-ek/src/sam_leds.c               |  2 +-
 configs/sam4e-ek/src/sam_spi.c                |  2 +-
 configs/sam4e-ek/usbnsh/defconfig             |  2 +-
 configs/sam4l-xplained/nsh/defconfig          |  2 +-
 configs/sam4l-xplained/src/sam_autoleds.c     |  2 +-
 configs/sam4l-xplained/src/sam_slcd.c         |  2 +-
 configs/sam4l-xplained/src/sam_spi.c          |  2 +-
 configs/sam4l-xplained/src/sam_userleds.c     |  2 +-
 configs/sam4s-xplained-pro/nsh/defconfig      |  2 +-
 configs/sam4s-xplained-pro/src/sam_autoleds.c |  2 +-
 configs/sam4s-xplained-pro/src/sam_tc.c       |  2 +-
 configs/sam4s-xplained-pro/src/sam_userleds.c |  2 +-
 configs/sam4s-xplained-pro/src/sam_wdt.c      |  2 +-
 configs/sam4s-xplained/nsh/defconfig          |  2 +-
 configs/sam4s-xplained/src/sam_autoleds.c     |  2 +-
 configs/sam4s-xplained/src/sam_userleds.c     |  2 +-
 configs/sama5d2-xult/nsh/defconfig            |  2 +-
 configs/sama5d2-xult/src/sam_autoleds.c       |  2 +-
 configs/sama5d2-xult/src/sam_userleds.c       |  2 +-
 configs/sama5d3-xplained/README.txt           |  4 +-
 configs/sama5d3-xplained/bridge/defconfig     |  2 +-
 configs/sama5d3-xplained/nsh/defconfig        |  2 +-
 configs/sama5d3-xplained/src/sam_autoleds.c   |  2 +-
 configs/sama5d3-xplained/src/sam_spi.c        |  2 +-
 configs/sama5d3-xplained/src/sam_userleds.c   |  2 +-
 configs/sama5d3x-ek/README.txt                |  4 +-
 configs/sama5d3x-ek/demo/defconfig            |  2 +-
 configs/sama5d3x-ek/hello/defconfig           |  2 +-
 configs/sama5d3x-ek/norboot/defconfig         |  2 +-
 configs/sama5d3x-ek/nsh/defconfig             |  2 +-
 configs/sama5d3x-ek/nx/defconfig              |  2 +-
 configs/sama5d3x-ek/nxplayer/defconfig        |  2 +-
 configs/sama5d3x-ek/nxwm/defconfig            |  2 +-
 configs/sama5d3x-ek/ov2640/defconfig          |  2 +-
 configs/sama5d3x-ek/src/sam_autoleds.c        |  2 +-
 configs/sama5d3x-ek/src/sam_spi.c             |  2 +-
 configs/sama5d3x-ek/src/sam_userleds.c        |  2 +-
 configs/sama5d4-ek/README.txt                 |  4 +-
 configs/sama5d4-ek/at25boot/defconfig         |  2 +-
 configs/sama5d4-ek/bridge/defconfig           |  2 +-
 configs/sama5d4-ek/dramboot/defconfig         |  2 +-
 configs/sama5d4-ek/elf/defconfig              |  2 +-
 configs/sama5d4-ek/ipv6/defconfig             |  2 +-
 configs/sama5d4-ek/knsh/defconfig             |  2 +-
 configs/sama5d4-ek/knsh/defconfig.ROMFS       |  2 +-
 configs/sama5d4-ek/nsh/defconfig              |  2 +-
 configs/sama5d4-ek/nxwm/defconfig             |  2 +-
 configs/sama5d4-ek/ramtest/defconfig          |  2 +-
 configs/sama5d4-ek/src/sam_autoleds.c         |  2 +-
 configs/sama5d4-ek/src/sam_spi.c              |  2 +-
 configs/sama5d4-ek/src/sam_userleds.c         |  2 +-
 configs/samd20-xplained/nsh/defconfig         |  2 +-
 configs/samd20-xplained/src/sam_autoleds.c    |  2 +-
 configs/samd20-xplained/src/sam_spi.c         |  2 +-
 configs/samd20-xplained/src/sam_userleds.c    |  2 +-
 configs/samd21-xplained/nsh/defconfig         |  2 +-
 configs/samd21-xplained/src/sam_autoleds.c    |  2 +-
 configs/samd21-xplained/src/sam_spi.c         |  2 +-
 configs/samd21-xplained/src/sam_userleds.c    |  2 +-
 configs/same70-xplained/README.txt            |  4 +-
 configs/same70-xplained/netnsh/defconfig      |  2 +-
 configs/same70-xplained/nsh/defconfig         |  2 +-
 configs/same70-xplained/src/sam_autoleds.c    |  2 +-
 configs/same70-xplained/src/sam_spi.c         |  2 +-
 configs/saml21-xplained/nsh/defconfig         |  2 +-
 configs/saml21-xplained/src/sam_autoleds.c    |  2 +-
 configs/saml21-xplained/src/sam_spi.c         |  2 +-
 configs/saml21-xplained/src/sam_userleds.c    |  2 +-
 configs/samv71-xult/README.txt                |  4 +-
 configs/samv71-xult/knsh/defconfig            |  2 +-
 configs/samv71-xult/module/defconfig          |  2 +-
 configs/samv71-xult/mxtxplnd/defconfig        |  2 +-
 configs/samv71-xult/netnsh/defconfig          |  2 +-
 configs/samv71-xult/nsh/defconfig             |  2 +-
 configs/samv71-xult/nxwm/defconfig            |  2 +-
 configs/samv71-xult/src/sam_autoleds.c        |  2 +-
 configs/samv71-xult/src/sam_ili9488.c         |  2 +-
 configs/samv71-xult/src/sam_spi.c             |  2 +-
 configs/samv71-xult/vnc/defconfig             |  2 +-
 configs/samv71-xult/vnxwm/defconfig           |  2 +-
 configs/shenzhou/README.txt                   |  6 +-
 configs/shenzhou/nsh/defconfig                |  2 +-
 configs/shenzhou/nxwm/defconfig               |  2 +-
 configs/shenzhou/src/stm32_autoleds.c         |  2 +-
 configs/shenzhou/src/stm32_ili93xx.c          |  2 +-
 configs/shenzhou/src/stm32_spi.c              |  4 +-
 configs/shenzhou/src/stm32_ssd1289.c          |  2 +-
 configs/shenzhou/src/stm32_userleds.c         |  2 +-
 configs/shenzhou/thttpd/defconfig             |  2 +-
 configs/sim/bas/defconfig                     |  2 +-
 configs/sim/configdata/defconfig              |  2 +-
 configs/sim/cxxtest/defconfig                 |  2 +-
 configs/sim/mount/defconfig                   |  2 +-
 configs/sim/mtdpart/defconfig                 |  2 +-
 configs/sim/mtdrwb/defconfig                  |  2 +-
 configs/sim/nettest/defconfig                 |  2 +-
 configs/sim/nsh/defconfig                     |  2 +-
 configs/sim/nsh2/defconfig                    |  2 +-
 configs/sim/nx/defconfig                      |  2 +-
 configs/sim/nx11/defconfig                    |  2 +-
 configs/sim/nxffs/defconfig                   |  2 +-
 configs/sim/nxlines/defconfig                 |  2 +-
 configs/sim/nxwm/defconfig                    |  2 +-
 configs/sim/ostest/defconfig                  |  2 +-
 configs/sim/pashello/defconfig                |  2 +-
 configs/sim/touchscreen/defconfig             |  2 +-
 configs/sim/traveler/defconfig                |  2 +-
 configs/sim/udgram/defconfig                  |  2 +-
 configs/sim/unionfs/defconfig                 |  2 +-
 configs/sim/ustream/defconfig                 |  2 +-
 configs/skp16c26/ostest/defconfig             |  2 +-
 configs/spark/composite/defconfig             |  2 +-
 configs/spark/nsh/defconfig                   |  2 +-
 configs/spark/src/stm32_autoleds.c            |  2 +-
 configs/spark/src/stm32_spi.c                 |  2 +-
 configs/spark/src/stm32_userleds.c            |  2 +-
 configs/spark/usbmsc/defconfig                |  2 +-
 configs/spark/usbnsh/defconfig                |  2 +-
 configs/spark/usbserial/defconfig             |  2 +-
 configs/stm3210e-eval/README.txt              |  6 +-
 configs/stm3210e-eval/buttons/defconfig       |  2 +-
 configs/stm3210e-eval/composite/defconfig     |  2 +-
 configs/stm3210e-eval/nsh/defconfig           |  2 +-
 configs/stm3210e-eval/nsh2/defconfig          |  2 +-
 configs/stm3210e-eval/nx/defconfig            |  2 +-
 configs/stm3210e-eval/nxterm/defconfig        |  2 +-
 configs/stm3210e-eval/pm/defconfig            |  2 +-
 configs/stm3210e-eval/src/stm32_lcd.c         |  2 +-
 configs/stm3210e-eval/src/stm32_leds.c        |  2 +-
 configs/stm3210e-eval/src/stm32_spi.c         |  2 +-
 configs/stm3210e-eval/usbmsc/defconfig        |  2 +-
 configs/stm3210e-eval/usbserial/defconfig     |  2 +-
 configs/stm3220g-eval/README.txt              |  8 +-
 configs/stm3220g-eval/dhcpd/defconfig         |  2 +-
 configs/stm3220g-eval/nettest/defconfig       |  2 +-
 configs/stm3220g-eval/nsh/defconfig           |  2 +-
 configs/stm3220g-eval/nsh2/defconfig          |  2 +-
 configs/stm3220g-eval/nxwm/defconfig          |  2 +-
 configs/stm3220g-eval/src/stm32_autoleds.c    |  2 +-
 configs/stm3220g-eval/src/stm32_lcd.c         |  2 +-
 configs/stm3220g-eval/src/stm32_spi.c         |  2 +-
 configs/stm3220g-eval/src/stm32_userleds.c    |  2 +-
 configs/stm3220g-eval/telnetd/defconfig       |  2 +-
 configs/stm3240g-eval/README.txt              |  8 +-
 configs/stm3240g-eval/dhcpd/defconfig         |  2 +-
 configs/stm3240g-eval/discover/defconfig      |  2 +-
 configs/stm3240g-eval/knxwm/defconfig         |  2 +-
 configs/stm3240g-eval/nettest/defconfig       |  2 +-
 configs/stm3240g-eval/nsh/defconfig           |  2 +-
 configs/stm3240g-eval/nsh2/defconfig          |  2 +-
 configs/stm3240g-eval/nxterm/defconfig        |  2 +-
 configs/stm3240g-eval/nxwm/defconfig          |  2 +-
 configs/stm3240g-eval/src/stm32_autoleds.c    |  2 +-
 configs/stm3240g-eval/src/stm32_lcd.c         |  2 +-
 configs/stm3240g-eval/src/stm32_spi.c         |  2 +-
 configs/stm3240g-eval/src/stm32_userleds.c    |  2 +-
 configs/stm3240g-eval/telnetd/defconfig       |  2 +-
 configs/stm3240g-eval/webserver/defconfig     |  2 +-
 configs/stm3240g-eval/xmlrpc/defconfig        |  2 +-
 configs/stm32_tiny/README.txt                 |  2 +-
 configs/stm32_tiny/nsh/defconfig              |  2 +-
 configs/stm32_tiny/src/stm32_leds.c           |  2 +-
 configs/stm32_tiny/src/stm32_spi.c            |  4 +-
 configs/stm32_tiny/usbnsh/defconfig           |  2 +-
 configs/stm32f103-minimum/README.txt          |  2 +-
 configs/stm32f103-minimum/minnsh/defconfig    |  2 +-
 configs/stm32f103-minimum/nsh/defconfig       |  2 +-
 .../stm32f103-minimum/src/stm32_autoleds.c    |  2 +-
 configs/stm32f103-minimum/src/stm32_spi.c     |  4 +-
 configs/stm32f103-minimum/usbnsh/defconfig    |  2 +-
 configs/stm32f3discovery/README.txt           |  2 +-
 configs/stm32f3discovery/nsh/defconfig        |  2 +-
 configs/stm32f3discovery/src/stm32_autoleds.c |  2 +-
 configs/stm32f3discovery/src/stm32_spi.c      |  2 +-
 configs/stm32f3discovery/src/stm32_userleds.c |  2 +-
 configs/stm32f3discovery/usbnsh/defconfig     |  2 +-
 configs/stm32f411e-disco/nsh/defconfig        |  2 +-
 configs/stm32f429i-disco/README.txt           |  6 +-
 configs/stm32f429i-disco/extflash/defconfig   |  2 +-
 configs/stm32f429i-disco/lcd/defconfig        |  2 +-
 configs/stm32f429i-disco/ltdc/defconfig       |  2 +-
 configs/stm32f429i-disco/nsh/defconfig        |  2 +-
 configs/stm32f429i-disco/src/stm32_autoleds.c |  2 +-
 configs/stm32f429i-disco/src/stm32_spi.c      |  2 +-
 configs/stm32f429i-disco/src/stm32_userleds.c |  2 +-
 configs/stm32f429i-disco/usbmsc/defconfig     |  2 +-
 configs/stm32f429i-disco/usbnsh/defconfig     |  2 +-
 configs/stm32f4discovery/README.txt           |  6 +-
 configs/stm32f4discovery/cxxtest/defconfig    |  2 +-
 configs/stm32f4discovery/elf/defconfig        |  2 +-
 configs/stm32f4discovery/ipv6/defconfig       |  2 +-
 configs/stm32f4discovery/kostest/defconfig    |  2 +-
 configs/stm32f4discovery/netnsh/defconfig     |  2 +-
 configs/stm32f4discovery/nsh/defconfig        |  2 +-
 configs/stm32f4discovery/nxlines/defconfig    |  2 +-
 configs/stm32f4discovery/pm/defconfig         |  2 +-
 .../stm32f4discovery/posix_spawn/defconfig    |  2 +-
 configs/stm32f4discovery/rgbled/defconfig     |  2 +-
 configs/stm32f4discovery/src/stm32_autoleds.c |  2 +-
 configs/stm32f4discovery/src/stm32_spi.c      |  2 +-
 configs/stm32f4discovery/src/stm32_ssd1289.c  |  2 +-
 configs/stm32f4discovery/src/stm32_userleds.c |  2 +-
 configs/stm32f4discovery/uavcan/defconfig     |  2 +-
 configs/stm32f4discovery/usbnsh/defconfig     |  2 +-
 configs/stm32f4discovery/winbuild/defconfig   |  2 +-
 configs/stm32f746g-disco/README.txt           |  6 +-
 configs/stm32f746g-disco/knsh/defconfig       |  2 +-
 configs/stm32f746g-disco/netnsh/defconfig     |  2 +-
 configs/stm32f746g-disco/nsh/defconfig        |  2 +-
 configs/stm32f746g-disco/src/stm32_autoleds.c |  2 +-
 configs/stm32f746g-disco/src/stm32_userleds.c |  2 +-
 configs/stm32l476vg-disco/nsh/defconfig       |  2 +-
 .../stm32l476vg-disco/src/stm32_autoleds.c    |  2 +-
 configs/stm32l476vg-disco/src/stm32_spi.c     |  2 +-
 .../stm32l476vg-disco/src/stm32_userleds.c    |  2 +-
 configs/stm32ldiscovery/README.txt            |  6 +-
 configs/stm32ldiscovery/nsh/defconfig         |  2 +-
 configs/stm32ldiscovery/src/stm32_autoleds.c  |  2 +-
 configs/stm32ldiscovery/src/stm32_lcd.c       |  2 +-
 configs/stm32ldiscovery/src/stm32_spi.c       |  2 +-
 configs/stm32ldiscovery/src/stm32_userleds.c  |  2 +-
 configs/stm32vldiscovery/README.txt           |  2 +-
 configs/stm32vldiscovery/nsh/defconfig        |  2 +-
 configs/stm32vldiscovery/src/stm32_leds.c     |  2 +-
 configs/sure-pic32mx/README.txt               |  8 +-
 configs/sure-pic32mx/nsh/defconfig            |  2 +-
 configs/sure-pic32mx/src/pic32mx_autoleds.c   |  2 +-
 configs/sure-pic32mx/src/pic32mx_lcd1602.c    |  2 +-
 configs/sure-pic32mx/src/pic32mx_spi.c        |  4 +-
 configs/sure-pic32mx/usbnsh/defconfig         |  2 +-
 configs/teensy-2.0/hello/defconfig            |  2 +-
 configs/teensy-2.0/nsh/defconfig              |  2 +-
 configs/teensy-2.0/src/at90usb_leds.c         |  2 +-
 configs/teensy-2.0/src/at90usb_spi.c          |  2 +-
 configs/teensy-2.0/usbmsc/defconfig           |  2 +-
 configs/teensy-3.x/nsh/defconfig              |  2 +-
 configs/teensy-3.x/src/k20_spi.c              |  2 +-
 configs/teensy-3.x/usbnsh/defconfig           |  2 +-
 configs/teensy-lc/nsh/defconfig               |  2 +-
 configs/teensy-lc/src/kl_led.c                |  2 +-
 configs/teensy-lc/src/kl_spi.c                |  2 +-
 configs/tm4c123g-launchpad/nsh/defconfig      |  2 +-
 .../tm4c123g-launchpad/src/tm4c_autoleds.c    |  2 +-
 configs/tm4c123g-launchpad/src/tm4c_ssi.c     |  2 +-
 configs/tm4c1294-launchpad/ipv6/defconfig     |  2 +-
 configs/tm4c1294-launchpad/nsh/defconfig      |  2 +-
 .../tm4c1294-launchpad/src/tm4c_userleds.c    |  2 +-
 configs/twr-k60n512/nsh/defconfig             |  2 +-
 configs/twr-k60n512/src/k60_leds.c            |  2 +-
 configs/twr-k60n512/src/k60_spi.c             |  2 +-
 configs/u-blox-c027/nsh/defconfig             |  2 +-
 configs/u-blox-c027/src/lpc17_leds.c          |  2 +-
 configs/u-blox-c027/src/lpc17_ssp.c           |  2 +-
 configs/ubw32/nsh/defconfig                   |  2 +-
 configs/ubw32/src/pic32_leds.c                |  2 +-
 configs/us7032evb1/nsh/defconfig              |  2 +-
 configs/us7032evb1/ostest/defconfig           |  2 +-
 configs/viewtool-stm32f107/README.txt         |  4 +-
 configs/viewtool-stm32f107/highpri/defconfig  |  2 +-
 configs/viewtool-stm32f107/netnsh/defconfig   |  2 +-
 configs/viewtool-stm32f107/nsh/defconfig      |  2 +-
 configs/viewtool-stm32f107/src/stm32_leds.c   |  2 +-
 configs/viewtool-stm32f107/src/stm32_spi.c    |  2 +-
 .../viewtool-stm32f107/src/stm32_ssd1289.c    |  2 +-
 configs/xtrs/nsh/defconfig                    |  2 +-
 configs/xtrs/ostest/defconfig                 |  2 +-
 configs/xtrs/pashello/defconfig               |  2 +-
 configs/z16f2800100zcog/nsh/defconfig         |  2 +-
 configs/z16f2800100zcog/ostest/defconfig      |  2 +-
 configs/z16f2800100zcog/pashello/defconfig    |  2 +-
 configs/z80sim/nsh/defconfig                  |  2 +-
 configs/z80sim/ostest/defconfig               |  2 +-
 configs/z80sim/pashello/defconfig             |  2 +-
 configs/z8encore000zco/ostest/defconfig       |  2 +-
 configs/z8f64200100kit/ostest/defconfig       |  2 +-
 configs/zkit-arm-1769/README.txt              |  4 +-
 configs/zkit-arm-1769/hello/defconfig         |  2 +-
 configs/zkit-arm-1769/nsh/defconfig           |  2 +-
 configs/zkit-arm-1769/nxhello/defconfig       |  2 +-
 configs/zkit-arm-1769/src/lpc17_appinit.c     |  4 +-
 configs/zkit-arm-1769/src/lpc17_lcd.c         |  2 +-
 configs/zkit-arm-1769/src/lpc17_leds.c        |  2 +-
 configs/zkit-arm-1769/src/lpc17_spi.c         |  2 +-
 configs/zkit-arm-1769/src/lpc17_ssp.c         |  2 +-
 configs/zkit-arm-1769/thttpd/defconfig        |  2 +-
 configs/zp214xpa/nsh/Make.defs                |  4 +-
 configs/zp214xpa/nsh/defconfig                |  2 +-
 configs/zp214xpa/nxlines/Make.defs            |  4 +-
 configs/zp214xpa/nxlines/defconfig            |  2 +-
 configs/zp214xpa/src/lpc2148_spi1.c           |  2 +-
 drivers/analog/ads1242.c                      | 16 ++--
 drivers/analog/pga11x.c                       |  2 +-
 drivers/audio/i2schar.c                       |  2 +-
 drivers/bch/bchdev_unregister.c               |  2 +-
 drivers/i2c/i2c_driver.c                      |  2 +-
 drivers/input/Kconfig                         |  2 +-
 drivers/input/ajoystick.c                     |  2 +-
 drivers/input/button_upper.c                  |  2 +-
 drivers/input/djoystick.c                     |  2 +-
 drivers/input/mxt.h                           |  2 +-
 drivers/input/stmpe811_tsc.c                  |  2 +-
 drivers/lcd/mio283qt2.c                       |  2 +-
 drivers/lcd/mio283qt9a.c                      |  2 +-
 drivers/lcd/nokia6100.c                       |  2 +-
 drivers/lcd/p14201.c                          |  2 +-
 drivers/lcd/ra8875.c                          |  2 +-
 drivers/lcd/skeleton.c                        |  2 +-
 drivers/lcd/ssd1289.c                         |  2 +-
 drivers/lcd/ssd1306_base.c                    |  2 +-
 drivers/lcd/st7565.c                          |  4 +-
 drivers/lcd/st7567.c                          |  4 +-
 drivers/lcd/ug-2864ambag01.c                  |  2 +-
 drivers/lcd/ug-9664hswag01.c                  |  2 +-
 drivers/leds/userled_upper.c                  |  2 +-
 drivers/loop/losetup.c                        |  4 +-
 drivers/mmcsd/mmcsd_sdio.c                    | 24 +++---
 drivers/mmcsd/mmcsd_spi.c                     | 22 +++---
 drivers/mtd/filemtd.c                         |  2 +-
 drivers/mtd/ftl.c                             |  4 +-
 drivers/mtd/rammtd.c                          |  2 +-
 drivers/mtd/smart.c                           |  6 +-
 drivers/mtd/sst39vf.c                         |  2 +-
 drivers/net/Kconfig                           | 16 ++--
 drivers/net/cs89x0.c                          |  4 +-
 drivers/net/enc28j60.c                        |  2 +-
 drivers/net/encx24j600.c                      |  2 +-
 drivers/net/telnet.c                          |  2 +-
 drivers/net/vnet.c                            |  8 +-
 drivers/pipes/pipe_common.c                   |  6 +-
 drivers/ramdisk.c                             |  2 +-
 drivers/sensors/Kconfig                       |  2 +-
 drivers/serial/Kconfig                        |  2 +-
 drivers/serial/serial.c                       |  4 +-
 drivers/spi/spi_bitbang.c                     |  2 +-
 drivers/syslog/ramlog.c                       |  2 +-
 drivers/timers/Kconfig                        |  4 +-
 drivers/timers/ds3231.c                       |  2 +-
 drivers/timers/pcf85263.c                     |  2 +-
 drivers/usbdev/cdcacm.c                       | 34 ++++-----
 drivers/usbdev/composite.c                    | 20 ++---
 drivers/usbdev/pl2303.c                       | 34 ++++-----
 drivers/usbdev/usbdev_trace.c                 | 12 +--
 drivers/usbdev/usbmsc.c                       | 38 +++++-----
 drivers/usbhost/usbhost_trace.c               |  4 +-
 drivers/video/Kconfig                         |  2 +-
 drivers/wireless/cc3000/cc3000.c              |  2 +-
 drivers/wireless/cc3000/cc3000.h              |  2 +-
 fs/Kconfig                                    |  2 +-
 fs/driver/fs_closeblockdriver.c               |  2 +-
 fs/driver/fs_devsyslog.c                      |  2 +-
 fs/driver/fs_findblockdriver.c                |  2 +-
 fs/driver/fs_openblockdriver.c                |  2 +-
 fs/fat/fs_configfat.c                         |  2 +-
 fs/fat/fs_mkfatfs.c                           |  4 +-
 fs/mmap/fs_mmap.c                             |  2 +-
 fs/nxffs/nxffs_dump.c                         | 12 +--
 fs/nxffs/nxffs_initialize.c                   |  4 +-
 fs/nxffs/nxffs_open.c                         |  4 +-
 fs/romfs/fs_romfs.c                           |  2 +-
 fs/romfs/fs_romfsutil.c                       |  2 +-
 graphics/nxbe/nxbe_bitmap.c                   |  2 +-
 graphics/nxbe/nxbe_closewindow.c              |  2 +-
 graphics/nxbe/nxbe_configure.c                |  2 +-
 graphics/nxbe/nxbe_fill.c                     |  2 +-
 graphics/nxbe/nxbe_filltrapezoid.c            |  2 +-
 graphics/nxbe/nxbe_getrectangle.c             |  2 +-
 graphics/nxbe/nxbe_move.c                     |  2 +-
 graphics/nxbe/nxbe_setpixel.c                 |  2 +-
 graphics/nxbe/nxbe_setposition.c              |  2 +-
 graphics/nxbe/nxbe_setsize.c                  |  2 +-
 graphics/nxmu/nxmu_releasebkgd.c              |  2 +-
 graphics/nxmu/nxmu_requestbkgd.c              |  2 +-
 graphics/nxmu/nxmu_sendclient.c               |  2 +-
 graphics/nxmu/nxmu_sendclientwindow.c         |  2 +-
 graphics/nxmu/nxmu_server.c                   |  2 +-
 graphics/nxsu/nx_bitmap.c                     |  2 +-
 graphics/nxsu/nx_closewindow.c                |  2 +-
 graphics/nxsu/nx_constructwindow.c            |  2 +-
 graphics/nxsu/nx_fill.c                       |  2 +-
 graphics/nxsu/nx_filltrapezoid.c              |  2 +-
 graphics/nxsu/nx_getposition.c                |  2 +-
 graphics/nxsu/nx_getrectangle.c               |  2 +-
 graphics/nxsu/nx_lower.c                      |  2 +-
 graphics/nxsu/nx_move.c                       |  2 +-
 graphics/nxsu/nx_open.c                       |  2 +-
 graphics/nxsu/nx_openwindow.c                 |  2 +-
 graphics/nxsu/nx_raise.c                      |  2 +-
 graphics/nxsu/nx_releasebkgd.c                |  2 +-
 graphics/nxsu/nx_requestbkgd.c                |  2 +-
 graphics/nxsu/nx_setbgcolor.c                 |  2 +-
 graphics/nxsu/nx_setpixel.c                   |  2 +-
 graphics/nxsu/nx_setposition.c                |  2 +-
 graphics/nxsu/nx_setsize.c                    |  2 +-
 graphics/nxsu/nxsu_redrawreq.c                |  2 +-
 graphics/nxsu/nxsu_reportposition.c           |  2 +-
 graphics/nxterm/Make.defs                     |  2 +-
 graphics/nxterm/nxterm.h                      |  4 +-
 graphics/nxterm/nxterm_kbdin.c                |  2 +-
 graphics/nxterm/nxterm_register.c             |  2 +-
 graphics/nxterm/nxterm_sem.c                  |  4 +-
 graphics/vnc/server/Kconfig                   |  2 +-
 graphics/vnc/server/vnc_fbdev.c               | 12 ++-
 graphics/vnc/server/vnc_negotiate.c           | 10 ++-
 graphics/vnc/server/vnc_raw.c                 | 10 ++-
 graphics/vnc/server/vnc_receiver.c            | 10 ++-
 graphics/vnc/server/vnc_rre.c                 | 10 ++-
 graphics/vnc/server/vnc_server.c              | 10 ++-
 graphics/vnc/server/vnc_updater.c             | 10 ++-
 include/debug.h                               | 16 ++--
 include/nuttx/analog/pga11x.h                 |  2 +-
 include/nuttx/audio/audio.h                   |  2 +-
 include/nuttx/fs/nxffs.h                      |  2 +-
 include/nuttx/input/stmpe811.h                |  4 +-
 include/nuttx/mm/mm.h                         |  2 +-
 include/nuttx/net/iob.h                       |  2 +-
 include/nuttx/pwm.h                           |  2 +-
 include/nuttx/sensors/adxl345.h               |  2 +-
 include/nuttx/sensors/bmp180.h                |  2 +-
 include/nuttx/sensors/mpl115a.h               |  2 +-
 include/nuttx/spi/spi_bitbang.c               |  2 +-
 include/nuttx/spi/spi_bitbang.h               |  2 +-
 include/nuttx/timers/cs2100-cp.h              |  2 +-
 include/nuttx/usb/usbdev_trace.h              |  4 +-
 include/nuttx/usb/usbhost_trace.h             |  4 +-
 include/spawn.h                               |  4 +-
 libc/libc.csv                                 | 10 ++-
 libc/misc/Make.defs                           |  2 +-
 libc/misc/lib_dbg.c                           |  4 +-
 libc/misc/lib_slcddecode.c                    |  2 +-
 libc/spawn/Make.defs                          |  4 +-
 libc/spawn/lib_psa_dump.c                     |  4 +-
 libc/spawn/lib_psfa_dump.c                    |  4 +-
 libc/stdio/lib_fgetpos.c                      |  2 +-
 libc/stdio/lib_fputs.c                        |  6 +-
 libc/stdio/lib_fsetpos.c                      |  2 +-
 libc/stdio/lib_wrflush.c                      |  4 +-
 libc/string/lib_strpbrk.c                     |  2 +-
 libc/time/lib_gettimeofday.c                  |  2 +-
 libc/time/lib_settimeofday.c                  |  2 +-
 libc/unistd/lib_getcwd.c                      |  2 +-
 libnx/nx/nx_drawline.c                        |  2 +-
 libnx/nxmu/nx_bitmap.c                        |  2 +-
 libnx/nxmu/nx_block.c                         |  2 +-
 libnx/nxmu/nx_connect.c                       |  2 +-
 libnx/nxmu/nx_constructwindow.c               |  2 +-
 libnx/nxmu/nx_fill.c                          |  2 +-
 libnx/nxmu/nx_filltrapezoid.c                 |  2 +-
 libnx/nxmu/nx_getposition.c                   |  2 +-
 libnx/nxmu/nx_getrectangle.c                  |  2 +-
 libnx/nxmu/nx_move.c                          |  2 +-
 libnx/nxmu/nx_openwindow.c                    |  2 +-
 libnx/nxmu/nx_releasebkgd.c                   |  2 +-
 libnx/nxmu/nx_requestbkgd.c                   |  2 +-
 libnx/nxmu/nx_setbgcolor.c                    |  2 +-
 libnx/nxmu/nx_setpixel.c                      |  2 +-
 libnx/nxmu/nx_setposition.c                   |  2 +-
 libnx/nxmu/nx_setsize.c                       |  2 +-
 libnx/nxmu/nxmu_sendserver.c                  |  2 +-
 libnx/nxmu/nxmu_sendwindow.c                  |  2 +-
 libnx/nxtk/nxtk_bitmaptoolbar.c               |  2 +-
 libnx/nxtk/nxtk_bitmapwindow.c                |  2 +-
 libnx/nxtk/nxtk_drawlinetoolbar.c             |  2 +-
 libnx/nxtk/nxtk_drawlinewindow.c              |  2 +-
 libnx/nxtk/nxtk_filltoolbar.c                 |  2 +-
 libnx/nxtk/nxtk_filltraptoolbar.c             |  2 +-
 libnx/nxtk/nxtk_filltrapwindow.c              |  2 +-
 libnx/nxtk/nxtk_fillwindow.c                  |  2 +-
 libnx/nxtk/nxtk_gettoolbar.c                  |  2 +-
 libnx/nxtk/nxtk_getwindow.c                   |  2 +-
 libnx/nxtk/nxtk_movetoolbar.c                 |  2 +-
 libnx/nxtk/nxtk_movewindow.c                  |  2 +-
 libnx/nxtk/nxtk_opentoolbar.c                 |  2 +-
 libnx/nxtk/nxtk_openwindow.c                  |  2 +-
 libnx/nxtk/nxtk_setsize.c                     |  2 +-
 libxx/libxx_new.cxx                           |  2 +-
 libxx/libxx_newa.cxx                          |  2 +-
 mm/Kconfig                                    |  4 +-
 mm/kmm_heap/Make.defs                         |  2 +-
 mm/kmm_heap/kmm_heapmember.c                  |  4 +-
 mm/kmm_heap/kmm_kernel.c                      |  2 +-
 mm/mm_heap/mm_sem.c                           |  6 +-
 net/arp/Kconfig                               |  2 +-
 net/arp/arp.h                                 |  2 +-
 net/devif/devif_callback.c                    |  4 +-
 net/iob/Kconfig                               |  2 +-
 net/iob/Make.defs                             |  2 +-
 net/iob/iob_add_queue.c                       |  2 +-
 net/iob/iob_alloc.c                           |  2 +-
 net/iob/iob_alloc_qentry.c                    |  2 +-
 net/iob/iob_clone.c                           |  2 +-
 net/iob/iob_concat.c                          |  2 +-
 net/iob/iob_contig.c                          |  2 +-
 net/iob/iob_copyin.c                          |  2 +-
 net/iob/iob_copyout.c                         |  2 +-
 net/iob/iob_dump.c                            |  4 +-
 net/iob/iob_free.c                            |  2 +-
 net/iob/iob_free_chain.c                      |  2 +-
 net/iob/iob_free_qentry.c                     |  2 +-
 net/iob/iob_free_queue.c                      |  2 +-
 net/iob/iob_initialize.c                      |  2 +-
 net/iob/iob_pack.c                            |  2 +-
 net/iob/iob_peek_queue.c                      |  2 +-
 net/iob/iob_remove_queue.c                    |  2 +-
 net/iob/iob_trimhead.c                        |  2 +-
 net/iob/iob_trimhead_queue.c                  |  2 +-
 net/iob/iob_trimtail.c                        |  2 +-
 net/socket/getsockname.c                      |  2 +-
 net/socket/net_sockets.c                      |  2 +-
 net/socket/recvfrom.c                         |  2 +-
 net/tcp/Kconfig                               |  2 +-
 net/tcp/Make.defs                             |  2 +-
 net/tcp/tcp.h                                 |  4 +-
 net/tcp/tcp_backlog.c                         | 10 +--
 net/tcp/tcp_netpoll.c                         |  4 +-
 net/tcp/tcp_send_buffered.c                   |  2 +-
 net/tcp/tcp_wrbuffer.c                        |  2 +-
 net/tcp/tcp_wrbuffer_dump.c                   |  4 +-
 net/udp/udp_netpoll.c                         |  4 +-
 sched/Kconfig                                 |  4 +-
 sched/group/group_childstatus.c               |  2 +-
 sched/module/mod_init.c                       |  2 +-
 sched/module/mod_insmod.c                     |  4 +-
 sched/sched/sched_waitid.c                    |  2 +-
 sched/sched/sched_waitpid.c                   |  4 +-
 sched/semaphore/sem_holder.c                  | 12 +--
 sched/semaphore/sem_timedwait.c               |  2 +-
 sched/signal/sig_nanosleep.c                  |  4 +-
 sched/task/task_vfork.c                       |  2 +-
 sched/wdog/wd_start.c                         |  2 +-
 tools/mkconfig.c                              |  2 +-
 1185 files changed, 2056 insertions(+), 2019 deletions(-)

diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index 9fc2e5e9e2..b067a8c139 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@@ -802,7 +802,7 @@
     
          
       Definitions in the Make.defs file probably depend on some of the
       settings in the .config file.  For example, the CFLAGS will most likely be
-      different if CONFIG_DEBUG=y.
+      different if CONFIG_DEBUG_FEATURES=y.
     
          
     
          
       The included tools/Config.mk file contains additional definitions that may
diff --git a/Documentation/UsbTrace.html b/Documentation/UsbTrace.html
index 03530cbfb6..a6800983d5 100644
--- a/Documentation/UsbTrace.html
+++ b/Documentation/UsbTrace.html
@@ -125,7 +125,7 @@
 
          
 
            
   
          • CONFIG_USBDEV_TRACE, or
            • 
-  
          • CONFIG_DEBUG and CONFIG_DEBUG_USB
            • 
+  
          • CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_USB
            • 
 
          
 
          Log Data Sink.
   The logged data itself may go to either (1) an internal circular buffer, or (2) may be provided on the console.
@@ -137,7 +137,7 @@
   Here is an example of USB trace output using apps/examples/usbserial for an LPC1768 platform with the following NuttX configuration settings:
 
          
 
            
-  
          • CONFIG_DEBUG, CONFIG_DEBUG_INFO, CONFIG_USB
+  
          • CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO, CONFIG_USB
   
          • CONFIG_EXAMPLES_USBSERIAL_TRACEINIT, CONFIG_EXAMPLES_USBSERIAL_TRACECLASS,
     CONFIG_EXAMPLES_USBSERIAL_TRACETRANSFERS, CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER,
     CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS
diff --git a/Kconfig b/Kconfig
index b0afa42a9c..12e8887d3b 100644
--- a/Kconfig
+++ b/Kconfig
@@ -395,7 +395,7 @@ endmenu # Customize Header Files
 
 menu "Debug Options"
 
-config DEBUG
+config DEBUG_FEATURES
 	bool "Enable Debug Features"
 	default n
 	---help---
@@ -409,7 +409,7 @@ config ARCH_HAVE_HEAPCHECK
 	bool
 	default n
 
-if DEBUG
+if DEBUG_FEATURES
 
 comment "Debug SYSLOG Output Controls"
 
@@ -707,7 +707,7 @@ config DEBUG_WATCHDOG
 		Support for this debug option is architecture-specific and may not
 		be available for some MCUs.
 
-endif # DEBUG
+endif # DEBUG_FEATURES
 
 config ARCH_HAVE_STACKCHECK
 	bool
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 6b6c046060..f31f812778 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -588,7 +588,7 @@ config ARCH_ROMPGTABLE
 config DEBUG_HARDFAULT
 	bool "Verbose Hard-Fault Debug"
 	default n
-	depends on DEBUG && (ARCH_CORTEXM3 || ARCH_CORTEXM4 || ARCH_CORTEXM7)
+	depends on DEBUG_FEATURES && (ARCH_CORTEXM3 || ARCH_CORTEXM4 || ARCH_CORTEXM7)
 	---help---
 		Enables verbose debug output when a hard fault is occurs.  This verbose
 		output is sometimes helpful when debugging difficult hard fault problems,
diff --git a/arch/arm/include/efm32/irq.h b/arch/arm/include/efm32/irq.h
index 7bd0449d62..a5f2eff8e4 100644
--- a/arch/arm/include/efm32/irq.h
+++ b/arch/arm/include/efm32/irq.h
@@ -60,7 +60,7 @@
 
 /* Processor Exceptions (vectors 0-15) */
 
-#define EFM32_IRQ_RESERVED     (0) /* Reserved vector (only used with CONFIG_DEBUG) */
+#define EFM32_IRQ_RESERVED     (0) /* Reserved vector (only used with CONFIG_DEBUG_FEATURES) */
                                    /* Vector  0: Reset stack pointer value */
                                    /* Vector  1: Reset (not handler as an IRQ) */
 #define EFM32_IRQ_NMI          (2) /* Vector  2: Non-Maskable Interrupt (NMI) */
diff --git a/arch/arm/include/kinetis/irq.h b/arch/arm/include/kinetis/irq.h
index 3355f29b02..16b59ab8ae 100644
--- a/arch/arm/include/kinetis/irq.h
+++ b/arch/arm/include/kinetis/irq.h
@@ -58,7 +58,7 @@
 
 /* Processor Exceptions (vectors 0-15) */
 
-#define KINETIS_IRQ_RESERVED      (0)   /* Reserved vector (only used with CONFIG_DEBUG) */
+#define KINETIS_IRQ_RESERVED      (0)   /* Reserved vector (only used with CONFIG_DEBUG_FEATURES) */
                                         /* Vector  0: Reset stack pointer value */
                                         /* Vector  1: Reset (not handler as an IRQ) */
 #define KINETIS_IRQ_NMI           (2)   /* Vector  2: Non-Maskable Interrupt (NMI) */
diff --git a/arch/arm/include/kl/irq.h b/arch/arm/include/kl/irq.h
index 27ba8575f5..9302182730 100644
--- a/arch/arm/include/kl/irq.h
+++ b/arch/arm/include/kl/irq.h
@@ -58,7 +58,7 @@
 
 /* Processor Exceptions (vectors 0-15) */
 
-#define KL_IRQ_RESERVED      (0)   /* Reserved vector (only used with CONFIG_DEBUG) */
+#define KL_IRQ_RESERVED      (0)   /* Reserved vector (only used with CONFIG_DEBUG_FEATURES) */
                                         /* Vector  0: Reset stack pointer value */
                                         /* Vector  1: Reset (not handler as an IRQ) */
 #define KL_IRQ_NMI           (2)   /* Vector  2: Non-Maskable Interrupt (NMI) */
diff --git a/arch/arm/include/lpc11xx/irq.h b/arch/arm/include/lpc11xx/irq.h
index caac7c3e17..46ff7d27ca 100644
--- a/arch/arm/include/lpc11xx/irq.h
+++ b/arch/arm/include/lpc11xx/irq.h
@@ -59,7 +59,7 @@
 
 /* Common Processor Exceptions (vectors 0-15) */
 
-#define LPC11_IRQ_RESERVED       (0) /* Reserved vector (only used with CONFIG_DEBUG) */
+#define LPC11_IRQ_RESERVED       (0) /* Reserved vector (only used with CONFIG_DEBUG_FEATURES) */
                                         /* Vector  0: Reset stack pointer value */
                                         /* Vector  1: Reset (not handler as an IRQ) */
 #define LPC11_IRQ_NMI            (2) /* Vector  2: Non-Maskable Interrupt (NMI) */
diff --git a/arch/arm/include/lpc17xx/irq.h b/arch/arm/include/lpc17xx/irq.h
index 6af683225c..99bffe17eb 100644
--- a/arch/arm/include/lpc17xx/irq.h
+++ b/arch/arm/include/lpc17xx/irq.h
@@ -59,7 +59,7 @@
 
 /* Common Processor Exceptions (vectors 0-15) */
 
-#define LPC17_IRQ_RESERVED       (0) /* Reserved vector (only used with CONFIG_DEBUG) */
+#define LPC17_IRQ_RESERVED       (0) /* Reserved vector (only used with CONFIG_DEBUG_FEATURES) */
                                      /* Vector  0: Reset stack pointer value */
                                      /* Vector  1: Reset (not handler as an IRQ) */
 #define LPC17_IRQ_NMI            (2) /* Vector  2: Non-Maskable Interrupt (NMI) */
diff --git a/arch/arm/include/lpc43xx/irq.h b/arch/arm/include/lpc43xx/irq.h
index 9b103e9718..dd9790ab10 100644
--- a/arch/arm/include/lpc43xx/irq.h
+++ b/arch/arm/include/lpc43xx/irq.h
@@ -59,7 +59,7 @@
 
 /* Processor Exceptions (vectors 0-15) */
 
-#define LPC43_IRQ_RESERVED         (0) /* Reserved vector (only used with CONFIG_DEBUG) */
+#define LPC43_IRQ_RESERVED         (0) /* Reserved vector (only used with CONFIG_DEBUG_FEATURES) */
                                        /* Vector  0: Reset stack pointer value */
                                        /* Vector  1: Reset (not handler as an IRQ) */
 #define LPC43_IRQ_NMI              (2) /* Vector  2: Non-Maskable Interrupt (NMI) */
diff --git a/arch/arm/include/nuc1xx/irq.h b/arch/arm/include/nuc1xx/irq.h
index 0db0379d1b..26b0d8125f 100644
--- a/arch/arm/include/nuc1xx/irq.h
+++ b/arch/arm/include/nuc1xx/irq.h
@@ -58,7 +58,7 @@
 
 /* Processor Exceptions (vectors 0-15) */
 
-#define NUC_IRQ_RESERVED       (0) /* Reserved vector (only used with CONFIG_DEBUG) */
+#define NUC_IRQ_RESERVED       (0) /* Reserved vector (only used with CONFIG_DEBUG_FEATURES) */
                                    /* Vector  0: Reset stack pointer value */
                                    /* Vector  1: Reset (not handler as an IRQ) */
 #define NUC_IRQ_NMI            (2) /* Vector  2: Non-Maskable Interrupt (NMI) */
diff --git a/arch/arm/include/sam34/irq.h b/arch/arm/include/sam34/irq.h
index 521cd5a93c..a0f5de604f 100644
--- a/arch/arm/include/sam34/irq.h
+++ b/arch/arm/include/sam34/irq.h
@@ -58,7 +58,7 @@
 
 /* Common Processor Exceptions (vectors 0-15) */
 
-#define SAM_IRQ_RESERVED       (0) /* Reserved vector (only used with CONFIG_DEBUG) */
+#define SAM_IRQ_RESERVED       (0) /* Reserved vector (only used with CONFIG_DEBUG_FEATURES) */
                                    /* Vector  0: Reset stack pointer value */
                                    /* Vector  1: Reset (not handler as an IRQ) */
 #define SAM_IRQ_NMI            (2) /* Vector  2: Non-Maskable Interrupt (NMI) */
diff --git a/arch/arm/include/samdl/irq.h b/arch/arm/include/samdl/irq.h
index d74584fb29..7da8c7b21e 100644
--- a/arch/arm/include/samdl/irq.h
+++ b/arch/arm/include/samdl/irq.h
@@ -58,7 +58,7 @@
 
 /* Processor Exceptions (vectors 0-15) */
 
-#define SAM_IRQ_RESERVED       (0) /* Reserved vector (only used with CONFIG_DEBUG) */
+#define SAM_IRQ_RESERVED       (0) /* Reserved vector (only used with CONFIG_DEBUG_FEATURES) */
                                    /* Vector  0: Reset stack pointer value */
                                    /* Vector  1: Reset (not handler as an IRQ) */
 #define SAM_IRQ_NMI            (2) /* Vector  2: Non-Maskable Interrupt (NMI) */
diff --git a/arch/arm/include/samv7/irq.h b/arch/arm/include/samv7/irq.h
index 4c33f3dbec..eec3d12e05 100644
--- a/arch/arm/include/samv7/irq.h
+++ b/arch/arm/include/samv7/irq.h
@@ -58,7 +58,7 @@
 
 /* Common Processor Exceptions (vectors 0-15) */
 
-#define SAM_IRQ_RESERVED       (0) /* Reserved vector (only used with CONFIG_DEBUG) */
+#define SAM_IRQ_RESERVED       (0) /* Reserved vector (only used with CONFIG_DEBUG_FEATURES) */
                                    /* Vector  0: Reset stack pointer value */
                                    /* Vector  1: Reset (not handler as an IRQ) */
 #define SAM_IRQ_NMI            (2) /* Vector  2: Non-Maskable Interrupt (NMI) */
diff --git a/arch/arm/include/stm32/irq.h b/arch/arm/include/stm32/irq.h
index 1d57bc3e50..2c9b188f02 100644
--- a/arch/arm/include/stm32/irq.h
+++ b/arch/arm/include/stm32/irq.h
@@ -59,7 +59,7 @@
 
 /* Processor Exceptions (vectors 0-15) */
 
-#define STM32_IRQ_RESERVED       (0) /* Reserved vector (only used with CONFIG_DEBUG) */
+#define STM32_IRQ_RESERVED       (0) /* Reserved vector (only used with CONFIG_DEBUG_FEATURES) */
                                      /* Vector  0: Reset stack pointer value */
                                      /* Vector  1: Reset (not handler as an IRQ) */
 #define STM32_IRQ_NMI            (2) /* Vector  2: Non-Maskable Interrupt (NMI) */
diff --git a/arch/arm/include/stm32f7/irq.h b/arch/arm/include/stm32f7/irq.h
index 205d06b644..f09659190b 100644
--- a/arch/arm/include/stm32f7/irq.h
+++ b/arch/arm/include/stm32f7/irq.h
@@ -57,7 +57,7 @@
 
 /* Processor Exceptions (vectors 0-15) */
 
-#define STM32_IRQ_RESERVED       (0) /* Reserved vector (only used with CONFIG_DEBUG) */
+#define STM32_IRQ_RESERVED       (0) /* Reserved vector (only used with CONFIG_DEBUG_FEATURES) */
                                      /* Vector  0: Reset stack pointer value */
                                      /* Vector  1: Reset (not handler as an IRQ) */
 #define STM32_IRQ_NMI            (2) /* Vector  2: Non-Maskable Interrupt (NMI) */
diff --git a/arch/arm/include/stm32l4/irq.h b/arch/arm/include/stm32l4/irq.h
index ebfb226678..89e74c1760 100644
--- a/arch/arm/include/stm32l4/irq.h
+++ b/arch/arm/include/stm32l4/irq.h
@@ -57,7 +57,7 @@
 
 /* Processor Exceptions (vectors 0-15) */
 
-#define STM32L4_IRQ_RESERVED       (0) /* Reserved vector (only used with CONFIG_DEBUG) */
+#define STM32L4_IRQ_RESERVED       (0) /* Reserved vector (only used with CONFIG_DEBUG_FEATURES) */
                                      /* Vector  0: Reset stack pointer value */
                                      /* Vector  1: Reset (not handler as an IRQ) */
 #define STM32L4_IRQ_NMI            (2) /* Vector  2: Non-Maskable Interrupt (NMI) */
diff --git a/arch/arm/include/tiva/irq.h b/arch/arm/include/tiva/irq.h
index 17c73a254d..d6a3216da9 100644
--- a/arch/arm/include/tiva/irq.h
+++ b/arch/arm/include/tiva/irq.h
@@ -162,7 +162,7 @@
 
 /* Processor Exceptions (vectors 0-15) */
 
-#define TIVA_IRQ_RESERVED     (0) /* Reserved vector (only used with CONFIG_DEBUG) */
+#define TIVA_IRQ_RESERVED     (0) /* Reserved vector (only used with CONFIG_DEBUG_FEATURES) */
                                   /* Vector  0: Reset stack pointer value */
                                   /* Vector  1: Reset (not handler as an IRQ) */
 #define TIVA_IRQ_NMI          (2) /* Vector  2: Non-Maskable Interrupt (NMI) */
diff --git a/arch/arm/src/arm/up_assert.c b/arch/arm/src/arm/up_assert.c
index e8e6b8dbb9..5e2aa0810d 100644
--- a/arch/arm/src/arm/up_assert.c
+++ b/arch/arm/src/arm/up_assert.c
@@ -44,9 +44,9 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-#  undef  CONFIG_DEBUG
+#  undef  CONFIG_DEBUG_FEATURES
 #  undef  CONFIG_DEBUG_INFO
-#  define CONFIG_DEBUG 1
+#  define CONFIG_DEBUG_FEATURES 1
 #  define CONFIG_DEBUG_INFO 1
 #endif
 
@@ -81,12 +81,12 @@
  * code.  We are going to print the task name if:
  *
  *  CONFIG_TASK_NAME_SIZE > 0 &&    <-- The task has a name
- *  (defined(CONFIG_DEBUG)    ||    <-- And the debug is enabled (lldbg used)
+ *  (defined(CONFIG_DEBUG_FEATURES)    ||    <-- And the debug is enabled (lldbg used)
  *   defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used
  */
 
 #undef CONFIG_PRINT_TASKNAME
-#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG) || defined(CONFIG_ARCH_STACKDUMP))
+#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG_FEATURES) || defined(CONFIG_ARCH_STACKDUMP))
 #  define CONFIG_PRINT_TASKNAME 1
 #endif
 
diff --git a/arch/arm/src/arm/up_dataabort.c b/arch/arm/src/arm/up_dataabort.c
index 676928c7cd..2306d80713 100644
--- a/arch/arm/src/arm/up_dataabort.c
+++ b/arch/arm/src/arm/up_dataabort.c
@@ -44,9 +44,9 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG
+# undef  CONFIG_DEBUG_FEATURES
 # undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
 # define CONFIG_DEBUG_INFO 1
 #endif
 
diff --git a/arch/arm/src/arm/up_head.S b/arch/arm/src/arm/up_head.S
index 53f94a2e0f..da317c12f9 100644
--- a/arch/arm/src/arm/up_head.S
+++ b/arch/arm/src/arm/up_head.S
@@ -208,7 +208,7 @@
 
 /* This macro will modify r0, r1, r2 and r14 */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 	.macro	showprogress, code
 	mov		r0, #\code
 	bl		up_lowputc
diff --git a/arch/arm/src/arm/up_nommuhead.S b/arch/arm/src/arm/up_nommuhead.S
index 04c5205efe..d8689d85bd 100644
--- a/arch/arm/src/arm/up_nommuhead.S
+++ b/arch/arm/src/arm/up_nommuhead.S
@@ -49,7 +49,7 @@
 
 	/* This macro will modify r0, r1, r2 and r14 */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 	.macro	showprogress, code
 	mov	r0, #\code
 	bl	up_lowputc
@@ -115,7 +115,7 @@ __start:
 	bl		up_earlyserialinit
 #endif
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 	mov		r0, #'C'
 	bl		up_putc
 	mov		r0, #'\n'
diff --git a/arch/arm/src/arm/up_prefetchabort.c b/arch/arm/src/arm/up_prefetchabort.c
index c827a38868..995fedd1be 100644
--- a/arch/arm/src/arm/up_prefetchabort.c
+++ b/arch/arm/src/arm/up_prefetchabort.c
@@ -44,9 +44,9 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG
+# undef  CONFIG_DEBUG_FEATURES
 # undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
 # define CONFIG_DEBUG_INFO 1
 #endif
 
diff --git a/arch/arm/src/arm/up_syscall.c b/arch/arm/src/arm/up_syscall.c
index 6c8ba18e44..498f702281 100644
--- a/arch/arm/src/arm/up_syscall.c
+++ b/arch/arm/src/arm/up_syscall.c
@@ -44,9 +44,9 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG
+# undef  CONFIG_DEBUG_FEATURES
 # undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
 # define CONFIG_DEBUG_INFO 1
 #endif
 
diff --git a/arch/arm/src/arm/up_undefinedinsn.c b/arch/arm/src/arm/up_undefinedinsn.c
index 468d55e6af..4c242126bb 100644
--- a/arch/arm/src/arm/up_undefinedinsn.c
+++ b/arch/arm/src/arm/up_undefinedinsn.c
@@ -44,9 +44,9 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG
+# undef  CONFIG_DEBUG_FEATURES
 # undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
 # define CONFIG_DEBUG_INFO 1
 #endif
 
diff --git a/arch/arm/src/armv6-m/nvic.h b/arch/arm/src/armv6-m/nvic.h
index 945d5c4338..06d11d5d63 100644
--- a/arch/arm/src/armv6-m/nvic.h
+++ b/arch/arm/src/armv6-m/nvic.h
@@ -386,7 +386,7 @@ extern "C"
  *
  ****************************************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 void up_dumpnvic(FAR const char *msg);
 #else
 #  define up_dumpnvic(m)
diff --git a/arch/arm/src/armv6-m/up_assert.c b/arch/arm/src/armv6-m/up_assert.c
index 8106eaf10e..4c391ed848 100644
--- a/arch/arm/src/armv6-m/up_assert.c
+++ b/arch/arm/src/armv6-m/up_assert.c
@@ -44,9 +44,9 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG
+# undef  CONFIG_DEBUG_FEATURES
 # undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
 # define CONFIG_DEBUG_INFO 1
 #endif
 
@@ -79,13 +79,13 @@
 /* The following is just intended to keep some ugliness out of the mainline
  * code.  We are going to print the task name if:
  *
- *  CONFIG_TASK_NAME_SIZE > 0 &&    <-- The task has a name
- *  (defined(CONFIG_DEBUG)    ||    <-- And the debug is enabled (lldbg used)
- *   defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used
+ *  CONFIG_TASK_NAME_SIZE > 0 &&       <-- The task has a name
+ *  (defined(CONFIG_DEBUG_FEATURES) || <-- And the debug is enabled (lldbg used)
+ *   defined(CONFIG_ARCH_STACKDUMP)    <-- Or lowsyslog() is used
  */
 
 #undef CONFIG_PRINT_TASKNAME
-#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG) || defined(CONFIG_ARCH_STACKDUMP))
+#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG_FEATURES) || defined(CONFIG_ARCH_STACKDUMP))
 #  define CONFIG_PRINT_TASKNAME 1
 #endif
 
diff --git a/arch/arm/src/armv6-m/up_dumpnvic.c b/arch/arm/src/armv6-m/up_dumpnvic.c
index 36c2fdf216..3e67f44372 100644
--- a/arch/arm/src/armv6-m/up_dumpnvic.c
+++ b/arch/arm/src/armv6-m/up_dumpnvic.c
@@ -48,7 +48,7 @@
 
 #include "nvic.h"
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 
 /****************************************************************************
  * Private Data
@@ -108,4 +108,4 @@ void up_dumpnvic(FAR const char *msg)
   leave_critical_section(flags);
 }
 
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_FEATURES */
diff --git a/arch/arm/src/armv6-m/up_svcall.c b/arch/arm/src/armv6-m/up_svcall.c
index b5cec07937..45610c5cc0 100644
--- a/arch/arm/src/armv6-m/up_svcall.c
+++ b/arch/arm/src/armv6-m/up_svcall.c
@@ -64,8 +64,8 @@
 /* Debug output from this file may interfere with context switching!  To get
  * debug output you must enabled the following in your NuttX configuration:
  *
- * - CONFIG_DEBUG and CONFIG_DEBUG_SYSCALL (shows only syscalls)
- * - CONFIG_DEBUG and CONFIG_DEBUG_SVCALL  (shows everything)
+ * - CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_SYSCALL (shows only syscalls)
+ * - CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_SVCALL  (shows everything)
  */
 
 #if defined(CONFIG_DEBUG_SYSCALL) || defined(CONFIG_DEBUG_SVCALL)
diff --git a/arch/arm/src/armv7-a/arm_assert.c b/arch/arm/src/armv7-a/arm_assert.c
index 6299a46241..83191f510d 100644
--- a/arch/arm/src/armv7-a/arm_assert.c
+++ b/arch/arm/src/armv7-a/arm_assert.c
@@ -44,9 +44,9 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG
+# undef  CONFIG_DEBUG_FEATURES
 # undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
 # define CONFIG_DEBUG_INFO 1
 #endif
 
@@ -79,12 +79,12 @@
  * code.  We are going to print the task name if:
  *
  *  CONFIG_TASK_NAME_SIZE > 0 &&    <-- The task has a name
- *  (defined(CONFIG_DEBUG)    ||    <-- And the debug is enabled (lldbg used)
+ *  (defined(CONFIG_DEBUG_FEATURES)    ||    <-- And the debug is enabled (lldbg used)
  *   defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used
  */
 
 #undef CONFIG_PRINT_TASKNAME
-#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG) || defined(CONFIG_ARCH_STACKDUMP))
+#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG_FEATURES) || defined(CONFIG_ARCH_STACKDUMP))
 #  define CONFIG_PRINT_TASKNAME 1
 #endif
 
diff --git a/arch/arm/src/armv7-a/arm_dataabort.c b/arch/arm/src/armv7-a/arm_dataabort.c
index 52c6bb2f98..927ace3360 100644
--- a/arch/arm/src/armv7-a/arm_dataabort.c
+++ b/arch/arm/src/armv7-a/arm_dataabort.c
@@ -44,9 +44,9 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG
+# undef  CONFIG_DEBUG_FEATURES
 # undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
 # define CONFIG_DEBUG_INFO 1
 #endif
 
diff --git a/arch/arm/src/armv7-a/arm_head.S b/arch/arm/src/armv7-a/arm_head.S
index 220026da34..c98ab30719 100644
--- a/arch/arm/src/armv7-a/arm_head.S
+++ b/arch/arm/src/armv7-a/arm_head.S
@@ -169,7 +169,7 @@
 
 /* This macro will modify r0, r1, r2 and r14 */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 	.macro	showprogress, code
 	mov		r0, #\code
 	bl		up_lowputc
diff --git a/arch/arm/src/armv7-a/arm_pghead.S b/arch/arm/src/armv7-a/arm_pghead.S
index bc4c99ce26..1a546c813d 100644
--- a/arch/arm/src/armv7-a/arm_pghead.S
+++ b/arch/arm/src/armv7-a/arm_pghead.S
@@ -194,7 +194,7 @@
 
 /* This macro will modify r0, r1, r2 and r14 */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 	.macro	showprogress, code
 	mov		r0, #\code
 	bl		up_lowputc
diff --git a/arch/arm/src/armv7-a/arm_prefetchabort.c b/arch/arm/src/armv7-a/arm_prefetchabort.c
index f06150772b..18f37557fb 100644
--- a/arch/arm/src/armv7-a/arm_prefetchabort.c
+++ b/arch/arm/src/armv7-a/arm_prefetchabort.c
@@ -44,9 +44,9 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG
+# undef  CONFIG_DEBUG_FEATURES
 # undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
 # define CONFIG_DEBUG_INFO 1
 #endif
 
diff --git a/arch/arm/src/armv7-a/arm_syscall.c b/arch/arm/src/armv7-a/arm_syscall.c
index 10e0569d1f..fbaf5f5e18 100644
--- a/arch/arm/src/armv7-a/arm_syscall.c
+++ b/arch/arm/src/armv7-a/arm_syscall.c
@@ -44,9 +44,9 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG
+# undef  CONFIG_DEBUG_FEATURES
 # undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
 # define CONFIG_DEBUG_INFO 1
 #endif
 
diff --git a/arch/arm/src/armv7-a/arm_undefinedinsn.c b/arch/arm/src/armv7-a/arm_undefinedinsn.c
index 208ca5068c..5b93bbd6cd 100644
--- a/arch/arm/src/armv7-a/arm_undefinedinsn.c
+++ b/arch/arm/src/armv7-a/arm_undefinedinsn.c
@@ -44,9 +44,9 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG
+# undef  CONFIG_DEBUG_FEATURES
 # undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
 # define CONFIG_DEBUG_INFO 1
 #endif
 
diff --git a/arch/arm/src/armv7-m/mpu.h b/arch/arm/src/armv7-m/mpu.h
index 310c21a909..8ca9a0293c 100644
--- a/arch/arm/src/armv7-m/mpu.h
+++ b/arch/arm/src/armv7-m/mpu.h
@@ -219,7 +219,7 @@ uint32_t mpu_subregion(uintptr_t base, size_t size, uint8_t l2size);
 
 static inline void mpu_showtype(void)
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   uint32_t regval = getreg32(MPU_TYPE);
   dbg("%s MPU Regions: data=%d instr=%d\n",
       (regval & MPU_TYPE_SEPARATE) != 0 ? "Separate" : "Unified",
diff --git a/arch/arm/src/armv7-m/up_assert.c b/arch/arm/src/armv7-m/up_assert.c
index 70fdfcd95d..e7546d3d23 100644
--- a/arch/arm/src/armv7-m/up_assert.c
+++ b/arch/arm/src/armv7-m/up_assert.c
@@ -44,9 +44,9 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG
+# undef  CONFIG_DEBUG_FEATURES
 # undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
 # define CONFIG_DEBUG_INFO 1
 #endif
 
@@ -79,12 +79,12 @@
  * code.  We are going to print the task name if:
  *
  *  CONFIG_TASK_NAME_SIZE > 0 &&    <-- The task has a name
- *  (defined(CONFIG_DEBUG)    ||    <-- And the debug is enabled (lldbg used)
+ *  (defined(CONFIG_DEBUG_FEATURES)    ||    <-- And the debug is enabled (lldbg used)
  *   defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used
  */
 
 #undef CONFIG_PRINT_TASKNAME
-#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG) || defined(CONFIG_ARCH_STACKDUMP))
+#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG_FEATURES) || defined(CONFIG_ARCH_STACKDUMP))
 #  define CONFIG_PRINT_TASKNAME 1
 #endif
 
diff --git a/arch/arm/src/armv7-m/up_svcall.c b/arch/arm/src/armv7-m/up_svcall.c
index 4d28224fd7..eb9f41b74f 100644
--- a/arch/arm/src/armv7-m/up_svcall.c
+++ b/arch/arm/src/armv7-m/up_svcall.c
@@ -65,8 +65,8 @@
 /* Debug output from this file may interfere with context switching!  To get
  * debug output you must enabled the following in your NuttX configuration:
  *
- * - CONFIG_DEBUG and CONFIG_DEBUG_SYSCALL (shows only syscalls)
- * - CONFIG_DEBUG and CONFIG_DEBUG_SVCALL  (shows everything)
+ * - CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_SYSCALL (shows only syscalls)
+ * - CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_SVCALL  (shows everything)
  */
 
 #if defined(CONFIG_DEBUG_SYSCALL) || defined(CONFIG_DEBUG_SVCALL)
diff --git a/arch/arm/src/armv7-r/arm_assert.c b/arch/arm/src/armv7-r/arm_assert.c
index a7082e9173..8ec701d9ad 100644
--- a/arch/arm/src/armv7-r/arm_assert.c
+++ b/arch/arm/src/armv7-r/arm_assert.c
@@ -44,9 +44,9 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG
+# undef  CONFIG_DEBUG_FEATURES
 # undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
 # define CONFIG_DEBUG_INFO 1
 #endif
 
@@ -78,13 +78,13 @@
 /* The following is just intended to keep some ugliness out of the mainline
  * code.  We are going to print the task name if:
  *
- *  CONFIG_TASK_NAME_SIZE > 0 &&    <-- The task has a name
- *  (defined(CONFIG_DEBUG)    ||    <-- And the debug is enabled (lldbg used)
- *   defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used
+ *  CONFIG_TASK_NAME_SIZE > 0 &&       <-- The task has a name
+ *  (defined(CONFIG_DEBUG_FEATURES) || <-- And the debug is enabled (lldbg used)
+ *   defined(CONFIG_ARCH_STACKDUMP)    <-- Or lowsyslog() is used
  */
 
 #undef CONFIG_PRINT_TASKNAME
-#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG) || defined(CONFIG_ARCH_STACKDUMP))
+#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG_FEATURES) || defined(CONFIG_ARCH_STACKDUMP))
 #  define CONFIG_PRINT_TASKNAME 1
 #endif
 
diff --git a/arch/arm/src/armv7-r/arm_dataabort.c b/arch/arm/src/armv7-r/arm_dataabort.c
index 9366c5d1c2..cf2d73d438 100644
--- a/arch/arm/src/armv7-r/arm_dataabort.c
+++ b/arch/arm/src/armv7-r/arm_dataabort.c
@@ -44,9 +44,9 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG
+# undef  CONFIG_DEBUG_FEATURES
 # undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
 # define CONFIG_DEBUG_INFO 1
 #endif
 
diff --git a/arch/arm/src/armv7-r/arm_prefetchabort.c b/arch/arm/src/armv7-r/arm_prefetchabort.c
index e6e4607b0d..ab7228eac2 100644
--- a/arch/arm/src/armv7-r/arm_prefetchabort.c
+++ b/arch/arm/src/armv7-r/arm_prefetchabort.c
@@ -44,9 +44,9 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG
+# undef  CONFIG_DEBUG_FEATURES
 # undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
 # define CONFIG_DEBUG_INFO 1
 #endif
 
diff --git a/arch/arm/src/armv7-r/arm_syscall.c b/arch/arm/src/armv7-r/arm_syscall.c
index 401835a556..c68ba0f798 100644
--- a/arch/arm/src/armv7-r/arm_syscall.c
+++ b/arch/arm/src/armv7-r/arm_syscall.c
@@ -44,9 +44,9 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG
+# undef  CONFIG_DEBUG_FEATURES
 # undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
 # define CONFIG_DEBUG_INFO 1
 #endif
 
diff --git a/arch/arm/src/armv7-r/arm_undefinedinsn.c b/arch/arm/src/armv7-r/arm_undefinedinsn.c
index f9716239c3..5ecee39ce8 100644
--- a/arch/arm/src/armv7-r/arm_undefinedinsn.c
+++ b/arch/arm/src/armv7-r/arm_undefinedinsn.c
@@ -44,9 +44,9 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG
+# undef  CONFIG_DEBUG_FEATURES
 # undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
 # define CONFIG_DEBUG_INFO 1
 #endif
 
diff --git a/arch/arm/src/armv7-r/mpu.h b/arch/arm/src/armv7-r/mpu.h
index 67aeb2e94a..26d5f9373d 100644
--- a/arch/arm/src/armv7-r/mpu.h
+++ b/arch/arm/src/armv7-r/mpu.h
@@ -359,7 +359,7 @@ static inline void mpu_set_rgnr(unsigned int rgnr)
 
 static inline void mpu_showtype(void)
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   uint32_t regval = mpu_get_mpuir();
   dbg("%s MPU Regions: data=%d instr=%d\n",
       (regval & MPUIR_SEPARATE) != 0 ? "Separate" : "Unified",
diff --git a/arch/arm/src/c5471/c5471_ethernet.c b/arch/arm/src/c5471/c5471_ethernet.c
index 3497ded776..0fc1cf1176 100644
--- a/arch/arm/src/c5471/c5471_ethernet.c
+++ b/arch/arm/src/c5471/c5471_ethernet.c
@@ -413,7 +413,7 @@ static void c5471_macassign(struct c5471_driver_s *c5471);
 #ifdef CONFIG_C5471_NET_DUMPBUFFER
 static inline void c5471_dumpbuffer(const char *msg, const uint8_t *buffer, unsigned int nbytes)
 {
-  /* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_NET have to be
+  /* CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_NET have to be
    * defined or the following does nothing.
    */
 
diff --git a/arch/arm/src/common/up_createstack.c b/arch/arm/src/common/up_createstack.c
index c3aa9d7adb..1aa06a31c3 100644
--- a/arch/arm/src/common/up_createstack.c
+++ b/arch/arm/src/common/up_createstack.c
@@ -205,7 +205,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
         }
 #endif /* CONFIG_TLS */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       /* Was the allocation successful? */
 
       if (!tcb->stack_alloc_ptr)
diff --git a/arch/arm/src/common/up_exit.c b/arch/arm/src/common/up_exit.c
index 57137a60de..1a41f52ad4 100644
--- a/arch/arm/src/common/up_exit.c
+++ b/arch/arm/src/common/up_exit.c
@@ -66,7 +66,7 @@
  *
  ****************************************************************************/
 
-#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
 static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
 {
 #if CONFIG_NFILE_DESCRIPTORS > 0
@@ -140,7 +140,7 @@ void _exit(int status)
 
   slldbg("TCB=%p exiting\n", this_task());
 
-#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
   slldbg("Other tasks:\n");
   sched_foreach(_up_dumponexit, NULL);
 #endif
diff --git a/arch/arm/src/common/up_initialize.c b/arch/arm/src/common/up_initialize.c
index 511138e4f5..da8db2d0b0 100644
--- a/arch/arm/src/common/up_initialize.c
+++ b/arch/arm/src/common/up_initialize.c
@@ -72,7 +72,7 @@
  *
  ****************************************************************************/
 
-#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG_FEATURES)
 static void up_calibratedelay(void)
 {
   int i;
diff --git a/arch/arm/src/dm320/dm320_framebuffer.c b/arch/arm/src/dm320/dm320_framebuffer.c
index b6c6def0d5..b753adc274 100644
--- a/arch/arm/src/dm320/dm320_framebuffer.c
+++ b/arch/arm/src/dm320/dm320_framebuffer.c
@@ -980,7 +980,7 @@ static void dm320_hwinitialize(void)
 static int dm320_getvid0videoinfo(FAR struct fb_vtable_s *vtable,
                                   FAR struct fb_videoinfo_s *vinfo)
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!vtable || !vinfo)
     {
       return -EINVAL;
@@ -1003,7 +1003,7 @@ static int dm320_getvid0videoinfo(FAR struct fb_vtable_s *vtable,
 static int dm320_getvid0planeinfo(FAR struct fb_vtable_s *vtable, int planeno,
                                   FAR struct fb_planeinfo_s *pinfo)
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!vtable || !pinfo)
     {
       return -EINVAL;
@@ -1027,7 +1027,7 @@ static int dm320_getvid0planeinfo(FAR struct fb_vtable_s *vtable, int planeno,
 static int dm320_getvid1videoinfo(FAR struct fb_vtable_s *vtable,
                                   FAR struct fb_videoinfo_s *vinfo)
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!vtable || !vinfo)
     {
       return -EINVAL;
@@ -1050,7 +1050,7 @@ static int dm320_getvid1videoinfo(FAR struct fb_vtable_s *vtable,
 static int dm320_getvid1planeinfo(FAR struct fb_vtable_s *vtable, int planeno,
                                   FAR struct fb_planeinfo_s *pinfo)
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!vtable || !pinfo)
     {
       return -EINVAL;
@@ -1074,7 +1074,7 @@ static int dm320_getvid1planeinfo(FAR struct fb_vtable_s *vtable, int planeno,
 static int dm320_getosd0videoinfo(FAR struct fb_vtable_s *vtable,
                                   FAR struct fb_videoinfo_s *vinfo)
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!vtable || !vinfo)
     {
       return -EINVAL;
@@ -1101,7 +1101,7 @@ static int dm320_getosd0videoinfo(FAR struct fb_vtable_s *vtable,
 static int dm320_getosd0planeinfo(FAR struct fb_vtable_s *vtable, int planeno,
                                   FAR struct fb_planeinfo_s *pinfo)
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!vtable || !pinfo)
     {
       return -EINVAL;
@@ -1125,7 +1125,7 @@ static int dm320_getosd0planeinfo(FAR struct fb_vtable_s *vtable, int planeno,
 static int dm320_getosd1videoinfo(FAR struct fb_vtable_s *vtable,
                                   FAR struct fb_videoinfo_s *vinfo)
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!vtable || !vinfo)
     {
       return -EINVAL;
@@ -1152,7 +1152,7 @@ static int dm320_getosd1videoinfo(FAR struct fb_vtable_s *vtable,
 static int dm320_getosd1planeinfo(FAR struct fb_vtable_s *vtable, int planeno,
                                   FAR struct fb_planeinfo_s *pinfo)
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!vtable || !pinfo)
     {
       return -EINVAL;
@@ -1196,7 +1196,7 @@ static int dm320_putcmap(FAR struct fb_vtable_s *vtable, FAR struct fb_cmap_s *c
   int len
   int i;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!vtable || !cmap || !cmap->read || !cmap->green || !cmap->blue)
     {
       return -EINVAL;
@@ -1245,7 +1245,7 @@ static int dm320_getcursor(FAR struct fb_vtable_s *vtable, FAR struct fb_cursora
 {
   irqstate_t flags;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!vtable || !attrib)
     {
       return -EINVAL;
@@ -1288,7 +1288,7 @@ static int dm320_setcursor(FAR struct fb_vtable_s *vtable, FAR struct fb_setcurs
   irqstate_t flags;
   uint16_t regval;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!vtable || !settings)
     {
       return -EINVAL;
diff --git a/arch/arm/src/dm320/dm320_usbdev.c b/arch/arm/src/dm320/dm320_usbdev.c
index aae0d5fe3c..ed3812c698 100644
--- a/arch/arm/src/dm320/dm320_usbdev.c
+++ b/arch/arm/src/dm320/dm320_usbdev.c
@@ -268,7 +268,7 @@ struct dm320_epinfo_s
 
 /* Register operations */
 
-#if defined(CONFIG_DM320_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DM320_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t dm320_getreg8(uint32_t addr);
 static uint32_t dm320_getreg16(uint32_t addr);
 static uint32_t dm320_getreg32(uint32_t addr);
@@ -422,7 +422,7 @@ static const struct dm320_epinfo_s g_epinfo[DM320_NENDPOINTS] =
  *
  ****************************************************************************/
 
-#if defined(CONFIG_DM320_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DM320_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint8_t dm320_getreg8(uint32_t addr)
 {
   static uint32_t prevaddr = 0;
@@ -485,7 +485,7 @@ static uint8_t dm320_getreg8(uint32_t addr)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_DM320_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DM320_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t dm320_getreg16(uint32_t addr)
 {
   static uint32_t prevaddr = 0;
@@ -548,7 +548,7 @@ static uint32_t dm320_getreg16(uint32_t addr)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_DM320_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DM320_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t dm320_getreg32(uint32_t addr)
 {
   static uint32_t prevaddr = 0;
@@ -611,7 +611,7 @@ static uint32_t dm320_getreg32(uint32_t addr)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_DM320_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DM320_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static void dm320_putreg8(uint8_t val, uint32_t addr)
 {
   /* Show the register value being written */
@@ -632,7 +632,7 @@ static void dm320_putreg8(uint8_t val, uint32_t addr)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_DM320_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DM320_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static void dm320_putreg16(uint16_t val, uint32_t addr)
 {
   /* Show the register value being written */
@@ -653,7 +653,7 @@ static void dm320_putreg16(uint16_t val, uint32_t addr)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_DM320_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DM320_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static void dm320_putreg32(uint32_t val, uint32_t addr)
 {
   /* Show the register value being written */
@@ -1943,7 +1943,7 @@ static int dm320_epdisable(FAR struct usbdev_ep_s *ep)
   FAR struct dm320_ep_s *privep = (FAR struct dm320_ep_s *)ep;
   irqstate_t flags;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(DM320_TRACEERR_INVALIDPARMS), 0);
@@ -1974,7 +1974,7 @@ static FAR struct usbdev_req_s *dm320_epallocreq(FAR struct usbdev_ep_s *ep)
 {
   FAR struct dm320_req_s *privreq;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep)
     {
       return NULL;
@@ -2005,7 +2005,7 @@ static void dm320_epfreereq(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s
 {
   FAR struct dm320_req_s *privreq = (FAR struct dm320_req_s *)req;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !req)
     {
       usbtrace(TRACE_DEVERROR(DM320_TRACEERR_INVALIDPARMS), 0);
@@ -2075,7 +2075,7 @@ static int dm320_epsubmit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *r
   irqstate_t flags;
   int ret = OK;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!req || !req->callback || !req->buf || !ep)
     {
       usbtrace(TRACE_DEVERROR(DM320_TRACEERR_INVALIDPARMS), 0);
@@ -2170,7 +2170,7 @@ static int dm320_epcancel(struct usbdev_ep_s *ep, FAR struct usbdev_req_s *req)
   FAR struct dm320_usbdev_s *priv;
   irqstate_t flags;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !req)
     {
       usbtrace(TRACE_DEVERROR(DM320_TRACEERR_INVALIDPARMS), 0);
@@ -2293,7 +2293,7 @@ static int dm320_getframe(struct usbdev_s *dev)
 
   usbtrace(TRACE_DEVGETFRAME, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(DM320_TRACEERR_INVALIDPARMS), 0);
@@ -2345,7 +2345,7 @@ static int dm320_selfpowered(struct usbdev_s *dev, bool selfpowered)
 
   usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(DM320_TRACEERR_INVALIDPARMS), 0);
@@ -2544,7 +2544,7 @@ int usbdev_register(FAR struct usbdevclass_driver_s *driver)
 
   usbtrace(TRACE_DEVREGISTER, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!driver || (driver->speed != USB_SPEED_FULL) || !driver->ops->bind ||
       !driver->ops->unbind || !driver->ops->setup)
     {
@@ -2602,7 +2602,7 @@ int usbdev_unregister(FAR struct usbdevclass_driver_s *driver)
 {
   usbtrace(TRACE_DEVUNREGISTER, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (driver != g_usbdev.driver)
     {
       usbtrace(TRACE_DEVERROR(DM320_TRACEERR_INVALIDPARMS), 0);
diff --git a/arch/arm/src/efm32/Kconfig b/arch/arm/src/efm32/Kconfig
index ad1abfbfa0..877cca1074 100644
--- a/arch/arm/src/efm32/Kconfig
+++ b/arch/arm/src/efm32/Kconfig
@@ -140,7 +140,7 @@ config EFM32_FLASHPROG
 config EFM32_RMU_DEBUG
 	bool "Reset Management Unit (RMU) DEBUG "
 	default n
-	depends on EFM32_RMU && DEBUG
+	depends on EFM32_RMU && DEBUG_FEATURES
 
 config EFM32_I2C0
 	bool "I2C0"
diff --git a/arch/arm/src/efm32/efm32_clockconfig.c b/arch/arm/src/efm32/efm32_clockconfig.c
index e2f0d3b5df..d597407811 100644
--- a/arch/arm/src/efm32/efm32_clockconfig.c
+++ b/arch/arm/src/efm32/efm32_clockconfig.c
@@ -450,7 +450,7 @@ static inline uint32_t efm32_hfclk_config(uint32_t hfclksel, uint32_t hfclkdiv)
       }
       break;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       default:
         PANIC();
 #endif
diff --git a/arch/arm/src/efm32/efm32_gpio.h b/arch/arm/src/efm32/efm32_gpio.h
index ed54bb5148..50c239954a 100644
--- a/arch/arm/src/efm32/efm32_gpio.h
+++ b/arch/arm/src/efm32/efm32_gpio.h
@@ -50,7 +50,7 @@
  ************************************************************************************/
 /* Configuration ********************************************************************/
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_GPIO
 #endif
 
diff --git a/arch/arm/src/efm32/efm32_i2c.c b/arch/arm/src/efm32/efm32_i2c.c
index de775d4dd4..aef2df814e 100644
--- a/arch/arm/src/efm32/efm32_i2c.c
+++ b/arch/arm/src/efm32/efm32_i2c.c
@@ -134,7 +134,7 @@
 
 /* Debug ****************************************************************************/
 
-/* CONFIG_DEBUG_I2C + CONFIG_DEBUG enables general I2C debug output. */
+/* CONFIG_DEBUG_I2C + CONFIG_DEBUG_FEATURES enables general I2C debug output. */
 
 #ifdef CONFIG_DEBUG_I2C
 #  define i2cdbg dbg
diff --git a/arch/arm/src/efm32/efm32_irq.c b/arch/arm/src/efm32/efm32_irq.c
index 821d5cdc76..078ec8e8a4 100644
--- a/arch/arm/src/efm32/efm32_irq.c
+++ b/arch/arm/src/efm32/efm32_irq.c
@@ -164,7 +164,7 @@ static void efm32_dumpnvic(const char *msg, int irq)
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 static int efm32_nmi(int irq, FAR void *context)
 {
   (void)up_irq_save();
@@ -448,7 +448,7 @@ void up_irqinitialize(void)
 
   /* Attach all other processor exceptions (except reset and sys tick) */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   irq_attach(EFM32_IRQ_NMI, efm32_nmi);
 #ifndef CONFIG_ARM_MPU
   irq_attach(EFM32_IRQ_MEMFAULT, up_memfault);
diff --git a/arch/arm/src/efm32/efm32_leserial.c b/arch/arm/src/efm32/efm32_leserial.c
index e57af78353..4e0fc0f37d 100644
--- a/arch/arm/src/efm32/efm32_leserial.c
+++ b/arch/arm/src/efm32/efm32_leserial.c
@@ -119,7 +119,7 @@
 #define EFM32_TXERR_INTS      (LEUART_IEN_TXOF)
 #define EFM32_RXERR_INTS      (LEUART_IEN_RXOF | LEUART_IEN_PERR | \
                                LEUART_IEN_FERR)
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 #  define EFM32_TX_INTS       (LEUART_IEN_TXBL | EFM32_TXERR_INTS)
 #  define EFM32_RX_INTS       (LEUART_IEN_RXDATAV | EFM32_RXERR_INTS)
 #else
@@ -506,7 +506,7 @@ static int  efm32_interrupt(struct uart_dev_s *dev)
       uart_xmitchars(dev);
     }
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   /* Check for receive errors */
 
   if ((intflags & EFM32_RXERR_INTS) != 0)
diff --git a/arch/arm/src/efm32/efm32_pwm.c b/arch/arm/src/efm32/efm32_pwm.c
index d0db8e6bde..3f848de28a 100644
--- a/arch/arm/src/efm32/efm32_pwm.c
+++ b/arch/arm/src/efm32/efm32_pwm.c
@@ -77,7 +77,7 @@
 /* Debug ********************************************************************/
 /* Non-standard debug that may be enabled just for testing PWM */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_PWM
 #endif
 
diff --git a/arch/arm/src/efm32/efm32_rmu.h b/arch/arm/src/efm32/efm32_rmu.h
index 9d4dfb514e..0d108d4811 100644
--- a/arch/arm/src/efm32/efm32_rmu.h
+++ b/arch/arm/src/efm32/efm32_rmu.h
@@ -50,7 +50,7 @@
  ****************************************************************************/
 /* Configuration ************************************************************/
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_EFM32_RMU_DEBUG
 #endif
diff --git a/arch/arm/src/efm32/efm32_rtc_burtc.c b/arch/arm/src/efm32/efm32_rtc_burtc.c
index 914ebd03ff..1bc1c9f107 100644
--- a/arch/arm/src/efm32/efm32_rtc_burtc.c
+++ b/arch/arm/src/efm32/efm32_rtc_burtc.c
@@ -130,7 +130,7 @@
 #define __CNT_CARRY_REG         EFM32_BURTC_RET_REG(0)
 #define __CNT_ZERO_REG          EFM32_BURTC_RET_REG(1)
 
-#if defined CONFIG_DEBUG && defined CONFIG_RTC_DEBUG
+#if defined CONFIG_DEBUG_FEATURES && defined CONFIG_RTC_DEBUG
 #   define burtcdbg lldbg
 #else
 #   define burtcdbg(x...)
diff --git a/arch/arm/src/efm32/efm32_serial.c b/arch/arm/src/efm32/efm32_serial.c
index fed33adcba..c0f3bd4a5f 100644
--- a/arch/arm/src/efm32/efm32_serial.c
+++ b/arch/arm/src/efm32/efm32_serial.c
@@ -205,7 +205,7 @@
 #define EFM32_TXERR_INTS      (USART_IEN_TXOF)
 #define EFM32_RXERR_INTS      (USART_IEN_RXOF | USART_IEN_RXUF | \
                                USART_IEN_PERR | USART_IEN_FERR)
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 #  define EFM32_TX_INTS       (USART_IEN_TXBL | EFM32_TXERR_INTS)
 #  define EFM32_RX_INTS       (USART_IEN_RXDATAV | EFM32_RXERR_INTS)
 #else
@@ -768,7 +768,7 @@ static int  efm32_rxinterrupt(struct uart_dev_s *dev)
       uart_recvchars(dev);
     }
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   /* Check for receive errors */
 
   if ((intflags & EFM32_RXERR_INTS) != 0)
@@ -856,7 +856,7 @@ static int  efm32_txinterrupt(struct uart_dev_s *dev)
       uart_xmitchars(dev);
     }
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   /* Check for transmit errors */
 
   if ((intflags & EFM32_TXERR_INTS) != 0)
diff --git a/arch/arm/src/efm32/efm32_spi.c b/arch/arm/src/efm32/efm32_spi.c
index 7c48070e4a..321de58d7d 100644
--- a/arch/arm/src/efm32/efm32_spi.c
+++ b/arch/arm/src/efm32/efm32_spi.c
@@ -94,7 +94,7 @@
 /* Debug ********************************************************************/
 /* Check if SPI debug is enabled */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_SPI
 #endif
diff --git a/arch/arm/src/efm32/efm32_start.c b/arch/arm/src/efm32/efm32_start.c
index ec0171f230..f62e1461d5 100644
--- a/arch/arm/src/efm32/efm32_start.c
+++ b/arch/arm/src/efm32/efm32_start.c
@@ -85,7 +85,7 @@ static void go_os_start(void *pv, unsigned int nbytes)
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 #  if defined(CONFIG_ARMV7M_ITMSYSLOG)
 #    define showprogress(c) (void)syslog_putc(c)
 #  elif defined(HAVE_UART_CONSOLE) || defined(HAVE_LEUART_CONSOLE)
diff --git a/arch/arm/src/efm32/efm32_timer.c b/arch/arm/src/efm32/efm32_timer.c
index 3e75e631ea..b526376c87 100644
--- a/arch/arm/src/efm32/efm32_timer.c
+++ b/arch/arm/src/efm32/efm32_timer.c
@@ -63,7 +63,7 @@
 /* Debug ********************************************************************/
 /* Non-standard debug that may be enabled just for testing TIMER */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_TIMER
 #endif
 
diff --git a/arch/arm/src/efm32/efm32_usbdev.c b/arch/arm/src/efm32/efm32_usbdev.c
index bffcadbf93..fab4867207 100644
--- a/arch/arm/src/efm32/efm32_usbdev.c
+++ b/arch/arm/src/efm32/efm32_usbdev.c
@@ -474,7 +474,7 @@ struct efm32_usbdev_s
 
 /* Register operations ********************************************************/
 
-#if defined(CONFIG_EFM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_EFM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t    efm32_getreg(uint32_t addr);
 static void        efm32_putreg(uint32_t val, uint32_t addr);
 #else
@@ -794,7 +794,7 @@ const struct trace_msg_t g_usb_trace_strings_intdecode[] =
  *
  ****************************************************************************/
 
-#if defined(CONFIG_EFM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_EFM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t efm32_getreg(uint32_t addr)
 {
   static uint32_t prevaddr = 0;
@@ -857,7 +857,7 @@ static uint32_t efm32_getreg(uint32_t addr)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_EFM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_EFM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static void efm32_putreg(uint32_t val, uint32_t addr)
 {
   /* Show the register value being written */
@@ -4184,7 +4184,7 @@ static int efm32_ep_disable(FAR struct usbdev_ep_s *ep)
 {
   FAR struct efm32_ep_s *privep = (FAR struct efm32_ep_s *)ep;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(EFM32_TRACEERR_INVALIDPARMS), 0);
@@ -4224,7 +4224,7 @@ static FAR struct usbdev_req_s *efm32_ep_allocreq(FAR struct usbdev_ep_s *ep)
 {
   FAR struct efm32_req_s *privreq;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(EFM32_TRACEERR_INVALIDPARMS), 0);
@@ -4257,7 +4257,7 @@ static void efm32_ep_freereq(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s
 {
   FAR struct efm32_req_s *privreq = (FAR struct efm32_req_s *)req;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !req)
     {
       usbtrace(TRACE_DEVERROR(EFM32_TRACEERR_INVALIDPARMS), 0);
@@ -4329,7 +4329,7 @@ static int efm32_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *
 
   /* Some sanity checking */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!req || !req->callback || !req->buf || !ep)
     {
       usbtrace(TRACE_DEVERROR(EFM32_TRACEERR_INVALIDPARMS), 0);
@@ -4341,7 +4341,7 @@ static int efm32_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *
   usbtrace(TRACE_EPSUBMIT, privep->epphy);
   priv = privep->dev;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!priv->driver)
     {
       usbtrace(TRACE_DEVERROR(EFM32_TRACEERR_NOTCONFIGURED), priv->usbdev.speed);
@@ -4418,7 +4418,7 @@ static int efm32_ep_cancel(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *
   FAR struct efm32_ep_s *privep = (FAR struct efm32_ep_s *)ep;
   irqstate_t flags;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !req)
     {
       usbtrace(TRACE_DEVERROR(EFM32_TRACEERR_INVALIDPARMS), 0);
@@ -4876,7 +4876,7 @@ static int efm32_selfpowered(struct usbdev_s *dev, bool selfpowered)
 
   usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(EFM32_TRACEERR_INVALIDPARMS), 0);
@@ -5605,7 +5605,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
 
   usbtrace(TRACE_DEVREGISTER, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!driver || !driver->ops->bind || !driver->ops->unbind ||
       !driver->ops->disconnect || !driver->ops->setup)
     {
@@ -5676,7 +5676,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
 
   usbtrace(TRACE_DEVUNREGISTER, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (driver != priv->driver)
     {
       usbtrace(TRACE_DEVERROR(EFM32_TRACEERR_INVALIDPARMS), 0);
diff --git a/arch/arm/src/efm32/efm32_usbhost.c b/arch/arm/src/efm32/efm32_usbhost.c
index 9f4c926cbe..0c3c12fbc7 100644
--- a/arch/arm/src/efm32/efm32_usbhost.c
+++ b/arch/arm/src/efm32/efm32_usbhost.c
@@ -92,9 +92,9 @@
  *  CONFIG_EFM32_OTGFS_SOFINTR - Enable SOF interrupts.  Why would you ever
  *    want to do that?
  *  CONFIG_EFM32_USBHOST_REGDEBUG - Enable very low-level register access
- *    debug.  Depends on CONFIG_DEBUG.
+ *    debug.  Depends on CONFIG_DEBUG_FEATURES.
  *  CONFIG_EFM32_USBHOST_PKTDUMP - Dump all incoming and outgoing USB
- *    packets. Depends on CONFIG_DEBUG.
+ *    packets. Depends on CONFIG_DEBUG_FEATURES.
  */
 
 /* Default RxFIFO size */
@@ -121,9 +121,9 @@
 #  define CONFIG_EFM32_OTGFS_DESCSIZE 128
 #endif
 
-/* Register/packet debug depends on CONFIG_DEBUG */
+/* Register/packet debug depends on CONFIG_DEBUG_FEATURES */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_EFM32_USBHOST_REGDEBUG
 #  undef CONFIG_EFM32_USBHOST_PKTDUMP
 #endif
diff --git a/arch/arm/src/imx6/imx_lowputc.c b/arch/arm/src/imx6/imx_lowputc.c
index a6387e7321..8bfabf7085 100644
--- a/arch/arm/src/imx6/imx_lowputc.c
+++ b/arch/arm/src/imx6/imx_lowputc.c
@@ -584,7 +584,7 @@ int imx_uart_configure(uint32_t base, FAR const struct uart_config_s *config)
  *
  ************************************************************************************/
 
-#if defined(IMX_HAVE_UART) && defined(CONFIG_DEBUG)
+#if defined(IMX_HAVE_UART) && defined(CONFIG_DEBUG_FEATURES)
 void imx_lowputc(int ch)
 {
   /* Poll the TX fifo trigger level bit of the UART status register. When the TXFE
diff --git a/arch/arm/src/imx6/imx_lowputc.h b/arch/arm/src/imx6/imx_lowputc.h
index d487931dc6..081f366ea7 100644
--- a/arch/arm/src/imx6/imx_lowputc.h
+++ b/arch/arm/src/imx6/imx_lowputc.h
@@ -105,7 +105,7 @@ int imx_uart_configure(uint32_t base, FAR const struct uart_config_s *config);
  *
  ************************************************************************************/
 
-#if defined(IMX_HAVE_UART) && defined(CONFIG_DEBUG)
+#if defined(IMX_HAVE_UART) && defined(CONFIG_DEBUG_FEATURES)
 void imx_lowputc(int ch);
 #else
 #  define imx_lowputc(ch)
diff --git a/arch/arm/src/kinetis/kinetis_irq.c b/arch/arm/src/kinetis/kinetis_irq.c
index 44f21af47d..6fea252101 100644
--- a/arch/arm/src/kinetis/kinetis_irq.c
+++ b/arch/arm/src/kinetis/kinetis_irq.c
@@ -168,7 +168,7 @@ static void kinetis_dumpnvic(const char *msg, int irq)
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 static int kinetis_nmi(int irq, FAR void *context)
 {
   (void)up_irq_save();
@@ -420,7 +420,7 @@ void up_irqinitialize(void)
 
   /* Attach all other processor exceptions (except reset and sys tick) */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   irq_attach(KINETIS_IRQ_NMI, kinetis_nmi);
 #ifndef CONFIG_ARM_MPU
   irq_attach(KINETIS_IRQ_MEMFAULT, up_memfault);
diff --git a/arch/arm/src/kinetis/kinetis_pwm.c b/arch/arm/src/kinetis/kinetis_pwm.c
index 6d8f223591..51604dd860 100644
--- a/arch/arm/src/kinetis/kinetis_pwm.c
+++ b/arch/arm/src/kinetis/kinetis_pwm.c
@@ -78,7 +78,7 @@
 /* Debug ********************************************************************/
 /* Non-standard debug that may be enabled just for testing PWM */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_PWM
 #endif
 
diff --git a/arch/arm/src/kinetis/kinetis_sdhc.c b/arch/arm/src/kinetis/kinetis_sdhc.c
index d385592b40..38607d128b 100644
--- a/arch/arm/src/kinetis/kinetis_sdhc.c
+++ b/arch/arm/src/kinetis/kinetis_sdhc.c
@@ -2152,7 +2152,7 @@ static int kinetis_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd,
    */
 
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!rshort)
     {
       fdbg("ERROR: rshort=NULL\n");
@@ -2209,7 +2209,7 @@ static int kinetis_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t r
    *     0         1               End bit
    */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   /* Check that R1 is the correct response to this command */
 
   if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R2_RESPONSE)
@@ -2263,7 +2263,7 @@ static int kinetis_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t
 
   /* Check that this is the correct response to this command */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R3_RESPONSE &&
       (cmd & MMCSD_RESPONSE_MASK) != MMCSD_R7_RESPONSE)
     {
diff --git a/arch/arm/src/kinetis/kinetis_serial.c b/arch/arm/src/kinetis/kinetis_serial.c
index 550ff55917..1d5e6d4840 100644
--- a/arch/arm/src/kinetis/kinetis_serial.c
+++ b/arch/arm/src/kinetis/kinetis_serial.c
@@ -232,7 +232,7 @@ struct up_dev_s
   uintptr_t uartbase;  /* Base address of UART registers */
   uint32_t  baud;      /* Configured baud */
   uint32_t  clock;     /* Clocking frequency of the UART module */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   uint8_t   irqe;      /* Error IRQ associated with this UART (for enable) */
 #endif
   uint8_t   irqs;      /* Status IRQ associated with this UART (for enable) */
@@ -250,7 +250,7 @@ static int  up_setup(struct uart_dev_s *dev);
 static void up_shutdown(struct uart_dev_s *dev);
 static int  up_attach(struct uart_dev_s *dev);
 static void up_detach(struct uart_dev_s *dev);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 static int  up_interrupte(int irq, void *context);
 #endif
 static int  up_interrupts(int irq, void *context);
@@ -327,7 +327,7 @@ static struct up_dev_s g_uart0priv =
   .uartbase       = KINETIS_UART0_BASE,
   .clock          = BOARD_CORECLK_FREQ,
   .baud           = CONFIG_UART0_BAUD,
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   .irqe           = KINETIS_IRQ_UART0E,
 #endif
   .irqs           = KINETIS_IRQ_UART0S,
@@ -361,7 +361,7 @@ static struct up_dev_s g_uart1priv =
   .uartbase       = KINETIS_UART1_BASE,
   .clock          = BOARD_CORECLK_FREQ,
   .baud           = CONFIG_UART1_BAUD,
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   .irqe           = KINETIS_IRQ_UART1E,
 #endif
   .irqs           = KINETIS_IRQ_UART1S,
@@ -395,7 +395,7 @@ static struct up_dev_s g_uart2priv =
   .uartbase       = KINETIS_UART2_BASE,
   .clock          = BOARD_BUS_FREQ,
   .baud           = CONFIG_UART2_BAUD,
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   .irqe           = KINETIS_IRQ_UART2E,
 #endif
   .irqs           = KINETIS_IRQ_UART2S,
@@ -429,7 +429,7 @@ static struct up_dev_s g_uart3priv =
   .uartbase       = KINETIS_UART3_BASE,
   .clock          = BOARD_BUS_FREQ,
   .baud           = CONFIG_UART3_BAUD,
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   .irqe           = KINETIS_IRQ_UART3E,
 #endif
   .irqs           = KINETIS_IRQ_UART3S,
@@ -463,7 +463,7 @@ static struct up_dev_s g_uart4priv =
   .uartbase       = KINETIS_UART4_BASE,
   .clock          = BOARD_BUS_FREQ,
   .baud           = CONFIG_UART4_BAUD,
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   .irqe           = KINETIS_IRQ_UART4E,
 #endif
   .irqs           = KINETIS_IRQ_UART4S,
@@ -497,7 +497,7 @@ static struct up_dev_s g_uart5priv =
   .uartbase       = KINETIS_UART5_BASE,
   .clock          = BOARD_BUS_FREQ,
   .baud           = CONFIG_UART5_BAUD,
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   .irqe           = KINETIS_IRQ_UART5E,
 #endif
   .irqs           = KINETIS_IRQ_UART5S,
@@ -626,7 +626,7 @@ static int up_setup(struct uart_dev_s *dev)
   /* Set up the interrupt priority */
 
   up_prioritize_irq(priv->irqs, priv->irqprio);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   up_prioritize_irq(priv->irqe, priv->irqprio);
 #endif
 #endif
@@ -681,7 +681,7 @@ static int up_attach(struct uart_dev_s *dev)
    */
 
   ret = irq_attach(priv->irqs, up_interrupts);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (ret == OK)
     {
       ret = irq_attach(priv->irqe, up_interrupte);
@@ -690,7 +690,7 @@ static int up_attach(struct uart_dev_s *dev)
 
   if (ret == OK)
     {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       up_enable_irq(priv->irqe);
 #endif
       up_enable_irq(priv->irqs);
@@ -716,7 +716,7 @@ static void up_detach(struct uart_dev_s *dev)
   /* Disable interrupts */
 
   up_restoreuartint(priv, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   up_disable_irq(priv->irqe);
 #endif
   up_disable_irq(priv->irqs);
@@ -724,7 +724,7 @@ static void up_detach(struct uart_dev_s *dev)
   /* Detach from the interrupt(s) */
 
   irq_detach(priv->irqs);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   irq_detach(priv->irqe);
 #endif
 }
@@ -738,7 +738,7 @@ static void up_detach(struct uart_dev_s *dev)
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 static int up_interrupte(int irq, void *context)
 {
   struct uart_dev_s *dev = NULL;
@@ -808,7 +808,7 @@ static int up_interrupte(int irq, void *context)
   regval = up_serialin(priv, KINETIS_UART_D_OFFSET);
   return OK;
 }
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_FEATURES */
 
 /****************************************************************************
  * Name: up_interrupts
@@ -1064,7 +1064,7 @@ static void up_rxint(struct uart_dev_s *dev, bool enable)
     }
   else
     {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 #  warning "Revisit:  How are errors enabled?"
       priv->ie |= UART_C2_RIE;
 #else
diff --git a/arch/arm/src/kinetis/kinetis_usbdev.c b/arch/arm/src/kinetis/kinetis_usbdev.c
index fdb76f455c..e92edd72a0 100644
--- a/arch/arm/src/kinetis/kinetis_usbdev.c
+++ b/arch/arm/src/kinetis/kinetis_usbdev.c
@@ -86,7 +86,7 @@
  * enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_KHCI_USBDEV_REGDEBUG
 #  undef CONFIG_KHCI_USBDEV_BDTDEBUG
 #endif
@@ -3237,7 +3237,7 @@ static int khci_epconfigure(struct usbdev_ep_s *ep,
   bool     bidi;
   int      index;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !desc)
     {
       usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_INVALIDPARMS), 0);
@@ -3364,7 +3364,7 @@ static int khci_epdisable(struct usbdev_ep_s *ep)
   int i;
   irqstate_t flags;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_INVALIDPARMS), 0);
@@ -3408,7 +3408,7 @@ static struct usbdev_req_s *khci_epallocreq(struct usbdev_ep_s *ep)
 {
   struct khci_req_s *privreq;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_INVALIDPARMS), 0);
@@ -3437,7 +3437,7 @@ static void khci_epfreereq(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
 {
   struct khci_req_s *privreq = (struct khci_req_s *)req;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !req)
     {
       usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_INVALIDPARMS), 0);
@@ -3463,7 +3463,7 @@ static int khci_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
   uint8_t epno;
   int ret = OK;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!req || !req->callback || !req->buf || !ep)
     {
       usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_INVALIDPARMS), 0);
@@ -3475,7 +3475,7 @@ static int khci_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
   usbtrace(TRACE_EPSUBMIT, USB_EPNO(ep->eplog));
   priv = privep->dev;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!priv->driver)
     {
       usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_NOTCONFIGURED), priv->usbdev.speed);
@@ -3550,7 +3550,7 @@ static int khci_epcancel(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
   struct khci_ep_s *privep = (struct khci_ep_s *)ep;
   irqstate_t flags;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !req)
     {
       usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_INVALIDPARMS), 0);
@@ -3737,7 +3737,7 @@ static int khci_epstall(struct usbdev_ep_s *ep, bool resume)
   irqstate_t flags;
   int ret;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_INVALIDPARMS), 0);
@@ -3798,7 +3798,7 @@ static struct usbdev_ep_s *khci_allocep(struct usbdev_s *dev, uint8_t epno,
   uint16_t epset = KHCI_ENDP_ALLSET;
 
   usbtrace(TRACE_DEVALLOCEP, (uint16_t)epno);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_INVALIDPARMS), 0);
@@ -3856,7 +3856,7 @@ static void khci_freeep(struct usbdev_s *dev, struct usbdev_ep_s *ep)
   struct khci_usbdev_s *priv;
   struct khci_ep_s *privep;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev || !ep)
     {
       usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_INVALIDPARMS), 0);
@@ -3888,7 +3888,7 @@ static int khci_getframe(struct usbdev_s *dev)
   uint16_t frmh;
   uint16_t tmp;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_INVALIDPARMS), 0);
@@ -3929,7 +3929,7 @@ static int khci_wakeup(struct usbdev_s *dev)
   struct khci_usbdev_s *priv = (struct khci_usbdev_s *)dev;
 
   usbtrace(TRACE_DEVWAKEUP, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_INVALIDPARMS), 0);
@@ -3953,7 +3953,7 @@ static int khci_selfpowered(struct usbdev_s *dev, bool selfpowered)
 
   usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_INVALIDPARMS), 0);
@@ -4532,7 +4532,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
 
   usbtrace(TRACE_DEVREGISTER, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!driver || !driver->ops->bind || !driver->ops->unbind ||
       !driver->ops->disconnect || !driver->ops->setup)
     {
@@ -4599,7 +4599,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
 
   usbtrace(TRACE_DEVUNREGISTER, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (driver != priv->driver)
     {
       usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_INVALIDPARMS), 0);
diff --git a/arch/arm/src/kl/Make.defs b/arch/arm/src/kl/Make.defs
index 39308b6948..105d267a73 100644
--- a/arch/arm/src/kl/Make.defs
+++ b/arch/arm/src/kl/Make.defs
@@ -65,7 +65,7 @@ else ifeq ($(CONFIG_MODULE),y)
 CMN_CSRCS += up_elf.c
 endif
 
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
 CMN_CSRCS += up_dumpnvic.c
 endif
 
@@ -101,6 +101,6 @@ ifeq ($(CONFIG_PWM),y)
 CHIP_CSRCS += kl_pwm.c
 endif
 
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
 CHIP_CSRCS += kl_dumpgpio.c
 endif
diff --git a/arch/arm/src/kl/kl_dumpgpio.c b/arch/arm/src/kl/kl_dumpgpio.c
index b6ea6de628..961414b466 100644
--- a/arch/arm/src/kl/kl_dumpgpio.c
+++ b/arch/arm/src/kl/kl_dumpgpio.c
@@ -48,14 +48,14 @@
 #include "chip.h"
 #include "kl_gpio.h"
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 
 /****************************************************************************
  * Private Data
  ****************************************************************************/
 /* Port letters for prettier debug output */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 static const char g_portchar[KL_GPIO_NPORTS] =
 {
 #if KL_GPIO_NPORTS > 9
@@ -133,4 +133,4 @@ void kl_dumpgpio(gpio_cfgset_t pinset, const char *msg)
   leave_critical_section(flags);
 }
 
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_FEATURES */
diff --git a/arch/arm/src/kl/kl_irq.c b/arch/arm/src/kl/kl_irq.c
index 87d47ab35c..1f62d1a013 100644
--- a/arch/arm/src/kl/kl_irq.c
+++ b/arch/arm/src/kl/kl_irq.c
@@ -137,7 +137,7 @@ static void kl_dumpnvic(const char *msg, int irq)
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 static int kl_nmi(int irq, FAR void *context)
 {
   (void)up_irq_save();
@@ -236,7 +236,7 @@ void up_irqinitialize(void)
 
   /* Attach all other processor exceptions (except reset and sys tick) */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   irq_attach(KL_IRQ_NMI, kl_nmi);
   irq_attach(KL_IRQ_PENDSV, kl_pendsv);
   irq_attach(KL_IRQ_RESERVED, kl_reserved);
diff --git a/arch/arm/src/kl/kl_pwm.c b/arch/arm/src/kl/kl_pwm.c
index 52249f34fe..72f1705d21 100644
--- a/arch/arm/src/kl/kl_pwm.c
+++ b/arch/arm/src/kl/kl_pwm.c
@@ -75,7 +75,7 @@
 /* Debug ********************************************************************/
 /* Non-standard debug that may be enabled just for testing PWM */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_PWM
 #endif
 
diff --git a/arch/arm/src/kl/kl_spi.c b/arch/arm/src/kl/kl_spi.c
index eacebac98a..e80de128ad 100644
--- a/arch/arm/src/kl/kl_spi.c
+++ b/arch/arm/src/kl/kl_spi.c
@@ -65,9 +65,9 @@
 /* Debug ********************************************************************/
 /* The following enable debug output from this file:
  *
- * CONFIG_DEBUG         - Define to enable general debug features
- * CONFIG_DEBUG_SPI     - Define to enable basic SSP debug (needs CONFIG_DEBUG)
- * CONFIG_DEBUG_INFO - Define to enable verbose SSP debug
+ * CONFIG_DEBUG_FEATURES - Define to enable general debug features
+ * CONFIG_DEBUG_SPI      - Define to enable basic SSP debug (needs CONFIG_DEBUG_FEATURES)
+ * CONFIG_DEBUG_INFO     - Define to enable verbose SSP debug
  */
 
 #ifdef CONFIG_DEBUG_SPI
diff --git a/arch/arm/src/kl/kl_start.c b/arch/arm/src/kl/kl_start.c
index 63491ac74d..6e9970517f 100644
--- a/arch/arm/src/kl/kl_start.c
+++ b/arch/arm/src/kl/kl_start.c
@@ -94,7 +94,7 @@ const uint32_t g_idle_topstack = IDLE_STACK;
  *
  ****************************************************************************/
 
-#if defined(CONFIG_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES)
 #  define showprogress(c) kl_lowputc((uint32_t)c)
 #else
 #  define showprogress(c)
diff --git a/arch/arm/src/lpc11xx/Kconfig b/arch/arm/src/lpc11xx/Kconfig
index 45bb842a30..64badf0dbd 100644
--- a/arch/arm/src/lpc11xx/Kconfig
+++ b/arch/arm/src/lpc11xx/Kconfig
@@ -229,10 +229,11 @@ config CAN_LOOPBACK
 
 config CAN_REGDEBUG
 	bool "Register level debug"
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	default n
 	---help---
-		Output detailed register-level CAN debug information.  Requires also DEBUG and DEBUG_CAN.
+		Output detailed register-level CAN debug information.  Requires also
+		CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_CAN.
 
 endmenu
 
diff --git a/arch/arm/src/lpc11xx/Make.defs b/arch/arm/src/lpc11xx/Make.defs
index fd0e046964..041419c248 100644
--- a/arch/arm/src/lpc11xx/Make.defs
+++ b/arch/arm/src/lpc11xx/Make.defs
@@ -65,7 +65,7 @@ else ifeq ($(CONFIG_MODULE),y)
 CMN_CSRCS += up_elf.c
 endif
 
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
 CMN_CSRCS += up_dumpnvic.c
 endif
 
diff --git a/arch/arm/src/lpc11xx/lpc11_gpiodbg.c b/arch/arm/src/lpc11xx/lpc11_gpiodbg.c
index 6be8d9c55f..5907c8df2c 100644
--- a/arch/arm/src/lpc11xx/lpc11_gpiodbg.c
+++ b/arch/arm/src/lpc11xx/lpc11_gpiodbg.c
@@ -53,7 +53,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_GPIO
 #endif
 
diff --git a/arch/arm/src/lpc11xx/lpc11_irq.c b/arch/arm/src/lpc11xx/lpc11_irq.c
index c6daaba380..80a299926e 100644
--- a/arch/arm/src/lpc11xx/lpc11_irq.c
+++ b/arch/arm/src/lpc11xx/lpc11_irq.c
@@ -133,7 +133,7 @@ static void lpc11_dumpnvic(const char *msg, int irq)
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 static int lpc11_nmi(int irq, FAR void *context)
 {
   (void)up_irq_save();
@@ -232,7 +232,7 @@ void up_irqinitialize(void)
 
   /* Attach all other processor exceptions (except reset and sys tick) */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   irq_attach(LPC11_IRQ_NMI, lpc11_nmi);
   irq_attach(LPC11_IRQ_PENDSV, lpc11_pendsv);
   irq_attach(LPC11_IRQ_RESERVED, lpc11_reserved);
diff --git a/arch/arm/src/lpc11xx/lpc11_spi.c b/arch/arm/src/lpc11xx/lpc11_spi.c
index 942ff3e2fc..c065965111 100644
--- a/arch/arm/src/lpc11xx/lpc11_spi.c
+++ b/arch/arm/src/lpc11xx/lpc11_spi.c
@@ -74,9 +74,9 @@
 /* Debug ********************************************************************/
 /* The following enable debug output from this file:
  *
- * CONFIG_DEBUG         - Define to enable general debug features
- * CONFIG_DEBUG_SPI     - Define to enable basic SSP debug (needs CONFIG_DEBUG)
- * CONFIG_DEBUG_INFO - Define to enable verbose SSP debug
+ * CONFIG_DEBUG_FEATURES - Define to enable general debug features
+ * CONFIG_DEBUG_SPI      - Define to enable basic SSP debug (needs CONFIG_DEBUG_FEATURES)
+ * CONFIG_DEBUG_INFO     - Define to enable verbose SSP debug
  */
 
 #ifdef CONFIG_DEBUG_SPI
diff --git a/arch/arm/src/lpc11xx/lpc11_ssp.c b/arch/arm/src/lpc11xx/lpc11_ssp.c
index 7ebb1b3bdb..a272f6f940 100644
--- a/arch/arm/src/lpc11xx/lpc11_ssp.c
+++ b/arch/arm/src/lpc11xx/lpc11_ssp.c
@@ -75,9 +75,9 @@
 /* Debug ********************************************************************/
 /* The following enable debug output from this file:
  *
- * CONFIG_DEBUG         - Define to enable general debug features
- * CONFIG_DEBUG_SPI     - Define to enable basic SSP debug (needs CONFIG_DEBUG)
- * CONFIG_DEBUG_INFO - Define to enable verbose SSP debug
+ * CONFIG_DEBUG_FEATURES - Define to enable general debug features
+ * CONFIG_DEBUG_SPI      - Define to enable basic SSP debug (needs CONFIG_DEBUG_FEATURES)
+ * CONFIG_DEBUG_INFO     - Define to enable verbose SSP debug
  */
 
 #ifdef CONFIG_DEBUG_SPI
diff --git a/arch/arm/src/lpc11xx/lpc11_start.c b/arch/arm/src/lpc11xx/lpc11_start.c
index 7842969149..917cdeae27 100644
--- a/arch/arm/src/lpc11xx/lpc11_start.c
+++ b/arch/arm/src/lpc11xx/lpc11_start.c
@@ -86,7 +86,7 @@ const uint32_t g_idle_topstack = IDLE_STACK;
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 #  define showprogress(c) up_lowputc(c)
 #else
 #  define showprogress(c)
diff --git a/arch/arm/src/lpc11xx/lpc11_timer.c b/arch/arm/src/lpc11xx/lpc11_timer.c
index a7b995fd90..0201e259f7 100644
--- a/arch/arm/src/lpc11xx/lpc11_timer.c
+++ b/arch/arm/src/lpc11xx/lpc11_timer.c
@@ -84,7 +84,7 @@
 /* Debug ********************************************************************/
 /* Non-standard debug that may be enabled just for testing PWM */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_PWM
 #endif
 
diff --git a/arch/arm/src/lpc17xx/Kconfig b/arch/arm/src/lpc17xx/Kconfig
index 4bb53068bb..e2315fedd7 100644
--- a/arch/arm/src/lpc17xx/Kconfig
+++ b/arch/arm/src/lpc17xx/Kconfig
@@ -596,10 +596,11 @@ config CAN_LOOPBACK
 
 config CAN_REGDEBUG
 	bool "Register level debug"
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	default n
 	---help---
-		Output detailed register-level CAN debug information.  Requires also DEBUG and DEBUG_CAN.
+		Output detailed register-level CAN debug information.  Requires also
+		CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_CAN.
 
 endmenu
 
@@ -705,10 +706,10 @@ config NET_WOL
 
 config NET_REGDEBUG
 	bool "Ethernet register-level debug"
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	default n
 	---help---
-		Enable low level register debug.  Also needs DEBUG.
+		Enable low level register debug.  Also needs CONFIG_DEBUG_FEATURES.
 
 config NET_HASH
 	bool "Hashing"
@@ -900,10 +901,11 @@ config LPC17_USBDEV_NOLED
 
 config LPC17_USBDEV_REGDEBUG
 	bool "Register level debug"
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	default n
 	---help---
-		Output detailed register-level USB device debug information.  Requires also DEBUG.
+		Output detailed register-level USB device debug information.  Requires
+		also CONFIG_DEBUG_FEATURES.
 
 endmenu
 
@@ -976,9 +978,10 @@ config USBHOST_ISOC_DISABLE
 
 config LPC17_USBHOST_REGDEBUG
 	bool "Register level debug"
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	default n
 	---help---
-		Output detailed register-level USB host debug information.  Requires also DEBUG.
+		Output detailed register-level USB host debug information.  Requires
+		also CONFIG_DEBUG_FEATURES.
 
 endmenu
diff --git a/arch/arm/src/lpc17xx/lpc176x_rtc.c b/arch/arm/src/lpc17xx/lpc176x_rtc.c
index fbec7c40e2..eb347ff4c8 100644
--- a/arch/arm/src/lpc17xx/lpc176x_rtc.c
+++ b/arch/arm/src/lpc17xx/lpc176x_rtc.c
@@ -72,7 +72,7 @@
 #  error "CONFIG_RTC_HIRES must NOT be set with this driver"
 #endif
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_RTC
 #endif
 
diff --git a/arch/arm/src/lpc17xx/lpc17_can.c b/arch/arm/src/lpc17xx/lpc17_can.c
index ea08c70fe1..d7d46afd3f 100644
--- a/arch/arm/src/lpc17xx/lpc17_can.c
+++ b/arch/arm/src/lpc17xx/lpc17_can.c
@@ -160,7 +160,7 @@
 /* Debug ********************************************************************/
 /* Non-standard debug that may be enabled just for testing CAN */
 
-#if !defined(CONFIG_DEBUG) || !defined(CONFIG_DEBUG_CAN)
+#if !defined(CONFIG_DEBUG_FEATURES) || !defined(CONFIG_DEBUG_CAN)
 #  undef CONFIG_CAN_REGDEBUG
 #endif
 
diff --git a/arch/arm/src/lpc17xx/lpc17_ethernet.c b/arch/arm/src/lpc17xx/lpc17_ethernet.c
index 5180204a32..c49b61ad5d 100644
--- a/arch/arm/src/lpc17xx/lpc17_ethernet.c
+++ b/arch/arm/src/lpc17xx/lpc17_ethernet.c
@@ -127,9 +127,9 @@
 #endif
 
 /* Debug Configuration *****************************************************/
-/* Register debug -- can only happen of CONFIG_DEBUG is selected */
+/* Register debug -- can only happen of CONFIG_DEBUG_FEATURES is selected */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef  CONFIG_NET_REGDEBUG
 #endif
 
@@ -137,7 +137,7 @@
  * console.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef  CONFIG_NET_DUMPPACKET
 #endif
 
diff --git a/arch/arm/src/lpc17xx/lpc17_gpiodbg.c b/arch/arm/src/lpc17xx/lpc17_gpiodbg.c
index fc6ce33162..680e02a53d 100644
--- a/arch/arm/src/lpc17xx/lpc17_gpiodbg.c
+++ b/arch/arm/src/lpc17xx/lpc17_gpiodbg.c
@@ -53,7 +53,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_GPIO
 #endif
 
diff --git a/arch/arm/src/lpc17xx/lpc17_irq.c b/arch/arm/src/lpc17xx/lpc17_irq.c
index d1f72be399..734308952e 100644
--- a/arch/arm/src/lpc17xx/lpc17_irq.c
+++ b/arch/arm/src/lpc17xx/lpc17_irq.c
@@ -146,7 +146,7 @@ static void lpc17_dumpnvic(const char *msg, int irq)
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 static int lpc17_nmi(int irq, FAR void *context)
 {
   (void)up_irq_save();
@@ -392,7 +392,7 @@ void up_irqinitialize(void)
 
   /* Attach all other processor exceptions (except reset and sys tick) */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   irq_attach(LPC17_IRQ_NMI, lpc17_nmi);
 #ifndef CONFIG_ARM_MPU
   irq_attach(LPC17_IRQ_MEMFAULT, up_memfault);
diff --git a/arch/arm/src/lpc17xx/lpc17_mcpwm.c b/arch/arm/src/lpc17xx/lpc17_mcpwm.c
index 04c1830dad..7fe1edee39 100644
--- a/arch/arm/src/lpc17xx/lpc17_mcpwm.c
+++ b/arch/arm/src/lpc17xx/lpc17_mcpwm.c
@@ -83,7 +83,7 @@
 /* Debug ********************************************************************/
 /* Non-standard debug that may be enabled just for testing PWM */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_PWM
 #endif
 
diff --git a/arch/arm/src/lpc17xx/lpc17_pwm.c b/arch/arm/src/lpc17xx/lpc17_pwm.c
index 3fdb7397ac..756feb5f52 100644
--- a/arch/arm/src/lpc17xx/lpc17_pwm.c
+++ b/arch/arm/src/lpc17xx/lpc17_pwm.c
@@ -101,7 +101,7 @@
 /* Debug ********************************************************************/
 /* Non-standard debug that may be enabled just for testing PWM */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_PWM
 #endif
 
diff --git a/arch/arm/src/lpc17xx/lpc17_sdcard.c b/arch/arm/src/lpc17xx/lpc17_sdcard.c
index 3f5c5a5b66..4ba4d8bbd3 100644
--- a/arch/arm/src/lpc17xx/lpc17_sdcard.c
+++ b/arch/arm/src/lpc17xx/lpc17_sdcard.c
@@ -109,7 +109,7 @@
 #  error "Callback support requires CONFIG_SCHED_WORKQUEUE"
 #endif
 
-#if !defined(CONFIG_DEBUG_FS) || !defined(CONFIG_DEBUG)
+#if !defined(CONFIG_DEBUG_FS) || !defined(CONFIG_DEBUG_FEATURES)
 #  undef CONFIG_DEBUG_SDIO
 #endif
 
@@ -1955,7 +1955,7 @@ static int lpc17_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
 
 static int lpc17_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort)
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   uint32_t respcmd;
 #endif
   uint32_t regval;
@@ -1984,7 +1984,7 @@ static int lpc17_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t
    */
 
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!rshort)
     {
       fdbg("ERROR: rshort=NULL\n");
@@ -2016,7 +2016,7 @@ static int lpc17_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t
           fdbg("ERROR: CRC failure: %08x\n", regval);
           ret = -EIO;
         }
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       else
         {
           /* Check response received is of desired command */
@@ -2052,7 +2052,7 @@ static int lpc17_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlo
    *     0         1               End bit
    */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   /* Check that R1 is the correct response to this command */
 
   if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R2_RESPONSE)
@@ -2107,7 +2107,7 @@ static int lpc17_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *r
 
   /* Check that this is the correct response to this command */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R3_RESPONSE &&
       (cmd & MMCSD_RESPONSE_MASK) != MMCSD_R7_RESPONSE)
     {
diff --git a/arch/arm/src/lpc17xx/lpc17_spi.c b/arch/arm/src/lpc17xx/lpc17_spi.c
index 7853419cdc..34f30a703e 100644
--- a/arch/arm/src/lpc17xx/lpc17_spi.c
+++ b/arch/arm/src/lpc17xx/lpc17_spi.c
@@ -74,9 +74,9 @@
 /* Debug ********************************************************************/
 /* The following enable debug output from this file:
  *
- * CONFIG_DEBUG         - Define to enable general debug features
- * CONFIG_DEBUG_SPI     - Define to enable basic SSP debug (needs CONFIG_DEBUG)
- * CONFIG_DEBUG_INFO - Define to enable verbose SSP debug
+ * CONFIG_DEBUG_FEATURES - Define to enable general debug features
+ * CONFIG_DEBUG_SPI      - Define to enable basic SSP debug (needs CONFIG_DEBUG_FEATURES)
+ * CONFIG_DEBUG_INFO     - Define to enable verbose SSP debug
  */
 
 #ifdef CONFIG_DEBUG_SPI
diff --git a/arch/arm/src/lpc17xx/lpc17_ssp.c b/arch/arm/src/lpc17xx/lpc17_ssp.c
index f80b12de1d..6685cb0723 100644
--- a/arch/arm/src/lpc17xx/lpc17_ssp.c
+++ b/arch/arm/src/lpc17xx/lpc17_ssp.c
@@ -75,9 +75,9 @@
 /* Debug ********************************************************************/
 /* The following enable debug output from this file:
  *
- * CONFIG_DEBUG         - Define to enable general debug features
- * CONFIG_DEBUG_SPI     - Define to enable basic SSP debug (needs CONFIG_DEBUG)
- * CONFIG_DEBUG_INFO - Define to enable verbose SSP debug
+ * CONFIG_DEBUG_FEATURES - Define to enable general debug features
+ * CONFIG_DEBUG_SPI      - Define to enable basic SSP debug (needs CONFIG_DEBUG_FEATURES)
+ * CONFIG_DEBUG_INFO     - Define to enable verbose SSP debug
  */
 
 #ifdef CONFIG_DEBUG_SPI
diff --git a/arch/arm/src/lpc17xx/lpc17_start.c b/arch/arm/src/lpc17xx/lpc17_start.c
index 8d95518d02..3a0ae1d705 100644
--- a/arch/arm/src/lpc17xx/lpc17_start.c
+++ b/arch/arm/src/lpc17xx/lpc17_start.c
@@ -82,7 +82,7 @@
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 #  define showprogress(c) up_lowputc(c)
 #else
 #  define showprogress(c)
diff --git a/arch/arm/src/lpc17xx/lpc17_timer.c b/arch/arm/src/lpc17xx/lpc17_timer.c
index 198c099cd1..1138f6b38e 100644
--- a/arch/arm/src/lpc17xx/lpc17_timer.c
+++ b/arch/arm/src/lpc17xx/lpc17_timer.c
@@ -84,7 +84,7 @@
 /* Debug ********************************************************************/
 /* Non-standard debug that may be enabled just for testing PWM */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_PWM
 #endif
 
diff --git a/arch/arm/src/lpc17xx/lpc17_usbdev.c b/arch/arm/src/lpc17xx/lpc17_usbdev.c
index 62495439af..cb8f8366e8 100644
--- a/arch/arm/src/lpc17xx/lpc17_usbdev.c
+++ b/arch/arm/src/lpc17xx/lpc17_usbdev.c
@@ -99,7 +99,7 @@
 #  define USB_FRAME_INT 0
 #endif
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 #  define USB_ERROR_INT USBDEV_INT_ERRINT
 #else
 #  undef  CONFIG_LPC17_USBDEV_REGDEBUG
@@ -2090,7 +2090,7 @@ static int lpc17_usbinterrupt(int irq, FAR void *context)
 
 #endif
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       /* USB engine error interrupt */
 
       if ((devintstatus & USBDEV_INT_ERRINT) != 0)
@@ -2412,7 +2412,7 @@ static int lpc17_dmasetup(struct lpc17_usbdev_s *priv, uint8_t epphy,
   struct lpc17_dmadesc_s *dmadesc = priv;
   uint32_t regval;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!priv || epphy < 2)
     {
       usbtrace(TRACE_DEVERROR(LPC17_TRACEERR_INVALIDPARMS), 0);
@@ -2611,7 +2611,7 @@ static int lpc17_epdisable(FAR struct usbdev_ep_s *ep)
   uint32_t mask = (1 << privep->epphy);
   uint32_t regval;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(LPC17_TRACEERR_INVALIDPARMS), 0);
@@ -2653,7 +2653,7 @@ static FAR struct usbdev_req_s *lpc17_epallocreq(FAR struct usbdev_ep_s *ep)
 {
   FAR struct lpc17_req_s *privreq;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(LPC17_TRACEERR_INVALIDPARMS), 0);
@@ -2685,7 +2685,7 @@ static void lpc17_epfreereq(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s
 {
   FAR struct lpc17_req_s *privreq = (FAR struct lpc17_req_s *)req;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !req)
     {
       usbtrace(TRACE_DEVERROR(LPC17_TRACEERR_INVALIDPARMS), 0);
@@ -2793,7 +2793,7 @@ static int lpc17_epsubmit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *r
   irqstate_t flags;
   int ret = OK;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!req || !req->callback || !req->buf || !ep)
     {
       usbtrace(TRACE_DEVERROR(LPC17_TRACEERR_INVALIDPARMS), 0);
@@ -2878,7 +2878,7 @@ static int lpc17_epcancel(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *r
   FAR struct lpc17_ep_s *privep = (FAR struct lpc17_ep_s *)ep;
   irqstate_t flags;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !req)
     {
       usbtrace(TRACE_DEVERROR(LPC17_TRACEERR_INVALIDPARMS), 0);
@@ -3142,7 +3142,7 @@ static int lpc17_selfpowered(struct usbdev_s *dev, bool selfpowered)
 
   usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(LPC17_TRACEERR_INVALIDPARMS), 0);
@@ -3406,7 +3406,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
 
   usbtrace(TRACE_DEVREGISTER, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!driver || !driver->ops->bind || !driver->ops->unbind ||
       !driver->ops->disconnect || !driver->ops->setup)
     {
@@ -3456,7 +3456,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
 {
   usbtrace(TRACE_DEVUNREGISTER, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (driver != g_usbdev.driver)
     {
       usbtrace(TRACE_DEVERROR(LPC17_TRACEERR_INVALIDPARMS), 0);
diff --git a/arch/arm/src/lpc214x/Kconfig b/arch/arm/src/lpc214x/Kconfig
index 68926095cf..a9fc00c245 100644
--- a/arch/arm/src/lpc214x/Kconfig
+++ b/arch/arm/src/lpc214x/Kconfig
@@ -140,7 +140,7 @@ config LPC214X_USBDEV_FRAME_INTERRUPT
 config LPC214X_USBDEV_REGDEBUG
 	bool "USB Device Register-Level Debug Output"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 
 endmenu
 endif
diff --git a/arch/arm/src/lpc214x/lpc214x_head.S b/arch/arm/src/lpc214x/lpc214x_head.S
index 8db27f29eb..c0d6c76510 100644
--- a/arch/arm/src/lpc214x/lpc214x_head.S
+++ b/arch/arm/src/lpc214x/lpc214x_head.S
@@ -280,7 +280,7 @@
  */
 
 	.macro	showprogress, code
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 	mov	r0, #\code
 	bl	up_lowputc
 #endif
diff --git a/arch/arm/src/lpc214x/lpc214x_usbdev.c b/arch/arm/src/lpc214x/lpc214x_usbdev.c
index cce4c2adb0..926a7a1280 100644
--- a/arch/arm/src/lpc214x/lpc214x_usbdev.c
+++ b/arch/arm/src/lpc214x/lpc214x_usbdev.c
@@ -104,7 +104,7 @@
 #  define USB_FRAME_INT 0
 #endif
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 #  define USB_ERROR_INT USBDEV_DEVINT_EPRINT
 #else
 #  define USB_ERROR_INT 0
@@ -382,7 +382,7 @@ struct lpc214x_usbdev_s
 
 /* Register operations ********************************************************/
 
-#if defined(CONFIG_LPC214X_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_LPC214X_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t lpc214x_getreg(uint32_t addr);
 static void lpc214x_putreg(uint32_t val, uint32_t addr);
 #else
@@ -518,7 +518,7 @@ static const struct usbdev_ops_s g_devops =
  *
  ****************************************************************************/
 
-#if defined(CONFIG_LPC214X_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_LPC214X_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t lpc214x_getreg(uint32_t addr)
 {
   static uint32_t prevaddr = 0;
@@ -581,7 +581,7 @@ static uint32_t lpc214x_getreg(uint32_t addr)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_LPC214X_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_LPC214X_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static void lpc214x_putreg(uint32_t val, uint32_t addr)
 {
   /* Show the register value being written */
@@ -2055,7 +2055,7 @@ static int lpc214x_usbinterrupt(int irq, FAR void *context)
 
 #endif
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       /* USB engine error interrupt */
 
       if ((devintstatus & USBDEV_DEVINT_EPRINT))
@@ -2378,7 +2378,7 @@ static int lpc214x_dmasetup(struct lpc214x_usbdev_s *priv, uint8_t epphy,
   struct lpc214x_dmadesc_s *dmadesc = priv;
   uint32_t reg;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!priv || epphy < 2)
     {
       usbtrace(TRACE_DEVERROR(LPC214X_TRACEERR_INVALIDPARMS), 0);
@@ -2577,7 +2577,7 @@ static int lpc214x_epdisable(FAR struct usbdev_ep_s *ep)
   uint32_t mask = (1 << privep->epphy);
   uint32_t reg;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(LPC214X_TRACEERR_INVALIDPARMS), 0);
@@ -2619,7 +2619,7 @@ static FAR struct usbdev_req_s *lpc214x_epallocreq(FAR struct usbdev_ep_s *ep)
 {
   FAR struct lpc214x_req_s *privreq;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(LPC214X_TRACEERR_INVALIDPARMS), 0);
@@ -2651,7 +2651,7 @@ static void lpc214x_epfreereq(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_
 {
   FAR struct lpc214x_req_s *privreq = (FAR struct lpc214x_req_s *)req;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !req)
     {
       usbtrace(TRACE_DEVERROR(LPC214X_TRACEERR_INVALIDPARMS), 0);
@@ -2759,7 +2759,7 @@ static int lpc214x_epsubmit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s
   irqstate_t flags;
   int ret = OK;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!req || !req->callback || !req->buf || !ep)
     {
       usbtrace(TRACE_DEVERROR(LPC214X_TRACEERR_INVALIDPARMS), 0);
@@ -2844,7 +2844,7 @@ static int lpc214x_epcancel(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s
   FAR struct lpc214x_ep_s *privep = (FAR struct lpc214x_ep_s *)ep;
   irqstate_t flags;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !req)
     {
       usbtrace(TRACE_DEVERROR(LPC214X_TRACEERR_INVALIDPARMS), 0);
@@ -3107,7 +3107,7 @@ static int lpc214x_selfpowered(struct usbdev_s *dev, bool selfpowered)
 
   usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(LPC214X_TRACEERR_INVALIDPARMS), 0);
@@ -3322,7 +3322,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
 
   usbtrace(TRACE_DEVREGISTER, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!driver || !driver->ops->bind || !driver->ops->unbind ||
       !driver->ops->disconnect || !driver->ops->setup)
     {
@@ -3372,7 +3372,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
 {
   usbtrace(TRACE_DEVUNREGISTER, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (driver != g_usbdev.driver)
     {
       usbtrace(TRACE_DEVERROR(LPC214X_TRACEERR_INVALIDPARMS), 0);
diff --git a/arch/arm/src/lpc2378/Kconfig b/arch/arm/src/lpc2378/Kconfig
index 08197970c6..eb9cba7570 100644
--- a/arch/arm/src/lpc2378/Kconfig
+++ b/arch/arm/src/lpc2378/Kconfig
@@ -185,7 +185,7 @@ config LPC2378_USBDEV_FRAME_INTERRUPT
 config LPC2378_USBDEV_REGDEBUG
 	bool "USB Device Register-Level Debug Output"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 
 endmenu
 endif
diff --git a/arch/arm/src/lpc2378/lpc23xx_head.S b/arch/arm/src/lpc2378/lpc23xx_head.S
index 179b390271..551f2d240e 100644
--- a/arch/arm/src/lpc2378/lpc23xx_head.S
+++ b/arch/arm/src/lpc2378/lpc23xx_head.S
@@ -60,7 +60,7 @@
  * modify r0, r1, r2 and r14
  */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 	.macro	showprogress, code
 	mov	r0, #\code
 	bl	up_lowputc
diff --git a/arch/arm/src/lpc31xx/Kconfig b/arch/arm/src/lpc31xx/Kconfig
index ffdaa81146..e89430ec9b 100644
--- a/arch/arm/src/lpc31xx/Kconfig
+++ b/arch/arm/src/lpc31xx/Kconfig
@@ -243,10 +243,11 @@ config LPC31_USBDEV_DMA
 
 config LPC31_USBDEV_REGDEBUG
 	bool "Register level debug"
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	default n
 	---help---
-		Output detailed register-level USB device debug information.  Requires also DEBUG.
+		Output detailed register-level USB device debug information.  Requires
+		also CONFIG_DEBUG_FEATURES.
 
 endmenu # USB device driver controller (DCD) options
 endif # LPC31_USBOTG && USBDEV
@@ -300,7 +301,7 @@ config LPC31_EHCI_PREALLOCATE
 config LPC31_EHCI_REGDEBUG
 	bool "Enable low-level EHCI register debug"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 
 endmenu # USB host controller driver (HCD) options
 endif # LPC31_USBOTG && USBHOST
@@ -309,9 +310,9 @@ menu "SPI device driver options"
 
 config LPC31_SPI_REGDEBUG
 	bool "SPI Register level debug"
-	depends on LPC31_SPI && DEBUG
+	depends on LPC31_SPI && DEBUG_FEATURES
 	default n
 	---help---
-		Output detailed register-level SPI device debug information.  Requires also DEBUG.
+		Output detailed register-level SPI device debug information.  Requires also CONFIG_DEBUG_FEATURES.
 
 endmenu # SPI device driver options
diff --git a/arch/arm/src/lpc31xx/lpc31_ehci.c b/arch/arm/src/lpc31xx/lpc31_ehci.c
index b881daea63..498d848da3 100644
--- a/arch/arm/src/lpc31xx/lpc31_ehci.c
+++ b/arch/arm/src/lpc31xx/lpc31_ehci.c
@@ -113,7 +113,7 @@
 
 /* Debug options */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_LPC31_EHCI_REGDEBUG
 #endif
 
@@ -124,7 +124,7 @@
 
 /* Simplify DEBUG checks */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_USB
 #endif
diff --git a/arch/arm/src/lpc31xx/lpc31_spi.c b/arch/arm/src/lpc31xx/lpc31_spi.c
index f750ca0792..fb4586e009 100644
--- a/arch/arm/src/lpc31xx/lpc31_spi.c
+++ b/arch/arm/src/lpc31xx/lpc31_spi.c
@@ -63,10 +63,10 @@
 
 /* Debug ****************************************************************************/
 /* CONFIG_LPC31_SPI_REGDEBUG enabled very low, register-level debug output.
- * CONFIG_DEBUG must also be defined
+ * CONFIG_DEBUG_FEATURES must also be defined
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_LPC31_SPI_REGDEBUG
 #endif
 
diff --git a/arch/arm/src/lpc31xx/lpc31_usbdev.c b/arch/arm/src/lpc31xx/lpc31_usbdev.c
index 25a8bb6004..bcf51dbbe7 100644
--- a/arch/arm/src/lpc31xx/lpc31_usbdev.c
+++ b/arch/arm/src/lpc31xx/lpc31_usbdev.c
@@ -100,7 +100,7 @@
 #  define USB_FRAME_INT 0
 #endif
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 #  define USB_ERROR_INT USBDEV_USBINTR_UEE
 #else
 #  define USB_ERROR_INT 0
@@ -343,7 +343,7 @@ struct lpc31_usbdev_s
 
 /* Register operations ********************************************************/
 
-#if defined(CONFIG_LPC31_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_LPC31_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t lpc31_getreg(uint32_t addr);
 static void lpc31_putreg(uint32_t val, uint32_t addr);
 #else
@@ -480,7 +480,7 @@ static const struct usbdev_ops_s g_devops =
  *
  ****************************************************************************/
 
-#if defined(CONFIG_LPC31_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_LPC31_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t lpc31_getreg(uint32_t addr)
 {
   static uint32_t prevaddr = 0;
@@ -543,7 +543,7 @@ static uint32_t lpc31_getreg(uint32_t addr)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_LPC31_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_LPC31_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static void lpc31_putreg(uint32_t val, uint32_t addr)
 {
   /* Show the register value being written */
@@ -1536,7 +1536,7 @@ static void lpc31_ep0complete(struct lpc31_usbdev_s *priv, uint8_t epphy)
       break;
 
     default:
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       DEBUGASSERT(priv->ep0state != EP0STATE_DATA_IN &&
           priv->ep0state != EP0STATE_DATA_OUT        &&
           priv->ep0state != EP0STATE_SHORTWRITE      &&
@@ -1578,7 +1578,7 @@ static void lpc31_ep0nak(struct lpc31_usbdev_s *priv, uint8_t epphy)
       lpc31_ep0state (priv, EP0STATE_WAIT_STATUS_OUT);
       break;
     default:
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       DEBUGASSERT(priv->ep0state != EP0STATE_WAIT_NAK_IN &&
           priv->ep0state != EP0STATE_WAIT_NAK_OUT);
 #endif
@@ -1939,7 +1939,7 @@ static int lpc31_epdisable(FAR struct usbdev_ep_s *ep)
   FAR struct lpc31_ep_s *privep = (FAR struct lpc31_ep_s *)ep;
   irqstate_t flags;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(LPC31_TRACEERR_INVALIDPARMS), 0);
@@ -1977,7 +1977,7 @@ static FAR struct usbdev_req_s *lpc31_epallocreq(FAR struct usbdev_ep_s *ep)
 {
   FAR struct lpc31_req_s *privreq;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(LPC31_TRACEERR_INVALIDPARMS), 0);
@@ -2009,7 +2009,7 @@ static void lpc31_epfreereq(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s
 {
   FAR struct lpc31_req_s *privreq = (FAR struct lpc31_req_s *)req;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !req)
     {
       usbtrace(TRACE_DEVERROR(LPC31_TRACEERR_INVALIDPARMS), 0);
@@ -2079,7 +2079,7 @@ static int lpc31_epsubmit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *r
   irqstate_t flags;
   int ret = OK;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!req || !req->callback || !req->buf || !ep)
     {
       usbtrace(TRACE_DEVERROR(LPC31_TRACEERR_INVALIDPARMS), 0);
@@ -2144,7 +2144,7 @@ static int lpc31_epcancel(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *r
   FAR struct lpc31_ep_s *privep = (FAR struct lpc31_ep_s *)ep;
   irqstate_t flags;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !req)
     {
       usbtrace(TRACE_DEVERROR(LPC31_TRACEERR_INVALIDPARMS), 0);
@@ -2423,7 +2423,7 @@ static int lpc31_selfpowered(struct usbdev_s *dev, bool selfpowered)
 
   usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(LPC31_TRACEERR_INVALIDPARMS), 0);
@@ -2655,7 +2655,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
 
   usbtrace(TRACE_DEVREGISTER, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!driver || !driver->ops->bind || !driver->ops->unbind ||
       !driver->ops->disconnect || !driver->ops->setup)
     {
@@ -2716,7 +2716,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
 {
   usbtrace(TRACE_DEVUNREGISTER, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (driver != g_usbdev.driver)
     {
       usbtrace(TRACE_DEVERROR(LPC31_TRACEERR_INVALIDPARMS), 0);
diff --git a/arch/arm/src/lpc43xx/Kconfig b/arch/arm/src/lpc43xx/Kconfig
index 9a2bcad916..84868ab13f 100644
--- a/arch/arm/src/lpc43xx/Kconfig
+++ b/arch/arm/src/lpc43xx/Kconfig
@@ -457,9 +457,9 @@ config LPC43_RMII
 config LPC43_ETHERNET_REGDEBUG
 	bool "Register-Level Debug"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	---help---
-		Enable very low-level register access debug.  Depends on DEBUG.
+		Enable very low-level register access debug.  Depends on CONFIG_DEBUG_FEATURES.
 
 endmenu # Ethernet MAC configuration
 endif # LPC43_ETHERNET
diff --git a/arch/arm/src/lpc43xx/Make.defs b/arch/arm/src/lpc43xx/Make.defs
index 60e0ad3ed0..6e5d7ef3a7 100644
--- a/arch/arm/src/lpc43xx/Make.defs
+++ b/arch/arm/src/lpc43xx/Make.defs
@@ -110,7 +110,7 @@ ifneq ($(CONFIG_ARCH_IDLE_CUSTOM),y)
 CHIP_CSRCS += lpc43_idle.c
 endif
 
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
 CHIP_CSRCS += lpc43_debug.c
 endif
 
diff --git a/arch/arm/src/lpc43xx/lpc43_debug.c b/arch/arm/src/lpc43xx/lpc43_debug.c
index 51cf947067..06a5ea71fb 100644
--- a/arch/arm/src/lpc43xx/lpc43_debug.c
+++ b/arch/arm/src/lpc43xx/lpc43_debug.c
@@ -47,7 +47,7 @@
 #include "lpc43_pinconfig.h"
 #include "lpc43_gpio.h"
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -93,4 +93,4 @@ int lpc43_gpio_dump(uint16_t gpiocfg, const char *msg)
   return -ENOSYS;
 }
 
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_FEATURES */
diff --git a/arch/arm/src/lpc43xx/lpc43_ehci.c b/arch/arm/src/lpc43xx/lpc43_ehci.c
index a170b01e21..0c536fcb6c 100644
--- a/arch/arm/src/lpc43xx/lpc43_ehci.c
+++ b/arch/arm/src/lpc43xx/lpc43_ehci.c
@@ -105,7 +105,7 @@
 
 /* Debug options */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_LPC43_EHCI_REGDEBUG
 #endif
 
@@ -116,7 +116,7 @@
 
 /* Simplify DEBUG checks */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_USB
 #endif
diff --git a/arch/arm/src/lpc43xx/lpc43_ethernet.c b/arch/arm/src/lpc43xx/lpc43_ethernet.c
index 6b5e456c24..11da4b3d11 100644
--- a/arch/arm/src/lpc43xx/lpc43_ethernet.c
+++ b/arch/arm/src/lpc43xx/lpc43_ethernet.c
@@ -197,7 +197,7 @@
  * enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_LPC43_ETHMAC_REGDEBUG
 #endif
 
@@ -559,7 +559,7 @@ static struct lpc43_ethmac_s g_lpc43ethmac;
  ****************************************************************************/
 /* Register operations ******************************************************/
 
-#if defined(CONFIG_LPC43_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_LPC43_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t lpc43_getreg(uint32_t addr);
 static void lpc43_putreg(uint32_t val, uint32_t addr);
 static void lpc43_checksetup(void);
@@ -683,7 +683,7 @@ static int  lpc43_ethconfig(FAR struct lpc43_ethmac_s *priv);
  *
  ****************************************************************************/
 
-#if defined(CONFIG_LPC43_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_LPC43_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t lpc43_getreg(uint32_t addr)
 {
   static uint32_t prevaddr = 0;
@@ -755,7 +755,7 @@ static uint32_t lpc43_getreg(uint32_t addr)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_LPC43_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_LPC43_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static void lpc43_putreg(uint32_t val, uint32_t addr)
 {
   /* Show the register value being written */
@@ -782,7 +782,7 @@ static void lpc43_putreg(uint32_t val, uint32_t addr)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_LPC43_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_LPC43_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static void lpc43_checksetup(void)
 {
 }
diff --git a/arch/arm/src/lpc43xx/lpc43_gpdma.c b/arch/arm/src/lpc43xx/lpc43_gpdma.c
index 37313b901e..a84eba773a 100644
--- a/arch/arm/src/lpc43xx/lpc43_gpdma.c
+++ b/arch/arm/src/lpc43xx/lpc43_gpdma.c
@@ -61,7 +61,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef DMA_DEBUG     /* Define to enable debug */
 #undef DMA_VERBOSE   /* Define to enable verbose debug */
diff --git a/arch/arm/src/lpc43xx/lpc43_gpio.h b/arch/arm/src/lpc43xx/lpc43_gpio.h
index 4f16c841de..24a492beae 100644
--- a/arch/arm/src/lpc43xx/lpc43_gpio.h
+++ b/arch/arm/src/lpc43xx/lpc43_gpio.h
@@ -310,7 +310,7 @@ bool lpc43_gpio_read(uint16_t gpiocfg);
  *
  ********************************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 int lpc43_gpio_dump(uint16_t gpiocfg, const char *msg);
 #else
 #  define lpc43_gpio_dump(p,m)
diff --git a/arch/arm/src/lpc43xx/lpc43_irq.c b/arch/arm/src/lpc43xx/lpc43_irq.c
index a6e54b51f0..f45e9248c6 100644
--- a/arch/arm/src/lpc43xx/lpc43_irq.c
+++ b/arch/arm/src/lpc43xx/lpc43_irq.c
@@ -155,7 +155,7 @@ static void lpc43_dumpnvic(const char *msg, int irq)
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 static int lpc43_nmi(int irq, FAR void *context)
 {
   (void)up_irq_save();
@@ -336,7 +336,7 @@ static int lpc43_irqinfo(int irq, uintptr_t *regaddr, uint32_t *bit,
 void up_irqinitialize(void)
 {
   uint32_t regaddr;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   uint32_t regval;
 #endif
   int num_priority_registers;
@@ -427,7 +427,7 @@ void up_irqinitialize(void)
 
   /* Attach all other processor exceptions (except reset and sys tick) */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   irq_attach(LPC43_IRQ_NMI, lpc43_nmi);
 #ifndef CONFIG_ARM_MPU
   irq_attach(LPC43_IRQ_MEMFAULT, up_memfault);
@@ -446,7 +446,7 @@ void up_irqinitialize(void)
    * operation.
    */
 
-#if defined(CONFIG_DEBUG) && !defined(CONFIG_ARMV7M_USEBASEPRI)
+#if defined(CONFIG_DEBUG_FEATURES) && !defined(CONFIG_ARMV7M_USEBASEPRI)
   regval  = getreg32(NVIC_DEMCR);
   regval &= ~NVIC_DEMCR_VCHARDERR;
   putreg32(regval, NVIC_DEMCR);
diff --git a/arch/arm/src/lpc43xx/lpc43_pinconfig.h b/arch/arm/src/lpc43xx/lpc43_pinconfig.h
index dad885d86b..63e7d768bd 100644
--- a/arch/arm/src/lpc43xx/lpc43_pinconfig.h
+++ b/arch/arm/src/lpc43xx/lpc43_pinconfig.h
@@ -264,7 +264,7 @@ int lpc43_pin_config(uint32_t pinconf);
  *
  ********************************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 int lpc43_pin_dump(uint32_t pinconf, const char *msg);
 #else
 #  define lpc43_pin_dump(p,m)
diff --git a/arch/arm/src/lpc43xx/lpc43_rgu.c b/arch/arm/src/lpc43xx/lpc43_rgu.c
index 9671a4f8a5..799e3c21e6 100644
--- a/arch/arm/src/lpc43xx/lpc43_rgu.c
+++ b/arch/arm/src/lpc43xx/lpc43_rgu.c
@@ -75,7 +75,7 @@
  * Description:
  *   Reset as many of the LPC43 peripherals as possible. This is necessary
  *   because the LPC43 does not provide any way of performing a full system
- *   reset under debugger control.  So, if CONFIG_DEBUG is set (indicating
+ *   reset under debugger control.  So, if CONFIG_DEBUG_FEATURES is set (indicating
  *   that a debugger is being used?), the boot logic will call this
  *   function on all restarts.
  *
diff --git a/arch/arm/src/lpc43xx/lpc43_rgu.h b/arch/arm/src/lpc43xx/lpc43_rgu.h
index 2d1604d23a..f283a9aaf3 100644
--- a/arch/arm/src/lpc43xx/lpc43_rgu.h
+++ b/arch/arm/src/lpc43xx/lpc43_rgu.h
@@ -76,7 +76,7 @@ extern "C"
  * Description:
  *   Reset as many of the LPC43 peripherals as possible. This is necessary
  *   because the LPC43 does not provide any way of performing a full system
- *   reset under debugger control.  So, if CONFIG_DEBUG is set (indicating
+ *   reset under debugger control.  So, if CONFIG_DEBUG_FEATURES is set (indicating
  *   that a debugger is being used?), the boot logic will call this
  *   function on all restarts.
  *
diff --git a/arch/arm/src/lpc43xx/lpc43_spi.c b/arch/arm/src/lpc43xx/lpc43_spi.c
index bc9813f44d..629f5654c9 100644
--- a/arch/arm/src/lpc43xx/lpc43_spi.c
+++ b/arch/arm/src/lpc43xx/lpc43_spi.c
@@ -64,7 +64,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
diff --git a/arch/arm/src/lpc43xx/lpc43_spifi.c b/arch/arm/src/lpc43xx/lpc43_spifi.c
index e7e183ab55..101f355546 100644
--- a/arch/arm/src/lpc43xx/lpc43_spifi.c
+++ b/arch/arm/src/lpc43xx/lpc43_spifi.c
@@ -92,7 +92,7 @@
  *   from the SPI address space after each write.
  * CONFIG_DEBUG_SPIFI_DUMP - Debug option to dump read/write buffers.  You
  *   probably do not want to enable this unless you want to dig through a
- *   *lot* of debug output!  Also required CONFIG_DEBUG, CONFIG_DEBUG_INFO,
+ *   *lot* of debug output!  Also required CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO,
  *   and CONFIG_DEBUG_FS,
  */
 
@@ -263,7 +263,7 @@
  * enable this unless you want to dig through a *lot* of debug output!
  */
 
-#if !defined(CONFIG_DEBUG) || !defined(CONFIG_DEBUG_INFO) || !defined(CONFIG_DEBUG_FS)
+#if !defined(CONFIG_DEBUG_FEATURES) || !defined(CONFIG_DEBUG_INFO) || !defined(CONFIG_DEBUG_FS)
 #  undef CONFIG_DEBUG_SPIFI_DUMP
 #endif
 
diff --git a/arch/arm/src/lpc43xx/lpc43_ssp.c b/arch/arm/src/lpc43xx/lpc43_ssp.c
index 61c8ce3c4e..141c7090f1 100644
--- a/arch/arm/src/lpc43xx/lpc43_ssp.c
+++ b/arch/arm/src/lpc43xx/lpc43_ssp.c
@@ -69,7 +69,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* The following enable debug output from this file (needs CONFIG_DEBUG too).
+/* The following enable debug output from this file (needs CONFIG_DEBUG_FEATURES too).
  *
  * CONFIG_SSP_DEBUG - Define to enable basic SSP debug
  * CONFIG_SSP_VERBOSE - Define to enable verbose SSP debug
diff --git a/arch/arm/src/lpc43xx/lpc43_start.c b/arch/arm/src/lpc43xx/lpc43_start.c
index 80ffb581ee..e3fe5c552e 100644
--- a/arch/arm/src/lpc43xx/lpc43_start.c
+++ b/arch/arm/src/lpc43xx/lpc43_start.c
@@ -87,7 +87,7 @@
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 #  define showprogress(c) up_lowputc(c)
 #else
 #  define showprogress(c)
@@ -271,12 +271,12 @@ void __start(void)
 
   /* Reset as many of the LPC43 peripherals as possible. This is necessary
    * because the LPC43 does not provide any way of performing a full system
-   * reset under debugger control.  So, if CONFIG_DEBUG is set (indicating
+   * reset under debugger control.  So, if CONFIG_DEBUG_FEATURES is set (indicating
    * that a debugger is being used?), the boot logic will call this
    * function on all restarts.
    */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   lpc43_softreset();
 #endif
 
diff --git a/arch/arm/src/lpc43xx/lpc43_usb0dev.c b/arch/arm/src/lpc43xx/lpc43_usb0dev.c
index 082f35eb3b..6f0c36e855 100644
--- a/arch/arm/src/lpc43xx/lpc43_usb0dev.c
+++ b/arch/arm/src/lpc43xx/lpc43_usb0dev.c
@@ -107,7 +107,7 @@
 #  define USB_FRAME_INT 0
 #endif
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 #  define USB_ERROR_INT USBDEV_USBINTR_UEE
 #else
 #  define USB_ERROR_INT 0
@@ -361,7 +361,7 @@ struct lpc43_usbdev_s
 
 /* Register operations ********************************************************/
 
-#if defined(CONFIG_LPC43_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_LPC43_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t lpc43_getreg(uint32_t addr);
 static void lpc43_putreg(uint32_t val, uint32_t addr);
 #else
@@ -501,7 +501,7 @@ static const struct usbdev_ops_s g_devops =
  *
  ****************************************************************************/
 
-#if defined(CONFIG_LPC43_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_LPC43_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t lpc43_getreg(uint32_t addr)
 {
   static uint32_t prevaddr = 0;
@@ -564,7 +564,7 @@ static uint32_t lpc43_getreg(uint32_t addr)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_LPC43_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_LPC43_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static void lpc43_putreg(uint32_t val, uint32_t addr)
 {
   /* Show the register value being written */
@@ -1623,7 +1623,7 @@ static void lpc43_ep0complete(struct lpc43_usbdev_s *priv, uint8_t epphy)
       break;
 
     default:
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       DEBUGASSERT(priv->ep0state != EP0STATE_DATA_IN &&
           priv->ep0state != EP0STATE_DATA_OUT        &&
           priv->ep0state != EP0STATE_SHORTWRITE      &&
@@ -1667,7 +1667,7 @@ static void lpc43_ep0nak(struct lpc43_usbdev_s *priv, uint8_t epphy)
       break;
 
     default:
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       DEBUGASSERT(priv->ep0state != EP0STATE_WAIT_NAK_IN &&
                   priv->ep0state != EP0STATE_WAIT_NAK_OUT);
 #endif
@@ -2056,7 +2056,7 @@ static int lpc43_epdisable(FAR struct usbdev_ep_s *ep)
   FAR struct lpc43_ep_s *privep = (FAR struct lpc43_ep_s *)ep;
   irqstate_t flags;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(LPC43_TRACEERR_INVALIDPARMS), 0);
@@ -2100,7 +2100,7 @@ static FAR struct usbdev_req_s *lpc43_epallocreq(FAR struct usbdev_ep_s *ep)
 {
   FAR struct lpc43_req_s *privreq;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(LPC43_TRACEERR_INVALIDPARMS), 0);
@@ -2132,7 +2132,7 @@ static void lpc43_epfreereq(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s
 {
   FAR struct lpc43_req_s *privreq = (FAR struct lpc43_req_s *)req;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !req)
     {
       usbtrace(TRACE_DEVERROR(LPC43_TRACEERR_INVALIDPARMS), 0);
@@ -2202,7 +2202,7 @@ static int lpc43_epsubmit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *r
   irqstate_t flags;
   int ret = OK;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!req || !req->callback || !req->buf || !ep)
     {
       usbtrace(TRACE_DEVERROR(LPC43_TRACEERR_INVALIDPARMS), 0);
@@ -2271,7 +2271,7 @@ static int lpc43_epcancel(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *r
   FAR struct lpc43_ep_s *privep = (FAR struct lpc43_ep_s *)ep;
   irqstate_t flags;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !req)
     {
       usbtrace(TRACE_DEVERROR(LPC43_TRACEERR_INVALIDPARMS), 0);
@@ -2554,7 +2554,7 @@ static int lpc43_selfpowered(struct usbdev_s *dev, bool selfpowered)
 
   usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(LPC43_TRACEERR_INVALIDPARMS), 0);
@@ -2790,7 +2790,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
 
   usbtrace(TRACE_DEVREGISTER, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!driver || !driver->ops->bind || !driver->ops->unbind ||
       !driver->ops->disconnect || !driver->ops->setup)
     {
@@ -2851,7 +2851,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
 {
   usbtrace(TRACE_DEVUNREGISTER, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (driver != g_usbdev.driver)
     {
       usbtrace(TRACE_DEVERROR(LPC43_TRACEERR_INVALIDPARMS), 0);
diff --git a/arch/arm/src/nuc1xx/Make.defs b/arch/arm/src/nuc1xx/Make.defs
index 3a9f065191..7a5a00e85a 100644
--- a/arch/arm/src/nuc1xx/Make.defs
+++ b/arch/arm/src/nuc1xx/Make.defs
@@ -65,7 +65,7 @@ else ifeq ($(CONFIG_MODULE),y)
 CMN_CSRCS += up_elf.c
 endif
 
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
 CMN_CSRCS += up_dumpnvic.c
 endif
 
@@ -81,6 +81,6 @@ ifeq ($(CONFIG_BUILD_PROTECTED),y)
 CHIP_CSRCS += nuc_userspace.c
 endif
 
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
 CHIP_CSRCS += nuc_dumpgpio.c
 endif
diff --git a/arch/arm/src/nuc1xx/nuc_dumpgpio.c b/arch/arm/src/nuc1xx/nuc_dumpgpio.c
index 480bb4f588..7722349881 100644
--- a/arch/arm/src/nuc1xx/nuc_dumpgpio.c
+++ b/arch/arm/src/nuc1xx/nuc_dumpgpio.c
@@ -49,14 +49,14 @@
 #include "chip.h"
 #include "nuc_gpio.h"
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 
 /****************************************************************************
  * Private Data
  ****************************************************************************/
 /* Port letters for prettier debug output */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 static const char g_portchar[NUC_GPIO_NPORTS] =
 {
 #if NUC_GPIO_NPORTS > 9
@@ -142,4 +142,4 @@ void nuc_dumpgpio(gpio_cfgset_t pinset, const char *msg)
   leave_critical_section(flags);
 }
 
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_FEATURES */
diff --git a/arch/arm/src/nuc1xx/nuc_gpio.h b/arch/arm/src/nuc1xx/nuc_gpio.h
index 52e9dd2095..1fca1dc0e5 100644
--- a/arch/arm/src/nuc1xx/nuc_gpio.h
+++ b/arch/arm/src/nuc1xx/nuc_gpio.h
@@ -245,7 +245,7 @@ bool nuc_gpioread(gpio_cfgset_t pinset);
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 void nuc_dumpgpio(gpio_cfgset_t pinset, const char *msg);
 #else
 #  define nuc_dumpgpio(p,m)
diff --git a/arch/arm/src/nuc1xx/nuc_irq.c b/arch/arm/src/nuc1xx/nuc_irq.c
index 0bdb86a8ee..ee6f5f1824 100644
--- a/arch/arm/src/nuc1xx/nuc_irq.c
+++ b/arch/arm/src/nuc1xx/nuc_irq.c
@@ -137,7 +137,7 @@ static void nuc_dumpnvic(const char *msg, int irq)
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 static int nuc_nmi(int irq, FAR void *context)
 {
   (void)up_irq_save();
@@ -236,7 +236,7 @@ void up_irqinitialize(void)
 
   /* Attach all other processor exceptions (except reset and sys tick) */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   irq_attach(NUC_IRQ_NMI, nuc_nmi);
   irq_attach(NUC_IRQ_PENDSV, nuc_pendsv);
   irq_attach(NUC_IRQ_RESERVED, nuc_reserved);
diff --git a/arch/arm/src/nuc1xx/nuc_start.c b/arch/arm/src/nuc1xx/nuc_start.c
index 3cbb5becde..80c01077ae 100644
--- a/arch/arm/src/nuc1xx/nuc_start.c
+++ b/arch/arm/src/nuc1xx/nuc_start.c
@@ -92,7 +92,7 @@ const uint32_t g_idle_topstack = IDLE_STACK;
  *
  ****************************************************************************/
 
-#if defined(CONFIG_DEBUG) && defined(HAVE_SERIAL_CONSOLE)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(HAVE_SERIAL_CONSOLE)
 #  define showprogress(c) nuc_lowputc((uint32_t)c)
 #else
 #  define showprogress(c)
diff --git a/arch/arm/src/sam34/Kconfig b/arch/arm/src/sam34/Kconfig
index b588bae2cc..ce158857cd 100644
--- a/arch/arm/src/sam34/Kconfig
+++ b/arch/arm/src/sam34/Kconfig
@@ -1118,7 +1118,7 @@ config SAM34_SPI_DMATHRESHOLD
 
 config SAM34_SPI_DMADEBUG
 	bool "SPI DMA transfer debug"
-	depends on SAM34_SPI_DMA && DEBUG && DEBUG_DMA
+	depends on SAM34_SPI_DMA && DEBUG_FEATURES && DEBUG_DMA
 	default n
 	---help---
 		Enable special debug instrumentation analyze SPI DMA data transfers.
@@ -1128,11 +1128,11 @@ config SAM34_SPI_DMADEBUG
 
 config SAM34_SPI_REGDEBUG
 	bool "SPI Register level debug"
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	default n
 	---help---
 		Output detailed register-level SPI device debug information.
-		Requires also DEBUG.
+		Requires also CONFIG_DEBUG_FEATURES.
 
 endmenu # AT91SAM3/4 SPI device driver options
 endif # SAM34_SPI0 || SAM34_SPI1
@@ -1336,9 +1336,9 @@ config SAM34_EMAC_PHYSR_100FD
 config SAM34_EMAC_REGDEBUG
 	bool "Register-Level Debug"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	---help---
-		Enable very low-level register access debug.  Depends on DEBUG.
+		Enable very low-level register access debug.  Depends on CONFIG_DEBUG_FEATURES.
 
 config SAM34_EMAC_ISETH0
 	bool
@@ -1400,7 +1400,7 @@ menu "AT91SAM3/4 USB Full Speed Device Controller driver (DCD) options"
 config SAM34_UDP_REGDEBUG
 	bool "Enable low-level UDP register debug"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 
 endmenu # USB Full Speed Device Controller driver (DCD) options
 
@@ -1415,7 +1415,7 @@ menu "AT91SAM3/4 Timer/Counter options"
 config SAM34_TC_REGDEBUG
 	bool "Enable low-level timer/counter register debug"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 
 endmenu # USB Full Speed Device Controller driver (DCD) options
 
diff --git a/arch/arm/src/sam34/sam4cm_tc.h b/arch/arm/src/sam34/sam4cm_tc.h
index e71ffdb42b..4da8e54a8b 100644
--- a/arch/arm/src/sam34/sam4cm_tc.h
+++ b/arch/arm/src/sam34/sam4cm_tc.h
@@ -71,7 +71,7 @@
 
 /* Timer debug is enabled if any timer client is enabled */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_ANALOG
 #  undef CONFIG_SAMA5_TC_REGDEBUG
 #endif
diff --git a/arch/arm/src/sam34/sam_dmac.c b/arch/arm/src/sam34/sam_dmac.c
index 2c60c958ba..d3d2899286 100644
--- a/arch/arm/src/sam34/sam_dmac.c
+++ b/arch/arm/src/sam34/sam_dmac.c
@@ -889,7 +889,7 @@ sam_allocdesc(struct sam_dma_s *dmach, struct dma_linklist_s *prev,
    * Obviously setting it to zero would break that usage.
    */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (src != 0)
 #endif
     {
diff --git a/arch/arm/src/sam34/sam_dmac.h b/arch/arm/src/sam34/sam_dmac.h
index 0ff4f2e144..3b8a3cc2c4 100644
--- a/arch/arm/src/sam34/sam_dmac.h
+++ b/arch/arm/src/sam34/sam_dmac.h
@@ -52,7 +52,7 @@
 
 /* Configuration ********************************************************************/
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_DMA
 #endif
 
diff --git a/arch/arm/src/sam34/sam_emac.c b/arch/arm/src/sam34/sam_emac.c
index e6fdd770ed..8f6e5cec99 100644
--- a/arch/arm/src/sam34/sam_emac.c
+++ b/arch/arm/src/sam34/sam_emac.c
@@ -231,7 +231,7 @@
  * enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_SAM34_EMAC_REGDEBUG
 #endif
 
@@ -346,7 +346,7 @@ static uint8_t g_rxbuffer[CONFIG_SAM34_EMAC_NRXBUFFERS * EMAC_RX_UNITSIZE]
  ****************************************************************************/
 /* Register operations ******************************************************/
 
-#if defined(CONFIG_SAM34_EMAC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAM34_EMAC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static bool sam_checkreg(struct sam_emac_s *priv, bool wr,
                          uint32_t regval, uintptr_t address);
 static uint32_t sam_getreg(struct sam_emac_s *priv, uintptr_t addr);
diff --git a/arch/arm/src/sam34/sam_gpio.h b/arch/arm/src/sam34/sam_gpio.h
index f8f267ef5e..32d579a12c 100644
--- a/arch/arm/src/sam34/sam_gpio.h
+++ b/arch/arm/src/sam34/sam_gpio.h
@@ -77,7 +77,7 @@
 #  undef CONFIG_SAM34_GPIO_IRQ
 #endif
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_GPIO
 #endif
 
diff --git a/arch/arm/src/sam34/sam_hsmci.c b/arch/arm/src/sam34/sam_hsmci.c
index bf5f3c6e71..8057785991 100644
--- a/arch/arm/src/sam34/sam_hsmci.c
+++ b/arch/arm/src/sam34/sam_hsmci.c
@@ -2035,7 +2035,7 @@ static int sam_recvshort(FAR struct sdio_dev_s *dev,
    *     0         1               End bit
    */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!rshort)
     {
       fdbg("ERROR: rshort=NULL\n");
@@ -2095,7 +2095,7 @@ static int sam_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlong
    *     0         1               End bit
    */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   /* Check that R1 is the correct response to this command */
 
   if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R2_RESPONSE)
diff --git a/arch/arm/src/sam34/sam_irq.c b/arch/arm/src/sam34/sam_irq.c
index 2a8b2f990e..d775907bd5 100644
--- a/arch/arm/src/sam34/sam_irq.c
+++ b/arch/arm/src/sam34/sam_irq.c
@@ -171,7 +171,7 @@ static void sam_dumpnvic(const char *msg, int irq)
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 static int sam_nmi(int irq, FAR void *context)
 {
   (void)up_irq_save();
@@ -456,7 +456,7 @@ void up_irqinitialize(void)
 
   /* Attach all other processor exceptions (except reset and sys tick) */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   irq_attach(SAM_IRQ_NMI, sam_nmi);
 #ifndef CONFIG_ARM_MPU
   irq_attach(SAM_IRQ_MEMFAULT, up_memfault);
diff --git a/arch/arm/src/sam34/sam_rtc.c b/arch/arm/src/sam34/sam_rtc.c
index 1877f7d111..98e06ad936 100644
--- a/arch/arm/src/sam34/sam_rtc.c
+++ b/arch/arm/src/sam34/sam_rtc.c
@@ -80,7 +80,7 @@
 
 #define RTC_MAGIC 0xdeadbeef
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_RTC
 #endif
 
diff --git a/arch/arm/src/sam34/sam_rtt.c b/arch/arm/src/sam34/sam_rtt.c
index e281723114..516153e191 100644
--- a/arch/arm/src/sam34/sam_rtt.c
+++ b/arch/arm/src/sam34/sam_rtt.c
@@ -115,7 +115,7 @@ struct sam34_lowerhalf_s
  ****************************************************************************/
 /* Register operations ******************************************************/
 
-#if defined(CONFIG_SAM34_RTT_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAM34_RTT_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t sam34_getreg(uint32_t addr);
 static void     sam34_putreg(uint32_t val, uint32_t addr);
 #else
@@ -193,7 +193,7 @@ static inline uint32_t sam34_readvr(void)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_SAM34_RTT_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAM34_RTT_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t sam34_getreg(uint32_t addr)
 {
   static uint32_t prevaddr = 0;
@@ -256,7 +256,7 @@ static uint32_t sam34_getreg(uint32_t addr)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_SAM34_RTT_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAM34_RTT_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static void sam34_putreg(uint32_t val, uint32_t addr)
 {
   /* Show the register value being written */
diff --git a/arch/arm/src/sam34/sam_spi.c b/arch/arm/src/sam34/sam_spi.c
index ca9938782e..adf2842ae7 100644
--- a/arch/arm/src/sam34/sam_spi.c
+++ b/arch/arm/src/sam34/sam_spi.c
@@ -136,7 +136,7 @@
  * include/debug.h
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_SPI
 #  undef CONFIG_SAM34_SPI_DMADEBUG
diff --git a/arch/arm/src/sam34/sam_start.c b/arch/arm/src/sam34/sam_start.c
index dc1d449808..abae1da761 100644
--- a/arch/arm/src/sam34/sam_start.c
+++ b/arch/arm/src/sam34/sam_start.c
@@ -88,7 +88,7 @@ void __start(void) __attribute__ ((no_instrument_function));
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 #  define showprogress(c) up_lowputc(c)
 #else
 #  define showprogress(c)
diff --git a/arch/arm/src/sam34/sam_tc.c b/arch/arm/src/sam34/sam_tc.c
index 985249c6f6..ed67d4b5ca 100644
--- a/arch/arm/src/sam34/sam_tc.c
+++ b/arch/arm/src/sam34/sam_tc.c
@@ -114,7 +114,7 @@ struct sam34_lowerhalf_s
  ****************************************************************************/
 /* Register operations ******************************************************/
 
-#if defined(CONFIG_SAM34_TC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAM34_TC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t sam34_getreg(uint32_t addr);
 static void     sam34_putreg(uint32_t val, uint32_t addr);
 #else
@@ -174,7 +174,7 @@ static struct sam34_lowerhalf_s g_tcdevs[6];
  *
  ****************************************************************************/
 
-#if defined(CONFIG_SAM34_TC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAM34_TC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t sam34_getreg(uint32_t addr)
 {
   static uint32_t prevaddr = 0;
@@ -237,7 +237,7 @@ static uint32_t sam34_getreg(uint32_t addr)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_SAM34_TC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAM34_TC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static void sam34_putreg(uint32_t val, uint32_t addr)
 {
   /* Show the register value being written */
diff --git a/arch/arm/src/sam34/sam_twi.c b/arch/arm/src/sam34/sam_twi.c
index 265c3f636d..1b2030237f 100644
--- a/arch/arm/src/sam34/sam_twi.c
+++ b/arch/arm/src/sam34/sam_twi.c
@@ -96,7 +96,7 @@
 #define TWI_MAX_FREQUENCY 66000000   /* Maximum TWI frequency */
 
 /* Debug ***********************************************************************/
-/* CONFIG_DEBUG_I2C + CONFIG_DEBUG enables general I2C debug output. */
+/* CONFIG_DEBUG_I2C + CONFIG_DEBUG_FEATURES enables general I2C debug output. */
 
 #ifdef CONFIG_DEBUG_I2C
 #  define i2cdbg    dbg
diff --git a/arch/arm/src/sam34/sam_udp.c b/arch/arm/src/sam34/sam_udp.c
index c1a30c9fc5..976867c706 100644
--- a/arch/arm/src/sam34/sam_udp.c
+++ b/arch/arm/src/sam34/sam_udp.c
@@ -90,7 +90,7 @@
  * enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_SAM34_UDP_REGDEBUG
 #endif
 
@@ -732,7 +732,7 @@ static inline void sam_putreg(uint32_t regval, uint32_t regaddr)
  * Name: sam_dumpep
  ****************************************************************************/
 
-#if defined(CONFIG_SAM34_UDP_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAM34_UDP_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static void sam_dumpep(struct sam_usbdev_s *priv, uint8_t epno)
 {
   /* Global Registers */
@@ -2891,7 +2891,7 @@ static int sam_ep_configure(struct usbdev_ep_s *ep,
 
   /* Verify parameters.  Endpoint 0 is not available at this interface */
 
-#if defined(CONFIG_DEBUG) || defined(CONFIG_USBDEV_TRACE)
+#if defined(CONFIG_DEBUG_FEATURES) || defined(CONFIG_USBDEV_TRACE)
   uint8_t epno = USB_EPNO(desc->addr);
   usbtrace(TRACE_EPCONFIGURE, (uint16_t)epno);
 
@@ -2942,7 +2942,7 @@ static int sam_ep_disable(struct usbdev_ep_s *ep)
   irqstate_t flags;
   uint8_t epno;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -2979,7 +2979,7 @@ static struct usbdev_req_s *sam_ep_allocreq(struct usbdev_ep_s *ep)
 {
   struct sam_req_s *privreq;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3011,7 +3011,7 @@ static void sam_ep_freereq(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
 {
   struct sam_req_s *privreq = (struct sam_req_s *)req;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !req)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3074,7 +3074,7 @@ static int sam_ep_submit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
   uint8_t epno;
   int ret = OK;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!req || !req->callback || !req->buf || !ep)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3086,7 +3086,7 @@ static int sam_ep_submit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
   usbtrace(TRACE_EPSUBMIT, USB_EPNO(ep->eplog));
   priv = privep->dev;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!priv->driver)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_NOTCONFIGURED), priv->usbdev.speed);
@@ -3182,7 +3182,7 @@ static int sam_ep_cancel(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
   struct sam_ep_s *privep = (struct sam_ep_s *)ep;
   irqstate_t flags;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !req)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3208,7 +3208,7 @@ static int sam_ep_stallresume(struct usbdev_ep_s *ep, bool resume)
   irqstate_t flags;
   int ret;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3283,7 +3283,7 @@ static struct usbdev_ep_s *sam_allocep(struct usbdev_s *dev, uint8_t epno,
   uint16_t epset = SAM_EPSET_NOTEP0;
 
   usbtrace(TRACE_DEVALLOCEP, (uint16_t)epno);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3345,7 +3345,7 @@ static void sam_freeep(struct usbdev_s *dev, struct usbdev_ep_s *ep)
   struct sam_usbdev_s *priv;
   struct sam_ep_s *privep;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev || !ep)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3377,7 +3377,7 @@ static int sam_getframe(struct usbdev_s *dev)
   uint32_t regval;
   uint16_t frameno;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3409,7 +3409,7 @@ static int sam_wakeup(struct usbdev_s *dev)
   uint32_t regval;
 
   usbtrace(TRACE_DEVWAKEUP, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3480,7 +3480,7 @@ static int sam_selfpowered(struct usbdev_s *dev, bool selfpowered)
 
   usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3926,7 +3926,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
 
   usbtrace(TRACE_DEVREGISTER, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!driver || !driver->ops->bind || !driver->ops->unbind ||
       !driver->ops->disconnect || !driver->ops->setup)
     {
@@ -4000,7 +4000,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
 
   usbtrace(TRACE_DEVUNREGISTER, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (driver != priv->driver)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
diff --git a/arch/arm/src/sam34/sam_wdt.c b/arch/arm/src/sam34/sam_wdt.c
index 92dde86756..be00925842 100644
--- a/arch/arm/src/sam34/sam_wdt.c
+++ b/arch/arm/src/sam34/sam_wdt.c
@@ -118,7 +118,7 @@ struct sam34_lowerhalf_s
  ****************************************************************************/
 /* Register operations ******************************************************/
 
-#if defined(CONFIG_SAM34_WDT_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAM34_WDT_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t sam34_getreg(uint32_t addr);
 static void     sam34_putreg(uint32_t val, uint32_t addr);
 #else
@@ -176,7 +176,7 @@ static struct sam34_lowerhalf_s g_wdgdev;
  *
  ****************************************************************************/
 
-#if defined(CONFIG_SAM34_WDT_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAM34_WDT_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t sam34_getreg(uint32_t addr)
 {
   static uint32_t prevaddr = 0;
@@ -239,7 +239,7 @@ static uint32_t sam34_getreg(uint32_t addr)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_SAM34_WDT_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAM34_WDT_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static void sam34_putreg(uint32_t val, uint32_t addr)
 {
   /* Show the register value being written */
diff --git a/arch/arm/src/sama5/Kconfig b/arch/arm/src/sama5/Kconfig
index da7da52e39..19ffbf0352 100644
--- a/arch/arm/src/sama5/Kconfig
+++ b/arch/arm/src/sama5/Kconfig
@@ -1393,9 +1393,9 @@ endif # SAMA5_LCDC_HCR
 config SAMA5_LCDC_REGDEBUG
 	bool "Register-Level Debug"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	---help---
-		Enable very low-level register access debug.  Depends on DEBUG.
+		Enable very low-level register access debug.  Depends on CONFIG_DEBUG_FEATURES.
 
 endmenu # LCDC configuration
 endif # SAMA5_LCDC
@@ -1499,9 +1499,9 @@ endif # !SAMA5_GMAC_AUTONEG
 config SAMA5_GMAC_REGDEBUG
 	bool "Register-Level Debug"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	---help---
-		Enable very low-level register access debug.  Depends on DEBUG.
+		Enable very low-level register access debug.  Depends on CONFIG_DEBUG_FEATURES.
 
 endmenu # GMAC device driver options
 endif # SAMA5_GMAC
@@ -1678,9 +1678,9 @@ config SAMA5_EMACA_NBC
 config SAMA5_EMACA_REGDEBUG
 	bool "Register-Level Debug"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	---help---
-		Enable very low-level register access debug.  Depends on DEBUG.
+		Enable very low-level register access debug.  Depends on CONFIG_DEBUG_FEATURES.
 
 endmenu # EMAC device driver options
 endif # SAMA5_EMACA
@@ -2076,7 +2076,7 @@ config SAMA5_EMACB_NBC
 config SAMA5_EMACB_DEBUG
 	bool "Force EMAC0/1 DEBUG"
 	default n
-	depends on DEBUG && !DEBUG_NET
+	depends on DEBUG_FEATURES && !DEBUG_NET
 	---help---
 		This option will force debug output from EMAC driver even without
 		network debug output enabled.  This is not normally something
@@ -2087,9 +2087,9 @@ config SAMA5_EMACB_DEBUG
 config SAMA5_EMACB_REGDEBUG
 	bool "Register-Level Debug"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	---help---
-		Enable very low-level register access debug.  Depends on DEBUG.
+		Enable very low-level register access debug.  Depends on CONFIG_DEBUG_FEATURES.
 
 endmenu # EMAC device driver options
 endif # SAMA5_EMACB
@@ -2323,11 +2323,11 @@ config SAMA5_CAN_AUTOBAUD
 
 config SAMA5_CAN_REGDEBUG
 	bool "CAN Register level debug"
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	default n
 	---help---
 		Output detailed register-level CAN device debug information.
-		Requires also DEBUG.
+		Requires also CONFIG_DEBUG_FEATURES.
 
 endmenu # CAN device driver options
 endif # SAMA5_CAN0 || SAMA5_CAN1
@@ -2354,7 +2354,7 @@ config SAMA5_SPI_DMATHRESHOLD
 
 config SAMA5_SPI_DMADEBUG
 	bool "SPI DMA transfer debug"
-	depends on SAMA5_SPI_DMA && DEBUG && DEBUG_DMA
+	depends on SAMA5_SPI_DMA && DEBUG_FEATURES && DEBUG_DMA
 	default n
 	---help---
 		Enable special debug instrumentation analyze SPI DMA data transfers.
@@ -2364,11 +2364,11 @@ config SAMA5_SPI_DMADEBUG
 
 config SAMA5_SPI_REGDEBUG
 	bool "SPI Register level debug"
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	default n
 	---help---
 		Output detailed register-level SPI device debug information.
-		Requires also DEBUG.
+		Requires also CONFIG_DEBUG_FEATURES.
 
 endmenu # SPI device driver options
 endif # SAMA5_SPI0 || SAMA5_SPI1
@@ -2399,11 +2399,11 @@ config SAMA5_TWI3_FREQUENCY
 
 config SAMA5_TWI_REGDEBUG
 	bool "TWI register level debug"
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	default n
 	---help---
 		Output detailed register-level TWI device debug information.
-		Very invasive! Requires also DEBUG.
+		Very invasive! Requires also CONFIG_DEBUG_FEATURES.
 
 endmenu # TWI device driver options
 endif # SAMA5_TWI0 || SAMA5_TWI1 || SAMA5_TWI2 || SAMA5_TWI3
@@ -2766,7 +2766,7 @@ endif # SAMA5_SSC1
 
 config SAMA5_SSC_DMADEBUG
 	bool "SSC DMA transfer debug"
-	depends on DEBUG && DEBUG_DMA
+	depends on DEBUG_FEATURES && DEBUG_DMA
 	default n
 	---help---
 		Enable special debug instrumentation analyze SSC DMA data transfers.
@@ -2776,11 +2776,11 @@ config SAMA5_SSC_DMADEBUG
 
 config SAMA5_SSC_REGDEBUG
 	bool "SSC Register level debug"
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	default n
 	---help---
 		Output detailed register-level SSC device debug information.
-		Very invasive! Requires also DEBUG.
+		Very invasive! Requires also CONFIG_DEBUG_FEATURES.
 
 config SAMA5_SSC_QDEBUG
 	bool "SSC Queue debug"
@@ -2881,11 +2881,11 @@ config SAMA5_HSMCI_CMDDEBUG
 
 config SAMA5_HSMCI_REGDEBUG
 	bool "HSMCI Register level debug"
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	default n
 	---help---
 		Output detailed register-level HSCMI device debug information.
-		Very invasive! Requires also DEBUG.
+		Very invasive! Requires also CONFIG_DEBUG_FEATURES.
 
 endmenu # HSMCI device driver options
 endif # SAMA5_HSMCI0 || SAMA5_HSMCI1 || SAMA5_HSMCI2
@@ -2920,7 +2920,7 @@ config SAMA5_UDPHS_PREALLOCATE
 config SAMA5_UDPHS_REGDEBUG
 	bool "Enable low-level UDPHS register debug"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 
 endmenu # USB High Speed Device Controller driver (DCD) options
 endif # SAMA5_UDPHS
@@ -2960,7 +2960,7 @@ config SAMA5_OHCI_TDBUFSIZE
 config SAMA5_OHCI_REGDEBUG
 	bool "Enable low-level OHCI register debug"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 
 endif # SAMA5_OHCI
 
@@ -3009,7 +3009,7 @@ config SAMA5_EHCI_PREALLOCATE
 config SAMA5_EHCI_REGDEBUG
 	bool "Enable low-level EHCI register debug"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 
 endif # SAMA5_EHCI
 
@@ -3661,7 +3661,7 @@ endif # SAMA5_ADC_HAVE_CHAN
 config SAMA5_ADC_REGDEBUG
 	bool "Enable register-level ADC/touchscreen debug"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	---help---
 		Enable very low register-level debug output.
 
@@ -3903,11 +3903,11 @@ endif
 
 config SAMA5_TC_DEBUG
 	bool "TC debug"
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	default n
 	---help---
 		Output high level Timer/Counter device debug information.
-		Requires also DEBUG.  If this option AND CONFIG_DEBUG_INFO are
+		Requires also CONFIG_DEBUG_FEATURES.  If this option AND CONFIG_DEBUG_INFO are
 		enabled, then the system will be overwhelmed the timer debug
 		output.  If CONFIG_DEBUG_INFO is disabled, then debug output will
 		only indicate if/when timer-related errors occur.  This
@@ -3915,11 +3915,11 @@ config SAMA5_TC_DEBUG
 
 config SAMA5_TC_REGDEBUG
 	bool "TC register level debug"
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	default n
 	---help---
 		Output detailed register-level Timer/Counter device debug
-		information. Very invasive! Requires also DEBUG.
+		information. Very invasive! Requires also CONFIG_DEBUG_FEATURES.
 
 endmenu # Timer/counter Configuration
 endif # SAMA5_HAVE_TC
@@ -4150,7 +4150,7 @@ endif # SAMA5_PWM_CHAN3
 config SAMA5_PWM_REGDEBUG
 	bool "Enable register-level PWM debug"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	---help---
 		Enable very low register-level debug output.
 
@@ -4171,8 +4171,8 @@ config SAMA5_WDT_INTERRUPT
 
 config SAMA5_WDT_DEBUGHALT
 	bool "Halt on DEBUG"
-	default y if DEBUG
-	default n if !DEBUG
+	default y if DEBUG_FEATURES
+	default n if !DEBUG_FEATURES
 	---help---
 		Halt the watchdog timer in the debug state
 
@@ -4185,7 +4185,7 @@ config SAMA5_WDT_IDLEHALT
 config SAMA5_WDT_REGDEBUG
 	bool "Register level debug"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	---help---
 		Enable low-level register debug output
 
@@ -4688,7 +4688,7 @@ endif # SAMA5_HAVE_PMECC
 
 config SAMA5_NAND_DMADEBUG
 	bool "NAND DMA transfer debug"
-	depends on SAMA5_NAND_DMA && DEBUG && DEBUG_DMA
+	depends on SAMA5_NAND_DMA && DEBUG_FEATURES && DEBUG_DMA
 	default n
 	---help---
 		Enable special debug instrumentation analyze NAND DMA data transfers.
@@ -4699,18 +4699,18 @@ config SAMA5_NAND_DMADEBUG
 config SAMA5_NAND_REGDEBUG
 	bool "Register-Level NAND Debug"
 	default n
-	depends on DEBUG && DEBUG_FS
+	depends on DEBUG_FEATURES && DEBUG_FS
 	---help---
-		Enable very low-level register access debug.  Depends on DEBUG and
+		Enable very low-level register access debug.  Depends on CONFIG_DEBUG_FEATURES and
 		DEBUG_FS.
 
 config SAMA5_NAND_DUMP
 	bool "NAND data dump"
 	default n
-	depends on DEBUG && DEBUG_FS
+	depends on DEBUG_FEATURES && DEBUG_FS
 	---help---
 		Dump the contents of all data read and written to FLAH.  Depends on
-		DEBUG and DEBUG_FS.
+		CONFIG_DEBUG_FEATURES and DEBUG_FS.
 
 endif # SAMA5_HAVE_NAND
 endmenu # External Memory Configuration
diff --git a/arch/arm/src/sama5/sam_adc.c b/arch/arm/src/sama5/sam_adc.c
index e1e3071996..82208b0bdc 100644
--- a/arch/arm/src/sama5/sam_adc.c
+++ b/arch/arm/src/sama5/sam_adc.c
@@ -423,7 +423,7 @@ struct sam_adc_s
  ****************************************************************************/
 /* Register operations ******************************************************/
 
-#if defined(CONFIG_SAMA5_ADC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAMA5_ADC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static bool sam_adc_checkreg(struct sam_adc_s *priv, bool wr,
                              uint32_t regval, uintptr_t address);
 #endif
diff --git a/arch/arm/src/sama5/sam_adc.h b/arch/arm/src/sama5/sam_adc.h
index f8ba29f157..f84a45a65d 100644
--- a/arch/arm/src/sama5/sam_adc.h
+++ b/arch/arm/src/sama5/sam_adc.h
@@ -57,7 +57,7 @@
 #  error Work queue support is required (CONFIG_SCHED_WORKQUEUE)
 #endif
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_SAMA5_ADC_REGDEBUG
 #endif
 
diff --git a/arch/arm/src/sama5/sam_can.c b/arch/arm/src/sama5/sam_can.c
index 2689ac414f..b9a3ee3892 100644
--- a/arch/arm/src/sama5/sam_can.c
+++ b/arch/arm/src/sama5/sam_can.c
@@ -138,7 +138,7 @@
 #  define canllinfo(x...)
 #endif
 
-#if !defined(CONFIG_DEBUG) || !defined(CONFIG_DEBUG_CAN)
+#if !defined(CONFIG_DEBUG_FEATURES) || !defined(CONFIG_DEBUG_CAN)
 #  undef CONFIG_SAMA5_CAN_REGDEBUG
 #endif
 
@@ -893,7 +893,7 @@ static int can_setup(FAR struct can_dev_s *dev)
 
   /* Enable all error interrupts */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   can_putreg(priv, SAM_CAN_IER_OFFSET, CAN_DEBUG_INTS);
 #endif
 
diff --git a/arch/arm/src/sama5/sam_dmac.c b/arch/arm/src/sama5/sam_dmac.c
index f86edd3169..8c305b5a9b 100644
--- a/arch/arm/src/sama5/sam_dmac.c
+++ b/arch/arm/src/sama5/sam_dmac.c
@@ -1364,7 +1364,7 @@ sam_allocdesc(struct sam_dmach_s *dmach, struct dma_linklist_s *prev,
    * Obviously setting it to zero would break that usage.
    */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (saddr != 0)
 #endif
     {
diff --git a/arch/arm/src/sama5/sam_dmac.h b/arch/arm/src/sama5/sam_dmac.h
index c9fc885369..b6ba92c23f 100644
--- a/arch/arm/src/sama5/sam_dmac.h
+++ b/arch/arm/src/sama5/sam_dmac.h
@@ -52,7 +52,7 @@
 
 /* Configuration ********************************************************************/
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_DMA
 #endif
 
diff --git a/arch/arm/src/sama5/sam_ehci.c b/arch/arm/src/sama5/sam_ehci.c
index 8d41577c7d..f5affbb515 100644
--- a/arch/arm/src/sama5/sam_ehci.c
+++ b/arch/arm/src/sama5/sam_ehci.c
@@ -112,7 +112,7 @@
 
 /* Debug options */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_SAMA5_EHCI_REGDEBUG
 #endif
 
@@ -129,7 +129,7 @@
 
 /* Simplify DEBUG checks */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_USB
 #endif
diff --git a/arch/arm/src/sama5/sam_emaca.c b/arch/arm/src/sama5/sam_emaca.c
index 755ccc1dd9..ff99f550f7 100644
--- a/arch/arm/src/sama5/sam_emaca.c
+++ b/arch/arm/src/sama5/sam_emaca.c
@@ -223,7 +223,7 @@
  * enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_SAMA5_EMACA_REGDEBUG
 #endif
 
@@ -335,7 +335,7 @@ static uint8_t g_rxbuffer[CONFIG_SAMA5_EMAC_NRXBUFFERS * EMAC_RX_UNITSIZE]
  ****************************************************************************/
 /* Register operations ******************************************************/
 
-#if defined(CONFIG_SAMA5_EMACA_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAMA5_EMACA_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static bool sam_checkreg(struct sam_emac_s *priv, bool wr,
                          uint32_t regval, uintptr_t address);
 static uint32_t sam_getreg(struct sam_emac_s *priv, uintptr_t addr);
diff --git a/arch/arm/src/sama5/sam_emacb.c b/arch/arm/src/sama5/sam_emacb.c
index c6fe757a98..b593a15181 100644
--- a/arch/arm/src/sama5/sam_emacb.c
+++ b/arch/arm/src/sama5/sam_emacb.c
@@ -58,7 +58,7 @@
 
 #include 
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_SAMA5_EMACB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_SAMA5_EMACB_DEBUG)
   /* Force debug output (from this file only) */
 
 #  undef  CONFIG_DEBUG_NET
@@ -295,7 +295,7 @@
  * enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_SAMA5_EMACB_REGDEBUG
 #endif
 
@@ -459,7 +459,7 @@ struct sam_emac_s
  ****************************************************************************/
 /* Register operations ******************************************************/
 
-#if defined(CONFIG_SAMA5_EMACB_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAMA5_EMACB_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static bool sam_checkreg(struct sam_emac_s *priv, bool wr,
                          uint32_t regval, uintptr_t address);
 #endif
diff --git a/arch/arm/src/sama5/sam_gmac.c b/arch/arm/src/sama5/sam_gmac.c
index fd06f414de..8ba0aed708 100644
--- a/arch/arm/src/sama5/sam_gmac.c
+++ b/arch/arm/src/sama5/sam_gmac.c
@@ -149,7 +149,7 @@
  * enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_SAMA5_GMAC_REGDEBUG
 #endif
 
@@ -260,7 +260,7 @@ static uint8_t g_rxbuffer[CONFIG_SAMA5_GMAC_NRXBUFFERS * GMAC_RX_UNITSIZE]
  ****************************************************************************/
 /* Register operations ******************************************************/
 
-#if defined(CONFIG_SAMA5_GMAC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAMA5_GMAC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static bool sam_checkreg(struct sam_gmac_s *priv, bool wr,
                          uint32_t regval, uintptr_t address);
 static uint32_t sam_getreg(struct sam_gmac_s *priv, uintptr_t addr);
diff --git a/arch/arm/src/sama5/sam_hsmci.c b/arch/arm/src/sama5/sam_hsmci.c
index 2e13488a59..adbfa2bc04 100644
--- a/arch/arm/src/sama5/sam_hsmci.c
+++ b/arch/arm/src/sama5/sam_hsmci.c
@@ -2490,7 +2490,7 @@ static int sam_recvshort(FAR struct sdio_dev_s *dev,
    *     0         1               End bit
    */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!rshort)
     {
       fdbg("ERROR: rshort=NULL\n");
@@ -2550,7 +2550,7 @@ static int sam_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlong
    *     0         1               End bit
    */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   /* Check that R1 is the correct response to this command */
 
   if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R2_RESPONSE)
diff --git a/arch/arm/src/sama5/sam_lcd.c b/arch/arm/src/sama5/sam_lcd.c
index cc2b4bf1c8..821a18ec61 100644
--- a/arch/arm/src/sama5/sam_lcd.c
+++ b/arch/arm/src/sama5/sam_lcd.c
@@ -492,7 +492,7 @@
 
 /* Debug */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_SAMA5_LCDC_REGDEBUG
 #endif
 
@@ -666,7 +666,7 @@ struct sam_lcdc_s
  ****************************************************************************/
 /* Register operations ******************************************************/
 
-#if defined(CONFIG_SAMA5_LCDC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAMA5_LCDC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static bool sam_checkreg(bool wr, uint32_t regval, uintptr_t address);
 static uint32_t sam_getreg(uintptr_t addr);
 static void sam_putreg(uintptr_t addr, uint32_t val);
diff --git a/arch/arm/src/sama5/sam_nand.h b/arch/arm/src/sama5/sam_nand.h
index f4229b8d6c..1467d29945 100644
--- a/arch/arm/src/sama5/sam_nand.h
+++ b/arch/arm/src/sama5/sam_nand.h
@@ -259,7 +259,7 @@
 
 /* Debug */
 
-#if !defined(CONFIG_DEBUG) || !defined(CONFIG_DEBUG_FS)
+#if !defined(CONFIG_DEBUG_FEATURES) || !defined(CONFIG_DEBUG_FS)
 #  undef CONFIG_DEBUG_FS
 #  undef CONFIG_SAMA5_NAND_DMADEBUG
 #  undef CONFIG_SAMA5_NAND_REGDEBUG
diff --git a/arch/arm/src/sama5/sam_ohci.c b/arch/arm/src/sama5/sam_ohci.c
index 65e5111d56..7aae6c7be1 100644
--- a/arch/arm/src/sama5/sam_ohci.c
+++ b/arch/arm/src/sama5/sam_ohci.c
@@ -151,7 +151,7 @@
 
 /* Debug */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_SAMA5_OHCI_REGDEBUG
 #endif
 
@@ -2835,7 +2835,7 @@ errout:
 
 static int sam_epfree(struct usbhost_driver_s *drvr, usbhost_ep_t ep)
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   struct sam_rhport_s *rhport = (struct sam_rhport_s *)drvr;
 #endif
   struct sam_eplist_s *eplist = (struct sam_eplist_s *)ep;
diff --git a/arch/arm/src/sama5/sam_pwm.c b/arch/arm/src/sama5/sam_pwm.c
index c80cf5812e..5d07e57a62 100644
--- a/arch/arm/src/sama5/sam_pwm.c
+++ b/arch/arm/src/sama5/sam_pwm.c
@@ -396,7 +396,7 @@
 /* Debug ********************************************************************/
 /* Non-standard debug that may be enabled just for testing PWM */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_PWM
 #endif
 
diff --git a/arch/arm/src/sama5/sam_rtc.c b/arch/arm/src/sama5/sam_rtc.c
index 05600d9ec1..0260a947b6 100644
--- a/arch/arm/src/sama5/sam_rtc.c
+++ b/arch/arm/src/sama5/sam_rtc.c
@@ -77,7 +77,7 @@
 
 #define RTC_MAGIC 0xdeadbeef
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_RTC
 #endif
 
diff --git a/arch/arm/src/sama5/sam_spi.c b/arch/arm/src/sama5/sam_spi.c
index 646a848bee..b681de8b29 100644
--- a/arch/arm/src/sama5/sam_spi.c
+++ b/arch/arm/src/sama5/sam_spi.c
@@ -129,7 +129,7 @@
  * include/debug.h
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_SPI
 #  undef CONFIG_SAMA5_SPI_DMADEBUG
diff --git a/arch/arm/src/sama5/sam_ssc.c b/arch/arm/src/sama5/sam_ssc.c
index 97ce8ce964..480d0e9d9f 100644
--- a/arch/arm/src/sama5/sam_ssc.c
+++ b/arch/arm/src/sama5/sam_ssc.c
@@ -397,7 +397,7 @@
  * include/debug.h
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_I2S
 #endif
@@ -476,7 +476,7 @@ struct sam_ssc_s
   uintptr_t base;              /* SSC controller register base address */
   sem_t exclsem;               /* Assures mutually exclusive acess to SSC */
   uint8_t datalen;             /* Data width (8, 16, or 32) */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   uint8_t align;               /* Log2 of data width (0, 1, or 3) */
 #endif
   uint8_t pid;                 /* Peripheral ID */
@@ -2059,19 +2059,19 @@ static int ssc_checkwidth(struct sam_ssc_s *priv, int bits)
   switch (bits)
     {
     case 8:
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       priv->align = 0;
 #endif
       break;
 
     case 16:
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       priv->align = 1;
 #endif
       break;
 
     case 32:
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       priv->align = 3;
 #endif
       break;
@@ -3257,7 +3257,7 @@ static void ssc0_configure(struct sam_ssc_s *priv)
 
   priv->base    = SAM_SSC0_VBASE;
   priv->datalen = CONFIG_SAMA5_SSC0_DATALEN;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   priv->align   = SAMA5_SSC0_DATAMASK;
 #endif
   priv->pid     = SAM_PID_SSC0;
@@ -3398,7 +3398,7 @@ static void ssc1_configure(struct sam_ssc_s *priv)
 
   priv->base    = SAM_SSC1_VBASE;
   priv->datalen = CONFIG_SAMA5_SSC1_DATALEN;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   priv->align   = SAMA5_SSC1_DATAMASK;
 #endif
   priv->pid     = SAM_PID_SSC1;
diff --git a/arch/arm/src/sama5/sam_tc.h b/arch/arm/src/sama5/sam_tc.h
index 8d5df8423e..7a6f8dbba2 100644
--- a/arch/arm/src/sama5/sam_tc.h
+++ b/arch/arm/src/sama5/sam_tc.h
@@ -74,7 +74,7 @@
 
 /* Timer debug is enabled if any timer client is enabled */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_ANALOG
 #  undef CONFIG_SAMA5_TC_REGDEBUG
 #endif
diff --git a/arch/arm/src/sama5/sam_twi.c b/arch/arm/src/sama5/sam_twi.c
index d430898dde..5aa22b90a7 100644
--- a/arch/arm/src/sama5/sam_twi.c
+++ b/arch/arm/src/sama5/sam_twi.c
@@ -124,7 +124,7 @@
 #define MKI2C_OUTPUT(p) (((p) & (PIO_PORT_MASK | PIO_PIN_MASK)) | I2C_OUTPUT)
 
 /* Debug ***********************************************************************/
-/* CONFIG_DEBUG_I2C + CONFIG_DEBUG enables general I2C debug output. */
+/* CONFIG_DEBUG_I2C + CONFIG_DEBUG_FEATURES enables general I2C debug output. */
 
 #ifdef CONFIG_DEBUG_I2C
 #  define i2cdbg    dbg
diff --git a/arch/arm/src/sama5/sam_udphs.c b/arch/arm/src/sama5/sam_udphs.c
index 72d8bb8241..a73cb0e420 100644
--- a/arch/arm/src/sama5/sam_udphs.c
+++ b/arch/arm/src/sama5/sam_udphs.c
@@ -95,7 +95,7 @@
  * enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_SAMA5_UDPHS_REGDEBUG
 #endif
 
@@ -797,7 +797,7 @@ static inline void sam_putreg(uint32_t regval, uint32_t regaddr)
  * Name: sam_dumpep
  ****************************************************************************/
 
-#if defined(CONFIG_SAMA5_UDPHS_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAMA5_UDPHS_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static void sam_dumpep(struct sam_usbdev_s *priv, int epno)
 {
   /* Global Registers */
@@ -3397,7 +3397,7 @@ static int sam_ep_configure(struct usbdev_ep_s *ep,
 
   /* Verify parameters.  Endpoint 0 is not available at this interface */
 
-#if defined(CONFIG_DEBUG) || defined(CONFIG_USBDEV_TRACE)
+#if defined(CONFIG_DEBUG_FEATURES) || defined(CONFIG_USBDEV_TRACE)
   uint8_t epno = USB_EPNO(desc->addr);
   usbtrace(TRACE_EPCONFIGURE, (uint16_t)epno);
 
@@ -3436,7 +3436,7 @@ static int sam_ep_disable(struct usbdev_ep_s *ep)
   irqstate_t flags;
   uint8_t epno;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3473,7 +3473,7 @@ static struct usbdev_req_s *sam_ep_allocreq(struct usbdev_ep_s *ep)
 {
   struct sam_req_s *privreq;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3505,7 +3505,7 @@ static void sam_ep_freereq(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
 {
   struct sam_req_s *privreq = (struct sam_req_s *)req;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !req)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3568,7 +3568,7 @@ static int sam_ep_submit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
   uint8_t epno;
   int ret = OK;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!req || !req->callback || !req->buf || !ep)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3580,7 +3580,7 @@ static int sam_ep_submit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
   usbtrace(TRACE_EPSUBMIT, USB_EPNO(ep->eplog));
   priv = privep->dev;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!priv->driver)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_NOTCONFIGURED), priv->usbdev.speed);
@@ -3660,7 +3660,7 @@ static int sam_ep_cancel(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
   struct sam_ep_s *privep = (struct sam_ep_s *)ep;
   irqstate_t flags;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !req)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3687,7 +3687,7 @@ static int sam_ep_stall(struct usbdev_ep_s *ep, bool resume)
   uint32_t regval;
   irqstate_t flags;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3826,7 +3826,7 @@ static struct usbdev_ep_s *sam_allocep(struct usbdev_s *dev, uint8_t epno,
   uint16_t epset = SAM_EPSET_NOTEP0;
 
   usbtrace(TRACE_DEVALLOCEP, (uint16_t)epno);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3888,7 +3888,7 @@ static void sam_freeep(struct usbdev_s *dev, struct usbdev_ep_s *ep)
   struct sam_usbdev_s *priv;
   struct sam_ep_s *privep;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev || !ep)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3920,7 +3920,7 @@ static int sam_getframe(struct usbdev_s *dev)
   uint32_t regval;
   uint16_t frameno;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3952,7 +3952,7 @@ static int sam_wakeup(struct usbdev_s *dev)
   uint32_t regval;
 
   usbtrace(TRACE_DEVWAKEUP, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3998,7 +3998,7 @@ static int sam_selfpowered(struct usbdev_s *dev, bool selfpowered)
 
   usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -4517,7 +4517,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
 
   usbtrace(TRACE_DEVREGISTER, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!driver || !driver->ops->bind || !driver->ops->unbind ||
       !driver->ops->disconnect || !driver->ops->setup)
     {
@@ -4591,7 +4591,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
 
   usbtrace(TRACE_DEVUNREGISTER, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (driver != priv->driver)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
diff --git a/arch/arm/src/sama5/sam_wdt.c b/arch/arm/src/sama5/sam_wdt.c
index 8e1141543a..e5507a3949 100644
--- a/arch/arm/src/sama5/sam_wdt.c
+++ b/arch/arm/src/sama5/sam_wdt.c
@@ -118,7 +118,7 @@ struct sam_lowerhalf_s
  ****************************************************************************/
 /* Register operations ******************************************************/
 
-#if defined(CONFIG_SAMA5_WDT_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAMA5_WDT_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t sam_getreg(uintptr_t regaddr);
 static void     sam_putreg(uint32_t regval, uintptr_t regaddr);
 #else
@@ -178,7 +178,7 @@ static struct sam_lowerhalf_s g_wdtdev;
  *
  ****************************************************************************/
 
-#if defined(CONFIG_SAMA5_WDT_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAMA5_WDT_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t sam_getreg(uintptr_t regaddr)
 {
   static uint32_t prevaddr = 0;
@@ -241,7 +241,7 @@ static uint32_t sam_getreg(uintptr_t regaddr)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_SAMA5_WDT_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAMA5_WDT_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static void sam_putreg(uint32_t regval, uintptr_t regaddr)
 {
   /* Show the register value being written */
diff --git a/arch/arm/src/sama5/sam_xdmac.c b/arch/arm/src/sama5/sam_xdmac.c
index 77301c5c43..609823acb6 100644
--- a/arch/arm/src/sama5/sam_xdmac.c
+++ b/arch/arm/src/sama5/sam_xdmac.c
@@ -1330,7 +1330,7 @@ sam_allocdesc(struct sam_xdmach_s *xdmach, struct chnext_view1_s *prev,
    * Obviously setting it to zero would break that usage.
    */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (csa != 0)
 #endif
     {
@@ -1650,7 +1650,7 @@ static inline int sam_single(struct sam_xdmach_s *xdmach)
 static inline int sam_multiple(struct sam_xdmach_s *xdmach)
 {
   struct sam_xdmac_s *xdmac = sam_controller(xdmach);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   struct chnext_view1_s *llhead = xdmach->llhead;
 #endif
   uintptr_t paddr;
diff --git a/arch/arm/src/sama5/sama5d2x_pio.h b/arch/arm/src/sama5/sama5d2x_pio.h
index 4b37166d4b..6f4f28f9a4 100644
--- a/arch/arm/src/sama5/sama5d2x_pio.h
+++ b/arch/arm/src/sama5/sama5d2x_pio.h
@@ -58,7 +58,7 @@
 #  undef CONFIG_SAMA5_PIO_IRQ
 #endif
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_GPIO
 #endif
 
diff --git a/arch/arm/src/sama5/sama5d3x4x_pio.h b/arch/arm/src/sama5/sama5d3x4x_pio.h
index 63b6615b55..86ae201745 100644
--- a/arch/arm/src/sama5/sama5d3x4x_pio.h
+++ b/arch/arm/src/sama5/sama5d3x4x_pio.h
@@ -52,7 +52,7 @@
 #  undef CONFIG_SAMA5_PIO_IRQ
 #endif
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_GPIO
 #endif
 
diff --git a/arch/arm/src/samdl/Make.defs b/arch/arm/src/samdl/Make.defs
index d9a82f959e..7ef0105780 100644
--- a/arch/arm/src/samdl/Make.defs
+++ b/arch/arm/src/samdl/Make.defs
@@ -65,7 +65,7 @@ else ifeq ($(CONFIG_MODULE),y)
 CMN_CSRCS += up_elf.c
 endif
 
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
 CMN_CSRCS += up_dumpnvic.c
 endif
 
diff --git a/arch/arm/src/samdl/sam_dmac.h b/arch/arm/src/samdl/sam_dmac.h
index cc1c60e7a0..86224469ff 100644
--- a/arch/arm/src/samdl/sam_dmac.h
+++ b/arch/arm/src/samdl/sam_dmac.h
@@ -64,7 +64,7 @@
 
 /* Configuration ********************************************************************/
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_DMA
 #endif
 
diff --git a/arch/arm/src/samdl/sam_irq.c b/arch/arm/src/samdl/sam_irq.c
index 3f12b9943a..42b65d814f 100644
--- a/arch/arm/src/samdl/sam_irq.c
+++ b/arch/arm/src/samdl/sam_irq.c
@@ -93,7 +93,7 @@ volatile uint32_t *g_current_regs[1];
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 static int sam_nmi(int irq, FAR void *context)
 {
   (void)up_irq_save();
@@ -192,7 +192,7 @@ void up_irqinitialize(void)
 
   /* Attach all other processor exceptions (except reset and sys tick) */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   irq_attach(SAM_IRQ_NMI, sam_nmi);
   irq_attach(SAM_IRQ_PENDSV, sam_pendsv);
   irq_attach(SAM_IRQ_RESERVED, sam_reserved);
diff --git a/arch/arm/src/samdl/sam_port.h b/arch/arm/src/samdl/sam_port.h
index 26ba8bcb5d..3e9704cd14 100644
--- a/arch/arm/src/samdl/sam_port.h
+++ b/arch/arm/src/samdl/sam_port.h
@@ -379,7 +379,7 @@ bool sam_portread(port_pinset_t pinset);
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 int sam_dumpport(port_pinset_t pinset, const char *msg);
 #else
 #  define sam_dumpport(p,m)
diff --git a/arch/arm/src/samdl/sam_sercom.c b/arch/arm/src/samdl/sam_sercom.c
index ae50ca39c1..e44e895a87 100644
--- a/arch/arm/src/samdl/sam_sercom.c
+++ b/arch/arm/src/samdl/sam_sercom.c
@@ -162,7 +162,7 @@ void sercom_slowclk_configure(int sercom, int gclkgen)
 #ifdef CONFIG_SAMDL_SERCOM5
   static bool configured5 = false;
 #endif
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 #ifdef HAVE_SERCOM0_4
   static uint8_t slowgen  = 0xff;
 #endif
@@ -205,12 +205,12 @@ void sercom_slowclk_configure(int sercom, int gclkgen)
            */
 
           configured = true;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
           slowgen    = (uint8_t)gclkgen;
 #endif
         }
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       /* Already configured.  This is okay provided that the same GCLK
        * generator is being used.  Otherwise, there is a problem.
        */
@@ -236,12 +236,12 @@ void sercom_slowclk_configure(int sercom, int gclkgen)
            */
 
           configured5 = true;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
           slowgen5    = (uint8_t)gclkgen;
 #endif
         }
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       /* Already configured.  This is okay provided that the same GCLK
        * generator is being used.  Otherwise, there is a problem.
        */
diff --git a/arch/arm/src/samdl/sam_spi.c b/arch/arm/src/samdl/sam_spi.c
index 78bc1b9cf3..b78ef8c548 100644
--- a/arch/arm/src/samdl/sam_spi.c
+++ b/arch/arm/src/samdl/sam_spi.c
@@ -84,7 +84,7 @@
  * include/debug.h
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_SPI
 #  undef CONFIG_SAMDL_SPI_REGDEBUG
diff --git a/arch/arm/src/samdl/sam_start.c b/arch/arm/src/samdl/sam_start.c
index e31a1b274d..f46e114fd6 100644
--- a/arch/arm/src/samdl/sam_start.c
+++ b/arch/arm/src/samdl/sam_start.c
@@ -91,7 +91,7 @@ const uint32_t g_idle_topstack = IDLE_STACK;
  *
  ****************************************************************************/
 
-#if defined(CONFIG_DEBUG) && defined(HAVE_SERIAL_CONSOLE)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(HAVE_SERIAL_CONSOLE)
 #  define showprogress(c) sam_lowputc((uint32_t)c)
 #else
 #  define showprogress(c)
diff --git a/arch/arm/src/samv7/Kconfig b/arch/arm/src/samv7/Kconfig
index e5d70d93a7..8b5c3b6870 100644
--- a/arch/arm/src/samv7/Kconfig
+++ b/arch/arm/src/samv7/Kconfig
@@ -687,8 +687,8 @@ config SAMV7_WDT_INTERRUPT
 
 config SAMV7_WDT_DEBUGHALT
 	bool "Halt on DEBUG"
-	default y if DEBUG
-	default n if !DEBUG
+	default y if DEBUG_FEATURES
+	default n if !DEBUG_FEATURES
 	---help---
 		Halt the watchdog timer in the debug state
 
@@ -701,7 +701,7 @@ config SAMV7_WDT_IDLEHALT
 config SAMV7_WDT_REGDEBUG
 	bool "Register level debug"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	---help---
 		Enable low-level register debug output
 
@@ -721,8 +721,8 @@ config SAMV7_RSWDT_INTERRUPT
 
 config SAMV7_RSWDT_DEBUGHALT
 	bool "Halt on DEBUG"
-	default y if DEBUG
-	default n if !DEBUG
+	default y if DEBUG_FEATURES
+	default n if !DEBUG_FEATURES
 	---help---
 		Halt the watchdog timer in the debug state
 
@@ -735,7 +735,7 @@ config SAMV7_RSWDT_IDLEHALT
 config SAMV7_RSWDT_REGDEBUG
 	bool "Register level debug"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	---help---
 		Enable low-level register debug output
 
@@ -853,7 +853,7 @@ config SAMV7_SPI_DMATHRESHOLD
 
 config SAMV7_SPI_DMADEBUG
 	bool "SPI DMA transfer debug"
-	depends on SAMV7_SPI_DMA && DEBUG && DEBUG_DMA
+	depends on SAMV7_SPI_DMA && DEBUG_FEATURES && DEBUG_DMA
 	default n
 	---help---
 		Enable special debug instrumentation analyze SPI DMA data transfers.
@@ -877,11 +877,11 @@ endif # SAMV7_SPI_SLAVE
 
 config SAMV7_SPI_REGDEBUG
 	bool "SPI Register level debug"
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	default n
 	---help---
 		Output detailed register-level SPI device debug information.
-		Requires also DEBUG.
+		Requires also CONFIG_DEBUG_FEATURES.
 
 endmenu # SPI device driver options
 
@@ -914,7 +914,7 @@ config SAMV7_QSPI_DMATHRESHOLD
 
 config SAMV7_QSPI_DMADEBUG
 	bool "QSPI DMA transfer debug"
-	depends on SAMV7_QSPI_DMA && DEBUG && DEBUG_DMA
+	depends on SAMV7_QSPI_DMA && DEBUG_FEATURES && DEBUG_DMA
 	default n
 	---help---
 		Enable special debug instrumentation analyze QSPI DMA data transfers.
@@ -924,11 +924,11 @@ config SAMV7_QSPI_DMADEBUG
 
 config SAMV7_QSPI_REGDEBUG
 	bool "QSPI Register level debug"
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	default n
 	---help---
 		Output detailed register-level QSPI device debug information.
-		Requires also DEBUG.
+		Requires also CONFIG_DEBUG_FEATURES.
 
 endmenu # QSPI device driver options
 
@@ -952,11 +952,11 @@ config SAMV7_TWIHS2_FREQUENCY
 
 config SAMV7_TWIHS_REGDEBUG
 	bool "TWIHS register level debug"
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	default n
 	---help---
 		Output detailed register-level TWIHS device debug information.
-		Very invasive! Requires also DEBUG.
+		Very invasive! Requires also CONFIG_DEBUG_FEATURES.
 
 endmenu # TWIHS device driver options
 
@@ -1318,7 +1318,7 @@ endif # SAMV7_SSC1
 
 config SAMV7_SSC_DMADEBUG
 	bool "SSC DMA transfer debug"
-	depends on DEBUG && DEBUG_DMA
+	depends on DEBUG_FEATURES && DEBUG_DMA
 	default n
 	---help---
 		Enable special debug instrumentation analyze SSC DMA data transfers.
@@ -1328,11 +1328,11 @@ config SAMV7_SSC_DMADEBUG
 
 config SAMV7_SSC_REGDEBUG
 	bool "SSC Register level debug"
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	default n
 	---help---
 		Output detailed register-level SSC device debug information.
-		Very invasive! Requires also DEBUG.
+		Very invasive! Requires also CONFIG_DEBUG_FEATURES.
 
 config SAMV7_SSC_QDEBUG
 	bool "SSC Queue debug"
@@ -1551,11 +1551,11 @@ endif
 
 config SAMV7_TC_DEBUG
 	bool "TC debug"
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	default n
 	---help---
 		Output high level Timer/Counter device debug information.
-		Requires also DEBUG.  If this option AND CONFIG_DEBUG_INFO are
+		Requires also CONFIG_DEBUG_FEATURES.  If this option AND CONFIG_DEBUG_INFO are
 		enabled, then the system will be overwhelmed the timer debug
 		output.  If CONFIG_DEBUG_INFO is disabled, then debug output will
 		only indicate if/when timer-related errors occur.  This
@@ -1563,11 +1563,11 @@ config SAMV7_TC_DEBUG
 
 config SAMV7_TC_REGDEBUG
 	bool "TC register level debug"
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	default n
 	---help---
 		Output detailed register-level Timer/Counter device debug
-		information. Very invasive! Requires also DEBUG.
+		information. Very invasive! Requires also CONFIG_DEBUG_FEATURES.
 
 endmenu # Timer/counter Configuration
 endif # SAMV7_HAVE_TC
@@ -1641,11 +1641,11 @@ config SAMV7_HSMCI_CMDDEBUG
 
 config SAMV7_HSMCI_REGDEBUG
 	bool "HSMCI Register level debug"
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	default n
 	---help---
 		Output detailed register-level HSCMI device debug information.
-		Very invasive! Requires also DEBUG.
+		Very invasive! Requires also CONFIG_DEBUG_FEATURES.
 
 endmenu # HSMCI device driver options
 
@@ -1854,7 +1854,7 @@ config SAMV7_EMAC_NBC
 config SAMV7_EMAC_DEBUG
 	bool "Force EMAC0/1 DEBUG"
 	default n
-	depends on DEBUG && !DEBUG_NET
+	depends on DEBUG_FEATURES && !DEBUG_NET
 	---help---
 		This option will force debug output from EMAC driver even without
 		network debug output enabled.  This is not normally something
@@ -1865,9 +1865,9 @@ config SAMV7_EMAC_DEBUG
 config SAMV7_EMAC_REGDEBUG
 	bool "Register-Level Debug"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	---help---
-		Enable very low-level register access debug.  Depends on DEBUG.
+		Enable very low-level register access debug.  Depends on CONFIG_DEBUG_FEATURES.
 
 endmenu # EMAC0 device driver options
 
@@ -1923,7 +1923,7 @@ config SAMV7_USBHS_EP7DMA_WAR
 config SAMV7_USBHS_REGDEBUG
 	bool "Enable low-level USBHS register debug"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 
 endmenu # USB High Speed Device Controller driver (DCD) options
 
@@ -2598,11 +2598,11 @@ endmenu # MCAN1 device driver options
 
 config SAMV7_MCAN_REGDEBUG
 	bool "CAN Register level debug"
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	default n
 	---help---
 		Output detailed register-level CAN device debug information.
-		Requires also DEBUG.
+		Requires also CONFIG_DEBUG_FEATURES.
 
 endmenu # CAN device driver options
 endif # SAMV7_MCAN
diff --git a/arch/arm/src/samv7/sam_emac.c b/arch/arm/src/samv7/sam_emac.c
index e03cd76e6c..ff39b0c659 100644
--- a/arch/arm/src/samv7/sam_emac.c
+++ b/arch/arm/src/samv7/sam_emac.c
@@ -48,7 +48,7 @@
 
 #include 
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_SAMV7_EMAC_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_SAMV7_EMAC_DEBUG)
   /* Force debug output (from this file only) */
 
 #  undef  CONFIG_DEBUG_NET
@@ -307,7 +307,7 @@
  * enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_SAMV7_EMAC_REGDEBUG
 #endif
 
@@ -560,7 +560,7 @@ struct sam_emac_s
  ****************************************************************************/
 /* Register operations ******************************************************/
 
-#if defined(CONFIG_SAMV7_EMAC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAMV7_EMAC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static bool sam_checkreg(struct sam_emac_s *priv, bool wr,
                          uint32_t regval, uintptr_t address);
 #endif
diff --git a/arch/arm/src/samv7/sam_hsmci.c b/arch/arm/src/samv7/sam_hsmci.c
index 10b0cff4b5..0bc9daf919 100644
--- a/arch/arm/src/samv7/sam_hsmci.c
+++ b/arch/arm/src/samv7/sam_hsmci.c
@@ -2521,7 +2521,7 @@ static int sam_recvshort(FAR struct sdio_dev_s *dev,
    *     0         1               End bit
    */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!rshort)
     {
       fdbg("ERROR: rshort=NULL\n");
@@ -2582,7 +2582,7 @@ static int sam_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd,
    *     0         1               End bit
    */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   /* Check that R1 is the correct response to this command */
 
   if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R2_RESPONSE)
diff --git a/arch/arm/src/samv7/sam_irq.c b/arch/arm/src/samv7/sam_irq.c
index 963b87db1d..3f7c5eeabb 100644
--- a/arch/arm/src/samv7/sam_irq.c
+++ b/arch/arm/src/samv7/sam_irq.c
@@ -171,7 +171,7 @@ static void sam_dumpnvic(const char *msg, int irq)
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 static int sam_nmi(int irq, FAR void *context)
 {
   (void)up_irq_save();
@@ -456,7 +456,7 @@ void up_irqinitialize(void)
 
   /* Attach all other processor exceptions (except reset and sys tick) */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   irq_attach(SAM_IRQ_NMI, sam_nmi);
 #ifndef CONFIG_ARM_MPU
   irq_attach(SAM_IRQ_MEMFAULT, up_memfault);
diff --git a/arch/arm/src/samv7/sam_mcan.c b/arch/arm/src/samv7/sam_mcan.c
index 15c9104781..6e31dcac6d 100644
--- a/arch/arm/src/samv7/sam_mcan.c
+++ b/arch/arm/src/samv7/sam_mcan.c
@@ -789,7 +789,7 @@
 /* Debug ********************************************************************/
 /* Debug configurations that may be enabled just for testing MCAN */
 
-#if !defined(CONFIG_DEBUG) || !defined(CONFIG_DEBUG_CAN)
+#if !defined(CONFIG_DEBUG_FEATURES) || !defined(CONFIG_DEBUG_CAN)
 #  undef CONFIG_SAMV7_MCAN_REGDEBUG
 #endif
 
@@ -2829,7 +2829,7 @@ static bool mcan_txready(FAR struct can_dev_s *dev)
   FAR struct sam_mcan_s *priv = dev->cd_priv;
   uint32_t regval;
   bool notfull;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   int sval;
 #endif
 
@@ -2846,7 +2846,7 @@ static bool mcan_txready(FAR struct can_dev_s *dev)
   regval  = mcan_getreg(priv, SAM_MCAN_TXFQS_OFFSET);
   notfull = ((regval & MCAN_TXFQS_TFQF) == 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   /* As a sanity check, the txfsem should also track the number of elements
    * the TX FIFO/queue.  Make sure that they are consistent.
    */
diff --git a/arch/arm/src/samv7/sam_qspi.c b/arch/arm/src/samv7/sam_qspi.c
index b08490f248..cee4d5110f 100644
--- a/arch/arm/src/samv7/sam_qspi.c
+++ b/arch/arm/src/samv7/sam_qspi.c
@@ -142,7 +142,7 @@
  * include/debug.h
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_SPI
 #  undef CONFIG_SAMV7_QSPI_DMADEBUG
diff --git a/arch/arm/src/samv7/sam_rswdt.c b/arch/arm/src/samv7/sam_rswdt.c
index c9f08e444c..b188c3dfd6 100644
--- a/arch/arm/src/samv7/sam_rswdt.c
+++ b/arch/arm/src/samv7/sam_rswdt.c
@@ -118,7 +118,7 @@ struct sam_lowerhalf_s
  ****************************************************************************/
 /* Register operations ******************************************************/
 
-#if defined(CONFIG_SAMV7_RSWDT_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAMV7_RSWDT_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t sam_getreg(uintptr_t regaddr);
 static void     sam_putreg(uint32_t regval, uintptr_t regaddr);
 #else
@@ -178,7 +178,7 @@ static struct sam_lowerhalf_s g_wdtdev;
  *
  ****************************************************************************/
 
-#if defined(CONFIG_SAMV7_RSWDT_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAMV7_RSWDT_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t sam_getreg(uintptr_t regaddr)
 {
   static uint32_t prevaddr = 0;
@@ -241,7 +241,7 @@ static uint32_t sam_getreg(uintptr_t regaddr)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_SAMV7_RSWDT_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAMV7_RSWDT_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static void sam_putreg(uint32_t regval, uintptr_t regaddr)
 {
   /* Show the register value being written */
diff --git a/arch/arm/src/samv7/sam_spi.c b/arch/arm/src/samv7/sam_spi.c
index 454947d572..3c264eb4e6 100644
--- a/arch/arm/src/samv7/sam_spi.c
+++ b/arch/arm/src/samv7/sam_spi.c
@@ -124,7 +124,7 @@
  * include/debug.h
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_SPI
 #  undef CONFIG_SAMV7_SPI_DMADEBUG
diff --git a/arch/arm/src/samv7/sam_spi_slave.c b/arch/arm/src/samv7/sam_spi_slave.c
index b2203519cb..4b1ee3bb60 100644
--- a/arch/arm/src/samv7/sam_spi_slave.c
+++ b/arch/arm/src/samv7/sam_spi_slave.c
@@ -79,7 +79,7 @@
  * include/debug.h
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_SPI
 #endif
diff --git a/arch/arm/src/samv7/sam_ssc.c b/arch/arm/src/samv7/sam_ssc.c
index 52891da588..7c1b45a557 100644
--- a/arch/arm/src/samv7/sam_ssc.c
+++ b/arch/arm/src/samv7/sam_ssc.c
@@ -370,7 +370,7 @@
  * include/debug.h
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_I2S
 #endif
@@ -449,7 +449,7 @@ struct sam_ssc_s
   uintptr_t base;              /* SSC controller register base address */
   sem_t exclsem;               /* Assures mutually exclusive acess to SSC */
   uint8_t datalen;             /* Data width (8, 16, or 32) */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   uint8_t align;               /* Log2 of data width (0, 1, or 3) */
 #endif
   uint8_t pid;                 /* Peripheral ID */
@@ -2036,19 +2036,19 @@ static int ssc_checkwidth(struct sam_ssc_s *priv, int bits)
   switch (bits)
     {
     case 8:
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       priv->align = 0;
 #endif
       break;
 
     case 16:
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       priv->align = 1;
 #endif
       break;
 
     case 32:
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       priv->align = 3;
 #endif
       break;
@@ -3231,7 +3231,7 @@ static void ssc0_configure(struct sam_ssc_s *priv)
 
   priv->base    = SAM_SSC0_BASE;
   priv->datalen = CONFIG_SAMV7_SSC0_DATALEN;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   priv->align   = SAMV7_SSC0_DATAMASK;
 #endif
   priv->pid     = SAM_PID_SSC0;
@@ -3372,7 +3372,7 @@ static void ssc1_configure(struct sam_ssc_s *priv)
 
   priv->base    = SAM_SSC1_BASE;
   priv->datalen = CONFIG_SAMV7_SSC1_DATALEN;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   priv->align   = SAMV7_SSC1_DATAMASK;
 #endif
   priv->pid     = SAM_PID_SSC1;
diff --git a/arch/arm/src/samv7/sam_tc.h b/arch/arm/src/samv7/sam_tc.h
index 15673deaf9..9efd00d607 100644
--- a/arch/arm/src/samv7/sam_tc.h
+++ b/arch/arm/src/samv7/sam_tc.h
@@ -75,7 +75,7 @@
 
 /* Timer debug is enabled if any timer client is enabled */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_ANALOG
 #  undef CONFIG_SAMV7_TC_REGDEBUG
 #endif
diff --git a/arch/arm/src/samv7/sam_twihs.c b/arch/arm/src/samv7/sam_twihs.c
index 3e242d8525..87123462aa 100644
--- a/arch/arm/src/samv7/sam_twihs.c
+++ b/arch/arm/src/samv7/sam_twihs.c
@@ -121,7 +121,7 @@
 #define MKI2C_OUTPUT(p) (((p) & (PIO_PORT_MASK | PIO_PIN_MASK)) | I2C_OUTPUT)
 
 /* Debug ***********************************************************************/
-/* CONFIG_DEBUG_I2C + CONFIG_DEBUG enables general I2C debug output. */
+/* CONFIG_DEBUG_I2C + CONFIG_DEBUG_FEATURES enables general I2C debug output. */
 
 #ifdef CONFIG_DEBUG_I2C
 #  define i2cdbg    dbg
diff --git a/arch/arm/src/samv7/sam_usbdevhs.c b/arch/arm/src/samv7/sam_usbdevhs.c
index c7c2275b98..a2f0774079 100644
--- a/arch/arm/src/samv7/sam_usbdevhs.c
+++ b/arch/arm/src/samv7/sam_usbdevhs.c
@@ -112,7 +112,7 @@
  * enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_SAMV7_USBHS_REGDEBUG
 #endif
 
@@ -869,7 +869,7 @@ static inline void sam_putreg(uint32_t regval, uint32_t regaddr)
  * Name: sam_dumpep
  ****************************************************************************/
 
-#if defined(CONFIG_SAMV7_USBHS_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAMV7_USBHS_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static void sam_dumpep(struct sam_usbdev_s *priv, int epno)
 {
   /* Global Registers */
@@ -3730,7 +3730,7 @@ static int sam_ep_configure(struct usbdev_ep_s *ep,
 
   /* Verify parameters.  Endpoint 0 is not available at this interface */
 
-#if defined(CONFIG_DEBUG) || defined(CONFIG_USBDEV_TRACE)
+#if defined(CONFIG_DEBUG_FEATURES) || defined(CONFIG_USBDEV_TRACE)
   uint8_t epno = USB_EPNO(desc->addr);
   usbtrace(TRACE_EPCONFIGURE, (uint16_t)epno);
 
diff --git a/arch/arm/src/samv7/sam_wdt.c b/arch/arm/src/samv7/sam_wdt.c
index cd156021e3..efcb01b92e 100644
--- a/arch/arm/src/samv7/sam_wdt.c
+++ b/arch/arm/src/samv7/sam_wdt.c
@@ -118,7 +118,7 @@ struct sam_lowerhalf_s
  ****************************************************************************/
 /* Register operations ******************************************************/
 
-#if defined(CONFIG_SAMV7_WDT_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAMV7_WDT_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t sam_getreg(uintptr_t regaddr);
 static void     sam_putreg(uint32_t regval, uintptr_t regaddr);
 #else
@@ -178,7 +178,7 @@ static struct sam_lowerhalf_s g_wdtdev;
  *
  ****************************************************************************/
 
-#if defined(CONFIG_SAMV7_WDT_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAMV7_WDT_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t sam_getreg(uintptr_t regaddr)
 {
   static uint32_t prevaddr = 0;
@@ -241,7 +241,7 @@ static uint32_t sam_getreg(uintptr_t regaddr)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_SAMV7_WDT_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_SAMV7_WDT_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static void sam_putreg(uint32_t regval, uintptr_t regaddr)
 {
   /* Show the register value being written */
diff --git a/arch/arm/src/samv7/sam_xdmac.c b/arch/arm/src/samv7/sam_xdmac.c
index c52f63fb9b..f04782980f 100644
--- a/arch/arm/src/samv7/sam_xdmac.c
+++ b/arch/arm/src/samv7/sam_xdmac.c
@@ -1020,7 +1020,7 @@ sam_allocdesc(struct sam_xdmach_s *xdmach, struct chnext_view1_s *prev,
    * Obviously setting it to zero would break that usage.
    */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (csa != 0)
 #endif
     {
@@ -1340,7 +1340,7 @@ static inline int sam_single(struct sam_xdmach_s *xdmach)
 static inline int sam_multiple(struct sam_xdmach_s *xdmach)
 {
   struct sam_xdmac_s *xdmac = sam_controller(xdmach);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   struct chnext_view1_s *llhead = xdmach->llhead;
 #endif
   uintptr_t paddr;
diff --git a/arch/arm/src/samv7/sam_xdmac.h b/arch/arm/src/samv7/sam_xdmac.h
index fe98581d08..775591f94a 100644
--- a/arch/arm/src/samv7/sam_xdmac.h
+++ b/arch/arm/src/samv7/sam_xdmac.h
@@ -52,7 +52,7 @@
 
 /* Configuration ********************************************************************/
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_DMA
 #endif
 
diff --git a/arch/arm/src/stm32/Kconfig b/arch/arm/src/stm32/Kconfig
index a9b89773ea..c1e277fc2b 100644
--- a/arch/arm/src/stm32/Kconfig
+++ b/arch/arm/src/stm32/Kconfig
@@ -6215,9 +6215,9 @@ endchoice
 config STM32_ETHMAC_REGDEBUG
 	bool "Register-Level Debug"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	---help---
-		Enable very low-level register access debug.  Depends on DEBUG.
+		Enable very low-level register access debug.  Depends on CONFIG_DEBUG_FEATURES.
 
 endmenu
 endif
@@ -6307,14 +6307,14 @@ config STM32_USBHOST_REGDEBUG
 	default n
 	depends on USBHOST && (STM32_OTGFS || STM32_OTGHS)
 	---help---
-		Enable very low-level register access debug.  Depends on DEBUG.
+		Enable very low-level register access debug.
 
 config STM32_USBHOST_PKTDUMP
 	bool "Packet Dump Debug"
 	default n
 	depends on USBHOST && (STM32_OTGFS || STM32_OTGHS)
 	---help---
-		Dump all incoming and outgoing USB packets. Depends on DEBUG.
+		Dump all incoming and outgoing USB packets.
 
 endmenu
 
diff --git a/arch/arm/src/stm32/Make.defs b/arch/arm/src/stm32/Make.defs
index 0b691c270d..1a3355d24d 100644
--- a/arch/arm/src/stm32/Make.defs
+++ b/arch/arm/src/stm32/Make.defs
@@ -247,7 +247,7 @@ ifeq ($(CONFIG_STM32_WWDG),y)
 CHIP_CSRCS += stm32_wwdg.c
 endif
 
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
 CHIP_CSRCS += stm32_dumpgpio.c
 endif
 
diff --git a/arch/arm/src/stm32/stm32.h b/arch/arm/src/stm32/stm32.h
index a1cc224f59..f52fa2cb4a 100644
--- a/arch/arm/src/stm32/stm32.h
+++ b/arch/arm/src/stm32/stm32.h
@@ -59,7 +59,7 @@
  * depend on CONFIG_DEBUG_INFO
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_DMA
 #  undef CONFIG_DEBUG_RTC
 #  undef CONFIG_DEBUG_I2C
diff --git a/arch/arm/src/stm32/stm32_can.c b/arch/arm/src/stm32/stm32_can.c
index 29545492ef..b361133f1f 100644
--- a/arch/arm/src/stm32/stm32_can.c
+++ b/arch/arm/src/stm32/stm32_can.c
@@ -96,7 +96,7 @@
 #  define canllinfo(x...)
 #endif
 
-#if !defined(CONFIG_DEBUG) || !defined(CONFIG_DEBUG_CAN)
+#if !defined(CONFIG_DEBUG_FEATURES) || !defined(CONFIG_DEBUG_CAN)
 #  undef CONFIG_CAN_REGDEBUG
 #endif
 
diff --git a/arch/arm/src/stm32/stm32_dumpgpio.c b/arch/arm/src/stm32/stm32_dumpgpio.c
index 77d49ffa08..4e4f4327c5 100644
--- a/arch/arm/src/stm32/stm32_dumpgpio.c
+++ b/arch/arm/src/stm32/stm32_dumpgpio.c
@@ -49,14 +49,14 @@
 #include "stm32_gpio.h"
 #include "stm32_rcc.h"
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 
 /****************************************************************************
  * Private Data
  ****************************************************************************/
 /* Port letters for prettier debug output */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 static const char g_portchar[STM32_NGPIO_PORTS] =
 {
 #if STM32_NGPIO_PORTS > 11
@@ -238,4 +238,4 @@ int stm32_dumpgpio(uint32_t pinset, const char *msg)
   return OK;
 }
 
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_FEATURES */
diff --git a/arch/arm/src/stm32/stm32_eth.c b/arch/arm/src/stm32/stm32_eth.c
index 481538aedd..19c5e3aee1 100644
--- a/arch/arm/src/stm32/stm32_eth.c
+++ b/arch/arm/src/stm32/stm32_eth.c
@@ -240,7 +240,7 @@
  * enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_STM32_ETHMAC_REGDEBUG
 #endif
 
@@ -622,7 +622,7 @@ static struct stm32_ethmac_s g_stm32ethmac[STM32_NETHERNET];
  ****************************************************************************/
 /* Register operations ******************************************************/
 
-#if defined(CONFIG_STM32_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t stm32_getreg(uint32_t addr);
 static void stm32_putreg(uint32_t val, uint32_t addr);
 static void stm32_checksetup(void);
@@ -748,7 +748,7 @@ static int  stm32_ethconfig(FAR struct stm32_ethmac_s *priv);
  *
  ****************************************************************************/
 
-#if defined(CONFIG_STM32_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t stm32_getreg(uint32_t addr)
 {
   static uint32_t prevaddr = 0;
@@ -820,7 +820,7 @@ static uint32_t stm32_getreg(uint32_t addr)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_STM32_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static void stm32_putreg(uint32_t val, uint32_t addr)
 {
   /* Show the register value being written */
@@ -847,7 +847,7 @@ static void stm32_putreg(uint32_t val, uint32_t addr)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_STM32_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static void stm32_checksetup(void)
 {
 }
diff --git a/arch/arm/src/stm32/stm32_gpio.h b/arch/arm/src/stm32/stm32_gpio.h
index c1790eaaaa..34b49bf0d6 100644
--- a/arch/arm/src/stm32/stm32_gpio.h
+++ b/arch/arm/src/stm32/stm32_gpio.h
@@ -510,7 +510,7 @@ xcpt_t stm32_gpiosetevent(uint32_t pinset, bool risingedge, bool fallingedge,
  *
  ************************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 int stm32_dumpgpio(uint32_t pinset, const char *msg);
 #else
 #  define stm32_dumpgpio(p,m)
diff --git a/arch/arm/src/stm32/stm32_i2c.c b/arch/arm/src/stm32/stm32_i2c.c
index e1d7e3cade..6b4728cf6a 100644
--- a/arch/arm/src/stm32/stm32_i2c.c
+++ b/arch/arm/src/stm32/stm32_i2c.c
@@ -162,7 +162,7 @@
 #define MKI2C_OUTPUT(p) (((p) & (GPIO_PORT_MASK | GPIO_PIN_MASK)) | I2C_OUTPUT)
 
 /* Debug ****************************************************************************/
-/* CONFIG_DEBUG_I2C + CONFIG_DEBUG enables general I2C debug output. */
+/* CONFIG_DEBUG_I2C + CONFIG_DEBUG_FEATURES enables general I2C debug output. */
 
 #ifdef CONFIG_DEBUG_I2C
 #  define i2cdbg dbg
diff --git a/arch/arm/src/stm32/stm32_i2c_alt.c b/arch/arm/src/stm32/stm32_i2c_alt.c
index cc0aa02120..3ed1e6939d 100644
--- a/arch/arm/src/stm32/stm32_i2c_alt.c
+++ b/arch/arm/src/stm32/stm32_i2c_alt.c
@@ -169,7 +169,7 @@
 #define MKI2C_OUTPUT(p) (((p) & (GPIO_PORT_MASK | GPIO_PIN_MASK)) | I2C_OUTPUT)
 
 /* Debug ****************************************************************************/
-/* CONFIG_DEBUG_I2C + CONFIG_DEBUG enables general I2C debug output. */
+/* CONFIG_DEBUG_I2C + CONFIG_DEBUG_FEATURES enables general I2C debug output. */
 
 #ifdef CONFIG_DEBUG_I2C
 #  define i2cdbg dbg
diff --git a/arch/arm/src/stm32/stm32_irq.c b/arch/arm/src/stm32/stm32_irq.c
index e6a347c00a..803345b381 100644
--- a/arch/arm/src/stm32/stm32_irq.c
+++ b/arch/arm/src/stm32/stm32_irq.c
@@ -158,7 +158,7 @@ static void stm32_dumpnvic(const char *msg, int irq)
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 static int stm32_nmi(int irq, FAR void *context)
 {
   (void)up_irq_save();
@@ -408,7 +408,7 @@ void up_irqinitialize(void)
 
   /* Attach all other processor exceptions (except reset and sys tick) */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   irq_attach(STM32_IRQ_NMI, stm32_nmi);
 #ifndef CONFIG_ARM_MPU
   irq_attach(STM32_IRQ_MEMFAULT, up_memfault);
diff --git a/arch/arm/src/stm32/stm32_iwdg.c b/arch/arm/src/stm32/stm32_iwdg.c
index 85af854ef4..1e52b26a01 100644
--- a/arch/arm/src/stm32/stm32_iwdg.c
+++ b/arch/arm/src/stm32/stm32_iwdg.c
@@ -143,7 +143,7 @@ struct stm32_lowerhalf_s
  ****************************************************************************/
 /* Register operations ******************************************************/
 
-#if defined(CONFIG_STM32_IWDG_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_IWDG_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint16_t stm32_getreg(uint32_t addr);
 static void     stm32_putreg(uint16_t val, uint32_t addr);
 #else
@@ -195,7 +195,7 @@ static struct stm32_lowerhalf_s g_wdgdev;
  *
  ****************************************************************************/
 
-#if defined(CONFIG_STM32_IWDG_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_IWDG_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint16_t stm32_getreg(uint32_t addr)
 {
   static uint32_t prevaddr = 0;
@@ -258,7 +258,7 @@ static uint16_t stm32_getreg(uint32_t addr)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_STM32_IWDG_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_IWDG_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static void stm32_putreg(uint16_t val, uint32_t addr)
 {
   /* Show the register value being written */
diff --git a/arch/arm/src/stm32/stm32_otgfsdev.c b/arch/arm/src/stm32/stm32_otgfsdev.c
index 2d347ad870..05325986a6 100644
--- a/arch/arm/src/stm32/stm32_otgfsdev.c
+++ b/arch/arm/src/stm32/stm32_otgfsdev.c
@@ -472,7 +472,7 @@ struct stm32_usbdev_s
 
 /* Register operations ********************************************************/
 
-#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t    stm32_getreg(uint32_t addr);
 static void        stm32_putreg(uint32_t val, uint32_t addr);
 #else
@@ -792,7 +792,7 @@ const struct trace_msg_t g_usb_trace_strings_intdecode[] =
  *
  ****************************************************************************/
 
-#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t stm32_getreg(uint32_t addr)
 {
   static uint32_t prevaddr = 0;
@@ -855,7 +855,7 @@ static uint32_t stm32_getreg(uint32_t addr)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static void stm32_putreg(uint32_t val, uint32_t addr)
 {
   /* Show the register value being written */
@@ -4185,7 +4185,7 @@ static int stm32_ep_disable(FAR struct usbdev_ep_s *ep)
 {
   FAR struct stm32_ep_s *privep = (FAR struct stm32_ep_s *)ep;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -4225,7 +4225,7 @@ static FAR struct usbdev_req_s *stm32_ep_allocreq(FAR struct usbdev_ep_s *ep)
 {
   FAR struct stm32_req_s *privreq;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -4258,7 +4258,7 @@ static void stm32_ep_freereq(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s
 {
   FAR struct stm32_req_s *privreq = (FAR struct stm32_req_s *)req;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !req)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -4330,7 +4330,7 @@ static int stm32_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *
 
   /* Some sanity checking */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!req || !req->callback || !req->buf || !ep)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -4342,7 +4342,7 @@ static int stm32_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *
   usbtrace(TRACE_EPSUBMIT, privep->epphy);
   priv = privep->dev;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!priv->driver)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_NOTCONFIGURED), priv->usbdev.speed);
@@ -4419,7 +4419,7 @@ static int stm32_ep_cancel(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *
   FAR struct stm32_ep_s *privep = (FAR struct stm32_ep_s *)ep;
   irqstate_t flags;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !req)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -4877,7 +4877,7 @@ static int stm32_selfpowered(struct usbdev_s *dev, bool selfpowered)
 
   usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -5560,7 +5560,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
 
   usbtrace(TRACE_DEVREGISTER, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!driver || !driver->ops->bind || !driver->ops->unbind ||
       !driver->ops->disconnect || !driver->ops->setup)
     {
@@ -5631,7 +5631,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
 
   usbtrace(TRACE_DEVUNREGISTER, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (driver != priv->driver)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
diff --git a/arch/arm/src/stm32/stm32_otgfshost.c b/arch/arm/src/stm32/stm32_otgfshost.c
index ba0d451d43..f2ce8e2abd 100644
--- a/arch/arm/src/stm32/stm32_otgfshost.c
+++ b/arch/arm/src/stm32/stm32_otgfshost.c
@@ -93,9 +93,9 @@
  *  CONFIG_STM32_OTGFS_SOFINTR - Enable SOF interrupts.  Why would you ever
  *    want to do that?
  *  CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access
- *    debug.  Depends on CONFIG_DEBUG.
+ *    debug.  Depends on CONFIG_DEBUG_FEATURES.
  *  CONFIG_STM32_USBHOST_PKTDUMP - Dump all incoming and outgoing USB
- *    packets. Depends on CONFIG_DEBUG.
+ *    packets. Depends on CONFIG_DEBUG_FEATURES.
  */
 
 /* Pre-requisites (partial) */
@@ -128,9 +128,9 @@
 #  define CONFIG_STM32_OTGFS_DESCSIZE 128
 #endif
 
-/* Register/packet debug depends on CONFIG_DEBUG */
+/* Register/packet debug depends on CONFIG_DEBUG_FEATURES */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_STM32_USBHOST_REGDEBUG
 #  undef CONFIG_STM32_USBHOST_PKTDUMP
 #endif
diff --git a/arch/arm/src/stm32/stm32_otghsdev.c b/arch/arm/src/stm32/stm32_otghsdev.c
index 7df1b921ce..6d14771b6d 100644
--- a/arch/arm/src/stm32/stm32_otghsdev.c
+++ b/arch/arm/src/stm32/stm32_otghsdev.c
@@ -472,7 +472,7 @@ struct stm32_usbdev_s
 
 /* Register operations ********************************************************/
 
-#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t    stm32_getreg(uint32_t addr);
 static void        stm32_putreg(uint32_t val, uint32_t addr);
 #else
@@ -792,7 +792,7 @@ const struct trace_msg_t g_usb_trace_strings_intdecode[] =
  *
  ****************************************************************************/
 
-#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t stm32_getreg(uint32_t addr)
 {
   static uint32_t prevaddr = 0;
@@ -855,7 +855,7 @@ static uint32_t stm32_getreg(uint32_t addr)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static void stm32_putreg(uint32_t val, uint32_t addr)
 {
   /* Show the register value being written */
@@ -4185,7 +4185,7 @@ static int stm32_ep_disable(FAR struct usbdev_ep_s *ep)
 {
   FAR struct stm32_ep_s *privep = (FAR struct stm32_ep_s *)ep;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -4225,7 +4225,7 @@ static FAR struct usbdev_req_s *stm32_ep_allocreq(FAR struct usbdev_ep_s *ep)
 {
   FAR struct stm32_req_s *privreq;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -4258,7 +4258,7 @@ static void stm32_ep_freereq(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s
 {
   FAR struct stm32_req_s *privreq = (FAR struct stm32_req_s *)req;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !req)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -4330,7 +4330,7 @@ static int stm32_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *
 
   /* Some sanity checking */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!req || !req->callback || !req->buf || !ep)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -4342,7 +4342,7 @@ static int stm32_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *
   usbtrace(TRACE_EPSUBMIT, privep->epphy);
   priv = privep->dev;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!priv->driver)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_NOTCONFIGURED), priv->usbdev.speed);
@@ -4419,7 +4419,7 @@ static int stm32_ep_cancel(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *
   FAR struct stm32_ep_s *privep = (FAR struct stm32_ep_s *)ep;
   irqstate_t flags;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !req)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -4877,7 +4877,7 @@ static int stm32_selfpowered(struct usbdev_s *dev, bool selfpowered)
 
   usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -5549,7 +5549,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
 
   usbtrace(TRACE_DEVREGISTER, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!driver || !driver->ops->bind || !driver->ops->unbind ||
       !driver->ops->disconnect || !driver->ops->setup)
     {
@@ -5620,7 +5620,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
 
   usbtrace(TRACE_DEVUNREGISTER, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (driver != priv->driver)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
diff --git a/arch/arm/src/stm32/stm32_otghshost.c b/arch/arm/src/stm32/stm32_otghshost.c
index 4a81571791..66f8214783 100644
--- a/arch/arm/src/stm32/stm32_otghshost.c
+++ b/arch/arm/src/stm32/stm32_otghshost.c
@@ -93,9 +93,9 @@
  *  CONFIG_STM32_OTGHS_SOFINTR - Enable SOF interrupts.  Why would you ever
  *    want to do that?
  *  CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access
- *    debug.  Depends on CONFIG_DEBUG.
+ *    debug.  Depends on CONFIG_DEBUG_FEATURES.
  *  CONFIG_STM32_USBHOST_PKTDUMP - Dump all incoming and outgoing USB
- *    packets. Depends on CONFIG_DEBUG.
+ *    packets. Depends on CONFIG_DEBUG_FEATURES.
  */
 
 /* Pre-requisites (partial) */
@@ -128,9 +128,9 @@
 #  define CONFIG_STM32_OTGHS_DESCSIZE 128
 #endif
 
-/* Register/packet debug depends on CONFIG_DEBUG */
+/* Register/packet debug depends on CONFIG_DEBUG_FEATURES */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_STM32_USBHOST_REGDEBUG
 #  undef CONFIG_STM32_USBHOST_PKTDUMP
 #endif
diff --git a/arch/arm/src/stm32/stm32_pwm.c b/arch/arm/src/stm32/stm32_pwm.c
index 0af0465bff..549edeae6d 100644
--- a/arch/arm/src/stm32/stm32_pwm.c
+++ b/arch/arm/src/stm32/stm32_pwm.c
@@ -117,7 +117,7 @@
 /* Debug ********************************************************************/
 /* Non-standard debug that may be enabled just for testing PWM */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_PWM
 #endif
 
diff --git a/arch/arm/src/stm32/stm32_qencoder.c b/arch/arm/src/stm32/stm32_qencoder.c
index 4b438a7e72..8c856b25c4 100644
--- a/arch/arm/src/stm32/stm32_qencoder.c
+++ b/arch/arm/src/stm32/stm32_qencoder.c
@@ -247,7 +247,7 @@
 /* Debug ****************************************************************************/
 /* Non-standard debug that may be enabled just for testing the quadrature encoder */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_SENSORS
 #endif
 
diff --git a/arch/arm/src/stm32/stm32_rtcc.c b/arch/arm/src/stm32/stm32_rtcc.c
index 3b0877775a..1f1cbcaae7 100644
--- a/arch/arm/src/stm32/stm32_rtcc.c
+++ b/arch/arm/src/stm32/stm32_rtcc.c
@@ -76,7 +76,7 @@
 #  error "CONFIG_STM32_PWR must selected to use this driver"
 #endif
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_RTC
 #endif
 
diff --git a/arch/arm/src/stm32/stm32_sdio.c b/arch/arm/src/stm32/stm32_sdio.c
index 7244877af6..ae31eb5ccd 100644
--- a/arch/arm/src/stm32/stm32_sdio.c
+++ b/arch/arm/src/stm32/stm32_sdio.c
@@ -139,7 +139,7 @@
 #  undef CONFIG_SDIO_DMAPRIO
 #endif
 
-#if !defined(CONFIG_DEBUG_FS) || !defined(CONFIG_DEBUG)
+#if !defined(CONFIG_DEBUG_FS) || !defined(CONFIG_DEBUG_FEATURES)
 #  undef CONFIG_SDIO_XFRDEBUG
 #endif
 
@@ -2060,7 +2060,7 @@ static int stm32_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
 
 static int stm32_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort)
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   uint32_t respcmd;
 #endif
   uint32_t regval;
@@ -2089,7 +2089,7 @@ static int stm32_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t
    */
 
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!rshort)
     {
       fdbg("ERROR: rshort=NULL\n");
@@ -2121,7 +2121,7 @@ static int stm32_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t
           fdbg("ERROR: CRC failure: %08x\n", regval);
           ret = -EIO;
         }
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       else
         {
           /* Check response received is of desired command */
@@ -2157,7 +2157,7 @@ static int stm32_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlo
    *     0         1               End bit
    */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   /* Check that R1 is the correct response to this command */
 
   if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R2_RESPONSE)
@@ -2212,7 +2212,7 @@ static int stm32_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *r
 
   /* Check that this is the correct response to this command */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R3_RESPONSE &&
       (cmd & MMCSD_RESPONSE_MASK) != MMCSD_R7_RESPONSE)
     {
diff --git a/arch/arm/src/stm32/stm32_spi.c b/arch/arm/src/stm32/stm32_spi.c
index 6c3f7eea90..f589b83efa 100644
--- a/arch/arm/src/stm32/stm32_spi.c
+++ b/arch/arm/src/stm32/stm32_spi.c
@@ -159,7 +159,7 @@
 /* Debug ****************************************************************************/
 /* Check if (non-standard) SPI debug is enabled */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_SPI
 #endif
diff --git a/arch/arm/src/stm32/stm32_start.c b/arch/arm/src/stm32/stm32_start.c
index 8e58e862a9..480d5f58b4 100644
--- a/arch/arm/src/stm32/stm32_start.c
+++ b/arch/arm/src/stm32/stm32_start.c
@@ -81,7 +81,7 @@ static void go_os_start(void *pv, unsigned int nbytes)
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 #  define showprogress(c) up_lowputc(c)
 #else
 #  define showprogress(c)
diff --git a/arch/arm/src/stm32/stm32_usbdev.c b/arch/arm/src/stm32/stm32_usbdev.c
index 5f352dc26c..631c936d74 100644
--- a/arch/arm/src/stm32/stm32_usbdev.c
+++ b/arch/arm/src/stm32/stm32_usbdev.c
@@ -103,7 +103,7 @@
  * enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_STM32_USBDEV_REGDEBUG
 #endif
 
@@ -388,7 +388,7 @@ struct stm32_usbdev_s
 
 /* Register operations ******************************************************/
 
-#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint16_t stm32_getreg(uint32_t addr);
 static void stm32_putreg(uint16_t val, uint32_t addr);
 static void stm32_checksetup(void);
@@ -652,7 +652,7 @@ const struct trace_msg_t g_usb_trace_strings_deverror[] =
  * Name: stm32_getreg
  ****************************************************************************/
 
-#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint16_t stm32_getreg(uint32_t addr)
 {
   static uint32_t prevaddr = 0;
@@ -710,7 +710,7 @@ static uint16_t stm32_getreg(uint32_t addr)
  * Name: stm32_putreg
  ****************************************************************************/
 
-#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static void stm32_putreg(uint16_t val, uint32_t addr)
 {
   /* Show the register value being written */
@@ -727,7 +727,7 @@ static void stm32_putreg(uint16_t val, uint32_t addr)
  * Name: stm32_dumpep
  ****************************************************************************/
 
-#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static void stm32_dumpep(int epno)
 {
   uint32_t addr;
@@ -770,7 +770,7 @@ static void stm32_dumpep(int epno)
  * Name: stm32_checksetup
  ****************************************************************************/
 
-#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static void stm32_checksetup(void)
 {
   uint32_t cfgr     = getreg32(STM32_RCC_CFGR);
@@ -2840,7 +2840,7 @@ static int stm32_epconfigure(struct usbdev_ep_s *ep,
   uint16_t maxpacket;
   uint8_t  epno;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !desc)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -2936,7 +2936,7 @@ static int stm32_epdisable(struct usbdev_ep_s *ep)
   irqstate_t flags;
   uint8_t epno;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -2971,7 +2971,7 @@ static struct usbdev_req_s *stm32_epallocreq(struct usbdev_ep_s *ep)
 {
   struct stm32_req_s *privreq;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -2999,7 +2999,7 @@ static void stm32_epfreereq(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
 {
   struct stm32_req_s *privreq = (struct stm32_req_s *)req;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !req)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -3024,7 +3024,7 @@ static int stm32_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
   uint8_t epno;
   int ret = OK;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!req || !req->callback || !req->buf || !ep)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -3036,7 +3036,7 @@ static int stm32_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
   usbtrace(TRACE_EPSUBMIT, USB_EPNO(ep->eplog));
   priv = privep->dev;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!priv->driver)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_NOTCONFIGURED), priv->usbdev.speed);
@@ -3136,7 +3136,7 @@ static int stm32_epcancel(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
   struct stm32_ep_s *privep = (struct stm32_ep_s *)ep;
   irqstate_t flags;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !req)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -3163,7 +3163,7 @@ static int stm32_epstall(struct usbdev_ep_s *ep, bool resume)
   uint16_t status;
   irqstate_t flags;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -3305,7 +3305,7 @@ static struct usbdev_ep_s *stm32_allocep(struct usbdev_s *dev, uint8_t epno,
   int bufno;
 
   usbtrace(TRACE_DEVALLOCEP, (uint16_t)epno);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -3379,7 +3379,7 @@ static void stm32_freeep(struct usbdev_s *dev, struct usbdev_ep_s *ep)
   struct stm32_usbdev_s *priv;
   struct stm32_ep_s *privep;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev || !ep)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -3410,7 +3410,7 @@ static int stm32_getframe(struct usbdev_s *dev)
 {
   uint16_t fnr;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -3435,7 +3435,7 @@ static int stm32_wakeup(struct usbdev_s *dev)
   irqstate_t flags;
 
   usbtrace(TRACE_DEVWAKEUP, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -3473,7 +3473,7 @@ static int stm32_selfpowered(struct usbdev_s *dev, bool selfpowered)
 
   usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -3834,7 +3834,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
 
   usbtrace(TRACE_DEVREGISTER, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!driver || !driver->ops->bind || !driver->ops->unbind ||
       !driver->ops->disconnect || !driver->ops->setup)
     {
@@ -3912,7 +3912,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
 
   usbtrace(TRACE_DEVUNREGISTER, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (driver != priv->driver)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
diff --git a/arch/arm/src/stm32/stm32_usbhost.h b/arch/arm/src/stm32/stm32_usbhost.h
index 2a6a733544..7c036a8fa6 100644
--- a/arch/arm/src/stm32/stm32_usbhost.h
+++ b/arch/arm/src/stm32/stm32_usbhost.h
@@ -236,7 +236,7 @@ enum usbhost_trace1codes_e
  *    want to do that?
  *
  *  CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access
- *    debug.  Depends on CONFIG_DEBUG.
+ *    debug.  Depends on CONFIG_DEBUG_FEATURES.
  */
 
 /************************************************************************************
diff --git a/arch/arm/src/stm32/stm32_wwdg.c b/arch/arm/src/stm32/stm32_wwdg.c
index dd20476f57..a65bfadf96 100644
--- a/arch/arm/src/stm32/stm32_wwdg.c
+++ b/arch/arm/src/stm32/stm32_wwdg.c
@@ -119,7 +119,7 @@ struct stm32_lowerhalf_s
  ****************************************************************************/
 /* Register operations ******************************************************/
 
-#if defined(CONFIG_STM32_WWDG_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_WWDG_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint16_t stm32_getreg(uint32_t addr);
 static void     stm32_putreg(uint16_t val, uint32_t addr);
 #else
@@ -179,7 +179,7 @@ static struct stm32_lowerhalf_s g_wdgdev;
  *
  ****************************************************************************/
 
-#if defined(CONFIG_STM32_WWDG_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_WWDG_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint16_t stm32_getreg(uint32_t addr)
 {
   static uint32_t prevaddr = 0;
@@ -242,7 +242,7 @@ static uint16_t stm32_getreg(uint32_t addr)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_STM32_WWDG_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32_WWDG_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static void stm32_putreg(uint16_t val, uint32_t addr)
 {
   /* Show the register value being written */
diff --git a/arch/arm/src/stm32/stm32f30xxx_i2c.c b/arch/arm/src/stm32/stm32f30xxx_i2c.c
index 643ca1ecd8..d3ed1ae31c 100644
--- a/arch/arm/src/stm32/stm32f30xxx_i2c.c
+++ b/arch/arm/src/stm32/stm32f30xxx_i2c.c
@@ -154,7 +154,7 @@
 #define STATUS_BUSY(status)    (status & I2C_ISR_BUSY)
 
 /* Debug ****************************************************************************/
-/* CONFIG_DEBUG_I2C + CONFIG_DEBUG enables general I2C debug output. */
+/* CONFIG_DEBUG_I2C + CONFIG_DEBUG_FEATURES enables general I2C debug output. */
 
 #ifdef CONFIG_DEBUG_I2C
 #  define i2cdbg dbg
diff --git a/arch/arm/src/stm32/stm32f40xxx_rtcc.c b/arch/arm/src/stm32/stm32f40xxx_rtcc.c
index 0f79fc1709..e513066a6a 100644
--- a/arch/arm/src/stm32/stm32f40xxx_rtcc.c
+++ b/arch/arm/src/stm32/stm32f40xxx_rtcc.c
@@ -81,7 +81,7 @@
 #  error "CONFIG_STM32_PWR must selected to use this driver"
 #endif
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_RTC
 #endif
 
diff --git a/arch/arm/src/stm32f7/Kconfig b/arch/arm/src/stm32f7/Kconfig
index e77c028ec0..e4bb50c884 100644
--- a/arch/arm/src/stm32f7/Kconfig
+++ b/arch/arm/src/stm32f7/Kconfig
@@ -1856,9 +1856,9 @@ endchoice
 config STM32F7_ETHMAC_REGDEBUG
 	bool "Register-Level Debug"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	---help---
-		Enable very low-level register access debug.  Depends on DEBUG.
+		Enable very low-level register access debug.  Depends on CONFIG_DEBUG_FEATURES.
 
 endmenu
 endif # STM32F7_ETHMAC
diff --git a/arch/arm/src/stm32f7/Make.defs b/arch/arm/src/stm32f7/Make.defs
index 2f4b7b2513..a23e141e21 100644
--- a/arch/arm/src/stm32f7/Make.defs
+++ b/arch/arm/src/stm32f7/Make.defs
@@ -149,6 +149,6 @@ ifeq ($(CONFIG_STM32F7_ETHMAC),y)
 CHIP_CSRCS += stm32_ethernet.c
 endif
 
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
 CHIP_CSRCS += stm32_dumpgpio.c
 endif
diff --git a/arch/arm/src/stm32f7/stm32_dumpgpio.c b/arch/arm/src/stm32f7/stm32_dumpgpio.c
index 24429b01e2..fcd3357efe 100644
--- a/arch/arm/src/stm32f7/stm32_dumpgpio.c
+++ b/arch/arm/src/stm32f7/stm32_dumpgpio.c
@@ -51,7 +51,7 @@
 #include "stm32_gpio.h"
 #include "stm32_rcc.h"
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 
 /* Content of this file requires verification before it is used with other
  * families
@@ -65,7 +65,7 @@
  ****************************************************************************/
 /* Port letters for prettier debug output */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 static const char g_portchar[STM32F7_NGPIO] =
 {
 #if STM32F7_NGPIO > 11
@@ -156,4 +156,4 @@ int stm32_dumpgpio(uint32_t pinset, const char *msg)
 }
 
 #endif /* CONFIG_STM32F7_STM32F74XX || CONFIG_STM32F7_STM32F75XX */
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_FEATURES */
diff --git a/arch/arm/src/stm32f7/stm32_ethernet.c b/arch/arm/src/stm32f7/stm32_ethernet.c
index 1123d0b0a9..af0e461446 100644
--- a/arch/arm/src/stm32f7/stm32_ethernet.c
+++ b/arch/arm/src/stm32f7/stm32_ethernet.c
@@ -263,7 +263,7 @@
  * enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_STM32F7_ETHMAC_REGDEBUG
 #endif
 
@@ -664,7 +664,7 @@ static struct stm32_ethmac_s g_stm32ethmac[STM32F7_NETHERNET];
  ****************************************************************************/
 /* Register operations ******************************************************/
 
-#if defined(CONFIG_STM32F7_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32F7_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t stm32_getreg(uint32_t addr);
 static void stm32_putreg(uint32_t val, uint32_t addr);
 static void stm32_checksetup(void);
@@ -795,7 +795,7 @@ static int  stm32_ethconfig(struct stm32_ethmac_s *priv);
  *
  ****************************************************************************/
 
-#if defined(CONFIG_STM32F7_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32F7_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t stm32_getreg(uint32_t addr)
 {
   static uint32_t prevaddr = 0;
@@ -867,7 +867,7 @@ static uint32_t stm32_getreg(uint32_t addr)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_STM32F7_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32F7_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static void stm32_putreg(uint32_t val, uint32_t addr)
 {
   /* Show the register value being written */
@@ -894,7 +894,7 @@ static void stm32_putreg(uint32_t val, uint32_t addr)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_STM32F7_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_STM32F7_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static void stm32_checksetup(void)
 {
 }
diff --git a/arch/arm/src/stm32f7/stm32_gpio.h b/arch/arm/src/stm32f7/stm32_gpio.h
index 7fff5e2499..e08aac39f7 100644
--- a/arch/arm/src/stm32f7/stm32_gpio.h
+++ b/arch/arm/src/stm32f7/stm32_gpio.h
@@ -345,7 +345,7 @@ xcpt_t stm32_gpiosetevent(uint32_t pinset, bool risingedge, bool fallingedge,
  *
  ************************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 int stm32_dumpgpio(uint32_t pinset, const char *msg);
 #else
 #  define stm32_dumpgpio(p,m)
diff --git a/arch/arm/src/stm32f7/stm32_irq.c b/arch/arm/src/stm32f7/stm32_irq.c
index a52e3e56d9..ca3c5f64fb 100644
--- a/arch/arm/src/stm32f7/stm32_irq.c
+++ b/arch/arm/src/stm32f7/stm32_irq.c
@@ -183,7 +183,7 @@ static void stm32_dumpnvic(const char *msg, int irq)
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 static int stm32_nmi(int irq, FAR void *context)
 {
   (void)up_irq_save();
@@ -490,7 +490,7 @@ void up_irqinitialize(void)
 
   /* Attach all other processor exceptions (except reset and sys tick) */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   irq_attach(STM32_IRQ_NMI, stm32_nmi);
 #ifndef CONFIG_ARM_MPU
   irq_attach(STM32_IRQ_MEMFAULT, up_memfault);
diff --git a/arch/arm/src/stm32l4/Kconfig b/arch/arm/src/stm32l4/Kconfig
index eccd8469bf..6bc1cc9920 100644
--- a/arch/arm/src/stm32l4/Kconfig
+++ b/arch/arm/src/stm32l4/Kconfig
@@ -333,7 +333,7 @@ config STM32L4_QSPI_DMATHRESHOLD
 
 config STM32L4_QSPI_DMADEBUG
 	bool "QSPI DMA transfer debug"
-	depends on STM32L4_QSPI_DMA && DEBUG && DEBUG_DMA
+	depends on STM32L4_QSPI_DMA && DEBUG_FEATURES && DEBUG_DMA
 	default n
 	---help---
 		Enable special debug instrumentation to analyze QSPI DMA data transfers.
@@ -343,11 +343,11 @@ config STM32L4_QSPI_DMADEBUG
 
 config STM32L4_QSPI_REGDEBUG
 	bool "QSPI Register level debug"
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	default n
 	---help---
 		Output detailed register-level QSPI device debug information.
-		Requires also DEBUG.
+		Requires also CONFIG_DEBUG_FEATURES.
 
 endif
 
diff --git a/arch/arm/src/stm32l4/Make.defs b/arch/arm/src/stm32l4/Make.defs
index d7b602efe4..a1acddd1ba 100644
--- a/arch/arm/src/stm32l4/Make.defs
+++ b/arch/arm/src/stm32l4/Make.defs
@@ -150,7 +150,7 @@ CHIP_CSRCS += stm32l4_rtcc.c
 endif
 endif
 
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
 CHIP_CSRCS += stm32l4_dumpgpio.c
 endif
 
diff --git a/arch/arm/src/stm32l4/stm32l4.h b/arch/arm/src/stm32l4/stm32l4.h
index 11cba6d363..1b0973e891 100644
--- a/arch/arm/src/stm32l4/stm32l4.h
+++ b/arch/arm/src/stm32l4/stm32l4.h
@@ -59,7 +59,7 @@
  * NOTE:  Some of these also depend on CONFIG_DEBUG_INFO
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_DMA
 #  undef CONFIG_DEBUG_RTC
 #  undef CONFIG_DEBUG_I2C
diff --git a/arch/arm/src/stm32l4/stm32l4_can.c b/arch/arm/src/stm32l4/stm32l4_can.c
index 3781de996e..00789f419b 100644
--- a/arch/arm/src/stm32l4/stm32l4_can.c
+++ b/arch/arm/src/stm32l4/stm32l4_can.c
@@ -97,7 +97,7 @@
 #  define canllinfo(x...)
 #endif
 
-#if !defined(CONFIG_DEBUG) || !defined(CONFIG_DEBUG_CAN)
+#if !defined(CONFIG_DEBUG_FEATURES) || !defined(CONFIG_DEBUG_CAN)
 #  undef CONFIG_CAN_REGDEBUG
 #endif
 
diff --git a/arch/arm/src/stm32l4/stm32l4_gpio.h b/arch/arm/src/stm32l4/stm32l4_gpio.h
index 185af4810f..49f8c95fa5 100644
--- a/arch/arm/src/stm32l4/stm32l4_gpio.h
+++ b/arch/arm/src/stm32l4/stm32l4_gpio.h
@@ -350,7 +350,7 @@ xcpt_t stm32l4_gpiosetevent(uint32_t pinset, bool risingedge, bool fallingedge,
  *
  ************************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 int stm32l4_dumpgpio(uint32_t pinset, const char *msg);
 #else
 #  define stm32l4_dumpgpio(p,m)
diff --git a/arch/arm/src/stm32l4/stm32l4_i2c.c b/arch/arm/src/stm32l4/stm32l4_i2c.c
index 08bc407719..679739d995 100644
--- a/arch/arm/src/stm32l4/stm32l4_i2c.c
+++ b/arch/arm/src/stm32l4/stm32l4_i2c.c
@@ -146,7 +146,7 @@
 #define STATUS_BUSY(status)    (status & I2C_ISR_BUSY)
 
 /* Debug ****************************************************************************/
-/* CONFIG_DEBUG_I2C + CONFIG_DEBUG enables general I2C debug output. */
+/* CONFIG_DEBUG_I2C + CONFIG_DEBUG_FEATURES enables general I2C debug output. */
 
 #ifdef CONFIG_DEBUG_I2C
 #  define i2cdbg dbg
diff --git a/arch/arm/src/stm32l4/stm32l4_irq.c b/arch/arm/src/stm32l4/stm32l4_irq.c
index e0e963c66d..ebf76d7fd2 100644
--- a/arch/arm/src/stm32l4/stm32l4_irq.c
+++ b/arch/arm/src/stm32l4/stm32l4_irq.c
@@ -157,7 +157,7 @@ static void stm32l4_dumpnvic(const char *msg, int irq)
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 static int stm32l4_nmi(int irq, FAR void *context)
 {
   (void)up_irq_save();
@@ -403,7 +403,7 @@ void up_irqinitialize(void)
 
   /* Attach all other processor exceptions (except reset and sys tick) */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   irq_attach(STM32L4_IRQ_NMI, stm32l4_nmi);
 #ifndef CONFIG_ARM_MPU
   irq_attach(STM32L4_IRQ_MEMFAULT, up_memfault);
diff --git a/arch/arm/src/stm32l4/stm32l4_qspi.c b/arch/arm/src/stm32l4/stm32l4_qspi.c
index 06c136014e..7a932930eb 100644
--- a/arch/arm/src/stm32l4/stm32l4_qspi.c
+++ b/arch/arm/src/stm32l4/stm32l4_qspi.c
@@ -89,7 +89,7 @@
  * include/debug.h
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_SPI
 #  undef CONFIG_STM32L4_QSPI_DMADEBUG
diff --git a/arch/arm/src/stm32l4/stm32l4_rtcc.c b/arch/arm/src/stm32l4/stm32l4_rtcc.c
index 2c349abfd9..c13ddf1442 100644
--- a/arch/arm/src/stm32l4/stm32l4_rtcc.c
+++ b/arch/arm/src/stm32l4/stm32l4_rtcc.c
@@ -83,7 +83,7 @@
 #  error "CONFIG_STM32L4_PWR must selected to use this driver"
 #endif
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_RTC
 #endif
 
diff --git a/arch/arm/src/stm32l4/stm32l4_spi.c b/arch/arm/src/stm32l4/stm32l4_spi.c
index 712ed7c915..b3f9b0db17 100644
--- a/arch/arm/src/stm32l4/stm32l4_spi.c
+++ b/arch/arm/src/stm32l4/stm32l4_spi.c
@@ -140,7 +140,7 @@
 /* Debug ****************************************************************************/
 /* Check if (non-standard) SPI debug is enabled */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_SPI
 #endif
diff --git a/arch/arm/src/stm32l4/stm32l4_start.c b/arch/arm/src/stm32l4/stm32l4_start.c
index 6209cde541..1c391851b4 100644
--- a/arch/arm/src/stm32l4/stm32l4_start.c
+++ b/arch/arm/src/stm32l4/stm32l4_start.c
@@ -120,7 +120,7 @@ static void go_os_start(void *pv, unsigned int nbytes)
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 #  define showprogress(c) up_lowputc(c)
 #else
 #  define showprogress(c)
diff --git a/arch/arm/src/str71x/str71x_decodeirq.c b/arch/arm/src/str71x/str71x_decodeirq.c
index c908ae9e3a..bdf8015e91 100644
--- a/arch/arm/src/str71x/str71x_decodeirq.c
+++ b/arch/arm/src/str71x/str71x_decodeirq.c
@@ -132,7 +132,7 @@ void up_decodeirq(uint32_t *regs)
 
       CURRENT_REGS = savestate;
     }
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   else
     {
       PANIC(); /* Normally never happens */
diff --git a/arch/arm/src/str71x/str71x_head.S b/arch/arm/src/str71x/str71x_head.S
index 6a299e8911..c35715e02d 100644
--- a/arch/arm/src/str71x/str71x_head.S
+++ b/arch/arm/src/str71x/str71x_head.S
@@ -67,7 +67,7 @@
 #ifdef CONFIG_ARCH_LEDS
 	.globl	board_autoled_initialize	/* Boot LED setup */
 #endif
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 	.globl	up_lowputc					/* Low-level debug output */
 #endif
 	.globl	os_start					/* NuttX entry point */
@@ -86,7 +86,7 @@
  *****************************************************************************/
 
 	.macro	showprogress, code
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 	mov		r0, #\code
 	bl		up_lowputc
 #endif
diff --git a/arch/arm/src/tiva/Kconfig b/arch/arm/src/tiva/Kconfig
index 20be141309..5cda5b394d 100644
--- a/arch/arm/src/tiva/Kconfig
+++ b/arch/arm/src/tiva/Kconfig
@@ -783,7 +783,7 @@ config TIVA_I2C_HIGHSPEED
 config TIVA_I2C_REGDEBUG
 	bool "Register level debug"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	---help---
 		Enables extremely detailed register access debug output.
 
@@ -840,7 +840,7 @@ endif # TIVA_TIMER_16BIT
 config TIVA_TIMER_REGDEBUG
 	bool "Register level debug"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	---help---
 		Enables extremely detailed register access debug output.
 
@@ -853,7 +853,7 @@ menu "ADC Configuration"
 config TIVA_ADC_REGDEBUG
 	bool "Register level debug"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	---help---
 		Enables extremely detailed register access debug output.
 
@@ -1103,9 +1103,9 @@ config TIVA_EMAC_HWCHECKSUM
 config TIVA_ETHERNET_REGDEBUG
 	bool "Register-Level Debug"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	---help---
-		Enable very low-level register access debug.  Depends on DEBUG.
+		Enable very low-level register access debug.  Depends on CONFIG_DEBUG_FEATURES.
 
 endmenu # Tiva Ethernet Configuration
 
diff --git a/arch/arm/src/tiva/tiva_adc.h b/arch/arm/src/tiva/tiva_adc.h
index 693252ad35..7f6edd4f9d 100644
--- a/arch/arm/src/tiva/tiva_adc.h
+++ b/arch/arm/src/tiva/tiva_adc.h
@@ -52,7 +52,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_TIVA_ADC_REGDEBUG
 #endif
 
diff --git a/arch/arm/src/tiva/tiva_dumpgpio.c b/arch/arm/src/tiva/tiva_dumpgpio.c
index 89ae3a462b..c40c432920 100644
--- a/arch/arm/src/tiva/tiva_dumpgpio.c
+++ b/arch/arm/src/tiva/tiva_dumpgpio.c
@@ -136,7 +136,7 @@ static inline uint8_t tiva_gpioport(int port)
 
 int tiva_dumpgpio(uint32_t pinset, const char *msg)
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   irqstate_t   flags;
   unsigned int port = (pinset & GPIO_PORT_MASK) >> GPIO_PORT_SHIFT;
   uintptr_t    base;
@@ -191,7 +191,7 @@ int tiva_dumpgpio(uint32_t pinset, const char *msg)
     }
 
   leave_critical_section(flags);
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_FEATURES */
 
   return OK;
 }
diff --git a/arch/arm/src/tiva/tiva_gpio.h b/arch/arm/src/tiva/tiva_gpio.h
index 94a90937ff..86fda2d4f2 100644
--- a/arch/arm/src/tiva/tiva_gpio.h
+++ b/arch/arm/src/tiva/tiva_gpio.h
@@ -321,7 +321,7 @@
 
 /* Debug ********************************************************************/
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_GPIO
 #endif
 
diff --git a/arch/arm/src/tiva/tiva_i2c.c b/arch/arm/src/tiva/tiva_i2c.c
index bf19f58248..2977263607 100644
--- a/arch/arm/src/tiva/tiva_i2c.c
+++ b/arch/arm/src/tiva/tiva_i2c.c
@@ -119,7 +119,7 @@
 #define MKI2C_OUTPUT(p) (((p) & (GPIO_PORT_MASK | GPIO_PIN_MASK)) | I2C_OUTPUT)
 
 /* Debug ****************************************************************************/
-/* CONFIG_DEBUG_I2C + CONFIG_DEBUG enables general I2C debug output. */
+/* CONFIG_DEBUG_I2C + CONFIG_DEBUG_FEATURES enables general I2C debug output. */
 
 #ifdef CONFIG_DEBUG_I2C
 #  define i2cdbg dbg
@@ -129,7 +129,7 @@
 #  define i2cinfo(x...)
 #endif
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_TIVA_I2C_REGDEBUG
 #endif
 
diff --git a/arch/arm/src/tiva/tiva_irq.c b/arch/arm/src/tiva/tiva_irq.c
index 67f8f18060..b934efdf05 100644
--- a/arch/arm/src/tiva/tiva_irq.c
+++ b/arch/arm/src/tiva/tiva_irq.c
@@ -195,7 +195,7 @@ static void tiva_dumpnvic(const char *msg, int irq)
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 static int tiva_nmi(int irq, FAR void *context)
 {
   (void)up_irq_save();
@@ -474,7 +474,7 @@ void up_irqinitialize(void)
 
   /* Attach all other processor exceptions (except reset and sys tick) */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   irq_attach(TIVA_IRQ_NMI, tiva_nmi);
 #ifndef CONFIG_ARM_MPU
   irq_attach(TIVA_IRQ_MEMFAULT, up_memfault);
diff --git a/arch/arm/src/tiva/tiva_ssi.c b/arch/arm/src/tiva/tiva_ssi.c
index b4147b1567..a70b06198c 100644
--- a/arch/arm/src/tiva/tiva_ssi.c
+++ b/arch/arm/src/tiva/tiva_ssi.c
@@ -66,7 +66,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES with
  * CONFIG_DEBUG_INFO too)
  */
 
@@ -719,7 +719,7 @@ static int ssi_performtx(struct tiva_ssidev_s *priv)
            * when the Tx FIFO is 1/2 full or less.
            */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
           regval |= (SSI_IM_TX | SSI_RIS_ROR);
 #else
           regval |= SSI_IM_TX;
@@ -792,7 +792,7 @@ static inline void ssi_performrx(struct tiva_ssidev_s *priv)
        * interrupt, probably an Rx timeout).
        */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       regval |= (SSI_IM_RX | SSI_IM_RT | SSI_IM_ROR);
 #else
       regval |= (SSI_IM_RX | SSI_IM_RT);
diff --git a/arch/arm/src/tiva/tiva_start.c b/arch/arm/src/tiva/tiva_start.c
index 6ecc46223e..db2abcc5ec 100644
--- a/arch/arm/src/tiva/tiva_start.c
+++ b/arch/arm/src/tiva/tiva_start.c
@@ -78,7 +78,7 @@
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 #  define showprogress(c) up_lowputc(c)
 #else
 #  define showprogress(c)
diff --git a/arch/arm/src/tiva/tm4c_ethernet.c b/arch/arm/src/tiva/tm4c_ethernet.c
index 5a77fc5c4b..395949471f 100644
--- a/arch/arm/src/tiva/tm4c_ethernet.c
+++ b/arch/arm/src/tiva/tm4c_ethernet.c
@@ -247,7 +247,7 @@
  * enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_TIVA_ETHERNET_REGDEBUG
 #endif
 
@@ -667,7 +667,7 @@ static struct tiva_ethmac_s g_tiva_ethmac[TIVA_NETHCONTROLLERS];
  ****************************************************************************/
 /* Register operations ******************************************************/
 
-#if defined(CONFIG_TIVA_ETHERNET_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_TIVA_ETHERNET_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t tiva_getreg(uint32_t addr);
 static void tiva_putreg(uint32_t val, uint32_t addr);
 static void tiva_checksetup(void);
@@ -787,7 +787,7 @@ static int  tive_emac_configure(FAR struct tiva_ethmac_s *priv);
  *
  ****************************************************************************/
 
-#if defined(CONFIG_TIVA_ETHERNET_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_TIVA_ETHERNET_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t tiva_getreg(uint32_t addr)
 {
   static uint32_t prevaddr = 0;
@@ -859,7 +859,7 @@ static uint32_t tiva_getreg(uint32_t addr)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_TIVA_ETHERNET_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_TIVA_ETHERNET_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static void tiva_putreg(uint32_t val, uint32_t addr)
 {
   /* Show the register value being written */
@@ -886,7 +886,7 @@ static void tiva_putreg(uint32_t val, uint32_t addr)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_TIVA_ETHERNET_REGDEBUG) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_TIVA_ETHERNET_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static void tiva_checksetup(void)
 {
 }
diff --git a/arch/arm/src/tms570/tms570_boot.c b/arch/arm/src/tms570/tms570_boot.c
index 66c92862f5..653825cce4 100644
--- a/arch/arm/src/tms570/tms570_boot.c
+++ b/arch/arm/src/tms570/tms570_boot.c
@@ -122,7 +122,7 @@ static inline void tms570_event_export(void)
 
 static inline void tms570_check_reset(void)
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   uint32_t regval;
 
   /* Read from the system exception status register to identify the cause of
diff --git a/arch/avr/src/at90usb/at90usb_usbdev.c b/arch/avr/src/at90usb/at90usb_usbdev.c
index 98a8d2cd2f..63b7fe95cd 100644
--- a/arch/avr/src/at90usb/at90usb_usbdev.c
+++ b/arch/avr/src/at90usb/at90usb_usbdev.c
@@ -2247,7 +2247,7 @@ static int avr_epdisable(FAR struct usbdev_ep_s *ep)
   FAR struct avr_ep_s *privep = (FAR struct avr_ep_s *)ep;
   irqstate_t flags;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(AVR_TRACEERR_INVALIDPARMS), 0);
@@ -2279,7 +2279,7 @@ static FAR struct usbdev_req_s *avr_epallocreq(FAR struct usbdev_ep_s *ep)
 {
   FAR struct avr_req_s *privreq;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(AVR_TRACEERR_INVALIDPARMS), 0);
@@ -2312,7 +2312,7 @@ static void avr_epfreereq(FAR struct usbdev_ep_s *ep,
 {
   FAR struct avr_req_s *privreq = (FAR struct avr_req_s *)req;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !req)
     {
       usbtrace(TRACE_DEVERROR(AVR_TRACEERR_INVALIDPARMS), 0);
@@ -2382,7 +2382,7 @@ static int avr_epsubmit(FAR struct usbdev_ep_s *ep,
   irqstate_t flags;
   int ret = OK;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!req || !req->callback || !req->buf || !ep)
     {
       usbtrace(TRACE_DEVERROR(AVR_TRACEERR_INVALIDPARMS), 0);
@@ -2484,7 +2484,7 @@ static int avr_epcancel(FAR struct usbdev_ep_s *ep,
   FAR struct avr_ep_s *privep = (FAR struct avr_ep_s *)ep;
   irqstate_t flags;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !req)
     {
       usbtrace(TRACE_DEVERROR(AVR_TRACEERR_INVALIDPARMS), 0);
@@ -2582,7 +2582,7 @@ static FAR struct usbdev_ep_s *avr_allocep(FAR struct usbdev_s *dev,
        * requested 'logical' endpoint.
        */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       if (epno >= AVR_NENDPOINTS)
         {
           usbtrace(TRACE_DEVERROR(AVR_TRACEERR_BADEPNO), (uint16_t)epno);
@@ -2725,7 +2725,7 @@ static int avr_selfpowered(struct usbdev_s *dev, bool selfpowered)
 {
   usbtrace(TRACE_DEVSELFPOWERED, (uint16_t) selfpowered);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(AVR_TRACEERR_INVALIDPARMS), 0);
@@ -2872,7 +2872,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
 
   usbtrace(TRACE_DEVREGISTER, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!driver || !driver->ops->bind || !driver->ops->unbind ||
       !driver->ops->disconnect || !driver->ops->setup)
     {
@@ -2927,7 +2927,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
 {
   usbtrace(TRACE_DEVUNREGISTER, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (driver != g_usbdev.driver)
     {
       usbtrace(TRACE_DEVERROR(AVR_TRACEERR_INVALIDPARMS), 0);
diff --git a/arch/avr/src/avr/up_createstack.c b/arch/avr/src/avr/up_createstack.c
index c2dda4d271..6d6dce9d47 100644
--- a/arch/avr/src/avr/up_createstack.c
+++ b/arch/avr/src/avr/up_createstack.c
@@ -122,7 +122,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
 
       tcb->stack_alloc_ptr = (uint32_t *)kumm_malloc(stack_size);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       /* Was the allocation successful? */
 
       if (!tcb->stack_alloc_ptr)
diff --git a/arch/avr/src/avr/up_dumpstate.c b/arch/avr/src/avr/up_dumpstate.c
index fe414afd8f..d529b33509 100644
--- a/arch/avr/src/avr/up_dumpstate.c
+++ b/arch/avr/src/avr/up_dumpstate.c
@@ -41,9 +41,9 @@
 
 /* Output debug info -- even if debug is not selected. */
 
-#undef  CONFIG_DEBUG
+#undef  CONFIG_DEBUG_FEATURES
 #undef  CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG 1
+#define CONFIG_DEBUG_FEATURES 1
 #define CONFIG_DEBUG_INFO 1
 
 #include 
diff --git a/arch/avr/src/avr/up_spi.c b/arch/avr/src/avr/up_spi.c
index 0e78443012..f04fe9844c 100644
--- a/arch/avr/src/avr/up_spi.c
+++ b/arch/avr/src/avr/up_spi.c
@@ -66,7 +66,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SPI_DEBUG     /* Define to enable debug */
 #undef SPI_VERBOSE   /* Define to enable verbose debug */
diff --git a/arch/avr/src/avr32/up_createstack.c b/arch/avr/src/avr32/up_createstack.c
index db76abc38d..59c470383f 100644
--- a/arch/avr/src/avr32/up_createstack.c
+++ b/arch/avr/src/avr32/up_createstack.c
@@ -140,7 +140,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
           tcb->stack_alloc_ptr = (uint32_t *)kumm_malloc(stack_size);
         }
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       /* Was the allocation successful? */
 
       if (!tcb->stack_alloc_ptr)
diff --git a/arch/avr/src/avr32/up_dumpstate.c b/arch/avr/src/avr32/up_dumpstate.c
index 37a5f25f55..a57893c831 100644
--- a/arch/avr/src/avr32/up_dumpstate.c
+++ b/arch/avr/src/avr32/up_dumpstate.c
@@ -41,9 +41,9 @@
 
 /* Output debug info -- even if debug is not selected. */
 
-#undef  CONFIG_DEBUG
+#undef  CONFIG_DEBUG_FEATURES
 #undef  CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG 1
+#define CONFIG_DEBUG_FEATURES 1
 #define CONFIG_DEBUG_INFO 1
 
 #include 
diff --git a/arch/avr/src/avr32/up_initialstate.c b/arch/avr/src/avr32/up_initialstate.c
index 821637423a..641d6278bd 100644
--- a/arch/avr/src/avr32/up_initialstate.c
+++ b/arch/avr/src/avr32/up_initialstate.c
@@ -85,7 +85,7 @@ void up_initial_state(struct tcb_s *tcb)
    * all registers is a good debug helper, but should not be necessary.
    */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   memset(xcp, 0, sizeof(struct xcptcontext));
 #else
   /* No pending signal delivery */
diff --git a/arch/avr/src/common/up_assert.c b/arch/avr/src/common/up_assert.c
index d6f71f6e5c..44be077339 100644
--- a/arch/avr/src/common/up_assert.c
+++ b/arch/avr/src/common/up_assert.c
@@ -44,9 +44,9 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG
+# undef  CONFIG_DEBUG_FEATURES
 # undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
 # define CONFIG_DEBUG_INFO 1
 #endif
 
@@ -79,12 +79,12 @@
  * code.  We are going to print the task name if:
  *
  *  CONFIG_TASK_NAME_SIZE > 0 &&     <-- The task has a name
- *  (defined(CONFIG_DEBUG)    ||     <-- And the debug is enabled (lldbg used)
+ *  (defined(CONFIG_DEBUG_FEATURES)    ||     <-- And the debug is enabled (lldbg used)
  *   defined(CONFIG_ARCH_STACKDUMP)) <-- Or lowsyslog() is used
  */
 
 #undef CONFIG_PRINT_TASKNAME
-#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG) || defined(CONFIG_ARCH_STACKDUMP))
+#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG_FEATURES) || defined(CONFIG_ARCH_STACKDUMP))
 #  define CONFIG_PRINT_TASKNAME 1
 #endif
 
diff --git a/arch/avr/src/common/up_exit.c b/arch/avr/src/common/up_exit.c
index 936a79d233..521aa25945 100644
--- a/arch/avr/src/common/up_exit.c
+++ b/arch/avr/src/common/up_exit.c
@@ -66,7 +66,7 @@
  *
  ****************************************************************************/
 
-#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
 static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
 {
 #if CONFIG_NFILE_DESCRIPTORS > 0
@@ -140,7 +140,7 @@ void _exit(int status)
 
   slldbg("TCB=%p exiting\n", this_task());
 
-#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
   slldbg("Other tasks:\n");
   sched_foreach(_up_dumponexit, NULL);
 #endif
diff --git a/arch/avr/src/common/up_initialize.c b/arch/avr/src/common/up_initialize.c
index 5c36cd0814..9677304647 100644
--- a/arch/avr/src/common/up_initialize.c
+++ b/arch/avr/src/common/up_initialize.c
@@ -120,7 +120,7 @@
  *
  ****************************************************************************/
 
-#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG_FEATURES)
 static void up_calibratedelay(void)
 {
   int i;
diff --git a/arch/hc/src/common/up_createstack.c b/arch/hc/src/common/up_createstack.c
index 9afb471e47..9ae87865d0 100644
--- a/arch/hc/src/common/up_createstack.c
+++ b/arch/hc/src/common/up_createstack.c
@@ -137,7 +137,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
           tcb->stack_alloc_ptr = (uint32_t *)kumm_malloc(stack_size);
         }
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       /* Was the allocation successful? */
 
       if (!tcb->stack_alloc_ptr)
diff --git a/arch/hc/src/common/up_exit.c b/arch/hc/src/common/up_exit.c
index f80a4c3b0e..f20932ba61 100644
--- a/arch/hc/src/common/up_exit.c
+++ b/arch/hc/src/common/up_exit.c
@@ -74,7 +74,7 @@
  *
  ****************************************************************************/
 
-#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
 static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
 {
 #if CONFIG_NFILE_DESCRIPTORS > 0
@@ -148,7 +148,7 @@ void _exit(int status)
 
   slldbg("TCB=%p exiting\n", this_task());
 
-#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
   slldbg("Other tasks:\n");
   sched_foreach(_up_dumponexit, NULL);
 #endif
diff --git a/arch/hc/src/common/up_initialize.c b/arch/hc/src/common/up_initialize.c
index 30daa39ea2..e6728f0ea8 100644
--- a/arch/hc/src/common/up_initialize.c
+++ b/arch/hc/src/common/up_initialize.c
@@ -69,7 +69,7 @@
  *
  ****************************************************************************/
 
-#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG_FEATURES)
 static void up_calibratedelay(void)
 {
   int i;
diff --git a/arch/hc/src/m9s12/m9s12_assert.c b/arch/hc/src/m9s12/m9s12_assert.c
index 4911c81145..0241009fc6 100644
--- a/arch/hc/src/m9s12/m9s12_assert.c
+++ b/arch/hc/src/m9s12/m9s12_assert.c
@@ -44,9 +44,9 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG
+# undef  CONFIG_DEBUG_FEATURES
 # undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
 # define CONFIG_DEBUG_INFO 1
 #endif
 
@@ -79,12 +79,12 @@
  * code.  We are going to print the task name if:
  *
  *  CONFIG_TASK_NAME_SIZE > 0 &&    <-- The task has a name
- *  (defined(CONFIG_DEBUG)    ||    <-- And the debug is enabled (lldbg used)
+ *  (defined(CONFIG_DEBUG_FEATURES)    ||    <-- And the debug is enabled (lldbg used)
  *   defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used
  */
 
 #undef CONFIG_PRINT_TASKNAME
-#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG) || defined(CONFIG_ARCH_STACKDUMP))
+#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG_FEATURES) || defined(CONFIG_ARCH_STACKDUMP))
 #  define CONFIG_PRINT_TASKNAME 1
 #endif
 
diff --git a/arch/hc/src/m9s12/m9s12_gpio.c b/arch/hc/src/m9s12/m9s12_gpio.c
index 7d43f0a3d8..0004bdf5de 100644
--- a/arch/hc/src/m9s12/m9s12_gpio.c
+++ b/arch/hc/src/m9s12/m9s12_gpio.c
@@ -304,7 +304,7 @@ static inline void pim_configgpio(uint16_t cfgset, uint8_t portndx, uint8_t pin)
 
   DEBUGASSERT(portndx < HCS12_PIM_NPORTS);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if ((cfgset & GPIO_INT_ENABLE) != 0)
     {
       /* Yes.. then it must not be tagged as an output */
diff --git a/arch/hc/src/m9s12/m9s12_start.S b/arch/hc/src/m9s12/m9s12_start.S
index 49d31b4e1d..3747967f5b 100644
--- a/arch/hc/src/m9s12/m9s12_start.S
+++ b/arch/hc/src/m9s12/m9s12_start.S
@@ -82,7 +82,7 @@
  */
 
 	.macro	showprogress, code
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 	ldab	\code
 #ifdef CONFIG_HCS12_SERIALMON
 	jsr		#PutChar
diff --git a/arch/mips/src/common/up_createstack.c b/arch/mips/src/common/up_createstack.c
index 5540b8bc4f..e4f9520b3b 100644
--- a/arch/mips/src/common/up_createstack.c
+++ b/arch/mips/src/common/up_createstack.c
@@ -158,7 +158,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
           tcb->stack_alloc_ptr = (uint32_t *)kumm_malloc(stack_size);
         }
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       /* Was the allocation successful? */
 
       if (!tcb->stack_alloc_ptr)
diff --git a/arch/mips/src/common/up_exit.c b/arch/mips/src/common/up_exit.c
index 36a1d2b170..5f167488cc 100644
--- a/arch/mips/src/common/up_exit.c
+++ b/arch/mips/src/common/up_exit.c
@@ -76,7 +76,7 @@
  *
  ****************************************************************************/
 
-#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
 static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
 {
 #if CONFIG_NFILE_DESCRIPTORS > 0
@@ -150,7 +150,7 @@ void _exit(int status)
 
   slldbg("TCB=%p exiting\n", this_task());
 
-#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
   slldbg("Other tasks:\n");
   sched_foreach(_up_dumponexit, NULL);
 #endif
diff --git a/arch/mips/src/common/up_initialize.c b/arch/mips/src/common/up_initialize.c
index b7df229f2f..e9ebdbbf98 100644
--- a/arch/mips/src/common/up_initialize.c
+++ b/arch/mips/src/common/up_initialize.c
@@ -71,7 +71,7 @@
  *
  ****************************************************************************/
 
-#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG_FEATURES)
 static void up_calibratedelay(void)
 {
   int i;
diff --git a/arch/mips/src/mips32/up_assert.c b/arch/mips/src/mips32/up_assert.c
index 4332d3d8c2..c10048a4cf 100644
--- a/arch/mips/src/mips32/up_assert.c
+++ b/arch/mips/src/mips32/up_assert.c
@@ -44,9 +44,9 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG
+# undef  CONFIG_DEBUG_FEATURES
 # undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
 # define CONFIG_DEBUG_INFO 1
 #endif
 
@@ -79,12 +79,12 @@
  * code.  We are going to print the task name if:
  *
  *  CONFIG_TASK_NAME_SIZE > 0 &&    <-- The task has a name
- *  (defined(CONFIG_DEBUG)    ||    <-- And the debug is enabled (lldbg used)
+ *  (defined(CONFIG_DEBUG_FEATURES)    ||    <-- And the debug is enabled (lldbg used)
  *   defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used
  */
 
 #undef CONFIG_PRINT_TASKNAME
-#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG) || defined(CONFIG_ARCH_STACKDUMP))
+#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG_FEATURES) || defined(CONFIG_ARCH_STACKDUMP))
 #  define CONFIG_PRINT_TASKNAME 1
 #endif
 
diff --git a/arch/mips/src/mips32/up_dumpstate.c b/arch/mips/src/mips32/up_dumpstate.c
index 3ef9e89df6..bf507e5e4a 100644
--- a/arch/mips/src/mips32/up_dumpstate.c
+++ b/arch/mips/src/mips32/up_dumpstate.c
@@ -41,9 +41,9 @@
 
 /* Output debug info -- even if debug is not selected. */
 
-#undef  CONFIG_DEBUG
+#undef  CONFIG_DEBUG_FEATURES
 #undef  CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG 1
+#define CONFIG_DEBUG_FEATURES 1
 #define CONFIG_DEBUG_INFO 1
 
 #include 
diff --git a/arch/mips/src/mips32/up_swint0.c b/arch/mips/src/mips32/up_swint0.c
index 1d335b1792..bf394921d0 100644
--- a/arch/mips/src/mips32/up_swint0.c
+++ b/arch/mips/src/mips32/up_swint0.c
@@ -61,7 +61,7 @@
 /* Debug output from this file may interfere with context switching!  To get
  * debug output you must enabled the following in your NuttX configuration:
  *
- * CONFIG_DEBUG and CONFIG_DEBUG_SYSCALL
+ * CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_SYSCALL
  */
 
 #ifdef CONFIG_DEBUG_SYSCALL
diff --git a/arch/mips/src/pic32mx/Kconfig b/arch/mips/src/pic32mx/Kconfig
index 3da65ead35..6d24c3e355 100644
--- a/arch/mips/src/pic32mx/Kconfig
+++ b/arch/mips/src/pic32mx/Kconfig
@@ -1034,11 +1034,11 @@ config PIC32MX_SPI_ENHBUF
 
 config PIC32MX_SPI_REGDEBUG
 	bool "SPI Register level debug"
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	default n
 	---help---
 		Output detailed register-level SPI device debug information.
-		Requires also DEBUG.
+		Requires also CONFIG_DEBUG_FEATURES.
 
 endmenu # SPI Driver Configuration
 
@@ -1097,9 +1097,9 @@ config NET_WOL
 config NET_REGDEBUG
 	bool "Register level debug"
 	default n
-	depends on PIC32MX_ETHERNET && DEBUG
+	depends on PIC32MX_ETHERNET && DEBUG_FEATURES
 	---help---
-		Enabled low level register debug.  Also needs DEBUG.
+		Enabled low level register debug.  Also needs CONFIG_DEBUG_FEATURES.
 
 config NET_HASH
 	bool "Hash"
diff --git a/arch/mips/src/pic32mx/pic32mx-ethernet.c b/arch/mips/src/pic32mx/pic32mx-ethernet.c
index a5c7e48390..9004af4be5 100644
--- a/arch/mips/src/pic32mx/pic32mx-ethernet.c
+++ b/arch/mips/src/pic32mx/pic32mx-ethernet.c
@@ -141,11 +141,11 @@
 #define PIC32MX_NBUFFERS (CONFIG_NET_NRXDESC + CONFIG_NET_NTXDESC + 1)
 
 /* Debug Configuration *****************************************************/
-/* Register/Descriptor debug -- can only happen of CONFIG_DEBUG is selected.
+/* Register/Descriptor debug -- can only happen of CONFIG_DEBUG_FEATURES is selected.
  * This will probably generate much more output than you care to see.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_NET_REGDEBUG
 #  undef CONFIG_NET_DESCDEBUG
 #endif
@@ -154,7 +154,7 @@
  * console.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef  CONFIG_NET_DUMPPACKET
 #endif
 
diff --git a/arch/mips/src/pic32mx/pic32mx-exception.c b/arch/mips/src/pic32mx/pic32mx-exception.c
index 71b76180cb..756ebbe80d 100644
--- a/arch/mips/src/pic32mx/pic32mx-exception.c
+++ b/arch/mips/src/pic32mx/pic32mx-exception.c
@@ -85,7 +85,7 @@
 
 uint32_t *pic32mx_exception(uint32_t *regs)
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   uint32_t cause;
   uint32_t epc;
 #endif
@@ -96,7 +96,7 @@ uint32_t *pic32mx_exception(uint32_t *regs)
 
   board_autoled_on(LED_INIRQ);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   /* Get the cause of the exception from the CAUSE register */
 
   asm volatile("\tmfc0 %0,$13,0\n" : "=r"(cause));
diff --git a/arch/mips/src/pic32mx/pic32mx-gpio.c b/arch/mips/src/pic32mx/pic32mx-gpio.c
index e07a44fc3d..928ce85d9f 100644
--- a/arch/mips/src/pic32mx/pic32mx-gpio.c
+++ b/arch/mips/src/pic32mx/pic32mx-gpio.c
@@ -303,7 +303,7 @@ bool pic32mx_gpioread(uint16_t pinset)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_GPIO)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_GPIO)
 void pic32mx_dumpgpio(uint32_t pinset, const char *msg)
 {
   unsigned int port = pic32mx_portno(pinset);
diff --git a/arch/mips/src/pic32mx/pic32mx-serial.c b/arch/mips/src/pic32mx/pic32mx-serial.c
index 590c5998a1..f36679aaa5 100644
--- a/arch/mips/src/pic32mx/pic32mx-serial.c
+++ b/arch/mips/src/pic32mx/pic32mx-serial.c
@@ -494,7 +494,7 @@ static int up_interrupt(int irq, void *context)
        *  - Overflow condition for the receive buffer OERR (UxSTA bit 1) occurs
        */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       if (up_pending_irq(priv->irqe))
         {
            /* Clear the pending error interrupt */
@@ -700,7 +700,7 @@ static void up_rxint(struct uart_dev_s *dev, bool enable)
        */
 
 #ifndef CONFIG_SUPPRESS_SERIAL_INTS
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       up_enable_irq(priv->irqe);
 #endif
       up_enable_irq(priv->irqrx);
@@ -709,7 +709,7 @@ static void up_rxint(struct uart_dev_s *dev, bool enable)
     }
   else
     {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       up_disable_irq(priv->irqe);
 #endif
       up_disable_irq(priv->irqrx);
diff --git a/arch/mips/src/pic32mx/pic32mx-usbdev.c b/arch/mips/src/pic32mx/pic32mx-usbdev.c
index 0cf450fd01..613e7eccfa 100644
--- a/arch/mips/src/pic32mx/pic32mx-usbdev.c
+++ b/arch/mips/src/pic32mx/pic32mx-usbdev.c
@@ -83,7 +83,7 @@
  * enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_PIC32MX_USBDEV_REGDEBUG
 #  undef CONFIG_PIC32MX_USBDEV_BDTDEBUG
 #endif
@@ -3148,7 +3148,7 @@ static int pic32mx_epconfigure(struct usbdev_ep_s *ep,
   bool     bidi;
   int      index;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !desc)
     {
       usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_INVALIDPARMS), 0);
@@ -3275,7 +3275,7 @@ static int pic32mx_epdisable(struct usbdev_ep_s *ep)
   int i;
   irqstate_t flags;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_INVALIDPARMS), 0);
@@ -3319,7 +3319,7 @@ static struct usbdev_req_s *pic32mx_epallocreq(struct usbdev_ep_s *ep)
 {
   struct pic32mx_req_s *privreq;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_INVALIDPARMS), 0);
@@ -3347,7 +3347,7 @@ static void pic32mx_epfreereq(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
 {
   struct pic32mx_req_s *privreq = (struct pic32mx_req_s *)req;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !req)
     {
       usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_INVALIDPARMS), 0);
@@ -3372,7 +3372,7 @@ static int pic32mx_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
   uint8_t epno;
   int ret = OK;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!req || !req->callback || !req->buf || !ep)
     {
       usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_INVALIDPARMS), 0);
@@ -3384,7 +3384,7 @@ static int pic32mx_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
   usbtrace(TRACE_EPSUBMIT, USB_EPNO(ep->eplog));
   priv = privep->dev;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!priv->driver)
     {
       usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_NOTCONFIGURED), priv->usbdev.speed);
@@ -3459,7 +3459,7 @@ static int pic32mx_epcancel(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
   struct pic32mx_ep_s *privep = (struct pic32mx_ep_s *)ep;
   irqstate_t flags;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !req)
     {
       usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_INVALIDPARMS), 0);
@@ -3646,7 +3646,7 @@ static int pic32mx_epstall(struct usbdev_ep_s *ep, bool resume)
   irqstate_t flags;
   int ret;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_INVALIDPARMS), 0);
@@ -3707,7 +3707,7 @@ static struct usbdev_ep_s *pic32mx_allocep(struct usbdev_s *dev, uint8_t epno,
   uint16_t epset = PIC32MX_ENDP_ALLSET;
 
   usbtrace(TRACE_DEVALLOCEP, (uint16_t)epno);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_INVALIDPARMS), 0);
@@ -3765,7 +3765,7 @@ static void pic32mx_freeep(struct usbdev_s *dev, struct usbdev_ep_s *ep)
   struct pic32mx_usbdev_s *priv;
   struct pic32mx_ep_s *privep;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev || !ep)
     {
       usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_INVALIDPARMS), 0);
@@ -3797,7 +3797,7 @@ static int pic32mx_getframe(struct usbdev_s *dev)
   uint16_t frmh;
   uint16_t tmp;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_INVALIDPARMS), 0);
@@ -3838,7 +3838,7 @@ static int pic32mx_wakeup(struct usbdev_s *dev)
   struct pic32mx_usbdev_s *priv = (struct pic32mx_usbdev_s *)dev;
 
   usbtrace(TRACE_DEVWAKEUP, 0);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_INVALIDPARMS), 0);
@@ -3862,7 +3862,7 @@ static int pic32mx_selfpowered(struct usbdev_s *dev, bool selfpowered)
 
   usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_INVALIDPARMS), 0);
@@ -4373,7 +4373,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
 
   usbtrace(TRACE_DEVREGISTER, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!driver || !driver->ops->bind || !driver->ops->unbind ||
       !driver->ops->disconnect || !driver->ops->setup)
     {
@@ -4439,7 +4439,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
 
   usbtrace(TRACE_DEVUNREGISTER, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (driver != priv->driver)
     {
       usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_INVALIDPARMS), 0);
diff --git a/arch/mips/src/pic32mz/Kconfig b/arch/mips/src/pic32mz/Kconfig
index ac412b6dc5..6a66969184 100644
--- a/arch/mips/src/pic32mz/Kconfig
+++ b/arch/mips/src/pic32mz/Kconfig
@@ -332,11 +332,11 @@ config PIC32MZ_SPI_ENHBUF
 
 config PIC32MZ_SPI_REGDEBUG
 	bool "SPI Register level debug"
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	default n
 	---help---
 		Output detailed register-level SPI device debug information.
-		Requires also DEBUG.
+		Requires also CONFIG_DEBUG_FEATURES.
 
 endmenu # SPI Driver Configuration
 
@@ -400,9 +400,9 @@ config NET_WOL
 config NET_REGDEBUG
 	bool "Register level debug"
 	default n
-	depends on PIC32MZ_ETHERNET && DEBUG
+	depends on PIC32MZ_ETHERNET && DEBUG_FEATURES
 	---help---
-		Enabled low level register debug.  Also needs DEBUG.
+		Enabled low level register debug.  Also needs CONFIG_DEBUG_FEATURES.
 
 config NET_HASH
 	bool "Hash"
@@ -425,8 +425,8 @@ menu "Device Configuration 0 (DEVCFG0)"
 
 config PIC32MZ_DEBUGGER_ENABLE
 	bool "Background debugger enable"
-	default y if DEBUG
-	default n if !DEBUG
+	default y if DEBUG_FEATURES
+	default n if !DEBUG_FEATURES
 	---help---
 		Background Debugger Enable
 
@@ -444,8 +444,8 @@ config PIC32MZ_ICESEL_CH2
 
 config PIC32MZ_TRACE_ENABLE
 	bool "Trace enable"
-	default y if DEBUG
-	default n if !DEBUG
+	default y if DEBUG_FEATURES
+	default n if !DEBUG_FEATURES
 	---help---
 		Trace Enable
 
diff --git a/arch/mips/src/pic32mz/pic32mz-ethernet.c b/arch/mips/src/pic32mz/pic32mz-ethernet.c
index 4118fc7567..2d60888a37 100644
--- a/arch/mips/src/pic32mz/pic32mz-ethernet.c
+++ b/arch/mips/src/pic32mz/pic32mz-ethernet.c
@@ -141,11 +141,11 @@
 #define PIC32MZ_NBUFFERS (CONFIG_NET_NRXDESC + CONFIG_NET_NTXDESC + 1)
 
 /* Debug Configuration *****************************************************/
-/* Register/Descriptor debug -- can only happen of CONFIG_DEBUG is selected.
+/* Register/Descriptor debug -- can only happen of CONFIG_DEBUG_FEATURES is selected.
  * This will probably generate much more output than you care to see.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_NET_REGDEBUG
 #  undef CONFIG_NET_DESCDEBUG
 #endif
@@ -154,7 +154,7 @@
  * console.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef  CONFIG_NET_DUMPPACKET
 #endif
 
diff --git a/arch/mips/src/pic32mz/pic32mz-exception.c b/arch/mips/src/pic32mz/pic32mz-exception.c
index 1c1a0b8512..a370ca4c4b 100644
--- a/arch/mips/src/pic32mz/pic32mz-exception.c
+++ b/arch/mips/src/pic32mz/pic32mz-exception.c
@@ -85,7 +85,7 @@
 
 uint32_t *pic32mz_exception(uint32_t *regs)
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   uint32_t cause;
   uint32_t epc;
 #endif
@@ -96,7 +96,7 @@ uint32_t *pic32mz_exception(uint32_t *regs)
 
   board_autoled_on(LED_INIRQ);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   /* Get the cause of the exception from the CAUSE register */
 
   asm volatile("\tmfc0 %0,$13,0\n" : "=r"(cause));
diff --git a/arch/mips/src/pic32mz/pic32mz-gpio.c b/arch/mips/src/pic32mz/pic32mz-gpio.c
index ae46628585..a8707ca107 100644
--- a/arch/mips/src/pic32mz/pic32mz-gpio.c
+++ b/arch/mips/src/pic32mz/pic32mz-gpio.c
@@ -307,7 +307,7 @@ bool pic32mz_gpioread(pinset_t pinset)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_GPIO)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_GPIO)
 void pic32mz_dumpgpio(uint32_t pinset, const char *msg)
 {
   unsigned int port = pic32mz_portno(pinset);
diff --git a/arch/mips/src/pic32mz/pic32mz-serial.c b/arch/mips/src/pic32mz/pic32mz-serial.c
index 6845ff5035..0679bf95ff 100644
--- a/arch/mips/src/pic32mz/pic32mz-serial.c
+++ b/arch/mips/src/pic32mz/pic32mz-serial.c
@@ -752,7 +752,7 @@ static int  up_interrupt(struct uart_dev_s *dev)
        *  - Overflow condition for the receive buffer OERR (UxSTA bit 1) occurs
        */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       if (up_pending_irq(priv->irqe))
         {
            /* Clear the pending error interrupt */
@@ -1008,7 +1008,7 @@ static void up_rxint(struct uart_dev_s *dev, bool enable)
        */
 
 #ifndef CONFIG_SUPPRESS_SERIAL_INTS
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       up_enable_irq(priv->irqe);
 #endif
       up_enable_irq(priv->irqrx);
@@ -1017,7 +1017,7 @@ static void up_rxint(struct uart_dev_s *dev, bool enable)
     }
   else
     {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       up_disable_irq(priv->irqe);
 #endif
       up_disable_irq(priv->irqrx);
diff --git a/arch/sh/src/common/up_assert.c b/arch/sh/src/common/up_assert.c
index 2a51031c45..47879c3240 100644
--- a/arch/sh/src/common/up_assert.c
+++ b/arch/sh/src/common/up_assert.c
@@ -44,9 +44,9 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG
+# undef  CONFIG_DEBUG_FEATURES
 # undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
 # define CONFIG_DEBUG_INFO 1
 #endif
 
@@ -147,7 +147,7 @@ static int assert_tracecallback(FAR struct usbtrace_s *trace, FAR void *arg)
 
 void up_assert(const uint8_t *filename, int lineno)
 {
-#if CONFIG_TASK_NAME_SIZE > 0 && defined(CONFIG_DEBUG)
+#if CONFIG_TASK_NAME_SIZE > 0 && defined(CONFIG_DEBUG_FEATURES)
   struct tcb_s *rtcb = this_task();
 #endif
 
diff --git a/arch/sh/src/common/up_createstack.c b/arch/sh/src/common/up_createstack.c
index f52f03386e..da20268328 100644
--- a/arch/sh/src/common/up_createstack.c
+++ b/arch/sh/src/common/up_createstack.c
@@ -137,7 +137,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
           tcb->stack_alloc_ptr = (uint32_t *)kumm_malloc(stack_size);
         }
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       /* Was the allocation successful? */
 
       if (!tcb->stack_alloc_ptr)
diff --git a/arch/sh/src/common/up_exit.c b/arch/sh/src/common/up_exit.c
index 84845556e9..c2c41763c8 100644
--- a/arch/sh/src/common/up_exit.c
+++ b/arch/sh/src/common/up_exit.c
@@ -75,7 +75,7 @@
  *
  ****************************************************************************/
 
-#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
 static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
 {
 #if CONFIG_NFILE_DESCRIPTORS > 0
@@ -149,7 +149,7 @@ void _exit(int status)
 
   slldbg("TCB=%p exiting\n", this_task());
 
-#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
   slldbg("Other tasks:\n");
   sched_foreach(_up_dumponexit, NULL);
 #endif
diff --git a/arch/sh/src/common/up_initialize.c b/arch/sh/src/common/up_initialize.c
index 98c6bf273d..579b15fe7f 100644
--- a/arch/sh/src/common/up_initialize.c
+++ b/arch/sh/src/common/up_initialize.c
@@ -77,7 +77,7 @@
  *
  ****************************************************************************/
 
-#if defined(CONFIG_ARCH_CALIBRATION) & defined(CONFIG_DEBUG)
+#if defined(CONFIG_ARCH_CALIBRATION) & defined(CONFIG_DEBUG_FEATURES)
 static void up_calibratedelay(void)
 {
   int i;
diff --git a/arch/sh/src/m16c/m16c_dumpstate.c b/arch/sh/src/m16c/m16c_dumpstate.c
index 640564d094..4e29d7127c 100644
--- a/arch/sh/src/m16c/m16c_dumpstate.c
+++ b/arch/sh/src/m16c/m16c_dumpstate.c
@@ -41,9 +41,9 @@
 
 /* Output debug info -- even if debug is not selected. */
 
-#undef  CONFIG_DEBUG
+#undef  CONFIG_DEBUG_FEATURES
 #undef  CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG 1
+#define CONFIG_DEBUG_FEATURES 1
 #define CONFIG_DEBUG_INFO 1
 
 #include 
diff --git a/arch/sh/src/m16c/m16c_head.S b/arch/sh/src/m16c/m16c_head.S
index f18da3fe3f..711ce26aaa 100644
--- a/arch/sh/src/m16c/m16c_head.S
+++ b/arch/sh/src/m16c/m16c_head.S
@@ -58,7 +58,7 @@
  *****************************************************************************/
 
 	.macro	showprogress, code
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 	.globl	_up_lowputc
 	mov.b	r#\code1l					/* Character to print */
 	jsr.a	_up_lowputc					/* Print it */
diff --git a/arch/sh/src/sh1/sh1_dumpstate.c b/arch/sh/src/sh1/sh1_dumpstate.c
index 289745aaf0..ed5edee427 100644
--- a/arch/sh/src/sh1/sh1_dumpstate.c
+++ b/arch/sh/src/sh1/sh1_dumpstate.c
@@ -41,9 +41,9 @@
 
 /* Output debug info -- even if debug is not selected. */
 
-#undef  CONFIG_DEBUG
+#undef  CONFIG_DEBUG_FEATURES
 #undef  CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG 1
+#define CONFIG_DEBUG_FEATURES 1
 #define CONFIG_DEBUG_INFO 1
 
 #include 
diff --git a/arch/sh/src/sh1/sh1_head.S b/arch/sh/src/sh1/sh1_head.S
index 9bb4efb1f5..e46522da88 100644
--- a/arch/sh/src/sh1/sh1_head.S
+++ b/arch/sh/src/sh1/sh1_head.S
@@ -67,7 +67,7 @@
 #ifdef CONFIG_ARCH_LEDS
 	.globl	_board_autoled_initialize	/* Boot LED setup */
 #endif
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 	.globl	_up_lowputc					/* Low-level debug output */
 #endif
 	.globl	_os_start					/* NuttX entry point */
@@ -161,7 +161,7 @@
  *****************************************************************************/
 
 	.macro	showprogress, code
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 	mov.l	.Llowputc, r0				/* Address of up_earlyconsoleinit */
 	jsr		@r0							/* Call it */
 	mov		#\code, r4					/* Delay slot */
@@ -488,7 +488,7 @@ __start0:
 #endif
 .Llowsetup:
 	.long	_up_lowsetup
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 .Llowputc:
 	.long	_up_lowputc
 #endif
diff --git a/arch/sh/src/sh1/sh1_irq.c b/arch/sh/src/sh1/sh1_irq.c
index 58514a2574..3a0651efd4 100644
--- a/arch/sh/src/sh1/sh1_irq.c
+++ b/arch/sh/src/sh1/sh1_irq.c
@@ -92,7 +92,7 @@ void up_prioritize_irq(int irq, int priority)
   uint32_t reg;
   int      shift;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if ((unsigned) irq > NR_IRQS || (unsigned)priority > 15)
     {
       dbg("Invalid parameters\n");
diff --git a/arch/sim/src/board_lcd.c b/arch/sim/src/board_lcd.c
index d3dc5a54b1..592c4a7cb2 100644
--- a/arch/sim/src/board_lcd.c
+++ b/arch/sim/src/board_lcd.c
@@ -105,7 +105,7 @@
  * also be enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_GRAPHICS
 #  undef CONFIG_DEBUG_LCD
diff --git a/arch/sim/src/up_spiflash.c b/arch/sim/src/up_spiflash.c
index 517081af9d..4bab7d5fd0 100644
--- a/arch/sim/src/up_spiflash.c
+++ b/arch/sim/src/up_spiflash.c
@@ -63,7 +63,7 @@
 /* Debug ****************************************************************************/
 /* Check if (non-standard) SPI debug is enabled */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_SPI
 #endif
diff --git a/arch/x86/src/common/up_assert.c b/arch/x86/src/common/up_assert.c
index 4a577053f2..5039955757 100644
--- a/arch/x86/src/common/up_assert.c
+++ b/arch/x86/src/common/up_assert.c
@@ -44,9 +44,9 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG
+# undef  CONFIG_DEBUG_FEATURES
 # undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
 # define CONFIG_DEBUG_INFO 1
 #endif
 
@@ -80,12 +80,12 @@
  * code.  We are going to print the task name if:
  *
  *  CONFIG_TASK_NAME_SIZE > 0 &&    <-- The task has a name
- *  (defined(CONFIG_DEBUG)    ||    <-- And the debug is enabled (lldbg used)
+ *  (defined(CONFIG_DEBUG_FEATURES)    ||    <-- And the debug is enabled (lldbg used)
  *   defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used
  */
 
 #undef CONFIG_PRINT_TASKNAME
-#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG) || defined(CONFIG_ARCH_STACKDUMP))
+#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG_FEATURES) || defined(CONFIG_ARCH_STACKDUMP))
 #  define CONFIG_PRINT_TASKNAME 1
 #endif
 
diff --git a/arch/x86/src/common/up_exit.c b/arch/x86/src/common/up_exit.c
index 12779df024..a776bd5b1b 100644
--- a/arch/x86/src/common/up_exit.c
+++ b/arch/x86/src/common/up_exit.c
@@ -74,7 +74,7 @@
  *
  ****************************************************************************/
 
-#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
 static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
 {
 #if CONFIG_NFILE_DESCRIPTORS > 0
@@ -148,7 +148,7 @@ void _exit(int status)
 
   slldbg("TCB=%p exiting\n", this_task());
 
-#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
   slldbg("Other tasks:\n");
   sched_foreach(_up_dumponexit, NULL);
 #endif
diff --git a/arch/x86/src/common/up_initialize.c b/arch/x86/src/common/up_initialize.c
index 07697ea078..502aca2338 100644
--- a/arch/x86/src/common/up_initialize.c
+++ b/arch/x86/src/common/up_initialize.c
@@ -71,7 +71,7 @@
  *
  ****************************************************************************/
 
-#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG_FEATURES)
 static void up_calibratedelay(void)
 {
   int i;
diff --git a/arch/x86/src/i486/up_createstack.c b/arch/x86/src/i486/up_createstack.c
index 1d9b1008d0..61992d2740 100644
--- a/arch/x86/src/i486/up_createstack.c
+++ b/arch/x86/src/i486/up_createstack.c
@@ -139,7 +139,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
           tcb->stack_alloc_ptr = (uint32_t *)kumm_malloc(stack_size);
         }
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       /* Was the allocation successful? */
 
       if (!tcb->stack_alloc_ptr)
diff --git a/arch/x86/src/i486/up_regdump.c b/arch/x86/src/i486/up_regdump.c
index 69924f5141..dbf0599dda 100644
--- a/arch/x86/src/i486/up_regdump.c
+++ b/arch/x86/src/i486/up_regdump.c
@@ -41,9 +41,9 @@
 
 /* Output debug info -- even if debug is not selected. */
 
-#undef  CONFIG_DEBUG
+#undef  CONFIG_DEBUG_FEATURES
 #undef  CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG 1
+#define CONFIG_DEBUG_FEATURES 1
 #define CONFIG_DEBUG_INFO 1
 
 #include 
diff --git a/arch/x86/src/qemu/qemu_fullcontextrestore.S b/arch/x86/src/qemu/qemu_fullcontextrestore.S
index 97a208ad89..bc55160e3a 100644
--- a/arch/x86/src/qemu/qemu_fullcontextrestore.S
+++ b/arch/x86/src/qemu/qemu_fullcontextrestore.S
@@ -58,7 +58,7 @@
 /* Trace macros, use like trace 'i' to print char to serial port. */
 
 	.macro	chout, addr, ch
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 	mov		$\addr, %dx
 	mov		$\ch, %al
 	out		%al, %dx
@@ -66,7 +66,7 @@
 	.endm
 
 	.macro	trace, ch
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 	push	%eax
 	push	%edx
 	chout	0x3f8, \ch
diff --git a/arch/x86/src/qemu/qemu_head.S b/arch/x86/src/qemu/qemu_head.S
index 82b8d37a8d..2b205208b3 100644
--- a/arch/x86/src/qemu/qemu_head.S
+++ b/arch/x86/src/qemu/qemu_head.S
@@ -64,7 +64,7 @@
 /* Trace macros, use like trace 'i' to print char to serial port. */
 
 	.macro	trace, ch
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 	mov		$0x3f8, %dx
 	mov		$\ch, %al
 	out		%al, %dx
diff --git a/arch/x86/src/qemu/qemu_saveusercontext.S b/arch/x86/src/qemu/qemu_saveusercontext.S
index 5b4b78647b..0620bbf658 100644
--- a/arch/x86/src/qemu/qemu_saveusercontext.S
+++ b/arch/x86/src/qemu/qemu_saveusercontext.S
@@ -54,7 +54,7 @@
 /* Trace macros, use like trace 'i' to print char to serial port. */
 
 	.macro	chout, addr, ch
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 	mov		$\addr, %dx
 	mov		$\ch, %al
 	out		%al, %dx
@@ -62,7 +62,7 @@
 	.endm
 
 	.macro	trace, ch
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 	push	%eax
 	push	%edx
 	chout	0x3f8, \ch
diff --git a/arch/z16/src/common/up_assert.c b/arch/z16/src/common/up_assert.c
index dc06d022f6..bcefc234ae 100644
--- a/arch/z16/src/common/up_assert.c
+++ b/arch/z16/src/common/up_assert.c
@@ -44,9 +44,9 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG
+# undef  CONFIG_DEBUG_FEATURES
 # undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
 # define CONFIG_DEBUG_INFO 1
 #endif
 
diff --git a/arch/z16/src/common/up_createstack.c b/arch/z16/src/common/up_createstack.c
index c4d5537040..db9296dd1c 100644
--- a/arch/z16/src/common/up_createstack.c
+++ b/arch/z16/src/common/up_createstack.c
@@ -120,7 +120,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
 
       tcb->stack_alloc_ptr = (uint32_t *)kumm_malloc(stack_size);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       /* Was the allocation successful? */
 
       if (!tcb->stack_alloc_ptr)
diff --git a/arch/z16/src/common/up_exit.c b/arch/z16/src/common/up_exit.c
index 7c238b2499..bb98e7f357 100644
--- a/arch/z16/src/common/up_exit.c
+++ b/arch/z16/src/common/up_exit.c
@@ -67,7 +67,7 @@
  *
  ****************************************************************************/
 
-#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
 static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
 {
 #if CONFIG_NFILE_DESCRIPTORS > 0
@@ -141,7 +141,7 @@ void _exit(int status)
 
   slldbg("TCB=%p exiting\n", tcb);
 
-#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
   lldbg("Other tasks:\n");
   sched_foreach(_up_dumponexit, NULL);
 #endif
diff --git a/arch/z16/src/common/up_initialize.c b/arch/z16/src/common/up_initialize.c
index 50b287d08a..c7fc43bfbc 100644
--- a/arch/z16/src/common/up_initialize.c
+++ b/arch/z16/src/common/up_initialize.c
@@ -82,7 +82,7 @@ volatile FAR chipreg_t *g_current_regs;
  *
  ****************************************************************************/
 
-#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG_FEATURES)
 static void up_calibratedelay(void)
 {
   int i;
diff --git a/arch/z16/src/common/up_registerdump.c b/arch/z16/src/common/up_registerdump.c
index a100010c1c..76cdff2481 100644
--- a/arch/z16/src/common/up_registerdump.c
+++ b/arch/z16/src/common/up_registerdump.c
@@ -44,9 +44,9 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-#  undef  CONFIG_DEBUG
+#  undef  CONFIG_DEBUG_FEATURES
 #  undef  CONFIG_DEBUG_INFO
-#  define CONFIG_DEBUG 1
+#  define CONFIG_DEBUG_FEATURES 1
 #  define CONFIG_DEBUG_INFO 1
 #endif
 
diff --git a/arch/z16/src/common/up_stackdump.c b/arch/z16/src/common/up_stackdump.c
index b6f5c66ad2..9f95debe31 100644
--- a/arch/z16/src/common/up_stackdump.c
+++ b/arch/z16/src/common/up_stackdump.c
@@ -41,9 +41,9 @@
 
 /* Output debug info -- even if debug is not selected. */
 
-#undef  CONFIG_DEBUG
+#undef  CONFIG_DEBUG_FEATURES
 #undef  CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG 1
+#define CONFIG_DEBUG_FEATURES 1
 #define CONFIG_DEBUG_INFO 1
 
 #include 
diff --git a/arch/z16/src/z16f/Kconfig b/arch/z16/src/z16f/Kconfig
index 8861726aee..56067cae66 100644
--- a/arch/z16/src/z16f/Kconfig
+++ b/arch/z16/src/z16f/Kconfig
@@ -33,7 +33,7 @@ menu "Z16F ESPI Configuration"
 config Z16F_ESPI_REGDEBUG
 	bool "ESPI register-level debug"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 
 endmenu # Z16F ESPI Configuration
 endif # ARCH_CHIP_Z16F
diff --git a/arch/z16/src/z16f/z16f_clkinit.c b/arch/z16/src/z16f/z16f_clkinit.c
index 15371646bc..883a5d8407 100644
--- a/arch/z16/src/z16f/z16f_clkinit.c
+++ b/arch/z16/src/z16f/z16f_clkinit.c
@@ -59,7 +59,7 @@ extern _Erom unsigned long SYS_CLK_FREQ;
  * Private Functions
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 /****************************************************************************
  *  System clock initialization--DEBUG. Code Using Frequency Input from
  *  ZDS IDE.
@@ -206,7 +206,7 @@ static void z16f_sysclkinit(int clockid, uint32_t frequency)
     for (count = 0; count < 10000; count++);
 }
 
-#else /* CONFIG_DEBUG */
+#else /* CONFIG_DEBUG_FEATURES */
 /****************************************************************************
  * System Clock Initialization Recommended for Release Code
  *
@@ -247,7 +247,7 @@ static void z16f_sysclkinit(int clockid, uint32_t frequency)
        putreg8(0xe0 | 1, Z16F_OSC_CTL); /* Use the external osc/clock as system clock */
     }
 }
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_FEATURES */
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/z16/src/z16f/z16f_espi.c b/arch/z16/src/z16f/z16f_espi.c
index d20c71a756..af357444a9 100644
--- a/arch/z16/src/z16f/z16f_espi.c
+++ b/arch/z16/src/z16f/z16f_espi.c
@@ -63,7 +63,7 @@
  * include/debug.h
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_SPI
 #  undef CONFIG_Z16F_ESPI_REGDEBUG
diff --git a/arch/z80/src/common/up_assert.c b/arch/z80/src/common/up_assert.c
index 222d718070..a7b4733934 100644
--- a/arch/z80/src/common/up_assert.c
+++ b/arch/z80/src/common/up_assert.c
@@ -44,9 +44,9 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG
+# undef  CONFIG_DEBUG_FEATURES
 # undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG 1
+# define CONFIG_DEBUG_FEATURES 1
 # define CONFIG_DEBUG_INFO 1
 #endif
 
diff --git a/arch/z80/src/common/up_createstack.c b/arch/z80/src/common/up_createstack.c
index 60c4733d99..b38a0b9a61 100644
--- a/arch/z80/src/common/up_createstack.c
+++ b/arch/z80/src/common/up_createstack.c
@@ -137,7 +137,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
           tcb->stack_alloc_ptr = (uint32_t *)kumm_malloc(stack_size);
         }
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       /* Was the allocation successful? */
 
       if (!tcb->stack_alloc_ptr)
diff --git a/arch/z80/src/common/up_exit.c b/arch/z80/src/common/up_exit.c
index 82f647c18c..45efedd881 100644
--- a/arch/z80/src/common/up_exit.c
+++ b/arch/z80/src/common/up_exit.c
@@ -77,7 +77,7 @@
  *
  ****************************************************************************/
 
-#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
 static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
 {
 #if CONFIG_NFILE_DESCRIPTORS > 0
@@ -151,7 +151,7 @@ void _exit(int status)
 
   slldbg("TCB=%p exiting\n", tcb);
 
-#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
   lldbg("Other tasks:\n");
   sched_foreach(_up_dumponexit, NULL);
 #endif
diff --git a/arch/z80/src/common/up_initialize.c b/arch/z80/src/common/up_initialize.c
index 218a782326..17a1c037a9 100644
--- a/arch/z80/src/common/up_initialize.c
+++ b/arch/z80/src/common/up_initialize.c
@@ -70,7 +70,7 @@
  *
  ****************************************************************************/
 
-#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG_FEATURES)
 static void up_calibratedelay(void)
 {
   int i;
diff --git a/arch/z80/src/common/up_stackdump.c b/arch/z80/src/common/up_stackdump.c
index 1de5a0b004..b9a1bf1508 100644
--- a/arch/z80/src/common/up_stackdump.c
+++ b/arch/z80/src/common/up_stackdump.c
@@ -41,9 +41,9 @@
 
 /* Output debug info -- even if debug is not selected. */
 
-#undef  CONFIG_DEBUG
+#undef  CONFIG_DEBUG_FEATURES
 #undef  CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG 1
+#define CONFIG_DEBUG_FEATURES 1
 #define CONFIG_DEBUG_INFO 1
 
 #include 
diff --git a/arch/z80/src/ez80/ez80_emac.c b/arch/z80/src/ez80/ez80_emac.c
index 364ebfa95e..308f8231b2 100644
--- a/arch/z80/src/ez80/ez80_emac.c
+++ b/arch/z80/src/ez80/ez80_emac.c
@@ -244,7 +244,7 @@
 
 /* EMAC statistics (debug only) */
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_NET)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_NET)
 struct ez80mac_statistics_s
 {
   uint32_t rx_int;         /* Number of Rx interrupts received */
@@ -321,7 +321,7 @@ struct ez80emac_driver_s
   WDOG_ID txpoll;           /* TX poll timer */
   WDOG_ID txtimeout;        /* TX timeout timer */
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_NET)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_NET)
   struct ez80mac_statistics_s stat;
 #endif
 
@@ -574,7 +574,7 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
 
   /* Verify that the detect PHY is an AMD Am87c874 as expected */
 
-#ifdef CONFIG_DEBUG /* Parameter checking only done when DEBUG is enabled */
+#ifdef CONFIG_DEBUG_FEATURES /* Parameter checking only done when DEBUG is enabled */
   phyval = ez80emac_miiread(priv, MII_PHYID1);
   if (phyval != MII_PHYID1_AM79C874)
     {
diff --git a/arch/z80/src/ez80/ez80_i2c.c b/arch/z80/src/ez80/ez80_i2c.c
index f1c8a2bcd1..d9bec997c2 100644
--- a/arch/z80/src/ez80/ez80_i2c.c
+++ b/arch/z80/src/ez80/ez80_i2c.c
@@ -399,7 +399,7 @@ static int ez80_i2c_sendaddr(struct ez80_i2cdev_s *priv, uint8_t readbit)
    */
 
   sr = ez80_i2c_waitiflg();
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (sr != I2C_SR_MSTART)
     {
       /* This error should never occur */
@@ -469,7 +469,7 @@ static int ez80_i2c_sendaddr(struct ez80_i2cdev_s *priv, uint8_t readbit)
   /* We don't attempt any fancy status-based error recovery */
 
 failure:
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   switch (sr)
     {
       case I2C_SR_ARBLOST1: /* Arbitration lost in address or data byte */
diff --git a/arch/z80/src/ez80/ez80_registerdump.c b/arch/z80/src/ez80/ez80_registerdump.c
index f5bbf0dedc..c6025165d3 100644
--- a/arch/z80/src/ez80/ez80_registerdump.c
+++ b/arch/z80/src/ez80/ez80_registerdump.c
@@ -41,9 +41,9 @@
 
 /* Output debug info -- even if debug is not selected. */
 
-#undef  CONFIG_DEBUG
+#undef  CONFIG_DEBUG_FEATURES
 #undef  CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG 1
+#define CONFIG_DEBUG_FEATURES 1
 #define CONFIG_DEBUG_INFO 1
 
 #include 
diff --git a/arch/z80/src/ez80/ez80_spi.c b/arch/z80/src/ez80/ez80_spi.c
index a2f1c4c535..0e3b9d07be 100644
--- a/arch/z80/src/ez80/ez80_spi.c
+++ b/arch/z80/src/ez80/ez80_spi.c
@@ -446,7 +446,7 @@ FAR struct spi_dev_s *ez80_spibus_initialize(int port)
 
   /* Only the SPI1 interface is supported */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (port != 1)
     {
       return NULL;
diff --git a/arch/z80/src/z180/z180_registerdump.c b/arch/z80/src/z180/z180_registerdump.c
index 8c78148cd3..bf8713d6a2 100644
--- a/arch/z80/src/z180/z180_registerdump.c
+++ b/arch/z80/src/z180/z180_registerdump.c
@@ -41,9 +41,9 @@
 
 /* Output debug info -- even if debug is not selected. */
 
-#undef  CONFIG_DEBUG
+#undef  CONFIG_DEBUG_FEATURES
 #undef  CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG 1
+#define CONFIG_DEBUG_FEATURES 1
 #define CONFIG_DEBUG_INFO 1
 
 #include 
diff --git a/arch/z80/src/z8/z8_registerdump.c b/arch/z80/src/z8/z8_registerdump.c
index c5bfd8251e..f85273d27f 100644
--- a/arch/z80/src/z8/z8_registerdump.c
+++ b/arch/z80/src/z8/z8_registerdump.c
@@ -41,9 +41,9 @@
 
 /* Output debug info -- even if debug is not selected. */
 
-#undef  CONFIG_DEBUG
+#undef  CONFIG_DEBUG_FEATURES
 #undef  CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG 1
+#define CONFIG_DEBUG_FEATURES 1
 #define CONFIG_DEBUG_INFO 1
 
 #include 
diff --git a/arch/z80/src/z80/z80_registerdump.c b/arch/z80/src/z80/z80_registerdump.c
index 0f6a701379..eaea63c7b4 100644
--- a/arch/z80/src/z80/z80_registerdump.c
+++ b/arch/z80/src/z80/z80_registerdump.c
@@ -41,9 +41,9 @@
 
 /* Output debug info -- even if debug is not selected. */
 
-#undef  CONFIG_DEBUG
+#undef  CONFIG_DEBUG_FEATURES
 #undef  CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG 1
+#define CONFIG_DEBUG_FEATURES 1
 #define CONFIG_DEBUG_INFO 1
 
 #include 
diff --git a/binfmt/binfmt.h b/binfmt/binfmt.h
index 370ef57eae..cfde554d4e 100644
--- a/binfmt/binfmt.h
+++ b/binfmt/binfmt.h
@@ -86,7 +86,7 @@ EXTERN FAR struct binfmt_s *g_binfmts;
  *
  ****************************************************************************/
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_BINFMT)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_BINFMT)
 int dump_module(FAR const struct binary_s *bin);
 #else
 #  define dump_module(bin)
diff --git a/binfmt/binfmt_dumpmodule.c b/binfmt/binfmt_dumpmodule.c
index c69fed83c4..d4b534ce9c 100644
--- a/binfmt/binfmt_dumpmodule.c
+++ b/binfmt/binfmt_dumpmodule.c
@@ -47,7 +47,7 @@
 
 #include "binfmt.h"
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_BINFMT) && !defined(CONFIG_BINFMT_DISABLE)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_BINFMT) && !defined(CONFIG_BINFMT_DISABLE)
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/binfmt/binfmt_execmodule.c b/binfmt/binfmt_execmodule.c
index 03b10c89ab..3afe49042e 100644
--- a/binfmt/binfmt_execmodule.c
+++ b/binfmt/binfmt_execmodule.c
@@ -147,7 +147,7 @@ int exec_module(FAR const struct binary_s *binp)
 
   /* Sanity checking */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!binp || !binp->entrypt || binp->stacksize <= 0)
     {
       err = EINVAL;
diff --git a/binfmt/binfmt_loadmodule.c b/binfmt/binfmt_loadmodule.c
index 3e73a01fb6..c8b319f685 100644
--- a/binfmt/binfmt_loadmodule.c
+++ b/binfmt/binfmt_loadmodule.c
@@ -180,7 +180,7 @@ int load_module(FAR struct binary_s *bin)
 
   /* Verify that we were provided something to work with */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (bin && bin->filename)
 #endif
     {
diff --git a/binfmt/elf.c b/binfmt/elf.c
index 92f8b9b9e0..ab08515dd9 100644
--- a/binfmt/elf.c
+++ b/binfmt/elf.c
@@ -60,7 +60,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
+/* CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
  * defined or CONFIG_ELF_DUMPBUFFER does nothing.
  */
 
@@ -87,7 +87,7 @@
  ****************************************************************************/
 
 static int elf_loadbinary(FAR struct binary_s *binp);
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_BINFMT)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_BINFMT)
 static void elf_dumploadinfo(FAR struct elf_loadinfo_s *loadinfo);
 #endif
 
@@ -110,7 +110,7 @@ static struct binfmt_s g_elfbinfmt =
  * Name: elf_dumploadinfo
  ****************************************************************************/
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_BINFMT)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_BINFMT)
 static void elf_dumploadinfo(FAR struct elf_loadinfo_s *loadinfo)
 {
   int i;
diff --git a/binfmt/libelf/Kconfig b/binfmt/libelf/Kconfig
index 1c416fa660..684eaba8be 100644
--- a/binfmt/libelf/Kconfig
+++ b/binfmt/libelf/Kconfig
@@ -35,7 +35,7 @@ config ELF_BUFFERINCR
 config ELF_DUMPBUFFER
 	bool "Dump ELF buffers"
 	default n
-	depends on DEBUG && CONFIG_DEBUG_INFO
+	depends on DEBUG_FEATURES && CONFIG_DEBUG_INFO
 	---help---
 		Dump various ELF buffers for debug purposes
 
diff --git a/binfmt/libelf/libelf_bind.c b/binfmt/libelf/libelf_bind.c
index 7d63fa87a3..009e17c7df 100644
--- a/binfmt/libelf/libelf_bind.c
+++ b/binfmt/libelf/libelf_bind.c
@@ -55,7 +55,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
+/* CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
  * defined or CONFIG_ELF_DUMPBUFFER does nothing.
  */
 
diff --git a/binfmt/libelf/libelf_init.c b/binfmt/libelf/libelf_init.c
index fdbe328d60..9efa1e4b2c 100644
--- a/binfmt/libelf/libelf_init.c
+++ b/binfmt/libelf/libelf_init.c
@@ -56,7 +56,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
+/* CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
  * defined or CONFIG_ELF_DUMPBUFFER does nothing.
  */
 
diff --git a/binfmt/libnxflat/Kconfig b/binfmt/libnxflat/Kconfig
index c5f920695d..6929b04296 100644
--- a/binfmt/libnxflat/Kconfig
+++ b/binfmt/libnxflat/Kconfig
@@ -6,4 +6,4 @@
 config NXFLAT_DUMPBUFFER
 	bool "Dump NXFLAT buffers"
 	default n
-	depends on DEBUG && CONFIG_DEBUG_INFO
+	depends on DEBUG_FEATURES && CONFIG_DEBUG_INFO
diff --git a/binfmt/libnxflat/libnxflat_bind.c b/binfmt/libnxflat/libnxflat_bind.c
index 25f251685d..4239517153 100644
--- a/binfmt/libnxflat/libnxflat_bind.c
+++ b/binfmt/libnxflat/libnxflat_bind.c
@@ -58,7 +58,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
+/* CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
  * defined or CONFIG_NXFLAT_DUMPBUFFER does nothing.
  */
 
diff --git a/binfmt/libnxflat/libnxflat_init.c b/binfmt/libnxflat/libnxflat_init.c
index af8fd102d2..826614f2d9 100644
--- a/binfmt/libnxflat/libnxflat_init.c
+++ b/binfmt/libnxflat/libnxflat_init.c
@@ -54,7 +54,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
+/* CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
  * defined or CONFIG_NXFLAT_DUMPBUFFER does nothing.
  */
 
diff --git a/binfmt/libpcode/Kconfig b/binfmt/libpcode/Kconfig
index 6005657b6b..c767aca790 100644
--- a/binfmt/libpcode/Kconfig
+++ b/binfmt/libpcode/Kconfig
@@ -64,6 +64,6 @@ endif # PCODE_TEST_FS
 config PCODE_DUMPBUFFER
 	bool "Dump P-code buffers"
 	default n
-	depends on DEBUG && CONFIG_DEBUG_INFO
+	depends on DEBUG_FEATURES && CONFIG_DEBUG_INFO
 	---help---
 		Dump various P-code buffers for debug purposes
diff --git a/binfmt/libpcode/README.txt b/binfmt/libpcode/README.txt
index 4c06a5c075..d6cb606af7 100644
--- a/binfmt/libpcode/README.txt
+++ b/binfmt/libpcode/README.txt
@@ -96,7 +96,7 @@ Here is a simple test configuration using the NuttX simulator:
 
    Debug options can also be enabled with:
 
-    CONFIG_DEBUG=y
+    CONFIG_DEBUG_FEATURES=y
     CONFIG_DEBUG_BINFMT=y
     CONFIG_DEBUG_INFO=y
 
diff --git a/binfmt/nxflat.c b/binfmt/nxflat.c
index d2df7c1d11..1e2eddf3a2 100644
--- a/binfmt/nxflat.c
+++ b/binfmt/nxflat.c
@@ -56,7 +56,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
+/* CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
  * defined or CONFIG_NXFLAT_DUMPBUFFER does nothing.
  */
 
@@ -79,7 +79,7 @@
  ****************************************************************************/
 
 static int nxflat_loadbinary(struct binary_s *binp);
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_BINFMT)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_BINFMT)
 static void nxflat_dumploadinfo(struct nxflat_loadinfo_s *loadinfo);
 #endif
 
@@ -102,7 +102,7 @@ static struct binfmt_s g_nxflatbinfmt =
  * Name: nxflat_dumploadinfo
  ****************************************************************************/
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_BINFMT)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_BINFMT)
 static void nxflat_dumploadinfo(struct nxflat_loadinfo_s *loadinfo)
 {
   unsigned long dsize = loadinfo->datasize + loadinfo->bsssize;
diff --git a/configs/README.txt b/configs/README.txt
index 45f06d0fa0..3e44ef649c 100644
--- a/configs/README.txt
+++ b/configs/README.txt
@@ -123,7 +123,7 @@ Make.defs -- This makefile fragment provides architecture and
 
   Definitions in the Make.defs file probably depend on some of the
   settings in the .config file.  For example, the CFLAGS will most likely be
-  different if CONFIG_DEBUG=y.
+  different if CONFIG_DEBUG_FEATURES=y.
 
   The included tools/Config.mk file contains additional definitions that may
   be overriden in the architecture-specific Make.defs file as necessary:
diff --git a/configs/amber/hello/defconfig b/configs/amber/hello/defconfig
index 5c62c54f88..f7862235e3 100644
--- a/configs/amber/hello/defconfig
+++ b/configs/amber/hello/defconfig
@@ -42,7 +42,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/arduino-due/README.txt b/configs/arduino-due/README.txt
index 3d3a6e0903..e886b55889 100644
--- a/configs/arduino-due/README.txt
+++ b/configs/arduino-due/README.txt
@@ -1072,8 +1072,8 @@ Configuration sub-directories
        debug output on USART0 can be enabled with:
 
        Build Setup:
-         CONFIG_DEBUG=y                    : Enable debug features
-         CONFIG_DEBUG_INFO=y            : Enable verbose debug output
+         CONFIG_DEBUG_FEATURES=y           : Enable debug features
+         CONFIG_DEBUG_INFO=y               : Enable verbose debug output
          CONFIG_DEBUG_INPUT=y              : Enable debug output from input devices
 
        STATUS:
diff --git a/configs/arduino-due/nsh/defconfig b/configs/arduino-due/nsh/defconfig
index 51cf6e0923..ed94d78174 100644
--- a/configs/arduino-due/nsh/defconfig
+++ b/configs/arduino-due/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/arduino-due/src/sam_autoleds.c b/configs/arduino-due/src/sam_autoleds.c
index 9708b777fa..b84f34f1a5 100644
--- a/configs/arduino-due/src/sam_autoleds.c
+++ b/configs/arduino-due/src/sam_autoleds.c
@@ -95,7 +95,7 @@
  * at approximately 2Hz, then a fatal error has been detected and the system
  */
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/arduino-due/src/sam_userleds.c b/configs/arduino-due/src/sam_userleds.c
index eecc9fae4e..4279a4ab1e 100644
--- a/configs/arduino-due/src/sam_userleds.c
+++ b/configs/arduino-due/src/sam_userleds.c
@@ -55,7 +55,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/arduino-mega2560/hello/defconfig b/configs/arduino-mega2560/hello/defconfig
index 4459053ee1..d710f55deb 100644
--- a/configs/arduino-mega2560/hello/defconfig
+++ b/configs/arduino-mega2560/hello/defconfig
@@ -45,7 +45,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/arduino-mega2560/nsh/defconfig b/configs/arduino-mega2560/nsh/defconfig
index 9aee289d6d..d9eca795de 100644
--- a/configs/arduino-mega2560/nsh/defconfig
+++ b/configs/arduino-mega2560/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/avr32dev1/nsh/defconfig b/configs/avr32dev1/nsh/defconfig
index 0f87f20046..a0846beb46 100644
--- a/configs/avr32dev1/nsh/defconfig
+++ b/configs/avr32dev1/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/avr32dev1/ostest/defconfig b/configs/avr32dev1/ostest/defconfig
index 6fc2eed59f..1342e4c2e7 100644
--- a/configs/avr32dev1/ostest/defconfig
+++ b/configs/avr32dev1/ostest/defconfig
@@ -42,7 +42,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/c5471evm/httpd/Make.defs b/configs/c5471evm/httpd/Make.defs
index 9f465df52c..aa491bb2bc 100644
--- a/configs/c5471evm/httpd/Make.defs
+++ b/configs/c5471evm/httpd/Make.defs
@@ -71,7 +71,7 @@ ifneq ($(HOSTOS),Cygwin)
 endif
 endif
 
-ifeq ("${CONFIG_DEBUG}","y")
+ifeq ("${CONFIG_DEBUG_FEATURES}","y")
   ARCHOPTIMIZATION = -g
 endif
 
@@ -115,7 +115,7 @@ EXEEXT =
 ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
   LDFLAGS += -g
 endif
 
diff --git a/configs/c5471evm/httpd/defconfig b/configs/c5471evm/httpd/defconfig
index 895892b246..5f0118087a 100644
--- a/configs/c5471evm/httpd/defconfig
+++ b/configs/c5471evm/httpd/defconfig
@@ -41,7 +41,7 @@ CONFIG_RRLOAD_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/c5471evm/nettest/Make.defs b/configs/c5471evm/nettest/Make.defs
index 909f21b083..0cd136c400 100644
--- a/configs/c5471evm/nettest/Make.defs
+++ b/configs/c5471evm/nettest/Make.defs
@@ -71,7 +71,7 @@ ifneq ($(HOSTOS),Cygwin)
 endif
 endif
 
-ifeq ("${CONFIG_DEBUG}","y")
+ifeq ("${CONFIG_DEBUG_FEATURES}","y")
   ARCHOPTIMIZATION = -g
 endif
 
@@ -115,7 +115,7 @@ EXEEXT =
 ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
   LDFLAGS += -g
 endif
 
diff --git a/configs/c5471evm/nettest/defconfig b/configs/c5471evm/nettest/defconfig
index 006c9b09b0..ba47f3e266 100644
--- a/configs/c5471evm/nettest/defconfig
+++ b/configs/c5471evm/nettest/defconfig
@@ -41,7 +41,7 @@ CONFIG_RRLOAD_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/c5471evm/nsh/Make.defs b/configs/c5471evm/nsh/Make.defs
index 41fa4b2f25..9e22f8ef31 100644
--- a/configs/c5471evm/nsh/Make.defs
+++ b/configs/c5471evm/nsh/Make.defs
@@ -71,7 +71,7 @@ ifneq ($(HOSTOS),Cygwin)
 endif
 endif
 
-ifeq ("${CONFIG_DEBUG}","y")
+ifeq ("${CONFIG_DEBUG_FEATURES}","y")
   ARCHOPTIMIZATION = -g
 endif
 
@@ -115,7 +115,7 @@ EXEEXT =
 ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
   LDFLAGS += -g
 endif
 
diff --git a/configs/c5471evm/nsh/defconfig b/configs/c5471evm/nsh/defconfig
index 3ca99d5e61..90dba4e681 100644
--- a/configs/c5471evm/nsh/defconfig
+++ b/configs/c5471evm/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RRLOAD_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/cc3200-launchpad/nsh/defconfig b/configs/cc3200-launchpad/nsh/defconfig
index 68c1a21f1c..df8dc6ecb9 100644
--- a/configs/cc3200-launchpad/nsh/defconfig
+++ b/configs/cc3200-launchpad/nsh/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/cc3200-launchpad/src/cc3200_autoleds.c b/configs/cc3200-launchpad/src/cc3200_autoleds.c
index 6155f84550..f3cded9e76 100644
--- a/configs/cc3200-launchpad/src/cc3200_autoleds.c
+++ b/configs/cc3200-launchpad/src/cc3200_autoleds.c
@@ -87,7 +87,7 @@
  * LED_PANIC         4      ON   OFF   OFF (flashing 2Hz)
  */
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/cloudctrl/README.txt b/configs/cloudctrl/README.txt
index f98996d214..853c2e6e9e 100644
--- a/configs/cloudctrl/README.txt
+++ b/configs/cloudctrl/README.txt
@@ -651,7 +651,7 @@ Cloudctrl-specific Configuration Options
     CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_STM32_CAN2 is defined.
     CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
     CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
-    CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
+    CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an
       dump of all CAN registers.
 
   Cloudctrl LCD Hardware Configuration
@@ -708,9 +708,9 @@ Cloudctrl-specific Configuration Options
    CONFIG_STM32_OTGFS_SOFINTR - Enable SOF interrupts.  Why would you ever
      want to do that?
    CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access
-     debug.  Depends on CONFIG_DEBUG.
+     debug.  Depends on CONFIG_DEBUG_FEATURES.
    CONFIG_STM32_USBHOST_PKTDUMP - Dump all incoming and outgoing USB
-     packets. Depends on CONFIG_DEBUG.
+     packets. Depends on CONFIG_DEBUG_FEATURES.
 
 Configurations
 ==============
diff --git a/configs/cloudctrl/nsh/defconfig b/configs/cloudctrl/nsh/defconfig
index 40bd30e1a1..2b6591e0eb 100644
--- a/configs/cloudctrl/nsh/defconfig
+++ b/configs/cloudctrl/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/cloudctrl/src/stm32_autoleds.c b/configs/cloudctrl/src/stm32_autoleds.c
index 9e1f000078..ef237c0652 100644
--- a/configs/cloudctrl/src/stm32_autoleds.c
+++ b/configs/cloudctrl/src/stm32_autoleds.c
@@ -58,7 +58,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/cloudctrl/src/stm32_spi.c b/configs/cloudctrl/src/stm32_spi.c
index dadb3fa8be..d1eba035c1 100644
--- a/configs/cloudctrl/src/stm32_spi.c
+++ b/configs/cloudctrl/src/stm32_spi.c
@@ -58,9 +58,9 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_SPI
 #endif
 
diff --git a/configs/cloudctrl/src/stm32_userleds.c b/configs/cloudctrl/src/stm32_userleds.c
index e7bc159243..79316352ac 100644
--- a/configs/cloudctrl/src/stm32_userleds.c
+++ b/configs/cloudctrl/src/stm32_userleds.c
@@ -58,7 +58,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/compal_e86/nsh_highram/defconfig b/configs/compal_e86/nsh_highram/defconfig
index e521e8e7da..29d7ceb287 100644
--- a/configs/compal_e86/nsh_highram/defconfig
+++ b/configs/compal_e86/nsh_highram/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/compal_e88/nsh_highram/defconfig b/configs/compal_e88/nsh_highram/defconfig
index 85ad3ce661..66ca0db0ea 100644
--- a/configs/compal_e88/nsh_highram/defconfig
+++ b/configs/compal_e88/nsh_highram/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/compal_e99/nsh_compalram/Make.defs b/configs/compal_e99/nsh_compalram/Make.defs
index 9fe718fb89..2920fb27d6 100644
--- a/configs/compal_e99/nsh_compalram/Make.defs
+++ b/configs/compal_e99/nsh_compalram/Make.defs
@@ -71,7 +71,7 @@ ifneq ($(HOSTOS),Cygwin)
 endif
 endif
 
-ifeq ("${CONFIG_DEBUG}","y")
+ifeq ("${CONFIG_DEBUG_FEATURES}","y")
   ARCHOPTIMIZATION = -g
 endif
 
@@ -115,7 +115,7 @@ EXEEXT =
 ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
   LDFLAGS += -g
 endif
 
diff --git a/configs/compal_e99/nsh_compalram/defconfig b/configs/compal_e99/nsh_compalram/defconfig
index e3107fc847..77d140a6fe 100644
--- a/configs/compal_e99/nsh_compalram/defconfig
+++ b/configs/compal_e99/nsh_compalram/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/compal_e99/nsh_highram/Make.defs b/configs/compal_e99/nsh_highram/Make.defs
index a7164120e0..28c0f00c54 100644
--- a/configs/compal_e99/nsh_highram/Make.defs
+++ b/configs/compal_e99/nsh_highram/Make.defs
@@ -71,7 +71,7 @@ ifneq ($(HOSTOS),Cygwin)
 endif
 endif
 
-ifeq ("${CONFIG_DEBUG}","y")
+ifeq ("${CONFIG_DEBUG_FEATURES}","y")
   ARCHOPTIMIZATION = -g
 endif
 
@@ -115,7 +115,7 @@ EXEEXT =
 ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
   LDFLAGS += -g
 endif
 
diff --git a/configs/compal_e99/nsh_highram/defconfig b/configs/compal_e99/nsh_highram/defconfig
index a7cbecbe98..3f18883c1d 100644
--- a/configs/compal_e99/nsh_highram/defconfig
+++ b/configs/compal_e99/nsh_highram/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/demo9s12ne64/ostest/defconfig b/configs/demo9s12ne64/ostest/defconfig
index b5f8ba3a5d..dc2009b5d2 100644
--- a/configs/demo9s12ne64/ostest/defconfig
+++ b/configs/demo9s12ne64/ostest/defconfig
@@ -38,7 +38,7 @@ CONFIG_MOTOROLA_SREC=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/demo9s12ne64/src/m9s12_leds.c b/configs/demo9s12ne64/src/m9s12_leds.c
index 56c0df885f..a5b357b803 100644
--- a/configs/demo9s12ne64/src/m9s12_leds.c
+++ b/configs/demo9s12ne64/src/m9s12_leds.c
@@ -50,7 +50,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/demo9s12ne64/src/m9s12_spi.c b/configs/demo9s12ne64/src/m9s12_spi.c
index 3d029f14ea..329609850d 100644
--- a/configs/demo9s12ne64/src/m9s12_spi.c
+++ b/configs/demo9s12ne64/src/m9s12_spi.c
@@ -54,7 +54,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SPI_DEBUG   /* Define to enable debug */
 #undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/dk-tm4c129x/ipv6/defconfig b/configs/dk-tm4c129x/ipv6/defconfig
index 7bc8f6f825..fc1e30d816 100644
--- a/configs/dk-tm4c129x/ipv6/defconfig
+++ b/configs/dk-tm4c129x/ipv6/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/dk-tm4c129x/nsh/defconfig b/configs/dk-tm4c129x/nsh/defconfig
index 28ca9aa4ca..a2d60ace10 100644
--- a/configs/dk-tm4c129x/nsh/defconfig
+++ b/configs/dk-tm4c129x/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/dk-tm4c129x/src/tm4c_ssi.c b/configs/dk-tm4c129x/src/tm4c_ssi.c
index 6b5dbe5d0b..35122c8bf5 100644
--- a/configs/dk-tm4c129x/src/tm4c_ssi.c
+++ b/configs/dk-tm4c129x/src/tm4c_ssi.c
@@ -59,7 +59,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG too) */
+/* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
 #  define ssidbg lldbg
diff --git a/configs/dk-tm4c129x/src/tm4c_userleds.c b/configs/dk-tm4c129x/src/tm4c_userleds.c
index 7d894ede63..6d708ad1cc 100644
--- a/configs/dk-tm4c129x/src/tm4c_userleds.c
+++ b/configs/dk-tm4c129x/src/tm4c_userleds.c
@@ -66,7 +66,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/ea3131/nsh/defconfig b/configs/ea3131/nsh/defconfig
index 847486498e..7db317ab9f 100644
--- a/configs/ea3131/nsh/defconfig
+++ b/configs/ea3131/nsh/defconfig
@@ -45,7 +45,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/ea3131/pgnsh/defconfig b/configs/ea3131/pgnsh/defconfig
index 68215a41b3..e56fb71d68 100644
--- a/configs/ea3131/pgnsh/defconfig
+++ b/configs/ea3131/pgnsh/defconfig
@@ -48,7 +48,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/ea3131/src/lpc31_fillpage.c b/configs/ea3131/src/lpc31_fillpage.c
index 91bad2c867..51c57f06a9 100644
--- a/configs/ea3131/src/lpc31_fillpage.c
+++ b/configs/ea3131/src/lpc31_fillpage.c
@@ -199,7 +199,7 @@ struct pg_source_s
 
   /* This the device geometry */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   FAR struct mtd_geometry_s geo;
 #endif
 };
@@ -289,7 +289,7 @@ static inline void lpc31_initsrc(void)
 static inline void lpc31_initsrc(void)
 {
   FAR struct spi_dev_s *spi;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   uint32_t capacity;
   int ret;
 #endif
@@ -318,7 +318,7 @@ static inline void lpc31_initsrc(void)
 
       /* Verify that we can use the device */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       /* Get the device geometry. (casting to uintptr_t first eliminates
        * complaints on some architectures where the sizeof long is different
        * from the size of a pointer).
diff --git a/configs/ea3131/src/lpc31_leds.c b/configs/ea3131/src/lpc31_leds.c
index 3b509575c3..396f014bd9 100644
--- a/configs/ea3131/src/lpc31_leds.c
+++ b/configs/ea3131/src/lpc31_leds.c
@@ -55,7 +55,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/ea3131/src/lpc31_spi.c b/configs/ea3131/src/lpc31_spi.c
index fead540055..2a71d33c27 100644
--- a/configs/ea3131/src/lpc31_spi.c
+++ b/configs/ea3131/src/lpc31_spi.c
@@ -59,7 +59,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SPI_DEBUG   /* Define to enable debug */
 #undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/ea3131/usbserial/defconfig b/configs/ea3131/usbserial/defconfig
index e7a88724c9..6d68bedc94 100644
--- a/configs/ea3131/usbserial/defconfig
+++ b/configs/ea3131/usbserial/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/ea3152/ostest/defconfig b/configs/ea3152/ostest/defconfig
index 598fabeb5a..49dda7cc91 100644
--- a/configs/ea3152/ostest/defconfig
+++ b/configs/ea3152/ostest/defconfig
@@ -45,7 +45,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/ea3152/src/lpc31_fillpage.c b/configs/ea3152/src/lpc31_fillpage.c
index b964927c37..09cb59c000 100644
--- a/configs/ea3152/src/lpc31_fillpage.c
+++ b/configs/ea3152/src/lpc31_fillpage.c
@@ -199,7 +199,7 @@ struct pg_source_s
 
   /* This the device geometry */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   FAR struct mtd_geometry_s geo;
 #endif
 };
@@ -289,7 +289,7 @@ static inline void lpc31_initsrc(void)
 static inline void lpc31_initsrc(void)
 {
   FAR struct spi_dev_s *spi;
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   uint32_t capacity;
   int ret;
 #endif
@@ -318,7 +318,7 @@ static inline void lpc31_initsrc(void)
 
       /* Verify that we can use the device */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       /* Get the device geometry. (casting to uintptr_t first eliminates
        * complaints on some architectures where the sizeof long is different
        * from the size of a pointer).
diff --git a/configs/ea3152/src/lpc31_leds.c b/configs/ea3152/src/lpc31_leds.c
index 429c87abcd..7810e06e1e 100644
--- a/configs/ea3152/src/lpc31_leds.c
+++ b/configs/ea3152/src/lpc31_leds.c
@@ -55,7 +55,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/ea3152/src/lpc31_spi.c b/configs/ea3152/src/lpc31_spi.c
index 68153a0655..6347edf502 100644
--- a/configs/ea3152/src/lpc31_spi.c
+++ b/configs/ea3152/src/lpc31_spi.c
@@ -59,7 +59,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SPI_DEBUG   /* Define to enable debug */
 #undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/eagle100/httpd/defconfig b/configs/eagle100/httpd/defconfig
index 96e0b09524..b7920a1123 100644
--- a/configs/eagle100/httpd/defconfig
+++ b/configs/eagle100/httpd/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/eagle100/nettest/defconfig b/configs/eagle100/nettest/defconfig
index bd692c7ffa..3488e2b471 100644
--- a/configs/eagle100/nettest/defconfig
+++ b/configs/eagle100/nettest/defconfig
@@ -45,7 +45,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/eagle100/nsh/defconfig b/configs/eagle100/nsh/defconfig
index 77837598c1..96471a6dcf 100644
--- a/configs/eagle100/nsh/defconfig
+++ b/configs/eagle100/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/eagle100/nxflat/defconfig b/configs/eagle100/nxflat/defconfig
index 67b18010a4..364634f48e 100644
--- a/configs/eagle100/nxflat/defconfig
+++ b/configs/eagle100/nxflat/defconfig
@@ -43,7 +43,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/eagle100/src/lm_leds.c b/configs/eagle100/src/lm_leds.c
index 9cd7ef8325..53282481ad 100644
--- a/configs/eagle100/src/lm_leds.c
+++ b/configs/eagle100/src/lm_leds.c
@@ -55,7 +55,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/eagle100/src/lm_ssi.c b/configs/eagle100/src/lm_ssi.c
index 87b347b0d1..09cfcb4451 100644
--- a/configs/eagle100/src/lm_ssi.c
+++ b/configs/eagle100/src/lm_ssi.c
@@ -59,7 +59,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SSI_DEBUG   /* Define to enable debug */
 #undef SSI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/eagle100/thttpd/defconfig b/configs/eagle100/thttpd/defconfig
index 9bd0ee452b..ae3c7d6e27 100644
--- a/configs/eagle100/thttpd/defconfig
+++ b/configs/eagle100/thttpd/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/efm32-g8xx-stk/nsh/defconfig b/configs/efm32-g8xx-stk/nsh/defconfig
index a3112c194c..d99809600d 100644
--- a/configs/efm32-g8xx-stk/nsh/defconfig
+++ b/configs/efm32-g8xx-stk/nsh/defconfig
@@ -45,7 +45,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/efm32-g8xx-stk/src/efm32_autoleds.c b/configs/efm32-g8xx-stk/src/efm32_autoleds.c
index 54a4df6f3d..d1d73ada95 100644
--- a/configs/efm32-g8xx-stk/src/efm32_autoleds.c
+++ b/configs/efm32-g8xx-stk/src/efm32_autoleds.c
@@ -59,7 +59,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/efm32-g8xx-stk/src/efm32_userleds.c b/configs/efm32-g8xx-stk/src/efm32_userleds.c
index 556556454f..ce42e08b69 100644
--- a/configs/efm32-g8xx-stk/src/efm32_userleds.c
+++ b/configs/efm32-g8xx-stk/src/efm32_userleds.c
@@ -59,7 +59,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/efm32gg-stk3700/nsh/defconfig b/configs/efm32gg-stk3700/nsh/defconfig
index d8d3ea37a7..d78466e83c 100644
--- a/configs/efm32gg-stk3700/nsh/defconfig
+++ b/configs/efm32gg-stk3700/nsh/defconfig
@@ -45,7 +45,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/efm32gg-stk3700/src/efm32_autoleds.c b/configs/efm32gg-stk3700/src/efm32_autoleds.c
index 6fb6fb00ae..598f7c04b8 100644
--- a/configs/efm32gg-stk3700/src/efm32_autoleds.c
+++ b/configs/efm32gg-stk3700/src/efm32_autoleds.c
@@ -93,7 +93,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/efm32gg-stk3700/src/efm32_userleds.c b/configs/efm32gg-stk3700/src/efm32_userleds.c
index ab25dda6a8..093a151f97 100644
--- a/configs/efm32gg-stk3700/src/efm32_userleds.c
+++ b/configs/efm32gg-stk3700/src/efm32_userleds.c
@@ -70,7 +70,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/ekk-lm3s9b96/nsh/defconfig b/configs/ekk-lm3s9b96/nsh/defconfig
index 946038cb05..c4c1ca9db1 100644
--- a/configs/ekk-lm3s9b96/nsh/defconfig
+++ b/configs/ekk-lm3s9b96/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/ekk-lm3s9b96/src/lm_leds.c b/configs/ekk-lm3s9b96/src/lm_leds.c
index a70dd50dc2..7abff4bbcc 100644
--- a/configs/ekk-lm3s9b96/src/lm_leds.c
+++ b/configs/ekk-lm3s9b96/src/lm_leds.c
@@ -56,7 +56,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/ekk-lm3s9b96/src/lm_ssi.c b/configs/ekk-lm3s9b96/src/lm_ssi.c
index c8cd2a16d7..bef242e500 100644
--- a/configs/ekk-lm3s9b96/src/lm_ssi.c
+++ b/configs/ekk-lm3s9b96/src/lm_ssi.c
@@ -58,7 +58,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SSI_DEBUG   /* Define to enable debug */
 #undef SSI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/ez80f910200kitg/ostest/defconfig b/configs/ez80f910200kitg/ostest/defconfig
index 6beb0a6b78..5ad96bd915 100644
--- a/configs/ez80f910200kitg/ostest/defconfig
+++ b/configs/ez80f910200kitg/ostest/defconfig
@@ -46,7 +46,7 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_INFO is not set
 
diff --git a/configs/ez80f910200zco/dhcpd/defconfig b/configs/ez80f910200zco/dhcpd/defconfig
index a2b16e6650..19f54e3feb 100644
--- a/configs/ez80f910200zco/dhcpd/defconfig
+++ b/configs/ez80f910200zco/dhcpd/defconfig
@@ -46,7 +46,7 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_INFO is not set
 
diff --git a/configs/ez80f910200zco/httpd/defconfig b/configs/ez80f910200zco/httpd/defconfig
index ca49dec32a..c34eb7aff5 100644
--- a/configs/ez80f910200zco/httpd/defconfig
+++ b/configs/ez80f910200zco/httpd/defconfig
@@ -46,7 +46,7 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_INFO is not set
 
diff --git a/configs/ez80f910200zco/nettest/defconfig b/configs/ez80f910200zco/nettest/defconfig
index ca3b61d97e..9e0180deaf 100644
--- a/configs/ez80f910200zco/nettest/defconfig
+++ b/configs/ez80f910200zco/nettest/defconfig
@@ -46,7 +46,7 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_INFO is not set
 
diff --git a/configs/ez80f910200zco/nsh/defconfig b/configs/ez80f910200zco/nsh/defconfig
index f365f264a6..f431c18dad 100644
--- a/configs/ez80f910200zco/nsh/defconfig
+++ b/configs/ez80f910200zco/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_INFO is not set
 
diff --git a/configs/ez80f910200zco/poll/defconfig b/configs/ez80f910200zco/poll/defconfig
index afc307df76..ca969eee98 100644
--- a/configs/ez80f910200zco/poll/defconfig
+++ b/configs/ez80f910200zco/poll/defconfig
@@ -46,7 +46,7 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_INFO is not set
 
diff --git a/configs/fire-stm32v2/README.txt b/configs/fire-stm32v2/README.txt
index 3af6249e50..d8da5f1f34 100644
--- a/configs/fire-stm32v2/README.txt
+++ b/configs/fire-stm32v2/README.txt
@@ -758,7 +758,7 @@ M3 Wildfire-specific Configuration Options
     CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_STM32_CAN2 is defined.
     CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
     CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
-    CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
+    CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an
       dump of all CAN registers.
 
   M3 Wildfire LCD Hardware Configuration
diff --git a/configs/fire-stm32v2/nsh/defconfig b/configs/fire-stm32v2/nsh/defconfig
index a914c0624a..72a8e7e4a1 100644
--- a/configs/fire-stm32v2/nsh/defconfig
+++ b/configs/fire-stm32v2/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/fire-stm32v2/src/stm32_autoleds.c b/configs/fire-stm32v2/src/stm32_autoleds.c
index c64c9f2f59..e70905831f 100644
--- a/configs/fire-stm32v2/src/stm32_autoleds.c
+++ b/configs/fire-stm32v2/src/stm32_autoleds.c
@@ -57,7 +57,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/fire-stm32v2/src/stm32_spi.c b/configs/fire-stm32v2/src/stm32_spi.c
index 541f79ed84..6f2bcb4177 100644
--- a/configs/fire-stm32v2/src/stm32_spi.c
+++ b/configs/fire-stm32v2/src/stm32_spi.c
@@ -57,7 +57,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SPI_DEBUG   /* Define to enable debug */
 #undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/fire-stm32v2/src/stm32_userleds.c b/configs/fire-stm32v2/src/stm32_userleds.c
index 7092d02577..f4968c2974 100644
--- a/configs/fire-stm32v2/src/stm32_userleds.c
+++ b/configs/fire-stm32v2/src/stm32_userleds.c
@@ -57,7 +57,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/freedom-kl25z/minnsh/defconfig b/configs/freedom-kl25z/minnsh/defconfig
index 753da383ba..c2ccfaf0a6 100644
--- a/configs/freedom-kl25z/minnsh/defconfig
+++ b/configs/freedom-kl25z/minnsh/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/freedom-kl25z/nsh/defconfig b/configs/freedom-kl25z/nsh/defconfig
index 7a97b9a5bb..285f30c8b3 100644
--- a/configs/freedom-kl25z/nsh/defconfig
+++ b/configs/freedom-kl25z/nsh/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/freedom-kl25z/src/kl_led.c b/configs/freedom-kl25z/src/kl_led.c
index 7480fab438..c5fe8d3831 100644
--- a/configs/freedom-kl25z/src/kl_led.c
+++ b/configs/freedom-kl25z/src/kl_led.c
@@ -81,7 +81,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/freedom-kl25z/src/kl_spi.c b/configs/freedom-kl25z/src/kl_spi.c
index 7b5562c94b..0a41ea3371 100644
--- a/configs/freedom-kl25z/src/kl_spi.c
+++ b/configs/freedom-kl25z/src/kl_spi.c
@@ -55,7 +55,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
diff --git a/configs/freedom-kl26z/minnsh/defconfig b/configs/freedom-kl26z/minnsh/defconfig
index 843bd482e0..b21dd2b710 100644
--- a/configs/freedom-kl26z/minnsh/defconfig
+++ b/configs/freedom-kl26z/minnsh/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/freedom-kl26z/nsh/defconfig b/configs/freedom-kl26z/nsh/defconfig
index 40157e1b53..af85a35e63 100644
--- a/configs/freedom-kl26z/nsh/defconfig
+++ b/configs/freedom-kl26z/nsh/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/freedom-kl26z/src/kl_led.c b/configs/freedom-kl26z/src/kl_led.c
index bc42e95e46..a6bc7f048f 100644
--- a/configs/freedom-kl26z/src/kl_led.c
+++ b/configs/freedom-kl26z/src/kl_led.c
@@ -81,7 +81,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/freedom-kl26z/src/kl_spi.c b/configs/freedom-kl26z/src/kl_spi.c
index c54e51d5d1..2c7151a7b4 100644
--- a/configs/freedom-kl26z/src/kl_spi.c
+++ b/configs/freedom-kl26z/src/kl_spi.c
@@ -55,7 +55,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
diff --git a/configs/hymini-stm32v/README.txt b/configs/hymini-stm32v/README.txt
index 98d8c23e23..4c7a5f6be7 100644
--- a/configs/hymini-stm32v/README.txt
+++ b/configs/hymini-stm32v/README.txt
@@ -502,7 +502,7 @@ HY-Mini specific Configuration Options
     CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_STM32_CAN2 is defined.
     CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
     CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
-    CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
+    CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an
       dump of all CAN registers.
 
   HY-MiniSTM32V LCD Hardware Configuration.  The HY-Mini board may be delivered with
@@ -702,10 +702,10 @@ Where  is one of the following:
     USB debug output can be enabled as by changing the following
     settings in the configuration file:
 
-      -CONFIG_DEBUG=n
+      -CONFIG_DEBUG_FEATURES=n
       -CONFIG_DEBUG_INFO=n
       -CONFIG_DEBUG_USB=n
-      +CONFIG_DEBUG=y
+      +CONFIG_DEBUG_FEATURES=y
       +CONFIG_DEBUG_INFO=y
       +CONFIG_DEBUG_USB=y
 
diff --git a/configs/hymini-stm32v/buttons/defconfig b/configs/hymini-stm32v/buttons/defconfig
index 3141e0c160..bc42209cf8 100644
--- a/configs/hymini-stm32v/buttons/defconfig
+++ b/configs/hymini-stm32v/buttons/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/hymini-stm32v/nsh/defconfig b/configs/hymini-stm32v/nsh/defconfig
index 69662e887c..d572218f04 100644
--- a/configs/hymini-stm32v/nsh/defconfig
+++ b/configs/hymini-stm32v/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/hymini-stm32v/nsh2/defconfig b/configs/hymini-stm32v/nsh2/defconfig
index e36492fc6a..4e191fbbbf 100644
--- a/configs/hymini-stm32v/nsh2/defconfig
+++ b/configs/hymini-stm32v/nsh2/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/hymini-stm32v/src/stm32_leds.c b/configs/hymini-stm32v/src/stm32_leds.c
index 19b6158e85..4b1b1e4684 100644
--- a/configs/hymini-stm32v/src/stm32_leds.c
+++ b/configs/hymini-stm32v/src/stm32_leds.c
@@ -57,7 +57,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/hymini-stm32v/src/stm32_spi.c b/configs/hymini-stm32v/src/stm32_spi.c
index 5e9d4c5748..2150e1833f 100644
--- a/configs/hymini-stm32v/src/stm32_spi.c
+++ b/configs/hymini-stm32v/src/stm32_spi.c
@@ -58,7 +58,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #define SPI_DEBUG   /* Define to enable debug */
 #define SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/hymini-stm32v/src/stm32_ssd1289.c b/configs/hymini-stm32v/src/stm32_ssd1289.c
index 2aa36b2ab1..264be5d900 100644
--- a/configs/hymini-stm32v/src/stm32_ssd1289.c
+++ b/configs/hymini-stm32v/src/stm32_ssd1289.c
@@ -69,7 +69,7 @@
  * also be enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_GRAPHICS
 #  undef CONFIG_DEBUG_LCD
diff --git a/configs/hymini-stm32v/usbmsc/defconfig b/configs/hymini-stm32v/usbmsc/defconfig
index a38efa7b82..a84c37fb42 100644
--- a/configs/hymini-stm32v/usbmsc/defconfig
+++ b/configs/hymini-stm32v/usbmsc/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/hymini-stm32v/usbnsh/defconfig b/configs/hymini-stm32v/usbnsh/defconfig
index d744b1a2ca..200447a70d 100644
--- a/configs/hymini-stm32v/usbnsh/defconfig
+++ b/configs/hymini-stm32v/usbnsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/hymini-stm32v/usbserial/defconfig b/configs/hymini-stm32v/usbserial/defconfig
index 6183ec98d4..aefb46b048 100644
--- a/configs/hymini-stm32v/usbserial/defconfig
+++ b/configs/hymini-stm32v/usbserial/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/kwikstik-k40/ostest/defconfig b/configs/kwikstik-k40/ostest/defconfig
index 51b5c56a7a..60166ea794 100644
--- a/configs/kwikstik-k40/ostest/defconfig
+++ b/configs/kwikstik-k40/ostest/defconfig
@@ -41,7 +41,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/kwikstik-k40/src/k40_leds.c b/configs/kwikstik-k40/src/k40_leds.c
index 57d275ab21..ee458ef185 100644
--- a/configs/kwikstik-k40/src/k40_leds.c
+++ b/configs/kwikstik-k40/src/k40_leds.c
@@ -47,7 +47,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/kwikstik-k40/src/k40_spi.c b/configs/kwikstik-k40/src/k40_spi.c
index 2a80ab0024..710e9e56b2 100644
--- a/configs/kwikstik-k40/src/k40_spi.c
+++ b/configs/kwikstik-k40/src/k40_spi.c
@@ -57,7 +57,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
diff --git a/configs/launchxl-tms57004/nsh/defconfig b/configs/launchxl-tms57004/nsh/defconfig
index 082be95f2b..cae356b118 100644
--- a/configs/launchxl-tms57004/nsh/defconfig
+++ b/configs/launchxl-tms57004/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/launchxl-tms57004/src/tms570_autoleds.c b/configs/launchxl-tms57004/src/tms570_autoleds.c
index e99f81bcfa..a92cf59ebb 100644
--- a/configs/launchxl-tms57004/src/tms570_autoleds.c
+++ b/configs/launchxl-tms57004/src/tms570_autoleds.c
@@ -93,7 +93,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/lincoln60/README.txt b/configs/lincoln60/README.txt
index 1bea5b5bfb..b5320549c0 100644
--- a/configs/lincoln60/README.txt
+++ b/configs/lincoln60/README.txt
@@ -386,9 +386,9 @@ Lincoln 60 Configuration Options
     CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18
     CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented).
     CONFIG_NET_REGDEBUG - Enabled low level register debug.  Also needs
-      CONFIG_DEBUG.
+      CONFIG_DEBUG_FEATURES.
     CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets.
-      Also needs CONFIG_DEBUG.
+      Also needs CONFIG_DEBUG_FEATURES.
     CONFIG_NET_HASH - Enable receipt of near-perfect match frames.
     CONFIG_LPC17_MULTICAST - Enable receipt of multicast (and unicast) frames.
       Automatically set if CONFIG_NET_IGMP is selected.
diff --git a/configs/lincoln60/netnsh/defconfig b/configs/lincoln60/netnsh/defconfig
index c48f297786..38c6cb0587 100644
--- a/configs/lincoln60/netnsh/defconfig
+++ b/configs/lincoln60/netnsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/lincoln60/nsh/defconfig b/configs/lincoln60/nsh/defconfig
index 54c6ad3f8c..609322785b 100644
--- a/configs/lincoln60/nsh/defconfig
+++ b/configs/lincoln60/nsh/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/lincoln60/src/lpc17_leds.c b/configs/lincoln60/src/lpc17_leds.c
index 27b46bfbc0..5b8ab87951 100644
--- a/configs/lincoln60/src/lpc17_leds.c
+++ b/configs/lincoln60/src/lpc17_leds.c
@@ -60,7 +60,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/lincoln60/thttpd-binfs/defconfig b/configs/lincoln60/thttpd-binfs/defconfig
index a752c4c72f..1cbd3aeb33 100644
--- a/configs/lincoln60/thttpd-binfs/defconfig
+++ b/configs/lincoln60/thttpd-binfs/defconfig
@@ -45,7 +45,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/lm3s6432-s2e/nsh/defconfig b/configs/lm3s6432-s2e/nsh/defconfig
index 0d4695c79b..618b1a5be1 100644
--- a/configs/lm3s6432-s2e/nsh/defconfig
+++ b/configs/lm3s6432-s2e/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/lm3s6432-s2e/src/lm_leds.c b/configs/lm3s6432-s2e/src/lm_leds.c
index 5ee88cc12b..dc97dbe180 100644
--- a/configs/lm3s6432-s2e/src/lm_leds.c
+++ b/configs/lm3s6432-s2e/src/lm_leds.c
@@ -55,7 +55,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/lm3s6432-s2e/src/lm_ssi.c b/configs/lm3s6432-s2e/src/lm_ssi.c
index 7df29e56ad..4b7ddac4e8 100644
--- a/configs/lm3s6432-s2e/src/lm_ssi.c
+++ b/configs/lm3s6432-s2e/src/lm_ssi.c
@@ -57,7 +57,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SSI_DEBUG   /* Define to enable debug */
 #undef SSI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/lm3s6965-ek/discover/defconfig b/configs/lm3s6965-ek/discover/defconfig
index 3a31755617..1ede54c185 100644
--- a/configs/lm3s6965-ek/discover/defconfig
+++ b/configs/lm3s6965-ek/discover/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/lm3s6965-ek/nsh/defconfig b/configs/lm3s6965-ek/nsh/defconfig
index 3a31755617..1ede54c185 100644
--- a/configs/lm3s6965-ek/nsh/defconfig
+++ b/configs/lm3s6965-ek/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/lm3s6965-ek/nx/defconfig b/configs/lm3s6965-ek/nx/defconfig
index 3d779630f9..0753cc248f 100644
--- a/configs/lm3s6965-ek/nx/defconfig
+++ b/configs/lm3s6965-ek/nx/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/lm3s6965-ek/src/lm_leds.c b/configs/lm3s6965-ek/src/lm_leds.c
index 2ff29036b1..1f38fe65ae 100644
--- a/configs/lm3s6965-ek/src/lm_leds.c
+++ b/configs/lm3s6965-ek/src/lm_leds.c
@@ -55,7 +55,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/lm3s6965-ek/src/lm_oled.c b/configs/lm3s6965-ek/src/lm_oled.c
index db662fd1a1..f289c65bad 100644
--- a/configs/lm3s6965-ek/src/lm_oled.c
+++ b/configs/lm3s6965-ek/src/lm_oled.c
@@ -63,7 +63,7 @@
  * Verbose debug must also be enabled
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_GRAPHICS
 #endif
diff --git a/configs/lm3s6965-ek/src/lm_ssi.c b/configs/lm3s6965-ek/src/lm_ssi.c
index 256d3a5482..9e18cbe60e 100644
--- a/configs/lm3s6965-ek/src/lm_ssi.c
+++ b/configs/lm3s6965-ek/src/lm_ssi.c
@@ -59,7 +59,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SSI_DEBUG   /* Define to enable debug */
 #undef SSI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/lm3s6965-ek/tcpecho/defconfig b/configs/lm3s6965-ek/tcpecho/defconfig
index e655d4d6c1..d4282f16fb 100644
--- a/configs/lm3s6965-ek/tcpecho/defconfig
+++ b/configs/lm3s6965-ek/tcpecho/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/lm3s8962-ek/nsh/defconfig b/configs/lm3s8962-ek/nsh/defconfig
index 57c304ce13..067dad9f11 100644
--- a/configs/lm3s8962-ek/nsh/defconfig
+++ b/configs/lm3s8962-ek/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/lm3s8962-ek/nx/defconfig b/configs/lm3s8962-ek/nx/defconfig
index c72dc447b5..ab03e9edc6 100644
--- a/configs/lm3s8962-ek/nx/defconfig
+++ b/configs/lm3s8962-ek/nx/defconfig
@@ -45,7 +45,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/lm3s8962-ek/src/lm_leds.c b/configs/lm3s8962-ek/src/lm_leds.c
index d7d6c3cd57..0274ddc1fd 100644
--- a/configs/lm3s8962-ek/src/lm_leds.c
+++ b/configs/lm3s8962-ek/src/lm_leds.c
@@ -55,7 +55,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/lm3s8962-ek/src/lm_oled.c b/configs/lm3s8962-ek/src/lm_oled.c
index 42871d17b3..74e5cd9164 100644
--- a/configs/lm3s8962-ek/src/lm_oled.c
+++ b/configs/lm3s8962-ek/src/lm_oled.c
@@ -62,7 +62,7 @@
  * Verbose debug must also be enabled
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_GRAPHICS
 #endif
diff --git a/configs/lm3s8962-ek/src/lm_ssi.c b/configs/lm3s8962-ek/src/lm_ssi.c
index 1149704dc8..a0a32472ac 100644
--- a/configs/lm3s8962-ek/src/lm_ssi.c
+++ b/configs/lm3s8962-ek/src/lm_ssi.c
@@ -59,7 +59,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SSI_DEBUG   /* Define to enable debug */
 #undef SSI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/lm4f120-launchpad/nsh/defconfig b/configs/lm4f120-launchpad/nsh/defconfig
index 61ff3481e3..d87cc7cf0d 100644
--- a/configs/lm4f120-launchpad/nsh/defconfig
+++ b/configs/lm4f120-launchpad/nsh/defconfig
@@ -39,7 +39,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/lm4f120-launchpad/src/lm4f_autoleds.c b/configs/lm4f120-launchpad/src/lm4f_autoleds.c
index 89684e1c24..0fcb45ffa8 100644
--- a/configs/lm4f120-launchpad/src/lm4f_autoleds.c
+++ b/configs/lm4f120-launchpad/src/lm4f_autoleds.c
@@ -97,7 +97,7 @@
  * LED_PANIC         4      ON   OFF   OFF (flashing 2Hz)
  */
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/lm4f120-launchpad/src/lm4f_ssi.c b/configs/lm4f120-launchpad/src/lm4f_ssi.c
index e23385e207..0acbe8f4d1 100644
--- a/configs/lm4f120-launchpad/src/lm4f_ssi.c
+++ b/configs/lm4f120-launchpad/src/lm4f_ssi.c
@@ -60,7 +60,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG too) */
+/* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
 #  define ssidbg lldbg
diff --git a/configs/lpc4330-xplorer/README.txt b/configs/lpc4330-xplorer/README.txt
index 93f71509e7..3afbe967ff 100644
--- a/configs/lpc4330-xplorer/README.txt
+++ b/configs/lpc4330-xplorer/README.txt
@@ -362,14 +362,14 @@ Code Red IDE/Tools
   in debugging symbols.
 
   NOTE 3:  There are few things that NuttX has to do differently if you
-  are using a debugger.  Make sure that you also set CONFIG_DEBUG=y.  Nothing
+  are using a debugger.  Make sure that you also set CONFIG_DEBUG_FEATURES=y.  Nothing
   also is needed and no debug output will be generated; but NuttX will
-  use CONFIG_DEBUG=y to mean that a debugger is attached and will deal
+  use CONFIG_DEBUG_FEATURES=y to mean that a debugger is attached and will deal
   with certain resets and debug controls appropriately.
 
   So you should have:
 
-    CONFIG_DEBUG=y
+    CONFIG_DEBUG_FEATURES=y
     CONFIG_DEBUG_SYMBOLS=y
 
   NOTE 4: Every time that you control-C out of the command line GDB, you
@@ -817,9 +817,9 @@ LPC4330-Xplorer Configuration Options
     CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18
     CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented).
     CONFIG_NET_REGDEBUG - Enabled low level register debug.  Also needs
-      CONFIG_DEBUG.
+      CONFIG_DEBUG_FEATURES.
     CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets.
-      Also needs CONFIG_DEBUG.
+      Also needs CONFIG_DEBUG_FEATURES.
     CONFIG_NET_HASH - Enable receipt of near-perfect match frames.
 
   LPC43xx USB Device Configuration
@@ -928,7 +928,7 @@ Where  is one of the following:
            from the SPI address space after each write.
          CONFIG_DEBUG_SPIFI_DUMP - Debug option to dump read/write buffers.  You
            probably do not want to enable this unless you want to dig through a
-           *lot* of debug output!  Also required CONFIG_DEBUG, CONFIG_DEBUG_INFO,
+           *lot* of debug output!  Also required CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO,
            and CONFIG_DEBUG_FS,
 
     5. In my experience, there were some missing function pointers in the LPC43xx
diff --git a/configs/lpc4330-xplorer/nsh/defconfig b/configs/lpc4330-xplorer/nsh/defconfig
index a6a461ba6c..13c015c5c4 100644
--- a/configs/lpc4330-xplorer/nsh/defconfig
+++ b/configs/lpc4330-xplorer/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_ARCH_STDARG_H=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/lpc4330-xplorer/src/lpc43_autoleds.c b/configs/lpc4330-xplorer/src/lpc43_autoleds.c
index 85a537e3d6..2d67cde475 100644
--- a/configs/lpc4330-xplorer/src/lpc43_autoleds.c
+++ b/configs/lpc4330-xplorer/src/lpc43_autoleds.c
@@ -90,7 +90,7 @@
  */
 
 /* Debug definitions ********************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/lpc4330-xplorer/src/lpc43_userleds.c b/configs/lpc4330-xplorer/src/lpc43_userleds.c
index d296cdf275..0de6d63063 100644
--- a/configs/lpc4330-xplorer/src/lpc43_userleds.c
+++ b/configs/lpc4330-xplorer/src/lpc43_userleds.c
@@ -67,7 +67,7 @@
  */
 
 /* Debug definitions ********************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/lpc4337-ws/README.txt b/configs/lpc4337-ws/README.txt
index 25dec3aad4..a62558a8a0 100644
--- a/configs/lpc4337-ws/README.txt
+++ b/configs/lpc4337-ws/README.txt
@@ -358,14 +358,14 @@ Code Red IDE/Tools
   in debugging symbols.
 
   NOTE 3:  There are few things that NuttX has to do differently if you
-  are using a debugger.  Make sure that you also set CONFIG_DEBUG=y.  Nothing
+  are using a debugger.  Make sure that you also set CONFIG_DEBUG_FEATURES=y.  Nothing
   also is needed and no debug output will be generated; but NuttX will
-  use CONFIG_DEBUG=y to mean that a debugger is attached and will deal
+  use CONFIG_DEBUG_FEATURES=y to mean that a debugger is attached and will deal
   with certain resets and debug controls appropriately.
 
   So you should have:
 
-    CONFIG_DEBUG=y
+    CONFIG_DEBUG_FEATURES=y
     CONFIG_DEBUG_SYMBOLS=y
 
   NOTE 4: Every time that you control-C out of the command line GDB, you
@@ -856,9 +856,9 @@ LPC4337-ws Configuration Options
     CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18
     CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented).
     CONFIG_NET_REGDEBUG - Enabled low level register debug.  Also needs
-      CONFIG_DEBUG.
+      CONFIG_DEBUG_FEATURES.
     CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets.
-      Also needs CONFIG_DEBUG.
+      Also needs CONFIG_DEBUG_FEATURES.
     CONFIG_NET_HASH - Enable receipt of near-perfect match frames.
 
   LPC43xx USB Device Configuration
@@ -967,7 +967,7 @@ Where  is one of the following:
            from the SPI address space after each write.
          CONFIG_DEBUG_SPIFI_DUMP - Debug option to dump read/write buffers.  You
            probably do not want to enable this unless you want to dig through a
-           *lot* of debug output!  Also required CONFIG_DEBUG, CONFIG_DEBUG_INFO,
+           *lot* of debug output!  Also required CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO,
            and CONFIG_DEBUG_FS,
 
     5. In my experience, there were some missing function pointers in the LPC43xx
diff --git a/configs/lpc4337-ws/nsh/defconfig b/configs/lpc4337-ws/nsh/defconfig
index 4f36719c26..11e1e3062f 100644
--- a/configs/lpc4337-ws/nsh/defconfig
+++ b/configs/lpc4337-ws/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_ARCH_STDARG_H=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/lpc4357-evb/README.txt b/configs/lpc4357-evb/README.txt
index f60934d6bd..c3febbec03 100644
--- a/configs/lpc4357-evb/README.txt
+++ b/configs/lpc4357-evb/README.txt
@@ -355,14 +355,14 @@ Code Red IDE/Tools
   in debugging symbols.
 
   NOTE 3:  There are few things that NuttX has to do differently if you
-  are using a debugger.  Make sure that you also set CONFIG_DEBUG=y.  Nothing
+  are using a debugger.  Make sure that you also set CONFIG_DEBUG_FEATURES=y.  Nothing
   also is needed and no debug output will be generated; but NuttX will
-  use CONFIG_DEBUG=y to mean that a debugger is attached and will deal
+  use CONFIG_DEBUG_FEATURES=y to mean that a debugger is attached and will deal
   with certain resets and debug controls appropriately.
 
   So you should have:
 
-    CONFIG_DEBUG=y
+    CONFIG_DEBUG_FEATURES=y
     CONFIG_DEBUG_SYMBOLS=y
 
   NOTE 4: Every time that you control-C out of the command line GDB, you
@@ -853,9 +853,9 @@ LPC4357-EVB Configuration Options
     CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18
     CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented).
     CONFIG_NET_REGDEBUG - Enabled low level register debug.  Also needs
-      CONFIG_DEBUG.
+      CONFIG_DEBUG_FEATURES.
     CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets.
-      Also needs CONFIG_DEBUG.
+      Also needs CONFIG_DEBUG_FEATURES.
     CONFIG_NET_HASH - Enable receipt of near-perfect match frames.
 
   LPC43xx USB Device Configuration
@@ -964,7 +964,7 @@ Where  is one of the following:
            from the SPI address space after each write.
          CONFIG_DEBUG_SPIFI_DUMP - Debug option to dump read/write buffers.  You
            probably do not want to enable this unless you want to dig through a
-           *lot* of debug output!  Also required CONFIG_DEBUG, CONFIG_DEBUG_INFO,
+           *lot* of debug output!  Also required CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO,
            and CONFIG_DEBUG_FS,
 
     5. In my experience, there were some missing function pointers in the LPC43xx
diff --git a/configs/lpc4357-evb/nsh/defconfig b/configs/lpc4357-evb/nsh/defconfig
index e1f25c97d5..37601e039c 100644
--- a/configs/lpc4357-evb/nsh/defconfig
+++ b/configs/lpc4357-evb/nsh/defconfig
@@ -41,7 +41,7 @@ CONFIG_ARCH_STDARG_H=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/lpc4357-evb/src/lpc43_autoleds.c b/configs/lpc4357-evb/src/lpc43_autoleds.c
index 1ff5dc954b..31589a84da 100644
--- a/configs/lpc4357-evb/src/lpc43_autoleds.c
+++ b/configs/lpc4357-evb/src/lpc43_autoleds.c
@@ -87,7 +87,7 @@
  */
 
 /* Debug definitions ********************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/lpc4357-evb/src/lpc43_userleds.c b/configs/lpc4357-evb/src/lpc43_userleds.c
index e7d4f672a0..29086a86d0 100644
--- a/configs/lpc4357-evb/src/lpc43_userleds.c
+++ b/configs/lpc4357-evb/src/lpc43_userleds.c
@@ -78,7 +78,7 @@
  */
 
 /* Debug definitions ********************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/lpc4370-link2/README.txt b/configs/lpc4370-link2/README.txt
index 492e8c4abc..9280b3258b 100644
--- a/configs/lpc4370-link2/README.txt
+++ b/configs/lpc4370-link2/README.txt
@@ -358,14 +358,14 @@ Code Red IDE/Tools
   in debugging symbols.
 
   NOTE 3:  There are few things that NuttX has to do differently if you
-  are using a debugger.  Make sure that you also set CONFIG_DEBUG=y.  Nothing
+  are using a debugger.  Make sure that you also set CONFIG_DEBUG_FEATURES=y.  Nothing
   also is needed and no debug output will be generated; but NuttX will
-  use CONFIG_DEBUG=y to mean that a debugger is attached and will deal
+  use CONFIG_DEBUG_FEATURES=y to mean that a debugger is attached and will deal
   with certain resets and debug controls appropriately.
 
   So you should have:
 
-    CONFIG_DEBUG=y
+    CONFIG_DEBUG_FEATURES=y
     CONFIG_DEBUG_SYMBOLS=y
 
   NOTE 4: Every time that you control-C out of the command line GDB, you
@@ -856,9 +856,9 @@ LPC4370-Link2 Configuration Options
     CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18
     CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented).
     CONFIG_NET_REGDEBUG - Enabled low level register debug.  Also needs
-      CONFIG_DEBUG.
+      CONFIG_DEBUG_FEATURES.
     CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets.
-      Also needs CONFIG_DEBUG.
+      Also needs CONFIG_DEBUG_FEATURES.
     CONFIG_NET_HASH - Enable receipt of near-perfect match frames.
 
   LPC43xx USB Device Configuration
@@ -967,7 +967,7 @@ Where  is one of the following:
            from the SPI address space after each write.
          CONFIG_DEBUG_SPIFI_DUMP - Debug option to dump read/write buffers.  You
            probably do not want to enable this unless you want to dig through a
-           *lot* of debug output!  Also required CONFIG_DEBUG, CONFIG_DEBUG_INFO,
+           *lot* of debug output!  Also required CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO,
            and CONFIG_DEBUG_FS,
 
     5. In my experience, there were some missing function pointers in the LPC43xx
diff --git a/configs/lpc4370-link2/nsh/defconfig b/configs/lpc4370-link2/nsh/defconfig
index 8a14cef067..82d3fdea90 100644
--- a/configs/lpc4370-link2/nsh/defconfig
+++ b/configs/lpc4370-link2/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_ARCH_STDARG_H=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/lpc4370-link2/src/lpc43_autoleds.c b/configs/lpc4370-link2/src/lpc43_autoleds.c
index 147a18316f..8e9edbf141 100644
--- a/configs/lpc4370-link2/src/lpc43_autoleds.c
+++ b/configs/lpc4370-link2/src/lpc43_autoleds.c
@@ -59,7 +59,7 @@
  ****************************************************************************/
 
 /* Debug definitions ********************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/lpc4370-link2/src/lpc43_userleds.c b/configs/lpc4370-link2/src/lpc43_userleds.c
index 1469e52ed6..294bf48078 100644
--- a/configs/lpc4370-link2/src/lpc43_userleds.c
+++ b/configs/lpc4370-link2/src/lpc43_userleds.c
@@ -60,7 +60,7 @@
 
 
 /* Debug definitions ********************************************************/
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/lpcxpresso-lpc1115/minnsh/defconfig b/configs/lpcxpresso-lpc1115/minnsh/defconfig
index 58ea587ca6..4b7a2748e9 100644
--- a/configs/lpcxpresso-lpc1115/minnsh/defconfig
+++ b/configs/lpcxpresso-lpc1115/minnsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/lpcxpresso-lpc1115/nsh/defconfig b/configs/lpcxpresso-lpc1115/nsh/defconfig
index fc7f470f6d..17f1bfde04 100644
--- a/configs/lpcxpresso-lpc1115/nsh/defconfig
+++ b/configs/lpcxpresso-lpc1115/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/lpcxpresso-lpc1115/src/lpc11_leds.c b/configs/lpcxpresso-lpc1115/src/lpc11_leds.c
index 0c1abf192c..06bb3e57c5 100644
--- a/configs/lpcxpresso-lpc1115/src/lpc11_leds.c
+++ b/configs/lpcxpresso-lpc1115/src/lpc11_leds.c
@@ -56,7 +56,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c b/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c
index 0cc48e117a..08847387ca 100644
--- a/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c
+++ b/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c
@@ -58,7 +58,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SSP_DEBUG   /* Define to enable debug */
 #undef SSP_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/lpcxpresso-lpc1768/README.txt b/configs/lpcxpresso-lpc1768/README.txt
index 4d00330a14..36d5eead96 100644
--- a/configs/lpcxpresso-lpc1768/README.txt
+++ b/configs/lpcxpresso-lpc1768/README.txt
@@ -676,9 +676,9 @@ LPCXpresso Configuration Options
     CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18
     CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented).
     CONFIG_NET_REGDEBUG - Enabled low level register debug.  Also needs
-      CONFIG_DEBUG.
+      CONFIG_DEBUG_FEATURES.
     CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets.
-      Also needs CONFIG_DEBUG.
+      Also needs CONFIG_DEBUG_FEATURES.
     CONFIG_NET_HASH - Enable receipt of near-perfect match frames.
     CONFIG_LPC17_MULTICAST - Enable receipt of multicast (and unicast) frames.
       Automatically set if CONFIG_NET_IGMP is selected.
diff --git a/configs/lpcxpresso-lpc1768/dhcpd/defconfig b/configs/lpcxpresso-lpc1768/dhcpd/defconfig
index aca1a2a69b..9e7037cf02 100644
--- a/configs/lpcxpresso-lpc1768/dhcpd/defconfig
+++ b/configs/lpcxpresso-lpc1768/dhcpd/defconfig
@@ -41,7 +41,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/lpcxpresso-lpc1768/nsh/defconfig b/configs/lpcxpresso-lpc1768/nsh/defconfig
index e5151fc961..e548bd2b89 100644
--- a/configs/lpcxpresso-lpc1768/nsh/defconfig
+++ b/configs/lpcxpresso-lpc1768/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/lpcxpresso-lpc1768/nx/defconfig b/configs/lpcxpresso-lpc1768/nx/defconfig
index e604f2997f..2473e7e4b3 100644
--- a/configs/lpcxpresso-lpc1768/nx/defconfig
+++ b/configs/lpcxpresso-lpc1768/nx/defconfig
@@ -41,7 +41,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_leds.c b/configs/lpcxpresso-lpc1768/src/lpc17_leds.c
index d454e1db75..cd18e6846e 100644
--- a/configs/lpcxpresso-lpc1768/src/lpc17_leds.c
+++ b/configs/lpcxpresso-lpc1768/src/lpc17_leds.c
@@ -56,7 +56,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_oled.c b/configs/lpcxpresso-lpc1768/src/lpc17_oled.c
index c61b67fb4b..5610c90c9c 100644
--- a/configs/lpcxpresso-lpc1768/src/lpc17_oled.c
+++ b/configs/lpcxpresso-lpc1768/src/lpc17_oled.c
@@ -75,7 +75,7 @@
  * Verbose debug must also be enabled
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_GRAPHICS
 #endif
diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c b/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c
index 632200a77f..f3239e42a8 100644
--- a/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c
+++ b/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c
@@ -58,7 +58,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SSP_DEBUG   /* Define to enable debug */
 #undef SSP_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/lpcxpresso-lpc1768/thttpd/defconfig b/configs/lpcxpresso-lpc1768/thttpd/defconfig
index 69b2148fdf..e203df5654 100644
--- a/configs/lpcxpresso-lpc1768/thttpd/defconfig
+++ b/configs/lpcxpresso-lpc1768/thttpd/defconfig
@@ -41,7 +41,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/lpcxpresso-lpc1768/usbmsc/defconfig b/configs/lpcxpresso-lpc1768/usbmsc/defconfig
index a6d2fa0c3d..fe6c95bf21 100644
--- a/configs/lpcxpresso-lpc1768/usbmsc/defconfig
+++ b/configs/lpcxpresso-lpc1768/usbmsc/defconfig
@@ -41,7 +41,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/maple/nsh/defconfig b/configs/maple/nsh/defconfig
index 54ebb6d22e..fd555b7de2 100644
--- a/configs/maple/nsh/defconfig
+++ b/configs/maple/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/maple/nx/defconfig b/configs/maple/nx/defconfig
index b60f26e071..686663cfa8 100644
--- a/configs/maple/nx/defconfig
+++ b/configs/maple/nx/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/maple/src/stm32_lcd.c b/configs/maple/src/stm32_lcd.c
index 567b5d5a56..13b7ba2c62 100644
--- a/configs/maple/src/stm32_lcd.c
+++ b/configs/maple/src/stm32_lcd.c
@@ -73,7 +73,7 @@
  * also be enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_GRAPHICS
 #  undef CONFIG_DEBUG_LCD
diff --git a/configs/maple/src/stm32_leds.c b/configs/maple/src/stm32_leds.c
index e372dca1d8..22f1d4e55a 100644
--- a/configs/maple/src/stm32_leds.c
+++ b/configs/maple/src/stm32_leds.c
@@ -57,7 +57,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/maple/src/stm32_spi.c b/configs/maple/src/stm32_spi.c
index 90df022c7f..9100c5632a 100644
--- a/configs/maple/src/stm32_spi.c
+++ b/configs/maple/src/stm32_spi.c
@@ -59,9 +59,9 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_SPI
 #endif
diff --git a/configs/maple/usbnsh/defconfig b/configs/maple/usbnsh/defconfig
index fe4466fd04..58380687fa 100644
--- a/configs/maple/usbnsh/defconfig
+++ b/configs/maple/usbnsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/mbed/README.txt b/configs/mbed/README.txt
index 8385d563f5..734ff3883d 100644
--- a/configs/mbed/README.txt
+++ b/configs/mbed/README.txt
@@ -349,9 +349,9 @@ mbed Configuration Options
     CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18
     CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented).
     CONFIG_NET_REGDEBUG - Enabled low level register debug.  Also needs
-      CONFIG_DEBUG.
+      CONFIG_DEBUG_FEATURES.
     CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets.
-      Also needs CONFIG_DEBUG.
+      Also needs CONFIG_DEBUG_FEATURES.
     CONFIG_NET_HASH - Enable receipt of near-perfect match frames.
     CONFIG_LPC17_MULTICAST - Enable receipt of multicast (and unicast) frames.
       Automatically set if CONFIG_NET_IGMP is selected.
diff --git a/configs/mbed/hidkbd/defconfig b/configs/mbed/hidkbd/defconfig
index ef889a0411..aec81d6444 100644
--- a/configs/mbed/hidkbd/defconfig
+++ b/configs/mbed/hidkbd/defconfig
@@ -37,7 +37,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/mbed/nsh/defconfig b/configs/mbed/nsh/defconfig
index dcfda7b8c9..6596091fc8 100644
--- a/configs/mbed/nsh/defconfig
+++ b/configs/mbed/nsh/defconfig
@@ -45,7 +45,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/mbed/src/lpc17_leds.c b/configs/mbed/src/lpc17_leds.c
index 2262ac0de7..c303cc33b9 100644
--- a/configs/mbed/src/lpc17_leds.c
+++ b/configs/mbed/src/lpc17_leds.c
@@ -60,7 +60,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/mcu123-lpc214x/composite/Make.defs b/configs/mcu123-lpc214x/composite/Make.defs
index a1d22707cc..8d1cd5305e 100644
--- a/configs/mcu123-lpc214x/composite/Make.defs
+++ b/configs/mcu123-lpc214x/composite/Make.defs
@@ -71,7 +71,7 @@ ifneq ($(HOSTOS),Cygwin)
 endif
 endif
 
-ifeq ("${CONFIG_DEBUG}","y")
+ifeq ("${CONFIG_DEBUG_FEATURES}","y")
   ARCHOPTIMIZATION = -g
 endif
 
@@ -115,7 +115,7 @@ EXEEXT =
 ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
   LDFLAGS += -g
 endif
 
diff --git a/configs/mcu123-lpc214x/composite/defconfig b/configs/mcu123-lpc214x/composite/defconfig
index 73d1c5912d..eda130109f 100644
--- a/configs/mcu123-lpc214x/composite/defconfig
+++ b/configs/mcu123-lpc214x/composite/defconfig
@@ -41,7 +41,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/mcu123-lpc214x/nsh/Make.defs b/configs/mcu123-lpc214x/nsh/Make.defs
index 35984af465..e7f4792f8a 100644
--- a/configs/mcu123-lpc214x/nsh/Make.defs
+++ b/configs/mcu123-lpc214x/nsh/Make.defs
@@ -71,7 +71,7 @@ ifneq ($(HOSTOS),Cygwin)
 endif
 endif
 
-ifeq ("${CONFIG_DEBUG}","y")
+ifeq ("${CONFIG_DEBUG_FEATURES}","y")
   ARCHOPTIMIZATION = -g
 endif
 
@@ -115,7 +115,7 @@ EXEEXT =
 ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
   LDFLAGS += -g
 endif
 
diff --git a/configs/mcu123-lpc214x/nsh/defconfig b/configs/mcu123-lpc214x/nsh/defconfig
index 4d7bbb44e8..ef65613050 100644
--- a/configs/mcu123-lpc214x/nsh/defconfig
+++ b/configs/mcu123-lpc214x/nsh/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/mcu123-lpc214x/src/lpc2148_spi1.c b/configs/mcu123-lpc214x/src/lpc2148_spi1.c
index aeddd22b97..3c1b5eca6e 100644
--- a/configs/mcu123-lpc214x/src/lpc2148_spi1.c
+++ b/configs/mcu123-lpc214x/src/lpc2148_spi1.c
@@ -548,7 +548,7 @@ FAR struct spi_dev_s *lpc214x_spibus_initialize(int port)
 
   /* Only the SPI1 interface is supported */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (port != 1)
     {
       return NULL;
diff --git a/configs/mcu123-lpc214x/usbmsc/Make.defs b/configs/mcu123-lpc214x/usbmsc/Make.defs
index 09495f17e2..cbdb32871a 100644
--- a/configs/mcu123-lpc214x/usbmsc/Make.defs
+++ b/configs/mcu123-lpc214x/usbmsc/Make.defs
@@ -71,7 +71,7 @@ ifneq ($(HOSTOS),Cygwin)
 endif
 endif
 
-ifeq ("${CONFIG_DEBUG}","y")
+ifeq ("${CONFIG_DEBUG_FEATURES}","y")
   ARCHOPTIMIZATION = -g
 endif
 
@@ -115,7 +115,7 @@ EXEEXT =
 ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
   LDFLAGS += -g
 endif
 
diff --git a/configs/mcu123-lpc214x/usbmsc/defconfig b/configs/mcu123-lpc214x/usbmsc/defconfig
index 5d58f0bba7..3fba717eaf 100644
--- a/configs/mcu123-lpc214x/usbmsc/defconfig
+++ b/configs/mcu123-lpc214x/usbmsc/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/mcu123-lpc214x/usbserial/Make.defs b/configs/mcu123-lpc214x/usbserial/Make.defs
index 54c6f3ffe4..5e6d6aa799 100644
--- a/configs/mcu123-lpc214x/usbserial/Make.defs
+++ b/configs/mcu123-lpc214x/usbserial/Make.defs
@@ -71,7 +71,7 @@ ifneq ($(HOSTOS),Cygwin)
 endif
 endif
 
-ifeq ("${CONFIG_DEBUG}","y")
+ifeq ("${CONFIG_DEBUG_FEATURES}","y")
   ARCHOPTIMIZATION = -g
 endif
 
@@ -115,7 +115,7 @@ EXEEXT =
 ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
   LDFLAGS += -g
 endif
 
diff --git a/configs/mcu123-lpc214x/usbserial/defconfig b/configs/mcu123-lpc214x/usbserial/defconfig
index e13970db02..4c01c08a48 100644
--- a/configs/mcu123-lpc214x/usbserial/defconfig
+++ b/configs/mcu123-lpc214x/usbserial/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/micropendous3/hello/defconfig b/configs/micropendous3/hello/defconfig
index a1a6f7ceec..b843bb70a7 100644
--- a/configs/micropendous3/hello/defconfig
+++ b/configs/micropendous3/hello/defconfig
@@ -42,7 +42,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/mikroe-stm32f4/README.txt b/configs/mikroe-stm32f4/README.txt
index e71797ffb1..59522039a4 100644
--- a/configs/mikroe-stm32f4/README.txt
+++ b/configs/mikroe-stm32f4/README.txt
@@ -660,7 +660,7 @@ Mikroe-STM32F4-specific Configuration Options
     CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_STM32_CAN2 is defined.
     CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
     CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
-    CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
+    CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an
       dump of all CAN registers.
 
   Mikroe-STM32F4 SPI Configuration
@@ -703,9 +703,9 @@ Mikroe-STM32F4-specific Configuration Options
    CONFIG_STM32_OTGFS_SOFINTR - Enable SOF interrupts.  Why would you ever
      want to do that?
    CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access
-     debug.  Depends on CONFIG_DEBUG.
+     debug.  Depends on CONFIG_DEBUG_FEATURES.
    CONFIG_STM32_USBHOST_PKTDUMP - Dump all incoming and outgoing USB
-     packets. Depends on CONFIG_DEBUG.
+     packets. Depends on CONFIG_DEBUG_FEATURES.
 
 Configurations
 ==============
diff --git a/configs/mikroe-stm32f4/fulldemo/defconfig b/configs/mikroe-stm32f4/fulldemo/defconfig
index 60e6ec4584..d2855b8219 100644
--- a/configs/mikroe-stm32f4/fulldemo/defconfig
+++ b/configs/mikroe-stm32f4/fulldemo/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/mikroe-stm32f4/kostest/defconfig b/configs/mikroe-stm32f4/kostest/defconfig
index 53c51bc66f..541bf36f6d 100644
--- a/configs/mikroe-stm32f4/kostest/defconfig
+++ b/configs/mikroe-stm32f4/kostest/defconfig
@@ -47,7 +47,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/mikroe-stm32f4/nsh/defconfig b/configs/mikroe-stm32f4/nsh/defconfig
index ddff8824cb..b70544ce97 100644
--- a/configs/mikroe-stm32f4/nsh/defconfig
+++ b/configs/mikroe-stm32f4/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/mikroe-stm32f4/nx/defconfig b/configs/mikroe-stm32f4/nx/defconfig
index e0bd19efdd..f15e9f29d5 100644
--- a/configs/mikroe-stm32f4/nx/defconfig
+++ b/configs/mikroe-stm32f4/nx/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/mikroe-stm32f4/nxlines/defconfig b/configs/mikroe-stm32f4/nxlines/defconfig
index 61f68f82d8..6d6e72883b 100644
--- a/configs/mikroe-stm32f4/nxlines/defconfig
+++ b/configs/mikroe-stm32f4/nxlines/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/mikroe-stm32f4/nxtext/defconfig b/configs/mikroe-stm32f4/nxtext/defconfig
index 06e3ab7ab2..efe5b4720f 100644
--- a/configs/mikroe-stm32f4/nxtext/defconfig
+++ b/configs/mikroe-stm32f4/nxtext/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/mikroe-stm32f4/src/stm32_mio283qt2.c b/configs/mikroe-stm32f4/src/stm32_mio283qt2.c
index 9cb05cddb4..9abd9ebe04 100644
--- a/configs/mikroe-stm32f4/src/stm32_mio283qt2.c
+++ b/configs/mikroe-stm32f4/src/stm32_mio283qt2.c
@@ -73,7 +73,7 @@
  * also be enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_GRAPHICS
 #  undef CONFIG_DEBUG_LCD
diff --git a/configs/mikroe-stm32f4/src/stm32_mio283qt9a.c b/configs/mikroe-stm32f4/src/stm32_mio283qt9a.c
index e6336e3145..c007e5aebe 100644
--- a/configs/mikroe-stm32f4/src/stm32_mio283qt9a.c
+++ b/configs/mikroe-stm32f4/src/stm32_mio283qt9a.c
@@ -74,7 +74,7 @@
  * also be enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_GRAPHICS
 #  undef CONFIG_DEBUG_LCD
diff --git a/configs/mikroe-stm32f4/src/stm32_spi.c b/configs/mikroe-stm32f4/src/stm32_spi.c
index 6c445f2c82..e35b332c6a 100644
--- a/configs/mikroe-stm32f4/src/stm32_spi.c
+++ b/configs/mikroe-stm32f4/src/stm32_spi.c
@@ -63,7 +63,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SPI_DEBUG   /* Define to enable debug */
 #undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/mikroe-stm32f4/usbnsh/defconfig b/configs/mikroe-stm32f4/usbnsh/defconfig
index aff176b9df..af0fd609fb 100644
--- a/configs/mikroe-stm32f4/usbnsh/defconfig
+++ b/configs/mikroe-stm32f4/usbnsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/mirtoo/nsh/defconfig b/configs/mirtoo/nsh/defconfig
index 1925e947cf..faf80c044b 100644
--- a/configs/mirtoo/nsh/defconfig
+++ b/configs/mirtoo/nsh/defconfig
@@ -45,7 +45,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/mirtoo/nxffs/defconfig b/configs/mirtoo/nxffs/defconfig
index 876d762db0..5a9b691c1b 100644
--- a/configs/mirtoo/nxffs/defconfig
+++ b/configs/mirtoo/nxffs/defconfig
@@ -45,7 +45,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/mirtoo/src/pic32_leds.c b/configs/mirtoo/src/pic32_leds.c
index 65622c8bac..99b3f8195b 100644
--- a/configs/mirtoo/src/pic32_leds.c
+++ b/configs/mirtoo/src/pic32_leds.c
@@ -93,7 +93,7 @@
 
 /* Debug ********************************************************************/
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS)
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
 #    define ledinfo lldbg
diff --git a/configs/mirtoo/src/pic32_spi2.c b/configs/mirtoo/src/pic32_spi2.c
index 23f7578ff4..bd3446a1d8 100644
--- a/configs/mirtoo/src/pic32_spi2.c
+++ b/configs/mirtoo/src/pic32_spi2.c
@@ -92,7 +92,7 @@
 #define GPIO_PGA117_CS      (GPIO_OUTPUT|GPIO_VALUE_ONE|GPIO_PORTB|GPIO_PIN7)
 #define GPIO_SST25VF032B_CS (GPIO_OUTPUT|GPIO_VALUE_ONE|GPIO_PORTB|GPIO_PIN13)
 
-/* The following enable debug output from this file (needs CONFIG_DEBUG too).
+/* The following enable debug output from this file (needs CONFIG_DEBUG_FEATURES too).
  *
  * CONFIG_DEBUG_SPI - Define to enable basic SPI debug
  */
diff --git a/configs/moteino-mega/hello/defconfig b/configs/moteino-mega/hello/defconfig
index 92218c71f2..c2cf278267 100644
--- a/configs/moteino-mega/hello/defconfig
+++ b/configs/moteino-mega/hello/defconfig
@@ -40,7 +40,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/moteino-mega/nsh/defconfig b/configs/moteino-mega/nsh/defconfig
index 3625027ae2..36156b8a29 100644
--- a/configs/moteino-mega/nsh/defconfig
+++ b/configs/moteino-mega/nsh/defconfig
@@ -40,7 +40,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/moteino-mega/src/avr_leds.c b/configs/moteino-mega/src/avr_leds.c
index 526f57c900..3770e8e927 100644
--- a/configs/moteino-mega/src/avr_leds.c
+++ b/configs/moteino-mega/src/avr_leds.c
@@ -57,7 +57,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/moxa/nsh/defconfig b/configs/moxa/nsh/defconfig
index ff3598cad6..a46d532713 100644
--- a/configs/moxa/nsh/defconfig
+++ b/configs/moxa/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/mx1ads/ostest/defconfig b/configs/mx1ads/ostest/defconfig
index 0740d2a158..b9442ef16f 100644
--- a/configs/mx1ads/ostest/defconfig
+++ b/configs/mx1ads/ostest/defconfig
@@ -41,7 +41,7 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/ne64badge/ostest/defconfig b/configs/ne64badge/ostest/defconfig
index f13118e580..52e1afd874 100644
--- a/configs/ne64badge/ostest/defconfig
+++ b/configs/ne64badge/ostest/defconfig
@@ -38,7 +38,7 @@ CONFIG_MOTOROLA_SREC=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/ne64badge/src/m9s12_buttons.c b/configs/ne64badge/src/m9s12_buttons.c
index 7871ecbb60..e35663b075 100644
--- a/configs/ne64badge/src/m9s12_buttons.c
+++ b/configs/ne64badge/src/m9s12_buttons.c
@@ -53,7 +53,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES with
  * CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/ne64badge/src/m9s12_leds.c b/configs/ne64badge/src/m9s12_leds.c
index 9fa059af1f..414b243000 100644
--- a/configs/ne64badge/src/m9s12_leds.c
+++ b/configs/ne64badge/src/m9s12_leds.c
@@ -52,7 +52,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/ne64badge/src/m9s12_spi.c b/configs/ne64badge/src/m9s12_spi.c
index b76b8509b9..4e69581a86 100644
--- a/configs/ne64badge/src/m9s12_spi.c
+++ b/configs/ne64badge/src/m9s12_spi.c
@@ -54,7 +54,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SPI_DEBUG   /* Define to enable debug */
 #undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/ntosd-dm320/nettest/defconfig b/configs/ntosd-dm320/nettest/defconfig
index 9b28755450..d5e1e4c25c 100644
--- a/configs/ntosd-dm320/nettest/defconfig
+++ b/configs/ntosd-dm320/nettest/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/ntosd-dm320/nsh/defconfig b/configs/ntosd-dm320/nsh/defconfig
index 3d30d84415..253a848408 100644
--- a/configs/ntosd-dm320/nsh/defconfig
+++ b/configs/ntosd-dm320/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/ntosd-dm320/poll/defconfig b/configs/ntosd-dm320/poll/defconfig
index 82d918604f..19312449ba 100644
--- a/configs/ntosd-dm320/poll/defconfig
+++ b/configs/ntosd-dm320/poll/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/ntosd-dm320/thttpd/defconfig b/configs/ntosd-dm320/thttpd/defconfig
index 55c20c3790..189372f25a 100644
--- a/configs/ntosd-dm320/thttpd/defconfig
+++ b/configs/ntosd-dm320/thttpd/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/ntosd-dm320/udp/defconfig b/configs/ntosd-dm320/udp/defconfig
index 906bc57eab..976f701824 100644
--- a/configs/ntosd-dm320/udp/defconfig
+++ b/configs/ntosd-dm320/udp/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/ntosd-dm320/webserver/defconfig b/configs/ntosd-dm320/webserver/defconfig
index 7173e67561..0c1575922b 100644
--- a/configs/ntosd-dm320/webserver/defconfig
+++ b/configs/ntosd-dm320/webserver/defconfig
@@ -45,7 +45,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/nucleo-144/f746-evalos/defconfig b/configs/nucleo-144/f746-evalos/defconfig
index 4c63ce773c..06fc415c04 100644
--- a/configs/nucleo-144/f746-evalos/defconfig
+++ b/configs/nucleo-144/f746-evalos/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 CONFIG_STACK_COLORATION=y
diff --git a/configs/nucleo-144/f746-nsh/defconfig b/configs/nucleo-144/f746-nsh/defconfig
index b8bcde84fe..68451cbb1b 100644
--- a/configs/nucleo-144/f746-nsh/defconfig
+++ b/configs/nucleo-144/f746-nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 CONFIG_STACK_COLORATION=y
diff --git a/configs/nucleo-144/f767-evalos/defconfig b/configs/nucleo-144/f767-evalos/defconfig
index e4165fa20d..5e15aafa6b 100644
--- a/configs/nucleo-144/f767-evalos/defconfig
+++ b/configs/nucleo-144/f767-evalos/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 CONFIG_STACK_COLORATION=y
diff --git a/configs/nucleo-144/f767-nsh/defconfig b/configs/nucleo-144/f767-nsh/defconfig
index 8e7fae13a4..d939a39556 100644
--- a/configs/nucleo-144/f767-nsh/defconfig
+++ b/configs/nucleo-144/f767-nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 CONFIG_STACK_COLORATION=y
diff --git a/configs/nucleo-144/src/stm32_autoleds.c b/configs/nucleo-144/src/stm32_autoleds.c
index 74334025a7..5003ea4384 100644
--- a/configs/nucleo-144/src/stm32_autoleds.c
+++ b/configs/nucleo-144/src/stm32_autoleds.c
@@ -54,7 +54,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/nucleo-144/src/stm32_userleds.c b/configs/nucleo-144/src/stm32_userleds.c
index 98d8020f63..1794a2845b 100644
--- a/configs/nucleo-144/src/stm32_userleds.c
+++ b/configs/nucleo-144/src/stm32_userleds.c
@@ -56,7 +56,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/nucleo-f303re/adc/defconfig b/configs/nucleo-f303re/adc/defconfig
index 4a26a328f9..c7f0d63378 100644
--- a/configs/nucleo-f303re/adc/defconfig
+++ b/configs/nucleo-f303re/adc/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/nucleo-f303re/can/defconfig b/configs/nucleo-f303re/can/defconfig
index 3fe7a7e6ff..3a3c06931a 100644
--- a/configs/nucleo-f303re/can/defconfig
+++ b/configs/nucleo-f303re/can/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/nucleo-f303re/nxlines/defconfig b/configs/nucleo-f303re/nxlines/defconfig
index 6ea676faa0..868dff9a65 100644
--- a/configs/nucleo-f303re/nxlines/defconfig
+++ b/configs/nucleo-f303re/nxlines/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/nucleo-f303re/pwm/defconfig b/configs/nucleo-f303re/pwm/defconfig
index 08973aff2a..e794d3b47c 100644
--- a/configs/nucleo-f303re/pwm/defconfig
+++ b/configs/nucleo-f303re/pwm/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/nucleo-f303re/serialrx/defconfig b/configs/nucleo-f303re/serialrx/defconfig
index 2203ccbe87..760b77e347 100644
--- a/configs/nucleo-f303re/serialrx/defconfig
+++ b/configs/nucleo-f303re/serialrx/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/nucleo-f303re/src/stm32_autoleds.c b/configs/nucleo-f303re/src/stm32_autoleds.c
index ef1b3cdb07..098fe24563 100644
--- a/configs/nucleo-f303re/src/stm32_autoleds.c
+++ b/configs/nucleo-f303re/src/stm32_autoleds.c
@@ -57,7 +57,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/nucleo-f303re/src/stm32_spi.c b/configs/nucleo-f303re/src/stm32_spi.c
index d9bb2000b9..28f4403518 100644
--- a/configs/nucleo-f303re/src/stm32_spi.c
+++ b/configs/nucleo-f303re/src/stm32_spi.c
@@ -60,7 +60,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SPI_DEBUG   /* Define to enable debug */
 #undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/nucleo-f303re/src/stm32_userleds.c b/configs/nucleo-f303re/src/stm32_userleds.c
index f7bc8dff30..bda0055d12 100644
--- a/configs/nucleo-f303re/src/stm32_userleds.c
+++ b/configs/nucleo-f303re/src/stm32_userleds.c
@@ -56,7 +56,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/nucleo-f303re/uavcan/defconfig b/configs/nucleo-f303re/uavcan/defconfig
index c68b048740..6473097cf3 100644
--- a/configs/nucleo-f303re/uavcan/defconfig
+++ b/configs/nucleo-f303re/uavcan/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/nucleo-f4x1re/f401-nsh/defconfig b/configs/nucleo-f4x1re/f401-nsh/defconfig
index bdacfd5723..164422be80 100644
--- a/configs/nucleo-f4x1re/f401-nsh/defconfig
+++ b/configs/nucleo-f4x1re/f401-nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/nucleo-f4x1re/f411-nsh/defconfig b/configs/nucleo-f4x1re/f411-nsh/defconfig
index 1192acfa94..5f35339032 100644
--- a/configs/nucleo-f4x1re/f411-nsh/defconfig
+++ b/configs/nucleo-f4x1re/f411-nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/nucleo-f4x1re/src/stm32_autoleds.c b/configs/nucleo-f4x1re/src/stm32_autoleds.c
index cfec1f4e6e..20882df345 100644
--- a/configs/nucleo-f4x1re/src/stm32_autoleds.c
+++ b/configs/nucleo-f4x1re/src/stm32_autoleds.c
@@ -58,7 +58,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/nucleo-f4x1re/src/stm32_spi.c b/configs/nucleo-f4x1re/src/stm32_spi.c
index b2f268afbc..91a3fcfc56 100644
--- a/configs/nucleo-f4x1re/src/stm32_spi.c
+++ b/configs/nucleo-f4x1re/src/stm32_spi.c
@@ -61,7 +61,7 @@
 
 /* Enables debug output from this file */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_SPI
 #  undef CONFIG_DEBUG_INFO
 #endif
diff --git a/configs/nucleo-f4x1re/src/stm32_userleds.c b/configs/nucleo-f4x1re/src/stm32_userleds.c
index 7aaa9954c5..ad45a69390 100644
--- a/configs/nucleo-f4x1re/src/stm32_userleds.c
+++ b/configs/nucleo-f4x1re/src/stm32_userleds.c
@@ -58,7 +58,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/nucleo-l476rg/nsh/defconfig b/configs/nucleo-l476rg/nsh/defconfig
index 4f58d7b1ae..40d1757a02 100644
--- a/configs/nucleo-l476rg/nsh/defconfig
+++ b/configs/nucleo-l476rg/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_DEBUG_INFO=y
 
diff --git a/configs/nucleo-l476rg/src/stm32_autoleds.c b/configs/nucleo-l476rg/src/stm32_autoleds.c
index af2a75424d..667fd024a0 100644
--- a/configs/nucleo-l476rg/src/stm32_autoleds.c
+++ b/configs/nucleo-l476rg/src/stm32_autoleds.c
@@ -58,7 +58,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/nucleo-l476rg/src/stm32_spi.c b/configs/nucleo-l476rg/src/stm32_spi.c
index b86dd6091a..a98a19c963 100644
--- a/configs/nucleo-l476rg/src/stm32_spi.c
+++ b/configs/nucleo-l476rg/src/stm32_spi.c
@@ -61,7 +61,7 @@
 
 /* Enables debug output from this file */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_SPI
 #  undef CONFIG_DEBUG_INFO
 #endif
diff --git a/configs/nucleo-l476rg/src/stm32_userleds.c b/configs/nucleo-l476rg/src/stm32_userleds.c
index fab0f27850..0521655dc4 100644
--- a/configs/nucleo-l476rg/src/stm32_userleds.c
+++ b/configs/nucleo-l476rg/src/stm32_userleds.c
@@ -58,7 +58,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/nutiny-nuc120/nsh/defconfig b/configs/nutiny-nuc120/nsh/defconfig
index 9c73cbc043..25df02b98d 100644
--- a/configs/nutiny-nuc120/nsh/defconfig
+++ b/configs/nutiny-nuc120/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 
 #
diff --git a/configs/nutiny-nuc120/src/nuc_led.c b/configs/nutiny-nuc120/src/nuc_led.c
index bb797e8ce2..712fec27c5 100644
--- a/configs/nutiny-nuc120/src/nuc_led.c
+++ b/configs/nutiny-nuc120/src/nuc_led.c
@@ -76,7 +76,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/olimex-efm32g880f128-stk/nsh/defconfig b/configs/olimex-efm32g880f128-stk/nsh/defconfig
index 99b47aac95..2437444121 100644
--- a/configs/olimex-efm32g880f128-stk/nsh/defconfig
+++ b/configs/olimex-efm32g880f128-stk/nsh/defconfig
@@ -45,7 +45,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/olimex-lpc-h3131/nsh/defconfig b/configs/olimex-lpc-h3131/nsh/defconfig
index f346317664..84f2cbd171 100644
--- a/configs/olimex-lpc-h3131/nsh/defconfig
+++ b/configs/olimex-lpc-h3131/nsh/defconfig
@@ -45,7 +45,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-lpc-h3131/src/lpc31_leds.c b/configs/olimex-lpc-h3131/src/lpc31_leds.c
index ac0659ab42..6817a1d3f3 100644
--- a/configs/olimex-lpc-h3131/src/lpc31_leds.c
+++ b/configs/olimex-lpc-h3131/src/lpc31_leds.c
@@ -57,7 +57,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/olimex-lpc-h3131/src/lpc31_spi.c b/configs/olimex-lpc-h3131/src/lpc31_spi.c
index d664922543..f8a13297c0 100644
--- a/configs/olimex-lpc-h3131/src/lpc31_spi.c
+++ b/configs/olimex-lpc-h3131/src/lpc31_spi.c
@@ -59,7 +59,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SPI_DEBUG   /* Define to enable debug */
 #undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/olimex-lpc1766stk/README.txt b/configs/olimex-lpc1766stk/README.txt
index 7739e8dc0e..9e88edd877 100644
--- a/configs/olimex-lpc1766stk/README.txt
+++ b/configs/olimex-lpc1766stk/README.txt
@@ -773,9 +773,9 @@ Olimex LPC1766-STK Configuration Options
     CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18
     CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented).
     CONFIG_NET_REGDEBUG - Enabled low level register debug.  Also needs
-      CONFIG_DEBUG.
+      CONFIG_DEBUG_FEATURES.
     CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets.
-      Also needs CONFIG_DEBUG.
+      Also needs CONFIG_DEBUG_FEATURES.
     CONFIG_NET_HASH - Enable receipt of near-perfect match frames.
     CONFIG_LPC17_MULTICAST - Enable receipt of multicast (and unicast) frames.
       Automatically set if CONFIG_NET_IGMP is selected.
@@ -929,7 +929,7 @@ Configuration Sub-Directories
     2. You may also want to define the following in your configuration file.
        Otherwise, you will have not feedback about what is going on:
 
-       CONFIG_DEBUG=y
+       CONFIG_DEBUG_FEATURES=y
        CONFIG_DEBUG_INFO=y
        CONFIG_DEBUG_FTPC=y
 
diff --git a/configs/olimex-lpc1766stk/ftpc/defconfig b/configs/olimex-lpc1766stk/ftpc/defconfig
index 612214ee67..b6d71ebeb1 100644
--- a/configs/olimex-lpc1766stk/ftpc/defconfig
+++ b/configs/olimex-lpc1766stk/ftpc/defconfig
@@ -42,7 +42,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-lpc1766stk/hidkbd/defconfig b/configs/olimex-lpc1766stk/hidkbd/defconfig
index 995016cfd6..56b10fb30f 100644
--- a/configs/olimex-lpc1766stk/hidkbd/defconfig
+++ b/configs/olimex-lpc1766stk/hidkbd/defconfig
@@ -45,7 +45,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-lpc1766stk/hidmouse/defconfig b/configs/olimex-lpc1766stk/hidmouse/defconfig
index f4e746ef76..8a34f1b45a 100644
--- a/configs/olimex-lpc1766stk/hidmouse/defconfig
+++ b/configs/olimex-lpc1766stk/hidmouse/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-lpc1766stk/nettest/defconfig b/configs/olimex-lpc1766stk/nettest/defconfig
index d9b5662152..3ea457fd88 100644
--- a/configs/olimex-lpc1766stk/nettest/defconfig
+++ b/configs/olimex-lpc1766stk/nettest/defconfig
@@ -41,7 +41,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-lpc1766stk/nsh/defconfig b/configs/olimex-lpc1766stk/nsh/defconfig
index 5de7c1a619..73b936feca 100644
--- a/configs/olimex-lpc1766stk/nsh/defconfig
+++ b/configs/olimex-lpc1766stk/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-lpc1766stk/nx/defconfig b/configs/olimex-lpc1766stk/nx/defconfig
index 34b2d4c3f0..897a1b3dd4 100644
--- a/configs/olimex-lpc1766stk/nx/defconfig
+++ b/configs/olimex-lpc1766stk/nx/defconfig
@@ -45,7 +45,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-lpc1766stk/slip-httpd/defconfig b/configs/olimex-lpc1766stk/slip-httpd/defconfig
index bf9a212683..a965a598b0 100644
--- a/configs/olimex-lpc1766stk/slip-httpd/defconfig
+++ b/configs/olimex-lpc1766stk/slip-httpd/defconfig
@@ -41,7 +41,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-lpc1766stk/src/lpc17_lcd.c b/configs/olimex-lpc1766stk/src/lpc17_lcd.c
index 3b2299f960..7861edf614 100644
--- a/configs/olimex-lpc1766stk/src/lpc17_lcd.c
+++ b/configs/olimex-lpc1766stk/src/lpc17_lcd.c
@@ -79,7 +79,7 @@
  * Verbose debug must also be enabled
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_GRAPHICS
 #endif
diff --git a/configs/olimex-lpc1766stk/src/lpc17_leds.c b/configs/olimex-lpc1766stk/src/lpc17_leds.c
index 1fce6e0512..7299f508fc 100644
--- a/configs/olimex-lpc1766stk/src/lpc17_leds.c
+++ b/configs/olimex-lpc1766stk/src/lpc17_leds.c
@@ -58,7 +58,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/olimex-lpc1766stk/src/lpc17_ssp.c b/configs/olimex-lpc1766stk/src/lpc17_ssp.c
index 5fe86c7f05..db562cc984 100644
--- a/configs/olimex-lpc1766stk/src/lpc17_ssp.c
+++ b/configs/olimex-lpc1766stk/src/lpc17_ssp.c
@@ -74,7 +74,7 @@
 #endif
 
 /* Debug ********************************************************************/
-/* The following enable debug output from this file (needs CONFIG_DEBUG too).
+/* The following enable debug output from this file (needs CONFIG_DEBUG_FEATURES too).
  *
  * CONFIG_SSP_DEBUG - Define to enable basic SSP debug
  * CONFIG_SSP_VERBOSE - Define to enable verbose SSP debug
diff --git a/configs/olimex-lpc1766stk/thttpd-binfs/defconfig b/configs/olimex-lpc1766stk/thttpd-binfs/defconfig
index da3dca2d7e..d3cdafdb9d 100644
--- a/configs/olimex-lpc1766stk/thttpd-binfs/defconfig
+++ b/configs/olimex-lpc1766stk/thttpd-binfs/defconfig
@@ -45,7 +45,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-lpc1766stk/thttpd-nxflat/defconfig b/configs/olimex-lpc1766stk/thttpd-nxflat/defconfig
index ae4b8bfd3e..505ddb9bdb 100644
--- a/configs/olimex-lpc1766stk/thttpd-nxflat/defconfig
+++ b/configs/olimex-lpc1766stk/thttpd-nxflat/defconfig
@@ -41,7 +41,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-lpc1766stk/usbmsc/defconfig b/configs/olimex-lpc1766stk/usbmsc/defconfig
index f499036204..35d7141e1a 100644
--- a/configs/olimex-lpc1766stk/usbmsc/defconfig
+++ b/configs/olimex-lpc1766stk/usbmsc/defconfig
@@ -41,7 +41,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-lpc1766stk/usbserial/defconfig b/configs/olimex-lpc1766stk/usbserial/defconfig
index 28806b7c2b..8a2e409f58 100644
--- a/configs/olimex-lpc1766stk/usbserial/defconfig
+++ b/configs/olimex-lpc1766stk/usbserial/defconfig
@@ -42,7 +42,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-lpc1766stk/zmodem/defconfig b/configs/olimex-lpc1766stk/zmodem/defconfig
index 5150356081..093cef7b7a 100644
--- a/configs/olimex-lpc1766stk/zmodem/defconfig
+++ b/configs/olimex-lpc1766stk/zmodem/defconfig
@@ -42,7 +42,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-lpc2378/nsh/Make.defs b/configs/olimex-lpc2378/nsh/Make.defs
index d5c026545c..e623ef3b85 100644
--- a/configs/olimex-lpc2378/nsh/Make.defs
+++ b/configs/olimex-lpc2378/nsh/Make.defs
@@ -76,7 +76,7 @@ ifneq ($(HOSTOS),Cygwin)
 endif
 endif
 
-ifeq ("${CONFIG_DEBUG}","y")
+ifeq ("${CONFIG_DEBUG_FEATURES}","y")
   ARCHOPTIMIZATION = -g
 endif
 
@@ -120,7 +120,7 @@ EXEEXT =
 ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
   LDFLAGS += -g
 endif
 
diff --git a/configs/olimex-lpc2378/nsh/defconfig b/configs/olimex-lpc2378/nsh/defconfig
index 207ae574d5..2670bc4dc0 100644
--- a/configs/olimex-lpc2378/nsh/defconfig
+++ b/configs/olimex-lpc2378/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-stm32-h405/src/stm32_autoleds.c b/configs/olimex-stm32-h405/src/stm32_autoleds.c
index 5a928b269f..8003b79621 100644
--- a/configs/olimex-stm32-h405/src/stm32_autoleds.c
+++ b/configs/olimex-stm32-h405/src/stm32_autoleds.c
@@ -55,7 +55,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/olimex-stm32-h405/src/stm32_userleds.c b/configs/olimex-stm32-h405/src/stm32_userleds.c
index f1ab8ed283..00bb661f4e 100644
--- a/configs/olimex-stm32-h405/src/stm32_userleds.c
+++ b/configs/olimex-stm32-h405/src/stm32_userleds.c
@@ -52,7 +52,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/olimex-stm32-h405/usbnsh/defconfig b/configs/olimex-stm32-h405/usbnsh/defconfig
index 5ba6d946fc..33a729cbde 100644
--- a/configs/olimex-stm32-h405/usbnsh/defconfig
+++ b/configs/olimex-stm32-h405/usbnsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-stm32-h407/nsh/defconfig b/configs/olimex-stm32-h407/nsh/defconfig
index 808193295b..17aafd0c0b 100644
--- a/configs/olimex-stm32-h407/nsh/defconfig
+++ b/configs/olimex-stm32-h407/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-stm32-h407/src/stm32_autoleds.c b/configs/olimex-stm32-h407/src/stm32_autoleds.c
index 67d5a75497..6f19d4a630 100644
--- a/configs/olimex-stm32-h407/src/stm32_autoleds.c
+++ b/configs/olimex-stm32-h407/src/stm32_autoleds.c
@@ -58,7 +58,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/olimex-stm32-h407/src/stm32_userleds.c b/configs/olimex-stm32-h407/src/stm32_userleds.c
index 02719fb94e..a4dd9aa31f 100644
--- a/configs/olimex-stm32-h407/src/stm32_userleds.c
+++ b/configs/olimex-stm32-h407/src/stm32_userleds.c
@@ -57,7 +57,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/olimex-stm32-p107/nsh/defconfig b/configs/olimex-stm32-p107/nsh/defconfig
index 5d921f8c5c..5f103a6e7e 100644
--- a/configs/olimex-stm32-p107/nsh/defconfig
+++ b/configs/olimex-stm32-p107/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-stm32-p107/src/stm32_spi.c b/configs/olimex-stm32-p107/src/stm32_spi.c
index 372cd50450..b45af59735 100644
--- a/configs/olimex-stm32-p107/src/stm32_spi.c
+++ b/configs/olimex-stm32-p107/src/stm32_spi.c
@@ -58,7 +58,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SPI_DEBUG   /* Define to enable debug */
 #undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/olimex-stm32-p207/nsh/defconfig b/configs/olimex-stm32-p207/nsh/defconfig
index 645352677c..3ccfd8bfee 100644
--- a/configs/olimex-stm32-p207/nsh/defconfig
+++ b/configs/olimex-stm32-p207/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-stm32-p207/src/stm32_autoleds.c b/configs/olimex-stm32-p207/src/stm32_autoleds.c
index 291759f60b..334b123e1c 100644
--- a/configs/olimex-stm32-p207/src/stm32_autoleds.c
+++ b/configs/olimex-stm32-p207/src/stm32_autoleds.c
@@ -55,7 +55,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/olimex-stm32-p207/src/stm32_userleds.c b/configs/olimex-stm32-p207/src/stm32_userleds.c
index ba1f3d8cc7..b11a576508 100644
--- a/configs/olimex-stm32-p207/src/stm32_userleds.c
+++ b/configs/olimex-stm32-p207/src/stm32_userleds.c
@@ -52,7 +52,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/olimex-strp711/nettest/Make.defs b/configs/olimex-strp711/nettest/Make.defs
index ca1550a6ed..67f4f77d67 100644
--- a/configs/olimex-strp711/nettest/Make.defs
+++ b/configs/olimex-strp711/nettest/Make.defs
@@ -71,7 +71,7 @@ ifneq ($(HOSTOS),Cygwin)
 endif
 endif
 
-ifeq ("${CONFIG_DEBUG}","y")
+ifeq ("${CONFIG_DEBUG_FEATURES}","y")
   ARCHOPTIMIZATION = -g
 endif
 
@@ -115,7 +115,7 @@ EXEEXT =
 ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
   LDFLAGS += -g
 endif
 
diff --git a/configs/olimex-strp711/nettest/defconfig b/configs/olimex-strp711/nettest/defconfig
index 2f698cc8bd..07d292a7a9 100644
--- a/configs/olimex-strp711/nettest/defconfig
+++ b/configs/olimex-strp711/nettest/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/olimex-strp711/nsh/Make.defs b/configs/olimex-strp711/nsh/Make.defs
index 268e6039eb..d2750fb667 100644
--- a/configs/olimex-strp711/nsh/Make.defs
+++ b/configs/olimex-strp711/nsh/Make.defs
@@ -71,7 +71,7 @@ ifneq ($(HOSTOS),Cygwin)
 endif
 endif
 
-ifeq ("${CONFIG_DEBUG}","y")
+ifeq ("${CONFIG_DEBUG_FEATURES}","y")
   ARCHOPTIMIZATION = -g
 endif
 
@@ -115,7 +115,7 @@ EXEEXT =
 ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
   LDFLAGS += -g
 endif
 
diff --git a/configs/olimex-strp711/nsh/defconfig b/configs/olimex-strp711/nsh/defconfig
index 790273c422..b6454a797f 100644
--- a/configs/olimex-strp711/nsh/defconfig
+++ b/configs/olimex-strp711/nsh/defconfig
@@ -38,7 +38,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/olimexino-stm32/can/defconfig b/configs/olimexino-stm32/can/defconfig
index 866967575e..284fc55b6d 100644
--- a/configs/olimexino-stm32/can/defconfig
+++ b/configs/olimexino-stm32/can/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 CONFIG_STACK_COLORATION=y
diff --git a/configs/olimexino-stm32/composite/defconfig b/configs/olimexino-stm32/composite/defconfig
index bb7055ac68..4db6ca49fb 100644
--- a/configs/olimexino-stm32/composite/defconfig
+++ b/configs/olimexino-stm32/composite/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 CONFIG_STACK_COLORATION=y
diff --git a/configs/olimexino-stm32/nsh/defconfig b/configs/olimexino-stm32/nsh/defconfig
index bff7b46119..a5d7847237 100644
--- a/configs/olimexino-stm32/nsh/defconfig
+++ b/configs/olimexino-stm32/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 CONFIG_STACK_COLORATION=y
diff --git a/configs/olimexino-stm32/smallnsh/defconfig b/configs/olimexino-stm32/smallnsh/defconfig
index 1429b4c2b4..efcbbe0a48 100644
--- a/configs/olimexino-stm32/smallnsh/defconfig
+++ b/configs/olimexino-stm32/smallnsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 CONFIG_STACK_COLORATION=y
diff --git a/configs/olimexino-stm32/src/stm32_leds.c b/configs/olimexino-stm32/src/stm32_leds.c
index ff823e5262..f51b89e165 100644
--- a/configs/olimexino-stm32/src/stm32_leds.c
+++ b/configs/olimexino-stm32/src/stm32_leds.c
@@ -54,7 +54,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/olimexino-stm32/src/stm32_spi.c b/configs/olimexino-stm32/src/stm32_spi.c
index 99b404326d..e71ab183c0 100644
--- a/configs/olimexino-stm32/src/stm32_spi.c
+++ b/configs/olimexino-stm32/src/stm32_spi.c
@@ -59,7 +59,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SPI_DEBUG   /* Define to enable debug */
 #undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/olimexino-stm32/tiny/defconfig b/configs/olimexino-stm32/tiny/defconfig
index 4fe4bb5a90..6a8fbe3cf6 100644
--- a/configs/olimexino-stm32/tiny/defconfig
+++ b/configs/olimexino-stm32/tiny/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 CONFIG_STACK_COLORATION=y
diff --git a/configs/open1788/README.txt b/configs/open1788/README.txt
index 4e2fae623f..8edd78ab13 100644
--- a/configs/open1788/README.txt
+++ b/configs/open1788/README.txt
@@ -438,8 +438,8 @@ CONFIGURATION
           debug output can be enabled with:
 
           Build Setup:
-            CONFIG_DEBUG=y                    : Enable debug features
-            CONFIG_DEBUG_INFO=y            : Enable verbose debug output
+            CONFIG_DEBUG_FEATURES=y           : Enable debug features
+            CONFIG_DEBUG_INFO=y               : Enable verbose debug output
             CONFIG_DEBUG_INPUT=y              : Enable debug output from input devices
 
        c) You will also have to disable SD card support to use this test.  The
@@ -463,7 +463,7 @@ CONFIGURATION
           For touchscreen debug output:
 
           Build Setup:
-            CONFIG_DEBUG=y
+            CONFIG_DEBUG_FEATURES=y
             CONFIG_DEBUG_INFO=y
             CONFIG_DEBUG_INPUT=y
 
diff --git a/configs/open1788/knsh/defconfig b/configs/open1788/knsh/defconfig
index 566df000ae..b28e4e87bf 100644
--- a/configs/open1788/knsh/defconfig
+++ b/configs/open1788/knsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/open1788/nsh/defconfig b/configs/open1788/nsh/defconfig
index 82a8f975de..00a7dd6711 100644
--- a/configs/open1788/nsh/defconfig
+++ b/configs/open1788/nsh/defconfig
@@ -41,7 +41,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/open1788/nxlines/defconfig b/configs/open1788/nxlines/defconfig
index 486cc41cb0..22e10f17cd 100644
--- a/configs/open1788/nxlines/defconfig
+++ b/configs/open1788/nxlines/defconfig
@@ -37,7 +37,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 
 #
diff --git a/configs/open1788/src/lpc17_autoleds.c b/configs/open1788/src/lpc17_autoleds.c
index 3f16d5cd06..30b44682a6 100644
--- a/configs/open1788/src/lpc17_autoleds.c
+++ b/configs/open1788/src/lpc17_autoleds.c
@@ -134,7 +134,7 @@
 #define LED_IDLE_OFF_SETBITS         ((OPEN1788_LED4) << OFF_SETBITS_SHIFT)
 #define LED_IDLE_OFF_CLRBITS         ((0) << OFF_CLRBITS_SHIFT)
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/open1788/src/lpc17_userleds.c b/configs/open1788/src/lpc17_userleds.c
index b7f1ca5d5b..2f75e67847 100644
--- a/configs/open1788/src/lpc17_userleds.c
+++ b/configs/open1788/src/lpc17_userleds.c
@@ -60,7 +60,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/p112/ostest/defconfig b/configs/p112/ostest/defconfig
index 4e2ebbff08..12359147a4 100644
--- a/configs/p112/ostest/defconfig
+++ b/configs/p112/ostest/defconfig
@@ -43,7 +43,7 @@ CONFIG_WINDOWS_NATIVE=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 
 #
diff --git a/configs/pcblogic-pic32mx/README.txt b/configs/pcblogic-pic32mx/README.txt
index d6e5176a5c..c98882584b 100644
--- a/configs/pcblogic-pic32mx/README.txt
+++ b/configs/pcblogic-pic32mx/README.txt
@@ -626,8 +626,8 @@ Configuration sub-directories
        To enable LCD debug output:
 
        Build Setup:
-         CONFIG_DEBUG=y                          : Enable debug features
-         CONFIG_DEBUG_INFO=y                  : Enable LCD debug
+         CONFIG_DEBUG_FEATURES=y                 : Enable debug features
+         CONFIG_DEBUG_INFO=y                     : Enable LCD debug
 
        NOTES:
        a. I do not have the LCD1602 working.  I may just be getting lost in the
diff --git a/configs/pcblogic-pic32mx/nsh/defconfig b/configs/pcblogic-pic32mx/nsh/defconfig
index 7a3de04aba..3585765cbe 100644
--- a/configs/pcblogic-pic32mx/nsh/defconfig
+++ b/configs/pcblogic-pic32mx/nsh/defconfig
@@ -45,7 +45,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c b/configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c
index 517bfee6a9..43027711d5 100644
--- a/configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c
+++ b/configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c
@@ -106,7 +106,7 @@
  * also be enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_GRAPHICS
 #  undef CONFIG_DEBUG_LCD
diff --git a/configs/pcduino-a10/nsh/defconfig b/configs/pcduino-a10/nsh/defconfig
index 95833160ff..0d5c40af7a 100644
--- a/configs/pcduino-a10/nsh/defconfig
+++ b/configs/pcduino-a10/nsh/defconfig
@@ -45,7 +45,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/pcduino-a10/src/a1x_leds.c b/configs/pcduino-a10/src/a1x_leds.c
index ee13572a7a..69b00d196b 100644
--- a/configs/pcduino-a10/src/a1x_leds.c
+++ b/configs/pcduino-a10/src/a1x_leds.c
@@ -90,7 +90,7 @@
  * application if CONFIG_ARCH_LEDS is not defined.
  */
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/pic32mx-starterkit/README.txt b/configs/pic32mx-starterkit/README.txt
index f89cf14663..196efadda9 100644
--- a/configs/pic32mx-starterkit/README.txt
+++ b/configs/pic32mx-starterkit/README.txt
@@ -991,9 +991,9 @@ PIC32MX specific PHY/Ethernet device driver settings
     CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 4
     CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented).
     CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets.
-      Also needs CONFIG_DEBUG.
+      Also needs CONFIG_DEBUG_FEATURES.
     CONFIG_NET_REGDEBUG - Enabled low level register debug.  Also needs
-      CONFIG_DEBUG.
+      CONFIG_DEBUG_FEATURES.
     CONFIG_NET_HASH - Enable receipt of near-perfect match frames.
     CONFIG_PIC32MX_MULTICAST - Enable receipt of multicast (and unicast) frames.
       Automatically set if CONFIG_NET_IGMP is selected.
diff --git a/configs/pic32mx-starterkit/nsh/defconfig b/configs/pic32mx-starterkit/nsh/defconfig
index f337701d2e..9d95806d46 100644
--- a/configs/pic32mx-starterkit/nsh/defconfig
+++ b/configs/pic32mx-starterkit/nsh/defconfig
@@ -45,7 +45,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/pic32mx-starterkit/nsh2/defconfig b/configs/pic32mx-starterkit/nsh2/defconfig
index 99d9569795..168b1157b5 100644
--- a/configs/pic32mx-starterkit/nsh2/defconfig
+++ b/configs/pic32mx-starterkit/nsh2/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/pic32mx-starterkit/src/pic32mx_leds.c b/configs/pic32mx-starterkit/src/pic32mx_leds.c
index 07480043b5..705de956ad 100644
--- a/configs/pic32mx-starterkit/src/pic32mx_leds.c
+++ b/configs/pic32mx-starterkit/src/pic32mx_leds.c
@@ -97,7 +97,7 @@
 
 /* Debug ********************************************************************/
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS)
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
 #    define ledinfo lldbg
diff --git a/configs/pic32mx-starterkit/src/pic32mx_spi.c b/configs/pic32mx-starterkit/src/pic32mx_spi.c
index 234f740d9e..4b18174c1c 100644
--- a/configs/pic32mx-starterkit/src/pic32mx_spi.c
+++ b/configs/pic32mx-starterkit/src/pic32mx_spi.c
@@ -58,7 +58,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* The following enable debug output from this file (needs CONFIG_DEBUG too).
+/* The following enable debug output from this file (needs CONFIG_DEBUG_FEATURES too).
  *
  * CONFIG_SPI_DEBUG - Define to enable basic SPI debug
  * CONFIG_SPI_VERBOSE - Define to enable verbose SPI debug
diff --git a/configs/pic32mx7mmb/README.txt b/configs/pic32mx7mmb/README.txt
index 641f159024..29fb0acbc1 100644
--- a/configs/pic32mx7mmb/README.txt
+++ b/configs/pic32mx7mmb/README.txt
@@ -569,9 +569,9 @@ PIC32MX specific PHY/Ethernet device driver settings
     CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 4
     CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented).
     CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets.
-      Also needs CONFIG_DEBUG.
+      Also needs CONFIG_DEBUG_FEATURES.
     CONFIG_NET_REGDEBUG - Enabled low level register debug.  Also needs
-      CONFIG_DEBUG.
+      CONFIG_DEBUG_FEATURES.
     CONFIG_NET_HASH - Enable receipt of near-perfect match frames.
     CONFIG_PIC32MX_MULTICAST - Enable receipt of multicast (and unicast) frames.
       Automatically set if CONFIG_NET_IGMP is selected.
diff --git a/configs/pic32mx7mmb/nsh/defconfig b/configs/pic32mx7mmb/nsh/defconfig
index 13adb9973c..fd10897fb8 100644
--- a/configs/pic32mx7mmb/nsh/defconfig
+++ b/configs/pic32mx7mmb/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/pic32mx7mmb/src/pic32_leds.c b/configs/pic32mx7mmb/src/pic32_leds.c
index c329b3a379..88cbbd164a 100644
--- a/configs/pic32mx7mmb/src/pic32_leds.c
+++ b/configs/pic32mx7mmb/src/pic32_leds.c
@@ -100,7 +100,7 @@
 
 /* Debug ********************************************************************/
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS)
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
 #    define ledinfo lldbg
diff --git a/configs/pic32mx7mmb/src/pic32_mio283qt2.c b/configs/pic32mx7mmb/src/pic32_mio283qt2.c
index 11b156e5f8..d083041692 100644
--- a/configs/pic32mx7mmb/src/pic32_mio283qt2.c
+++ b/configs/pic32mx7mmb/src/pic32_mio283qt2.c
@@ -73,7 +73,7 @@
  * also be enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_GRAPHICS
 #  undef CONFIG_DEBUG_LCD
diff --git a/configs/pic32mx7mmb/src/pic32_spi.c b/configs/pic32mx7mmb/src/pic32_spi.c
index 84a5db8b16..1768e5ddd6 100644
--- a/configs/pic32mx7mmb/src/pic32_spi.c
+++ b/configs/pic32mx7mmb/src/pic32_spi.c
@@ -75,7 +75,7 @@
 #define GPIO_SD_WP (GPIO_INPUT|GPIO_PORTG|GPIO_PIN6)
 #define GPIO_SD_CD (GPIO_INPUT|GPIO_INT|GPIO_PORTG|GPIO_PIN7)
 
-/* The following enable debug output from this file (needs CONFIG_DEBUG too).
+/* The following enable debug output from this file (needs CONFIG_DEBUG_FEATURES too).
  *
  * CONFIG_DEBUG_SPI - Define to enable basic SPI debug
  */
diff --git a/configs/pic32mz-starterkit/nsh/Make.defs b/configs/pic32mz-starterkit/nsh/Make.defs
index 83d48045e8..ab082145f3 100644
--- a/configs/pic32mz-starterkit/nsh/Make.defs
+++ b/configs/pic32mz-starterkit/nsh/Make.defs
@@ -103,7 +103,7 @@ ARCHWARNINGSXX = -Wall -Wshadow -Wundef
 ARCHDEFINES =
 
 ifeq ($(CONFIG_MIPS32_TOOLCHAIN_MICROCHIPL_XC32),y)
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
   ARCHCFLAGS += -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -fframe-base-loclist
 endif
 endif
diff --git a/configs/pic32mz-starterkit/nsh/defconfig b/configs/pic32mz-starterkit/nsh/defconfig
index 4948a286e6..3662e48eeb 100644
--- a/configs/pic32mz-starterkit/nsh/defconfig
+++ b/configs/pic32mz-starterkit/nsh/defconfig
@@ -45,7 +45,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/pic32mz-starterkit/src/pic32mz_autoleds.c b/configs/pic32mz-starterkit/src/pic32mz_autoleds.c
index f8aa219476..db41f99420 100644
--- a/configs/pic32mz-starterkit/src/pic32mz_autoleds.c
+++ b/configs/pic32mz-starterkit/src/pic32mz_autoleds.c
@@ -93,7 +93,7 @@
 
 /* Debug ********************************************************************/
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS)
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
 #    define ledinfo lldbg
diff --git a/configs/pic32mz-starterkit/src/pic32mz_userleds.c b/configs/pic32mz-starterkit/src/pic32mz_userleds.c
index a2bfc39e51..57849364c3 100644
--- a/configs/pic32mz-starterkit/src/pic32mz_userleds.c
+++ b/configs/pic32mz-starterkit/src/pic32mz_userleds.c
@@ -73,7 +73,7 @@
 
 /* Debug ********************************************************************/
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS)
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
 #    define ledinfo lldbg
diff --git a/configs/pirelli_dpl10/nsh_highram/defconfig b/configs/pirelli_dpl10/nsh_highram/defconfig
index d8eac38010..ad786886a8 100644
--- a/configs/pirelli_dpl10/nsh_highram/defconfig
+++ b/configs/pirelli_dpl10/nsh_highram/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/qemu-i486/nsh/defconfig b/configs/qemu-i486/nsh/defconfig
index c07faea1da..7f88c5286b 100644
--- a/configs/qemu-i486/nsh/defconfig
+++ b/configs/qemu-i486/nsh/defconfig
@@ -39,7 +39,7 @@ CONFIG_HOST_LINUX=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/qemu-i486/ostest/defconfig b/configs/qemu-i486/ostest/defconfig
index 9306bec0db..9ada6498ab 100644
--- a/configs/qemu-i486/ostest/defconfig
+++ b/configs/qemu-i486/ostest/defconfig
@@ -39,7 +39,7 @@ CONFIG_HOST_LINUX=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/rgmp/arm/default/defconfig b/configs/rgmp/arm/default/defconfig
index 4b1bf3a25c..8495938b1b 100644
--- a/configs/rgmp/arm/default/defconfig
+++ b/configs/rgmp/arm/default/defconfig
@@ -39,7 +39,7 @@ CONFIG_ARCH_MATH_H=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/rgmp/arm/nsh/defconfig b/configs/rgmp/arm/nsh/defconfig
index acbb59be36..90f2003195 100644
--- a/configs/rgmp/arm/nsh/defconfig
+++ b/configs/rgmp/arm/nsh/defconfig
@@ -39,7 +39,7 @@ CONFIG_ARCH_MATH_H=y
 #
 # Debug Options
 #
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_INFO is not set
diff --git a/configs/rgmp/x86/cxxtest/defconfig b/configs/rgmp/x86/cxxtest/defconfig
index 6823fb176e..d9ba51f827 100644
--- a/configs/rgmp/x86/cxxtest/defconfig
+++ b/configs/rgmp/x86/cxxtest/defconfig
@@ -39,7 +39,7 @@ CONFIG_ARCH_MATH_H=y
 #
 # Debug Options
 #
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_DEBUG_INFO=y
diff --git a/configs/rgmp/x86/default/defconfig b/configs/rgmp/x86/default/defconfig
index 6f10a9ed0e..5d6cb9c5f0 100644
--- a/configs/rgmp/x86/default/defconfig
+++ b/configs/rgmp/x86/default/defconfig
@@ -39,7 +39,7 @@ CONFIG_ARCH_MATH_H=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_DEBUG_SYMBOLS=y
diff --git a/configs/rgmp/x86/helloxx/defconfig b/configs/rgmp/x86/helloxx/defconfig
index c3491a89ae..bc8d365d29 100644
--- a/configs/rgmp/x86/helloxx/defconfig
+++ b/configs/rgmp/x86/helloxx/defconfig
@@ -39,7 +39,7 @@ CONFIG_ARCH_MATH_H=y
 #
 # Debug Options
 #
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_DEBUG_INFO=y
diff --git a/configs/rgmp/x86/nsh/defconfig b/configs/rgmp/x86/nsh/defconfig
index ff56c8ecf8..7bd35b1c0d 100644
--- a/configs/rgmp/x86/nsh/defconfig
+++ b/configs/rgmp/x86/nsh/defconfig
@@ -39,7 +39,7 @@ CONFIG_ARCH_MATH_H=y
 #
 # Debug Options
 #
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_INFO is not set
diff --git a/configs/sabre-6quad/README.txt b/configs/sabre-6quad/README.txt
index 8835b84b4f..965d2d908e 100644
--- a/configs/sabre-6quad/README.txt
+++ b/configs/sabre-6quad/README.txt
@@ -79,7 +79,7 @@ Status
   configuration that I used for testing.  I enabled DEBUG output, ran with
   only 2 CPUS, and disabled the RAMLOG:
 
-    +CONFIG_DEBUG=y
+    +CONFIG_DEBUG_FEATURES=y
     +CONFIG_DEBUG_INFO=y
     +CONFIG_DEBUG_SCHED=y
     +CONFIG_DEBUG_SYMBOLS=y
diff --git a/configs/sabre-6quad/nsh/defconfig b/configs/sabre-6quad/nsh/defconfig
index 25b14c99ff..5d95de0c17 100644
--- a/configs/sabre-6quad/nsh/defconfig
+++ b/configs/sabre-6quad/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/sabre-6quad/smp/defconfig b/configs/sabre-6quad/smp/defconfig
index 2cd36db127..5e8afbadb1 100644
--- a/configs/sabre-6quad/smp/defconfig
+++ b/configs/sabre-6quad/smp/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/sabre-6quad/src/imx_autoleds.c b/configs/sabre-6quad/src/imx_autoleds.c
index 65c45ef2cd..487f3d69cb 100644
--- a/configs/sabre-6quad/src/imx_autoleds.c
+++ b/configs/sabre-6quad/src/imx_autoleds.c
@@ -82,7 +82,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/sam3u-ek/README.txt b/configs/sam3u-ek/README.txt
index 75fa2f8e3a..c4dadfe809 100644
--- a/configs/sam3u-ek/README.txt
+++ b/configs/sam3u-ek/README.txt
@@ -624,8 +624,8 @@ Configurations
           debug output on UART0 can be enabled with:
 
           Build Setup:
-            CONFIG_DEBUG=y                    : Enable debug features
-            CONFIG_DEBUG_INFO=y            : Enable verbose debug output
+            CONFIG_DEBUG_FEATURES=y           : Enable debug features
+            CONFIG_DEBUG_INFO=y               : Enable verbose debug output
             CONFIG_DEBUG_INPUT=y              : Enable debug output from input devices
 
     3. Enabling HSMCI support. The SAM3U-KE provides a an SD memory card
diff --git a/configs/sam3u-ek/knsh/defconfig b/configs/sam3u-ek/knsh/defconfig
index e7e5b4d898..9a56064aa0 100644
--- a/configs/sam3u-ek/knsh/defconfig
+++ b/configs/sam3u-ek/knsh/defconfig
@@ -47,7 +47,7 @@ CONFIG_NUTTX_USERSPACE=0x00090000
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/sam3u-ek/nsh/defconfig b/configs/sam3u-ek/nsh/defconfig
index 028d86b604..0f23cf44ca 100644
--- a/configs/sam3u-ek/nsh/defconfig
+++ b/configs/sam3u-ek/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/sam3u-ek/nx/defconfig b/configs/sam3u-ek/nx/defconfig
index 5a1d8b2466..f8f9a7ffe8 100644
--- a/configs/sam3u-ek/nx/defconfig
+++ b/configs/sam3u-ek/nx/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/sam3u-ek/nxwm/defconfig b/configs/sam3u-ek/nxwm/defconfig
index 407a4e34d5..da3c51728a 100644
--- a/configs/sam3u-ek/nxwm/defconfig
+++ b/configs/sam3u-ek/nxwm/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/sam3u-ek/src/sam_lcd.c b/configs/sam3u-ek/src/sam_lcd.c
index 4aa0e28d22..467d199eb8 100644
--- a/configs/sam3u-ek/src/sam_lcd.c
+++ b/configs/sam3u-ek/src/sam_lcd.c
@@ -142,7 +142,7 @@
 
 /* Verbose debug must also be enabled */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_LED
 #endif
diff --git a/configs/sam3u-ek/src/sam_leds.c b/configs/sam3u-ek/src/sam_leds.c
index 8d702f5f20..e2cc82a99f 100644
--- a/configs/sam3u-ek/src/sam_leds.c
+++ b/configs/sam3u-ek/src/sam_leds.c
@@ -58,7 +58,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/sam3u-ek/src/sam_spi.c b/configs/sam3u-ek/src/sam_spi.c
index 39fb1da061..1b7768057e 100644
--- a/configs/sam3u-ek/src/sam_spi.c
+++ b/configs/sam3u-ek/src/sam_spi.c
@@ -59,7 +59,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SPI_DEBUG   /* Define to enable debug */
 #undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/sam4e-ek/README.txt b/configs/sam4e-ek/README.txt
index 63d2afa21a..41694bc275 100644
--- a/configs/sam4e-ek/README.txt
+++ b/configs/sam4e-ek/README.txt
@@ -815,7 +815,7 @@ USB Full-Speed Device
   --------------------
 
   There is normal console debug output available that can be enabled with
-  CONFIG_DEBUG + CONFIG_DEBUG_USB.  However, USB device operation is very
+  CONFIG_DEBUG_FEATURES + CONFIG_DEBUG_USB.  However, USB device operation is very
   time critical and enabling this debug output WILL interfere with the
   operation of the UDP.  USB device tracing is a less invasive way to get
   debug information:  If tracing is enabled, the USB device will save
@@ -943,9 +943,9 @@ Touchscreen
     debug output on UART0 can be enabled with:
 
     Build Setup:
-      CONFIG_DEBUG=y                    : Enable debug features
-      CONFIG_DEBUG_INFO=y            : Enable verbose debug output
-      CONFIG_DEBUG_INPUT=y              : Enable debug output from input devices
+      CONFIG_DEBUG_FEATURES=y               : Enable debug features
+      CONFIG_DEBUG_INFO=y                   : Enable verbose debug output
+      CONFIG_DEBUG_INPUT=y                  : Enable debug output from input devices
 
     STATUS: Verified 2014-05-14
 
@@ -1439,8 +1439,8 @@ Configurations
        debug output on UART0 can be enabled with:
 
        Build Setup:
-         CONFIG_DEBUG=y                    : Enable debug features
-         CONFIG_DEBUG_INFO=y            : Enable verbose debug output
+         CONFIG_DEBUG_FEATURES=y           : Enable debug features
+         CONFIG_DEBUG_INFO=y               : Enable verbose debug output
          CONFIG_DEBUG_INPUT=y              : Enable debug output from input devices
 
    10. This configuration can be re-configured to test the on-board LCD
diff --git a/configs/sam4e-ek/nsh/defconfig b/configs/sam4e-ek/nsh/defconfig
index 9790e30919..e6d405873f 100644
--- a/configs/sam4e-ek/nsh/defconfig
+++ b/configs/sam4e-ek/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/sam4e-ek/nxwm/defconfig b/configs/sam4e-ek/nxwm/defconfig
index c5e1de7a6b..2ef7b2a98f 100644
--- a/configs/sam4e-ek/nxwm/defconfig
+++ b/configs/sam4e-ek/nxwm/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/sam4e-ek/src/sam_ili9325.c b/configs/sam4e-ek/src/sam_ili9325.c
index 1aee4173ae..a589d40ab2 100644
--- a/configs/sam4e-ek/src/sam_ili9325.c
+++ b/configs/sam4e-ek/src/sam_ili9325.c
@@ -201,7 +201,7 @@
  * also be enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_GRAPHICS
 #  undef CONFIG_DEBUG_LCD
diff --git a/configs/sam4e-ek/src/sam_ili9341.c b/configs/sam4e-ek/src/sam_ili9341.c
index 48d755e43b..26aa294945 100644
--- a/configs/sam4e-ek/src/sam_ili9341.c
+++ b/configs/sam4e-ek/src/sam_ili9341.c
@@ -202,7 +202,7 @@
  * also be enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_GRAPHICS
 #  undef CONFIG_DEBUG_LCD
diff --git a/configs/sam4e-ek/src/sam_leds.c b/configs/sam4e-ek/src/sam_leds.c
index 747428abac..329ff4078d 100644
--- a/configs/sam4e-ek/src/sam_leds.c
+++ b/configs/sam4e-ek/src/sam_leds.c
@@ -98,7 +98,7 @@
 #define D4_ON          (LED_ON << D4_SHIFT)
 #define D4_NOCHANGE    (LED_NOCHANGE << D4_SHIFT)
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/sam4e-ek/src/sam_spi.c b/configs/sam4e-ek/src/sam_spi.c
index 42e92ac917..e94fbd6308 100644
--- a/configs/sam4e-ek/src/sam_spi.c
+++ b/configs/sam4e-ek/src/sam_spi.c
@@ -59,7 +59,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SPI_DEBUG   /* Define to enable debug */
 #undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/sam4e-ek/usbnsh/defconfig b/configs/sam4e-ek/usbnsh/defconfig
index 09a19f5aea..80736c4caa 100644
--- a/configs/sam4e-ek/usbnsh/defconfig
+++ b/configs/sam4e-ek/usbnsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/sam4l-xplained/nsh/defconfig b/configs/sam4l-xplained/nsh/defconfig
index 223ce701c6..60170ad2aa 100644
--- a/configs/sam4l-xplained/nsh/defconfig
+++ b/configs/sam4l-xplained/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/sam4l-xplained/src/sam_autoleds.c b/configs/sam4l-xplained/src/sam_autoleds.c
index 91d59db7e5..1a695ca3d3 100644
--- a/configs/sam4l-xplained/src/sam_autoleds.c
+++ b/configs/sam4l-xplained/src/sam_autoleds.c
@@ -81,7 +81,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/sam4l-xplained/src/sam_slcd.c b/configs/sam4l-xplained/src/sam_slcd.c
index 844d438821..9b53b14724 100644
--- a/configs/sam4l-xplained/src/sam_slcd.c
+++ b/configs/sam4l-xplained/src/sam_slcd.c
@@ -85,7 +85,7 @@
 #  error CONFIG_SAM34_RC32K be selected in the board configuration
 #endif
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_GRAPHICS
 #  undef CONFIG_DEBUG_LCD
diff --git a/configs/sam4l-xplained/src/sam_spi.c b/configs/sam4l-xplained/src/sam_spi.c
index 1c74d8e9f8..9135e6dfb4 100644
--- a/configs/sam4l-xplained/src/sam_spi.c
+++ b/configs/sam4l-xplained/src/sam_spi.c
@@ -54,7 +54,7 @@
 /************************************************************************************
  * Pre-processor Definitions
  ************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SPI_DEBUG   /* Define to enable debug */
 #undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/sam4l-xplained/src/sam_userleds.c b/configs/sam4l-xplained/src/sam_userleds.c
index 8e5ab2e699..d3849f6768 100644
--- a/configs/sam4l-xplained/src/sam_userleds.c
+++ b/configs/sam4l-xplained/src/sam_userleds.c
@@ -66,7 +66,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/sam4s-xplained-pro/nsh/defconfig b/configs/sam4s-xplained-pro/nsh/defconfig
index d5008bd41a..e796be0db2 100644
--- a/configs/sam4s-xplained-pro/nsh/defconfig
+++ b/configs/sam4s-xplained-pro/nsh/defconfig
@@ -43,7 +43,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/sam4s-xplained-pro/src/sam_autoleds.c b/configs/sam4s-xplained-pro/src/sam_autoleds.c
index aabf3fca5e..22b6688d0e 100644
--- a/configs/sam4s-xplained-pro/src/sam_autoleds.c
+++ b/configs/sam4s-xplained-pro/src/sam_autoleds.c
@@ -74,7 +74,7 @@
  *   LED_IDLE             MCU is is sleep mode       Not used
  */
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/sam4s-xplained-pro/src/sam_tc.c b/configs/sam4s-xplained-pro/src/sam_tc.c
index 06a5ae8668..a6e9fc7854 100644
--- a/configs/sam4s-xplained-pro/src/sam_tc.c
+++ b/configs/sam4s-xplained-pro/src/sam_tc.c
@@ -102,7 +102,7 @@
  * timer
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_TIMER
 #endif
 
diff --git a/configs/sam4s-xplained-pro/src/sam_userleds.c b/configs/sam4s-xplained-pro/src/sam_userleds.c
index aa67cc33a1..e7b604e529 100644
--- a/configs/sam4s-xplained-pro/src/sam_userleds.c
+++ b/configs/sam4s-xplained-pro/src/sam_userleds.c
@@ -56,7 +56,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/sam4s-xplained-pro/src/sam_wdt.c b/configs/sam4s-xplained-pro/src/sam_wdt.c
index e0f845e337..f9ebfb46c6 100644
--- a/configs/sam4s-xplained-pro/src/sam_wdt.c
+++ b/configs/sam4s-xplained-pro/src/sam_wdt.c
@@ -85,7 +85,7 @@
 /* Debug ***************************************************************************/
 /* Non-standard debug that may be enabled just for testing the watchdog timer */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_WATCHDOG
 #endif
 
diff --git a/configs/sam4s-xplained/nsh/defconfig b/configs/sam4s-xplained/nsh/defconfig
index 583fa8d926..18055fb119 100644
--- a/configs/sam4s-xplained/nsh/defconfig
+++ b/configs/sam4s-xplained/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/sam4s-xplained/src/sam_autoleds.c b/configs/sam4s-xplained/src/sam_autoleds.c
index fd1a2a448a..289b3e01dd 100644
--- a/configs/sam4s-xplained/src/sam_autoleds.c
+++ b/configs/sam4s-xplained/src/sam_autoleds.c
@@ -73,7 +73,7 @@
  *   LED_IDLE             MCU is is sleep mode         Not used
  */
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/sam4s-xplained/src/sam_userleds.c b/configs/sam4s-xplained/src/sam_userleds.c
index e501a0db3e..bd1411c800 100644
--- a/configs/sam4s-xplained/src/sam_userleds.c
+++ b/configs/sam4s-xplained/src/sam_userleds.c
@@ -55,7 +55,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/sama5d2-xult/nsh/defconfig b/configs/sama5d2-xult/nsh/defconfig
index 537cb8d4ea..dcd38abd68 100644
--- a/configs/sama5d2-xult/nsh/defconfig
+++ b/configs/sama5d2-xult/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d2-xult/src/sam_autoleds.c b/configs/sama5d2-xult/src/sam_autoleds.c
index 4336f047fd..f7875f73a0 100644
--- a/configs/sama5d2-xult/src/sam_autoleds.c
+++ b/configs/sama5d2-xult/src/sam_autoleds.c
@@ -89,7 +89,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/sama5d2-xult/src/sam_userleds.c b/configs/sama5d2-xult/src/sam_userleds.c
index bc29bcb7b6..03299f8d40 100644
--- a/configs/sama5d2-xult/src/sam_userleds.c
+++ b/configs/sama5d2-xult/src/sam_userleds.c
@@ -65,7 +65,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/sama5d3-xplained/README.txt b/configs/sama5d3-xplained/README.txt
index 93cfb9a6c2..336008da1e 100644
--- a/configs/sama5d3-xplained/README.txt
+++ b/configs/sama5d3-xplained/README.txt
@@ -1356,7 +1356,7 @@ USB High-Speed Device
   --------------------
 
   There is normal console debug output available that can be enabled with
-  CONFIG_DEBUG + CONFIG_DEBUG_USB.  However, USB device operation is very
+  CONFIG_DEBUG_FEATURES + CONFIG_DEBUG_USB.  However, USB device operation is very
   time critical and enabling this debug output WILL interfere with the
   operation of the UDPHS.  USB device tracing is a less invasive way to get
   debug information:  If tracing is enabled, the USB device will save
@@ -1550,7 +1550,7 @@ file1: CONFIG_USBHOST_ISOC_DISABLE=y
   ------------------
 
   There is normal console debug output available that can be enabled with
-  CONFIG_DEBUG + CONFIG_DEBUG_USB.  However, USB host operation is very time
+  CONFIG_DEBUG_FEATURES + CONFIG_DEBUG_USB.  However, USB host operation is very time
   critical and enabling this debug output might interfere with the operation
   of the UDPHS.  USB host tracing is a less invasive way to get debug
   information:  If tracing is enabled, the USB host will save encoded trace
diff --git a/configs/sama5d3-xplained/bridge/defconfig b/configs/sama5d3-xplained/bridge/defconfig
index 59d6feb7a2..21cbf729de 100644
--- a/configs/sama5d3-xplained/bridge/defconfig
+++ b/configs/sama5d3-xplained/bridge/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d3-xplained/nsh/defconfig b/configs/sama5d3-xplained/nsh/defconfig
index 9e517d9edb..b096817b15 100644
--- a/configs/sama5d3-xplained/nsh/defconfig
+++ b/configs/sama5d3-xplained/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d3-xplained/src/sam_autoleds.c b/configs/sama5d3-xplained/src/sam_autoleds.c
index 208761c25c..468f74c33c 100644
--- a/configs/sama5d3-xplained/src/sam_autoleds.c
+++ b/configs/sama5d3-xplained/src/sam_autoleds.c
@@ -91,7 +91,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/sama5d3-xplained/src/sam_spi.c b/configs/sama5d3-xplained/src/sam_spi.c
index 903f8b93aa..588e24a834 100644
--- a/configs/sama5d3-xplained/src/sam_spi.c
+++ b/configs/sama5d3-xplained/src/sam_spi.c
@@ -59,7 +59,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SPI_DEBUG   /* Define to enable debug */
 #undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/sama5d3-xplained/src/sam_userleds.c b/configs/sama5d3-xplained/src/sam_userleds.c
index c8464c6ad0..3b31c71813 100644
--- a/configs/sama5d3-xplained/src/sam_userleds.c
+++ b/configs/sama5d3-xplained/src/sam_userleds.c
@@ -67,7 +67,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/sama5d3x-ek/README.txt b/configs/sama5d3x-ek/README.txt
index 82a5c2fd4c..f6601d2653 100644
--- a/configs/sama5d3x-ek/README.txt
+++ b/configs/sama5d3x-ek/README.txt
@@ -1534,7 +1534,7 @@ USB High-Speed Device
   --------------------
 
   There is normal console debug output available that can be enabled with
-  CONFIG_DEBUG + CONFIG_DEBUG_USB.  However, USB device operation is very
+  CONFIG_DEBUG_FEATURES + CONFIG_DEBUG_USB.  However, USB device operation is very
   time critical and enabling this debug output WILL interfere with the
   operation of the UDPHS.  USB device tracing is a less invasive way to get
   debug information:  If tracing is enabled, the USB device will save
@@ -1718,7 +1718,7 @@ USB High-Speed Host
   ------------------
 
   There is normal console debug output available that can be enabled with
-  CONFIG_DEBUG + CONFIG_DEBUG_USB.  However, USB host operation is very time
+  CONFIG_DEBUG_FEATURES + CONFIG_DEBUG_USB.  However, USB host operation is very time
   critical and enabling this debug output might interfere with the operation
   of the UDPHS.  USB host tracing is a less invasive way to get debug
   information:  If tracing is enabled, the USB host will save encoded trace
diff --git a/configs/sama5d3x-ek/demo/defconfig b/configs/sama5d3x-ek/demo/defconfig
index 6805bd04ab..a25290cbec 100644
--- a/configs/sama5d3x-ek/demo/defconfig
+++ b/configs/sama5d3x-ek/demo/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d3x-ek/hello/defconfig b/configs/sama5d3x-ek/hello/defconfig
index 0be49453e1..e1677b9444 100644
--- a/configs/sama5d3x-ek/hello/defconfig
+++ b/configs/sama5d3x-ek/hello/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d3x-ek/norboot/defconfig b/configs/sama5d3x-ek/norboot/defconfig
index 56b211c95f..f6888c8649 100644
--- a/configs/sama5d3x-ek/norboot/defconfig
+++ b/configs/sama5d3x-ek/norboot/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d3x-ek/nsh/defconfig b/configs/sama5d3x-ek/nsh/defconfig
index 78c2073493..cd3c6e0256 100644
--- a/configs/sama5d3x-ek/nsh/defconfig
+++ b/configs/sama5d3x-ek/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d3x-ek/nx/defconfig b/configs/sama5d3x-ek/nx/defconfig
index 7a4734bead..5bd9fd49e1 100644
--- a/configs/sama5d3x-ek/nx/defconfig
+++ b/configs/sama5d3x-ek/nx/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d3x-ek/nxplayer/defconfig b/configs/sama5d3x-ek/nxplayer/defconfig
index 7a1878be00..51feda7a00 100644
--- a/configs/sama5d3x-ek/nxplayer/defconfig
+++ b/configs/sama5d3x-ek/nxplayer/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d3x-ek/nxwm/defconfig b/configs/sama5d3x-ek/nxwm/defconfig
index bc5e3694ac..11e9a85441 100644
--- a/configs/sama5d3x-ek/nxwm/defconfig
+++ b/configs/sama5d3x-ek/nxwm/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d3x-ek/ov2640/defconfig b/configs/sama5d3x-ek/ov2640/defconfig
index c058dd759b..1529474d0a 100644
--- a/configs/sama5d3x-ek/ov2640/defconfig
+++ b/configs/sama5d3x-ek/ov2640/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d3x-ek/src/sam_autoleds.c b/configs/sama5d3x-ek/src/sam_autoleds.c
index 6859ff0772..03932ae879 100644
--- a/configs/sama5d3x-ek/src/sam_autoleds.c
+++ b/configs/sama5d3x-ek/src/sam_autoleds.c
@@ -91,7 +91,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/sama5d3x-ek/src/sam_spi.c b/configs/sama5d3x-ek/src/sam_spi.c
index 2ffa429913..ef1c1d0b87 100644
--- a/configs/sama5d3x-ek/src/sam_spi.c
+++ b/configs/sama5d3x-ek/src/sam_spi.c
@@ -59,7 +59,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SPI_DEBUG   /* Define to enable debug */
 #undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/sama5d3x-ek/src/sam_userleds.c b/configs/sama5d3x-ek/src/sam_userleds.c
index d98ef8955a..4b623515ac 100644
--- a/configs/sama5d3x-ek/src/sam_userleds.c
+++ b/configs/sama5d3x-ek/src/sam_userleds.c
@@ -67,7 +67,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/sama5d4-ek/README.txt b/configs/sama5d4-ek/README.txt
index 7e3f33bd3b..2120739e5b 100644
--- a/configs/sama5d4-ek/README.txt
+++ b/configs/sama5d4-ek/README.txt
@@ -1910,7 +1910,7 @@ USB High-Speed Device
   --------------------
 
   There is normal console debug output available that can be enabled with
-  CONFIG_DEBUG + CONFIG_DEBUG_USB.  However, USB device operation is very
+  CONFIG_DEBUG_FEATURES + CONFIG_DEBUG_USB.  However, USB device operation is very
   time critical and enabling this debug output WILL interfere with the
   operation of the UDPHS.  USB device tracing is a less invasive way to get
   debug information:  If tracing is enabled, the USB device will save
@@ -2102,7 +2102,7 @@ USB High-Speed Host
   ------------------
 
   There is normal console debug output available that can be enabled with
-  CONFIG_DEBUG + CONFIG_DEBUG_USB.  However, USB host operation is very time
+  CONFIG_DEBUG_FEATURES + CONFIG_DEBUG_USB.  However, USB host operation is very time
   critical and enabling this debug output might interfere with the operation
   of the UDPHS.  USB host tracing is a less invasive way to get debug
   information:  If tracing is enabled, the USB host will save encoded trace
diff --git a/configs/sama5d4-ek/at25boot/defconfig b/configs/sama5d4-ek/at25boot/defconfig
index 64151008f5..cd7c46ca7b 100644
--- a/configs/sama5d4-ek/at25boot/defconfig
+++ b/configs/sama5d4-ek/at25boot/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d4-ek/bridge/defconfig b/configs/sama5d4-ek/bridge/defconfig
index e777febe93..b90ca57f51 100644
--- a/configs/sama5d4-ek/bridge/defconfig
+++ b/configs/sama5d4-ek/bridge/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d4-ek/dramboot/defconfig b/configs/sama5d4-ek/dramboot/defconfig
index f12701c0c5..9d8209403d 100644
--- a/configs/sama5d4-ek/dramboot/defconfig
+++ b/configs/sama5d4-ek/dramboot/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d4-ek/elf/defconfig b/configs/sama5d4-ek/elf/defconfig
index b598b3f7cc..5e871507ae 100644
--- a/configs/sama5d4-ek/elf/defconfig
+++ b/configs/sama5d4-ek/elf/defconfig
@@ -47,7 +47,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d4-ek/ipv6/defconfig b/configs/sama5d4-ek/ipv6/defconfig
index 4a1d810af9..ba5f8eaa16 100644
--- a/configs/sama5d4-ek/ipv6/defconfig
+++ b/configs/sama5d4-ek/ipv6/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d4-ek/knsh/defconfig b/configs/sama5d4-ek/knsh/defconfig
index 1992f4004b..87b85e3ae6 100644
--- a/configs/sama5d4-ek/knsh/defconfig
+++ b/configs/sama5d4-ek/knsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d4-ek/knsh/defconfig.ROMFS b/configs/sama5d4-ek/knsh/defconfig.ROMFS
index a069c2d2a7..eeb8acc422 100644
--- a/configs/sama5d4-ek/knsh/defconfig.ROMFS
+++ b/configs/sama5d4-ek/knsh/defconfig.ROMFS
@@ -45,7 +45,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/sama5d4-ek/nsh/defconfig b/configs/sama5d4-ek/nsh/defconfig
index cf1cd2d601..d8ef00a4d5 100644
--- a/configs/sama5d4-ek/nsh/defconfig
+++ b/configs/sama5d4-ek/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d4-ek/nxwm/defconfig b/configs/sama5d4-ek/nxwm/defconfig
index 0144af933e..814542201d 100644
--- a/configs/sama5d4-ek/nxwm/defconfig
+++ b/configs/sama5d4-ek/nxwm/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d4-ek/ramtest/defconfig b/configs/sama5d4-ek/ramtest/defconfig
index 4490b66233..a8bb0dc5f7 100644
--- a/configs/sama5d4-ek/ramtest/defconfig
+++ b/configs/sama5d4-ek/ramtest/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/sama5d4-ek/src/sam_autoleds.c b/configs/sama5d4-ek/src/sam_autoleds.c
index 773800694d..41184e4a17 100644
--- a/configs/sama5d4-ek/src/sam_autoleds.c
+++ b/configs/sama5d4-ek/src/sam_autoleds.c
@@ -96,7 +96,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/sama5d4-ek/src/sam_spi.c b/configs/sama5d4-ek/src/sam_spi.c
index c0efcfa1ce..9d62139275 100644
--- a/configs/sama5d4-ek/src/sam_spi.c
+++ b/configs/sama5d4-ek/src/sam_spi.c
@@ -59,7 +59,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SPI_DEBUG   /* Define to enable debug */
 #undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/sama5d4-ek/src/sam_userleds.c b/configs/sama5d4-ek/src/sam_userleds.c
index 04bcc1a260..eab759d679 100644
--- a/configs/sama5d4-ek/src/sam_userleds.c
+++ b/configs/sama5d4-ek/src/sam_userleds.c
@@ -71,7 +71,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/samd20-xplained/nsh/defconfig b/configs/samd20-xplained/nsh/defconfig
index 5df5b16c4d..87edc245bf 100644
--- a/configs/samd20-xplained/nsh/defconfig
+++ b/configs/samd20-xplained/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/samd20-xplained/src/sam_autoleds.c b/configs/samd20-xplained/src/sam_autoleds.c
index ff0b699ba2..eb032116e9 100644
--- a/configs/samd20-xplained/src/sam_autoleds.c
+++ b/configs/samd20-xplained/src/sam_autoleds.c
@@ -81,7 +81,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/samd20-xplained/src/sam_spi.c b/configs/samd20-xplained/src/sam_spi.c
index d6fb6d6329..6417b980b6 100644
--- a/configs/samd20-xplained/src/sam_spi.c
+++ b/configs/samd20-xplained/src/sam_spi.c
@@ -57,7 +57,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SPI_DEBUG   /* Define to enable debug */
 #undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/samd20-xplained/src/sam_userleds.c b/configs/samd20-xplained/src/sam_userleds.c
index fe9157aea7..ca90196d01 100644
--- a/configs/samd20-xplained/src/sam_userleds.c
+++ b/configs/samd20-xplained/src/sam_userleds.c
@@ -66,7 +66,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/samd21-xplained/nsh/defconfig b/configs/samd21-xplained/nsh/defconfig
index 1610bf7397..83cfab4624 100644
--- a/configs/samd21-xplained/nsh/defconfig
+++ b/configs/samd21-xplained/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/samd21-xplained/src/sam_autoleds.c b/configs/samd21-xplained/src/sam_autoleds.c
index b1ce7f5236..bb06a515d7 100644
--- a/configs/samd21-xplained/src/sam_autoleds.c
+++ b/configs/samd21-xplained/src/sam_autoleds.c
@@ -81,7 +81,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/samd21-xplained/src/sam_spi.c b/configs/samd21-xplained/src/sam_spi.c
index d4ad01a64f..b44bf35b47 100644
--- a/configs/samd21-xplained/src/sam_spi.c
+++ b/configs/samd21-xplained/src/sam_spi.c
@@ -57,7 +57,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SPI_DEBUG   /* Define to enable debug */
 #undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/samd21-xplained/src/sam_userleds.c b/configs/samd21-xplained/src/sam_userleds.c
index 78aa6e6d0b..b424805f75 100644
--- a/configs/samd21-xplained/src/sam_userleds.c
+++ b/configs/samd21-xplained/src/sam_userleds.c
@@ -66,7 +66,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/same70-xplained/README.txt b/configs/same70-xplained/README.txt
index e35fb67a8b..b4e882a5f6 100644
--- a/configs/same70-xplained/README.txt
+++ b/configs/same70-xplained/README.txt
@@ -745,8 +745,8 @@ MCAN1 Loopback Test
     Enabling CAN Debug Output
     -------------------------
     Build Setup -> Debug Options
-      CONFIG_DEBUG=y                           # Enables general debug features
-      CONFIG_DEBUG_INFO=y                   # Enables verbose output
+      CONFIG_DEBUG_FEATURES=y                  # Enables general debug features
+      CONFIG_DEBUG_INFO=y                      # Enables verbose output
       CONFIG_DEBUG_CAN=y                       # Enables debug output from CAN
 
       CONFIG_STACK_COLORATION=y                # Monitor stack usage
diff --git a/configs/same70-xplained/netnsh/defconfig b/configs/same70-xplained/netnsh/defconfig
index 6fbb830a23..80e6323f2d 100644
--- a/configs/same70-xplained/netnsh/defconfig
+++ b/configs/same70-xplained/netnsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/same70-xplained/nsh/defconfig b/configs/same70-xplained/nsh/defconfig
index 07e012f98e..0a77aaefd5 100644
--- a/configs/same70-xplained/nsh/defconfig
+++ b/configs/same70-xplained/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/same70-xplained/src/sam_autoleds.c b/configs/same70-xplained/src/sam_autoleds.c
index 005c93bb3d..9a68e179cd 100644
--- a/configs/same70-xplained/src/sam_autoleds.c
+++ b/configs/same70-xplained/src/sam_autoleds.c
@@ -81,7 +81,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/same70-xplained/src/sam_spi.c b/configs/same70-xplained/src/sam_spi.c
index 7357f3a6fd..d1a090e332 100644
--- a/configs/same70-xplained/src/sam_spi.c
+++ b/configs/same70-xplained/src/sam_spi.c
@@ -59,7 +59,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SPI_DEBUG   /* Define to enable debug */
 #undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/saml21-xplained/nsh/defconfig b/configs/saml21-xplained/nsh/defconfig
index c44ddac15a..0501ee95b4 100644
--- a/configs/saml21-xplained/nsh/defconfig
+++ b/configs/saml21-xplained/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/saml21-xplained/src/sam_autoleds.c b/configs/saml21-xplained/src/sam_autoleds.c
index 80b43043a4..6a3f4a8505 100644
--- a/configs/saml21-xplained/src/sam_autoleds.c
+++ b/configs/saml21-xplained/src/sam_autoleds.c
@@ -81,7 +81,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/saml21-xplained/src/sam_spi.c b/configs/saml21-xplained/src/sam_spi.c
index 2fd0c0923d..da3e2d67ec 100644
--- a/configs/saml21-xplained/src/sam_spi.c
+++ b/configs/saml21-xplained/src/sam_spi.c
@@ -57,7 +57,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SPI_DEBUG   /* Define to enable debug */
 #undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/saml21-xplained/src/sam_userleds.c b/configs/saml21-xplained/src/sam_userleds.c
index 35b4fdc099..a21714d9b8 100644
--- a/configs/saml21-xplained/src/sam_userleds.c
+++ b/configs/saml21-xplained/src/sam_userleds.c
@@ -66,7 +66,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/samv71-xult/README.txt b/configs/samv71-xult/README.txt
index 014627e831..c3626d085f 100644
--- a/configs/samv71-xult/README.txt
+++ b/configs/samv71-xult/README.txt
@@ -1335,8 +1335,8 @@ MCAN1 Loopback Test
     Enabling CAN Debug Output
     -------------------------
     Build Setup -> Debug Options
-      CONFIG_DEBUG=y                           # Enables general debug features
-      CONFIG_DEBUG_INFO=y                   # Enables verbose output
+      CONFIG_DEBUG_FEATURES=y                  # Enables general debug features
+      CONFIG_DEBUG_INFO=y                      # Enables verbose output
       CONFIG_DEBUG_CAN=y                       # Enables debug output from CAN
 
       CONFIG_STACK_COLORATION=y                # Monitor stack usage
diff --git a/configs/samv71-xult/knsh/defconfig b/configs/samv71-xult/knsh/defconfig
index de6d5d57f6..6339428989 100644
--- a/configs/samv71-xult/knsh/defconfig
+++ b/configs/samv71-xult/knsh/defconfig
@@ -51,7 +51,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/samv71-xult/module/defconfig b/configs/samv71-xult/module/defconfig
index b55a4699a4..1d484f8f60 100644
--- a/configs/samv71-xult/module/defconfig
+++ b/configs/samv71-xult/module/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/samv71-xult/mxtxplnd/defconfig b/configs/samv71-xult/mxtxplnd/defconfig
index 2186d42ddf..3909c4bb40 100644
--- a/configs/samv71-xult/mxtxplnd/defconfig
+++ b/configs/samv71-xult/mxtxplnd/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/samv71-xult/netnsh/defconfig b/configs/samv71-xult/netnsh/defconfig
index 98334e6437..28f69354ac 100644
--- a/configs/samv71-xult/netnsh/defconfig
+++ b/configs/samv71-xult/netnsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/samv71-xult/nsh/defconfig b/configs/samv71-xult/nsh/defconfig
index 235b9afd19..66eef8cec9 100644
--- a/configs/samv71-xult/nsh/defconfig
+++ b/configs/samv71-xult/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/samv71-xult/nxwm/defconfig b/configs/samv71-xult/nxwm/defconfig
index cae079b2d7..f4315ad71a 100644
--- a/configs/samv71-xult/nxwm/defconfig
+++ b/configs/samv71-xult/nxwm/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/samv71-xult/src/sam_autoleds.c b/configs/samv71-xult/src/sam_autoleds.c
index 3381fe8cc6..d302980a64 100644
--- a/configs/samv71-xult/src/sam_autoleds.c
+++ b/configs/samv71-xult/src/sam_autoleds.c
@@ -97,7 +97,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/samv71-xult/src/sam_ili9488.c b/configs/samv71-xult/src/sam_ili9488.c
index 14e12ca690..ed9dd1d5b7 100644
--- a/configs/samv71-xult/src/sam_ili9488.c
+++ b/configs/samv71-xult/src/sam_ili9488.c
@@ -207,7 +207,7 @@
  * also be enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_GRAPHICS
 #  undef CONFIG_DEBUG_LCD
diff --git a/configs/samv71-xult/src/sam_spi.c b/configs/samv71-xult/src/sam_spi.c
index 0edc2f45a2..82172a6041 100644
--- a/configs/samv71-xult/src/sam_spi.c
+++ b/configs/samv71-xult/src/sam_spi.c
@@ -59,7 +59,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SPI_DEBUG   /* Define to enable debug */
 #undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/samv71-xult/vnc/defconfig b/configs/samv71-xult/vnc/defconfig
index d13af25cab..6e472ce90b 100644
--- a/configs/samv71-xult/vnc/defconfig
+++ b/configs/samv71-xult/vnc/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/samv71-xult/vnxwm/defconfig b/configs/samv71-xult/vnxwm/defconfig
index 9f7df955c9..30c3346129 100644
--- a/configs/samv71-xult/vnxwm/defconfig
+++ b/configs/samv71-xult/vnxwm/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/shenzhou/README.txt b/configs/shenzhou/README.txt
index f310f2f7b7..cff8b23595 100644
--- a/configs/shenzhou/README.txt
+++ b/configs/shenzhou/README.txt
@@ -668,7 +668,7 @@ Shenzhou-specific Configuration Options
     CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_STM32_CAN2 is defined.
     CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
     CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
-    CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
+    CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an
       dump of all CAN registers.
 
   Shenzhou LCD Hardware Configuration
@@ -725,9 +725,9 @@ Shenzhou-specific Configuration Options
    CONFIG_STM32_OTGFS_SOFINTR - Enable SOF interrupts.  Why would you ever
      want to do that?
    CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access
-     debug.  Depends on CONFIG_DEBUG.
+     debug.  Depends on CONFIG_DEBUG_FEATURES.
    CONFIG_STM32_USBHOST_PKTDUMP - Dump all incoming and outgoing USB
-     packets. Depends on CONFIG_DEBUG.
+     packets. Depends on CONFIG_DEBUG_FEATURES.
 
 Configurations
 ==============
diff --git a/configs/shenzhou/nsh/defconfig b/configs/shenzhou/nsh/defconfig
index 468531b33a..6d7451accf 100644
--- a/configs/shenzhou/nsh/defconfig
+++ b/configs/shenzhou/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/shenzhou/nxwm/defconfig b/configs/shenzhou/nxwm/defconfig
index ccb8ecf3ab..cd4f922de2 100644
--- a/configs/shenzhou/nxwm/defconfig
+++ b/configs/shenzhou/nxwm/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/shenzhou/src/stm32_autoleds.c b/configs/shenzhou/src/stm32_autoleds.c
index 4d521f68e2..9e22924ed7 100644
--- a/configs/shenzhou/src/stm32_autoleds.c
+++ b/configs/shenzhou/src/stm32_autoleds.c
@@ -57,7 +57,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/shenzhou/src/stm32_ili93xx.c b/configs/shenzhou/src/stm32_ili93xx.c
index e92b29042f..41fef5868b 100644
--- a/configs/shenzhou/src/stm32_ili93xx.c
+++ b/configs/shenzhou/src/stm32_ili93xx.c
@@ -206,7 +206,7 @@
  * also be enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_GRAPHICS
 #  undef CONFIG_DEBUG_LCD
diff --git a/configs/shenzhou/src/stm32_spi.c b/configs/shenzhou/src/stm32_spi.c
index 6992fc3835..e83eb0c62f 100644
--- a/configs/shenzhou/src/stm32_spi.c
+++ b/configs/shenzhou/src/stm32_spi.c
@@ -57,9 +57,9 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_SPI
 #endif
 
diff --git a/configs/shenzhou/src/stm32_ssd1289.c b/configs/shenzhou/src/stm32_ssd1289.c
index 221e0821ec..868449ee00 100644
--- a/configs/shenzhou/src/stm32_ssd1289.c
+++ b/configs/shenzhou/src/stm32_ssd1289.c
@@ -71,7 +71,7 @@
  * also be enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_GRAPHICS
 #  undef CONFIG_DEBUG_LCD
diff --git a/configs/shenzhou/src/stm32_userleds.c b/configs/shenzhou/src/stm32_userleds.c
index 3cf360d7fb..66b9de9ea6 100644
--- a/configs/shenzhou/src/stm32_userleds.c
+++ b/configs/shenzhou/src/stm32_userleds.c
@@ -57,7 +57,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/shenzhou/thttpd/defconfig b/configs/shenzhou/thttpd/defconfig
index c7dc38f611..f59e2704af 100644
--- a/configs/shenzhou/thttpd/defconfig
+++ b/configs/shenzhou/thttpd/defconfig
@@ -42,7 +42,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 # CONFIG_DEBUG_INFO is not set
 
diff --git a/configs/sim/bas/defconfig b/configs/sim/bas/defconfig
index a20524034a..263a99090e 100644
--- a/configs/sim/bas/defconfig
+++ b/configs/sim/bas/defconfig
@@ -41,7 +41,7 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 CONFIG_DEBUG_SYMBOLS=y
diff --git a/configs/sim/configdata/defconfig b/configs/sim/configdata/defconfig
index a22c644dca..f4233e5360 100644
--- a/configs/sim/configdata/defconfig
+++ b/configs/sim/configdata/defconfig
@@ -41,7 +41,7 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_INFO is not set
 
diff --git a/configs/sim/cxxtest/defconfig b/configs/sim/cxxtest/defconfig
index 62e60cc71c..6c81c365be 100644
--- a/configs/sim/cxxtest/defconfig
+++ b/configs/sim/cxxtest/defconfig
@@ -41,7 +41,7 @@ CONFIG_ARCH_FLOAT_H=y
 #
 # Debug Options
 #
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_DEBUG_INFO=y
 
diff --git a/configs/sim/mount/defconfig b/configs/sim/mount/defconfig
index a45d341ba6..05e0718ce7 100644
--- a/configs/sim/mount/defconfig
+++ b/configs/sim/mount/defconfig
@@ -41,7 +41,7 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_DEBUG_INFO=y
 
diff --git a/configs/sim/mtdpart/defconfig b/configs/sim/mtdpart/defconfig
index a56157ed00..a91df0a3d2 100644
--- a/configs/sim/mtdpart/defconfig
+++ b/configs/sim/mtdpart/defconfig
@@ -41,7 +41,7 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_INFO is not set
 
diff --git a/configs/sim/mtdrwb/defconfig b/configs/sim/mtdrwb/defconfig
index 32196dd8b9..4eb9ea8780 100644
--- a/configs/sim/mtdrwb/defconfig
+++ b/configs/sim/mtdrwb/defconfig
@@ -41,7 +41,7 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_INFO is not set
 
diff --git a/configs/sim/nettest/defconfig b/configs/sim/nettest/defconfig
index d5a3b82651..da4d1d7140 100644
--- a/configs/sim/nettest/defconfig
+++ b/configs/sim/nettest/defconfig
@@ -42,7 +42,7 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/sim/nsh/defconfig b/configs/sim/nsh/defconfig
index 7fecde9a3d..48223bb14a 100644
--- a/configs/sim/nsh/defconfig
+++ b/configs/sim/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 CONFIG_DEBUG_SYMBOLS=y
diff --git a/configs/sim/nsh2/defconfig b/configs/sim/nsh2/defconfig
index 4ff288e484..ea53866275 100644
--- a/configs/sim/nsh2/defconfig
+++ b/configs/sim/nsh2/defconfig
@@ -41,7 +41,7 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 CONFIG_DEBUG_SYMBOLS=y
diff --git a/configs/sim/nx/defconfig b/configs/sim/nx/defconfig
index e3f3c92817..5d816932c7 100644
--- a/configs/sim/nx/defconfig
+++ b/configs/sim/nx/defconfig
@@ -41,7 +41,7 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_DEBUG_INFO=y
 
diff --git a/configs/sim/nx11/defconfig b/configs/sim/nx11/defconfig
index 2b5f953a89..05d2ac83cb 100644
--- a/configs/sim/nx11/defconfig
+++ b/configs/sim/nx11/defconfig
@@ -41,7 +41,7 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_DEBUG_INFO=y
 
diff --git a/configs/sim/nxffs/defconfig b/configs/sim/nxffs/defconfig
index 167222da6c..2f17fed0b8 100644
--- a/configs/sim/nxffs/defconfig
+++ b/configs/sim/nxffs/defconfig
@@ -41,7 +41,7 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 CONFIG_DEBUG_SYMBOLS=y
diff --git a/configs/sim/nxlines/defconfig b/configs/sim/nxlines/defconfig
index b31cb37fa4..c2c38d6215 100644
--- a/configs/sim/nxlines/defconfig
+++ b/configs/sim/nxlines/defconfig
@@ -45,7 +45,7 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 CONFIG_DEBUG_SYMBOLS=y
diff --git a/configs/sim/nxwm/defconfig b/configs/sim/nxwm/defconfig
index 1c872a8792..3baa4ef65d 100644
--- a/configs/sim/nxwm/defconfig
+++ b/configs/sim/nxwm/defconfig
@@ -41,7 +41,7 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 CONFIG_DEBUG_SYMBOLS=y
diff --git a/configs/sim/ostest/defconfig b/configs/sim/ostest/defconfig
index 113dc3f622..62666d3d3a 100644
--- a/configs/sim/ostest/defconfig
+++ b/configs/sim/ostest/defconfig
@@ -42,7 +42,7 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_DEBUG_INFO=y
 
diff --git a/configs/sim/pashello/defconfig b/configs/sim/pashello/defconfig
index 2fed08f743..1ffde388e0 100644
--- a/configs/sim/pashello/defconfig
+++ b/configs/sim/pashello/defconfig
@@ -41,7 +41,7 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/sim/touchscreen/defconfig b/configs/sim/touchscreen/defconfig
index 98d29376a9..3cb463d85c 100644
--- a/configs/sim/touchscreen/defconfig
+++ b/configs/sim/touchscreen/defconfig
@@ -41,7 +41,7 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_DEBUG_INFO=y
 
diff --git a/configs/sim/traveler/defconfig b/configs/sim/traveler/defconfig
index ac0a5d398f..b9854ec3f2 100644
--- a/configs/sim/traveler/defconfig
+++ b/configs/sim/traveler/defconfig
@@ -41,7 +41,7 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_DEBUG_INFO=y
 
diff --git a/configs/sim/udgram/defconfig b/configs/sim/udgram/defconfig
index 8a1b8ce8a6..5db261aa15 100644
--- a/configs/sim/udgram/defconfig
+++ b/configs/sim/udgram/defconfig
@@ -42,7 +42,7 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 CONFIG_DEBUG_SYMBOLS=y
diff --git a/configs/sim/unionfs/defconfig b/configs/sim/unionfs/defconfig
index 5646c7bccd..f634b8bf10 100644
--- a/configs/sim/unionfs/defconfig
+++ b/configs/sim/unionfs/defconfig
@@ -41,7 +41,7 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 CONFIG_DEBUG_SYMBOLS=y
diff --git a/configs/sim/ustream/defconfig b/configs/sim/ustream/defconfig
index 237e32d66f..53879abb9f 100644
--- a/configs/sim/ustream/defconfig
+++ b/configs/sim/ustream/defconfig
@@ -42,7 +42,7 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 CONFIG_DEBUG_SYMBOLS=y
diff --git a/configs/skp16c26/ostest/defconfig b/configs/skp16c26/ostest/defconfig
index da7c48a09d..afa72d9af4 100644
--- a/configs/skp16c26/ostest/defconfig
+++ b/configs/skp16c26/ostest/defconfig
@@ -38,7 +38,7 @@ CONFIG_MOTOROLA_SREC=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/spark/composite/defconfig b/configs/spark/composite/defconfig
index bb01a161b5..c0713e16b1 100644
--- a/configs/spark/composite/defconfig
+++ b/configs/spark/composite/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/spark/nsh/defconfig b/configs/spark/nsh/defconfig
index 6f2a5f631a..a18bcd21cb 100644
--- a/configs/spark/nsh/defconfig
+++ b/configs/spark/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/spark/src/stm32_autoleds.c b/configs/spark/src/stm32_autoleds.c
index 8ccf2f3141..c39b53d312 100644
--- a/configs/spark/src/stm32_autoleds.c
+++ b/configs/spark/src/stm32_autoleds.c
@@ -59,7 +59,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/spark/src/stm32_spi.c b/configs/spark/src/stm32_spi.c
index bdbb5b229a..a74a434d37 100644
--- a/configs/spark/src/stm32_spi.c
+++ b/configs/spark/src/stm32_spi.c
@@ -63,7 +63,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SPI_DEBUG   /* Define to enable debug */
 #undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/spark/src/stm32_userleds.c b/configs/spark/src/stm32_userleds.c
index 995feb06f3..db66130c71 100644
--- a/configs/spark/src/stm32_userleds.c
+++ b/configs/spark/src/stm32_userleds.c
@@ -58,7 +58,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/spark/usbmsc/defconfig b/configs/spark/usbmsc/defconfig
index cb4040ef82..8e945a51d2 100644
--- a/configs/spark/usbmsc/defconfig
+++ b/configs/spark/usbmsc/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/spark/usbnsh/defconfig b/configs/spark/usbnsh/defconfig
index 4d3c51a5ff..0069b99f04 100644
--- a/configs/spark/usbnsh/defconfig
+++ b/configs/spark/usbnsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/spark/usbserial/defconfig b/configs/spark/usbserial/defconfig
index aba09edc98..dcc83462a0 100644
--- a/configs/spark/usbserial/defconfig
+++ b/configs/spark/usbserial/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3210e-eval/README.txt b/configs/stm3210e-eval/README.txt
index 6570d4e8da..9fedf98eff 100644
--- a/configs/stm3210e-eval/README.txt
+++ b/configs/stm3210e-eval/README.txt
@@ -657,7 +657,7 @@ STM3210E-EVAL-specific Configuration Options
     CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_STM32_CAN2 is defined.
     CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
     CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
-    CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
+    CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an
       dump of all CAN registers.
 
   STM3210E-EVAL LCD Hardware Configuration
@@ -1064,10 +1064,10 @@ Where  is one of the following:
     USB debug output can be enabled as by changing the following
     settings in the configuration file:
 
-      -CONFIG_DEBUG=n
+      -CONFIG_DEBUG_FEATURES=n
       -CONFIG_DEBUG_INFO=n
       -CONFIG_DEBUG_USB=n
-      +CONFIG_DEBUG=y
+      +CONFIG_DEBUG_FEATURES=y
       +CONFIG_DEBUG_INFO=y
       +CONFIG_DEBUG_USB=y
 
diff --git a/configs/stm3210e-eval/buttons/defconfig b/configs/stm3210e-eval/buttons/defconfig
index 11783f5652..9760c7596a 100644
--- a/configs/stm3210e-eval/buttons/defconfig
+++ b/configs/stm3210e-eval/buttons/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3210e-eval/composite/defconfig b/configs/stm3210e-eval/composite/defconfig
index d4664da422..4256427821 100644
--- a/configs/stm3210e-eval/composite/defconfig
+++ b/configs/stm3210e-eval/composite/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3210e-eval/nsh/defconfig b/configs/stm3210e-eval/nsh/defconfig
index bc1df0013a..3e4babf3c4 100644
--- a/configs/stm3210e-eval/nsh/defconfig
+++ b/configs/stm3210e-eval/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3210e-eval/nsh2/defconfig b/configs/stm3210e-eval/nsh2/defconfig
index f2a22b3f38..6495ae0b4f 100644
--- a/configs/stm3210e-eval/nsh2/defconfig
+++ b/configs/stm3210e-eval/nsh2/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3210e-eval/nx/defconfig b/configs/stm3210e-eval/nx/defconfig
index 2554b724aa..4eab3a9ded 100644
--- a/configs/stm3210e-eval/nx/defconfig
+++ b/configs/stm3210e-eval/nx/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3210e-eval/nxterm/defconfig b/configs/stm3210e-eval/nxterm/defconfig
index 4a19b0a255..da99ecd650 100644
--- a/configs/stm3210e-eval/nxterm/defconfig
+++ b/configs/stm3210e-eval/nxterm/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3210e-eval/pm/defconfig b/configs/stm3210e-eval/pm/defconfig
index 4acbe0d3a7..570954ff63 100644
--- a/configs/stm3210e-eval/pm/defconfig
+++ b/configs/stm3210e-eval/pm/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3210e-eval/src/stm32_lcd.c b/configs/stm3210e-eval/src/stm32_lcd.c
index b6aab70639..a0b4062d3b 100644
--- a/configs/stm3210e-eval/src/stm32_lcd.c
+++ b/configs/stm3210e-eval/src/stm32_lcd.c
@@ -161,7 +161,7 @@
  * also be enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_GRAPHICS
 #  undef CONFIG_DEBUG_LCD
diff --git a/configs/stm3210e-eval/src/stm32_leds.c b/configs/stm3210e-eval/src/stm32_leds.c
index 99d86cf97f..fd61c85ce9 100644
--- a/configs/stm3210e-eval/src/stm32_leds.c
+++ b/configs/stm3210e-eval/src/stm32_leds.c
@@ -57,7 +57,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/stm3210e-eval/src/stm32_spi.c b/configs/stm3210e-eval/src/stm32_spi.c
index 934137ee57..efa7305b61 100644
--- a/configs/stm3210e-eval/src/stm32_spi.c
+++ b/configs/stm3210e-eval/src/stm32_spi.c
@@ -57,7 +57,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SPI_DEBUG   /* Define to enable debug */
 #undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/stm3210e-eval/usbmsc/defconfig b/configs/stm3210e-eval/usbmsc/defconfig
index 001c83e4f5..8548824a95 100644
--- a/configs/stm3210e-eval/usbmsc/defconfig
+++ b/configs/stm3210e-eval/usbmsc/defconfig
@@ -42,7 +42,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3210e-eval/usbserial/defconfig b/configs/stm3210e-eval/usbserial/defconfig
index 4e6b606f27..7a54c3a789 100644
--- a/configs/stm3210e-eval/usbserial/defconfig
+++ b/configs/stm3210e-eval/usbserial/defconfig
@@ -42,7 +42,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3220g-eval/README.txt b/configs/stm3220g-eval/README.txt
index c30383cbdf..d1ceddaca4 100644
--- a/configs/stm3220g-eval/README.txt
+++ b/configs/stm3220g-eval/README.txt
@@ -486,7 +486,7 @@ Configuration Options:
   CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_STM32_CAN2 is defined.
   CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
   CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
-  CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
+  CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an
     dump of all CAN registers.
 
 FSMC SRAM
@@ -817,7 +817,7 @@ STM3220G-EVAL-specific Configuration Options
     CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_STM32_CAN2 is defined.
     CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
     CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
-    CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
+    CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an
       dump of all CAN registers.
 
   STM3220G-EVAL LCD Hardware Configuration
@@ -842,9 +842,9 @@ STM3220G-EVAL-specific Configuration Options
    CONFIG_STM32_OTGFS_SOFINTR - Enable SOF interrupts.  Why would you ever
      want to do that?
    CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access
-     debug.  Depends on CONFIG_DEBUG.
+     debug.  Depends on CONFIG_DEBUG_FEATURES.
    CONFIG_STM32_USBHOST_PKTDUMP - Dump all incoming and outgoing USB
-     packets. Depends on CONFIG_DEBUG.
+     packets. Depends on CONFIG_DEBUG_FEATURES.
 
 Configurations
 ==============
diff --git a/configs/stm3220g-eval/dhcpd/defconfig b/configs/stm3220g-eval/dhcpd/defconfig
index 1a09df8349..25432aea87 100644
--- a/configs/stm3220g-eval/dhcpd/defconfig
+++ b/configs/stm3220g-eval/dhcpd/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3220g-eval/nettest/defconfig b/configs/stm3220g-eval/nettest/defconfig
index 59d9ac24fa..bd6d76b032 100644
--- a/configs/stm3220g-eval/nettest/defconfig
+++ b/configs/stm3220g-eval/nettest/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3220g-eval/nsh/defconfig b/configs/stm3220g-eval/nsh/defconfig
index 2d730e8707..55eb89cda4 100644
--- a/configs/stm3220g-eval/nsh/defconfig
+++ b/configs/stm3220g-eval/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3220g-eval/nsh2/defconfig b/configs/stm3220g-eval/nsh2/defconfig
index 94a88d9a22..99b7a1f652 100644
--- a/configs/stm3220g-eval/nsh2/defconfig
+++ b/configs/stm3220g-eval/nsh2/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3220g-eval/nxwm/defconfig b/configs/stm3220g-eval/nxwm/defconfig
index 9ba451d203..10dd97c8c9 100644
--- a/configs/stm3220g-eval/nxwm/defconfig
+++ b/configs/stm3220g-eval/nxwm/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3220g-eval/src/stm32_autoleds.c b/configs/stm3220g-eval/src/stm32_autoleds.c
index 02d3ff18af..d2d428d868 100644
--- a/configs/stm3220g-eval/src/stm32_autoleds.c
+++ b/configs/stm3220g-eval/src/stm32_autoleds.c
@@ -58,7 +58,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/stm3220g-eval/src/stm32_lcd.c b/configs/stm3220g-eval/src/stm32_lcd.c
index 3ea0d3dcd4..392c4f3990 100644
--- a/configs/stm3220g-eval/src/stm32_lcd.c
+++ b/configs/stm3220g-eval/src/stm32_lcd.c
@@ -113,7 +113,7 @@
  * also be enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_GRAPHICS
 #  undef CONFIG_DEBUG_LCD
diff --git a/configs/stm3220g-eval/src/stm32_spi.c b/configs/stm3220g-eval/src/stm32_spi.c
index ba00efe80d..ca42244f98 100644
--- a/configs/stm3220g-eval/src/stm32_spi.c
+++ b/configs/stm3220g-eval/src/stm32_spi.c
@@ -57,7 +57,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SPI_DEBUG   /* Define to enable debug */
 #undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/stm3220g-eval/src/stm32_userleds.c b/configs/stm3220g-eval/src/stm32_userleds.c
index 3eda42599a..301ea4bdda 100644
--- a/configs/stm3220g-eval/src/stm32_userleds.c
+++ b/configs/stm3220g-eval/src/stm32_userleds.c
@@ -57,7 +57,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/stm3220g-eval/telnetd/defconfig b/configs/stm3220g-eval/telnetd/defconfig
index 2e65dced62..456ec61e19 100644
--- a/configs/stm3220g-eval/telnetd/defconfig
+++ b/configs/stm3220g-eval/telnetd/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3240g-eval/README.txt b/configs/stm3240g-eval/README.txt
index e6dfe3cf53..560ee32e0b 100644
--- a/configs/stm3240g-eval/README.txt
+++ b/configs/stm3240g-eval/README.txt
@@ -382,7 +382,7 @@ Configuration Options:
   CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_STM32_CAN2 is defined.
   CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
   CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
-  CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
+  CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an
     dump of all CAN registers.
 
 FPU
@@ -810,7 +810,7 @@ STM3240G-EVAL-specific Configuration Options
     CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_STM32_CAN2 is defined.
     CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
     CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
-    CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
+    CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an
       dump of all CAN registers.
 
   STM3240G-EVAL LCD Hardware Configuration
@@ -877,9 +877,9 @@ STM3240G-EVAL-specific Configuration Options
    CONFIG_STM32_OTGFS_SOFINTR - Enable SOF interrupts.  Why would you ever
      want to do that?
    CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access
-     debug.  Depends on CONFIG_DEBUG.
+     debug.  Depends on CONFIG_DEBUG_FEATURES.
    CONFIG_STM32_USBHOST_PKTDUMP - Dump all incoming and outgoing USB
-     packets. Depends on CONFIG_DEBUG.
+     packets. Depends on CONFIG_DEBUG_FEATURES.
 
 Configurations
 ==============
diff --git a/configs/stm3240g-eval/dhcpd/defconfig b/configs/stm3240g-eval/dhcpd/defconfig
index e78e731217..8aede9c9e3 100644
--- a/configs/stm3240g-eval/dhcpd/defconfig
+++ b/configs/stm3240g-eval/dhcpd/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3240g-eval/discover/defconfig b/configs/stm3240g-eval/discover/defconfig
index 6e6116857e..a6556e8be1 100644
--- a/configs/stm3240g-eval/discover/defconfig
+++ b/configs/stm3240g-eval/discover/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3240g-eval/knxwm/defconfig b/configs/stm3240g-eval/knxwm/defconfig
index 9d2baf17c6..895218c6f4 100644
--- a/configs/stm3240g-eval/knxwm/defconfig
+++ b/configs/stm3240g-eval/knxwm/defconfig
@@ -51,7 +51,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3240g-eval/nettest/defconfig b/configs/stm3240g-eval/nettest/defconfig
index d8f93001ea..7ff0a9859f 100644
--- a/configs/stm3240g-eval/nettest/defconfig
+++ b/configs/stm3240g-eval/nettest/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3240g-eval/nsh/defconfig b/configs/stm3240g-eval/nsh/defconfig
index fa7c9c4e38..e11d8b48ad 100644
--- a/configs/stm3240g-eval/nsh/defconfig
+++ b/configs/stm3240g-eval/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3240g-eval/nsh2/defconfig b/configs/stm3240g-eval/nsh2/defconfig
index d839e77cb2..f413fb97d9 100644
--- a/configs/stm3240g-eval/nsh2/defconfig
+++ b/configs/stm3240g-eval/nsh2/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3240g-eval/nxterm/defconfig b/configs/stm3240g-eval/nxterm/defconfig
index ddc8ede129..c50998d698 100644
--- a/configs/stm3240g-eval/nxterm/defconfig
+++ b/configs/stm3240g-eval/nxterm/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3240g-eval/nxwm/defconfig b/configs/stm3240g-eval/nxwm/defconfig
index a4f272fb43..cfc9df8f9b 100644
--- a/configs/stm3240g-eval/nxwm/defconfig
+++ b/configs/stm3240g-eval/nxwm/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3240g-eval/src/stm32_autoleds.c b/configs/stm3240g-eval/src/stm32_autoleds.c
index a20e979628..fbfffffec1 100644
--- a/configs/stm3240g-eval/src/stm32_autoleds.c
+++ b/configs/stm3240g-eval/src/stm32_autoleds.c
@@ -58,7 +58,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/stm3240g-eval/src/stm32_lcd.c b/configs/stm3240g-eval/src/stm32_lcd.c
index 89e7bd508c..9ac96ce3b5 100644
--- a/configs/stm3240g-eval/src/stm32_lcd.c
+++ b/configs/stm3240g-eval/src/stm32_lcd.c
@@ -113,7 +113,7 @@
  * also be enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_GRAPHICS
 #  undef CONFIG_DEBUG_LCD
diff --git a/configs/stm3240g-eval/src/stm32_spi.c b/configs/stm3240g-eval/src/stm32_spi.c
index 04ec6d37f6..3d77a12175 100644
--- a/configs/stm3240g-eval/src/stm32_spi.c
+++ b/configs/stm3240g-eval/src/stm32_spi.c
@@ -57,7 +57,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SPI_DEBUG   /* Define to enable debug */
 #undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/stm3240g-eval/src/stm32_userleds.c b/configs/stm3240g-eval/src/stm32_userleds.c
index dd3d70ea52..303eebdc81 100644
--- a/configs/stm3240g-eval/src/stm32_userleds.c
+++ b/configs/stm3240g-eval/src/stm32_userleds.c
@@ -57,7 +57,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/stm3240g-eval/telnetd/defconfig b/configs/stm3240g-eval/telnetd/defconfig
index b2cc945bdd..6d37c628d5 100644
--- a/configs/stm3240g-eval/telnetd/defconfig
+++ b/configs/stm3240g-eval/telnetd/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3240g-eval/webserver/defconfig b/configs/stm3240g-eval/webserver/defconfig
index 22e9eae028..d624ed0102 100644
--- a/configs/stm3240g-eval/webserver/defconfig
+++ b/configs/stm3240g-eval/webserver/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm3240g-eval/xmlrpc/defconfig b/configs/stm3240g-eval/xmlrpc/defconfig
index 010bb5d881..ef3897d0fc 100644
--- a/configs/stm3240g-eval/xmlrpc/defconfig
+++ b/configs/stm3240g-eval/xmlrpc/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32_tiny/README.txt b/configs/stm32_tiny/README.txt
index 1909b9dac8..2e1bc8a294 100644
--- a/configs/stm32_tiny/README.txt
+++ b/configs/stm32_tiny/README.txt
@@ -493,7 +493,7 @@ STM32 Tiny - specific Configuration Options
     CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_STM32_CAN2 is defined.
     CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
     CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
-    CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
+    CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an
       dump of all CAN registers.
 
   STM32Tiny SPI Configuration
diff --git a/configs/stm32_tiny/nsh/defconfig b/configs/stm32_tiny/nsh/defconfig
index 488ebd637b..9314ce10da 100644
--- a/configs/stm32_tiny/nsh/defconfig
+++ b/configs/stm32_tiny/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32_tiny/src/stm32_leds.c b/configs/stm32_tiny/src/stm32_leds.c
index 21329e76e9..54767e6b5b 100644
--- a/configs/stm32_tiny/src/stm32_leds.c
+++ b/configs/stm32_tiny/src/stm32_leds.c
@@ -56,7 +56,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/stm32_tiny/src/stm32_spi.c b/configs/stm32_tiny/src/stm32_spi.c
index a5867cd70a..6ecb45feb8 100644
--- a/configs/stm32_tiny/src/stm32_spi.c
+++ b/configs/stm32_tiny/src/stm32_spi.c
@@ -58,9 +58,9 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_SPI
 #endif
diff --git a/configs/stm32_tiny/usbnsh/defconfig b/configs/stm32_tiny/usbnsh/defconfig
index 18a9cdab67..dee2bffc0c 100644
--- a/configs/stm32_tiny/usbnsh/defconfig
+++ b/configs/stm32_tiny/usbnsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f103-minimum/README.txt b/configs/stm32f103-minimum/README.txt
index 4f8ff5849f..800ce32c47 100644
--- a/configs/stm32f103-minimum/README.txt
+++ b/configs/stm32f103-minimum/README.txt
@@ -392,7 +392,7 @@ STM32F103 Minimum - specific Configuration Options
     CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_STM32_CAN2 is defined.
     CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
     CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
-    CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
+    CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an
       dump of all CAN registers.
 
   STM32F103 Minimum SPI Configuration
diff --git a/configs/stm32f103-minimum/minnsh/defconfig b/configs/stm32f103-minimum/minnsh/defconfig
index 16568484f0..f82d32cdaa 100644
--- a/configs/stm32f103-minimum/minnsh/defconfig
+++ b/configs/stm32f103-minimum/minnsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f103-minimum/nsh/defconfig b/configs/stm32f103-minimum/nsh/defconfig
index c489f2182c..6a74e8d4db 100644
--- a/configs/stm32f103-minimum/nsh/defconfig
+++ b/configs/stm32f103-minimum/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f103-minimum/src/stm32_autoleds.c b/configs/stm32f103-minimum/src/stm32_autoleds.c
index 5be7c7c885..3ab744afd3 100644
--- a/configs/stm32f103-minimum/src/stm32_autoleds.c
+++ b/configs/stm32f103-minimum/src/stm32_autoleds.c
@@ -56,7 +56,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/stm32f103-minimum/src/stm32_spi.c b/configs/stm32f103-minimum/src/stm32_spi.c
index 6781b25ed8..8866451219 100644
--- a/configs/stm32f103-minimum/src/stm32_spi.c
+++ b/configs/stm32f103-minimum/src/stm32_spi.c
@@ -58,9 +58,9 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_SPI
 #endif
diff --git a/configs/stm32f103-minimum/usbnsh/defconfig b/configs/stm32f103-minimum/usbnsh/defconfig
index 84579e2f49..b1804dc70b 100644
--- a/configs/stm32f103-minimum/usbnsh/defconfig
+++ b/configs/stm32f103-minimum/usbnsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f3discovery/README.txt b/configs/stm32f3discovery/README.txt
index 4c5a16c803..cf20d38836 100644
--- a/configs/stm32f3discovery/README.txt
+++ b/configs/stm32f3discovery/README.txt
@@ -637,7 +637,7 @@ STM32F3Discovery-specific Configuration Options
     CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_STM32_CAN2 is defined.
     CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
     CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
-    CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
+    CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an
       dump of all CAN registers.
 
   STM32F3Discovery SPI Configuration
diff --git a/configs/stm32f3discovery/nsh/defconfig b/configs/stm32f3discovery/nsh/defconfig
index 9c48a2059a..ea746def10 100644
--- a/configs/stm32f3discovery/nsh/defconfig
+++ b/configs/stm32f3discovery/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f3discovery/src/stm32_autoleds.c b/configs/stm32f3discovery/src/stm32_autoleds.c
index f62159c156..7b74fdbeaf 100644
--- a/configs/stm32f3discovery/src/stm32_autoleds.c
+++ b/configs/stm32f3discovery/src/stm32_autoleds.c
@@ -56,7 +56,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/stm32f3discovery/src/stm32_spi.c b/configs/stm32f3discovery/src/stm32_spi.c
index 2a9f8e1464..8a5b992773 100644
--- a/configs/stm32f3discovery/src/stm32_spi.c
+++ b/configs/stm32f3discovery/src/stm32_spi.c
@@ -58,7 +58,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SPI_DEBUG   /* Define to enable debug */
 #undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/stm32f3discovery/src/stm32_userleds.c b/configs/stm32f3discovery/src/stm32_userleds.c
index 1dbe43d762..89eb1e6492 100644
--- a/configs/stm32f3discovery/src/stm32_userleds.c
+++ b/configs/stm32f3discovery/src/stm32_userleds.c
@@ -55,7 +55,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/stm32f3discovery/usbnsh/defconfig b/configs/stm32f3discovery/usbnsh/defconfig
index ed5e23a9d9..1b60a529e1 100644
--- a/configs/stm32f3discovery/usbnsh/defconfig
+++ b/configs/stm32f3discovery/usbnsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f411e-disco/nsh/defconfig b/configs/stm32f411e-disco/nsh/defconfig
index e9719959a9..16f23c5048 100644
--- a/configs/stm32f411e-disco/nsh/defconfig
+++ b/configs/stm32f411e-disco/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f429i-disco/README.txt b/configs/stm32f429i-disco/README.txt
index 1a1960a0d2..215a837e45 100644
--- a/configs/stm32f429i-disco/README.txt
+++ b/configs/stm32f429i-disco/README.txt
@@ -533,7 +533,7 @@ STM32F429I-DISCO-specific Configuration Options
     CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_STM32_CAN2 is defined.
     CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
     CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
-    CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
+    CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an
       dump of all CAN registers.
 
   STM32F429I-DISCO SPI Configuration
@@ -576,9 +576,9 @@ STM32F429I-DISCO-specific Configuration Options
    CONFIG_STM32_OTGFS_SOFINTR - Enable SOF interrupts.  Why would you ever
      want to do that?
    CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access
-     debug.  Depends on CONFIG_DEBUG.
+     debug.  Depends on CONFIG_DEBUG_FEATURES.
    CONFIG_STM32_USBHOST_PKTDUMP - Dump all incoming and outgoing USB
-     packets. Depends on CONFIG_DEBUG.
+     packets. Depends on CONFIG_DEBUG_FEATURES.
 
 Configurations
 ==============
diff --git a/configs/stm32f429i-disco/extflash/defconfig b/configs/stm32f429i-disco/extflash/defconfig
index e277a69d2a..ca99193689 100644
--- a/configs/stm32f429i-disco/extflash/defconfig
+++ b/configs/stm32f429i-disco/extflash/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f429i-disco/lcd/defconfig b/configs/stm32f429i-disco/lcd/defconfig
index 7d399bb399..bc0a882e2c 100644
--- a/configs/stm32f429i-disco/lcd/defconfig
+++ b/configs/stm32f429i-disco/lcd/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f429i-disco/ltdc/defconfig b/configs/stm32f429i-disco/ltdc/defconfig
index 7adb9cc1d5..ce2a6655cd 100644
--- a/configs/stm32f429i-disco/ltdc/defconfig
+++ b/configs/stm32f429i-disco/ltdc/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 # CONFIG_DEBUG_INFO is not set
 
diff --git a/configs/stm32f429i-disco/nsh/defconfig b/configs/stm32f429i-disco/nsh/defconfig
index 37e776417d..c54c4bd5b6 100644
--- a/configs/stm32f429i-disco/nsh/defconfig
+++ b/configs/stm32f429i-disco/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f429i-disco/src/stm32_autoleds.c b/configs/stm32f429i-disco/src/stm32_autoleds.c
index 6c417c9856..1f11012077 100644
--- a/configs/stm32f429i-disco/src/stm32_autoleds.c
+++ b/configs/stm32f429i-disco/src/stm32_autoleds.c
@@ -58,7 +58,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/stm32f429i-disco/src/stm32_spi.c b/configs/stm32f429i-disco/src/stm32_spi.c
index f0d4890eec..97d2de76ca 100644
--- a/configs/stm32f429i-disco/src/stm32_spi.c
+++ b/configs/stm32f429i-disco/src/stm32_spi.c
@@ -60,7 +60,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SPI_DEBUG   /* Define to enable debug */
 #undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/stm32f429i-disco/src/stm32_userleds.c b/configs/stm32f429i-disco/src/stm32_userleds.c
index 11513057f8..60176c905b 100644
--- a/configs/stm32f429i-disco/src/stm32_userleds.c
+++ b/configs/stm32f429i-disco/src/stm32_userleds.c
@@ -58,7 +58,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/stm32f429i-disco/usbmsc/defconfig b/configs/stm32f429i-disco/usbmsc/defconfig
index 802ff5915b..5f34604f72 100644
--- a/configs/stm32f429i-disco/usbmsc/defconfig
+++ b/configs/stm32f429i-disco/usbmsc/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f429i-disco/usbnsh/defconfig b/configs/stm32f429i-disco/usbnsh/defconfig
index 0a9deac046..2189ee2ebf 100644
--- a/configs/stm32f429i-disco/usbnsh/defconfig
+++ b/configs/stm32f429i-disco/usbnsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f4discovery/README.txt b/configs/stm32f4discovery/README.txt
index a5ce946ad7..101607188b 100644
--- a/configs/stm32f4discovery/README.txt
+++ b/configs/stm32f4discovery/README.txt
@@ -1024,7 +1024,7 @@ STM32F4Discovery-specific Configuration Options
     CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_STM32_CAN2 is defined.
     CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
     CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
-    CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
+    CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an
       dump of all CAN registers.
 
   STM32F4Discovery SPI Configuration
@@ -1067,9 +1067,9 @@ STM32F4Discovery-specific Configuration Options
    CONFIG_STM32_OTGFS_SOFINTR - Enable SOF interrupts.  Why would you ever
      want to do that?
    CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access
-     debug.  Depends on CONFIG_DEBUG.
+     debug.  Depends on CONFIG_DEBUG_FEATURES.
    CONFIG_STM32_USBHOST_PKTDUMP - Dump all incoming and outgoing USB
-     packets. Depends on CONFIG_DEBUG.
+     packets. Depends on CONFIG_DEBUG_FEATURES.
 
 BASIC
 =====
diff --git a/configs/stm32f4discovery/cxxtest/defconfig b/configs/stm32f4discovery/cxxtest/defconfig
index 7a4a6262ad..df571f322a 100644
--- a/configs/stm32f4discovery/cxxtest/defconfig
+++ b/configs/stm32f4discovery/cxxtest/defconfig
@@ -46,7 +46,7 @@ CONFIG_ARCH_FLOAT_H=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f4discovery/elf/defconfig b/configs/stm32f4discovery/elf/defconfig
index d31cbd08ca..82c8b86c0a 100644
--- a/configs/stm32f4discovery/elf/defconfig
+++ b/configs/stm32f4discovery/elf/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f4discovery/ipv6/defconfig b/configs/stm32f4discovery/ipv6/defconfig
index 07b3a1fc08..9cf8c1ee69 100644
--- a/configs/stm32f4discovery/ipv6/defconfig
+++ b/configs/stm32f4discovery/ipv6/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f4discovery/kostest/defconfig b/configs/stm32f4discovery/kostest/defconfig
index c3f1854877..00e1ff529f 100644
--- a/configs/stm32f4discovery/kostest/defconfig
+++ b/configs/stm32f4discovery/kostest/defconfig
@@ -51,7 +51,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f4discovery/netnsh/defconfig b/configs/stm32f4discovery/netnsh/defconfig
index 1edd9ec625..5a83e7bdbd 100644
--- a/configs/stm32f4discovery/netnsh/defconfig
+++ b/configs/stm32f4discovery/netnsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f4discovery/nsh/defconfig b/configs/stm32f4discovery/nsh/defconfig
index e57c9fd05e..7a8b1a8b58 100644
--- a/configs/stm32f4discovery/nsh/defconfig
+++ b/configs/stm32f4discovery/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f4discovery/nxlines/defconfig b/configs/stm32f4discovery/nxlines/defconfig
index 284eef1c4c..fccdcbc179 100644
--- a/configs/stm32f4discovery/nxlines/defconfig
+++ b/configs/stm32f4discovery/nxlines/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f4discovery/pm/defconfig b/configs/stm32f4discovery/pm/defconfig
index f9444cbdbe..383a96f644 100644
--- a/configs/stm32f4discovery/pm/defconfig
+++ b/configs/stm32f4discovery/pm/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f4discovery/posix_spawn/defconfig b/configs/stm32f4discovery/posix_spawn/defconfig
index 2eaef40473..3e58869dd1 100644
--- a/configs/stm32f4discovery/posix_spawn/defconfig
+++ b/configs/stm32f4discovery/posix_spawn/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f4discovery/rgbled/defconfig b/configs/stm32f4discovery/rgbled/defconfig
index 0c7ace6f01..737163cc46 100644
--- a/configs/stm32f4discovery/rgbled/defconfig
+++ b/configs/stm32f4discovery/rgbled/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 # CONFIG_DEBUG_INFO is not set
 
diff --git a/configs/stm32f4discovery/src/stm32_autoleds.c b/configs/stm32f4discovery/src/stm32_autoleds.c
index 70888d40a3..36255cb24e 100644
--- a/configs/stm32f4discovery/src/stm32_autoleds.c
+++ b/configs/stm32f4discovery/src/stm32_autoleds.c
@@ -58,7 +58,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/stm32f4discovery/src/stm32_spi.c b/configs/stm32f4discovery/src/stm32_spi.c
index 62713692ef..846db5a8e8 100644
--- a/configs/stm32f4discovery/src/stm32_spi.c
+++ b/configs/stm32f4discovery/src/stm32_spi.c
@@ -59,7 +59,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SPI_DEBUG   /* Define to enable debug */
 #undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/stm32f4discovery/src/stm32_ssd1289.c b/configs/stm32f4discovery/src/stm32_ssd1289.c
index dbb1642ec2..90a27bd91e 100644
--- a/configs/stm32f4discovery/src/stm32_ssd1289.c
+++ b/configs/stm32f4discovery/src/stm32_ssd1289.c
@@ -76,7 +76,7 @@
  * also be enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_GRAPHICS
 #  undef CONFIG_DEBUG_LCD
diff --git a/configs/stm32f4discovery/src/stm32_userleds.c b/configs/stm32f4discovery/src/stm32_userleds.c
index 1359e81689..fbfa7c5b16 100644
--- a/configs/stm32f4discovery/src/stm32_userleds.c
+++ b/configs/stm32f4discovery/src/stm32_userleds.c
@@ -59,7 +59,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/stm32f4discovery/uavcan/defconfig b/configs/stm32f4discovery/uavcan/defconfig
index 97db93590e..de30626285 100644
--- a/configs/stm32f4discovery/uavcan/defconfig
+++ b/configs/stm32f4discovery/uavcan/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f4discovery/usbnsh/defconfig b/configs/stm32f4discovery/usbnsh/defconfig
index 66134476b7..16c569baf4 100644
--- a/configs/stm32f4discovery/usbnsh/defconfig
+++ b/configs/stm32f4discovery/usbnsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f4discovery/winbuild/defconfig b/configs/stm32f4discovery/winbuild/defconfig
index 079f197c1f..fa2cc94cab 100644
--- a/configs/stm32f4discovery/winbuild/defconfig
+++ b/configs/stm32f4discovery/winbuild/defconfig
@@ -45,7 +45,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f746g-disco/README.txt b/configs/stm32f746g-disco/README.txt
index eff9a80353..e1a9c2783d 100644
--- a/configs/stm32f746g-disco/README.txt
+++ b/configs/stm32f746g-disco/README.txt
@@ -416,7 +416,7 @@ STM32F746G-DISCO-specific Configuration Options
     CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_STM32F7_CAN2 is defined.
     CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
     CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
-    CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
+    CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an
       dump of all CAN registers.
 
   STM32F746G-DISCO SPI Configuration
@@ -459,9 +459,9 @@ STM32F746G-DISCO-specific Configuration Options
    CONFIG_STM32F7_OTGFS_SOFINTR - Enable SOF interrupts.  Why would you ever
      want to do that?
    CONFIG_STM32F7_USBHOST_REGDEBUG - Enable very low-level register access
-     debug.  Depends on CONFIG_DEBUG.
+     debug.  Depends on CONFIG_DEBUG_FEATURES.
    CONFIG_STM32F7_USBHOST_PKTDUMP - Dump all incoming and outgoing USB
-     packets. Depends on CONFIG_DEBUG.
+     packets. Depends on CONFIG_DEBUG_FEATURES.
 
 Configurations
 ==============
diff --git a/configs/stm32f746g-disco/knsh/defconfig b/configs/stm32f746g-disco/knsh/defconfig
index 6edc370a23..0d53e8c3f6 100644
--- a/configs/stm32f746g-disco/knsh/defconfig
+++ b/configs/stm32f746g-disco/knsh/defconfig
@@ -51,7 +51,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f746g-disco/netnsh/defconfig b/configs/stm32f746g-disco/netnsh/defconfig
index 5fe8fa019d..ba5526141b 100644
--- a/configs/stm32f746g-disco/netnsh/defconfig
+++ b/configs/stm32f746g-disco/netnsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f746g-disco/nsh/defconfig b/configs/stm32f746g-disco/nsh/defconfig
index fdac7f8dd6..564d647ad2 100644
--- a/configs/stm32f746g-disco/nsh/defconfig
+++ b/configs/stm32f746g-disco/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32f746g-disco/src/stm32_autoleds.c b/configs/stm32f746g-disco/src/stm32_autoleds.c
index 5cb07a6939..59db81ec16 100644
--- a/configs/stm32f746g-disco/src/stm32_autoleds.c
+++ b/configs/stm32f746g-disco/src/stm32_autoleds.c
@@ -53,7 +53,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/stm32f746g-disco/src/stm32_userleds.c b/configs/stm32f746g-disco/src/stm32_userleds.c
index 5107c78900..e59ba51693 100644
--- a/configs/stm32f746g-disco/src/stm32_userleds.c
+++ b/configs/stm32f746g-disco/src/stm32_userleds.c
@@ -51,7 +51,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/stm32l476vg-disco/nsh/defconfig b/configs/stm32l476vg-disco/nsh/defconfig
index b903233d87..bb35e16b4d 100644
--- a/configs/stm32l476vg-disco/nsh/defconfig
+++ b/configs/stm32l476vg-disco/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 # CONFIG_DEBUG_INFO is not set
 
diff --git a/configs/stm32l476vg-disco/src/stm32_autoleds.c b/configs/stm32l476vg-disco/src/stm32_autoleds.c
index 4114e983a5..fe53243641 100644
--- a/configs/stm32l476vg-disco/src/stm32_autoleds.c
+++ b/configs/stm32l476vg-disco/src/stm32_autoleds.c
@@ -58,7 +58,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/stm32l476vg-disco/src/stm32_spi.c b/configs/stm32l476vg-disco/src/stm32_spi.c
index ed1d224c7b..186f0f8f38 100644
--- a/configs/stm32l476vg-disco/src/stm32_spi.c
+++ b/configs/stm32l476vg-disco/src/stm32_spi.c
@@ -61,7 +61,7 @@
 
 /* Enables debug output from this file */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_SPI
 #  undef CONFIG_DEBUG_INFO
 #endif
diff --git a/configs/stm32l476vg-disco/src/stm32_userleds.c b/configs/stm32l476vg-disco/src/stm32_userleds.c
index da3d0a389c..eafb33b6d4 100644
--- a/configs/stm32l476vg-disco/src/stm32_userleds.c
+++ b/configs/stm32l476vg-disco/src/stm32_userleds.c
@@ -58,7 +58,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/stm32ldiscovery/README.txt b/configs/stm32ldiscovery/README.txt
index 5b957dcf47..ed8a1b2c7a 100644
--- a/configs/stm32ldiscovery/README.txt
+++ b/configs/stm32ldiscovery/README.txt
@@ -707,7 +707,7 @@ STM32L-Discovery-specific Configuration Options
     CONFIG_CAN2_BAUD - CAN1 BAUD rate.  Required if CONFIG_STM32_CAN2 is defined.
     CONFIG_CAN_TSEG1 - The number of CAN time quanta in segment 1. Default: 6
     CONFIG_CAN_TSEG2 - the number of CAN time quanta in segment 2. Default: 7
-    CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG is set, this will generate an
+    CONFIG_CAN_REGDEBUG - If CONFIG_DEBUG_FEATURES is set, this will generate an
       dump of all CAN registers.
 
   STM32L-Discovery SPI Configuration
@@ -813,8 +813,8 @@ Configuration sub-directories
          CONFIG_LCD=y                            : (Needed to enable LCD debug)
 
        Build Setup -> Debug Options:
-         CONFIG_DEBUG=y                          : Enable debug features
-         CONFIG_DEBUG_INFO=y                  : Enable LCD debug
+         CONFIG_DEBUG_FEATURES=y                 : Enable debug features
+         CONFIG_DEBUG_INFO=y                     : Enable LCD debug
 
        NOTE:  At this point in time, testing of the SLCD is very limited because
        there is not much in apps/examples/slcd.  Certainly there are more bugs
diff --git a/configs/stm32ldiscovery/nsh/defconfig b/configs/stm32ldiscovery/nsh/defconfig
index d497e5e5d9..ae2c63ff12 100644
--- a/configs/stm32ldiscovery/nsh/defconfig
+++ b/configs/stm32ldiscovery/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32ldiscovery/src/stm32_autoleds.c b/configs/stm32ldiscovery/src/stm32_autoleds.c
index d59ffbea7d..b903cb81a1 100644
--- a/configs/stm32ldiscovery/src/stm32_autoleds.c
+++ b/configs/stm32ldiscovery/src/stm32_autoleds.c
@@ -73,7 +73,7 @@
  *   LED_IDLE             STM32 is is sleep mode       Not used
  */
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/stm32ldiscovery/src/stm32_lcd.c b/configs/stm32ldiscovery/src/stm32_lcd.c
index e90f9b018b..cdab603a5f 100644
--- a/configs/stm32ldiscovery/src/stm32_lcd.c
+++ b/configs/stm32ldiscovery/src/stm32_lcd.c
@@ -84,7 +84,7 @@
 #  error "This SLCD driver requires CONFIG_LIB_SLCDCODEC"
 #endif
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_GRAPHICS
 #  undef CONFIG_DEBUG_LCD
diff --git a/configs/stm32ldiscovery/src/stm32_spi.c b/configs/stm32ldiscovery/src/stm32_spi.c
index deb88a0339..e0a0638c70 100644
--- a/configs/stm32ldiscovery/src/stm32_spi.c
+++ b/configs/stm32ldiscovery/src/stm32_spi.c
@@ -59,7 +59,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SPI_DEBUG   /* Define to enable debug */
 #undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/stm32ldiscovery/src/stm32_userleds.c b/configs/stm32ldiscovery/src/stm32_userleds.c
index 8ba7f81ecd..3e2fa4dbe9 100644
--- a/configs/stm32ldiscovery/src/stm32_userleds.c
+++ b/configs/stm32ldiscovery/src/stm32_userleds.c
@@ -55,7 +55,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/stm32vldiscovery/README.txt b/configs/stm32vldiscovery/README.txt
index 28986df04d..963a85ff7c 100644
--- a/configs/stm32vldiscovery/README.txt
+++ b/configs/stm32vldiscovery/README.txt
@@ -342,7 +342,7 @@ RX pin (PA10) of your board besides, of course, the GND pin.
 
     CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
 
-    CONFIG_ARCH_CALIBRATION - when used togeter with CONFIG_DEBUG enables some
+    CONFIG_ARCH_CALIBRATION - when used togeter with CONFIG_DEBUG_FEATURES enables some
 	   build in instrumentation that cause a 100 second delay during boot-up.
 	   This 100 second delay serves no purpose other than it allows you to
 	   calibratre CONFIG_ARCH_LOOPSPERMSEC.  You simply use a stop watch to
diff --git a/configs/stm32vldiscovery/nsh/defconfig b/configs/stm32vldiscovery/nsh/defconfig
index d1911fb961..36cbe83970 100644
--- a/configs/stm32vldiscovery/nsh/defconfig
+++ b/configs/stm32vldiscovery/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/stm32vldiscovery/src/stm32_leds.c b/configs/stm32vldiscovery/src/stm32_leds.c
index e4392c1c93..9c0a052e5c 100644
--- a/configs/stm32vldiscovery/src/stm32_leds.c
+++ b/configs/stm32vldiscovery/src/stm32_leds.c
@@ -58,7 +58,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/sure-pic32mx/README.txt b/configs/sure-pic32mx/README.txt
index ea79c4b20e..0f59eccba3 100644
--- a/configs/sure-pic32mx/README.txt
+++ b/configs/sure-pic32mx/README.txt
@@ -735,13 +735,13 @@ Where  is one of the following:
 
        File Systems:
          CONFIG_FS_FAT=y            : FAT file system
-                                  : Other FAT options
+                                    : Other FAT options
 
     Debug output for testing the SD card can be enabled using:
 
        Build Setup:
-         CONFIG_DEBUG=y             : Enable debug features
-         CONFIG_DEBUG_INFO=y     : Enable verbose debug output
+         CONFIG_DEBUG_FEATURES=y    : Enable debug features
+         CONFIG_DEBUG_INFO=y        : Enable verbose debug output
          CONFIG_DEBUG_FS=y          : Enable file system debug
          CONFIG_DEBUG_SPI=y         : Enable SPI debug
 
@@ -772,7 +772,7 @@ Where  is one of the following:
        To enable LCD debug output:
 
        Build Setup -> Debug Options:
-         CONFIG_DEBUG=y             : Enable debug features
+         CONFIG_DEBUG_FEATURES=y             : Enable debug features
          CONFIG_DEBUG_INFO=y     : Enable verbose debug output
          CONFIG_DEBUG_LCD=y         : Enable LCD debug output
 
diff --git a/configs/sure-pic32mx/nsh/defconfig b/configs/sure-pic32mx/nsh/defconfig
index 25e91c17f2..586054fd48 100644
--- a/configs/sure-pic32mx/nsh/defconfig
+++ b/configs/sure-pic32mx/nsh/defconfig
@@ -45,7 +45,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/sure-pic32mx/src/pic32mx_autoleds.c b/configs/sure-pic32mx/src/pic32mx_autoleds.c
index f03ebd1f09..7c9ef99b00 100644
--- a/configs/sure-pic32mx/src/pic32mx_autoleds.c
+++ b/configs/sure-pic32mx/src/pic32mx_autoleds.c
@@ -88,7 +88,7 @@
 
 /* Debug ********************************************************************/
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS)
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
 #    define ledinfo lldbg
diff --git a/configs/sure-pic32mx/src/pic32mx_lcd1602.c b/configs/sure-pic32mx/src/pic32mx_lcd1602.c
index 7c6480505c..ad6eefc52a 100644
--- a/configs/sure-pic32mx/src/pic32mx_lcd1602.c
+++ b/configs/sure-pic32mx/src/pic32mx_lcd1602.c
@@ -113,7 +113,7 @@
  * also be enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_GRAPHICS
 #  undef CONFIG_DEBUG_LCD
diff --git a/configs/sure-pic32mx/src/pic32mx_spi.c b/configs/sure-pic32mx/src/pic32mx_spi.c
index 28207c49ef..6e2a0fa3d7 100644
--- a/configs/sure-pic32mx/src/pic32mx_spi.c
+++ b/configs/sure-pic32mx/src/pic32mx_spi.c
@@ -120,11 +120,11 @@
 
 /* The following enable debug output from this file.
  *
- * CONFIG_DEBUG_SPI && CONFIG_DEBUG - Define to enable basic SPI debug
+ * CONFIG_DEBUG_SPI && CONFIG_DEBUG_FEATURES - Define to enable basic SPI debug
  * CONFIG_DEBUG_INFO - Define to enable verbose SPI debug
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_SPI
 #  undef CONFIG_DEBUG_INFO
 #endif
diff --git a/configs/sure-pic32mx/usbnsh/defconfig b/configs/sure-pic32mx/usbnsh/defconfig
index 572454b95a..cf8c9003bd 100644
--- a/configs/sure-pic32mx/usbnsh/defconfig
+++ b/configs/sure-pic32mx/usbnsh/defconfig
@@ -45,7 +45,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/teensy-2.0/hello/defconfig b/configs/teensy-2.0/hello/defconfig
index 423049ad66..7b0cb5f914 100644
--- a/configs/teensy-2.0/hello/defconfig
+++ b/configs/teensy-2.0/hello/defconfig
@@ -45,7 +45,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/teensy-2.0/nsh/defconfig b/configs/teensy-2.0/nsh/defconfig
index eaf3e24cc9..be4d9acb2d 100644
--- a/configs/teensy-2.0/nsh/defconfig
+++ b/configs/teensy-2.0/nsh/defconfig
@@ -45,7 +45,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/teensy-2.0/src/at90usb_leds.c b/configs/teensy-2.0/src/at90usb_leds.c
index 19aa4eb5a9..a192722123 100644
--- a/configs/teensy-2.0/src/at90usb_leds.c
+++ b/configs/teensy-2.0/src/at90usb_leds.c
@@ -57,7 +57,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/teensy-2.0/src/at90usb_spi.c b/configs/teensy-2.0/src/at90usb_spi.c
index 015ace6b4d..cd67ae6ac2 100644
--- a/configs/teensy-2.0/src/at90usb_spi.c
+++ b/configs/teensy-2.0/src/at90usb_spi.c
@@ -80,7 +80,7 @@
 #define TEENSY_CD (1 << 4)
 #define TEENSY_WP (1 << 5)
 
-/* The following enable debug output from this file (needs CONFIG_DEBUG too).
+/* The following enable debug output from this file (needs CONFIG_DEBUG_FEATURES too).
  *
  * CONFIG_SPI_DEBUG - Define to enable basic SSP debug
  * CONFIG_SPI_VERBOSE - Define to enable verbose SSP debug
diff --git a/configs/teensy-2.0/usbmsc/defconfig b/configs/teensy-2.0/usbmsc/defconfig
index b185f2467c..99f4422eca 100644
--- a/configs/teensy-2.0/usbmsc/defconfig
+++ b/configs/teensy-2.0/usbmsc/defconfig
@@ -45,7 +45,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/teensy-3.x/nsh/defconfig b/configs/teensy-3.x/nsh/defconfig
index 2b5dfa6aec..b1c743c446 100644
--- a/configs/teensy-3.x/nsh/defconfig
+++ b/configs/teensy-3.x/nsh/defconfig
@@ -45,7 +45,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/teensy-3.x/src/k20_spi.c b/configs/teensy-3.x/src/k20_spi.c
index 8e3c3fb222..d220304539 100644
--- a/configs/teensy-3.x/src/k20_spi.c
+++ b/configs/teensy-3.x/src/k20_spi.c
@@ -57,7 +57,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
diff --git a/configs/teensy-3.x/usbnsh/defconfig b/configs/teensy-3.x/usbnsh/defconfig
index 1e750e8e6f..28941b695d 100644
--- a/configs/teensy-3.x/usbnsh/defconfig
+++ b/configs/teensy-3.x/usbnsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/teensy-lc/nsh/defconfig b/configs/teensy-lc/nsh/defconfig
index 500557d15d..6473aa8b65 100644
--- a/configs/teensy-lc/nsh/defconfig
+++ b/configs/teensy-lc/nsh/defconfig
@@ -41,7 +41,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_DEBUG_INFO=y
 
diff --git a/configs/teensy-lc/src/kl_led.c b/configs/teensy-lc/src/kl_led.c
index 783df86163..daf26ed5c2 100644
--- a/configs/teensy-lc/src/kl_led.c
+++ b/configs/teensy-lc/src/kl_led.c
@@ -56,7 +56,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/teensy-lc/src/kl_spi.c b/configs/teensy-lc/src/kl_spi.c
index 2dcb86c62c..111900225e 100644
--- a/configs/teensy-lc/src/kl_spi.c
+++ b/configs/teensy-lc/src/kl_spi.c
@@ -55,7 +55,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
diff --git a/configs/tm4c123g-launchpad/nsh/defconfig b/configs/tm4c123g-launchpad/nsh/defconfig
index 454af5b842..2b6387edee 100644
--- a/configs/tm4c123g-launchpad/nsh/defconfig
+++ b/configs/tm4c123g-launchpad/nsh/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/tm4c123g-launchpad/src/tm4c_autoleds.c b/configs/tm4c123g-launchpad/src/tm4c_autoleds.c
index 918de86f7d..f2cbb2ab61 100644
--- a/configs/tm4c123g-launchpad/src/tm4c_autoleds.c
+++ b/configs/tm4c123g-launchpad/src/tm4c_autoleds.c
@@ -97,7 +97,7 @@
  * LED_PANIC         4      ON   OFF   OFF (flashing 2Hz)
  */
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/tm4c123g-launchpad/src/tm4c_ssi.c b/configs/tm4c123g-launchpad/src/tm4c_ssi.c
index 52c049f984..2cf79f11f9 100644
--- a/configs/tm4c123g-launchpad/src/tm4c_ssi.c
+++ b/configs/tm4c123g-launchpad/src/tm4c_ssi.c
@@ -59,7 +59,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG too) */
+/* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
 #  define ssidbg lldbg
diff --git a/configs/tm4c1294-launchpad/ipv6/defconfig b/configs/tm4c1294-launchpad/ipv6/defconfig
index 95080731f6..0e28f5a84d 100644
--- a/configs/tm4c1294-launchpad/ipv6/defconfig
+++ b/configs/tm4c1294-launchpad/ipv6/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/tm4c1294-launchpad/nsh/defconfig b/configs/tm4c1294-launchpad/nsh/defconfig
index 00bf8e7e7c..683294364a 100644
--- a/configs/tm4c1294-launchpad/nsh/defconfig
+++ b/configs/tm4c1294-launchpad/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/tm4c1294-launchpad/src/tm4c_userleds.c b/configs/tm4c1294-launchpad/src/tm4c_userleds.c
index d5c79ef522..6e8d287652 100644
--- a/configs/tm4c1294-launchpad/src/tm4c_userleds.c
+++ b/configs/tm4c1294-launchpad/src/tm4c_userleds.c
@@ -67,7 +67,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/twr-k60n512/nsh/defconfig b/configs/twr-k60n512/nsh/defconfig
index ac65d4c025..87448694e1 100644
--- a/configs/twr-k60n512/nsh/defconfig
+++ b/configs/twr-k60n512/nsh/defconfig
@@ -41,7 +41,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/twr-k60n512/src/k60_leds.c b/configs/twr-k60n512/src/k60_leds.c
index 5e7cc58e65..a7130f7e62 100644
--- a/configs/twr-k60n512/src/k60_leds.c
+++ b/configs/twr-k60n512/src/k60_leds.c
@@ -119,7 +119,7 @@
 #define LED_PANIC_OFF_SETBITS        ((0) << OFF_SETBITS_SHIFT)
 #define LED_PANIC_OFF_CLRBITS        ((K60_LED4) << OFF_CLRBITS_SHIFT)
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/twr-k60n512/src/k60_spi.c b/configs/twr-k60n512/src/k60_spi.c
index 2e08636ce6..8f7b8145f4 100644
--- a/configs/twr-k60n512/src/k60_spi.c
+++ b/configs/twr-k60n512/src/k60_spi.c
@@ -57,7 +57,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
diff --git a/configs/u-blox-c027/nsh/defconfig b/configs/u-blox-c027/nsh/defconfig
index 73f0d2fcf3..2e9d8ebe10 100644
--- a/configs/u-blox-c027/nsh/defconfig
+++ b/configs/u-blox-c027/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_INFO is not set
 
diff --git a/configs/u-blox-c027/src/lpc17_leds.c b/configs/u-blox-c027/src/lpc17_leds.c
index 0b141fe6c8..f7299b1c66 100644
--- a/configs/u-blox-c027/src/lpc17_leds.c
+++ b/configs/u-blox-c027/src/lpc17_leds.c
@@ -56,7 +56,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/u-blox-c027/src/lpc17_ssp.c b/configs/u-blox-c027/src/lpc17_ssp.c
index 2655f043be..85d58d5564 100644
--- a/configs/u-blox-c027/src/lpc17_ssp.c
+++ b/configs/u-blox-c027/src/lpc17_ssp.c
@@ -58,7 +58,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SSP_DEBUG   /* Define to enable debug */
 #undef SSP_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/ubw32/nsh/defconfig b/configs/ubw32/nsh/defconfig
index b6ec91adbc..0061bd3fca 100644
--- a/configs/ubw32/nsh/defconfig
+++ b/configs/ubw32/nsh/defconfig
@@ -45,7 +45,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/ubw32/src/pic32_leds.c b/configs/ubw32/src/pic32_leds.c
index d6d492cda5..db51c2dba8 100644
--- a/configs/ubw32/src/pic32_leds.c
+++ b/configs/ubw32/src/pic32_leds.c
@@ -97,7 +97,7 @@
 
 /* Debug ********************************************************************/
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_LEDS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS)
 #  define leddbg  lldbg
 #  ifdef CONFIG_DEBUG_INFO
 #    define ledinfo lldbg
diff --git a/configs/us7032evb1/nsh/defconfig b/configs/us7032evb1/nsh/defconfig
index e18cd49cc8..df2d6ced1d 100644
--- a/configs/us7032evb1/nsh/defconfig
+++ b/configs/us7032evb1/nsh/defconfig
@@ -38,7 +38,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/us7032evb1/ostest/defconfig b/configs/us7032evb1/ostest/defconfig
index 7490f982d7..c5e816c47a 100644
--- a/configs/us7032evb1/ostest/defconfig
+++ b/configs/us7032evb1/ostest/defconfig
@@ -38,7 +38,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
diff --git a/configs/viewtool-stm32f107/README.txt b/configs/viewtool-stm32f107/README.txt
index a07182756d..e84f13aec0 100644
--- a/configs/viewtool-stm32f107/README.txt
+++ b/configs/viewtool-stm32f107/README.txt
@@ -766,8 +766,8 @@ Configurations
           debug output on USART1 can be enabled with:
 
           Build Setup:
-            CONFIG_DEBUG=y                     : Enable debug features
-            CONFIG_DEBUG_INFO=y             : Enable verbose debug output
+            CONFIG_DEBUG_FEATURES=y            : Enable debug features
+            CONFIG_DEBUG_INFO=y                : Enable verbose debug output
             CONFIG_DEBUG_INPUT=y               : Enable debug output from input devices
 
        STATUS: Working
diff --git a/configs/viewtool-stm32f107/highpri/defconfig b/configs/viewtool-stm32f107/highpri/defconfig
index 0fcfc13a51..0fd667d8db 100644
--- a/configs/viewtool-stm32f107/highpri/defconfig
+++ b/configs/viewtool-stm32f107/highpri/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/viewtool-stm32f107/netnsh/defconfig b/configs/viewtool-stm32f107/netnsh/defconfig
index 1309839189..678c3c0d85 100644
--- a/configs/viewtool-stm32f107/netnsh/defconfig
+++ b/configs/viewtool-stm32f107/netnsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/viewtool-stm32f107/nsh/defconfig b/configs/viewtool-stm32f107/nsh/defconfig
index eac5f7d914..a3c40e589a 100644
--- a/configs/viewtool-stm32f107/nsh/defconfig
+++ b/configs/viewtool-stm32f107/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/viewtool-stm32f107/src/stm32_leds.c b/configs/viewtool-stm32f107/src/stm32_leds.c
index 49cac84523..fa65507488 100644
--- a/configs/viewtool-stm32f107/src/stm32_leds.c
+++ b/configs/viewtool-stm32f107/src/stm32_leds.c
@@ -53,7 +53,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * with CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/viewtool-stm32f107/src/stm32_spi.c b/configs/viewtool-stm32f107/src/stm32_spi.c
index 398416010b..3b957acc52 100644
--- a/configs/viewtool-stm32f107/src/stm32_spi.c
+++ b/configs/viewtool-stm32f107/src/stm32_spi.c
@@ -57,7 +57,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG too) */
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #undef SPI_DEBUG   /* Define to enable debug */
 #undef SPI_VERBOSE /* Define to enable verbose debug */
diff --git a/configs/viewtool-stm32f107/src/stm32_ssd1289.c b/configs/viewtool-stm32f107/src/stm32_ssd1289.c
index 69fe2590a0..b3e135191d 100644
--- a/configs/viewtool-stm32f107/src/stm32_ssd1289.c
+++ b/configs/viewtool-stm32f107/src/stm32_ssd1289.c
@@ -68,7 +68,7 @@
  * also be enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_GRAPHICS
 #  undef CONFIG_DEBUG_LCD
diff --git a/configs/xtrs/nsh/defconfig b/configs/xtrs/nsh/defconfig
index fed3d18a03..b9eb07b695 100644
--- a/configs/xtrs/nsh/defconfig
+++ b/configs/xtrs/nsh/defconfig
@@ -43,7 +43,7 @@ CONFIG_WINDOWS_NATIVE=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 
 #
diff --git a/configs/xtrs/ostest/defconfig b/configs/xtrs/ostest/defconfig
index d0f9abadd0..e7a9ae6755 100644
--- a/configs/xtrs/ostest/defconfig
+++ b/configs/xtrs/ostest/defconfig
@@ -43,7 +43,7 @@ CONFIG_WINDOWS_NATIVE=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 
 #
diff --git a/configs/xtrs/pashello/defconfig b/configs/xtrs/pashello/defconfig
index eeceb9e582..77e8550bc1 100644
--- a/configs/xtrs/pashello/defconfig
+++ b/configs/xtrs/pashello/defconfig
@@ -43,7 +43,7 @@ CONFIG_WINDOWS_NATIVE=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 
 #
diff --git a/configs/z16f2800100zcog/nsh/defconfig b/configs/z16f2800100zcog/nsh/defconfig
index 4625d2eb57..a9b333f3f9 100644
--- a/configs/z16f2800100zcog/nsh/defconfig
+++ b/configs/z16f2800100zcog/nsh/defconfig
@@ -44,7 +44,7 @@ CONFIG_WINDOWS_CYGWIN=y
 #
 # Debug Options
 #
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_INFO is not set
diff --git a/configs/z16f2800100zcog/ostest/defconfig b/configs/z16f2800100zcog/ostest/defconfig
index cb6238c254..c02658bcd5 100644
--- a/configs/z16f2800100zcog/ostest/defconfig
+++ b/configs/z16f2800100zcog/ostest/defconfig
@@ -41,7 +41,7 @@ CONFIG_WINDOWS_CYGWIN=y
 #
 # Debug Options
 #
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_INFO is not set
diff --git a/configs/z16f2800100zcog/pashello/defconfig b/configs/z16f2800100zcog/pashello/defconfig
index e64e86fce0..18023c6270 100644
--- a/configs/z16f2800100zcog/pashello/defconfig
+++ b/configs/z16f2800100zcog/pashello/defconfig
@@ -41,7 +41,7 @@ CONFIG_WINDOWS_CYGWIN=y
 #
 # Debug Options
 #
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
 # CONFIG_DEBUG_INFO is not set
 
 
diff --git a/configs/z80sim/nsh/defconfig b/configs/z80sim/nsh/defconfig
index ab5c5da665..ece521d8f1 100644
--- a/configs/z80sim/nsh/defconfig
+++ b/configs/z80sim/nsh/defconfig
@@ -43,7 +43,7 @@ CONFIG_WINDOWS_NATIVE=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 
 #
diff --git a/configs/z80sim/ostest/defconfig b/configs/z80sim/ostest/defconfig
index dc0a04bc13..5a7eb1de7f 100644
--- a/configs/z80sim/ostest/defconfig
+++ b/configs/z80sim/ostest/defconfig
@@ -43,7 +43,7 @@ CONFIG_WINDOWS_NATIVE=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 
 #
diff --git a/configs/z80sim/pashello/defconfig b/configs/z80sim/pashello/defconfig
index 4a702c2638..f2ee7176d4 100644
--- a/configs/z80sim/pashello/defconfig
+++ b/configs/z80sim/pashello/defconfig
@@ -43,7 +43,7 @@ CONFIG_WINDOWS_NATIVE=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 
 #
diff --git a/configs/z8encore000zco/ostest/defconfig b/configs/z8encore000zco/ostest/defconfig
index ef7487caa4..2a4dfbbd38 100644
--- a/configs/z8encore000zco/ostest/defconfig
+++ b/configs/z8encore000zco/ostest/defconfig
@@ -46,7 +46,7 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_INFO is not set
 
diff --git a/configs/z8f64200100kit/ostest/defconfig b/configs/z8f64200100kit/ostest/defconfig
index fb57aee022..b6a7427380 100644
--- a/configs/z8f64200100kit/ostest/defconfig
+++ b/configs/z8f64200100kit/ostest/defconfig
@@ -46,7 +46,7 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-CONFIG_DEBUG=y
+CONFIG_DEBUG_FEATURES=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_INFO is not set
 
diff --git a/configs/zkit-arm-1769/README.txt b/configs/zkit-arm-1769/README.txt
index 7c27c53144..b645c7f6b2 100644
--- a/configs/zkit-arm-1769/README.txt
+++ b/configs/zkit-arm-1769/README.txt
@@ -469,9 +469,9 @@ ZKit-ARM Configuration Options
     CONFIG_NET_NRXDESC - Configured number of Rx descriptors. Default: 18
     CONFIG_NET_WOL - Enable Wake-up on Lan (not fully implemented).
     CONFIG_NET_REGDEBUG - Enabled low level register debug.  Also needs
-      CONFIG_DEBUG.
+      CONFIG_DEBUG_FEATURES.
     CONFIG_NET_DUMPPACKET - Dump all received and transmitted packets.
-      Also needs CONFIG_DEBUG.
+      Also needs CONFIG_DEBUG_FEATURES.
     CONFIG_NET_HASH - Enable receipt of near-perfect match frames.
     CONFIG_LPC17_MULTICAST - Enable receipt of multicast (and unicast) frames.
       Automatically set if CONFIG_NET_IGMP is selected.
diff --git a/configs/zkit-arm-1769/hello/defconfig b/configs/zkit-arm-1769/hello/defconfig
index 4cbbb53954..ee52a97f0c 100644
--- a/configs/zkit-arm-1769/hello/defconfig
+++ b/configs/zkit-arm-1769/hello/defconfig
@@ -41,7 +41,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/zkit-arm-1769/nsh/defconfig b/configs/zkit-arm-1769/nsh/defconfig
index 05e99cc696..2ea0ad42a2 100644
--- a/configs/zkit-arm-1769/nsh/defconfig
+++ b/configs/zkit-arm-1769/nsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/zkit-arm-1769/nxhello/defconfig b/configs/zkit-arm-1769/nxhello/defconfig
index afb737eae7..0b785d75fe 100644
--- a/configs/zkit-arm-1769/nxhello/defconfig
+++ b/configs/zkit-arm-1769/nxhello/defconfig
@@ -42,7 +42,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/zkit-arm-1769/src/lpc17_appinit.c b/configs/zkit-arm-1769/src/lpc17_appinit.c
index 9817d76c33..c8afc9304e 100644
--- a/configs/zkit-arm-1769/src/lpc17_appinit.c
+++ b/configs/zkit-arm-1769/src/lpc17_appinit.c
@@ -116,13 +116,13 @@
 /* Debug ********************************************************************/
 
 #ifdef CONFIG_CPP_HAVE_VARARGS
-#  ifdef CONFIG_DEBUG
+#  ifdef CONFIG_DEBUG_FEATURES
 #    define message(...) lib_lowprintf(__VA_ARGS__)
 #  else
 #    define message(...) printf(__VA_ARGS__)
 #  endif
 #else
-#  ifdef CONFIG_DEBUG
+#  ifdef CONFIG_DEBUG_FEATURES
 #    define message lib_lowprintf
 #  else
 #    define message printf
diff --git a/configs/zkit-arm-1769/src/lpc17_lcd.c b/configs/zkit-arm-1769/src/lpc17_lcd.c
index a196c48e61..b58e46b853 100644
--- a/configs/zkit-arm-1769/src/lpc17_lcd.c
+++ b/configs/zkit-arm-1769/src/lpc17_lcd.c
@@ -68,7 +68,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG with
+/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES with
  * CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/zkit-arm-1769/src/lpc17_leds.c b/configs/zkit-arm-1769/src/lpc17_leds.c
index 75f62c931a..02d4b03cfe 100644
--- a/configs/zkit-arm-1769/src/lpc17_leds.c
+++ b/configs/zkit-arm-1769/src/lpc17_leds.c
@@ -62,7 +62,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG
+/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
  * and pherhaps CONFIG_DEBUG_INFO too)
  */
 
diff --git a/configs/zkit-arm-1769/src/lpc17_spi.c b/configs/zkit-arm-1769/src/lpc17_spi.c
index 8a74fa0880..d28347c723 100644
--- a/configs/zkit-arm-1769/src/lpc17_spi.c
+++ b/configs/zkit-arm-1769/src/lpc17_spi.c
@@ -63,7 +63,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG too) */
+/* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spidbg  lldbg
diff --git a/configs/zkit-arm-1769/src/lpc17_ssp.c b/configs/zkit-arm-1769/src/lpc17_ssp.c
index b0e65a378b..f0667b4bba 100644
--- a/configs/zkit-arm-1769/src/lpc17_ssp.c
+++ b/configs/zkit-arm-1769/src/lpc17_ssp.c
@@ -63,7 +63,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG too) */
+/* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
 #  define sspdbg  lldbg
diff --git a/configs/zkit-arm-1769/thttpd/defconfig b/configs/zkit-arm-1769/thttpd/defconfig
index 5f7f9ab01a..ec26a6cdf4 100644
--- a/configs/zkit-arm-1769/thttpd/defconfig
+++ b/configs/zkit-arm-1769/thttpd/defconfig
@@ -41,7 +41,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/zp214xpa/nsh/Make.defs b/configs/zp214xpa/nsh/Make.defs
index 5fdba6c38b..4e6db0acdc 100644
--- a/configs/zp214xpa/nsh/Make.defs
+++ b/configs/zp214xpa/nsh/Make.defs
@@ -71,7 +71,7 @@ ifneq ($(HOSTOS),Cygwin)
 endif
 endif
 
-ifeq ("${CONFIG_DEBUG}","y")
+ifeq ("${CONFIG_DEBUG_FEATURES}","y")
   ARCHOPTIMIZATION = -g
 endif
 
@@ -115,7 +115,7 @@ EXEEXT =
 ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
   LDFLAGS += -g
 endif
 
diff --git a/configs/zp214xpa/nsh/defconfig b/configs/zp214xpa/nsh/defconfig
index 1fa5f238cc..01389b37f1 100644
--- a/configs/zp214xpa/nsh/defconfig
+++ b/configs/zp214xpa/nsh/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/zp214xpa/nxlines/Make.defs b/configs/zp214xpa/nxlines/Make.defs
index 8f8f9b0089..75b8a40e0c 100644
--- a/configs/zp214xpa/nxlines/Make.defs
+++ b/configs/zp214xpa/nxlines/Make.defs
@@ -71,7 +71,7 @@ ifneq ($(HOSTOS),Cygwin)
 endif
 endif
 
-ifeq ("${CONFIG_DEBUG}","y")
+ifeq ("${CONFIG_DEBUG_FEATURES}","y")
   ARCHOPTIMIZATION = -g
 endif
 
@@ -115,7 +115,7 @@ EXEEXT =
 ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
   LDFLAGS += -g
 endif
 
diff --git a/configs/zp214xpa/nxlines/defconfig b/configs/zp214xpa/nxlines/defconfig
index 580c2a8070..5a285c01f4 100644
--- a/configs/zp214xpa/nxlines/defconfig
+++ b/configs/zp214xpa/nxlines/defconfig
@@ -41,7 +41,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
diff --git a/configs/zp214xpa/src/lpc2148_spi1.c b/configs/zp214xpa/src/lpc2148_spi1.c
index 06d4853c87..c0336cef05 100644
--- a/configs/zp214xpa/src/lpc2148_spi1.c
+++ b/configs/zp214xpa/src/lpc2148_spi1.c
@@ -592,7 +592,7 @@ FAR struct spi_dev_s *lpc214x_spibus_initialize(int port)
 
   /* Only the SPI1 interface is supported */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (port != 1)
     {
       return NULL;
diff --git a/drivers/analog/ads1242.c b/drivers/analog/ads1242.c
index 768a3a93a2..dc942bbace 100644
--- a/drivers/analog/ads1242.c
+++ b/drivers/analog/ads1242.c
@@ -97,9 +97,9 @@ static void    ads1242_set_negative_input(FAR struct ads1242_dev_s *dev,
                  ADS1242_NEGATIVE_INPUT_SELECTION const neg_in_sel);
 static bool    ads1242_is_data_ready(FAR struct ads1242_dev_s *dev);
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_INFO)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_INFO)
 static void    ads1242_print_regs(FAR struct ads1242_dev_s *dev, char const *msg);
-#endif /* CONFIG_DEBUG && CONFIG_DEBUG_INFO */
+#endif /* CONFIG_DEBUG_FEATURES && CONFIG_DEBUG_INFO */
 
 /* Character driver methods */
 
@@ -331,7 +331,7 @@ static void ads1242_set_gain(FAR struct ads1242_dev_s *dev,
   setup_reg_value |= (uint8_t)(gain_selection);
   ads1242_write_reg(dev, ADS1242_REG_SETUP, setup_reg_value);
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_INFO)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_INFO)
   ads1242_print_regs(dev, "ads1242_set_gain");
 #endif
 
@@ -355,7 +355,7 @@ static void ads1242_set_positive_input(FAR struct ads1242_dev_s *dev,
   mux_reg_value |= (uint8_t)(pos_in_sel);
   ads1242_write_reg(dev, ADS1242_REG_MUX, mux_reg_value);
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_INFO)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_INFO)
   ads1242_print_regs(dev, "ads1242_set_positive_input");
 #endif
 }
@@ -375,7 +375,7 @@ static void ads1242_set_negative_input(FAR struct ads1242_dev_s *dev,
   mux_reg_value |= (uint8_t)(neg_in_sel);
   ads1242_write_reg(dev, ADS1242_REG_MUX, mux_reg_value);
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_INFO)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_INFO)
   ads1242_print_regs(dev, "ads1242_set_negative_input");
 #endif
 }
@@ -396,7 +396,7 @@ static bool ads1242_is_data_ready(FAR struct ads1242_dev_s *dev)
  * Name: ads1242_print_regs
  ****************************************************************************/
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_INFO)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_INFO)
 static void ads1242_print_regs(FAR struct ads1242_dev_s *dev, char const *msg)
 {
  uint8_t setup_reg_value = 0;
@@ -413,7 +413,7 @@ static void ads1242_print_regs(FAR struct ads1242_dev_s *dev, char const *msg)
  dbg("MUX    %02X\n", mux_reg_value);
  dbg("ACR    %02X\n", acr_reg_value);
 }
-#endif /* CONFIG_DEBUG && CONFIG_DEBUG_INFO */
+#endif /* CONFIG_DEBUG_FEATURES && CONFIG_DEBUG_INFO */
 
 /****************************************************************************
  * Name: ads1242_open
@@ -441,7 +441,7 @@ static int ads1242_open(FAR struct file *filep)
   ads1242_performSelfOffsetCalibration(priv);
   up_mdelay(100);
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_INFO)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_INFO)
   ads1242_print_regs(priv, "ads1242_open");
 #endif
 
diff --git a/drivers/analog/pga11x.c b/drivers/analog/pga11x.c
index ec991e0d06..0169459cdd 100644
--- a/drivers/analog/pga11x.c
+++ b/drivers/analog/pga11x.c
@@ -104,7 +104,7 @@
 /* Debug ********************************************************************/
 /* Check if (non-standard) SPI debug is enabled */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_SPI
 #endif
diff --git a/drivers/audio/i2schar.c b/drivers/audio/i2schar.c
index 8e11dd1149..27072548b5 100644
--- a/drivers/audio/i2schar.c
+++ b/drivers/audio/i2schar.c
@@ -80,7 +80,7 @@
  * include/debug.h
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_I2S
 #endif
diff --git a/drivers/bch/bchdev_unregister.c b/drivers/bch/bchdev_unregister.c
index 0c6a35d4b1..ae6ecb1dd0 100644
--- a/drivers/bch/bchdev_unregister.c
+++ b/drivers/bch/bchdev_unregister.c
@@ -91,7 +91,7 @@ int bchdev_unregister(FAR const char *chardev)
 
   /* Sanity check */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!chardev)
     {
       return -EINVAL;
diff --git a/drivers/i2c/i2c_driver.c b/drivers/i2c/i2c_driver.c
index e6571b0006..817e6058e9 100644
--- a/drivers/i2c/i2c_driver.c
+++ b/drivers/i2c/i2c_driver.c
@@ -63,7 +63,7 @@
 #define DEVNAME_FMTLEN (8 + 3 + 1)
 
 /* Debug ********************************************************************/
-/* CONFIG_DEBUG_I2C + CONFIG_DEBUG enables general I2C debug output. */
+/* CONFIG_DEBUG_I2C + CONFIG_DEBUG_FEATURES enables general I2C debug output. */
 
 #ifdef CONFIG_DEBUG_I2C
 #  define i2cdbg dbg
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 349ccfa9a2..e28d053af7 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -316,7 +316,7 @@ config STMPE811_TEMP_DISABLE
 config STMPE811_REGDEBUG
 	bool "Enable Register-Level STMPE811 Debug"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	---help---
 		Enable very low register-level debug output.
 
diff --git a/drivers/input/ajoystick.c b/drivers/input/ajoystick.c
index b0ce4f15ae..af938ae157 100644
--- a/drivers/input/ajoystick.c
+++ b/drivers/input/ajoystick.c
@@ -794,7 +794,7 @@ static int ajoy_poll(FAR struct file *filep, FAR struct pollfd *fds,
 
       FAR struct pollfd **slot = (FAR struct pollfd **)fds->priv;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       if (!slot)
         {
           iinfo("ERROR: Poll slot not found\n");
diff --git a/drivers/input/button_upper.c b/drivers/input/button_upper.c
index 98adf18b7a..b56afeccb7 100644
--- a/drivers/input/button_upper.c
+++ b/drivers/input/button_upper.c
@@ -786,7 +786,7 @@ static int btn_poll(FAR struct file *filep, FAR struct pollfd *fds,
 
       FAR struct pollfd **slot = (FAR struct pollfd **)fds->priv;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       if (!slot)
         {
           iinfo("ERROR: Poll slot not found\n");
diff --git a/drivers/input/djoystick.c b/drivers/input/djoystick.c
index a20451c13e..b1b7522eb8 100644
--- a/drivers/input/djoystick.c
+++ b/drivers/input/djoystick.c
@@ -790,7 +790,7 @@ static int djoy_poll(FAR struct file *filep, FAR struct pollfd *fds,
 
       FAR struct pollfd **slot = (FAR struct pollfd **)fds->priv;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       if (!slot)
         {
           iinfo("ERROR: Poll slot not found\n");
diff --git a/drivers/input/mxt.h b/drivers/input/mxt.h
index 459684da72..94145b1801 100644
--- a/drivers/input/mxt.h
+++ b/drivers/input/mxt.h
@@ -49,7 +49,7 @@
 /* Support T6 only if debug is enabled */
 
 #undef MXT_SUPPORT_T6
-#if !defined(CONFIG_DEBUG)
+#if !defined(CONFIG_DEBUG_FEATURES)
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_INPUT
 #endif
diff --git a/drivers/input/stmpe811_tsc.c b/drivers/input/stmpe811_tsc.c
index 60362da51c..21ad19c2c7 100644
--- a/drivers/input/stmpe811_tsc.c
+++ b/drivers/input/stmpe811_tsc.c
@@ -306,7 +306,7 @@ static inline int stmpe811_waitsample(FAR struct stmpe811_dev_s *priv,
 
       if (ret < 0)
         {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
           /* Sample the errno (debug output could change it) */
 
           int errval = errno;
diff --git a/drivers/lcd/mio283qt2.c b/drivers/lcd/mio283qt2.c
index 49ff6f5884..c6f6eabb06 100644
--- a/drivers/lcd/mio283qt2.c
+++ b/drivers/lcd/mio283qt2.c
@@ -106,7 +106,7 @@
  * also be enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_GRAPHICS
 #  undef CONFIG_DEBUG_LCD
diff --git a/drivers/lcd/mio283qt9a.c b/drivers/lcd/mio283qt9a.c
index a474a899de..9bd4938333 100644
--- a/drivers/lcd/mio283qt9a.c
+++ b/drivers/lcd/mio283qt9a.c
@@ -100,7 +100,7 @@
  * also be enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_GRAPHICS
 #  undef CONFIG_DEBUG_LCD
diff --git a/drivers/lcd/nokia6100.c b/drivers/lcd/nokia6100.c
index 8a21afa396..72e8dc7870 100644
--- a/drivers/lcd/nokia6100.c
+++ b/drivers/lcd/nokia6100.c
@@ -238,7 +238,7 @@
  * (Verbose debug must also be enabled)
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_GRAPHICS
 #endif
diff --git a/drivers/lcd/p14201.c b/drivers/lcd/p14201.c
index dbc54f547c..5a5164cfe3 100644
--- a/drivers/lcd/p14201.c
+++ b/drivers/lcd/p14201.c
@@ -147,7 +147,7 @@
  * Verbose debug must also be enabled
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_GRAPHICS
 #endif
diff --git a/drivers/lcd/ra8875.c b/drivers/lcd/ra8875.c
index 309a7fb546..11aad5b137 100644
--- a/drivers/lcd/ra8875.c
+++ b/drivers/lcd/ra8875.c
@@ -103,7 +103,7 @@
  * also be enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_GRAPHICS
 #  undef CONFIG_DEBUG_LCD
diff --git a/drivers/lcd/skeleton.c b/drivers/lcd/skeleton.c
index f0bd831137..7b4d7a6034 100644
--- a/drivers/lcd/skeleton.c
+++ b/drivers/lcd/skeleton.c
@@ -66,7 +66,7 @@
 
 /* Verbose debug must also be enabled */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_GRAPHICS
 #endif
diff --git a/drivers/lcd/ssd1289.c b/drivers/lcd/ssd1289.c
index 8c4800d5fe..98e994d17f 100644
--- a/drivers/lcd/ssd1289.c
+++ b/drivers/lcd/ssd1289.c
@@ -104,7 +104,7 @@
  * also be enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_GRAPHICS
 #  undef CONFIG_DEBUG_LCD
diff --git a/drivers/lcd/ssd1306_base.c b/drivers/lcd/ssd1306_base.c
index 345b5f5695..96a50c369d 100644
--- a/drivers/lcd/ssd1306_base.c
+++ b/drivers/lcd/ssd1306_base.c
@@ -742,7 +742,7 @@ static int ssd1306_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
 
   /* Verify the contrast value */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (contrast > CONFIG_LCD_MAXCONTRAST)
     {
       return -EINVAL;
diff --git a/drivers/lcd/st7565.c b/drivers/lcd/st7565.c
index 6350e0bda7..8bcaea643c 100644
--- a/drivers/lcd/st7565.c
+++ b/drivers/lcd/st7565.c
@@ -79,7 +79,7 @@
  *   ST7565 devices that will be supported.  NOTE:  At present, this
  *   must be undefined or defined to be 1.
  * CONFIG_LCD_ST7565DEBUG - Enable detailed ST7565 debst7565 output
- *   (CONFIG_DEBUG and CONFIG_VERBOSE must also be enabled).
+ *   (CONFIG_DEBUG_FEATURES and CONFIG_VERBOSE must also be enabled).
  *
  * Required LCD driver settings:
  * CONFIG_LCD_ST7565 - Enable ST7565 support
@@ -105,7 +105,7 @@
 
 /* Verbose debst7565 must also be enabled to use the extra OLED debst7565 */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_GRAPHICS
 #endif
diff --git a/drivers/lcd/st7567.c b/drivers/lcd/st7567.c
index 004f0deae4..ce5b06a92d 100644
--- a/drivers/lcd/st7567.c
+++ b/drivers/lcd/st7567.c
@@ -80,7 +80,7 @@
  *   If the hardware supports a controllable OLED a power supply, this
  *   configuration shold be defined.  (See st7567_power() below).
  * CONFIG_LCD_ST7567DEBUG - Enable detailed ST7567 debst7567 output
- *   (CONFIG_DEBUG and CONFIG_VERBOSE must also be enabled).
+ *   (CONFIG_DEBUG_FEATURES and CONFIG_VERBOSE must also be enabled).
  *
  * Required LCD driver settings:
  * CONFIG_LCD_ST7567 - Enable ST7567 support
@@ -123,7 +123,7 @@
 
 /* Verbose debst7567 must also be enabled to use the extra OLED debst7567 */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_GRAPHICS
 #endif
diff --git a/drivers/lcd/ug-2864ambag01.c b/drivers/lcd/ug-2864ambag01.c
index 7019ddbc5a..21c4215631 100644
--- a/drivers/lcd/ug-2864ambag01.c
+++ b/drivers/lcd/ug-2864ambag01.c
@@ -961,7 +961,7 @@ static int ug2864ambag01_setcontrast(struct lcd_dev_s *dev, unsigned int contras
 
   /* Verify the contrast value */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (contrast > CONFIG_LCD_MAXCONTRAST)
     {
       return -EINVAL;
diff --git a/drivers/lcd/ug-9664hswag01.c b/drivers/lcd/ug-9664hswag01.c
index 9fa03989f6..4f427d69a9 100644
--- a/drivers/lcd/ug-9664hswag01.c
+++ b/drivers/lcd/ug-9664hswag01.c
@@ -125,7 +125,7 @@
 
 /* Verbose debug must also be enabled to use the extra OLED debug */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #endif
 
diff --git a/drivers/leds/userled_upper.c b/drivers/leds/userled_upper.c
index 43954bd63a..dd074db27a 100644
--- a/drivers/leds/userled_upper.c
+++ b/drivers/leds/userled_upper.c
@@ -61,7 +61,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_LEDS
 #endif
diff --git a/drivers/loop/losetup.c b/drivers/loop/losetup.c
index ccc75a7971..5ff237058b 100644
--- a/drivers/loop/losetup.c
+++ b/drivers/loop/losetup.c
@@ -379,7 +379,7 @@ int losetup(FAR const char *devname, FAR const char *filename,
 
   /* Sanity check */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!devname || !filename || !sectsize)
     {
       return -EINVAL;
@@ -485,7 +485,7 @@ int loteardown(FAR const char *devname)
 
   /* Sanity check */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!devname)
     {
       return -EINVAL;
diff --git a/drivers/mmcsd/mmcsd_sdio.c b/drivers/mmcsd/mmcsd_sdio.c
index 1471208a59..2b52f72142 100644
--- a/drivers/mmcsd/mmcsd_sdio.c
+++ b/drivers/mmcsd/mmcsd_sdio.c
@@ -171,7 +171,7 @@ static int     mmcsd_getSCR(FAR struct mmcsd_state_s *priv, uint32_t scr[2]);
 
 static void    mmcsd_decodeCSD(FAR struct mmcsd_state_s *priv,
                  uint32_t csd[4]);
-#if defined(CONFIG_DEBUG) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
 static void    mmcsd_decodeCID(FAR struct mmcsd_state_s *priv,
                  uint32_t cid[4]);
 #else
@@ -558,7 +558,7 @@ static int mmcsd_getSCR(FAR struct mmcsd_state_s *priv, uint32_t scr[2])
 
 static void mmcsd_decodeCSD(FAR struct mmcsd_state_s *priv, uint32_t csd[4])
 {
-#if defined(CONFIG_DEBUG) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
   struct mmcsd_csd_s decoded;
 #endif
   unsigned int readbllen;
@@ -578,7 +578,7 @@ static void mmcsd_decodeCSD(FAR struct mmcsd_state_s *priv, uint32_t csd[4])
    *   TRANSFER_RATE_UNIT 2:0 Rate mantissa
    */
 
-#if defined(CONFIG_DEBUG) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
   memset(&decoded, 0, sizeof(struct mmcsd_csd_s));
   decoded.csdstructure               =  csd[0] >> 30;
   decoded.mmcspecvers                = (csd[0] >> 26) & 0x0f;
@@ -606,7 +606,7 @@ static void mmcsd_decodeCSD(FAR struct mmcsd_state_s *priv, uint32_t csd[4])
   priv->dsrimp             = (csd[1] >> 12) & 1;
   readbllen                = (csd[1] >> 16) & 0x0f;
 
-#if defined(CONFIG_DEBUG) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
   decoded.ccc              = (csd[1] >> 20) & 0x0fff;
   decoded.readbllen        = (csd[1] >> 16) & 0x0f;
   decoded.readblpartial    = (csd[1] >> 15) & 1;
@@ -667,7 +667,7 @@ static void mmcsd_decodeCSD(FAR struct mmcsd_state_s *priv, uint32_t csd[4])
       priv->blocksize                = 1 << 9;
       priv->nblocks                  = priv->capacity >> 9;
 
-#if defined(CONFIG_DEBUG) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
       decoded.u.sdblock.csize        = csize;
       decoded.u.sdblock.sderblen     = (csd[2] >> 14) & 1;
       decoded.u.sdblock.sdsectorsize = (csd[2] >> 7) & 0x7f;
@@ -703,7 +703,7 @@ static void mmcsd_decodeCSD(FAR struct mmcsd_state_s *priv, uint32_t csd[4])
           priv->blockshift           = 9;
         }
 
-#if defined(CONFIG_DEBUG) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
       if (IS_SD(priv->type))
         {
           decoded.u.sdbyte.csize            = csize;
@@ -753,7 +753,7 @@ static void mmcsd_decodeCSD(FAR struct mmcsd_state_s *priv, uint32_t csd[4])
   tmpwriteprotect          = (csd[3] >> 12) & 1;
   priv->wrprotect          = (permwriteprotect || tmpwriteprotect);
 
-#if defined(CONFIG_DEBUG) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
   decoded.wpgrpen          =  csd[3] >> 31;
   decoded.mmcdfltecc       = (csd[3] >> 29) & 3;
   decoded.r2wfactor        = (csd[3] >> 26) & 7;
@@ -844,7 +844,7 @@ static void mmcsd_decodeCSD(FAR struct mmcsd_state_s *priv, uint32_t csd[4])
  *
  ****************************************************************************/
 
-#if defined(CONFIG_DEBUG) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
 static void mmcsd_decodeCID(FAR struct mmcsd_state_s *priv, uint32_t cid[4])
 {
   struct mmcsd_cid_s decoded;
@@ -910,7 +910,7 @@ static void mmcsd_decodeCID(FAR struct mmcsd_state_s *priv, uint32_t cid[4])
 
 static void mmcsd_decodeSCR(FAR struct mmcsd_state_s *priv, uint32_t scr[2])
 {
-#if defined(CONFIG_DEBUG) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
 struct mmcsd_scr_s decoded;
 #endif
 
@@ -929,7 +929,7 @@ struct mmcsd_scr_s decoded;
   priv->buswidth     = (scr[0] >> 8) & 15;
 #endif
 
-#if defined(CONFIG_DEBUG) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
 #ifdef CONFIG_ENDIAN_BIG	/* Card SCR is big-endian order / CPU also big-endian
                              *   60   56   52   48   44   40   36   32
                              * VVVV SSSS ESSS BBBB RRRR RRRR RRRR RRRR */
@@ -952,7 +952,7 @@ struct mmcsd_scr_s decoded;
    *   Reserved               31:0  32-bits reserved for manufacturing usage.
    */
 
-#if defined(CONFIG_DEBUG) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined (CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_FS)
   decoded.mfgdata   = scr[1];  /* Might be byte reversed! */
 
   finfo("SCR:\n");
@@ -3251,7 +3251,7 @@ int mmcsd_slotinitialize(int minor, FAR struct sdio_dev_s *dev)
 
   /* Sanity check */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (minor < 0 || minor > 255 || !dev)
     {
       return -EINVAL;
diff --git a/drivers/mmcsd/mmcsd_spi.c b/drivers/mmcsd/mmcsd_spi.c
index bcd67e555b..082ff094b0 100644
--- a/drivers/mmcsd/mmcsd_spi.c
+++ b/drivers/mmcsd/mmcsd_spi.c
@@ -1031,7 +1031,7 @@ static int mmcsd_open(FAR struct inode *inode)
 
   finfo("Entry\n");
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!inode || !inode->i_private)
     {
       fdbg("Internal confusion\n");
@@ -1044,7 +1044,7 @@ static int mmcsd_open(FAR struct inode *inode)
   slot = (FAR struct mmcsd_slot_s *)inode->i_private;
   spi  = slot->spi;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!spi)
     {
       fdbg("Internal confusion\n");
@@ -1116,7 +1116,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
 
   finfo("start_sector=%d nsectors=%d\n", start_sector, nsectors);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!buffer)
     {
       fdbg("Invalid parameters\n");
@@ -1135,7 +1135,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
   slot = (FAR struct mmcsd_slot_s *)inode->i_private;
   spi  = slot->spi;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!spi)
     {
       fdbg("Internal confusion\n");
@@ -1270,7 +1270,7 @@ static ssize_t mmcsd_write(FAR struct inode *inode, const unsigned char *buffer,
 
   finfo("start_sector=%d nsectors=%d\n", start_sector, nsectors);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!buffer)
     {
       fdbg("Invalid parameters\n");
@@ -1289,7 +1289,7 @@ static ssize_t mmcsd_write(FAR struct inode *inode, const unsigned char *buffer,
   slot = (FAR struct mmcsd_slot_s *)inode->i_private;
   spi  = slot->spi;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!spi)
     {
       fdbg("Internal confusion\n");
@@ -1452,7 +1452,7 @@ static int mmcsd_geometry(FAR struct inode *inode, struct geometry *geometry)
   uint8_t csd[16];
   int ret;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!geometry)
     {
       fdbg("Invalid parameters\n");
@@ -1471,7 +1471,7 @@ static int mmcsd_geometry(FAR struct inode *inode, struct geometry *geometry)
   slot = (FAR struct mmcsd_slot_s *)inode->i_private;
   spi  = slot->spi;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!spi)
     {
       fdbg("Internal confusion\n");
@@ -1833,7 +1833,7 @@ static void mmcsd_mediachanged(void *arg)
   uint8_t oldstate;
   int ret;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!slot || !slot->spi)
     {
       fdbg("Internal confusion\n");
@@ -1915,7 +1915,7 @@ int mmcsd_spislotinitialize(int minor, int slotno, FAR struct spi_dev_s *spi)
   char devname[16];
   int ret;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if ((unsigned)slotno >= CONFIG_MMCSD_NSLOTS || (unsigned)minor > 255 || !spi)
     {
       fdbg("Invalid arguments\n");
@@ -1929,7 +1929,7 @@ int mmcsd_spislotinitialize(int minor, int slotno, FAR struct spi_dev_s *spi)
   memset(slot, 0, sizeof(struct mmcsd_slot_s));
   sem_init(&slot->sem, 0, 1);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (slot->spi)
     {
       fdbg("Already registered\n");
diff --git a/drivers/mtd/filemtd.c b/drivers/mtd/filemtd.c
index 18b2e19e1a..89f6fb7b87 100644
--- a/drivers/mtd/filemtd.c
+++ b/drivers/mtd/filemtd.c
@@ -184,7 +184,7 @@ static ssize_t filemtd_write(FAR struct file_dev_s *priv, size_t offset,
        * erased state.
        */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       if (newvalue != srcvalue)
         {
           dbg("ERROR: Bad write: source=%02x dest=%02x result=%02x\n",
diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c
index cf22b4477d..98e61cb578 100644
--- a/drivers/mtd/ftl.c
+++ b/drivers/mtd/ftl.c
@@ -466,7 +466,7 @@ static int ftl_ioctl(FAR struct inode *inode, int cmd, unsigned long arg)
        * driver.
        */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       if (arg == 0)
         {
           fdbg("ERROR: BIOC_XIPBASE argument is NULL\n");
@@ -519,7 +519,7 @@ int ftl_initialize(int minor, FAR struct mtd_dev_s *mtd)
 
   /* Sanity check */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (minor < 0 || minor > 255 || !mtd)
     {
       return -EINVAL;
diff --git a/drivers/mtd/rammtd.c b/drivers/mtd/rammtd.c
index af63097723..8bc9ac8b82 100644
--- a/drivers/mtd/rammtd.c
+++ b/drivers/mtd/rammtd.c
@@ -169,7 +169,7 @@ static void *ram_write(FAR void *dest, FAR const void *src, size_t len)
        * erased state.
        */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       if (newvalue != srcvalue)
         {
           dbg("ERROR: Bad write: source=%02x dest=%02x result=%02x\n",
diff --git a/drivers/mtd/smart.c b/drivers/mtd/smart.c
index 7e54bf71fa..56629e2689 100644
--- a/drivers/mtd/smart.c
+++ b/drivers/mtd/smart.c
@@ -5104,7 +5104,7 @@ static int smart_ioctl(FAR struct inode *inode, int cmd, unsigned long arg)
        * driver.
        */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       if (arg == 0)
         {
           fdbg("ERROR: BIOC_XIPBASE argument is NULL\n");
@@ -5281,7 +5281,7 @@ int smart_initialize(int minor, FAR struct mtd_dev_s *mtd, FAR const char *partn
 
   /* Sanity check */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (minor < 0 || minor > 255 || !mtd)
     {
       return -EINVAL;
@@ -5550,7 +5550,7 @@ static int smart_loteardown(FAR const char *devname)
 
   /* Sanity check */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!devname)
     {
       return -EINVAL;
diff --git a/drivers/mtd/sst39vf.c b/drivers/mtd/sst39vf.c
index 53a12f0a02..0c7e2cac61 100644
--- a/drivers/mtd/sst39vf.c
+++ b/drivers/mtd/sst39vf.c
@@ -697,7 +697,7 @@ static ssize_t sst39vf_bwrite(FAR struct mtd_dev_s *dev, off_t startblock,
 static ssize_t sst39vf_read(FAR struct mtd_dev_s *dev, off_t offset,
                             size_t nbytes, FAR uint8_t *buffer)
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   FAR struct sst39vf_dev_s *priv = (FAR struct sst39vf_dev_s *)dev;
 #endif
   FAR const uint8_t *source;
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 5e1ef3fee1..8852ead7b8 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -95,12 +95,12 @@ config NETDEV_LATEINIT
 
 config NET_DUMPPACKET
 	bool "Enable packet dumping"
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	default n
 	---help---
 		Some Ethernet MAC drivers supporting dumping of received and
 		transmitted packets as a debug option.  This setting enables that
-		debug option. Also needs DEBUG.
+		debug option. Also needs CONFIG_DEBUG_FEATURES.
 
 comment "External Ethernet MAC Device Support"
 
@@ -234,9 +234,10 @@ config ENC28J60_DUMPPACKET
 config ENC28J60_REGDEBUG
 	bool "Register-Level Debug"
 	default n
-	depends on DEBUG && DEBUG_NET
+	depends on DEBUG_FEATURES && DEBUG_NET
 	---help---
-		Enable very low-level register access debug.  Depends on DEBUG and DEBUG_NET.
+		Enable very low-level register access debug.  Depends on
+		CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_NET.
 
 endif # ENC28J60
 
@@ -296,9 +297,10 @@ config ENCX24J600_DUMPPACKET
 config ENCX24J600_REGDEBUG
 	bool "Register-Level Debug"
 	default n
-	depends on DEBUG && DEBUG_NET
+	depends on DEBUG_FEATURES && DEBUG_NET
 	---help---
-		Enable very low-level register access debug.  Depends on DEBUG and DEBUG_NET.
+		Enable very low-level register access debug.  Depends on
+		CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_NET.
 
 endif # ENCX24J600
 
@@ -495,7 +497,7 @@ endchoice
 config NETDEV_PHY_DEBUG
 	bool "PHY debug"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	---help---
 		Normally debug output is controlled by DEBUG_NET.  However, that
 		may generate a LOT of debug output, especially if CONFIG_DEBUG_INFO is
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index c10782fbe6..a9e26152ed 100644
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -679,7 +679,7 @@ static int cs89x0_interrupt(int irq, FAR void *context)
   register struct cs89x0_driver_s *cs89x0 = s89x0_mapirq(irq);
   uint16_t isq;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!cs89x0)
     {
       return -ENODEV;
@@ -1010,7 +1010,7 @@ int cs89x0_initialize(FAR const cs89x0_driver_s *cs89x0, int devno)
 {
   /* Sanity checks -- only performed with debug enabled */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!cs89x0 || (unsigned)devno > CONFIG_CS89x0_NINTERFACES || g_cs89x00[devno])
     {
       return -EINVAL;
diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c
index 225cf13d7a..ecc2d4a2e1 100644
--- a/drivers/net/enc28j60.c
+++ b/drivers/net/enc28j60.c
@@ -135,7 +135,7 @@
 
 /* Low-level register debug */
 
-#if !defined(CONFIG_DEBUG) || !defined(CONFIG_DEBUG_NET)
+#if !defined(CONFIG_DEBUG_FEATURES) || !defined(CONFIG_DEBUG_NET)
 #  undef CONFIG_ENC28J60_REGDEBUG
 #endif
 
diff --git a/drivers/net/encx24j600.c b/drivers/net/encx24j600.c
index b0fa6b430a..67582d5c2d 100644
--- a/drivers/net/encx24j600.c
+++ b/drivers/net/encx24j600.c
@@ -140,7 +140,7 @@
 
 /* Low-level register debug */
 
-#if !defined(CONFIG_DEBUG) || !defined(CONFIG_DEBUG_NET)
+#if !defined(CONFIG_DEBUG_FEATURES) || !defined(CONFIG_DEBUG_NET)
 #  undef CONFIG_ENCX24J600_REGDEBUG
 #endif
 
diff --git a/drivers/net/telnet.c b/drivers/net/telnet.c
index 27c313038a..c2ddfc44c9 100644
--- a/drivers/net/telnet.c
+++ b/drivers/net/telnet.c
@@ -230,7 +230,7 @@ static inline void telnet_dumpbuffer(FAR const char *msg,
                                      FAR const char *buffer,
                                      unsigned int nbytes)
 {
-  /* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_NET have to be
+  /* CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_NET have to be
   * defined or the following does nothing.
   */
 
diff --git a/drivers/net/vnet.c b/drivers/net/vnet.c
index a21fa91d12..ef70eb100f 100644
--- a/drivers/net/vnet.c
+++ b/drivers/net/vnet.c
@@ -186,7 +186,7 @@ static int vnet_transmit(FAR struct vnet_driver_s *vnet)
        * we reset the TX buffer directly.
        */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       cprintf("VNET: TX buffer is full\n");
 #endif
       return ERROR;
@@ -308,7 +308,7 @@ void rtos_vnet_recv(struct rgmp_vnet *rgmp_vnet, char *data, int len)
 
       if (len > CONFIG_NET_ETH_MTU || len < 14)
         {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
           cprintf("VNET: receive invalid packet of size %d\n", len);
 #endif
           return;
@@ -506,7 +506,7 @@ static void vnet_polltimer(int argc, uint32_t arg, ...)
 
   if (vnet_is_txbuff_full(vnet->vnet))
     {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       cprintf("VNET: TX buffer is full\n");
 #endif
       return;
@@ -640,7 +640,7 @@ static int vnet_txavail(struct net_driver_s *dev)
 
       if (vnet_is_txbuff_full(vnet->vnet))
         {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
           cprintf("VNET: TX buffer is full\n");
 #endif
           goto out;
diff --git a/drivers/pipes/pipe_common.c b/drivers/pipes/pipe_common.c
index 1541fecd46..3d45b8fdac 100644
--- a/drivers/pipes/pipe_common.c
+++ b/drivers/pipes/pipe_common.c
@@ -56,7 +56,7 @@
 #include 
 #include 
 #include 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 #  include 
 #endif
 
@@ -722,7 +722,7 @@ int pipecommon_poll(FAR struct file *filep, FAR struct pollfd *fds,
 
       FAR struct pollfd **slot = (FAR struct pollfd **)fds->priv;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       if (!slot)
         {
           ret              = -EIO;
@@ -752,7 +752,7 @@ int pipecommon_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
   FAR struct pipe_dev_s *dev   = inode->i_private;
   int                    ret   = -EINVAL;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   /* Some sanity checking */
 
   if (dev == NULL)
diff --git a/drivers/ramdisk.c b/drivers/ramdisk.c
index 172adde32f..ef35b11656 100644
--- a/drivers/ramdisk.c
+++ b/drivers/ramdisk.c
@@ -456,7 +456,7 @@ int romdisk_register(int minor, FAR const uint8_t *buffer, uint32_t nsectors,
 
   /* Sanity check */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (minor < 0 || minor > 255 || !buffer || !nsectors || !sectsize)
     {
       return -EINVAL;
diff --git a/drivers/sensors/Kconfig b/drivers/sensors/Kconfig
index 78e4cd009a..c369db5fc5 100644
--- a/drivers/sensors/Kconfig
+++ b/drivers/sensors/Kconfig
@@ -136,7 +136,7 @@ config ADXL345_ACTIVELOW
 config ADXL345_REGDEBUG
 	bool "Enable Register-Level ADXL345 Debug"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	---help---
 		Enable very low register-level debug output.
 
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index ef4858171d..d5435539f7 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -531,7 +531,7 @@ endif # SERIAL_IFLOWCONTROL_WATERMARKS
 config SERIAL_TIOCSERGSTRUCT
 	bool "Support TIOCSERGSTRUCT"
 	default n
-	depends on DEBUG && (MCU_SERIAL || 16550_UART)
+	depends on DEBUG_FEATURES && (MCU_SERIAL || 16550_UART)
 	---help---
 		As a debug option, many serial bottom half drivers support the TIOCSERGSTRUCT
 		that allows you to get the internal driver data structure.  By default, this
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index fe56f46d44..2d8056e126 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -998,7 +998,7 @@ int uart_poll(FAR struct file *filep, FAR struct pollfd *fds, bool setup)
 
   /* Some sanity checking */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev || !fds)
     {
       return -ENODEV;
@@ -1104,7 +1104,7 @@ int uart_poll(FAR struct file *filep, FAR struct pollfd *fds, bool setup)
 
       struct pollfd **slot = (struct pollfd **)fds->priv;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       if (!slot)
         {
           ret              = -EIO;
diff --git a/drivers/spi/spi_bitbang.c b/drivers/spi/spi_bitbang.c
index 78f1e1c88f..ec3a1512e1 100644
--- a/drivers/spi/spi_bitbang.c
+++ b/drivers/spi/spi_bitbang.c
@@ -83,7 +83,7 @@
  * include/debug.h
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_SPI
 #endif
diff --git a/drivers/syslog/ramlog.c b/drivers/syslog/ramlog.c
index 1025500987..ad62e935f1 100644
--- a/drivers/syslog/ramlog.c
+++ b/drivers/syslog/ramlog.c
@@ -615,7 +615,7 @@ int ramlog_poll(FAR struct file *filep, FAR struct pollfd *fds, bool setup)
 
       struct pollfd **slot = (struct pollfd **)fds->priv;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       if (!slot)
         {
           ret = -EIO;
diff --git a/drivers/timers/Kconfig b/drivers/timers/Kconfig
index ef5d6aed71..076cc43c8b 100644
--- a/drivers/timers/Kconfig
+++ b/drivers/timers/Kconfig
@@ -237,11 +237,11 @@ if TIMERS_CS2100CP
 
 config CS2100CP_DEBUG
 	bool "Enable CS2100-CP Debug Features"
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 
 config CS2100CP_REGDEBUG
 	bool "Enable CS2100-CP Register Debug"
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 
 endif # TIMERS_CS2100CP
 endmenu  # Timer Driver Support
diff --git a/drivers/timers/ds3231.c b/drivers/timers/ds3231.c
index cc45f4b29e..630ba72259 100644
--- a/drivers/timers/ds3231.c
+++ b/drivers/timers/ds3231.c
@@ -77,7 +77,7 @@
 
 #define DS3231_I2C_ADDRESS 0x68
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_RTC
 #endif
 
diff --git a/drivers/timers/pcf85263.c b/drivers/timers/pcf85263.c
index b513c9f8ac..93619f2d93 100644
--- a/drivers/timers/pcf85263.c
+++ b/drivers/timers/pcf85263.c
@@ -77,7 +77,7 @@
 
 #define PCF85263_I2C_ADDRESS 0x51
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_RTC
 #endif
 
diff --git a/drivers/usbdev/cdcacm.c b/drivers/usbdev/cdcacm.c
index ab48720c21..48dbdf5cb0 100644
--- a/drivers/usbdev/cdcacm.c
+++ b/drivers/usbdev/cdcacm.c
@@ -339,7 +339,7 @@ static int cdcacm_sndpacket(FAR struct cdcacm_dev_s *priv)
   int len;
   int ret = OK;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (priv == NULL)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -643,7 +643,7 @@ static int cdcacm_setconfig(FAR struct cdcacm_dev_s *priv, uint8_t config)
   int i;
   int ret = 0;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (priv == NULL)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -817,7 +817,7 @@ static void cdcacm_rdcomplete(FAR struct usbdev_ep_s *ep,
 
   /* Sanity check */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !ep->priv || !req)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -880,7 +880,7 @@ static void cdcacm_wrcomplete(FAR struct usbdev_ep_s *ep,
 
   /* Sanity check */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !ep->priv || !req || !req->priv)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -1120,7 +1120,7 @@ static void cdcacm_unbind(FAR struct usbdevclass_driver_s *driver,
 
   usbtrace(TRACE_CLASSUNBIND, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!driver || !dev)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -1132,7 +1132,7 @@ static void cdcacm_unbind(FAR struct usbdevclass_driver_s *driver,
 
   priv = ((FAR struct cdcacm_driver_s *)driver)->dev;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!priv)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_EP0NOTBOUND), 0);
@@ -1248,7 +1248,7 @@ static int cdcacm_setup(FAR struct usbdevclass_driver_s *driver,
   uint16_t len;
   int ret = -EOPNOTSUPP;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!driver || !dev || !ctrl)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -1261,7 +1261,7 @@ static int cdcacm_setup(FAR struct usbdevclass_driver_s *driver,
   usbtrace(TRACE_CLASSSETUP, ctrl->req);
   priv = ((FAR struct cdcacm_driver_s *)driver)->dev;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!priv || !priv->ctrlreq)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_EP0NOTBOUND), 0);
@@ -1621,7 +1621,7 @@ static void cdcacm_disconnect(FAR struct usbdevclass_driver_s *driver,
 
   usbtrace(TRACE_CLASSDISCONNECT, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!driver || !dev || !dev->ep0)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -1633,7 +1633,7 @@ static void cdcacm_disconnect(FAR struct usbdevclass_driver_s *driver,
 
   priv = ((FAR struct cdcacm_driver_s *)driver)->dev;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!priv)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_EP0NOTBOUND), 0);
@@ -1686,7 +1686,7 @@ static void cdcacm_suspend(FAR struct usbdevclass_driver_s *driver,
 
   usbtrace(TRACE_CLASSSUSPEND, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!driver || !dev)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -1720,7 +1720,7 @@ static void cdcacm_resume(FAR struct usbdevclass_driver_s *driver,
 
   usbtrace(TRACE_CLASSRESUME, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!driver || !dev)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -1763,7 +1763,7 @@ static int cdcuart_setup(FAR struct uart_dev_s *dev)
 
   /* Sanity check */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev || !dev->priv)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -1804,7 +1804,7 @@ static void cdcuart_shutdown(FAR struct uart_dev_s *dev)
 
   /* Sanity check */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev || !dev->priv)
     {
        usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -2063,7 +2063,7 @@ static void cdcuart_rxint(FAR struct uart_dev_s *dev, bool enable)
 
   /* Sanity check */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev || !dev->priv)
     {
        usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -2192,7 +2192,7 @@ static void cdcuart_txint(FAR struct uart_dev_s *dev, bool enable)
 
   /* Sanity checks */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev || !dev->priv)
     {
        usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -2235,7 +2235,7 @@ static bool cdcuart_txempty(FAR struct uart_dev_s *dev)
 
   usbtrace(CDCACM_CLASSAPI_TXEMPTY, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!priv)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
diff --git a/drivers/usbdev/composite.c b/drivers/usbdev/composite.c
index 7a4f3fdc24..54bc3c827e 100644
--- a/drivers/usbdev/composite.c
+++ b/drivers/usbdev/composite.c
@@ -339,7 +339,7 @@ static void composite_unbind(FAR struct usbdevclass_driver_s *driver,
 
   usbtrace(TRACE_CLASSUNBIND, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!driver || !dev || !dev->ep0)
     {
       usbtrace(TRACE_CLSERROR(USBCOMPOSITE_TRACEERR_INVALIDARG), 0);
@@ -351,7 +351,7 @@ static void composite_unbind(FAR struct usbdevclass_driver_s *driver,
 
   priv = ((FAR struct composite_driver_s *)driver)->dev;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!priv)
     {
       usbtrace(TRACE_CLSERROR(USBCOMPOSITE_TRACEERR_EP0NOTBOUND), 0);
@@ -403,7 +403,7 @@ static int composite_setup(FAR struct usbdevclass_driver_s *driver,
   bool dispatched = false;
   int ret = -EOPNOTSUPP;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!driver || !dev || !dev->ep0 || !ctrl)
     {
       usbtrace(TRACE_CLSERROR(USBCOMPOSITE_TRACEERR_SETUPINVALIDARGS), 0);
@@ -416,7 +416,7 @@ static int composite_setup(FAR struct usbdevclass_driver_s *driver,
   usbtrace(TRACE_CLASSSETUP, ctrl->req);
   priv = ((FAR struct composite_driver_s *)driver)->dev;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!priv)
     {
       usbtrace(TRACE_CLSERROR(USBCOMPOSITE_TRACEERR_EP0NOTBOUND2), 0);
@@ -638,7 +638,7 @@ static void composite_disconnect(FAR struct usbdevclass_driver_s *driver,
 
   usbtrace(TRACE_CLASSDISCONNECT, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!driver || !dev)
     {
       usbtrace(TRACE_CLSERROR(USBCOMPOSITE_TRACEERR_INVALIDARG), 0);
@@ -650,7 +650,7 @@ static void composite_disconnect(FAR struct usbdevclass_driver_s *driver,
 
   priv = ((FAR struct composite_driver_s *)driver)->dev;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!priv)
     {
       usbtrace(TRACE_CLSERROR(USBCOMPOSITE_TRACEERR_EP0NOTBOUND), 0);
@@ -691,7 +691,7 @@ static void composite_suspend(FAR struct usbdevclass_driver_s *driver,
 
   usbtrace(TRACE_CLASSSUSPEND, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev)
     {
       usbtrace(TRACE_CLSERROR(USBCOMPOSITE_TRACEERR_INVALIDARG), 0);
@@ -703,7 +703,7 @@ static void composite_suspend(FAR struct usbdevclass_driver_s *driver,
 
   priv = ((FAR struct composite_driver_s *)driver)->dev;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!priv)
     {
       usbtrace(TRACE_CLSERROR(USBCOMPOSITE_TRACEERR_EP0NOTBOUND), 0);
@@ -733,7 +733,7 @@ static void composite_resume(FAR struct usbdevclass_driver_s *driver,
   FAR struct composite_dev_s *priv = NULL;
   irqstate_t flags;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev)
     {
       usbtrace(TRACE_CLSERROR(USBCOMPOSITE_TRACEERR_INVALIDARG), 0);
@@ -745,7 +745,7 @@ static void composite_resume(FAR struct usbdevclass_driver_s *driver,
 
   priv = ((FAR struct composite_driver_s *)driver)->dev;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!priv)
     {
       usbtrace(TRACE_CLSERROR(USBCOMPOSITE_TRACEERR_EP0NOTBOUND), 0);
diff --git a/drivers/usbdev/pl2303.c b/drivers/usbdev/pl2303.c
index 0a07ebaa66..1611905790 100644
--- a/drivers/usbdev/pl2303.c
+++ b/drivers/usbdev/pl2303.c
@@ -598,7 +598,7 @@ static int usbclass_sndpacket(FAR struct pl2303_dev_s *priv)
   int len;
   int ret = OK;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (priv == NULL)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -1047,7 +1047,7 @@ static int usbclass_setconfig(FAR struct pl2303_dev_s *priv, uint8_t config)
   int i;
   int ret = 0;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (priv == NULL)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -1203,7 +1203,7 @@ static void usbclass_rdcomplete(FAR struct usbdev_ep_s *ep,
 
   /* Sanity check */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !ep->priv || !req)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -1265,7 +1265,7 @@ static void usbclass_wrcomplete(FAR struct usbdev_ep_s *ep,
 
   /* Sanity check */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !ep->priv || !req || !req->priv)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -1489,7 +1489,7 @@ static void usbclass_unbind(FAR struct usbdevclass_driver_s *driver,
 
   usbtrace(TRACE_CLASSUNBIND, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!driver || !dev || !dev->ep0)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -1501,7 +1501,7 @@ static void usbclass_unbind(FAR struct usbdevclass_driver_s *driver,
 
   priv = ((FAR struct pl2303_driver_s *)driver)->dev;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!priv)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_EP0NOTBOUND), 0);
@@ -1616,7 +1616,7 @@ static int usbclass_setup(FAR struct usbdevclass_driver_s *driver,
   uint16_t len;
   int ret = -EOPNOTSUPP;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!driver || !dev || !dev->ep0 || !ctrl)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -1629,7 +1629,7 @@ static int usbclass_setup(FAR struct usbdevclass_driver_s *driver,
   usbtrace(TRACE_CLASSSETUP, ctrl->req);
   priv = ((FAR struct pl2303_driver_s *)driver)->dev;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!priv || !priv->ctrlreq)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_EP0NOTBOUND), 0);
@@ -1877,7 +1877,7 @@ static void usbclass_disconnect(FAR struct usbdevclass_driver_s *driver,
 
   usbtrace(TRACE_CLASSDISCONNECT, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!driver || !dev || !dev->ep0)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -1889,7 +1889,7 @@ static void usbclass_disconnect(FAR struct usbdevclass_driver_s *driver,
 
   priv = ((FAR struct pl2303_driver_s *)driver)->dev;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!priv)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_EP0NOTBOUND), 0);
@@ -1940,7 +1940,7 @@ static void usbclass_suspend(FAR struct usbdevclass_driver_s *driver,
 
   usbtrace(TRACE_CLASSSUSPEND, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!driver || !dev)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -1974,7 +1974,7 @@ static void usbclass_resume(FAR struct usbdevclass_driver_s *driver,
 
   usbtrace(TRACE_CLASSRESUME, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!driver || !dev)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -2017,7 +2017,7 @@ static int usbser_setup(FAR struct uart_dev_s *dev)
 
   /* Sanity check */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev || !dev->priv)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -2058,7 +2058,7 @@ static void usbser_shutdown(FAR struct uart_dev_s *dev)
 
   /* Sanity check */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev || !dev->priv)
     {
        usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -2120,7 +2120,7 @@ static void usbser_rxint(FAR struct uart_dev_s *dev, bool enable)
 
   /* Sanity check */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev || !dev->priv)
     {
        usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -2211,7 +2211,7 @@ static void usbser_txint(FAR struct uart_dev_s *dev, bool enable)
 
   /* Sanity checks */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev || !dev->priv)
     {
        usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
@@ -2254,7 +2254,7 @@ static bool usbser_txempty(FAR struct uart_dev_s *dev)
 
   usbtrace(PL2303_CLASSAPI_TXEMPTY, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!priv)
     {
       usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_INVALIDARG), 0);
diff --git a/drivers/usbdev/usbdev_trace.c b/drivers/usbdev/usbdev_trace.c
index be19863b1b..3e9831562e 100644
--- a/drivers/usbdev/usbdev_trace.c
+++ b/drivers/usbdev/usbdev_trace.c
@@ -81,7 +81,7 @@ static uint16_t g_head = 0;
 static uint16_t g_tail = 0;
 #endif
 
-#if defined(CONFIG_USBDEV_TRACE) || (defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_USB))
+#if defined(CONFIG_USBDEV_TRACE) || (defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_USB))
 static usbtrace_idset_t g_maskedidset = CONFIG_USBDEV_TRACE_INITIALIDSET;
 #endif
 
@@ -94,7 +94,7 @@ static usbtrace_idset_t g_maskedidset = CONFIG_USBDEV_TRACE_INITIALIDSET;
  ****************************************************************************/
 
 #if !defined(CONFIG_USBDEV_TRACE) && \
-    (defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_USB))
+    (defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_USB))
 static int usbtrace_syslog(const char *fmt, ...)
 {
   va_list ap;
@@ -132,7 +132,7 @@ static int usbtrace_syslog(const char *fmt, ...)
  ****************************************************************************/
 
 #if defined(CONFIG_USBDEV_TRACE) || \
-   (defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_USB))
+   (defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_USB))
 usbtrace_idset_t usbtrace_enable(usbtrace_idset_t idset)
 {
   irqstate_t flags;
@@ -146,7 +146,7 @@ usbtrace_idset_t usbtrace_enable(usbtrace_idset_t idset)
   leave_critical_section(flags);
   return ret;
 }
-#endif /* CONFIG_USBDEV_TRACE || CONFIG_DEBUG && CONFIG_DEBUG_USB */
+#endif /* CONFIG_USBDEV_TRACE || CONFIG_DEBUG_FEATURES && CONFIG_DEBUG_USB */
 
 /****************************************************************************
  * Name: usbtrace
@@ -159,7 +159,7 @@ usbtrace_idset_t usbtrace_enable(usbtrace_idset_t idset)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_USBDEV_TRACE) || (defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_USB))
+#if defined(CONFIG_USBDEV_TRACE) || (defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_USB))
 void usbtrace(uint16_t event, uint16_t value)
 {
   irqstate_t flags;
@@ -198,7 +198,7 @@ void usbtrace(uint16_t event, uint16_t value)
 
   leave_critical_section(flags);
 }
-#endif /* CONFIG_USBDEV_TRACE || CONFIG_DEBUG && CONFIG_DEBUG_USB */
+#endif /* CONFIG_USBDEV_TRACE || CONFIG_DEBUG_FEATURES && CONFIG_DEBUG_USB */
 
 /****************************************************************************
  * Name: usbtrace_enumerate
diff --git a/drivers/usbdev/usbmsc.c b/drivers/usbdev/usbmsc.c
index 34873c1a81..35fc5cf5a3 100644
--- a/drivers/usbdev/usbmsc.c
+++ b/drivers/usbdev/usbmsc.c
@@ -404,7 +404,7 @@ static void usbmsc_unbind(FAR struct usbdevclass_driver_s *driver,
 
   usbtrace(TRACE_CLASSUNBIND, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!driver || !dev || !dev->ep0)
     {
       usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_UNBINDINVALIDARGS), 0);
@@ -416,7 +416,7 @@ static void usbmsc_unbind(FAR struct usbdevclass_driver_s *driver,
 
   priv = ((FAR struct usbmsc_driver_s *)driver)->dev;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!priv)
     {
       usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_EP0NOTBOUND1), 0);
@@ -521,7 +521,7 @@ static int usbmsc_setup(FAR struct usbdevclass_driver_s *driver,
   uint16_t len;
   int ret = -EOPNOTSUPP;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!driver || !dev || !dev->ep0 || !ctrl)
     {
       usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_SETUPINVALIDARGS), 0);
@@ -534,7 +534,7 @@ static int usbmsc_setup(FAR struct usbdevclass_driver_s *driver,
   usbtrace(TRACE_CLASSSETUP, ctrl->req);
   priv = ((FAR struct usbmsc_driver_s *)driver)->dev;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!priv || !priv->ctrlreq)
     {
       usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_EP0NOTBOUND2), 0);
@@ -847,7 +847,7 @@ static void usbmsc_disconnect(FAR struct usbdevclass_driver_s *driver,
 
   usbtrace(TRACE_CLASSDISCONNECT, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!driver || !dev || !dev->ep0)
     {
       usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_DISCONNECTINVALIDARGS), 0);
@@ -859,7 +859,7 @@ static void usbmsc_disconnect(FAR struct usbdevclass_driver_s *driver,
 
   priv = ((FAR struct usbmsc_driver_s *)driver)->dev;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!priv)
     {
       usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_EP0NOTBOUND3), 0);
@@ -935,7 +935,7 @@ int usbmsc_setconfig(FAR struct usbmsc_dev_s *priv, uint8_t config)
   int i;
   int ret = 0;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (priv == NULL)
     {
       usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_SETCONFIGINVALIDARGS), 0);
@@ -1074,7 +1074,7 @@ void usbmsc_wrcomplete(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *req)
 
   /* Sanity check */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !ep->priv || !req || !req->priv)
     {
       usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_WRCOMPLETEINVALIDARGS), 0);
@@ -1135,7 +1135,7 @@ void usbmsc_rdcomplete(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *req)
 
   /* Sanity check */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ep || !ep->priv || !req || !req->priv)
     {
       usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_RDCOMPLETEINVALIDARGS), 0);
@@ -1227,7 +1227,7 @@ void usbmsc_deferredresponse(FAR struct usbmsc_dev_s *priv, bool failed)
   FAR struct usbdev_req_s *ctrlreq;
   int ret;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!priv || !priv->usbdev || !priv->ctrlreq)
     {
       usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_DEFERREDRESPINVALIDARGS), 0);
@@ -1317,7 +1317,7 @@ int usbmsc_configure(unsigned int nluns, void **handle)
   FAR struct usbmsc_driver_s *drvr;
   int ret;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (nluns > 15)
     {
       usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_TOOMANYLUNS), 0);
@@ -1411,7 +1411,7 @@ int usbmsc_bindlun(FAR void *handle, FAR const char *drvrpath,
   struct geometry geo;
   int ret;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!alloc || !drvrpath || startsector < 0)
     {
       usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_BINLUNINVALIDARGS1), 0);
@@ -1421,7 +1421,7 @@ int usbmsc_bindlun(FAR void *handle, FAR const char *drvrpath,
 
   priv = &alloc->dev;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!priv->luntab)
     {
       usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_INTERNALCONFUSION1), 0);
@@ -1437,7 +1437,7 @@ int usbmsc_bindlun(FAR void *handle, FAR const char *drvrpath,
 
   lun = &priv->luntab[lunno];
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (lun->inode != NULL)
     {
       usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_LUNALREADYBOUND), 0);
@@ -1552,7 +1552,7 @@ int usbmsc_unbindlun(FAR void *handle, unsigned int lunno)
   FAR struct usbmsc_lun_s *lun;
   int ret;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!alloc)
     {
       usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_UNBINDLUNINVALIDARGS1), 0);
@@ -1562,7 +1562,7 @@ int usbmsc_unbindlun(FAR void *handle, unsigned int lunno)
 
   priv = &alloc->dev;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!priv->luntab)
     {
       usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_INTERNALCONFUSION2), 0);
@@ -1579,7 +1579,7 @@ int usbmsc_unbindlun(FAR void *handle, unsigned int lunno)
   lun = &priv->luntab[lunno];
   usbmsc_scsi_lock(priv);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (lun->inode == NULL)
     {
       usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_LUNNOTBOUND), 0);
@@ -1626,7 +1626,7 @@ int usbmsc_exportluns(FAR void *handle)
   irqstate_t flags;
   int ret = OK;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!alloc)
     {
       usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_EXPORTLUNSINVALIDARGS), 0);
@@ -1756,7 +1756,7 @@ void usbmsc_uninitialize(FAR void *handle)
 #endif
   int i;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!handle)
     {
       usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_UNINITIALIZEINVALIDARGS), 0);
diff --git a/drivers/usbhost/usbhost_trace.c b/drivers/usbhost/usbhost_trace.c
index cd1ef92c4f..ba47097fa8 100644
--- a/drivers/usbhost/usbhost_trace.c
+++ b/drivers/usbhost/usbhost_trace.c
@@ -190,7 +190,7 @@ void usbhost_trace_common(uint32_t event)
  ****************************************************************************/
 
 #if defined(CONFIG_USBHOST_TRACE) || \
-   (defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_USB))
+   (defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_USB))
 
 void usbhost_trace1(uint16_t id, uint32_t u23)
 {
@@ -228,7 +228,7 @@ void usbhost_trace2(uint16_t id, uint8_t u7, uint16_t u16)
 #endif
 }
 
-#endif /* CONFIG_USBHOST_TRACE || CONFIG_DEBUG && CONFIG_DEBUG_USB */
+#endif /* CONFIG_USBHOST_TRACE || CONFIG_DEBUG_FEATURES && CONFIG_DEBUG_USB */
 
 /****************************************************************************
  * Name: usbtrace_enumerate
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 523971c748..56c2fe89fd 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -104,7 +104,7 @@ endchoice
 config OV2640_REGDEBUG
 	bool "Register level debug output"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	---help---
 		Enable details, register level debug output.
 
diff --git a/drivers/wireless/cc3000/cc3000.c b/drivers/wireless/cc3000/cc3000.c
index b14b8a94a6..12413070df 100644
--- a/drivers/wireless/cc3000/cc3000.c
+++ b/drivers/wireless/cc3000/cc3000.c
@@ -113,7 +113,7 @@ CCASSERT(sizeof(cc3000_buffer_desc) <= CONFIG_MQ_MAXMSGSIZE);
 #define FREE_SLOT -1
 #define CLOSE_SLOT -2
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_CC3000_PROBES)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_CC3000_PROBES)
 #  define CC3000_GUARD (0xc35aa53c)
 #  define INIT_GUARD(p) p->guard = CC3000_GUARD
 #  define CHECK_GUARD(p) DEBUGASSERT(p->guard == CC3000_GUARD)
diff --git a/drivers/wireless/cc3000/cc3000.h b/drivers/wireless/cc3000/cc3000.h
index 0ebc118ebb..ddcd4f5163 100644
--- a/drivers/wireless/cc3000/cc3000.h
+++ b/drivers/wireless/cc3000/cc3000.h
@@ -168,7 +168,7 @@ struct cc3000_dev_s
   struct pollfd *fds[CONFIG_CC3000_NPOLLWAITERS];
 #endif
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_CC3000_PROBES)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_CC3000_PROBES)
  long guard;
 #endif
 
diff --git a/fs/Kconfig b/fs/Kconfig
index 150bbcdde9..fe436402b3 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -21,7 +21,7 @@ config FS_AUTOMOUNTER
 config FS_AUTOMOUNTER_DEBUG
 	bool "Auto-mounter debug"
 	default n
-	depends on FS_AUTOMOUNTER && DEBUG
+	depends on FS_AUTOMOUNTER && DEBUG_FEATURES
 	---help---
 		Normally, the auto-mounter will generate debug output when sub-system
 		level file system debug is enabled.  This option will select debug
diff --git a/fs/driver/fs_closeblockdriver.c b/fs/driver/fs_closeblockdriver.c
index 3280236af1..ea39e99e53 100644
--- a/fs/driver/fs_closeblockdriver.c
+++ b/fs/driver/fs_closeblockdriver.c
@@ -72,7 +72,7 @@ int close_blockdriver(FAR struct inode *inode)
 
   /* Sanity checks */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!inode || !inode->u.i_bops)
     {
       ret = -EINVAL;
diff --git a/fs/driver/fs_devsyslog.c b/fs/driver/fs_devsyslog.c
index b33129a924..2c35dab48d 100644
--- a/fs/driver/fs_devsyslog.c
+++ b/fs/driver/fs_devsyslog.c
@@ -167,7 +167,7 @@ static inline int syslog_takesem(void)
 
 static inline void syslog_givesem(void)
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   pid_t me = getpid();
   DEBUGASSERT(g_sysdev.sl_holder == me);
 #endif
diff --git a/fs/driver/fs_findblockdriver.c b/fs/driver/fs_findblockdriver.c
index 86b2c65a15..bfbb0ac59e 100644
--- a/fs/driver/fs_findblockdriver.c
+++ b/fs/driver/fs_findblockdriver.c
@@ -83,7 +83,7 @@ int find_blockdriver(FAR const char *pathname, int mountflags, FAR struct inode
 
   /* Sanity checks */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!pathname || !ppinode)
     {
       ret = -EINVAL;
diff --git a/fs/driver/fs_openblockdriver.c b/fs/driver/fs_openblockdriver.c
index 2852751575..bfdf3caadc 100644
--- a/fs/driver/fs_openblockdriver.c
+++ b/fs/driver/fs_openblockdriver.c
@@ -81,7 +81,7 @@ int open_blockdriver(FAR const char *pathname, int mountflags,
 
   /* Minimal sanity checks */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!ppinode)
     {
       ret = -EINVAL;
diff --git a/fs/fat/fs_configfat.c b/fs/fat/fs_configfat.c
index 5898887ca1..f152e45dd1 100644
--- a/fs/fat/fs_configfat.c
+++ b/fs/fat/fs_configfat.c
@@ -973,7 +973,7 @@ int mkfatfs_configfatfs(FAR struct fat_format_s *fmt,
 
   /* Describe the configured filesystem */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   fdbg("Sector size:          %d bytes\n",    var->fv_sectorsize);
   fdbg("Number of sectors:    %d sectors\n",  fmt->ff_nsectors);
   fdbg("FAT size:             %d bits\n",     var->fv_fattype);
diff --git a/fs/fat/fs_mkfatfs.c b/fs/fat/fs_mkfatfs.c
index a1f17d7374..6e083703c6 100644
--- a/fs/fat/fs_mkfatfs.c
+++ b/fs/fat/fs_mkfatfs.c
@@ -193,7 +193,7 @@ int mkfatfs(FAR const char *pathname, FAR struct fat_format_s *fmt)
 
   /* Verify format options (only when DEBUG enabled) */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!pathname)
     {
       fdbg("ERROR: No block driver path\n");
@@ -228,7 +228,7 @@ int mkfatfs(FAR const char *pathname, FAR struct fat_format_s *fmt)
    * means that we should autoselect the cluster sizel.
    */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (fmt->ff_clustshift > 7 && fmt->ff_clustshift != 0xff)
     {
       fdbg("ERROR: Invalid cluster shift value: %d\n", fmt->ff_clustshift);
diff --git a/fs/mmap/fs_mmap.c b/fs/mmap/fs_mmap.c
index 501db40282..fd23f7647b 100644
--- a/fs/mmap/fs_mmap.c
+++ b/fs/mmap/fs_mmap.c
@@ -131,7 +131,7 @@ FAR void *mmap(FAR void *start, size_t length, int prot, int flags,
    * things.
    */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (prot == PROT_NONE ||
       (flags & (MAP_PRIVATE | MAP_FIXED | MAP_ANONYMOUS | MAP_DENYWRITE)) != 0)
     {
diff --git a/fs/nxffs/nxffs_dump.c b/fs/nxffs/nxffs_dump.c
index 1be0e294ac..1bfba3177e 100644
--- a/fs/nxffs/nxffs_dump.c
+++ b/fs/nxffs/nxffs_dump.c
@@ -67,7 +67,7 @@ struct nxffs_blkinfo_s
   off_t nblocks;
   off_t block;
   off_t offset;
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_FS)
   bool verbose;
 #endif
 };
@@ -91,7 +91,7 @@ static const char g_format[]    = "  %5d:%-5d %s %s %5d\n";
  *
  ****************************************************************************/
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_FS)
 static inline ssize_t nxffs_analyzeinode(FAR struct nxffs_blkinfo_s *blkinfo,
                                          int offset)
 {
@@ -239,7 +239,7 @@ static inline ssize_t nxffs_analyzeinode(FAR struct nxffs_blkinfo_s *blkinfo,
  *
  ****************************************************************************/
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_FS)
 static inline ssize_t nxffs_analyzedata(FAR struct nxffs_blkinfo_s *blkinfo,
                                         int offset)
 {
@@ -297,7 +297,7 @@ static inline ssize_t nxffs_analyzedata(FAR struct nxffs_blkinfo_s *blkinfo,
  *
  ****************************************************************************/
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_FS)
 static inline void nxffs_analyze(FAR struct nxffs_blkinfo_s *blkinfo)
 {
   FAR struct nxffs_block_s *blkhdr;
@@ -403,7 +403,7 @@ static inline void nxffs_analyze(FAR struct nxffs_blkinfo_s *blkinfo)
  * Name: nxffs_dump
  *
  * Description:
- *   Dump a summary of the contents of an NXFFS file system.  CONFIG_DEBUG
+ *   Dump a summary of the contents of an NXFFS file system.  CONFIG_DEBUG_FEATURES
  *   and CONFIG_DEBUG_FS must be enabled for this function to do anything.
  *
  * Input Parameters:
@@ -419,7 +419,7 @@ static inline void nxffs_analyze(FAR struct nxffs_blkinfo_s *blkinfo)
 
 int nxffs_dump(FAR struct mtd_dev_s *mtd, bool verbose)
 {
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_FS)
   struct nxffs_blkinfo_s blkinfo;
   int ret;
 
diff --git a/fs/nxffs/nxffs_initialize.c b/fs/nxffs/nxffs_initialize.c
index 19e419a5de..6a5aa49e91 100644
--- a/fs/nxffs/nxffs_initialize.c
+++ b/fs/nxffs/nxffs_initialize.c
@@ -253,7 +253,7 @@ int nxffs_initialize(FAR struct mtd_dev_s *mtd)
 
       /* Get statistics on the re-formatted volume */
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_FS)
       ret = nxffs_blockstats(volume, &stats);
       if (ret < 0)
         {
@@ -284,7 +284,7 @@ int nxffs_initialize(FAR struct mtd_dev_s *mtd)
 
   /* Get statistics on the re-formatted volume */
 
-#if defined(CONFIG_NXFFS_SCAN_VOLUME) && defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_FS)
+#if defined(CONFIG_NXFFS_SCAN_VOLUME) && defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_FS)
   ret = nxffs_blockstats(volume, &stats);
   if (ret < 0)
     {
diff --git a/fs/nxffs/nxffs_open.c b/fs/nxffs/nxffs_open.c
index a461d2c080..64db270426 100644
--- a/fs/nxffs/nxffs_open.c
+++ b/fs/nxffs/nxffs_open.c
@@ -1064,7 +1064,7 @@ int nxffs_open(FAR struct file *filep, FAR const char *relpath,
 
 int nxffs_dup(FAR const struct file *oldp, FAR struct file *newp)
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   FAR struct nxffs_volume_s *volume;
 #endif
   FAR struct nxffs_ofile_s *ofile;
@@ -1073,7 +1073,7 @@ int nxffs_dup(FAR const struct file *oldp, FAR struct file *newp)
 
   /* Sanity checks */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   DEBUGASSERT(oldp->f_priv == NULL && oldp->f_inode != NULL);
 
   /* Get the mountpoint private data from the NuttX inode reference in the
diff --git a/fs/romfs/fs_romfs.c b/fs/romfs/fs_romfs.c
index 91686d32d6..e48c6e71e2 100644
--- a/fs/romfs/fs_romfs.c
+++ b/fs/romfs/fs_romfs.c
@@ -979,7 +979,7 @@ static int romfs_unbind(FAR void *handle, FAR struct inode **blkdriver,
 
   finfo("Entry\n");
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!rm)
     {
       return -EINVAL;
diff --git a/fs/romfs/fs_romfsutil.c b/fs/romfs/fs_romfsutil.c
index da4b7685cd..045bed977f 100644
--- a/fs/romfs/fs_romfsutil.c
+++ b/fs/romfs/fs_romfsutil.c
@@ -499,7 +499,7 @@ int romfs_hwconfigure(struct romfs_mountpt_s *rm)
 
   /* Get the underlying device geometry */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!inode || !inode->u.i_bops || !inode->u.i_bops->geometry)
     {
       return -ENODEV;
diff --git a/graphics/nxbe/nxbe_bitmap.c b/graphics/nxbe/nxbe_bitmap.c
index c4d29681a2..5c94d0b04d 100644
--- a/graphics/nxbe/nxbe_bitmap.c
+++ b/graphics/nxbe/nxbe_bitmap.c
@@ -125,7 +125,7 @@ void nxbe_bitmap(FAR struct nxbe_window_s *wnd, FAR const struct nxgl_rect_s *de
   unsigned int deststride;
   int i;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!wnd || !dest || !src || !origin)
     {
       return;
diff --git a/graphics/nxbe/nxbe_closewindow.c b/graphics/nxbe/nxbe_closewindow.c
index 04f5b9b23d..44520da22c 100644
--- a/graphics/nxbe/nxbe_closewindow.c
+++ b/graphics/nxbe/nxbe_closewindow.c
@@ -70,7 +70,7 @@ void nxbe_closewindow(struct nxbe_window_s *wnd)
 {
   FAR struct nxbe_state_s *be;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!wnd)
     {
       return;
diff --git a/graphics/nxbe/nxbe_configure.c b/graphics/nxbe/nxbe_configure.c
index 5dc9b49c19..f3aae2433d 100644
--- a/graphics/nxbe/nxbe_configure.c
+++ b/graphics/nxbe/nxbe_configure.c
@@ -99,7 +99,7 @@ int nxbe_configure(FAR NX_DRIVERTYPE *dev, FAR struct nxbe_state_s *be)
 
   /* Check the number of color planes */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (be->vinfo.nplanes > CONFIG_NX_NPLANES)
     {
       gdbg("NX configured for only %d planes, controller wants %d\n",
diff --git a/graphics/nxbe/nxbe_fill.c b/graphics/nxbe/nxbe_fill.c
index c87992052e..671a3e7ab9 100644
--- a/graphics/nxbe/nxbe_fill.c
+++ b/graphics/nxbe/nxbe_fill.c
@@ -112,7 +112,7 @@ void nxbe_fill(FAR struct nxbe_window_s *wnd,
   struct nxgl_rect_s remaining;
   int i;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!wnd || !rect)
     {
       return;
diff --git a/graphics/nxbe/nxbe_filltrapezoid.c b/graphics/nxbe/nxbe_filltrapezoid.c
index cf3b3096a3..1936a6c4d6 100644
--- a/graphics/nxbe/nxbe_filltrapezoid.c
+++ b/graphics/nxbe/nxbe_filltrapezoid.c
@@ -137,7 +137,7 @@ void nxbe_filltrapezoid(FAR struct nxbe_window_s *wnd,
   struct nxgl_rect_s remaining;
   int i;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!wnd || !trap)
     {
       return;
diff --git a/graphics/nxbe/nxbe_getrectangle.c b/graphics/nxbe/nxbe_getrectangle.c
index e7ec53d2b0..2e707a816c 100644
--- a/graphics/nxbe/nxbe_getrectangle.c
+++ b/graphics/nxbe/nxbe_getrectangle.c
@@ -87,7 +87,7 @@ void nxbe_getrectangle(FAR struct nxbe_window_s *wnd,
 {
   struct nxgl_rect_s remaining;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!wnd || !rect || !dest || plane >= wnd->be->vinfo.nplanes)
     {
       ginfo("Invalid parameters\n");
diff --git a/graphics/nxbe/nxbe_move.c b/graphics/nxbe/nxbe_move.c
index 9bf56fd1e9..e2eee9f01b 100644
--- a/graphics/nxbe/nxbe_move.c
+++ b/graphics/nxbe/nxbe_move.c
@@ -208,7 +208,7 @@ void nxbe_move(FAR struct nxbe_window_s *wnd, FAR const struct nxgl_rect_s *rect
   struct nxbe_move_s info;
   int i;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!wnd || !rect)
     {
       return;
diff --git a/graphics/nxbe/nxbe_setpixel.c b/graphics/nxbe/nxbe_setpixel.c
index 81627f0608..0b61897381 100644
--- a/graphics/nxbe/nxbe_setpixel.c
+++ b/graphics/nxbe/nxbe_setpixel.c
@@ -112,7 +112,7 @@ void nxbe_setpixel(FAR struct nxbe_window_s *wnd,
   struct nxgl_rect_s rect;
   int i;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!wnd || !pos)
     {
       return;
diff --git a/graphics/nxbe/nxbe_setposition.c b/graphics/nxbe/nxbe_setposition.c
index 5647270e54..a40a01ebe7 100644
--- a/graphics/nxbe/nxbe_setposition.c
+++ b/graphics/nxbe/nxbe_setposition.c
@@ -63,7 +63,7 @@ void nxbe_setposition(FAR struct nxbe_window_s *wnd,
   struct nxgl_rect_s before;
   struct nxgl_rect_s rect;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!wnd)
     {
       return;
diff --git a/graphics/nxbe/nxbe_setsize.c b/graphics/nxbe/nxbe_setsize.c
index b542c0a8e8..3b522d38a4 100644
--- a/graphics/nxbe/nxbe_setsize.c
+++ b/graphics/nxbe/nxbe_setsize.c
@@ -62,7 +62,7 @@ void nxbe_setsize(FAR struct nxbe_window_s *wnd,
 {
   struct nxgl_rect_s bounds;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!wnd)
     {
       return;
diff --git a/graphics/nxmu/nxmu_releasebkgd.c b/graphics/nxmu/nxmu_releasebkgd.c
index 4762e69f8a..7f8d293507 100644
--- a/graphics/nxmu/nxmu_releasebkgd.c
+++ b/graphics/nxmu/nxmu_releasebkgd.c
@@ -88,7 +88,7 @@ void nxmu_releasebkgd(FAR struct nxfe_state_s *fe)
 {
   FAR struct nxbe_state_s *be = &fe->be;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!fe)
     {
       return;
diff --git a/graphics/nxmu/nxmu_requestbkgd.c b/graphics/nxmu/nxmu_requestbkgd.c
index d25516008d..23f7748fc3 100644
--- a/graphics/nxmu/nxmu_requestbkgd.c
+++ b/graphics/nxmu/nxmu_requestbkgd.c
@@ -92,7 +92,7 @@ void nxmu_requestbkgd(FAR struct nxfe_conn_s *conn,
                       FAR const struct nx_callback_s *cb,
                       FAR void *arg)
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!conn || !be || !cb)
     {
       errno = EINVAL;
diff --git a/graphics/nxmu/nxmu_sendclient.c b/graphics/nxmu/nxmu_sendclient.c
index 95b60581f0..66a992e526 100644
--- a/graphics/nxmu/nxmu_sendclient.c
+++ b/graphics/nxmu/nxmu_sendclient.c
@@ -92,7 +92,7 @@ int nxmu_sendclient(FAR struct nxfe_conn_s *conn, FAR const void *msg,
 
   /* Sanity checking */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!conn || !conn->swrmq)
     {
       set_errno(EINVAL);
diff --git a/graphics/nxmu/nxmu_sendclientwindow.c b/graphics/nxmu/nxmu_sendclientwindow.c
index c06c9f225e..e8ce5276a1 100644
--- a/graphics/nxmu/nxmu_sendclientwindow.c
+++ b/graphics/nxmu/nxmu_sendclientwindow.c
@@ -92,7 +92,7 @@ int nxmu_sendclientwindow(FAR struct nxbe_window_s *wnd, FAR const void *msg,
 
   /* Sanity checking */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!wnd || !wnd->conn)
     {
       set_errno(EINVAL);
diff --git a/graphics/nxmu/nxmu_server.c b/graphics/nxmu/nxmu_server.c
index 3d5822b5bb..680e4cde16 100644
--- a/graphics/nxmu/nxmu_server.c
+++ b/graphics/nxmu/nxmu_server.c
@@ -301,7 +301,7 @@ int nx_runinstance(FAR const char *mqname, FAR NX_DRIVERTYPE *dev)
 
   /* Sanity checking */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!mqname || !dev)
     {
       errno = EINVAL;
diff --git a/graphics/nxsu/nx_bitmap.c b/graphics/nxsu/nx_bitmap.c
index b9d732bee6..59f3199c2d 100644
--- a/graphics/nxsu/nx_bitmap.c
+++ b/graphics/nxsu/nx_bitmap.c
@@ -97,7 +97,7 @@ int nx_bitmap(NXWINDOW hwnd, FAR const struct nxgl_rect_s *dest,
               FAR const void *src[CONFIG_NX_NPLANES],
               FAR const struct nxgl_point_s *origin, unsigned int stride)
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!hwnd || !dest || !src || !origin)
     {
       errno = EINVAL;
diff --git a/graphics/nxsu/nx_closewindow.c b/graphics/nxsu/nx_closewindow.c
index 07fedac83d..bd3c0e44f0 100644
--- a/graphics/nxsu/nx_closewindow.c
+++ b/graphics/nxsu/nx_closewindow.c
@@ -86,7 +86,7 @@
 
 int nx_closewindow(NXWINDOW hwnd)
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!hwnd)
     {
       errno = EINVAL;
diff --git a/graphics/nxsu/nx_constructwindow.c b/graphics/nxsu/nx_constructwindow.c
index 62bf138e9f..ca468809d8 100644
--- a/graphics/nxsu/nx_constructwindow.c
+++ b/graphics/nxsu/nx_constructwindow.c
@@ -107,7 +107,7 @@ int nx_constructwindow(NXHANDLE handle, NXWINDOW hwnd,
   FAR struct nxbe_window_s *wnd = (FAR struct nxbe_window_s *)hwnd;
   FAR struct nxbe_state_s *be = &fe->be;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!wnd)
     {
       set_errno(EINVAL);
diff --git a/graphics/nxsu/nx_fill.c b/graphics/nxsu/nx_fill.c
index 1659df1869..adf3d16236 100644
--- a/graphics/nxsu/nx_fill.c
+++ b/graphics/nxsu/nx_fill.c
@@ -90,7 +90,7 @@
 int nx_fill(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
             nxgl_mxpixel_t color[CONFIG_NX_NPLANES])
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!hwnd || !rect || !color)
     {
       errno = EINVAL;
diff --git a/graphics/nxsu/nx_filltrapezoid.c b/graphics/nxsu/nx_filltrapezoid.c
index dbe99b943a..dcbace13eb 100644
--- a/graphics/nxsu/nx_filltrapezoid.c
+++ b/graphics/nxsu/nx_filltrapezoid.c
@@ -92,7 +92,7 @@ int nx_filltrapezoid(NXWINDOW hwnd, FAR const struct nxgl_rect_s *clip,
                      FAR const struct nxgl_trapezoid_s *trap,
                      nxgl_mxpixel_t color[CONFIG_NX_NPLANES])
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!hwnd || !trap || !color)
     {
       errno = EINVAL;
diff --git a/graphics/nxsu/nx_getposition.c b/graphics/nxsu/nx_getposition.c
index c41048862d..86326db188 100644
--- a/graphics/nxsu/nx_getposition.c
+++ b/graphics/nxsu/nx_getposition.c
@@ -87,7 +87,7 @@
 
 int nx_getposition(NXWINDOW hwnd)
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!hwnd)
     {
       errno = EINVAL;
diff --git a/graphics/nxsu/nx_getrectangle.c b/graphics/nxsu/nx_getrectangle.c
index ed3ebf4268..37e5b8b214 100644
--- a/graphics/nxsu/nx_getrectangle.c
+++ b/graphics/nxsu/nx_getrectangle.c
@@ -96,7 +96,7 @@ int nx_getrectangle(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
                     unsigned int plane, FAR uint8_t *dest,
                     unsigned int deststride)
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!hwnd || !rect || !dest)
     {
       set_errno(EINVAL);
diff --git a/graphics/nxsu/nx_lower.c b/graphics/nxsu/nx_lower.c
index 877c89ce6b..b6693cb0a5 100644
--- a/graphics/nxsu/nx_lower.c
+++ b/graphics/nxsu/nx_lower.c
@@ -85,7 +85,7 @@
 
 int nx_lower(NXWINDOW hwnd)
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!hwnd)
     {
       errno = EINVAL;
diff --git a/graphics/nxsu/nx_move.c b/graphics/nxsu/nx_move.c
index 6404bf48ac..54f17b696f 100644
--- a/graphics/nxsu/nx_move.c
+++ b/graphics/nxsu/nx_move.c
@@ -88,7 +88,7 @@
 int nx_move(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
             FAR const struct nxgl_point_s *offset)
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!hwnd)
     {
       errno = EINVAL;
diff --git a/graphics/nxsu/nx_open.c b/graphics/nxsu/nx_open.c
index ae0007c247..a89340d37e 100644
--- a/graphics/nxsu/nx_open.c
+++ b/graphics/nxsu/nx_open.c
@@ -187,7 +187,7 @@ NXHANDLE nx_open(FAR NX_DRIVERTYPE *dev)
 
   /* Sanity checking */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!dev)
     {
       errno = EINVAL;
diff --git a/graphics/nxsu/nx_openwindow.c b/graphics/nxsu/nx_openwindow.c
index 3be9d5393a..3ff6b5a5f1 100644
--- a/graphics/nxsu/nx_openwindow.c
+++ b/graphics/nxsu/nx_openwindow.c
@@ -95,7 +95,7 @@ NXWINDOW nx_openwindow(NXHANDLE handle, FAR const struct nx_callback_s *cb,
   FAR struct nxbe_window_s *wnd;
   int ret;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!handle || !cb)
     {
       errno = EINVAL;
diff --git a/graphics/nxsu/nx_raise.c b/graphics/nxsu/nx_raise.c
index 7e963577a3..ae7f72480c 100644
--- a/graphics/nxsu/nx_raise.c
+++ b/graphics/nxsu/nx_raise.c
@@ -85,7 +85,7 @@
 
 int nx_raise(NXWINDOW hwnd)
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!hwnd)
     {
       errno = EINVAL;
diff --git a/graphics/nxsu/nx_releasebkgd.c b/graphics/nxsu/nx_releasebkgd.c
index 8c2181f2d0..6a0e5f4208 100644
--- a/graphics/nxsu/nx_releasebkgd.c
+++ b/graphics/nxsu/nx_releasebkgd.c
@@ -88,7 +88,7 @@ int nx_releasebkgd(NXWINDOW hwnd)
 {
   FAR struct nxbe_window_s *bkgd = (FAR struct nxbe_window_s *)hwnd;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!bkgd)
     {
       errno = EINVAL;
diff --git a/graphics/nxsu/nx_requestbkgd.c b/graphics/nxsu/nx_requestbkgd.c
index e5aaad311e..5441adaaae 100644
--- a/graphics/nxsu/nx_requestbkgd.c
+++ b/graphics/nxsu/nx_requestbkgd.c
@@ -115,7 +115,7 @@ int nx_requestbkgd(NXHANDLE handle, FAR const struct nx_callback_s *cb,
   FAR struct nxfe_state_s *fe = (FAR struct nxfe_state_s *)handle;
   FAR struct nxbe_state_s *be = &fe->be;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!fe || !cb)
     {
       errno = EINVAL;
diff --git a/graphics/nxsu/nx_setbgcolor.c b/graphics/nxsu/nx_setbgcolor.c
index 3b6af80626..ab1e974bbb 100644
--- a/graphics/nxsu/nx_setbgcolor.c
+++ b/graphics/nxsu/nx_setbgcolor.c
@@ -89,7 +89,7 @@ int nx_setbgcolor(NXHANDLE handle,
 {
   FAR struct nxfe_state_s *fe = (FAR struct nxfe_state_s *)handle;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!fe)
     {
       errno = EINVAL;
diff --git a/graphics/nxsu/nx_setpixel.c b/graphics/nxsu/nx_setpixel.c
index 37ce41af39..35e10832af 100644
--- a/graphics/nxsu/nx_setpixel.c
+++ b/graphics/nxsu/nx_setpixel.c
@@ -91,7 +91,7 @@
 int nx_setpixel(NXWINDOW hwnd,  FAR const struct nxgl_point_s *pos,
                 nxgl_mxpixel_t color[CONFIG_NX_NPLANES])
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!hwnd || !pos || !color)
     {
       errno = EINVAL;
diff --git a/graphics/nxsu/nx_setposition.c b/graphics/nxsu/nx_setposition.c
index e138ea9733..e2799f6261 100644
--- a/graphics/nxsu/nx_setposition.c
+++ b/graphics/nxsu/nx_setposition.c
@@ -86,7 +86,7 @@
 
 int nx_setposition(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos)
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!hwnd || !pos)
     {
       errno = EINVAL;
diff --git a/graphics/nxsu/nx_setsize.c b/graphics/nxsu/nx_setsize.c
index 7be045b90e..bec2f7642a 100644
--- a/graphics/nxsu/nx_setsize.c
+++ b/graphics/nxsu/nx_setsize.c
@@ -86,7 +86,7 @@
 
 int nx_setsize(NXWINDOW hwnd, FAR const struct nxgl_size_s *size)
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!hwnd || !size)
     {
       errno = EINVAL;
diff --git a/graphics/nxsu/nxsu_redrawreq.c b/graphics/nxsu/nxsu_redrawreq.c
index 9871e879c5..f903639f66 100644
--- a/graphics/nxsu/nxsu_redrawreq.c
+++ b/graphics/nxsu/nxsu_redrawreq.c
@@ -82,7 +82,7 @@ void nxfe_redrawreq(FAR struct nxbe_window_s *wnd, FAR const struct nxgl_rect_s
 {
   struct nxgl_rect_s relrect;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!wnd)
     {
       return;
diff --git a/graphics/nxsu/nxsu_reportposition.c b/graphics/nxsu/nxsu_reportposition.c
index 043caee8a6..9a3be6a61f 100644
--- a/graphics/nxsu/nxsu_reportposition.c
+++ b/graphics/nxsu/nxsu_reportposition.c
@@ -82,7 +82,7 @@ void nxfe_reportposition(FAR struct nxbe_window_s *wnd)
   FAR struct nxbe_state_s  *be;
   struct nxgl_size_s        size;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!wnd)
     {
       return;
diff --git a/graphics/nxterm/Make.defs b/graphics/nxterm/Make.defs
index 5a02507313..469d4bfde2 100644
--- a/graphics/nxterm/Make.defs
+++ b/graphics/nxterm/Make.defs
@@ -44,7 +44,7 @@ ifeq ($(CONFIG_NXTERM_NXKBDIN),y)
 CSRCS += nxterm_kbdin.c
 endif
 
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
 CSRCS += nxterm_sem.c
 endif
 
diff --git a/graphics/nxterm/nxterm.h b/graphics/nxterm/nxterm.h
index 1a082e5283..326a2ed5f9 100644
--- a/graphics/nxterm/nxterm.h
+++ b/graphics/nxterm/nxterm.h
@@ -141,7 +141,7 @@ struct nxterm_state_s
   FAR struct nxterm_window_s wndo;           /* Describes the window and font */
   NXHANDLE font;                            /* The current font handle */
   sem_t exclsem;                            /* Forces mutually exclusive access */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   pid_t holder;                             /* Deadlock avoidance */
 #endif
   uint8_t minor;                            /* Device minor number */
@@ -206,7 +206,7 @@ extern const struct file_operations g_nxterm_drvrops;
  ****************************************************************************/
 /* Semaphore helpers */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 int nxterm_semwait(FAR struct nxterm_state_s *priv);
 int nxterm_sempost(FAR struct nxterm_state_s *priv);
 #else
diff --git a/graphics/nxterm/nxterm_kbdin.c b/graphics/nxterm/nxterm_kbdin.c
index 3ffb75b01d..f23b5ac16f 100644
--- a/graphics/nxterm/nxterm_kbdin.c
+++ b/graphics/nxterm/nxterm_kbdin.c
@@ -337,7 +337,7 @@ int nxterm_poll(FAR struct file *filep, FAR struct pollfd *fds, bool setup)
 
       struct pollfd **slot = (struct pollfd **)fds->priv;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       if (!slot)
         {
           gdbg("ERROR: No slot\n");
diff --git a/graphics/nxterm/nxterm_register.c b/graphics/nxterm/nxterm_register.c
index a0751773d7..a88d038055 100644
--- a/graphics/nxterm/nxterm_register.c
+++ b/graphics/nxterm/nxterm_register.c
@@ -99,7 +99,7 @@ FAR struct nxterm_state_s *
   memcpy(&priv->wndo, wndo, sizeof(struct nxterm_window_s));
 
   sem_init(&priv->exclsem, 0, 1);
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   priv->holder  = NO_HOLDER;
 #endif
 
diff --git a/graphics/nxterm/nxterm_sem.c b/graphics/nxterm/nxterm_sem.c
index 3bdbf85410..185ff30adc 100644
--- a/graphics/nxterm/nxterm_sem.c
+++ b/graphics/nxterm/nxterm_sem.c
@@ -46,7 +46,7 @@
 
 #include "nxterm.h"
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -126,4 +126,4 @@ int nxterm_sempost(FAR struct nxterm_state_s *priv)
   return sem_post(&priv->exclsem);
 }
 
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_FEATURES */
diff --git a/graphics/vnc/server/Kconfig b/graphics/vnc/server/Kconfig
index 157b62dfc9..bab68706d1 100644
--- a/graphics/vnc/server/Kconfig
+++ b/graphics/vnc/server/Kconfig
@@ -130,7 +130,7 @@ config VNCSERVER_INBUFFER_SIZE
 config VNCSERVER_DEBUG
 	bool "VNC Server debug"
 	default n
-	depends on DEBUG && !DEBUG_GRAPHICS
+	depends on DEBUG_FEATURES && !DEBUG_GRAPHICS
 	---help---
 		Normally VNC debug output is selected with DEBUG_GRAPHICS.  The VNC
 		server server suupport this special option to enable GRAPHICS debug
diff --git a/graphics/vnc/server/vnc_fbdev.c b/graphics/vnc/server/vnc_fbdev.c
index aa71ebd5ff..3c4fe08133 100644
--- a/graphics/vnc/server/vnc_fbdev.c
+++ b/graphics/vnc/server/vnc_fbdev.c
@@ -45,10 +45,14 @@
 #include 
 
 #if defined(CONFIG_VNCSERVER_DEBUG) && !defined(CONFIG_DEBUG_GRAPHICS)
-#  undef  CONFIG_DEBUG
+#  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
 #  undef  CONFIG_DEBUG_INFO
-#  define CONFIG_DEBUG          1
-#  define CONFIG_DEBUG_INFO  1
+#  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR    1
+#  define CONFIG_DEBUG_WARN     1
+#  define CONFIG_DEBUG_INFO     1
 #  define CONFIG_DEBUG_GRAPHICS 1
 #endif
 #include 
@@ -580,7 +584,7 @@ static inline int vnc_wait_connect(int display)
       result = g_fbstartup[display].result;
       if (result != -EBUSY)
         {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
           if (result < 0)
             {
               DEBUGASSERT(g_vnc_sessions[display] == NULL);
diff --git a/graphics/vnc/server/vnc_negotiate.c b/graphics/vnc/server/vnc_negotiate.c
index 1541cf2749..3e6eae0f58 100644
--- a/graphics/vnc/server/vnc_negotiate.c
+++ b/graphics/vnc/server/vnc_negotiate.c
@@ -45,10 +45,14 @@
 #include 
 
 #if defined(CONFIG_VNCSERVER_DEBUG) && !defined(CONFIG_DEBUG_GRAPHICS)
-#  undef  CONFIG_DEBUG
+#  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
 #  undef  CONFIG_DEBUG_INFO
-#  define CONFIG_DEBUG          1
-#  define CONFIG_DEBUG_INFO  1
+#  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR    1
+#  define CONFIG_DEBUG_WARN     1
+#  define CONFIG_DEBUG_INFO     1
 #  define CONFIG_DEBUG_GRAPHICS 1
 #endif
 #include 
diff --git a/graphics/vnc/server/vnc_raw.c b/graphics/vnc/server/vnc_raw.c
index 4b4ac83209..b3decfd8a3 100644
--- a/graphics/vnc/server/vnc_raw.c
+++ b/graphics/vnc/server/vnc_raw.c
@@ -44,10 +44,14 @@
 #include 
 
 #if defined(CONFIG_VNCSERVER_DEBUG) && !defined(CONFIG_DEBUG_GRAPHICS)
-#  undef  CONFIG_DEBUG
+#  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
 #  undef  CONFIG_DEBUG_INFO
-#  define CONFIG_DEBUG          1
-#  define CONFIG_DEBUG_INFO  1
+#  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR    1
+#  define CONFIG_DEBUG_WARN     1
+#  define CONFIG_DEBUG_INFO     1
 #  define CONFIG_DEBUG_GRAPHICS 1
 #endif
 #include 
diff --git a/graphics/vnc/server/vnc_receiver.c b/graphics/vnc/server/vnc_receiver.c
index 2344ede712..a3cc473ba9 100644
--- a/graphics/vnc/server/vnc_receiver.c
+++ b/graphics/vnc/server/vnc_receiver.c
@@ -43,10 +43,14 @@
 #include 
 
 #if defined(CONFIG_VNCSERVER_DEBUG) && !defined(CONFIG_DEBUG_GRAPHICS)
-#  undef  CONFIG_DEBUG
+#  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
 #  undef  CONFIG_DEBUG_INFO
-#  define CONFIG_DEBUG          1
-#  define CONFIG_DEBUG_INFO  1
+#  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR    1
+#  define CONFIG_DEBUG_WARN     1
+#  define CONFIG_DEBUG_INFO     1
 #  define CONFIG_DEBUG_GRAPHICS 1
 #endif
 #include 
diff --git a/graphics/vnc/server/vnc_rre.c b/graphics/vnc/server/vnc_rre.c
index fa4935f7d4..0be90029c6 100644
--- a/graphics/vnc/server/vnc_rre.c
+++ b/graphics/vnc/server/vnc_rre.c
@@ -44,10 +44,14 @@
 #include 
 
 #if defined(CONFIG_VNCSERVER_DEBUG) && !defined(CONFIG_DEBUG_GRAPHICS)
-#  undef  CONFIG_DEBUG
+#  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
 #  undef  CONFIG_DEBUG_INFO
-#  define CONFIG_DEBUG          1
-#  define CONFIG_DEBUG_INFO  1
+#  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR    1
+#  define CONFIG_DEBUG_WARN     1
+#  define CONFIG_DEBUG_INFO     1
 #  define CONFIG_DEBUG_GRAPHICS 1
 #endif
 #include 
diff --git a/graphics/vnc/server/vnc_server.c b/graphics/vnc/server/vnc_server.c
index 94b993ccd7..fd795398c3 100644
--- a/graphics/vnc/server/vnc_server.c
+++ b/graphics/vnc/server/vnc_server.c
@@ -48,10 +48,14 @@
 #include 
 
 #if defined(CONFIG_VNCSERVER_DEBUG) && !defined(CONFIG_DEBUG_GRAPHICS)
-#  undef  CONFIG_DEBUG
+#  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
 #  undef  CONFIG_DEBUG_INFO
-#  define CONFIG_DEBUG          1
-#  define CONFIG_DEBUG_INFO  1
+#  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR    1
+#  define CONFIG_DEBUG_WARN     1
+#  define CONFIG_DEBUG_INFO     1
 #  define CONFIG_DEBUG_GRAPHICS 1
 #endif
 #include 
diff --git a/graphics/vnc/server/vnc_updater.c b/graphics/vnc/server/vnc_updater.c
index a466740b23..675d36fd4a 100644
--- a/graphics/vnc/server/vnc_updater.c
+++ b/graphics/vnc/server/vnc_updater.c
@@ -48,10 +48,14 @@
 #include 
 
 #if defined(CONFIG_VNCSERVER_DEBUG) && !defined(CONFIG_DEBUG_GRAPHICS)
-#  undef  CONFIG_DEBUG
+#  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
 #  undef  CONFIG_DEBUG_INFO
-#  define CONFIG_DEBUG          1
-#  define CONFIG_DEBUG_INFO  1
+#  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR    1
+#  define CONFIG_DEBUG_WARN     1
+#  define CONFIG_DEBUG_INFO     1
 #  define CONFIG_DEBUG_GRAPHICS 1
 #endif
 #include 
diff --git a/include/debug.h b/include/debug.h
index 80d175ed30..b2810cdc56 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -81,7 +81,7 @@
  *    fatal consequences).
  *
  * [a-z]dbg() -- Identical to [a-z]info() except that it also requires that
- *    CONFIG_DEBUG be defined.  This is intended for important error-related
+ *    CONFIG_DEBUG_FEATURES be defined.  This is intended for important error-related
  *    information that you probably not want to suppress during normal debug
  *    general debugging.
  *
@@ -102,7 +102,7 @@
  *    fatal consequences).
  *
  * [a-z]lldbg() -- Identical to [a-z]llinfo() except that it also requires that
- *    CONFIG_DEBUG be defined. This is intended for important error-related
+ *    CONFIG_DEBUG_FEATURES be defined. This is intended for important error-related
  *    information that you probably not want to suppress during normal debug
  *    general debugging.
  */
@@ -132,7 +132,7 @@
 
 /* C-99 style variadic macros are supported */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 #  define dbg(format, ...) \
    __arch_syslog(LOG_ERR, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
 
@@ -142,7 +142,7 @@
 # else
 #  define lldbg(x...)
 # endif
-#else /* CONFIG_DEBUG */
+#else /* CONFIG_DEBUG_FEATURES */
 
 #  define dbg(x...)
 #  define lldbg(x...)
@@ -424,7 +424,7 @@
 
 /* Variadic macros NOT supported */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 #  ifndef CONFIG_ARCH_LOWPUTC
 #    define lldbg     (void)
 #  endif
@@ -697,7 +697,7 @@
 
 /* Buffer dumping macros do not depend on varargs */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 #  define dbgdumpbuffer(m,b,n) lib_dumpbuffer(m,b,n)
 #  ifdef CONFIG_DEBUG_INFO
 #    define infodumpbuffer(m,b,n) lib_dumpbuffer(m,b,n)
@@ -839,13 +839,13 @@ void lib_dumpbuffer(FAR const char *msg, FAR const uint8_t *buffer,
  */
 
 #ifndef CONFIG_CPP_HAVE_VARARGS
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 int dbg(const char *format, ...);
 
 # ifdef CONFIG_ARCH_LOWPUTC
 int lldbg(const char *format, ...);
 # endif
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_FEATURES */
 
 #ifdef CONFIG_DEBUG_WARN
 int warn(const char *format, ...);
diff --git a/include/nuttx/analog/pga11x.h b/include/nuttx/analog/pga11x.h
index d95589cdae..789059504d 100644
--- a/include/nuttx/analog/pga11x.h
+++ b/include/nuttx/analog/pga11x.h
@@ -73,7 +73,7 @@
  *   When SPI_SELECT is called with devid=SPIDEV_MUX.
  *
  * Other settings that effect the driver:
- *   CONFIG_DEBUG_SPI -- With CONFIG_DEBUG and CONFIG_DEBUG_INFO,
+ *   CONFIG_DEBUG_SPI -- With CONFIG_DEBUG_FEATURES and CONFIG_DEBUG_INFO,
  *     this will enable debug output from the PGA117 driver.
  */
 
diff --git a/include/nuttx/audio/audio.h b/include/nuttx/audio/audio.h
index 709b701553..e955a4618b 100644
--- a/include/nuttx/audio/audio.h
+++ b/include/nuttx/audio/audio.h
@@ -67,7 +67,7 @@
  ****************************************************************************/
 /* Configuration ************************************************************/
 /* CONFIG_AUDIO - Enables Audio driver support
- * CONFIG_DEBUG_AUDIO - If enabled (with CONFIG_DEBUG and, optionally,
+ * CONFIG_DEBUG_AUDIO - If enabled (with CONFIG_DEBUG_FEATURES and, optionally,
  *   CONFIG_DEBUG_INFO), this will generate output that can be used to
  *   debug Audio drivers.
  */
diff --git a/include/nuttx/fs/nxffs.h b/include/nuttx/fs/nxffs.h
index a93a697056..edbaf190aa 100644
--- a/include/nuttx/fs/nxffs.h
+++ b/include/nuttx/fs/nxffs.h
@@ -140,7 +140,7 @@ int nxffs_initialize(FAR struct mtd_dev_s *mtd);
  * Name: nxffs_dump
  *
  * Description:
- *   Dump a summary of the contents of an NXFFS file system.  CONFIG_DEBUG
+ *   Dump a summary of the contents of an NXFFS file system.  CONFIG_DEBUG_FEATURES
  *   and CONFIG_DEBUG_FS must be enabled for this function to do anything.
  *
  * Input Parameters:
diff --git a/include/nuttx/input/stmpe811.h b/include/nuttx/input/stmpe811.h
index 0ace9ea313..08b7e6f3cf 100644
--- a/include/nuttx/input/stmpe811.h
+++ b/include/nuttx/input/stmpe811.h
@@ -85,7 +85,7 @@
  * CONFIG_STMPE811_TEMP_DISABLE
  *   Disable driver temperature sensor functionality.
  * CONFIG_STMPE811_REGDEBUG
- *   Enable very low register-level debug output.  Requires CONFIG_DEBUG.
+ *   Enable very low register-level debug output.  Requires CONFIG_DEBUG_FEATURES.
  * CONFIG_STMPE811_THRESHX and CONFIG_STMPE811_THRESHY
  *   STMPE811 touchscreen data comes in a a very high rate.  New touch positions
  *   will only be reported when the X or Y data changes by these thresholds.
@@ -143,7 +143,7 @@
 
 /* Debug output */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_STMPE811_REGDEBUG
 #endif
 
diff --git a/include/nuttx/mm/mm.h b/include/nuttx/mm/mm.h
index 7d2e102f31..485e73fbeb 100644
--- a/include/nuttx/mm/mm.h
+++ b/include/nuttx/mm/mm.h
@@ -427,7 +427,7 @@ FAR void *kmm_memalign(size_t alignment, size_t size);
 
 /* Functions contained in kmm_heapmember.c **********************************/
 
-#if defined(CONFIG_MM_KERNEL_HEAP) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_MM_KERNEL_HEAP) && defined(CONFIG_DEBUG_FEATURES)
 bool kmm_heapmember(FAR void *mem);
 #endif
 
diff --git a/include/nuttx/net/iob.h b/include/nuttx/net/iob.h
index b9ff53d78c..2ac74dceb8 100644
--- a/include/nuttx/net/iob.h
+++ b/include/nuttx/net/iob.h
@@ -410,7 +410,7 @@ int iob_contig(FAR struct iob_s *iob, unsigned int len);
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 void iob_dump(FAR const char *msg, FAR struct iob_s *iob, unsigned int len,
               unsigned int offset);
 #else
diff --git a/include/nuttx/pwm.h b/include/nuttx/pwm.h
index 24d2e6980d..78369a793b 100644
--- a/include/nuttx/pwm.h
+++ b/include/nuttx/pwm.h
@@ -72,7 +72,7 @@
  *   number of pulses.  This might be used, for example to support a stepper
  *   motor.  If the hardware will support a fixed pulse count, then this
  *   configuration should be set to enable the capability.
- * CONFIG_DEBUG_PWM - If enabled (with CONFIG_DEBUG and, optionally,
+ * CONFIG_DEBUG_PWM - If enabled (with CONFIG_DEBUG_FEATURES and, optionally,
  *   CONFIG_DEBUG_INFO), this will generate output that can be use dto
  *   debug the PWM driver.
  */
diff --git a/include/nuttx/sensors/adxl345.h b/include/nuttx/sensors/adxl345.h
index da563c8ac6..59df6c9dad 100644
--- a/include/nuttx/sensors/adxl345.h
+++ b/include/nuttx/sensors/adxl345.h
@@ -66,7 +66,7 @@
  *    going high, it will start high and will go low when an interrupt
  *    is fired. Default:  Active high/rising edge.
  * CONFIG_ADXL345_REGDEBUG
- *   Enable very low register-level debug output.  Requires CONFIG_DEBUG.
+ *   Enable very low register-level debug output.  Requires CONFIG_DEBUG_FEATURES.
  */
 
 #ifdef CONFIG_DISABLE_SIGNALS
diff --git a/include/nuttx/sensors/bmp180.h b/include/nuttx/sensors/bmp180.h
index 0c12e24226..9a2d21d839 100644
--- a/include/nuttx/sensors/bmp180.h
+++ b/include/nuttx/sensors/bmp180.h
@@ -52,7 +52,7 @@
  * CONFIG_BMP180
  *   Enables support for the BMP180 driver
  * CONFIG_BMP180_REGDEBUG
- *   Enable very low register-level debug output.  Requires CONFIG_DEBUG.
+ *   Enable very low register-level debug output.  Requires CONFIG_DEBUG_FEATURES.
  */
 
 /****************************************************************************
diff --git a/include/nuttx/sensors/mpl115a.h b/include/nuttx/sensors/mpl115a.h
index c958c8025d..736922d968 100644
--- a/include/nuttx/sensors/mpl115a.h
+++ b/include/nuttx/sensors/mpl115a.h
@@ -49,7 +49,7 @@
  * CONFIG_SENSORS_MPL115A
  *   Enables support for the MPL115A driver
  * CONFIG_MPL115A_REGDEBUG
- *   Enable very low register-level debug output.  Requires CONFIG_DEBUG.
+ *   Enable very low register-level debug output.  Requires CONFIG_DEBUG_FEATURES.
  */
 
 /* There are two types of MPL115A chips. The MPL115A1 communicates with the target CPU
diff --git a/include/nuttx/spi/spi_bitbang.c b/include/nuttx/spi/spi_bitbang.c
index 9e424b5aa2..0c5f852376 100644
--- a/include/nuttx/spi/spi_bitbang.c
+++ b/include/nuttx/spi/spi_bitbang.c
@@ -69,7 +69,7 @@
  * include/debug.h
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_SPI
 #endif
diff --git a/include/nuttx/spi/spi_bitbang.h b/include/nuttx/spi/spi_bitbang.h
index 95b1a85538..8debf10211 100644
--- a/include/nuttx/spi/spi_bitbang.h
+++ b/include/nuttx/spi/spi_bitbang.h
@@ -56,7 +56,7 @@
  * include/debug.h
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_SPI
 #endif
diff --git a/include/nuttx/timers/cs2100-cp.h b/include/nuttx/timers/cs2100-cp.h
index fe72836770..51fe48974d 100644
--- a/include/nuttx/timers/cs2100-cp.h
+++ b/include/nuttx/timers/cs2100-cp.h
@@ -60,7 +60,7 @@
 # define CONFIG_TIMERS_CS2100CP_CLKINBW 16
 #endif
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_CS2100CP_DEBUG
 #  undef CONFIG_CS2100CP_REGDEBUG
 #endif
diff --git a/include/nuttx/usb/usbdev_trace.h b/include/nuttx/usb/usbdev_trace.h
index 445ef5f560..4ef4e170e1 100644
--- a/include/nuttx/usb/usbdev_trace.h
+++ b/include/nuttx/usb/usbdev_trace.h
@@ -480,7 +480,7 @@ EXTERN const struct trace_msg_t g_usb_trace_strings_intdecode[];
  *
  ****************************************************************************/
 
-#if defined(CONFIG_USBDEV_TRACE) || (defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_USB))
+#if defined(CONFIG_USBDEV_TRACE) || (defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_USB))
 usbtrace_idset_t usbtrace_enable(usbtrace_idset_t idset);
 #else
 #  define usbtrace_enable(idset)
@@ -497,7 +497,7 @@ usbtrace_idset_t usbtrace_enable(usbtrace_idset_t idset);
  *
  ****************************************************************************/
 
-#if defined(CONFIG_USBDEV_TRACE) || (defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_USB))
+#if defined(CONFIG_USBDEV_TRACE) || (defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_USB))
 void usbtrace(uint16_t event, uint16_t value);
 #else
 #  define usbtrace(event, value)
diff --git a/include/nuttx/usb/usbhost_trace.h b/include/nuttx/usb/usbhost_trace.h
index 5351cb090e..f71b7c90b8 100644
--- a/include/nuttx/usb/usbhost_trace.h
+++ b/include/nuttx/usb/usbhost_trace.h
@@ -48,7 +48,7 @@
 /* Configuration ************************************************************/
 /* Debug/Trace-related definitions */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_USB
 #  undef CONFIG_DEBUG_INFO
 #endif
@@ -115,7 +115,7 @@ extern "C"
  *
  ****************************************************************************/
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_USB
 #endif
diff --git a/include/spawn.h b/include/spawn.h
index 19b0c24501..f2d49f0410 100644
--- a/include/spawn.h
+++ b/include/spawn.h
@@ -186,7 +186,7 @@ int posix_spawn_file_actions_addopen(FAR posix_spawn_file_actions_t *file_action
 int posix_spawnattr_init(FAR posix_spawnattr_t *attr);
 
 /* int posix_spawnattr_destroy(FAR posix_spawnattr_t *); */
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 #  define posix_spawnattr_destroy(attr) (attr ? 0 : EINVAL)
 #else
 #  define posix_spawnattr_destroy(attr) (0)
@@ -234,7 +234,7 @@ int task_spawnattr_setstacksize(FAR posix_spawnattr_t *attr,
 
 /* Non standard debug functions */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 void posix_spawn_file_actions_dump(FAR posix_spawn_file_actions_t *file_actions);
 void posix_spawnattr_dump(FAR posix_spawnattr_t *attr);
 #else
diff --git a/libc/libc.csv b/libc/libc.csv
index cf68eaf776..87a98f778d 100644
--- a/libc/libc.csv
+++ b/libc/libc.csv
@@ -18,7 +18,6 @@
 "chdir","unistd.h","CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DISABLE_ENVIRON)","int","FAR const char *"
 "crc32","crc32.h","","uint32_t","FAR const uint8_t *","size_t"
 "crc32part","crc32.h","","uint32_t","FAR const uint8_t *","size_t","uint32_t"
-"dbg","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG)","int","const char *","..."
 "dirname","libgen.h","","FAR char","FAR char *"
 "dq_addafter","queue.h","","void","FAR dq_entry_t *","FAR dq_entry_t *","FAR dq_queue_t *"
 "dq_addbefore","queue.h","","void","FAR dq_entry_t *","FAR dq_entry_t *","FAR dq_queue_t *"
@@ -27,6 +26,7 @@
 "dq_rem","queue.h","","void","FAR dq_entry_t *","dq_queue_t *"
 "dq_remfirst","queue.h","","FAR dq_entry_t","dq_queue_t *"
 "dq_remlast","queue.h","","FAR dq_entry_t","dq_queue_t *"
+"err","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_ERROR)","int","const char *","..."
 "ether_ntoa","netinet/ether.h","","FAR char","FAR const struct ether_addr *"
 "fclose","stdio.h","CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","int","FAR FILE *"
 "fdopen","stdio.h","CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","FAR FILE","int","FAR const char *"
@@ -64,8 +64,9 @@
 "lib_dumpbuffer","debug.h","","void","FAR const char *","FAR const uint8_t *","unsigned int"
 "lio_listio","aio.h","defined(CONFIG_FS_AIO)","int","int","FAR struct aiocb *const []|FAR struct aiocb *const *","int","FAR struct sigevent *"
 "llabs","stdlib.h","defined(CONFIG_HAVE_LONG_LONG)","long long int","long long int"
-"lldbg","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG) && defined(CONFIG_ARCH_LOWPUTC)","int","const char *","..."
-"llinfo","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_INFO) && defined(CONFIG_ARCH_LOWPUTC)","int","const char *","..."
+"llerr","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_ERROR) && defined(CONFIG_ARCH_LOWPUTC)","int","const char *","..."
+"llinfo","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_INFO) && defined(CONFIG_ARCH_LOWPUTC)","int","const char *","..."
+"llwarn","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_WARN) && defined(CONFIG_ARCH_LOWPUTC)","int","const char *","..."
 "lowsyslog","syslog.h","","int","int","FAR const char *","..."
 "lowvsyslog","syslog.h","","int","int","FAR const char *","va_list"
 "match","nuttx/regex.h","","int","const char *","const char *"
@@ -168,10 +169,11 @@
 "ub16sqr","fixedmath.h","!defined(CONFIG_HAVE_LONG_LONG)","ub16_t","ub16_t"
 "ungetc","stdio.h","CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","int","int","FAR FILE *"
 "usleep","unistd.h","!defined(CONFIG_DISABLE_SIGNALS)","int","int","FAR FILE *"
-"info","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_INFO)","int","const char *","..."
+"info","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_INFO)","int","const char *","..."
 "vfprintf","stdio.h","CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","int","FAR FILE *","const char *","va_list"
 "vprintf","stdio.h","CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","int","FAR const char *","va_list"
 "vsnprintf","stdio.h","","int","FAR char *","size_t","const char *","va_list"
 "vsprintf","stdio.h","","int","FAR char *","const char *","va_list"
 "vsscanf","stdio.h","","int","char *","const char *","va_list"
 "vsyslog","syslog.h","","int","int","FAR const char *","va_list"
+"warn","debug.h","!defined(CONFIG_CPP_HAVE_VARARGS) && defined(CONFIG_DEBUG_WARN)","int","const char *","..."
diff --git a/libc/misc/Make.defs b/libc/misc/Make.defs
index 45f3705a28..6fa349e0f9 100644
--- a/libc/misc/Make.defs
+++ b/libc/misc/Make.defs
@@ -78,7 +78,7 @@ endif
 CSRCS += lib_crc64.c lib_crc32.c lib_crc16.c lib_crc8.c
 CSRCS += lib_dumpbuffer.c lib_match.c
 
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
 CSRCS += lib_dbg.c
 endif
 
diff --git a/libc/misc/lib_dbg.c b/libc/misc/lib_dbg.c
index ba9bec63ea..219b1ec79c 100644
--- a/libc/misc/lib_dbg.c
+++ b/libc/misc/lib_dbg.c
@@ -59,7 +59,7 @@
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 int dbg(const char *format, ...)
 {
   va_list ap;
@@ -85,7 +85,7 @@ int lldbg(const char *format, ...)
   return ret;
 }
 #endif /* CONFIG_ARCH_LOWPUTC */
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_FEATURES */
 
 #ifdef CONFIG_DEBUG_WARN
 int warn(const char *format, ...)
diff --git a/libc/misc/lib_slcddecode.c b/libc/misc/lib_slcddecode.c
index 92e11a297c..2f8cdaa73e 100644
--- a/libc/misc/lib_slcddecode.c
+++ b/libc/misc/lib_slcddecode.c
@@ -57,7 +57,7 @@
  * debug must also be enabled.
  */
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_LCD
 #endif
diff --git a/libc/spawn/Make.defs b/libc/spawn/Make.defs
index 7b4fdba4ce..3581193f67 100644
--- a/libc/spawn/Make.defs
+++ b/libc/spawn/Make.defs
@@ -38,7 +38,7 @@
 CSRCS += lib_psfa_addaction.c lib_psfa_addclose.c lib_psfa_adddup2.c
 CSRCS += lib_psfa_addopen.c lib_psfa_destroy.c lib_psfa_init.c
 
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
 CSRCS += lib_psfa_dump.c
 endif
 
@@ -54,7 +54,7 @@ ifneq ($(CONFIG_BUILD_KERNEL),y)
 CSRCS += lib_psa_getstacksize.c lib_psa_setstacksize.c
 endif
 
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
 CSRCS += lib_psa_dump.c
 endif
 
diff --git a/libc/spawn/lib_psa_dump.c b/libc/spawn/lib_psa_dump.c
index 935de174ed..0afd087dee 100644
--- a/libc/spawn/lib_psa_dump.c
+++ b/libc/spawn/lib_psa_dump.c
@@ -42,7 +42,7 @@
 #include 
 #include 
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 
 /****************************************************************************
  * Public Functions
@@ -124,4 +124,4 @@ void posix_spawnattr_dump(posix_spawnattr_t *attr)
 #endif
 }
 
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_FEATURES */
diff --git a/libc/spawn/lib_psfa_dump.c b/libc/spawn/lib_psfa_dump.c
index 45ca67107a..fe6fd0c276 100644
--- a/libc/spawn/lib_psfa_dump.c
+++ b/libc/spawn/lib_psfa_dump.c
@@ -45,7 +45,7 @@
 
 #include 
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 
 /****************************************************************************
  * Public Functions
@@ -126,5 +126,5 @@ void posix_spawn_file_actions_dump(FAR posix_spawn_file_actions_t *file_actions)
     }
 }
 
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_FEATURES */
 
diff --git a/libc/stdio/lib_fgetpos.c b/libc/stdio/lib_fgetpos.c
index ba4fa478b2..deca7e4455 100644
--- a/libc/stdio/lib_fgetpos.c
+++ b/libc/stdio/lib_fgetpos.c
@@ -104,7 +104,7 @@ int fgetpos(FAR FILE *stream, FAR fpos_t *pos)
 {
   long position;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!stream || !pos)
     {
       set_errno(EINVAL);
diff --git a/libc/stdio/lib_fputs.c b/libc/stdio/lib_fputs.c
index 4b47a04628..1d66c269d3 100644
--- a/libc/stdio/lib_fputs.c
+++ b/libc/stdio/lib_fputs.c
@@ -104,7 +104,7 @@ int fputs(FAR const char *s, FAR FILE *stream)
 
   /* Make sure that a string was provided. */
 
-#ifdef CONFIG_DEBUG /* Most parameter checking is disabled if DEBUG is off */
+#ifdef CONFIG_DEBUG_FEATURES /* Most parameter checking is disabled if DEBUG is off */
   if (!s)
     {
       set_errno(EINVAL);
@@ -149,7 +149,7 @@ int fputs(FAR const char *s, FAR FILE *stream)
 
   /* Make sure that a string was provided. */
 
-#ifdef CONFIG_DEBUG /* Most parameter checking is disabled if DEBUG is off */
+#ifdef CONFIG_DEBUG_FEATURES /* Most parameter checking is disabled if DEBUG is off */
   if (!s)
     {
       set_errno(EINVAL);
@@ -192,7 +192,7 @@ int fputs(FAR const char *s, FAR FILE *stream)
 
   /* Make sure that a string was provided. */
 
-#ifdef CONFIG_DEBUG /* Most parameter checking is disabled if DEBUG is off */
+#ifdef CONFIG_DEBUG_FEATURES /* Most parameter checking is disabled if DEBUG is off */
   if (!s)
     {
       set_errno(EINVAL);
diff --git a/libc/stdio/lib_fsetpos.c b/libc/stdio/lib_fsetpos.c
index 18843cb6f7..faa7324cde 100644
--- a/libc/stdio/lib_fsetpos.c
+++ b/libc/stdio/lib_fsetpos.c
@@ -104,7 +104,7 @@
 
 int fsetpos(FAR FILE *stream, FAR fpos_t *pos)
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!stream || !pos)
     {
       set_errno(EINVAL);
diff --git a/libc/stdio/lib_wrflush.c b/libc/stdio/lib_wrflush.c
index b07c48b290..ad562f128d 100644
--- a/libc/stdio/lib_wrflush.c
+++ b/libc/stdio/lib_wrflush.c
@@ -91,7 +91,7 @@ int lib_wrflush(FAR FILE *stream)
 #if CONFIG_STDIO_BUFFER_SIZE > 0
   /* Verify that we were passed a valid (i.e., non-NULL) stream */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!stream)
     {
       return -EINVAL;
@@ -122,7 +122,7 @@ int lib_wrflush(FAR FILE *stream)
 #else
   /* Verify that we were passed a valid (i.e., non-NULL) stream */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!stream)
     {
       return -EINVAL;
diff --git a/libc/string/lib_strpbrk.c b/libc/string/lib_strpbrk.c
index 4170926bb6..f01b5a148b 100644
--- a/libc/string/lib_strpbrk.c
+++ b/libc/string/lib_strpbrk.c
@@ -49,7 +49,7 @@ FAR char *strpbrk(FAR const char *str, FAR const char *charset)
 {
   /* Sanity checking */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!str || !charset)
     {
       return NULL;
diff --git a/libc/time/lib_gettimeofday.c b/libc/time/lib_gettimeofday.c
index d1315b1288..6a1f01d16e 100644
--- a/libc/time/lib_gettimeofday.c
+++ b/libc/time/lib_gettimeofday.c
@@ -75,7 +75,7 @@ int gettimeofday(FAR struct timeval *tv, FAR struct timezone *tz)
   struct timespec ts;
   int ret;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!tv)
     {
       set_errno(EINVAL);
diff --git a/libc/time/lib_settimeofday.c b/libc/time/lib_settimeofday.c
index ea404b7e03..a36f32911b 100644
--- a/libc/time/lib_settimeofday.c
+++ b/libc/time/lib_settimeofday.c
@@ -73,7 +73,7 @@ int settimeofday(FAR const struct timeval *tv, FAR struct timezone *tz)
 {
   struct timespec ts;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!tv || tv->tv_usec >= USEC_PER_SEC)
     {
       set_errno(EINVAL);
diff --git a/libc/unistd/lib_getcwd.c b/libc/unistd/lib_getcwd.c
index 851d380fb6..55587a599e 100644
--- a/libc/unistd/lib_getcwd.c
+++ b/libc/unistd/lib_getcwd.c
@@ -99,7 +99,7 @@ FAR char *getcwd(FAR char *buf, size_t size)
 
   /* Verify input parameters */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!buf || !size)
     {
       set_errno(EINVAL);
diff --git a/libnx/nx/nx_drawline.c b/libnx/nx/nx_drawline.c
index 49046be94b..6ca0ade436 100644
--- a/libnx/nx/nx_drawline.c
+++ b/libnx/nx/nx_drawline.c
@@ -99,7 +99,7 @@ int nx_drawline(NXWINDOW hwnd, FAR struct nxgl_vector_s *vector,
   struct nxgl_rect_s rect;
   int ret;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!hwnd || !vector || width < 1 || !color)
     {
       set_errno(EINVAL);
diff --git a/libnx/nxmu/nx_bitmap.c b/libnx/nxmu/nx_bitmap.c
index 6ed0096b7b..8526e92f29 100644
--- a/libnx/nxmu/nx_bitmap.c
+++ b/libnx/nxmu/nx_bitmap.c
@@ -102,7 +102,7 @@ int nx_bitmap(NXWINDOW hwnd, FAR const struct nxgl_rect_s *dest,
   int ret;
   sem_t sem_done;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!wnd || !dest || !src || !origin)
     {
       set_errno(EINVAL);
diff --git a/libnx/nxmu/nx_block.c b/libnx/nxmu/nx_block.c
index 56b66f23a9..eb4cb41fd9 100644
--- a/libnx/nxmu/nx_block.c
+++ b/libnx/nxmu/nx_block.c
@@ -107,7 +107,7 @@ int nx_block(NXWINDOW hwnd, FAR void *arg)
   struct nxsvrmsg_blocked_s outmsg;
   int ret = OK;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!hwnd)
     {
       set_errno(EINVAL);
diff --git a/libnx/nxmu/nx_connect.c b/libnx/nxmu/nx_connect.c
index 07cf7a7514..540bf698f7 100644
--- a/libnx/nxmu/nx_connect.c
+++ b/libnx/nxmu/nx_connect.c
@@ -122,7 +122,7 @@ NXHANDLE nx_connectinstance(FAR const char *svrmqname)
 
   /* Sanity checking */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!svrmqname)
     {
       set_errno(EINVAL);
diff --git a/libnx/nxmu/nx_constructwindow.c b/libnx/nxmu/nx_constructwindow.c
index 677706e185..32f47880d5 100644
--- a/libnx/nxmu/nx_constructwindow.c
+++ b/libnx/nxmu/nx_constructwindow.c
@@ -108,7 +108,7 @@ int nx_constructwindow(NXHANDLE handle, NXWINDOW hwnd,
   FAR struct nxbe_window_s *wnd = (FAR struct nxbe_window_s *)hwnd;
   struct nxsvrmsg_openwindow_s outmsg;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!wnd)
     {
       set_errno(EINVAL);
diff --git a/libnx/nxmu/nx_fill.c b/libnx/nxmu/nx_fill.c
index 263431b064..93c8c613ca 100644
--- a/libnx/nxmu/nx_fill.c
+++ b/libnx/nxmu/nx_fill.c
@@ -94,7 +94,7 @@ int nx_fill(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
   FAR struct nxbe_window_s *wnd = (FAR struct nxbe_window_s *)hwnd;
   struct nxsvrmsg_fill_s  outmsg;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!wnd || !rect || !color)
     {
       set_errno(EINVAL);
diff --git a/libnx/nxmu/nx_filltrapezoid.c b/libnx/nxmu/nx_filltrapezoid.c
index 374d86614e..04f69320ac 100644
--- a/libnx/nxmu/nx_filltrapezoid.c
+++ b/libnx/nxmu/nx_filltrapezoid.c
@@ -99,7 +99,7 @@ int nx_filltrapezoid(NXWINDOW hwnd, FAR const struct nxgl_rect_s *clip,
 
   /* Some debug-only sanity checks */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!wnd || !trap || !color)
     {
       set_errno(EINVAL);
diff --git a/libnx/nxmu/nx_getposition.c b/libnx/nxmu/nx_getposition.c
index 19fee248ff..ff3f7723f3 100644
--- a/libnx/nxmu/nx_getposition.c
+++ b/libnx/nxmu/nx_getposition.c
@@ -91,7 +91,7 @@ int nx_getposition(NXWINDOW hwnd)
   FAR struct nxbe_window_s     *wnd = (FAR struct nxbe_window_s *)hwnd;
   struct nxsvrmsg_getposition_s outmsg;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!wnd)
     {
       set_errno(EINVAL);
diff --git a/libnx/nxmu/nx_getrectangle.c b/libnx/nxmu/nx_getrectangle.c
index 4c6f2d22e2..737831e9a4 100644
--- a/libnx/nxmu/nx_getrectangle.c
+++ b/libnx/nxmu/nx_getrectangle.c
@@ -101,7 +101,7 @@ int nx_getrectangle(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
   int ret;
   sem_t sem_done;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!hwnd || !rect || !dest)
     {
       ginfo("Invalid parameters\n");
diff --git a/libnx/nxmu/nx_move.c b/libnx/nxmu/nx_move.c
index 19d36703ec..d62d680df5 100644
--- a/libnx/nxmu/nx_move.c
+++ b/libnx/nxmu/nx_move.c
@@ -92,7 +92,7 @@ int nx_move(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
   FAR struct nxbe_window_s *wnd = (FAR struct nxbe_window_s *)hwnd;
   struct nxsvrmsg_move_s    outmsg;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!wnd)
     {
       set_errno(EINVAL);
diff --git a/libnx/nxmu/nx_openwindow.c b/libnx/nxmu/nx_openwindow.c
index 5100a3b9a5..a704c42496 100644
--- a/libnx/nxmu/nx_openwindow.c
+++ b/libnx/nxmu/nx_openwindow.c
@@ -95,7 +95,7 @@ NXWINDOW nx_openwindow(NXHANDLE handle, FAR const struct nx_callback_s *cb,
   FAR struct nxbe_window_s *wnd;
   int ret;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!handle || !cb)
     {
       set_errno(EINVAL);
diff --git a/libnx/nxmu/nx_releasebkgd.c b/libnx/nxmu/nx_releasebkgd.c
index 3bad1b265d..ca51f5e92e 100644
--- a/libnx/nxmu/nx_releasebkgd.c
+++ b/libnx/nxmu/nx_releasebkgd.c
@@ -90,7 +90,7 @@ int nx_releasebkgd(NXWINDOW hwnd)
   FAR struct nxbe_window_s *wnd = (FAR struct nxbe_window_s *)hwnd;
   struct nxsvrmsg_releasebkgd_s outmsg;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!wnd)
     {
       set_errno(EINVAL);
diff --git a/libnx/nxmu/nx_requestbkgd.c b/libnx/nxmu/nx_requestbkgd.c
index 20f217d084..b1f3e68028 100644
--- a/libnx/nxmu/nx_requestbkgd.c
+++ b/libnx/nxmu/nx_requestbkgd.c
@@ -116,7 +116,7 @@ int nx_requestbkgd(NXHANDLE handle, FAR const struct nx_callback_s *cb,
   FAR struct nxfe_conn_s *conn = (FAR struct nxfe_conn_s *)handle;
   struct nxsvrmsg_requestbkgd_s outmsg;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!conn || !cb)
     {
       set_errno(EINVAL);
diff --git a/libnx/nxmu/nx_setbgcolor.c b/libnx/nxmu/nx_setbgcolor.c
index ac3afe48a2..78599edb2b 100644
--- a/libnx/nxmu/nx_setbgcolor.c
+++ b/libnx/nxmu/nx_setbgcolor.c
@@ -90,7 +90,7 @@ int nx_setbgcolor(NXHANDLE handle,
   FAR struct nxfe_conn_s *conn = (FAR struct nxfe_conn_s *)handle;
   struct nxsvrmsg_setbgcolor_s outmsg;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!conn)
     {
       set_errno(EINVAL);
diff --git a/libnx/nxmu/nx_setpixel.c b/libnx/nxmu/nx_setpixel.c
index fef16c0535..5c973bec71 100644
--- a/libnx/nxmu/nx_setpixel.c
+++ b/libnx/nxmu/nx_setpixel.c
@@ -95,7 +95,7 @@ int nx_setpixel(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
   FAR struct nxbe_window_s  *wnd = (FAR struct nxbe_window_s *)hwnd;
   struct nxsvrmsg_setpixel_s outmsg;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!wnd || !pos || !color)
     {
       set_errno(EINVAL);
diff --git a/libnx/nxmu/nx_setposition.c b/libnx/nxmu/nx_setposition.c
index 10568595a6..7ca0d02baf 100644
--- a/libnx/nxmu/nx_setposition.c
+++ b/libnx/nxmu/nx_setposition.c
@@ -90,7 +90,7 @@ int nx_setposition(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos)
   FAR struct nxbe_window_s     *wnd = (FAR struct nxbe_window_s *)hwnd;
   struct nxsvrmsg_setposition_s outmsg;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!wnd || !pos)
     {
       set_errno(EINVAL);
diff --git a/libnx/nxmu/nx_setsize.c b/libnx/nxmu/nx_setsize.c
index 948ace4307..b1cbb1086a 100644
--- a/libnx/nxmu/nx_setsize.c
+++ b/libnx/nxmu/nx_setsize.c
@@ -90,7 +90,7 @@ int nx_setsize(NXWINDOW hwnd, FAR const struct nxgl_size_s *size)
   FAR struct nxbe_window_s *wnd = (FAR struct nxbe_window_s *)hwnd;
   struct nxsvrmsg_setsize_s outmsg;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!wnd || !size)
     {
       set_errno(EINVAL);
diff --git a/libnx/nxmu/nxmu_sendserver.c b/libnx/nxmu/nxmu_sendserver.c
index 0281903980..0b93809a66 100644
--- a/libnx/nxmu/nxmu_sendserver.c
+++ b/libnx/nxmu/nxmu_sendserver.c
@@ -92,7 +92,7 @@ int nxmu_sendserver(FAR struct nxfe_conn_s *conn, FAR const void *msg,
 
   /* Sanity checking */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!conn || !conn->cwrmq)
     {
       set_errno(EINVAL);
diff --git a/libnx/nxmu/nxmu_sendwindow.c b/libnx/nxmu/nxmu_sendwindow.c
index f240c5614f..ff279d86ac 100644
--- a/libnx/nxmu/nxmu_sendwindow.c
+++ b/libnx/nxmu/nxmu_sendwindow.c
@@ -94,7 +94,7 @@ int nxmu_sendwindow(FAR struct nxbe_window_s *wnd, FAR const void *msg,
 
   /* Sanity checking */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!wnd || !wnd->conn)
     {
       set_errno(EINVAL);
diff --git a/libnx/nxtk/nxtk_bitmaptoolbar.c b/libnx/nxtk/nxtk_bitmaptoolbar.c
index abc1815b8f..6f31d93009 100644
--- a/libnx/nxtk/nxtk_bitmaptoolbar.c
+++ b/libnx/nxtk/nxtk_bitmaptoolbar.c
@@ -102,7 +102,7 @@ int nxtk_bitmaptoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *dest,
   struct nxgl_point_s wndorigin;
   struct nxgl_rect_s clipdest;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!hfwnd || !dest || !src || !origin)
     {
       set_errno(EINVAL);
diff --git a/libnx/nxtk/nxtk_bitmapwindow.c b/libnx/nxtk/nxtk_bitmapwindow.c
index 59a8776b62..0371715ba7 100644
--- a/libnx/nxtk/nxtk_bitmapwindow.c
+++ b/libnx/nxtk/nxtk_bitmapwindow.c
@@ -102,7 +102,7 @@ int nxtk_bitmapwindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *dest,
   struct nxgl_point_s wndorigin;
   struct nxgl_rect_s clipdest;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!hfwnd || !dest || !src || !origin)
     {
       set_errno(EINVAL);
diff --git a/libnx/nxtk/nxtk_drawlinetoolbar.c b/libnx/nxtk/nxtk_drawlinetoolbar.c
index bd7744725e..84d25ad83c 100644
--- a/libnx/nxtk/nxtk_drawlinetoolbar.c
+++ b/libnx/nxtk/nxtk_drawlinetoolbar.c
@@ -102,7 +102,7 @@ int nxtk_drawlinetoolbar(NXTKWINDOW hfwnd,  FAR struct nxgl_vector_s *vector,
   struct nxgl_rect_s rect;
   int ret;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!hfwnd || !vector || width < 1 || !color)
     {
       set_errno(EINVAL);
diff --git a/libnx/nxtk/nxtk_drawlinewindow.c b/libnx/nxtk/nxtk_drawlinewindow.c
index a616ce1320..231842b882 100644
--- a/libnx/nxtk/nxtk_drawlinewindow.c
+++ b/libnx/nxtk/nxtk_drawlinewindow.c
@@ -101,7 +101,7 @@ int nxtk_drawlinewindow(NXTKWINDOW hfwnd, FAR struct nxgl_vector_s *vector,
   struct nxgl_rect_s rect;
   int ret;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!hfwnd || !vector || width < 1 || !color)
     {
       set_errno(EINVAL);
diff --git a/libnx/nxtk/nxtk_filltoolbar.c b/libnx/nxtk/nxtk_filltoolbar.c
index 0d62eaaf84..25eb6a8e8e 100644
--- a/libnx/nxtk/nxtk_filltoolbar.c
+++ b/libnx/nxtk/nxtk_filltoolbar.c
@@ -94,7 +94,7 @@ int nxtk_filltoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
   FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hfwnd;
   struct nxgl_rect_s fillrect;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!hfwnd || !rect || !color)
     {
       set_errno(EINVAL);
diff --git a/libnx/nxtk/nxtk_filltraptoolbar.c b/libnx/nxtk/nxtk_filltraptoolbar.c
index 1b7ae27277..3ca0b38ad2 100644
--- a/libnx/nxtk/nxtk_filltraptoolbar.c
+++ b/libnx/nxtk/nxtk_filltraptoolbar.c
@@ -95,7 +95,7 @@ int nxtk_filltraptoolbar(NXTKWINDOW hfwnd,
   FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hfwnd;
   struct nxgl_rect_s relclip;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!hfwnd || !trap || !color)
     {
       set_errno(EINVAL);
diff --git a/libnx/nxtk/nxtk_filltrapwindow.c b/libnx/nxtk/nxtk_filltrapwindow.c
index bbfba26599..88c3077223 100644
--- a/libnx/nxtk/nxtk_filltrapwindow.c
+++ b/libnx/nxtk/nxtk_filltrapwindow.c
@@ -96,7 +96,7 @@ int nxtk_filltrapwindow(NXTKWINDOW hfwnd,
   struct nxgl_rect_s relclip;
   struct nxgl_trapezoid_s reltrap;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!hfwnd || !trap || !color)
     {
       set_errno(EINVAL);
diff --git a/libnx/nxtk/nxtk_fillwindow.c b/libnx/nxtk/nxtk_fillwindow.c
index fa0fd8d8f2..9ff1caca57 100644
--- a/libnx/nxtk/nxtk_fillwindow.c
+++ b/libnx/nxtk/nxtk_fillwindow.c
@@ -94,7 +94,7 @@ int nxtk_fillwindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
   FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hfwnd;
   struct nxgl_rect_s fillrect;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!hfwnd || !rect || !color)
     {
       set_errno(EINVAL);
diff --git a/libnx/nxtk/nxtk_gettoolbar.c b/libnx/nxtk/nxtk_gettoolbar.c
index 3626462dad..bc05cbce94 100644
--- a/libnx/nxtk/nxtk_gettoolbar.c
+++ b/libnx/nxtk/nxtk_gettoolbar.c
@@ -100,7 +100,7 @@ int nxtk_gettoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
   FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hfwnd;
   struct nxgl_rect_s getrect;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!hfwnd || !rect || !dest)
     {
       ginfo("Invalid parameters\n");
diff --git a/libnx/nxtk/nxtk_getwindow.c b/libnx/nxtk/nxtk_getwindow.c
index ffb06bf95d..4106267fb0 100644
--- a/libnx/nxtk/nxtk_getwindow.c
+++ b/libnx/nxtk/nxtk_getwindow.c
@@ -100,7 +100,7 @@ int nxtk_getwindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
   FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hfwnd;
   struct nxgl_rect_s getrect;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!hfwnd || !rect || !dest)
     {
       ginfo("Invalid parameters\n");
diff --git a/libnx/nxtk/nxtk_movetoolbar.c b/libnx/nxtk/nxtk_movetoolbar.c
index 62d14e7bf8..913142a0d4 100644
--- a/libnx/nxtk/nxtk_movetoolbar.c
+++ b/libnx/nxtk/nxtk_movetoolbar.c
@@ -99,7 +99,7 @@ int nxtk_movetoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
   struct nxgl_rect_s srcrect;
   struct nxgl_point_s clipoffset;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!hfwnd || !rect || !offset)
     {
       set_errno(EINVAL);
diff --git a/libnx/nxtk/nxtk_movewindow.c b/libnx/nxtk/nxtk_movewindow.c
index 2b34f44a8b..302cff98d1 100644
--- a/libnx/nxtk/nxtk_movewindow.c
+++ b/libnx/nxtk/nxtk_movewindow.c
@@ -98,7 +98,7 @@ int nxtk_movewindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
   struct nxgl_rect_s srcrect;
   struct nxgl_point_s clipoffset;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!hfwnd || !rect || !offset)
     {
       set_errno(EINVAL);
diff --git a/libnx/nxtk/nxtk_opentoolbar.c b/libnx/nxtk/nxtk_opentoolbar.c
index 26aa4c504f..f5d58979ea 100644
--- a/libnx/nxtk/nxtk_opentoolbar.c
+++ b/libnx/nxtk/nxtk_opentoolbar.c
@@ -96,7 +96,7 @@ int nxtk_opentoolbar(NXTKWINDOW hfwnd, nxgl_coord_t height,
 {
   FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hfwnd;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!hfwnd || !cb)
     {
       set_errno(EINVAL);
diff --git a/libnx/nxtk/nxtk_openwindow.c b/libnx/nxtk/nxtk_openwindow.c
index 796a57d3b7..ebefaec892 100644
--- a/libnx/nxtk/nxtk_openwindow.c
+++ b/libnx/nxtk/nxtk_openwindow.c
@@ -120,7 +120,7 @@ NXTKWINDOW nxtk_openwindow(NXHANDLE handle,
   FAR struct nxtk_framedwindow_s *fwnd;
   int ret;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!handle || !cb)
     {
       set_errno(EINVAL);
diff --git a/libnx/nxtk/nxtk_setsize.c b/libnx/nxtk/nxtk_setsize.c
index 8848c71720..7e90796966 100644
--- a/libnx/nxtk/nxtk_setsize.c
+++ b/libnx/nxtk/nxtk_setsize.c
@@ -94,7 +94,7 @@ int nxtk_setsize(NXTKWINDOW hfwnd, FAR const struct nxgl_size_s *size)
   FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hfwnd;
   struct nxgl_size_s newsize;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!hfwnd || !size)
     {
       set_errno(EINVAL);
diff --git a/libxx/libxx_new.cxx b/libxx/libxx_new.cxx
index a4575519ab..290933883c 100644
--- a/libxx/libxx_new.cxx
+++ b/libxx/libxx_new.cxx
@@ -87,7 +87,7 @@ void *operator new(unsigned int nbytes)
 
   void *alloc = lib_malloc(nbytes);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (alloc == 0)
     {
       // Oh my.. we are required to return a valid pointer and
diff --git a/libxx/libxx_newa.cxx b/libxx/libxx_newa.cxx
index c1e4dfa95d..7b909dad42 100644
--- a/libxx/libxx_newa.cxx
+++ b/libxx/libxx_newa.cxx
@@ -87,7 +87,7 @@ void *operator new[](unsigned int nbytes)
 
   void *alloc = lib_malloc(nbytes);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (alloc == 0)
     {
       // Oh my.. we are required to return a valid pointer and
diff --git a/mm/Kconfig b/mm/Kconfig
index 1f0a79f0de..8cba9265ea 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -116,7 +116,7 @@ config GRAN_INTR
 config DEBUG_GRAN
 	bool "Granule Allocator Debug"
 	default n
-	depends on GRAN && DEBUG
+	depends on GRAN && DEBUG_FEATURES
 	---help---
 		Just like DEBUG_MM, but only generates output from the gran
 		allocation logic.
@@ -143,7 +143,7 @@ config MM_PGSIZE
 config DEBUG_PGALLOC
 	bool "Page Allocator Debug"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	---help---
 		Just like DEBUG_MM, but only generates output from the page
 		allocation logic.
diff --git a/mm/kmm_heap/Make.defs b/mm/kmm_heap/Make.defs
index cf7053e54b..9f7ac447a3 100644
--- a/mm/kmm_heap/Make.defs
+++ b/mm/kmm_heap/Make.defs
@@ -44,7 +44,7 @@ ifeq ($(CONFIG_BUILD_KERNEL),y)
 CSRCS += kmm_sbrk.c
 endif
 
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
 CSRCS += kmm_heapmember.c
 endif
 
diff --git a/mm/kmm_heap/kmm_heapmember.c b/mm/kmm_heap/kmm_heapmember.c
index b96a6f7ada..53fa7027b7 100644
--- a/mm/kmm_heap/kmm_heapmember.c
+++ b/mm/kmm_heap/kmm_heapmember.c
@@ -43,7 +43,7 @@
 
 #include 
 
-#if defined(CONFIG_MM_KERNEL_HEAP) && defined(CONFIG_DEBUG)
+#if defined(CONFIG_MM_KERNEL_HEAP) && defined(CONFIG_DEBUG_FEATURES)
 
 /****************************************************************************
  * Public Functions
@@ -105,4 +105,4 @@ bool kmm_heapmember(FAR void *mem)
 #endif
 }
 
-#endif /* CONFIG_MM_KERNEL_HEAP && CONFIG_DEBUG */
+#endif /* CONFIG_MM_KERNEL_HEAP && CONFIG_DEBUG_FEATURES */
diff --git a/mm/kmm_heap/kmm_kernel.c b/mm/kmm_heap/kmm_kernel.c
index 4a2231dd01..e2fc9232b8 100644
--- a/mm/kmm_heap/kmm_kernel.c
+++ b/mm/kmm_heap/kmm_kernel.c
@@ -66,7 +66,7 @@
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 bool kmm_heapmember(FAR void *mem)
 {
 #if CONFIG_MM_REGIONS > 1
diff --git a/mm/mm_heap/mm_sem.c b/mm/mm_heap/mm_sem.c
index ae00b0b80f..0cbe1b4e61 100644
--- a/mm/mm_heap/mm_sem.c
+++ b/mm/mm_heap/mm_sem.c
@@ -53,7 +53,7 @@
 //#define MONITOR_MM_SEMAPHORE 1
 
 #ifdef MONITOR_MM_SEMAPHORE
-#  ifdef CONFIG_DEBUG
+#  ifdef CONFIG_DEBUG_FEATURES
 #    include 
 #    define msemdbg dbg
 #  else
@@ -186,7 +186,7 @@ void mm_takesemaphore(FAR struct mm_heap_s *heap)
 
 void mm_givesemaphore(FAR struct mm_heap_s *heap)
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   pid_t my_pid = getpid();
 #endif
 
@@ -207,7 +207,7 @@ void mm_givesemaphore(FAR struct mm_heap_s *heap)
     {
       /* Nope, this is the last reference I have */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       msemdbg("PID=%d giving\n", my_pid);
 #endif
 
diff --git a/net/arp/Kconfig b/net/arp/Kconfig
index df228db6b7..3004ab943e 100644
--- a/net/arp/Kconfig
+++ b/net/arp/Kconfig
@@ -65,7 +65,7 @@ endif # NET_ARP_SEND
 config NET_ARP_DUMP
 	bool "Dump ARP packet header"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	---help---
 		Dump ARP packets to the SYSLOG device.
 
diff --git a/net/arp/arp.h b/net/arp/arp.h
index ba62f7893b..0b95c4abd3 100644
--- a/net/arp/arp.h
+++ b/net/arp/arp.h
@@ -64,7 +64,7 @@
  ****************************************************************************/
 /* Configuration ************************************************************/
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_NET_ARP_DUMP
 #endif
 
diff --git a/net/devif/devif_callback.c b/net/devif/devif_callback.c
index 4db178e425..6923bd6b1c 100644
--- a/net/devif/devif_callback.c
+++ b/net/devif/devif_callback.c
@@ -86,7 +86,7 @@ static void devif_callback_free(FAR struct net_driver_s *dev,
     {
       save = net_lock();
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
       /* Check for double freed callbacks */
 
       curr = g_cbfreelist;
@@ -257,7 +257,7 @@ FAR struct devif_callback_s *
            *list = ret;
         }
     }
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   else
     {
       nlldbg("Failed to allocate callback\n");
diff --git a/net/iob/Kconfig b/net/iob/Kconfig
index e6018d6426..a5cec7e117 100644
--- a/net/iob/Kconfig
+++ b/net/iob/Kconfig
@@ -63,7 +63,7 @@ config IOB_THROTTLE
 config IOB_DEBUG
 	bool "Force I/O buffer debug"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	---help---
 		This option will force debug output from I/O buffer logic,
 		even without network debug output.  This is not normally something
diff --git a/net/iob/Make.defs b/net/iob/Make.defs
index 27827cff49..7f5f1d665b 100644
--- a/net/iob/Make.defs
+++ b/net/iob/Make.defs
@@ -43,7 +43,7 @@ NET_CSRCS += iob_free_chain.c iob_free_qentry.c iob_free_queue.c
 NET_CSRCS += iob_initialize.c iob_pack.c iob_peek_queue.c iob_remove_queue.c
 NET_CSRCS += iob_trimhead.c iob_trimhead_queue.c iob_trimtail.c
 
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
 NET_CSRCS += iob_dump.c
 endif
 
diff --git a/net/iob/iob_add_queue.c b/net/iob/iob_add_queue.c
index bc7e0adb8e..d749c56276 100644
--- a/net/iob/iob_add_queue.c
+++ b/net/iob/iob_add_queue.c
@@ -39,7 +39,7 @@
 
 #include 
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
 /* Force debug output (from this file only) */
 
 #  undef  CONFIG_DEBUG_NET
diff --git a/net/iob/iob_alloc.c b/net/iob/iob_alloc.c
index e5483a2c3e..4b43320fcd 100644
--- a/net/iob/iob_alloc.c
+++ b/net/iob/iob_alloc.c
@@ -39,7 +39,7 @@
 
 #include 
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
 /* Force debug output (from this file only) */
 
 #  undef  CONFIG_DEBUG_NET
diff --git a/net/iob/iob_alloc_qentry.c b/net/iob/iob_alloc_qentry.c
index c1a9f54a97..5ba2e6205a 100644
--- a/net/iob/iob_alloc_qentry.c
+++ b/net/iob/iob_alloc_qentry.c
@@ -39,7 +39,7 @@
 
 #include 
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
 /* Force debug output (from this file only) */
 
 #  undef  CONFIG_DEBUG_NET
diff --git a/net/iob/iob_clone.c b/net/iob/iob_clone.c
index db29abde24..73ccd81893 100644
--- a/net/iob/iob_clone.c
+++ b/net/iob/iob_clone.c
@@ -39,7 +39,7 @@
 
 #include 
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
 /* Force debug output (from this file only) */
 
 #  undef  CONFIG_DEBUG_NET
diff --git a/net/iob/iob_concat.c b/net/iob/iob_concat.c
index b543d63e6c..99fff8e75a 100644
--- a/net/iob/iob_concat.c
+++ b/net/iob/iob_concat.c
@@ -39,7 +39,7 @@
 
 #include 
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
 /* Force debug output (from this file only) */
 
 #  undef  CONFIG_DEBUG_NET
diff --git a/net/iob/iob_contig.c b/net/iob/iob_contig.c
index 749e72a0c7..8817d7de61 100644
--- a/net/iob/iob_contig.c
+++ b/net/iob/iob_contig.c
@@ -39,7 +39,7 @@
 
 #include 
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
 /* Force debug output (from this file only) */
 
 #  undef  CONFIG_DEBUG_NET
diff --git a/net/iob/iob_copyin.c b/net/iob/iob_copyin.c
index e671dc2b5e..4c2205cd7e 100644
--- a/net/iob/iob_copyin.c
+++ b/net/iob/iob_copyin.c
@@ -39,7 +39,7 @@
 
 #include 
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
 /* Force debug output (from this file only) */
 
 #  undef  CONFIG_DEBUG_NET
diff --git a/net/iob/iob_copyout.c b/net/iob/iob_copyout.c
index 2cb0a10be6..b250cc5601 100644
--- a/net/iob/iob_copyout.c
+++ b/net/iob/iob_copyout.c
@@ -39,7 +39,7 @@
 
 #include 
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
 /* Force debug output (from this file only) */
 
 #  undef  CONFIG_DEBUG_NET
diff --git a/net/iob/iob_dump.c b/net/iob/iob_dump.c
index a34dc1ca2a..78fd87a72c 100644
--- a/net/iob/iob_dump.c
+++ b/net/iob/iob_dump.c
@@ -44,7 +44,7 @@
 
 #include 
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 
 /****************************************************************************
  * Pre-processor definitions
@@ -162,4 +162,4 @@ void iob_dump(FAR const char *msg, FAR struct iob_s *iob, unsigned int len,
     }
 }
 
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_FEATURES */
diff --git a/net/iob/iob_free.c b/net/iob/iob_free.c
index 7762201b3c..67a3016088 100644
--- a/net/iob/iob_free.c
+++ b/net/iob/iob_free.c
@@ -39,7 +39,7 @@
 
 #include 
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
 /* Force debug output (from this file only) */
 
 #  undef  CONFIG_DEBUG_NET
diff --git a/net/iob/iob_free_chain.c b/net/iob/iob_free_chain.c
index 810622e828..6f5d4d4ba1 100644
--- a/net/iob/iob_free_chain.c
+++ b/net/iob/iob_free_chain.c
@@ -39,7 +39,7 @@
 
 #include 
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
 /* Force debug output (from this file only) */
 
 #  undef  CONFIG_DEBUG_NET
diff --git a/net/iob/iob_free_qentry.c b/net/iob/iob_free_qentry.c
index e663d8a2ea..66cccb9947 100644
--- a/net/iob/iob_free_qentry.c
+++ b/net/iob/iob_free_qentry.c
@@ -39,7 +39,7 @@
 
 #include 
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
 /* Force debug output (from this file only) */
 
 #  undef  CONFIG_DEBUG_NET
diff --git a/net/iob/iob_free_queue.c b/net/iob/iob_free_queue.c
index 91ded4f42c..5a4a52513d 100644
--- a/net/iob/iob_free_queue.c
+++ b/net/iob/iob_free_queue.c
@@ -39,7 +39,7 @@
 
 #include 
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
 /* Force debug output (from this file only) */
 
 #  undef  CONFIG_DEBUG_NET
diff --git a/net/iob/iob_initialize.c b/net/iob/iob_initialize.c
index d63d957219..9bae90b0e4 100644
--- a/net/iob/iob_initialize.c
+++ b/net/iob/iob_initialize.c
@@ -39,7 +39,7 @@
 
 #include 
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
 /* Force debug output (from this file only) */
 
 #  undef  CONFIG_DEBUG_NET
diff --git a/net/iob/iob_pack.c b/net/iob/iob_pack.c
index 660b31d4a8..2df9300ece 100644
--- a/net/iob/iob_pack.c
+++ b/net/iob/iob_pack.c
@@ -39,7 +39,7 @@
 
 #include 
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
 /* Force debug output (from this file only) */
 
 #  undef  CONFIG_DEBUG_NET
diff --git a/net/iob/iob_peek_queue.c b/net/iob/iob_peek_queue.c
index c49fb1ecbf..3422d65d60 100644
--- a/net/iob/iob_peek_queue.c
+++ b/net/iob/iob_peek_queue.c
@@ -39,7 +39,7 @@
 
 #include 
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
 /* Force debug output (from this file only) */
 
 #  undef  CONFIG_DEBUG_NET
diff --git a/net/iob/iob_remove_queue.c b/net/iob/iob_remove_queue.c
index e134bcd016..4d8a45a381 100644
--- a/net/iob/iob_remove_queue.c
+++ b/net/iob/iob_remove_queue.c
@@ -39,7 +39,7 @@
 
 #include 
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
 /* Force debug output (from this file only) */
 
 #  undef  CONFIG_DEBUG_NET
diff --git a/net/iob/iob_trimhead.c b/net/iob/iob_trimhead.c
index 1262eecf09..ce4f642588 100644
--- a/net/iob/iob_trimhead.c
+++ b/net/iob/iob_trimhead.c
@@ -39,7 +39,7 @@
 
 #include 
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
 /* Force debug output (from this file only) */
 
 #  undef  CONFIG_DEBUG_NET
diff --git a/net/iob/iob_trimhead_queue.c b/net/iob/iob_trimhead_queue.c
index 24b9878321..791892d738 100644
--- a/net/iob/iob_trimhead_queue.c
+++ b/net/iob/iob_trimhead_queue.c
@@ -39,7 +39,7 @@
 
 #include 
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
 /* Force debug output (from this file only) */
 
 #  undef  CONFIG_DEBUG_NET
diff --git a/net/iob/iob_trimtail.c b/net/iob/iob_trimtail.c
index 4ca9407957..f89cdeee22 100644
--- a/net/iob/iob_trimtail.c
+++ b/net/iob/iob_trimtail.c
@@ -39,7 +39,7 @@
 
 #include 
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_IOB_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_IOB_DEBUG)
 /* Force debug output (from this file only) */
 
 #  undef  CONFIG_DEBUG_NET
diff --git a/net/socket/getsockname.c b/net/socket/getsockname.c
index b6b8eebcee..09c8fa0e65 100644
--- a/net/socket/getsockname.c
+++ b/net/socket/getsockname.c
@@ -365,7 +365,7 @@ int getsockname(int sockfd, FAR struct sockaddr *addr, FAR socklen_t *addrlen)
    * system (?)
    */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!addr || !addrlen)
     {
       err = EINVAL;
diff --git a/net/socket/net_sockets.c b/net/socket/net_sockets.c
index 31274117c7..ceac793ee8 100644
--- a/net/socket/net_sockets.c
+++ b/net/socket/net_sockets.c
@@ -201,7 +201,7 @@ int sockfd_allocate(int minsd)
 
 void sock_release(FAR struct socket *psock)
 {
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (psock)
 #endif
     {
diff --git a/net/socket/recvfrom.c b/net/socket/recvfrom.c
index fc9d8c794d..d095e19ad8 100644
--- a/net/socket/recvfrom.c
+++ b/net/socket/recvfrom.c
@@ -1848,7 +1848,7 @@ ssize_t psock_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len,
 
   /* Verify that non-NULL pointers were passed */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!buf)
     {
       err = EINVAL;
diff --git a/net/tcp/Kconfig b/net/tcp/Kconfig
index fccfba8fea..59fa04d018 100644
--- a/net/tcp/Kconfig
+++ b/net/tcp/Kconfig
@@ -107,7 +107,7 @@ config NET_TCP_NWRBCHAINS
 config NET_TCP_WRBUFFER_DEBUG
 	bool "Force write buffer debug"
 	default n
-	depends on DEBUG
+	depends on DEBUG_FEATURES
 	select IOB_DEBUG
 	---help---
 		This option will force debug output from TCP write buffer logic,
diff --git a/net/tcp/Make.defs b/net/tcp/Make.defs
index 9581c626ab..520e601f4c 100644
--- a/net/tcp/Make.defs
+++ b/net/tcp/Make.defs
@@ -63,7 +63,7 @@ NET_CSRCS += tcp_callback.c tcp_backlog.c tcp_ipselect.c
 
 ifeq ($(CONFIG_NET_TCP_WRITE_BUFFERS),y)
 NET_CSRCS += tcp_wrbuffer.c
-ifeq ($(CONFIG_DEBUG),y)
+ifeq ($(CONFIG_DEBUG_FEATURES),y)
 NET_CSRCS += tcp_wrbuffer_dump.c
 endif
 endif
diff --git a/net/tcp/tcp.h b/net/tcp/tcp.h
index 0b3bd37ce5..e95d50cdf4 100644
--- a/net/tcp/tcp.h
+++ b/net/tcp/tcp.h
@@ -115,7 +115,7 @@
 #  define WRB_TRIM(wrb,n) \
   do { (wrb)->wb_iob = iob_trimhead((wrb)->wb_iob,(n)); } while (0)
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 #  define WRB_DUMP(msg,wrb,len,offset) \
      tcp_wrbuffer_dump(msg,wrb,len,offset)
 #else
@@ -1251,7 +1251,7 @@ int tcp_wrbuffer_test(void);
  ****************************************************************************/
 
 #ifdef CONFIG_NET_TCP_WRITE_BUFFERS
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 void tcp_wrbuffer_dump(FAR const char *msg, FAR struct tcp_wrbuffer_s *wrb,
                        unsigned int len, unsigned int offset);
 #else
diff --git a/net/tcp/tcp_backlog.c b/net/tcp/tcp_backlog.c
index 9a1e6e3bf5..1a7d73b833 100644
--- a/net/tcp/tcp_backlog.c
+++ b/net/tcp/tcp_backlog.c
@@ -79,7 +79,7 @@ int tcp_backlogcreate(FAR struct tcp_conn_s *conn, int nblg)
 
   nllinfo("conn=%p nblg=%d\n", conn, nblg);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!conn)
     {
       return -EINVAL;
@@ -163,7 +163,7 @@ int tcp_backlogdestroy(FAR struct tcp_conn_s *conn)
 
   nllinfo("conn=%p\n", conn);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!conn)
     {
       return -EINVAL;
@@ -224,7 +224,7 @@ int tcp_backlogadd(FAR struct tcp_conn_s *conn, FAR struct tcp_conn_s *blconn)
 
   nllinfo("conn=%p blconn=%p\n", conn, blconn);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!conn)
     {
       return -EINVAL;
@@ -294,7 +294,7 @@ FAR struct tcp_conn_s *tcp_backlogremove(FAR struct tcp_conn_s *conn)
   FAR struct tcp_blcontainer_s *blc;
   FAR struct tcp_conn_s        *blconn = NULL;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!conn)
     {
       return NULL;
@@ -347,7 +347,7 @@ int tcp_backlogdelete(FAR struct tcp_conn_s *conn,
 
   nllinfo("conn=%p blconn=%p\n", conn, blconn);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!conn)
     {
       return -EINVAL;
diff --git a/net/tcp/tcp_netpoll.c b/net/tcp/tcp_netpoll.c
index 40a5a34c78..5344eb4303 100644
--- a/net/tcp/tcp_netpoll.c
+++ b/net/tcp/tcp_netpoll.c
@@ -169,7 +169,7 @@ int tcp_pollsetup(FAR struct socket *psock, FAR struct pollfd *fds)
 
   /* Sanity check */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!conn || !fds)
     {
       return -EINVAL;
@@ -329,7 +329,7 @@ int tcp_pollteardown(FAR struct socket *psock, FAR struct pollfd *fds)
 
   /* Sanity check */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!conn || !fds->priv)
     {
       return -EINVAL;
diff --git a/net/tcp/tcp_send_buffered.c b/net/tcp/tcp_send_buffered.c
index 538cb29980..b5c729def9 100644
--- a/net/tcp/tcp_send_buffered.c
+++ b/net/tcp/tcp_send_buffered.c
@@ -43,7 +43,7 @@
 #if defined(CONFIG_NET) && defined(CONFIG_NET_TCP) && \
     defined(CONFIG_NET_TCP_WRITE_BUFFERS)
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_NET_TCP_WRBUFFER_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_NET_TCP_WRBUFFER_DEBUG)
 /* Force debug output (from this file only) */
 
 #  undef  CONFIG_DEBUG_NET
diff --git a/net/tcp/tcp_wrbuffer.c b/net/tcp/tcp_wrbuffer.c
index cb6c10e9d8..1c4dd824fb 100644
--- a/net/tcp/tcp_wrbuffer.c
+++ b/net/tcp/tcp_wrbuffer.c
@@ -41,7 +41,7 @@
 #include 
 #if defined(CONFIG_NET) && defined(CONFIG_NET_TCP) && defined(CONFIG_NET_TCP_WRITE_BUFFERS)
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_NET_TCP_WRBUFFER_DEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_NET_TCP_WRBUFFER_DEBUG)
 /* Force debug output (from this file only) */
 
 #  undef  CONFIG_DEBUG_NET
diff --git a/net/tcp/tcp_wrbuffer_dump.c b/net/tcp/tcp_wrbuffer_dump.c
index 5458519195..2155a3b475 100644
--- a/net/tcp/tcp_wrbuffer_dump.c
+++ b/net/tcp/tcp_wrbuffer_dump.c
@@ -46,7 +46,7 @@
 
 #include "tcp/tcp.h"
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 
 /****************************************************************************
  * Public Functions
@@ -68,4 +68,4 @@ void tcp_wrbuffer_dump(FAR const char *msg, FAR struct tcp_wrbuffer_s *wrb,
   iob_dump("I/O Buffer Chain", WRB_IOB(wrb), len, offset);
 }
 
-#endif /* CONFIG_DEBUG */
+#endif /* CONFIG_DEBUG_FEATURES */
diff --git a/net/udp/udp_netpoll.c b/net/udp/udp_netpoll.c
index 349560b1cc..0dc670fe10 100644
--- a/net/udp/udp_netpoll.c
+++ b/net/udp/udp_netpoll.c
@@ -166,7 +166,7 @@ int udp_pollsetup(FAR struct socket *psock, FAR struct pollfd *fds)
 
   /* Sanity check */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!conn || !fds)
     {
       return -EINVAL;
@@ -295,7 +295,7 @@ int udp_pollteardown(FAR struct socket *psock, FAR struct pollfd *fds)
 
   /* Sanity check */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!conn || !fds->priv)
     {
       return -EINVAL;
diff --git a/sched/Kconfig b/sched/Kconfig
index d85be10ce7..69b4945fd1 100644
--- a/sched/Kconfig
+++ b/sched/Kconfig
@@ -484,7 +484,7 @@ config PREALLOC_CHILDSTATUS
 config DEBUG_CHILDSTATUS
 	bool "Enable Child Status Debug Output"
 	default n
-	depends on SCHED_CHILD_STATUS && DEBUG
+	depends on SCHED_CHILD_STATUS && DEBUG_FEATURES
 	---help---
 		Very detailed... I am sure that you do not want this.
 
@@ -1013,7 +1013,7 @@ config MODULE_BUFFERINCR
 config MODULE_DUMPBUFFER
 	bool "Dump module buffers"
 	default n
-	depends on DEBUG && CONFIG_DEBUG_INFO
+	depends on DEBUG_FEATURES && CONFIG_DEBUG_INFO
 	---help---
 		Dump various module buffers for debug purposes
 
diff --git a/sched/group/group_childstatus.c b/sched/group/group_childstatus.c
index 00e78b4322..065697b482 100644
--- a/sched/group/group_childstatus.c
+++ b/sched/group/group_childstatus.c
@@ -66,7 +66,7 @@
 #  define CONFIG_PREALLOC_CHILDSTATUS (2*CONFIG_MAX_TASKS)
 #endif
 
-#ifndef CONFIG_DEBUG
+#ifndef CONFIG_DEBUG_FEATURES
 #  undef CONFIG_DEBUG_CHILDSTATUS
 #endif
 
diff --git a/sched/module/mod_init.c b/sched/module/mod_init.c
index d9c55f1599..67a63e65dd 100644
--- a/sched/module/mod_init.c
+++ b/sched/module/mod_init.c
@@ -56,7 +56,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_MODULE_DUMPBUFFER have to
+/* CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO, and CONFIG_MODULE_DUMPBUFFER have to
  * be defined or CONFIG_MODULE_DUMPBUFFER does nothing.
  */
 
diff --git a/sched/module/mod_insmod.c b/sched/module/mod_insmod.c
index f7bf1b9a84..9b4add646a 100644
--- a/sched/module/mod_insmod.c
+++ b/sched/module/mod_insmod.c
@@ -58,7 +58,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
+/* CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
  * defined or CONFIG_MODULE_DUMPBUFFER does nothing.
  */
 
@@ -84,7 +84,7 @@
  * Name: mod_dumploadinfo
  ****************************************************************************/
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_BINFMT)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_BINFMT)
 static void mod_dumploadinfo(FAR struct mod_loadinfo_s *loadinfo)
 {
   int i;
diff --git a/sched/sched/sched_waitid.c b/sched/sched/sched_waitid.c
index c6fd8d4501..ca24507279 100644
--- a/sched/sched/sched_waitid.c
+++ b/sched/sched/sched_waitid.c
@@ -175,7 +175,7 @@ int waitid(idtype_t idtype, id_t id, FAR siginfo_t *info, int options)
    * distinguish any other events.
    */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (options != WEXITED)
     {
       set_errno(ENOSYS);
diff --git a/sched/sched/sched_waitpid.c b/sched/sched/sched_waitpid.c
index 4a669958c7..aa5f2dccc6 100644
--- a/sched/sched/sched_waitpid.c
+++ b/sched/sched/sched_waitpid.c
@@ -187,7 +187,7 @@ pid_t waitpid(pid_t pid, int *stat_loc, int options)
 
   /* None of the options are supported */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (options != 0)
     {
       set_errno(ENOSYS);
@@ -309,7 +309,7 @@ pid_t waitpid(pid_t pid, int *stat_loc, int options)
 
   /* None of the options are supported */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (options != 0)
     {
       set_errno(ENOSYS);
diff --git a/sched/semaphore/sem_holder.c b/sched/semaphore/sem_holder.c
index 854747cb01..873dff5be1 100644
--- a/sched/semaphore/sem_holder.c
+++ b/sched/semaphore/sem_holder.c
@@ -372,7 +372,7 @@ static int sem_boostholderprio(FAR struct semholder_s *pholder,
  * Name: sem_verifyholder
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
 static int sem_verifyholder(FAR struct semholder_s *pholder, FAR sem_t *sem,
                             FAR void *arg)
 {
@@ -397,7 +397,7 @@ static int sem_verifyholder(FAR struct semholder_s *pholder, FAR sem_t *sem,
  * Name: sem_dumpholder
  ****************************************************************************/
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_SEM_PHDEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_SEM_PHDEBUG)
 static int sem_dumpholder(FAR struct semholder_s *pholder, FAR sem_t *sem,
                           FAR void *arg)
 {
@@ -648,7 +648,7 @@ static inline void sem_restorebaseprio_irq(FAR struct tcb_s *stcb,
    * should be at their base priority.
    */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   else
     {
       (void)sem_foreachholder(sem, sem_verifyholder, NULL);
@@ -723,7 +723,7 @@ static inline void sem_restorebaseprio_task(FAR struct tcb_s *stcb,
    * should be at their base priority.
    */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   else
     {
       (void)sem_foreachholder(sem, sem_verifyholder, NULL);
@@ -1036,7 +1036,7 @@ void sem_canceled(FAR struct tcb_s *stcb, FAR sem_t *sem)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_SEM_PHDEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_SEM_PHDEBUG)
 void sem_enumholders(FAR sem_t *sem)
 {
   (void)sem_foreachholder(sem, sem_dumpholder, NULL);
@@ -1060,7 +1060,7 @@ void sem_enumholders(FAR sem_t *sem)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_DEBUG) && defined(CONFIG_SEM_PHDEBUG)
+#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_SEM_PHDEBUG)
 int sem_nfreeholders(void)
 {
 #if CONFIG_SEM_PREALLOCHOLDERS > 0
diff --git a/sched/semaphore/sem_timedwait.c b/sched/semaphore/sem_timedwait.c
index f006268c5c..81e7a79d50 100644
--- a/sched/semaphore/sem_timedwait.c
+++ b/sched/semaphore/sem_timedwait.c
@@ -107,7 +107,7 @@ int sem_timedwait(FAR sem_t *sem, FAR const struct timespec *abstime)
    * errno appropriately.
    */
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   if (!abstime || !sem)
     {
       errcode = EINVAL;
diff --git a/sched/signal/sig_nanosleep.c b/sched/signal/sig_nanosleep.c
index 9ffbcb52c7..382715c798 100644
--- a/sched/signal/sig_nanosleep.c
+++ b/sched/signal/sig_nanosleep.c
@@ -108,7 +108,7 @@ int nanosleep(FAR const struct timespec *rqtp, FAR struct timespec *rmtp)
   sigset_t set;
   struct siginfo value;
   int errval;
-#ifdef CONFIG_DEBUG /* Warning avoidance */
+#ifdef CONFIG_DEBUG_FEATURES /* Warning avoidance */
   int ret;
 #endif
 
@@ -135,7 +135,7 @@ int nanosleep(FAR const struct timespec *rqtp, FAR struct timespec *rmtp)
 
   /* nanosleep is a simple application of sigtimedwait. */
 
-#ifdef CONFIG_DEBUG /* Warning avoidance */
+#ifdef CONFIG_DEBUG_FEATURES /* Warning avoidance */
   ret = sigtimedwait(&set, &value, rqtp);
 #else
   (void)sigtimedwait(&set, &value, rqtp);
diff --git a/sched/task/task_vfork.c b/sched/task/task_vfork.c
index d1978135c5..476e8c06d7 100644
--- a/sched/task/task_vfork.c
+++ b/sched/task/task_vfork.c
@@ -430,7 +430,7 @@ pid_t task_vforkstart(FAR struct task_tcb_s *child)
 
   rc = 0;
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   ret = waitpid(pid, &rc, 0);
   if (ret < 0)
     {
diff --git a/sched/wdog/wd_start.c b/sched/wdog/wd_start.c
index 9e99d01277..898f80060f 100644
--- a/sched/wdog/wd_start.c
+++ b/sched/wdog/wd_start.c
@@ -260,7 +260,7 @@ int wd_start(WDOG_ID wdog, int32_t delay, wdentry_t wdentry,  int argc, ...)
     {
       wdog->parm[i] = va_arg(ap, wdparm_t);
     }
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_FEATURES
   for (; i < CONFIG_MAX_WDOGPARMS; i++)
     {
       wdog->parm[i] = 0;
diff --git a/tools/mkconfig.c b/tools/mkconfig.c
index 4be92476d8..6011744b94 100644
--- a/tools/mkconfig.c
+++ b/tools/mkconfig.c
@@ -270,7 +270,7 @@ int main(int argc, char **argv, char **envp)
   printf("#endif\n\n");
 
   printf("/* Verbose debug and sub-system debug only make sense if debug is enabled */\n\n");
-  printf("#ifndef CONFIG_DEBUG\n");
+  printf("#ifndef CONFIG_DEBUG_FEATURES\n");
   printf("#  undef CONFIG_DEBUG_INFO\n");
   printf("#  undef CONFIG_DEBUG_ANALOG\n");
   printf("#  undef CONFIG_DEBUG_AUDIO\n");
-- 
GitLab


From 86b79b33cf5cba2b0dd2400bd4857a9a7d8771d3 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sat, 11 Jun 2016 14:40:07 -0600
Subject: [PATCH 22/91] Reserver the name 'err' for other purposes

---
 arch/arm/src/lpc2378/lpc23xx_serial.c         | 16 ++++-----
 arch/arm/src/lpc31xx/lpc31_lowputc.c          | 18 +++++-----
 arch/arm/src/lpc31xx/lpc31_serial.c           | 18 +++++-----
 .../lpc43xx/spifi/src/spifilib_dev_common.c   | 30 ++++++++--------
 arch/rgmp/src/x86/com.c                       | 24 ++++++-------
 binfmt/binfmt_exec.c                          | 35 +++++++++----------
 binfmt/binfmt_execmodule.c                    | 30 ++++++++--------
 drivers/analog/adc.c                          |  7 ++--
 drivers/can.c                                 |  6 ++--
 drivers/net/e1000.c                           | 20 +++++------
 drivers/net/vnet.c                            |  6 ++--
 drivers/pipes/pipe.c                          | 14 ++++----
 fs/inode/fs_files.c                           |  8 ++---
 fs/mmap/fs_munmap.c                           |  8 ++---
 fs/mmap/fs_rammap.c                           | 14 ++++----
 fs/vfs/fs_close.c                             |  9 +++--
 fs/vfs/fs_fcntl.c                             | 16 ++++-----
 fs/vfs/fs_fdopen.c                            | 14 ++++----
 fs/vfs/fs_ioctl.c                             |  9 +++--
 fs/vfs/fs_lseek.c                             | 12 +++----
 fs/vfs/fs_poll.c                              | 14 ++++----
 fs/vfs/fs_write.c                             | 10 +++---
 include/pthread.h                             |  2 +-
 libc/stdio/lib_fclose.c                       |  8 ++---
 libc/unistd/lib_chdir.c                       | 10 +++---
 mm/mm_heap/mm_sbrk.c                          | 10 +++---
 net/pkt/pkt_send.c                            | 12 +++----
 net/socket/accept.c                           | 34 +++++++++---------
 net/socket/bind.c                             | 14 ++++----
 net/socket/connect.c                          | 22 ++++++------
 net/socket/getsockname.c                      | 12 +++----
 net/socket/getsockopt.c                       | 14 ++++----
 net/socket/listen.c                           | 28 +++++++--------
 net/socket/net_close.c                        | 12 +++----
 net/socket/net_dupsd.c                        | 14 ++++----
 net/socket/net_dupsd2.c                       | 10 +++---
 net/socket/net_sendfile.c                     | 16 ++++-----
 net/socket/net_vfcntl.c                       | 14 ++++----
 net/socket/recvfrom.c                         | 16 ++++-----
 net/socket/sendto.c                           | 18 +++++-----
 net/socket/setsockopt.c                       | 14 ++++----
 net/socket/socket.c                           | 26 +++++++-------
 net/tcp/tcp_send_buffered.c                   | 18 +++++-----
 net/tcp/tcp_send_unbuffered.c                 | 14 ++++----
 sched/sched/sched_waitid.c                    | 18 +++++-----
 sched/sched/sched_waitpid.c                   | 24 ++++++-------
 sched/task/task_prctl.c                       | 12 +++----
 sched/task/task_restart.c                     | 12 +++----
 tools/pic32mx/mkpichex.c                      | 12 +++----
 49 files changed, 374 insertions(+), 380 deletions(-)

diff --git a/arch/arm/src/lpc2378/lpc23xx_serial.c b/arch/arm/src/lpc2378/lpc23xx_serial.c
index 90e62bf0a7..d582fe5de3 100644
--- a/arch/arm/src/lpc2378/lpc23xx_serial.c
+++ b/arch/arm/src/lpc2378/lpc23xx_serial.c
@@ -320,14 +320,14 @@ static inline void up_configbaud(struct up_dev_s *priv)
   /* Test values calculated for every multiplier/divisor combination */
 
   uint32_t tdiv;
-  uint32_t terr;
+  uint32_t tmperr;
   int tmulval;
   int tdivaddval;
 
   /* Optimal multiplier/divider values */
 
   uint32_t div = 0;
-  uint32_t err = 100000;
+  uint32_t errval = 100000;
   int mulval = 1;
   int divaddval = 0;
 
@@ -350,13 +350,13 @@ static inline void up_configbaud(struct up_dev_s *priv)
 
   /* Try every valid multiplier, tmulval (or until a perfect match is found). */
 
-  for (tmulval = 1; tmulval <= 15 && err > 0; tmulval++)
+  for (tmulval = 1; tmulval <= 15 && errval > 0; tmulval++)
     {
       /* Try every valid pre-scale div, tdivaddval (or until a perfect match is
        * found).
        */
 
-      for (tdivaddval = 0; tdivaddval <= 15 && err > 0; tdivaddval++)
+      for (tdivaddval = 0; tdivaddval <= 15 && errval > 0; tdivaddval++)
         {
           /* Calculate the divisor with these fractional divider settings */
 
@@ -373,16 +373,16 @@ static inline void up_configbaud(struct up_dev_s *priv)
 
               if (actualbaud <= priv->baud)
                 {
-                  terr = priv->baud - actualbaud;
+                  tmperr = priv->baud - actualbaud;
                 }
               else
                 {
-                  terr = actualbaud - priv->baud;
+                  tmperr = actualbaud - priv->baud;
                 }
 
               /* Is this the smallest error we have encountered? */
 
-              if (terr < err)
+              if (tmperr < errval)
                 {
                   /* Yes, save these settings as the new, candidate optimal
                    * settings
@@ -391,7 +391,7 @@ static inline void up_configbaud(struct up_dev_s *priv)
                   mulval = tmulval;
                   divaddval = tdivaddval;
                   div = tdiv;
-                  err = terr;
+                  errval = tmperr;
                 }
             }
         }
diff --git a/arch/arm/src/lpc31xx/lpc31_lowputc.c b/arch/arm/src/lpc31xx/lpc31_lowputc.c
index 3e3213927f..7d1335fd5a 100644
--- a/arch/arm/src/lpc31xx/lpc31_lowputc.c
+++ b/arch/arm/src/lpc31xx/lpc31_lowputc.c
@@ -144,14 +144,14 @@ static inline void up_configbaud(void)
   /* Test values calculated for every multiplier/divisor combination */
 
   uint32_t tdiv;
-  uint32_t terr;
+  uint32_t tmperr;
   int      tmulval;
   int      tdivaddval;
 
   /* Optimal multiplier/divider values */
 
   uint32_t div       = 0;
-  uint32_t err       = 100000;
+  uint32_t errval    = 100000;
   int      mulval    = 1;
   int      divaddval = 0;
 
@@ -176,13 +176,13 @@ static inline void up_configbaud(void)
    * match is found).
    */
 
-  for (tmulval = 1 ; tmulval <= 15 && err > 0; tmulval++)
+  for (tmulval = 1 ; tmulval <= 15 && errval > 0; tmulval++)
     {
       /* Try every valid pre-scale div, tdivaddval (or until a perfect
        * match is found).
        */
 
-      for (tdivaddval = 0 ; tdivaddval <= 15 && err > 0; tdivaddval++)
+      for (tdivaddval = 0 ; tdivaddval <= 15 && errval > 0; tdivaddval++)
         {
           /* Calculate the divisor with these fractional divider settings */
 
@@ -199,23 +199,23 @@ static inline void up_configbaud(void)
 
               if (actualbaud <= CONFIG_UART_BAUD)
                 {
-                  terr = CONFIG_UART_BAUD - actualbaud;
+                  tmperr = CONFIG_UART_BAUD - actualbaud;
                 }
               else
                 {
-                  terr = actualbaud - CONFIG_UART_BAUD;
+                  tmperr = actualbaud - CONFIG_UART_BAUD;
                 }
 
               /* Is this the smallest error we have encountered? */
 
-              if (terr < err)
+              if (tmperr < errval)
                 {
                   /* Yes, save these settings as the new, candidate optimal settings */
 
-                  mulval     = tmulval ;
+                  mulval    = tmulval ;
                   divaddval = tdivaddval;
                   div       = tdiv;
-                  err       = terr;
+                  errval    = tmperr;
                 }
             }
         }
diff --git a/arch/arm/src/lpc31xx/lpc31_serial.c b/arch/arm/src/lpc31xx/lpc31_serial.c
index 74a0db9ddd..e64e91352e 100644
--- a/arch/arm/src/lpc31xx/lpc31_serial.c
+++ b/arch/arm/src/lpc31xx/lpc31_serial.c
@@ -215,14 +215,14 @@ static inline void up_configbaud(void)
   /* Test values calculated for every multiplier/divisor combination */
 
   uint32_t tdiv;
-  uint32_t terr;
+  uint32_t tmperr;
   int      tmulval;
   int      tdivaddval;
 
   /* Optimal multiplier/divider values */
 
   uint32_t div       = 0;
-  uint32_t err       = 100000;
+  uint32_t errval    = 100000;
   int      mulval    = 1;
   int      divaddval = 0;
 
@@ -247,13 +247,13 @@ static inline void up_configbaud(void)
    * match is found).
    */
 
-  for (tmulval = 1 ; tmulval <= 15 && err > 0; tmulval++)
+  for (tmulval = 1 ; tmulval <= 15 && errval > 0; tmulval++)
     {
       /* Try every valid pre-scale div, tdivaddval (or until a perfect
        * match is found).
        */
 
-      for (tdivaddval = 0 ; tdivaddval <= 15 && err > 0; tdivaddval++)
+      for (tdivaddval = 0 ; tdivaddval <= 15 && errval > 0; tdivaddval++)
         {
           /* Calculate the divisor with these fractional divider settings */
 
@@ -270,23 +270,23 @@ static inline void up_configbaud(void)
 
               if (actualbaud <= CONFIG_UART_BAUD)
                 {
-                  terr = CONFIG_UART_BAUD - actualbaud;
+                  tmperr = CONFIG_UART_BAUD - actualbaud;
                 }
               else
                 {
-                  terr = actualbaud - CONFIG_UART_BAUD;
+                  tmperr = actualbaud - CONFIG_UART_BAUD;
                 }
 
               /* Is this the smallest error we have encountered? */
 
-              if (terr < err)
+              if (tmperr < errval)
                 {
                   /* Yes, save these settings as the new, candidate optimal settings */
 
-                  mulval     = tmulval ;
+                  mulval    = tmulval ;
                   divaddval = tdivaddval;
                   div       = tdiv;
-                  err       = terr;
+                  errval    = tmperr;
                 }
             }
         }
diff --git a/arch/arm/src/lpc43xx/spifi/src/spifilib_dev_common.c b/arch/arm/src/lpc43xx/spifi/src/spifilib_dev_common.c
index 8adc8f762b..c3e0a7b53b 100644
--- a/arch/arm/src/lpc43xx/spifi/src/spifilib_dev_common.c
+++ b/arch/arm/src/lpc43xx/spifi/src/spifilib_dev_common.c
@@ -785,50 +785,50 @@ uint32_t spifiGetSubBlockFromBlock(const SPIFI_HANDLE_T *pHandle, uint32_t block
 SPIFI_ERR_T spifiProgram(const SPIFI_HANDLE_T *pHandle, uint32_t addr, const uint32_t *writeBuff, uint32_t bytes)
 {
 	uint32_t sendBytes;
-	SPIFI_ERR_T err = SPIFI_ERR_NONE;
+	SPIFI_ERR_T errcode = SPIFI_ERR_NONE;
 
 	/* Program using up to page size */
-	while ((bytes > 0) && (err == SPIFI_ERR_NONE)) {
+	while ((bytes > 0) && (errcode == SPIFI_ERR_NONE)) {
 		sendBytes = bytes;
 		if (sendBytes > pHandle->pInfoData->pageSize) {
 			sendBytes = pHandle->pInfoData->pageSize;
 		}
 
-		err = pHandle->pFamFx->pageProgram(pHandle, addr, writeBuff, sendBytes);
+		errcode = pHandle->pFamFx->pageProgram(pHandle, addr, writeBuff, sendBytes);
 		addr += sendBytes;
 		writeBuff += (sendBytes >> 2);
 		bytes -= sendBytes;
 	}
 
-	return err;
+	return errcode;
 }
 
 /* Read the device into the passed buffer */
 SPIFI_ERR_T spifiRead(const SPIFI_HANDLE_T *pHandle, uint32_t addr, uint32_t *readBuff, uint32_t bytes)
 {
 	uint32_t readBytes;
-	SPIFI_ERR_T err = SPIFI_ERR_NONE;
+	SPIFI_ERR_T errcode = SPIFI_ERR_NONE;
 
 	/* Read using up to the maximum read size */
-	while ((bytes > 0) && (err == SPIFI_ERR_NONE)) {
+	while ((bytes > 0) && (errcode == SPIFI_ERR_NONE)) {
 		readBytes = bytes;
 		if (readBytes > pHandle->pInfoData->maxReadSize) {
 			readBytes = pHandle->pInfoData->maxReadSize;
 		}
 
-		err = pHandle->pFamFx->read(pHandle, addr, readBuff, readBytes);
+		errcode = pHandle->pFamFx->read(pHandle, addr, readBuff, readBytes);
 		addr += readBytes;
 		readBuff += (readBytes / sizeof(uint32_t));
 		bytes -= readBytes;
 	}
 
-	return err;
+	return errcode;
 }
 
 /* Erase multiple blocks */
 SPIFI_ERR_T spifiErase(const SPIFI_HANDLE_T *pHandle, uint32_t firstBlock, uint32_t numBlocks)
 {
-	SPIFI_ERR_T err = SPIFI_ERR_NONE;
+	SPIFI_ERR_T errcode = SPIFI_ERR_NONE;
 
 	if ((firstBlock + numBlocks) > pHandle->pInfoData->numBlocks) {
 		return SPIFI_ERR_RANGE;
@@ -836,20 +836,20 @@ SPIFI_ERR_T spifiErase(const SPIFI_HANDLE_T *pHandle, uint32_t firstBlock, uint3
 
 	/* Only perform erase if numBlocks is != 0 */
 	for (; (numBlocks); ++firstBlock, --numBlocks) {
-		err = pHandle->pFamFx->eraseBlock(pHandle, firstBlock);
-		if (err != SPIFI_ERR_NONE) {
+		errcode = pHandle->pFamFx->eraseBlock(pHandle, firstBlock);
+		if (errcode != SPIFI_ERR_NONE) {
 			break;
 		}
 	}
 
-	return err;
+	return errcode;
 }
 
 /* Erase multiple blocks by address range */
 SPIFI_ERR_T spifiEraseByAddr(const SPIFI_HANDLE_T *pHandle, uint32_t firstAddr, uint32_t lastAddr)
 {
 	uint32_t firstBlock, lastBlock;
-	SPIFI_ERR_T err = SPIFI_ERR_RANGE;
+	SPIFI_ERR_T errcode = SPIFI_ERR_RANGE;
 
 	/* Get block numbers for addresses */
 	firstBlock = spifiGetBlockFromAddr(pHandle, firstAddr);
@@ -857,8 +857,8 @@ SPIFI_ERR_T spifiEraseByAddr(const SPIFI_HANDLE_T *pHandle, uint32_t firstAddr,
 
 	/* Limit to legal address range */
 	if ((firstBlock != ~0UL) && (lastBlock != ~0UL)) {
-		err = spifiErase(pHandle, firstBlock, ((lastBlock - firstBlock) + 1));
+		errcode = spifiErase(pHandle, firstBlock, ((lastBlock - firstBlock) + 1));
 	}
 
-	return err;
+	return errcode;
 }
diff --git a/arch/rgmp/src/x86/com.c b/arch/rgmp/src/x86/com.c
index 8a149bcadc..c31e301a7b 100644
--- a/arch/rgmp/src/x86/com.c
+++ b/arch/rgmp/src/x86/com.c
@@ -315,11 +315,11 @@ static void up_shutdown(struct uart_dev_s *dev)
 static int up_attach(struct uart_dev_s *dev)
 {
     struct up_dev_s *priv = dev->priv;
-    int err;
+    int errcode;
 
-    err = rgmp_request_irq(priv->irq, &priv->action, 0);
+    errcode = rgmp_request_irq(priv->irq, &priv->action, 0);
 
-    return err;
+    return errcode;
 }
 
 /****************************************************************************
@@ -578,15 +578,15 @@ void up_earlyserialinit(void)
 void up_serialinit(void)
 {
     uart_dev_t *dev;
-    int err;
+    int errcode;
 
 #ifdef CONFIG_COM1
     dev = up_alloc_com(COM1, 4);
     if (dev == NULL)
         dbg("alloc com1 fail\n");
     else {
-        err = uart_register("/dev/ttyS0", dev);
-        if (err)
+        errcode = uart_register("/dev/ttyS0", dev);
+        if (errcode)
             dbg("register com1 fail\n");
     }
 #endif
@@ -595,8 +595,8 @@ void up_serialinit(void)
     if (dev == NULL)
         dbg("alloc com2 fail\n");
     else {
-        err = uart_register("/dev/ttyS1", dev);
-        if (err)
+        errcode = uart_register("/dev/ttyS1", dev);
+        if (errcode)
             dbg("register com2 fail\n");
     }
 #endif
@@ -605,8 +605,8 @@ void up_serialinit(void)
     if (dev == NULL)
         dbg("alloc com3 fail\n");
     else {
-        err = uart_register("/dev/ttyS2", dev);
-        if (err)
+        errcode = uart_register("/dev/ttyS2", dev);
+        if (errcode)
             dbg("register com3 fail\n");
     }
 #endif
@@ -615,8 +615,8 @@ void up_serialinit(void)
     if (dev == NULL)
         dbg("alloc com4 fail\n");
     else {
-        err = uart_register("/dev/ttyS3", dev);
-        if (err)
+        errcode = uart_register("/dev/ttyS3", dev);
+        if (errcode)
             dbg("register com4 fail\n");
     }
 #endif
diff --git a/binfmt/binfmt_exec.c b/binfmt/binfmt_exec.c
index f3f62027eb..6352b0f981 100644
--- a/binfmt/binfmt_exec.c
+++ b/binfmt/binfmt_exec.c
@@ -86,7 +86,7 @@ int exec(FAR const char *filename, FAR char * const *argv,
 #if defined(CONFIG_SCHED_ONEXIT) && defined(CONFIG_SCHED_HAVE_PARENT)
   FAR struct binary_s *bin;
   int pid;
-  int err;
+  int errcode;
   int ret;
 
   /* Allocate the load information */
@@ -95,7 +95,7 @@ int exec(FAR const char *filename, FAR char * const *argv,
   if (!bin)
     {
       bdbg("ERROR: Failed to allocate binary_s\n");
-      err = ENOMEM;
+      errcode = ENOMEM;
       goto errout;
     }
 
@@ -110,8 +110,8 @@ int exec(FAR const char *filename, FAR char * const *argv,
   ret = binfmt_copyargv(bin, argv);
   if (ret < 0)
     {
-      err = -ret;
-      bdbg("ERROR: Failed to copy argv[]: %d\n", err);
+      errcode = -ret;
+      bdbg("ERROR: Failed to copy argv[]: %d\n", errcode);
       goto errout_with_bin;
     }
 
@@ -120,8 +120,8 @@ int exec(FAR const char *filename, FAR char * const *argv,
   ret = load_module(bin);
   if (ret < 0)
     {
-      err = get_errno();
-      bdbg("ERROR: Failed to load program '%s': %d\n", filename, err);
+      errcode = get_errno();
+      bdbg("ERROR: Failed to load program '%s': %d\n", filename, errcode);
       goto errout_with_argv;
     }
 
@@ -137,8 +137,8 @@ int exec(FAR const char *filename, FAR char * const *argv,
   pid = exec_module(bin);
   if (pid < 0)
     {
-      err = get_errno();
-      bdbg("ERROR: Failed to execute program '%s': %d\n", filename, err);
+      errcode = get_errno();
+      bdbg("ERROR: Failed to execute program '%s': %d\n", filename, errcode);
       goto errout_with_lock;
     }
 
@@ -149,8 +149,8 @@ int exec(FAR const char *filename, FAR char * const *argv,
   ret = schedule_unload(pid, bin);
   if (ret < 0)
     {
-      err = get_errno();
-      bdbg("ERROR: Failed to schedule unload '%s': %d\n", filename, err);
+      errcode = get_errno();
+      bdbg("ERROR: Failed to schedule unload '%s': %d\n", filename, errcode);
     }
 
   sched_unlock();
@@ -164,12 +164,12 @@ errout_with_argv:
 errout_with_bin:
   kmm_free(bin);
 errout:
-  set_errno(err);
+  set_errno(errcode);
   return ERROR;
 
 #else
   struct binary_s bin;
-  int err;
+  int errcode;
   int ret;
 
   /* Load the module into memory */
@@ -182,8 +182,8 @@ errout:
   ret = load_module(&bin);
   if (ret < 0)
     {
-      err = get_errno();
-      bdbg("ERROR: Failed to load program '%s': %d\n", filename, err);
+      errcode = get_errno();
+      bdbg("ERROR: Failed to load program '%s': %d\n", filename, errcode);
       goto errout;
     }
 
@@ -192,8 +192,8 @@ errout:
   ret = exec_module(&bin);
   if (ret < 0)
     {
-      err = get_errno();
-      bdbg("ERROR: Failed to execute program '%s': %d\n", filename, err);
+      errcode = get_errno();
+      bdbg("ERROR: Failed to execute program '%s': %d\n", filename, errcode);
       goto errout_with_module;
     }
 
@@ -204,10 +204,9 @@ errout:
 errout_with_module:
   unload_module(&bin);
 errout:
-  set_errno(err);
+  set_errno(errcode);
   return ERROR;
 #endif
 }
 
 #endif /* !CONFIG_BINFMT_DISABLE */
-
diff --git a/binfmt/binfmt_execmodule.c b/binfmt/binfmt_execmodule.c
index 3afe49042e..32b35c15aa 100644
--- a/binfmt/binfmt_execmodule.c
+++ b/binfmt/binfmt_execmodule.c
@@ -142,7 +142,7 @@ int exec_module(FAR const struct binary_s *binp)
 #endif
   FAR uint32_t *stack;
   pid_t pid;
-  int err;
+  int errcode;
   int ret;
 
   /* Sanity checking */
@@ -150,7 +150,7 @@ int exec_module(FAR const struct binary_s *binp)
 #ifdef CONFIG_DEBUG_FEATURES
   if (!binp || !binp->entrypt || binp->stacksize <= 0)
     {
-      err = EINVAL;
+      errcode = EINVAL;
       goto errout;
     }
 #endif
@@ -162,7 +162,7 @@ int exec_module(FAR const struct binary_s *binp)
   tcb = (FAR struct task_tcb_s *)kmm_zalloc(sizeof(struct task_tcb_s));
   if (!tcb)
     {
-      err = ENOMEM;
+      errcode = ENOMEM;
       goto errout;
     }
 
@@ -173,7 +173,7 @@ int exec_module(FAR const struct binary_s *binp)
   if (ret < 0)
     {
       bdbg("ERROR: up_addrenv_select() failed: %d\n", ret);
-      err = -ret;
+      errcode = -ret;
       goto errout_with_tcb;
     }
 
@@ -192,7 +192,7 @@ int exec_module(FAR const struct binary_s *binp)
   stack = (FAR uint32_t *)kumm_malloc(binp->stacksize);
   if (!stack)
     {
-      err = ENOMEM;
+      errcode = ENOMEM;
       goto errout_with_addrenv;
     }
 
@@ -202,8 +202,8 @@ int exec_module(FAR const struct binary_s *binp)
                   stack, binp->stacksize, binp->entrypt, binp->argv);
   if (ret < 0)
     {
-      err = get_errno();
-      bdbg("task_init() failed: %d\n", err);
+      errcode = get_errno();
+      bdbg("task_init() failed: %d\n", errcode);
       goto errout_with_addrenv;
     }
 
@@ -225,7 +225,7 @@ int exec_module(FAR const struct binary_s *binp)
   if (ret < 0)
     {
       bdbg("ERROR: up_addrenv_select() failed: %d\n", ret);
-      err = -ret;
+      errcode = -ret;
       goto errout_with_tcbinit;
     }
 #endif
@@ -237,7 +237,7 @@ int exec_module(FAR const struct binary_s *binp)
   if (ret < 0)
     {
       bdbg("ERROR: shm_group_initialize() failed: %d\n", ret);
-      err = -ret;
+      errcode = -ret;
       goto errout_with_tcbinit;
     }
 #endif
@@ -260,7 +260,7 @@ int exec_module(FAR const struct binary_s *binp)
   ret = up_addrenv_clone(&binp->addrenv, &tcb->cmn.group->tg_addrenv);
   if (ret < 0)
     {
-      err = -ret;
+      errcode = -ret;
       bdbg("ERROR: up_addrenv_clone() failed: %d\n", ret);
       goto errout_with_tcbinit;
     }
@@ -288,8 +288,8 @@ int exec_module(FAR const struct binary_s *binp)
   ret = task_activate((FAR struct tcb_s *)tcb);
   if (ret < 0)
     {
-      err = get_errno();
-      bdbg("task_activate() failed: %d\n", err);
+      errcode = get_errno();
+      bdbg("task_activate() failed: %d\n", errcode);
       goto errout_with_tcbinit;
     }
 
@@ -300,7 +300,7 @@ int exec_module(FAR const struct binary_s *binp)
   if (ret < 0)
     {
       bdbg("ERROR: up_addrenv_select() failed: %d\n", ret);
-      err = -ret;
+      errcode = -ret;
       goto errout_with_tcbinit;
     }
 #endif
@@ -322,8 +322,8 @@ errout_with_tcb:
   kmm_free(tcb);
 
 errout:
-  set_errno(err);
-  bdbg("returning errno: %d\n", err);
+  set_errno(errcode);
+  bdbg("returning errno: %d\n", errcode);
   return ERROR;
 }
 
diff --git a/drivers/analog/adc.c b/drivers/analog/adc.c
index 92dd84d2b2..d11c962384 100644
--- a/drivers/analog/adc.c
+++ b/drivers/analog/adc.c
@@ -377,7 +377,7 @@ static int adc_receive(FAR struct adc_dev_s *dev, uint8_t ch, int32_t data)
 {
   FAR struct adc_fifo_s *fifo = &dev->ad_recv;
   int                    nexttail;
-  int                    err = -ENOMEM;
+  int                    errcode = -ENOMEM;
 
   /* Check if adding this new message would over-run the drivers ability to enqueue
    * read data.
@@ -407,9 +407,10 @@ static int adc_receive(FAR struct adc_dev_s *dev, uint8_t ch, int32_t data)
           sem_post(&fifo->af_sem);
         }
 
-      err = OK;
+      errcode = OK;
     }
-    return err;
+
+  return errcode;
 }
 
 /****************************************************************************
diff --git a/drivers/can.c b/drivers/can.c
index 3e5e0750be..bd5cd96220 100644
--- a/drivers/can.c
+++ b/drivers/can.c
@@ -1015,7 +1015,7 @@ int can_receive(FAR struct can_dev_s *dev, FAR struct can_hdr_s *hdr,
   FAR struct can_rxfifo_s *fifo = &dev->cd_recv;
   FAR uint8_t             *dest;
   int                      nexttail;
-  int                      err = -ENOMEM;
+  int                      errcode = -ENOMEM;
   int                      i;
 
   canllinfo("ID: %d DLC: %d\n", hdr->ch_id, hdr->ch_dlc);
@@ -1113,7 +1113,7 @@ int can_receive(FAR struct can_dev_s *dev, FAR struct can_hdr_s *hdr,
           sem_post(&fifo->rx_sem);
         }
 
-      err = OK;
+      errcode = OK;
     }
 #ifdef CONFIG_CAN_ERRORS
   else
@@ -1124,7 +1124,7 @@ int can_receive(FAR struct can_dev_s *dev, FAR struct can_hdr_s *hdr,
     }
 #endif
 
-  return err;
+  return errcode;
 }
 
 /****************************************************************************
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index 6f605554eb..c176abc732 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -1089,7 +1089,7 @@ static int e1000_probe(uint16_t addr, pci_id_t id)
 {
   uint32_t mmio_base, mmio_size;
   uint32_t size;
-  int err;
+  int errcode;
   void *kmem;
   void *omem;
   struct e1000_dev *dev;
@@ -1107,7 +1107,7 @@ static int e1000_probe(uint16_t addr, pci_id_t id)
 
   /* enable device */
 
-  if ((err = pci_enable_device(addr, PCI_BUS_MASTER)) < 0)
+  if ((errcode = pci_enable_device(addr, PCI_BUS_MASTER)) < 0)
     {
       goto error;
     }
@@ -1120,8 +1120,8 @@ static int e1000_probe(uint16_t addr, pci_id_t id)
 
   mmio_base = pci_resource_start(addr, 0);
   mmio_size = pci_resource_len(addr, 0);
-  err = rgmp_memmap_nocache(mmio_base, mmio_size, mmio_base);
-  if (err)
+  errcode = rgmp_memmap_nocache(mmio_base, mmio_size, mmio_base);
+  if (errcode)
     {
       goto error;
     }
@@ -1139,7 +1139,7 @@ static int e1000_probe(uint16_t addr, pci_id_t id)
 
   dev->int_desc.handler = e1000_interrupt_handler;
   dev->int_desc.dev_id = dev;
-  if ((err = pci_request_irq(addr, &dev->int_desc, 0)) < 0)
+  if ((errcode = pci_request_irq(addr, &dev->int_desc, 0)) < 0)
     {
       goto err0;
     }
@@ -1164,7 +1164,7 @@ static int e1000_probe(uint16_t addr, pci_id_t id)
   omem = kmem = memalign(PGSIZE, size);
   if (kmem == NULL)
     {
-      err = -ENOMEM;
+      errcode = -ENOMEM;
       goto err1;
     }
 
@@ -1211,8 +1211,8 @@ static int e1000_probe(uint16_t addr, pci_id_t id)
 
   /* Register the device with the OS so that socket IOCTLs can be performed */
 
-  err = netdev_register(&dev->netdev, NET_LL_ETHERNET);
-  if (err)
+  errcode = netdev_register(&dev->netdev, NET_LL_ETHERNET);
+  if (errcode)
     {
       goto err2;
     }
@@ -1234,8 +1234,8 @@ err0:
   rgmp_memunmap(mmio_base, mmio_size);
 error:
   kmm_free(dev);
-  cprintf("e1000 device probe fail: %d\n", err);
-  return err;
+  cprintf("e1000 device probe fail: %d\n", errcode);
+  return errcode;
 }
 
 /****************************************************************************
diff --git a/drivers/net/vnet.c b/drivers/net/vnet.c
index ef70eb100f..c96845c1b9 100644
--- a/drivers/net/vnet.c
+++ b/drivers/net/vnet.c
@@ -169,7 +169,7 @@ static int vnet_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac);
 
 static int vnet_transmit(FAR struct vnet_driver_s *vnet)
 {
-  int err;
+  int errcode;
 
   /* Verify that the hardware is ready to send another packet.  If we get
    * here, then we are committed to sending a packet; Higher level logic
@@ -178,8 +178,8 @@ static int vnet_transmit(FAR struct vnet_driver_s *vnet)
 
   /* Send the packet: address=vnet->sk_dev.d_buf, length=vnet->sk_dev.d_len */
 
-  err = vnet_xmit(vnet->vnet, (char *)vnet->sk_dev.d_buf, vnet->sk_dev.d_len);
-  if (err)
+  errcode = vnet_xmit(vnet->vnet, (char *)vnet->sk_dev.d_buf, vnet->sk_dev.d_len);
+  if (errcode)
     {
       /* When vnet_xmit fail, it means TX buffer is full. Watchdog
        * is of no use here because no TX done INT will happen. So
diff --git a/drivers/pipes/pipe.c b/drivers/pipes/pipe.c
index b4c6acd72c..715639d21c 100644
--- a/drivers/pipes/pipe.c
+++ b/drivers/pipes/pipe.c
@@ -189,7 +189,7 @@ int pipe(int fd[2])
   FAR struct pipe_dev_s *dev = NULL;
   char devname[16];
   int pipeno;
-  int err;
+  int errcode;
   int ret;
 
   /* Get exclusive access to the pipe allocation data */
@@ -208,7 +208,7 @@ int pipe(int fd[2])
   if (pipeno < 0)
     {
       (void)sem_post(&g_pipesem);
-      err = -pipeno;
+      errcode = -pipeno;
       goto errout;
     }
 
@@ -226,7 +226,7 @@ int pipe(int fd[2])
       if (!dev)
         {
           (void)sem_post(&g_pipesem);
-          err = ENOMEM;
+          errcode = ENOMEM;
           goto errout_with_pipe;
         }
 
@@ -238,7 +238,7 @@ int pipe(int fd[2])
       if (ret != 0)
         {
           (void)sem_post(&g_pipesem);
-          err = -ret;
+          errcode = -ret;
           goto errout_with_dev;
         }
 
@@ -254,7 +254,7 @@ int pipe(int fd[2])
   fd[1] = open(devname, O_WRONLY);
   if (fd[1] < 0)
     {
-      err = -fd[1];
+      errcode = -fd[1];
       goto errout_with_driver;
     }
 
@@ -263,7 +263,7 @@ int pipe(int fd[2])
   fd[0] = open(devname, O_RDONLY);
   if (fd[0] < 0)
     {
-      err = -fd[0];
+      errcode = -fd[0];
       goto errout_with_wrfd;
     }
 
@@ -285,7 +285,7 @@ errout_with_pipe:
   pipe_free(pipeno);
 
 errout:
-  set_errno(err);
+  set_errno(errcode);
   return ERROR;
 }
 
diff --git a/fs/inode/fs_files.c b/fs/inode/fs_files.c
index 7c4665640e..1667130c93 100644
--- a/fs/inode/fs_files.c
+++ b/fs/inode/fs_files.c
@@ -196,12 +196,12 @@ int file_dup2(FAR struct file *filep1, FAR struct file *filep2)
 {
   FAR struct filelist *list;
   FAR struct inode *inode;
-  int err;
+  int errcode;
   int ret;
 
   if (!filep1 || !filep1->f_inode || !filep2)
     {
-      err = EBADF;
+      errcode = EBADF;
       goto errout;
     }
 
@@ -287,7 +287,7 @@ errout_with_inode:
   filep2->f_inode  = NULL;
 
 errout_with_ret:
-  err              = -ret;
+  errcode              = -ret;
 
   if (list != NULL)
     {
@@ -295,7 +295,7 @@ errout_with_ret:
     }
 
 errout:
-  set_errno(err);
+  set_errno(errcode);
   return ERROR;
 }
 
diff --git a/fs/mmap/fs_munmap.c b/fs/mmap/fs_munmap.c
index 12b084d85b..f15f34847a 100644
--- a/fs/mmap/fs_munmap.c
+++ b/fs/mmap/fs_munmap.c
@@ -115,7 +115,7 @@ int munmap(FAR void *start, size_t length)
   FAR void *newaddr;
   unsigned int offset;
   int ret;
-  int err;
+  int errcode;
 
   /* Find a region containing this start and length in the list of regions */
 
@@ -144,7 +144,7 @@ int munmap(FAR void *start, size_t length)
   if (!curr)
     {
       fdbg("Region not found\n");
-      err = EINVAL;
+      errcode = EINVAL;
       goto errout_with_semaphore;
     }
 
@@ -159,7 +159,7 @@ int munmap(FAR void *start, size_t length)
   if (offset + length < curr->length)
     {
       fdbg("Cannot umap without unmapping to the end\n");
-      err = ENOSYS;
+      errcode = ENOSYS;
       goto errout_with_semaphore;
     }
 
@@ -205,7 +205,7 @@ int munmap(FAR void *start, size_t length)
 
 errout_with_semaphore:
   sem_post(&g_rammaps.exclsem);
-  set_errno(err);
+  set_errno(errcode);
   return ERROR;
 }
 
diff --git a/fs/mmap/fs_rammap.c b/fs/mmap/fs_rammap.c
index 5f00032553..39ff5a24b1 100644
--- a/fs/mmap/fs_rammap.c
+++ b/fs/mmap/fs_rammap.c
@@ -121,7 +121,7 @@ FAR void *rammap(int fd, size_t length, off_t offset)
   FAR uint8_t *rdbuffer;
   ssize_t nread;
   off_t fpos;
-  int err;
+  int errcode;
   int ret;
 
   /* There is a major design flaw that I have not yet thought of fix for:
@@ -143,7 +143,7 @@ FAR void *rammap(int fd, size_t length, off_t offset)
   if (!alloc)
     {
       fdbg("Region allocation failed, length: %d\n", (int)length);
-      err = ENOMEM;
+      errcode = ENOMEM;
       goto errout;
     }
 
@@ -165,7 +165,7 @@ FAR void *rammap(int fd, size_t length, off_t offset)
        */
 
       fdbg("Seek to position %d failed\n", (int)offset);
-      err = EINVAL;
+      errcode = EINVAL;
       goto errout_with_region;
     }
 
@@ -181,8 +181,8 @@ FAR void *rammap(int fd, size_t length, off_t offset)
            * signal.
            */
 
-          err = get_errno();
-          if (err != EINTR)
+          errcode = get_errno();
+          if (errcode != EINTR)
             {
               /* All other read errors are bad.  errno is already set.
                * (but maybe should be forced to EINVAL?).  NOTE that if
@@ -190,7 +190,7 @@ FAR void *rammap(int fd, size_t length, off_t offset)
                * destroy the errno value.
                */
 
-              fdbg("Read failed: offset=%d errno=%d\n", (int)offset, err);
+              fdbg("Read failed: offset=%d errno=%d\n", (int)offset, errcode);
 #ifdef CONFIG_DEBUG_FS
               goto errout_with_region;
 #else
@@ -234,7 +234,7 @@ FAR void *rammap(int fd, size_t length, off_t offset)
 errout_with_region:
   kumm_free(alloc);
 errout:
-  set_errno(err);
+  set_errno(errcode);
   return MAP_FAILED;
 
 errout_with_errno:
diff --git a/fs/vfs/fs_close.c b/fs/vfs/fs_close.c
index 3a52d0c086..a2b02b1d87 100644
--- a/fs/vfs/fs_close.c
+++ b/fs/vfs/fs_close.c
@@ -79,7 +79,7 @@
 
 int close(int fd)
 {
-  int err;
+  int errcode;
 #if CONFIG_NFILE_DESCRIPTORS > 0
   int ret;
 
@@ -98,7 +98,7 @@ int close(int fd)
       else
 #endif
         {
-          err = EBADF;
+          errcode = EBADF;
           goto errout;
         }
     }
@@ -119,7 +119,7 @@ int close(int fd)
     {
       /* An error occurred while closing the driver */
 
-      err = -ret;
+      errcode = -ret;
       goto errout;
     }
 
@@ -128,7 +128,6 @@ int close(int fd)
 #endif
 
 errout:
-  set_errno(err);
+  set_errno(errcode);
   return ERROR;
 }
-
diff --git a/fs/vfs/fs_fcntl.c b/fs/vfs/fs_fcntl.c
index f4d67ae457..01ca8761fe 100644
--- a/fs/vfs/fs_fcntl.c
+++ b/fs/vfs/fs_fcntl.c
@@ -75,14 +75,14 @@
 #if CONFIG_NFILE_DESCRIPTORS > 0
 int file_vfcntl(FAR struct file *filep, int cmd, va_list ap)
 {
-  int err = 0;
+  int errcode = 0;
   int ret = OK;
 
   /* Was this file opened ? */
 
   if (!filep->f_inode)
     {
-      err = EBADF;
+      errcode = EBADF;
       goto errout;
     }
 
@@ -119,7 +119,7 @@ int file_vfcntl(FAR struct file *filep, int cmd, va_list ap)
          * successful execution of one  of  the  exec  functions.
          */
 
-        err = ENOSYS;
+        errcode = ENOSYS;
         break;
 
       case F_GETFL:
@@ -169,7 +169,7 @@ int file_vfcntl(FAR struct file *filep, int cmd, va_list ap)
          * fd does not refer to a socket, the results are unspecified.
          */
 
-        err = EBADF; /* Only valid on socket descriptors */
+        errcode = EBADF; /* Only valid on socket descriptors */
         break;
 
       case F_GETLK:
@@ -199,18 +199,18 @@ int file_vfcntl(FAR struct file *filep, int cmd, va_list ap)
          * not be done.
          */
 
-        err = ENOSYS; /* Not implemented */
+        errcode = ENOSYS; /* Not implemented */
         break;
 
       default:
-        err = EINVAL;
+        errcode = EINVAL;
         break;
     }
 
 errout:
-  if (err != 0)
+  if (errcode != 0)
     {
-      set_errno(err);
+      set_errno(errcode);
       return ERROR;
     }
 
diff --git a/fs/vfs/fs_fdopen.c b/fs/vfs/fs_fdopen.c
index 882337da11..85abbf7989 100644
--- a/fs/vfs/fs_fdopen.c
+++ b/fs/vfs/fs_fdopen.c
@@ -129,7 +129,7 @@ FAR struct file_struct *fs_fdopen(int fd, int oflags, FAR struct tcb_s *tcb)
 {
   FAR struct streamlist *slist;
   FAR FILE              *stream;
-  int                    err = OK;
+  int                    errcode = OK;
   int                    ret;
   int                    i;
 
@@ -137,7 +137,7 @@ FAR struct file_struct *fs_fdopen(int fd, int oflags, FAR struct tcb_s *tcb)
 
   if (fd < 0)
     {
-      err = EBADF;
+      errcode = EBADF;
       goto errout;
     }
 
@@ -173,7 +173,7 @@ FAR struct file_struct *fs_fdopen(int fd, int oflags, FAR struct tcb_s *tcb)
 #else
       /* No networking... it is just a bad descriptor */
 
-      err = EBADF;
+      errcode = EBADF;
       goto errout;
 #endif
     }
@@ -193,7 +193,7 @@ FAR struct file_struct *fs_fdopen(int fd, int oflags, FAR struct tcb_s *tcb)
     {
       /* No... return the reported error */
 
-      err = -ret;
+      errcode = -ret;
       goto errout;
     }
 
@@ -241,7 +241,7 @@ FAR struct file_struct *fs_fdopen(int fd, int oflags, FAR struct tcb_s *tcb)
 
           if (!stream->fs_bufstart)
             {
-              err = ENOMEM;
+              errcode = ENOMEM;
               goto errout_with_sem;
             }
 
@@ -266,7 +266,7 @@ FAR struct file_struct *fs_fdopen(int fd, int oflags, FAR struct tcb_s *tcb)
 
   /* No free stream available.. report ENFILE */
 
-  err = ENFILE;
+  errcode = ENFILE;
 
 #if CONFIG_STDIO_BUFFER_SIZE > 0
 errout_with_sem:
@@ -274,7 +274,7 @@ errout_with_sem:
   sem_post(&slist->sl_sem);
 
 errout:
-  set_errno(err);
+  set_errno(errcode);
 errout_with_errno:
   return NULL;
 }
diff --git a/fs/vfs/fs_ioctl.c b/fs/vfs/fs_ioctl.c
index 593eae963a..238da907a7 100644
--- a/fs/vfs/fs_ioctl.c
+++ b/fs/vfs/fs_ioctl.c
@@ -91,7 +91,7 @@ int fs_ioctl(int fd, int req, unsigned long arg)
 int ioctl(int fd, int req, unsigned long arg)
 #endif
 {
-  int err;
+  int errcode;
 #if CONFIG_NFILE_DESCRIPTORS > 0
   FAR struct file     *filep;
   FAR struct inode    *inode;
@@ -112,7 +112,7 @@ int ioctl(int fd, int req, unsigned long arg)
       else
 #endif
         {
-          err = EBADF;
+          errcode = EBADF;
           goto errout;
         }
     }
@@ -138,7 +138,7 @@ int ioctl(int fd, int req, unsigned long arg)
       ret = (int)inode->u.i_ops->ioctl(filep, req, arg);
       if (ret < 0)
         {
-          err = -ret;
+          errcode = -ret;
           goto errout;
         }
     }
@@ -147,7 +147,6 @@ int ioctl(int fd, int req, unsigned long arg)
 #endif
 
 errout:
-  set_errno(err);
+  set_errno(errcode);
   return ERROR;
 }
-
diff --git a/fs/vfs/fs_lseek.c b/fs/vfs/fs_lseek.c
index 7136d2ce11..be74239eca 100644
--- a/fs/vfs/fs_lseek.c
+++ b/fs/vfs/fs_lseek.c
@@ -75,7 +75,7 @@ off_t file_seek(FAR struct file *filep, off_t offset, int whence)
 {
   FAR struct inode *inode;
   int ret;
-  int err = OK;
+  int errcode = OK;
 
   DEBUGASSERT(filep);
   inode =  filep->f_inode;
@@ -87,7 +87,7 @@ off_t file_seek(FAR struct file *filep, off_t offset, int whence)
       ret = (int)inode->u.i_ops->seek(filep, offset, whence);
       if (ret < 0)
         {
-          err = -ret;
+          errcode = -ret;
           goto errout;
         }
     }
@@ -108,17 +108,17 @@ off_t file_seek(FAR struct file *filep, off_t offset, int whence)
               }
             else
               {
-                err = EINVAL;
+                errcode = EINVAL;
                 goto errout;
               }
             break;
 
           case SEEK_END:
-            err = ENOSYS;
+            errcode = ENOSYS;
             goto errout;
 
           default:
-            err = EINVAL;
+            errcode = EINVAL;
             goto errout;
         }
     }
@@ -126,7 +126,7 @@ off_t file_seek(FAR struct file *filep, off_t offset, int whence)
   return filep->f_pos;
 
 errout:
-  set_errno(err);
+  set_errno(errcode);
   return (off_t)ERROR;
 }
 
diff --git a/fs/vfs/fs_poll.c b/fs/vfs/fs_poll.c
index 2910b30551..b4163230fe 100644
--- a/fs/vfs/fs_poll.c
+++ b/fs/vfs/fs_poll.c
@@ -77,14 +77,14 @@ static int poll_semtake(FAR sem_t *sem)
 
   if (sem_wait(sem) < 0)
     {
-      int err = get_errno();
+      int errcode = get_errno();
 
       /* The only case that an error should occur here is if the wait were
        * awakened by a signal.
        */
 
-      DEBUGASSERT(err == EINTR);
-      return -err;
+      DEBUGASSERT(errcode == EINTR);
+      return -errcode;
     }
 
   return OK;
@@ -329,7 +329,7 @@ int poll(FAR struct pollfd *fds, nfds_t nfds, int timeout)
 {
   sem_t sem;
   int count = 0;
-  int err;
+  int errcode;
   int ret;
 
   sem_init(&sem, 0, 0);
@@ -378,10 +378,10 @@ int poll(FAR struct pollfd *fds, nfds_t nfds, int timeout)
        * Preserve ret, if negative, since it holds the result of the wait.
        */
 
-      err = poll_teardown(fds, nfds, &count, ret);
-      if (err < 0 && ret >= 0)
+      errcode = poll_teardown(fds, nfds, &count, ret);
+      if (errcode < 0 && ret >= 0)
         {
-          ret = err;
+          ret = errcode;
         }
     }
 
diff --git a/fs/vfs/fs_write.c b/fs/vfs/fs_write.c
index b7f71a2265..34b77e5a47 100644
--- a/fs/vfs/fs_write.c
+++ b/fs/vfs/fs_write.c
@@ -73,13 +73,13 @@ ssize_t file_write(FAR struct file *filep, FAR const void *buf, size_t nbytes)
 {
   FAR struct inode *inode;
   int ret;
-  int err;
+  int errcode;
 
   /* Was this file opened for write access? */
 
   if ((filep->f_oflags & O_WROK) == 0)
     {
-      err = EBADF;
+      errcode = EBADF;
       goto errout;
     }
 
@@ -88,7 +88,7 @@ ssize_t file_write(FAR struct file *filep, FAR const void *buf, size_t nbytes)
   inode = filep->f_inode;
   if (!inode || !inode->u.i_ops || !inode->u.i_ops->write)
     {
-      err = EBADF;
+      errcode = EBADF;
       goto errout;
     }
 
@@ -97,14 +97,14 @@ ssize_t file_write(FAR struct file *filep, FAR const void *buf, size_t nbytes)
   ret = inode->u.i_ops->write(filep, buf, nbytes);
   if (ret < 0)
     {
-      err = -ret;
+      errcode = -ret;
       goto errout;
     }
 
   return ret;
 
 errout:
-  set_errno(err);
+  set_errno(errcode);
   return ERROR;
 }
 
diff --git a/include/pthread.h b/include/pthread.h
index b2ebffda45..64228154f7 100644
--- a/include/pthread.h
+++ b/include/pthread.h
@@ -138,7 +138,7 @@
 /* Definitions to map some non-standard, BSD thread management interfaces to
  * the non-standard Linux-like prctl() interface.  Since these are simple
  * mappings to prctl, they will return 0 on success and -1 on failure with the
- * err number in errno.  This is an inconsistency with the pthread interfaces.
+ * error number in errno.  This is an inconsistency with the pthread interfaces.
  */
 
 #define pthread_setname_np(thread, name) \
diff --git a/libc/stdio/lib_fclose.c b/libc/stdio/lib_fclose.c
index 35301fc6bb..9700b2854f 100644
--- a/libc/stdio/lib_fclose.c
+++ b/libc/stdio/lib_fclose.c
@@ -69,7 +69,7 @@
 
 int fclose(FAR FILE *stream)
 {
-  int err = EINVAL;
+  int errcode = EINVAL;
   int ret = ERROR;
   int status;
 
@@ -89,7 +89,7 @@ int fclose(FAR FILE *stream)
           if ((stream->fs_oflags & O_WROK) != 0)
             {
               ret = lib_fflush(stream, true);
-              err = errno;
+              errcode = errno;
             }
 
           /* Close the underlying file descriptor and save the return status */
@@ -103,7 +103,7 @@ int fclose(FAR FILE *stream)
           if (ret == OK)
             {
               ret = status;
-              err = errno;
+              errcode = errno;
             }
         }
 
@@ -143,7 +143,7 @@ int fclose(FAR FILE *stream)
 
   if (ret != OK)
     {
-      set_errno(err);
+      set_errno(errcode);
       return EOF;
     }
 
diff --git a/libc/unistd/lib_chdir.c b/libc/unistd/lib_chdir.c
index 4780a6b72e..16786a0f31 100644
--- a/libc/unistd/lib_chdir.c
+++ b/libc/unistd/lib_chdir.c
@@ -119,14 +119,14 @@ int chdir(FAR const char *path)
   struct stat buf;
   char *oldpwd;
   char *alloc;
-  int err;
+  int errcode;
   int ret;
 
   /* Verify the input parameters */
 
   if (!path)
     {
-      err = ENOENT;
+      errcode = ENOENT;
       goto errout;
     }
 
@@ -135,7 +135,7 @@ int chdir(FAR const char *path)
   ret = stat(path, &buf);
   if (ret != 0)
     {
-      err = ENOENT;
+      errcode = ENOENT;
       goto errout;
     }
 
@@ -143,7 +143,7 @@ int chdir(FAR const char *path)
 
   if (!S_ISDIR(buf.st_mode))
     {
-      err = ENOTDIR;
+      errcode = ENOTDIR;
       goto errout;
     }
 
@@ -173,7 +173,7 @@ int chdir(FAR const char *path)
   return OK;
 
 errout:
-  set_errno(err);
+  set_errno(errcode);
   return ERROR;
 }
 #endif /* CONFIG_NFILE_DESCRIPTORS && !CONFIG_DISABLE_ENVIRON */
diff --git a/mm/mm_heap/mm_sbrk.c b/mm/mm_heap/mm_sbrk.c
index 774d5d3f11..ddbf288d06 100644
--- a/mm/mm_heap/mm_sbrk.c
+++ b/mm/mm_heap/mm_sbrk.c
@@ -94,12 +94,12 @@ FAR void *mm_sbrk(FAR struct mm_heap_s *heap, intptr_t incr,
   uintptr_t allocbase;
   unsigned int pgincr;
   size_t bytesize;
-  int err;
+  int errcode;
 
   DEBUGASSERT(incr >= 0);
   if (incr < 0)
     {
-      err = ENOSYS;
+      errcode = ENOSYS;
       goto errout;
     }
 
@@ -119,7 +119,7 @@ FAR void *mm_sbrk(FAR struct mm_heap_s *heap, intptr_t incr,
 
       if ((brkaddr > 0) && ((maxbreak - brkaddr) < (pgincr << MM_PGSHIFT)))
         {
-          err = ENOMEM;
+          errcode = ENOMEM;
           goto errout;
         }
 
@@ -132,7 +132,7 @@ FAR void *mm_sbrk(FAR struct mm_heap_s *heap, intptr_t incr,
       allocbase = pgalloc(brkaddr, pgincr);
       if (allocbase == 0)
         {
-          err = EAGAIN;
+          errcode = EAGAIN;
           goto errout;
         }
 
@@ -158,7 +158,7 @@ FAR void *mm_sbrk(FAR struct mm_heap_s *heap, intptr_t incr,
   return (FAR void *)brkaddr;
 
 errout:
-  set_errno(err);
+  set_errno(errcode);
   return (FAR void *)-1;
 }
 #endif /* CONFIG_BUILD_KERNEL */
diff --git a/net/pkt/pkt_send.c b/net/pkt/pkt_send.c
index 70c2a5e2f6..164f187ebc 100644
--- a/net/pkt/pkt_send.c
+++ b/net/pkt/pkt_send.c
@@ -212,14 +212,14 @@ ssize_t psock_pkt_send(FAR struct socket *psock, FAR const void *buf,
   FAR struct net_driver_s *dev;
   struct send_s state;
   net_lock_t save;
-  int err;
+  int errcode;
   int ret = OK;
 
   /* Verify that the sockfd corresponds to valid, allocated socket */
 
   if (!psock || psock->s_crefs <= 0)
     {
-      err = EBADF;
+      errcode = EBADF;
       goto errout;
     }
 
@@ -228,7 +228,7 @@ ssize_t psock_pkt_send(FAR struct socket *psock, FAR const void *buf,
   dev = pkt_find_device((FAR struct pkt_conn_s *)psock->s_conn);
   if (dev == NULL)
     {
-      err = ENODEV;
+      errcode = ENODEV;
       goto errout;
     }
 
@@ -296,7 +296,7 @@ ssize_t psock_pkt_send(FAR struct socket *psock, FAR const void *buf,
 
   if (state.snd_sent < 0)
     {
-      err = state.snd_sent;
+      errcode = state.snd_sent;
       goto errout;
     }
 
@@ -306,7 +306,7 @@ ssize_t psock_pkt_send(FAR struct socket *psock, FAR const void *buf,
 
   if (ret < 0)
     {
-      err = -ret;
+      errcode = -ret;
       goto errout;
     }
 
@@ -315,7 +315,7 @@ ssize_t psock_pkt_send(FAR struct socket *psock, FAR const void *buf,
   return state.snd_sent;
 
 errout:
-  set_errno(err);
+  set_errno(errcode);
   return ERROR;
 }
 
diff --git a/net/socket/accept.c b/net/socket/accept.c
index 11c2301ba8..59fa329bd8 100644
--- a/net/socket/accept.c
+++ b/net/socket/accept.c
@@ -127,7 +127,7 @@
 int psock_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
                  FAR socklen_t *addrlen, FAR struct socket *newsock)
 {
-  int err;
+  int errcode;
   int ret;
 
   DEBUGASSERT(psock != NULL);
@@ -136,7 +136,7 @@ int psock_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
 
   if (psock->s_type != SOCK_STREAM)
     {
-      err = EOPNOTSUPP;
+      errcode = EOPNOTSUPP;
       goto errout;
     }
 
@@ -144,7 +144,7 @@ int psock_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
 
   if (!_SS_ISLISTENING(psock->s_flags))
     {
-      err = EINVAL;
+      errcode = EINVAL;
       goto errout;
     }
 
@@ -167,7 +167,7 @@ int psock_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
           {
             if (*addrlen < sizeof(struct sockaddr_in))
               {
-                err = EBADF;
+                errcode = EBADF;
                 goto errout;
               }
           }
@@ -179,7 +179,7 @@ int psock_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
           {
             if (*addrlen < sizeof(struct sockaddr_in6))
               {
-                err = EBADF;
+                errcode = EBADF;
                 goto errout;
               }
           }
@@ -191,7 +191,7 @@ int psock_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
           {
             if (*addrlen < sizeof(sa_family_t))
               {
-                err = EBADF;
+                errcode = EBADF;
                 goto errout;
               }
           }
@@ -200,7 +200,7 @@ int psock_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
 
         default:
           DEBUGPANIC();
-          err = EINVAL;
+          errcode = EINVAL;
           goto errout;
         }
     }
@@ -222,7 +222,7 @@ int psock_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
       ret = psock_local_accept(psock, addr, addrlen, &newsock->s_conn);
       if (ret < 0)
         {
-          err = -ret;
+          errcode = -ret;
           goto errout;
         }
     }
@@ -242,7 +242,7 @@ int psock_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
       if (ret < 0)
         {
           net_unlock(state);
-          err = -ret;
+          errcode = -ret;
           goto errout;
         }
 
@@ -259,7 +259,7 @@ int psock_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
            */
 
           net_unlock(state);
-          err = -ret;
+          errcode = -ret;
           goto errout_after_accept;
         }
 
@@ -277,7 +277,7 @@ errout_after_accept:
   psock_close(newsock);
 
 errout:
-  set_errno(err);
+  set_errno(errcode);
   return ERROR;
 }
 
@@ -354,7 +354,7 @@ int accept(int sockfd, FAR struct sockaddr *addr, FAR socklen_t *addrlen)
   FAR struct socket *psock = sockfd_socket(sockfd);
   FAR struct socket *newsock;
   int newfd;
-  int err;
+  int errcode;
   int ret;
 
   /* Verify that the sockfd corresponds to valid, allocated socket */
@@ -369,12 +369,12 @@ int accept(int sockfd, FAR struct sockaddr *addr, FAR socklen_t *addrlen)
 #if CONFIG_NFILE_DESCRIPTORS > 0
       if ((unsigned int)sockfd < CONFIG_NFILE_DESCRIPTORS)
         {
-          err = ENOTSOCK;
+          errcode = ENOTSOCK;
         }
       else
 #endif
         {
-          err = EBADF;
+          errcode = EBADF;
         }
 
       goto errout;
@@ -387,14 +387,14 @@ int accept(int sockfd, FAR struct sockaddr *addr, FAR socklen_t *addrlen)
   newfd = sockfd_allocate(0);
   if (newfd < 0)
     {
-      err = ENFILE;
+      errcode = ENFILE;
       goto errout;
     }
 
   newsock = sockfd_socket(newfd);
   if (newsock == NULL)
     {
-      err = ENFILE;
+      errcode = ENFILE;
       goto errout_with_socket;
     }
 
@@ -413,7 +413,7 @@ errout_with_socket:
   sockfd_release(newfd);
 
 errout:
-  set_errno(err);
+  set_errno(errcode);
   return ERROR;
 }
 
diff --git a/net/socket/bind.c b/net/socket/bind.c
index 8095c71807..4580b4943b 100644
--- a/net/socket/bind.c
+++ b/net/socket/bind.c
@@ -156,14 +156,14 @@ int psock_bind(FAR struct socket *psock, const struct sockaddr *addr,
   FAR const struct sockaddr_ll *lladdr = (const struct sockaddr_ll *)addr;
 #endif
   socklen_t minlen;
-  int err;
+  int errcode;
   int ret = OK;
 
   /* Verify that the psock corresponds to valid, allocated socket */
 
   if (!psock || psock->s_crefs <= 0)
     {
-      err = ENOTSOCK;
+      errcode = ENOTSOCK;
       goto errout;
     }
 
@@ -197,14 +197,14 @@ int psock_bind(FAR struct socket *psock, const struct sockaddr *addr,
 
     default:
       ndbg("ERROR: Unrecognized address family: %d\n", addr->sa_family);
-      err = EAFNOSUPPORT;
+      errcode = EAFNOSUPPORT;
       goto errout;
     }
 
   if (addrlen < minlen)
     {
       ndbg("ERROR: Invalid address length: %d < %d\n", addrlen, minlen);
-      err = EBADF;
+      errcode = EBADF;
       goto errout;
     }
 
@@ -301,7 +301,7 @@ int psock_bind(FAR struct socket *psock, const struct sockaddr *addr,
 #endif /* CONFIG_NET_UDP || CONFIG_NET_LOCAL_DGRAM */
 
       default:
-        err = EBADF;
+        errcode = EBADF;
         goto errout;
     }
 
@@ -309,14 +309,14 @@ int psock_bind(FAR struct socket *psock, const struct sockaddr *addr,
 
   if (ret < 0)
     {
-      err = -ret;
+      errcode = -ret;
       goto errout;
     }
 
   return OK;
 
 errout:
-  set_errno(err);
+  set_errno(errcode);
   return ERROR;
 }
 
diff --git a/net/socket/connect.c b/net/socket/connect.c
index 8365a5b3d5..aa9903c4d7 100644
--- a/net/socket/connect.c
+++ b/net/socket/connect.c
@@ -507,13 +507,13 @@ int psock_connect(FAR struct socket *psock, FAR const struct sockaddr *addr,
 #if defined(CONFIG_NET_TCP) || defined(CONFIG_NET_UDP) || defined(CONFIG_NET_LOCAL)
   int ret;
 #endif
-  int err;
+  int errcode;
 
   /* Verify that the psock corresponds to valid, allocated socket */
 
   if (!psock || psock->s_crefs <= 0)
     {
-      err = EBADF;
+      errcode = EBADF;
       goto errout;
     }
 
@@ -526,7 +526,7 @@ int psock_connect(FAR struct socket *psock, FAR const struct sockaddr *addr,
       {
         if (addrlen < sizeof(struct sockaddr_in))
           {
-            err = EBADF;
+            errcode = EBADF;
             goto errout;
           }
       }
@@ -538,7 +538,7 @@ int psock_connect(FAR struct socket *psock, FAR const struct sockaddr *addr,
       {
         if (addrlen < sizeof(struct sockaddr_in6))
           {
-            err = EBADF;
+            errcode = EBADF;
             goto errout;
           }
       }
@@ -550,7 +550,7 @@ int psock_connect(FAR struct socket *psock, FAR const struct sockaddr *addr,
       {
         if (addrlen < sizeof(sa_family_t))
           {
-            err = EBADF;
+            errcode = EBADF;
             goto errout;
           }
       }
@@ -559,7 +559,7 @@ int psock_connect(FAR struct socket *psock, FAR const struct sockaddr *addr,
 
     default:
       DEBUGPANIC();
-      err = EAFNOSUPPORT;
+      errcode = EAFNOSUPPORT;
       goto errout;
     }
 
@@ -574,7 +574,7 @@ int psock_connect(FAR struct socket *psock, FAR const struct sockaddr *addr,
 
           if (_SS_ISCONNECTED(psock->s_flags))
             {
-              err = EISCONN;
+              errcode = EISCONN;
               goto errout;
             }
 
@@ -604,7 +604,7 @@ int psock_connect(FAR struct socket *psock, FAR const struct sockaddr *addr,
 
           if (ret < 0)
             {
-              err = -ret;
+              errcode = -ret;
               goto errout;
             }
         }
@@ -644,7 +644,7 @@ int psock_connect(FAR struct socket *psock, FAR const struct sockaddr *addr,
 
           if (ret < 0)
             {
-              err = -ret;
+              errcode = -ret;
               goto errout;
             }
         }
@@ -652,14 +652,14 @@ int psock_connect(FAR struct socket *psock, FAR const struct sockaddr *addr,
 #endif /* CONFIG_NET_UDP || CONFIG_NET_LOCAL_DGRAM */
 
       default:
-        err = EBADF;
+        errcode = EBADF;
         goto errout;
     }
 
   return OK;
 
 errout:
-  set_errno(err);
+  set_errno(errcode);
   return ERROR;
 }
 
diff --git a/net/socket/getsockname.c b/net/socket/getsockname.c
index 09c8fa0e65..3b895525ef 100644
--- a/net/socket/getsockname.c
+++ b/net/socket/getsockname.c
@@ -351,13 +351,13 @@ int getsockname(int sockfd, FAR struct sockaddr *addr, FAR socklen_t *addrlen)
 {
   FAR struct socket *psock = sockfd_socket(sockfd);
   int ret;
-  int err;
+  int errcode;
 
   /* Verify that the sockfd corresponds to valid, allocated socket */
 
   if (!psock || psock->s_crefs <= 0)
     {
-      err = EBADF;
+      errcode = EBADF;
       goto errout;
     }
 
@@ -368,7 +368,7 @@ int getsockname(int sockfd, FAR struct sockaddr *addr, FAR socklen_t *addrlen)
 #ifdef CONFIG_DEBUG_FEATURES
   if (!addr || !addrlen)
     {
-      err = EINVAL;
+      errcode = EINVAL;
       goto errout;
     }
 #endif
@@ -391,7 +391,7 @@ int getsockname(int sockfd, FAR struct sockaddr *addr, FAR socklen_t *addrlen)
 
     case PF_PACKET:
     default:
-      err = EAFNOSUPPORT;
+      errcode = EAFNOSUPPORT;
       goto errout;
     }
 
@@ -399,14 +399,14 @@ int getsockname(int sockfd, FAR struct sockaddr *addr, FAR socklen_t *addrlen)
 
   if (ret < 0)
     {
-      err = -ret;
+      errcode = -ret;
       goto errout;
     }
 
   return OK;
 
 errout:
-  set_errno(err);
+  set_errno(errcode);
   return ERROR;
 }
 
diff --git a/net/socket/getsockopt.c b/net/socket/getsockopt.c
index c2236e7591..5072f02067 100644
--- a/net/socket/getsockopt.c
+++ b/net/socket/getsockopt.c
@@ -96,13 +96,13 @@
 int psock_getsockopt(FAR struct socket *psock, int level, int option,
                      FAR void *value, FAR socklen_t *value_len)
 {
-  int err;
+  int errcode;
 
   /* Verify that the socket option if valid (but might not be supported ) */
 
   if (!_SO_GETVALID(option) || !value || !value_len)
     {
-      err = EINVAL;
+      errcode = EINVAL;
       goto errout;
     }
 
@@ -131,7 +131,7 @@ int psock_getsockopt(FAR struct socket *psock, int level, int option,
 
           if (*value_len < sizeof(int))
             {
-              err = EINVAL;
+              errcode = EINVAL;
               goto errout;
            }
 
@@ -155,7 +155,7 @@ int psock_getsockopt(FAR struct socket *psock, int level, int option,
 
           if (*value_len < sizeof(int))
             {
-              err = EINVAL;
+              errcode = EINVAL;
               goto errout;
             }
 
@@ -179,7 +179,7 @@ int psock_getsockopt(FAR struct socket *psock, int level, int option,
 
           if (*value_len < sizeof(struct timeval))
             {
-              err = EINVAL;
+              errcode = EINVAL;
               goto errout;
             }
 
@@ -214,14 +214,14 @@ int psock_getsockopt(FAR struct socket *psock, int level, int option,
       case SO_SNDLOWAT:   /* Sets the minimum number of bytes to output */
 
       default:
-        err = ENOPROTOOPT;
+        errcode = ENOPROTOOPT;
         goto errout;
     }
 
   return OK;
 
 errout:
-  set_errno(err);
+  set_errno(errcode);
   return ERROR;
 }
 
diff --git a/net/socket/listen.c b/net/socket/listen.c
index c552d79402..0d91ccb586 100644
--- a/net/socket/listen.c
+++ b/net/socket/listen.c
@@ -84,7 +84,7 @@
 
 int psock_listen(FAR struct socket *psock, int backlog)
 {
-  int err;
+  int errcode;
 
   DEBUGASSERT(psock != NULL);
 
@@ -92,7 +92,7 @@ int psock_listen(FAR struct socket *psock, int backlog)
 
   if (psock->s_type != SOCK_STREAM || !psock->s_conn)
     {
-      err = EOPNOTSUPP;
+      errcode = EOPNOTSUPP;
       goto errout;
     }
 
@@ -104,10 +104,10 @@ int psock_listen(FAR struct socket *psock, int backlog)
       FAR struct local_conn_s *conn =
         (FAR struct local_conn_s *)psock->s_conn;
 
-      err = local_listen(conn, backlog);
-      if (err < 0)
+      errcode = local_listen(conn, backlog);
+      if (errcode < 0)
         {
-          err = -err;
+          errcode = -errcode;
           goto errout;
         }
     }
@@ -123,17 +123,17 @@ int psock_listen(FAR struct socket *psock, int backlog)
 
       if (conn->lport <= 0)
         {
-          err = EOPNOTSUPP;
+          errcode = EOPNOTSUPP;
           goto errout;
         }
 
       /* Set up the backlog for this connection */
 
 #ifdef CONFIG_NET_TCPBACKLOG
-      err = tcp_backlogcreate(conn, backlog);
-      if (err < 0)
+      errcode = tcp_backlogcreate(conn, backlog);
+      if (errcode < 0)
         {
-          err = -err;
+          errcode = -errcode;
           goto errout;
         }
 #endif
@@ -150,7 +150,7 @@ int psock_listen(FAR struct socket *psock, int backlog)
   return OK;
 
 errout:
-  set_errno(err);
+  set_errno(errcode);
   return ERROR;
 }
 
@@ -190,7 +190,7 @@ errout:
 int listen(int sockfd, int backlog)
 {
   FAR struct socket *psock = sockfd_socket(sockfd);
-  int err;
+  int errcode;
 
   /* Verify that the sockfd corresponds to valid, allocated socket */
 
@@ -204,15 +204,15 @@ int listen(int sockfd, int backlog)
 #if CONFIG_NFILE_DESCRIPTORS > 0
       if ((unsigned int)sockfd < CONFIG_NFILE_DESCRIPTORS)
         {
-          err = ENOTSOCK;
+          errcode = ENOTSOCK;
         }
       else
 #endif
         {
-          err = EBADF;
+          errcode = EBADF;
         }
 
-      set_errno(err);
+      set_errno(errcode);
       return ERROR;
     }
 
diff --git a/net/socket/net_close.c b/net/socket/net_close.c
index 75ddb23b53..f400e21e4e 100644
--- a/net/socket/net_close.c
+++ b/net/socket/net_close.c
@@ -507,13 +507,13 @@ static void local_close(FAR struct socket *psock)
 
 int psock_close(FAR struct socket *psock)
 {
-  int err;
+  int errcode;
 
   /* Verify that the sockfd corresponds to valid, allocated socket */
 
   if (!psock || psock->s_crefs <= 0)
     {
-      err = EBADF;
+      errcode = EBADF;
       goto errout;
     }
 
@@ -565,8 +565,8 @@ int psock_close(FAR struct socket *psock)
 
                       /* Break any current connections */
 
-                      err = netclose_disconnect(psock);
-                      if (err < 0)
+                      errcode = netclose_disconnect(psock);
+                      if (errcode < 0)
                         {
                           /* This would normally occur only if there is a
                            * timeout from a lingering close.
@@ -662,7 +662,7 @@ int psock_close(FAR struct socket *psock)
 #endif
 
           default:
-            err = EBADF;
+            errcode = EBADF;
             goto errout;
         }
     }
@@ -678,7 +678,7 @@ errout_with_psock:
 #endif
 
 errout:
-  set_errno(err);
+  set_errno(errcode);
   return ERROR;
 }
 
diff --git a/net/socket/net_dupsd.c b/net/socket/net_dupsd.c
index 85d9b6f935..b5696871d2 100644
--- a/net/socket/net_dupsd.c
+++ b/net/socket/net_dupsd.c
@@ -68,7 +68,7 @@ int net_dupsd(int sockfd, int minsd)
   FAR struct socket *psock1;
   FAR struct socket *psock2;
   int sockfd2;
-  int err;
+  int errcode;
   int ret;
 
   /* Make sure that the minimum socket descriptor is within the legal range.
@@ -99,7 +99,7 @@ int net_dupsd(int sockfd, int minsd)
 
   if (!psock1 || psock1->s_crefs <= 0)
     {
-      err = EBADF;
+      errcode = EBADF;
       goto errout;
     }
 
@@ -108,7 +108,7 @@ int net_dupsd(int sockfd, int minsd)
   sockfd2 = sockfd_allocate(minsd);
   if (sockfd2 < 0)
     {
-      err = ENFILE;
+      errcode = ENFILE;
       goto errout;
     }
 
@@ -117,7 +117,7 @@ int net_dupsd(int sockfd, int minsd)
   psock2 = sockfd_socket(sockfd2);
   if (!psock2)
     {
-      err = ENOSYS; /* should not happen */
+      errcode = ENOSYS; /* should not happen */
       goto errout;
     }
 
@@ -126,7 +126,7 @@ int net_dupsd(int sockfd, int minsd)
   ret = net_clone(psock1, psock2);
   if (ret < 0)
     {
-      err = -ret;
+      errcode = -ret;
       goto errout;
 
     }
@@ -136,10 +136,8 @@ int net_dupsd(int sockfd, int minsd)
 
 errout:
   sched_unlock();
-  set_errno(err);
+  set_errno(errcode);
   return ERROR;
 }
 
 #endif /* defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0 */
-
-
diff --git a/net/socket/net_dupsd2.c b/net/socket/net_dupsd2.c
index 96c3d18315..7aa2634e21 100644
--- a/net/socket/net_dupsd2.c
+++ b/net/socket/net_dupsd2.c
@@ -71,7 +71,7 @@ int dup2(int sockfd1, int sockfd2)
 {
   FAR struct socket *psock1;
   FAR struct socket *psock2;
-  int err;
+  int errcode;
   int ret;
 
   /* Lock the scheduler throughout the following */
@@ -89,7 +89,7 @@ int dup2(int sockfd1, int sockfd2)
 
   if (!psock1 || !psock2 || psock1->s_crefs <= 0)
     {
-      err = EBADF;
+      errcode = EBADF;
       goto errout;
     }
 
@@ -107,7 +107,7 @@ int dup2(int sockfd1, int sockfd2)
   ret = net_clone(psock1, psock2);
   if (ret < 0)
     {
-      err = -ret;
+      errcode = -ret;
       goto errout;
     }
 
@@ -116,10 +116,8 @@ int dup2(int sockfd1, int sockfd2)
 
 errout:
   sched_unlock();
-  set_errno(err);
+  set_errno(errcode);
   return ERROR;
 }
 
 #endif /* CONFIG_NET && CONFIG_NSOCKET_DESCRIPTORS > 0 */
-
-
diff --git a/net/socket/net_sendfile.c b/net/socket/net_sendfile.c
index 0ab962d762..53a76349ad 100644
--- a/net/socket/net_sendfile.c
+++ b/net/socket/net_sendfile.c
@@ -604,14 +604,14 @@ ssize_t net_sendfile(int outfd, struct file *infile, off_t *offset,
   FAR struct tcp_conn_s *conn;
   struct sendfile_s state;
   net_lock_t save;
-  int err;
+  int errcode;
 
   /* Verify that the sockfd corresponds to valid, allocated socket */
 
   if (!psock || psock->s_crefs <= 0)
     {
       ndbg("ERROR: Invalid socket\n");
-      err = EBADF;
+      errcode = EBADF;
       goto errout;
     }
 
@@ -620,7 +620,7 @@ ssize_t net_sendfile(int outfd, struct file *infile, off_t *offset,
   if (psock->s_type != SOCK_STREAM || !_SS_ISCONNECTED(psock->s_flags))
     {
       ndbg("ERROR: Not connected\n");
-      err = ENOTCONN;
+      errcode = ENOTCONN;
       goto errout;
     }
 
@@ -658,7 +658,7 @@ ssize_t net_sendfile(int outfd, struct file *infile, off_t *offset,
   if (ret < 0)
     {
       ndbg("ERROR: Not reachable\n");
-      err = ENETUNREACH;
+      errcode = ENETUNREACH;
       goto errout;
     }
 #endif /* CONFIG_NET_ARP_SEND || CONFIG_NET_ICMPv6_NEIGHBOR */
@@ -688,7 +688,7 @@ ssize_t net_sendfile(int outfd, struct file *infile, off_t *offset,
   if (state.snd_datacb == NULL)
     {
       nlldbg("Failed to allocate data callback\n");
-      err = ENOMEM;
+      errcode = ENOMEM;
       goto errout_locked;
     }
 
@@ -697,7 +697,7 @@ ssize_t net_sendfile(int outfd, struct file *infile, off_t *offset,
   if (state.snd_ackcb == NULL)
     {
       nlldbg("Failed to allocate ack callback\n");
-      err = ENOMEM;
+      errcode = ENOMEM;
       goto errout_datacb;
     }
 
@@ -754,9 +754,9 @@ errout_locked:
 
 errout:
 
-  if (err)
+  if (errcode)
     {
-      set_errno(err);
+      set_errno(errcode);
       return ERROR;
     }
   else if (state.snd_sent < 0)
diff --git a/net/socket/net_vfcntl.c b/net/socket/net_vfcntl.c
index a58756cb8e..a1cb386e76 100644
--- a/net/socket/net_vfcntl.c
+++ b/net/socket/net_vfcntl.c
@@ -77,7 +77,7 @@ int net_vfcntl(int sockfd, int cmd, va_list ap)
 {
   FAR struct socket *psock = sockfd_socket(sockfd);
   net_lock_t flags;
-  int err = 0;
+  int errcode = 0;
   int ret = 0;
 
   ninfo("sockfd=%d cmd=%d\n", sockfd, cmd);
@@ -86,7 +86,7 @@ int net_vfcntl(int sockfd, int cmd, va_list ap)
 
   if (!psock || psock->s_crefs <= 0)
     {
-      err = EBADF;
+      errcode = EBADF;
       goto errout;
     }
 
@@ -126,7 +126,7 @@ int net_vfcntl(int sockfd, int cmd, va_list ap)
          * successful execution of one  of  the  exec  functions.
          */
 
-         err = ENOSYS; /* F_GETFD and F_SETFD not implemented */
+         errcode = ENOSYS; /* F_GETFD and F_SETFD not implemented */
          break;
 
       case F_GETFL:
@@ -263,20 +263,20 @@ int net_vfcntl(int sockfd, int cmd, va_list ap)
          * not be done.
          */
 
-         err = ENOSYS; /* F_GETOWN, F_SETOWN, F_GETLK, F_SETLK, F_SETLKW */
+         errcode = ENOSYS; /* F_GETOWN, F_SETOWN, F_GETLK, F_SETLK, F_SETLKW */
          break;
 
       default:
-         err = EINVAL;
+         errcode = EINVAL;
          break;
   }
 
   net_unlock(flags);
 
 errout:
-  if (err != 0)
+  if (errcode != 0)
     {
-      set_errno(err);
+      set_errno(errcode);
       return ERROR;
     }
 
diff --git a/net/socket/recvfrom.c b/net/socket/recvfrom.c
index d095e19ad8..50b45bee9f 100644
--- a/net/socket/recvfrom.c
+++ b/net/socket/recvfrom.c
@@ -1844,21 +1844,21 @@ ssize_t psock_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len,
                        FAR socklen_t *fromlen)
 {
   ssize_t ret;
-  int err;
+  int errcode;
 
   /* Verify that non-NULL pointers were passed */
 
 #ifdef CONFIG_DEBUG_FEATURES
   if (!buf)
     {
-      err = EINVAL;
+      errcode = EINVAL;
       goto errout;
     }
 #endif
 
   if (from && !fromlen)
     {
-      err = EINVAL;
+      errcode = EINVAL;
       goto errout;
     }
 
@@ -1866,7 +1866,7 @@ ssize_t psock_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len,
 
   if (!psock || psock->s_crefs <= 0)
     {
-      err = EBADF;
+      errcode = EBADF;
       goto errout;
     }
 
@@ -1908,13 +1908,13 @@ ssize_t psock_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len,
 
         default:
           DEBUGPANIC();
-          err = EINVAL;
+          errcode = EINVAL;
           goto errout;
         }
 
       if (*fromlen < minlen)
         {
-          err = EINVAL;
+          errcode = EINVAL;
           goto errout;
         }
     }
@@ -2002,7 +2002,7 @@ ssize_t psock_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len,
 
   if (ret < 0)
     {
-      err = -ret;
+      errcode = -ret;
       goto errout;
     }
 
@@ -2011,7 +2011,7 @@ ssize_t psock_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len,
   return ret;
 
 errout:
-  set_errno(err);
+  set_errno(errcode);
   return ERROR;
 }
 
diff --git a/net/socket/sendto.c b/net/socket/sendto.c
index 193e3ae4fe..31a33f4142 100644
--- a/net/socket/sendto.c
+++ b/net/socket/sendto.c
@@ -128,7 +128,7 @@ ssize_t psock_sendto(FAR struct socket *psock, FAR const void *buf,
 #if defined(CONFIG_NET_UDP) || defined(CONFIG_NET_LOCAL_DGRAM)
   ssize_t nsent;
 #endif
-  int err;
+  int errcode;
 
   /* If to is NULL or tolen is zero, then this function is same as send (for
    * connected socket types)
@@ -140,7 +140,7 @@ ssize_t psock_sendto(FAR struct socket *psock, FAR const void *buf,
       return psock_send(psock, buf, len, flags);
 #else
       ndbg("ERROR: No 'to' address\n");
-      err = EINVAL;
+      errcode = EINVAL;
       goto errout;
 #endif
     }
@@ -169,14 +169,14 @@ ssize_t psock_sendto(FAR struct socket *psock, FAR const void *buf,
 
     default:
       ndbg("ERROR: Unrecognized address family: %d\n", to->sa_family);
-      err = EAFNOSUPPORT;
+      errcode = EAFNOSUPPORT;
       goto errout;
     }
 
   if (tolen < minlen)
     {
       ndbg("ERROR: Invalid address length: %d < %d\n", tolen, minlen);
-      err = EBADF;
+      errcode = EBADF;
       goto errout;
     }
 
@@ -185,7 +185,7 @@ ssize_t psock_sendto(FAR struct socket *psock, FAR const void *buf,
   if (!psock || psock->s_crefs <= 0)
     {
       ndbg("ERROR: Invalid socket\n");
-      err = EBADF;
+      errcode = EBADF;
       goto errout;
     }
 
@@ -194,7 +194,7 @@ ssize_t psock_sendto(FAR struct socket *psock, FAR const void *buf,
   if (psock->s_type != SOCK_DGRAM)
     {
       ndbg("ERROR: Connected socket\n");
-      err = EISCONN;
+      errcode = EISCONN;
       goto errout;
     }
 
@@ -226,17 +226,17 @@ ssize_t psock_sendto(FAR struct socket *psock, FAR const void *buf,
   if (nsent < 0)
     {
       ndbg("ERROR: UDP or Unix domain sendto() failed: %ld\n", (long)nsent);
-      err = -nsent;
+      errcode = -nsent;
       goto errout;
     }
 
   return nsent;
 #else
-  err = ENOSYS;
+  errcode = ENOSYS;
 #endif /* CONFIG_NET_UDP || CONFIG_NET_LOCAL_DGRAM */
 
 errout:
-  set_errno(err);
+  set_errno(errcode);
   return ERROR;
 }
 
diff --git a/net/socket/setsockopt.c b/net/socket/setsockopt.c
index 99ec9378ed..2086771b37 100644
--- a/net/socket/setsockopt.c
+++ b/net/socket/setsockopt.c
@@ -106,13 +106,13 @@ int psock_setsockopt(FAR struct socket *psock, int level, int option,
                      FAR const void *value, socklen_t value_len)
 {
   net_lock_t flags;
-  int err;
+  int errcode;
 
   /* Verify that the socket option if valid (but might not be supported ) */
 
   if (!_SO_SETVALID(option) || !value)
     {
-      err = EINVAL;
+      errcode = EINVAL;
       goto errout;
     }
 
@@ -141,7 +141,7 @@ int psock_setsockopt(FAR struct socket *psock, int level, int option,
 
           if (value_len != sizeof(int))
             {
-              err = EINVAL;
+              errcode = EINVAL;
               goto errout;
             }
 
@@ -180,7 +180,7 @@ int psock_setsockopt(FAR struct socket *psock, int level, int option,
 
           if (tv == NULL || value_len != sizeof(struct timeval))
             {
-              err = EINVAL;
+              errcode = EINVAL;
               goto errout;
             }
 
@@ -223,7 +223,7 @@ int psock_setsockopt(FAR struct socket *psock, int level, int option,
 
           if (value_len < sizeof(FAR struct linger))
             {
-              err = EINVAL;
+              errcode = EINVAL;
               goto errout;
             }
 
@@ -268,14 +268,14 @@ int psock_setsockopt(FAR struct socket *psock, int level, int option,
       case SO_TYPE:       /* Reports the socket type */
 
       default:
-        err = ENOPROTOOPT;
+        errcode = ENOPROTOOPT;
         goto errout;
     }
 
   return OK;
 
 errout:
-  set_errno(err);
+  set_errno(errcode);
   return ERROR;
 }
 
diff --git a/net/socket/socket.c b/net/socket/socket.c
index 93fd41a278..56f6ddfe9c 100644
--- a/net/socket/socket.c
+++ b/net/socket/socket.c
@@ -248,7 +248,7 @@ int psock_socket(int domain, int type, int protocol, FAR struct socket *psock)
 #endif
   bool dgramok  = false;
   int ret;
-  int err;
+  int errcode;
 
   /* Only PF_INET, PF_INET6 or PF_PACKET domains supported */
 
@@ -284,7 +284,7 @@ int psock_socket(int domain, int type, int protocol, FAR struct socket *psock)
 #endif
 
     default:
-      err = EAFNOSUPPORT;
+      errcode = EAFNOSUPPORT;
       goto errout;
     }
 
@@ -305,7 +305,7 @@ int psock_socket(int domain, int type, int protocol, FAR struct socket *psock)
           {
             if ((protocol != 0 && protocol != IPPROTO_TCP) || !dgramok)
               {
-                err = EPROTONOSUPPORT;
+                errcode = EPROTONOSUPPORT;
                 goto errout;
               }
           }
@@ -318,7 +318,7 @@ int psock_socket(int domain, int type, int protocol, FAR struct socket *psock)
           {
             if (protocol != 0 || !dgramok)
               {
-                err = EPROTONOSUPPORT;
+                errcode = EPROTONOSUPPORT;
                 goto errout;
               }
           }
@@ -336,7 +336,7 @@ int psock_socket(int domain, int type, int protocol, FAR struct socket *psock)
           {
             if ((protocol != 0 && protocol != IPPROTO_UDP) || !dgramok)
               {
-                err = EPROTONOSUPPORT;
+                errcode = EPROTONOSUPPORT;
                 goto errout;
               }
           }
@@ -349,7 +349,7 @@ int psock_socket(int domain, int type, int protocol, FAR struct socket *psock)
           {
             if (protocol != 0 || !dgramok)
               {
-                err = EPROTONOSUPPORT;
+                errcode = EPROTONOSUPPORT;
                 goto errout;
               }
           }
@@ -362,7 +362,7 @@ int psock_socket(int domain, int type, int protocol, FAR struct socket *psock)
       case SOCK_RAW:
         if (dgramok)
           {
-            err = EPROTONOSUPPORT;
+            errcode = EPROTONOSUPPORT;
             goto errout;
           }
 
@@ -370,7 +370,7 @@ int psock_socket(int domain, int type, int protocol, FAR struct socket *psock)
 #endif
 
       default:
-        err = EPROTONOSUPPORT;
+        errcode = EPROTONOSUPPORT;
         goto errout;
     }
 
@@ -389,7 +389,7 @@ int psock_socket(int domain, int type, int protocol, FAR struct socket *psock)
    * not actually be initialized until the socket is connected.
    */
 
-  err = ENOMEM; /* Assume failure to allocate connection instance */
+  errcode = ENOMEM; /* Assume failure to allocate connection instance */
   switch (type)
     {
 #if defined(CONFIG_NET_TCP) || defined(CONFIG_NET_LOCAL_STREAM)
@@ -423,7 +423,7 @@ int psock_socket(int domain, int type, int protocol, FAR struct socket *psock)
             {
               /* Failed to reserve a connection structure */
 
-              err = -ret;
+              errcode = -ret;
               goto errout;
             }
         }
@@ -461,7 +461,7 @@ int psock_socket(int domain, int type, int protocol, FAR struct socket *psock)
             {
               /* Failed to reserve a connection structure */
 
-              err = -ret;
+              errcode = -ret;
               goto errout;
             }
         }
@@ -476,7 +476,7 @@ int psock_socket(int domain, int type, int protocol, FAR struct socket *psock)
             {
               /* Failed to reserve a connection structure */
 
-              err = -ret;
+              errcode = -ret;
               goto errout;
             }
         }
@@ -490,7 +490,7 @@ int psock_socket(int domain, int type, int protocol, FAR struct socket *psock)
   return OK;
 
 errout:
-  set_errno(err);
+  set_errno(errcode);
   return ERROR;
 }
 
diff --git a/net/tcp/tcp_send_buffered.c b/net/tcp/tcp_send_buffered.c
index b5c729def9..f5a70176f2 100644
--- a/net/tcp/tcp_send_buffered.c
+++ b/net/tcp/tcp_send_buffered.c
@@ -936,20 +936,20 @@ ssize_t psock_tcp_send(FAR struct socket *psock, FAR const void *buf,
   FAR struct tcp_wrbuffer_s *wrb;
   net_lock_t save;
   ssize_t    result = 0;
-  int        err;
+  int        errcode;
   int        ret = OK;
 
   if (!psock || psock->s_crefs <= 0)
     {
       ndbg("ERROR: Invalid socket\n");
-      err = EBADF;
+      errcode = EBADF;
       goto errout;
     }
 
   if (psock->s_type != SOCK_STREAM || !_SS_ISCONNECTED(psock->s_flags))
     {
       ndbg("ERROR: Not connected\n");
-      err = ENOTCONN;
+      errcode = ENOTCONN;
       goto errout;
     }
 
@@ -986,7 +986,7 @@ ssize_t psock_tcp_send(FAR struct socket *psock, FAR const void *buf,
   if (ret < 0)
     {
       ndbg("ERROR: Not reachable\n");
-      err = ENETUNREACH;
+      errcode = ENETUNREACH;
       goto errout;
     }
 #endif /* CONFIG_NET_ARP_SEND || CONFIG_NET_ICMPv6_NEIGHBOR */
@@ -1012,7 +1012,7 @@ ssize_t psock_tcp_send(FAR struct socket *psock, FAR const void *buf,
           /* A buffer allocation error occurred */
 
           ndbg("ERROR: Failed to allocate write buffer\n");
-          err = ENOMEM;
+          errcode = ENOMEM;
           goto errout_with_lock;
         }
 
@@ -1030,7 +1030,7 @@ ssize_t psock_tcp_send(FAR struct socket *psock, FAR const void *buf,
           /* A buffer allocation error occurred */
 
           ndbg("ERROR: Failed to allocate callback\n");
-          err = ENOMEM;
+          errcode = ENOMEM;
           goto errout_with_wrb;
         }
 
@@ -1076,7 +1076,7 @@ ssize_t psock_tcp_send(FAR struct socket *psock, FAR const void *buf,
 
   if (result < 0)
     {
-      err = result;
+      errcode = result;
       goto errout;
     }
 
@@ -1086,7 +1086,7 @@ ssize_t psock_tcp_send(FAR struct socket *psock, FAR const void *buf,
 
   if (ret < 0)
     {
-      err = -ret;
+      errcode = -ret;
       goto errout;
     }
 
@@ -1101,7 +1101,7 @@ errout_with_lock:
   net_unlock(save);
 
 errout:
-  set_errno(err);
+  set_errno(errcode);
   return ERROR;
 }
 
diff --git a/net/tcp/tcp_send_unbuffered.c b/net/tcp/tcp_send_unbuffered.c
index d043a46250..53b8941499 100644
--- a/net/tcp/tcp_send_unbuffered.c
+++ b/net/tcp/tcp_send_unbuffered.c
@@ -719,7 +719,7 @@ ssize_t psock_tcp_send(FAR struct socket *psock,
   FAR struct tcp_conn_s *conn = (FAR struct tcp_conn_s *)psock->s_conn;
   struct send_s state;
   net_lock_t save;
-  int err;
+  int errcode;
   int ret = OK;
 
   /* Verify that the sockfd corresponds to valid, allocated socket */
@@ -727,7 +727,7 @@ ssize_t psock_tcp_send(FAR struct socket *psock,
   if (!psock || psock->s_crefs <= 0)
     {
       ndbg("ERROR: Invalid socket\n");
-      err = EBADF;
+      errcode = EBADF;
       goto errout;
     }
 
@@ -736,7 +736,7 @@ ssize_t psock_tcp_send(FAR struct socket *psock,
   if (psock->s_type != SOCK_STREAM || !_SS_ISCONNECTED(psock->s_flags))
     {
       ndbg("ERROR: Not connected\n");
-      err = ENOTCONN;
+      errcode = ENOTCONN;
       goto errout;
     }
 
@@ -774,7 +774,7 @@ ssize_t psock_tcp_send(FAR struct socket *psock,
   if (ret < 0)
     {
       ndbg("ERROR: Not reachable\n");
-      err = ENETUNREACH;
+      errcode = ENETUNREACH;
       goto errout;
     }
 #endif /* CONFIG_NET_ARP_SEND || CONFIG_NET_ICMPv6_NEIGHBOR */
@@ -857,7 +857,7 @@ ssize_t psock_tcp_send(FAR struct socket *psock,
 
   if (state.snd_sent < 0)
     {
-      err = state.snd_sent;
+      errcode = state.snd_sent;
       goto errout;
     }
 
@@ -867,7 +867,7 @@ ssize_t psock_tcp_send(FAR struct socket *psock,
 
   if (ret < 0)
     {
-      err = -ret;
+      errcode = -ret;
       goto errout;
     }
 
@@ -876,7 +876,7 @@ ssize_t psock_tcp_send(FAR struct socket *psock,
   return state.snd_sent;
 
 errout:
-  set_errno(err);
+  set_errno(errcode);
   return ERROR;
 }
 
diff --git a/sched/sched/sched_waitid.c b/sched/sched/sched_waitid.c
index ca24507279..003f8b597f 100644
--- a/sched/sched/sched_waitid.c
+++ b/sched/sched/sched_waitid.c
@@ -161,7 +161,7 @@ int waitid(idtype_t idtype, id_t id, FAR siginfo_t *info, int options)
   bool retains;
 #endif
   sigset_t set;
-  int err;
+  int errcode;
   int ret;
 
   /* MISSING LOGIC:   If WNOHANG is provided in the options, then this function
@@ -205,7 +205,7 @@ int waitid(idtype_t idtype, id_t id, FAR siginfo_t *info, int options)
     {
       /* There are no children */
 
-      err = ECHILD;
+      errcode = ECHILD;
       goto errout_with_errno;
     }
   else if (idtype == P_PID)
@@ -219,7 +219,7 @@ int waitid(idtype_t idtype, id_t id, FAR siginfo_t *info, int options)
       if (!ctcb || ctcb->ppid != rtcb->pid)
 #endif
         {
-          err = ECHILD;
+          errcode = ECHILD;
           goto errout_with_errno;
         }
 
@@ -233,7 +233,7 @@ int waitid(idtype_t idtype, id_t id, FAR siginfo_t *info, int options)
             {
               /* This specific pid is not a child */
 
-              err = ECHILD;
+              errcode = ECHILD;
               goto errout_with_errno;
             }
         }
@@ -243,7 +243,7 @@ int waitid(idtype_t idtype, id_t id, FAR siginfo_t *info, int options)
     {
       /* There are no children */
 
-      err = ECHILD;
+      errcode = ECHILD;
       goto errout_with_errno;
     }
   else if (idtype == P_PID)
@@ -257,7 +257,7 @@ int waitid(idtype_t idtype, id_t id, FAR siginfo_t *info, int options)
       if (!ctcb || ctcb->ppid != rtcb->pid)
 #endif
         {
-          err = ECHILD;
+          errcode = ECHILD;
           goto errout_with_errno;
         }
     }
@@ -327,7 +327,7 @@ int waitid(idtype_t idtype, id_t id, FAR siginfo_t *info, int options)
                * to reported ECHILD than bogus status.
                */
 
-              err = ECHILD;
+              errcode = ECHILD;
               goto errout_with_errno;
             }
         }
@@ -346,7 +346,7 @@ int waitid(idtype_t idtype, id_t id, FAR siginfo_t *info, int options)
            * Let's return ECHILD.. that is at least informative.
            */
 
-          err = ECHILD;
+          errcode = ECHILD;
           goto errout_with_errno;
         }
 #endif
@@ -400,7 +400,7 @@ int waitid(idtype_t idtype, id_t id, FAR siginfo_t *info, int options)
   return OK;
 
 errout_with_errno:
-  set_errno(err);
+  set_errno(errcode);
 errout:
   sched_unlock();
   return ERROR;
diff --git a/sched/sched/sched_waitpid.c b/sched/sched/sched_waitpid.c
index aa5f2dccc6..0e3902342b 100644
--- a/sched/sched/sched_waitpid.c
+++ b/sched/sched/sched_waitpid.c
@@ -180,7 +180,7 @@ pid_t waitpid(pid_t pid, int *stat_loc, int options)
   FAR struct tcb_s *ctcb;
   FAR struct task_group_s *group;
   bool mystat = false;
-  int err;
+  int errcode;
   int ret;
 
   DEBUGASSERT(stat_loc);
@@ -204,7 +204,7 @@ pid_t waitpid(pid_t pid, int *stat_loc, int options)
   ctcb = sched_gettcb(pid);
   if (!ctcb)
     {
-      err = ECHILD;
+      errcode = ECHILD;
       goto errout_with_errno;
     }
 
@@ -272,7 +272,7 @@ pid_t waitpid(pid_t pid, int *stat_loc, int options)
   return pid;
 
 errout_with_errno:
-  set_errno(err);
+  set_errno(errcode);
 errout:
   sched_unlock();
   return ERROR;
@@ -302,7 +302,7 @@ pid_t waitpid(pid_t pid, int *stat_loc, int options)
 #endif
   FAR struct siginfo info;
   sigset_t set;
-  int err;
+  int errcode;
   int ret;
 
   DEBUGASSERT(stat_loc);
@@ -337,7 +337,7 @@ pid_t waitpid(pid_t pid, int *stat_loc, int options)
 
   if (rtcb->group->tg_children == NULL && retains)
     {
-      err = ECHILD;
+      errcode = ECHILD;
       goto errout_with_errno;
     }
   else if (pid != (pid_t)-1)
@@ -351,7 +351,7 @@ pid_t waitpid(pid_t pid, int *stat_loc, int options)
       if (!ctcb || ctcb->ppid != rtcb->pid)
 #endif
         {
-          err = ECHILD;
+          errcode = ECHILD;
           goto errout_with_errno;
         }
 
@@ -363,7 +363,7 @@ pid_t waitpid(pid_t pid, int *stat_loc, int options)
 
           if (group_findchild(rtcb->group, pid) == NULL)
             {
-              err = ECHILD;
+              errcode = ECHILD;
               goto errout_with_errno;
             }
         }
@@ -375,7 +375,7 @@ pid_t waitpid(pid_t pid, int *stat_loc, int options)
     {
       /* There are no children */
 
-      err = ECHILD;
+      errcode = ECHILD;
       goto errout_with_errno;
     }
   else if (pid != (pid_t)-1)
@@ -389,7 +389,7 @@ pid_t waitpid(pid_t pid, int *stat_loc, int options)
       if (!ctcb || ctcb->ppid != rtcb->pid)
 #endif
         {
-          err = ECHILD;
+          errcode = ECHILD;
           goto errout_with_errno;
         }
     }
@@ -472,7 +472,7 @@ pid_t waitpid(pid_t pid, int *stat_loc, int options)
                * to reported ECHILD than bogus status.
                */
 
-              err = ECHILD;
+              errcode = ECHILD;
               goto errout_with_errno;
             }
         }
@@ -493,7 +493,7 @@ pid_t waitpid(pid_t pid, int *stat_loc, int options)
            * Let's return ECHILD.. that is at least informative.
            */
 
-          err = ECHILD;
+          errcode = ECHILD;
           goto errout_with_errno;
         }
 
@@ -526,7 +526,7 @@ pid_t waitpid(pid_t pid, int *stat_loc, int options)
   return (int)pid;
 
 errout_with_errno:
-  set_errno(err);
+  set_errno(errcode);
 
 errout_with_lock:
   sched_unlock();
diff --git a/sched/task/task_prctl.c b/sched/task/task_prctl.c
index 1908872536..654ecba481 100644
--- a/sched/task/task_prctl.c
+++ b/sched/task/task_prctl.c
@@ -77,7 +77,7 @@
 int prctl(int option, ...)
 {
   va_list ap;
-  int err;
+  int errcode;
 
   va_start(ap, option);
   switch (option)
@@ -112,7 +112,7 @@ int prctl(int option, ...)
         if (!tcb)
           {
             sdbg("Pid does not correspond to a task: %d\n", pid);
-            err = ESRCH;
+            errcode = ESRCH;
             goto errout;
           }
 
@@ -121,7 +121,7 @@ int prctl(int option, ...)
         if (!name)
           {
             sdbg("No name provide\n");
-            err = EFAULT;
+            errcode = EFAULT;
             goto errout;
           }
 
@@ -145,13 +145,13 @@ int prctl(int option, ...)
       break;
 #else
       sdbg("Option not enabled: %d\n", option);
-      err = ENOSYS;
+      errcode = ENOSYS;
       goto errout;
 #endif
 
     default:
       sdbg("Unrecognized option: %d\n", option);
-      err = EINVAL;
+      errcode = EINVAL;
       goto errout;
     }
 
@@ -166,6 +166,6 @@ int prctl(int option, ...)
 
 errout:
   va_end(ap);
-  set_errno(err);
+  set_errno(errcode);
   return ERROR;
 }
diff --git a/sched/task/task_restart.c b/sched/task/task_restart.c
index 9090d789ca..5f3b76958f 100644
--- a/sched/task/task_restart.c
+++ b/sched/task/task_restart.c
@@ -83,7 +83,7 @@ int task_restart(pid_t pid)
   FAR struct task_tcb_s *tcb;
   FAR dq_queue_t *tasklist;
   irqstate_t flags;
-  int err;
+  int errcode;
   int status;
 
   /* Make sure this task does not become ready-to-run while we are futzing
@@ -99,7 +99,7 @@ int task_restart(pid_t pid)
     {
       /* Not implemented */
 
-      err = ENOSYS;
+      errcode = ENOSYS;
       goto errout_with_lock;
     }
 
@@ -115,7 +115,7 @@ int task_restart(pid_t pid)
     {
       /* There is no TCB with this pid or, if there is, it is not a task. */
 
-      err = ESRCH;
+      errcode = ESRCH;
       goto errout_with_lock;
     }
 
@@ -133,7 +133,7 @@ int task_restart(pid_t pid)
     {
       /* Not implemented */
 
-      err = ENOSYS;
+      errcode = ENOSYS;
       goto errout_with_lock;
     }
 #endif /* CONFIG_SMP */
@@ -197,7 +197,7 @@ int task_restart(pid_t pid)
   if (status != OK)
     {
       (void)task_delete(pid);
-      err = -status;
+      errcode = -status;
       goto errout_with_lock;
     }
 
@@ -205,7 +205,7 @@ int task_restart(pid_t pid)
   return OK;
 
 errout_with_lock:
-  set_errno(err);
+  set_errno(errcode);
   sched_unlock();
   return ERROR;
 }
diff --git a/tools/pic32mx/mkpichex.c b/tools/pic32mx/mkpichex.c
index 48cb02805f..1562031bc8 100644
--- a/tools/pic32mx/mkpichex.c
+++ b/tools/pic32mx/mkpichex.c
@@ -239,7 +239,7 @@ int main(int argc, char **argv, char **envp)
   char *destfile;
   FILE *src;
   FILE *dest;
-  int err;
+  int errcode;
 
   if (argc != 2)
     {
@@ -258,7 +258,7 @@ int main(int argc, char **argv, char **envp)
   if (!destfile)
     {
       fprintf(stderr, "getfilepath failed\n");
-      err = 2;
+      errcode = 2;
       goto errout_with_srcfile;
     }
 
@@ -266,7 +266,7 @@ int main(int argc, char **argv, char **envp)
   if (!src)
     {
       fprintf(stderr, "open %s failed: %s\n", srcfile, strerror(errno));
-      err = 3;
+      errcode = 3;
       goto errout_with_destfile;
     }
 
@@ -274,7 +274,7 @@ int main(int argc, char **argv, char **envp)
   if (!dest)
     {
       fprintf(stderr, "open %s failed: %s\n", destfile, strerror(errno));
-      err = 3;
+      errcode = 3;
       goto errout_with_destfile;
     }
 
@@ -285,7 +285,7 @@ int main(int argc, char **argv, char **envp)
       if (parse_line(&hexline))
         {
           fprintf(stderr, "Failed to parse line\n");
-          err = 1;
+          errcode = 1;
           goto errout_with_destfile;
         }
 
@@ -325,5 +325,5 @@ errout_with_destfile:
   free(destfile);
 errout_with_srcfile:
   free(srcfile);
-  return err;
+  return errcode;
 }
-- 
GitLab


From e99301d7c2b1d0b934ecbad91c8f87801a95116f Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sat, 11 Jun 2016 14:55:27 -0600
Subject: [PATCH 23/91] Rename *lldbg to *llerr

---
 arch/arm/src/a1x/a1x_irq.c                    |  24 ++--
 arch/arm/src/a1x/a1x_serial.c                 |   2 +-
 arch/arm/src/arm/up_assert.c                  |  42 +++---
 arch/arm/src/arm/up_dataabort.c               |   6 +-
 arch/arm/src/arm/up_prefetchabort.c           |   4 +-
 arch/arm/src/arm/up_releasepending.c          |   2 +-
 arch/arm/src/arm/up_reprioritizertr.c         |   2 +-
 arch/arm/src/arm/up_syscall.c                 |   2 +-
 arch/arm/src/arm/up_undefinedinsn.c           |   2 +-
 arch/arm/src/armv6-m/up_assert.c              |  50 +++----
 arch/arm/src/armv6-m/up_dumpnvic.c            |  12 +-
 arch/arm/src/armv6-m/up_hardfault.c           |   4 +-
 arch/arm/src/armv6-m/up_releasepending.c      |   2 +-
 arch/arm/src/armv6-m/up_reprioritizertr.c     |   2 +-
 arch/arm/src/armv6-m/up_svcall.c              |   4 +-
 arch/arm/src/armv7-a/arm_assert.c             |  50 +++----
 arch/arm/src/armv7-a/arm_cpustart.c           |   6 +-
 arch/arm/src/armv7-a/arm_dataabort.c          |   6 +-
 arch/arm/src/armv7-a/arm_l2cc_pl310.c         |   2 +-
 arch/arm/src/armv7-a/arm_prefetchabort.c      |   6 +-
 arch/arm/src/armv7-a/arm_releasepending.c     |   2 +-
 arch/arm/src/armv7-a/arm_reprioritizertr.c    |   2 +-
 arch/arm/src/armv7-a/arm_syscall.c            |   4 +-
 arch/arm/src/armv7-a/arm_undefinedinsn.c      |   2 +-
 arch/arm/src/armv7-a/gic.h                    |   4 +-
 arch/arm/src/armv7-m/up_assert.c              |  52 +++----
 arch/arm/src/armv7-m/up_hardfault.c           |   4 +-
 arch/arm/src/armv7-m/up_memfault.c            |   6 +-
 arch/arm/src/armv7-m/up_ramvec_attach.c       |   4 +-
 arch/arm/src/armv7-m/up_ramvec_initialize.c   |   4 +-
 arch/arm/src/armv7-m/up_releasepending.c      |   2 +-
 arch/arm/src/armv7-m/up_reprioritizertr.c     |   2 +-
 arch/arm/src/armv7-m/up_svcall.c              |   4 +-
 arch/arm/src/armv7-r/arm_assert.c             |  48 +++----
 arch/arm/src/armv7-r/arm_dataabort.c          |   2 +-
 arch/arm/src/armv7-r/arm_l2cc_pl310.c         |   2 +-
 arch/arm/src/armv7-r/arm_prefetchabort.c      |   2 +-
 arch/arm/src/armv7-r/arm_releasepending.c     |   2 +-
 arch/arm/src/armv7-r/arm_reprioritizertr.c    |   2 +-
 arch/arm/src/armv7-r/arm_syscall.c            |   4 +-
 arch/arm/src/armv7-r/arm_undefinedinsn.c      |   2 +-
 arch/arm/src/c5471/c5471_ethernet.c           |   2 +-
 arch/arm/src/common/up_exit.c                 |   4 +-
 arch/arm/src/common/up_initialize.c           |   4 +-
 arch/arm/src/dm320/dm320_usbdev.c             |  26 ++--
 arch/arm/src/efm32/efm32_adc.c                |   2 +-
 arch/arm/src/efm32/efm32_irq.c                |  20 +--
 arch/arm/src/efm32/efm32_leserial.c           |   4 +-
 arch/arm/src/efm32/efm32_pwm.c                |   4 +-
 arch/arm/src/efm32/efm32_rmu.h                |   4 +-
 arch/arm/src/efm32/efm32_rtc_burtc.c          |   2 +-
 arch/arm/src/efm32/efm32_serial.c             |   4 +-
 arch/arm/src/efm32/efm32_spi.c                |   4 +-
 arch/arm/src/efm32/efm32_timer.c              |   6 +-
 arch/arm/src/efm32/efm32_usbdev.c             |  12 +-
 arch/arm/src/efm32/efm32_usbhost.c            |   4 +-
 arch/arm/src/kinetis/kinetis_irq.c            |  26 ++--
 arch/arm/src/kinetis/kinetis_pindump.c        |   4 +-
 arch/arm/src/kinetis/kinetis_pwm.c            |   6 +-
 arch/arm/src/kinetis/kinetis_sdhc.c           |   6 +-
 arch/arm/src/kinetis/kinetis_serial.c         |   2 +-
 arch/arm/src/kinetis/kinetis_usbdev.c         |  34 ++---
 arch/arm/src/kl/kl_dumpgpio.c                 |   4 +-
 arch/arm/src/kl/kl_irq.c                      |  20 +--
 arch/arm/src/kl/kl_pwm.c                      |   4 +-
 arch/arm/src/kl/kl_spi.c                      |   4 +-
 arch/arm/src/lpc11xx/lpc11_gpiodbg.c          |  12 +-
 arch/arm/src/lpc11xx/lpc11_irq.c              |  20 +--
 arch/arm/src/lpc11xx/lpc11_spi.c              |   4 +-
 arch/arm/src/lpc11xx/lpc11_ssp.c              |   4 +-
 arch/arm/src/lpc11xx/lpc11_timer.c            |   4 +-
 arch/arm/src/lpc17xx/lpc176x_rtc.c            |  24 ++--
 arch/arm/src/lpc17xx/lpc17_can.c              |  18 +--
 arch/arm/src/lpc17xx/lpc17_ethernet.c         |  16 +--
 arch/arm/src/lpc17xx/lpc17_gpiodbg.c          |  12 +-
 arch/arm/src/lpc17xx/lpc17_irq.c              |  16 +--
 arch/arm/src/lpc17xx/lpc17_mcpwm.c            |   4 +-
 arch/arm/src/lpc17xx/lpc17_pwm.c              |   4 +-
 arch/arm/src/lpc17xx/lpc17_sdcard.c           |  14 +-
 arch/arm/src/lpc17xx/lpc17_spi.c              |   4 +-
 arch/arm/src/lpc17xx/lpc17_ssp.c              |   4 +-
 arch/arm/src/lpc17xx/lpc17_timer.c            |   4 +-
 arch/arm/src/lpc17xx/lpc17_usbdev.c           |   4 +-
 arch/arm/src/lpc17xx/lpc17_usbhost.c          |  12 +-
 arch/arm/src/lpc214x/lpc214x_usbdev.c         |   8 +-
 arch/arm/src/lpc2378/lpc23xx_spi.c            |   4 +-
 arch/arm/src/lpc31xx/lpc31_ehci.c             |   4 +-
 arch/arm/src/lpc31xx/lpc31_spi.c              |   8 +-
 arch/arm/src/lpc31xx/lpc31_usbdev.c           |   8 +-
 arch/arm/src/lpc43xx/lpc43_ehci.c             |   4 +-
 arch/arm/src/lpc43xx/lpc43_ethernet.c         |  20 +--
 arch/arm/src/lpc43xx/lpc43_gpdma.c            |   4 +-
 arch/arm/src/lpc43xx/lpc43_irq.c              |  18 +--
 arch/arm/src/lpc43xx/lpc43_rit.c              |   2 +-
 arch/arm/src/lpc43xx/lpc43_spi.c              |   4 +-
 arch/arm/src/lpc43xx/lpc43_ssp.c              |   4 +-
 arch/arm/src/lpc43xx/lpc43_usb0dev.c          |   8 +-
 arch/arm/src/moxart/moxart_irq.c              |  10 +-
 arch/arm/src/nuc1xx/nuc_dumpgpio.c            |   8 +-
 arch/arm/src/nuc1xx/nuc_irq.c                 |  20 +--
 arch/arm/src/sam34/sam4cm_tc.c                |  18 +--
 arch/arm/src/sam34/sam4cm_tc.h                |   4 +-
 arch/arm/src/sam34/sam4cm_tickless.c          |   6 +-
 arch/arm/src/sam34/sam4l_gpio.c               |  12 +-
 arch/arm/src/sam34/sam_emac.c                 | 108 +++++++-------
 arch/arm/src/sam34/sam_gpio.c                 |  22 +--
 arch/arm/src/sam34/sam_hsmci.c                |   4 +-
 arch/arm/src/sam34/sam_irq.c                  |  20 +--
 arch/arm/src/sam34/sam_rtc.c                  |  40 +++---
 arch/arm/src/sam34/sam_rtt.c                  |  12 +-
 arch/arm/src/sam34/sam_spi.c                  |  10 +-
 arch/arm/src/sam34/sam_tc.c                   |  12 +-
 arch/arm/src/sam34/sam_twi.c                  |  18 +--
 arch/arm/src/sam34/sam_udp.c                  |  30 ++--
 arch/arm/src/sam34/sam_wdt.c                  |  12 +-
 arch/arm/src/sama5/sam_adc.c                  |  10 +-
 arch/arm/src/sama5/sam_allocateheap.c         |  24 ++--
 arch/arm/src/sama5/sam_can.c                  |  46 +++---
 arch/arm/src/sama5/sam_dmac.c                 |   2 +-
 arch/arm/src/sama5/sam_ehci.c                 |   4 +-
 arch/arm/src/sama5/sam_emaca.c                |  96 ++++++-------
 arch/arm/src/sama5/sam_emacb.c                |  94 ++++++------
 arch/arm/src/sama5/sam_ethernet.c             |   8 +-
 arch/arm/src/sama5/sam_gmac.c                 | 110 +++++++-------
 arch/arm/src/sama5/sam_hsmci.c                |  12 +-
 arch/arm/src/sama5/sam_irq.c                  |  18 +--
 arch/arm/src/sama5/sam_lcd.c                  |   6 +-
 arch/arm/src/sama5/sam_nand.c                 |   4 +-
 arch/arm/src/sama5/sam_nand.h                 |   4 +-
 arch/arm/src/sama5/sam_ohci.c                 |   4 +-
 arch/arm/src/sama5/sam_pwm.c                  |  18 +--
 arch/arm/src/sama5/sam_rtc.c                  |  40 +++---
 arch/arm/src/sama5/sam_spi.c                  |  10 +-
 arch/arm/src/sama5/sam_ssc.c                  |  24 ++--
 arch/arm/src/sama5/sam_tc.c                   |  22 +--
 arch/arm/src/sama5/sam_tc.h                   |   4 +-
 arch/arm/src/sama5/sam_tickless.c             |   6 +-
 arch/arm/src/sama5/sam_tsd.c                  |   2 +-
 arch/arm/src/sama5/sam_twi.c                  |  14 +-
 arch/arm/src/sama5/sam_udphs.c                |  44 +++---
 arch/arm/src/sama5/sam_wdt.c                  |  12 +-
 arch/arm/src/sama5/sam_xdmac.c                |   4 +-
 arch/arm/src/sama5/sama5d2x_pio.c             |  12 +-
 arch/arm/src/sama5/sama5d3x4x_pio.c           |  20 +--
 arch/arm/src/samdl/sam_irq.c                  |  20 +--
 arch/arm/src/samdl/sam_port.c                 |   8 +-
 arch/arm/src/samdl/sam_spi.c                  |  18 +--
 arch/arm/src/samv7/sam_emac.c                 | 102 ++++++-------
 arch/arm/src/samv7/sam_ethernet.c             |   4 +-
 arch/arm/src/samv7/sam_gpio.c                 |  24 ++--
 arch/arm/src/samv7/sam_hsmci.c                |  12 +-
 arch/arm/src/samv7/sam_irq.c                  |  20 +--
 arch/arm/src/samv7/sam_mcan.c                 |  62 ++++----
 arch/arm/src/samv7/sam_qspi.c                 |  10 +-
 arch/arm/src/samv7/sam_rswdt.c                |  12 +-
 arch/arm/src/samv7/sam_spi.c                  |  10 +-
 arch/arm/src/samv7/sam_spi_slave.c            |  10 +-
 arch/arm/src/samv7/sam_ssc.c                  |  24 ++--
 arch/arm/src/samv7/sam_tc.c                   |  20 +--
 arch/arm/src/samv7/sam_tc.h                   |   4 +-
 arch/arm/src/samv7/sam_tickless.c             |   4 +-
 arch/arm/src/samv7/sam_twihs.c                |  14 +-
 arch/arm/src/samv7/sam_usbdevhs.c             |  38 ++---
 arch/arm/src/samv7/sam_wdt.c                  |  12 +-
 arch/arm/src/samv7/sam_xdmac.c                |   4 +-
 arch/arm/src/stm32/stm32_adc.c                |   4 +-
 arch/arm/src/stm32/stm32_bbsram.c             |  16 +--
 arch/arm/src/stm32/stm32_can.c                |  68 ++++-----
 arch/arm/src/stm32/stm32_dumpgpio.c           |  36 ++---
 arch/arm/src/stm32/stm32_eth.c                |  20 +--
 arch/arm/src/stm32/stm32_irq.c                |  20 +--
 arch/arm/src/stm32/stm32_iwdg.c               |  12 +-
 arch/arm/src/stm32/stm32_otgfsdev.c           |  12 +-
 arch/arm/src/stm32/stm32_otgfshost.c          |   4 +-
 arch/arm/src/stm32/stm32_otghsdev.c           |  12 +-
 arch/arm/src/stm32/stm32_otghshost.c          |   4 +-
 arch/arm/src/stm32/stm32_pwm.c                |   4 +-
 arch/arm/src/stm32/stm32_rtcc.c               |  66 ++++-----
 arch/arm/src/stm32/stm32_sdio.c               |  14 +-
 arch/arm/src/stm32/stm32_spi.c                |   4 +-
 arch/arm/src/stm32/stm32_usbdev.c             |  44 +++---
 arch/arm/src/stm32/stm32_wwdg.c               |  12 +-
 arch/arm/src/stm32/stm32f40xxx_rtcc.c         |  66 ++++-----
 arch/arm/src/stm32f7/stm32_dumpgpio.c         |  10 +-
 arch/arm/src/stm32f7/stm32_ethernet.c         |  20 +--
 arch/arm/src/stm32f7/stm32_irq.c              |  24 ++--
 arch/arm/src/stm32l4/stm32l4_can.c            |  66 ++++-----
 arch/arm/src/stm32l4/stm32l4_irq.c            |  20 +--
 arch/arm/src/stm32l4/stm32l4_qspi.c           |  10 +-
 arch/arm/src/stm32l4/stm32l4_rtcc.c           |  54 +++----
 arch/arm/src/stm32l4/stm32l4_spi.c            |   4 +-
 arch/arm/src/tiva/lm3s_ethernet.c             |  14 +-
 arch/arm/src/tiva/tiva_adclow.c               |   2 +-
 arch/arm/src/tiva/tiva_dumpgpio.c             |  12 +-
 arch/arm/src/tiva/tiva_gpio.h                 |   4 +-
 arch/arm/src/tiva/tiva_i2c.c                  |   6 +-
 arch/arm/src/tiva/tiva_irq.c                  |  30 ++--
 arch/arm/src/tiva/tiva_ssi.c                  |   2 +-
 arch/arm/src/tiva/tiva_timer.h                |   4 +-
 arch/arm/src/tiva/tiva_timerlib.c             |  56 ++++----
 arch/arm/src/tiva/tm4c_ethernet.c             |  20 +--
 arch/arm/src/tms570/tms570_esm.c              |   2 +-
 arch/arm/src/tms570/tms570_gio.c              |  10 +-
 arch/avr/src/at32uc3/at32uc3_gpioirq.c        |   4 +-
 arch/avr/src/at32uc3/at32uc3_irq.c            |   6 +-
 arch/avr/src/avr/up_dumpstate.c               |  44 +++---
 arch/avr/src/avr/up_releasepending.c          |   2 +-
 arch/avr/src/avr/up_reprioritizertr.c         |   2 +-
 arch/avr/src/avr/up_spi.c                     |   4 +-
 arch/avr/src/avr32/up_dumpstate.c             |  38 ++---
 arch/avr/src/avr32/up_releasepending.c        |   2 +-
 arch/avr/src/avr32/up_reprioritizertr.c       |   2 +-
 arch/avr/src/common/up_assert.c               |   6 +-
 arch/avr/src/common/up_exit.c                 |   4 +-
 arch/avr/src/common/up_initialize.c           |   4 +-
 arch/hc/src/common/up_exit.c                  |   4 +-
 arch/hc/src/common/up_initialize.c            |   4 +-
 arch/hc/src/common/up_releasepending.c        |   2 +-
 arch/hc/src/common/up_reprioritizertr.c       |   2 +-
 arch/hc/src/m9s12/m9s12_assert.c              |  42 +++---
 arch/hc/src/m9s12/m9s12_dumpgpio.c            |  24 ++--
 arch/mips/src/common/up_exit.c                |   4 +-
 arch/mips/src/common/up_initialize.c          |   4 +-
 arch/mips/src/mips32/up_assert.c              |   6 +-
 arch/mips/src/mips32/up_dumpstate.c           |  38 ++---
 arch/mips/src/mips32/up_releasepending.c      |   2 +-
 arch/mips/src/mips32/up_reprioritizertr.c     |   2 +-
 arch/mips/src/mips32/up_swint0.c              |   4 +-
 arch/mips/src/pic32mx/pic32mx-ethernet.c      |  46 +++---
 arch/mips/src/pic32mx/pic32mx-exception.c     |   2 +-
 arch/mips/src/pic32mx/pic32mx-gpio.c          |   6 +-
 arch/mips/src/pic32mx/pic32mx-serial.c        |   2 +-
 arch/mips/src/pic32mx/pic32mx-spi.c           |  12 +-
 arch/mips/src/pic32mx/pic32mx-usbdev.c        |  26 ++--
 arch/mips/src/pic32mz/pic32mz-ethernet.c      |  46 +++---
 arch/mips/src/pic32mz/pic32mz-exception.c     |   2 +-
 arch/mips/src/pic32mz/pic32mz-gpio.c          |   6 +-
 arch/mips/src/pic32mz/pic32mz-serial.c        |   2 +-
 arch/mips/src/pic32mz/pic32mz-spi.c           |  10 +-
 arch/sh/src/common/up_assert.c                |   4 +-
 arch/sh/src/common/up_exit.c                  |   4 +-
 arch/sh/src/common/up_initialize.c            |   4 +-
 arch/sh/src/common/up_releasepending.c        |   2 +-
 arch/sh/src/common/up_reprioritizertr.c       |   2 +-
 arch/sh/src/m16c/m16c_dumpstate.c             |  30 ++--
 arch/sh/src/sh1/sh1_dumpstate.c               |  34 ++---
 arch/sim/src/up_spiflash.c                    |   4 +-
 arch/x86/src/common/up_assert.c               |  32 ++---
 arch/x86/src/common/up_exit.c                 |   4 +-
 arch/x86/src/common/up_initialize.c           |   4 +-
 arch/x86/src/common/up_releasepending.c       |   2 +-
 arch/x86/src/common/up_reprioritizertr.c      |   2 +-
 arch/x86/src/i486/up_regdump.c                |   8 +-
 arch/z16/src/common/up_assert.c               |   8 +-
 arch/z16/src/common/up_exit.c                 |  16 +--
 arch/z16/src/common/up_initialize.c           |   4 +-
 arch/z16/src/common/up_registerdump.c         |   6 +-
 arch/z16/src/common/up_releasepending.c       |   2 +-
 arch/z16/src/common/up_reprioritizertr.c      |   2 +-
 arch/z16/src/common/up_stackdump.c            |  10 +-
 arch/z16/src/z16f/z16f_espi.c                 |  12 +-
 arch/z80/src/common/up_assert.c               |   8 +-
 arch/z80/src/common/up_exit.c                 |  16 +--
 arch/z80/src/common/up_initialize.c           |   4 +-
 arch/z80/src/common/up_releasepending.c       |   2 +-
 arch/z80/src/common/up_reprioritizertr.c      |   2 +-
 arch/z80/src/common/up_stackdump.c            |  10 +-
 arch/z80/src/ez80/ez80_emac.c                 |   6 +-
 arch/z80/src/ez80/ez80_registerdump.c         |  16 +--
 arch/z80/src/z180/z180_registerdump.c         |  10 +-
 arch/z80/src/z8/z8_registerdump.c             |   4 +-
 arch/z80/src/z80/z80_registerdump.c           |   8 +-
 binfmt/binfmt_schedunload.c                   |   8 +-
 configs/arduino-due/src/sam_autoleds.c        |   2 +-
 configs/arduino-due/src/sam_userleds.c        |   2 +-
 .../cc3200-launchpad/src/cc3200_autoleds.c    |   2 +-
 configs/cloudctrl/src/stm32_autoleds.c        |   2 +-
 configs/cloudctrl/src/stm32_spi.c             |   4 +-
 configs/cloudctrl/src/stm32_usb.c             |   2 +-
 configs/cloudctrl/src/stm32_userleds.c        |   2 +-
 configs/demo9s12ne64/src/m9s12_leds.c         |   2 +-
 configs/demo9s12ne64/src/m9s12_spi.c          |   4 +-
 configs/dk-tm4c129x/src/tm4c_ethernet.c       |   2 +-
 configs/dk-tm4c129x/src/tm4c_ssi.c            |   4 +-
 configs/dk-tm4c129x/src/tm4c_userleds.c       |   2 +-
 configs/ea3131/src/lpc31_fillpage.c           |   4 +-
 configs/ea3131/src/lpc31_leds.c               |   2 +-
 configs/ea3131/src/lpc31_spi.c                |   4 +-
 configs/ea3152/src/lpc31_fillpage.c           |   4 +-
 configs/ea3152/src/lpc31_leds.c               |   2 +-
 configs/ea3152/src/lpc31_spi.c                |   4 +-
 configs/eagle100/src/lm_ethernet.c            |   2 +-
 configs/eagle100/src/lm_leds.c                |   2 +-
 configs/eagle100/src/lm_ssi.c                 |   4 +-
 configs/efm32-g8xx-stk/src/efm32_autoleds.c   |   2 +-
 configs/efm32-g8xx-stk/src/efm32_userleds.c   |   2 +-
 configs/efm32gg-stk3700/src/efm32_autoleds.c  |   2 +-
 configs/efm32gg-stk3700/src/efm32_userleds.c  |   2 +-
 configs/ekk-lm3s9b96/src/lm_ethernet.c        |   2 +-
 configs/ekk-lm3s9b96/src/lm_leds.c            |   2 +-
 configs/ekk-lm3s9b96/src/lm_ssi.c             |   4 +-
 configs/fire-stm32v2/src/stm32_autoleds.c     |   2 +-
 configs/fire-stm32v2/src/stm32_enc28j60.c     |   4 +-
 configs/fire-stm32v2/src/stm32_spi.c          |   4 +-
 configs/fire-stm32v2/src/stm32_usbdev.c       |   2 +-
 configs/fire-stm32v2/src/stm32_userleds.c     |   2 +-
 configs/freedom-kl25z/src/kl_led.c            |   4 +-
 configs/freedom-kl25z/src/kl_spi.c            |   4 +-
 configs/freedom-kl26z/src/kl_led.c            |   4 +-
 configs/freedom-kl26z/src/kl_spi.c            |   4 +-
 configs/hymini-stm32v/src/stm32_leds.c        |   2 +-
 configs/hymini-stm32v/src/stm32_spi.c         |   4 +-
 configs/hymini-stm32v/src/stm32_usbdev.c      |   4 +-
 configs/kwikstik-k40/src/k40_leds.c           |   2 +-
 configs/kwikstik-k40/src/k40_spi.c            |   4 +-
 configs/kwikstik-k40/src/k40_usbdev.c         |   2 +-
 .../launchxl-tms57004/src/tms570_autoleds.c   |   2 +-
 configs/lincoln60/src/lpc17_leds.c            |   4 +-
 configs/lm3s6432-s2e/src/lm_ethernet.c        |   2 +-
 configs/lm3s6432-s2e/src/lm_leds.c            |   2 +-
 configs/lm3s6432-s2e/src/lm_ssi.c             |   4 +-
 configs/lm3s6965-ek/src/lm_ethernet.c         |   2 +-
 configs/lm3s6965-ek/src/lm_leds.c             |   2 +-
 configs/lm3s6965-ek/src/lm_oled.c             |   4 +-
 configs/lm3s6965-ek/src/lm_ssi.c              |   4 +-
 configs/lm3s8962-ek/src/lm_ethernet.c         |   2 +-
 configs/lm3s8962-ek/src/lm_leds.c             |   2 +-
 configs/lm3s8962-ek/src/lm_oled.c             |   4 +-
 configs/lm3s8962-ek/src/lm_ssi.c              |   4 +-
 configs/lm4f120-launchpad/src/lm4f_autoleds.c |   2 +-
 configs/lm4f120-launchpad/src/lm4f_ssi.c      |   4 +-
 configs/lpc4330-xplorer/src/lpc43_autoleds.c  |   4 +-
 configs/lpc4330-xplorer/src/lpc43_userleds.c  |   4 +-
 configs/lpc4357-evb/src/lpc43_autoleds.c      |   4 +-
 configs/lpc4357-evb/src/lpc43_userleds.c      |   4 +-
 configs/lpc4370-link2/src/lpc43_autoleds.c    |   4 +-
 configs/lpc4370-link2/src/lpc43_userleds.c    |   4 +-
 configs/lpcxpresso-lpc1115/src/lpc11_leds.c   |   4 +-
 configs/lpcxpresso-lpc1115/src/lpc11_ssp.c    |   4 +-
 configs/lpcxpresso-lpc1768/src/lpc17_leds.c   |   4 +-
 configs/lpcxpresso-lpc1768/src/lpc17_oled.c   |   4 +-
 configs/lpcxpresso-lpc1768/src/lpc17_ssp.c    |   4 +-
 configs/maple/src/stm32_leds.c                |   2 +-
 configs/maple/src/stm32_spi.c                 |   4 +-
 configs/maple/src/stm32_usbdev.c              |   4 +-
 configs/mbed/src/lpc17_leds.c                 |   4 +-
 configs/mcu123-lpc214x/src/lpc2148_spi1.c     |   4 +-
 configs/mikroe-stm32f4/src/stm32_idle.c       |   2 +-
 configs/mikroe-stm32f4/src/stm32_spi.c        |   4 +-
 configs/mikroe-stm32f4/src/stm32_usb.c        |   2 +-
 configs/mikroe-stm32f4/src/stm32_vs1053.c     |   2 +-
 configs/mirtoo/src/pic32_leds.c               |   4 +-
 configs/mirtoo/src/pic32_spi2.c               |   2 +-
 configs/moteino-mega/src/avr_leds.c           |   4 +-
 configs/ne64badge/src/m9s12_buttons.c         |   4 +-
 configs/ne64badge/src/m9s12_leds.c            |   4 +-
 configs/ne64badge/src/m9s12_spi.c             |   4 +-
 configs/ntosd-dm320/src/dm320_network.c       |   4 +-
 configs/nucleo-144/src/stm32_autoleds.c       |   2 +-
 configs/nucleo-144/src/stm32_spi.c            |   4 +-
 configs/nucleo-144/src/stm32_userleds.c       |   2 +-
 configs/nucleo-f303re/src/stm32_autoleds.c    |   2 +-
 configs/nucleo-f303re/src/stm32_can.c         |   4 +-
 configs/nucleo-f303re/src/stm32_pwm.c         |   4 +-
 configs/nucleo-f303re/src/stm32_spi.c         |   4 +-
 configs/nucleo-f303re/src/stm32_userleds.c    |   2 +-
 configs/nucleo-f4x1re/src/stm32_autoleds.c    |   2 +-
 configs/nucleo-f4x1re/src/stm32_spi.c         |   4 +-
 configs/nucleo-f4x1re/src/stm32_userleds.c    |   2 +-
 configs/nucleo-l476rg/src/stm32_autoleds.c    |   2 +-
 configs/nucleo-l476rg/src/stm32_spi.c         |   4 +-
 configs/nucleo-l476rg/src/stm32_userleds.c    |   2 +-
 configs/nutiny-nuc120/src/nuc_led.c           |   4 +-
 configs/olimex-lpc-h3131/src/lpc31_leds.c     |   2 +-
 configs/olimex-lpc-h3131/src/lpc31_spi.c      |   4 +-
 configs/olimex-lpc1766stk/src/lpc17_can.c     |   4 +-
 .../olimex-lpc1766stk/src/lpc17_hidmouse.c    |   4 +-
 configs/olimex-lpc1766stk/src/lpc17_lcd.c     |   4 +-
 configs/olimex-lpc1766stk/src/lpc17_leds.c    |   4 +-
 configs/olimex-lpc1766stk/src/lpc17_ssp.c     |   4 +-
 .../olimex-stm32-h405/src/stm32_autoleds.c    |   2 +-
 configs/olimex-stm32-h405/src/stm32_can.c     |   4 +-
 configs/olimex-stm32-h405/src/stm32_usb.c     |   2 +-
 .../olimex-stm32-h405/src/stm32_userleds.c    |   2 +-
 .../olimex-stm32-h407/src/stm32_autoleds.c    |   2 +-
 configs/olimex-stm32-h407/src/stm32_can.c     |   4 +-
 configs/olimex-stm32-h407/src/stm32_usb.c     |   2 +-
 .../olimex-stm32-h407/src/stm32_userleds.c    |   2 +-
 configs/olimex-stm32-p107/src/stm32_can.c     |   4 +-
 .../olimex-stm32-p107/src/stm32_encx24j600.c  |   4 +-
 configs/olimex-stm32-p107/src/stm32_spi.c     |   4 +-
 .../olimex-stm32-p207/src/stm32_autoleds.c    |   2 +-
 configs/olimex-stm32-p207/src/stm32_can.c     |   4 +-
 configs/olimex-stm32-p207/src/stm32_usb.c     |   2 +-
 .../olimex-stm32-p207/src/stm32_userleds.c    |   2 +-
 configs/olimex-strp711/src/str71_enc28j60.c   |   6 +-
 configs/olimexino-stm32/src/stm32_can.c       |   4 +-
 configs/olimexino-stm32/src/stm32_leds.c      |   4 +-
 configs/olimexino-stm32/src/stm32_spi.c       |   4 +-
 configs/olimexino-stm32/src/stm32_usbdev.c    |   4 +-
 configs/open1788/src/lpc17_autoleds.c         |   4 +-
 configs/open1788/src/lpc17_ssp.c              |   4 +-
 configs/open1788/src/lpc17_userleds.c         |   4 +-
 configs/pcduino-a10/src/a1x_leds.c            |   2 +-
 configs/pic32mx-starterkit/src/pic32mx_leds.c |   4 +-
 configs/pic32mx-starterkit/src/pic32mx_spi.c  |   4 +-
 configs/pic32mx7mmb/src/pic32_leds.c          |   4 +-
 configs/pic32mx7mmb/src/pic32_spi.c           |   2 +-
 .../pic32mz-starterkit/src/pic32mz_autoleds.c |   4 +-
 configs/pic32mz-starterkit/src/pic32mz_spi.c  |   4 +-
 .../pic32mz-starterkit/src/pic32mz_userleds.c |   4 +-
 configs/sabre-6quad/src/imx_autoleds.c        |   2 +-
 configs/sabre-6quad/src/imx_bringup.c         |   2 +-
 configs/sam3u-ek/src/sam_leds.c               |   2 +-
 configs/sam3u-ek/src/sam_spi.c                |   4 +-
 configs/sam3u-ek/src/sam_usbdev.c             |   2 +-
 configs/sam4e-ek/src/sam_ethernet.c           |   4 +-
 configs/sam4e-ek/src/sam_leds.c               |   2 +-
 configs/sam4e-ek/src/sam_spi.c                |   4 +-
 configs/sam4e-ek/src/sam_udp.c                |   2 +-
 configs/sam4l-xplained/src/sam_autoleds.c     |   2 +-
 configs/sam4l-xplained/src/sam_spi.c          |   4 +-
 configs/sam4l-xplained/src/sam_userleds.c     |   2 +-
 configs/sam4s-xplained-pro/src/sam_autoleds.c |   2 +-
 configs/sam4s-xplained-pro/src/sam_tc.c       |   4 +-
 configs/sam4s-xplained-pro/src/sam_udp.c      |   2 +-
 configs/sam4s-xplained-pro/src/sam_userleds.c |   2 +-
 configs/sam4s-xplained-pro/src/sam_wdt.c      |   4 +-
 configs/sam4s-xplained/src/sam_autoleds.c     |   2 +-
 configs/sam4s-xplained/src/sam_userleds.c     |   2 +-
 configs/sama5d2-xult/src/sam_autoleds.c       |   2 +-
 configs/sama5d2-xult/src/sam_bringup.c        |   2 +-
 configs/sama5d2-xult/src/sam_userleds.c       |   2 +-
 configs/sama5d3-xplained/src/sam_autoleds.c   |   2 +-
 configs/sama5d3-xplained/src/sam_can.c        |   4 +-
 configs/sama5d3-xplained/src/sam_ethernet.c   |   4 +-
 configs/sama5d3-xplained/src/sam_spi.c        |   4 +-
 configs/sama5d3-xplained/src/sam_usb.c        |   2 +-
 configs/sama5d3-xplained/src/sam_userleds.c   |   2 +-
 configs/sama5d3x-ek/src/sam_autoleds.c        |   2 +-
 configs/sama5d3x-ek/src/sam_can.c             |   4 +-
 configs/sama5d3x-ek/src/sam_ethernet.c        |   4 +-
 configs/sama5d3x-ek/src/sam_spi.c             |   4 +-
 configs/sama5d3x-ek/src/sam_usb.c             |   2 +-
 configs/sama5d3x-ek/src/sam_userleds.c        |   2 +-
 configs/sama5d4-ek/src/sam_autoleds.c         |   2 +-
 configs/sama5d4-ek/src/sam_bringup.c          |   2 +-
 configs/sama5d4-ek/src/sam_ethernet.c         |   4 +-
 configs/sama5d4-ek/src/sam_spi.c              |   4 +-
 configs/sama5d4-ek/src/sam_usb.c              |   2 +-
 configs/sama5d4-ek/src/sam_userleds.c         |   2 +-
 configs/samd20-xplained/src/sam_autoleds.c    |   2 +-
 configs/samd20-xplained/src/sam_spi.c         |   4 +-
 configs/samd20-xplained/src/sam_userleds.c    |   2 +-
 configs/samd21-xplained/src/sam_autoleds.c    |   2 +-
 configs/samd21-xplained/src/sam_spi.c         |   4 +-
 configs/samd21-xplained/src/sam_userleds.c    |   2 +-
 configs/same70-xplained/src/sam_autoleds.c    |   2 +-
 configs/same70-xplained/src/sam_bringup.c     |   2 +-
 configs/same70-xplained/src/sam_ethernet.c    |   4 +-
 configs/same70-xplained/src/sam_mcan.c        |   4 +-
 configs/same70-xplained/src/sam_spi.c         |   4 +-
 configs/same70-xplained/src/sam_usbdev.c      |   2 +-
 configs/saml21-xplained/src/sam_autoleds.c    |   2 +-
 configs/saml21-xplained/src/sam_spi.c         |   4 +-
 configs/saml21-xplained/src/sam_userleds.c    |   2 +-
 configs/samv71-xult/src/sam_autoleds.c        |   2 +-
 configs/samv71-xult/src/sam_bringup.c         |   2 +-
 configs/samv71-xult/src/sam_ethernet.c        |   4 +-
 configs/samv71-xult/src/sam_mcan.c            |   4 +-
 configs/samv71-xult/src/sam_spi.c             |   4 +-
 configs/samv71-xult/src/sam_usbdev.c          |   2 +-
 configs/shenzhou/src/stm32_autoleds.c         |   2 +-
 configs/shenzhou/src/stm32_can.c              |   4 +-
 configs/shenzhou/src/stm32_spi.c              |   4 +-
 configs/shenzhou/src/stm32_usb.c              |   2 +-
 configs/shenzhou/src/stm32_userleds.c         |   2 +-
 configs/sim/src/sim_bringup.c                 |   2 +-
 configs/spark/src/stm32_autoleds.c            |   2 +-
 configs/spark/src/stm32_spi.c                 |   4 +-
 configs/spark/src/stm32_usbdev.c              |   4 +-
 configs/spark/src/stm32_userleds.c            |   2 +-
 configs/stm3210e-eval/src/stm32_can.c         |   4 +-
 configs/stm3210e-eval/src/stm32_idle.c        |   4 +-
 configs/stm3210e-eval/src/stm32_leds.c        |   2 +-
 configs/stm3210e-eval/src/stm32_spi.c         |   4 +-
 configs/stm3210e-eval/src/stm32_usbdev.c      |   2 +-
 configs/stm3220g-eval/src/stm32_autoleds.c    |   2 +-
 configs/stm3220g-eval/src/stm32_can.c         |   4 +-
 configs/stm3220g-eval/src/stm32_spi.c         |   4 +-
 configs/stm3220g-eval/src/stm32_usb.c         |   2 +-
 configs/stm3220g-eval/src/stm32_userleds.c    |   2 +-
 configs/stm3240g-eval/src/stm32_autoleds.c    |   2 +-
 configs/stm3240g-eval/src/stm32_can.c         |   4 +-
 configs/stm3240g-eval/src/stm32_spi.c         |   4 +-
 configs/stm3240g-eval/src/stm32_usb.c         |   2 +-
 configs/stm3240g-eval/src/stm32_userleds.c    |   2 +-
 configs/stm32_tiny/src/stm32_leds.c           |   2 +-
 configs/stm32_tiny/src/stm32_spi.c            |   4 +-
 configs/stm32_tiny/src/stm32_usbdev.c         |   4 +-
 .../stm32f103-minimum/src/stm32_autoleds.c    |   2 +-
 configs/stm32f103-minimum/src/stm32_spi.c     |   4 +-
 configs/stm32f103-minimum/src/stm32_usbdev.c  |   2 +-
 configs/stm32f3discovery/src/stm32_autoleds.c |   2 +-
 configs/stm32f3discovery/src/stm32_spi.c      |   4 +-
 configs/stm32f3discovery/src/stm32_usb.c      |   2 +-
 configs/stm32f3discovery/src/stm32_userleds.c |   2 +-
 configs/stm32f429i-disco/src/stm32_autoleds.c |   2 +-
 configs/stm32f429i-disco/src/stm32_idle.c     |   2 +-
 configs/stm32f429i-disco/src/stm32_spi.c      |   4 +-
 configs/stm32f429i-disco/src/stm32_usb.c      |   2 +-
 configs/stm32f429i-disco/src/stm32_userleds.c |   2 +-
 configs/stm32f4discovery/src/stm32_autoleds.c |   2 +-
 configs/stm32f4discovery/src/stm32_ethernet.c |   4 +-
 configs/stm32f4discovery/src/stm32_idle.c     |   2 +-
 configs/stm32f4discovery/src/stm32_spi.c      |   4 +-
 configs/stm32f4discovery/src/stm32_usb.c      |   2 +-
 configs/stm32f4discovery/src/stm32_userleds.c |   2 +-
 configs/stm32f746g-disco/src/stm32_autoleds.c |   2 +-
 configs/stm32f746g-disco/src/stm32_spi.c      |   4 +-
 configs/stm32f746g-disco/src/stm32_userleds.c |   2 +-
 configs/stm32l476vg-disco/src/stm32_appinit.c |   2 +-
 .../stm32l476vg-disco/src/stm32_autoleds.c    |   2 +-
 configs/stm32l476vg-disco/src/stm32_spi.c     |   4 +-
 .../stm32l476vg-disco/src/stm32_userleds.c    |   2 +-
 configs/stm32ldiscovery/src/stm32_autoleds.c  |   2 +-
 configs/stm32ldiscovery/src/stm32_spi.c       |   4 +-
 configs/stm32ldiscovery/src/stm32_userleds.c  |   2 +-
 configs/stm32vldiscovery/src/stm32_leds.c     |   2 +-
 configs/sure-pic32mx/src/pic32mx_autoleds.c   |   4 +-
 configs/sure-pic32mx/src/pic32mx_spi.c        |   4 +-
 configs/teensy-2.0/src/at90usb_leds.c         |   4 +-
 configs/teensy-2.0/src/at90usb_spi.c          |   4 +-
 configs/teensy-3.x/src/k20_spi.c              |   4 +-
 configs/teensy-3.x/src/k20_usbdev.c           |   2 +-
 configs/teensy-lc/src/kl_led.c                |   4 +-
 configs/teensy-lc/src/kl_spi.c                |   4 +-
 .../tm4c123g-launchpad/src/tm4c_autoleds.c    |   2 +-
 configs/tm4c123g-launchpad/src/tm4c_ssi.c     |   4 +-
 .../tm4c1294-launchpad/src/tm4c_ethernet.c    |   2 +-
 .../tm4c1294-launchpad/src/tm4c_userleds.c    |   2 +-
 configs/twr-k60n512/src/k60_leds.c            |   2 +-
 configs/twr-k60n512/src/k60_spi.c             |   4 +-
 configs/twr-k60n512/src/k60_usbdev.c          |   2 +-
 configs/u-blox-c027/src/lpc17_leds.c          |   4 +-
 configs/u-blox-c027/src/lpc17_ssp.c           |   4 +-
 configs/u-blox-c027/src/lpc17_ubxmdm.c        |   4 +-
 configs/ubw32/src/pic32_leds.c                |   4 +-
 configs/viewtool-stm32f107/src/stm32_can.c    |   4 +-
 configs/viewtool-stm32f107/src/stm32_leds.c   |   2 +-
 configs/viewtool-stm32f107/src/stm32_spi.c    |   4 +-
 configs/viewtool-stm32f107/src/stm32_usbdev.c |   2 +-
 configs/zkit-arm-1769/src/lpc17_can.c         |   4 +-
 configs/zkit-arm-1769/src/lpc17_lcd.c         |   8 +-
 configs/zkit-arm-1769/src/lpc17_leds.c        |   4 +-
 configs/zkit-arm-1769/src/lpc17_spi.c         |   4 +-
 configs/zkit-arm-1769/src/lpc17_ssp.c         |   4 +-
 configs/zp214xpa/src/lpc2148_spi1.c           |   4 +-
 crypto/crypto.c                               |   2 +-
 crypto/testmngr.c                             |   4 +-
 drivers/audio/i2schar.c                       |   6 +-
 drivers/audio/wm8904.c                        |   4 +-
 drivers/can.c                                 |   4 +-
 drivers/input/ads7843e.c                      |   2 +-
 drivers/input/max11802.c                      |   2 +-
 drivers/input/mxt.c                           |   2 +-
 drivers/input/stmpe811_base.c                 |   2 +-
 drivers/input/stmpe811_gpio.c                 |   2 +-
 drivers/input/stmpe811_tsc.c                  |   2 +-
 drivers/input/tsc2007.c                       |   2 +-
 drivers/lcd/ssd1306_i2c.c                     |   2 +-
 drivers/lcd/ssd1306_spi.c                     |   2 +-
 drivers/leds/rgbled.c                         |   4 +-
 drivers/leds/userled_upper.c                  |   4 +-
 drivers/modem/u-blox.c                        |   4 +-
 drivers/mtd/sst26.c                           |   6 +-
 drivers/net/dm90x0.c                          |   8 +-
 drivers/net/enc28j60.c                        |  16 +--
 drivers/net/encx24j600.c                      |  34 ++---
 drivers/net/phy_notify.c                      |   8 +-
 drivers/net/telnet.c                          |  20 +--
 drivers/pipes/pipe_common.c                   |   2 +-
 drivers/pwm.c                                 |   4 +-
 drivers/sensors/adxl345_base.c                |   2 +-
 drivers/spi/spi_bitbang.c                     |   4 +-
 drivers/timers/ds3231.c                       |  24 ++--
 drivers/timers/pcf85263.c                     |  24 ++--
 drivers/timers/timer.c                        |   4 +-
 drivers/timers/watchdog.c                     |   4 +-
 drivers/usbhost/usbhost_hidkbd.c              |   6 +-
 drivers/usbhost/usbhost_hidmouse.c            |   6 +-
 drivers/usbhost/usbhost_hub.c                 |   4 +-
 drivers/usbhost/usbhost_skeleton.c            |   2 +-
 drivers/usbhost/usbhost_storage.c             |   2 +-
 drivers/wireless/cc3000/cc3000.c              |  12 +-
 drivers/wireless/cc3000/cc3000drv.c           |   6 +-
 drivers/wireless/cc3000/socket.c              |  16 +--
 drivers/wireless/ieee802154/mrf24j40.c        |   2 +-
 graphics/vnc/server/vnc_server.h              |   8 +-
 include/debug.h                               | 134 +++++++++---------
 include/nuttx/spi/spi_bitbang.c               |   4 +-
 include/nuttx/spi/spi_bitbang.h               |   4 +-
 include/nuttx/wireless/nrf24l01.h             |   4 +-
 libc/misc/lib_dbg.c                           |   4 +-
 mm/mm_heap/mm_initialize.c                    |   4 +-
 net/arp/arp_arpin.c                           |   2 +-
 net/arp/arp_dump.c                            |   8 +-
 net/arp/arp_send.c                            |   2 +-
 net/devif/devif_callback.c                    |   2 +-
 net/devif/ipv4_input.c                        |  14 +-
 net/devif/ipv6_input.c                        |  10 +-
 net/icmp/icmp_input.c                         |   2 +-
 net/icmp/icmp_ping.c                          |   8 +-
 net/icmpv6/icmpv6_autoconfig.c                |   2 +-
 net/icmpv6/icmpv6_input.c                     |   2 +-
 net/icmpv6/icmpv6_ping.c                      |   8 +-
 net/igmp/igmp_group.c                         |  34 ++---
 net/igmp/igmp_input.c                         |  12 +-
 net/igmp/igmp_timer.c                         |  10 +-
 net/iob/iob_add_queue.c                       |   2 +-
 net/iob/iob_trimtail.c                        |   2 +-
 net/netdev/netdev_register.c                  |   6 +-
 net/netdev/netdev_unregister.c                |   4 +-
 net/pkt/pkt_input.c                           |   2 +-
 net/pkt/pkt_poll.c                            |   2 +-
 net/socket/net_close.c                        |   2 +-
 net/socket/net_sendfile.c                     |  18 +--
 net/socket/recvfrom.c                         |   2 +-
 net/tcp/tcp_backlog.c                         |   6 +-
 net/tcp/tcp_callback.c                        |   6 +-
 net/tcp/tcp_conn.c                            |   2 +-
 net/tcp/tcp_input.c                           |   8 +-
 net/tcp/tcp_send_buffered.c                   |   4 +-
 net/tcp/tcp_send_unbuffered.c                 |   2 +-
 net/udp/udp_callback.c                        |  10 +-
 net/udp/udp_input.c                           |   4 +-
 net/udp/udp_psock_sendto.c                    |   4 +-
 sched/group/group_setupidlefiles.c            |   4 +-
 sched/init/os_start.c                         |   2 +-
 sched/irq/irq_unexpectedisr.c                 |   2 +-
 sched/paging/pg_miss.c                        |   4 +-
 sched/paging/pg_worker.c                      |  14 +-
 sched/sched/sched_sporadic.c                  |   8 +-
 sched/sched/sched_timerexpiration.c           |   2 +-
 sched/wqueue/kwork_hpthread.c                 |   2 +-
 sched/wqueue/kwork_lpthread.c                 |   2 +-
 646 files changed, 2688 insertions(+), 2688 deletions(-)

diff --git a/arch/arm/src/a1x/a1x_irq.c b/arch/arm/src/a1x/a1x_irq.c
index 65e18ffd73..2508a23cf1 100644
--- a/arch/arm/src/a1x/a1x_irq.c
+++ b/arch/arm/src/a1x/a1x_irq.c
@@ -85,37 +85,37 @@ static void a1x_dumpintc(const char *msg, int irq)
   /* Dump some relevant ARMv7 register contents */
 
   flags = enter_critical_section();
-  lldbg("ARMv7 (%s, irq=%d):\n", msg, irq);
-  lldbg("  CPSR: %08x SCTLR: %08x\n", flags, cp15_rdsctlr());
+  llerr("ARMv7 (%s, irq=%d):\n", msg, irq);
+  llerr("  CPSR: %08x SCTLR: %08x\n", flags, cp15_rdsctlr());
 
   /* Dump all of the (readable) INTC register contents */
 
-  lldbg("INTC (%s, irq=%d):\n", msg, irq);
-  lldbg("  VECTOR: %08x BASE: %08x PROTECT: %08x NMICTRL: %08x\n",
+  llerr("INTC (%s, irq=%d):\n", msg, irq);
+  llerr("  VECTOR: %08x BASE: %08x PROTECT: %08x NMICTRL: %08x\n",
         getreg32(A1X_INTC_VECTOR),    getreg32(A1X_INTC_BASEADDR),
         getreg32(A1X_INTC_PROTECT),   getreg32(A1X_INTC_NMICTRL));
-  lldbg("  IRQ PEND: %08x %08x %08x\n",
+  llerr("  IRQ PEND: %08x %08x %08x\n",
         getreg32(A1X_INTC_IRQ_PEND0), getreg32(A1X_INTC_IRQ_PEND1),
         getreg32(A1X_INTC_IRQ_PEND2));
-  lldbg("  FIQ PEND: %08x %08x %08x\n",
+  llerr("  FIQ PEND: %08x %08x %08x\n",
         getreg32(A1X_INTC_FIQ_PEND0), getreg32(A1X_INTC_FIQ_PEND1),
         getreg32(A1X_INTC_FIQ_PEND2));
-  lldbg("  SEL:      %08x %08x %08x\n",
+  llerr("  SEL:      %08x %08x %08x\n",
         getreg32(A1X_INTC_IRQ_SEL0),  getreg32(A1X_INTC_IRQ_SEL1),
         getreg32(A1X_INTC_IRQ_SEL2));
-  lldbg("  EN:       %08x %08x %08x\n",
+  llerr("  EN:       %08x %08x %08x\n",
         getreg32(A1X_INTC_EN0),       getreg32(A1X_INTC_EN1),
         getreg32(A1X_INTC_EN2));
-  lldbg("  MASK:     %08x %08x %08x\n",
+  llerr("  MASK:     %08x %08x %08x\n",
         getreg32(A1X_INTC_MASK0),     getreg32(A1X_INTC_MASK1),
         getreg32(A1X_INTC_MASK2));
-  lldbg("  RESP:     %08x %08x %08x\n",
+  llerr("  RESP:     %08x %08x %08x\n",
         getreg32(A1X_INTC_RESP0),     getreg32(A1X_INTC_RESP1),
         getreg32(A1X_INTC_RESP2));
-  lldbg("  FF:       %08x %08x %08x\n",
+  llerr("  FF:       %08x %08x %08x\n",
         getreg32(A1X_INTC_FF0),       getreg32(A1X_INTC_FF1),
         getreg32(A1X_INTC_FF2));
-  lldbg("  PRIO:     %08x %08x %08x %08x %08x\n",
+  llerr("  PRIO:     %08x %08x %08x %08x %08x\n",
         getreg32(A1X_INTC_PRIO0),     getreg32(A1X_INTC_PRIO1),
         getreg32(A1X_INTC_PRIO2),     getreg32(A1X_INTC_PRIO3),
         getreg32(A1X_INTC_PRIO4));
diff --git a/arch/arm/src/a1x/a1x_serial.c b/arch/arm/src/a1x/a1x_serial.c
index 00c484bab9..3ae955a99d 100644
--- a/arch/arm/src/a1x/a1x_serial.c
+++ b/arch/arm/src/a1x/a1x_serial.c
@@ -1192,7 +1192,7 @@ static int uart_interrupt(struct uart_dev_s *dev)
 
           default:
             {
-              lldbg("Unexpected IIR: %02x\n", status);
+              llerr("Unexpected IIR: %02x\n", status);
               break;
             }
         }
diff --git a/arch/arm/src/arm/up_assert.c b/arch/arm/src/arm/up_assert.c
index 5e2aa0810d..f5e34f941f 100644
--- a/arch/arm/src/arm/up_assert.c
+++ b/arch/arm/src/arm/up_assert.c
@@ -81,7 +81,7 @@
  * code.  We are going to print the task name if:
  *
  *  CONFIG_TASK_NAME_SIZE > 0 &&    <-- The task has a name
- *  (defined(CONFIG_DEBUG_FEATURES)    ||    <-- And the debug is enabled (lldbg used)
+ *  (defined(CONFIG_DEBUG_FEATURES)    ||    <-- And the debug is enabled (llerr used)
  *   defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used
  */
 
@@ -127,7 +127,7 @@ static void up_stackdump(uint32_t sp, uint32_t stack_base)
   for (stack = sp & ~0x1f; stack < stack_base; stack += 32)
     {
       uint32_t *ptr = (uint32_t *)stack;
-      lldbg("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      llerr("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
              stack, ptr[0], ptr[1], ptr[2], ptr[3],
              ptr[4], ptr[5], ptr[6], ptr[7]);
     }
@@ -154,12 +154,12 @@ static inline void up_registerdump(void)
       for (regs = REG_R0; regs <= REG_R15; regs += 8)
         {
           uint32_t *ptr = (uint32_t *)&CURRENT_REGS[regs];
-          lldbg("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+          llerr("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n",
                  regs, ptr[0], ptr[1], ptr[2], ptr[3],
                  ptr[4], ptr[5], ptr[6], ptr[7]);
         }
 
-      lldbg("CPSR: %08x\n", CURRENT_REGS[REG_CPSR]);
+      llerr("CPSR: %08x\n", CURRENT_REGS[REG_CPSR]);
     }
 }
 #else
@@ -228,12 +228,12 @@ static void up_dumpstate(void)
 
   /* Show interrupt stack info */
 
-  lldbg("sp:     %08x\n", sp);
-  lldbg("IRQ stack:\n");
-  lldbg("  base: %08x\n", istackbase);
-  lldbg("  size: %08x\n", istacksize);
+  llerr("sp:     %08x\n", sp);
+  llerr("IRQ stack:\n");
+  llerr("  base: %08x\n", istackbase);
+  llerr("  size: %08x\n", istacksize);
 #ifdef CONFIG_STACK_COLORATION
-  lldbg("  used: %08x\n", up_check_intstack());
+  llerr("  used: %08x\n", up_check_intstack());
 #endif
 
   /* Does the current stack pointer lie within the interrupt
@@ -251,24 +251,24 @@ static void up_dumpstate(void)
        */
 
       sp = g_intstackbase;
-      lldbg("sp:     %08x\n", sp);
+      llerr("sp:     %08x\n", sp);
     }
 
   /* Show user stack info */
 
-  lldbg("User stack:\n");
-  lldbg("  base: %08x\n", ustackbase);
-  lldbg("  size: %08x\n", ustacksize);
+  llerr("User stack:\n");
+  llerr("  base: %08x\n", ustackbase);
+  llerr("  size: %08x\n", ustacksize);
 #ifdef CONFIG_STACK_COLORATION
-  lldbg("  used: %08x\n", up_check_tcbstack(rtcb));
+  llerr("  used: %08x\n", up_check_tcbstack(rtcb));
 #endif
 
 #else
-  lldbg("sp:         %08x\n", sp);
-  lldbg("stack base: %08x\n", ustackbase);
-  lldbg("stack size: %08x\n", ustacksize);
+  llerr("sp:         %08x\n", sp);
+  llerr("stack base: %08x\n", ustackbase);
+  llerr("stack size: %08x\n", ustacksize);
 #ifdef CONFIG_STACK_COLORATION
-  lldbg("stack used: %08x\n", up_check_tcbstack(rtcb));
+  llerr("stack used: %08x\n", up_check_tcbstack(rtcb));
 #endif
 #endif
 
@@ -279,7 +279,7 @@ static void up_dumpstate(void)
   if (sp > ustackbase || sp <= ustackbase - ustacksize)
     {
 #if !defined(CONFIG_ARCH_INTERRUPTSTACK) || CONFIG_ARCH_INTERRUPTSTACK < 4
-      lldbg("ERROR: Stack pointer is not within allocated stack\n");
+      llerr("ERROR: Stack pointer is not within allocated stack\n");
 #endif
     }
   else
@@ -346,10 +346,10 @@ void up_assert(const uint8_t *filename, int lineno)
   board_autoled_on(LED_ASSERTION);
 
 #ifdef CONFIG_PRINT_TASKNAME
-  lldbg("Assertion failed at file:%s line: %d task: %s\n",
+  llerr("Assertion failed at file:%s line: %d task: %s\n",
         filename, lineno, rtcb->name);
 #else
-  lldbg("Assertion failed at file:%s line: %d\n",
+  llerr("Assertion failed at file:%s line: %d\n",
         filename, lineno);
 #endif
 
diff --git a/arch/arm/src/arm/up_dataabort.c b/arch/arm/src/arm/up_dataabort.c
index 2306d80713..264eb5324d 100644
--- a/arch/arm/src/arm/up_dataabort.c
+++ b/arch/arm/src/arm/up_dataabort.c
@@ -131,7 +131,7 @@ void up_dataabort(uint32_t *regs, uint32_t far, uint32_t fsr)
    * fatal error.
    */
 
-  pglldbg("FSR: %08x FAR: %08x\n", fsr, far);
+  pgllerr("FSR: %08x FAR: %08x\n", fsr, far);
   if ((fsr & FSR_MASK) != FSR_PAGE)
     {
       goto segfault;
@@ -180,7 +180,7 @@ void up_dataabort(uint32_t *regs, uint32_t far, uint32_t fsr)
 
 segfault:
 #endif
-  lldbg("Data abort. PC: %08x FAR: %08x FSR: %08x\n", regs[REG_PC], far, fsr);
+  llerr("Data abort. PC: %08x FAR: %08x FSR: %08x\n", regs[REG_PC], far, fsr);
   PANIC();
 }
 
@@ -196,7 +196,7 @@ void up_dataabort(uint32_t *regs)
 
   /* Crash -- possibly showing diagnost debug information. */
 
-  lldbg("Data abort. PC: %08x\n", regs[REG_PC]);
+  llerr("Data abort. PC: %08x\n", regs[REG_PC]);
   PANIC();
 }
 
diff --git a/arch/arm/src/arm/up_prefetchabort.c b/arch/arm/src/arm/up_prefetchabort.c
index 995fedd1be..cbe91d130c 100644
--- a/arch/arm/src/arm/up_prefetchabort.c
+++ b/arch/arm/src/arm/up_prefetchabort.c
@@ -110,7 +110,7 @@ void up_prefetchabort(uint32_t *regs)
    * virtual addresses.
    */
 
-  pglldbg("VADDR: %08x VBASE: %08x VEND: %08x\n",
+  pgllerr("VADDR: %08x VBASE: %08x VEND: %08x\n",
           regs[REG_PC], PG_PAGED_VBASE, PG_PAGED_VEND);
 
   if (regs[REG_R15] >= PG_PAGED_VBASE && regs[REG_R15] < PG_PAGED_VEND)
@@ -148,7 +148,7 @@ void up_prefetchabort(uint32_t *regs)
   else
 #endif
     {
-      lldbg("Prefetch abort. PC: %08x\n", regs[REG_PC]);
+      llerr("Prefetch abort. PC: %08x\n", regs[REG_PC]);
       PANIC();
     }
 }
diff --git a/arch/arm/src/arm/up_releasepending.c b/arch/arm/src/arm/up_releasepending.c
index 4defb895e0..99bf93f6f7 100644
--- a/arch/arm/src/arm/up_releasepending.c
+++ b/arch/arm/src/arm/up_releasepending.c
@@ -67,7 +67,7 @@ void up_release_pending(void)
 {
   struct tcb_s *rtcb = this_task();
 
-  slldbg("From TCB=%p\n", rtcb);
+  sllerr("From TCB=%p\n", rtcb);
 
   /* Merge the g_pendingtasks list into the ready-to-run task list */
 
diff --git a/arch/arm/src/arm/up_reprioritizertr.c b/arch/arm/src/arm/up_reprioritizertr.c
index 8f6b739d08..7d6015cccb 100644
--- a/arch/arm/src/arm/up_reprioritizertr.c
+++ b/arch/arm/src/arm/up_reprioritizertr.c
@@ -95,7 +95,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
       struct tcb_s *rtcb = this_task();
       bool switch_needed;
 
-      slldbg("TCB=%p PRI=%d\n", tcb, priority);
+      sllerr("TCB=%p PRI=%d\n", tcb, priority);
 
       /* Remove the tcb task from the ready-to-run list.
        * sched_removereadytorun will return true if we just
diff --git a/arch/arm/src/arm/up_syscall.c b/arch/arm/src/arm/up_syscall.c
index 498f702281..1493163120 100644
--- a/arch/arm/src/arm/up_syscall.c
+++ b/arch/arm/src/arm/up_syscall.c
@@ -93,7 +93,7 @@
 
 void up_syscall(uint32_t *regs)
 {
-  lldbg("Syscall from 0x%x\n", regs[REG_PC]);
+  llerr("Syscall from 0x%x\n", regs[REG_PC]);
   CURRENT_REGS = regs;
   PANIC();
 }
diff --git a/arch/arm/src/arm/up_undefinedinsn.c b/arch/arm/src/arm/up_undefinedinsn.c
index 4c242126bb..a51d972a2e 100644
--- a/arch/arm/src/arm/up_undefinedinsn.c
+++ b/arch/arm/src/arm/up_undefinedinsn.c
@@ -80,7 +80,7 @@
 
 void up_undefinedinsn(uint32_t *regs)
 {
-  lldbg("Undefined instruction at 0x%x\n", regs[REG_PC]);
+  llerr("Undefined instruction at 0x%x\n", regs[REG_PC]);
   CURRENT_REGS = regs;
   PANIC();
 }
diff --git a/arch/arm/src/armv6-m/up_assert.c b/arch/arm/src/armv6-m/up_assert.c
index 4c391ed848..c32628a302 100644
--- a/arch/arm/src/armv6-m/up_assert.c
+++ b/arch/arm/src/armv6-m/up_assert.c
@@ -80,7 +80,7 @@
  * code.  We are going to print the task name if:
  *
  *  CONFIG_TASK_NAME_SIZE > 0 &&       <-- The task has a name
- *  (defined(CONFIG_DEBUG_FEATURES) || <-- And the debug is enabled (lldbg used)
+ *  (defined(CONFIG_DEBUG_FEATURES) || <-- And the debug is enabled (llerr used)
  *   defined(CONFIG_ARCH_STACKDUMP)    <-- Or lowsyslog() is used
  */
 
@@ -126,7 +126,7 @@ static void up_stackdump(uint32_t sp, uint32_t stack_base)
   for (stack = sp & ~0x1f; stack < stack_base; stack += 32)
     {
       uint32_t *ptr = (uint32_t *)stack;
-      lldbg("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      llerr("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
              stack, ptr[0], ptr[1], ptr[2], ptr[3],
              ptr[4], ptr[5], ptr[6], ptr[7]);
     }
@@ -145,11 +145,11 @@ static void up_taskdump(FAR struct tcb_s *tcb, FAR void *arg)
   /* Dump interesting properties of this task */
 
 #ifdef CONFIG_PRINT_TASKNAME
-  lldbg("%s: PID=%d Stack Used=%lu of %lu\n",
+  llerr("%s: PID=%d Stack Used=%lu of %lu\n",
         tcb->name, tcb->pid, (unsigned long)up_check_tcbstack(tcb),
         (unsigned long)tcb->adj_stack_size);
 #else
-  lldbg("PID: %d Stack Used=%lu of %lu\n",
+  llerr("PID: %d Stack Used=%lu of %lu\n",
         tcb->pid, (unsigned long)up_check_tcbstack(tcb),
         (unsigned long)tcb->adj_stack_size);
 #endif
@@ -184,22 +184,22 @@ static inline void up_registerdump(void)
     {
       /* Yes.. dump the interrupt registers */
 
-      lldbg("R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      llerr("R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
             CURRENT_REGS[REG_R0],  CURRENT_REGS[REG_R1],
             CURRENT_REGS[REG_R2],  CURRENT_REGS[REG_R3],
             CURRENT_REGS[REG_R4],  CURRENT_REGS[REG_R5],
             CURRENT_REGS[REG_R6],  CURRENT_REGS[REG_R7]);
-      lldbg("R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      llerr("R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
             CURRENT_REGS[REG_R8],  CURRENT_REGS[REG_R9],
             CURRENT_REGS[REG_R10], CURRENT_REGS[REG_R11],
             CURRENT_REGS[REG_R12], CURRENT_REGS[REG_R13],
             CURRENT_REGS[REG_R14], CURRENT_REGS[REG_R15]);
 #ifdef CONFIG_BUILD_PROTECTED
-      lldbg("xPSR: %08x PRIMASK: %08x EXEC_RETURN: %08x\n",
+      llerr("xPSR: %08x PRIMASK: %08x EXEC_RETURN: %08x\n",
             CURRENT_REGS[REG_XPSR], CURRENT_REGS[REG_PRIMASK],
             CURRENT_REGS[REG_EXC_RETURN]);
 #else
-      lldbg("xPSR: %08x PRIMASK: %08x\n",
+      llerr("xPSR: %08x PRIMASK: %08x\n",
             CURRENT_REGS[REG_XPSR], CURRENT_REGS[REG_PRIMASK]);
 #endif
     }
@@ -270,12 +270,12 @@ static void up_dumpstate(void)
 
   /* Show interrupt stack info */
 
-  lldbg("sp:     %08x\n", sp);
-  lldbg("IRQ stack:\n");
-  lldbg("  base: %08x\n", istackbase);
-  lldbg("  size: %08x\n", istacksize);
+  llerr("sp:     %08x\n", sp);
+  llerr("IRQ stack:\n");
+  llerr("  base: %08x\n", istackbase);
+  llerr("  size: %08x\n", istacksize);
 #ifdef CONFIG_STACK_COLORATION
-  lldbg("  used: %08x\n", up_check_intstack());
+  llerr("  used: %08x\n", up_check_intstack());
 #endif
 
   /* Does the current stack pointer lie within the interrupt
@@ -297,14 +297,14 @@ static void up_dumpstate(void)
   if (CURRENT_REGS)
     {
       sp = CURRENT_REGS[REG_R13];
-      lldbg("sp:     %08x\n", sp);
+      llerr("sp:     %08x\n", sp);
     }
 
-  lldbg("User stack:\n");
-  lldbg("  base: %08x\n", ustackbase);
-  lldbg("  size: %08x\n", ustacksize);
+  llerr("User stack:\n");
+  llerr("  base: %08x\n", ustackbase);
+  llerr("  size: %08x\n", ustacksize);
 #ifdef CONFIG_STACK_COLORATION
-  lldbg("  used: %08x\n", up_check_tcbstack(rtcb));
+  llerr("  used: %08x\n", up_check_tcbstack(rtcb));
 #endif
 
   /* Dump the user stack if the stack pointer lies within the allocated user
@@ -317,11 +317,11 @@ static void up_dumpstate(void)
     }
 
 #else
-  lldbg("sp:         %08x\n", sp);
-  lldbg("stack base: %08x\n", ustackbase);
-  lldbg("stack size: %08x\n", ustacksize);
+  llerr("sp:         %08x\n", sp);
+  llerr("stack base: %08x\n", ustackbase);
+  llerr("stack size: %08x\n", ustacksize);
 #ifdef CONFIG_STACK_COLORATION
-  lldbg("stack used: %08x\n", up_check_tcbstack(rtcb));
+  llerr("stack used: %08x\n", up_check_tcbstack(rtcb));
 #endif
 
   /* Dump the user stack if the stack pointer lies within the allocated user
@@ -330,7 +330,7 @@ static void up_dumpstate(void)
 
   if (sp > ustackbase || sp <= ustackbase - ustacksize)
     {
-      lldbg("ERROR: Stack pointer is not within allocated stack\n");
+      llerr("ERROR: Stack pointer is not within allocated stack\n");
     }
   else
     {
@@ -401,10 +401,10 @@ void up_assert(const uint8_t *filename, int lineno)
   board_autoled_on(LED_ASSERTION);
 
 #ifdef CONFIG_PRINT_TASKNAME
-  lldbg("Assertion failed at file:%s line: %d task: %s\n",
+  llerr("Assertion failed at file:%s line: %d task: %s\n",
         filename, lineno, rtcb->name);
 #else
-  lldbg("Assertion failed at file:%s line: %d\n",
+  llerr("Assertion failed at file:%s line: %d\n",
         filename, lineno);
 #endif
 
diff --git a/arch/arm/src/armv6-m/up_dumpnvic.c b/arch/arm/src/armv6-m/up_dumpnvic.c
index 3e67f44372..a5746d5829 100644
--- a/arch/arm/src/armv6-m/up_dumpnvic.c
+++ b/arch/arm/src/armv6-m/up_dumpnvic.c
@@ -83,25 +83,25 @@ void up_dumpnvic(FAR const char *msg)
 
   flags = enter_critical_section();
 
-  lldbg("NVIC: %s\n", msg);
-  lldbg("   ISER: %08x  ICER: %08x  ISPR: %08x  ICPR: %08x\n",
+  llerr("NVIC: %s\n", msg);
+  llerr("   ISER: %08x  ICER: %08x  ISPR: %08x  ICPR: %08x\n",
         getreg32(ARMV6M_NVIC_ISER), getreg32(ARMV6M_NVIC_ICER),
         getreg32(ARMV6M_NVIC_ISPR), getreg32(ARMV6M_NVIC_ICPR));
 
   for (i = 0 ; i < 8; i += 4)
     {
-      lldbg("   IPR%d: %08x  IPR%d: %08x  IPR%d: %08x  IPR%d: %08x\n",
+      llerr("   IPR%d: %08x  IPR%d: %08x  IPR%d: %08x  IPR%d: %08x\n",
             i,   getreg32(ARMV6M_NVIC_IPR(i)),
             i+1, getreg32(ARMV6M_NVIC_IPR(i+1)),
             i+2, getreg32(ARMV6M_NVIC_IPR(i+2)),
             i+3, getreg32(ARMV6M_NVIC_IPR(i+3)));
     }
 
-  lldbg("SYSCON:\n");
-  lldbg("  CPUID: %08x  ICSR: %08x AIRCR: %08x   SCR: %08x\n",
+  llerr("SYSCON:\n");
+  llerr("  CPUID: %08x  ICSR: %08x AIRCR: %08x   SCR: %08x\n",
         getreg32(ARMV6M_SYSCON_CPUID), getreg32(ARMV6M_SYSCON_ICSR),
         getreg32(ARMV6M_SYSCON_AIRCR), getreg32(ARMV6M_SYSCON_SCR));
-  lldbg("    CCR: %08x SHPR2: %08x SHPR3: %08x\n",
+  llerr("    CCR: %08x SHPR2: %08x SHPR3: %08x\n",
         getreg32(ARMV6M_SYSCON_CCR),   getreg32(ARMV6M_SYSCON_SHPR2),
         getreg32(ARMV6M_SYSCON_SHPR3));
 
diff --git a/arch/arm/src/armv6-m/up_hardfault.c b/arch/arm/src/armv6-m/up_hardfault.c
index edd1bab6a2..6260d4ac2c 100644
--- a/arch/arm/src/armv6-m/up_hardfault.c
+++ b/arch/arm/src/armv6-m/up_hardfault.c
@@ -55,7 +55,7 @@
  ****************************************************************************/
 
 #ifdef CONFIG_DEBUG_HARDFAULT
-# define hfdbg(format, ...) lldbg(format, ##__VA_ARGS__)
+# define hfdbg(format, ...) llerr(format, ##__VA_ARGS__)
 #else
 # define hfdbg(x...)
 #endif
@@ -149,7 +149,7 @@ int up_hardfault(int irq, FAR void *context)
 #endif
 
   (void)up_irq_save();
-  lldbg("PANIC!!! Hard fault\n");
+  llerr("PANIC!!! Hard fault\n");
   PANIC();
   return OK; /* Won't get here */
 }
diff --git a/arch/arm/src/armv6-m/up_releasepending.c b/arch/arm/src/armv6-m/up_releasepending.c
index c3e2d02ea7..6ac07736b5 100644
--- a/arch/arm/src/armv6-m/up_releasepending.c
+++ b/arch/arm/src/armv6-m/up_releasepending.c
@@ -66,7 +66,7 @@ void up_release_pending(void)
 {
   struct tcb_s *rtcb = this_task();
 
-  slldbg("From TCB=%p\n", rtcb);
+  sllerr("From TCB=%p\n", rtcb);
 
   /* Merge the g_pendingtasks list into the ready-to-run task list */
 
diff --git a/arch/arm/src/armv6-m/up_reprioritizertr.c b/arch/arm/src/armv6-m/up_reprioritizertr.c
index bd50b88b70..ff30d6b590 100644
--- a/arch/arm/src/armv6-m/up_reprioritizertr.c
+++ b/arch/arm/src/armv6-m/up_reprioritizertr.c
@@ -94,7 +94,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
       struct tcb_s *rtcb = this_task();
       bool switch_needed;
 
-      slldbg("TCB=%p PRI=%d\n", tcb, priority);
+      sllerr("TCB=%p PRI=%d\n", tcb, priority);
 
       /* Remove the tcb task from the ready-to-run list.
        * sched_removereadytorun will return true if we just removed the head
diff --git a/arch/arm/src/armv6-m/up_svcall.c b/arch/arm/src/armv6-m/up_svcall.c
index 45610c5cc0..da66f30461 100644
--- a/arch/arm/src/armv6-m/up_svcall.c
+++ b/arch/arm/src/armv6-m/up_svcall.c
@@ -69,7 +69,7 @@
  */
 
 #if defined(CONFIG_DEBUG_SYSCALL) || defined(CONFIG_DEBUG_SVCALL)
-# define svcdbg(format, ...) lldbg(format, ##__VA_ARGS__)
+# define svcdbg(format, ...) llerr(format, ##__VA_ARGS__)
 #else
 # define svcdbg(x...)
 #endif
@@ -471,7 +471,7 @@ int up_svcall(int irq, FAR void *context)
 
           regs[REG_R0] -= CONFIG_SYS_RESERVED;
 #else
-          slldbg("ERROR: Bad SYS call: %d\n", regs[REG_R0]);
+          sllerr("ERROR: Bad SYS call: %d\n", regs[REG_R0]);
 #endif
         }
         break;
diff --git a/arch/arm/src/armv7-a/arm_assert.c b/arch/arm/src/armv7-a/arm_assert.c
index 83191f510d..7132bf3ca5 100644
--- a/arch/arm/src/armv7-a/arm_assert.c
+++ b/arch/arm/src/armv7-a/arm_assert.c
@@ -79,7 +79,7 @@
  * code.  We are going to print the task name if:
  *
  *  CONFIG_TASK_NAME_SIZE > 0 &&    <-- The task has a name
- *  (defined(CONFIG_DEBUG_FEATURES)    ||    <-- And the debug is enabled (lldbg used)
+ *  (defined(CONFIG_DEBUG_FEATURES)    ||    <-- And the debug is enabled (llerr used)
  *   defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used
  */
 
@@ -121,7 +121,7 @@ static void up_stackdump(uint32_t sp, uint32_t stack_base)
   for (stack = sp & ~0x1f; stack < stack_base; stack += 32)
     {
       uint32_t *ptr = (uint32_t *)stack;
-      lldbg("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      llerr("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
              stack, ptr[0], ptr[1], ptr[2], ptr[3],
              ptr[4], ptr[5], ptr[6], ptr[7]);
     }
@@ -140,11 +140,11 @@ static void up_taskdump(FAR struct tcb_s *tcb, FAR void *arg)
   /* Dump interesting properties of this task */
 
 #ifdef CONFIG_PRINT_TASKNAME
-  lldbg("%s: PID=%d Stack Used=%lu of %lu\n",
+  llerr("%s: PID=%d Stack Used=%lu of %lu\n",
         tcb->name, tcb->pid, (unsigned long)up_check_tcbstack(tcb),
         (unsigned long)tcb->adj_stack_size);
 #else
-  lldbg("PID: %d Stack Used=%lu of %lu\n",
+  llerr("PID: %d Stack Used=%lu of %lu\n",
         tcb->pid, (unsigned long)up_check_tcbstack(tcb),
         (unsigned long)tcb->adj_stack_size);
 #endif
@@ -184,12 +184,12 @@ static inline void up_registerdump(void)
       for (regs = REG_R0; regs <= REG_R15; regs += 8)
         {
           uint32_t *ptr = (uint32_t *)&CURRENT_REGS[regs];
-          lldbg("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+          llerr("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n",
                  regs, ptr[0], ptr[1], ptr[2], ptr[3],
                  ptr[4], ptr[5], ptr[6], ptr[7]);
         }
 
-      lldbg("CPSR: %08x\n", CURRENT_REGS[REG_CPSR]);
+      llerr("CPSR: %08x\n", CURRENT_REGS[REG_CPSR]);
     }
 }
 #else
@@ -253,7 +253,7 @@ static void up_dumpstate(void)
       ustacksize = (uint32_t)rtcb->adj_stack_size;
     }
 
-  lldbg("Current sp: %08x\n", sp);
+  llerr("Current sp: %08x\n", sp);
 
 #if CONFIG_ARCH_INTERRUPTSTACK > 3
   /* Get the limits on the interrupt stack memory */
@@ -263,21 +263,21 @@ static void up_dumpstate(void)
 
   /* Show interrupt stack info */
 
-  lldbg("Interrupt stack:\n");
-  lldbg("  base: %08x\n", istackbase);
-  lldbg("  size: %08x\n", istacksize);
+  llerr("Interrupt stack:\n");
+  llerr("  base: %08x\n", istackbase);
+  llerr("  size: %08x\n", istacksize);
 #ifdef CONFIG_STACK_COLORATION
-  lldbg("  used: %08x\n", up_check_intstack());
+  llerr("  used: %08x\n", up_check_intstack());
 #endif
 #endif
 
   /* Show user stack info */
 
-  lldbg("User stack:\n");
-  lldbg("  base: %08x\n", ustackbase);
-  lldbg("  size: %08x\n", ustacksize);
+  llerr("User stack:\n");
+  llerr("  base: %08x\n", ustackbase);
+  llerr("  size: %08x\n", ustacksize);
 #ifdef CONFIG_STACK_COLORATION
-  lldbg("  used: %08x\n", up_check_tcbstack(rtcb));
+  llerr("  used: %08x\n", up_check_tcbstack(rtcb));
 #endif
 
 #ifdef CONFIG_ARCH_KERNEL_STACK
@@ -287,9 +287,9 @@ static void up_dumpstate(void)
     {
       kstackbase = (uint32_t)rtcb->xcp.kstack + CONFIG_ARCH_KERNEL_STACKSIZE - 4;
 
-      lldbg("Kernel stack:\n");
-      lldbg("  base: %08x\n", kstackbase);
-      lldbg("  size: %08x\n", CONFIG_ARCH_KERNEL_STACKSIZE);
+      llerr("Kernel stack:\n");
+      llerr("  base: %08x\n", kstackbase);
+      llerr("  size: %08x\n", CONFIG_ARCH_KERNEL_STACKSIZE);
     }
 #endif
 
@@ -300,7 +300,7 @@ static void up_dumpstate(void)
     {
       /* Yes.. dump the interrupt stack */
 
-      lldbg("Interrupt Stack\n", sp);
+      llerr("Interrupt Stack\n", sp);
       up_stackdump(sp, istackbase);
 
       /* Extract the user stack pointer which should lie
@@ -308,7 +308,7 @@ static void up_dumpstate(void)
        */
 
       sp = g_intstackbase;
-      lldbg("User sp: %08x\n", sp);
+      llerr("User sp: %08x\n", sp);
     }
 #endif
 
@@ -318,7 +318,7 @@ static void up_dumpstate(void)
 
   if (sp > ustackbase - ustacksize && sp < ustackbase)
     {
-      lldbg("User Stack\n", sp);
+      llerr("User Stack\n", sp);
       up_stackdump(sp, ustackbase);
     }
 
@@ -329,7 +329,7 @@ static void up_dumpstate(void)
 
   if (sp >= (uint32_t)rtcb->xcp.kstack && sp < kstackbase)
     {
-      lldbg("Kernel Stack\n", sp);
+      llerr("Kernel Stack\n", sp);
       up_stackdump(sp, kstackbase);
     }
 #endif
@@ -337,7 +337,7 @@ static void up_dumpstate(void)
 #ifdef CONFIG_SMP
   /* Show the CPU number */
 
-  lldbg("CPU%d:\n", up_cpu_index());
+  llerr("CPU%d:\n", up_cpu_index());
 #endif
 
   /* Then dump the CPU registers (if available) */
@@ -402,10 +402,10 @@ void up_assert(const uint8_t *filename, int lineno)
   board_autoled_on(LED_ASSERTION);
 
 #ifdef CONFIG_PRINT_TASKNAME
-  lldbg("Assertion failed at file:%s line: %d task: %s\n",
+  llerr("Assertion failed at file:%s line: %d task: %s\n",
         filename, lineno, rtcb->name);
 #else
-  lldbg("Assertion failed at file:%s line: %d\n",
+  llerr("Assertion failed at file:%s line: %d\n",
         filename, lineno);
 #endif
   up_dumpstate();
diff --git a/arch/arm/src/armv7-a/arm_cpustart.c b/arch/arm/src/armv7-a/arm_cpustart.c
index cec904e2df..30653ed197 100644
--- a/arch/arm/src/armv7-a/arm_cpustart.c
+++ b/arch/arm/src/armv7-a/arm_cpustart.c
@@ -64,19 +64,19 @@ static inline void arm_registerdump(FAR struct tcb_s *tcb)
 {
   int regndx;
 
-  lldbg("CPU%d:\n", up_cpu_index());
+  llerr("CPU%d:\n", up_cpu_index());
 
   /* Dump the startup registers */
 
   for (regndx = REG_R0; regndx <= REG_R15; regndx += 8)
     {
       uint32_t *ptr = (uint32_t *)&tcb->xcp.regs[regndx];
-      lldbg("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      llerr("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n",
              regndx, ptr[0], ptr[1], ptr[2], ptr[3],
              ptr[4], ptr[5], ptr[6], ptr[7]);
     }
 
-  lldbg("CPSR: %08x\n", tcb->xcp.regs[REG_CPSR]);
+  llerr("CPSR: %08x\n", tcb->xcp.regs[REG_CPSR]);
 }
 #else
 # define arm_registerdump(tcb)
diff --git a/arch/arm/src/armv7-a/arm_dataabort.c b/arch/arm/src/armv7-a/arm_dataabort.c
index 927ace3360..033d0473c6 100644
--- a/arch/arm/src/armv7-a/arm_dataabort.c
+++ b/arch/arm/src/armv7-a/arm_dataabort.c
@@ -115,7 +115,7 @@ uint32_t *arm_dataabort(uint32_t *regs, uint32_t dfar, uint32_t dfsr)
    * fatal error.
    */
 
-  pglldbg("DFSR: %08x DFAR: %08x\n", dfsr, dfar);
+  pgllerr("DFSR: %08x DFAR: %08x\n", dfsr, dfar);
   if ((dfsr & FSR_MASK) != FSR_PAGE)
     {
       goto segfault;
@@ -163,7 +163,7 @@ uint32_t *arm_dataabort(uint32_t *regs, uint32_t dfar, uint32_t dfsr)
   return regs;
 
 segfault:
-  lldbg("Data abort. PC: %08x DFAR: %08x DFSR: %08x\n",
+  llerr("Data abort. PC: %08x DFAR: %08x DFSR: %08x\n",
         regs[REG_PC], dfar, dfsr);
   PANIC();
   return regs; /* To keep the compiler happy */
@@ -181,7 +181,7 @@ uint32_t *arm_dataabort(uint32_t *regs, uint32_t dfar, uint32_t dfsr)
 
   /* Crash -- possibly showing diagnostic debug information. */
 
-  lldbg("Data abort. PC: %08x DFAR: %08x DFSR: %08x\n",
+  llerr("Data abort. PC: %08x DFAR: %08x DFSR: %08x\n",
         regs[REG_PC], dfar, dfsr);
   PANIC();
   return regs; /* To keep the compiler happy */
diff --git a/arch/arm/src/armv7-a/arm_l2cc_pl310.c b/arch/arm/src/armv7-a/arm_l2cc_pl310.c
index 64aeaf3b8b..1b88cca350 100644
--- a/arch/arm/src/armv7-a/arm_l2cc_pl310.c
+++ b/arch/arm/src/armv7-a/arm_l2cc_pl310.c
@@ -411,7 +411,7 @@ void up_l2ccinitialize(void)
       putreg32(L2CC_CR_L2CEN, L2CC_CR);
     }
 
-  lldbg("(%d ways) * (%d bytes/way) = %d bytes\n",
+  llerr("(%d ways) * (%d bytes/way) = %d bytes\n",
         PL310_NWAYS, PL310_WAYSIZE, PL310_CACHE_SIZE);
 }
 
diff --git a/arch/arm/src/armv7-a/arm_prefetchabort.c b/arch/arm/src/armv7-a/arm_prefetchabort.c
index 18f37557fb..f65286f2aa 100644
--- a/arch/arm/src/armv7-a/arm_prefetchabort.c
+++ b/arch/arm/src/armv7-a/arm_prefetchabort.c
@@ -97,7 +97,7 @@ uint32_t *arm_prefetchabort(uint32_t *regs, uint32_t ifar, uint32_t ifsr)
    * virtual addresses.
    */
 
-  pglldbg("VADDR: %08x VBASE: %08x VEND: %08x\n",
+  pgllerr("VADDR: %08x VBASE: %08x VEND: %08x\n",
           regs[REG_PC], PG_PAGED_VBASE, PG_PAGED_VEND);
 
   if (regs[REG_R15] >= PG_PAGED_VBASE && regs[REG_R15] < PG_PAGED_VEND)
@@ -134,7 +134,7 @@ uint32_t *arm_prefetchabort(uint32_t *regs, uint32_t ifar, uint32_t ifsr)
     }
   else
     {
-      lldbg("Prefetch abort. PC: %08x IFAR: %08x IFSR: %08x\n",
+      llerr("Prefetch abort. PC: %08x IFAR: %08x IFSR: %08x\n",
             regs[REG_PC], ifar, ifsr);
       PANIC();
     }
@@ -154,7 +154,7 @@ uint32_t *arm_prefetchabort(uint32_t *regs, uint32_t ifar, uint32_t ifsr)
 
   /* Crash -- possibly showing diagnostic debug information. */
 
-  lldbg("Prefetch abort. PC: %08x IFAR: %08x IFSR: %08x\n",
+  llerr("Prefetch abort. PC: %08x IFAR: %08x IFSR: %08x\n",
         regs[REG_PC], ifar, ifsr);
   PANIC();
   return regs; /* To keep the compiler happy */
diff --git a/arch/arm/src/armv7-a/arm_releasepending.c b/arch/arm/src/armv7-a/arm_releasepending.c
index 9696e931c0..b2e36821b1 100644
--- a/arch/arm/src/armv7-a/arm_releasepending.c
+++ b/arch/arm/src/armv7-a/arm_releasepending.c
@@ -67,7 +67,7 @@ void up_release_pending(void)
 {
   struct tcb_s *rtcb = this_task();
 
-  slldbg("From TCB=%p\n", rtcb);
+  sllerr("From TCB=%p\n", rtcb);
 
   /* Merge the g_pendingtasks list into the ready-to-run task list */
 
diff --git a/arch/arm/src/armv7-a/arm_reprioritizertr.c b/arch/arm/src/armv7-a/arm_reprioritizertr.c
index d4b2699f6d..468e382779 100644
--- a/arch/arm/src/armv7-a/arm_reprioritizertr.c
+++ b/arch/arm/src/armv7-a/arm_reprioritizertr.c
@@ -95,7 +95,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
       struct tcb_s *rtcb = this_task();
       bool switch_needed;
 
-      slldbg("TCB=%p PRI=%d\n", tcb, priority);
+      sllerr("TCB=%p PRI=%d\n", tcb, priority);
 
       /* Remove the tcb task from the ready-to-run list.
        * sched_removereadytorun will return true if we just
diff --git a/arch/arm/src/armv7-a/arm_syscall.c b/arch/arm/src/armv7-a/arm_syscall.c
index fbaf5f5e18..d6845595f6 100644
--- a/arch/arm/src/armv7-a/arm_syscall.c
+++ b/arch/arm/src/armv7-a/arm_syscall.c
@@ -71,7 +71,7 @@
 /* Debug ********************************************************************/
 
 #if defined(CONFIG_DEBUG_SYSCALL)
-# define svcdbg(format, ...) lldbg(format, ##__VA_ARGS__)
+# define svcdbg(format, ...) llerr(format, ##__VA_ARGS__)
 #else
 # define svcdbg(x...)
 #endif
@@ -526,7 +526,7 @@ uint32_t *arm_syscall(uint32_t *regs)
 
 uint32_t *arm_syscall(uint32_t *regs)
 {
-  lldbg("SYSCALL from 0x%x\n", regs[REG_PC]);
+  llerr("SYSCALL from 0x%x\n", regs[REG_PC]);
   CURRENT_REGS = regs;
   PANIC();
 }
diff --git a/arch/arm/src/armv7-a/arm_undefinedinsn.c b/arch/arm/src/armv7-a/arm_undefinedinsn.c
index 5b93bbd6cd..34081e11a0 100644
--- a/arch/arm/src/armv7-a/arm_undefinedinsn.c
+++ b/arch/arm/src/armv7-a/arm_undefinedinsn.c
@@ -68,7 +68,7 @@
 
 uint32_t *arm_undefinedinsn(uint32_t *regs)
 {
-  lldbg("Undefined instruction at 0x%x\n", regs[REG_PC]);
+  llerr("Undefined instruction at 0x%x\n", regs[REG_PC]);
   CURRENT_REGS = regs;
   PANIC();
   return regs; /* To keep the compiler happy */
diff --git a/arch/arm/src/armv7-a/gic.h b/arch/arm/src/armv7-a/gic.h
index 9bddaa06ae..0e0220e75b 100644
--- a/arch/arm/src/armv7-a/gic.h
+++ b/arch/arm/src/armv7-a/gic.h
@@ -595,12 +595,12 @@
 
 #ifdef CONFIG_DEBUG_IRQ
 #  define gicdbg(format, ...)    dbg(format, ##__VA_ARGS__)
-#  define giclldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
+#  define gicllerr(format, ...)  llerr(format, ##__VA_ARGS__)
 #  define gicinfo(format, ...)   info(format, ##__VA_ARGS__)
 #  define gicllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 #  define gicdbg(x...)
-#  define giclldbg(x...)
+#  define gicllerr(x...)
 #  define gicinfo(x...)
 #  define gicllinfo(x...)
 #endif
diff --git a/arch/arm/src/armv7-m/up_assert.c b/arch/arm/src/armv7-m/up_assert.c
index e7546d3d23..e94b64afb7 100644
--- a/arch/arm/src/armv7-m/up_assert.c
+++ b/arch/arm/src/armv7-m/up_assert.c
@@ -79,7 +79,7 @@
  * code.  We are going to print the task name if:
  *
  *  CONFIG_TASK_NAME_SIZE > 0 &&    <-- The task has a name
- *  (defined(CONFIG_DEBUG_FEATURES)    ||    <-- And the debug is enabled (lldbg used)
+ *  (defined(CONFIG_DEBUG_FEATURES)    ||    <-- And the debug is enabled (llerr used)
  *   defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used
  */
 
@@ -125,7 +125,7 @@ static void up_stackdump(uint32_t sp, uint32_t stack_base)
   for (stack = sp & ~0x1f; stack < stack_base; stack += 32)
     {
       uint32_t *ptr = (uint32_t *)stack;
-      lldbg("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      llerr("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
              stack, ptr[0], ptr[1], ptr[2], ptr[3],
              ptr[4], ptr[5], ptr[6], ptr[7]);
     }
@@ -144,11 +144,11 @@ static void up_taskdump(FAR struct tcb_s *tcb, FAR void *arg)
   /* Dump interesting properties of this task */
 
 #ifdef CONFIG_PRINT_TASKNAME
-  lldbg("%s: PID=%d Stack Used=%lu of %lu\n",
+  llerr("%s: PID=%d Stack Used=%lu of %lu\n",
         tcb->name, tcb->pid, (unsigned long)up_check_tcbstack(tcb),
         (unsigned long)tcb->adj_stack_size);
 #else
-  lldbg("PID: %d Stack Used=%lu of %lu\n",
+  llerr("PID: %d Stack Used=%lu of %lu\n",
         tcb->pid, (unsigned long)up_check_tcbstack(tcb),
         (unsigned long)tcb->adj_stack_size);
 #endif
@@ -183,29 +183,29 @@ static inline void up_registerdump(void)
     {
       /* Yes.. dump the interrupt registers */
 
-      lldbg("R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      llerr("R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
             CURRENT_REGS[REG_R0],  CURRENT_REGS[REG_R1],
             CURRENT_REGS[REG_R2],  CURRENT_REGS[REG_R3],
             CURRENT_REGS[REG_R4],  CURRENT_REGS[REG_R5],
             CURRENT_REGS[REG_R6],  CURRENT_REGS[REG_R7]);
-      lldbg("R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      llerr("R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
             CURRENT_REGS[REG_R8],  CURRENT_REGS[REG_R9],
             CURRENT_REGS[REG_R10], CURRENT_REGS[REG_R11],
             CURRENT_REGS[REG_R12], CURRENT_REGS[REG_R13],
             CURRENT_REGS[REG_R14], CURRENT_REGS[REG_R15]);
 
 #ifdef CONFIG_ARMV7M_USEBASEPRI
-      lldbg("xPSR: %08x BASEPRI: %08x CONTROL: %08x\n",
+      llerr("xPSR: %08x BASEPRI: %08x CONTROL: %08x\n",
             CURRENT_REGS[REG_XPSR],  CURRENT_REGS[REG_BASEPRI],
             getcontrol());
 #else
-      lldbg("xPSR: %08x PRIMASK: %08x CONTROL: %08x\n",
+      llerr("xPSR: %08x PRIMASK: %08x CONTROL: %08x\n",
             CURRENT_REGS[REG_XPSR],  CURRENT_REGS[REG_PRIMASK],
             getcontrol());
 #endif
 
 #ifdef REG_EXC_RETURN
-      lldbg("EXC_RETURN: %08x\n", CURRENT_REGS[REG_EXC_RETURN]);
+      llerr("EXC_RETURN: %08x\n", CURRENT_REGS[REG_EXC_RETURN]);
 #endif
     }
 }
@@ -275,12 +275,12 @@ static void up_dumpstate(void)
 
   /* Show interrupt stack info */
 
-  lldbg("sp:     %08x\n", sp);
-  lldbg("IRQ stack:\n");
-  lldbg("  base: %08x\n", istackbase);
-  lldbg("  size: %08x\n", istacksize);
+  llerr("sp:     %08x\n", sp);
+  llerr("IRQ stack:\n");
+  llerr("  base: %08x\n", istackbase);
+  llerr("  size: %08x\n", istacksize);
 #ifdef CONFIG_STACK_COLORATION
-  lldbg("  used: %08x\n", up_check_intstack());
+  llerr("  used: %08x\n", up_check_intstack());
 #endif
 
   /* Does the current stack pointer lie within the interrupt
@@ -302,14 +302,14 @@ static void up_dumpstate(void)
   if (CURRENT_REGS)
     {
       sp = CURRENT_REGS[REG_R13];
-      lldbg("sp:     %08x\n", sp);
+      llerr("sp:     %08x\n", sp);
     }
 
-  lldbg("User stack:\n");
-  lldbg("  base: %08x\n", ustackbase);
-  lldbg("  size: %08x\n", ustacksize);
+  llerr("User stack:\n");
+  llerr("  base: %08x\n", ustackbase);
+  llerr("  size: %08x\n", ustacksize);
 #ifdef CONFIG_STACK_COLORATION
-  lldbg("  used: %08x\n", up_check_tcbstack(rtcb));
+  llerr("  used: %08x\n", up_check_tcbstack(rtcb));
 #endif
 
   /* Dump the user stack if the stack pointer lies within the allocated user
@@ -325,11 +325,11 @@ static void up_dumpstate(void)
 
   /* Show user stack info */
 
-  lldbg("sp:         %08x\n", sp);
-  lldbg("stack base: %08x\n", ustackbase);
-  lldbg("stack size: %08x\n", ustacksize);
+  llerr("sp:         %08x\n", sp);
+  llerr("stack base: %08x\n", ustackbase);
+  llerr("stack size: %08x\n", ustacksize);
 #ifdef CONFIG_STACK_COLORATION
-  lldbg("stack used: %08x\n", up_check_tcbstack(rtcb));
+  llerr("stack used: %08x\n", up_check_tcbstack(rtcb));
 #endif
 
   /* Dump the user stack if the stack pointer lies within the allocated user
@@ -338,7 +338,7 @@ static void up_dumpstate(void)
 
   if (sp > ustackbase || sp <= ustackbase - ustacksize)
     {
-      lldbg("ERROR: Stack pointer is not within the allocated stack\n");
+      llerr("ERROR: Stack pointer is not within the allocated stack\n");
     }
   else
     {
@@ -410,10 +410,10 @@ void up_assert(const uint8_t *filename, int lineno)
   board_autoled_on(LED_ASSERTION);
 
 #ifdef CONFIG_PRINT_TASKNAME
-  lldbg("Assertion failed at file:%s line: %d task: %s\n",
+  llerr("Assertion failed at file:%s line: %d task: %s\n",
         filename, lineno, rtcb->name);
 #else
-  lldbg("Assertion failed at file:%s line: %d\n",
+  llerr("Assertion failed at file:%s line: %d\n",
         filename, lineno);
 #endif
 
diff --git a/arch/arm/src/armv7-m/up_hardfault.c b/arch/arm/src/armv7-m/up_hardfault.c
index 807d45cc43..e65f08534f 100644
--- a/arch/arm/src/armv7-m/up_hardfault.c
+++ b/arch/arm/src/armv7-m/up_hardfault.c
@@ -60,7 +60,7 @@
  */
 
 #ifdef CONFIG_DEBUG_HARDFAULT
-# define hfdbg(format, ...) lldbg(format, ##__VA_ARGS__)
+# define hfdbg(format, ...) llerr(format, ##__VA_ARGS__)
 #else
 # define hfdbg(x...)
 #endif
@@ -179,7 +179,7 @@ int up_hardfault(int irq, FAR void *context)
 #endif
 
   (void)up_irq_save();
-  lldbg("PANIC!!! Hard fault: %08x\n", getreg32(NVIC_HFAULTS));
+  llerr("PANIC!!! Hard fault: %08x\n", getreg32(NVIC_HFAULTS));
   PANIC();
   return OK;
 }
diff --git a/arch/arm/src/armv7-m/up_memfault.c b/arch/arm/src/armv7-m/up_memfault.c
index 145dba531d..40881f722c 100644
--- a/arch/arm/src/armv7-m/up_memfault.c
+++ b/arch/arm/src/armv7-m/up_memfault.c
@@ -55,7 +55,7 @@
 #undef DEBUG_MEMFAULTS         /* Define to debug memory management faults */
 
 #ifdef DEBUG_MEMFAULTS
-# define mfdbg(format, ...) lldbg(format, ##__VA_ARGS__)
+# define mfdbg(format, ...) llerr(format, ##__VA_ARGS__)
 #else
 # define mfdbg(x...)
 #endif
@@ -92,9 +92,9 @@ int up_memfault(int irq, FAR void *context)
   /* Dump some memory management fault info */
 
   (void)up_irq_save();
-  lldbg("PANIC!!! Memory Management Fault:\n");
+  llerr("PANIC!!! Memory Management Fault:\n");
   mfdbg("  IRQ: %d context: %p\n", irq, regs);
-  lldbg("  CFAULTS: %08x MMFAR: %08x\n",
+  llerr("  CFAULTS: %08x MMFAR: %08x\n",
         getreg32(NVIC_CFAULTS), getreg32(NVIC_MEMMANAGE_ADDR));
   mfdbg("  BASEPRI: %08x PRIMASK: %08x IPSR: %08x CONTROL: %08x\n",
         getbasepri(), getprimask(), getipsr(), getcontrol());
diff --git a/arch/arm/src/armv7-m/up_ramvec_attach.c b/arch/arm/src/armv7-m/up_ramvec_attach.c
index 03314616b6..60ba6e8590 100644
--- a/arch/arm/src/armv7-m/up_ramvec_attach.c
+++ b/arch/arm/src/armv7-m/up_ramvec_attach.c
@@ -54,12 +54,12 @@
  ****************************************************************************/
 /* Debug ********************************************************************/
 /* Non-standard debug that may be enabled just for testing the interrupt
- * config.  NOTE: that only lldbg types are used so that the output is
+ * config.  NOTE: that only llerr types are used so that the output is
  * immediately available.
  */
 
 #ifdef CONFIG_DEBUG_IRQ
-#  define intdbg    lldbg
+#  define intdbg    llerr
 #  define intinfo   llinfo
 #else
 #  define intdbg(x...)
diff --git a/arch/arm/src/armv7-m/up_ramvec_initialize.c b/arch/arm/src/armv7-m/up_ramvec_initialize.c
index 7cc11cfb02..9ff31cc902 100644
--- a/arch/arm/src/armv7-m/up_ramvec_initialize.c
+++ b/arch/arm/src/armv7-m/up_ramvec_initialize.c
@@ -73,12 +73,12 @@
 
 /* Debug ********************************************************************/
 /* Non-standard debug that may be enabled just for testing the interrupt
- * config.  NOTE: that only lldbg types are used so that the output is
+ * config.  NOTE: that only llerr types are used so that the output is
  * immediately available.
  */
 
 #ifdef CONFIG_DEBUG_IRQ
-#  define intdbg    lldbg
+#  define intdbg    llerr
 #  define intinfo   llinfo
 #else
 #  define intdbg(x...)
diff --git a/arch/arm/src/armv7-m/up_releasepending.c b/arch/arm/src/armv7-m/up_releasepending.c
index e9f4cceb33..489e3537e1 100644
--- a/arch/arm/src/armv7-m/up_releasepending.c
+++ b/arch/arm/src/armv7-m/up_releasepending.c
@@ -66,7 +66,7 @@ void up_release_pending(void)
 {
   struct tcb_s *rtcb = this_task();
 
-  slldbg("From TCB=%p\n", rtcb);
+  sllerr("From TCB=%p\n", rtcb);
 
   /* Merge the g_pendingtasks list into the ready-to-run task list */
 
diff --git a/arch/arm/src/armv7-m/up_reprioritizertr.c b/arch/arm/src/armv7-m/up_reprioritizertr.c
index d3415e7741..61b592be05 100644
--- a/arch/arm/src/armv7-m/up_reprioritizertr.c
+++ b/arch/arm/src/armv7-m/up_reprioritizertr.c
@@ -94,7 +94,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
       struct tcb_s *rtcb = this_task();
       bool switch_needed;
 
-      slldbg("TCB=%p PRI=%d\n", tcb, priority);
+      sllerr("TCB=%p PRI=%d\n", tcb, priority);
 
       /* Remove the tcb task from the ready-to-run list.
        * sched_removereadytorun will return true if we just removed the head
diff --git a/arch/arm/src/armv7-m/up_svcall.c b/arch/arm/src/armv7-m/up_svcall.c
index eb9f41b74f..d6f5cacdb8 100644
--- a/arch/arm/src/armv7-m/up_svcall.c
+++ b/arch/arm/src/armv7-m/up_svcall.c
@@ -70,7 +70,7 @@
  */
 
 #if defined(CONFIG_DEBUG_SYSCALL) || defined(CONFIG_DEBUG_SVCALL)
-# define svcdbg(format, ...) lldbg(format, ##__VA_ARGS__)
+# define svcdbg(format, ...) llerr(format, ##__VA_ARGS__)
 #else
 # define svcdbg(x...)
 #endif
@@ -473,7 +473,7 @@ int up_svcall(int irq, FAR void *context)
 
           regs[REG_R0] -= CONFIG_SYS_RESERVED;
 #else
-          slldbg("ERROR: Bad SYS call: %d\n", regs[REG_R0]);
+          sllerr("ERROR: Bad SYS call: %d\n", regs[REG_R0]);
 #endif
         }
         break;
diff --git a/arch/arm/src/armv7-r/arm_assert.c b/arch/arm/src/armv7-r/arm_assert.c
index 8ec701d9ad..40dec555cd 100644
--- a/arch/arm/src/armv7-r/arm_assert.c
+++ b/arch/arm/src/armv7-r/arm_assert.c
@@ -79,7 +79,7 @@
  * code.  We are going to print the task name if:
  *
  *  CONFIG_TASK_NAME_SIZE > 0 &&       <-- The task has a name
- *  (defined(CONFIG_DEBUG_FEATURES) || <-- And the debug is enabled (lldbg used)
+ *  (defined(CONFIG_DEBUG_FEATURES) || <-- And the debug is enabled (llerr used)
  *   defined(CONFIG_ARCH_STACKDUMP)    <-- Or lowsyslog() is used
  */
 
@@ -121,7 +121,7 @@ static void up_stackdump(uint32_t sp, uint32_t stack_base)
   for (stack = sp & ~0x1f; stack < stack_base; stack += 32)
     {
       uint32_t *ptr = (uint32_t *)stack;
-      lldbg("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      llerr("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
              stack, ptr[0], ptr[1], ptr[2], ptr[3],
              ptr[4], ptr[5], ptr[6], ptr[7]);
     }
@@ -140,11 +140,11 @@ static void up_taskdump(FAR struct tcb_s *tcb, FAR void *arg)
   /* Dump interesting properties of this task */
 
 #ifdef CONFIG_PRINT_TASKNAME
-  lldbg("%s: PID=%d Stack Used=%lu of %lu\n",
+  llerr("%s: PID=%d Stack Used=%lu of %lu\n",
         tcb->name, tcb->pid, (unsigned long)up_check_tcbstack(tcb),
         (unsigned long)tcb->adj_stack_size);
 #else
-  lldbg("PID: %d Stack Used=%lu of %lu\n",
+  llerr("PID: %d Stack Used=%lu of %lu\n",
         tcb->pid, (unsigned long)up_check_tcbstack(tcb),
         (unsigned long)tcb->adj_stack_size);
 #endif
@@ -184,12 +184,12 @@ static inline void up_registerdump(void)
       for (regs = REG_R0; regs <= REG_R15; regs += 8)
         {
           uint32_t *ptr = (uint32_t *)&CURRENT_REGS[regs];
-          lldbg("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+          llerr("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n",
                  regs, ptr[0], ptr[1], ptr[2], ptr[3],
                  ptr[4], ptr[5], ptr[6], ptr[7]);
         }
 
-      lldbg("CPSR: %08x\n", CURRENT_REGS[REG_CPSR]);
+      llerr("CPSR: %08x\n", CURRENT_REGS[REG_CPSR]);
     }
 }
 #else
@@ -253,7 +253,7 @@ static void up_dumpstate(void)
       ustacksize = (uint32_t)rtcb->adj_stack_size;
     }
 
-  lldbg("Current sp: %08x\n", sp);
+  llerr("Current sp: %08x\n", sp);
 
 #if CONFIG_ARCH_INTERRUPTSTACK > 3
   /* Get the limits on the interrupt stack memory */
@@ -263,21 +263,21 @@ static void up_dumpstate(void)
 
   /* Show interrupt stack info */
 
-  lldbg("Interrupt stack:\n");
-  lldbg("  base: %08x\n", istackbase);
-  lldbg("  size: %08x\n", istacksize);
+  llerr("Interrupt stack:\n");
+  llerr("  base: %08x\n", istackbase);
+  llerr("  size: %08x\n", istacksize);
 #ifdef CONFIG_STACK_COLORATION
-  lldbg("  used: %08x\n", up_check_intstack());
+  llerr("  used: %08x\n", up_check_intstack());
 #endif
 #endif
 
   /* Show user stack info */
 
-  lldbg("User stack:\n");
-  lldbg("  base: %08x\n", ustackbase);
-  lldbg("  size: %08x\n", ustacksize);
+  llerr("User stack:\n");
+  llerr("  base: %08x\n", ustackbase);
+  llerr("  size: %08x\n", ustacksize);
 #ifdef CONFIG_STACK_COLORATION
-  lldbg("  used: %08x\n", up_check_tcbstack(rtcb));
+  llerr("  used: %08x\n", up_check_tcbstack(rtcb));
 #endif
 
 #ifdef CONFIG_ARCH_KERNEL_STACK
@@ -287,9 +287,9 @@ static void up_dumpstate(void)
     {
       kstackbase = (uint32_t)rtcb->xcp.kstack + CONFIG_ARCH_KERNEL_STACKSIZE - 4;
 
-      lldbg("Kernel stack:\n");
-      lldbg("  base: %08x\n", kstackbase);
-      lldbg("  size: %08x\n", CONFIG_ARCH_KERNEL_STACKSIZE);
+      llerr("Kernel stack:\n");
+      llerr("  base: %08x\n", kstackbase);
+      llerr("  size: %08x\n", CONFIG_ARCH_KERNEL_STACKSIZE);
     }
 #endif
 
@@ -300,7 +300,7 @@ static void up_dumpstate(void)
     {
       /* Yes.. dump the interrupt stack */
 
-      lldbg("Interrupt Stack\n", sp);
+      llerr("Interrupt Stack\n", sp);
       up_stackdump(sp, istackbase);
 
       /* Extract the user stack pointer which should lie
@@ -308,7 +308,7 @@ static void up_dumpstate(void)
        */
 
       sp = g_intstackbase;
-      lldbg("User sp: %08x\n", sp);
+      llerr("User sp: %08x\n", sp);
     }
 #endif
 
@@ -318,7 +318,7 @@ static void up_dumpstate(void)
 
   if (sp > ustackbase - ustacksize && sp < ustackbase)
     {
-      lldbg("User Stack\n", sp);
+      llerr("User Stack\n", sp);
       up_stackdump(sp, ustackbase);
     }
 
@@ -329,7 +329,7 @@ static void up_dumpstate(void)
 
   if (sp >= (uint32_t)rtcb->xcp.kstack && sp < kstackbase)
     {
-      lldbg("Kernel Stack\n", sp);
+      llerr("Kernel Stack\n", sp);
       up_stackdump(sp, kstackbase);
     }
 #endif
@@ -396,10 +396,10 @@ void up_assert(const uint8_t *filename, int lineno)
   board_autoled_on(LED_ASSERTION);
 
 #ifdef CONFIG_PRINT_TASKNAME
-  lldbg("Assertion failed at file:%s line: %d task: %s\n",
+  llerr("Assertion failed at file:%s line: %d task: %s\n",
         filename, lineno, rtcb->name);
 #else
-  lldbg("Assertion failed at file:%s line: %d\n",
+  llerr("Assertion failed at file:%s line: %d\n",
         filename, lineno);
 #endif
   up_dumpstate();
diff --git a/arch/arm/src/armv7-r/arm_dataabort.c b/arch/arm/src/armv7-r/arm_dataabort.c
index cf2d73d438..802a67984a 100644
--- a/arch/arm/src/armv7-r/arm_dataabort.c
+++ b/arch/arm/src/armv7-r/arm_dataabort.c
@@ -86,7 +86,7 @@ uint32_t *arm_dataabort(uint32_t *regs, uint32_t dfar, uint32_t dfsr)
 
   /* Crash -- possibly showing diagnostic debug information. */
 
-  lldbg("Data abort. PC: %08x DFAR: %08x DFSR: %08x\n",
+  llerr("Data abort. PC: %08x DFAR: %08x DFSR: %08x\n",
         regs[REG_PC], dfar, dfsr);
   PANIC();
   return regs; /* To keep the compiler happy */
diff --git a/arch/arm/src/armv7-r/arm_l2cc_pl310.c b/arch/arm/src/armv7-r/arm_l2cc_pl310.c
index e019e70e95..e389c87e59 100644
--- a/arch/arm/src/armv7-r/arm_l2cc_pl310.c
+++ b/arch/arm/src/armv7-r/arm_l2cc_pl310.c
@@ -411,7 +411,7 @@ void up_l2ccinitialize(void)
       putreg32(L2CC_CR_L2CEN, L2CC_CR);
     }
 
-  lldbg("(%d ways) * (%d bytes/way) = %d bytes\n",
+  llerr("(%d ways) * (%d bytes/way) = %d bytes\n",
         PL310_NWAYS, PL310_WAYSIZE, PL310_CACHE_SIZE);
 }
 
diff --git a/arch/arm/src/armv7-r/arm_prefetchabort.c b/arch/arm/src/armv7-r/arm_prefetchabort.c
index ab7228eac2..26c1c052fe 100644
--- a/arch/arm/src/armv7-r/arm_prefetchabort.c
+++ b/arch/arm/src/armv7-r/arm_prefetchabort.c
@@ -82,7 +82,7 @@ uint32_t *arm_prefetchabort(uint32_t *regs, uint32_t ifar, uint32_t ifsr)
 
   /* Crash -- possibly showing diagnostic debug information. */
 
-  lldbg("Prefetch abort. PC: %08x IFAR: %08x IFSR: %08x\n",
+  llerr("Prefetch abort. PC: %08x IFAR: %08x IFSR: %08x\n",
         regs[REG_PC], ifar, ifsr);
   PANIC();
   return regs; /* To keep the compiler happy */
diff --git a/arch/arm/src/armv7-r/arm_releasepending.c b/arch/arm/src/armv7-r/arm_releasepending.c
index 8982708590..d65bc75be2 100644
--- a/arch/arm/src/armv7-r/arm_releasepending.c
+++ b/arch/arm/src/armv7-r/arm_releasepending.c
@@ -67,7 +67,7 @@ void up_release_pending(void)
 {
   struct tcb_s *rtcb = this_task();
 
-  slldbg("From TCB=%p\n", rtcb);
+  sllerr("From TCB=%p\n", rtcb);
 
   /* Merge the g_pendingtasks list into the ready-to-run task list */
 
diff --git a/arch/arm/src/armv7-r/arm_reprioritizertr.c b/arch/arm/src/armv7-r/arm_reprioritizertr.c
index 4fed13e8f2..192bff007d 100644
--- a/arch/arm/src/armv7-r/arm_reprioritizertr.c
+++ b/arch/arm/src/armv7-r/arm_reprioritizertr.c
@@ -95,7 +95,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
       struct tcb_s *rtcb = this_task();
       bool switch_needed;
 
-      slldbg("TCB=%p PRI=%d\n", tcb, priority);
+      sllerr("TCB=%p PRI=%d\n", tcb, priority);
 
       /* Remove the tcb task from the ready-to-run list.
        * sched_removereadytorun will return true if we just
diff --git a/arch/arm/src/armv7-r/arm_syscall.c b/arch/arm/src/armv7-r/arm_syscall.c
index c68ba0f798..ce4a60bb8b 100644
--- a/arch/arm/src/armv7-r/arm_syscall.c
+++ b/arch/arm/src/armv7-r/arm_syscall.c
@@ -69,7 +69,7 @@
 /* Debug ********************************************************************/
 
 #if defined(CONFIG_DEBUG_SYSCALL)
-# define svcdbg(format, ...) lldbg(format, ##__VA_ARGS__)
+# define svcdbg(format, ...) llerr(format, ##__VA_ARGS__)
 #else
 # define svcdbg(x...)
 #endif
@@ -524,7 +524,7 @@ uint32_t *arm_syscall(uint32_t *regs)
 
 uint32_t *arm_syscall(uint32_t *regs)
 {
-  lldbg("SYSCALL from 0x%x\n", regs[REG_PC]);
+  llerr("SYSCALL from 0x%x\n", regs[REG_PC]);
   CURRENT_REGS = regs;
   PANIC();
 }
diff --git a/arch/arm/src/armv7-r/arm_undefinedinsn.c b/arch/arm/src/armv7-r/arm_undefinedinsn.c
index 5ecee39ce8..0c61b5f19c 100644
--- a/arch/arm/src/armv7-r/arm_undefinedinsn.c
+++ b/arch/arm/src/armv7-r/arm_undefinedinsn.c
@@ -80,7 +80,7 @@
 
 uint32_t *arm_undefinedinsn(uint32_t *regs)
 {
-  lldbg("Undefined instruction at 0x%x\n", regs[REG_PC]);
+  llerr("Undefined instruction at 0x%x\n", regs[REG_PC]);
   CURRENT_REGS = regs;
   PANIC();
   return regs; /* To keep the compiler happy */
diff --git a/arch/arm/src/c5471/c5471_ethernet.c b/arch/arm/src/c5471/c5471_ethernet.c
index 0fc1cf1176..f59b028f21 100644
--- a/arch/arm/src/c5471/c5471_ethernet.c
+++ b/arch/arm/src/c5471/c5471_ethernet.c
@@ -2241,7 +2241,7 @@ void up_netinitialize(void)
     {
       /* We could not attach the ISR to the ISR */
 
-      nlldbg("irq_attach() failed\n");
+      nllerr("irq_attach() failed\n");
       return;
     }
 
diff --git a/arch/arm/src/common/up_exit.c b/arch/arm/src/common/up_exit.c
index 1a41f52ad4..b58ba08a44 100644
--- a/arch/arm/src/common/up_exit.c
+++ b/arch/arm/src/common/up_exit.c
@@ -138,10 +138,10 @@ void _exit(int status)
 
   (void)up_irq_save();
 
-  slldbg("TCB=%p exiting\n", this_task());
+  sllerr("TCB=%p exiting\n", this_task());
 
 #if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
-  slldbg("Other tasks:\n");
+  sllerr("Other tasks:\n");
   sched_foreach(_up_dumponexit, NULL);
 #endif
 
diff --git a/arch/arm/src/common/up_initialize.c b/arch/arm/src/common/up_initialize.c
index da8db2d0b0..6482a5fce2 100644
--- a/arch/arm/src/common/up_initialize.c
+++ b/arch/arm/src/common/up_initialize.c
@@ -77,13 +77,13 @@ static void up_calibratedelay(void)
 {
   int i;
 
-  lldbg("Beginning 100s delay\n");
+  llerr("Beginning 100s delay\n");
   for (i = 0; i < 100; i++)
     {
       up_mdelay(1000);
     }
 
-  lldbg("End 100s delay\n");
+  llerr("End 100s delay\n");
 }
 #else
 # define up_calibratedelay()
diff --git a/arch/arm/src/dm320/dm320_usbdev.c b/arch/arm/src/dm320/dm320_usbdev.c
index ed3812c698..7f3229b7fc 100644
--- a/arch/arm/src/dm320/dm320_usbdev.c
+++ b/arch/arm/src/dm320/dm320_usbdev.c
@@ -443,7 +443,7 @@ static uint8_t dm320_getreg8(uint32_t addr)
         {
           if (count == 4)
             {
-              lldbg("...\n");
+              llerr("...\n");
             }
 
           return val;
@@ -460,7 +460,7 @@ static uint8_t dm320_getreg8(uint32_t addr)
         {
           /* Yes.. then show how many times the value repeated */
 
-          lldbg("[repeats %d more times]\n", count-3);
+          llerr("[repeats %d more times]\n", count-3);
         }
 
       /* Save the new address, value, and count */
@@ -472,7 +472,7 @@ static uint8_t dm320_getreg8(uint32_t addr)
 
   /* Show the register value read */
 
-  lldbg("%08x->%02x\n", addr, val);
+  llerr("%08x->%02x\n", addr, val);
   return val;
 }
 #endif
@@ -506,7 +506,7 @@ static uint32_t dm320_getreg16(uint32_t addr)
         {
           if (count == 4)
             {
-              lldbg("...\n");
+              llerr("...\n");
             }
 
           return val;
@@ -523,7 +523,7 @@ static uint32_t dm320_getreg16(uint32_t addr)
         {
           /* Yes.. then show how many times the value repeated */
 
-          lldbg("[repeats %d more times]\n", count-3);
+          llerr("[repeats %d more times]\n", count-3);
         }
 
       /* Save the new address, value, and count */
@@ -535,7 +535,7 @@ static uint32_t dm320_getreg16(uint32_t addr)
 
   /* Show the register value read */
 
-  lldbg("%08x->%04x\n", addr, val);
+  llerr("%08x->%04x\n", addr, val);
   return val;
 }
 #endif
@@ -569,7 +569,7 @@ static uint32_t dm320_getreg32(uint32_t addr)
         {
           if (count == 4)
             {
-              lldbg("...\n");
+              llerr("...\n");
             }
 
           return val;
@@ -586,7 +586,7 @@ static uint32_t dm320_getreg32(uint32_t addr)
         {
           /* Yes.. then show how many times the value repeated */
 
-          lldbg("[repeats %d more times]\n", count-3);
+          llerr("[repeats %d more times]\n", count-3);
         }
 
       /* Save the new address, value, and count */
@@ -598,7 +598,7 @@ static uint32_t dm320_getreg32(uint32_t addr)
 
   /* Show the register value read */
 
-  lldbg("%08x->%08x\n", addr, val);
+  llerr("%08x->%08x\n", addr, val);
   return val;
 }
 #endif
@@ -616,7 +616,7 @@ static void dm320_putreg8(uint8_t val, uint32_t addr)
 {
   /* Show the register value being written */
 
-  lldbg("%08x<-%02x\n", addr, val);
+  llerr("%08x<-%02x\n", addr, val);
 
   /* Write the value */
 
@@ -637,7 +637,7 @@ static void dm320_putreg16(uint16_t val, uint32_t addr)
 {
   /* Show the register value being written */
 
-  lldbg("%08x<-%04x\n", addr, val);
+  llerr("%08x<-%04x\n", addr, val);
 
   /* Write the value */
 
@@ -658,7 +658,7 @@ static void dm320_putreg32(uint32_t val, uint32_t addr)
 {
   /* Show the register value being written */
 
-  lldbg("%08x<-%08x\n", addr, val);
+  llerr("%08x<-%08x\n", addr, val);
 
   /* Write the value */
 
@@ -2417,7 +2417,7 @@ void up_usbinitialize(void)
 
 #ifdef CONFIG_DEBUG_USB
   chiprev = dm320_getreg16(DM320_BUSC_REVR);
-  ulldbg("DM320 revision : %d.%d\n", chiprev >> 4, chiprev & 0x0f);
+  ullerr("DM320 revision : %d.%d\n", chiprev >> 4, chiprev & 0x0f);
 #endif
 
   /* Enable USB clock & GIO clock  */
diff --git a/arch/arm/src/efm32/efm32_adc.c b/arch/arm/src/efm32/efm32_adc.c
index 29e01d9d0d..0053a874bd 100644
--- a/arch/arm/src/efm32/efm32_adc.c
+++ b/arch/arm/src/efm32/efm32_adc.c
@@ -1191,7 +1191,7 @@ static int adc_interrupt(FAR struct adc_dev_s *dev)
   adcsr = adc_getreg(priv, EFM32_ADC_SR_OFFSET);
   if ((adcsr & ADC_SR_AWD) != 0)
     {
-      alldbg("WARNING: Analog Watchdog, Value converted out of range!\n");
+      allerr("WARNING: Analog Watchdog, Value converted out of range!\n");
     }
 
   /* EOC: End of conversion */
diff --git a/arch/arm/src/efm32/efm32_irq.c b/arch/arm/src/efm32/efm32_irq.c
index 078ec8e8a4..4ad702d4ab 100644
--- a/arch/arm/src/efm32/efm32_irq.c
+++ b/arch/arm/src/efm32/efm32_irq.c
@@ -115,34 +115,34 @@ static void efm32_dumpnvic(const char *msg, int irq)
   irqstate_t flags;
 
   flags = enter_critical_section();
-  lldbg("NVIC (%s, irq=%d):\n", msg, irq);
-  lldbg("  INTCTRL:    %08x VECTAB:  %08x\n",
+  llerr("NVIC (%s, irq=%d):\n", msg, irq);
+  llerr("  INTCTRL:    %08x VECTAB:  %08x\n",
         getreg32(NVIC_INTCTRL), getreg32(NVIC_VECTAB));
-  lldbg("  SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n",
+  llerr("  SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n",
         getreg32(NVIC_SYSHCON_MEMFAULTENA), getreg32(NVIC_SYSHCON_BUSFAULTENA),
         getreg32(NVIC_SYSHCON_USGFAULTENA), getreg32(NVIC_SYSTICK_CTRL_ENABLE));
-  lldbg("  IRQ ENABLE: %08x %08x %08x\n",
+  llerr("  IRQ ENABLE: %08x %08x %08x\n",
         getreg32(NVIC_IRQ0_31_ENABLE), getreg32(NVIC_IRQ32_63_ENABLE),
         getreg32(NVIC_IRQ64_95_ENABLE));
-  lldbg("  SYSH_PRIO:  %08x %08x %08x\n",
+  llerr("  SYSH_PRIO:  %08x %08x %08x\n",
         getreg32(NVIC_SYSH4_7_PRIORITY), getreg32(NVIC_SYSH8_11_PRIORITY),
         getreg32(NVIC_SYSH12_15_PRIORITY));
-  lldbg("  IRQ PRIO:   %08x %08x %08x %08x\n",
+  llerr("  IRQ PRIO:   %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ0_3_PRIORITY), getreg32(NVIC_IRQ4_7_PRIORITY),
         getreg32(NVIC_IRQ8_11_PRIORITY), getreg32(NVIC_IRQ12_15_PRIORITY));
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ16_19_PRIORITY), getreg32(NVIC_IRQ20_23_PRIORITY),
         getreg32(NVIC_IRQ24_27_PRIORITY), getreg32(NVIC_IRQ28_31_PRIORITY));
 #if NR_VECTORS >= (EFM32_IRQ_INTERRUPTS + 32)
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ32_35_PRIORITY), getreg32(NVIC_IRQ36_39_PRIORITY),
         getreg32(NVIC_IRQ40_43_PRIORITY), getreg32(NVIC_IRQ44_47_PRIORITY));
 #if NR_VECTORS >= (EFM32_IRQ_INTERRUPTS + 48)
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ48_51_PRIORITY), getreg32(NVIC_IRQ52_55_PRIORITY),
         getreg32(NVIC_IRQ56_59_PRIORITY), getreg32(NVIC_IRQ60_63_PRIORITY));
 #if NR_VECTORS >= (EFM32_IRQ_INTERRUPTS + 64)
-  lldbg("              %08x\n",
+  llerr("              %08x\n",
         getreg32(NVIC_IRQ64_67_PRIORITY));
 #endif
 #endif
diff --git a/arch/arm/src/efm32/efm32_leserial.c b/arch/arm/src/efm32/efm32_leserial.c
index 4e0fc0f37d..63fbd5f8cd 100644
--- a/arch/arm/src/efm32/efm32_leserial.c
+++ b/arch/arm/src/efm32/efm32_leserial.c
@@ -518,7 +518,7 @@ static int  efm32_interrupt(struct uart_dev_s *dev)
        * FERR - Framing Error Interrupt Enable
        */
 
-      lldbg("RX ERROR: %08x\n", intflags);
+      llerr("RX ERROR: %08x\n", intflags);
     }
 
   /* Check for transmit errors */
@@ -527,7 +527,7 @@ static int  efm32_interrupt(struct uart_dev_s *dev)
     {
       /* TXOF - TX Overflow Interrupt Enable */
 
-      lldbg("RX ERROR: %08x\n", intflags);
+      llerr("RX ERROR: %08x\n", intflags);
     }
 #endif
 
diff --git a/arch/arm/src/efm32/efm32_pwm.c b/arch/arm/src/efm32/efm32_pwm.c
index 3f848de28a..3794c177c8 100644
--- a/arch/arm/src/efm32/efm32_pwm.c
+++ b/arch/arm/src/efm32/efm32_pwm.c
@@ -83,7 +83,7 @@
 
 #ifdef CONFIG_DEBUG_PWM
 #  define pwmdbg              dbg
-#  define pwmlldbg            lldbg
+#  define pwmllerr            llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define pwminfo           info
 #    define pwmllinfo         llinfo
@@ -95,7 +95,7 @@
 #  endif
 #else
 #  define pwmdbg(x...)
-#  define pwmlldbg(x...)
+#  define pwmllerr(x...)
 #  define pwminfo(x...)
 #  define pwmllinfo(x...)
 #  define pwm_dumpgpio(p,m)
diff --git a/arch/arm/src/efm32/efm32_rmu.h b/arch/arm/src/efm32/efm32_rmu.h
index 0d108d4811..dec1a00464 100644
--- a/arch/arm/src/efm32/efm32_rmu.h
+++ b/arch/arm/src/efm32/efm32_rmu.h
@@ -56,9 +56,9 @@
 #endif
 
 #ifdef CONFIG_EFM32_RMU_DEBUG
-#  define rmudbg lldbg
+#  define rmudbg llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define rmuinfo lldbg
+#    define rmuinfo llerr
 #  else
 #    define rmuinfo(x...)
 #  endif
diff --git a/arch/arm/src/efm32/efm32_rtc_burtc.c b/arch/arm/src/efm32/efm32_rtc_burtc.c
index 1bc1c9f107..ed32518f7b 100644
--- a/arch/arm/src/efm32/efm32_rtc_burtc.c
+++ b/arch/arm/src/efm32/efm32_rtc_burtc.c
@@ -131,7 +131,7 @@
 #define __CNT_ZERO_REG          EFM32_BURTC_RET_REG(1)
 
 #if defined CONFIG_DEBUG_FEATURES && defined CONFIG_RTC_DEBUG
-#   define burtcdbg lldbg
+#   define burtcdbg llerr
 #else
 #   define burtcdbg(x...)
 #endif
diff --git a/arch/arm/src/efm32/efm32_serial.c b/arch/arm/src/efm32/efm32_serial.c
index c0f3bd4a5f..762da175a9 100644
--- a/arch/arm/src/efm32/efm32_serial.c
+++ b/arch/arm/src/efm32/efm32_serial.c
@@ -780,7 +780,7 @@ static int  efm32_rxinterrupt(struct uart_dev_s *dev)
        * FERR - Framing Error Interrupt Enable
        */
 
-      lldbg("RX ERROR: %08x\n", intflags);
+      llerr("RX ERROR: %08x\n", intflags);
     }
 #endif
 
@@ -863,7 +863,7 @@ static int  efm32_txinterrupt(struct uart_dev_s *dev)
     {
       /* TXOF - TX Overflow Interrupt Enable */
 
-      lldbg("RX ERROR: %08x\n", intflags);
+      llerr("RX ERROR: %08x\n", intflags);
     }
 #endif
 
diff --git a/arch/arm/src/efm32/efm32_spi.c b/arch/arm/src/efm32/efm32_spi.c
index 321de58d7d..5fce18d3ae 100644
--- a/arch/arm/src/efm32/efm32_spi.c
+++ b/arch/arm/src/efm32/efm32_spi.c
@@ -100,9 +100,9 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg lldbg
+#  define spidbg llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/arch/arm/src/efm32/efm32_timer.c b/arch/arm/src/efm32/efm32_timer.c
index b526376c87..e44121e411 100644
--- a/arch/arm/src/efm32/efm32_timer.c
+++ b/arch/arm/src/efm32/efm32_timer.c
@@ -69,19 +69,19 @@
 
 #ifdef CONFIG_DEBUG_TIMER
 #  define efm32_timerdbg              dbg
-#  define efm32_timerlldbg            lldbg
+#  define efm32_timerllerr            llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define efm32_timerinfo           info
 #    define efm32_timerllinfo         llinfo
 #    define efm32_timer_dumpgpio(p,m) efm32_dumpgpio(p,m)
 #  else
-#    define efm32_timerlldbg(x...)
+#    define efm32_timerllerr(x...)
 #    define efm32_timerllinfo(x...)
 #    define efm32_timer_dumpgpio(p,m)
 #  endif
 #else
 #  define efm32_timerdbg(x...)
-#  define efm32_timerlldbg(x...)
+#  define efm32_timerllerr(x...)
 #  define efm32_timerinfo(x...)
 #  define efm32_timerllinfo(x...)
 #  define efm32_timer_dumpgpio(p,m)
diff --git a/arch/arm/src/efm32/efm32_usbdev.c b/arch/arm/src/efm32/efm32_usbdev.c
index fab4867207..fe0a85f15d 100644
--- a/arch/arm/src/efm32/efm32_usbdev.c
+++ b/arch/arm/src/efm32/efm32_usbdev.c
@@ -815,7 +815,7 @@ static uint32_t efm32_getreg(uint32_t addr)
         {
           if (count == 4)
             {
-              lldbg("...\n");
+              llerr("...\n");
             }
 
           return val;
@@ -832,7 +832,7 @@ static uint32_t efm32_getreg(uint32_t addr)
         {
           /* Yes.. then show how many times the value repeated */
 
-          lldbg("[repeats %d more times]\n", count-3);
+          llerr("[repeats %d more times]\n", count-3);
         }
 
       /* Save the new address, value, and count */
@@ -844,7 +844,7 @@ static uint32_t efm32_getreg(uint32_t addr)
 
   /* Show the register value read */
 
-  lldbg("%08x->%08x\n", addr, val);
+  llerr("%08x->%08x\n", addr, val);
   return val;
 }
 #endif
@@ -862,7 +862,7 @@ static void efm32_putreg(uint32_t val, uint32_t addr)
 {
   /* Show the register value being written */
 
-  lldbg("%08x<-%08x\n", addr, val);
+  llerr("%08x<-%08x\n", addr, val);
 
   /* Write the value */
 
@@ -2629,7 +2629,7 @@ static inline void efm32_epout_interrupt(FAR struct efm32_usbdev_s *priv)
           if ((daint & 1) != 0)
             {
               regval = efm32_getreg(EFM32_USB_DOEPINT(epno));
-              ulldbg("DOEPINT(%d) = %08x\n", epno, regval);
+              ullerr("DOEPINT(%d) = %08x\n", epno, regval);
               efm32_putreg(0xFF, EFM32_USB_DOEPINT(epno));
             }
 
@@ -2859,7 +2859,7 @@ static inline void efm32_epin_interrupt(FAR struct efm32_usbdev_s *priv)
         {
           if ((daint & 1) != 0)
             {
-              ulldbg("DIEPINT(%d) = %08x\n",
+              ullerr("DIEPINT(%d) = %08x\n",
                      epno, efm32_getreg(EFM32_USB_DIEPINT(epno)));
               efm32_putreg(0xFF, EFM32_USB_DIEPINT(epno));
             }
diff --git a/arch/arm/src/efm32/efm32_usbhost.c b/arch/arm/src/efm32/efm32_usbhost.c
index 0c3c12fbc7..8c18363062 100644
--- a/arch/arm/src/efm32/efm32_usbhost.c
+++ b/arch/arm/src/efm32/efm32_usbhost.c
@@ -582,7 +582,7 @@ static const struct efm32_usbhost_trace_s g_trace2[TRACE2_NSTRINGS] =
 #ifdef CONFIG_EFM32_USBHOST_REGDEBUG
 static void efm32_printreg(uint32_t addr, uint32_t val, bool iswrite)
 {
-  lldbg("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val);
+  llerr("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val);
 }
 #endif
 
@@ -632,7 +632,7 @@ static void efm32_checkreg(uint32_t addr, uint32_t val, bool iswrite)
             {
               /* No.. More than one. */
 
-              lldbg("[repeats %d more times]\n", count);
+              llerr("[repeats %d more times]\n", count);
             }
         }
 
diff --git a/arch/arm/src/kinetis/kinetis_irq.c b/arch/arm/src/kinetis/kinetis_irq.c
index 6fea252101..10abcf8e5f 100644
--- a/arch/arm/src/kinetis/kinetis_irq.c
+++ b/arch/arm/src/kinetis/kinetis_irq.c
@@ -111,43 +111,43 @@ static void kinetis_dumpnvic(const char *msg, int irq)
   irqstate_t flags;
 
   flags = enter_critical_section();
-  lldbg("NVIC (%s, irq=%d):\n", msg, irq);
-  lldbg("  INTCTRL:    %08x VECTAB: %08x\n",
+  llerr("NVIC (%s, irq=%d):\n", msg, irq);
+  llerr("  INTCTRL:    %08x VECTAB: %08x\n",
         getreg32(NVIC_INTCTRL), getreg32(NVIC_VECTAB));
 #if 0
-  lldbg("  SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n",
+  llerr("  SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n",
         getreg32(NVIC_SYSHCON_MEMFAULTENA), getreg32(NVIC_SYSHCON_BUSFAULTENA),
         getreg32(NVIC_SYSHCON_USGFAULTENA), getreg32(NVIC_SYSTICK_CTRL_ENABLE));
 #endif
-  lldbg("  IRQ ENABLE: %08x %08x %08x %08x\n",
+  llerr("  IRQ ENABLE: %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ0_31_ENABLE), getreg32(NVIC_IRQ32_63_ENABLE),
         getreg32(NVIC_IRQ64_95_ENABLE), getreg32(NVIC_IRQ96_127_ENABLE));
-  lldbg("  SYSH_PRIO:  %08x %08x %08x\n",
+  llerr("  SYSH_PRIO:  %08x %08x %08x\n",
         getreg32(NVIC_SYSH4_7_PRIORITY), getreg32(NVIC_SYSH8_11_PRIORITY),
         getreg32(NVIC_SYSH12_15_PRIORITY));
-  lldbg("  IRQ PRIO:   %08x %08x %08x %08x\n",
+  llerr("  IRQ PRIO:   %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ0_3_PRIORITY), getreg32(NVIC_IRQ4_7_PRIORITY),
         getreg32(NVIC_IRQ8_11_PRIORITY), getreg32(NVIC_IRQ12_15_PRIORITY));
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ16_19_PRIORITY), getreg32(NVIC_IRQ20_23_PRIORITY),
         getreg32(NVIC_IRQ24_27_PRIORITY), getreg32(NVIC_IRQ28_31_PRIORITY));
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ32_35_PRIORITY), getreg32(NVIC_IRQ36_39_PRIORITY),
         getreg32(NVIC_IRQ40_43_PRIORITY), getreg32(NVIC_IRQ44_47_PRIORITY));
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ48_51_PRIORITY), getreg32(NVIC_IRQ52_55_PRIORITY),
         getreg32(NVIC_IRQ56_59_PRIORITY), getreg32(NVIC_IRQ60_63_PRIORITY));
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ64_67_PRIORITY), getreg32(NVIC_IRQ68_71_PRIORITY),
         getreg32(NVIC_IRQ72_75_PRIORITY), getreg32(NVIC_IRQ76_79_PRIORITY));
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ80_83_PRIORITY), getreg32(NVIC_IRQ84_87_PRIORITY),
         getreg32(NVIC_IRQ88_91_PRIORITY), getreg32(NVIC_IRQ92_95_PRIORITY));
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ96_99_PRIORITY), getreg32(NVIC_IRQ100_103_PRIORITY),
         getreg32(NVIC_IRQ104_107_PRIORITY), getreg32(NVIC_IRQ108_111_PRIORITY));
 #if NR_VECTORS > 111
-  lldbg("              %08x %08x\n",
+  llerr("              %08x %08x\n",
         getreg32(NVIC_IRQ112_115_PRIORITY), getreg32(NVIC_IRQ116_119_PRIORITY));
 #endif
 
diff --git a/arch/arm/src/kinetis/kinetis_pindump.c b/arch/arm/src/kinetis/kinetis_pindump.c
index 1e1c2325eb..de750115e7 100644
--- a/arch/arm/src/kinetis/kinetis_pindump.c
+++ b/arch/arm/src/kinetis/kinetis_pindump.c
@@ -115,9 +115,9 @@ void kinetis_pindump(uint32_t pinset, const char *msg)
 
   flags = enter_critical_section();
 
-  lldbg("GPIO%c pinset: %08x base: %08x -- %s\n",
+  llerr("GPIO%c pinset: %08x base: %08x -- %s\n",
         g_portchar[port], pinset, base, msg);
-  lldbg("  PDOR: %08x  PDIR: %08x  PDDR: %08x\n",
+  llerr("  PDOR: %08x  PDIR: %08x  PDDR: %08x\n",
         getreg32(base + KINETIS_GPIO_PDOR_OFFSET),
         getreg32(base + KINETIS_GPIO_PDIR_OFFSET),
         getreg32(base + KINETIS_GPIO_PDDR_OFFSET));
diff --git a/arch/arm/src/kinetis/kinetis_pwm.c b/arch/arm/src/kinetis/kinetis_pwm.c
index 51604dd860..214b3249a3 100644
--- a/arch/arm/src/kinetis/kinetis_pwm.c
+++ b/arch/arm/src/kinetis/kinetis_pwm.c
@@ -84,19 +84,19 @@
 
 #ifdef CONFIG_DEBUG_PWM
 #  define pwmdbg              dbg
-#  define pwmlldbg            lldbg
+#  define pwmllerr            llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define pwminfo           info
 #    define pwmllinfo         llinfo
 #    define pwm_dumpgpio(p,m) kinetis_pindump(p,m)
 #  else
-#    define pwmlldbg(x...)
+#    define pwmllerr(x...)
 #    define pwmllinfo(x...)
 #    define pwm_dumpgpio(p,m)
 #  endif
 #else
 #  define pwmdbg(x...)
-#  define pwmlldbg(x...)
+#  define pwmllerr(x...)
 #  define pwminfo(x...)
 #  define pwmllinfo(x...)
 #  define pwm_dumpgpio(p,m)
diff --git a/arch/arm/src/kinetis/kinetis_sdhc.c b/arch/arm/src/kinetis/kinetis_sdhc.c
index 38607d128b..7c6f2d421f 100644
--- a/arch/arm/src/kinetis/kinetis_sdhc.c
+++ b/arch/arm/src/kinetis/kinetis_sdhc.c
@@ -973,7 +973,7 @@ static void kinetis_eventtimeout(int argc, uint32_t arg)
       /* Wake up any waiting threads */
 
       kinetis_endwait(priv, SDIOWAIT_TIMEOUT);
-      flldbg("Timeout: remaining: %d\n", priv->remaining);
+      fllerr("Timeout: remaining: %d\n", priv->remaining);
     }
 }
 
@@ -1162,7 +1162,7 @@ static int kinetis_interrupt(int irq, void *context)
         {
           /* Terminate the transfer with an error */
 
-          flldbg("ERROR: Data block CRC failure, remaining: %d\n", priv->remaining);
+          fllerr("ERROR: Data block CRC failure, remaining: %d\n", priv->remaining);
           kinetis_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_ERROR);
         }
 
@@ -1172,7 +1172,7 @@ static int kinetis_interrupt(int irq, void *context)
         {
           /* Terminate the transfer with an error */
 
-          flldbg("ERROR: Data timeout, remaining: %d\n", priv->remaining);
+          fllerr("ERROR: Data timeout, remaining: %d\n", priv->remaining);
           kinetis_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_TIMEOUT);
         }
     }
diff --git a/arch/arm/src/kinetis/kinetis_serial.c b/arch/arm/src/kinetis/kinetis_serial.c
index 1d5e6d4840..4b9f1641f0 100644
--- a/arch/arm/src/kinetis/kinetis_serial.c
+++ b/arch/arm/src/kinetis/kinetis_serial.c
@@ -804,7 +804,7 @@ static int up_interrupte(int irq, void *context)
    */
 
   regval = up_serialin(priv, KINETIS_UART_S1_OFFSET);
-  lldbg("S1: %02x\n", regval);
+  llerr("S1: %02x\n", regval);
   regval = up_serialin(priv, KINETIS_UART_D_OFFSET);
   return OK;
 }
diff --git a/arch/arm/src/kinetis/kinetis_usbdev.c b/arch/arm/src/kinetis/kinetis_usbdev.c
index e92edd72a0..9a8d5c75ab 100644
--- a/arch/arm/src/kinetis/kinetis_usbdev.c
+++ b/arch/arm/src/kinetis/kinetis_usbdev.c
@@ -369,9 +369,9 @@ const struct trace_msg_t g_usb_trace_strings_deverror[] =
 #  undef CONFIG_KHCI_USBDEV_BDTDEBUG
 #  define CONFIG_KHCI_USBDEV_BDTDEBUG 1
 
-#  define regdbg lldbg
+#  define regdbg llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define reginfo lldbg
+#    define reginfo llerr
 #  else
 #    define reginfo(x...)
 #  endif
@@ -389,9 +389,9 @@ const struct trace_msg_t g_usb_trace_strings_deverror[] =
 
 #ifdef CONFIG_KHCI_USBDEV_BDTDEBUG
 
-#  define bdtdbg lldbg
+#  define bdtdbg llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define bdtinfo lldbg
+#    define bdtinfo llerr
 #  else
 #    define bdtinfo(x...)
 #  endif
@@ -714,7 +714,7 @@ static uint16_t khci_getreg(uint32_t addr)
         {
            if (count == 4)
              {
-               lldbg("...\n");
+               llerr("...\n");
              }
           return val;
         }
@@ -730,7 +730,7 @@ static uint16_t khci_getreg(uint32_t addr)
          {
            /* Yes.. then show how many times the value repeated */
 
-           lldbg("[repeats %d more times]\n", count-3);
+           llerr("[repeats %d more times]\n", count-3);
          }
 
        /* Save the new address, value, and count */
@@ -742,7 +742,7 @@ static uint16_t khci_getreg(uint32_t addr)
 
   /* Show the register value read */
 
-  lldbg("%08x->%04x\n", addr, val);
+  llerr("%08x->%04x\n", addr, val);
   return val;
 }
 #endif
@@ -756,7 +756,7 @@ static void khci_putreg(uint32_t val, uint32_t addr)
 {
   /* Show the register value being written */
 
-  lldbg("%08x<-%04x\n", addr, val);
+  llerr("%08x<-%04x\n", addr, val);
 
   /* Write the value */
 
@@ -2913,7 +2913,7 @@ x
   if ((usbir & USB_INT_ERROR) != 0)
     {
       usbtrace(TRACE_INTDECODE(KHCI_TRACEINTID_UERR), usbir);
-      ulldbg("Error: EIR=%04x\n", khci_getreg(KINETIS_USB0_ERRSTAT));
+      ullerr("Error: EIR=%04x\n", khci_getreg(KINETIS_USB0_ERRSTAT));
 
       /* Clear all pending USB error interrupts */
 
@@ -3241,7 +3241,7 @@ static int khci_epconfigure(struct usbdev_ep_s *ep,
   if (!ep || !desc)
     {
       usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_INVALIDPARMS), 0);
-      ulldbg("ERROR: ep=%p desc=%p\n");
+      ullerr("ERROR: ep=%p desc=%p\n");
       return -EINVAL;
     }
 #endif
@@ -3368,7 +3368,7 @@ static int khci_epdisable(struct usbdev_ep_s *ep)
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_INVALIDPARMS), 0);
-      ulldbg("ERROR: ep=%p\n", ep);
+      ullerr("ERROR: ep=%p\n", ep);
       return -EINVAL;
     }
 #endif
@@ -3467,7 +3467,7 @@ static int khci_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
   if (!req || !req->callback || !req->buf || !ep)
     {
       usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_INVALIDPARMS), 0);
-      ulldbg("ERROR: req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep);
+      ullerr("ERROR: req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep);
       return -EINVAL;
     }
 #endif
@@ -3479,7 +3479,7 @@ static int khci_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
   if (!priv->driver)
     {
       usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_NOTCONFIGURED), priv->usbdev.speed);
-      ulldbg("ERROR: driver=%p\n", priv->driver);
+      ullerr("ERROR: driver=%p\n", priv->driver);
       return -ESHUTDOWN;
     }
 #endif
@@ -4248,10 +4248,10 @@ static void khci_hwreset(struct khci_usbdev_s *priv)
   khci_putreg((uint8_t)((uint32_t)g_bdt >> 16), KINETIS_USB0_BDTPAGE2);
   khci_putreg((uint8_t)(((uint32_t)g_bdt >>  8) & USB_BDTPAGE1_MASK), KINETIS_USB0_BDTPAGE1);
 
-  ulldbg("BDT Address %hhx \n" ,&g_bdt);
-  ulldbg("BDTPAGE3 %hhx\n",khci_getreg(KINETIS_USB0_BDTPAGE3));
-  ulldbg("BDTPAGE2 %hhx\n",khci_getreg(KINETIS_USB0_BDTPAGE2));
-  ulldbg("BDTPAGE1 %hhx\n",khci_getreg(KINETIS_USB0_BDTPAGE1));
+  ullerr("BDT Address %hhx \n" ,&g_bdt);
+  ullerr("BDTPAGE3 %hhx\n",khci_getreg(KINETIS_USB0_BDTPAGE3));
+  ullerr("BDTPAGE2 %hhx\n",khci_getreg(KINETIS_USB0_BDTPAGE2));
+  ullerr("BDTPAGE1 %hhx\n",khci_getreg(KINETIS_USB0_BDTPAGE1));
 
   /* Clear any pending interrupts */
 
diff --git a/arch/arm/src/kl/kl_dumpgpio.c b/arch/arm/src/kl/kl_dumpgpio.c
index 961414b466..218b9ae0df 100644
--- a/arch/arm/src/kl/kl_dumpgpio.c
+++ b/arch/arm/src/kl/kl_dumpgpio.c
@@ -123,9 +123,9 @@ void kl_dumpgpio(gpio_cfgset_t pinset, const char *msg)
 
   flags = enter_critical_section();
 
-  lldbg("GPIO%c pinset: %08x base: %08x -- %s\n",
+  llerr("GPIO%c pinset: %08x base: %08x -- %s\n",
         g_portchar[port], pinset, base, msg);
-  lldbg("  PDOR: %08x  PDIR: %08x  PDDR: %08x\n",
+  llerr("  PDOR: %08x  PDIR: %08x  PDDR: %08x\n",
         getreg32(base + KL_GPIO_PDOR_OFFSET),
         getreg32(base + KL_GPIO_PDIR_OFFSET),
         getreg32(base + KL_GPIO_PDDR_OFFSET));
diff --git a/arch/arm/src/kl/kl_irq.c b/arch/arm/src/kl/kl_irq.c
index 1f62d1a013..af104dd9c6 100644
--- a/arch/arm/src/kl/kl_irq.c
+++ b/arch/arm/src/kl/kl_irq.c
@@ -97,26 +97,26 @@ static void kl_dumpnvic(const char *msg, int irq)
 
   flags = enter_critical_section();
 
-  lldbg("NVIC (%s, irq=%d):\n", msg, irq);
-  lldbg("  ISER:       %08x ICER:   %08x\n",
+  llerr("NVIC (%s, irq=%d):\n", msg, irq);
+  llerr("  ISER:       %08x ICER:   %08x\n",
         getreg32(ARMV6M_NVIC_ISER), getreg32(ARMV6M_NVIC_ICER));
-  lldbg("  ISPR:       %08x ICPR:   %08x\n",
+  llerr("  ISPR:       %08x ICPR:   %08x\n",
         getreg32(ARMV6M_NVIC_ISPR), getreg32(ARMV6M_NVIC_ICPR));
-  lldbg("  IRQ PRIO:   %08x %08x %08x %08x\n",
+  llerr("  IRQ PRIO:   %08x %08x %08x %08x\n",
         getreg32(ARMV6M_NVIC_IPR0), getreg32(ARMV6M_NVIC_IPR1),
         getreg32(ARMV6M_NVIC_IPR2), getreg32(ARMV6M_NVIC_IPR3));
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(ARMV6M_NVIC_IPR4), getreg32(ARMV6M_NVIC_IPR5),
         getreg32(ARMV6M_NVIC_IPR6), getreg32(ARMV6M_NVIC_IPR7));
 
-  lldbg("SYSCON:\n");
-  lldbg("  CPUID:      %08x\n",
+  llerr("SYSCON:\n");
+  llerr("  CPUID:      %08x\n",
         getreg32(ARMV6M_SYSCON_CPUID));
-  lldbg("  ICSR:       %08x AIRCR:  %08x\n",
+  llerr("  ICSR:       %08x AIRCR:  %08x\n",
         getreg32(ARMV6M_SYSCON_ICSR), getreg32(ARMV6M_SYSCON_AIRCR));
-  lldbg("  SCR:        %08x CCR:    %08x\n",
+  llerr("  SCR:        %08x CCR:    %08x\n",
         getreg32(ARMV6M_SYSCON_SCR), getreg32(ARMV6M_SYSCON_CCR));
-  lldbg("  SHPR2:      %08x SHPR3:  %08x\n",
+  llerr("  SHPR2:      %08x SHPR3:  %08x\n",
         getreg32(ARMV6M_SYSCON_SHPR2), getreg32(ARMV6M_SYSCON_SHPR3));
 
   leave_critical_section(flags);
diff --git a/arch/arm/src/kl/kl_pwm.c b/arch/arm/src/kl/kl_pwm.c
index 72f1705d21..7fef072a84 100644
--- a/arch/arm/src/kl/kl_pwm.c
+++ b/arch/arm/src/kl/kl_pwm.c
@@ -81,7 +81,7 @@
 
 #ifdef CONFIG_DEBUG_PWM
 #  define pwmdbg              dbg
-#  define pwmlldbg            lldbg
+#  define pwmllerr            llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define pwminfo           info
 #    define pwmllinfo         llinfo
@@ -93,7 +93,7 @@
 #  endif
 #else
 #  define pwmdbg(x...)
-#  define pwmlldbg(x...)
+#  define pwmllerr(x...)
 #  define pwminfo(x...)
 #  define pwmllinfo(x...)
 #  define pwm_dumpgpio(p,m)
diff --git a/arch/arm/src/kl/kl_spi.c b/arch/arm/src/kl/kl_spi.c
index e80de128ad..b4fb53ac04 100644
--- a/arch/arm/src/kl/kl_spi.c
+++ b/arch/arm/src/kl/kl_spi.c
@@ -71,9 +71,9 @@
  */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/arch/arm/src/lpc11xx/lpc11_gpiodbg.c b/arch/arm/src/lpc11xx/lpc11_gpiodbg.c
index 5907c8df2c..c14e11a7b8 100644
--- a/arch/arm/src/lpc11xx/lpc11_gpiodbg.c
+++ b/arch/arm/src/lpc11xx/lpc11_gpiodbg.c
@@ -157,30 +157,30 @@ int lpc11_dumpgpio(lpc11_pinset_t pinset, const char *msg)
   /* The following requires exclusive access to the GPIO registers */
 
   flags = enter_critical_section();
-  lldbg("GPIO%c pin%d (pinset: %08x) -- %s\n",
+  llerr("GPIO%c pin%d (pinset: %08x) -- %s\n",
         port + '0', pin, pinset, msg);
 
 #if defined(LPC176x)
-  lldbg("  PINSEL[%08x]: %08x PINMODE[%08x]: %08x ODMODE[%08x]: %08x\n",
+  llerr("  PINSEL[%08x]: %08x PINMODE[%08x]: %08x ODMODE[%08x]: %08x\n",
         pinsel,  pinsel  ? getreg32(pinsel) : 0,
         pinmode, pinmode ? getreg32(pinmode) : 0,
         g_odmode[port],    getreg32(g_odmode[port]));
 #elif defined(LPC178x)
-  lldbg("  IOCON[%08x]: %08x\n", iocon, getreg32(iocon));
+  llerr("  IOCON[%08x]: %08x\n", iocon, getreg32(iocon));
 #endif
 
   base = g_fiobase[port];
-  lldbg("  FIODIR[%08x]: %08x FIOMASK[%08x]: %08x FIOPIN[%08x]: %08x\n",
+  llerr("  FIODIR[%08x]: %08x FIOMASK[%08x]: %08x FIOPIN[%08x]: %08x\n",
         base+LPC11_FIO_DIR_OFFSET,  getreg32(base+LPC11_FIO_DIR_OFFSET),
         base+LPC11_FIO_MASK_OFFSET, getreg32(base+LPC11_FIO_MASK_OFFSET),
         base+LPC11_FIO_PIN_OFFSET,  getreg32(base+LPC11_FIO_PIN_OFFSET));
 
   base = g_intbase[port];
-  lldbg("  IOINTSTATUS[%08x]: %08x INTSTATR[%08x]: %08x INSTATF[%08x]: %08x\n",
+  llerr("  IOINTSTATUS[%08x]: %08x INTSTATR[%08x]: %08x INSTATF[%08x]: %08x\n",
         LPC11_GPIOINT_IOINTSTATUS,          getreg32(LPC11_GPIOINT_IOINTSTATUS),
         base+LPC11_GPIOINT_INTSTATR_OFFSET, getreg32(base+LPC11_GPIOINT_INTSTATR_OFFSET),
         base+LPC11_GPIOINT_INTSTATF_OFFSET, getreg32(base+LPC11_GPIOINT_INTSTATF_OFFSET));
-  lldbg("  INTENR[%08x]: %08x INTENF[%08x]: %08x\n",
+  llerr("  INTENR[%08x]: %08x INTENF[%08x]: %08x\n",
         base+LPC11_GPIOINT_INTENR_OFFSET,   getreg32(base+LPC11_GPIOINT_INTENR_OFFSET),
         base+LPC11_GPIOINT_INTENF_OFFSET,   getreg32(base+LPC11_GPIOINT_INTENF_OFFSET));
   leave_critical_section(flags);
diff --git a/arch/arm/src/lpc11xx/lpc11_irq.c b/arch/arm/src/lpc11xx/lpc11_irq.c
index 80a299926e..a5de46bc6e 100644
--- a/arch/arm/src/lpc11xx/lpc11_irq.c
+++ b/arch/arm/src/lpc11xx/lpc11_irq.c
@@ -93,26 +93,26 @@ static void lpc11_dumpnvic(const char *msg, int irq)
 
   flags = enter_critical_section();
 
-  lldbg("NVIC (%s, irq=%d):\n", msg, irq);
-  lldbg("  ISER:       %08x ICER:   %08x\n",
+  llerr("NVIC (%s, irq=%d):\n", msg, irq);
+  llerr("  ISER:       %08x ICER:   %08x\n",
         getreg32(ARMV6M_NVIC_ISER), getreg32(ARMV6M_NVIC_ICER));
-  lldbg("  ISPR:       %08x ICPR:   %08x\n",
+  llerr("  ISPR:       %08x ICPR:   %08x\n",
         getreg32(ARMV6M_NVIC_ISPR), getreg32(ARMV6M_NVIC_ICPR));
-  lldbg("  IRQ PRIO:   %08x %08x %08x %08x\n",
+  llerr("  IRQ PRIO:   %08x %08x %08x %08x\n",
         getreg32(ARMV6M_NVIC_IPR0), getreg32(ARMV6M_NVIC_IPR1),
         getreg32(ARMV6M_NVIC_IPR2), getreg32(ARMV6M_NVIC_IPR3));
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(ARMV6M_NVIC_IPR4), getreg32(ARMV6M_NVIC_IPR5),
         getreg32(ARMV6M_NVIC_IPR6), getreg32(ARMV6M_NVIC_IPR7));
 
-  lldbg("SYSCON:\n");
-  lldbg("  CPUID:      %08x\n",
+  llerr("SYSCON:\n");
+  llerr("  CPUID:      %08x\n",
         getreg32(ARMV6M_SYSCON_CPUID));
-  lldbg("  ICSR:       %08x AIRCR:  %08x\n",
+  llerr("  ICSR:       %08x AIRCR:  %08x\n",
         getreg32(ARMV6M_SYSCON_ICSR), getreg32(ARMV6M_SYSCON_AIRCR));
-  lldbg("  SCR:        %08x CCR:    %08x\n",
+  llerr("  SCR:        %08x CCR:    %08x\n",
         getreg32(ARMV6M_SYSCON_SCR), getreg32(ARMV6M_SYSCON_CCR));
-  lldbg("  SHPR2:      %08x SHPR3:  %08x\n",
+  llerr("  SHPR2:      %08x SHPR3:  %08x\n",
         getreg32(ARMV6M_SYSCON_SHPR2), getreg32(ARMV6M_SYSCON_SHPR3));
 
   leave_critical_section(flags);
diff --git a/arch/arm/src/lpc11xx/lpc11_spi.c b/arch/arm/src/lpc11xx/lpc11_spi.c
index c065965111..7e9c7c0a20 100644
--- a/arch/arm/src/lpc11xx/lpc11_spi.c
+++ b/arch/arm/src/lpc11xx/lpc11_spi.c
@@ -80,9 +80,9 @@
  */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/arch/arm/src/lpc11xx/lpc11_ssp.c b/arch/arm/src/lpc11xx/lpc11_ssp.c
index a272f6f940..201227ae94 100644
--- a/arch/arm/src/lpc11xx/lpc11_ssp.c
+++ b/arch/arm/src/lpc11xx/lpc11_ssp.c
@@ -81,9 +81,9 @@
  */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define sspdbg  lldbg
+#  define sspdbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/arch/arm/src/lpc11xx/lpc11_timer.c b/arch/arm/src/lpc11xx/lpc11_timer.c
index 0201e259f7..4791df3fc7 100644
--- a/arch/arm/src/lpc11xx/lpc11_timer.c
+++ b/arch/arm/src/lpc11xx/lpc11_timer.c
@@ -90,7 +90,7 @@
 
 #ifdef CONFIG_DEBUG_PWM
 #  define pwmdbg              dbg
-#  define pwmlldbg            lldbg
+#  define pwmllerr            llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define pwminfo           info
 #    define pwmllinfo         llinfo
@@ -102,7 +102,7 @@
 #  endif
 #else
 #  define pwmdbg(x...)
-#  define pwmlldbg(x...)
+#  define pwmllerr(x...)
 #  define pwminfo(x...)
 #  define pwmllinfo(x...)
 #  define pwm_dumpgpio(p,m)
diff --git a/arch/arm/src/lpc17xx/lpc176x_rtc.c b/arch/arm/src/lpc17xx/lpc176x_rtc.c
index eb347ff4c8..a16030b48d 100644
--- a/arch/arm/src/lpc17xx/lpc176x_rtc.c
+++ b/arch/arm/src/lpc17xx/lpc176x_rtc.c
@@ -83,12 +83,12 @@
 #ifdef CONFIG_DEBUG_RTC
 #  define rtcdbg    dbg
 #  define rtcinfo   info
-#  define rtclldbg  lldbg
+#  define rtcllerr  llerr
 #  define rtcllinfo llinfo
 #else
 #  define rtcdbg(x...)
 #  define rtcinfo(x...)
-#  define rtclldbg(x...)
+#  define rtcllerr(x...)
 #  define rtcllinfo(x...)
 #endif
 
@@ -134,9 +134,9 @@ volatile bool g_rtc_enabled = false;
 #ifdef CONFIG_DEBUG_RTC
 static void rtc_dumpregs(FAR const char *msg)
 {
-  rtclldbg("%s:\n", msg);
-  rtclldbg("  DOM : %08x\n", (getreg32(LPC17_RTC_DOM) & RTC_DOM_MASK));
-  rtclldbg("  DOW : %08x\n", (getreg32(LPC17_RTC_DOW) & RTC_DOW_MASK));
+  rtcllerr("%s:\n", msg);
+  rtcllerr("  DOM : %08x\n", (getreg32(LPC17_RTC_DOM) & RTC_DOM_MASK));
+  rtcllerr("  DOW : %08x\n", (getreg32(LPC17_RTC_DOW) & RTC_DOW_MASK));
 }
 #else
 #  define rtc_dumpregs(msg)
@@ -159,13 +159,13 @@ static void rtc_dumpregs(FAR const char *msg)
 #ifdef CONFIG_DEBUG_RTC
 static void rtc_dumptime(FAR struct tm *tp, FAR const char *msg)
 {
-  rtclldbg("%s:\n", msg);
-  rtclldbg("  tm_sec: %08x\n", tp->tm_sec);
-  rtclldbg("  tm_min: %08x\n", tp->tm_min);
-  rtclldbg(" tm_hour: %08x\n", tp->tm_hour);
-  rtclldbg(" tm_mday: %08x\n", tp->tm_mday);
-  rtclldbg("  tm_mon: %08x\n", tp->tm_mon);
-  rtclldbg(" tm_year: %08x\n", tp->tm_year);
+  rtcllerr("%s:\n", msg);
+  rtcllerr("  tm_sec: %08x\n", tp->tm_sec);
+  rtcllerr("  tm_min: %08x\n", tp->tm_min);
+  rtcllerr(" tm_hour: %08x\n", tp->tm_hour);
+  rtcllerr(" tm_mday: %08x\n", tp->tm_mday);
+  rtcllerr("  tm_mon: %08x\n", tp->tm_mon);
+  rtcllerr(" tm_year: %08x\n", tp->tm_year);
 }
 #else
 #  define rtc_dumptime(tp, msg)
diff --git a/arch/arm/src/lpc17xx/lpc17_can.c b/arch/arm/src/lpc17xx/lpc17_can.c
index d7d46afd3f..5678f41546 100644
--- a/arch/arm/src/lpc17xx/lpc17_can.c
+++ b/arch/arm/src/lpc17xx/lpc17_can.c
@@ -166,18 +166,18 @@
 
 #ifdef CONFIG_DEBUG_CAN
 #  ifdef CONFIG_CAN_REGDEBUG
-#    define candbg  lldbg
+#    define candbg  llerr
 #    define caninfo llinfo
 #  else
 #    define candbg  dbg
 #    define caninfo info
 #  endif
-#  define canlldbg  lldbg
+#  define canllerr  llerr
 #  define canllinfo llinfo
 #else
 #  define candbg(x...)
 #  define caninfo(x...)
-#  define canlldbg(x...)
+#  define canllerr(x...)
 #  define canllinfo(x...)
 #endif
 
@@ -325,7 +325,7 @@ static void can_printreg(uint32_t addr, uint32_t value)
         {
           if (count == 4)
             {
-              lldbg("...\n");
+              llerr("...\n");
             }
 
           return;
@@ -342,7 +342,7 @@ static void can_printreg(uint32_t addr, uint32_t value)
         {
           /* Yes.. then show how many times the value repeated */
 
-          lldbg("[repeats %d more times]\n", count-3);
+          llerr("[repeats %d more times]\n", count-3);
         }
 
       /* Save the new address, value, and count */
@@ -354,7 +354,7 @@ static void can_printreg(uint32_t addr, uint32_t value)
 
   /* Show the register value read */
 
-  lldbg("%08x->%08x\n", addr, value);
+  llerr("%08x->%08x\n", addr, value);
 }
 #endif
 
@@ -415,7 +415,7 @@ static void can_putreg(struct up_dev_s *priv, int offset, uint32_t value)
 
   /* Show the register value being written */
 
-  lldbg("%08x<-%08x\n", addr, value);
+  llerr("%08x<-%08x\n", addr, value);
 
   /* Write the value */
 
@@ -475,7 +475,7 @@ static void can_putcommon(uint32_t addr, uint32_t value)
 {
   /* Show the register value being written */
 
-  lldbg("%08x<-%08x\n", addr, value);
+  llerr("%08x<-%08x\n", addr, value);
 
   /* Write the value */
 
@@ -988,7 +988,7 @@ static void can_interrupt(FAR struct can_dev_s *dev)
 
       if ((rfs & CAN_RFS_FF) != 0)
         {
-          canlldbg("ERROR: Received message with extended identifier.  Dropped\n");
+          canllerr("ERROR: Received message with extended identifier.  Dropped\n");
         }
       else
 #endif
diff --git a/arch/arm/src/lpc17xx/lpc17_ethernet.c b/arch/arm/src/lpc17xx/lpc17_ethernet.c
index c49b61ad5d..fbf3172687 100644
--- a/arch/arm/src/lpc17xx/lpc17_ethernet.c
+++ b/arch/arm/src/lpc17xx/lpc17_ethernet.c
@@ -837,7 +837,7 @@ static void lpc17_rxdone_process(struct lpc17_driver_s *priv)
 
       if ((*rxstat & RXSTAT_INFO_ERROR) != 0)
         {
-          nlldbg("Error. considx: %08x prodidx: %08x rxstat: %08x\n",
+          nllerr("Error. considx: %08x prodidx: %08x rxstat: %08x\n",
                  considx, prodidx, *rxstat);
           NETDEV_RXERRORS(&priv->lp_dev);
         }
@@ -850,20 +850,20 @@ static void lpc17_rxdone_process(struct lpc17_driver_s *priv)
 
       /* else */ if (pktlen > CONFIG_NET_ETH_MTU + CONFIG_NET_GUARDSIZE)
         {
-          nlldbg("Too big. considx: %08x prodidx: %08x pktlen: %d rxstat: %08x\n",
+          nllerr("Too big. considx: %08x prodidx: %08x pktlen: %d rxstat: %08x\n",
                  considx, prodidx, pktlen, *rxstat);
           NETDEV_RXERRORS(&priv->lp_dev);
         }
       else if ((*rxstat & RXSTAT_INFO_LASTFLAG) == 0)
         {
-          nlldbg("Fragment. considx: %08x prodidx: %08x pktlen: %d rxstat: %08x\n",
+          nllerr("Fragment. considx: %08x prodidx: %08x pktlen: %d rxstat: %08x\n",
                  considx, prodidx, pktlen, *rxstat);
           NETDEV_RXFRAGMENTS(&priv->lp_dev);
           fragment = true;
         }
       else if (fragment)
         {
-          nlldbg("Last fragment. considx: %08x prodidx: %08x pktlen: %d rxstat: %08x\n",
+          nllerr("Last fragment. considx: %08x prodidx: %08x pktlen: %d rxstat: %08x\n",
                  considx, prodidx, pktlen, *rxstat);
           NETDEV_RXFRAGMENTS(&priv->lp_dev);
           fragment = false;
@@ -1202,13 +1202,13 @@ static int lpc17_interrupt(int irq, void *context)
         {
           if ((status & ETH_INT_RXOVR) != 0)
             {
-              nlldbg("RX Overrun. status: %08x\n", status);
+              nllerr("RX Overrun. status: %08x\n", status);
               NETDEV_RXERRORS(&priv->lp_dev);
             }
 
           if ((status & ETH_INT_TXUNR) != 0)
             {
-              nlldbg("TX Underrun. status: %08x\n", status);
+              nllerr("TX Underrun. status: %08x\n", status);
               NETDEV_TXERRORS(&priv->lp_dev);
             }
 
@@ -1229,7 +1229,7 @@ static int lpc17_interrupt(int irq, void *context)
 
           if ((status & ETH_INT_RXERR) != 0)
             {
-              nlldbg("RX Error. status: %08x\n", status);
+              nllerr("RX Error. status: %08x\n", status);
               NETDEV_RXERRORS(&priv->lp_dev);
             }
 
@@ -1281,7 +1281,7 @@ static int lpc17_interrupt(int irq, void *context)
 
           if ((status & ETH_INT_TXERR) != 0)
             {
-              nlldbg("TX Error. status: %08x\n", status);
+              nllerr("TX Error. status: %08x\n", status);
               NETDEV_TXERRORS(&priv->lp_dev);
             }
 
diff --git a/arch/arm/src/lpc17xx/lpc17_gpiodbg.c b/arch/arm/src/lpc17xx/lpc17_gpiodbg.c
index 680e02a53d..70f8698ef0 100644
--- a/arch/arm/src/lpc17xx/lpc17_gpiodbg.c
+++ b/arch/arm/src/lpc17xx/lpc17_gpiodbg.c
@@ -157,30 +157,30 @@ int lpc17_dumpgpio(lpc17_pinset_t pinset, const char *msg)
   /* The following requires exclusive access to the GPIO registers */
 
   flags = enter_critical_section();
-  lldbg("GPIO%c pin%d (pinset: %08x) -- %s\n",
+  llerr("GPIO%c pin%d (pinset: %08x) -- %s\n",
         port + '0', pin, pinset, msg);
 
 #if defined(LPC176x)
-  lldbg("  PINSEL[%08x]: %08x PINMODE[%08x]: %08x ODMODE[%08x]: %08x\n",
+  llerr("  PINSEL[%08x]: %08x PINMODE[%08x]: %08x ODMODE[%08x]: %08x\n",
         pinsel,  pinsel  ? getreg32(pinsel) : 0,
         pinmode, pinmode ? getreg32(pinmode) : 0,
         g_odmode[port],    getreg32(g_odmode[port]));
 #elif defined(LPC178x)
-  lldbg("  IOCON[%08x]: %08x\n", iocon, getreg32(iocon));
+  llerr("  IOCON[%08x]: %08x\n", iocon, getreg32(iocon));
 #endif
 
   base = g_fiobase[port];
-  lldbg("  FIODIR[%08x]: %08x FIOMASK[%08x]: %08x FIOPIN[%08x]: %08x\n",
+  llerr("  FIODIR[%08x]: %08x FIOMASK[%08x]: %08x FIOPIN[%08x]: %08x\n",
         base+LPC17_FIO_DIR_OFFSET,  getreg32(base+LPC17_FIO_DIR_OFFSET),
         base+LPC17_FIO_MASK_OFFSET, getreg32(base+LPC17_FIO_MASK_OFFSET),
         base+LPC17_FIO_PIN_OFFSET,  getreg32(base+LPC17_FIO_PIN_OFFSET));
 
   base = g_intbase[port];
-  lldbg("  IOINTSTATUS[%08x]: %08x INTSTATR[%08x]: %08x INSTATF[%08x]: %08x\n",
+  llerr("  IOINTSTATUS[%08x]: %08x INTSTATR[%08x]: %08x INSTATF[%08x]: %08x\n",
         LPC17_GPIOINT_IOINTSTATUS,          getreg32(LPC17_GPIOINT_IOINTSTATUS),
         base+LPC17_GPIOINT_INTSTATR_OFFSET, getreg32(base+LPC17_GPIOINT_INTSTATR_OFFSET),
         base+LPC17_GPIOINT_INTSTATF_OFFSET, getreg32(base+LPC17_GPIOINT_INTSTATF_OFFSET));
-  lldbg("  INTENR[%08x]: %08x INTENF[%08x]: %08x\n",
+  llerr("  INTENR[%08x]: %08x INTENF[%08x]: %08x\n",
         base+LPC17_GPIOINT_INTENR_OFFSET,   getreg32(base+LPC17_GPIOINT_INTENR_OFFSET),
         base+LPC17_GPIOINT_INTENF_OFFSET,   getreg32(base+LPC17_GPIOINT_INTENF_OFFSET));
   leave_critical_section(flags);
diff --git a/arch/arm/src/lpc17xx/lpc17_irq.c b/arch/arm/src/lpc17xx/lpc17_irq.c
index 734308952e..47467d32b6 100644
--- a/arch/arm/src/lpc17xx/lpc17_irq.c
+++ b/arch/arm/src/lpc17xx/lpc17_irq.c
@@ -108,25 +108,25 @@ static void lpc17_dumpnvic(const char *msg, int irq)
   irqstate_t flags;
 
   flags = enter_critical_section();
-  lldbg("NVIC (%s, irq=%d):\n", msg, irq);
-  lldbg("  INTCTRL:    %08x VECTAB: %08x\n",
+  llerr("NVIC (%s, irq=%d):\n", msg, irq);
+  llerr("  INTCTRL:    %08x VECTAB: %08x\n",
         getreg32(NVIC_INTCTRL), getreg32(NVIC_VECTAB));
 #if 0
-  lldbg("  SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n",
+  llerr("  SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n",
         getreg32(NVIC_SYSHCON_MEMFAULTENA), getreg32(NVIC_SYSHCON_BUSFAULTENA),
         getreg32(NVIC_SYSHCON_USGFAULTENA), getreg32(NVIC_SYSTICK_CTRL_ENABLE));
 #endif
-  lldbg("  IRQ ENABLE: %08x\n", getreg32(NVIC_IRQ0_31_ENABLE));
-  lldbg("  SYSH_PRIO:  %08x %08x %08x\n",
+  llerr("  IRQ ENABLE: %08x\n", getreg32(NVIC_IRQ0_31_ENABLE));
+  llerr("  SYSH_PRIO:  %08x %08x %08x\n",
         getreg32(NVIC_SYSH4_7_PRIORITY), getreg32(NVIC_SYSH8_11_PRIORITY),
         getreg32(NVIC_SYSH12_15_PRIORITY));
-  lldbg("  IRQ PRIO:   %08x %08x %08x %08x\n",
+  llerr("  IRQ PRIO:   %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ0_3_PRIORITY), getreg32(NVIC_IRQ4_7_PRIORITY),
         getreg32(NVIC_IRQ8_11_PRIORITY), getreg32(NVIC_IRQ12_15_PRIORITY));
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ16_19_PRIORITY), getreg32(NVIC_IRQ20_23_PRIORITY),
         getreg32(NVIC_IRQ24_27_PRIORITY), getreg32(NVIC_IRQ28_31_PRIORITY));
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ32_35_PRIORITY), getreg32(NVIC_IRQ36_39_PRIORITY),
         getreg32(NVIC_IRQ40_43_PRIORITY), getreg32(NVIC_IRQ44_47_PRIORITY));
   leave_critical_section(flags);
diff --git a/arch/arm/src/lpc17xx/lpc17_mcpwm.c b/arch/arm/src/lpc17xx/lpc17_mcpwm.c
index 7fe1edee39..b882af8950 100644
--- a/arch/arm/src/lpc17xx/lpc17_mcpwm.c
+++ b/arch/arm/src/lpc17xx/lpc17_mcpwm.c
@@ -89,7 +89,7 @@
 
 #ifdef CONFIG_DEBUG_PWM
 #  define pwmdbg              dbg
-#  define pwmlldbg            lldbg
+#  define pwmllerr            llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define pwminfo           info
 #    define pwmllinfo         llinfo
@@ -101,7 +101,7 @@
 #  endif
 #else
 #  define pwmdbg(x...)
-#  define pwmlldbg(x...)
+#  define pwmllerr(x...)
 #  define pwminfo(x...)
 #  define pwmllinfo(x...)
 #  define pwm_dumpgpio(p,m)
diff --git a/arch/arm/src/lpc17xx/lpc17_pwm.c b/arch/arm/src/lpc17xx/lpc17_pwm.c
index 756feb5f52..a2c9f6c39f 100644
--- a/arch/arm/src/lpc17xx/lpc17_pwm.c
+++ b/arch/arm/src/lpc17xx/lpc17_pwm.c
@@ -107,7 +107,7 @@
 
 #ifdef CONFIG_DEBUG_PWM
 #  define pwmdbg              dbg
-#  define pwmlldbg            lldbg
+#  define pwmllerr            llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define pwminfo           info
 #    define pwmllinfo         llinfo
@@ -119,7 +119,7 @@
 #  endif
 #else
 #  define pwmdbg(x...)
-#  define pwmlldbg(x...)
+#  define pwmllerr(x...)
 #  define pwminfo(x...)
 #  define pwmllinfo(x...)
 #  define pwm_dumpgpio(p,m)
diff --git a/arch/arm/src/lpc17xx/lpc17_sdcard.c b/arch/arm/src/lpc17xx/lpc17_sdcard.c
index 4ba4d8bbd3..225bd5465a 100644
--- a/arch/arm/src/lpc17xx/lpc17_sdcard.c
+++ b/arch/arm/src/lpc17xx/lpc17_sdcard.c
@@ -813,7 +813,7 @@ static void lpc17_dmacallback(DMA_HANDLE handle, void *arg, int status)
 
   if (status < 0)
     {
-      flldbg("DMA error %d, remaining: %d\n", status, priv->remaining);
+      fllerr("DMA error %d, remaining: %d\n", status, priv->remaining);
       result = SDIOWAIT_ERROR;
     }
   else
@@ -1080,7 +1080,7 @@ static void lpc17_eventtimeout(int argc, uint32_t arg)
       /* Yes.. wake up any waiting threads */
 
       lpc17_endwait(priv, SDIOWAIT_TIMEOUT);
-      flldbg("Timeout: remaining: %d\n", priv->remaining);
+      fllerr("Timeout: remaining: %d\n", priv->remaining);
     }
 }
 
@@ -1297,7 +1297,7 @@ static int lpc17_interrupt(int irq, void *context)
             {
               /* Terminate the transfer with an error */
 
-              flldbg("ERROR: Data block CRC failure, remaining: %d\n", priv->remaining);
+              fllerr("ERROR: Data block CRC failure, remaining: %d\n", priv->remaining);
               lpc17_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_ERROR);
             }
 
@@ -1307,7 +1307,7 @@ static int lpc17_interrupt(int irq, void *context)
             {
               /* Terminate the transfer with an error */
 
-              flldbg("ERROR: Data timeout, remaining: %d\n", priv->remaining);
+              fllerr("ERROR: Data timeout, remaining: %d\n", priv->remaining);
               lpc17_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_TIMEOUT);
             }
 
@@ -1317,7 +1317,7 @@ static int lpc17_interrupt(int irq, void *context)
             {
               /* Terminate the transfer with an error */
 
-              flldbg("ERROR: RX FIFO overrun, remaining: %d\n", priv->remaining);
+              fllerr("ERROR: RX FIFO overrun, remaining: %d\n", priv->remaining);
               lpc17_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_ERROR);
             }
 
@@ -1327,7 +1327,7 @@ static int lpc17_interrupt(int irq, void *context)
             {
               /* Terminate the transfer with an error */
 
-              flldbg("ERROR: TX FIFO underrun, remaining: %d\n", priv->remaining);
+              fllerr("ERROR: TX FIFO underrun, remaining: %d\n", priv->remaining);
               lpc17_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_ERROR);
             }
 
@@ -1337,7 +1337,7 @@ static int lpc17_interrupt(int irq, void *context)
             {
               /* Terminate the transfer with an error */
 
-              flldbg("ERROR: Start bit, remaining: %d\n", priv->remaining);
+              fllerr("ERROR: Start bit, remaining: %d\n", priv->remaining);
               lpc17_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_ERROR);
             }
         }
diff --git a/arch/arm/src/lpc17xx/lpc17_spi.c b/arch/arm/src/lpc17xx/lpc17_spi.c
index 34f30a703e..a7ccc2b2f1 100644
--- a/arch/arm/src/lpc17xx/lpc17_spi.c
+++ b/arch/arm/src/lpc17xx/lpc17_spi.c
@@ -80,9 +80,9 @@
  */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/arch/arm/src/lpc17xx/lpc17_ssp.c b/arch/arm/src/lpc17xx/lpc17_ssp.c
index 6685cb0723..ad6fc44c87 100644
--- a/arch/arm/src/lpc17xx/lpc17_ssp.c
+++ b/arch/arm/src/lpc17xx/lpc17_ssp.c
@@ -81,9 +81,9 @@
  */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define sspdbg  lldbg
+#  define sspdbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/arch/arm/src/lpc17xx/lpc17_timer.c b/arch/arm/src/lpc17xx/lpc17_timer.c
index 1138f6b38e..2fe7cc56cb 100644
--- a/arch/arm/src/lpc17xx/lpc17_timer.c
+++ b/arch/arm/src/lpc17xx/lpc17_timer.c
@@ -90,7 +90,7 @@
 
 #ifdef CONFIG_DEBUG_PWM
 #  define pwmdbg              dbg
-#  define pwmlldbg            lldbg
+#  define pwmllerr            llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define pwminfo           info
 #    define pwmllinfo         llinfo
@@ -102,7 +102,7 @@
 #  endif
 #else
 #  define pwmdbg(x...)
-#  define pwmlldbg(x...)
+#  define pwmllerr(x...)
 #  define pwminfo(x...)
 #  define pwmllinfo(x...)
 #  define pwm_dumpgpio(p,m)
diff --git a/arch/arm/src/lpc17xx/lpc17_usbdev.c b/arch/arm/src/lpc17xx/lpc17_usbdev.c
index cb8f8366e8..300d1ca6ef 100644
--- a/arch/arm/src/lpc17xx/lpc17_usbdev.c
+++ b/arch/arm/src/lpc17xx/lpc17_usbdev.c
@@ -531,7 +531,7 @@ static struct lpc17_dmadesc_s  g_usbddesc[CONFIG_LPC17_USBDEV_NDMADESCRIPTORS];
 #ifdef CONFIG_LPC17_USBDEV_REGDEBUG
 static void lpc17_printreg(uint32_t addr, uint32_t val, bool iswrite)
 {
-  lldbg("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val);
+  llerr("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val);
 }
 #endif
 
@@ -581,7 +581,7 @@ static void lpc17_checkreg(uint32_t addr, uint32_t val, bool iswrite)
             {
               /* No.. More than one. */
 
-              lldbg("[repeats %d more times]\n", count);
+              llerr("[repeats %d more times]\n", count);
             }
         }
 
diff --git a/arch/arm/src/lpc17xx/lpc17_usbhost.c b/arch/arm/src/lpc17xx/lpc17_usbhost.c
index e0cf06a037..d11c0eb4f9 100644
--- a/arch/arm/src/lpc17xx/lpc17_usbhost.c
+++ b/arch/arm/src/lpc17xx/lpc17_usbhost.c
@@ -456,7 +456,7 @@ static struct lpc17_xfrinfo_s g_xfrbuffers[CONFIG_LPC17_USBHOST_NPREALLOC];
 #ifdef CONFIG_LPC17_USBHOST_REGDEBUG
 static void lpc17_printreg(uint32_t addr, uint32_t val, bool iswrite)
 {
-  lldbg("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val);
+  llerr("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val);
 }
 #endif
 
@@ -506,7 +506,7 @@ static void lpc17_checkreg(uint32_t addr, uint32_t val, bool iswrite)
             {
               /* No.. More than one. */
 
-              lldbg("[repeats %d more times]\n", count);
+              llerr("[repeats %d more times]\n", count);
             }
         }
 
@@ -1694,7 +1694,7 @@ static int lpc17_usbinterrupt(int irq, void *context)
                         }
                       else
                         {
-                          ulldbg("Spurious status change (connected)\n");
+                          ullerr("Spurious status change (connected)\n");
                         }
 
                       /* The LSDA (Low speed device attached) bit is valid
@@ -1750,7 +1750,7 @@ static int lpc17_usbinterrupt(int irq, void *context)
                     }
                   else
                     {
-                       ulldbg("Spurious status change (disconnected)\n");
+                       ullerr("Spurious status change (disconnected)\n");
                     }
                 }
 
@@ -1830,7 +1830,7 @@ static int lpc17_usbinterrupt(int irq, void *context)
                     {
                       /* The transfer failed for some reason... dump some diagnostic info. */
 
-                      ulldbg("ERROR: ED xfrtype:%d TD CTRL:%08x/CC:%d RHPORTST1:%08x\n",
+                      ullerr("ERROR: ED xfrtype:%d TD CTRL:%08x/CC:%d RHPORTST1:%08x\n",
                              ed->xfrtype, td->hw.ctrl, xfrinfo->tdstatus,
                              lpc17_getreg(LPC17_USBHOST_RHPORTST1));
                     }
@@ -1894,7 +1894,7 @@ static int lpc17_usbinterrupt(int irq, void *context)
 #ifdef CONFIG_DEBUG_USB
       if ((pending & LPC17_DEBUG_INTS) != 0)
         {
-          ulldbg("ERROR: Unhandled interrupts INTST:%08x\n", intst);
+          ullerr("ERROR: Unhandled interrupts INTST:%08x\n", intst);
         }
 #endif
 
diff --git a/arch/arm/src/lpc214x/lpc214x_usbdev.c b/arch/arm/src/lpc214x/lpc214x_usbdev.c
index 926a7a1280..431b71655e 100644
--- a/arch/arm/src/lpc214x/lpc214x_usbdev.c
+++ b/arch/arm/src/lpc214x/lpc214x_usbdev.c
@@ -539,7 +539,7 @@ static uint32_t lpc214x_getreg(uint32_t addr)
         {
           if (count == 4)
             {
-              lldbg("...\n");
+              llerr("...\n");
             }
 
           return val;
@@ -556,7 +556,7 @@ static uint32_t lpc214x_getreg(uint32_t addr)
         {
           /* Yes.. then show how many times the value repeated */
 
-          lldbg("[repeats %d more times]\n", count-3);
+          llerr("[repeats %d more times]\n", count-3);
         }
 
       /* Save the new address, value, and count */
@@ -568,7 +568,7 @@ static uint32_t lpc214x_getreg(uint32_t addr)
 
   /* Show the register value read */
 
-  lldbg("%08x->%08x\n", addr, val);
+  llerr("%08x->%08x\n", addr, val);
   return val;
 }
 #endif
@@ -586,7 +586,7 @@ static void lpc214x_putreg(uint32_t val, uint32_t addr)
 {
   /* Show the register value being written */
 
-  lldbg("%08x<-%08x\n", addr, val);
+  llerr("%08x<-%08x\n", addr, val);
 
   /* Write the value */
 
diff --git a/arch/arm/src/lpc2378/lpc23xx_spi.c b/arch/arm/src/lpc2378/lpc23xx_spi.c
index 21aefa2f99..c1daf9f13c 100644
--- a/arch/arm/src/lpc2378/lpc23xx_spi.c
+++ b/arch/arm/src/lpc2378/lpc23xx_spi.c
@@ -79,9 +79,9 @@
 /* CONFIG_DEBUG_SPI enables debug output from this file */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/arch/arm/src/lpc31xx/lpc31_ehci.c b/arch/arm/src/lpc31xx/lpc31_ehci.c
index 498d848da3..0b161ac75c 100644
--- a/arch/arm/src/lpc31xx/lpc31_ehci.c
+++ b/arch/arm/src/lpc31xx/lpc31_ehci.c
@@ -833,7 +833,7 @@ static uint32_t lpc31_swap32(uint32_t value)
 static void lpc31_printreg(volatile uint32_t *regaddr, uint32_t regval,
                           bool iswrite)
 {
-  lldbg("%08x%s%08x\n", (uintptr_t)regaddr, iswrite ? "<-" : "->", regval);
+  llerr("%08x%s%08x\n", (uintptr_t)regaddr, iswrite ? "<-" : "->", regval);
 }
 #endif
 
@@ -884,7 +884,7 @@ static void lpc31_checkreg(volatile uint32_t *regaddr, uint32_t regval, bool isw
             {
               /* No.. More than one. */
 
-              lldbg("[repeats %d more times]\n", count);
+              llerr("[repeats %d more times]\n", count);
             }
         }
 
diff --git a/arch/arm/src/lpc31xx/lpc31_spi.c b/arch/arm/src/lpc31xx/lpc31_spi.c
index fb4586e009..c72a0221c0 100644
--- a/arch/arm/src/lpc31xx/lpc31_spi.c
+++ b/arch/arm/src/lpc31xx/lpc31_spi.c
@@ -207,7 +207,7 @@ static bool spi_checkreg(bool wr, uint32_t value, uint32_t address)
     {
       if (g_ntimes > 0)
         {
-          lldbg("...[Repeats %d times]...\n", g_ntimes);
+          llerr("...[Repeats %d times]...\n", g_ntimes);
         }
 
       g_wrlast      = wr;
@@ -239,7 +239,7 @@ static void spi_putreg(uint32_t value, uint32_t address)
 {
   if (spi_checkreg(true, value, address))
     {
-      lldbg("%08x<-%08x\n", address, value);
+      llerr("%08x<-%08x\n", address, value);
     }
   putreg32(value, address);
 }
@@ -265,7 +265,7 @@ static uint32_t spi_getreg(uint32_t address)
   uint32_t value = getreg32(address);
   if (spi_checkreg(false, value, address))
     {
-      lldbg("%08x->%08x\n", address, value);
+      llerr("%08x->%08x\n", address, value);
     }
   return value;
 }
@@ -921,7 +921,7 @@ FAR struct spi_dev_s *lpc31_spibus_initialize(int port)
    */
 
 #ifdef CONFIG_LPC31_SPI_REGDEBUG
-  lldbg("PINS: %08x MODE0: %08x MODE1: %08x\n",
+  llerr("PINS: %08x MODE0: %08x MODE1: %08x\n",
         spi_getreg(LPC31_IOCONFIG_SPI_PINS),
         spi_getreg(LPC31_IOCONFIG_SPI_MODE0),
         spi_getreg(LPC31_IOCONFIG_SPI_MODE1));
diff --git a/arch/arm/src/lpc31xx/lpc31_usbdev.c b/arch/arm/src/lpc31xx/lpc31_usbdev.c
index bcf51dbbe7..3d56725cea 100644
--- a/arch/arm/src/lpc31xx/lpc31_usbdev.c
+++ b/arch/arm/src/lpc31xx/lpc31_usbdev.c
@@ -501,7 +501,7 @@ static uint32_t lpc31_getreg(uint32_t addr)
         {
           if (count == 4)
             {
-              lldbg("...\n");
+              llerr("...\n");
             }
 
           return val;
@@ -518,7 +518,7 @@ static uint32_t lpc31_getreg(uint32_t addr)
         {
           /* Yes.. then show how many times the value repeated */
 
-          lldbg("[repeats %d more times]\n", count-3);
+          llerr("[repeats %d more times]\n", count-3);
         }
 
       /* Save the new address, value, and count */
@@ -530,7 +530,7 @@ static uint32_t lpc31_getreg(uint32_t addr)
 
   /* Show the register value read */
 
-  lldbg("%08x->%08x\n", addr, val);
+  llerr("%08x->%08x\n", addr, val);
   return val;
 }
 #endif
@@ -548,7 +548,7 @@ static void lpc31_putreg(uint32_t val, uint32_t addr)
 {
   /* Show the register value being written */
 
-  lldbg("%08x<-%08x\n", addr, val);
+  llerr("%08x<-%08x\n", addr, val);
 
   /* Write the value */
 
diff --git a/arch/arm/src/lpc43xx/lpc43_ehci.c b/arch/arm/src/lpc43xx/lpc43_ehci.c
index 0c536fcb6c..d69b9a796d 100644
--- a/arch/arm/src/lpc43xx/lpc43_ehci.c
+++ b/arch/arm/src/lpc43xx/lpc43_ehci.c
@@ -817,7 +817,7 @@ static uint32_t lpc43_swap32(uint32_t value)
 static void lpc43_printreg(volatile uint32_t *regaddr, uint32_t regval,
                           bool iswrite)
 {
-  lldbg("%08x%s%08x\n", (uintptr_t)regaddr, iswrite ? "<-" : "->", regval);
+  llerr("%08x%s%08x\n", (uintptr_t)regaddr, iswrite ? "<-" : "->", regval);
 }
 #endif
 
@@ -868,7 +868,7 @@ static void lpc43_checkreg(volatile uint32_t *regaddr, uint32_t regval, bool isw
             {
               /* No.. More than one. */
 
-              lldbg("[repeats %d more times]\n", count);
+              llerr("[repeats %d more times]\n", count);
             }
         }
 
diff --git a/arch/arm/src/lpc43xx/lpc43_ethernet.c b/arch/arm/src/lpc43xx/lpc43_ethernet.c
index 11da4b3d11..89d37cc88b 100644
--- a/arch/arm/src/lpc43xx/lpc43_ethernet.c
+++ b/arch/arm/src/lpc43xx/lpc43_ethernet.c
@@ -704,7 +704,7 @@ static uint32_t lpc43_getreg(uint32_t addr)
         {
           if (count == 4)
             {
-              lldbg("...\n");
+              llerr("...\n");
             }
 
           return val;
@@ -721,7 +721,7 @@ static uint32_t lpc43_getreg(uint32_t addr)
         {
           /* Yes.. then show how many times the value repeated */
 
-          lldbg("[repeats %d more times]\n", count-3);
+          llerr("[repeats %d more times]\n", count-3);
         }
 
       /* Save the new address, value, and count */
@@ -733,7 +733,7 @@ static uint32_t lpc43_getreg(uint32_t addr)
 
   /* Show the register value read */
 
-  lldbg("%08x->%08x\n", addr, val);
+  llerr("%08x->%08x\n", addr, val);
   return val;
 }
 #endif
@@ -760,7 +760,7 @@ static void lpc43_putreg(uint32_t val, uint32_t addr)
 {
   /* Show the register value being written */
 
-  lldbg("%08x<-%08x\n", addr, val);
+  llerr("%08x<-%08x\n", addr, val);
 
   /* Write the value */
 
@@ -1440,7 +1440,7 @@ static int lpc43_recvframe(FAR struct lpc43_ethmac_s *priv)
 
   if (!lpc43_isfreebuffer(priv))
     {
-      nlldbg("No free buffers\n");
+      nllerr("No free buffers\n");
       return -ENOMEM;
     }
 
@@ -1547,7 +1547,7 @@ static int lpc43_recvframe(FAR struct lpc43_ethmac_s *priv)
                * scanning logic, and continue scanning with the next frame.
                */
 
-              nlldbg("DROPPED: RX descriptor errors: %08x\n", rxdesc->rdes0);
+              nllerr("DROPPED: RX descriptor errors: %08x\n", rxdesc->rdes0);
               lpc43_freesegment(priv, rxcurr, priv->segments);
             }
         }
@@ -1608,7 +1608,7 @@ static void lpc43_receive(FAR struct lpc43_ethmac_s *priv)
 
       if (dev->d_len > CONFIG_NET_ETH_MTU)
         {
-          nlldbg("DROPPED: Too big: %d\n", dev->d_len);
+          nllerr("DROPPED: Too big: %d\n", dev->d_len);
           /* Free dropped packet buffer */
 
           if (dev->d_buf)
@@ -1727,7 +1727,7 @@ static void lpc43_receive(FAR struct lpc43_ethmac_s *priv)
       else
 #endif
         {
-          nlldbg("DROPPED: Unknown type: %04x\n", BUF->type);
+          nllerr("DROPPED: Unknown type: %04x\n", BUF->type);
         }
 
       /* We are finished with the RX buffer.  NOTE:  If the buffer is
@@ -1975,7 +1975,7 @@ static inline void lpc43_interrupt_process(FAR struct lpc43_ethmac_s *priv)
     {
       /* Just let the user know what happened */
 
-      nlldbg("Abnormal event(s): %08x\n", dmasr);
+      nllerr("Abnormal event(s): %08x\n", dmasr);
 
       /* Clear all pending abnormal events */
 
@@ -2179,7 +2179,7 @@ static void lpc43_txtimeout_expiry(int argc, uint32_t arg, ...)
 {
   FAR struct lpc43_ethmac_s *priv = (FAR struct lpc43_ethmac_s *)arg;
 
-  nlldbg("Timeout!\n");
+  nllerr("Timeout!\n");
 
 #ifdef CONFIG_NET_NOINTS
   /* Disable further Ethernet interrupts.  This will prevent some race
diff --git a/arch/arm/src/lpc43xx/lpc43_gpdma.c b/arch/arm/src/lpc43xx/lpc43_gpdma.c
index a84eba773a..c82de2a826 100644
--- a/arch/arm/src/lpc43xx/lpc43_gpdma.c
+++ b/arch/arm/src/lpc43xx/lpc43_gpdma.c
@@ -67,9 +67,9 @@
 #undef DMA_VERBOSE   /* Define to enable verbose debug */
 
 #ifdef DMA_DEBUG
-#  define dmadbg  lldbg
+#  define dmadbg  llerr
 #  ifdef DMA_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/arch/arm/src/lpc43xx/lpc43_irq.c b/arch/arm/src/lpc43xx/lpc43_irq.c
index f45e9248c6..cb2d1c502a 100644
--- a/arch/arm/src/lpc43xx/lpc43_irq.c
+++ b/arch/arm/src/lpc43xx/lpc43_irq.c
@@ -113,29 +113,29 @@ static void lpc43_dumpnvic(const char *msg, int irq)
   irqstate_t flags;
 
   flags = enter_critical_section();
-  lldbg("NVIC (%s, irq=%d):\n", msg, irq);
-  lldbg("  INTCTRL:    %08x VECTAB: %08x\n",
+  llerr("NVIC (%s, irq=%d):\n", msg, irq);
+  llerr("  INTCTRL:    %08x VECTAB: %08x\n",
         getreg32(NVIC_INTCTRL), getreg32(NVIC_VECTAB));
 #if 0
-  lldbg("  SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n",
+  llerr("  SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n",
         getreg32(NVIC_SYSHCON_MEMFAULTENA), getreg32(NVIC_SYSHCON_BUSFAULTENA),
         getreg32(NVIC_SYSHCON_USGFAULTENA), getreg32(NVIC_SYSTICK_CTRL_ENABLE));
 #endif
-  lldbg("  IRQ ENABLE: %08x %08x\n",
+  llerr("  IRQ ENABLE: %08x %08x\n",
         getreg32(NVIC_IRQ0_31_ENABLE), getreg32(NVIC_IRQ32_63_ENABLE));
-  lldbg("  SYSH_PRIO:  %08x %08x %08x\n",
+  llerr("  SYSH_PRIO:  %08x %08x %08x\n",
         getreg32(NVIC_SYSH4_7_PRIORITY), getreg32(NVIC_SYSH8_11_PRIORITY),
         getreg32(NVIC_SYSH12_15_PRIORITY));
-  lldbg("  IRQ PRIO:   %08x %08x %08x %08x\n",
+  llerr("  IRQ PRIO:   %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ0_3_PRIORITY), getreg32(NVIC_IRQ4_7_PRIORITY),
         getreg32(NVIC_IRQ8_11_PRIORITY), getreg32(NVIC_IRQ12_15_PRIORITY));
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ16_19_PRIORITY), getreg32(NVIC_IRQ20_23_PRIORITY),
         getreg32(NVIC_IRQ24_27_PRIORITY), getreg32(NVIC_IRQ28_31_PRIORITY));
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ32_35_PRIORITY), getreg32(NVIC_IRQ36_39_PRIORITY),
         getreg32(NVIC_IRQ40_43_PRIORITY), getreg32(NVIC_IRQ44_47_PRIORITY));
-  lldbg("              %08x %08x %08x\n",
+  llerr("              %08x %08x %08x\n",
         getreg32(NVIC_IRQ48_51_PRIORITY), getreg32(NVIC_IRQ52_55_PRIORITY),
         getreg32(NVIC_IRQ56_59_PRIORITY));
   leave_critical_section(flags);
diff --git a/arch/arm/src/lpc43xx/lpc43_rit.c b/arch/arm/src/lpc43xx/lpc43_rit.c
index f80cd550ac..2b153fb1b3 100644
--- a/arch/arm/src/lpc43xx/lpc43_rit.c
+++ b/arch/arm/src/lpc43xx/lpc43_rit.c
@@ -201,7 +201,7 @@ void up_timer_initialize(void)
       mask_bits++;
     }
 
-  lldbg("mask_bits = %d, mask = %X, ticks_per_int = %d\r\n",
+  llerr("mask_bits = %d, mask = %X, ticks_per_int = %d\r\n",
         mask_bits, (0xffffffff << (32 - mask_bits)), ticks_per_int);
 
   /* Set the mask and compare value so we get interrupts every
diff --git a/arch/arm/src/lpc43xx/lpc43_spi.c b/arch/arm/src/lpc43xx/lpc43_spi.c
index 629f5654c9..a5e6254ce1 100644
--- a/arch/arm/src/lpc43xx/lpc43_spi.c
+++ b/arch/arm/src/lpc43xx/lpc43_spi.c
@@ -67,9 +67,9 @@
 /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/arch/arm/src/lpc43xx/lpc43_ssp.c b/arch/arm/src/lpc43xx/lpc43_ssp.c
index 141c7090f1..4767ac057f 100644
--- a/arch/arm/src/lpc43xx/lpc43_ssp.c
+++ b/arch/arm/src/lpc43xx/lpc43_ssp.c
@@ -76,9 +76,9 @@
  */
 
 #ifdef CONFIG_SSP_DEBUG
-#  define sspdbg  lldbg
+#  define sspdbg  llerr
 #  ifdef CONFIG_SSP_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/arch/arm/src/lpc43xx/lpc43_usb0dev.c b/arch/arm/src/lpc43xx/lpc43_usb0dev.c
index 6f0c36e855..035b1827b9 100644
--- a/arch/arm/src/lpc43xx/lpc43_usb0dev.c
+++ b/arch/arm/src/lpc43xx/lpc43_usb0dev.c
@@ -522,7 +522,7 @@ static uint32_t lpc43_getreg(uint32_t addr)
         {
           if (count == 4)
             {
-              lldbg("...\n");
+              llerr("...\n");
             }
 
           return val;
@@ -539,7 +539,7 @@ static uint32_t lpc43_getreg(uint32_t addr)
         {
           /* Yes.. then show how many times the value repeated */
 
-          lldbg("[repeats %d more times]\n", count-3);
+          llerr("[repeats %d more times]\n", count-3);
         }
 
       /* Save the new address, value, and count */
@@ -551,7 +551,7 @@ static uint32_t lpc43_getreg(uint32_t addr)
 
   /* Show the register value read */
 
-  lldbg("%08x->%08x\n", addr, val);
+  llerr("%08x->%08x\n", addr, val);
   return val;
 }
 #endif
@@ -569,7 +569,7 @@ static void lpc43_putreg(uint32_t val, uint32_t addr)
 {
   /* Show the register value being written */
 
-  lldbg("%08x<-%08x\n", addr, val);
+  llerr("%08x<-%08x\n", addr, val);
 
   /* Write the value */
 
diff --git a/arch/arm/src/moxart/moxart_irq.c b/arch/arm/src/moxart/moxart_irq.c
index 8d2b07cc22..71d9e68629 100644
--- a/arch/arm/src/moxart/moxart_irq.c
+++ b/arch/arm/src/moxart/moxart_irq.c
@@ -145,15 +145,15 @@ void up_irqinitialize(void)
 
 #if 1
 #define REG(x) (*(volatile uint32_t *)(x))
-  lldbg("\n=============================================================\n");
-  lldbg("TM CNTL=%08x INTRS=%08x MASK=%08x LOAD=%08x COUNT=%08x M1=%08x\n",
+  llerr("\n=============================================================\n");
+  llerr("TM CNTL=%08x INTRS=%08x MASK=%08x LOAD=%08x COUNT=%08x M1=%08x\n",
         REG(0x98400030), REG(0x98400034), REG(0x98400038), REG(0x98400004),
         REG(0x98400000), REG(0x98400008));
-  lldbg("IRQ STATUS=%08x MASK=%08x MODE=%08x LEVEL=%08x\n",
+  llerr("IRQ STATUS=%08x MASK=%08x MODE=%08x LEVEL=%08x\n",
         REG(0x98800014), REG(0x98800004), REG(0x9880000C), REG(0x98800010));
-  lldbg("FIQ STATUS=%08x MASK=%08x MODE=%08x LEVEL=%08x\n",
+  llerr("FIQ STATUS=%08x MASK=%08x MODE=%08x LEVEL=%08x\n",
         REG(0x98800034), REG(0x98800024), REG(0x9880002C), REG(0x98800020));
-  lldbg("=============================================================\n");
+  llerr("=============================================================\n");
 #endif
 
 #ifndef CONFIG_SUPPRESS_INTERRUPTS
diff --git a/arch/arm/src/nuc1xx/nuc_dumpgpio.c b/arch/arm/src/nuc1xx/nuc_dumpgpio.c
index 7722349881..45db371a8b 100644
--- a/arch/arm/src/nuc1xx/nuc_dumpgpio.c
+++ b/arch/arm/src/nuc1xx/nuc_dumpgpio.c
@@ -124,19 +124,19 @@ void nuc_dumpgpio(gpio_cfgset_t pinset, const char *msg)
 
   flags = enter_critical_section();
 
-  lldbg("GPIO%c pinset: %08x base: %08x -- %s\n",
+  llerr("GPIO%c pinset: %08x base: %08x -- %s\n",
         g_portchar[port], pinset, base, msg);
-  lldbg("  PMD: %08x  OFFD: %08x  DOUT: %08x DMASK: %08x\n",
+  llerr("  PMD: %08x  OFFD: %08x  DOUT: %08x DMASK: %08x\n",
         getreg32(base + NUC_GPIO_PMD_OFFSET),
         getreg32(base + NUC_GPIO_OFFD_OFFSET),
         getreg32(base + NUC_GPIO_DOUT_OFFSET),
         getreg32(base + NUC_GPIO_DMASK_OFFSET));
-  lldbg("  PIN: %08x  DBEN: %08x   IMD: %08x   IEN: %08x\n",
+  llerr("  PIN: %08x  DBEN: %08x   IMD: %08x   IEN: %08x\n",
         getreg32(base + NUC_GPIO_PIN_OFFSET),
         getreg32(base + NUC_GPIO_DBEN_OFFSET),
         getreg32(base + NUC_GPIO_IMD_OFFSET),
         getreg32(base + NUC_GPIO_IEN_OFFSET));
-  lldbg(" ISRC: %08x\n",
+  llerr(" ISRC: %08x\n",
         getreg32(base + NUC_GPIO_ISRC_OFFSET));
 
   leave_critical_section(flags);
diff --git a/arch/arm/src/nuc1xx/nuc_irq.c b/arch/arm/src/nuc1xx/nuc_irq.c
index ee6f5f1824..961d7c8405 100644
--- a/arch/arm/src/nuc1xx/nuc_irq.c
+++ b/arch/arm/src/nuc1xx/nuc_irq.c
@@ -97,26 +97,26 @@ static void nuc_dumpnvic(const char *msg, int irq)
 
   flags = enter_critical_section();
 
-  lldbg("NVIC (%s, irq=%d):\n", msg, irq);
-  lldbg("  ISER:       %08x ICER:   %08x\n",
+  llerr("NVIC (%s, irq=%d):\n", msg, irq);
+  llerr("  ISER:       %08x ICER:   %08x\n",
         getreg32(ARMV6M_NVIC_ISER), getreg32(ARMV6M_NVIC_ICER));
-  lldbg("  ISPR:       %08x ICPR:   %08x\n",
+  llerr("  ISPR:       %08x ICPR:   %08x\n",
         getreg32(ARMV6M_NVIC_ISPR), getreg32(ARMV6M_NVIC_ICPR));
-  lldbg("  IRQ PRIO:   %08x %08x %08x %08x\n",
+  llerr("  IRQ PRIO:   %08x %08x %08x %08x\n",
         getreg32(ARMV6M_NVIC_IPR0), getreg32(ARMV6M_NVIC_IPR1),
         getreg32(ARMV6M_NVIC_IPR2), getreg32(ARMV6M_NVIC_IPR3));
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(ARMV6M_NVIC_IPR4), getreg32(ARMV6M_NVIC_IPR5),
         getreg32(ARMV6M_NVIC_IPR6), getreg32(ARMV6M_NVIC_IPR7));
 
-  lldbg("SYSCON:\n");
-  lldbg("  CPUID:      %08x\n",
+  llerr("SYSCON:\n");
+  llerr("  CPUID:      %08x\n",
         getreg32(ARMV6M_SYSCON_CPUID));
-  lldbg("  ICSR:       %08x AIRCR:  %08x\n",
+  llerr("  ICSR:       %08x AIRCR:  %08x\n",
         getreg32(ARMV6M_SYSCON_ICSR), getreg32(ARMV6M_SYSCON_AIRCR));
-  lldbg("  SCR:        %08x CCR:    %08x\n",
+  llerr("  SCR:        %08x CCR:    %08x\n",
         getreg32(ARMV6M_SYSCON_SCR), getreg32(ARMV6M_SYSCON_CCR));
-  lldbg("  SHPR2:      %08x SHPR3:  %08x\n",
+  llerr("  SHPR2:      %08x SHPR3:  %08x\n",
         getreg32(ARMV6M_SYSCON_SHPR2), getreg32(ARMV6M_SYSCON_SHPR3));
 
   leave_critical_section(flags);
diff --git a/arch/arm/src/sam34/sam4cm_tc.c b/arch/arm/src/sam34/sam4cm_tc.c
index 22afa97928..9edcbe9d8c 100644
--- a/arch/arm/src/sam34/sam4cm_tc.c
+++ b/arch/arm/src/sam34/sam4cm_tc.c
@@ -390,20 +390,20 @@ static void sam_regdump(struct sam_chan_s *chan, const char *msg)
   uintptr_t base;
 
   base = chan->base;
-  lldbg("TC%d [%08x]: %s\n", chan->chan, (int)base, msg);
-  lldbg("  BMR: %08x QIMR: %08x QISR: %08x WPMR: %08x\n",
+  llerr("TC%d [%08x]: %s\n", chan->chan, (int)base, msg);
+  llerr("  BMR: %08x QIMR: %08x QISR: %08x WPMR: %08x\n",
         getreg32(base+SAM_TC_BMR_OFFSET), getreg32(base+SAM_TC_QIMR_OFFSET),
         getreg32(base+SAM_TC_QISR_OFFSET), getreg32(base+SAM_TC_WPMR_OFFSET));
 
   base = chan->base;
-  lldbg("TC%d Channel %d [%08x]: %s\n", chan->chan, chan->chan, (int)base, msg);
-  lldbg("  CMR: %08x SSMR: %08x  RAB: %08x   CV: %08x\n",
+  llerr("TC%d Channel %d [%08x]: %s\n", chan->chan, chan->chan, (int)base, msg);
+  llerr("  CMR: %08x SSMR: %08x  RAB: %08x   CV: %08x\n",
         getreg32(base+SAM_TC_CMR_OFFSET), getreg32(base+SAM_TC_SMMR_OFFSET),
         getreg32(base+SAM_TC_RAB_OFFSET), getreg32(base+SAM_TC_CV_OFFSET));
-  lldbg("   RA: %08x   RB: %08x   RC: %08x   SR: %08x\n",
+  llerr("   RA: %08x   RB: %08x   RC: %08x   SR: %08x\n",
         getreg32(base+SAM_TC_RA_OFFSET), getreg32(base+SAM_TC_RB_OFFSET),
         getreg32(base+SAM_TC_RC_OFFSET), getreg32(base+SAM_TC_SR_OFFSET));
-  lldbg("  IMR: %08x\n",
+  llerr("  IMR: %08x\n",
         getreg32(base+SAM_TC_IMR_OFFSET));
 }
 #endif
@@ -447,7 +447,7 @@ static bool sam_checkreg(struct sam_chan_s *chan, bool wr, uint32_t regaddr,
         {
           /* Yes... show how many times we did it */
 
-          lldbg("...[Repeats %d times]...\n", chan->ntimes);
+          llerr("...[Repeats %d times]...\n", chan->ntimes);
         }
 
       /* Save information about the new access */
@@ -481,7 +481,7 @@ static inline uint32_t sam_chan_getreg(struct sam_chan_s *chan,
 #ifdef CONFIG_SAM34_TC_REGDEBUG
   if (sam_checkreg(chan, false, regaddr, regval))
     {
-      lldbg("%08x->%08x\n", regaddr, regval);
+      llerr("%08x->%08x\n", regaddr, regval);
     }
 #endif
 
@@ -504,7 +504,7 @@ static inline void sam_chan_putreg(struct sam_chan_s *chan, unsigned int offset,
 #ifdef CONFIG_SAM34_TC_REGDEBUG
   if (sam_checkreg(chan, true, regaddr, regval))
     {
-      lldbg("%08x<-%08x\n", regaddr, regval);
+      llerr("%08x<-%08x\n", regaddr, regval);
     }
 #endif
 
diff --git a/arch/arm/src/sam34/sam4cm_tc.h b/arch/arm/src/sam34/sam4cm_tc.h
index 4da8e54a8b..8476619aef 100644
--- a/arch/arm/src/sam34/sam4cm_tc.h
+++ b/arch/arm/src/sam34/sam4cm_tc.h
@@ -85,12 +85,12 @@
 #ifdef CONFIG_SAM34_TC_DEBUG
 #  define tcdbg    dbg
 #  define tcinfo   info
-#  define tclldbg  lldbg
+#  define tcllerr  llerr
 #  define tcllinfo llinfo
 #else
 #  define tcdbg(x...)
 #  define tcinfo(x...)
-#  define tclldbg(x...)
+#  define tcllerr(x...)
 #  define tcllinfo(x...)
 #endif
 
diff --git a/arch/arm/src/sam34/sam4cm_tickless.c b/arch/arm/src/sam34/sam4cm_tickless.c
index a942d429f3..048c42ffab 100644
--- a/arch/arm/src/sam34/sam4cm_tickless.c
+++ b/arch/arm/src/sam34/sam4cm_tickless.c
@@ -244,7 +244,7 @@ void up_timer_initialize(void)
                                CONFIG_USEC_PER_TICK);
   if (ret < 0)
     {
-      tclldbg("ERROR: sam_oneshot_initialize failed\n");
+      tcllerr("ERROR: sam_oneshot_initialize failed\n");
       PANIC();
     }
 
@@ -256,7 +256,7 @@ void up_timer_initialize(void)
   ret = sam_oneshot_max_delay(&g_tickless.oneshot, &max_delay);
   if (ret < 0)
     {
-      tclldbg("ERROR: sam_oneshot_max_delay failed\n");
+      tcllerr("ERROR: sam_oneshot_max_delay failed\n");
       PANIC();
     }
 
@@ -280,7 +280,7 @@ void up_timer_initialize(void)
                                CONFIG_USEC_PER_TICK);
   if (ret < 0)
     {
-      tclldbg("ERROR: sam_freerun_initialize failed\n");
+      tcllerr("ERROR: sam_freerun_initialize failed\n");
       PANIC();
     }
 
diff --git a/arch/arm/src/sam34/sam4l_gpio.c b/arch/arm/src/sam34/sam4l_gpio.c
index 4dcefcef55..efd97ee1b7 100644
--- a/arch/arm/src/sam34/sam4l_gpio.c
+++ b/arch/arm/src/sam34/sam4l_gpio.c
@@ -539,21 +539,21 @@ int sam_dumpgpio(uint32_t pinset, const char *msg)
   /* The following requires exclusive access to the GPIO registers */
 
   flags = enter_critical_section();
-  lldbg("GPIO%c pinset: %08x base: %08x -- %s\n",
+  llerr("GPIO%c pinset: %08x base: %08x -- %s\n",
         g_portchar[port], pinset, base, msg);
-  lldbg("    GPER: %08x  PMR0: %08x  PMR1: %08x  PMR2: %08x\n",
+  llerr("    GPER: %08x  PMR0: %08x  PMR1: %08x  PMR2: %08x\n",
         getreg32(base + SAM_GPIO_GPER_OFFSET), getreg32(base + SAM_GPIO_PMR0_OFFSET),
         getreg32(base + SAM_GPIO_PMR1_OFFSET), getreg32(base + SAM_GPIO_PMR2_OFFSET));
-  lldbg("   ODER: %08x   OVR: %08x   PVR:  %08x  PUER: %08x\n",
+  llerr("   ODER: %08x   OVR: %08x   PVR:  %08x  PUER: %08x\n",
         getreg32(base + SAM_GPIO_ODER_OFFSET), getreg32(base + SAM_GPIO_OVR_OFFSET),
         getreg32(base + SAM_GPIO_PVR_OFFSET), getreg32(base + SAM_GPIO_PUER_OFFSET));
-  lldbg("   PDER: %08x    IER: %08x  IMR0: %08x  IMR1: %08x\n",
+  llerr("   PDER: %08x    IER: %08x  IMR0: %08x  IMR1: %08x\n",
         getreg32(base + SAM_GPIO_PDER_OFFSET), getreg32(base + SAM_GPIO_IER_OFFSET),
         getreg32(base + SAM_GPIO_IMR0_OFFSET), getreg32(base + SAM_GPIO_IMR1_OFFSET));
-  lldbg("   GFER: %08x    IFR: %08x ODCR0: %08x ODCR1: %08x\n",
+  llerr("   GFER: %08x    IFR: %08x ODCR0: %08x ODCR1: %08x\n",
         getreg32(base + SAM_GPIO_GFER_OFFSET), getreg32(base + SAM_GPIO_IFR_OFFSET),
         getreg32(base + SAM_GPIO_ODCR0_OFFSET), getreg32(base + SAM_GPIO_ODCR1_OFFSET));
-  lldbg("  OSRR0: %08x   EVER: %08x PARAM: %08x  VERS: %08x\n",
+  llerr("  OSRR0: %08x   EVER: %08x PARAM: %08x  VERS: %08x\n",
         getreg32(base + SAM_GPIO_OSRR0_OFFSET), getreg32(base + SAM_GPIO_EVER_OFFSET),
         getreg32(base + SAM_GPIO_PARAMETER_OFFSET), getreg32(base + SAM_GPIO_VERSION_OFFSET));
   leave_critical_section(flags);
diff --git a/arch/arm/src/sam34/sam_emac.c b/arch/arm/src/sam34/sam_emac.c
index 8f6e5cec99..1c7d627677 100644
--- a/arch/arm/src/sam34/sam_emac.c
+++ b/arch/arm/src/sam34/sam_emac.c
@@ -490,7 +490,7 @@ static bool sam_checkreg(struct sam_emac_s *priv, bool wr, uint32_t regval,
         {
           /* Yes... show how many times we did it */
 
-          lldbg("...[Repeats %d times]...\n", priv->ntimes);
+          llerr("...[Repeats %d times]...\n", priv->ntimes);
         }
 
       /* Save information about the new access */
@@ -522,7 +522,7 @@ static uint32_t sam_getreg(struct sam_emac_s *priv, uintptr_t address)
 
   if (sam_checkreg(priv, false, regval, address))
     {
-      lldbg("%08x->%08x\n", address, regval);
+      llerr("%08x->%08x\n", address, regval);
     }
 
   return regval;
@@ -543,7 +543,7 @@ static void sam_putreg(struct sam_emac_s *priv, uintptr_t address,
 {
   if (sam_checkreg(priv, true, regval, address))
     {
-      lldbg("%08x<-%08x\n", address, regval);
+      llerr("%08x<-%08x\n", address, regval);
     }
 
   putreg32(regval, address);
@@ -636,7 +636,7 @@ static int sam_buffer_initialize(struct sam_emac_s *priv)
   priv->txdesc = (struct emac_txdesc_s *)kmm_memalign(8, allocsize);
   if (!priv->txdesc)
     {
-      nlldbg("ERROR: Failed to allocate TX descriptors\n");
+      nllerr("ERROR: Failed to allocate TX descriptors\n");
       return -ENOMEM;
     }
 
@@ -646,7 +646,7 @@ static int sam_buffer_initialize(struct sam_emac_s *priv)
   priv->rxdesc = (struct emac_rxdesc_s *)kmm_memalign(8, allocsize);
   if (!priv->rxdesc)
     {
-      nlldbg("ERROR: Failed to allocate RX descriptors\n");
+      nllerr("ERROR: Failed to allocate RX descriptors\n");
       sam_buffer_free(priv);
       return -ENOMEM;
     }
@@ -657,7 +657,7 @@ static int sam_buffer_initialize(struct sam_emac_s *priv)
   priv->txbuffer = (uint8_t *)kmm_memalign(8, allocsize);
   if (!priv->txbuffer)
     {
-      nlldbg("ERROR: Failed to allocate TX buffer\n");
+      nllerr("ERROR: Failed to allocate TX buffer\n");
       sam_buffer_free(priv);
       return -ENOMEM;
     }
@@ -666,7 +666,7 @@ static int sam_buffer_initialize(struct sam_emac_s *priv)
   priv->rxbuffer = (uint8_t *)kmm_memalign(8, allocsize);
   if (!priv->rxbuffer)
     {
-      nlldbg("ERROR: Failed to allocate RX buffer\n");
+      nllerr("ERROR: Failed to allocate RX buffer\n");
       sam_buffer_free(priv);
       return -ENOMEM;
     }
@@ -760,7 +760,7 @@ static int sam_transmit(struct sam_emac_s *priv)
 
   if (dev->d_len > EMAC_TX_UNITSIZE)
     {
-      nlldbg("ERROR: Packet too big: %d\n", dev->d_len);
+      nllerr("ERROR: Packet too big: %d\n", dev->d_len);
       return -EINVAL;
     }
 
@@ -772,7 +772,7 @@ static int sam_transmit(struct sam_emac_s *priv)
 
   if (sam_txfree(priv) < 1)
     {
-      nlldbg("ERROR: No free TX descriptors\n");
+      nllerr("ERROR: No free TX descriptors\n");
       return -EBUSY;
     }
 
@@ -1136,7 +1136,7 @@ static int sam_recvframe(struct sam_emac_s *priv)
 
               if (pktlen < dev->d_len)
                 {
-                  nlldbg("ERROR: Buffer size %d; frame size %d\n", dev->d_len, pktlen);
+                  nllerr("ERROR: Buffer size %d; frame size %d\n", dev->d_len, pktlen);
                   return -E2BIG;
                 }
 
@@ -1207,7 +1207,7 @@ static void sam_receive(struct sam_emac_s *priv)
 
       if (dev->d_len > CONFIG_NET_ETH_MTU)
         {
-          nlldbg("DROPPED: Too big: %d\n", dev->d_len);
+          nllerr("DROPPED: Too big: %d\n", dev->d_len);
           continue;
         }
 
@@ -1317,7 +1317,7 @@ static void sam_receive(struct sam_emac_s *priv)
       else
 #endif
         {
-          nlldbg("DROPPED: Unknown type: %04x\n", BUF->type);
+          nllerr("DROPPED: Unknown type: %04x\n", BUF->type);
         }
     }
 }
@@ -1468,7 +1468,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv)
           clrbits = EMAC_TSR_RLE | sam_txinuse(priv);
           sam_txreset(priv);
 
-          nlldbg("ERROR: Retry Limit Exceeded TSR: %08x\n", tsr);
+          nllerr("ERROR: Retry Limit Exceeded TSR: %08x\n", tsr);
 
           regval = sam_getreg(priv, SAM_EMAC_NCR);
           regval |= EMAC_NCR_TXEN;
@@ -1479,7 +1479,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv)
 
       if ((tsr & EMAC_TSR_COL) != 0)
         {
-          nlldbg("ERROR: Collision occurred TSR: %08x\n", tsr);
+          nllerr("ERROR: Collision occurred TSR: %08x\n", tsr);
           clrbits |= EMAC_TSR_COL;
         }
 
@@ -1487,7 +1487,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv)
 
       if ((tsr & EMAC_TSR_TFC) != 0)
         {
-          nlldbg("ERROR: Transmit Frame Corruption due to AHB error: %08x\n", tsr);
+          nllerr("ERROR: Transmit Frame Corruption due to AHB error: %08x\n", tsr);
           clrbits |= EMAC_TSR_TFC;
         }
 
@@ -1502,7 +1502,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv)
 
       if ((tsr & EMAC_TSR_UND) != 0)
         {
-          nlldbg("ERROR: Transmit Underrun TSR: %08x\n", tsr);
+          nllerr("ERROR: Transmit Underrun TSR: %08x\n", tsr);
           clrbits |= EMAC_TSR_UND;
         }
 
@@ -1539,7 +1539,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv)
 
       if ((rsr & EMAC_RSR_RXOVR) != 0)
         {
-          nlldbg("ERROR: Receiver overrun RSR: %08x\n", rsr);
+          nllerr("ERROR: Receiver overrun RSR: %08x\n", rsr);
           clrbits |= EMAC_RSR_RXOVR;
         }
 
@@ -1556,7 +1556,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv)
 
       if ((rsr & EMAC_RSR_BNA) != 0)
         {
-          nlldbg("ERROR: Buffer not available RSR: %08x\n", rsr);
+          nllerr("ERROR: Buffer not available RSR: %08x\n", rsr);
           clrbits |= EMAC_RSR_BNA;
         }
 
@@ -1578,7 +1578,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv)
 
   if ((pending & EMAC_INT_PFNZ) != 0)
     {
-      nlldbg("Pause frame received\n");
+      nllerr("Pause frame received\n");
     }
 
   /* Check for Pause Time Zero (PTZ)
@@ -1588,7 +1588,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv)
 
   if ((pending & EMAC_INT_PTZ) != 0)
     {
-      nlldbg("Pause TO!\n");
+      nllerr("Pause TO!\n");
     }
 #endif
 }
@@ -1725,7 +1725,7 @@ static int sam_emac_interrupt(int irq, void *context)
 
 static inline void sam_txtimeout_process(FAR struct sam_emac_s *priv)
 {
-  nlldbg("Timeout!\n");
+  nllerr("Timeout!\n");
 
   /* Then reset the hardware.  Just take the interface down, then back
    * up again.
@@ -1956,7 +1956,7 @@ static int sam_ifup(struct net_driver_s *dev)
   struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private;
   int ret;
 
-  nlldbg("Bringing up: %d.%d.%d.%d\n",
+  nllerr("Bringing up: %d.%d.%d.%d\n",
          dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
          (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 
@@ -1980,7 +1980,7 @@ static int sam_ifup(struct net_driver_s *dev)
   ret = sam_phyinit(priv);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_phyinit failed: %d\n", ret);
+      nllerr("ERROR: sam_phyinit failed: %d\n", ret);
       return ret;
     }
 
@@ -1989,7 +1989,7 @@ static int sam_ifup(struct net_driver_s *dev)
   ret = sam_autonegotiate(priv);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_autonegotiate failed: %d\n", ret);
+      nllerr("ERROR: sam_autonegotiate failed: %d\n", ret);
       return ret;
     }
 
@@ -2032,7 +2032,7 @@ static int sam_ifdown(struct net_driver_s *dev)
   struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private;
   irqstate_t flags;
 
-  nlldbg("Taking the network down\n");
+  nllerr("Taking the network down\n");
 
   /* Disable the EMAC interrupt */
 
@@ -2751,7 +2751,7 @@ static int sam_phyreset(struct sam_emac_s *priv)
   ret = sam_phywrite(priv, priv->phyaddr, MII_MCR, MII_MCR_RESET);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_phywrite failed: %d\n", ret);
+      nllerr("ERROR: sam_phywrite failed: %d\n", ret);
     }
 
   /* Wait for the PHY reset to complete */
@@ -2763,7 +2763,7 @@ static int sam_phyreset(struct sam_emac_s *priv)
       int result = sam_phyread(priv, priv->phyaddr, MII_MCR, &mcr);
       if (result < 0)
         {
-          nlldbg("ERROR: Failed to read the MCR register: %d\n", ret);
+          nllerr("ERROR: Failed to read the MCR register: %d\n", ret);
           ret = result;
         }
       else if ((mcr & MII_MCR_RESET) == 0)
@@ -2828,7 +2828,7 @@ static int sam_phyfind(struct sam_emac_s *priv, uint8_t *phyaddr)
 
   else
     {
-      nlldbg("ERROR: sam_phyread failed for PHY address %02x: %d\n",
+      nllerr("ERROR: sam_phyread failed for PHY address %02x: %d\n",
              candidate, ret);
 
       for (offset = 0; offset < 32; offset++)
@@ -2894,7 +2894,7 @@ static int sam_phyread(struct sam_emac_s *priv, uint8_t phyaddr,
   ret = sam_phywait(priv);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_phywait failed: %d\n", ret);
+      nllerr("ERROR: sam_phywait failed: %d\n", ret);
       return ret;
     }
 
@@ -2918,7 +2918,7 @@ static int sam_phyread(struct sam_emac_s *priv, uint8_t phyaddr,
   ret = sam_phywait(priv);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_phywait failed: %d\n", ret);
+      nllerr("ERROR: sam_phywait failed: %d\n", ret);
       return ret;
     }
 
@@ -2958,7 +2958,7 @@ static int sam_phywrite(struct sam_emac_s *priv, uint8_t phyaddr,
   ret = sam_phywait(priv);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_phywait failed: %d\n", ret);
+      nllerr("ERROR: sam_phywait failed: %d\n", ret);
       return ret;
     }
 
@@ -2982,7 +2982,7 @@ static int sam_phywrite(struct sam_emac_s *priv, uint8_t phyaddr,
   ret = sam_phywait(priv);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_phywait failed: %d\n", ret);
+      nllerr("ERROR: sam_phywait failed: %d\n", ret);
       return ret;
     }
 
@@ -3026,7 +3026,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phyread(priv, priv->phyaddr, MII_PHYID1, &phyid1);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to read PHYID1\n");
+      nllerr("ERROR: Failed to read PHYID1\n");
       goto errout;
     }
 
@@ -3035,7 +3035,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phyread(priv, priv->phyaddr, MII_PHYID2, &phyid2);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to read PHYID2\n");
+      nllerr("ERROR: Failed to read PHYID2\n");
       goto errout;
     }
 
@@ -3051,7 +3051,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
     }
   else
     {
-      nlldbg("ERROR: PHY not recognized\n");
+      nllerr("ERROR: PHY not recognized\n");
     }
 
   /* Setup control register */
@@ -3059,7 +3059,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phyread(priv, priv->phyaddr, MII_MCR, &mcr);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to read MCR\n");
+      nllerr("ERROR: Failed to read MCR\n");
       goto errout;
     }
 
@@ -3070,7 +3070,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phywrite(priv, priv->phyaddr, MII_MCR, mcr);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to write MCR\n");
+      nllerr("ERROR: Failed to write MCR\n");
       goto errout;
     }
 
@@ -3085,7 +3085,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phywrite(priv, priv->phyaddr, MII_ADVERTISE, advertise);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to write ANAR\n");
+      nllerr("ERROR: Failed to write ANAR\n");
       goto errout;
     }
 
@@ -3094,7 +3094,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phyread(priv, priv->phyaddr, MII_MCR, &mcr);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to read MCR\n");
+      nllerr("ERROR: Failed to read MCR\n");
       goto errout;
     }
 
@@ -3102,7 +3102,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phywrite(priv, priv->phyaddr, MII_MCR, mcr);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to write MCR\n");
+      nllerr("ERROR: Failed to write MCR\n");
       goto errout;
     }
 
@@ -3114,7 +3114,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phywrite(priv, priv->phyaddr, MII_MCR, mcr);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to write MCR\n");
+      nllerr("ERROR: Failed to write MCR\n");
       goto errout;
     }
 
@@ -3128,7 +3128,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
       ret = sam_phyread(priv, priv->phyaddr, MII_MSR, &msr);
       if (ret < 0)
         {
-          nlldbg("ERROR: Failed to read MSR\n");
+          nllerr("ERROR: Failed to read MSR\n");
           goto errout;
         }
 
@@ -3146,7 +3146,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
 
       if (++timeout >= PHY_RETRY_MAX)
         {
-          nlldbg("ERROR: TimeOut\n");
+          nllerr("ERROR: TimeOut\n");
           sam_phydump(priv);
           ret = -ETIMEDOUT;
           goto errout;
@@ -3158,7 +3158,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phyread(priv, priv->phyaddr, MII_LPA, &lpa);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to read ANLPAR\n");
+      nllerr("ERROR: Failed to read ANLPAR\n");
       goto errout;
     }
 
@@ -3244,13 +3244,13 @@ static bool sam_linkup(struct sam_emac_s *priv)
   ret = sam_phyread(priv, priv->phyaddr, MII_MSR, &msr);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to read MSR: %d\n", ret);
+      nllerr("ERROR: Failed to read MSR: %d\n", ret);
       goto errout;
     }
 
   if ((msr & MII_MSR_LINKSTATUS) == 0)
     {
-      nlldbg("ERROR: MSR LinkStatus: %04x\n", msr);
+      nllerr("ERROR: MSR LinkStatus: %04x\n", msr);
       goto errout;
     }
 
@@ -3259,7 +3259,7 @@ static bool sam_linkup(struct sam_emac_s *priv)
   ret = sam_phyread(priv, priv->phyaddr, CONFIG_SAM34_EMAC_PHYSR, &physr);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to read PHYSR: %d\n", ret);
+      nllerr("ERROR: Failed to read PHYSR: %d\n", ret);
       goto errout;
     }
 
@@ -3354,7 +3354,7 @@ static int sam_phyinit(struct sam_emac_s *priv)
   ret = sam_phyfind(priv, &priv->phyaddr);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_phyfind failed: %d\n", ret);
+      nllerr("ERROR: sam_phyfind failed: %d\n", ret);
       return ret;
     }
 
@@ -3823,14 +3823,14 @@ void up_netinitialize(void)
   priv->txpoll = wd_create();
   if (!priv->txpoll)
     {
-      nlldbg("ERROR: Failed to create periodic poll timer\n");
+      nllerr("ERROR: Failed to create periodic poll timer\n");
       return;
     }
 
   priv->txtimeout = wd_create();         /* Create TX timeout timer */
   if (!priv->txtimeout)
     {
-      nlldbg("ERROR: Failed to create periodic poll timer\n");
+      nllerr("ERROR: Failed to create periodic poll timer\n");
       goto errout_with_txpoll;
     }
 
@@ -3843,7 +3843,7 @@ void up_netinitialize(void)
   ret = sam_buffer_initialize(priv);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_buffer_initialize failed: %d\n", ret);
+      nllerr("ERROR: sam_buffer_initialize failed: %d\n", ret);
       goto errout_with_txtimeout;
     }
 
@@ -3854,7 +3854,7 @@ void up_netinitialize(void)
   ret = irq_attach(SAM_IRQ_EMAC, sam_emac_interrupt);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to attach the handler to the IRQ%d\n", SAM_IRQ_EMAC);
+      nllerr("ERROR: Failed to attach the handler to the IRQ%d\n", SAM_IRQ_EMAC);
       goto errout_with_buffers;
     }
 
@@ -3867,7 +3867,7 @@ void up_netinitialize(void)
   ret = sam_ifdown(&priv->dev);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to put the interface in the down state: %d\n", ret);
+      nllerr("ERROR: Failed to put the interface in the down state: %d\n", ret);
       goto errout_with_buffers;
     }
 
@@ -3879,7 +3879,7 @@ void up_netinitialize(void)
       return;
     }
 
-  nlldbg("ERROR: netdev_register() failed: %d\n", ret);
+  nllerr("ERROR: netdev_register() failed: %d\n", ret);
 
 errout_with_buffers:
   sam_buffer_free(priv);
diff --git a/arch/arm/src/sam34/sam_gpio.c b/arch/arm/src/sam34/sam_gpio.c
index b0f45e89e7..78f5e1aff1 100644
--- a/arch/arm/src/sam34/sam_gpio.c
+++ b/arch/arm/src/sam34/sam_gpio.c
@@ -488,41 +488,41 @@ int sam_dumpgpio(uint32_t pinset, const char *msg)
   /* The following requires exclusive access to the GPIO registers */
 
   flags = enter_critical_section();
-  lldbg("PIO%c pinset: %08x base: %08x -- %s\n",
+  llerr("PIO%c pinset: %08x base: %08x -- %s\n",
         g_portchar[port], pinset, base, msg);
-  lldbg("    PSR: %08x    OSR: %08x   IFSR: %08x   ODSR: %08x\n",
+  llerr("    PSR: %08x    OSR: %08x   IFSR: %08x   ODSR: %08x\n",
         getreg32(base + SAM_PIO_PSR_OFFSET), getreg32(base + SAM_PIO_OSR_OFFSET),
         getreg32(base + SAM_PIO_IFSR_OFFSET), getreg32(base + SAM_PIO_ODSR_OFFSET));
-  lldbg("   PDSR: %08x    IMR: %08x    ISR: %08x   MDSR: %08x\n",
+  llerr("   PDSR: %08x    IMR: %08x    ISR: %08x   MDSR: %08x\n",
         getreg32(base + SAM_PIO_PDSR_OFFSET), getreg32(base + SAM_PIO_IMR_OFFSET),
         getreg32(base + SAM_PIO_ISR_OFFSET), getreg32(base + SAM_PIO_MDSR_OFFSET));
 #if defined(CONFIG_ARCH_CHIP_SAM3U)
-  lldbg("   ABSR: %08x SCIFSR: %08x  DIFSR: %08x IFDGSR: %08x\n",
+  llerr("   ABSR: %08x SCIFSR: %08x  DIFSR: %08x IFDGSR: %08x\n",
         getreg32(base + SAM_PIO_ABSR_OFFSET), getreg32(base + SAM_PIO_SCIFSR_OFFSET),
         getreg32(base + SAM_PIO_DIFSR_OFFSET), getreg32(base + SAM_PIO_IFDGSR_OFFSET));
 #elif defined(CONFIG_ARCH_CHIP_SAM4S) || defined(CONFIG_ARCH_CHIP_SAM4E)
-  lldbg(" ABCDSR: %08x %08x         IFSCSR: %08x  PPDSR: %08x\n",
+  llerr(" ABCDSR: %08x %08x         IFSCSR: %08x  PPDSR: %08x\n",
         getreg32(base + SAM_PIO_ABCDSR1_OFFSET), getreg32(base + SAM_PIO_ABCDSR2_OFFSET),
         getreg32(base + SAM_PIO_IFSCSR_OFFSET), getreg32(base + SAM_PIO_PPDSR_OFFSET));
 #endif
-  lldbg("   PUSR: %08x   SCDR: %08x   OWSR: %08x  AIMMR: %08x\n",
+  llerr("   PUSR: %08x   SCDR: %08x   OWSR: %08x  AIMMR: %08x\n",
         getreg32(base + SAM_PIO_PUSR_OFFSET), getreg32(base + SAM_PIO_SCDR_OFFSET),
         getreg32(base + SAM_PIO_OWSR_OFFSET), getreg32(base + SAM_PIO_AIMMR_OFFSET));
-  lldbg("    ESR: %08x    LSR: %08x   ELSR: %08x FELLSR: %08x\n",
+  llerr("    ESR: %08x    LSR: %08x   ELSR: %08x FELLSR: %08x\n",
         getreg32(base + SAM_PIO_ESR_OFFSET), getreg32(base + SAM_PIO_LSR_OFFSET),
         getreg32(base + SAM_PIO_ELSR_OFFSET), getreg32(base + SAM_PIO_FELLSR_OFFSET));
-  lldbg(" FRLHSR: %08x LOCKSR: %08x   WPMR: %08x   WPSR: %08x\n",
+  llerr(" FRLHSR: %08x LOCKSR: %08x   WPMR: %08x   WPSR: %08x\n",
         getreg32(base + SAM_PIO_FRLHSR_OFFSET), getreg32(base + SAM_PIO_LOCKSR_OFFSET),
         getreg32(base + SAM_PIO_WPMR_OFFSET), getreg32(base + SAM_PIO_WPSR_OFFSET));
 #if defined(CONFIG_ARCH_CHIP_SAM4S) || defined(CONFIG_ARCH_CHIP_SAM4E)
-  lldbg("   PCMR: %08x  PCIMR: %08x  PCISR: %08x   PCRHR: %08x\n",
+  llerr("   PCMR: %08x  PCIMR: %08x  PCISR: %08x   PCRHR: %08x\n",
         getreg32(base + SAM_PIO_PCMR_OFFSET), getreg32(base + SAM_PIO_PCIMR_OFFSET),
         getreg32(base + SAM_PIO_PCISR_OFFSET), getreg32(base + SAM_PIO_PCRHR_OFFSET));
 #ifdef CONFIG_ARCH_CHIP_SAM4E
-  lldbg("SCHMITT: %08x DELAYR:%08x\n",
+  llerr("SCHMITT: %08x DELAYR:%08x\n",
         getreg32(base + SAM_PIO_SCHMITT_OFFSET), getreg32(base + SAM_PIO_DELAYR_OFFSET));
 #else
-  lldbg("SCHMITT: %08x\n",
+  llerr("SCHMITT: %08x\n",
         getreg32(base + SAM_PIO_SCHMITT_OFFSET));
 #endif
 #endif
diff --git a/arch/arm/src/sam34/sam_hsmci.c b/arch/arm/src/sam34/sam_hsmci.c
index 8057785991..7b36cac7fb 100644
--- a/arch/arm/src/sam34/sam_hsmci.c
+++ b/arch/arm/src/sam34/sam_hsmci.c
@@ -1083,7 +1083,7 @@ static void sam_eventtimeout(int argc, uint32_t arg)
       /* Yes.. wake up any waiting threads */
 
       sam_endwait(priv, SDIOWAIT_TIMEOUT);
-      flldbg("Timeout\n");
+      fllerr("Timeout\n");
     }
 }
 
@@ -1278,7 +1278,7 @@ static int sam_interrupt(int irq, void *context)
             {
               /* Yes.. Was it some kind of timeout error? */
 
-              flldbg("ERROR: enabled: %08x pending: %08x\n", enabled, pending);
+              fllerr("ERROR: enabled: %08x pending: %08x\n", enabled, pending);
               if ((pending & HSMCI_DATA_TIMEOUT_ERRORS) != 0)
                 {
                   /* Yes.. Terminate with a timeout. */
diff --git a/arch/arm/src/sam34/sam_irq.c b/arch/arm/src/sam34/sam_irq.c
index d775907bd5..d1a1de2407 100644
--- a/arch/arm/src/sam34/sam_irq.c
+++ b/arch/arm/src/sam34/sam_irq.c
@@ -114,40 +114,40 @@ static void sam_dumpnvic(const char *msg, int irq)
   irqstate_t flags;
 
   flags = enter_critical_section();
-  lldbg("NVIC (%s, irq=%d):\n", msg, irq);
-  lldbg("  INTCTRL:    %08x VECTAB:  %08x\n",
+  llerr("NVIC (%s, irq=%d):\n", msg, irq);
+  llerr("  INTCTRL:    %08x VECTAB:  %08x\n",
         getreg32(NVIC_INTCTRL), getreg32(NVIC_VECTAB));
 #if 0
-  lldbg("  SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n",
+  llerr("  SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n",
         getreg32(NVIC_SYSHCON_MEMFAULTENA), getreg32(NVIC_SYSHCON_BUSFAULTENA),
         getreg32(NVIC_SYSHCON_USGFAULTENA), getreg32(NVIC_SYSTICK_CTRL_ENABLE));
 #endif
-  lldbg("  IRQ ENABLE: %08x %08x %08x\n",
+  llerr("  IRQ ENABLE: %08x %08x %08x\n",
         getreg32(NVIC_IRQ0_31_ENABLE), getreg32(NVIC_IRQ32_63_ENABLE),
         getreg32(NVIC_IRQ64_95_ENABLE));
-  lldbg("  SYSH_PRIO:  %08x %08x %08x\n",
+  llerr("  SYSH_PRIO:  %08x %08x %08x\n",
         getreg32(NVIC_SYSH4_7_PRIORITY), getreg32(NVIC_SYSH8_11_PRIORITY),
         getreg32(NVIC_SYSH12_15_PRIORITY));
-  lldbg("  IRQ PRIO:   %08x %08x %08x %08x\n",
+  llerr("  IRQ PRIO:   %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ0_3_PRIORITY), getreg32(NVIC_IRQ4_7_PRIORITY),
         getreg32(NVIC_IRQ8_11_PRIORITY), getreg32(NVIC_IRQ12_15_PRIORITY));
 #if SAM_IRQ_NEXTINT > 15
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ16_19_PRIORITY), getreg32(NVIC_IRQ20_23_PRIORITY),
         getreg32(NVIC_IRQ24_27_PRIORITY), getreg32(NVIC_IRQ28_31_PRIORITY));
 #endif
 #if SAM_IRQ_NEXTINT > 31
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ32_35_PRIORITY), getreg32(NVIC_IRQ36_39_PRIORITY),
         getreg32(NVIC_IRQ40_43_PRIORITY), getreg32(NVIC_IRQ44_47_PRIORITY));
 #endif
 #if SAM_IRQ_NEXTINT > 47
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ48_51_PRIORITY), getreg32(NVIC_IRQ52_55_PRIORITY),
         getreg32(NVIC_IRQ56_59_PRIORITY), getreg32(NVIC_IRQ60_63_PRIORITY));
 #endif
 #if SAM_IRQ_NEXTINT > 63
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ64_67_PRIORITY), getreg32(NVIC_IRQ68_71_PRIORITY),
         getreg32(NVIC_IRQ72_75_PRIORITY), getreg32(NVIC_IRQ76_79_PRIORITY));
 #endif
diff --git a/arch/arm/src/sam34/sam_rtc.c b/arch/arm/src/sam34/sam_rtc.c
index 98e06ad936..39a9c7b111 100644
--- a/arch/arm/src/sam34/sam_rtc.c
+++ b/arch/arm/src/sam34/sam_rtc.c
@@ -91,12 +91,12 @@
 #ifdef CONFIG_DEBUG_RTC
 #  define rtcdbg    dbg
 #  define rtcinfo   info
-#  define rtclldbg  lldbg
+#  define rtcllerr  llerr
 #  define rtcllinfo llinfo
 #else
 #  define rtcdbg(x...)
 #  define rtcinfo(x...)
-#  define rtclldbg(x...)
+#  define rtcllerr(x...)
 #  define rtcllinfo(x...)
 #endif
 
@@ -149,16 +149,16 @@ uint32_t g_rtt_offset = 0;
 #ifdef CONFIG_DEBUG_RTC
 static void rtc_dumpregs(FAR const char *msg)
 {
-  rtclldbg("%s:\n", msg);
-  rtclldbg("      CR: %08x\n", getreg32(SAM_RTC_CR));
-  rtclldbg("      MR: %08x\n", getreg32(SAM_RTC_MR));
-  rtclldbg("    TIMR: %08x\n", getreg32(SAM_RTC_TIMR));
-  rtclldbg("    CALR: %08x\n", getreg32(SAM_RTC_CALR));
-  rtclldbg("  TIMALR: %08x\n", getreg32(SAM_RTC_TIMALR));
-  rtclldbg("  CALALR: %08x\n", getreg32(SAM_RTC_CALALR));
-  rtclldbg("      SR: %08x\n", getreg32(SAM_RTC_SR));
-  rtclldbg("     IMR: %08x\n", getreg32(SAM_RTC_IMR));
-  rtclldbg("     VER: %08x\n", getreg32(SAM_RTC_VER));
+  rtcllerr("%s:\n", msg);
+  rtcllerr("      CR: %08x\n", getreg32(SAM_RTC_CR));
+  rtcllerr("      MR: %08x\n", getreg32(SAM_RTC_MR));
+  rtcllerr("    TIMR: %08x\n", getreg32(SAM_RTC_TIMR));
+  rtcllerr("    CALR: %08x\n", getreg32(SAM_RTC_CALR));
+  rtcllerr("  TIMALR: %08x\n", getreg32(SAM_RTC_TIMALR));
+  rtcllerr("  CALALR: %08x\n", getreg32(SAM_RTC_CALALR));
+  rtcllerr("      SR: %08x\n", getreg32(SAM_RTC_SR));
+  rtcllerr("     IMR: %08x\n", getreg32(SAM_RTC_IMR));
+  rtcllerr("     VER: %08x\n", getreg32(SAM_RTC_VER));
 }
 #else
 #  define rtc_dumpregs(msg)
@@ -181,13 +181,13 @@ static void rtc_dumpregs(FAR const char *msg)
 #ifdef CONFIG_DEBUG_RTC
 static void rtc_dumptime(FAR struct tm *tp, FAR const char *msg)
 {
-  rtclldbg("%s:\n", msg);
-  rtclldbg("  tm_sec: %08x\n", tp->tm_sec);
-  rtclldbg("  tm_min: %08x\n", tp->tm_min);
-  rtclldbg(" tm_hour: %08x\n", tp->tm_hour);
-  rtclldbg(" tm_mday: %08x\n", tp->tm_mday);
-  rtclldbg("  tm_mon: %08x\n", tp->tm_mon);
-  rtclldbg(" tm_year: %08x\n", tp->tm_year);
+  rtcllerr("%s:\n", msg);
+  rtcllerr("  tm_sec: %08x\n", tp->tm_sec);
+  rtcllerr("  tm_min: %08x\n", tp->tm_min);
+  rtcllerr(" tm_hour: %08x\n", tp->tm_hour);
+  rtcllerr(" tm_mday: %08x\n", tp->tm_mday);
+  rtcllerr("  tm_mon: %08x\n", tp->tm_mon);
+  rtcllerr(" tm_year: %08x\n", tp->tm_year);
 }
 #else
 #  define rtc_dumptime(tp, msg)
@@ -298,7 +298,7 @@ static int rtc_interrupt(int irq, void *context)
   ret = work_queue(LPWORK, &g_alarmwork, rtc_worker, NULL, 0);
   if (ret < 0)
     {
-      rtclldbg("ERRPR: work_queue failed: %d\n", ret);
+      rtcllerr("ERRPR: work_queue failed: %d\n", ret);
     }
 
   /* Disable any further alarm interrupts */
diff --git a/arch/arm/src/sam34/sam_rtt.c b/arch/arm/src/sam34/sam_rtt.c
index 516153e191..f5f8b7e822 100644
--- a/arch/arm/src/sam34/sam_rtt.c
+++ b/arch/arm/src/sam34/sam_rtt.c
@@ -76,12 +76,12 @@
 
 /* Debug ********************************************************************/
 /* Non-standard debug that may be enabled just for testing the timer
- * driver.  NOTE: that only lldbg types are used so that the output is
+ * driver.  NOTE: that only llerr types are used so that the output is
  * immediately available.
  */
 
 #ifdef CONFIG_DEBUG_RTT
-#  define rttdbg    lldbg
+#  define rttdbg    llerr
 #  define rttinfo   llinfo
 #else
 #  define rttdbg(x...)
@@ -214,7 +214,7 @@ static uint32_t sam34_getreg(uint32_t addr)
         {
           if (count == 4)
             {
-              lldbg("...\n");
+              llerr("...\n");
             }
 
           return val;
@@ -231,7 +231,7 @@ static uint32_t sam34_getreg(uint32_t addr)
         {
           /* Yes.. then show how many times the value repeated */
 
-          lldbg("[repeats %d more times]\n", count-3);
+          llerr("[repeats %d more times]\n", count-3);
         }
 
       /* Save the new address, value, and count */
@@ -243,7 +243,7 @@ static uint32_t sam34_getreg(uint32_t addr)
 
   /* Show the register value read */
 
-  lldbg("%08lx->%08lx\n", addr, val);
+  llerr("%08lx->%08lx\n", addr, val);
   return val;
 }
 #endif
@@ -261,7 +261,7 @@ static void sam34_putreg(uint32_t val, uint32_t addr)
 {
   /* Show the register value being written */
 
-  lldbg("%08lx<-%08lx\n", addr, val);
+  llerr("%08lx<-%08lx\n", addr, val);
 
   /* Write the value */
 
diff --git a/arch/arm/src/sam34/sam_spi.c b/arch/arm/src/sam34/sam_spi.c
index adf2842ae7..80c2b3dc2c 100644
--- a/arch/arm/src/sam34/sam_spi.c
+++ b/arch/arm/src/sam34/sam_spi.c
@@ -148,9 +148,9 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg lldbg
+#  define spidbg llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
@@ -441,7 +441,7 @@ static bool spi_checkreg(struct sam_spidev_s *spi, bool wr, uint32_t value,
         {
           /* Yes... show how many times we did it */
 
-          lldbg("...[Repeats %d times]...\n", spi->ntimes);
+          llerr("...[Repeats %d times]...\n", spi->ntimes);
         }
 
       /* Save information about the new access */
@@ -475,7 +475,7 @@ static inline uint32_t spi_getreg(struct sam_spidev_s *spi,
 #ifdef CONFIG_SAM34_SPI_REGDEBUG
   if (spi_checkreg(spi, false, value, address))
     {
-      lldbg("%08x->%08x\n", address, value);
+      llerr("%08x->%08x\n", address, value);
     }
 #endif
 
@@ -498,7 +498,7 @@ static inline void spi_putreg(struct sam_spidev_s *spi, uint32_t value,
 #ifdef CONFIG_SAM34_SPI_REGDEBUG
   if (spi_checkreg(spi, true, value, address))
     {
-      lldbg("%08x<-%08x\n", address, value);
+      llerr("%08x<-%08x\n", address, value);
     }
 #endif
 
diff --git a/arch/arm/src/sam34/sam_tc.c b/arch/arm/src/sam34/sam_tc.c
index ed67d4b5ca..f16894f788 100644
--- a/arch/arm/src/sam34/sam_tc.c
+++ b/arch/arm/src/sam34/sam_tc.c
@@ -74,12 +74,12 @@
 
 /* Debug ********************************************************************/
 /* Non-standard debug that may be enabled just for testing the timer
- * driver.  NOTE: that only lldbg types are used so that the output is
+ * driver.  NOTE: that only llerr types are used so that the output is
  * immediately available.
  */
 
 #ifdef CONFIG_DEBUG_TIMER
-#  define tcdbg    lldbg
+#  define tcdbg    llerr
 #  define tcinfo   llinfo
 #else
 #  define tcdbg(x...)
@@ -195,7 +195,7 @@ static uint32_t sam34_getreg(uint32_t addr)
         {
           if (count == 4)
             {
-              lldbg("...\n");
+              llerr("...\n");
             }
 
           return val;
@@ -212,7 +212,7 @@ static uint32_t sam34_getreg(uint32_t addr)
         {
           /* Yes.. then show how many times the value repeated */
 
-          lldbg("[repeats %d more times]\n", count-3);
+          llerr("[repeats %d more times]\n", count-3);
         }
 
       /* Save the new address, value, and count */
@@ -224,7 +224,7 @@ static uint32_t sam34_getreg(uint32_t addr)
 
   /* Show the register value read */
 
-  lldbg("%08lx->%08lx\n", addr, val);
+  llerr("%08lx->%08lx\n", addr, val);
   return val;
 }
 #endif
@@ -242,7 +242,7 @@ static void sam34_putreg(uint32_t val, uint32_t addr)
 {
   /* Show the register value being written */
 
-  lldbg("%08lx<-%08lx\n", addr, val);
+  llerr("%08lx<-%08lx\n", addr, val);
 
   /* Write the value */
 
diff --git a/arch/arm/src/sam34/sam_twi.c b/arch/arm/src/sam34/sam_twi.c
index 1b2030237f..6a720f181c 100644
--- a/arch/arm/src/sam34/sam_twi.c
+++ b/arch/arm/src/sam34/sam_twi.c
@@ -101,12 +101,12 @@
 #ifdef CONFIG_DEBUG_I2C
 #  define i2cdbg    dbg
 #  define i2cinfo   info
-#  define i2clldbg  lldbg
+#  define i2cllerr  llerr
 #  define i2cllinfo llinfo
 #else
 #  define i2cdbg(x...)
 #  define i2cinfo(x...)
-#  define i2clldbg(x...)
+#  define i2cllerr(x...)
 #  define i2cllinfo(x...)
 #endif
 
@@ -288,7 +288,7 @@ static bool twi_checkreg(struct twi_dev_s *priv, bool wr, uint32_t value,
         {
           /* Yes... show how many times we did it */
 
-          lldbg("...[Repeats %d times]...\n", priv->ntimes);
+          llerr("...[Repeats %d times]...\n", priv->ntimes);
         }
 
       /* Save information about the new access */
@@ -320,7 +320,7 @@ static uint32_t twi_getabs(struct twi_dev_s *priv, uintptr_t address)
 
   if (twi_checkreg(priv, false, value, address))
     {
-      lldbg("%08x->%08x\n", address, value);
+      llerr("%08x->%08x\n", address, value);
     }
 
   return value;
@@ -341,7 +341,7 @@ static void twi_putabs(struct twi_dev_s *priv, uintptr_t address,
 {
   if (twi_checkreg(priv, true, value, address))
     {
-      lldbg("%08x<-%08x\n", address, value);
+      llerr("%08x<-%08x\n", address, value);
     }
 
   putreg32(value, address);
@@ -401,9 +401,9 @@ static int twi_wait(struct twi_dev_s *priv)
 
   do
     {
-      i2clldbg("TWI%d Waiting...\n", priv->twi);
+      i2cllerr("TWI%d Waiting...\n", priv->twi);
       twi_takesem(&priv->waitsem);
-      i2clldbg("TWI%d Awakened with result: %d\n", priv->twi, priv->result);
+      i2cllerr("TWI%d Awakened with result: %d\n", priv->twi, priv->result);
     }
   while (priv->result == -EBUSY);
 
@@ -470,7 +470,7 @@ static int twi_interrupt(struct twi_dev_s *priv)
     {
       /* Wake up the thread with an I/O error indication */
 
-      i2clldbg("ERROR: TWI%d pending: %08x\n", priv->twi, pending);
+      i2cllerr("ERROR: TWI%d pending: %08x\n", priv->twi, pending);
       twi_wakeup(priv, -EIO);
     }
 
@@ -593,7 +593,7 @@ static void twi_timeout(int argc, uint32_t arg, ...)
 {
   struct twi_dev_s *priv = (struct twi_dev_s *)arg;
 
-  i2clldbg("TWI%d Timeout!\n", priv->twi);
+  i2cllerr("TWI%d Timeout!\n", priv->twi);
   twi_wakeup(priv, -ETIMEDOUT);
 }
 
diff --git a/arch/arm/src/sam34/sam_udp.c b/arch/arm/src/sam34/sam_udp.c
index 976867c706..b1842e9d9f 100644
--- a/arch/arm/src/sam34/sam_udp.c
+++ b/arch/arm/src/sam34/sam_udp.c
@@ -606,7 +606,7 @@ const struct trace_msg_t g_usb_trace_strings_intdecode[] =
 #ifdef CONFIG_SAM34_UDP_REGDEBUG
 static void sam_printreg(uintptr_t regaddr, uint32_t regval, bool iswrite)
 {
-  lldbg("%p%s%08x\n", regaddr, iswrite ? "<-" : "->", regval);
+  llerr("%p%s%08x\n", regaddr, iswrite ? "<-" : "->", regval);
 }
 #endif
 
@@ -657,7 +657,7 @@ static void sam_checkreg(uintptr_t regaddr, uint32_t regval, bool iswrite)
             {
               /* No.. More than one. */
 
-              lldbg("[repeats %d more times]\n", count);
+              llerr("[repeats %d more times]\n", count);
             }
         }
 
@@ -737,15 +737,15 @@ static void sam_dumpep(struct sam_usbdev_s *priv, uint8_t epno)
 {
   /* Global Registers */
 
-  lldbg("Global Registers:\n");
-  lldbg(" FRMNUM:    %08x\n", sam_getreg(SAM_UDP_FRMNUM));
-  lldbg("GLBSTAT:    %08x\n", sam_getreg(SAM_UDP_GLBSTAT));
-  lldbg("  FADDR:    %08x\n", sam_getreg(SAM_UDP_FADDR));
-  lldbg("    IMR:    %08x\n", sam_getreg(SAM_UDP_IMR));
-  lldbg("    ISR:    %08x\n", sam_getreg(SAM_UDP_ISR));
-  lldbg("  RSTEP:    %08x\n", sam_getreg(SAM_UDP_RSTEP));
-  lldbg("   TXVC:    %08x\n", sam_getreg(SAM_UDP_TXVC));
-  lldbg(" CSR[%d]:    %08x\n", epno, sam_getreg(SAM_UDPEP_CSR(epno)));
+  llerr("Global Registers:\n");
+  llerr(" FRMNUM:    %08x\n", sam_getreg(SAM_UDP_FRMNUM));
+  llerr("GLBSTAT:    %08x\n", sam_getreg(SAM_UDP_GLBSTAT));
+  llerr("  FADDR:    %08x\n", sam_getreg(SAM_UDP_FADDR));
+  llerr("    IMR:    %08x\n", sam_getreg(SAM_UDP_IMR));
+  llerr("    ISR:    %08x\n", sam_getreg(SAM_UDP_ISR));
+  llerr("  RSTEP:    %08x\n", sam_getreg(SAM_UDP_RSTEP));
+  llerr("   TXVC:    %08x\n", sam_getreg(SAM_UDP_TXVC));
+  llerr(" CSR[%d]:    %08x\n", epno, sam_getreg(SAM_UDPEP_CSR(epno)));
 }
 #endif
 
@@ -2946,7 +2946,7 @@ static int sam_ep_disable(struct usbdev_ep_s *ep)
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
-      ulldbg("ERROR: ep=%p\n", ep);
+      ullerr("ERROR: ep=%p\n", ep);
       return -EINVAL;
     }
 #endif
@@ -3078,7 +3078,7 @@ static int sam_ep_submit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
   if (!req || !req->callback || !req->buf || !ep)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
-      ulldbg("ERROR: req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep);
+      ullerr("ERROR: req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep);
       return -EINVAL;
     }
 #endif
@@ -3090,7 +3090,7 @@ static int sam_ep_submit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
   if (!priv->driver)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_NOTCONFIGURED), priv->usbdev.speed);
-      ulldbg("ERROR: driver=%p\n", priv->driver);
+      ullerr("ERROR: driver=%p\n", priv->driver);
       return -ESHUTDOWN;
     }
 #endif
@@ -3118,7 +3118,7 @@ static int sam_ep_submit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
            * "pending" they will get queue until the stall is cleared.
            */
 
-          ulldbg("Pending stall clear\n");
+          ullerr("Pending stall clear\n");
           sam_req_enqueue(&privep->pendq, privreq);
           usbtrace(TRACE_INREQQUEUED(epno), req->len);
           ret = OK;
diff --git a/arch/arm/src/sam34/sam_wdt.c b/arch/arm/src/sam34/sam_wdt.c
index be00925842..37ae65e5bf 100644
--- a/arch/arm/src/sam34/sam_wdt.c
+++ b/arch/arm/src/sam34/sam_wdt.c
@@ -83,12 +83,12 @@
 
 /* Debug ********************************************************************/
 /* Non-standard debug that may be enabled just for testing the watchdog
- * driver.  NOTE: that only lldbg types are used so that the output is
+ * driver.  NOTE: that only llerr types are used so that the output is
  * immediately available.
  */
 
 #ifdef CONFIG_DEBUG_WATCHDOG
-#  define wddbg    lldbg
+#  define wddbg    llerr
 #  define wdinfo   llinfo
 #else
 #  define wddbg(x...)
@@ -197,7 +197,7 @@ static uint32_t sam34_getreg(uint32_t addr)
         {
           if (count == 4)
             {
-              lldbg("...\n");
+              llerr("...\n");
             }
 
           return val;
@@ -214,7 +214,7 @@ static uint32_t sam34_getreg(uint32_t addr)
         {
           /* Yes.. then show how many times the value repeated */
 
-          lldbg("[repeats %d more times]\n", count-3);
+          llerr("[repeats %d more times]\n", count-3);
         }
 
       /* Save the new address, value, and count */
@@ -226,7 +226,7 @@ static uint32_t sam34_getreg(uint32_t addr)
 
   /* Show the register value read */
 
-  lldbg("%08x->%08x\n", addr, val);
+  llerr("%08x->%08x\n", addr, val);
   return val;
 }
 #endif
@@ -244,7 +244,7 @@ static void sam34_putreg(uint32_t val, uint32_t addr)
 {
   /* Show the register value being written */
 
-  lldbg("%08x<-%08x\n", addr, val);
+  llerr("%08x<-%08x\n", addr, val);
 
   /* Write the value */
 
diff --git a/arch/arm/src/sama5/sam_adc.c b/arch/arm/src/sama5/sam_adc.c
index 82208b0bdc..e92091db05 100644
--- a/arch/arm/src/sama5/sam_adc.c
+++ b/arch/arm/src/sama5/sam_adc.c
@@ -544,7 +544,7 @@ static bool sam_adc_checkreg(struct sam_adc_s *priv, bool wr,
         {
           /* Yes... show how many times we did it */
 
-          lldbg("...[Repeats %d times]...\n", priv->ntimes);
+          llerr("...[Repeats %d times]...\n", priv->ntimes);
         }
 
       /* Save information about the new access */
@@ -751,7 +751,7 @@ static void sam_adc_dmacallback(DMA_HANDLE handle, void *arg, int result)
       ret = work_queue(HPWORK, &priv->work, sam_adc_dmadone, priv, 0);
       if (ret != 0)
         {
-          alldbg("ERROR: Failed to queue work: %d\n", ret);
+          allerr("ERROR: Failed to queue work: %d\n", ret);
         }
     }
 
@@ -957,7 +957,7 @@ static int sam_adc_interrupt(int irq, void *context)
       ret = work_queue(HPWORK, &priv->work, sam_adc_endconversion, priv, 0);
       if (ret != 0)
         {
-          alldbg("ERROR: Failed to queue work: %d\n", ret);
+          allerr("ERROR: Failed to queue work: %d\n", ret);
         }
 
       pending &= ~ADC_INT_EOCALL;
@@ -2187,7 +2187,7 @@ uint32_t sam_adc_getreg(struct sam_adc_s *priv, uintptr_t address)
 
   if (sam_adc_checkreg(priv, false, regval, address))
     {
-      lldbg("%08x->%08x\n", address, regval);
+      llerr("%08x->%08x\n", address, regval);
     }
 
   return regval;
@@ -2207,7 +2207,7 @@ void sam_adc_putreg(struct sam_adc_s *priv, uintptr_t address, uint32_t regval)
 {
   if (sam_adc_checkreg(priv, true, regval, address))
     {
-      lldbg("%08x<-%08x\n", address, regval);
+      llerr("%08x<-%08x\n", address, regval);
     }
 
   putreg32(regval, address);
diff --git a/arch/arm/src/sama5/sam_allocateheap.c b/arch/arm/src/sama5/sam_allocateheap.c
index 14388795f9..c666b09ce6 100644
--- a/arch/arm/src/sama5/sam_allocateheap.c
+++ b/arch/arm/src/sama5/sam_allocateheap.c
@@ -312,9 +312,9 @@ void up_addregion(void)
     }
   else
     {
-      lldbg("ERROR: SDRAM memory not added to heap.  CONFIG_MM_NREGIONS=%d\n",
+      llerr("ERROR: SDRAM memory not added to heap.  CONFIG_MM_NREGIONS=%d\n",
             CONFIG_MM_REGIONS);
-      lldbg("       Increase the size of CONFIG_MM_NREGIONS\n");
+      llerr("       Increase the size of CONFIG_MM_NREGIONS\n");
     }
 #endif
 
@@ -331,9 +331,9 @@ void up_addregion(void)
     }
   else
     {
-      lldbg("ERROR: CS0 memory not added to heap.  CONFIG_MM_NREGIONS=%d\n",
+      llerr("ERROR: CS0 memory not added to heap.  CONFIG_MM_NREGIONS=%d\n",
             CONFIG_MM_REGIONS);
-      lldbg("       Increase the size of CONFIG_MM_NREGIONS\n");
+      llerr("       Increase the size of CONFIG_MM_NREGIONS\n");
     }
 #endif
 
@@ -350,9 +350,9 @@ void up_addregion(void)
     }
   else
     {
-      lldbg("ERROR: CS1 memory not added to heap.  CONFIG_MM_NREGIONS=%d\n",
+      llerr("ERROR: CS1 memory not added to heap.  CONFIG_MM_NREGIONS=%d\n",
             CONFIG_MM_REGIONS);
-      lldbg("       Increase the size of CONFIG_MM_NREGIONS\n");
+      llerr("       Increase the size of CONFIG_MM_NREGIONS\n");
     }
 #endif
 
@@ -369,9 +369,9 @@ void up_addregion(void)
     }
   else
     {
-      lldbg("ERROR: CS2 memory not added to heap.  CONFIG_MM_NREGIONS=%d\n",
+      llerr("ERROR: CS2 memory not added to heap.  CONFIG_MM_NREGIONS=%d\n",
             CONFIG_MM_REGIONS);
-      lldbg("       Increase the size of CONFIG_MM_NREGIONS\n");
+      llerr("       Increase the size of CONFIG_MM_NREGIONS\n");
     }
 #endif
 
@@ -388,9 +388,9 @@ void up_addregion(void)
     }
   else
     {
-      lldbg("ERROR: CS3 memory not added to heap.  CONFIG_MM_NREGIONS=%d\n",
+      llerr("ERROR: CS3 memory not added to heap.  CONFIG_MM_NREGIONS=%d\n",
             CONFIG_MM_REGIONS);
-      lldbg("       Increase the size of CONFIG_MM_NREGIONS\n");
+      llerr("       Increase the size of CONFIG_MM_NREGIONS\n");
     }
 #endif
 
@@ -398,9 +398,9 @@ void up_addregion(void)
 
   if (nregions > 0)
     {
-      lldbg("ERROR: Not all regions added to heap: %d added, but CONFIG_MM_NREGIONS=%d\n",
+      llerr("ERROR: Not all regions added to heap: %d added, but CONFIG_MM_NREGIONS=%d\n",
             CONFIG_MM_REGIONS - nregions, CONFIG_MM_REGIONS);
-      lldbg("       Decrease the size of CONFIG_MM_NREGIONS\n");
+      llerr("       Decrease the size of CONFIG_MM_NREGIONS\n");
     }
 }
 #endif
diff --git a/arch/arm/src/sama5/sam_can.c b/arch/arm/src/sama5/sam_can.c
index b9a3ee3892..bda4b8b4dc 100644
--- a/arch/arm/src/sama5/sam_can.c
+++ b/arch/arm/src/sama5/sam_can.c
@@ -129,12 +129,12 @@
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
 #  define caninfo   info
-#  define canlldbg  lldbg
+#  define canllerr  llerr
 #  define canllinfo llinfo
 #else
 #  define candbg(x...)
 #  define caninfo(x...)
-#  define canlldbg(x...)
+#  define canllerr(x...)
 #  define canllinfo(x...)
 #endif
 
@@ -386,7 +386,7 @@ static uint32_t can_getreg(FAR struct sam_can_s *priv, int offset)
         {
           if (priv->count == 4)
             {
-              lldbg("...\n");
+              llerr("...\n");
             }
 
           return regval;
@@ -403,7 +403,7 @@ static uint32_t can_getreg(FAR struct sam_can_s *priv, int offset)
         {
           /* Yes.. then show how many times the value repeated */
 
-          lldbg("[repeats %d more times]\n", priv->count - 3);
+          llerr("[repeats %d more times]\n", priv->count - 3);
         }
 
       /* Save the new address, value, and count */
@@ -415,7 +415,7 @@ static uint32_t can_getreg(FAR struct sam_can_s *priv, int offset)
 
   /* Show the register value read */
 
-  lldbg("%08x->%08x\n", regaddr, regval);
+  llerr("%08x->%08x\n", regaddr, regval);
   return regval;
 }
 
@@ -452,7 +452,7 @@ static void can_putreg(FAR struct sam_can_s *priv, int offset, uint32_t regval)
 
   /* Show the register value being written */
 
-  lldbg("%08x<-%08x\n", regaddr, regval);
+  llerr("%08x<-%08x\n", regaddr, regval);
 
   /* Write the value */
 
@@ -489,26 +489,26 @@ static void can_dumpctrlregs(FAR struct sam_can_s *priv, FAR const char *msg)
 
   if (msg)
     {
-      canlldbg("Control Registers: %s\n", msg);
+      canllerr("Control Registers: %s\n", msg);
     }
   else
     {
-      canlldbg("Control Registers:\n");
+      canllerr("Control Registers:\n");
     }
 
   /* CAN control and status registers */
 
-  lldbg("   MR: %08x      IMR: %08x      SR: %08x\n",
+  llerr("   MR: %08x      IMR: %08x      SR: %08x\n",
         getreg32(config->base + SAM_CAN_MR_OFFSET),
         getreg32(config->base + SAM_CAN_IMR_OFFSET),
         getreg32(config->base + SAM_CAN_SR_OFFSET));
 
-  lldbg("   BR: %08x      TIM: %08x TIMESTP: %08x\n",
+  llerr("   BR: %08x      TIM: %08x TIMESTP: %08x\n",
         getreg32(config->base + SAM_CAN_BR_OFFSET),
         getreg32(config->base + SAM_CAN_TIM_OFFSET),
         getreg32(config->base + SAM_CAN_TIMESTP_OFFSET));
 
-  lldbg("  ECR: %08x     WPMR: %08x    WPSR: %08x\n",
+  llerr("  ECR: %08x     WPMR: %08x    WPSR: %08x\n",
         getreg32(config->base + SAM_CAN_ECR_OFFSET),
         getreg32(config->base + SAM_CAN_TCR_OFFSET),
         getreg32(config->base + SAM_CAN_ACR_OFFSET));
@@ -538,27 +538,27 @@ static void can_dumpmbregs(FAR struct sam_can_s *priv, FAR const char *msg)
 
   if (msg)
     {
-      canlldbg("Mailbox Registers: %s\n", msg);
+      canllerr("Mailbox Registers: %s\n", msg);
     }
   else
     {
-      canlldbg("Mailbox Registers:\n");
+      canllerr("Mailbox Registers:\n");
     }
 
   for (i = 0; i < SAM_CAN_NMAILBOXES; i++)
     {
       mbbase = config->base + SAM_CAN_MBn_OFFSET(i);
-      lldbg("  MB%d:\n", i);
+      llerr("  MB%d:\n", i);
 
       /* CAN mailbox registers */
 
-      lldbg("    MMR: %08x MAM: %08x MID: %08x MFID: %08x\n",
+      llerr("    MMR: %08x MAM: %08x MID: %08x MFID: %08x\n",
             getreg32(mbbase + SAM_CAN_MMR_OFFSET),
             getreg32(mbbase + SAM_CAN_MAM_OFFSET),
             getreg32(mbbase + SAM_CAN_MID_OFFSET),
             getreg32(mbbase + SAM_CAN_MFID_OFFSET));
 
-      lldbg("    MSR: %08x MDL: %08x MDH: %08x\n",
+      llerr("    MSR: %08x MDL: %08x MDH: %08x\n",
             getreg32(mbbase + SAM_CAN_MSR_OFFSET),
             getreg32(mbbase + SAM_CAN_MDL_OFFSET),
             getreg32(mbbase + SAM_CAN_MDH_OFFSET));
@@ -866,7 +866,7 @@ static int can_setup(FAR struct can_dev_s *dev)
   ret = can_hwinitialize(priv);
   if (ret < 0)
     {
-      canlldbg("CAN%d H/W initialization failed: %d\n", config->port, ret);
+      canllerr("CAN%d H/W initialization failed: %d\n", config->port, ret);
       return ret;
     }
 
@@ -878,7 +878,7 @@ static int can_setup(FAR struct can_dev_s *dev)
   ret = irq_attach(config->pid, config->handler);
   if (ret < 0)
     {
-      canlldbg("Failed to attach CAN%d IRQ (%d)", config->port, config->pid);
+      canllerr("Failed to attach CAN%d IRQ (%d)", config->port, config->pid);
       return ret;
     }
 
@@ -887,7 +887,7 @@ static int can_setup(FAR struct can_dev_s *dev)
   ret = can_recvsetup(priv);
   if (ret < 0)
     {
-      canlldbg("CAN%d H/W initialization failed: %d\n", config->port, ret);
+      canllerr("CAN%d H/W initialization failed: %d\n", config->port, ret);
       return ret;
     }
 
@@ -1342,7 +1342,7 @@ static inline void can_rxinterrupt(FAR struct can_dev_s *dev, int mbndx,
   ret = can_receive(dev, &hdr, (FAR uint8_t *)md);
   if (ret < 0)
     {
-      canlldbg("ERROR: can_receive failed: %d\n", ret);
+      canllerr("ERROR: can_receive failed: %d\n", ret);
     }
 
   /* Set the MTCR flag in the CAN_MCRx register.  This clears the
@@ -1437,9 +1437,9 @@ static inline void can_mbinterrupt(FAR struct can_dev_s *dev, int mbndx)
           case CAN_MMR_MOT_CONSUMER: /* Consumer Mailbox */
           case CAN_MMR_MOT_PRODUCER: /* Producer Mailbox */
           case CAN_MMR_MOT_DISABLED: /* Mailbox is disabled */
-            canlldbg("ERROR: CAN%d MB%d: Unsupported or invalid mailbox type\n",
+            canllerr("ERROR: CAN%d MB%d: Unsupported or invalid mailbox type\n",
                      priv->config->port, mbndx);
-            canlldbg("       MSR: %08x MMR: %08x\n", msr, mmr);
+            canllerr("       MSR: %08x MMR: %08x\n", msr, mmr);
             break;
         }
     }
@@ -1530,7 +1530,7 @@ static void can_interrupt(FAR struct can_dev_s *dev)
 
   if ((pending & ~CAN_INT_MBALL) != 0)
     {
-      canlldbg("ERROR: CAN%d system interrupt, SR=%08x IMR=%08x\n",
+      canllerr("ERROR: CAN%d system interrupt, SR=%08x IMR=%08x\n",
                priv->config->port, sr, imr);
     }
 }
diff --git a/arch/arm/src/sama5/sam_dmac.c b/arch/arm/src/sama5/sam_dmac.c
index 8c305b5a9b..794cac2373 100644
--- a/arch/arm/src/sama5/sam_dmac.c
+++ b/arch/arm/src/sama5/sam_dmac.c
@@ -1818,7 +1818,7 @@ static int sam_dmac_interrupt(struct sam_dmac_s *dmac)
                 {
                    /* Yes... Terminate the transfer with an error? */
 
-                   dmalldbg("ERROR: DMA failed: %08x\n", regval);
+                   dmallerr("ERROR: DMA failed: %08x\n", regval);
                    sam_dmaterminate(dmach, -EIO);
                 }
 
diff --git a/arch/arm/src/sama5/sam_ehci.c b/arch/arm/src/sama5/sam_ehci.c
index f5affbb515..7773652fc3 100644
--- a/arch/arm/src/sama5/sam_ehci.c
+++ b/arch/arm/src/sama5/sam_ehci.c
@@ -635,7 +635,7 @@ static uint32_t sam_swap32(uint32_t value)
 static void sam_printreg(volatile uint32_t *regaddr, uint32_t regval,
                           bool iswrite)
 {
-  lldbg("%08x%s%08x\n", (uintptr_t)regaddr, iswrite ? "<-" : "->", regval);
+  llerr("%08x%s%08x\n", (uintptr_t)regaddr, iswrite ? "<-" : "->", regval);
 }
 #endif
 
@@ -686,7 +686,7 @@ static void sam_checkreg(volatile uint32_t *regaddr, uint32_t regval, bool iswri
             {
               /* No.. More than one. */
 
-              lldbg("[repeats %d more times]\n", count);
+              llerr("[repeats %d more times]\n", count);
             }
         }
 
diff --git a/arch/arm/src/sama5/sam_emaca.c b/arch/arm/src/sama5/sam_emaca.c
index ff99f550f7..5f263b8b69 100644
--- a/arch/arm/src/sama5/sam_emaca.c
+++ b/arch/arm/src/sama5/sam_emaca.c
@@ -461,7 +461,7 @@ static bool sam_checkreg(struct sam_emac_s *priv, bool wr, uint32_t regval,
         {
           /* Yes... show how many times we did it */
 
-          lldbg("...[Repeats %d times]...\n", priv->ntimes);
+          llerr("...[Repeats %d times]...\n", priv->ntimes);
         }
 
       /* Save information about the new access */
@@ -493,7 +493,7 @@ static uint32_t sam_getreg(struct sam_emac_s *priv, uintptr_t address)
 
   if (sam_checkreg(priv, false, regval, address))
     {
-      lldbg("%08x->%08x\n", address, regval);
+      llerr("%08x->%08x\n", address, regval);
     }
 
   return regval;
@@ -514,7 +514,7 @@ static void sam_putreg(struct sam_emac_s *priv, uintptr_t address,
 {
   if (sam_checkreg(priv, true, regval, address))
     {
-      lldbg("%08x<-%08x\n", address, regval);
+      llerr("%08x<-%08x\n", address, regval);
     }
 
   putreg32(regval, address);
@@ -607,7 +607,7 @@ static int sam_buffer_initialize(struct sam_emac_s *priv)
   priv->txdesc = (struct emac_txdesc_s *)kmm_memalign(8, allocsize);
   if (!priv->txdesc)
     {
-      nlldbg("ERROR: Failed to allocate TX descriptors\n");
+      nllerr("ERROR: Failed to allocate TX descriptors\n");
       return -ENOMEM;
     }
 
@@ -617,7 +617,7 @@ static int sam_buffer_initialize(struct sam_emac_s *priv)
   priv->rxdesc = (struct emac_rxdesc_s *)kmm_memalign(8, allocsize);
   if (!priv->rxdesc)
     {
-      nlldbg("ERROR: Failed to allocate RX descriptors\n");
+      nllerr("ERROR: Failed to allocate RX descriptors\n");
       sam_buffer_free(priv);
       return -ENOMEM;
     }
@@ -628,7 +628,7 @@ static int sam_buffer_initialize(struct sam_emac_s *priv)
   priv->txbuffer = (uint8_t *)kmm_memalign(8, allocsize);
   if (!priv->txbuffer)
     {
-      nlldbg("ERROR: Failed to allocate TX buffer\n");
+      nllerr("ERROR: Failed to allocate TX buffer\n");
       sam_buffer_free(priv);
       return -ENOMEM;
     }
@@ -637,7 +637,7 @@ static int sam_buffer_initialize(struct sam_emac_s *priv)
   priv->rxbuffer = (uint8_t *)kmm_memalign(8, allocsize);
   if (!priv->rxbuffer)
     {
-      nlldbg("ERROR: Failed to allocate RX buffer\n");
+      nllerr("ERROR: Failed to allocate RX buffer\n");
       sam_buffer_free(priv);
       return -ENOMEM;
     }
@@ -732,7 +732,7 @@ static int sam_transmit(struct sam_emac_s *priv)
 
   if (dev->d_len > EMAC_TX_UNITSIZE)
     {
-      nlldbg("ERROR: Packet too big: %d\n", dev->d_len);
+      nllerr("ERROR: Packet too big: %d\n", dev->d_len);
       return -EINVAL;
     }
 
@@ -744,7 +744,7 @@ static int sam_transmit(struct sam_emac_s *priv)
 
   if (sam_txfree(priv) < 1)
     {
-      nlldbg("ERROR: No free TX descriptors\n");
+      nllerr("ERROR: No free TX descriptors\n");
       return -EBUSY;
     }
 
@@ -1132,7 +1132,7 @@ static int sam_recvframe(struct sam_emac_s *priv)
 
               if (pktlen < dev->d_len)
                 {
-                  nlldbg("ERROR: Buffer size %d; frame size %d\n", dev->d_len, pktlen);
+                  nllerr("ERROR: Buffer size %d; frame size %d\n", dev->d_len, pktlen);
                   return -E2BIG;
                 }
 
@@ -1212,7 +1212,7 @@ static void sam_receive(struct sam_emac_s *priv)
 
       if (dev->d_len > CONFIG_NET_ETH_MTU)
         {
-          nlldbg("DROPPED: Too big: %d\n", dev->d_len);
+          nllerr("DROPPED: Too big: %d\n", dev->d_len);
           continue;
         }
 
@@ -1322,7 +1322,7 @@ static void sam_receive(struct sam_emac_s *priv)
       else
 #endif
         {
-          nlldbg("DROPPED: Unknown type: %04x\n", BUF->type);
+          nllerr("DROPPED: Unknown type: %04x\n", BUF->type);
         }
     }
 }
@@ -1475,7 +1475,7 @@ static int sam_emac_interrupt(int irq, void *context)
           clrbits = EMAC_TSR_RLES | sam_txinuse(priv);
           sam_txreset(priv);
 
-          nlldbg("ERROR: Retry Limit Exceeded TSR: %08x\n", tsr);
+          nllerr("ERROR: Retry Limit Exceeded TSR: %08x\n", tsr);
 
           regval = sam_getreg(priv, SAM_EMAC_NCR);
           regval |= EMAC_NCR_TE;
@@ -1486,7 +1486,7 @@ static int sam_emac_interrupt(int irq, void *context)
 
       if ((tsr & EMAC_TSR_COL) != 0)
         {
-          nlldbg("ERROR: Collision occurred TSR: %08x\n", tsr);
+          nllerr("ERROR: Collision occurred TSR: %08x\n", tsr);
           clrbits |= EMAC_TSR_COL;
         }
 
@@ -1494,7 +1494,7 @@ static int sam_emac_interrupt(int irq, void *context)
 
       if ((tsr & EMAC_TSR_BEX) != 0)
         {
-          nlldbg("ERROR: Buffers exhausted mid-frame TSR: %08x\n", tsr);
+          nllerr("ERROR: Buffers exhausted mid-frame TSR: %08x\n", tsr);
           clrbits |= EMAC_TSR_BEX;
         }
 
@@ -1509,7 +1509,7 @@ static int sam_emac_interrupt(int irq, void *context)
 
       if ((tsr & EMAC_TSR_UND) != 0)
         {
-          nlldbg("ERROR: Transmit Underrun TSR: %08x\n", tsr);
+          nllerr("ERROR: Transmit Underrun TSR: %08x\n", tsr);
           clrbits |= EMAC_TSR_UND;
         }
 
@@ -1546,7 +1546,7 @@ static int sam_emac_interrupt(int irq, void *context)
 
       if ((rsr & EMAC_RSR_OVR) != 0)
         {
-          nlldbg("ERROR: Receiver overrun RSR: %08x\n", rsr);
+          nllerr("ERROR: Receiver overrun RSR: %08x\n", rsr);
           clrbits |= EMAC_RSR_OVR;
         }
 
@@ -1563,7 +1563,7 @@ static int sam_emac_interrupt(int irq, void *context)
 
       if ((rsr & EMAC_RSR_BNA) != 0)
         {
-          nlldbg("ERROR: Buffer not available RSR: %08x\n", rsr);
+          nllerr("ERROR: Buffer not available RSR: %08x\n", rsr);
           clrbits |= EMAC_RSR_BNA;
         }
 
@@ -1584,7 +1584,7 @@ static int sam_emac_interrupt(int irq, void *context)
 
   if ((pending & EMAC_INT_PFR) != 0)
     {
-      nlldbg("Pause frame received\n");
+      nllerr("Pause frame received\n");
     }
 
   /* Check for Pause Time Zero (PTZ)
@@ -1594,7 +1594,7 @@ static int sam_emac_interrupt(int irq, void *context)
 
   if ((pending & EMAC_INT_PTZ) != 0)
     {
-      nlldbg("Pause TO!\n");
+      nllerr("Pause TO!\n");
     }
 #endif
 
@@ -1624,7 +1624,7 @@ static void sam_txtimeout(int argc, uint32_t arg, ...)
 {
   struct sam_emac_s *priv = (struct sam_emac_s *)arg;
 
-  nlldbg("Timeout!\n");
+  nllerr("Timeout!\n");
 
   /* Then reset the hardware.  Just take the interface down, then back
    * up again.
@@ -1699,7 +1699,7 @@ static int sam_ifup(struct net_driver_s *dev)
   struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private;
   int ret;
 
-  nlldbg("Bringing up: %d.%d.%d.%d\n",
+  nllerr("Bringing up: %d.%d.%d.%d\n",
          dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
          (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 
@@ -1723,7 +1723,7 @@ static int sam_ifup(struct net_driver_s *dev)
   ret = sam_phyinit(priv);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_phyinit failed: %d\n", ret);
+      nllerr("ERROR: sam_phyinit failed: %d\n", ret);
       return ret;
     }
 
@@ -1732,7 +1732,7 @@ static int sam_ifup(struct net_driver_s *dev)
   ret = sam_autonegotiate(priv);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_autonegotiate failed: %d\n", ret);
+      nllerr("ERROR: sam_autonegotiate failed: %d\n", ret);
       return ret;
     }
 
@@ -1775,7 +1775,7 @@ static int sam_ifdown(struct net_driver_s *dev)
   struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private;
   irqstate_t flags;
 
-  nlldbg("Taking the network down\n");
+  nllerr("Taking the network down\n");
 
   /* Disable the EMAC interrupt */
 
@@ -2423,7 +2423,7 @@ static int sam_phyreset(struct sam_emac_s *priv)
   ret = sam_phywrite(priv, priv->phyaddr, MII_MCR, MII_MCR_RESET);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_phywrite failed: %d\n", ret);
+      nllerr("ERROR: sam_phywrite failed: %d\n", ret);
     }
 
   /* Wait for the PHY reset to complete */
@@ -2435,7 +2435,7 @@ static int sam_phyreset(struct sam_emac_s *priv)
       int result = sam_phyread(priv, priv->phyaddr, MII_MCR, &mcr);
       if (result < 0)
         {
-          nlldbg("ERROR: Failed to read the MCR register: %d\n", ret);
+          nllerr("ERROR: Failed to read the MCR register: %d\n", ret);
           ret = result;
         }
       else if ((mcr & MII_MCR_RESET) == 0)
@@ -2500,7 +2500,7 @@ static int sam_phyfind(struct sam_emac_s *priv, uint8_t *phyaddr)
 
   else
     {
-      nlldbg("ERROR: sam_phyread failed for PHY address %02x: %d\n",
+      nllerr("ERROR: sam_phyread failed for PHY address %02x: %d\n",
              candidate, ret);
 
       for (offset = 0; offset < 32; offset++)
@@ -2566,7 +2566,7 @@ static int sam_phyread(struct sam_emac_s *priv, uint8_t phyaddr,
   ret = sam_phywait(priv);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_phywait failed: %d\n", ret);
+      nllerr("ERROR: sam_phywait failed: %d\n", ret);
       return ret;
     }
 
@@ -2581,7 +2581,7 @@ static int sam_phyread(struct sam_emac_s *priv, uint8_t phyaddr,
   ret = sam_phywait(priv);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_phywait failed: %d\n", ret);
+      nllerr("ERROR: sam_phywait failed: %d\n", ret);
       return ret;
     }
 
@@ -2621,7 +2621,7 @@ static int sam_phywrite(struct sam_emac_s *priv, uint8_t phyaddr,
   ret = sam_phywait(priv);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_phywait failed: %d\n", ret);
+      nllerr("ERROR: sam_phywait failed: %d\n", ret);
       return ret;
     }
 
@@ -2636,7 +2636,7 @@ static int sam_phywrite(struct sam_emac_s *priv, uint8_t phyaddr,
   ret = sam_phywait(priv);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_phywait failed: %d\n", ret);
+      nllerr("ERROR: sam_phywait failed: %d\n", ret);
       return ret;
     }
 
@@ -2680,7 +2680,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phyread(priv, priv->phyaddr, MII_PHYID1, &phyid1);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to read PHYID1\n");
+      nllerr("ERROR: Failed to read PHYID1\n");
       goto errout;
     }
 
@@ -2689,7 +2689,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phyread(priv, priv->phyaddr, MII_PHYID2, &phyid2);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to read PHYID2\n");
+      nllerr("ERROR: Failed to read PHYID2\n");
       goto errout;
     }
 
@@ -2705,7 +2705,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
     }
   else
     {
-      nlldbg("ERROR: PHY not recognized\n");
+      nllerr("ERROR: PHY not recognized\n");
     }
 
   /* Setup control register */
@@ -2713,7 +2713,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phyread(priv, priv->phyaddr, MII_MCR, &mcr);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to read MCR\n");
+      nllerr("ERROR: Failed to read MCR\n");
       goto errout;
     }
 
@@ -2724,7 +2724,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phywrite(priv, priv->phyaddr, MII_MCR, mcr);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to write MCR\n");
+      nllerr("ERROR: Failed to write MCR\n");
       goto errout;
     }
 
@@ -2739,7 +2739,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phywrite(priv, priv->phyaddr, MII_ADVERTISE, advertise);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to write ANAR\n");
+      nllerr("ERROR: Failed to write ANAR\n");
       goto errout;
     }
 
@@ -2748,7 +2748,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phyread(priv, priv->phyaddr, MII_MCR, &mcr);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to read MCR\n");
+      nllerr("ERROR: Failed to read MCR\n");
       goto errout;
     }
 
@@ -2756,7 +2756,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phywrite(priv, priv->phyaddr, MII_MCR, mcr);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to write MCR\n");
+      nllerr("ERROR: Failed to write MCR\n");
       goto errout;
     }
 
@@ -2768,7 +2768,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phywrite(priv, priv->phyaddr, MII_MCR, mcr);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to write MCR\n");
+      nllerr("ERROR: Failed to write MCR\n");
       goto errout;
     }
 
@@ -2782,7 +2782,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
       ret = sam_phyread(priv, priv->phyaddr, MII_MSR, &msr);
       if (ret < 0)
         {
-          nlldbg("ERROR: Failed to read MSR\n");
+          nllerr("ERROR: Failed to read MSR\n");
           goto errout;
         }
 
@@ -2800,7 +2800,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
 
       if (++timeout >= PHY_RETRY_MAX)
         {
-          nlldbg("ERROR: TimeOut\n");
+          nllerr("ERROR: TimeOut\n");
           sam_phydump(priv);
           ret = -ETIMEDOUT;
           goto errout;
@@ -2812,7 +2812,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phyread(priv, priv->phyaddr, MII_LPA, &lpa);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to read ANLPAR\n");
+      nllerr("ERROR: Failed to read ANLPAR\n");
       goto errout;
     }
 
@@ -2902,13 +2902,13 @@ static bool sam_linkup(struct sam_emac_s *priv)
   ret = sam_phyread(priv, priv->phyaddr, MII_MSR, &msr);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to read MSR: %d\n", ret);
+      nllerr("ERROR: Failed to read MSR: %d\n", ret);
       goto errout;
     }
 
   if ((msr & MII_MSR_LINKSTATUS) == 0)
     {
-      nlldbg("ERROR: MSR LinkStatus: %04x\n", msr);
+      nllerr("ERROR: MSR LinkStatus: %04x\n", msr);
       goto errout;
     }
 
@@ -2917,7 +2917,7 @@ static bool sam_linkup(struct sam_emac_s *priv)
   ret = sam_phyread(priv, priv->phyaddr, CONFIG_SAMA5_EMAC_PHYSR, &physr);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to read PHYSR: %d\n", ret);
+      nllerr("ERROR: Failed to read PHYSR: %d\n", ret);
       goto errout;
     }
 
@@ -3024,7 +3024,7 @@ static int sam_phyinit(struct sam_emac_s *priv)
   ret = sam_phyfind(priv, &priv->phyaddr);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_phyfind failed: %d\n", ret);
+      nllerr("ERROR: sam_phyfind failed: %d\n", ret);
       return ret;
     }
 
diff --git a/arch/arm/src/sama5/sam_emacb.c b/arch/arm/src/sama5/sam_emacb.c
index b593a15181..5452e8d0f8 100644
--- a/arch/arm/src/sama5/sam_emacb.c
+++ b/arch/arm/src/sama5/sam_emacb.c
@@ -820,7 +820,7 @@ static bool sam_checkreg(struct sam_emac_s *priv, bool wr, uint32_t regval,
         {
           /* Yes... show how many times we did it */
 
-          lldbg("...[Repeats %d times]...\n", priv->ntimes);
+          llerr("...[Repeats %d times]...\n", priv->ntimes);
         }
 
       /* Save information about the new access */
@@ -853,7 +853,7 @@ static uint32_t sam_getreg(struct sam_emac_s *priv, uint16_t offset)
 #ifdef CONFIG_SAMA5_EMACB_REGDEBUG
   if (sam_checkreg(priv, false, regval, regaddr))
     {
-      lldbg("%08x->%08x\n", regaddr, regval);
+      llerr("%08x->%08x\n", regaddr, regval);
     }
 #endif
 
@@ -877,7 +877,7 @@ static void sam_putreg(struct sam_emac_s *priv, uint16_t offset,
 #ifdef CONFIG_SAMA5_EMACB_REGDEBUG
   if (sam_checkreg(priv, true, regval, regaddr))
     {
-      lldbg("%08x<-%08x\n", regaddr, regval);
+      llerr("%08x<-%08x\n", regaddr, regval);
     }
 #endif
 
@@ -970,7 +970,7 @@ static int sam_buffer_initialize(struct sam_emac_s *priv)
   priv->txdesc = (struct emac_txdesc_s *)kmm_memalign(8, allocsize);
   if (!priv->txdesc)
     {
-      nlldbg("ERROR: Failed to allocate TX descriptors\n");
+      nllerr("ERROR: Failed to allocate TX descriptors\n");
       return -ENOMEM;
     }
 
@@ -980,7 +980,7 @@ static int sam_buffer_initialize(struct sam_emac_s *priv)
   priv->rxdesc = (struct emac_rxdesc_s *)kmm_memalign(8, allocsize);
   if (!priv->rxdesc)
     {
-      nlldbg("ERROR: Failed to allocate RX descriptors\n");
+      nllerr("ERROR: Failed to allocate RX descriptors\n");
       sam_buffer_free(priv);
       return -ENOMEM;
     }
@@ -991,7 +991,7 @@ static int sam_buffer_initialize(struct sam_emac_s *priv)
   priv->txbuffer = (uint8_t *)kmm_memalign(8, allocsize);
   if (!priv->txbuffer)
     {
-      nlldbg("ERROR: Failed to allocate TX buffer\n");
+      nllerr("ERROR: Failed to allocate TX buffer\n");
       sam_buffer_free(priv);
       return -ENOMEM;
     }
@@ -1000,7 +1000,7 @@ static int sam_buffer_initialize(struct sam_emac_s *priv)
   priv->rxbuffer = (uint8_t *)kmm_memalign(8, allocsize);
   if (!priv->rxbuffer)
     {
-      nlldbg("ERROR: Failed to allocate RX buffer\n");
+      nllerr("ERROR: Failed to allocate RX buffer\n");
       sam_buffer_free(priv);
       return -ENOMEM;
     }
@@ -1095,7 +1095,7 @@ static int sam_transmit(struct sam_emac_s *priv)
 
   if (dev->d_len > EMAC_TX_UNITSIZE)
     {
-      nlldbg("ERROR: Packet too big: %d\n", dev->d_len);
+      nllerr("ERROR: Packet too big: %d\n", dev->d_len);
       return -EINVAL;
     }
 
@@ -1107,7 +1107,7 @@ static int sam_transmit(struct sam_emac_s *priv)
 
   if (sam_txfree(priv) < 1)
     {
-      nlldbg("ERROR: No free TX descriptors\n");
+      nllerr("ERROR: No free TX descriptors\n");
       return -EBUSY;
     }
 
@@ -1494,7 +1494,7 @@ static int sam_recvframe(struct sam_emac_s *priv)
               nllinfo("rxndx: %d d_len: %d\n", priv->rxndx, dev->d_len);
               if (pktlen < dev->d_len)
                 {
-                  nlldbg("ERROR: Buffer size %d; frame size %d\n",
+                  nllerr("ERROR: Buffer size %d; frame size %d\n",
                          dev->d_len, pktlen);
                   return -E2BIG;
                 }
@@ -1575,7 +1575,7 @@ static void sam_receive(struct sam_emac_s *priv)
 
       if (dev->d_len > CONFIG_NET_ETH_MTU)
         {
-          nlldbg("DROPPED: Too big: %d\n", dev->d_len);
+          nllerr("DROPPED: Too big: %d\n", dev->d_len);
           continue;
         }
 
@@ -1685,7 +1685,7 @@ static void sam_receive(struct sam_emac_s *priv)
       else
 #endif
         {
-          nlldbg("DROPPED: Unknown type: %04x\n", BUF->type);
+          nllerr("DROPPED: Unknown type: %04x\n", BUF->type);
         }
     }
 }
@@ -1862,7 +1862,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv)
           clrbits = EMAC_TSR_RLE | sam_txinuse(priv);
           sam_txreset(priv);
 
-          nlldbg("ERROR: Retry Limit Exceeded TSR: %08x\n", tsr);
+          nllerr("ERROR: Retry Limit Exceeded TSR: %08x\n", tsr);
 
           regval = sam_getreg(priv, SAM_EMAC_NCR_OFFSET);
           regval |= EMAC_NCR_TXEN;
@@ -1873,7 +1873,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv)
 
       if ((tsr & EMAC_TSR_COL) != 0)
         {
-          nlldbg("ERROR: Collision occurred TSR: %08x\n", tsr);
+          nllerr("ERROR: Collision occurred TSR: %08x\n", tsr);
           clrbits |= EMAC_TSR_COL;
         }
 
@@ -1881,7 +1881,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv)
 
       if ((tsr & EMAC_TSR_TFC) != 0)
         {
-          nlldbg("ERROR: Transmit Frame Corruption due to AHB error: %08x\n", tsr);
+          nllerr("ERROR: Transmit Frame Corruption due to AHB error: %08x\n", tsr);
           clrbits |= EMAC_TSR_TFC;
         }
 
@@ -1896,7 +1896,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv)
 
       if ((tsr & EMAC_TSR_UND) != 0)
         {
-          nlldbg("ERROR: Transmit Underrun TSR: %08x\n", tsr);
+          nllerr("ERROR: Transmit Underrun TSR: %08x\n", tsr);
           clrbits |= EMAC_TSR_UND;
         }
 
@@ -1933,7 +1933,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv)
 
       if ((rsr & EMAC_RSR_RXOVR) != 0)
         {
-          nlldbg("ERROR: Receiver overrun RSR: %08x\n", rsr);
+          nllerr("ERROR: Receiver overrun RSR: %08x\n", rsr);
           clrbits |= EMAC_RSR_RXOVR;
         }
 
@@ -1950,7 +1950,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv)
 
       if ((rsr & EMAC_RSR_BNA) != 0)
         {
-          nlldbg("ERROR: Buffer not available RSR: %08x\n", rsr);
+          nllerr("ERROR: Buffer not available RSR: %08x\n", rsr);
           clrbits |= EMAC_RSR_BNA;
         }
 
@@ -1972,7 +1972,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv)
 
   if ((pending & EMAC_INT_PFNZ) != 0)
     {
-      nlldbg("Pause frame received\n");
+      nllerr("Pause frame received\n");
     }
 
   /* Check for Pause Time Zero (PTZ)
@@ -1982,7 +1982,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv)
 
   if ((pending & EMAC_INT_PTZ) != 0)
     {
-      nlldbg("Pause TO!\n");
+      nllerr("Pause TO!\n");
     }
 #endif
 }
@@ -2147,7 +2147,7 @@ static int sam_emac1_interrupt(int irq, void *context)
 
 static inline void sam_txtimeout_process(FAR struct sam_emac_s *priv)
 {
-  nlldbg("Timeout!\n");
+  nllerr("Timeout!\n");
 
   /* Reset the hardware.  Just take the interface down, then back up again. */
 
@@ -2408,7 +2408,7 @@ static int sam_ifup(struct net_driver_s *dev)
   ret = sam_phyinit(priv);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_phyinit failed: %d\n", ret);
+      nllerr("ERROR: sam_phyinit failed: %d\n", ret);
       return ret;
     }
 
@@ -2417,7 +2417,7 @@ static int sam_ifup(struct net_driver_s *dev)
   ret = sam_autonegotiate(priv);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_autonegotiate failed: %d\n", ret);
+      nllerr("ERROR: sam_autonegotiate failed: %d\n", ret);
       return ret;
     }
 
@@ -2460,7 +2460,7 @@ static int sam_ifdown(struct net_driver_s *dev)
   struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private;
   irqstate_t flags;
 
-  nlldbg("Taking the network down\n");
+  nllerr("Taking the network down\n");
 
   /* Disable the EMAC interrupt */
 
@@ -3275,7 +3275,7 @@ static int sam_phyreset(struct sam_emac_s *priv)
   ret = sam_phywrite(priv, priv->phyaddr, MII_MCR, MII_MCR_RESET);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_phywrite failed: %d\n", ret);
+      nllerr("ERROR: sam_phywrite failed: %d\n", ret);
     }
 
   /* Wait for the PHY reset to complete */
@@ -3287,7 +3287,7 @@ static int sam_phyreset(struct sam_emac_s *priv)
       int result = sam_phyread(priv, priv->phyaddr, MII_MCR, &mcr);
       if (result < 0)
         {
-          nlldbg("ERROR: Failed to read the MCR register: %d\n", ret);
+          nllerr("ERROR: Failed to read the MCR register: %d\n", ret);
           ret = result;
         }
       else if ((mcr & MII_MCR_RESET) == 0)
@@ -3352,7 +3352,7 @@ static int sam_phyfind(struct sam_emac_s *priv, uint8_t *phyaddr)
 
   else
     {
-      nlldbg("ERROR: sam_phyread failed for PHY address %02x: %d\n",
+      nllerr("ERROR: sam_phyread failed for PHY address %02x: %d\n",
              candidate, ret);
 
       for (offset = 0; offset < 32; offset++)
@@ -3418,7 +3418,7 @@ static int sam_phyread(struct sam_emac_s *priv, uint8_t phyaddr,
   ret = sam_phywait(priv);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_phywait failed: %d\n", ret);
+      nllerr("ERROR: sam_phywait failed: %d\n", ret);
       return ret;
     }
 
@@ -3443,7 +3443,7 @@ static int sam_phyread(struct sam_emac_s *priv, uint8_t phyaddr,
   ret = sam_phywait(priv);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_phywait failed: %d\n", ret);
+      nllerr("ERROR: sam_phywait failed: %d\n", ret);
       return ret;
     }
 
@@ -3483,7 +3483,7 @@ static int sam_phywrite(struct sam_emac_s *priv, uint8_t phyaddr,
   ret = sam_phywait(priv);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_phywait failed: %d\n", ret);
+      nllerr("ERROR: sam_phywait failed: %d\n", ret);
       return ret;
     }
 
@@ -3508,7 +3508,7 @@ static int sam_phywrite(struct sam_emac_s *priv, uint8_t phyaddr,
   ret = sam_phywait(priv);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_phywait failed: %d\n", ret);
+      nllerr("ERROR: sam_phywait failed: %d\n", ret);
       return ret;
     }
 
@@ -3552,7 +3552,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phyread(priv, priv->phyaddr, MII_PHYID1, &phyid1);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to read PHYID1\n");
+      nllerr("ERROR: Failed to read PHYID1\n");
       goto errout;
     }
 
@@ -3561,7 +3561,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phyread(priv, priv->phyaddr, MII_PHYID2, &phyid2);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to read PHYID2\n");
+      nllerr("ERROR: Failed to read PHYID2\n");
       goto errout;
     }
 
@@ -3578,7 +3578,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
     }
   else
     {
-      nlldbg("ERROR: PHY not recognized\n");
+      nllerr("ERROR: PHY not recognized\n");
     }
 
   /* Setup control register */
@@ -3586,7 +3586,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phyread(priv, priv->phyaddr, MII_MCR, &mcr);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to read MCR\n");
+      nllerr("ERROR: Failed to read MCR\n");
       goto errout;
     }
 
@@ -3597,7 +3597,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phywrite(priv, priv->phyaddr, MII_MCR, mcr);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to write MCR\n");
+      nllerr("ERROR: Failed to write MCR\n");
       goto errout;
     }
 
@@ -3612,7 +3612,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phywrite(priv, priv->phyaddr, MII_ADVERTISE, advertise);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to write ANAR\n");
+      nllerr("ERROR: Failed to write ANAR\n");
       goto errout;
     }
 
@@ -3621,7 +3621,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phyread(priv, priv->phyaddr, MII_MCR, &mcr);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to read MCR\n");
+      nllerr("ERROR: Failed to read MCR\n");
       goto errout;
     }
 
@@ -3629,7 +3629,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phywrite(priv, priv->phyaddr, MII_MCR, mcr);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to write MCR\n");
+      nllerr("ERROR: Failed to write MCR\n");
       goto errout;
     }
 
@@ -3641,7 +3641,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phywrite(priv, priv->phyaddr, MII_MCR, mcr);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to write MCR\n");
+      nllerr("ERROR: Failed to write MCR\n");
       goto errout;
     }
 
@@ -3655,7 +3655,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
       ret = sam_phyread(priv, priv->phyaddr, MII_MSR, &msr);
       if (ret < 0)
         {
-          nlldbg("ERROR: Failed to read MSR\n");
+          nllerr("ERROR: Failed to read MSR\n");
           goto errout;
         }
 
@@ -3673,7 +3673,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
 
       if (++timeout >= PHY_RETRY_MAX)
         {
-          nlldbg("ERROR: TimeOut\n");
+          nllerr("ERROR: TimeOut\n");
           sam_phydump(priv);
           ret = -ETIMEDOUT;
           goto errout;
@@ -3685,7 +3685,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phyread(priv, priv->phyaddr, MII_LPA, &lpa);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to read ANLPAR\n");
+      nllerr("ERROR: Failed to read ANLPAR\n");
       goto errout;
     }
 
@@ -3775,13 +3775,13 @@ static bool sam_linkup(struct sam_emac_s *priv)
   ret = sam_phyread(priv, priv->phyaddr, MII_MSR, &msr);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to read MSR: %d\n", ret);
+      nllerr("ERROR: Failed to read MSR: %d\n", ret);
       goto errout;
     }
 
   if ((msr & MII_MSR_LINKSTATUS) == 0)
     {
-      nlldbg("ERROR: MSR LinkStatus: %04x\n", msr);
+      nllerr("ERROR: MSR LinkStatus: %04x\n", msr);
       goto errout;
     }
 
@@ -3790,7 +3790,7 @@ static bool sam_linkup(struct sam_emac_s *priv)
   ret = sam_phyread(priv, priv->phyaddr, priv->attr->physr, &physr);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to read PHYSR: %d\n", ret);
+      nllerr("ERROR: Failed to read PHYSR: %d\n", ret);
       goto errout;
     }
 
@@ -3897,7 +3897,7 @@ static int sam_phyinit(struct sam_emac_s *priv)
   ret = sam_phyfind(priv, &priv->phyaddr);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_phyfind failed: %d\n", ret);
+      nllerr("ERROR: sam_phyfind failed: %d\n", ret);
       return ret;
     }
 
diff --git a/arch/arm/src/sama5/sam_ethernet.c b/arch/arm/src/sama5/sam_ethernet.c
index 409db45535..d10f096d29 100644
--- a/arch/arm/src/sama5/sam_ethernet.c
+++ b/arch/arm/src/sama5/sam_ethernet.c
@@ -88,7 +88,7 @@ static inline void up_gmac_initialize(void)
   ret = sam_gmac_initialize();
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_gmac_initialize failed: %d\n", ret);
+      nllerr("ERROR: sam_gmac_initialize failed: %d\n", ret);
     }
 }
 #else
@@ -119,7 +119,7 @@ static inline void up_emac_initialize(void)
   ret = sam_emac_initialize();
   if (ret < 0)
     {
-      nlldbg("ERROR: up_emac_initialize failed: %d\n", ret);
+      nllerr("ERROR: up_emac_initialize failed: %d\n", ret);
     }
 }
 #elif defined(CONFIG_SAMA5_EMACB)
@@ -133,7 +133,7 @@ static inline void up_emac_initialize(void)
   ret = sam_emac_initialize(EMAC0_INTF);
   if (ret < 0)
     {
-      nlldbg("ERROR: up_emac_initialize(EMAC0) failed: %d\n", ret);
+      nllerr("ERROR: up_emac_initialize(EMAC0) failed: %d\n", ret);
     }
 #endif
 
@@ -143,7 +143,7 @@ static inline void up_emac_initialize(void)
   ret = sam_emac_initialize(EMAC1_INTF);
   if (ret < 0)
     {
-      nlldbg("ERROR: up_emac_initialize(EMAC1) failed: %d\n", ret);
+      nllerr("ERROR: up_emac_initialize(EMAC1) failed: %d\n", ret);
     }
 #endif
 }
diff --git a/arch/arm/src/sama5/sam_gmac.c b/arch/arm/src/sama5/sam_gmac.c
index 8ba0aed708..078841fbb1 100644
--- a/arch/arm/src/sama5/sam_gmac.c
+++ b/arch/arm/src/sama5/sam_gmac.c
@@ -392,7 +392,7 @@ static bool sam_checkreg(struct sam_gmac_s *priv, bool wr, uint32_t regval,
         {
           /* Yes... show how many times we did it */
 
-          lldbg("...[Repeats %d times]...\n", priv->ntimes);
+          llerr("...[Repeats %d times]...\n", priv->ntimes);
         }
 
       /* Save information about the new access */
@@ -424,7 +424,7 @@ static uint32_t sam_getreg(struct sam_gmac_s *priv, uintptr_t address)
 
   if (sam_checkreg(priv, false, regval, address))
     {
-      lldbg("%08x->%08x\n", address, regval);
+      llerr("%08x->%08x\n", address, regval);
     }
 
   return regval;
@@ -445,7 +445,7 @@ static void sam_putreg(struct sam_gmac_s *priv, uintptr_t address,
 {
   if (sam_checkreg(priv, true, regval, address))
     {
-      lldbg("%08x<-%08x\n", address, regval);
+      llerr("%08x<-%08x\n", address, regval);
     }
 
   putreg32(regval, address);
@@ -538,7 +538,7 @@ static int sam_buffer_initialize(struct sam_gmac_s *priv)
   priv->txdesc = (struct gmac_txdesc_s *)kmm_memalign(8, allocsize);
   if (!priv->txdesc)
     {
-      nlldbg("ERROR: Failed to allocate TX descriptors\n");
+      nllerr("ERROR: Failed to allocate TX descriptors\n");
       return -ENOMEM;
     }
 
@@ -548,7 +548,7 @@ static int sam_buffer_initialize(struct sam_gmac_s *priv)
   priv->rxdesc = (struct gmac_rxdesc_s *)kmm_memalign(8, allocsize);
   if (!priv->rxdesc)
     {
-      nlldbg("ERROR: Failed to allocate RX descriptors\n");
+      nllerr("ERROR: Failed to allocate RX descriptors\n");
       sam_buffer_free(priv);
       return -ENOMEM;
     }
@@ -559,7 +559,7 @@ static int sam_buffer_initialize(struct sam_gmac_s *priv)
   priv->txbuffer = (uint8_t *)kmm_memalign(8, allocsize);
   if (!priv->txbuffer)
     {
-      nlldbg("ERROR: Failed to allocate TX buffer\n");
+      nllerr("ERROR: Failed to allocate TX buffer\n");
       sam_buffer_free(priv);
       return -ENOMEM;
     }
@@ -568,7 +568,7 @@ static int sam_buffer_initialize(struct sam_gmac_s *priv)
   priv->rxbuffer = (uint8_t *)kmm_memalign(8, allocsize);
   if (!priv->rxbuffer)
     {
-      nlldbg("ERROR: Failed to allocate RX buffer\n");
+      nllerr("ERROR: Failed to allocate RX buffer\n");
       sam_buffer_free(priv);
       return -ENOMEM;
     }
@@ -664,7 +664,7 @@ static int sam_transmit(struct sam_gmac_s *priv)
 
   if (dev->d_len > GMAC_TX_UNITSIZE)
     {
-      nlldbg("ERROR: Packet too big: %d\n", dev->d_len);
+      nllerr("ERROR: Packet too big: %d\n", dev->d_len);
       return -EINVAL;
     }
 
@@ -676,7 +676,7 @@ static int sam_transmit(struct sam_gmac_s *priv)
 
   if (sam_txfree(priv) < 1)
     {
-      nlldbg("ERROR: No free TX descriptors\n");
+      nllerr("ERROR: No free TX descriptors\n");
       return -EBUSY;
     }
 
@@ -1064,7 +1064,7 @@ static int sam_recvframe(struct sam_gmac_s *priv)
 
               if (pktlen < dev->d_len)
                 {
-                  nlldbg("ERROR: Buffer size %d; frame size %d\n", dev->d_len, pktlen);
+                  nllerr("ERROR: Buffer size %d; frame size %d\n", dev->d_len, pktlen);
                   return -E2BIG;
                 }
 
@@ -1142,7 +1142,7 @@ static void sam_receive(struct sam_gmac_s *priv)
 
       if (dev->d_len > CONFIG_NET_ETH_MTU)
         {
-          nlldbg("DROPPED: Too big: %d\n", dev->d_len);
+          nllerr("DROPPED: Too big: %d\n", dev->d_len);
           continue;
         }
 
@@ -1252,7 +1252,7 @@ static void sam_receive(struct sam_gmac_s *priv)
       else
 #endif
         {
-          nlldbg("DROPPED: Unknown type: %04x\n", BUF->type);
+          nllerr("DROPPED: Unknown type: %04x\n", BUF->type);
         }
     }
 }
@@ -1403,7 +1403,7 @@ static int sam_gmac_interrupt(int irq, void *context)
           clrbits = GMAC_TSR_RLE | sam_txinuse(priv);
           sam_txreset(priv);
 
-          nlldbg("ERROR: Retry Limit Exceeded TSR: %08x\n", tsr);
+          nllerr("ERROR: Retry Limit Exceeded TSR: %08x\n", tsr);
 
           regval = sam_getreg(priv, SAM_GMAC_NCR);
           regval |= GMAC_NCR_TXEN;
@@ -1414,7 +1414,7 @@ static int sam_gmac_interrupt(int irq, void *context)
 
       if ((tsr & GMAC_TSR_COL) != 0)
         {
-          nlldbg("ERROR: Collision occurred TSR: %08x\n", tsr);
+          nllerr("ERROR: Collision occurred TSR: %08x\n", tsr);
           clrbits |= GMAC_TSR_COL;
         }
 
@@ -1422,7 +1422,7 @@ static int sam_gmac_interrupt(int irq, void *context)
 
       if ((tsr & GMAC_TSR_TFC) != 0)
         {
-          nlldbg("ERROR: Buffers exhausted mid-frame TSR: %08x\n", tsr);
+          nllerr("ERROR: Buffers exhausted mid-frame TSR: %08x\n", tsr);
           clrbits |= GMAC_TSR_TFC;
         }
 
@@ -1437,7 +1437,7 @@ static int sam_gmac_interrupt(int irq, void *context)
 
       if ((tsr & GMAC_TSR_UND) != 0)
         {
-          nlldbg("ERROR: Transmit Underrun TSR: %08x\n", tsr);
+          nllerr("ERROR: Transmit Underrun TSR: %08x\n", tsr);
           clrbits |= GMAC_TSR_UND;
         }
 
@@ -1445,7 +1445,7 @@ static int sam_gmac_interrupt(int irq, void *context)
 
       if ((tsr & GMAC_TSR_HRESP) != 0)
         {
-          nlldbg("ERROR: HRESP not OK: %08x\n", tsr);
+          nllerr("ERROR: HRESP not OK: %08x\n", tsr);
           clrbits |= GMAC_TSR_HRESP;
         }
 
@@ -1453,7 +1453,7 @@ static int sam_gmac_interrupt(int irq, void *context)
 
       if ((tsr & GMAC_TSR_LCO) != 0)
         {
-          nlldbg("ERROR: Late collision: %08x\n", tsr);
+          nllerr("ERROR: Late collision: %08x\n", tsr);
           clrbits |= GMAC_TSR_LCO;
         }
 
@@ -1490,7 +1490,7 @@ static int sam_gmac_interrupt(int irq, void *context)
 
       if ((rsr & GMAC_RSR_RXOVR) != 0)
         {
-          nlldbg("ERROR: Receiver overrun RSR: %08x\n", rsr);
+          nllerr("ERROR: Receiver overrun RSR: %08x\n", rsr);
           clrbits |= GMAC_RSR_RXOVR;
         }
 
@@ -1507,7 +1507,7 @@ static int sam_gmac_interrupt(int irq, void *context)
 
       if ((rsr & GMAC_RSR_BNA) != 0)
         {
-          nlldbg("ERROR: Buffer not available RSR: %08x\n", rsr);
+          nllerr("ERROR: Buffer not available RSR: %08x\n", rsr);
           clrbits |= GMAC_RSR_BNA;
         }
 
@@ -1515,7 +1515,7 @@ static int sam_gmac_interrupt(int irq, void *context)
 
       if ((rsr & GMAC_RSR_HNO) != 0)
         {
-          nlldbg("ERROR: HRESP not OK: %08x\n", rsr);
+          nllerr("ERROR: HRESP not OK: %08x\n", rsr);
           clrbits |= GMAC_RSR_HNO;
         }
 
@@ -1536,7 +1536,7 @@ static int sam_gmac_interrupt(int irq, void *context)
 
   if ((pending & GMAC_INT_PFNZ) != 0)
     {
-      nlldbg("Pause frame received\n");
+      nllerr("Pause frame received\n");
     }
 
   /* Check for Pause Time Zero (PTZ)
@@ -1546,7 +1546,7 @@ static int sam_gmac_interrupt(int irq, void *context)
 
   if ((pending & GMAC_INT_PTZ) != 0)
     {
-      nlldbg("Pause TO!\n");
+      nllerr("Pause TO!\n");
     }
 #endif
 
@@ -1576,7 +1576,7 @@ static void sam_txtimeout(int argc, uint32_t arg, ...)
 {
   struct sam_gmac_s *priv = (struct sam_gmac_s *)arg;
 
-  nlldbg("Timeout!\n");
+  nllerr("Timeout!\n");
 
   /* Then reset the hardware.  Just take the interface down, then back
    * up again.
@@ -1651,7 +1651,7 @@ static int sam_ifup(struct net_driver_s *dev)
   struct sam_gmac_s *priv = (struct sam_gmac_s *)dev->d_private;
   int ret;
 
-  nlldbg("Bringing up: %d.%d.%d.%d\n",
+  nllerr("Bringing up: %d.%d.%d.%d\n",
          dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
          (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 
@@ -1675,7 +1675,7 @@ static int sam_ifup(struct net_driver_s *dev)
   ret = sam_phyinit(priv);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_phyinit failed: %d\n", ret);
+      nllerr("ERROR: sam_phyinit failed: %d\n", ret);
       return ret;
     }
 
@@ -1685,7 +1685,7 @@ static int sam_ifup(struct net_driver_s *dev)
   ret = sam_autonegotiate(priv);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_autonegotiate failed: %d\n", ret);
+      nllerr("ERROR: sam_autonegotiate failed: %d\n", ret);
       return ret;
     }
 #else
@@ -1730,7 +1730,7 @@ static int sam_ifdown(struct net_driver_s *dev)
   struct sam_gmac_s *priv = (struct sam_gmac_s *)dev->d_private;
   irqstate_t flags;
 
-  nlldbg("Taking the network down\n");
+  nllerr("Taking the network down\n");
 
   /* Disable the GMAC interrupt */
 
@@ -2429,7 +2429,7 @@ static int sam_phyreset(struct sam_gmac_s *priv)
   ret = sam_phywrite(priv, priv->phyaddr, GMII_MCR, GMII_MCR_RESET);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_phywrite failed: %d\n", ret);
+      nllerr("ERROR: sam_phywrite failed: %d\n", ret);
     }
 
   /* Wait for the PHY reset to complete */
@@ -2441,7 +2441,7 @@ static int sam_phyreset(struct sam_gmac_s *priv)
       int result = sam_phyread(priv, priv->phyaddr, GMII_MCR, &mcr);
       if (result < 0)
         {
-          nlldbg("ERROR: Failed to read the MCR register: %d\n", ret);
+          nllerr("ERROR: Failed to read the MCR register: %d\n", ret);
           ret = result;
         }
       else if ((mcr & GMII_MCR_RESET) == 0)
@@ -2501,7 +2501,7 @@ static int sam_phyfind(struct sam_gmac_s *priv, uint8_t *phyaddr)
 
   else
     {
-      nlldbg("ERROR: sam_phyread failed for PHY address %02x: %d\n",
+      nllerr("ERROR: sam_phyread failed for PHY address %02x: %d\n",
              candidate, ret);
 
       for (offset = 0; offset < 32; offset++)
@@ -2563,7 +2563,7 @@ static int sam_phyread(struct sam_gmac_s *priv, uint8_t phyaddr,
   ret = sam_phywait(priv);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_phywait failed: %d\n", ret);
+      nllerr("ERROR: sam_phywait failed: %d\n", ret);
       return ret;
     }
 
@@ -2578,7 +2578,7 @@ static int sam_phyread(struct sam_gmac_s *priv, uint8_t phyaddr,
   ret = sam_phywait(priv);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_phywait failed: %d\n", ret);
+      nllerr("ERROR: sam_phywait failed: %d\n", ret);
       return ret;
     }
 
@@ -2618,7 +2618,7 @@ static int sam_phywrite(struct sam_gmac_s *priv, uint8_t phyaddr,
   ret = sam_phywait(priv);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_phywait failed: %d\n", ret);
+      nllerr("ERROR: sam_phywait failed: %d\n", ret);
       return ret;
     }
 
@@ -2633,7 +2633,7 @@ static int sam_phywrite(struct sam_gmac_s *priv, uint8_t phyaddr,
   ret = sam_phywait(priv);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_phywait failed: %d\n", ret);
+      nllerr("ERROR: sam_phywait failed: %d\n", ret);
       return ret;
     }
 
@@ -2679,7 +2679,7 @@ static int sam_autonegotiate(struct sam_gmac_s *priv)
   ret = sam_phyread(priv, priv->phyaddr, GMII_PHYID1, &phyid1);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to read PHYID1 register\n");
+      nllerr("ERROR: Failed to read PHYID1 register\n");
       goto errout;
     }
 
@@ -2690,7 +2690,7 @@ static int sam_autonegotiate(struct sam_gmac_s *priv)
   ret = sam_phyread(priv, priv->phyaddr, GMII_PHYID2, &phyid2);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to read PHYID2 register\n");
+      nllerr("ERROR: Failed to read PHYID2 register\n");
       goto errout;
     }
 
@@ -2706,7 +2706,7 @@ static int sam_autonegotiate(struct sam_gmac_s *priv)
     }
   else
     {
-      nlldbg("ERROR: PHY not recognized: PHYID1=%04x PHYID2=%04x\n",
+      nllerr("ERROR: PHY not recognized: PHYID1=%04x PHYID2=%04x\n",
               phyid1, phyid2);
     }
 
@@ -2735,7 +2735,7 @@ static int sam_autonegotiate(struct sam_gmac_s *priv)
   ret = sam_phywrite(priv, priv->phyaddr, GMII_ADVERTISE, advertise);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to write ADVERTISE register\n");
+      nllerr("ERROR: Failed to write ADVERTISE register\n");
       goto errout;
     }
 
@@ -2746,7 +2746,7 @@ static int sam_autonegotiate(struct sam_gmac_s *priv)
   ret = sam_phyread(priv, priv->phyaddr, GMII_1000BTCR, &btcr);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to read 1000BTCR register: %d\n", ret);
+      nllerr("ERROR: Failed to read 1000BTCR register: %d\n", ret);
       goto errout;
     }
 
@@ -2755,7 +2755,7 @@ static int sam_autonegotiate(struct sam_gmac_s *priv)
   ret = sam_phywrite(priv, priv->phyaddr, GMII_1000BTCR, btcr);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to write 1000BTCR register: %d\n", ret);
+      nllerr("ERROR: Failed to write 1000BTCR register: %d\n", ret);
       goto errout;
     }
 
@@ -2764,7 +2764,7 @@ static int sam_autonegotiate(struct sam_gmac_s *priv)
   ret  = sam_phyread(priv, priv->phyaddr, GMII_MCR, &phyval);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to read MCR register: %d\n", ret);
+      nllerr("ERROR: Failed to read MCR register: %d\n", ret);
       goto errout;
     }
 
@@ -2773,7 +2773,7 @@ static int sam_autonegotiate(struct sam_gmac_s *priv)
   ret = sam_phywrite(priv, priv->phyaddr, GMII_MCR, phyval);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to write MCR register: %d\n", ret);
+      nllerr("ERROR: Failed to write MCR register: %d\n", ret);
       goto errout;
     }
 
@@ -2787,7 +2787,7 @@ static int sam_autonegotiate(struct sam_gmac_s *priv)
       ret  = sam_phyread(priv, priv->phyaddr, GMII_MSR, &phyval);
       if (ret < 0)
         {
-          nlldbg("ERROR: Failed to read MSR register: %d\n", ret);
+          nllerr("ERROR: Failed to read MSR register: %d\n", ret);
           goto errout;
         }
 
@@ -2805,7 +2805,7 @@ static int sam_autonegotiate(struct sam_gmac_s *priv)
 
       if (++timeout >= PHY_RETRY_MAX)
         {
-          nlldbg("ERROR: TimeOut\n");
+          nllerr("ERROR: TimeOut\n");
           sam_phydump(priv);
           ret = -ETIMEDOUT;
           goto errout;
@@ -2822,7 +2822,7 @@ static int sam_autonegotiate(struct sam_gmac_s *priv)
       ret  = sam_phyread(priv, priv->phyaddr, GMII_1000BTSR, &btsr);
       if (ret < 0)
         {
-          nlldbg("ERROR: Failed to read 1000BTSR register: %d\n", ret);
+          nllerr("ERROR: Failed to read 1000BTSR register: %d\n", ret);
           goto errout;
         }
 
@@ -2850,7 +2850,7 @@ static int sam_autonegotiate(struct sam_gmac_s *priv)
       ret  = sam_phyread(priv, priv->phyaddr, GMII_LPA, &lpa);
       if (ret < 0)
         {
-          nlldbg("ERROR: Failed to read LPA register: %d\n", ret);
+          nllerr("ERROR: Failed to read LPA register: %d\n", ret);
           goto errout;
         }
 
@@ -2892,7 +2892,7 @@ static int sam_autonegotiate(struct sam_gmac_s *priv)
 
       if (++timeout >= PHY_RETRY_MAX)
         {
-          nlldbg("ERROR: TimeOut\n");
+          nllerr("ERROR: TimeOut\n");
           sam_phydump(priv);
           ret = -ETIMEDOUT;
           goto errout;
@@ -3065,7 +3065,7 @@ static int sam_phyinit(struct sam_gmac_s *priv)
   ret = sam_phyfind(priv, &priv->phyaddr);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_phyfind failed: %d\n", ret);
+      nllerr("ERROR: sam_phyfind failed: %d\n", ret);
       return ret;
     }
 
@@ -3573,7 +3573,7 @@ int sam_gmac_initialize(void)
   priv->txpoll = wd_create();
   if (!priv->txpoll)
     {
-      nlldbg("ERROR: Failed to create periodic poll timer\n");
+      nllerr("ERROR: Failed to create periodic poll timer\n");
       ret = -EAGAIN;
       goto errout;
     }
@@ -3581,7 +3581,7 @@ int sam_gmac_initialize(void)
   priv->txtimeout = wd_create();         /* Create TX timeout timer */
   if (!priv->txtimeout)
     {
-      nlldbg("ERROR: Failed to create periodic poll timer\n");
+      nllerr("ERROR: Failed to create periodic poll timer\n");
       ret = -EAGAIN;
       goto errout_with_txpoll;
     }
@@ -3595,7 +3595,7 @@ int sam_gmac_initialize(void)
   ret = sam_buffer_initialize(priv);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_buffer_initialize failed: %d\n", ret);
+      nllerr("ERROR: sam_buffer_initialize failed: %d\n", ret);
       goto errout_with_txtimeout;
     }
 
@@ -3606,7 +3606,7 @@ int sam_gmac_initialize(void)
   ret = irq_attach(SAM_IRQ_GMAC, sam_gmac_interrupt);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to attach the handler to the IRQ%d\n", SAM_IRQ_GMAC);
+      nllerr("ERROR: Failed to attach the handler to the IRQ%d\n", SAM_IRQ_GMAC);
       goto errout_with_buffers;
     }
 
@@ -3619,7 +3619,7 @@ int sam_gmac_initialize(void)
   ret = sam_ifdown(&priv->dev);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to put the interface in the down state: %d\n", ret);
+      nllerr("ERROR: Failed to put the interface in the down state: %d\n", ret);
       goto errout_with_buffers;
     }
 
@@ -3631,7 +3631,7 @@ int sam_gmac_initialize(void)
       return ret;
     }
 
-  nlldbg("ERROR: netdev_register() failed: %d\n", ret);
+  nllerr("ERROR: netdev_register() failed: %d\n", ret);
 
 errout_with_buffers:
   sam_buffer_free(priv);
diff --git a/arch/arm/src/sama5/sam_hsmci.c b/arch/arm/src/sama5/sam_hsmci.c
index adbfa2bc04..b33eaa9c6a 100644
--- a/arch/arm/src/sama5/sam_hsmci.c
+++ b/arch/arm/src/sama5/sam_hsmci.c
@@ -725,7 +725,7 @@ static bool sam_checkreg(struct sam_dev_s *priv, bool wr, uint32_t value,
         {
           /* Yes... show how many times we did it */
 
-          lldbg("...[Repeats %d times]...\n", priv->ntimes);
+          llerr("...[Repeats %d times]...\n", priv->ntimes);
         }
 
       /* Save information about the new access */
@@ -758,7 +758,7 @@ static inline uint32_t sam_getreg(struct sam_dev_s *priv, unsigned int offset)
 #ifdef CONFIG_SAMA5_HSMCI_REGDEBUG
   if (sam_checkreg(priv, false, value, address))
     {
-      lldbg("%08x->%08x\n", address, value);
+      llerr("%08x->%08x\n", address, value);
     }
 #endif
 
@@ -781,7 +781,7 @@ static inline void sam_putreg(struct sam_dev_s *priv, uint32_t value,
 #ifdef CONFIG_SAMA5_HSMCI_REGDEBUG
   if (sam_checkreg(priv, true, value, address))
     {
-      lldbg("%08x<-%08x\n", address, value);
+      llerr("%08x<-%08x\n", address, value);
     }
 #endif
 
@@ -1237,7 +1237,7 @@ static void sam_dmacallback(DMA_HANDLE handle, void *arg, int result)
       if (result < 0)
         {
           wkupevent = (result == -ETIMEDOUT ? SDIOWAIT_TIMEOUT : SDIOWAIT_ERROR);
-          flldbg("ERROR: DMA failed: result=%d wkupevent=%04x\n", result, wkupevent);
+          fllerr("ERROR: DMA failed: result=%d wkupevent=%04x\n", result, wkupevent);
 
           /* sam_endtransfer will terminate the transfer and wait up the waiting
            * client in this case.
@@ -1337,7 +1337,7 @@ static void sam_eventtimeout(int argc, uint32_t arg)
       /* Yes.. wake up any waiting threads */
 
       sam_endwait(priv, SDIOWAIT_TIMEOUT);
-      flldbg("ERROR: Timeout\n");
+      fllerr("ERROR: Timeout\n");
     }
 }
 
@@ -1537,7 +1537,7 @@ static int sam_hsmci_interrupt(struct sam_dev_s *priv)
             {
               /* Yes.. Was it some kind of timeout error? */
 
-              flldbg("ERROR: enabled: %08x pending: %08x\n", enabled, pending);
+              fllerr("ERROR: enabled: %08x pending: %08x\n", enabled, pending);
               if ((pending & HSMCI_DATA_TIMEOUT_ERRORS) != 0)
                 {
                   /* Yes.. Terminate with a timeout. */
diff --git a/arch/arm/src/sama5/sam_irq.c b/arch/arm/src/sama5/sam_irq.c
index 21ce68ff23..e9824e2aa7 100644
--- a/arch/arm/src/sama5/sam_irq.c
+++ b/arch/arm/src/sama5/sam_irq.c
@@ -131,7 +131,7 @@ static void sam_dumpaic(const char *msg, uintptr_t base, int irq)
   irqstate_t flags;
 
   flags = enter_critical_section();
-  lldbg("AIC (%s, base=%08x irq=%d):\n", msg, base, irq);
+  llerr("AIC (%s, base=%08x irq=%d):\n", msg, base, irq);
 
   /* Select the register set associated with this irq */
 
@@ -139,15 +139,15 @@ static void sam_dumpaic(const char *msg, uintptr_t base, int irq)
 
   /* Then dump all of the (readable) register contents */
 
-  lldbg("  SSR: %08x  SMR: %08x  SVR: %08x  IVR: %08x\n",
+  llerr("  SSR: %08x  SMR: %08x  SVR: %08x  IVR: %08x\n",
         getreg32(base + SAM_AIC_SSR_OFFSET),
         getreg32(base + SAM_AIC_SMR_OFFSET),
         getreg32(base + SAM_AIC_SVR_OFFSET),
         getreg32(base + SAM_AIC_IVR_OFFSET));
-  lldbg("  FVR: %08x  ISR: %08x\n",
+  llerr("  FVR: %08x  ISR: %08x\n",
         getreg32(base + SAM_AIC_FVR_OFFSET),
         getreg32(base + SAM_AIC_ISR_OFFSET));
-  lldbg("  IPR: %08x       %08x       %08x       %08x\n",
+  llerr("  IPR: %08x       %08x       %08x       %08x\n",
         getreg32(base + SAM_AIC_IPR0_OFFSET),
         getreg32(base + SAM_AIC_IPR1_OFFSET),
         getreg32(base + SAM_AIC_IPR2_OFFSET),
@@ -156,19 +156,19 @@ static void sam_dumpaic(const char *msg, uintptr_t base, int irq)
   /* SAMA5D4 does not have the FFSR register */
 
 #if defined(SAM_AIC_FFSR)
-  lldbg("  IMR: %08x CISR: %08x  SPU: %08x FFSR: %08x\n",
+  llerr("  IMR: %08x CISR: %08x  SPU: %08x FFSR: %08x\n",
         getreg32(base + SAM_AIC_IMR_OFFSET),
         getreg32(base + SAM_AIC_CISR_OFFSET),
         getreg32(base + SAM_AIC_SPU_OFFSET),
         getreg32(base + SAM_AIC_FFSR_OFFSET));
 #else
-  lldbg("  IMR: %08x CISR: %08x  SPU: %08x\n",
+  llerr("  IMR: %08x CISR: %08x  SPU: %08x\n",
         getreg32(base + SAM_AIC_IMR_OFFSET),
         getreg32(base + SAM_AIC_CISR_OFFSET),
         getreg32(base + SAM_AIC_SPU_OFFSET));
 #endif
 
-  lldbg("  DCR: %08x WPMR: %08x WPSR: %08x\n",
+  llerr("  DCR: %08x WPMR: %08x WPSR: %08x\n",
         getreg32(base + SAM_AIC_DCR_OFFSET),
         getreg32(base + SAM_AIC_WPMR_OFFSET),
         getreg32(base + SAM_AIC_WPSR_OFFSET));
@@ -235,7 +235,7 @@ static uint32_t *sam_spurious(int irq, uint32_t *regs)
    */
 
 #if defined(CONFIG_DEBUG_IRQ)
-  lldbg("Spurious interrupt: IRQ %d\n", irq);
+  llerr("Spurious interrupt: IRQ %d\n", irq);
 #endif
   return regs;
 }
@@ -331,7 +331,7 @@ static void sam_aic_redirection(void)
       /* Check if redirection was successfully enabled */
 
       regval = getreg32(SAM_SFR_AICREDIR);
-      lldbg("Interrupts %s redirected to the AIC\n",
+      llerr("Interrupts %s redirected to the AIC\n",
            (regval & SFR_AICREDIR_ENABLE) != 0 ? "ARE" : "NOT");
 #endif
     }
diff --git a/arch/arm/src/sama5/sam_lcd.c b/arch/arm/src/sama5/sam_lcd.c
index 821a18ec61..fe5b77b568 100644
--- a/arch/arm/src/sama5/sam_lcd.c
+++ b/arch/arm/src/sama5/sam_lcd.c
@@ -1021,7 +1021,7 @@ static bool sam_checkreg(bool wr, uint32_t regval, uintptr_t address)
         {
           /* Yes... show how many times we did it */
 
-          lldbg("...[Repeats %d times]...\n", g_lcdc.ntimes);
+          llerr("...[Repeats %d times]...\n", g_lcdc.ntimes);
         }
 
       /* Save information about the new access */
@@ -1053,7 +1053,7 @@ static uint32_t sam_getreg(uintptr_t address)
 
   if (sam_checkreg(false, regval, address))
     {
-      lldbg("%08x->%08x\n", address, regval);
+      llerr("%08x->%08x\n", address, regval);
     }
 
   return regval;
@@ -1073,7 +1073,7 @@ static void sam_putreg(uintptr_t address, uint32_t regval)
 {
   if (sam_checkreg(true, regval, address))
     {
-      lldbg("%08x<-%08x\n", address, regval);
+      llerr("%08x<-%08x\n", address, regval);
     }
 
   putreg32(regval, address);
diff --git a/arch/arm/src/sama5/sam_nand.c b/arch/arm/src/sama5/sam_nand.c
index 6e53471e40..bb8b63645a 100644
--- a/arch/arm/src/sama5/sam_nand.c
+++ b/arch/arm/src/sama5/sam_nand.c
@@ -1163,7 +1163,7 @@ static void nand_dma_sampleinit(struct sam_nandcs_s *priv)
 #ifdef CONFIG_SAMA5_NAND_DMADEBUG
 static void nand_dma_sampledone(struct sam_nandcs_s *priv, int result)
 {
-  lldbg("result: %d\n", result);
+  llerr("result: %d\n", result);
 
   /* Sample the final registers */
 
@@ -3088,7 +3088,7 @@ bool nand_checkreg(bool wr, uintptr_t regaddr, uint32_t regval)
         {
           /* Yes... show how many times we did it */
 
-          lldbg("...[Repeats %d times]...\n", g_nand.ntimes);
+          llerr("...[Repeats %d times]...\n", g_nand.ntimes);
         }
 
       /* Save information about the new access */
diff --git a/arch/arm/src/sama5/sam_nand.h b/arch/arm/src/sama5/sam_nand.h
index 1467d29945..352b45b491 100644
--- a/arch/arm/src/sama5/sam_nand.h
+++ b/arch/arm/src/sama5/sam_nand.h
@@ -518,7 +518,7 @@ static inline uint32_t nand_getreg(uintptr_t regaddr)
 #ifdef CONFIG_SAMA5_NAND_REGDEBUG
   if (nand_checkreg(false, regaddr, regval))
     {
-      lldbg("%08x->%08x\n", regaddr, regval);
+      llerr("%08x->%08x\n", regaddr, regval);
     }
 #endif
 
@@ -538,7 +538,7 @@ static inline void nand_putreg(uintptr_t regaddr, uint32_t regval)
 #ifdef CONFIG_SAMA5_NAND_REGDEBUG
   if (nand_checkreg(true, regaddr, regval))
     {
-      lldbg("%08x<-%08x\n", regaddr, regval);
+      llerr("%08x<-%08x\n", regaddr, regval);
     }
 #endif
 
diff --git a/arch/arm/src/sama5/sam_ohci.c b/arch/arm/src/sama5/sam_ohci.c
index 7aae6c7be1..1dd7dcb9eb 100644
--- a/arch/arm/src/sama5/sam_ohci.c
+++ b/arch/arm/src/sama5/sam_ohci.c
@@ -524,7 +524,7 @@ static uint8_t            g_bufalloc[SAM_BUFALLOC]
 #ifdef CONFIG_SAMA5_OHCI_REGDEBUG
 static void sam_printreg(uint32_t addr, uint32_t val, bool iswrite)
 {
-  lldbg("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val);
+  llerr("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val);
 }
 #endif
 
@@ -574,7 +574,7 @@ static void sam_checkreg(uint32_t addr, uint32_t val, bool iswrite)
             {
               /* No.. More than one. */
 
-              lldbg("[repeats %d more times]\n", count);
+              llerr("[repeats %d more times]\n", count);
             }
         }
 
diff --git a/arch/arm/src/sama5/sam_pwm.c b/arch/arm/src/sama5/sam_pwm.c
index 5d07e57a62..aacfc21f6c 100644
--- a/arch/arm/src/sama5/sam_pwm.c
+++ b/arch/arm/src/sama5/sam_pwm.c
@@ -402,7 +402,7 @@
 
 #ifdef CONFIG_DEBUG_PWM
 #  define pwmdbg              dbg
-#  define pwmlldbg            lldbg
+#  define pwmllerr            llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define pwminfo           info
 #    define pwmllinfo         llinfo
@@ -412,7 +412,7 @@
 #  endif
 #else
 #  define pwmdbg(x...)
-#  define pwmlldbg(x...)
+#  define pwmllerr(x...)
 #  define pwminfo(x...)
 #  define pwmllinfo(x...)
 #endif
@@ -713,7 +713,7 @@ static bool pwm_checkreg(FAR struct sam_pwm_s *pwm, bool wr, uint32_t regval,
         {
           /* Yes... show how many times we did it */
 
-          lldbg("...[Repeats %d times]...\n", pwm->count);
+          llerr("...[Repeats %d times]...\n", pwm->count);
         }
 
       /* Save information about the new access */
@@ -757,7 +757,7 @@ static uint32_t pwm_getreg(struct sam_pwm_chan_s *chan, int offset)
 #ifdef CONFIG_SAMA5_PWM_REGDEBUG
   if (pwm_checkreg(&g_pwm, false, regval, regaddr))
     {
-      lldbg("%08x->%08x\n", regaddr, regval);
+      llerr("%08x->%08x\n", regaddr, regval);
     }
 #endif
 
@@ -774,7 +774,7 @@ static uint32_t pwm_getreg(struct sam_pwm_chan_s *chan, int offset)
 #ifdef CONFIG_SAMA5_PWM_REGDEBUG
   if (pwm_checkreg(pwm, false, regval, regaddr))
     {
-      lldbg("%08x->%08x\n", regaddr, regval);
+      llerr("%08x->%08x\n", regaddr, regval);
     }
 #endif
 
@@ -813,7 +813,7 @@ static uint32_t pwm_chan_getreg(struct sam_pwm_chan_s *chan, int offset)
   if (pwm_checkreg(chan->pwm, false, regval, regaddr))
 #endif
     {
-      lldbg("%08x->%08x\n", regaddr, regval);
+      llerr("%08x->%08x\n", regaddr, regval);
     }
 #endif
 
@@ -844,7 +844,7 @@ static void pwm_putreg(struct sam_pwm_chan_s *chan, int offset,
 #ifdef CONFIG_SAMA5_PWM_REGDEBUG
   if (pwm_checkreg(&g_pwm, true, regval, regaddr))
     {
-      lldbg("%08x<-%08x\n", regaddr, regval);
+      llerr("%08x<-%08x\n", regaddr, regval);
     }
 #endif
 
@@ -857,7 +857,7 @@ static void pwm_putreg(struct sam_pwm_chan_s *chan, int offset,
 #ifdef CONFIG_SAMA5_PWM_REGDEBUG
   if (pwm_checkreg(pwm, true, regval, regaddr))
     {
-      lldbg("%08x<-%08x\n", regaddr, regval);
+      llerr("%08x<-%08x\n", regaddr, regval);
     }
 #endif
 
@@ -893,7 +893,7 @@ static void pwm_chan_putreg(struct sam_pwm_chan_s *chan, int offset,
   if (pwm_checkreg(chan->pwm, true, regval, regaddr))
 #endif
     {
-      lldbg("%08x<-%08x\n", regaddr, regval);
+      llerr("%08x<-%08x\n", regaddr, regval);
     }
 #endif
 
diff --git a/arch/arm/src/sama5/sam_rtc.c b/arch/arm/src/sama5/sam_rtc.c
index 0260a947b6..d195cbc329 100644
--- a/arch/arm/src/sama5/sam_rtc.c
+++ b/arch/arm/src/sama5/sam_rtc.c
@@ -88,12 +88,12 @@
 #ifdef CONFIG_DEBUG_RTC
 #  define rtcdbg    dbg
 #  define rtcinfo   info
-#  define rtclldbg  lldbg
+#  define rtcllerr  llerr
 #  define rtcllinfo llinfo
 #else
 #  define rtcdbg(x...)
 #  define rtcinfo(x...)
-#  define rtclldbg(x...)
+#  define rtcllerr(x...)
 #  define rtcllinfo(x...)
 #endif
 
@@ -140,16 +140,16 @@ volatile bool g_rtc_enabled = false;
 #ifdef CONFIG_DEBUG_RTC
 static void rtc_dumpregs(FAR const char *msg)
 {
-  rtclldbg("%s:\n", msg);
-  rtclldbg("      CR: %08x\n", getreg32(SAM_RTC_CR));
-  rtclldbg("      MR: %08x\n", getreg32(SAM_RTC_MR));
-  rtclldbg("    TIMR: %08x\n", getreg32(SAM_RTC_TIMR));
-  rtclldbg("    CALR: %08x\n", getreg32(SAM_RTC_CALR));
-  rtclldbg("  TIMALR: %08x\n", getreg32(SAM_RTC_TIMALR));
-  rtclldbg("  CALALR: %08x\n", getreg32(SAM_RTC_CALALR));
-  rtclldbg("      SR: %08x\n", getreg32(SAM_RTC_SR));
-  rtclldbg("     IMR: %08x\n", getreg32(SAM_RTC_IMR));
-  rtclldbg("     VER: %08x\n", getreg32(SAM_RTC_VER));
+  rtcllerr("%s:\n", msg);
+  rtcllerr("      CR: %08x\n", getreg32(SAM_RTC_CR));
+  rtcllerr("      MR: %08x\n", getreg32(SAM_RTC_MR));
+  rtcllerr("    TIMR: %08x\n", getreg32(SAM_RTC_TIMR));
+  rtcllerr("    CALR: %08x\n", getreg32(SAM_RTC_CALR));
+  rtcllerr("  TIMALR: %08x\n", getreg32(SAM_RTC_TIMALR));
+  rtcllerr("  CALALR: %08x\n", getreg32(SAM_RTC_CALALR));
+  rtcllerr("      SR: %08x\n", getreg32(SAM_RTC_SR));
+  rtcllerr("     IMR: %08x\n", getreg32(SAM_RTC_IMR));
+  rtcllerr("     VER: %08x\n", getreg32(SAM_RTC_VER));
 }
 #else
 #  define rtc_dumpregs(msg)
@@ -172,13 +172,13 @@ static void rtc_dumpregs(FAR const char *msg)
 #ifdef CONFIG_DEBUG_RTC
 static void rtc_dumptime(FAR struct tm *tp, FAR const char *msg)
 {
-  rtclldbg("%s:\n", msg);
-  rtclldbg("  tm_sec: %08x\n", tp->tm_sec);
-  rtclldbg("  tm_min: %08x\n", tp->tm_min);
-  rtclldbg(" tm_hour: %08x\n", tp->tm_hour);
-  rtclldbg(" tm_mday: %08x\n", tp->tm_mday);
-  rtclldbg("  tm_mon: %08x\n", tp->tm_mon);
-  rtclldbg(" tm_year: %08x\n", tp->tm_year);
+  rtcllerr("%s:\n", msg);
+  rtcllerr("  tm_sec: %08x\n", tp->tm_sec);
+  rtcllerr("  tm_min: %08x\n", tp->tm_min);
+  rtcllerr(" tm_hour: %08x\n", tp->tm_hour);
+  rtcllerr(" tm_mday: %08x\n", tp->tm_mday);
+  rtcllerr("  tm_mon: %08x\n", tp->tm_mon);
+  rtcllerr(" tm_year: %08x\n", tp->tm_year);
 }
 #else
 #  define rtc_dumptime(tp, msg)
@@ -289,7 +289,7 @@ static int rtc_interrupt(int irq, void *context)
   ret = work_queue(LPWORK, &g_alarmwork, rtc_worker, NULL, 0);
   if (ret < 0)
     {
-      rtclldbg("ERRPR: work_queue failed: %d\n", ret);
+      rtcllerr("ERRPR: work_queue failed: %d\n", ret);
     }
 
   /* Disable any further alarm interrupts */
diff --git a/arch/arm/src/sama5/sam_spi.c b/arch/arm/src/sama5/sam_spi.c
index b681de8b29..e3cd70944d 100644
--- a/arch/arm/src/sama5/sam_spi.c
+++ b/arch/arm/src/sama5/sam_spi.c
@@ -141,9 +141,9 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg lldbg
+#  define spidbg llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
@@ -430,7 +430,7 @@ static bool spi_checkreg(struct sam_spidev_s *spi, bool wr, uint32_t value,
         {
           /* Yes... show how many times we did it */
 
-          lldbg("...[Repeats %d times]...\n", spi->ntimes);
+          llerr("...[Repeats %d times]...\n", spi->ntimes);
         }
 
       /* Save information about the new access */
@@ -464,7 +464,7 @@ static inline uint32_t spi_getreg(struct sam_spidev_s *spi,
 #ifdef CONFIG_SAMA5_SPI_REGDEBUG
   if (spi_checkreg(spi, false, value, address))
     {
-      lldbg("%08x->%08x\n", address, value);
+      llerr("%08x->%08x\n", address, value);
     }
 #endif
 
@@ -487,7 +487,7 @@ static inline void spi_putreg(struct sam_spidev_s *spi, uint32_t value,
 #ifdef CONFIG_SAMA5_SPI_REGDEBUG
   if (spi_checkreg(spi, true, value, address))
     {
-      lldbg("%08x<-%08x\n", address, value);
+      llerr("%08x<-%08x\n", address, value);
     }
 #endif
 
diff --git a/arch/arm/src/sama5/sam_ssc.c b/arch/arm/src/sama5/sam_ssc.c
index 480d0e9d9f..8fdf222e04 100644
--- a/arch/arm/src/sama5/sam_ssc.c
+++ b/arch/arm/src/sama5/sam_ssc.c
@@ -415,16 +415,16 @@
 
 #ifdef CONFIG_DEBUG_I2S
 #  define i2sdbg         dbg
-#  define i2slldbg       lldbg
+#  define i2sllerr       llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define i2sinfo      dbg
-#    define i2sllinfo    lldbg
+#    define i2sllinfo    llerr
 #  else
 #    define i2sinfo(x...)
 #  endif
 #else
 #  define i2sdbg(x...)
-#  define i2slldbg(x...)
+#  define i2sllerr(x...)
 #  define i2sinfo(x...)
 #  define i2sllinfo(x...)
 #endif
@@ -724,7 +724,7 @@ static bool ssc_checkreg(struct sam_ssc_s *priv, bool wr, uint32_t regval,
         {
           /* Yes... show how many times we did it */
 
-          lldbg("...[Repeats %d times]...\n", priv->count);
+          llerr("...[Repeats %d times]...\n", priv->count);
         }
 
       /* Save information about the new access */
@@ -758,7 +758,7 @@ static inline uint32_t ssc_getreg(struct sam_ssc_s *priv,
 #ifdef CONFIG_SAMA5_SSC_REGDEBUG
   if (ssc_checkreg(priv, false, regval, regaddr))
     {
-      lldbg("%08x->%08x\n", regaddr, regval);
+      llerr("%08x->%08x\n", regaddr, regval);
     }
 #endif
 
@@ -781,7 +781,7 @@ static inline void ssc_putreg(struct sam_ssc_s *priv, unsigned int offset,
 #ifdef CONFIG_SAMA5_SSC_REGDEBUG
   if (ssc_checkreg(priv, true, regval, regaddr))
     {
-      lldbg("%08x<-%08x\n", regaddr, regval);
+      llerr("%08x<-%08x\n", regaddr, regval);
     }
 #endif
 
@@ -1111,7 +1111,7 @@ static void ssc_dma_sampleinit(struct sam_ssc_s *priv,
 #if defined(CONFIG_SAMA5_SSC_DMADEBUG) && defined(SSC_HAVE_RX)
 static void ssc_rxdma_sampledone(struct sam_ssc_s *priv, int result)
 {
-  lldbg("result: %d\n", result);
+  llerr("result: %d\n", result);
 
   /* Sample the final registers */
 
@@ -1176,7 +1176,7 @@ static void ssc_rxdma_sampledone(struct sam_ssc_s *priv, int result)
 #if defined(CONFIG_SAMA5_SSC_DMADEBUG) && defined(SSC_HAVE_TX)
 static void ssc_txdma_sampledone(struct sam_ssc_s *priv, int result)
 {
-  lldbg("result: %d\n", result);
+  llerr("result: %d\n", result);
 
   /* Sample the final registers */
 
@@ -1398,7 +1398,7 @@ static int ssc_rxdma_setup(struct sam_ssc_s *priv)
 
       if (ret < 0)
         {
-          i2slldbg("ERROR: wd_start failed: %d\n", errno);
+          i2sllerr("ERROR: wd_start failed: %d\n", errno);
         }
     }
 
@@ -1586,7 +1586,7 @@ static void ssc_rx_schedule(struct sam_ssc_s *priv, int result)
       ret = work_queue(HPWORK, &priv->rx.work, ssc_rx_worker, priv, 0);
       if (ret != 0)
         {
-          i2slldbg("ERROR: Failed to queue RX work: %d\n", ret);
+          i2sllerr("ERROR: Failed to queue RX work: %d\n", ret);
         }
     }
 }
@@ -1811,7 +1811,7 @@ static int ssc_txdma_setup(struct sam_ssc_s *priv)
 
       if (ret < 0)
         {
-          i2slldbg("ERROR: wd_start failed: %d\n", errno);
+          i2sllerr("ERROR: wd_start failed: %d\n", errno);
         }
     }
 
@@ -1986,7 +1986,7 @@ static void ssc_tx_schedule(struct sam_ssc_s *priv, int result)
       ret = work_queue(HPWORK, &priv->tx.work, ssc_tx_worker, priv, 0);
       if (ret != 0)
         {
-          i2slldbg("ERROR: Failed to queue TX work: %d\n", ret);
+          i2sllerr("ERROR: Failed to queue TX work: %d\n", ret);
         }
     }
 }
diff --git a/arch/arm/src/sama5/sam_tc.c b/arch/arm/src/sama5/sam_tc.c
index af434004ef..9a6c091ede 100644
--- a/arch/arm/src/sama5/sam_tc.c
+++ b/arch/arm/src/sama5/sam_tc.c
@@ -501,20 +501,20 @@ static void sam_regdump(struct sam_chan_s *chan, const char *msg)
   uintptr_t base;
 
   base = tc->base;
-  lldbg("TC%d [%08x]: %s\n", tc->tc, (int)base, msg);
-  lldbg("  BMR: %08x QIMR: %08x QISR: %08x WPMR: %08x\n",
+  llerr("TC%d [%08x]: %s\n", tc->tc, (int)base, msg);
+  llerr("  BMR: %08x QIMR: %08x QISR: %08x WPMR: %08x\n",
         getreg32(base+SAM_TC_BMR_OFFSET), getreg32(base+SAM_TC_QIMR_OFFSET),
         getreg32(base+SAM_TC_QISR_OFFSET), getreg32(base+SAM_TC_WPMR_OFFSET));
 
   base = chan->base;
-  lldbg("TC%d Channel %d [%08x]: %s\n", tc->tc, chan->chan, (int)base, msg);
-  lldbg("  CMR: %08x SSMR: %08x  RAB: %08x   CV: %08x\n",
+  llerr("TC%d Channel %d [%08x]: %s\n", tc->tc, chan->chan, (int)base, msg);
+  llerr("  CMR: %08x SSMR: %08x  RAB: %08x   CV: %08x\n",
         getreg32(base+SAM_TC_CMR_OFFSET), getreg32(base+SAM_TC_SMMR_OFFSET),
         getreg32(base+SAM_TC_RAB_OFFSET), getreg32(base+SAM_TC_CV_OFFSET));
-  lldbg("   RA: %08x   RB: %08x   RC: %08x   SR: %08x\n",
+  llerr("   RA: %08x   RB: %08x   RC: %08x   SR: %08x\n",
         getreg32(base+SAM_TC_RA_OFFSET), getreg32(base+SAM_TC_RB_OFFSET),
         getreg32(base+SAM_TC_RC_OFFSET), getreg32(base+SAM_TC_SR_OFFSET));
-  lldbg("  IMR: %08x\n",
+  llerr("  IMR: %08x\n",
         getreg32(base+SAM_TC_IMR_OFFSET));
 }
 #endif
@@ -558,7 +558,7 @@ static bool sam_checkreg(struct sam_tc_s *tc, bool wr, uint32_t regaddr,
         {
           /* Yes... show how many times we did it */
 
-          lldbg("...[Repeats %d times]...\n", tc->ntimes);
+          llerr("...[Repeats %d times]...\n", tc->ntimes);
         }
 
       /* Save information about the new access */
@@ -593,7 +593,7 @@ static inline uint32_t sam_tc_getreg(struct sam_chan_s *chan,
 #ifdef CONFIG_SAMA5_TC_REGDEBUG
   if (sam_checkreg(tc, false, regaddr, regval))
     {
-      lldbg("%08x->%08x\n", regaddr, regval);
+      llerr("%08x->%08x\n", regaddr, regval);
     }
 #endif
 
@@ -617,7 +617,7 @@ static inline void sam_tc_putreg(struct sam_chan_s *chan, uint32_t regval,
 #ifdef CONFIG_SAMA5_TC_REGDEBUG
   if (sam_checkreg(tc, true, regaddr, regval))
     {
-      lldbg("%08x<-%08x\n", regaddr, regval);
+      llerr("%08x<-%08x\n", regaddr, regval);
     }
 #endif
 
@@ -641,7 +641,7 @@ static inline uint32_t sam_chan_getreg(struct sam_chan_s *chan,
 #ifdef CONFIG_SAMA5_TC_REGDEBUG
   if (sam_checkreg(chan->tc, false, regaddr, regval))
     {
-      lldbg("%08x->%08x\n", regaddr, regval);
+      llerr("%08x->%08x\n", regaddr, regval);
     }
 #endif
 
@@ -664,7 +664,7 @@ static inline void sam_chan_putreg(struct sam_chan_s *chan, unsigned int offset,
 #ifdef CONFIG_SAMA5_TC_REGDEBUG
   if (sam_checkreg(chan->tc, true, regaddr, regval))
     {
-      lldbg("%08x<-%08x\n", regaddr, regval);
+      llerr("%08x<-%08x\n", regaddr, regval);
     }
 #endif
 
diff --git a/arch/arm/src/sama5/sam_tc.h b/arch/arm/src/sama5/sam_tc.h
index 7a6f8dbba2..8d19b5566c 100644
--- a/arch/arm/src/sama5/sam_tc.h
+++ b/arch/arm/src/sama5/sam_tc.h
@@ -88,12 +88,12 @@
 #ifdef CONFIG_SAMA5_TC_DEBUG
 #  define tcdbg    dbg
 #  define tcinfo   info
-#  define tclldbg  lldbg
+#  define tcllerr  llerr
 #  define tcllinfo llinfo
 #else
 #  define tcdbg(x...)
 #  define tcinfo(x...)
-#  define tclldbg(x...)
+#  define tcllerr(x...)
 #  define tcllinfo(x...)
 #endif
 
diff --git a/arch/arm/src/sama5/sam_tickless.c b/arch/arm/src/sama5/sam_tickless.c
index 190cdf19a5..42eeabf809 100644
--- a/arch/arm/src/sama5/sam_tickless.c
+++ b/arch/arm/src/sama5/sam_tickless.c
@@ -256,7 +256,7 @@ void up_timer_initialize(void)
                                CONFIG_USEC_PER_TICK);
   if (ret < 0)
     {
-      tclldbg("ERROR: sam_oneshot_initialize failed\n");
+      tcllerr("ERROR: sam_oneshot_initialize failed\n");
       PANIC();
     }
 
@@ -268,7 +268,7 @@ void up_timer_initialize(void)
   ret = sam_oneshot_max_delay(&g_tickless.oneshot, &max_delay);
   if (ret < 0)
     {
-      tclldbg("ERROR: sam_oneshot_max_delay failed\n");
+      tcllerr("ERROR: sam_oneshot_max_delay failed\n");
       PANIC();
     }
 
@@ -292,7 +292,7 @@ void up_timer_initialize(void)
                                CONFIG_USEC_PER_TICK);
   if (ret < 0)
     {
-      tclldbg("ERROR: sam_freerun_initialize failed\n");
+      tcllerr("ERROR: sam_freerun_initialize failed\n");
       PANIC();
     }
 
diff --git a/arch/arm/src/sama5/sam_tsd.c b/arch/arm/src/sama5/sam_tsd.c
index 5159a34e7e..ce1e2f67be 100644
--- a/arch/arm/src/sama5/sam_tsd.c
+++ b/arch/arm/src/sama5/sam_tsd.c
@@ -799,7 +799,7 @@ static int sam_tsd_schedule(struct sam_tsd_s *priv)
   ret = work_queue(HPWORK, &priv->work, sam_tsd_bottomhalf, priv, 0);
   if (ret != 0)
     {
-      illdbg("Failed to queue work: %d\n", ret);
+      illerr("Failed to queue work: %d\n", ret);
     }
 
   return OK;
diff --git a/arch/arm/src/sama5/sam_twi.c b/arch/arm/src/sama5/sam_twi.c
index 5aa22b90a7..8f813afe4b 100644
--- a/arch/arm/src/sama5/sam_twi.c
+++ b/arch/arm/src/sama5/sam_twi.c
@@ -129,12 +129,12 @@
 #ifdef CONFIG_DEBUG_I2C
 #  define i2cdbg    dbg
 #  define i2cinfo   info
-#  define i2clldbg  lldbg
+#  define i2cllerr  llerr
 #  define i2cllinfo llinfo
 #else
 #  define i2cdbg(x...)
 #  define i2cinfo(x...)
-#  define i2clldbg(x...)
+#  define i2cllerr(x...)
 #  define i2cllinfo(x...)
 #endif
 
@@ -384,7 +384,7 @@ static bool twi_checkreg(struct twi_dev_s *priv, bool wr, uint32_t value,
         {
           /* Yes... show how many times we did it */
 
-          lldbg("...[Repeats %d times]...\n", priv->ntimes);
+          llerr("...[Repeats %d times]...\n", priv->ntimes);
         }
 
       /* Save information about the new access */
@@ -416,7 +416,7 @@ static uint32_t twi_getabs(struct twi_dev_s *priv, uintptr_t address)
 
   if (twi_checkreg(priv, false, value, address))
     {
-      lldbg("%08x->%08x\n", address, value);
+      llerr("%08x->%08x\n", address, value);
     }
 
   return value;
@@ -437,7 +437,7 @@ static void twi_putabs(struct twi_dev_s *priv, uintptr_t address,
 {
   if (twi_checkreg(priv, true, value, address))
     {
-      lldbg("%08x<-%08x\n", address, value);
+      llerr("%08x<-%08x\n", address, value);
     }
 
   putreg32(value, address);
@@ -670,7 +670,7 @@ static int twi_interrupt(struct twi_dev_s *priv)
     {
       /* Wake up the thread with an I/O error indication */
 
-      i2clldbg("ERROR: TWI%d pending: %08x\n", priv->attr->twi, pending);
+      i2cllerr("ERROR: TWI%d pending: %08x\n", priv->attr->twi, pending);
       twi_wakeup(priv, -EIO);
     }
 
@@ -720,7 +720,7 @@ static void twi_timeout(int argc, uint32_t arg, ...)
 {
   struct twi_dev_s *priv = (struct twi_dev_s *)arg;
 
-  i2clldbg("ERROR: TWI%d Timeout!\n", priv->attr->twi);
+  i2cllerr("ERROR: TWI%d Timeout!\n", priv->attr->twi);
   twi_wakeup(priv, -ETIMEDOUT);
 }
 
diff --git a/arch/arm/src/sama5/sam_udphs.c b/arch/arm/src/sama5/sam_udphs.c
index a73cb0e420..baf24cdb58 100644
--- a/arch/arm/src/sama5/sam_udphs.c
+++ b/arch/arm/src/sama5/sam_udphs.c
@@ -671,7 +671,7 @@ const struct trace_msg_t g_usb_trace_strings_intdecode[] =
 #ifdef CONFIG_SAMA5_UDPHS_REGDEBUG
 static void sam_printreg(uintptr_t regaddr, uint32_t regval, bool iswrite)
 {
-  lldbg("%p%s%08x\n", regaddr, iswrite ? "<-" : "->", regval);
+  llerr("%p%s%08x\n", regaddr, iswrite ? "<-" : "->", regval);
 }
 #endif
 
@@ -722,7 +722,7 @@ static void sam_checkreg(uintptr_t regaddr, uint32_t regval, bool iswrite)
             {
               /* No.. More than one. */
 
-              lldbg("[repeats %d more times]\n", count);
+              llerr("[repeats %d more times]\n", count);
             }
         }
 
@@ -802,31 +802,31 @@ static void sam_dumpep(struct sam_usbdev_s *priv, int epno)
 {
   /* Global Registers */
 
-  lldbg("Global Register:\n");
-  lldbg("  CTRL:    %04x\n", sam_getreg(SAM_UDPHS_CTRL));
-  lldbg("  FNUM:    %04x\n", sam_getreg(SAM_UDPHS_FNUM));
-  lldbg("  IEN:     %04x\n", sam_getreg(SAM_UDPHS_IEN));
-  lldbg("  INSTA:   %04x\n", sam_getreg(SAM_UDPHS_INTSTA));
-  lldbg("  TST:     %04x\n", sam_getreg(SAM_UDPHS_TST));
+  llerr("Global Register:\n");
+  llerr("  CTRL:    %04x\n", sam_getreg(SAM_UDPHS_CTRL));
+  llerr("  FNUM:    %04x\n", sam_getreg(SAM_UDPHS_FNUM));
+  llerr("  IEN:     %04x\n", sam_getreg(SAM_UDPHS_IEN));
+  llerr("  INSTA:   %04x\n", sam_getreg(SAM_UDPHS_INTSTA));
+  llerr("  TST:     %04x\n", sam_getreg(SAM_UDPHS_TST));
 
   /* Endpoint registers */
 
-  lldbg("Endpoint %d Register:\n", epno);
-  lldbg("  CFG:     %04x\n", sam_getreg(SAM_UDPHS_EPTCFG(epno)));
-  lldbg("  CTL:     %04x\n", sam_getreg(SAM_UDPHS_EPTCTL(epno)));
-  lldbg("  STA:     %04x\n", sam_getreg(SAM_UDPHS_EPTSTA(epno)));
+  llerr("Endpoint %d Register:\n", epno);
+  llerr("  CFG:     %04x\n", sam_getreg(SAM_UDPHS_EPTCFG(epno)));
+  llerr("  CTL:     %04x\n", sam_getreg(SAM_UDPHS_EPTCTL(epno)));
+  llerr("  STA:     %04x\n", sam_getreg(SAM_UDPHS_EPTSTA(epno)));
 
-  lldbg("DMA %d Register:\n", epno);
+  llerr("DMA %d Register:\n", epno);
   if ((SAM_EPSET_DMA & SAM_EP_BIT(epno)) != 0)
     {
-      lldbg("  NXTDSC:  %04x\n", sam_getreg(SAM_UDPHS_DMANXTDSC(epno)));
-      lldbg("  ADDRESS: %04x\n", sam_getreg(SAM_UDPHS_DMAADDRESS(epno)));
-      lldbg("  CONTROL: %04x\n", sam_getreg(SAM_UDPHS_DMACONTROL(epno)));
-      lldbg("  STATUS:  %04x\n", sam_getreg(SAM_UDPHS_DMASTATUS(epno)));
+      llerr("  NXTDSC:  %04x\n", sam_getreg(SAM_UDPHS_DMANXTDSC(epno)));
+      llerr("  ADDRESS: %04x\n", sam_getreg(SAM_UDPHS_DMAADDRESS(epno)));
+      llerr("  CONTROL: %04x\n", sam_getreg(SAM_UDPHS_DMACONTROL(epno)));
+      llerr("  STATUS:  %04x\n", sam_getreg(SAM_UDPHS_DMASTATUS(epno)));
     }
   else
     {
-      lldbg("  None\n");
+      llerr("  None\n");
     }
 }
 #endif
@@ -3440,7 +3440,7 @@ static int sam_ep_disable(struct usbdev_ep_s *ep)
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
-      ulldbg("ERROR: ep=%p\n", ep);
+      ullerr("ERROR: ep=%p\n", ep);
       return -EINVAL;
     }
 #endif
@@ -3572,7 +3572,7 @@ static int sam_ep_submit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
   if (!req || !req->callback || !req->buf || !ep)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
-      ulldbg("ERROR: req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep);
+      ullerr("ERROR: req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep);
       return -EINVAL;
     }
 #endif
@@ -3584,7 +3584,7 @@ static int sam_ep_submit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
   if (!priv->driver)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_NOTCONFIGURED), priv->usbdev.speed);
-      ulldbg("ERROR: driver=%p\n", priv->driver);
+      ullerr("ERROR: driver=%p\n", priv->driver);
       return -ESHUTDOWN;
     }
 #endif
@@ -3611,7 +3611,7 @@ static int sam_ep_submit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
       if (privep->stalled)
         {
           sam_req_abort(privep, privreq, -EBUSY);
-          ulldbg("ERROR: stalled\n");
+          ullerr("ERROR: stalled\n");
           ret = -EPERM;
         }
       else
diff --git a/arch/arm/src/sama5/sam_wdt.c b/arch/arm/src/sama5/sam_wdt.c
index e5507a3949..88546618d9 100644
--- a/arch/arm/src/sama5/sam_wdt.c
+++ b/arch/arm/src/sama5/sam_wdt.c
@@ -82,12 +82,12 @@
 
 /* Debug ********************************************************************/
 /* Non-standard debug that may be enabled just for testing the watchdog
- * driver.  NOTE: that only lldbg types are used so that the output is
+ * driver.  NOTE: that only llerr types are used so that the output is
  * immediately available.
  */
 
 #ifdef CONFIG_DEBUG_WATCHDOG
-#  define wddbg    lldbg
+#  define wddbg    llerr
 #  define wdinfo   llinfo
 #else
 #  define wddbg(x...)
@@ -199,7 +199,7 @@ static uint32_t sam_getreg(uintptr_t regaddr)
         {
           if (count == 4)
             {
-              lldbg("...\n");
+              llerr("...\n");
             }
 
           return regval;
@@ -216,7 +216,7 @@ static uint32_t sam_getreg(uintptr_t regaddr)
         {
           /* Yes.. then show how many times the value repeated */
 
-          lldbg("[repeats %d more times]\n", count-3);
+          llerr("[repeats %d more times]\n", count-3);
         }
 
       /* Save the new address, value, and count */
@@ -228,7 +228,7 @@ static uint32_t sam_getreg(uintptr_t regaddr)
 
   /* Show the register value read */
 
-  lldbg("%08x->%048\n", regaddr, regval);
+  llerr("%08x->%048\n", regaddr, regval);
   return regval;
 }
 #endif
@@ -246,7 +246,7 @@ static void sam_putreg(uint32_t regval, uintptr_t regaddr)
 {
   /* Show the register value being written */
 
-  lldbg("%08x<-%08x\n", regaddr, regval);
+  llerr("%08x<-%08x\n", regaddr, regval);
 
   /* Write the value */
 
diff --git a/arch/arm/src/sama5/sam_xdmac.c b/arch/arm/src/sama5/sam_xdmac.c
index 609823acb6..74105e6147 100644
--- a/arch/arm/src/sama5/sam_xdmac.c
+++ b/arch/arm/src/sama5/sam_xdmac.c
@@ -1860,7 +1860,7 @@ static int sam_xdmac_interrupt(struct sam_xdmac_s *xdmac)
             {
               /* Yes... Terminate the transfer with an error? */
 
-              dmalldbg("ERROR: DMA failed: %08x\n", chpending);
+              dmallerr("ERROR: DMA failed: %08x\n", chpending);
               sam_dmaterminate(xdmach, -EIO);
             }
 
@@ -1877,7 +1877,7 @@ static int sam_xdmac_interrupt(struct sam_xdmac_s *xdmac)
 
           else
             {
-              dmalldbg("ERROR: Unexpected interrupt: %08x\n", chpending);
+              dmallerr("ERROR: Unexpected interrupt: %08x\n", chpending);
               DEBUGPANIC();
             }
 
diff --git a/arch/arm/src/sama5/sama5d2x_pio.c b/arch/arm/src/sama5/sama5d2x_pio.c
index d6daf15a82..1ca67e45bd 100644
--- a/arch/arm/src/sama5/sama5d2x_pio.c
+++ b/arch/arm/src/sama5/sama5d2x_pio.c
@@ -630,31 +630,31 @@ int sam_dumppio(uint32_t pinset, const char *msg)
 
   if (secure)
     {
-      lldbg("SPIO%c pinset: %08x base: %08x -- %s\n",
+      llerr("SPIO%c pinset: %08x base: %08x -- %s\n",
              g_portchar[port], pinset, base, msg);
     }
   else
     {
-      lldbg("PIO%c pinset: %08x base: %08x -- %s\n",
+      llerr("PIO%c pinset: %08x base: %08x -- %s\n",
              g_portchar[port], pinset, base, msg);
     }
 
-  lldbg("   MSKR: %08x   CFGR: %08x   PDSR: %08x LOCKSR: %08x\n",
+  llerr("   MSKR: %08x   CFGR: %08x   PDSR: %08x LOCKSR: %08x\n",
         getreg32(base + SAM_PIO_MSKR_OFFSET), getreg32(base + SAM_PIO_CFGR_OFFSET),
         getreg32(base + SAM_PIO_PDSR_OFFSET), getreg32(base + SAM_PIO_LOCKSR_OFFSET));
-  lldbg("   ODSR: %08x    IMR: %08x    ISR: %08x\n",
+  llerr("   ODSR: %08x    IMR: %08x    ISR: %08x\n",
         getreg32(base + SAM_PIO_ODSR_OFFSET), getreg32(base + SAM_PIO_IMR_OFFSET),
         getreg32(base + SAM_PIO_ISR_OFFSET));
 
   if (secure)
     {
-      lldbg("   SCDR: %08x   WPMR: %08x   WPSR: %08x  IOSSR: %08x\n",
+      llerr("   SCDR: %08x   WPMR: %08x   WPSR: %08x  IOSSR: %08x\n",
             getreg32(SAM_SPIO_SCDR), getreg32(SAM_SPIO_WPMR),
             getreg32(SAM_SPIO_WPSR), getreg32(base + SAM_SPIO_IOSSR_OFFSET));
     }
   else
     {
-      lldbg("   WPMR: %08x   WPSR: %08x\n",
+      llerr("   WPMR: %08x   WPSR: %08x\n",
             getreg32(SAM_PIO_WPMR), getreg32(SAM_PIO_WPSR));
     }
 
diff --git a/arch/arm/src/sama5/sama5d3x4x_pio.c b/arch/arm/src/sama5/sama5d3x4x_pio.c
index b9379ad868..c054625ac8 100644
--- a/arch/arm/src/sama5/sama5d3x4x_pio.c
+++ b/arch/arm/src/sama5/sama5d3x4x_pio.c
@@ -869,40 +869,40 @@ int sam_dumppio(uint32_t pinset, const char *msg)
   /* The following requires exclusive access to the PIO registers */
 
   flags = enter_critical_section();
-  lldbg("PIO%c pinset: %08x base: %08x -- %s\n",
+  llerr("PIO%c pinset: %08x base: %08x -- %s\n",
         g_portchar[port], pinset, base, msg);
 
 #ifdef SAM_PIO_ISLR_OFFSET
-  lldbg("    PSR: %08x   ISLR: %08x    OSR: %08x   IFSR: %08x\n",
+  llerr("    PSR: %08x   ISLR: %08x    OSR: %08x   IFSR: %08x\n",
         getreg32(base + SAM_PIO_PSR_OFFSET), getreg32(base + SAM_PIO_ISLR_OFFSET),
         getreg32(base + SAM_PIO_OSR_OFFSET), getreg32(base + SAM_PIO_IFSR_OFFSET));
 #else
-  lldbg("    PSR: %08x    OSR: %08x   IFSR: %08x\n",
+  llerr("    PSR: %08x    OSR: %08x   IFSR: %08x\n",
         getreg32(base + SAM_PIO_PSR_OFFSET), getreg32(base + SAM_PIO_OSR_OFFSET),
         getreg32(base + SAM_PIO_IFSR_OFFSET));
 #endif
-  lldbg("   ODSR: %08x   PDSR: %08x    IMR: %08x    ISR: %08x\n",
+  llerr("   ODSR: %08x   PDSR: %08x    IMR: %08x    ISR: %08x\n",
         getreg32(base + SAM_PIO_ODSR_OFFSET), getreg32(base + SAM_PIO_PDSR_OFFSET),
         getreg32(base + SAM_PIO_IMR_OFFSET), getreg32(base + SAM_PIO_ISR_OFFSET));
-  lldbg("   MDSR: %08x   PUSR: %08x ABDCSR: %08x %08x\n",
+  llerr("   MDSR: %08x   PUSR: %08x ABDCSR: %08x %08x\n",
         getreg32(base + SAM_PIO_MDSR_OFFSET), getreg32(base + SAM_PIO_PUSR_OFFSET),
         getreg32(base + SAM_PIO_ABCDSR1_OFFSET), getreg32(base + SAM_PIO_ABCDSR2_OFFSET));
-  lldbg(" IFSCSR: %08x   SCDR: %08x  PPDSR: %08x   OWSR: %08x\n",
+  llerr(" IFSCSR: %08x   SCDR: %08x  PPDSR: %08x   OWSR: %08x\n",
         getreg32(base + SAM_PIO_IFSCSR_OFFSET), getreg32(base + SAM_PIO_SCDR_OFFSET),
         getreg32(base + SAM_PIO_PPDSR_OFFSET), getreg32(base + SAM_PIO_OWSR_OFFSET));
 #ifdef SAM_PIO_LOCKSR_OFFSET
-  lldbg("  AIMMR: %08x   ELSR: %08x FRLHSR: %08x LOCKSR: %08x\n",
+  llerr("  AIMMR: %08x   ELSR: %08x FRLHSR: %08x LOCKSR: %08x\n",
         getreg32(base + SAM_PIO_AIMMR_OFFSET), getreg32(base + SAM_PIO_ELSR_OFFSET),
         getreg32(base + SAM_PIO_FRLHSR_OFFSET), getreg32(base + SAM_PIO_LOCKSR_OFFSET));
 #else
-  lldbg("  AIMMR: %08x   ELSR: %08x FRLHSR: %08x\n",
+  llerr("  AIMMR: %08x   ELSR: %08x FRLHSR: %08x\n",
         getreg32(base + SAM_PIO_AIMMR_OFFSET), getreg32(base + SAM_PIO_ELSR_OFFSET),
         getreg32(base + SAM_PIO_FRLHSR_OFFSET));
 #endif
-  lldbg("SCHMITT: %08x DRIVER: %08x %08x\n",
+  llerr("SCHMITT: %08x DRIVER: %08x %08x\n",
         getreg32(base + SAM_PIO_SCHMITT_OFFSET), getreg32(base + SAM_PIO_DRIVER1_OFFSET),
         getreg32(base + SAM_PIO_DRIVER2_OFFSET));
-  lldbg("   WPMR: %08x   WPSR: %08x\n",
+  llerr("   WPMR: %08x   WPSR: %08x\n",
         getreg32(base + SAM_PIO_WPMR_OFFSET), getreg32(base + SAM_PIO_WPSR_OFFSET));
 
   leave_critical_section(flags);
diff --git a/arch/arm/src/samdl/sam_irq.c b/arch/arm/src/samdl/sam_irq.c
index 42b65d814f..a67f403b53 100644
--- a/arch/arm/src/samdl/sam_irq.c
+++ b/arch/arm/src/samdl/sam_irq.c
@@ -306,26 +306,26 @@ void sam_dumpnvic(const char *msg, int irq)
 
   flags = enter_critical_section();
 
-  lldbg("NVIC (%s, irq=%d):\n", msg, irq);
-  lldbg("  ISER:       %08x ICER:   %08x\n",
+  llerr("NVIC (%s, irq=%d):\n", msg, irq);
+  llerr("  ISER:       %08x ICER:   %08x\n",
         getreg32(ARMV6M_NVIC_ISER), getreg32(ARMV6M_NVIC_ICER));
-  lldbg("  ISPR:       %08x ICPR:   %08x\n",
+  llerr("  ISPR:       %08x ICPR:   %08x\n",
         getreg32(ARMV6M_NVIC_ISPR), getreg32(ARMV6M_NVIC_ICPR));
-  lldbg("  IRQ PRIO:   %08x %08x %08x %08x\n",
+  llerr("  IRQ PRIO:   %08x %08x %08x %08x\n",
         getreg32(ARMV6M_NVIC_IPR0), getreg32(ARMV6M_NVIC_IPR1),
         getreg32(ARMV6M_NVIC_IPR2), getreg32(ARMV6M_NVIC_IPR3));
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(ARMV6M_NVIC_IPR4), getreg32(ARMV6M_NVIC_IPR5),
         getreg32(ARMV6M_NVIC_IPR6), getreg32(ARMV6M_NVIC_IPR7));
 
-  lldbg("SYSCON:\n");
-  lldbg("  CPUID:      %08x\n",
+  llerr("SYSCON:\n");
+  llerr("  CPUID:      %08x\n",
         getreg32(ARMV6M_SYSCON_CPUID));
-  lldbg("  ICSR:       %08x AIRCR:  %08x\n",
+  llerr("  ICSR:       %08x AIRCR:  %08x\n",
         getreg32(ARMV6M_SYSCON_ICSR), getreg32(ARMV6M_SYSCON_AIRCR));
-  lldbg("  SCR:        %08x CCR:    %08x\n",
+  llerr("  SCR:        %08x CCR:    %08x\n",
         getreg32(ARMV6M_SYSCON_SCR), getreg32(ARMV6M_SYSCON_CCR));
-  lldbg("  SHPR2:      %08x SHPR3:  %08x\n",
+  llerr("  SHPR2:      %08x SHPR3:  %08x\n",
         getreg32(ARMV6M_SYSCON_SHPR2), getreg32(ARMV6M_SYSCON_SHPR3));
 
   leave_critical_section(flags);
diff --git a/arch/arm/src/samdl/sam_port.c b/arch/arm/src/samdl/sam_port.c
index 53c8664efd..58d0550df3 100644
--- a/arch/arm/src/samdl/sam_port.c
+++ b/arch/arm/src/samdl/sam_port.c
@@ -538,16 +538,16 @@ int sam_dumpport(uint32_t pinset, const char *msg)
   /* The following requires exclusive access to the PORT registers */
 
   flags = enter_critical_section();
-  lldbg("PORT%c pin: %d pinset: %08x base: %08x -- %s\n",
+  llerr("PORT%c pin: %d pinset: %08x base: %08x -- %s\n",
         g_portchar[port], pin, pinset, base, msg);
-  lldbg("  DIR: %08x OUT: %08x IN: %08x\n",
+  llerr("  DIR: %08x OUT: %08x IN: %08x\n",
         getreg32(base + SAM_PORT_DIR_OFFSET),
         getreg32(base + SAM_PORT_OUT_OFFSET),
         getreg32(base + SAM_PORT_IN_OFFSET));
-  lldbg("  CTRL: %08x WRCONFIG: %08x\n",
+  llerr("  CTRL: %08x WRCONFIG: %08x\n",
         getreg32(base + SAM_PORT_CTRL_OFFSET),
         getreg32(base + SAM_PORT_WRCONFIG_OFFSET));
-  lldbg("  PMUX[%08x]: %02x PINCFG[%08x]: %02x\n",
+  llerr("  PMUX[%08x]: %02x PINCFG[%08x]: %02x\n",
         base + SAM_PORT_PMUX_OFFSET(pin),
         getreg8(base + SAM_PORT_PMUX_OFFSET(pin)),
         base + SAM_PORT_PINCFG_OFFSET(pin),
diff --git a/arch/arm/src/samdl/sam_spi.c b/arch/arm/src/samdl/sam_spi.c
index b78ef8c548..e16f4cd730 100644
--- a/arch/arm/src/samdl/sam_spi.c
+++ b/arch/arm/src/samdl/sam_spi.c
@@ -91,9 +91,9 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg lldbg
+#  define spidbg llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
@@ -569,7 +569,7 @@ static bool spi_checkreg(struct sam_spidev_s *priv, bool wr, uint32_t regval,
         {
           /* Yes... show how many times we did it */
 
-          lldbg("...[Repeats %d times]...\n", priv->ntimes);
+          llerr("...[Repeats %d times]...\n", priv->ntimes);
         }
 
       /* Save information about the new access */
@@ -602,7 +602,7 @@ static uint8_t spi_getreg8(struct sam_spidev_s *priv, unsigned int offset)
 #ifdef CONFIG_SAMDL_SPI_REGDEBUG
   if (spi_checkreg(priv, false, (uint32_t)regval, regaddr))
     {
-      lldbg("%08x->%02x\n", regaddr, regval);
+      llerr("%08x->%02x\n", regaddr, regval);
     }
 #endif
 
@@ -625,7 +625,7 @@ static void spi_putreg8(struct sam_spidev_s *priv, uint8_t regval,
 #ifdef CONFIG_SAMDL_SPI_REGDEBUG
   if (spi_checkreg(priv, true, (uint32_t)regval, regaddr))
     {
-      lldbg("%08x<-%02x\n", regaddr, regval);
+      llerr("%08x<-%02x\n", regaddr, regval);
     }
 #endif
 
@@ -648,7 +648,7 @@ static uint16_t spi_getreg16(struct sam_spidev_s *priv, unsigned int offset)
 #ifdef CONFIG_SAMDL_SPI_REGDEBUG
   if (spi_checkreg(priv, false, (uint32_t)regval, regaddr))
     {
-      lldbg("%08x->%04x\n", regaddr, regval);
+      llerr("%08x->%04x\n", regaddr, regval);
     }
 #endif
 
@@ -671,7 +671,7 @@ static void spi_putreg16(struct sam_spidev_s *priv, uint16_t regval,
 #ifdef CONFIG_SAMDL_SPI_REGDEBUG
   if (spi_checkreg(priv, true, (uint32_t)regval, regaddr))
     {
-      lldbg("%08x<-%04x\n", regaddr, regval);
+      llerr("%08x<-%04x\n", regaddr, regval);
     }
 #endif
 
@@ -694,7 +694,7 @@ static uint32_t spi_getreg32(struct sam_spidev_s *priv, unsigned int offset)
 #ifdef CONFIG_SAMDL_SPI_REGDEBUG
   if (spi_checkreg(priv, false, regval, regaddr))
     {
-      lldbg("%08x->%08x\n", regaddr, regval);
+      llerr("%08x->%08x\n", regaddr, regval);
     }
 #endif
 
@@ -717,7 +717,7 @@ static void spi_putreg32(struct sam_spidev_s *priv, uint32_t regval,
 #ifdef CONFIG_SAMDL_SPI_REGDEBUG
   if (spi_checkreg(priv, true, regval, regaddr))
     {
-      lldbg("%08x<-%08x\n", regaddr, regval);
+      llerr("%08x<-%08x\n", regaddr, regval);
     }
 #endif
 
diff --git a/arch/arm/src/samv7/sam_emac.c b/arch/arm/src/samv7/sam_emac.c
index ff39b0c659..1e5e80a840 100644
--- a/arch/arm/src/samv7/sam_emac.c
+++ b/arch/arm/src/samv7/sam_emac.c
@@ -966,7 +966,7 @@ static bool sam_checkreg(struct sam_emac_s *priv, bool wr, uint32_t regval,
         {
           /* Yes... show how many times we did it */
 
-          lldbg("...[Repeats %d times]...\n", priv->ntimes);
+          llerr("...[Repeats %d times]...\n", priv->ntimes);
         }
 
       /* Save information about the new access */
@@ -999,7 +999,7 @@ static uint32_t sam_getreg(struct sam_emac_s *priv, uint16_t offset)
 #ifdef CONFIG_SAMV7_EMAC_REGDEBUG
   if (sam_checkreg(priv, false, regval, regaddr))
     {
-      lldbg("%08x->%08x\n", regaddr, regval);
+      llerr("%08x->%08x\n", regaddr, regval);
     }
 #endif
 
@@ -1023,7 +1023,7 @@ static void sam_putreg(struct sam_emac_s *priv, uint16_t offset,
 #ifdef CONFIG_SAMV7_EMAC_REGDEBUG
   if (sam_checkreg(priv, true, regval, regaddr))
     {
-      lldbg("%08x<-%08x\n", regaddr, regval);
+      llerr("%08x<-%08x\n", regaddr, regval);
     }
 #endif
 
@@ -1147,7 +1147,7 @@ static int sam_buffer_allocate(struct sam_emac_s *priv)
   priv->xfrq[0].txdesc = (struct emac_txdesc_s *)kmm_memalign(EMAC_ALIGN, allocsize);
   if (!priv->xfrq[0].txdesc)
     {
-      nlldbg("ERROR: Failed to allocate TX descriptors\n");
+      nllerr("ERROR: Failed to allocate TX descriptors\n");
       return -ENOMEM;
     }
 
@@ -1158,7 +1158,7 @@ static int sam_buffer_allocate(struct sam_emac_s *priv)
   priv->xfrq[0].rxdesc = (struct emac_rxdesc_s *)kmm_memalign(EMAC_ALIGN, allocsize);
   if (!priv->xfrq[0].rxdesc)
     {
-      nlldbg("ERROR: Failed to allocate RX descriptors\n");
+      nllerr("ERROR: Failed to allocate RX descriptors\n");
       sam_buffer_free(priv);
       return -ENOMEM;
     }
@@ -1170,7 +1170,7 @@ static int sam_buffer_allocate(struct sam_emac_s *priv)
   priv->xfrq[0].txbuffer = (uint8_t *)kmm_memalign(EMAC_ALIGN, allocsize);
   if (!priv->xfrq[0].txbuffer)
     {
-      nlldbg("ERROR: Failed to allocate TX buffer\n");
+      nllerr("ERROR: Failed to allocate TX buffer\n");
       sam_buffer_free(priv);
       return -ENOMEM;
     }
@@ -1181,7 +1181,7 @@ static int sam_buffer_allocate(struct sam_emac_s *priv)
   priv->xfrq[0].rxbuffer = (uint8_t *)kmm_memalign(EMAC_ALIGN, allocsize);
   if (!priv->xfrq[0].rxbuffer)
     {
-      nlldbg("ERROR: Failed to allocate RX buffer\n");
+      nllerr("ERROR: Failed to allocate RX buffer\n");
       sam_buffer_free(priv);
       return -ENOMEM;
     }
@@ -1194,7 +1194,7 @@ static int sam_buffer_allocate(struct sam_emac_s *priv)
   priv->xfrq[1].txdesc = (struct emac_txdesc_s *)kmm_memalign(EMAC_ALIGN, allocsize);
   if (!priv->xfrq[1].txdesc)
     {
-      nlldbg("ERROR: Failed to allocate TX descriptors\n");
+      nllerr("ERROR: Failed to allocate TX descriptors\n");
       return -ENOMEM;
     }
 
@@ -1205,7 +1205,7 @@ static int sam_buffer_allocate(struct sam_emac_s *priv)
   priv->xfrq[1].rxdesc = (struct emac_rxdesc_s *)kmm_memalign(EMAC_ALIGN, allocsize);
   if (!priv->xfrq[1].rxdesc)
     {
-      nlldbg("ERROR: Failed to allocate RX descriptors\n");
+      nllerr("ERROR: Failed to allocate RX descriptors\n");
       sam_buffer_free(priv);
       return -ENOMEM;
     }
@@ -1217,7 +1217,7 @@ static int sam_buffer_allocate(struct sam_emac_s *priv)
   priv->xfrq[1].txbuffer = (uint8_t *)kmm_memalign(EMAC_ALIGN, allocsize);
   if (!priv->xfrq[1].txbuffer)
     {
-      nlldbg("ERROR: Failed to allocate TX buffer\n");
+      nllerr("ERROR: Failed to allocate TX buffer\n");
       sam_buffer_free(priv);
       return -ENOMEM;
     }
@@ -1228,7 +1228,7 @@ static int sam_buffer_allocate(struct sam_emac_s *priv)
   priv->xfrq[1].rxbuffer = (uint8_t *)kmm_memalign(EMAC_ALIGN, allocsize);
   if (!priv->xfrq[1].rxbuffer)
     {
-      nlldbg("ERROR: Failed to allocate RX buffer\n");
+      nllerr("ERROR: Failed to allocate RX buffer\n");
       sam_buffer_free(priv);
       return -ENOMEM;
     }
@@ -1369,7 +1369,7 @@ static int sam_transmit(struct sam_emac_s *priv, int qid)
 
   if (dev->d_len > EMAC_TX_UNITSIZE)
     {
-      nlldbg("ERROR: Packet too big: %d\n", dev->d_len);
+      nllerr("ERROR: Packet too big: %d\n", dev->d_len);
       return -EINVAL;
     }
 
@@ -1386,7 +1386,7 @@ static int sam_transmit(struct sam_emac_s *priv, int qid)
 
   if (sam_txfree(priv, qid) < 1)
     {
-      nlldbg("ERROR: No free TX descriptors\n");
+      nllerr("ERROR: No free TX descriptors\n");
       return -EBUSY;
     }
 
@@ -1805,7 +1805,7 @@ static int sam_recvframe(struct sam_emac_s *priv, int qid)
                       xfrq->rxndx, dev->d_len);
               if (pktlen < dev->d_len)
                 {
-                  nlldbg("ERROR: Buffer size %d; frame size %d\n",
+                  nllerr("ERROR: Buffer size %d; frame size %d\n",
                          dev->d_len, pktlen);
                   NETDEV_RXERRORS(&priv->dev);
                   return -E2BIG;
@@ -1896,7 +1896,7 @@ static void sam_receive(struct sam_emac_s *priv, int qid)
 
       if (dev->d_len > CONFIG_NET_ETH_MTU)
         {
-          nlldbg("DROPPED: Too big: %d\n", dev->d_len);
+          nllerr("DROPPED: Too big: %d\n", dev->d_len);
           NETDEV_RXERRORS(&priv->dev);
           continue;
         }
@@ -2010,7 +2010,7 @@ static void sam_receive(struct sam_emac_s *priv, int qid)
       else
 #endif
         {
-          nlldbg("DROPPED: Unknown type: %04x\n", BUF->type);
+          nllerr("DROPPED: Unknown type: %04x\n", BUF->type);
           NETDEV_RXDROPPED(&priv->dev);
         }
     }
@@ -2312,7 +2312,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv, int qid)
 
       if ((rsr & EMAC_RSR_RXOVR) != 0)
         {
-          nlldbg("ERROR: Receiver overrun RSR: %08x\n", rsr);
+          nllerr("ERROR: Receiver overrun RSR: %08x\n", rsr);
           clrbits |= EMAC_RSR_RXOVR;
         }
 
@@ -2329,7 +2329,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv, int qid)
 
       if ((rsr & EMAC_RSR_BNA) != 0)
         {
-          nlldbg("ERROR: Buffer not available RSR: %08x\n", rsr);
+          nllerr("ERROR: Buffer not available RSR: %08x\n", rsr);
           clrbits |= EMAC_RSR_BNA;
         }
 
@@ -2370,7 +2370,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv, int qid)
           clrbits = EMAC_TSR_RLE | sam_txinuse(priv, qid);
           sam_txreset(priv, qid);
 
-          nlldbg("ERROR: Retry Limit Exceeded TSR: %08x\n", tsr);
+          nllerr("ERROR: Retry Limit Exceeded TSR: %08x\n", tsr);
 
           regval  = sam_getreg(priv, SAM_EMAC_NCR_OFFSET);
           regval |= EMAC_NCR_TXEN;
@@ -2381,7 +2381,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv, int qid)
 
       if ((tsr & EMAC_TSR_COL) != 0)
         {
-          nlldbg("ERROR: Collision occurred TSR: %08x\n", tsr);
+          nllerr("ERROR: Collision occurred TSR: %08x\n", tsr);
           NETDEV_TXERRORS(&priv->dev);
         }
 
@@ -2389,7 +2389,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv, int qid)
 
       if ((tsr & EMAC_TSR_TFC) != 0)
         {
-          nlldbg("ERROR: Transmit Frame Corruption due to AHB error: %08x\n", tsr);
+          nllerr("ERROR: Transmit Frame Corruption due to AHB error: %08x\n", tsr);
           NETDEV_TXERRORS(&priv->dev);
         }
 
@@ -2407,7 +2407,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv, int qid)
 
   if ((pending & EMAC_INT_HRESP) != 0)
     {
-      nlldbg("ERROR: Hresp not OK\n");
+      nllerr("ERROR: Hresp not OK\n");
     }
 
   /* Check for PAUSE Frame received (PFRE).
@@ -2418,7 +2418,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv, int qid)
 
   if ((pending & EMAC_INT_PFNZ) != 0)
     {
-      nlldbg("Pause frame received\n");
+      nllerr("Pause frame received\n");
     }
 
   /* Check for Pause Time Zero (PTZ)
@@ -2428,7 +2428,7 @@ static inline void sam_interrupt_process(FAR struct sam_emac_s *priv, int qid)
 
   if ((pending & EMAC_INT_PTZ) != 0)
     {
-      nlldbg("Pause TO!\n");
+      nllerr("Pause TO!\n");
     }
 #endif
 }
@@ -2593,7 +2593,7 @@ static int sam_emac1_interrupt(int irq, void *context)
 
 static inline void sam_txtimeout_process(FAR struct sam_emac_s *priv)
 {
-  nlldbg("Timeout!\n");
+  nllerr("Timeout!\n");
   NETDEV_TXTIMEOUTS(&priv->dev);
 
   /* Reset the hardware.  Just take the interface down, then back up again. */
@@ -2858,7 +2858,7 @@ static int sam_ifup(struct net_driver_s *dev)
   ret = sam_phyinit(priv);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_phyinit failed: %d\n", ret);
+      nllerr("ERROR: sam_phyinit failed: %d\n", ret);
       return ret;
     }
 
@@ -2867,7 +2867,7 @@ static int sam_ifup(struct net_driver_s *dev)
   ret = sam_autonegotiate(priv);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_autonegotiate failed: %d\n", ret);
+      nllerr("ERROR: sam_autonegotiate failed: %d\n", ret);
       return ret;
     }
 
@@ -2910,7 +2910,7 @@ static int sam_ifdown(struct net_driver_s *dev)
   struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private;
   irqstate_t flags;
 
-  nlldbg("Taking the network down\n");
+  nllerr("Taking the network down\n");
 
   /* Disable the EMAC interrupt */
 
@@ -3729,7 +3729,7 @@ static int sam_phyreset(struct sam_emac_s *priv)
   ret = sam_phywrite(priv, priv->phyaddr, MII_MCR, MII_MCR_RESET);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_phywrite failed: %d\n", ret);
+      nllerr("ERROR: sam_phywrite failed: %d\n", ret);
     }
 
   /* Wait for the PHY reset to complete */
@@ -3741,7 +3741,7 @@ static int sam_phyreset(struct sam_emac_s *priv)
       int result = sam_phyread(priv, priv->phyaddr, MII_MCR, &mcr);
       if (result < 0)
         {
-          nlldbg("ERROR: Failed to read the MCR register: %d\n", ret);
+          nllerr("ERROR: Failed to read the MCR register: %d\n", ret);
           ret = result;
         }
       else if ((mcr & MII_MCR_RESET) == 0)
@@ -3806,7 +3806,7 @@ static int sam_phyfind(struct sam_emac_s *priv, uint8_t *phyaddr)
 
   else
     {
-      nlldbg("ERROR: sam_phyread failed for PHY address %02x: %d\n",
+      nllerr("ERROR: sam_phyread failed for PHY address %02x: %d\n",
              candidate, ret);
 
       for (offset = 0; offset < 32; offset++)
@@ -3872,7 +3872,7 @@ static int sam_phyread(struct sam_emac_s *priv, uint8_t phyaddr,
   ret = sam_phywait(priv);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_phywait failed: %d\n", ret);
+      nllerr("ERROR: sam_phywait failed: %d\n", ret);
       return ret;
     }
 
@@ -3897,7 +3897,7 @@ static int sam_phyread(struct sam_emac_s *priv, uint8_t phyaddr,
   ret = sam_phywait(priv);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_phywait failed: %d\n", ret);
+      nllerr("ERROR: sam_phywait failed: %d\n", ret);
       return ret;
     }
 
@@ -3937,7 +3937,7 @@ static int sam_phywrite(struct sam_emac_s *priv, uint8_t phyaddr,
   ret = sam_phywait(priv);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_phywait failed: %d\n", ret);
+      nllerr("ERROR: sam_phywait failed: %d\n", ret);
       return ret;
     }
 
@@ -3962,7 +3962,7 @@ static int sam_phywrite(struct sam_emac_s *priv, uint8_t phyaddr,
   ret = sam_phywait(priv);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_phywait failed: %d\n", ret);
+      nllerr("ERROR: sam_phywait failed: %d\n", ret);
       return ret;
     }
 
@@ -4007,7 +4007,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phyread(priv, priv->phyaddr, MII_PHYID1, &phyid1);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to read PHYID1\n");
+      nllerr("ERROR: Failed to read PHYID1\n");
       goto errout;
     }
 
@@ -4016,7 +4016,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phyread(priv, priv->phyaddr, MII_PHYID2, &phyid2);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to read PHYID2\n");
+      nllerr("ERROR: Failed to read PHYID2\n");
       goto errout;
     }
 
@@ -4033,7 +4033,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
     }
   else
     {
-      nlldbg("ERROR: PHY not recognized\n");
+      nllerr("ERROR: PHY not recognized\n");
     }
 
   /* Setup control register */
@@ -4041,7 +4041,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phyread(priv, priv->phyaddr, MII_MCR, &mcr);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to read MCR\n");
+      nllerr("ERROR: Failed to read MCR\n");
       goto errout;
     }
 
@@ -4052,7 +4052,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phywrite(priv, priv->phyaddr, MII_MCR, mcr);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to write MCR\n");
+      nllerr("ERROR: Failed to write MCR\n");
       goto errout;
     }
 
@@ -4067,7 +4067,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phywrite(priv, priv->phyaddr, MII_ADVERTISE, advertise);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to write ANAR\n");
+      nllerr("ERROR: Failed to write ANAR\n");
       goto errout;
     }
 
@@ -4076,7 +4076,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phyread(priv, priv->phyaddr, MII_MCR, &mcr);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to read MCR\n");
+      nllerr("ERROR: Failed to read MCR\n");
       goto errout;
     }
 
@@ -4084,7 +4084,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phywrite(priv, priv->phyaddr, MII_MCR, mcr);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to write MCR\n");
+      nllerr("ERROR: Failed to write MCR\n");
       goto errout;
     }
 
@@ -4096,7 +4096,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phywrite(priv, priv->phyaddr, MII_MCR, mcr);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to write MCR\n");
+      nllerr("ERROR: Failed to write MCR\n");
       goto errout;
     }
 
@@ -4110,7 +4110,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
       ret = sam_phyread(priv, priv->phyaddr, MII_MSR, &msr);
       if (ret < 0)
         {
-          nlldbg("ERROR: Failed to read MSR\n");
+          nllerr("ERROR: Failed to read MSR\n");
           goto errout;
         }
 
@@ -4128,7 +4128,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
 
       if (++timeout >= PHY_RETRY_MAX)
         {
-          nlldbg("ERROR: TimeOut\n");
+          nllerr("ERROR: TimeOut\n");
           sam_phydump(priv);
           ret = -ETIMEDOUT;
           goto errout;
@@ -4140,7 +4140,7 @@ static int sam_autonegotiate(struct sam_emac_s *priv)
   ret = sam_phyread(priv, priv->phyaddr, MII_LPA, &lpa);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to read ANLPAR\n");
+      nllerr("ERROR: Failed to read ANLPAR\n");
       goto errout;
     }
 
@@ -4235,13 +4235,13 @@ static bool sam_linkup(struct sam_emac_s *priv)
   ret = sam_phyread(priv, priv->phyaddr, MII_MSR, &msr);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to read MSR: %d\n", ret);
+      nllerr("ERROR: Failed to read MSR: %d\n", ret);
       goto errout;
     }
 
   if ((msr & MII_MSR_LINKSTATUS) == 0)
     {
-      nlldbg("ERROR: MSR LinkStatus: %04x\n", msr);
+      nllerr("ERROR: MSR LinkStatus: %04x\n", msr);
       goto errout;
     }
 
@@ -4250,7 +4250,7 @@ static bool sam_linkup(struct sam_emac_s *priv)
   ret = sam_phyread(priv, priv->phyaddr, priv->attr->physr, &physr);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to read PHYSR: %d\n", ret);
+      nllerr("ERROR: Failed to read PHYSR: %d\n", ret);
       goto errout;
     }
 
@@ -4365,7 +4365,7 @@ static int sam_phyinit(struct sam_emac_s *priv)
   ret = sam_phyfind(priv, &priv->phyaddr);
   if (ret < 0)
     {
-      nlldbg("ERROR: sam_phyfind failed: %d\n", ret);
+      nllerr("ERROR: sam_phyfind failed: %d\n", ret);
       return ret;
     }
 
diff --git a/arch/arm/src/samv7/sam_ethernet.c b/arch/arm/src/samv7/sam_ethernet.c
index 3e19d95873..84a883bfcb 100644
--- a/arch/arm/src/samv7/sam_ethernet.c
+++ b/arch/arm/src/samv7/sam_ethernet.c
@@ -99,7 +99,7 @@ void up_netinitialize(void)
   ret = sam_emac_initialize(EMAC0_INTF);
   if (ret < 0)
     {
-      nlldbg("ERROR: up_emac_initialize(EMAC0) failed: %d\n", ret);
+      nllerr("ERROR: up_emac_initialize(EMAC0) failed: %d\n", ret);
     }
 #endif
 
@@ -109,7 +109,7 @@ void up_netinitialize(void)
   ret = sam_emac_initialize(EMAC1_INTF);
   if (ret < 0)
     {
-      nlldbg("ERROR: up_emac_initialize(EMAC1) failed: %d\n", ret);
+      nllerr("ERROR: up_emac_initialize(EMAC1) failed: %d\n", ret);
     }
 #endif
 #endif
diff --git a/arch/arm/src/samv7/sam_gpio.c b/arch/arm/src/samv7/sam_gpio.c
index 32547ff1a3..eeb716686e 100644
--- a/arch/arm/src/samv7/sam_gpio.c
+++ b/arch/arm/src/samv7/sam_gpio.c
@@ -578,38 +578,38 @@ int sam_dumpgpio(uint32_t pinset, const char *msg)
   /* The following requires exclusive access to the GPIO registers */
 
   flags = enter_critical_section();
-  lldbg("PIO%c pinset: %08x base: %08x -- %s\n",
+  llerr("PIO%c pinset: %08x base: %08x -- %s\n",
         g_portchar[port], pinset, base, msg);
-  lldbg("    PSR: %08x    OSR: %08x   IFSR: %08x   ODSR: %08x\n",
+  llerr("    PSR: %08x    OSR: %08x   IFSR: %08x   ODSR: %08x\n",
         getreg32(base + SAM_PIO_PSR_OFFSET), getreg32(base + SAM_PIO_OSR_OFFSET),
         getreg32(base + SAM_PIO_IFSR_OFFSET), getreg32(base + SAM_PIO_ODSR_OFFSET));
-  lldbg("   PDSR: %08x    IMR: %08x    ISR: %08x   MDSR: %08x\n",
+  llerr("   PDSR: %08x    IMR: %08x    ISR: %08x   MDSR: %08x\n",
         getreg32(base + SAM_PIO_PDSR_OFFSET), getreg32(base + SAM_PIO_IMR_OFFSET),
         getreg32(base + SAM_PIO_ISR_OFFSET), getreg32(base + SAM_PIO_MDSR_OFFSET));
-  lldbg(" ABCDSR: %08x %08x         IFSCSR: %08x  PPDSR: %08x\n",
+  llerr(" ABCDSR: %08x %08x         IFSCSR: %08x  PPDSR: %08x\n",
         getreg32(base + SAM_PIO_ABCDSR1_OFFSET), getreg32(base + SAM_PIO_ABCDSR2_OFFSET),
         getreg32(base + SAM_PIO_IFSCSR_OFFSET), getreg32(base + SAM_PIO_PPDSR_OFFSET));
-  lldbg("   PUSR: %08x   SCDR: %08x   OWSR: %08x  AIMMR: %08x\n",
+  llerr("   PUSR: %08x   SCDR: %08x   OWSR: %08x  AIMMR: %08x\n",
         getreg32(base + SAM_PIO_PUSR_OFFSET), getreg32(base + SAM_PIO_SCDR_OFFSET),
         getreg32(base + SAM_PIO_OWSR_OFFSET), getreg32(base + SAM_PIO_AIMMR_OFFSET));
-  lldbg("    ESR: %08x    LSR: %08x   ELSR: %08x FELLSR: %08x\n",
+  llerr("    ESR: %08x    LSR: %08x   ELSR: %08x FELLSR: %08x\n",
         getreg32(base + SAM_PIO_ESR_OFFSET), getreg32(base + SAM_PIO_LSR_OFFSET),
         getreg32(base + SAM_PIO_ELSR_OFFSET), getreg32(base + SAM_PIO_FELLSR_OFFSET));
-  lldbg(" FRLHSR: %08x LOCKSR: %08x   WPMR: %08x   WPSR: %08x\n",
+  llerr(" FRLHSR: %08x LOCKSR: %08x   WPMR: %08x   WPSR: %08x\n",
         getreg32(base + SAM_PIO_FRLHSR_OFFSET), getreg32(base + SAM_PIO_LOCKSR_OFFSET),
         getreg32(base + SAM_PIO_WPMR_OFFSET), getreg32(base + SAM_PIO_WPSR_OFFSET));
-  lldbg("   PCMR: %08x  PCIMR: %08x  PCISR: %08x   PCRHR: %08x\n",
+  llerr("   PCMR: %08x  PCIMR: %08x  PCISR: %08x   PCRHR: %08x\n",
         getreg32(base + SAM_PIO_PCMR_OFFSET), getreg32(base + SAM_PIO_PCIMR_OFFSET),
         getreg32(base + SAM_PIO_PCISR_OFFSET), getreg32(base + SAM_PIO_PCRHR_OFFSET));
-  lldbg("SCHMITT: %08x DRIVER:%08x\n",
+  llerr("SCHMITT: %08x DRIVER:%08x\n",
         getreg32(base + SAM_PIO_SCHMITT_OFFSET), getreg32(base + SAM_PIO_DRIVER_OFFSET));
-  lldbg("    KER: %08x   KRCR: %08x    KDR: %08x   KIMR: %08x\n",
+  llerr("    KER: %08x   KRCR: %08x    KDR: %08x   KIMR: %08x\n",
         getreg32(base + SAM_PIO_KER_OFFSET), getreg32(base + SAM_PIO_KRCR_OFFSET),
         getreg32(base + SAM_PIO_KDR_OFFSET), getreg32(base + SAM_PIO_KIMR_OFFSET));
-  lldbg("    KSR: %08x   KKPR: %08x    KKRR: %08x\n",
+  llerr("    KSR: %08x   KKPR: %08x    KKRR: %08x\n",
         getreg32(base + SAM_PIO_KSR_OFFSET), getreg32(base + SAM_PIO_KKPR_OFFSET),
         getreg32(base + SAM_PIO_KKRR_OFFSET));
-  lldbg("   PCMR: %08x  PCIMR: %08x  PCISR: %08x  PCRHR: %08x\n",
+  llerr("   PCMR: %08x  PCIMR: %08x  PCISR: %08x  PCRHR: %08x\n",
         getreg32(base + SAM_PIO_PCMR_OFFSET), getreg32(base + SAM_PIO_PCIMR_OFFSET),
         getreg32(base + SAM_PIO_PCISR_OFFSET), getreg32(base + SAM_PIO_PCRHR_OFFSET));
   leave_critical_section(flags);
diff --git a/arch/arm/src/samv7/sam_hsmci.c b/arch/arm/src/samv7/sam_hsmci.c
index 0bc9daf919..836af1f394 100644
--- a/arch/arm/src/samv7/sam_hsmci.c
+++ b/arch/arm/src/samv7/sam_hsmci.c
@@ -653,7 +653,7 @@ static bool sam_checkreg(struct sam_dev_s *priv, bool wr, uint32_t value,
         {
           /* Yes... show how many times we did it */
 
-          lldbg("...[Repeats %d times]...\n", priv->ntimes);
+          llerr("...[Repeats %d times]...\n", priv->ntimes);
         }
 
       /* Save information about the new access */
@@ -686,7 +686,7 @@ static inline uint32_t sam_getreg(struct sam_dev_s *priv, unsigned int offset)
 #ifdef CONFIG_SAMV7_HSMCI_REGDEBUG
   if (sam_checkreg(priv, false, value, address))
     {
-      lldbg("%08x->%08x\n", address, value);
+      llerr("%08x->%08x\n", address, value);
     }
 #endif
 
@@ -709,7 +709,7 @@ static inline void sam_putreg(struct sam_dev_s *priv, uint32_t value,
 #ifdef CONFIG_SAMV7_HSMCI_REGDEBUG
   if (sam_checkreg(priv, true, value, address))
     {
-      lldbg("%08x<-%08x\n", address, value);
+      llerr("%08x<-%08x\n", address, value);
     }
 #endif
 
@@ -1169,7 +1169,7 @@ static void sam_dmacallback(DMA_HANDLE handle, void *arg, int result)
       if (result < 0)
         {
           wkupevent = (result == -ETIMEDOUT ? SDIOWAIT_TIMEOUT : SDIOWAIT_ERROR);
-          flldbg("ERROR: DMA failed: result=%d wkupevent=%04x\n", result, wkupevent);
+          fllerr("ERROR: DMA failed: result=%d wkupevent=%04x\n", result, wkupevent);
 
           /* sam_endtransfer will terminate the transfer and wait up the waiting
            * client in this case.
@@ -1269,7 +1269,7 @@ static void sam_eventtimeout(int argc, uint32_t arg)
       /* Yes.. wake up any waiting threads */
 
       sam_endwait(priv, SDIOWAIT_TIMEOUT);
-      flldbg("ERROR: Timeout\n");
+      fllerr("ERROR: Timeout\n");
     }
 }
 
@@ -1469,7 +1469,7 @@ static int sam_hsmci_interrupt(struct sam_dev_s *priv)
             {
               /* Yes.. Was it some kind of timeout error? */
 
-              flldbg("ERROR: enabled: %08x pending: %08x\n", enabled, pending);
+              fllerr("ERROR: enabled: %08x pending: %08x\n", enabled, pending);
               if ((pending & HSMCI_DATA_TIMEOUT_ERRORS) != 0)
                 {
                   /* Yes.. Terminate with a timeout. */
diff --git a/arch/arm/src/samv7/sam_irq.c b/arch/arm/src/samv7/sam_irq.c
index 3f7c5eeabb..2c0a1a54c5 100644
--- a/arch/arm/src/samv7/sam_irq.c
+++ b/arch/arm/src/samv7/sam_irq.c
@@ -114,40 +114,40 @@ static void sam_dumpnvic(const char *msg, int irq)
   irqstate_t flags;
 
   flags = enter_critical_section();
-  lldbg("NVIC (%s, irq=%d):\n", msg, irq);
-  lldbg("  INTCTRL:    %08x VECTAB:  %08x\n",
+  llerr("NVIC (%s, irq=%d):\n", msg, irq);
+  llerr("  INTCTRL:    %08x VECTAB:  %08x\n",
         getreg32(NVIC_INTCTRL), getreg32(NVIC_VECTAB));
 #if 0
-  lldbg("  SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n",
+  llerr("  SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n",
         getreg32(NVIC_SYSHCON_MEMFAULTENA), getreg32(NVIC_SYSHCON_BUSFAULTENA),
         getreg32(NVIC_SYSHCON_USGFAULTENA), getreg32(NVIC_SYSTICK_CTRL_ENABLE));
 #endif
-  lldbg("  IRQ ENABLE: %08x %08x %08x\n",
+  llerr("  IRQ ENABLE: %08x %08x %08x\n",
         getreg32(NVIC_IRQ0_31_ENABLE), getreg32(NVIC_IRQ32_63_ENABLE),
         getreg32(NVIC_IRQ64_95_ENABLE));
-  lldbg("  SYSH_PRIO:  %08x %08x %08x\n",
+  llerr("  SYSH_PRIO:  %08x %08x %08x\n",
         getreg32(NVIC_SYSH4_7_PRIORITY), getreg32(NVIC_SYSH8_11_PRIORITY),
         getreg32(NVIC_SYSH12_15_PRIORITY));
-  lldbg("  IRQ PRIO:   %08x %08x %08x %08x\n",
+  llerr("  IRQ PRIO:   %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ0_3_PRIORITY), getreg32(NVIC_IRQ4_7_PRIORITY),
         getreg32(NVIC_IRQ8_11_PRIORITY), getreg32(NVIC_IRQ12_15_PRIORITY));
 #if SAM_IRQ_NEXTINT > 15
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ16_19_PRIORITY), getreg32(NVIC_IRQ20_23_PRIORITY),
         getreg32(NVIC_IRQ24_27_PRIORITY), getreg32(NVIC_IRQ28_31_PRIORITY));
 #endif
 #if SAM_IRQ_NEXTINT > 31
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ32_35_PRIORITY), getreg32(NVIC_IRQ36_39_PRIORITY),
         getreg32(NVIC_IRQ40_43_PRIORITY), getreg32(NVIC_IRQ44_47_PRIORITY));
 #endif
 #if SAM_IRQ_NEXTINT > 47
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ48_51_PRIORITY), getreg32(NVIC_IRQ52_55_PRIORITY),
         getreg32(NVIC_IRQ56_59_PRIORITY), getreg32(NVIC_IRQ60_63_PRIORITY));
 #endif
 #if SAM_IRQ_NEXTINT > 63
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ64_67_PRIORITY), getreg32(NVIC_IRQ68_71_PRIORITY),
         getreg32(NVIC_IRQ72_75_PRIORITY), getreg32(NVIC_IRQ76_79_PRIORITY));
 #endif
diff --git a/arch/arm/src/samv7/sam_mcan.c b/arch/arm/src/samv7/sam_mcan.c
index 6e31dcac6d..fe2dfb2c41 100644
--- a/arch/arm/src/samv7/sam_mcan.c
+++ b/arch/arm/src/samv7/sam_mcan.c
@@ -796,11 +796,11 @@
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
 #  define caninfo   info
-#  define canlldbg  lldbg
+#  define canllerr  llerr
 #  define canllinfo llinfo
 
 #  ifdef CONFIG_SAMV7_MCAN_REGDEBUG
-#    define canregdbg lldbg
+#    define canregdbg llerr
 #  else
 #    define canregdbg(x...)
 #  endif
@@ -808,7 +808,7 @@
 #else
 #  define candbg(x...)
 #  define caninfo(x...)
-#  define canlldbg(x...)
+#  define canllerr(x...)
 #  define canllinfo(x...)
 #  define canregdbg(x...)
 #endif
@@ -1209,7 +1209,7 @@ static uint32_t mcan_getreg(FAR struct sam_mcan_s *priv, int offset)
         {
           if (priv->count == 4)
             {
-              lldbg("...\n");
+              llerr("...\n");
             }
 
           return regval;
@@ -1226,7 +1226,7 @@ static uint32_t mcan_getreg(FAR struct sam_mcan_s *priv, int offset)
         {
           /* Yes.. then show how many times the value repeated */
 
-          lldbg("[repeats %d more times]\n", priv->count - 3);
+          llerr("[repeats %d more times]\n", priv->count - 3);
         }
 
       /* Save the new address, value, and count */
@@ -1238,7 +1238,7 @@ static uint32_t mcan_getreg(FAR struct sam_mcan_s *priv, int offset)
 
   /* Show the register value read */
 
-  lldbg("%08x->%08x\n", regaddr, regval);
+  llerr("%08x->%08x\n", regaddr, regval);
   return regval;
 }
 
@@ -1275,7 +1275,7 @@ static void mcan_putreg(FAR struct sam_mcan_s *priv, int offset, uint32_t regval
 
   /* Show the register value being written */
 
-  lldbg("%08x<-%08x\n", regaddr, regval);
+  llerr("%08x<-%08x\n", regaddr, regval);
 
   /* Write the value */
 
@@ -1310,70 +1310,70 @@ static void mcan_dumpregs(FAR struct sam_mcan_s *priv, FAR const char *msg)
 {
   FAR const struct sam_config_s *config = priv->config;
 
-  lldbg("MCAN%d Registers: %s\n", config->port, msg);
-  lldbg("   Base: %08x\n", config->base);
+  llerr("MCAN%d Registers: %s\n", config->port, msg);
+  llerr("   Base: %08x\n", config->base);
 
-  lldbg("   CUST: %08x  FBTP: %08x TEST: %08x    RWD: %08x\n",
+  llerr("   CUST: %08x  FBTP: %08x TEST: %08x    RWD: %08x\n",
         getreg32(config->base + SAM_MCAN_CUST_OFFSET),
         getreg32(config->base + SAM_MCAN_FBTP_OFFSET),
         getreg32(config->base + SAM_MCAN_TEST_OFFSET),
         getreg32(config->base + SAM_MCAN_RWD_OFFSET));
 
-  lldbg("  CCCR: %08x   BTP: %08x  TSCC: %08x   TSCV: %08x\n",
+  llerr("  CCCR: %08x   BTP: %08x  TSCC: %08x   TSCV: %08x\n",
         getreg32(config->base + SAM_MCAN_CCCR_OFFSET),
         getreg32(config->base + SAM_MCAN_BTP_OFFSET),
         getreg32(config->base + SAM_MCAN_TSCC_OFFSET),
         getreg32(config->base + SAM_MCAN_TSCV_OFFSET));
 
-  lldbg("  TOCC: %08x  TOCV: %08x   ECR: %08x    PSR: %08x\n",
+  llerr("  TOCC: %08x  TOCV: %08x   ECR: %08x    PSR: %08x\n",
         getreg32(config->base + SAM_MCAN_TOCC_OFFSET),
         getreg32(config->base + SAM_MCAN_TOCV_OFFSET),
         getreg32(config->base + SAM_MCAN_ECR_OFFSET),
         getreg32(config->base + SAM_MCAN_PSR_OFFSET));
 
-  lldbg("    IR: %08x    IE: %08x   ILS: %08x    ILE: %08x\n",
+  llerr("    IR: %08x    IE: %08x   ILS: %08x    ILE: %08x\n",
         getreg32(config->base + SAM_MCAN_IR_OFFSET),
         getreg32(config->base + SAM_MCAN_IE_OFFSET),
         getreg32(config->base + SAM_MCAN_ILS_OFFSET),
         getreg32(config->base + SAM_MCAN_ILE_OFFSET));
 
-  lldbg("   GFC: %08x SIDFC: %08x XIDFC: %08x  XIDAM: %08x\n",
+  llerr("   GFC: %08x SIDFC: %08x XIDFC: %08x  XIDAM: %08x\n",
         getreg32(config->base + SAM_MCAN_GFC_OFFSET),
         getreg32(config->base + SAM_MCAN_SIDFC_OFFSET),
         getreg32(config->base + SAM_MCAN_XIDFC_OFFSET),
         getreg32(config->base + SAM_MCAN_XIDAM_OFFSET));
 
-  lldbg("  HPMS: %08x NDAT1: %08x NDAT2: %08x  RXF0C: %08x\n",
+  llerr("  HPMS: %08x NDAT1: %08x NDAT2: %08x  RXF0C: %08x\n",
         getreg32(config->base + SAM_MCAN_HPMS_OFFSET),
         getreg32(config->base + SAM_MCAN_NDAT1_OFFSET),
         getreg32(config->base + SAM_MCAN_NDAT2_OFFSET),
         getreg32(config->base + SAM_MCAN_RXF0C_OFFSET));
 
-  lldbg(" RXF0S: %08x FXF0A: %08x  RXBC: %08x  RXF1C: %08x\n",
+  llerr(" RXF0S: %08x FXF0A: %08x  RXBC: %08x  RXF1C: %08x\n",
         getreg32(config->base + SAM_MCAN_RXF0S_OFFSET),
         getreg32(config->base + SAM_MCAN_RXF0A_OFFSET),
         getreg32(config->base + SAM_MCAN_RXBC_OFFSET),
         getreg32(config->base + SAM_MCAN_RXF1C_OFFSET));
 
-  lldbg(" RXF1S: %08x FXF1A: %08x RXESC: %08x   TXBC: %08x\n",
+  llerr(" RXF1S: %08x FXF1A: %08x RXESC: %08x   TXBC: %08x\n",
         getreg32(config->base + SAM_MCAN_RXF1S_OFFSET),
         getreg32(config->base + SAM_MCAN_RXF1A_OFFSET),
         getreg32(config->base + SAM_MCAN_RXESC_OFFSET),
         getreg32(config->base + SAM_MCAN_TXBC_OFFSET));
 
-  lldbg(" TXFQS: %08x TXESC: %08x TXBRP: %08x  TXBAR: %08x\n",
+  llerr(" TXFQS: %08x TXESC: %08x TXBRP: %08x  TXBAR: %08x\n",
         getreg32(config->base + SAM_MCAN_TXFQS_OFFSET),
         getreg32(config->base + SAM_MCAN_TXESC_OFFSET),
         getreg32(config->base + SAM_MCAN_TXBRP_OFFSET),
         getreg32(config->base + SAM_MCAN_TXBAR_OFFSET));
 
-  lldbg(" TXBCR: %08x TXBTO: %08x TXBCF: %08x TXBTIE: %08x\n",
+  llerr(" TXBCR: %08x TXBTO: %08x TXBCF: %08x TXBTIE: %08x\n",
         getreg32(config->base + SAM_MCAN_TXBCR_OFFSET),
         getreg32(config->base + SAM_MCAN_TXBTO_OFFSET),
         getreg32(config->base + SAM_MCAN_TXBCF_OFFSET),
         getreg32(config->base + SAM_MCAN_TXBTIE_OFFSET));
 
-  lldbg("TXBCIE: %08x TXEFC: %08x TXEFS: %08x  TXEFA: %08x\n",
+  llerr("TXBCIE: %08x TXEFC: %08x TXEFS: %08x  TXEFA: %08x\n",
         getreg32(config->base + SAM_MCAN_TXBCIE_OFFSET),
         getreg32(config->base + SAM_MCAN_TXEFC_OFFSET),
         getreg32(config->base + SAM_MCAN_TXEFS_OFFSET),
@@ -2219,7 +2219,7 @@ static int mcan_setup(FAR struct can_dev_s *dev)
   ret = mcan_hw_initialize(priv);
   if (ret < 0)
     {
-      canlldbg("MCAN%d H/W initialization failed: %d\n", config->port, ret);
+      canllerr("MCAN%d H/W initialization failed: %d\n", config->port, ret);
       return ret;
     }
 
@@ -2230,7 +2230,7 @@ static int mcan_setup(FAR struct can_dev_s *dev)
   ret = irq_attach(config->irq0, config->handler);
   if (ret < 0)
     {
-      canlldbg("Failed to attach MCAN%d line 0 IRQ (%d)",
+      canllerr("Failed to attach MCAN%d line 0 IRQ (%d)",
       config->port, config->irq0);
       return ret;
     }
@@ -2238,7 +2238,7 @@ static int mcan_setup(FAR struct can_dev_s *dev)
   ret = irq_attach(config->irq1, config->handler);
   if (ret < 0)
     {
-      canlldbg("Failed to attach MCAN%d line 1 IRQ (%d)",
+      canllerr("Failed to attach MCAN%d line 1 IRQ (%d)",
       config->port, config->irq1);
       return ret;
     }
@@ -3155,7 +3155,7 @@ static void mcan_error(FAR struct can_dev_s *dev, uint32_t status,
       ret = can_receive(dev, &hdr, data);
       if (ret < 0)
         {
-          canlldbg("ERROR: can_receive failed: %d\n", ret);
+          canllerr("ERROR: can_receive failed: %d\n", ret);
         }
     }
 }
@@ -3249,7 +3249,7 @@ static void mcan_receive(FAR struct can_dev_s *dev, FAR uint32_t *rxbuffer,
   ret = can_receive(dev, &hdr, (FAR uint8_t *)rxbuffer);
   if (ret < 0)
     {
-      canlldbg("ERROR: can_receive failed: %d\n", ret);
+      canllerr("ERROR: can_receive failed: %d\n", ret);
     }
 }
 
@@ -3302,7 +3302,7 @@ static void mcan_interrupt(FAR struct can_dev_s *dev)
 
           if ((pending & MCAN_CMNERR_INTS) != 0)
             {
-              canlldbg("ERROR: Common %08x\n", pending & MCAN_CMNERR_INTS);
+              canllerr("ERROR: Common %08x\n", pending & MCAN_CMNERR_INTS);
 
               /* Clear the error indications */
 
@@ -3313,7 +3313,7 @@ static void mcan_interrupt(FAR struct can_dev_s *dev)
 
           if ((pending & MCAN_TXERR_INTS) != 0)
             {
-              canlldbg("ERROR: TX %08x\n", pending & MCAN_TXERR_INTS);
+              canllerr("ERROR: TX %08x\n", pending & MCAN_TXERR_INTS);
 
               /* Clear the error indications */
 
@@ -3334,7 +3334,7 @@ static void mcan_interrupt(FAR struct can_dev_s *dev)
 
           if ((pending & MCAN_RXERR_INTS) != 0)
             {
-              canlldbg("ERROR: RX %08x\n", pending & MCAN_RXERR_INTS);
+              canllerr("ERROR: RX %08x\n", pending & MCAN_RXERR_INTS);
 
               /* Clear the error indications */
 
@@ -3355,7 +3355,7 @@ static void mcan_interrupt(FAR struct can_dev_s *dev)
         {
           /* All (old) errors cleared  */
 
-          canlldbg("ERROR: CLEARED\n");
+          canllerr("ERROR: CLEARED\n");
 
           mcan_error(dev, 0, priv->olderrors);
 
@@ -3480,7 +3480,7 @@ static void mcan_interrupt(FAR struct can_dev_s *dev)
 
           if ((regval & MCAN_RXF0S_RF0L) != 0)
             {
-              canlldbg("ERROR: Message lost: %08x\n", regval);
+              canllerr("ERROR: Message lost: %08x\n", regval);
             }
           else
             {
@@ -3514,7 +3514,7 @@ static void mcan_interrupt(FAR struct can_dev_s *dev)
 
           if ((regval & MCAN_RXF0S_RF0L) != 0)
             {
-              canlldbg("ERROR: Message lost: %08x\n", regval);
+              canllerr("ERROR: Message lost: %08x\n", regval);
             }
           else
             {
diff --git a/arch/arm/src/samv7/sam_qspi.c b/arch/arm/src/samv7/sam_qspi.c
index cee4d5110f..6a19f5e83d 100644
--- a/arch/arm/src/samv7/sam_qspi.c
+++ b/arch/arm/src/samv7/sam_qspi.c
@@ -154,9 +154,9 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define qspidbg lldbg
+#  define qspidbg llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define qspiinfo lldbg
+#    define qspiinfo llerr
 #  else
 #    define qspiinfo(x...)
 #  endif
@@ -395,7 +395,7 @@ static bool qspi_checkreg(struct sam_qspidev_s *priv, bool wr, uint32_t value,
         {
           /* Yes... show how many times we did it */
 
-          lldbg("...[Repeats %d times]...\n", priv->ntimes);
+          llerr("...[Repeats %d times]...\n", priv->ntimes);
         }
 
       /* Save information about the new access */
@@ -429,7 +429,7 @@ static inline uint32_t qspi_getreg(struct sam_qspidev_s *priv,
 #ifdef CONFIG_SAMV7_QSPI_REGDEBUG
   if (qspi_checkreg(priv, false, value, address))
     {
-      lldbg("%08x->%08x\n", address, value);
+      llerr("%08x->%08x\n", address, value);
     }
 #endif
 
@@ -452,7 +452,7 @@ static inline void qspi_putreg(struct sam_qspidev_s *priv, uint32_t value,
 #ifdef CONFIG_SAMV7_QSPI_REGDEBUG
   if (qspi_checkreg(priv, true, value, address))
     {
-      lldbg("%08x<-%08x\n", address, value);
+      llerr("%08x<-%08x\n", address, value);
     }
 #endif
 
diff --git a/arch/arm/src/samv7/sam_rswdt.c b/arch/arm/src/samv7/sam_rswdt.c
index b188c3dfd6..c241027a19 100644
--- a/arch/arm/src/samv7/sam_rswdt.c
+++ b/arch/arm/src/samv7/sam_rswdt.c
@@ -82,12 +82,12 @@
 
 /* Debug ********************************************************************/
 /* Non-standard debug that may be enabled just for testing the watchdog
- * driver.  NOTE: that only lldbg types are used so that the output is
+ * driver.  NOTE: that only llerr types are used so that the output is
  * immediately available.
  */
 
 #ifdef CONFIG_DEBUG_WATCHDOG
-#  define wddbg    lldbg
+#  define wddbg    llerr
 #  define wdinfo   llinfo
 #else
 #  define wddbg(x...)
@@ -199,7 +199,7 @@ static uint32_t sam_getreg(uintptr_t regaddr)
         {
           if (count == 4)
             {
-              lldbg("...\n");
+              llerr("...\n");
             }
 
           return regval;
@@ -216,7 +216,7 @@ static uint32_t sam_getreg(uintptr_t regaddr)
         {
           /* Yes.. then show how many times the value repeated */
 
-          lldbg("[repeats %d more times]\n", count-3);
+          llerr("[repeats %d more times]\n", count-3);
         }
 
       /* Save the new address, value, and count */
@@ -228,7 +228,7 @@ static uint32_t sam_getreg(uintptr_t regaddr)
 
   /* Show the register value read */
 
-  lldbg("%08x->%048\n", regaddr, regval);
+  llerr("%08x->%048\n", regaddr, regval);
   return regval;
 }
 #endif
@@ -246,7 +246,7 @@ static void sam_putreg(uint32_t regval, uintptr_t regaddr)
 {
   /* Show the register value being written */
 
-  lldbg("%08x<-%08x\n", regaddr, regval);
+  llerr("%08x<-%08x\n", regaddr, regval);
 
   /* Write the value */
 
diff --git a/arch/arm/src/samv7/sam_spi.c b/arch/arm/src/samv7/sam_spi.c
index 3c264eb4e6..68d997440d 100644
--- a/arch/arm/src/samv7/sam_spi.c
+++ b/arch/arm/src/samv7/sam_spi.c
@@ -136,9 +136,9 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg lldbg
+#  define spidbg llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
@@ -436,7 +436,7 @@ static bool spi_checkreg(struct sam_spidev_s *spi, bool wr, uint32_t value,
         {
           /* Yes... show how many times we did it */
 
-          lldbg("...[Repeats %d times]...\n", spi->ntimes);
+          llerr("...[Repeats %d times]...\n", spi->ntimes);
         }
 
       /* Save information about the new access */
@@ -470,7 +470,7 @@ static inline uint32_t spi_getreg(struct sam_spidev_s *spi,
 #ifdef CONFIG_SAMV7_SPI_REGDEBUG
   if (spi_checkreg(spi, false, value, address))
     {
-      lldbg("%08x->%08x\n", address, value);
+      llerr("%08x->%08x\n", address, value);
     }
 #endif
 
@@ -493,7 +493,7 @@ static inline void spi_putreg(struct sam_spidev_s *spi, uint32_t value,
 #ifdef CONFIG_SAMV7_SPI_REGDEBUG
   if (spi_checkreg(spi, true, value, address))
     {
-      lldbg("%08x<-%08x\n", address, value);
+      llerr("%08x<-%08x\n", address, value);
     }
 #endif
 
diff --git a/arch/arm/src/samv7/sam_spi_slave.c b/arch/arm/src/samv7/sam_spi_slave.c
index 4b1ee3bb60..5d8d4987e6 100644
--- a/arch/arm/src/samv7/sam_spi_slave.c
+++ b/arch/arm/src/samv7/sam_spi_slave.c
@@ -85,9 +85,9 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg lldbg
+#  define spidbg llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
@@ -270,7 +270,7 @@ static bool spi_checkreg(struct sam_spidev_s *priv, bool wr, uint32_t value,
         {
           /* Yes... show how many times we did it */
 
-          lldbg("...[Repeats %d times]...\n", priv->ntimes);
+          llerr("...[Repeats %d times]...\n", priv->ntimes);
         }
 
       /* Save information about the new access */
@@ -303,7 +303,7 @@ static uint32_t spi_getreg(struct sam_spidev_s *priv, unsigned int offset)
 #ifdef CONFIG_SAMV7_SPI_REGDEBUG
   if (spi_checkreg(priv, false, value, address))
     {
-      lldbg("%08x->%08x\n", address, value);
+      llerr("%08x->%08x\n", address, value);
     }
 #endif
 
@@ -326,7 +326,7 @@ static void spi_putreg(struct sam_spidev_s *priv, uint32_t value,
 #ifdef CONFIG_SAMV7_SPI_REGDEBUG
   if (spi_checkreg(priv, true, value, address))
     {
-      lldbg("%08x<-%08x\n", address, value);
+      llerr("%08x<-%08x\n", address, value);
     }
 #endif
 
diff --git a/arch/arm/src/samv7/sam_ssc.c b/arch/arm/src/samv7/sam_ssc.c
index 7c1b45a557..bc3d7644e4 100644
--- a/arch/arm/src/samv7/sam_ssc.c
+++ b/arch/arm/src/samv7/sam_ssc.c
@@ -388,16 +388,16 @@
 
 #ifdef CONFIG_DEBUG_I2S
 #  define i2sdbg         dbg
-#  define i2slldbg       lldbg
+#  define i2sllerr       llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define i2sinfo      dbg
-#    define i2sllinfo    lldbg
+#    define i2sllinfo    llerr
 #  else
 #    define i2sinfo(x...)
 #  endif
 #else
 #  define i2sdbg(x...)
-#  define i2slldbg(x...)
+#  define i2sllerr(x...)
 #  define i2sinfo(x...)
 #  define i2sllinfo(x...)
 #endif
@@ -697,7 +697,7 @@ static bool ssc_checkreg(struct sam_ssc_s *priv, bool wr, uint32_t regval,
         {
           /* Yes... show how many times we did it */
 
-          lldbg("...[Repeats %d times]...\n", priv->count);
+          llerr("...[Repeats %d times]...\n", priv->count);
         }
 
       /* Save information about the new access */
@@ -731,7 +731,7 @@ static inline uint32_t ssc_getreg(struct sam_ssc_s *priv,
 #ifdef CONFIG_SAMV7_SSC_REGDEBUG
   if (ssc_checkreg(priv, false, regval, regaddr))
     {
-      lldbg("%08x->%08x\n", regaddr, regval);
+      llerr("%08x->%08x\n", regaddr, regval);
     }
 #endif
 
@@ -754,7 +754,7 @@ static inline void ssc_putreg(struct sam_ssc_s *priv, unsigned int offset,
 #ifdef CONFIG_SAMV7_SSC_REGDEBUG
   if (ssc_checkreg(priv, true, regval, regaddr))
     {
-      lldbg("%08x<-%08x\n", regaddr, regval);
+      llerr("%08x<-%08x\n", regaddr, regval);
     }
 #endif
 
@@ -1083,7 +1083,7 @@ static void ssc_dma_sampleinit(struct sam_ssc_s *priv,
 #if defined(CONFIG_SAMV7_SSC_DMADEBUG) && defined(SSC_HAVE_RX)
 static void ssc_rxdma_sampledone(struct sam_ssc_s *priv, int result)
 {
-  lldbg("result: %d\n", result);
+  llerr("result: %d\n", result);
 
   /* Sample the final registers */
 
@@ -1148,7 +1148,7 @@ static void ssc_rxdma_sampledone(struct sam_ssc_s *priv, int result)
 #if defined(CONFIG_SAMV7_SSC_DMADEBUG) && defined(SSC_HAVE_TX)
 static void ssc_txdma_sampledone(struct sam_ssc_s *priv, int result)
 {
-  lldbg("result: %d\n", result);
+  llerr("result: %d\n", result);
 
   /* Sample the final registers */
 
@@ -1371,7 +1371,7 @@ static int ssc_rxdma_setup(struct sam_ssc_s *priv)
 
       if (ret < 0)
         {
-          i2slldbg("ERROR: wd_start failed: %d\n", errno);
+          i2sllerr("ERROR: wd_start failed: %d\n", errno);
         }
     }
 
@@ -1559,7 +1559,7 @@ static void ssc_rx_schedule(struct sam_ssc_s *priv, int result)
       ret = work_queue(HPWORK, &priv->rx.work, ssc_rx_worker, priv, 0);
       if (ret != 0)
         {
-          i2slldbg("ERROR: Failed to queue RX work: %d\n", ret);
+          i2sllerr("ERROR: Failed to queue RX work: %d\n", ret);
         }
     }
 }
@@ -1788,7 +1788,7 @@ static int ssc_txdma_setup(struct sam_ssc_s *priv)
 
       if (ret < 0)
         {
-          i2slldbg("ERROR: wd_start failed: %d\n", errno);
+          i2sllerr("ERROR: wd_start failed: %d\n", errno);
         }
     }
 
@@ -1963,7 +1963,7 @@ static void ssc_tx_schedule(struct sam_ssc_s *priv, int result)
       ret = work_queue(HPWORK, &priv->tx.work, ssc_tx_worker, priv, 0);
       if (ret != 0)
         {
-          i2slldbg("ERROR: Failed to queue TX work: %d\n", ret);
+          i2sllerr("ERROR: Failed to queue TX work: %d\n", ret);
         }
     }
 }
diff --git a/arch/arm/src/samv7/sam_tc.c b/arch/arm/src/samv7/sam_tc.c
index d50ea984d2..30ac1a8fb6 100644
--- a/arch/arm/src/samv7/sam_tc.c
+++ b/arch/arm/src/samv7/sam_tc.c
@@ -643,17 +643,17 @@ static void sam_regdump(struct sam_chan_s *chan, const char *msg)
   uintptr_t base;
 
   base = tc->base;
-  lldbg("TC%d [%08x]: %s\n", tc->tc, (int)base, msg);
-  lldbg("  BMR: %08x QIMR: %08x QISR: %08x WPMR: %08x\n",
+  llerr("TC%d [%08x]: %s\n", tc->tc, (int)base, msg);
+  llerr("  BMR: %08x QIMR: %08x QISR: %08x WPMR: %08x\n",
         getreg32(base+SAM_TC_BMR_OFFSET), getreg32(base+SAM_TC_QIMR_OFFSET),
         getreg32(base+SAM_TC_QISR_OFFSET), getreg32(base+SAM_TC_WPMR_OFFSET));
 
   base = chan->base;
-  lldbg("TC%d Channel %d [%08x]: %s\n", tc->tc, chan->chan, (int)base, msg);
-  lldbg("  CMR: %08x SSMR: %08x  RAB: %08x   CV: %08x\n",
+  llerr("TC%d Channel %d [%08x]: %s\n", tc->tc, chan->chan, (int)base, msg);
+  llerr("  CMR: %08x SSMR: %08x  RAB: %08x   CV: %08x\n",
         getreg32(base+SAM_TC_CMR_OFFSET), getreg32(base+SAM_TC_SMMR_OFFSET),
         getreg32(base+SAM_TC_RAB_OFFSET), getreg32(base+SAM_TC_CV_OFFSET));
-  lldbg("   RA: %08x   RB: %08x   RC: %08x  IMR: %08x\n",
+  llerr("   RA: %08x   RB: %08x   RC: %08x  IMR: %08x\n",
         getreg32(base+SAM_TC_RA_OFFSET), getreg32(base+SAM_TC_RB_OFFSET),
         getreg32(base+SAM_TC_RC_OFFSET), getreg32(base+SAM_TC_IMR_OFFSET));
 }
@@ -698,7 +698,7 @@ static bool sam_checkreg(struct sam_tc_s *tc, bool wr, uint32_t regaddr,
         {
           /* Yes... show how many times we did it */
 
-          lldbg("...[Repeats %d times]...\n", tc->ntimes);
+          llerr("...[Repeats %d times]...\n", tc->ntimes);
         }
 
       /* Save information about the new access */
@@ -733,7 +733,7 @@ static inline uint32_t sam_tc_getreg(struct sam_chan_s *chan,
 #ifdef CONFIG_SAMV7_TC_REGDEBUG
   if (sam_checkreg(tc, false, regaddr, regval))
     {
-      lldbg("%08x->%08x\n", regaddr, regval);
+      llerr("%08x->%08x\n", regaddr, regval);
     }
 #endif
 
@@ -757,7 +757,7 @@ static inline void sam_tc_putreg(struct sam_chan_s *chan, uint32_t regval,
 #ifdef CONFIG_SAMV7_TC_REGDEBUG
   if (sam_checkreg(tc, true, regaddr, regval))
     {
-      lldbg("%08x<-%08x\n", regaddr, regval);
+      llerr("%08x<-%08x\n", regaddr, regval);
     }
 #endif
 
@@ -781,7 +781,7 @@ static inline uint32_t sam_chan_getreg(struct sam_chan_s *chan,
 #ifdef CONFIG_SAMV7_TC_REGDEBUG
   if (sam_checkreg(chan->tc, false, regaddr, regval))
     {
-      lldbg("%08x->%08x\n", regaddr, regval);
+      llerr("%08x->%08x\n", regaddr, regval);
     }
 #endif
 
@@ -804,7 +804,7 @@ static inline void sam_chan_putreg(struct sam_chan_s *chan, unsigned int offset,
 #ifdef CONFIG_SAMV7_TC_REGDEBUG
   if (sam_checkreg(chan->tc, true, regaddr, regval))
     {
-      lldbg("%08x<-%08x\n", regaddr, regval);
+      llerr("%08x<-%08x\n", regaddr, regval);
     }
 #endif
 
diff --git a/arch/arm/src/samv7/sam_tc.h b/arch/arm/src/samv7/sam_tc.h
index 9efd00d607..bf6f279703 100644
--- a/arch/arm/src/samv7/sam_tc.h
+++ b/arch/arm/src/samv7/sam_tc.h
@@ -89,12 +89,12 @@
 #ifdef CONFIG_SAMV7_TC_DEBUG
 #  define tcdbg    dbg
 #  define tcinfo   info
-#  define tclldbg  lldbg
+#  define tcllerr  llerr
 #  define tcllinfo llinfo
 #else
 #  define tcdbg(x...)
 #  define tcinfo(x...)
-#  define tclldbg(x...)
+#  define tcllerr(x...)
 #  define tcllinfo(x...)
 #endif
 
diff --git a/arch/arm/src/samv7/sam_tickless.c b/arch/arm/src/samv7/sam_tickless.c
index 899d464609..6b610642ea 100644
--- a/arch/arm/src/samv7/sam_tickless.c
+++ b/arch/arm/src/samv7/sam_tickless.c
@@ -265,7 +265,7 @@ void up_timer_initialize(void)
                                CONFIG_USEC_PER_TICK);
   if (ret < 0)
     {
-      tclldbg("ERROR: sam_oneshot_initialize failed\n");
+      tcllerr("ERROR: sam_oneshot_initialize failed\n");
       PANIC();
     }
 
@@ -278,7 +278,7 @@ void up_timer_initialize(void)
                                CONFIG_USEC_PER_TICK);
   if (ret < 0)
     {
-      tclldbg("ERROR: sam_freerun_initialize failed\n");
+      tcllerr("ERROR: sam_freerun_initialize failed\n");
       PANIC();
     }
 
diff --git a/arch/arm/src/samv7/sam_twihs.c b/arch/arm/src/samv7/sam_twihs.c
index 87123462aa..9319b2b65f 100644
--- a/arch/arm/src/samv7/sam_twihs.c
+++ b/arch/arm/src/samv7/sam_twihs.c
@@ -126,12 +126,12 @@
 #ifdef CONFIG_DEBUG_I2C
 #  define i2cdbg    dbg
 #  define i2cinfo   info
-#  define i2clldbg  lldbg
+#  define i2cllerr  llerr
 #  define i2cllinfo llinfo
 #else
 #  define i2cdbg(x...)
 #  define i2cinfo(x...)
-#  define i2clldbg(x...)
+#  define i2cllerr(x...)
 #  define i2cllinfo(x...)
 #endif
 
@@ -364,7 +364,7 @@ static bool twi_checkreg(struct twi_dev_s *priv, bool wr, uint32_t value,
         {
           /* Yes... show how many times we did it */
 
-          lldbg("...[Repeats %d times]...\n", priv->ntimes);
+          llerr("...[Repeats %d times]...\n", priv->ntimes);
         }
 
       /* Save information about the new access */
@@ -396,7 +396,7 @@ static uint32_t twi_getabs(struct twi_dev_s *priv, uintptr_t address)
 
   if (twi_checkreg(priv, false, value, address))
     {
-      lldbg("%08x->%08x\n", address, value);
+      llerr("%08x->%08x\n", address, value);
     }
 
   return value;
@@ -417,7 +417,7 @@ static void twi_putabs(struct twi_dev_s *priv, uintptr_t address,
 {
   if (twi_checkreg(priv, true, value, address))
     {
-      lldbg("%08x<-%08x\n", address, value);
+      llerr("%08x<-%08x\n", address, value);
     }
 
   putreg32(value, address);
@@ -627,7 +627,7 @@ static int twi_interrupt(struct twi_dev_s *priv)
     {
       /* Wake up the thread with an I/O error indication */
 
-      i2clldbg("ERROR: TWIHS%d pending: %08x\n", priv->attr->twi, pending);
+      i2cllerr("ERROR: TWIHS%d pending: %08x\n", priv->attr->twi, pending);
       twi_wakeup(priv, -EIO);
     }
 
@@ -750,7 +750,7 @@ static void twi_timeout(int argc, uint32_t arg, ...)
 {
   struct twi_dev_s *priv = (struct twi_dev_s *)arg;
 
-  i2clldbg("ERROR: TWIHS%d Timeout!\n", priv->attr->twi);
+  i2cllerr("ERROR: TWIHS%d Timeout!\n", priv->attr->twi);
   twi_wakeup(priv, -ETIMEDOUT);
 }
 
diff --git a/arch/arm/src/samv7/sam_usbdevhs.c b/arch/arm/src/samv7/sam_usbdevhs.c
index a2f0774079..cb58f3bff1 100644
--- a/arch/arm/src/samv7/sam_usbdevhs.c
+++ b/arch/arm/src/samv7/sam_usbdevhs.c
@@ -743,7 +743,7 @@ const struct trace_msg_t g_usb_trace_strings_intdecode[] =
 #ifdef CONFIG_SAMV7_USBHS_REGDEBUG
 static void sam_printreg(uintptr_t regaddr, uint32_t regval, bool iswrite)
 {
-  lldbg("%p%s%08x\n", regaddr, iswrite ? "<-" : "->", regval);
+  llerr("%p%s%08x\n", regaddr, iswrite ? "<-" : "->", regval);
 }
 #endif
 
@@ -794,7 +794,7 @@ static void sam_checkreg(uintptr_t regaddr, uint32_t regval, bool iswrite)
             {
               /* No.. More than one. */
 
-              lldbg("[repeats %d more times]\n", count);
+              llerr("[repeats %d more times]\n", count);
             }
         }
 
@@ -874,31 +874,31 @@ static void sam_dumpep(struct sam_usbdev_s *priv, int epno)
 {
   /* Global Registers */
 
-  lldbg("Global Register:\n");
-  lldbg("  CTRL:    %08x\n", sam_getreg(SAM_USBHS_DEVCTRL));
-  lldbg("  ISR:     %08x\n", sam_getreg(SAM_USBHS_DEVISR));
-  lldbg("  IMR:     %08x\n", sam_getreg(SAM_USBHS_DEVIMR));
-  lldbg("  EPT:     %08x\n", sam_getreg(SAM_USBHS_DEVEPT));
-  lldbg("  FNUM:    %08x\n", sam_getreg(SAM_USBHS_DEVFNUM));
+  llerr("Global Register:\n");
+  llerr("  CTRL:    %08x\n", sam_getreg(SAM_USBHS_DEVCTRL));
+  llerr("  ISR:     %08x\n", sam_getreg(SAM_USBHS_DEVISR));
+  llerr("  IMR:     %08x\n", sam_getreg(SAM_USBHS_DEVIMR));
+  llerr("  EPT:     %08x\n", sam_getreg(SAM_USBHS_DEVEPT));
+  llerr("  FNUM:    %08x\n", sam_getreg(SAM_USBHS_DEVFNUM));
 
   /* Endpoint registers */
 
-  lldbg("Endpoint %d Register:\n", epno);
-  lldbg("  CFG:     %08x\n", sam_getreg(SAM_USBHS_DEVEPTCFG(epno)));
-  lldbg("  ISR:     %08x\n", sam_getreg(SAM_USBHS_DEVEPTISR(epno)));
-  lldbg("  IMR:     %08x\n", sam_getreg(SAM_USBHS_DEVEPTIMR(epno)));
+  llerr("Endpoint %d Register:\n", epno);
+  llerr("  CFG:     %08x\n", sam_getreg(SAM_USBHS_DEVEPTCFG(epno)));
+  llerr("  ISR:     %08x\n", sam_getreg(SAM_USBHS_DEVEPTISR(epno)));
+  llerr("  IMR:     %08x\n", sam_getreg(SAM_USBHS_DEVEPTIMR(epno)));
 
-  lldbg("DMA %d Register:\n", epno);
+  llerr("DMA %d Register:\n", epno);
   if ((SAM_EPSET_DMA & SAM_EP_BIT(epno)) != 0)
     {
-      lldbg("  NXTDSC:  %08x\n", sam_getreg(SAM_USBHS_DEVDMANXTDSC(epno)));
-      lldbg("  ADDRESS: %08x\n", sam_getreg(SAM_USBHS_DEVDMAADDR(epno)));
-      lldbg("  CONTROL: %08x\n", sam_getreg(SAM_USBHS_DEVDMACTRL(epno)));
-      lldbg("  STATUS:  %08x\n", sam_getreg(SAM_USBHS_DEVDMASTA(epno)));
+      llerr("  NXTDSC:  %08x\n", sam_getreg(SAM_USBHS_DEVDMANXTDSC(epno)));
+      llerr("  ADDRESS: %08x\n", sam_getreg(SAM_USBHS_DEVDMAADDR(epno)));
+      llerr("  CONTROL: %08x\n", sam_getreg(SAM_USBHS_DEVDMACTRL(epno)));
+      llerr("  STATUS:  %08x\n", sam_getreg(SAM_USBHS_DEVDMASTA(epno)));
     }
   else
     {
-      lldbg("  None\n");
+      llerr("  None\n");
     }
 }
 #endif
@@ -3909,7 +3909,7 @@ static int sam_ep_submit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
       if (privep->stalled)
         {
           sam_req_abort(privep, privreq, -EBUSY);
-          ulldbg("ERROR: stalled\n");
+          ullerr("ERROR: stalled\n");
           ret = -EPERM;
         }
       else
diff --git a/arch/arm/src/samv7/sam_wdt.c b/arch/arm/src/samv7/sam_wdt.c
index efcb01b92e..b8d59b9363 100644
--- a/arch/arm/src/samv7/sam_wdt.c
+++ b/arch/arm/src/samv7/sam_wdt.c
@@ -82,12 +82,12 @@
 
 /* Debug ********************************************************************/
 /* Non-standard debug that may be enabled just for testing the watchdog
- * driver.  NOTE: that only lldbg types are used so that the output is
+ * driver.  NOTE: that only llerr types are used so that the output is
  * immediately available.
  */
 
 #ifdef CONFIG_DEBUG_WATCHDOG
-#  define wddbg    lldbg
+#  define wddbg    llerr
 #  define wdinfo   llinfo
 #else
 #  define wddbg(x...)
@@ -199,7 +199,7 @@ static uint32_t sam_getreg(uintptr_t regaddr)
         {
           if (count == 4)
             {
-              lldbg("...\n");
+              llerr("...\n");
             }
 
           return regval;
@@ -216,7 +216,7 @@ static uint32_t sam_getreg(uintptr_t regaddr)
         {
           /* Yes.. then show how many times the value repeated */
 
-          lldbg("[repeats %d more times]\n", count-3);
+          llerr("[repeats %d more times]\n", count-3);
         }
 
       /* Save the new address, value, and count */
@@ -228,7 +228,7 @@ static uint32_t sam_getreg(uintptr_t regaddr)
 
   /* Show the register value read */
 
-  lldbg("%08x->%048\n", regaddr, regval);
+  llerr("%08x->%048\n", regaddr, regval);
   return regval;
 }
 #endif
@@ -246,7 +246,7 @@ static void sam_putreg(uint32_t regval, uintptr_t regaddr)
 {
   /* Show the register value being written */
 
-  lldbg("%08x<-%08x\n", regaddr, regval);
+  llerr("%08x<-%08x\n", regaddr, regval);
 
   /* Write the value */
 
diff --git a/arch/arm/src/samv7/sam_xdmac.c b/arch/arm/src/samv7/sam_xdmac.c
index f04782980f..c9a2591f37 100644
--- a/arch/arm/src/samv7/sam_xdmac.c
+++ b/arch/arm/src/samv7/sam_xdmac.c
@@ -1542,7 +1542,7 @@ static int sam_xdmac_interrupt(int irq, void *context)
             {
               /* Yes... Terminate the transfer with an error? */
 
-              dmalldbg("ERROR: DMA failed: %08x\n", chpending);
+              dmallerr("ERROR: DMA failed: %08x\n", chpending);
               sam_dmaterminate(xdmach, -EIO);
             }
 
@@ -1559,7 +1559,7 @@ static int sam_xdmac_interrupt(int irq, void *context)
 
           else
             {
-              dmalldbg("ERROR: Unexpected interrupt: %08x\n", chpending);
+              dmallerr("ERROR: Unexpected interrupt: %08x\n", chpending);
               DEBUGPANIC();
             }
 
diff --git a/arch/arm/src/stm32/stm32_adc.c b/arch/arm/src/stm32/stm32_adc.c
index f3970f3d31..ac8d4636c2 100644
--- a/arch/arm/src/stm32/stm32_adc.c
+++ b/arch/arm/src/stm32/stm32_adc.c
@@ -2718,12 +2718,12 @@ static int adc_interrupt(FAR struct adc_dev_s *dev)
 
   if ((regval & ADC_ISR_AWD) != 0)
     {
-      alldbg("WARNING: Analog Watchdog, Value converted out of range!\n");
+      allerr("WARNING: Analog Watchdog, Value converted out of range!\n");
     }
 
   if ((regval & ADC_ISR_OVR) != 0)
     {
-      alldbg("WARNING: Overrun has occurred!\n");
+      allerr("WARNING: Overrun has occurred!\n");
     }
 
   /* EOC: End of conversion */
diff --git a/arch/arm/src/stm32/stm32_bbsram.c b/arch/arm/src/stm32/stm32_bbsram.c
index 507f5a4d4a..0266f6bedd 100644
--- a/arch/arm/src/stm32/stm32_bbsram.c
+++ b/arch/arm/src/stm32/stm32_bbsram.c
@@ -183,14 +183,14 @@ static void stm32_bbsram_rd(void)
 static void stm32_bbsram_dump(FAR struct bbsramfh_s *bbf, char *op)
 {
   BBSRAM_DEBUG_READ();
-  lldbg("%s:\n", op);
-  lldbg(" File Address:0x%8x\n", bbf);
-  lldbg("  crc:0x%8x\n", bbf->crc);
-  lldbg("  fileno:%d\n", (int) bbf->fileno);
-  lldbg("  dirty:%d\n", (int) bbf->dirty);
-  lldbg("  length:%d\n", (int) bbf->len);
-  lldbg("  time:%ld:%ld\n", bbf->lastwrite.tv_sec, bbf->lastwrite.tv_nsec);
-  lldbg("  data: 0x%2x 0x%2x 0x%2x 0x%2x 0x%2x\n",
+  llerr("%s:\n", op);
+  llerr(" File Address:0x%8x\n", bbf);
+  llerr("  crc:0x%8x\n", bbf->crc);
+  llerr("  fileno:%d\n", (int) bbf->fileno);
+  llerr("  dirty:%d\n", (int) bbf->dirty);
+  llerr("  length:%d\n", (int) bbf->len);
+  llerr("  time:%ld:%ld\n", bbf->lastwrite.tv_sec, bbf->lastwrite.tv_nsec);
+  llerr("  data: 0x%2x 0x%2x 0x%2x 0x%2x 0x%2x\n",
         bbf->data[0], bbf->data[1], bbf->data[2], bbf->data[3], bbf->data[4]);
 }
 #endif
diff --git a/arch/arm/src/stm32/stm32_can.c b/arch/arm/src/stm32/stm32_can.c
index b361133f1f..73feb048c7 100644
--- a/arch/arm/src/stm32/stm32_can.c
+++ b/arch/arm/src/stm32/stm32_can.c
@@ -87,12 +87,12 @@
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
 #  define caninfo   info
-#  define canlldbg  lldbg
+#  define canllerr  llerr
 #  define canllinfo llinfo
 #else
 #  define candbg(x...)
 #  define caninfo(x...)
-#  define canlldbg(x...)
+#  define canllerr(x...)
 #  define canllinfo(x...)
 #endif
 
@@ -270,7 +270,7 @@ static uint32_t can_vgetreg(uint32_t addr)
         {
           if (count == 4)
             {
-              lldbg("...\n");
+              llerr("...\n");
             }
 
           return val;
@@ -287,7 +287,7 @@ static uint32_t can_vgetreg(uint32_t addr)
         {
           /* Yes.. then show how many times the value repeated */
 
-          lldbg("[repeats %d more times]\n", count-3);
+          llerr("[repeats %d more times]\n", count-3);
         }
 
       /* Save the new address, value, and count */
@@ -299,7 +299,7 @@ static uint32_t can_vgetreg(uint32_t addr)
 
   /* Show the register value read */
 
-  lldbg("%08x->%08x\n", addr, val);
+  llerr("%08x->%08x\n", addr, val);
   return val;
 }
 
@@ -349,7 +349,7 @@ static void can_vputreg(uint32_t addr, uint32_t value)
 
   /* Show the register value being written */
 
-  lldbg("%08x<-%08x\n", addr, value);
+  llerr("%08x<-%08x\n", addr, value);
 
   /* Write the value */
 
@@ -402,25 +402,25 @@ static void can_dumpctrlregs(FAR struct stm32_can_s *priv,
 {
   if (msg)
     {
-      canlldbg("Control Registers: %s\n", msg);
+      canllerr("Control Registers: %s\n", msg);
     }
   else
     {
-      canlldbg("Control Registers:\n");
+      canllerr("Control Registers:\n");
     }
 
   /* CAN control and status registers */
 
-  lldbg("  MCR: %08x   MSR: %08x   TSR: %08x\n",
+  llerr("  MCR: %08x   MSR: %08x   TSR: %08x\n",
         getreg32(priv->base + STM32_CAN_MCR_OFFSET),
         getreg32(priv->base + STM32_CAN_MSR_OFFSET),
         getreg32(priv->base + STM32_CAN_TSR_OFFSET));
 
-  lldbg(" RF0R: %08x  RF1R: %08x\n",
+  llerr(" RF0R: %08x  RF1R: %08x\n",
         getreg32(priv->base + STM32_CAN_RF0R_OFFSET),
         getreg32(priv->base + STM32_CAN_RF1R_OFFSET));
 
-  lldbg("  IER: %08x   ESR: %08x   BTR: %08x\n",
+  llerr("  IER: %08x   ESR: %08x   BTR: %08x\n",
         getreg32(priv->base + STM32_CAN_IER_OFFSET),
         getreg32(priv->base + STM32_CAN_ESR_OFFSET),
         getreg32(priv->base + STM32_CAN_BTR_OFFSET));
@@ -447,40 +447,40 @@ static void can_dumpmbregs(FAR struct stm32_can_s *priv,
 {
   if (msg)
     {
-      canlldbg("Mailbox Registers: %s\n", msg);
+      canllerr("Mailbox Registers: %s\n", msg);
     }
   else
     {
-      canlldbg("Mailbox Registers:\n");
+      canllerr("Mailbox Registers:\n");
     }
 
   /* CAN mailbox registers (3 TX and 2 RX) */
 
-  lldbg(" TI0R: %08x TDT0R: %08x TDL0R: %08x TDH0R: %08x\n",
+  llerr(" TI0R: %08x TDT0R: %08x TDL0R: %08x TDH0R: %08x\n",
         getreg32(priv->base + STM32_CAN_TI0R_OFFSET),
         getreg32(priv->base + STM32_CAN_TDT0R_OFFSET),
         getreg32(priv->base + STM32_CAN_TDL0R_OFFSET),
         getreg32(priv->base + STM32_CAN_TDH0R_OFFSET));
 
-  lldbg(" TI1R: %08x TDT1R: %08x TDL1R: %08x TDH1R: %08x\n",
+  llerr(" TI1R: %08x TDT1R: %08x TDL1R: %08x TDH1R: %08x\n",
         getreg32(priv->base + STM32_CAN_TI1R_OFFSET),
         getreg32(priv->base + STM32_CAN_TDT1R_OFFSET),
         getreg32(priv->base + STM32_CAN_TDL1R_OFFSET),
         getreg32(priv->base + STM32_CAN_TDH1R_OFFSET));
 
-  lldbg(" TI2R: %08x TDT2R: %08x TDL2R: %08x TDH2R: %08x\n",
+  llerr(" TI2R: %08x TDT2R: %08x TDL2R: %08x TDH2R: %08x\n",
         getreg32(priv->base + STM32_CAN_TI2R_OFFSET),
         getreg32(priv->base + STM32_CAN_TDT2R_OFFSET),
         getreg32(priv->base + STM32_CAN_TDL2R_OFFSET),
         getreg32(priv->base + STM32_CAN_TDH2R_OFFSET));
 
-  lldbg(" RI0R: %08x RDT0R: %08x RDL0R: %08x RDH0R: %08x\n",
+  llerr(" RI0R: %08x RDT0R: %08x RDL0R: %08x RDH0R: %08x\n",
         getreg32(priv->base + STM32_CAN_RI0R_OFFSET),
         getreg32(priv->base + STM32_CAN_RDT0R_OFFSET),
         getreg32(priv->base + STM32_CAN_RDL0R_OFFSET),
         getreg32(priv->base + STM32_CAN_RDH0R_OFFSET));
 
-  lldbg(" RI1R: %08x RDT1R: %08x RDL1R: %08x RDH1R: %08x\n",
+  llerr(" RI1R: %08x RDT1R: %08x RDL1R: %08x RDH1R: %08x\n",
         getreg32(priv->base + STM32_CAN_RI1R_OFFSET),
         getreg32(priv->base + STM32_CAN_RDT1R_OFFSET),
         getreg32(priv->base + STM32_CAN_RDL1R_OFFSET),
@@ -510,14 +510,14 @@ static void can_dumpfiltregs(FAR struct stm32_can_s *priv,
 
   if (msg)
     {
-      canlldbg("Filter Registers: %s\n", msg);
+      canllerr("Filter Registers: %s\n", msg);
     }
   else
     {
-      canlldbg("Filter Registers:\n");
+      canllerr("Filter Registers:\n");
     }
 
-  lldbg(" FMR: %08x   FM1R: %08x  FS1R: %08x FFA1R: %08x  FA1R: %08x\n",
+  llerr(" FMR: %08x   FM1R: %08x  FS1R: %08x FFA1R: %08x  FA1R: %08x\n",
         getreg32(priv->base + STM32_CAN_FMR_OFFSET),
         getreg32(priv->base + STM32_CAN_FM1R_OFFSET),
         getreg32(priv->base + STM32_CAN_FS1R_OFFSET),
@@ -526,7 +526,7 @@ static void can_dumpfiltregs(FAR struct stm32_can_s *priv,
 
   for (i = 0; i < CAN_NFILTERS; i++)
     {
-      lldbg(" F%dR1: %08x F%dR2: %08x\n",
+      llerr(" F%dR1: %08x F%dR2: %08x\n",
             i, getreg32(priv->base + STM32_CAN_FIR_OFFSET(i, 1)),
             i, getreg32(priv->base + STM32_CAN_FIR_OFFSET(i, 2)));
     }
@@ -574,7 +574,7 @@ static void can_reset(FAR struct can_dev_s *dev)
   else
 #endif
     {
-      canlldbg("Unsupported port %d\n", priv->port);
+      canllerr("Unsupported port %d\n", priv->port);
       return;
     }
 
@@ -625,7 +625,7 @@ static int can_setup(FAR struct can_dev_s *dev)
   ret = can_cellinit(priv);
   if (ret < 0)
     {
-      canlldbg("CAN%d cell initialization failed: %d\n", priv->port, ret);
+      canllerr("CAN%d cell initialization failed: %d\n", priv->port, ret);
       return ret;
     }
 
@@ -637,7 +637,7 @@ static int can_setup(FAR struct can_dev_s *dev)
   ret = can_filterinit(priv);
   if (ret < 0)
     {
-      canlldbg("CAN%d filter initialization failed: %d\n", priv->port, ret);
+      canllerr("CAN%d filter initialization failed: %d\n", priv->port, ret);
       return ret;
     }
   can_dumpfiltregs(priv, "After filter initialization");
@@ -649,7 +649,7 @@ static int can_setup(FAR struct can_dev_s *dev)
   ret = irq_attach(priv->canrx[0], can_rx0interrupt);
   if (ret < 0)
     {
-      canlldbg("Failed to attach CAN%d RX0 IRQ (%d)",
+      canllerr("Failed to attach CAN%d RX0 IRQ (%d)",
                priv->port, priv->canrx[0]);
       return ret;
     }
@@ -657,7 +657,7 @@ static int can_setup(FAR struct can_dev_s *dev)
   ret = irq_attach(priv->canrx[1], can_rx1interrupt);
   if (ret < 0)
     {
-      canlldbg("Failed to attach CAN%d RX1 IRQ (%d)",
+      canllerr("Failed to attach CAN%d RX1 IRQ (%d)",
                priv->port, priv->canrx[1]);
       return ret;
     }
@@ -665,7 +665,7 @@ static int can_setup(FAR struct can_dev_s *dev)
   ret = irq_attach(priv->cantx, can_txinterrupt);
   if (ret < 0)
     {
-      canlldbg("Failed to attach CAN%d TX IRQ (%d)",
+      canllerr("Failed to attach CAN%d TX IRQ (%d)",
                priv->port, priv->cantx);
       return ret;
     }
@@ -878,7 +878,7 @@ static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg)
     }
   else
     {
-      canlldbg("ERROR: No available mailbox\n");
+      canllerr("ERROR: No available mailbox\n");
       return -EBUSY;
     }
 
@@ -1099,7 +1099,7 @@ static int can_rxinterrupt(int irq, FAR void *context, int rxmb)
   npending = (regval & CAN_RFR_FMP_MASK) >> CAN_RFR_FMP_SHIFT;
   if (npending < 1)
     {
-      canlldbg("WARNING: No messages pending\n");
+      canllerr("WARNING: No messages pending\n");
       return OK;
     }
 
@@ -1130,7 +1130,7 @@ static int can_rxinterrupt(int irq, FAR void *context, int rxmb)
 #else
   if ((regval & CAN_RIR_IDE) != 0)
     {
-      canlldbg("ERROR: Received message with extended identifier.  Dropped\n");
+      canllerr("ERROR: Received message with extended identifier.  Dropped\n");
       ret = -ENOSYS;
       goto errout;
     }
@@ -1520,7 +1520,7 @@ static int can_cellinit(FAR struct stm32_can_s *priv)
 
   if (timeout < 1)
     {
-      canlldbg("ERROR: Timed out waiting to enter initialization mode\n");
+      canllerr("ERROR: Timed out waiting to enter initialization mode\n");
       return -ETIMEDOUT;
     }
 
@@ -1544,7 +1544,7 @@ static int can_cellinit(FAR struct stm32_can_s *priv)
   ret = can_bittiming(priv);
   if (ret < 0)
     {
-      canlldbg("ERROR: Failed to set bit timing: %d\n", ret);
+      canllerr("ERROR: Failed to set bit timing: %d\n", ret);
       return ret;
     }
 
@@ -1571,7 +1571,7 @@ static int can_cellinit(FAR struct stm32_can_s *priv)
 
   if (timeout < 1)
     {
-      canlldbg("ERROR: Timed out waiting to exit initialization mode: %08x\n",
+      canllerr("ERROR: Timed out waiting to exit initialization mode: %08x\n",
                regval);
       return -ETIMEDOUT;
     }
diff --git a/arch/arm/src/stm32/stm32_dumpgpio.c b/arch/arm/src/stm32/stm32_dumpgpio.c
index 4e4f4327c5..c3023c21a8 100644
--- a/arch/arm/src/stm32/stm32_dumpgpio.c
+++ b/arch/arm/src/stm32/stm32_dumpgpio.c
@@ -126,18 +126,18 @@ int stm32_dumpgpio(uint32_t pinset, const char *msg)
 
 #if defined(CONFIG_STM32_STM32F10XX)
 
-  lldbg("GPIO%c pinset: %08x base: %08x -- %s\n",
+  llerr("GPIO%c pinset: %08x base: %08x -- %s\n",
         g_portchar[port], pinset, base, msg);
 
   if ((getreg32(STM32_RCC_APB2ENR) & RCC_APB2ENR_IOPEN(port)) != 0)
     {
-      lldbg("  CR: %08x %08x IDR: %04x ODR: %04x LCKR: %04x\n",
+      llerr("  CR: %08x %08x IDR: %04x ODR: %04x LCKR: %04x\n",
             getreg32(base + STM32_GPIO_CRH_OFFSET),
             getreg32(base + STM32_GPIO_CRL_OFFSET),
             getreg32(base + STM32_GPIO_IDR_OFFSET),
             getreg32(base + STM32_GPIO_ODR_OFFSET),
             getreg32(base + STM32_GPIO_LCKR_OFFSET));
-      lldbg("  EVCR: %02x MAPR: %08x CR: %04x %04x %04x %04x\n",
+      llerr("  EVCR: %02x MAPR: %08x CR: %04x %04x %04x %04x\n",
             getreg32(STM32_AFIO_EVCR), getreg32(STM32_AFIO_MAPR),
             getreg32(STM32_AFIO_EXTICR1),
             getreg32(STM32_AFIO_EXTICR2),
@@ -146,7 +146,7 @@ int stm32_dumpgpio(uint32_t pinset, const char *msg)
     }
   else
     {
-      lldbg("  GPIO%c not enabled: APB2ENR: %08x\n",
+      llerr("  GPIO%c not enabled: APB2ENR: %08x\n",
             g_portchar[port], getreg32(STM32_RCC_APB2ENR));
     }
 
@@ -154,28 +154,28 @@ int stm32_dumpgpio(uint32_t pinset, const char *msg)
 
   DEBUGASSERT(port < STM32_NGPIO_PORTS);
 
-  lldbg("GPIO%c pinset: %08x base: %08x -- %s\n",
+  llerr("GPIO%c pinset: %08x base: %08x -- %s\n",
         g_portchar[port], pinset, base, msg);
 
   if ((getreg32(STM32_RCC_AHBENR) & RCC_AHBENR_GPIOEN(port)) != 0)
     {
-      lldbg(" MODE: %08x OTYPE: %04x     OSPEED: %08x PUPDR: %08x\n",
+      llerr(" MODE: %08x OTYPE: %04x     OSPEED: %08x PUPDR: %08x\n",
             getreg32(base + STM32_GPIO_MODER_OFFSET),
             getreg32(base + STM32_GPIO_OTYPER_OFFSET),
             getreg32(base + STM32_GPIO_OSPEED_OFFSET),
             getreg32(base + STM32_GPIO_PUPDR_OFFSET));
-      lldbg("  IDR: %04x       ODR: %04x       BSRR: %08x  LCKR: %04x\n",
+      llerr("  IDR: %04x       ODR: %04x       BSRR: %08x  LCKR: %04x\n",
             getreg32(base + STM32_GPIO_IDR_OFFSET),
             getreg32(base + STM32_GPIO_ODR_OFFSET),
             getreg32(base + STM32_GPIO_BSRR_OFFSET),
             getreg32(base + STM32_GPIO_LCKR_OFFSET));
-      lldbg(" AFRH: %08x  AFRL: %08x\n",
+      llerr(" AFRH: %08x  AFRL: %08x\n",
             getreg32(base + STM32_GPIO_AFRH_OFFSET),
             getreg32(base + STM32_GPIO_AFRL_OFFSET));
     }
   else
     {
-      lldbg("  GPIO%c not enabled: AHBENR: %08x\n",
+      llerr("  GPIO%c not enabled: AHBENR: %08x\n",
             g_portchar[port], getreg32(STM32_RCC_AHBENR));
     }
 
@@ -183,22 +183,22 @@ int stm32_dumpgpio(uint32_t pinset, const char *msg)
 
   DEBUGASSERT(port < STM32_NGPIO_PORTS);
 
-  lldbg("GPIO%c pinset: %08x base: %08x -- %s\n",
+  llerr("GPIO%c pinset: %08x base: %08x -- %s\n",
         g_portchar[port], pinset, base, msg);
 
   /* GPIOs are always enabled */
 
-  lldbg(" MODE: %08x OTYPE: %04x     OSPEED: %08x PUPDR: %08x\n",
+  llerr(" MODE: %08x OTYPE: %04x     OSPEED: %08x PUPDR: %08x\n",
         getreg32(base + STM32_GPIO_MODER_OFFSET),
         getreg32(base + STM32_GPIO_OTYPER_OFFSET),
         getreg32(base + STM32_GPIO_OSPEED_OFFSET),
         getreg32(base + STM32_GPIO_PUPDR_OFFSET));
-  lldbg("  IDR: %04x       ODR: %04x       BSRR: %08x  LCKR: %04x\n",
+  llerr("  IDR: %04x       ODR: %04x       BSRR: %08x  LCKR: %04x\n",
         getreg32(base + STM32_GPIO_IDR_OFFSET),
         getreg32(base + STM32_GPIO_ODR_OFFSET),
         getreg32(base + STM32_GPIO_BSRR_OFFSET),
         getreg32(base + STM32_GPIO_LCKR_OFFSET));
-  lldbg(" AFRH: %08x  AFRL: %08x   BRR: %04x\n",
+  llerr(" AFRH: %08x  AFRL: %08x   BRR: %04x\n",
         getreg32(base + STM32_GPIO_AFRH_OFFSET),
         getreg32(base + STM32_GPIO_AFRL_OFFSET),
         getreg32(base + STM32_GPIO_BRR_OFFSET));
@@ -207,28 +207,28 @@ int stm32_dumpgpio(uint32_t pinset, const char *msg)
 
   DEBUGASSERT(port < STM32_NGPIO_PORTS);
 
-  lldbg("GPIO%c pinset: %08x base: %08x -- %s\n",
+  llerr("GPIO%c pinset: %08x base: %08x -- %s\n",
         g_portchar[port], pinset, base, msg);
 
   if ((getreg32(STM32_RCC_AHB1ENR) & RCC_AHB1ENR_GPIOEN(port)) != 0)
     {
-      lldbg(" MODE: %08x OTYPE: %04x     OSPEED: %08x PUPDR: %08x\n",
+      llerr(" MODE: %08x OTYPE: %04x     OSPEED: %08x PUPDR: %08x\n",
             getreg32(base + STM32_GPIO_MODER_OFFSET),
             getreg32(base + STM32_GPIO_OTYPER_OFFSET),
             getreg32(base + STM32_GPIO_OSPEED_OFFSET),
             getreg32(base + STM32_GPIO_PUPDR_OFFSET));
-      lldbg("  IDR: %04x       ODR: %04x       BSRR: %08x  LCKR: %04x\n",
+      llerr("  IDR: %04x       ODR: %04x       BSRR: %08x  LCKR: %04x\n",
             getreg32(base + STM32_GPIO_IDR_OFFSET),
             getreg32(base + STM32_GPIO_ODR_OFFSET),
             getreg32(base + STM32_GPIO_BSRR_OFFSET),
             getreg32(base + STM32_GPIO_LCKR_OFFSET));
-      lldbg(" AFRH: %08x  AFRL: %08x\n",
+      llerr(" AFRH: %08x  AFRL: %08x\n",
             getreg32(base + STM32_GPIO_AFRH_OFFSET),
             getreg32(base + STM32_GPIO_AFRL_OFFSET));
     }
   else
     {
-      lldbg("  GPIO%c not enabled: AHB1ENR: %08x\n",
+      llerr("  GPIO%c not enabled: AHB1ENR: %08x\n",
             g_portchar[port], getreg32(STM32_RCC_AHB1ENR));
     }
 #else
diff --git a/arch/arm/src/stm32/stm32_eth.c b/arch/arm/src/stm32/stm32_eth.c
index 19c5e3aee1..837289db1e 100644
--- a/arch/arm/src/stm32/stm32_eth.c
+++ b/arch/arm/src/stm32/stm32_eth.c
@@ -769,7 +769,7 @@ static uint32_t stm32_getreg(uint32_t addr)
         {
           if (count == 4)
             {
-              lldbg("...\n");
+              llerr("...\n");
             }
 
           return val;
@@ -786,7 +786,7 @@ static uint32_t stm32_getreg(uint32_t addr)
         {
           /* Yes.. then show how many times the value repeated */
 
-          lldbg("[repeats %d more times]\n", count-3);
+          llerr("[repeats %d more times]\n", count-3);
         }
 
       /* Save the new address, value, and count */
@@ -798,7 +798,7 @@ static uint32_t stm32_getreg(uint32_t addr)
 
   /* Show the register value read */
 
-  lldbg("%08x->%08x\n", addr, val);
+  llerr("%08x->%08x\n", addr, val);
   return val;
 }
 #endif
@@ -825,7 +825,7 @@ static void stm32_putreg(uint32_t val, uint32_t addr)
 {
   /* Show the register value being written */
 
-  lldbg("%08x<-%08x\n", addr, val);
+  llerr("%08x<-%08x\n", addr, val);
 
   /* Write the value */
 
@@ -1505,7 +1505,7 @@ static int stm32_recvframe(FAR struct stm32_ethmac_s *priv)
 
   if (!stm32_isfreebuffer(priv))
     {
-      nlldbg("No free buffers\n");
+      nllerr("No free buffers\n");
       return -ENOMEM;
     }
 
@@ -1612,7 +1612,7 @@ static int stm32_recvframe(FAR struct stm32_ethmac_s *priv)
                * scanning logic, and continue scanning with the next frame.
                */
 
-              nlldbg("DROPPED: RX descriptor errors: %08x\n", rxdesc->rdes0);
+              nllerr("DROPPED: RX descriptor errors: %08x\n", rxdesc->rdes0);
               stm32_freesegment(priv, rxcurr, priv->segments);
             }
         }
@@ -1673,7 +1673,7 @@ static void stm32_receive(FAR struct stm32_ethmac_s *priv)
 
       if (dev->d_len > CONFIG_NET_ETH_MTU)
         {
-          nlldbg("DROPPED: Too big: %d\n", dev->d_len);
+          nllerr("DROPPED: Too big: %d\n", dev->d_len);
 
           /* Free dropped packet buffer */
 
@@ -1793,7 +1793,7 @@ static void stm32_receive(FAR struct stm32_ethmac_s *priv)
       else
 #endif
         {
-          nlldbg("DROPPED: Unknown type: %04x\n", BUF->type);
+          nllerr("DROPPED: Unknown type: %04x\n", BUF->type);
         }
 
       /* We are finished with the RX buffer.  NOTE:  If the buffer is
@@ -2042,7 +2042,7 @@ static inline void stm32_interrupt_process(FAR struct stm32_ethmac_s *priv)
     {
       /* Just let the user know what happened */
 
-      nlldbg("Abormal event(s): %08x\n", dmasr);
+      nllerr("Abormal event(s): %08x\n", dmasr);
 
       /* Clear all pending abnormal events */
 
@@ -2246,7 +2246,7 @@ static void stm32_txtimeout_expiry(int argc, uint32_t arg, ...)
 {
   FAR struct stm32_ethmac_s *priv = (FAR struct stm32_ethmac_s *)arg;
 
-  nlldbg("Timeout!\n");
+  nllerr("Timeout!\n");
 
 #ifdef CONFIG_NET_NOINTS
   /* Disable further Ethernet interrupts.  This will prevent some race
diff --git a/arch/arm/src/stm32/stm32_irq.c b/arch/arm/src/stm32/stm32_irq.c
index 803345b381..f79a045b5c 100644
--- a/arch/arm/src/stm32/stm32_irq.c
+++ b/arch/arm/src/stm32/stm32_irq.c
@@ -113,33 +113,33 @@ static void stm32_dumpnvic(const char *msg, int irq)
   irqstate_t flags;
 
   flags = enter_critical_section();
-  lldbg("NVIC (%s, irq=%d):\n", msg, irq);
-  lldbg("  INTCTRL:    %08x VECTAB:  %08x\n",
+  llerr("NVIC (%s, irq=%d):\n", msg, irq);
+  llerr("  INTCTRL:    %08x VECTAB:  %08x\n",
         getreg32(NVIC_INTCTRL), getreg32(NVIC_VECTAB));
 #if 0
-  lldbg("  SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n",
+  llerr("  SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n",
         getreg32(NVIC_SYSHCON_MEMFAULTENA), getreg32(NVIC_SYSHCON_BUSFAULTENA),
         getreg32(NVIC_SYSHCON_USGFAULTENA), getreg32(NVIC_SYSTICK_CTRL_ENABLE));
 #endif
-  lldbg("  IRQ ENABLE: %08x %08x %08x\n",
+  llerr("  IRQ ENABLE: %08x %08x %08x\n",
         getreg32(NVIC_IRQ0_31_ENABLE), getreg32(NVIC_IRQ32_63_ENABLE),
         getreg32(NVIC_IRQ64_95_ENABLE));
-  lldbg("  SYSH_PRIO:  %08x %08x %08x\n",
+  llerr("  SYSH_PRIO:  %08x %08x %08x\n",
         getreg32(NVIC_SYSH4_7_PRIORITY), getreg32(NVIC_SYSH8_11_PRIORITY),
         getreg32(NVIC_SYSH12_15_PRIORITY));
-  lldbg("  IRQ PRIO:   %08x %08x %08x %08x\n",
+  llerr("  IRQ PRIO:   %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ0_3_PRIORITY), getreg32(NVIC_IRQ4_7_PRIORITY),
         getreg32(NVIC_IRQ8_11_PRIORITY), getreg32(NVIC_IRQ12_15_PRIORITY));
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ16_19_PRIORITY), getreg32(NVIC_IRQ20_23_PRIORITY),
         getreg32(NVIC_IRQ24_27_PRIORITY), getreg32(NVIC_IRQ28_31_PRIORITY));
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ32_35_PRIORITY), getreg32(NVIC_IRQ36_39_PRIORITY),
         getreg32(NVIC_IRQ40_43_PRIORITY), getreg32(NVIC_IRQ44_47_PRIORITY));
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ48_51_PRIORITY), getreg32(NVIC_IRQ52_55_PRIORITY),
         getreg32(NVIC_IRQ56_59_PRIORITY), getreg32(NVIC_IRQ60_63_PRIORITY));
-  lldbg("              %08x\n",
+  llerr("              %08x\n",
         getreg32(NVIC_IRQ64_67_PRIORITY));
   leave_critical_section(flags);
 }
diff --git a/arch/arm/src/stm32/stm32_iwdg.c b/arch/arm/src/stm32/stm32_iwdg.c
index 1e52b26a01..72489e6002 100644
--- a/arch/arm/src/stm32/stm32_iwdg.c
+++ b/arch/arm/src/stm32/stm32_iwdg.c
@@ -107,12 +107,12 @@
 
 /* Debug ********************************************************************/
 /* Non-standard debug that may be enabled just for testing the watchdog
- * driver.  NOTE: that only lldbg types are used so that the output is
+ * driver.  NOTE: that only llerr types are used so that the output is
  * immediately available.
  */
 
 #ifdef CONFIG_DEBUG_WATCHDOG
-#  define wddbg    lldbg
+#  define wddbg    llerr
 #  define wdinfo   llinfo
 #else
 #  define wddbg(x...)
@@ -216,7 +216,7 @@ static uint16_t stm32_getreg(uint32_t addr)
         {
           if (count == 4)
             {
-              lldbg("...\n");
+              llerr("...\n");
             }
 
           return val;
@@ -233,7 +233,7 @@ static uint16_t stm32_getreg(uint32_t addr)
         {
           /* Yes.. then show how many times the value repeated */
 
-          lldbg("[repeats %d more times]\n", count-3);
+          llerr("[repeats %d more times]\n", count-3);
         }
 
       /* Save the new address, value, and count */
@@ -245,7 +245,7 @@ static uint16_t stm32_getreg(uint32_t addr)
 
   /* Show the register value read */
 
-  lldbg("%08x->%04x\n", addr, val);
+  llerr("%08x->%04x\n", addr, val);
   return val;
 }
 #endif
@@ -263,7 +263,7 @@ static void stm32_putreg(uint16_t val, uint32_t addr)
 {
   /* Show the register value being written */
 
-  lldbg("%08x<-%04x\n", addr, val);
+  llerr("%08x<-%04x\n", addr, val);
 
   /* Write the value */
 
diff --git a/arch/arm/src/stm32/stm32_otgfsdev.c b/arch/arm/src/stm32/stm32_otgfsdev.c
index 05325986a6..82b6a9fb83 100644
--- a/arch/arm/src/stm32/stm32_otgfsdev.c
+++ b/arch/arm/src/stm32/stm32_otgfsdev.c
@@ -813,7 +813,7 @@ static uint32_t stm32_getreg(uint32_t addr)
         {
           if (count == 4)
             {
-              lldbg("...\n");
+              llerr("...\n");
             }
 
           return val;
@@ -830,7 +830,7 @@ static uint32_t stm32_getreg(uint32_t addr)
         {
           /* Yes.. then show how many times the value repeated */
 
-          lldbg("[repeats %d more times]\n", count-3);
+          llerr("[repeats %d more times]\n", count-3);
         }
 
       /* Save the new address, value, and count */
@@ -842,7 +842,7 @@ static uint32_t stm32_getreg(uint32_t addr)
 
   /* Show the register value read */
 
-  lldbg("%08x->%08x\n", addr, val);
+  llerr("%08x->%08x\n", addr, val);
   return val;
 }
 #endif
@@ -860,7 +860,7 @@ static void stm32_putreg(uint32_t val, uint32_t addr)
 {
   /* Show the register value being written */
 
-  lldbg("%08x<-%08x\n", addr, val);
+  llerr("%08x<-%08x\n", addr, val);
 
   /* Write the value */
 
@@ -2625,7 +2625,7 @@ static inline void stm32_epout_interrupt(FAR struct stm32_usbdev_s *priv)
           if ((daint & 1) != 0)
             {
               regval = stm32_getreg(STM32_OTGFS_DOEPINT(epno));
-              ulldbg("DOEPINT(%d) = %08x\n", epno, regval);
+              ullerr("DOEPINT(%d) = %08x\n", epno, regval);
               stm32_putreg(0xFF, STM32_OTGFS_DOEPINT(epno));
             }
 
@@ -2855,7 +2855,7 @@ static inline void stm32_epin_interrupt(FAR struct stm32_usbdev_s *priv)
         {
           if ((daint & 1) != 0)
             {
-              ulldbg("DIEPINT(%d) = %08x\n",
+              ullerr("DIEPINT(%d) = %08x\n",
                      epno, stm32_getreg(STM32_OTGFS_DIEPINT(epno)));
               stm32_putreg(0xFF, STM32_OTGFS_DIEPINT(epno));
             }
diff --git a/arch/arm/src/stm32/stm32_otgfshost.c b/arch/arm/src/stm32/stm32_otgfshost.c
index f2ce8e2abd..113c7c2551 100644
--- a/arch/arm/src/stm32/stm32_otgfshost.c
+++ b/arch/arm/src/stm32/stm32_otgfshost.c
@@ -506,7 +506,7 @@ static struct usbhost_connection_s g_usbconn =
 #ifdef CONFIG_STM32_USBHOST_REGDEBUG
 static void stm32_printreg(uint32_t addr, uint32_t val, bool iswrite)
 {
-  lldbg("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val);
+  llerr("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val);
 }
 #endif
 
@@ -556,7 +556,7 @@ static void stm32_checkreg(uint32_t addr, uint32_t val, bool iswrite)
             {
               /* No.. More than one. */
 
-              lldbg("[repeats %d more times]\n", count);
+              llerr("[repeats %d more times]\n", count);
             }
         }
 
diff --git a/arch/arm/src/stm32/stm32_otghsdev.c b/arch/arm/src/stm32/stm32_otghsdev.c
index 6d14771b6d..b63831a8ce 100644
--- a/arch/arm/src/stm32/stm32_otghsdev.c
+++ b/arch/arm/src/stm32/stm32_otghsdev.c
@@ -813,7 +813,7 @@ static uint32_t stm32_getreg(uint32_t addr)
         {
           if (count == 4)
             {
-              lldbg("...\n");
+              llerr("...\n");
             }
 
           return val;
@@ -830,7 +830,7 @@ static uint32_t stm32_getreg(uint32_t addr)
         {
           /* Yes.. then show how many times the value repeated */
 
-          lldbg("[repeats %d more times]\n", count-3);
+          llerr("[repeats %d more times]\n", count-3);
         }
 
       /* Save the new address, value, and count */
@@ -842,7 +842,7 @@ static uint32_t stm32_getreg(uint32_t addr)
 
   /* Show the register value read */
 
-  lldbg("%08x->%08x\n", addr, val);
+  llerr("%08x->%08x\n", addr, val);
   return val;
 }
 #endif
@@ -860,7 +860,7 @@ static void stm32_putreg(uint32_t val, uint32_t addr)
 {
   /* Show the register value being written */
 
-  lldbg("%08x<-%08x\n", addr, val);
+  llerr("%08x<-%08x\n", addr, val);
 
   /* Write the value */
 
@@ -2625,7 +2625,7 @@ static inline void stm32_epout_interrupt(FAR struct stm32_usbdev_s *priv)
           if ((daint & 1) != 0)
             {
               regval = stm32_getreg(STM32_OTGHS_DOEPINT(epno));
-              ulldbg("DOEPINT(%d) = %08x\n", epno, regval);
+              ullerr("DOEPINT(%d) = %08x\n", epno, regval);
               stm32_putreg(0xFF, STM32_OTGHS_DOEPINT(epno));
             }
 
@@ -2855,7 +2855,7 @@ static inline void stm32_epin_interrupt(FAR struct stm32_usbdev_s *priv)
         {
           if ((daint & 1) != 0)
             {
-              ulldbg("DIEPINT(%d) = %08x\n",
+              ullerr("DIEPINT(%d) = %08x\n",
                      epno, stm32_getreg(STM32_OTGHS_DIEPINT(epno)));
               stm32_putreg(0xFF, STM32_OTGHS_DIEPINT(epno));
             }
diff --git a/arch/arm/src/stm32/stm32_otghshost.c b/arch/arm/src/stm32/stm32_otghshost.c
index 66f8214783..6ae9aa788c 100644
--- a/arch/arm/src/stm32/stm32_otghshost.c
+++ b/arch/arm/src/stm32/stm32_otghshost.c
@@ -506,7 +506,7 @@ static struct usbhost_connection_s g_usbconn =
 #ifdef CONFIG_STM32_USBHOST_REGDEBUG
 static void stm32_printreg(uint32_t addr, uint32_t val, bool iswrite)
 {
-  lldbg("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val);
+  llerr("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val);
 }
 #endif
 
@@ -556,7 +556,7 @@ static void stm32_checkreg(uint32_t addr, uint32_t val, bool iswrite)
             {
               /* No.. More than one. */
 
-              lldbg("[repeats %d more times]\n", count);
+              llerr("[repeats %d more times]\n", count);
             }
         }
 
diff --git a/arch/arm/src/stm32/stm32_pwm.c b/arch/arm/src/stm32/stm32_pwm.c
index 549edeae6d..d43461d661 100644
--- a/arch/arm/src/stm32/stm32_pwm.c
+++ b/arch/arm/src/stm32/stm32_pwm.c
@@ -123,7 +123,7 @@
 
 #ifdef CONFIG_DEBUG_PWM
 #  define pwmdbg              dbg
-#  define pwmlldbg            lldbg
+#  define pwmllerr            llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define pwminfo           info
 #    define pwmllinfo         llinfo
@@ -135,7 +135,7 @@
 #  endif
 #else
 #  define pwmdbg(x...)
-#  define pwmlldbg(x...)
+#  define pwmllerr(x...)
 #  define pwminfo(x...)
 #  define pwmllinfo(x...)
 #  define pwm_dumpgpio(p,m)
diff --git a/arch/arm/src/stm32/stm32_rtcc.c b/arch/arm/src/stm32/stm32_rtcc.c
index 1f1cbcaae7..72ffc26fe3 100644
--- a/arch/arm/src/stm32/stm32_rtcc.c
+++ b/arch/arm/src/stm32/stm32_rtcc.c
@@ -128,12 +128,12 @@
 #ifdef CONFIG_DEBUG_RTC
 #  define rtcdbg    dbg
 #  define rtcinfo   info
-#  define rtclldbg  lldbg
+#  define rtcllerr  llerr
 #  define rtcllinfo llinfo
 #else
 #  define rtcdbg(x...)
 #  define rtcinfo(x...)
-#  define rtclldbg(x...)
+#  define rtcllerr(x...)
 #  define rtcllinfo(x...)
 #endif
 
@@ -179,27 +179,27 @@ volatile bool g_rtc_enabled = false;
 #ifdef CONFIG_DEBUG_RTC
 static void rtc_dumpregs(FAR const char *msg)
 {
-  rtclldbg("%s:\n", msg);
-  rtclldbg("      TR: %08x\n", getreg32(STM32_RTC_TR));
-  rtclldbg("      DR: %08x\n", getreg32(STM32_RTC_DR));
-  rtclldbg("      CR: %08x\n", getreg32(STM32_RTC_CR));
-  rtclldbg("     ISR: %08x\n", getreg32(STM32_RTC_ISR));
-  rtclldbg("    PRER: %08x\n", getreg32(STM32_RTC_PRER));
-  rtclldbg("    WUTR: %08x\n", getreg32(STM32_RTC_WUTR));
+  rtcllerr("%s:\n", msg);
+  rtcllerr("      TR: %08x\n", getreg32(STM32_RTC_TR));
+  rtcllerr("      DR: %08x\n", getreg32(STM32_RTC_DR));
+  rtcllerr("      CR: %08x\n", getreg32(STM32_RTC_CR));
+  rtcllerr("     ISR: %08x\n", getreg32(STM32_RTC_ISR));
+  rtcllerr("    PRER: %08x\n", getreg32(STM32_RTC_PRER));
+  rtcllerr("    WUTR: %08x\n", getreg32(STM32_RTC_WUTR));
 #ifndef CONFIG_STM32_STM32F30XX
-  rtclldbg("  CALIBR: %08x\n", getreg32(STM32_RTC_CALIBR));
+  rtcllerr("  CALIBR: %08x\n", getreg32(STM32_RTC_CALIBR));
 #endif
-  rtclldbg("  ALRMAR: %08x\n", getreg32(STM32_RTC_ALRMAR));
-  rtclldbg("  ALRMBR: %08x\n", getreg32(STM32_RTC_ALRMBR));
-  rtclldbg("  SHIFTR: %08x\n", getreg32(STM32_RTC_SHIFTR));
-  rtclldbg("    TSTR: %08x\n", getreg32(STM32_RTC_TSTR));
-  rtclldbg("    TSDR: %08x\n", getreg32(STM32_RTC_TSDR));
-  rtclldbg("   TSSSR: %08x\n", getreg32(STM32_RTC_TSSSR));
-  rtclldbg("    CALR: %08x\n", getreg32(STM32_RTC_CALR));
-  rtclldbg("   TAFCR: %08x\n", getreg32(STM32_RTC_TAFCR));
-  rtclldbg("ALRMASSR: %08x\n", getreg32(STM32_RTC_ALRMASSR));
-  rtclldbg("ALRMBSSR: %08x\n", getreg32(STM32_RTC_ALRMBSSR));
-  rtclldbg("MAGICREG: %08x\n", getreg32(RTC_MAGIC_REG));
+  rtcllerr("  ALRMAR: %08x\n", getreg32(STM32_RTC_ALRMAR));
+  rtcllerr("  ALRMBR: %08x\n", getreg32(STM32_RTC_ALRMBR));
+  rtcllerr("  SHIFTR: %08x\n", getreg32(STM32_RTC_SHIFTR));
+  rtcllerr("    TSTR: %08x\n", getreg32(STM32_RTC_TSTR));
+  rtcllerr("    TSDR: %08x\n", getreg32(STM32_RTC_TSDR));
+  rtcllerr("   TSSSR: %08x\n", getreg32(STM32_RTC_TSSSR));
+  rtcllerr("    CALR: %08x\n", getreg32(STM32_RTC_CALR));
+  rtcllerr("   TAFCR: %08x\n", getreg32(STM32_RTC_TAFCR));
+  rtcllerr("ALRMASSR: %08x\n", getreg32(STM32_RTC_ALRMASSR));
+  rtcllerr("ALRMBSSR: %08x\n", getreg32(STM32_RTC_ALRMBSSR));
+  rtcllerr("MAGICREG: %08x\n", getreg32(RTC_MAGIC_REG));
 }
 #else
 #  define rtc_dumpregs(msg)
@@ -222,13 +222,13 @@ static void rtc_dumpregs(FAR const char *msg)
 #ifdef CONFIG_DEBUG_RTC
 static void rtc_dumptime(FAR struct tm *tp, FAR const char *msg)
 {
-  rtclldbg("%s:\n", msg);
-  rtclldbg("  tm_sec: %08x\n", tp->tm_sec);
-  rtclldbg("  tm_min: %08x\n", tp->tm_min);
-  rtclldbg(" tm_hour: %08x\n", tp->tm_hour);
-  rtclldbg(" tm_mday: %08x\n", tp->tm_mday);
-  rtclldbg("  tm_mon: %08x\n", tp->tm_mon);
-  rtclldbg(" tm_year: %08x\n", tp->tm_year);
+  rtcllerr("%s:\n", msg);
+  rtcllerr("  tm_sec: %08x\n", tp->tm_sec);
+  rtcllerr("  tm_min: %08x\n", tp->tm_min);
+  rtcllerr(" tm_hour: %08x\n", tp->tm_hour);
+  rtcllerr(" tm_mday: %08x\n", tp->tm_mday);
+  rtcllerr("  tm_mon: %08x\n", tp->tm_mon);
+  rtcllerr(" tm_year: %08x\n", tp->tm_year);
 }
 #else
 #  define rtc_dumptime(tp, msg)
@@ -733,13 +733,13 @@ int up_rtc_initialize(void)
         {
           case OK:
             {
-              rtclldbg("rtc_syncwait() okay\n");
+              rtcllerr("rtc_syncwait() okay\n");
               break;
             }
 
           default:
             {
-              rtclldbg("rtc_syncwait() failed (%d)\n", ret);
+              rtcllerr("rtc_syncwait() failed (%d)\n", ret);
               break;
             }
         }
@@ -753,7 +753,7 @@ int up_rtc_initialize(void)
 
   if (regval != RTC_MAGIC)
     {
-      rtclldbg("Do setup\n");
+      rtcllerr("Do setup\n");
 
       /* Perform the one-time setup of the LSE clocking to the RTC */
 
@@ -771,7 +771,7 @@ int up_rtc_initialize(void)
     }
   else
     {
-      rtclldbg("Do resume\n");
+      rtcllerr("Do resume\n");
 
       /* RTC already set-up, just resume normal operation */
 
@@ -787,7 +787,7 @@ int up_rtc_initialize(void)
 
   if (ret != OK && nretry > 0)
     {
-      rtclldbg("setup/resume ran %d times and failed with %d\n",
+      rtcllerr("setup/resume ran %d times and failed with %d\n",
                 nretry, ret);
       return -ETIMEDOUT;
     }
diff --git a/arch/arm/src/stm32/stm32_sdio.c b/arch/arm/src/stm32/stm32_sdio.c
index ae31eb5ccd..c9686a4b75 100644
--- a/arch/arm/src/stm32/stm32_sdio.c
+++ b/arch/arm/src/stm32/stm32_sdio.c
@@ -901,7 +901,7 @@ static void stm32_dmacallback(DMA_HANDLE handle, uint8_t status, void *arg)
 
   if ((status & DMA_STATUS_ERROR) != 0)
     {
-      flldbg("DMA error %02x, remaining: %d\n", status, priv->remaining);
+      fllerr("DMA error %02x, remaining: %d\n", status, priv->remaining);
       result = SDIOWAIT_ERROR;
     }
   else
@@ -1166,7 +1166,7 @@ static void stm32_eventtimeout(int argc, uint32_t arg)
       /* Yes.. wake up any waiting threads */
 
       stm32_endwait(priv, SDIOWAIT_TIMEOUT);
-      flldbg("Timeout: remaining: %d\n", priv->remaining);
+      fllerr("Timeout: remaining: %d\n", priv->remaining);
     }
 }
 
@@ -1406,7 +1406,7 @@ static int stm32_interrupt(int irq, void *context)
             {
               /* Terminate the transfer with an error */
 
-              flldbg("ERROR: Data block CRC failure, remaining: %d\n", priv->remaining);
+              fllerr("ERROR: Data block CRC failure, remaining: %d\n", priv->remaining);
               stm32_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_ERROR);
             }
 
@@ -1416,7 +1416,7 @@ static int stm32_interrupt(int irq, void *context)
             {
               /* Terminate the transfer with an error */
 
-              flldbg("ERROR: Data timeout, remaining: %d\n", priv->remaining);
+              fllerr("ERROR: Data timeout, remaining: %d\n", priv->remaining);
               stm32_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_TIMEOUT);
             }
 
@@ -1426,7 +1426,7 @@ static int stm32_interrupt(int irq, void *context)
             {
               /* Terminate the transfer with an error */
 
-              flldbg("ERROR: RX FIFO overrun, remaining: %d\n", priv->remaining);
+              fllerr("ERROR: RX FIFO overrun, remaining: %d\n", priv->remaining);
               stm32_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_ERROR);
             }
 
@@ -1436,7 +1436,7 @@ static int stm32_interrupt(int irq, void *context)
             {
               /* Terminate the transfer with an error */
 
-              flldbg("ERROR: TX FIFO underrun, remaining: %d\n", priv->remaining);
+              fllerr("ERROR: TX FIFO underrun, remaining: %d\n", priv->remaining);
               stm32_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_ERROR);
             }
 
@@ -1446,7 +1446,7 @@ static int stm32_interrupt(int irq, void *context)
             {
               /* Terminate the transfer with an error */
 
-              flldbg("ERROR: Start bit, remaining: %d\n", priv->remaining);
+              fllerr("ERROR: Start bit, remaining: %d\n", priv->remaining);
               stm32_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_ERROR);
             }
         }
diff --git a/arch/arm/src/stm32/stm32_spi.c b/arch/arm/src/stm32/stm32_spi.c
index f589b83efa..803935fea5 100644
--- a/arch/arm/src/stm32/stm32_spi.c
+++ b/arch/arm/src/stm32/stm32_spi.c
@@ -165,9 +165,9 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg lldbg
+#  define spidbg llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/arch/arm/src/stm32/stm32_usbdev.c b/arch/arm/src/stm32/stm32_usbdev.c
index 631c936d74..b219a93e6c 100644
--- a/arch/arm/src/stm32/stm32_usbdev.c
+++ b/arch/arm/src/stm32/stm32_usbdev.c
@@ -673,7 +673,7 @@ static uint16_t stm32_getreg(uint32_t addr)
         {
            if (count == 4)
              {
-               lldbg("...\n");
+               llerr("...\n");
              }
           return val;
         }
@@ -689,7 +689,7 @@ static uint16_t stm32_getreg(uint32_t addr)
          {
            /* Yes.. then show how many times the value repeated */
 
-           lldbg("[repeats %d more times]\n", count-3);
+           llerr("[repeats %d more times]\n", count-3);
          }
 
        /* Save the new address, value, and count */
@@ -701,7 +701,7 @@ static uint16_t stm32_getreg(uint32_t addr)
 
   /* Show the register value read */
 
-  lldbg("%08x->%04x\n", addr, val);
+  llerr("%08x->%04x\n", addr, val);
   return val;
 }
 #endif
@@ -715,7 +715,7 @@ static void stm32_putreg(uint16_t val, uint32_t addr)
 {
   /* Show the register value being written */
 
-  lldbg("%08x<-%04x\n", addr, val);
+  llerr("%08x<-%04x\n", addr, val);
 
   /* Write the value */
 
@@ -734,35 +734,35 @@ static void stm32_dumpep(int epno)
 
   /* Common registers */
 
-  lldbg("CNTR:   %04x\n", getreg16(STM32_USB_CNTR));
-  lldbg("ISTR:   %04x\n", getreg16(STM32_USB_ISTR));
-  lldbg("FNR:    %04x\n", getreg16(STM32_USB_FNR));
-  lldbg("DADDR:  %04x\n", getreg16(STM32_USB_DADDR));
-  lldbg("BTABLE: %04x\n", getreg16(STM32_USB_BTABLE));
+  llerr("CNTR:   %04x\n", getreg16(STM32_USB_CNTR));
+  llerr("ISTR:   %04x\n", getreg16(STM32_USB_ISTR));
+  llerr("FNR:    %04x\n", getreg16(STM32_USB_FNR));
+  llerr("DADDR:  %04x\n", getreg16(STM32_USB_DADDR));
+  llerr("BTABLE: %04x\n", getreg16(STM32_USB_BTABLE));
 
   /* Endpoint register */
 
   addr = STM32_USB_EPR(epno);
-  lldbg("EPR%d:   [%08x] %04x\n", epno, addr, getreg16(addr));
+  llerr("EPR%d:   [%08x] %04x\n", epno, addr, getreg16(addr));
 
   /* Endpoint descriptor */
 
   addr = STM32_USB_BTABLE_ADDR(epno, 0);
-  lldbg("DESC:   %08x\n", addr);
+  llerr("DESC:   %08x\n", addr);
 
   /* Endpoint buffer descriptor */
 
   addr = STM32_USB_ADDR_TX(epno);
-  lldbg("  TX ADDR:  [%08x] %04x\n",  addr, getreg16(addr));
+  llerr("  TX ADDR:  [%08x] %04x\n",  addr, getreg16(addr));
 
   addr = STM32_USB_COUNT_TX(epno);
-  lldbg("     COUNT: [%08x] %04x\n",  addr, getreg16(addr));
+  llerr("     COUNT: [%08x] %04x\n",  addr, getreg16(addr));
 
   addr = STM32_USB_ADDR_RX(epno);
-  lldbg("  RX ADDR:  [%08x] %04x\n",  addr, getreg16(addr));
+  llerr("  RX ADDR:  [%08x] %04x\n",  addr, getreg16(addr));
 
   addr = STM32_USB_COUNT_RX(epno);
-  lldbg("     COUNT: [%08x] %04x\n",  addr, getreg16(addr));
+  llerr("     COUNT: [%08x] %04x\n",  addr, getreg16(addr));
 }
 #endif
 
@@ -777,12 +777,12 @@ static void stm32_checksetup(void)
   uint32_t apb1rstr = getreg32(STM32_RCC_APB1RSTR);
   uint32_t apb1enr  = getreg32(STM32_RCC_APB1ENR);
 
-  lldbg("CFGR: %08x APB1RSTR: %08x APB1ENR: %08x\n", cfgr, apb1rstr, apb1enr);
+  llerr("CFGR: %08x APB1RSTR: %08x APB1ENR: %08x\n", cfgr, apb1rstr, apb1enr);
 
   if ((apb1rstr & RCC_APB1RSTR_USBRST) != 0 ||
       (apb1enr & RCC_APB1ENR_USBEN) == 0)
     {
-      lldbg("ERROR: USB is NOT setup correctly\n");
+      llerr("ERROR: USB is NOT setup correctly\n");
     }
 }
 #endif
@@ -2844,7 +2844,7 @@ static int stm32_epconfigure(struct usbdev_ep_s *ep,
   if (!ep || !desc)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
-      ulldbg("ERROR: ep=%p desc=%p\n");
+      ullerr("ERROR: ep=%p desc=%p\n");
       return -EINVAL;
     }
 #endif
@@ -2940,7 +2940,7 @@ static int stm32_epdisable(struct usbdev_ep_s *ep)
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
-      ulldbg("ERROR: ep=%p\n", ep);
+      ullerr("ERROR: ep=%p\n", ep);
       return -EINVAL;
     }
 #endif
@@ -3028,7 +3028,7 @@ static int stm32_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
   if (!req || !req->callback || !req->buf || !ep)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
-      ulldbg("ERROR: req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep);
+      ullerr("ERROR: req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep);
       return -EINVAL;
     }
 #endif
@@ -3040,7 +3040,7 @@ static int stm32_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
   if (!priv->driver)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_NOTCONFIGURED), priv->usbdev.speed);
-      ulldbg("ERROR: driver=%p\n", priv->driver);
+      ullerr("ERROR: driver=%p\n", priv->driver);
       return -ESHUTDOWN;
     }
 #endif
@@ -3057,7 +3057,7 @@ static int stm32_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
   if (privep->stalled)
     {
       stm32_abortrequest(privep, privreq, -EBUSY);
-      ulldbg("ERROR: stalled\n");
+      ullerr("ERROR: stalled\n");
       ret = -EBUSY;
     }
 
diff --git a/arch/arm/src/stm32/stm32_wwdg.c b/arch/arm/src/stm32/stm32_wwdg.c
index a65bfadf96..2f9074867d 100644
--- a/arch/arm/src/stm32/stm32_wwdg.c
+++ b/arch/arm/src/stm32/stm32_wwdg.c
@@ -83,12 +83,12 @@
 
 /* Debug ********************************************************************/
 /* Non-standard debug that may be enabled just for testing the watchdog
- * driver.  NOTE: that only lldbg types are used so that the output is
+ * driver.  NOTE: that only llerr types are used so that the output is
  * immediately available.
  */
 
 #ifdef CONFIG_DEBUG_WATCHDOG
-#  define wddbg    lldbg
+#  define wddbg    llerr
 #  define wdinfo   llinfo
 #else
 #  define wddbg(x...)
@@ -200,7 +200,7 @@ static uint16_t stm32_getreg(uint32_t addr)
         {
           if (count == 4)
             {
-              lldbg("...\n");
+              llerr("...\n");
             }
 
           return val;
@@ -217,7 +217,7 @@ static uint16_t stm32_getreg(uint32_t addr)
         {
           /* Yes.. then show how many times the value repeated */
 
-          lldbg("[repeats %d more times]\n", count-3);
+          llerr("[repeats %d more times]\n", count-3);
         }
 
       /* Save the new address, value, and count */
@@ -229,7 +229,7 @@ static uint16_t stm32_getreg(uint32_t addr)
 
   /* Show the register value read */
 
-  lldbg("%08x->%04x\n", addr, val);
+  llerr("%08x->%04x\n", addr, val);
   return val;
 }
 #endif
@@ -247,7 +247,7 @@ static void stm32_putreg(uint16_t val, uint32_t addr)
 {
   /* Show the register value being written */
 
-  lldbg("%08x<-%04x\n", addr, val);
+  llerr("%08x<-%04x\n", addr, val);
 
   /* Write the value */
 
diff --git a/arch/arm/src/stm32/stm32f40xxx_rtcc.c b/arch/arm/src/stm32/stm32f40xxx_rtcc.c
index e513066a6a..d016e20559 100644
--- a/arch/arm/src/stm32/stm32f40xxx_rtcc.c
+++ b/arch/arm/src/stm32/stm32f40xxx_rtcc.c
@@ -136,12 +136,12 @@
 #ifdef CONFIG_DEBUG_RTC
 #  define rtcdbg             dbg
 #  define rtcinfo            info
-#  define rtclldbg           lldbg
+#  define rtcllerr           llerr
 #  define rtcllinfo          llinfo
 #else
 #  define rtcdbg(x...)
 #  define rtcinfo(x...)
-#  define rtclldbg(x...)
+#  define rtcllerr(x...)
 #  define rtcllinfo(x...)
 #endif
 
@@ -213,31 +213,31 @@ static void rtc_dumpregs(FAR const char *msg)
 {
   int rtc_state;
 
-  rtclldbg("%s:\n", msg);
-  rtclldbg("      TR: %08x\n", getreg32(STM32_RTC_TR));
-  rtclldbg("      DR: %08x\n", getreg32(STM32_RTC_DR));
-  rtclldbg("      CR: %08x\n", getreg32(STM32_RTC_CR));
-  rtclldbg("     ISR: %08x\n", getreg32(STM32_RTC_ISR));
-  rtclldbg("    PRER: %08x\n", getreg32(STM32_RTC_PRER));
-  rtclldbg("    WUTR: %08x\n", getreg32(STM32_RTC_WUTR));
-  rtclldbg("  ALRMAR: %08x\n", getreg32(STM32_RTC_ALRMAR));
-  rtclldbg("  ALRMBR: %08x\n", getreg32(STM32_RTC_ALRMBR));
-  rtclldbg("  SHIFTR: %08x\n", getreg32(STM32_RTC_SHIFTR));
-  rtclldbg("    TSTR: %08x\n", getreg32(STM32_RTC_TSTR));
-  rtclldbg("    TSDR: %08x\n", getreg32(STM32_RTC_TSDR));
-  rtclldbg("   TSSSR: %08x\n", getreg32(STM32_RTC_TSSSR));
-  rtclldbg("    CALR: %08x\n", getreg32(STM32_RTC_CALR));
-  rtclldbg("   TAFCR: %08x\n", getreg32(STM32_RTC_TAFCR));
-  rtclldbg("ALRMASSR: %08x\n", getreg32(STM32_RTC_ALRMASSR));
-  rtclldbg("ALRMBSSR: %08x\n", getreg32(STM32_RTC_ALRMBSSR));
-  rtclldbg("MAGICREG: %08x\n", getreg32(RTC_MAGIC_REG));
+  rtcllerr("%s:\n", msg);
+  rtcllerr("      TR: %08x\n", getreg32(STM32_RTC_TR));
+  rtcllerr("      DR: %08x\n", getreg32(STM32_RTC_DR));
+  rtcllerr("      CR: %08x\n", getreg32(STM32_RTC_CR));
+  rtcllerr("     ISR: %08x\n", getreg32(STM32_RTC_ISR));
+  rtcllerr("    PRER: %08x\n", getreg32(STM32_RTC_PRER));
+  rtcllerr("    WUTR: %08x\n", getreg32(STM32_RTC_WUTR));
+  rtcllerr("  ALRMAR: %08x\n", getreg32(STM32_RTC_ALRMAR));
+  rtcllerr("  ALRMBR: %08x\n", getreg32(STM32_RTC_ALRMBR));
+  rtcllerr("  SHIFTR: %08x\n", getreg32(STM32_RTC_SHIFTR));
+  rtcllerr("    TSTR: %08x\n", getreg32(STM32_RTC_TSTR));
+  rtcllerr("    TSDR: %08x\n", getreg32(STM32_RTC_TSDR));
+  rtcllerr("   TSSSR: %08x\n", getreg32(STM32_RTC_TSSSR));
+  rtcllerr("    CALR: %08x\n", getreg32(STM32_RTC_CALR));
+  rtcllerr("   TAFCR: %08x\n", getreg32(STM32_RTC_TAFCR));
+  rtcllerr("ALRMASSR: %08x\n", getreg32(STM32_RTC_ALRMASSR));
+  rtcllerr("ALRMBSSR: %08x\n", getreg32(STM32_RTC_ALRMBSSR));
+  rtcllerr("MAGICREG: %08x\n", getreg32(RTC_MAGIC_REG));
 
   rtc_state =
     ((getreg32(STM32_EXTI_RTSR) & EXTI_RTC_ALARM) ? 0x1000 : 0) |
     ((getreg32(STM32_EXTI_FTSR) & EXTI_RTC_ALARM) ? 0x0100 : 0) |
     ((getreg32(STM32_EXTI_IMR)  & EXTI_RTC_ALARM) ? 0x0010 : 0) |
     ((getreg32(STM32_EXTI_EMR)  & EXTI_RTC_ALARM) ? 0x0001 : 0);
-  rtclldbg("EXTI (RTSR FTSR ISR EVT): %01x\n",rtc_state);
+  rtcllerr("EXTI (RTSR FTSR ISR EVT): %01x\n",rtc_state);
 }
 #else
 #  define rtc_dumpregs(msg)
@@ -260,13 +260,13 @@ static void rtc_dumpregs(FAR const char *msg)
 #ifdef CONFIG_DEBUG_RTC
 static void rtc_dumptime(FAR const struct tm *tp, FAR const char *msg)
 {
-  rtclldbg("%s:\n", msg);
-  rtclldbg("  tm_sec: %08x\n", tp->tm_sec);
-  rtclldbg("  tm_min: %08x\n", tp->tm_min);
-  rtclldbg(" tm_hour: %08x\n", tp->tm_hour);
-  rtclldbg(" tm_mday: %08x\n", tp->tm_mday);
-  rtclldbg("  tm_mon: %08x\n", tp->tm_mon);
-  rtclldbg(" tm_year: %08x\n", tp->tm_year);
+  rtcllerr("%s:\n", msg);
+  rtcllerr("  tm_sec: %08x\n", tp->tm_sec);
+  rtcllerr("  tm_min: %08x\n", tp->tm_min);
+  rtcllerr(" tm_hour: %08x\n", tp->tm_hour);
+  rtcllerr(" tm_mday: %08x\n", tp->tm_mday);
+  rtcllerr("  tm_mon: %08x\n", tp->tm_mon);
+  rtcllerr(" tm_year: %08x\n", tp->tm_year);
 }
 #else
 #  define rtc_dumptime(tp, msg)
@@ -989,13 +989,13 @@ int up_rtc_initialize(void)
         {
           case OK:
             {
-              rtclldbg("rtc_syncwait() okay\n");
+              rtcllerr("rtc_syncwait() okay\n");
               break;
             }
 
           default:
             {
-              rtclldbg("rtc_syncwait() failed (%d)\n", ret);
+              rtcllerr("rtc_syncwait() failed (%d)\n", ret);
               break;
             }
         }
@@ -1009,7 +1009,7 @@ int up_rtc_initialize(void)
 
   if (regval != RTC_MAGIC)
     {
-      rtclldbg("Do setup\n");
+      rtcllerr("Do setup\n");
 
       /* Perform the one-time setup of the LSE clocking to the RTC */
 
@@ -1027,7 +1027,7 @@ int up_rtc_initialize(void)
     }
   else
     {
-      rtclldbg("Do resume\n");
+      rtcllerr("Do resume\n");
 
       /* RTC already set-up, just resume normal operation */
 
@@ -1043,7 +1043,7 @@ int up_rtc_initialize(void)
 
   if (ret != OK && nretry > 0)
     {
-      rtclldbg("setup/resume ran %d times and failed with %d\n",
+      rtcllerr("setup/resume ran %d times and failed with %d\n",
                 nretry, ret);
       return -ETIMEDOUT;
     }
diff --git a/arch/arm/src/stm32f7/stm32_dumpgpio.c b/arch/arm/src/stm32f7/stm32_dumpgpio.c
index fcd3357efe..a826720bbc 100644
--- a/arch/arm/src/stm32f7/stm32_dumpgpio.c
+++ b/arch/arm/src/stm32f7/stm32_dumpgpio.c
@@ -127,27 +127,27 @@ int stm32_dumpgpio(uint32_t pinset, const char *msg)
 
   DEBUGASSERT(port < STM32F7_NGPIO);
 
-  lldbg("GPIO%c pinset: %08x base: %08x -- %s\n",
+  llerr("GPIO%c pinset: %08x base: %08x -- %s\n",
         g_portchar[port], pinset, base, msg);
 
   if ((getreg32(STM32_RCC_AHB1ENR) & RCC_AHB1ENR_GPIOEN(port)) != 0)
     {
-      lldbg(" MODE: %08x OTYPE: %04x     OSPEED: %08x PUPDR: %08x\n",
+      llerr(" MODE: %08x OTYPE: %04x     OSPEED: %08x PUPDR: %08x\n",
             getreg32(base + STM32_GPIO_MODER_OFFSET),
             getreg32(base + STM32_GPIO_OTYPER_OFFSET),
             getreg32(base + STM32_GPIO_OSPEED_OFFSET),
             getreg32(base + STM32_GPIO_PUPDR_OFFSET));
-      lldbg("  IDR: %04x       ODR: %04x       LCKR: %05x\n",
+      llerr("  IDR: %04x       ODR: %04x       LCKR: %05x\n",
             getreg32(base + STM32_GPIO_IDR_OFFSET),
             getreg32(base + STM32_GPIO_ODR_OFFSET),
             getreg32(base + STM32_GPIO_LCKR_OFFSET));
-      lldbg(" AFRH: %08x  AFRL: %08x\n",
+      llerr(" AFRH: %08x  AFRL: %08x\n",
             getreg32(base + STM32_GPIO_AFRH_OFFSET),
             getreg32(base + STM32_GPIO_AFRL_OFFSET));
     }
   else
     {
-      lldbg("  GPIO%c not enabled: AHB1ENR: %08x\n",
+      llerr("  GPIO%c not enabled: AHB1ENR: %08x\n",
             g_portchar[port], getreg32(STM32_RCC_AHB1ENR));
     }
 
diff --git a/arch/arm/src/stm32f7/stm32_ethernet.c b/arch/arm/src/stm32f7/stm32_ethernet.c
index af0e461446..d2aae9bfa2 100644
--- a/arch/arm/src/stm32f7/stm32_ethernet.c
+++ b/arch/arm/src/stm32f7/stm32_ethernet.c
@@ -816,7 +816,7 @@ static uint32_t stm32_getreg(uint32_t addr)
         {
           if (count == 4)
             {
-              lldbg("...\n");
+              llerr("...\n");
             }
 
           return val;
@@ -833,7 +833,7 @@ static uint32_t stm32_getreg(uint32_t addr)
         {
           /* Yes.. then show how many times the value repeated */
 
-          lldbg("[repeats %d more times]\n", count-3);
+          llerr("[repeats %d more times]\n", count-3);
         }
 
       /* Save the new address, value, and count */
@@ -845,7 +845,7 @@ static uint32_t stm32_getreg(uint32_t addr)
 
   /* Show the register value read */
 
-  lldbg("%08x->%08x\n", addr, val);
+  llerr("%08x->%08x\n", addr, val);
   return val;
 }
 #endif
@@ -872,7 +872,7 @@ static void stm32_putreg(uint32_t val, uint32_t addr)
 {
   /* Show the register value being written */
 
-  lldbg("%08x<-%08x\n", addr, val);
+  llerr("%08x<-%08x\n", addr, val);
 
   /* Write the value */
 
@@ -1589,7 +1589,7 @@ static int stm32_recvframe(struct stm32_ethmac_s *priv)
 
   if (!stm32_isfreebuffer(priv))
     {
-      nlldbg("No free buffers\n");
+      nllerr("No free buffers\n");
       return -ENOMEM;
     }
 
@@ -1718,7 +1718,7 @@ static int stm32_recvframe(struct stm32_ethmac_s *priv)
                * scanning logic, and continue scanning with the next frame.
                */
 
-              nlldbg("DROPPED: RX descriptor errors: %08x\n", rxdesc->rdes0);
+              nllerr("DROPPED: RX descriptor errors: %08x\n", rxdesc->rdes0);
               stm32_freesegment(priv, rxcurr, priv->segments);
             }
         }
@@ -1784,7 +1784,7 @@ static void stm32_receive(struct stm32_ethmac_s *priv)
 
       if (dev->d_len > CONFIG_NET_ETH_MTU)
         {
-          nlldbg("DROPPED: Too big: %d\n", dev->d_len);
+          nllerr("DROPPED: Too big: %d\n", dev->d_len);
           continue;
         }
 
@@ -1894,7 +1894,7 @@ static void stm32_receive(struct stm32_ethmac_s *priv)
       else
 #endif
         {
-          nlldbg("DROPPED: Unknown type: %04x\n", BUF->type);
+          nllerr("DROPPED: Unknown type: %04x\n", BUF->type);
         }
 
       /* We are finished with the RX buffer.  NOTE:  If the buffer is
@@ -2158,7 +2158,7 @@ static inline void stm32_interrupt_process(struct stm32_ethmac_s *priv)
     {
       /* Just let the user know what happened */
 
-      nlldbg("Abormal event(s): %08x\n", dmasr);
+      nllerr("Abormal event(s): %08x\n", dmasr);
 
       /* Clear all pending abnormal events */
 
@@ -2362,7 +2362,7 @@ static void stm32_txtimeout_expiry(int argc, uint32_t arg, ...)
 {
   struct stm32_ethmac_s *priv = (struct stm32_ethmac_s *)arg;
 
-  nlldbg("Timeout!\n");
+  nllerr("Timeout!\n");
 
 #ifdef CONFIG_NET_NOINTS
   /* Disable further Ethernet interrupts.  This will prevent some race
diff --git a/arch/arm/src/stm32f7/stm32_irq.c b/arch/arm/src/stm32f7/stm32_irq.c
index ca3c5f64fb..125555cbcb 100644
--- a/arch/arm/src/stm32f7/stm32_irq.c
+++ b/arch/arm/src/stm32f7/stm32_irq.c
@@ -116,50 +116,50 @@ static void stm32_dumpnvic(const char *msg, int irq)
   irqstate_t flags;
 
   flags = enter_critical_section();
-  lldbg("NVIC (%s, irq=%d):\n", msg, irq);
-  lldbg("  INTCTRL:    %08x VECTAB:  %08x\n",
+  llerr("NVIC (%s, irq=%d):\n", msg, irq);
+  llerr("  INTCTRL:    %08x VECTAB:  %08x\n",
         getreg32(NVIC_INTCTRL), getreg32(NVIC_VECTAB));
 #if 0
-  lldbg("  SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n",
+  llerr("  SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n",
         getreg32(NVIC_SYSHCON_MEMFAULTENA), getreg32(NVIC_SYSHCON_BUSFAULTENA),
         getreg32(NVIC_SYSHCON_USGFAULTENA), getreg32(NVIC_SYSTICK_CTRL_ENABLE));
 #endif
-  lldbg("  IRQ ENABLE: %08x %08x %08x\n",
+  llerr("  IRQ ENABLE: %08x %08x %08x\n",
         getreg32(NVIC_IRQ0_31_ENABLE), getreg32(NVIC_IRQ32_63_ENABLE),
         getreg32(NVIC_IRQ64_95_ENABLE));
-  lldbg("  SYSH_PRIO:  %08x %08x %08x\n",
+  llerr("  SYSH_PRIO:  %08x %08x %08x\n",
         getreg32(NVIC_SYSH4_7_PRIORITY), getreg32(NVIC_SYSH8_11_PRIORITY),
         getreg32(NVIC_SYSH12_15_PRIORITY));
-  lldbg("  IRQ PRIO:   %08x %08x %08x %08x\n",
+  llerr("  IRQ PRIO:   %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ0_3_PRIORITY), getreg32(NVIC_IRQ4_7_PRIORITY),
         getreg32(NVIC_IRQ8_11_PRIORITY), getreg32(NVIC_IRQ12_15_PRIORITY));
 #if NR_INTERRUPTS > 15
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ16_19_PRIORITY), getreg32(NVIC_IRQ20_23_PRIORITY),
         getreg32(NVIC_IRQ24_27_PRIORITY), getreg32(NVIC_IRQ28_31_PRIORITY));
 #endif
 #if NR_INTERRUPTS > 31
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ32_35_PRIORITY), getreg32(NVIC_IRQ36_39_PRIORITY),
         getreg32(NVIC_IRQ40_43_PRIORITY), getreg32(NVIC_IRQ44_47_PRIORITY));
 #endif
 #if NR_INTERRUPTS > 47
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ48_51_PRIORITY), getreg32(NVIC_IRQ52_55_PRIORITY),
         getreg32(NVIC_IRQ56_59_PRIORITY), getreg32(NVIC_IRQ60_63_PRIORITY));
 #endif
 #if NR_INTERRUPTS > 63
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ64_67_PRIORITY), getreg32(NVIC_IRQ68_71_PRIORITY),
         getreg32(NVIC_IRQ72_75_PRIORITY), getreg32(NVIC_IRQ76_79_PRIORITY));
 #endif
 #if NR_INTERRUPTS > 79
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ80_83_PRIORITY), getreg32(NVIC_IRQ84_87_PRIORITY),
         getreg32(NVIC_IRQ88_91_PRIORITY), getreg32(NVIC_IRQ92_95_PRIORITY));
 #endif
 #if NR_INTERRUPTS > 95
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ96_99_PRIORITY), getreg32(NVIC_IRQ100_103_PRIORITY),
         getreg32(NVIC_IRQ104_107_PRIORITY), getreg32(NVIC_IRQ108_111_PRIORITY));
 #endif
diff --git a/arch/arm/src/stm32l4/stm32l4_can.c b/arch/arm/src/stm32l4/stm32l4_can.c
index 00789f419b..bb4e049312 100644
--- a/arch/arm/src/stm32l4/stm32l4_can.c
+++ b/arch/arm/src/stm32l4/stm32l4_can.c
@@ -88,12 +88,12 @@
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
 #  define caninfo   info
-#  define canlldbg  lldbg
+#  define canllerr  llerr
 #  define canllinfo llinfo
 #else
 #  define candbg(x...)
 #  define caninfo(x...)
-#  define canlldbg(x...)
+#  define canllerr(x...)
 #  define canllinfo(x...)
 #endif
 
@@ -237,7 +237,7 @@ static uint32_t can_vgetreg(uint32_t addr)
         {
           if (count == 4)
             {
-              lldbg("...\n");
+              llerr("...\n");
             }
 
           return val;
@@ -254,7 +254,7 @@ static uint32_t can_vgetreg(uint32_t addr)
         {
           /* Yes.. then show how many times the value repeated */
 
-          lldbg("[repeats %d more times]\n", count-3);
+          llerr("[repeats %d more times]\n", count-3);
         }
 
       /* Save the new address, value, and count */
@@ -266,7 +266,7 @@ static uint32_t can_vgetreg(uint32_t addr)
 
   /* Show the register value read */
 
-  lldbg("%08x->%08x\n", addr, val);
+  llerr("%08x->%08x\n", addr, val);
   return val;
 }
 
@@ -315,7 +315,7 @@ static void can_vputreg(uint32_t addr, uint32_t value)
 {
   /* Show the register value being written */
 
-  lldbg("%08x<-%08x\n", addr, value);
+  llerr("%08x<-%08x\n", addr, value);
 
   /* Write the value */
 
@@ -363,25 +363,25 @@ static void can_dumpctrlregs(struct stm32l4_can_s *priv, FAR const char *msg)
 {
   if (msg)
     {
-      canlldbg("Control Registers: %s\n", msg);
+      canllerr("Control Registers: %s\n", msg);
     }
   else
     {
-      canlldbg("Control Registers:\n");
+      canllerr("Control Registers:\n");
     }
 
   /* CAN control and status registers */
 
-  lldbg("  MCR: %08x   MSR: %08x   TSR: %08x\n",
+  llerr("  MCR: %08x   MSR: %08x   TSR: %08x\n",
         getreg32(priv->base + STM32L4_CAN_MCR_OFFSET),
         getreg32(priv->base + STM32L4_CAN_MSR_OFFSET),
         getreg32(priv->base + STM32L4_CAN_TSR_OFFSET));
 
-  lldbg(" RF0R: %08x  RF1R: %08x\n",
+  llerr(" RF0R: %08x  RF1R: %08x\n",
         getreg32(priv->base + STM32L4_CAN_RF0R_OFFSET),
         getreg32(priv->base + STM32L4_CAN_RF1R_OFFSET));
 
-  lldbg("  IER: %08x   ESR: %08x   BTR: %08x\n",
+  llerr("  IER: %08x   ESR: %08x   BTR: %08x\n",
         getreg32(priv->base + STM32L4_CAN_IER_OFFSET),
         getreg32(priv->base + STM32L4_CAN_ESR_OFFSET),
         getreg32(priv->base + STM32L4_CAN_BTR_OFFSET));
@@ -407,40 +407,40 @@ static void can_dumpmbregs(struct stm32l4_can_s *priv, FAR const char *msg)
 {
   if (msg)
     {
-      canlldbg("Mailbox Registers: %s\n", msg);
+      canllerr("Mailbox Registers: %s\n", msg);
     }
   else
     {
-      canlldbg("Mailbox Registers:\n");
+      canllerr("Mailbox Registers:\n");
     }
 
   /* CAN mailbox registers (3 TX and 2 RX) */
 
-  lldbg(" TI0R: %08x TDT0R: %08x TDL0R: %08x TDH0R: %08x\n",
+  llerr(" TI0R: %08x TDT0R: %08x TDL0R: %08x TDH0R: %08x\n",
         getreg32(priv->base + STM32L4_CAN_TI0R_OFFSET),
         getreg32(priv->base + STM32L4_CAN_TDT0R_OFFSET),
         getreg32(priv->base + STM32L4_CAN_TDL0R_OFFSET),
         getreg32(priv->base + STM32L4_CAN_TDH0R_OFFSET));
 
-  lldbg(" TI1R: %08x TDT1R: %08x TDL1R: %08x TDH1R: %08x\n",
+  llerr(" TI1R: %08x TDT1R: %08x TDL1R: %08x TDH1R: %08x\n",
         getreg32(priv->base + STM32L4_CAN_TI1R_OFFSET),
         getreg32(priv->base + STM32L4_CAN_TDT1R_OFFSET),
         getreg32(priv->base + STM32L4_CAN_TDL1R_OFFSET),
         getreg32(priv->base + STM32L4_CAN_TDH1R_OFFSET));
 
-  lldbg(" TI2R: %08x TDT2R: %08x TDL2R: %08x TDH2R: %08x\n",
+  llerr(" TI2R: %08x TDT2R: %08x TDL2R: %08x TDH2R: %08x\n",
         getreg32(priv->base + STM32L4_CAN_TI2R_OFFSET),
         getreg32(priv->base + STM32L4_CAN_TDT2R_OFFSET),
         getreg32(priv->base + STM32L4_CAN_TDL2R_OFFSET),
         getreg32(priv->base + STM32L4_CAN_TDH2R_OFFSET));
 
-  lldbg(" RI0R: %08x RDT0R: %08x RDL0R: %08x RDH0R: %08x\n",
+  llerr(" RI0R: %08x RDT0R: %08x RDL0R: %08x RDH0R: %08x\n",
         getreg32(priv->base + STM32L4_CAN_RI0R_OFFSET),
         getreg32(priv->base + STM32L4_CAN_RDT0R_OFFSET),
         getreg32(priv->base + STM32L4_CAN_RDL0R_OFFSET),
         getreg32(priv->base + STM32L4_CAN_RDH0R_OFFSET));
 
-  lldbg(" RI1R: %08x RDT1R: %08x RDL1R: %08x RDH1R: %08x\n",
+  llerr(" RI1R: %08x RDT1R: %08x RDL1R: %08x RDH1R: %08x\n",
         getreg32(priv->base + STM32L4_CAN_RI1R_OFFSET),
         getreg32(priv->base + STM32L4_CAN_RDT1R_OFFSET),
         getreg32(priv->base + STM32L4_CAN_RDL1R_OFFSET),
@@ -469,14 +469,14 @@ static void can_dumpfiltregs(struct stm32l4_can_s *priv, FAR const char *msg)
 
   if (msg)
     {
-      canlldbg("Filter Registers: %s\n", msg);
+      canllerr("Filter Registers: %s\n", msg);
     }
   else
     {
-      canlldbg("Filter Registers:\n");
+      canllerr("Filter Registers:\n");
     }
 
-  lldbg(" FMR: %08x   FM1R: %08x  FS1R: %08x FFA1R: %08x  FA1R: %08x\n",
+  llerr(" FMR: %08x   FM1R: %08x  FS1R: %08x FFA1R: %08x  FA1R: %08x\n",
         getreg32(priv->base + STM32L4_CAN_FMR_OFFSET),
         getreg32(priv->base + STM32L4_CAN_FM1R_OFFSET),
         getreg32(priv->base + STM32L4_CAN_FS1R_OFFSET),
@@ -485,7 +485,7 @@ static void can_dumpfiltregs(struct stm32l4_can_s *priv, FAR const char *msg)
 
   for (i = 0; i < CAN_NFILTERS; i++)
     {
-      lldbg(" F%dR1: %08x F%dR2: %08x\n",
+      llerr(" F%dR1: %08x F%dR2: %08x\n",
             i, getreg32(priv->base + STM32L4_CAN_FIR_OFFSET(i, 1)),
             i, getreg32(priv->base + STM32L4_CAN_FIR_OFFSET(i, 2)));
     }
@@ -526,7 +526,7 @@ static void can_reset(FAR struct can_dev_s *dev)
   else
 #endif
     {
-      canlldbg("Unsupported port %d\n", priv->port);
+      canllerr("Unsupported port %d\n", priv->port);
       return;
     }
 
@@ -576,7 +576,7 @@ static int can_setup(FAR struct can_dev_s *dev)
   ret = can_cellinit(priv);
   if (ret < 0)
     {
-      canlldbg("CAN%d cell initialization failed: %d\n", priv->port, ret);
+      canllerr("CAN%d cell initialization failed: %d\n", priv->port, ret);
       return ret;
     }
 
@@ -588,7 +588,7 @@ static int can_setup(FAR struct can_dev_s *dev)
   ret = can_filterinit(priv);
   if (ret < 0)
     {
-      canlldbg("CAN%d filter initialization failed: %d\n", priv->port, ret);
+      canllerr("CAN%d filter initialization failed: %d\n", priv->port, ret);
       return ret;
     }
 
@@ -599,14 +599,14 @@ static int can_setup(FAR struct can_dev_s *dev)
   ret = irq_attach(priv->canrx0, can_rx0interrupt);
   if (ret < 0)
     {
-      canlldbg("Failed to attach CAN%d RX0 IRQ (%d)", priv->port, priv->canrx0);
+      canllerr("Failed to attach CAN%d RX0 IRQ (%d)", priv->port, priv->canrx0);
       return ret;
     }
 
   ret = irq_attach(priv->cantx, can_txinterrupt);
   if (ret < 0)
     {
-      canlldbg("Failed to attach CAN%d TX IRQ (%d)", priv->port, priv->cantx);
+      canllerr("Failed to attach CAN%d TX IRQ (%d)", priv->port, priv->cantx);
       return ret;
     }
 
@@ -815,7 +815,7 @@ static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg)
     }
   else
     {
-      canlldbg("ERROR: No available mailbox\n");
+      canllerr("ERROR: No available mailbox\n");
       return -EBUSY;
     }
 
@@ -1029,7 +1029,7 @@ static int can_rx0interrupt(int irq, void *context)
   npending = (regval & CAN_RFR_FMP_MASK) >> CAN_RFR_FMP_SHIFT;
   if (npending < 1)
     {
-      canlldbg("WARNING: No messages pending\n");
+      canllerr("WARNING: No messages pending\n");
       return OK;
     }
 
@@ -1053,7 +1053,7 @@ static int can_rx0interrupt(int irq, void *context)
 #else
   if ((regval & CAN_RIR_IDE) != 0)
     {
-      canlldbg("ERROR: Received message with extended identifier.  Dropped\n");
+      canllerr("ERROR: Received message with extended identifier.  Dropped\n");
       ret = -ENOSYS;
       goto errout;
     }
@@ -1392,7 +1392,7 @@ static int can_cellinit(struct stm32l4_can_s *priv)
 
   if (timeout < 1)
     {
-      canlldbg("ERROR: Timed out waiting to enter initialization mode\n");
+      canllerr("ERROR: Timed out waiting to enter initialization mode\n");
       return -ETIMEDOUT;
     }
 
@@ -1415,7 +1415,7 @@ static int can_cellinit(struct stm32l4_can_s *priv)
   ret = can_bittiming(priv);
   if (ret < 0)
     {
-      canlldbg("ERROR: Failed to set bit timing: %d\n", ret);
+      canllerr("ERROR: Failed to set bit timing: %d\n", ret);
       return ret;
     }
 
@@ -1442,7 +1442,7 @@ static int can_cellinit(struct stm32l4_can_s *priv)
 
   if (timeout < 1)
     {
-      canlldbg("ERROR: Timed out waiting to exit initialization mode: %08x\n", regval);
+      canllerr("ERROR: Timed out waiting to exit initialization mode: %08x\n", regval);
       return -ETIMEDOUT;
     }
 
diff --git a/arch/arm/src/stm32l4/stm32l4_irq.c b/arch/arm/src/stm32l4/stm32l4_irq.c
index ebf76d7fd2..2a11ef105f 100644
--- a/arch/arm/src/stm32l4/stm32l4_irq.c
+++ b/arch/arm/src/stm32l4/stm32l4_irq.c
@@ -112,33 +112,33 @@ static void stm32l4_dumpnvic(const char *msg, int irq)
   irqstate_t flags;
 
   flags = enter_critical_section();
-  lldbg("NVIC (%s, irq=%d):\n", msg, irq);
-  lldbg("  INTCTRL:    %08x VECTAB:  %08x\n",
+  llerr("NVIC (%s, irq=%d):\n", msg, irq);
+  llerr("  INTCTRL:    %08x VECTAB:  %08x\n",
         getreg32(NVIC_INTCTRL), getreg32(NVIC_VECTAB));
 #if 0
-  lldbg("  SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n",
+  llerr("  SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n",
         getreg32(NVIC_SYSHCON_MEMFAULTENA), getreg32(NVIC_SYSHCON_BUSFAULTENA),
         getreg32(NVIC_SYSHCON_USGFAULTENA), getreg32(NVIC_SYSTICK_CTRL_ENABLE));
 #endif
-  lldbg("  IRQ ENABLE: %08x %08x %08x\n",
+  llerr("  IRQ ENABLE: %08x %08x %08x\n",
         getreg32(NVIC_IRQ0_31_ENABLE), getreg32(NVIC_IRQ32_63_ENABLE),
         getreg32(NVIC_IRQ64_95_ENABLE));
-  lldbg("  SYSH_PRIO:  %08x %08x %08x\n",
+  llerr("  SYSH_PRIO:  %08x %08x %08x\n",
         getreg32(NVIC_SYSH4_7_PRIORITY), getreg32(NVIC_SYSH8_11_PRIORITY),
         getreg32(NVIC_SYSH12_15_PRIORITY));
-  lldbg("  IRQ PRIO:   %08x %08x %08x %08x\n",
+  llerr("  IRQ PRIO:   %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ0_3_PRIORITY), getreg32(NVIC_IRQ4_7_PRIORITY),
         getreg32(NVIC_IRQ8_11_PRIORITY), getreg32(NVIC_IRQ12_15_PRIORITY));
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ16_19_PRIORITY), getreg32(NVIC_IRQ20_23_PRIORITY),
         getreg32(NVIC_IRQ24_27_PRIORITY), getreg32(NVIC_IRQ28_31_PRIORITY));
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ32_35_PRIORITY), getreg32(NVIC_IRQ36_39_PRIORITY),
         getreg32(NVIC_IRQ40_43_PRIORITY), getreg32(NVIC_IRQ44_47_PRIORITY));
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ48_51_PRIORITY), getreg32(NVIC_IRQ52_55_PRIORITY),
         getreg32(NVIC_IRQ56_59_PRIORITY), getreg32(NVIC_IRQ60_63_PRIORITY));
-  lldbg("              %08x\n",
+  llerr("              %08x\n",
         getreg32(NVIC_IRQ64_67_PRIORITY));
   leave_critical_section(flags);
 }
diff --git a/arch/arm/src/stm32l4/stm32l4_qspi.c b/arch/arm/src/stm32l4/stm32l4_qspi.c
index 7a932930eb..459b921ab6 100644
--- a/arch/arm/src/stm32l4/stm32l4_qspi.c
+++ b/arch/arm/src/stm32l4/stm32l4_qspi.c
@@ -101,9 +101,9 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define qspidbg lldbg
+#  define qspidbg llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define qspiinfo lldbg
+#    define qspiinfo llerr
 #  else
 #    define qspiinfo(x...)
 #  endif
@@ -426,7 +426,7 @@ static bool qspi_checkreg(struct stm32l4_qspidev_s *priv, bool wr, uint32_t valu
         {
           /* Yes... show how many times we did it */
 
-          lldbg("...[Repeats %d times]...\n", priv->ntimes);
+          llerr("...[Repeats %d times]...\n", priv->ntimes);
         }
 
       /* Save information about the new access */
@@ -460,7 +460,7 @@ static inline uint32_t qspi_getreg(struct stm32l4_qspidev_s *priv,
 #ifdef CONFIG_STM32L4_QSPI_REGDEBUG
   if (qspi_checkreg(priv, false, value, address))
     {
-      lldbg("%08x->%08x\n", address, value);
+      llerr("%08x->%08x\n", address, value);
     }
 #endif
 
@@ -483,7 +483,7 @@ static inline void qspi_putreg(struct stm32l4_qspidev_s *priv, uint32_t value,
 #ifdef CONFIG_STM32L4_QSPI_REGDEBUG
   if (qspi_checkreg(priv, true, value, address))
     {
-      lldbg("%08x<-%08x\n", address, value);
+      llerr("%08x<-%08x\n", address, value);
     }
 #endif
 
diff --git a/arch/arm/src/stm32l4/stm32l4_rtcc.c b/arch/arm/src/stm32l4/stm32l4_rtcc.c
index c13ddf1442..1d959e688a 100644
--- a/arch/arm/src/stm32l4/stm32l4_rtcc.c
+++ b/arch/arm/src/stm32l4/stm32l4_rtcc.c
@@ -121,12 +121,12 @@
 #ifdef CONFIG_DEBUG_RTC
 #  define rtcdbg    dbg
 #  define rtcinfo   info
-#  define rtclldbg  lldbg
+#  define rtcllerr  llerr
 #  define rtcllinfo llinfo
 #else
 #  define rtcdbg(x...)
 #  define rtcinfo(x...)
-#  define rtclldbg(x...)
+#  define rtcllerr(x...)
 #  define rtcllinfo(x...)
 #endif
 
@@ -194,24 +194,24 @@ static int rtchw_set_alrmbr(rtc_alarmreg_t alarmreg);
 #ifdef CONFIG_DEBUG_RTC
 static void rtc_dumpregs(FAR const char *msg)
 {
-  rtclldbg("%s:\n", msg);
-  rtclldbg("      TR: %08x\n", getreg32(STM32L4_RTC_TR));
-  rtclldbg("      DR: %08x\n", getreg32(STM32L4_RTC_DR));
-  rtclldbg("      CR: %08x\n", getreg32(STM32L4_RTC_CR));
-  rtclldbg("     ISR: %08x\n", getreg32(STM32L4_RTC_ISR));
-  rtclldbg("    PRER: %08x\n", getreg32(STM32L4_RTC_PRER));
-  rtclldbg("    WUTR: %08x\n", getreg32(STM32L4_RTC_WUTR));
+  rtcllerr("%s:\n", msg);
+  rtcllerr("      TR: %08x\n", getreg32(STM32L4_RTC_TR));
+  rtcllerr("      DR: %08x\n", getreg32(STM32L4_RTC_DR));
+  rtcllerr("      CR: %08x\n", getreg32(STM32L4_RTC_CR));
+  rtcllerr("     ISR: %08x\n", getreg32(STM32L4_RTC_ISR));
+  rtcllerr("    PRER: %08x\n", getreg32(STM32L4_RTC_PRER));
+  rtcllerr("    WUTR: %08x\n", getreg32(STM32L4_RTC_WUTR));
   
-  rtclldbg("  ALRMAR: %08x\n", getreg32(STM32L4_RTC_ALRMAR));
-  rtclldbg("  ALRMBR: %08x\n", getreg32(STM32L4_RTC_ALRMBR));
-  rtclldbg("  SHIFTR: %08x\n", getreg32(STM32L4_RTC_SHIFTR));
-  rtclldbg("    TSTR: %08x\n", getreg32(STM32L4_RTC_TSTR));
-  rtclldbg("    TSDR: %08x\n", getreg32(STM32L4_RTC_TSDR));
-  rtclldbg("   TSSSR: %08x\n", getreg32(STM32L4_RTC_TSSSR));
-  rtclldbg("    CALR: %08x\n", getreg32(STM32L4_RTC_CALR));
-  rtclldbg("  TAMPCR: %08x\n", getreg32(STM32L4_RTC_TAMPCR));
-  rtclldbg("ALRMASSR: %08x\n", getreg32(STM32L4_RTC_ALRMASSR));
-  rtclldbg("ALRMBSSR: %08x\n", getreg32(STM32L4_RTC_ALRMBSSR));
+  rtcllerr("  ALRMAR: %08x\n", getreg32(STM32L4_RTC_ALRMAR));
+  rtcllerr("  ALRMBR: %08x\n", getreg32(STM32L4_RTC_ALRMBR));
+  rtcllerr("  SHIFTR: %08x\n", getreg32(STM32L4_RTC_SHIFTR));
+  rtcllerr("    TSTR: %08x\n", getreg32(STM32L4_RTC_TSTR));
+  rtcllerr("    TSDR: %08x\n", getreg32(STM32L4_RTC_TSDR));
+  rtcllerr("   TSSSR: %08x\n", getreg32(STM32L4_RTC_TSSSR));
+  rtcllerr("    CALR: %08x\n", getreg32(STM32L4_RTC_CALR));
+  rtcllerr("  TAMPCR: %08x\n", getreg32(STM32L4_RTC_TAMPCR));
+  rtcllerr("ALRMASSR: %08x\n", getreg32(STM32L4_RTC_ALRMASSR));
+  rtcllerr("ALRMBSSR: %08x\n", getreg32(STM32L4_RTC_ALRMBSSR));
 }
 #else
 #  define rtc_dumpregs(msg)
@@ -234,16 +234,16 @@ static void rtc_dumpregs(FAR const char *msg)
 #ifdef CONFIG_DEBUG_RTC
 static void rtc_dumptime(FAR const struct tm *tp, FAR const char *msg)
 {
-  rtclldbg("%s:\n", msg);
+  rtcllerr("%s:\n", msg);
 #if 0
-  rtclldbg("  tm_sec: %08x\n", tp->tm_sec);
-  rtclldbg("  tm_min: %08x\n", tp->tm_min);
-  rtclldbg(" tm_hour: %08x\n", tp->tm_hour);
-  rtclldbg(" tm_mday: %08x\n", tp->tm_mday);
-  rtclldbg("  tm_mon: %08x\n", tp->tm_mon);
-  rtclldbg(" tm_year: %08x\n", tp->tm_year);
+  rtcllerr("  tm_sec: %08x\n", tp->tm_sec);
+  rtcllerr("  tm_min: %08x\n", tp->tm_min);
+  rtcllerr(" tm_hour: %08x\n", tp->tm_hour);
+  rtcllerr(" tm_mday: %08x\n", tp->tm_mday);
+  rtcllerr("  tm_mon: %08x\n", tp->tm_mon);
+  rtcllerr(" tm_year: %08x\n", tp->tm_year);
 #else
-  rtclldbg("  tm: %04d-%02d-%02d %02d:%02d:%02d\n",
+  rtcllerr("  tm: %04d-%02d-%02d %02d:%02d:%02d\n",
            tp->tm_year+1900, tp->tm_mon+1, tp->tm_mday,
            tp->tm_hour, tp->tm_min, tp->tm_sec);
 #endif
diff --git a/arch/arm/src/stm32l4/stm32l4_spi.c b/arch/arm/src/stm32l4/stm32l4_spi.c
index b3f9b0db17..05d6409035 100644
--- a/arch/arm/src/stm32l4/stm32l4_spi.c
+++ b/arch/arm/src/stm32l4/stm32l4_spi.c
@@ -146,9 +146,9 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg lldbg
+#  define spidbg llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/arch/arm/src/tiva/lm3s_ethernet.c b/arch/arm/src/tiva/lm3s_ethernet.c
index 4776e39e71..9a9f72e97b 100644
--- a/arch/arm/src/tiva/lm3s_ethernet.c
+++ b/arch/arm/src/tiva/lm3s_ethernet.c
@@ -686,7 +686,7 @@ static void tiva_receive(struct tiva_driver_s *priv)
 
           /* We will have to drop this packet */
 
-          nlldbg("Bad packet size dropped (%d)\n", pktlen);
+          nllerr("Bad packet size dropped (%d)\n", pktlen);
           NETDEV_RXERRORS(&priv->ld_dev);
 
           /* The number of bytes and words left to read is pktlen - 4 (including,
@@ -867,7 +867,7 @@ static void tiva_receive(struct tiva_driver_s *priv)
       else
 #endif
         {
-          nlldbg("Unsupported packet type dropped (%02x)\n", htons(ETHBUF->type));
+          nllerr("Unsupported packet type dropped (%02x)\n", htons(ETHBUF->type));
           NETDEV_RXDROPPED(&priv->ld_dev);
         }
     }
@@ -1024,7 +1024,7 @@ static void tiva_txtimeout(int argc, uint32_t arg, ...)
 
   /* Increment statistics */
 
-  nlldbg("Tx timeout\n");
+  nllerr("Tx timeout\n");
   NETDEV_TXTIMEOUTS(&priv->ld_dev);
 
   /* Then reset the hardware */
@@ -1104,7 +1104,7 @@ static int tiva_ifup(struct net_driver_s *dev)
   uint32_t div;
   uint16_t phyreg;
 
-  nlldbg("Bringing up: %d.%d.%d.%d\n",
+  nllerr("Bringing up: %d.%d.%d.%d\n",
        dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
        (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 
@@ -1168,13 +1168,13 @@ static int tiva_ifup(struct net_driver_s *dev)
    * set
    */
 
-  nlldbg("Waiting for link\n");
+  nllerr("Waiting for link\n");
   do
     {
       phyreg = tiva_phyread(priv, MII_MSR);
     }
   while ((phyreg & MII_MSR_LINKSTATUS) == 0);
-  nlldbg("Link established\n");
+  nllerr("Link established\n");
 
   /* Reset the receive FIFO */
 
@@ -1258,7 +1258,7 @@ static int tiva_ifdown(struct net_driver_s *dev)
   irqstate_t flags;
   uint32_t regval;
 
-  nlldbg("Taking down: %d.%d.%d.%d\n",
+  nllerr("Taking down: %d.%d.%d.%d\n",
        dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
        (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 
diff --git a/arch/arm/src/tiva/tiva_adclow.c b/arch/arm/src/tiva/tiva_adclow.c
index 6b9273dc68..9e4ecd59b0 100644
--- a/arch/arm/src/tiva/tiva_adclow.c
+++ b/arch/arm/src/tiva/tiva_adclow.c
@@ -686,7 +686,7 @@ static void tiva_adc_read(void *arg)
        * and should cause a full system stop.
        */
 
-      alldbg("PANIC!!! Invalid ADC device number given %d\n", sse->adc);
+      allerr("PANIC!!! Invalid ADC device number given %d\n", sse->adc);
       PANIC();
       return;
     }
diff --git a/arch/arm/src/tiva/tiva_dumpgpio.c b/arch/arm/src/tiva/tiva_dumpgpio.c
index c40c432920..ba58e92297 100644
--- a/arch/arm/src/tiva/tiva_dumpgpio.c
+++ b/arch/arm/src/tiva/tiva_dumpgpio.c
@@ -163,13 +163,13 @@ int tiva_dumpgpio(uint32_t pinset, const char *msg)
   enabled  = ((rcgc2 & SYSCON_RCGC2_GPIO(port)) != 0);
 #endif
 
-  lldbg("GPIO%c pinset: %08x base: %08x -- %s\n",
+  llerr("GPIO%c pinset: %08x base: %08x -- %s\n",
         tiva_gpioport(port), pinset, base, msg);
 #ifdef TIVA_SYSCON_RCGCGPIO
-  lldbg("RCGCGPIO: %08x (%s)\n",
+  llerr("RCGCGPIO: %08x (%s)\n",
         rcgcgpio, enabled ? "enabled" : "disabled");
 #else
-  lldbg("   RCGC2: %08x (%s)\n",
+  llerr("   RCGC2: %08x (%s)\n",
         rcgc2, enabled ? "enabled" : "disabled");
 #endif
 
@@ -177,13 +177,13 @@ int tiva_dumpgpio(uint32_t pinset, const char *msg)
 
   if (enabled)
     {
-      lldbg("   AFSEL: %02x DEN: %02x DIR: %02x DATA: %02x\n",
+      llerr("   AFSEL: %02x DEN: %02x DIR: %02x DATA: %02x\n",
             getreg32(base + TIVA_GPIO_AFSEL_OFFSET), getreg32(base + TIVA_GPIO_DEN_OFFSET),
             getreg32(base + TIVA_GPIO_DIR_OFFSET), getreg32(base + TIVA_GPIO_DATA_OFFSET + 0x3fc));
-      lldbg("      IS:  %02x IBE: %02x IEV: %02x IM:  %02x RIS: %08x MIS: %08x\n",
+      llerr("      IS:  %02x IBE: %02x IEV: %02x IM:  %02x RIS: %08x MIS: %08x\n",
             getreg32(base + TIVA_GPIO_IEV_OFFSET), getreg32(base + TIVA_GPIO_IM_OFFSET),
             getreg32(base + TIVA_GPIO_RIS_OFFSET), getreg32(base + TIVA_GPIO_MIS_OFFSET));
-      lldbg("     2MA:  %02x 4MA: %02x 8MA: %02x ODR: %02x PUR %02x PDR: %02x SLR: %02x\n",
+      llerr("     2MA:  %02x 4MA: %02x 8MA: %02x ODR: %02x PUR %02x PDR: %02x SLR: %02x\n",
             getreg32(base + TIVA_GPIO_DR2R_OFFSET), getreg32(base + TIVA_GPIO_DR4R_OFFSET),
             getreg32(base + TIVA_GPIO_DR8R_OFFSET), getreg32(base + TIVA_GPIO_ODR_OFFSET),
             getreg32(base + TIVA_GPIO_PUR_OFFSET), getreg32(base + TIVA_GPIO_PDR_OFFSET),
diff --git a/arch/arm/src/tiva/tiva_gpio.h b/arch/arm/src/tiva/tiva_gpio.h
index 86fda2d4f2..2d8f12e2c3 100644
--- a/arch/arm/src/tiva/tiva_gpio.h
+++ b/arch/arm/src/tiva/tiva_gpio.h
@@ -327,12 +327,12 @@
 
 #ifdef CONFIG_DEBUG_GPIO
 # define gpiodbg(format, ...)    dbg(format, ##__VA_ARGS__)
-# define gpiolldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
+# define gpiollerr(format, ...)  llerr(format, ##__VA_ARGS__)
 # define gpioinfo(format, ...)   info(format, ##__VA_ARGS__)
 # define gpiollinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 # define gpiodbg(x...)
-# define gpiolldbg(x...)
+# define gpiollerr(x...)
 # define gpioinfo(x...)
 # define gpiollinfo(x...)
 #endif
diff --git a/arch/arm/src/tiva/tiva_i2c.c b/arch/arm/src/tiva/tiva_i2c.c
index 2977263607..0c83dc1b15 100644
--- a/arch/arm/src/tiva/tiva_i2c.c
+++ b/arch/arm/src/tiva/tiva_i2c.c
@@ -609,7 +609,7 @@ static bool tiva_i2c_checkreg(struct tiva_i2c_priv_s *priv, bool wr,
         {
           /* Yes... show how many times we did it */
 
-          lldbg("...[Repeats %d times]...\n", priv->ntimes);
+          llerr("...[Repeats %d times]...\n", priv->ntimes);
         }
 
       /* Save information about the new access */
@@ -642,7 +642,7 @@ static uint32_t tiva_i2c_getreg(struct tiva_i2c_priv_s *priv, unsigned int offse
 
   if (tiva_i2c_checkreg(priv, false, regval, regaddr))
     {
-      lldbg("%08x->%08x\n", regaddr, regval);
+      llerr("%08x->%08x\n", regaddr, regval);
     }
 
   return regval;
@@ -671,7 +671,7 @@ static void tiva_i2c_putreg(struct tiva_i2c_priv_s *priv, unsigned int offset,
 
   if (tiva_i2c_checkreg(priv, true, regval, regaddr))
     {
-      lldbg("%08x<-%08x\n", regaddr, regval);
+      llerr("%08x<-%08x\n", regaddr, regval);
     }
 
   putreg32(regval, regaddr);
diff --git a/arch/arm/src/tiva/tiva_irq.c b/arch/arm/src/tiva/tiva_irq.c
index b934efdf05..121d93bdfb 100644
--- a/arch/arm/src/tiva/tiva_irq.c
+++ b/arch/arm/src/tiva/tiva_irq.c
@@ -113,24 +113,24 @@ static void tiva_dumpnvic(const char *msg, int irq)
   irqstate_t flags;
 
   flags = enter_critical_section();
-  lldbg("NVIC (%s, irq=%d):\n", msg, irq);
-  lldbg("  INTCTRL:    %08x VECTAB: %08x\n",
+  llerr("NVIC (%s, irq=%d):\n", msg, irq);
+  llerr("  INTCTRL:    %08x VECTAB: %08x\n",
         getreg32(NVIC_INTCTRL), getreg32(NVIC_VECTAB));
 #if 0
-  lldbg("  SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n",
+  llerr("  SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n",
         getreg32(NVIC_SYSHCON_MEMFAULTENA), getreg32(NVIC_SYSHCON_BUSFAULTENA),
         getreg32(NVIC_SYSHCON_USGFAULTENA), getreg32(NVIC_SYSTICK_CTRL_ENABLE));
 #endif
 
 #if NR_VECTORS < 64
-  lldbg("  IRQ ENABLE: %08x %08x\n",
+  llerr("  IRQ ENABLE: %08x %08x\n",
         getreg32(NVIC_IRQ0_31_ENABLE), getreg32(NVIC_IRQ32_63_ENABLE));
 #elif NR_VECTORS < 96
-  lldbg("  IRQ ENABLE: %08x %08x %08x\n",
+  llerr("  IRQ ENABLE: %08x %08x %08x\n",
         getreg32(NVIC_IRQ0_31_ENABLE), getreg32(NVIC_IRQ32_63_ENABLE),
         getreg32(NVIC_IRQ64_95_ENABLE));
 #elif NR_VECTORS < 128
-  lldbg("  IRQ ENABLE: %08x %08x %08x %08x\n",
+  llerr("  IRQ ENABLE: %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ0_31_ENABLE), getreg32(NVIC_IRQ32_63_ENABLE),
         getreg32(NVIC_IRQ64_95_ENABLE), getreg32(NVIC_IRQ96_127_ENABLE));
 #endif
@@ -138,40 +138,40 @@ static void tiva_dumpnvic(const char *msg, int irq)
 #  warning Missing output
 #endif
 
-  lldbg("  SYSH_PRIO:  %08x %08x %08x\n",
+  llerr("  SYSH_PRIO:  %08x %08x %08x\n",
         getreg32(NVIC_SYSH4_7_PRIORITY), getreg32(NVIC_SYSH8_11_PRIORITY),
         getreg32(NVIC_SYSH12_15_PRIORITY));
-  lldbg("  IRQ PRIO:   %08x %08x %08x %08x\n",
+  llerr("  IRQ PRIO:   %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ0_3_PRIORITY), getreg32(NVIC_IRQ4_7_PRIORITY),
         getreg32(NVIC_IRQ8_11_PRIORITY), getreg32(NVIC_IRQ12_15_PRIORITY));
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ16_19_PRIORITY), getreg32(NVIC_IRQ20_23_PRIORITY),
         getreg32(NVIC_IRQ24_27_PRIORITY), getreg32(NVIC_IRQ28_31_PRIORITY));
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ32_35_PRIORITY), getreg32(NVIC_IRQ36_39_PRIORITY),
         getreg32(NVIC_IRQ40_43_PRIORITY), getreg32(NVIC_IRQ44_47_PRIORITY));
 #if NR_VECTORS > 47
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ48_51_PRIORITY), getreg32(NVIC_IRQ52_55_PRIORITY),
         getreg32(NVIC_IRQ56_59_PRIORITY), getreg32(NVIC_IRQ60_63_PRIORITY));
 #endif
 #if NR_VECTORS > 63
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ64_67_PRIORITY), getreg32(NVIC_IRQ68_71_PRIORITY),
         getreg32(NVIC_IRQ72_75_PRIORITY), getreg32(NVIC_IRQ76_79_PRIORITY));
 #endif
 #if NR_VECTORS > 79
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ80_83_PRIORITY), getreg32(NVIC_IRQ84_87_PRIORITY),
         getreg32(NVIC_IRQ88_91_PRIORITY), getreg32(NVIC_IRQ92_95_PRIORITY));
 #endif
 #if NR_VECTORS > 95
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ96_99_PRIORITY), getreg32(NVIC_IRQ100_103_PRIORITY),
         getreg32(NVIC_IRQ104_107_PRIORITY), getreg32(NVIC_IRQ108_111_PRIORITY));
 #endif
 #if NR_VECTORS > 111
-  lldbg("              %08x %08x %08x %08x\n",
+  llerr("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ112_115_PRIORITY), getreg32(NVIC_IRQ116_119_PRIORITY),
         getreg32(NVIC_IRQ120_123_PRIORITY), getreg32(NVIC_IRQ124_127_PRIORITY));
 #endif
diff --git a/arch/arm/src/tiva/tiva_ssi.c b/arch/arm/src/tiva/tiva_ssi.c
index a70b06198c..a49ed5b023 100644
--- a/arch/arm/src/tiva/tiva_ssi.c
+++ b/arch/arm/src/tiva/tiva_ssi.c
@@ -73,7 +73,7 @@
 #undef SSI_DEBUG  /* Define to enable debug */
 
 #ifdef SSI_DEBUG
-#  define ssidbg  lldbg
+#  define ssidbg  llerr
 #  define ssiinfo llinfo
 #else
 #  define ssidbg(x...)
diff --git a/arch/arm/src/tiva/tiva_timer.h b/arch/arm/src/tiva/tiva_timer.h
index 6ae90d8292..3b8135247b 100644
--- a/arch/arm/src/tiva/tiva_timer.h
+++ b/arch/arm/src/tiva/tiva_timer.h
@@ -129,12 +129,12 @@
 
 /* Debug ********************************************************************/
 /* Non-standard debug that may be enabled just for testing the timer
- * driver.  NOTE: that only lldbg types are used so that the output is
+ * driver.  NOTE: that only llerr types are used so that the output is
  * immediately available.
  */
 
 #ifdef CONFIG_DEBUG_TIMER
-#  define timdbg  lldbg
+#  define timdbg  llerr
 #  define timinfo llinfo
 #else
 #  define timdbg(x...)
diff --git a/arch/arm/src/tiva/tiva_timerlib.c b/arch/arm/src/tiva/tiva_timerlib.c
index b71fc1f35b..8f91e391d9 100644
--- a/arch/arm/src/tiva/tiva_timerlib.c
+++ b/arch/arm/src/tiva/tiva_timerlib.c
@@ -393,7 +393,7 @@ static bool tiva_timer_checkreg(struct tiva_gptmstate_s *priv, bool wr,
         {
           /* Yes... show how many times we did it */
 
-          lldbg("...[Repeats %d times]...\n", priv->ntimes);
+          llerr("...[Repeats %d times]...\n", priv->ntimes);
         }
 
       /* Save information about the new access */
@@ -426,7 +426,7 @@ static uint32_t tiva_getreg(struct tiva_gptmstate_s *priv, unsigned int offset)
 #ifdef CONFIG_TIVA_TIMER_REGDEBUG
   if (tiva_timer_checkreg(priv, false, regval, regaddr))
     {
-      lldbg("%08x->%08x\n", regaddr, regval);
+      llerr("%08x->%08x\n", regaddr, regval);
     }
 #endif
 
@@ -449,7 +449,7 @@ static void tiva_putreg(struct tiva_gptmstate_s *priv, unsigned int offset,
 #ifdef CONFIG_TIVA_TIMER_REGDEBUG
   if (tiva_timer_checkreg(priv, true, regval, regaddr))
     {
-       lldbg("%08x<-%08x\n", regaddr, regval);
+       llerr("%08x<-%08x\n", regaddr, regval);
     }
 #endif
 
@@ -2378,14 +2378,14 @@ void tiva_timer32_setinterval(TIMER_HANDLE handle, uint32_t interval)
 #ifdef CONFIG_TIVA_TIMER_REGDEBUG
   /* Generate low-level debug output outside of the critical section */
 
-  lldbg("%08x<-%08x\n", loadr, interval);
+  llerr("%08x<-%08x\n", loadr, interval);
   if (toints)
     {
 #  ifdef CONFIG_ARCH_CHIP_TM4C129
-      lldbg("%08x->%08x\n", moder, modev1);
-      lldbg("%08x<-%08x\n", moder, modev2);
+      llerr("%08x->%08x\n", moder, modev1);
+      llerr("%08x<-%08x\n", moder, modev2);
 #  endif /* CONFIG_ARCH_CHIP_TM4C129 */
-      lldbg("%08x<-%08x\n", imrr, priv->imr);
+      llerr("%08x<-%08x\n", imrr, priv->imr);
     }
 #endif
 }
@@ -2525,14 +2525,14 @@ void tiva_timer16_setinterval(TIMER_HANDLE handle, uint16_t interval, int tmndx)
 #ifdef CONFIG_TIVA_TIMER_REGDEBUG
   /* Generate low-level debug output outside of the critical section */
 
-  lldbg("%08x<-%08x\n", loadr, interval);
+  llerr("%08x<-%08x\n", loadr, interval);
   if (toints)
     {
 #ifdef CONFIG_ARCH_CHIP_TM4C129
-      lldbg("%08x->%08x\n", moder, modev1);
-      lldbg("%08x<-%08x\n", moder, modev2);
+      llerr("%08x->%08x\n", moder, modev1);
+      llerr("%08x<-%08x\n", moder, modev2);
 #endif
-      lldbg("%08x<-%08x\n", imrr, priv->imr);
+      llerr("%08x<-%08x\n", imrr, priv->imr);
     }
 #endif
 }
@@ -2730,13 +2730,13 @@ void tiva_rtc_setalarm(TIMER_HANDLE handle, uint32_t delay)
 #ifdef CONFIG_TIVA_TIMER_REGDEBUG
   /* Generate low-level debug output outside of the critical section */
 
-  lldbg("%08x->%08x\n", base + TIVA_TIMER_TAR_OFFSET, counter);
-  lldbg("%08x<-%08x\n", base + TIVA_TIMER_TAMATCHR_OFFSET, match);
+  llerr("%08x->%08x\n", base + TIVA_TIMER_TAR_OFFSET, counter);
+  llerr("%08x<-%08x\n", base + TIVA_TIMER_TAMATCHR_OFFSET, match);
 #ifdef CONFIG_ARCH_CHIP_TM4C129
-  lldbg("%08x->%08x\n", base + TIVA_TIMER_ADCEV_OFFSET, adcev);
-  lldbg("%08x<-%08x\n", base + TIVA_TIMER_ADCEV_OFFSET, adcev | adcbits);
+  llerr("%08x->%08x\n", base + TIVA_TIMER_ADCEV_OFFSET, adcev);
+  llerr("%08x<-%08x\n", base + TIVA_TIMER_ADCEV_OFFSET, adcev | adcbits);
 #endif /* CONFIG_ARCH_CHIP_TM4C129 */
-  lldbg("%08x<-%08x\n", base + TIVA_TIMER_IMR_OFFSET, priv->imr);
+  llerr("%08x<-%08x\n", base + TIVA_TIMER_IMR_OFFSET, priv->imr);
 #endif
 }
 #endif
@@ -2834,13 +2834,13 @@ void tiva_timer32_relmatch(TIMER_HANDLE handle, uint32_t relmatch)
 #ifdef CONFIG_TIVA_TIMER_REGDEBUG
   /* Generate low-level debug output outside of the critical section */
 
-  lldbg("%08x->%08x\n", base + TIVA_TIMER_TAR_OFFSET, counter);
-  lldbg("%08x<-%08x\n", base + TIVA_TIMER_TAMATCHR_OFFSET, match);
+  llerr("%08x->%08x\n", base + TIVA_TIMER_TAR_OFFSET, counter);
+  llerr("%08x<-%08x\n", base + TIVA_TIMER_TAMATCHR_OFFSET, match);
 #ifdef CONFIG_ARCH_CHIP_TM4C129
-  lldbg("%08x->%08x\n", base + TIVA_TIMER_ADCEV_OFFSET, adcev);
-  lldbg("%08x<-%08x\n", base + TIVA_TIMER_ADCEV_OFFSET, adcev | adcbits);
+  llerr("%08x->%08x\n", base + TIVA_TIMER_ADCEV_OFFSET, adcev);
+  llerr("%08x<-%08x\n", base + TIVA_TIMER_ADCEV_OFFSET, adcev | adcbits);
 #endif /* CONFIG_ARCH_CHIP_TM4C129 */
-  lldbg("%08x<-%08x\n", base + TIVA_TIMER_IMR_OFFSET, priv->imr);
+  llerr("%08x<-%08x\n", base + TIVA_TIMER_IMR_OFFSET, priv->imr);
 #endif /* CONFIG_TIVA_TIMER_REGDEBUG */
 
 }
@@ -3036,15 +3036,15 @@ void tiva_timer16_relmatch(TIMER_HANDLE handle, uint32_t relmatch, int tmndx)
 #ifdef CONFIG_TIVA_TIMER_REGDEBUG
   /* Generate low-level debug output outside of the critical section */
 
-  lldbg("%08x->%08x\n", timerr, timerv);
-  lldbg("%08x->%08x\n", prescr, prescv);
-  lldbg("%08x<-%08x\n", matchr, matchv);
-  lldbg("%08x<-%08x\n", prematchr, prematchv);
+  llerr("%08x->%08x\n", timerr, timerv);
+  llerr("%08x->%08x\n", prescr, prescv);
+  llerr("%08x<-%08x\n", matchr, matchv);
+  llerr("%08x<-%08x\n", prematchr, prematchv);
 #ifdef CONFIG_ARCH_CHIP_TM4C129
-  lldbg("%08x->%08x\n", adcevr, adcevv);
-  lldbg("%08x<-%08x\n", adcevr, adcevv | adcbits);
+  llerr("%08x->%08x\n", adcevr, adcevv);
+  llerr("%08x<-%08x\n", adcevr, adcevv | adcbits);
 #endif
-  lldbg("%08x<-%08x\n", imr, priv->imr);
+  llerr("%08x<-%08x\n", imr, priv->imr);
 #endif
 }
 #endif
diff --git a/arch/arm/src/tiva/tm4c_ethernet.c b/arch/arm/src/tiva/tm4c_ethernet.c
index 395949471f..dfff51354b 100644
--- a/arch/arm/src/tiva/tm4c_ethernet.c
+++ b/arch/arm/src/tiva/tm4c_ethernet.c
@@ -808,7 +808,7 @@ static uint32_t tiva_getreg(uint32_t addr)
         {
           if (count == 4)
             {
-              lldbg("...\n");
+              llerr("...\n");
             }
 
           return val;
@@ -825,7 +825,7 @@ static uint32_t tiva_getreg(uint32_t addr)
         {
           /* Yes.. then show how many times the value repeated */
 
-          lldbg("[repeats %d more times]\n", count-3);
+          llerr("[repeats %d more times]\n", count-3);
         }
 
       /* Save the new address, value, and count */
@@ -837,7 +837,7 @@ static uint32_t tiva_getreg(uint32_t addr)
 
   /* Show the register value read */
 
-  lldbg("%08x->%08x\n", addr, val);
+  llerr("%08x->%08x\n", addr, val);
   return val;
 }
 #endif
@@ -864,7 +864,7 @@ static void tiva_putreg(uint32_t val, uint32_t addr)
 {
   /* Show the register value being written */
 
-  lldbg("%08x<-%08x\n", addr, val);
+  llerr("%08x<-%08x\n", addr, val);
 
   /* Write the value */
 
@@ -1544,7 +1544,7 @@ static int tiva_recvframe(FAR struct tiva_ethmac_s *priv)
 
   if (!tiva_isfreebuffer(priv))
     {
-      nlldbg("No free buffers\n");
+      nllerr("No free buffers\n");
       return -ENOMEM;
     }
 
@@ -1651,7 +1651,7 @@ static int tiva_recvframe(FAR struct tiva_ethmac_s *priv)
                * scanning logic, and continue scanning with the next frame.
                */
 
-              nlldbg("DROPPED: RX descriptor errors: %08x\n", rxdesc->rdes0);
+              nllerr("DROPPED: RX descriptor errors: %08x\n", rxdesc->rdes0);
               tiva_freesegment(priv, rxcurr, priv->segments);
             }
         }
@@ -1712,7 +1712,7 @@ static void tiva_receive(FAR struct tiva_ethmac_s *priv)
 
       if (dev->d_len > CONFIG_NET_ETH_MTU)
         {
-          nlldbg("DROPPED: Too big: %d\n", dev->d_len);
+          nllerr("DROPPED: Too big: %d\n", dev->d_len);
         }
       else
 
@@ -1815,7 +1815,7 @@ static void tiva_receive(FAR struct tiva_ethmac_s *priv)
       else
 #endif
         {
-          nlldbg("DROPPED: Unknown type: %04x\n", BUF->type);
+          nllerr("DROPPED: Unknown type: %04x\n", BUF->type);
         }
 
       /* We are finished with the RX buffer.  NOTE:  If the buffer is
@@ -2067,7 +2067,7 @@ static inline void tiva_interrupt_process(FAR struct tiva_ethmac_s *priv)
     {
       /* Just let the user know what happened */
 
-      nlldbg("Abnormal event(s): %08x\n", dmaris);
+      nllerr("Abnormal event(s): %08x\n", dmaris);
 
       /* Clear all pending abnormal events */
 
@@ -2287,7 +2287,7 @@ static void tiva_txtimeout_expiry(int argc, uint32_t arg, ...)
 {
   FAR struct tiva_ethmac_s *priv = (FAR struct tiva_ethmac_s *)arg;
 
-  nlldbg("Timeout!\n");
+  nllerr("Timeout!\n");
 
 #ifdef CONFIG_NET_NOINTS
   /* Disable further Ethernet interrupts.  This will prevent some race
diff --git a/arch/arm/src/tms570/tms570_esm.c b/arch/arm/src/tms570/tms570_esm.c
index a3259e4050..58b761335d 100644
--- a/arch/arm/src/tms570/tms570_esm.c
+++ b/arch/arm/src/tms570/tms570_esm.c
@@ -155,7 +155,7 @@ int tms570_esm_interrupt(int irq, void *context)
 
   /* Crash -- possibly showing diagnostic debug information. */
 
-  lldbg("ESM Interrupt. PC: %08x\n", CURRENT_REGS[REG_PC]);
+  llerr("ESM Interrupt. PC: %08x\n", CURRENT_REGS[REG_PC]);
   PANIC();
   return OK; /* To keep the compiler happy */
 }
diff --git a/arch/arm/src/tms570/tms570_gio.c b/arch/arm/src/tms570/tms570_gio.c
index 159ee05e4f..2164207b12 100644
--- a/arch/arm/src/tms570/tms570_gio.c
+++ b/arch/arm/src/tms570/tms570_gio.c
@@ -296,7 +296,7 @@ int tms570_dumpgio(uint32_t pinset, const char *msg)
   uintptr_t     base;
   unsigned int  port;
 
-  lldbg("GIO%c pinset: %08x base: %08x -- %s\n",
+  llerr("GIO%c pinset: %08x base: %08x -- %s\n",
         g_portchar[port], pinset, base, msg);
 
   /* Get the base address associated with the GIO port */
@@ -310,19 +310,19 @@ int tms570_dumpgio(uint32_t pinset, const char *msg)
 
   /* Show global GIO registers */
 
-  lldbg("   GCR0: %08x INTDET: %08x    POL: %08x   ENA: %08x\n",
+  llerr("   GCR0: %08x INTDET: %08x    POL: %08x   ENA: %08x\n",
         getreg32(TMS570_GIO_GCR0), getreg32(TMS570_GIO_INTDET),
         getreg32(TMS570_GIO_POL), getreg32(TMS570_GIO_ENASET));
-  lldbg("    LVL: %08x    FLG: %08x   EMU1: %08x   EMU2: %08x\n",
+  llerr("    LVL: %08x    FLG: %08x   EMU1: %08x   EMU2: %08x\n",
         getreg32(TMS570_GIO_LVLSET), getreg32(TMS570_GIO_FLG),
         getreg32(TMS570_GIO_EMU1), getreg32(TMS570_GIO_EMU2));
 
   /* Port specific registers */
 
-  lldbg("    DIR: %08x    DIN: %08x   DOUT: %08x    PDR: %08x\n",
+  llerr("    DIR: %08x    DIN: %08x   DOUT: %08x    PDR: %08x\n",
         getreg32(base + TMS570_GIO_DIR_OFFSET), getreg32(base + TMS570_GIO_DIN_OFFSET),
         getreg32(base + TMS570_GIO_DOUT_OFFSET), getreg32(base + TMS570_GIO_PDR_OFFSET));
-  lldbg(" PULDIS: %08x    PSL: %08x\n",
+  llerr(" PULDIS: %08x    PSL: %08x\n",
         getreg32(base + TMS570_GIO_PULDIS_OFFSET), getreg32(base + TMS570_GIO_PSL_OFFSET));
 
   leave_critical_section(flags);
diff --git a/arch/avr/src/at32uc3/at32uc3_gpioirq.c b/arch/avr/src/at32uc3/at32uc3_gpioirq.c
index 231af1026d..57ab58aec4 100644
--- a/arch/avr/src/at32uc3/at32uc3_gpioirq.c
+++ b/arch/avr/src/at32uc3/at32uc3_gpioirq.c
@@ -228,7 +228,7 @@ static void gpio_porthandler(uint32_t regbase, int irqbase, uint32_t irqset, voi
                 }
               else
                 {
-                  lldbg("No handler: pin=%d ifr=%08x irqset=%08x",
+                  llerr("No handler: pin=%d ifr=%08x irqset=%08x",
                         pin, ifr, irqset);
                 }
             }
@@ -247,7 +247,7 @@ static void gpio_porthandler(uint32_t regbase, int irqbase, uint32_t irqset, voi
           putreg32(bit, regbase + AVR32_GPIO_IFRC_OFFSET);
           ifr &= ~bit;
 
-          lldbg("IRQ on unconfigured pin: pin=%d ifr=%08x irqset=%08x",
+          llerr("IRQ on unconfigured pin: pin=%d ifr=%08x irqset=%08x",
                 pin, ifr, irqset);
         }
     }
diff --git a/arch/avr/src/at32uc3/at32uc3_irq.c b/arch/avr/src/at32uc3/at32uc3_irq.c
index 6df9cdf4a6..5e72f9a37e 100644
--- a/arch/avr/src/at32uc3/at32uc3_irq.c
+++ b/arch/avr/src/at32uc3/at32uc3_irq.c
@@ -177,7 +177,7 @@ static int up_getgrp(unsigned int irq)
 static int avr32_xcptn(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  lldbg("PANIC!!! Exception IRQ: %d\n", irq);
+  llerr("PANIC!!! Exception IRQ: %d\n", irq);
   PANIC();
   return 0;
 }
@@ -321,11 +321,11 @@ unsigned int avr32_intirqno(unsigned int level)
           mask <<= 1;
         }
 
-       lldbg("Spurious interrupt: group=%d IRR=%08x\n", group, irr);
+       llerr("Spurious interrupt: group=%d IRR=%08x\n", group, irr);
        return -ENODEV;
     }
 
-  lldbg("Bad group: %d\n", group);
+  llerr("Bad group: %d\n", group);
   return AVR32_IRQ_BADVECTOR;
 }
 
diff --git a/arch/avr/src/avr/up_dumpstate.c b/arch/avr/src/avr/up_dumpstate.c
index d529b33509..2a33bff5a5 100644
--- a/arch/avr/src/avr/up_dumpstate.c
+++ b/arch/avr/src/avr/up_dumpstate.c
@@ -97,7 +97,7 @@ static void up_stackdump(uint16_t sp, uint16_t stack_base)
   for (stack = sp & ~3; stack < stack_base; stack += 12)
     {
       uint8_t *ptr = (uint8_t *)stack;
-      lldbg("%04x: %02x %02x %02x %02x %02x %02x %02x %02x"
+      llerr("%04x: %02x %02x %02x %02x %02x %02x %02x %02x"
             " %02x %02x %02x %02x\n",
              stack,
              ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7],
@@ -115,28 +115,28 @@ static inline void up_registerdump(void)
 
   if (g_current_regs)
     {
-      lldbg("R%02d: %02x %02x %02x %02x %02x %02x %02x %02x\n",
+      llerr("R%02d: %02x %02x %02x %02x %02x %02x %02x %02x\n",
             0,
             g_current_regs[REG_R0],  g_current_regs[REG_R1],
             g_current_regs[REG_R2],  g_current_regs[REG_R3],
             g_current_regs[REG_R4],  g_current_regs[REG_R5],
             g_current_regs[REG_R6],  g_current_regs[REG_R7]);
 
-      lldbg("R%02d: %02x %02x %02x %02x %02x %02x %02x %02x\n",
+      llerr("R%02d: %02x %02x %02x %02x %02x %02x %02x %02x\n",
             8,
             g_current_regs[REG_R8],  g_current_regs[REG_R9],
             g_current_regs[REG_R10], g_current_regs[REG_R11],
             g_current_regs[REG_R12], g_current_regs[REG_R13],
             g_current_regs[REG_R14], g_current_regs[REG_R15]);
 
-      lldbg("R%02d: %02x %02x %02x %02x %02x %02x %02x %02x\n",
+      llerr("R%02d: %02x %02x %02x %02x %02x %02x %02x %02x\n",
             16,
             g_current_regs[REG_R16], g_current_regs[REG_R17],
             g_current_regs[REG_R18], g_current_regs[REG_R19],
             g_current_regs[REG_R20], g_current_regs[REG_R21],
             g_current_regs[REG_R22], g_current_regs[REG_R23]);
 
-      lldbg("R%02d: %02x %02x %02x %02x %02x %02x %02x %02x\n",
+      llerr("R%02d: %02x %02x %02x %02x %02x %02x %02x %02x\n",
             24,
             g_current_regs[REG_R24], g_current_regs[REG_R25],
             g_current_regs[REG_R26], g_current_regs[REG_R27],
@@ -144,12 +144,12 @@ static inline void up_registerdump(void)
             g_current_regs[REG_R30], g_current_regs[REG_R31]);
 
 #if !defined(REG_PC2)
-      lldbg("PC:  %02x%02x  SP: %02x%02x SREG: %02x\n",
+      llerr("PC:  %02x%02x  SP: %02x%02x SREG: %02x\n",
             g_current_regs[REG_PC0], g_current_regs[REG_PC1],
             g_current_regs[REG_SPH], g_current_regs[REG_SPL],
             g_current_regs[REG_SREG]);
 #else
-      lldbg("PC:  %02x%02x%02x  SP: %02x%02x SREG: %02x\n",
+      llerr("PC:  %02x%02x%02x  SP: %02x%02x SREG: %02x\n",
             g_current_regs[REG_PC0], g_current_regs[REG_PC1],
             g_current_regs[REG_PC2], g_current_regs[REG_SPH],
             g_current_regs[REG_SPL], g_current_regs[REG_SREG]);
@@ -197,12 +197,12 @@ void up_dumpstate(void)
 
   /* Show interrupt stack info */
 
-  lldbg("sp:     %04x\n", sp);
-  lldbg("IRQ stack:\n");
-  lldbg("  base: %04x\n", istackbase);
-  lldbg("  size: %04x\n", istacksize);
+  llerr("sp:     %04x\n", sp);
+  llerr("IRQ stack:\n");
+  llerr("  base: %04x\n", istackbase);
+  llerr("  size: %04x\n", istacksize);
 #ifdef CONFIG_STACK_COLORATION
-  lldbg("  used: %08x\n", up_check_intstack());
+  llerr("  used: %08x\n", up_check_intstack());
 #endif
 
   /* Does the current stack pointer lie within the interrupt
@@ -224,14 +224,14 @@ void up_dumpstate(void)
   if (g_current_regs)
     {
       sp = g_current_regs[REG_R13];
-      lldbg("sp:     %04x\n", sp);
+      llerr("sp:     %04x\n", sp);
     }
 
-  lldbg("User stack:\n");
-  lldbg("  base: %04x\n", ustackbase);
-  lldbg("  size: %04x\n", ustacksize);
+  llerr("User stack:\n");
+  llerr("  base: %04x\n", ustackbase);
+  llerr("  size: %04x\n", ustacksize);
 #ifdef CONFIG_STACK_COLORATION
-  lldbg("  used: %08x\n", up_check_tcbstack(rtcb));
+  llerr("  used: %08x\n", up_check_tcbstack(rtcb));
 #endif
 
   /* Dump the user stack if the stack pointer lies within the allocated user
@@ -243,11 +243,11 @@ void up_dumpstate(void)
       up_stackdump(sp, ustackbase);
     }
 #else
-  lldbg("sp:         %04x\n", sp);
-  lldbg("stack base: %04x\n", ustackbase);
-  lldbg("stack size: %04x\n", ustacksize);
+  llerr("sp:         %04x\n", sp);
+  llerr("stack base: %04x\n", ustackbase);
+  llerr("stack size: %04x\n", ustacksize);
 #ifdef CONFIG_STACK_COLORATION
-  lldbg("stack used: %08x\n", up_check_tcbstack(rtcb));
+  llerr("stack used: %08x\n", up_check_tcbstack(rtcb));
 #endif
 
   /* Dump the user stack if the stack pointer lies within the allocated user
@@ -256,7 +256,7 @@ void up_dumpstate(void)
 
   if (sp > ustackbase || sp <= ustackbase - ustacksize)
     {
-      lldbg("ERROR: Stack pointer is not within allocated stack\n");
+      llerr("ERROR: Stack pointer is not within allocated stack\n");
     }
   else
     {
diff --git a/arch/avr/src/avr/up_releasepending.c b/arch/avr/src/avr/up_releasepending.c
index 80789fee51..5bd675f10b 100644
--- a/arch/avr/src/avr/up_releasepending.c
+++ b/arch/avr/src/avr/up_releasepending.c
@@ -66,7 +66,7 @@ void up_release_pending(void)
 {
   struct tcb_s *rtcb = this_task();
 
-  slldbg("From TCB=%p\n", rtcb);
+  sllerr("From TCB=%p\n", rtcb);
 
   /* Merge the g_pendingtasks list into the ready-to-run task list */
 
diff --git a/arch/avr/src/avr/up_reprioritizertr.c b/arch/avr/src/avr/up_reprioritizertr.c
index 28978a19da..e2e8cb45c2 100644
--- a/arch/avr/src/avr/up_reprioritizertr.c
+++ b/arch/avr/src/avr/up_reprioritizertr.c
@@ -94,7 +94,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
       struct tcb_s *rtcb = this_task();
       bool switch_needed;
 
-      slldbg("TCB=%p PRI=%d\n", tcb, priority);
+      sllerr("TCB=%p PRI=%d\n", tcb, priority);
 
       /* Remove the tcb task from the ready-to-run list.
        * sched_removereadytorun will return true if we just
diff --git a/arch/avr/src/avr/up_spi.c b/arch/avr/src/avr/up_spi.c
index f04fe9844c..d3c0c56eed 100644
--- a/arch/avr/src/avr/up_spi.c
+++ b/arch/avr/src/avr/up_spi.c
@@ -72,9 +72,9 @@
 #undef SPI_VERBOSE   /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/arch/avr/src/avr32/up_dumpstate.c b/arch/avr/src/avr32/up_dumpstate.c
index a57893c831..8cdcdb91b0 100644
--- a/arch/avr/src/avr32/up_dumpstate.c
+++ b/arch/avr/src/avr32/up_dumpstate.c
@@ -93,7 +93,7 @@ static void up_stackdump(uint32_t sp, uint32_t stack_base)
   for (stack = sp & ~0x1f; stack < stack_base; stack += 32)
     {
       uint32_t *ptr = (uint32_t *)stack;
-      lldbg("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      llerr("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
              stack, ptr[0], ptr[1], ptr[2], ptr[3],
              ptr[4], ptr[5], ptr[6], ptr[7]);
     }
@@ -109,21 +109,21 @@ static inline void up_registerdump(void)
 
   if (g_current_regs)
     {
-      lldbg("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      llerr("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n",
             0,
             g_current_regs[REG_R0], g_current_regs[REG_R1],
             g_current_regs[REG_R2], g_current_regs[REG_R3],
             g_current_regs[REG_R4], g_current_regs[REG_R5],
             g_current_regs[REG_R6], g_current_regs[REG_R7]);
 
-      lldbg("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      llerr("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n",
             8,
             g_current_regs[REG_R8],  g_current_regs[REG_R9],
             g_current_regs[REG_R10], g_current_regs[REG_R11],
             g_current_regs[REG_R12], g_current_regs[REG_R13],
             g_current_regs[REG_R14], g_current_regs[REG_R15]);
 
-      lldbg("SR: %08x\n", g_current_regs[REG_SR]);
+      llerr("SR: %08x\n", g_current_regs[REG_SR]);
     }
 }
 
@@ -163,12 +163,12 @@ void up_dumpstate(void)
 
   /* Show interrupt stack info */
 
-  lldbg("sp:     %08x\n", sp);
-  lldbg("IRQ stack:\n");
-  lldbg("  base: %08x\n", istackbase);
-  lldbg("  size: %08x\n", istacksize);
+  llerr("sp:     %08x\n", sp);
+  llerr("IRQ stack:\n");
+  llerr("  base: %08x\n", istackbase);
+  llerr("  size: %08x\n", istacksize);
 #ifdef CONFIG_STACK_COLORATION
-  lldbg("  used: %08x\n", up_check_intstack());
+  llerr("  used: %08x\n", up_check_intstack());
 #endif
 
   /* Does the current stack pointer lie within the interrupt
@@ -190,14 +190,14 @@ void up_dumpstate(void)
   if (g_current_regs)
     {
       sp = g_current_regs[REG_R13];
-      lldbg("sp:     %08x\n", sp);
+      llerr("sp:     %08x\n", sp);
     }
 
-  lldbg("User stack:\n");
-  lldbg("  base: %08x\n", ustackbase);
-  lldbg("  size: %08x\n", ustacksize);
+  llerr("User stack:\n");
+  llerr("  base: %08x\n", ustackbase);
+  llerr("  size: %08x\n", ustacksize);
 #ifdef CONFIG_STACK_COLORATION
-  lldbg("  used: %08x\n", up_check_tcbstack(rtcb));
+  llerr("  used: %08x\n", up_check_tcbstack(rtcb));
 #endif
 
   /* Dump the user stack if the stack pointer lies within the allocated user
@@ -209,11 +209,11 @@ void up_dumpstate(void)
       up_stackdump(sp, ustackbase);
     }
 #else
-  lldbg("sp:         %08x\n", sp);
-  lldbg("stack base: %08x\n", ustackbase);
-  lldbg("stack size: %08x\n", ustacksize);
+  llerr("sp:         %08x\n", sp);
+  llerr("stack base: %08x\n", ustackbase);
+  llerr("stack size: %08x\n", ustacksize);
 #ifdef CONFIG_STACK_COLORATION
-  lldbg("stack used: %08x\n", up_check_tcbstack(rtcb));
+  llerr("stack used: %08x\n", up_check_tcbstack(rtcb));
 #endif
 
   /* Dump the user stack if the stack pointer lies within the allocated user
@@ -222,7 +222,7 @@ void up_dumpstate(void)
 
   if (sp > ustackbase || sp <= ustackbase - ustacksize)
     {
-      lldbg("ERROR: Stack pointer is not within allocated stack\n");
+      llerr("ERROR: Stack pointer is not within allocated stack\n");
     }
   else
     {
diff --git a/arch/avr/src/avr32/up_releasepending.c b/arch/avr/src/avr32/up_releasepending.c
index aaae06b59e..9640d7d844 100644
--- a/arch/avr/src/avr32/up_releasepending.c
+++ b/arch/avr/src/avr32/up_releasepending.c
@@ -67,7 +67,7 @@ void up_release_pending(void)
 {
   struct tcb_s *rtcb = this_task();
 
-  slldbg("From TCB=%p\n", rtcb);
+  sllerr("From TCB=%p\n", rtcb);
 
   /* Merge the g_pendingtasks list into the ready-to-run task list */
 
diff --git a/arch/avr/src/avr32/up_reprioritizertr.c b/arch/avr/src/avr32/up_reprioritizertr.c
index 88732c2b06..6a39f52646 100644
--- a/arch/avr/src/avr32/up_reprioritizertr.c
+++ b/arch/avr/src/avr32/up_reprioritizertr.c
@@ -95,7 +95,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
       struct tcb_s *rtcb = this_task();
       bool switch_needed;
 
-      slldbg("TCB=%p PRI=%d\n", tcb, priority);
+      sllerr("TCB=%p PRI=%d\n", tcb, priority);
 
       /* Remove the tcb task from the ready-to-run list.
        * sched_removereadytorun will return true if we just
diff --git a/arch/avr/src/common/up_assert.c b/arch/avr/src/common/up_assert.c
index 44be077339..664417fe03 100644
--- a/arch/avr/src/common/up_assert.c
+++ b/arch/avr/src/common/up_assert.c
@@ -79,7 +79,7 @@
  * code.  We are going to print the task name if:
  *
  *  CONFIG_TASK_NAME_SIZE > 0 &&     <-- The task has a name
- *  (defined(CONFIG_DEBUG_FEATURES)    ||     <-- And the debug is enabled (lldbg used)
+ *  (defined(CONFIG_DEBUG_FEATURES)    ||     <-- And the debug is enabled (llerr used)
  *   defined(CONFIG_ARCH_STACKDUMP)) <-- Or lowsyslog() is used
  */
 
@@ -166,10 +166,10 @@ void up_assert(const uint8_t *filename, int lineno)
   board_autoled_on(LED_ASSERTION);
 
 #ifdef CONFIG_PRINT_TASKNAME
-  lldbg("Assertion failed at file:%s line: %d task: %s\n",
+  llerr("Assertion failed at file:%s line: %d task: %s\n",
         filename, lineno, rtcb->name);
 #else
-  lldbg("Assertion failed at file:%s line: %d\n",
+  llerr("Assertion failed at file:%s line: %d\n",
         filename, lineno);
 #endif
 
diff --git a/arch/avr/src/common/up_exit.c b/arch/avr/src/common/up_exit.c
index 521aa25945..7002118a7f 100644
--- a/arch/avr/src/common/up_exit.c
+++ b/arch/avr/src/common/up_exit.c
@@ -138,10 +138,10 @@ void _exit(int status)
 
   (void)up_irq_save();
 
-  slldbg("TCB=%p exiting\n", this_task());
+  sllerr("TCB=%p exiting\n", this_task());
 
 #if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
-  slldbg("Other tasks:\n");
+  sllerr("Other tasks:\n");
   sched_foreach(_up_dumponexit, NULL);
 #endif
 
diff --git a/arch/avr/src/common/up_initialize.c b/arch/avr/src/common/up_initialize.c
index 9677304647..6171403c03 100644
--- a/arch/avr/src/common/up_initialize.c
+++ b/arch/avr/src/common/up_initialize.c
@@ -125,13 +125,13 @@ static void up_calibratedelay(void)
 {
   int i;
 
-  lldbg("Beginning 100s delay\n");
+  llerr("Beginning 100s delay\n");
   for (i = 0; i < 100; i++)
     {
       up_mdelay(1000);
     }
 
-  lldbg("End 100s delay\n");
+  llerr("End 100s delay\n");
 }
 #else
 # define up_calibratedelay()
diff --git a/arch/hc/src/common/up_exit.c b/arch/hc/src/common/up_exit.c
index f20932ba61..47a23f7d9e 100644
--- a/arch/hc/src/common/up_exit.c
+++ b/arch/hc/src/common/up_exit.c
@@ -146,10 +146,10 @@ void _exit(int status)
 
   (void)up_irq_save();
 
-  slldbg("TCB=%p exiting\n", this_task());
+  sllerr("TCB=%p exiting\n", this_task());
 
 #if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
-  slldbg("Other tasks:\n");
+  sllerr("Other tasks:\n");
   sched_foreach(_up_dumponexit, NULL);
 #endif
 
diff --git a/arch/hc/src/common/up_initialize.c b/arch/hc/src/common/up_initialize.c
index e6728f0ea8..b7b6b19d77 100644
--- a/arch/hc/src/common/up_initialize.c
+++ b/arch/hc/src/common/up_initialize.c
@@ -74,13 +74,13 @@ static void up_calibratedelay(void)
 {
   int i;
 
-  lldbg("Beginning 100s delay\n");
+  llerr("Beginning 100s delay\n");
   for (i = 0; i < 100; i++)
     {
       up_mdelay(1000);
     }
 
-  lldbg("End 100s delay\n");
+  llerr("End 100s delay\n");
 }
 #else
 # define up_calibratedelay()
diff --git a/arch/hc/src/common/up_releasepending.c b/arch/hc/src/common/up_releasepending.c
index d9a209c343..27f7fa868d 100644
--- a/arch/hc/src/common/up_releasepending.c
+++ b/arch/hc/src/common/up_releasepending.c
@@ -66,7 +66,7 @@ void up_release_pending(void)
 {
   struct tcb_s *rtcb = this_task();
 
-  slldbg("From TCB=%p\n", rtcb);
+  sllerr("From TCB=%p\n", rtcb);
 
   /* Merge the g_pendingtasks list into the ready-to-run task list */
 
diff --git a/arch/hc/src/common/up_reprioritizertr.c b/arch/hc/src/common/up_reprioritizertr.c
index efdde66738..6155f4e200 100644
--- a/arch/hc/src/common/up_reprioritizertr.c
+++ b/arch/hc/src/common/up_reprioritizertr.c
@@ -95,7 +95,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
       struct tcb_s *rtcb = this_task();
       bool switch_needed;
 
-      slldbg("TCB=%p PRI=%d\n", tcb, priority);
+      sllerr("TCB=%p PRI=%d\n", tcb, priority);
 
       /* Remove the tcb task from the ready-to-run list.
        * sched_removereadytorun will return true if we just
diff --git a/arch/hc/src/m9s12/m9s12_assert.c b/arch/hc/src/m9s12/m9s12_assert.c
index 0241009fc6..2805650bcf 100644
--- a/arch/hc/src/m9s12/m9s12_assert.c
+++ b/arch/hc/src/m9s12/m9s12_assert.c
@@ -79,7 +79,7 @@
  * code.  We are going to print the task name if:
  *
  *  CONFIG_TASK_NAME_SIZE > 0 &&    <-- The task has a name
- *  (defined(CONFIG_DEBUG_FEATURES)    ||    <-- And the debug is enabled (lldbg used)
+ *  (defined(CONFIG_DEBUG_FEATURES)    ||    <-- And the debug is enabled (llerr used)
  *   defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used
  */
 
@@ -108,7 +108,7 @@ static void up_stackdump(uint16_t sp, uint16_t stack_base)
   for (stack = sp; stack < stack_base; stack += 16)
     {
       uint8_t *ptr = (uint8_t*)stack;
-      lldbg("%04x: %02x %02x %02x %02x %02x %02x %02x %02x"
+      llerr("%04x: %02x %02x %02x %02x %02x %02x %02x %02x"
             "   %02x %02x %02x %02x %02x %02x %02x %02x\n",
              stack, ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7],
              ptr[8], ptr[9], ptr[10], ptr[11], ptr[12], ptr[13], ptr[14], ptr[15]);
@@ -129,11 +129,11 @@ static inline void up_registerdump(void)
 
   if (g_current_regs)
     {
-      lldbg("A:%02x B:%02x X:%02x%02x Y:%02x%02x PC:%02x%02x CCR:%02x\n",
+      llerr("A:%02x B:%02x X:%02x%02x Y:%02x%02x PC:%02x%02x CCR:%02x\n",
              g_current_regs[REG_A], g_current_regs[REG_B], g_current_regs[REG_XH],
              g_current_regs[REG_XL], g_current_regs[REG_YH], g_current_regs[REG_YL],
              g_current_regs[REG_PCH], g_current_regs[REG_PCL], g_current_regs[REG_CCR]);
-      lldbg("SP:%02x%02x FRAME:%02x%02x TMP:%02x%02x Z:%02x%02x XY:%02x\n",
+      llerr("SP:%02x%02x FRAME:%02x%02x TMP:%02x%02x Z:%02x%02x XY:%02x\n",
              g_current_regs[REG_SPH], g_current_regs[REG_SPL],
              g_current_regs[REG_FRAMEH], g_current_regs[REG_FRAMEL],
              g_current_regs[REG_TMPL], g_current_regs[REG_TMPH], g_current_regs[REG_ZL],
@@ -142,16 +142,16 @@ static inline void up_registerdump(void)
 #if CONFIG_HCS12_MSOFTREGS > 2
 #  error "Need to save more registers"
 #elif CONFIG_HCS12_MSOFTREGS == 2
-      lldbg("SOFTREGS: %02x%02x :%02x%02x\n",
+      llerr("SOFTREGS: %02x%02x :%02x%02x\n",
             g_current_regs[REG_SOFTREG1], g_current_regs[REG_SOFTREG1+1],
             g_current_regs[REG_SOFTREG2], g_current_regs[REG_SOFTREG2+1]);
 #elif CONFIG_HCS12_MSOFTREGS == 1
-      lldbg("SOFTREGS: %02x%02x\n", g_current_regs[REG_SOFTREG1],
+      llerr("SOFTREGS: %02x%02x\n", g_current_regs[REG_SOFTREG1],
             g_current_regs[REG_SOFTREG1+1]);
 #endif
 
 #ifndef CONFIG_HCS12_NONBANKED
-      lldbg("PPAGE: %02x\n", g_current_regs[REG_PPAGE],);
+      llerr("PPAGE: %02x\n", g_current_regs[REG_PPAGE],);
 #endif
     }
 }
@@ -221,10 +221,10 @@ static void up_dumpstate(void)
 
   /* Show interrupt stack info */
 
-  lldbg("sp:     %04x\n", sp);
-  lldbg("IRQ stack:\n");
-  lldbg("  base: %04x\n", istackbase);
-  lldbg("  size: %04x\n", istacksize);
+  llerr("sp:     %04x\n", sp);
+  llerr("IRQ stack:\n");
+  llerr("  base: %04x\n", istackbase);
+  llerr("  size: %04x\n", istacksize);
 
   /* Does the current stack pointer lie within the interrupt
    * stack?
@@ -241,18 +241,18 @@ static void up_dumpstate(void)
        */
 
       sp = g_intstackbase;
-      lldbg("sp:     %04x\n", sp);
+      llerr("sp:     %04x\n", sp);
     }
 
   /* Show user stack info */
 
-  lldbg("User stack:\n");
-  lldbg("  base: %04x\n", ustackbase);
-  lldbg("  size: %04x\n", ustacksize);
+  llerr("User stack:\n");
+  llerr("  base: %04x\n", ustackbase);
+  llerr("  size: %04x\n", ustacksize);
 #else
-  lldbg("sp:         %04x\n", sp);
-  lldbg("stack base: %04x\n", ustackbase);
-  lldbg("stack size: %04x\n", ustacksize);
+  llerr("sp:         %04x\n", sp);
+  llerr("stack base: %04x\n", ustackbase);
+  llerr("stack size: %04x\n", ustacksize);
 #endif
 
   /* Dump the user stack if the stack pointer lies within the allocated user
@@ -262,7 +262,7 @@ static void up_dumpstate(void)
   if (sp > ustackbase || sp <= ustackbase - ustacksize)
     {
 #if !defined(CONFIG_ARCH_INTERRUPTSTACK) || CONFIG_ARCH_INTERRUPTSTACK < 4
-      lldbg("ERROR: Stack pointer is not within allocated stack\n");
+      llerr("ERROR: Stack pointer is not within allocated stack\n");
 #endif
     }
   else
@@ -329,10 +329,10 @@ void up_assert(const uint8_t *filename, int lineno)
   board_autoled_on(LED_ASSERTION);
 
 #ifdef CONFIG_PRINT_TASKNAME
-  lldbg("Assertion failed at file:%s line: %d task: %s\n",
+  llerr("Assertion failed at file:%s line: %d task: %s\n",
         filename, lineno, rtcb->name);
 #else
-  lldbg("Assertion failed at file:%s line: %d\n",
+  llerr("Assertion failed at file:%s line: %d\n",
         filename, lineno);
 #endif
 
diff --git a/arch/hc/src/m9s12/m9s12_dumpgpio.c b/arch/hc/src/m9s12/m9s12_dumpgpio.c
index db4261256b..42313c0e3e 100644
--- a/arch/hc/src/m9s12/m9s12_dumpgpio.c
+++ b/arch/hc/src/m9s12/m9s12_dumpgpio.c
@@ -166,13 +166,13 @@ static inline void hcs12_pimdump(uint8_t portndx)
 
   if (portndx >= HCS12_PIM_NPORTS)
     {
-      lldbg("  Illegal PIM port index: %d\n", portndx);
+      llerr("  Illegal PIM port index: %d\n", portndx);
       return;
     }
 
   ptr = &piminfo[portndx];
-  lldbg(" PIM Port%c:\n", ptr->name);
-  lldbg("   IO:%02x  INP:%02x DDR:%02x RDR:%02x\n",
+  llerr(" PIM Port%c:\n", ptr->name);
+  llerr("   IO:%02x  INP:%02x DDR:%02x RDR:%02x\n",
         getreg8(ptr->base+HCS12_PIM_IO_OFFSET),
         getreg8(ptr->base+HCS12_PIM_INPUT_OFFSET),
         getreg8(ptr->base+HCS12_PIM_DDR_OFFSET),
@@ -181,20 +181,20 @@ static inline void hcs12_pimdump(uint8_t portndx)
   switch (ptr->form)
     {
     case PIMPORT_FORM1:
-      lldbg("  PER:%02x  PS:%02x\n",
+      llerr("  PER:%02x  PS:%02x\n",
             getreg8(ptr->base+HCS12_PIM_PER_OFFSET),
             getreg8(ptr->base+HCS12_PIM_PS_OFFSET));
       break;
 
     case PIMPORT_FORM2:
-      lldbg("  PER:%02x  PS:%02x WOM:%02x\n",
+      llerr("  PER:%02x  PS:%02x WOM:%02x\n",
             getreg8(ptr->base+HCS12_PIM_PER_OFFSET),
             getreg8(ptr->base+HCS12_PIM_PS_OFFSET),
             getreg8(ptr->base+HCS12_PIM_WOM_OFFSET));
       break;
 
     case PIMPORT_FORM3:
-      lldbg("  PER:%02x  PS:%02x  IE:%02x  IF:%02x\n",
+      llerr("  PER:%02x  PS:%02x  IE:%02x  IF:%02x\n",
             getreg8(ptr->base+HCS12_PIM_PER_OFFSET),
             getreg8(ptr->base+HCS12_PIM_PS_OFFSET),
             getreg8(ptr->base+HCS12_PIM_IE_OFFSET),
@@ -220,28 +220,28 @@ static inline void hcs12_mebidump(uint8_t portndx)
 
   if (portndx >= HCS12_MEBI_NPORTS)
     {
-      lldbg("  Illegal MEBI port index: %d\n", portndx);
+      llerr("  Illegal MEBI port index: %d\n", portndx);
       return;
     }
 
   ptr = &mebiinfo[portndx];
-  lldbg(" MEBI Port%c:\n", ptr->name);
+  llerr(" MEBI Port%c:\n", ptr->name);
 
   switch (ptr->form)
     {
     case MEBIPORT_AB:
-      lldbg("   DATA:%02x DDR:%02x\n",
+      llerr("   DATA:%02x DDR:%02x\n",
             getreg8(ptr->data), getreg8(ptr->ddr));
       break;
 
     case MEBIPORT_E:
-      lldbg("   DATA:%02x DDR:%02x MODE:%02x PEAR:%02x\n",
+      llerr("   DATA:%02x DDR:%02x MODE:%02x PEAR:%02x\n",
             getreg8(ptr->data), getreg8(ptr->ddr),
             getreg8(HCS12_MEBI_MODE), getreg8(HCS12_MEBI_PEAR));
       break;
 
     case MEBIPORT_K:
-      lldbg("   DATA:%02x DDR:%02x MODE:%02x\n",
+      llerr("   DATA:%02x DDR:%02x MODE:%02x\n",
             getreg8(ptr->data), getreg8(ptr->ddr),
             getreg8(HCS12_MEBI_MODE));
       break;
@@ -268,7 +268,7 @@ int hcs12_dumpgpio(uint16_t pinset, const char *msg)
   uint8_t portndx = HCS12_PORTNDX(pinset);
   irqstate_t flags = enter_critical_section();
 
-  lldbg("pinset: %08x -- %s\n", pinset, msg);
+  llerr("pinset: %08x -- %s\n", pinset, msg);
 
   if (HCS12_PIMPORT(pinset))
     {
diff --git a/arch/mips/src/common/up_exit.c b/arch/mips/src/common/up_exit.c
index 5f167488cc..00c23ba782 100644
--- a/arch/mips/src/common/up_exit.c
+++ b/arch/mips/src/common/up_exit.c
@@ -148,10 +148,10 @@ void _exit(int status)
 
   (void)up_irq_save();
 
-  slldbg("TCB=%p exiting\n", this_task());
+  sllerr("TCB=%p exiting\n", this_task());
 
 #if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
-  slldbg("Other tasks:\n");
+  sllerr("Other tasks:\n");
   sched_foreach(_up_dumponexit, NULL);
 #endif
 
diff --git a/arch/mips/src/common/up_initialize.c b/arch/mips/src/common/up_initialize.c
index e9ebdbbf98..f87882685b 100644
--- a/arch/mips/src/common/up_initialize.c
+++ b/arch/mips/src/common/up_initialize.c
@@ -76,13 +76,13 @@ static void up_calibratedelay(void)
 {
   int i;
 
-  lldbg("Beginning 100s delay\n");
+  llerr("Beginning 100s delay\n");
   for (i = 0; i < 100; i++)
     {
       up_mdelay(1000);
     }
 
-  lldbg("End 100s delay\n");
+  llerr("End 100s delay\n");
 }
 #else
 # define up_calibratedelay()
diff --git a/arch/mips/src/mips32/up_assert.c b/arch/mips/src/mips32/up_assert.c
index c10048a4cf..8742eb468a 100644
--- a/arch/mips/src/mips32/up_assert.c
+++ b/arch/mips/src/mips32/up_assert.c
@@ -79,7 +79,7 @@
  * code.  We are going to print the task name if:
  *
  *  CONFIG_TASK_NAME_SIZE > 0 &&    <-- The task has a name
- *  (defined(CONFIG_DEBUG_FEATURES)    ||    <-- And the debug is enabled (lldbg used)
+ *  (defined(CONFIG_DEBUG_FEATURES)    ||    <-- And the debug is enabled (llerr used)
  *   defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used
  */
 
@@ -166,10 +166,10 @@ void up_assert(const uint8_t *filename, int lineno)
   board_autoled_on(LED_ASSERTION);
 
 #ifdef CONFIG_PRINT_TASKNAME
-  lldbg("Assertion failed at file:%s line: %d task: %s\n",
+  llerr("Assertion failed at file:%s line: %d task: %s\n",
         filename, lineno, rtcb->name);
 #else
-  lldbg("Assertion failed at file:%s line: %d\n",
+  llerr("Assertion failed at file:%s line: %d\n",
         filename, lineno);
 #endif
 
diff --git a/arch/mips/src/mips32/up_dumpstate.c b/arch/mips/src/mips32/up_dumpstate.c
index bf507e5e4a..efcf44103d 100644
--- a/arch/mips/src/mips32/up_dumpstate.c
+++ b/arch/mips/src/mips32/up_dumpstate.c
@@ -101,7 +101,7 @@ static void up_stackdump(uint32_t sp, uint32_t stack_base)
   for (stack = sp & ~0x1f; stack < stack_base; stack += 32)
     {
       uint32_t *ptr = (uint32_t *)stack;
-      lldbg("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      llerr("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
              stack, ptr[0], ptr[1], ptr[2], ptr[3],
              ptr[4], ptr[5], ptr[6], ptr[7]);
     }
@@ -117,27 +117,27 @@ static inline void up_registerdump(void)
 
   if (g_current_regs)
     {
-      lldbg("MFLO:%08x MFHI:%08x EPC:%08x STATUS:%08x\n",
+      llerr("MFLO:%08x MFHI:%08x EPC:%08x STATUS:%08x\n",
             g_current_regs[REG_MFLO], g_current_regs[REG_MFHI], g_current_regs[REG_EPC],
             g_current_regs[REG_STATUS]);
-      lldbg("AT:%08x V0:%08x V1:%08x A0:%08x A1:%08x A2:%08x A3:%08x\n",
+      llerr("AT:%08x V0:%08x V1:%08x A0:%08x A1:%08x A2:%08x A3:%08x\n",
             g_current_regs[REG_AT], g_current_regs[REG_V0], g_current_regs[REG_V1],
             g_current_regs[REG_A0], g_current_regs[REG_A1], g_current_regs[REG_A2],
             g_current_regs[REG_A3]);
-      lldbg("T0:%08x T1:%08x T2:%08x T3:%08x T4:%08x T5:%08x T6:%08x T7:%08x\n",
+      llerr("T0:%08x T1:%08x T2:%08x T3:%08x T4:%08x T5:%08x T6:%08x T7:%08x\n",
             g_current_regs[REG_T0], g_current_regs[REG_T1], g_current_regs[REG_T2],
             g_current_regs[REG_T3], g_current_regs[REG_T4], g_current_regs[REG_T5],
             g_current_regs[REG_T6], g_current_regs[REG_T7]);
-      lldbg("S0:%08x S1:%08x S2:%08x S3:%08x S4:%08x S5:%08x S6:%08x S7:%08x\n",
+      llerr("S0:%08x S1:%08x S2:%08x S3:%08x S4:%08x S5:%08x S6:%08x S7:%08x\n",
             g_current_regs[REG_S0], g_current_regs[REG_S1], g_current_regs[REG_S2],
             g_current_regs[REG_S3], g_current_regs[REG_S4], g_current_regs[REG_S5],
             g_current_regs[REG_S6], g_current_regs[REG_S7]);
 #ifdef MIPS32_SAVE_GP
-      lldbg("T8:%08x T9:%08x GP:%08x SP:%08x FP:%08x RA:%08x\n",
+      llerr("T8:%08x T9:%08x GP:%08x SP:%08x FP:%08x RA:%08x\n",
             g_current_regs[REG_T8], g_current_regs[REG_T9], g_current_regs[REG_GP],
             g_current_regs[REG_SP], g_current_regs[REG_FP], g_current_regs[REG_RA]);
 #else
-      lldbg("T8:%08x T9:%08x SP:%08x FP:%08x RA:%08x\n",
+      llerr("T8:%08x T9:%08x SP:%08x FP:%08x RA:%08x\n",
             g_current_regs[REG_T8], g_current_regs[REG_T9], g_current_regs[REG_SP],
             g_current_regs[REG_FP], g_current_regs[REG_RA]);
 #endif
@@ -184,10 +184,10 @@ void up_dumpstate(void)
 
   /* Show interrupt stack info */
 
-  lldbg("sp:     %08x\n", sp);
-  lldbg("IRQ stack:\n");
-  lldbg("  base: %08x\n", istackbase);
-  lldbg("  size: %08x\n", istacksize);
+  llerr("sp:     %08x\n", sp);
+  llerr("IRQ stack:\n");
+  llerr("  base: %08x\n", istackbase);
+  llerr("  size: %08x\n", istacksize);
 
   /* Does the current stack pointer lie within the interrupt
    * stack?
@@ -204,18 +204,18 @@ void up_dumpstate(void)
        */
 
       sp = g_intstackbase;
-      lldbg("sp:     %08x\n", sp);
+      llerr("sp:     %08x\n", sp);
     }
 
   /* Show user stack info */
 
-  lldbg("User stack:\n");
-  lldbg("  base: %08x\n", ustackbase);
-  lldbg("  size: %08x\n", ustacksize);
+  llerr("User stack:\n");
+  llerr("  base: %08x\n", ustackbase);
+  llerr("  size: %08x\n", ustacksize);
 #else
-  lldbg("sp:         %08x\n", sp);
-  lldbg("stack base: %08x\n", ustackbase);
-  lldbg("stack size: %08x\n", ustacksize);
+  llerr("sp:         %08x\n", sp);
+  llerr("stack base: %08x\n", ustackbase);
+  llerr("stack size: %08x\n", ustacksize);
 #endif
 
   /* Dump the user stack if the stack pointer lies within the allocated user
@@ -225,7 +225,7 @@ void up_dumpstate(void)
   if (sp > ustackbase || sp <= ustackbase - ustacksize)
     {
 #if !defined(CONFIG_ARCH_INTERRUPTSTACK) || CONFIG_ARCH_INTERRUPTSTACK < 4
-      lldbg("ERROR: Stack pointer is not within allocated stack\n");
+      llerr("ERROR: Stack pointer is not within allocated stack\n");
 #endif
     }
   else
diff --git a/arch/mips/src/mips32/up_releasepending.c b/arch/mips/src/mips32/up_releasepending.c
index 0d4522ba8d..57310e30d1 100644
--- a/arch/mips/src/mips32/up_releasepending.c
+++ b/arch/mips/src/mips32/up_releasepending.c
@@ -69,7 +69,7 @@ void up_release_pending(void)
 {
   struct tcb_s *rtcb = this_task();
 
-  slldbg("From TCB=%p\n", rtcb);
+  sllerr("From TCB=%p\n", rtcb);
 
   /* Merge the g_pendingtasks list into the ready-to-run task list */
 
diff --git a/arch/mips/src/mips32/up_reprioritizertr.c b/arch/mips/src/mips32/up_reprioritizertr.c
index 3365f8862e..0f34c13894 100644
--- a/arch/mips/src/mips32/up_reprioritizertr.c
+++ b/arch/mips/src/mips32/up_reprioritizertr.c
@@ -97,7 +97,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
       struct tcb_s *rtcb = this_task();
       bool switch_needed;
 
-      slldbg("TCB=%p PRI=%d\n", tcb, priority);
+      sllerr("TCB=%p PRI=%d\n", tcb, priority);
 
       /* Remove the tcb task from the ready-to-run list.
        * sched_removereadytorun will return true if we just
diff --git a/arch/mips/src/mips32/up_swint0.c b/arch/mips/src/mips32/up_swint0.c
index bf394921d0..12c79b0f15 100644
--- a/arch/mips/src/mips32/up_swint0.c
+++ b/arch/mips/src/mips32/up_swint0.c
@@ -65,7 +65,7 @@
  */
 
 #ifdef CONFIG_DEBUG_SYSCALL
-# define swidbg(format, ...) lldbg(format, ##__VA_ARGS__)
+# define swidbg(format, ...) llerr(format, ##__VA_ARGS__)
 #else
 # define swidbg(x...)
 #endif
@@ -289,7 +289,7 @@ int up_swint0(int irq, FAR void *context)
 
           g_current_regs[REG_R0] -= CONFIG_SYS_RESERVED;
 #else
-          slldbg("ERROR: Bad SYS call: %d\n", regs[REG_A0]);
+          sllerr("ERROR: Bad SYS call: %d\n", regs[REG_A0]);
 #endif
         }
         break;
diff --git a/arch/mips/src/pic32mx/pic32mx-ethernet.c b/arch/mips/src/pic32mx/pic32mx-ethernet.c
index 9004af4be5..ceb1c98906 100644
--- a/arch/mips/src/pic32mx/pic32mx-ethernet.c
+++ b/arch/mips/src/pic32mx/pic32mx-ethernet.c
@@ -447,7 +447,7 @@ static void pic32mx_ethreset(struct pic32mx_driver_s *priv);
 #ifdef CONFIG_NET_REGDEBUG
 static void pic32mx_printreg(uint32_t addr, uint32_t val, bool iswrite)
 {
-  lldbg("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val);
+  llerr("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val);
 }
 #endif
 
@@ -497,7 +497,7 @@ static void pic32mx_checkreg(uint32_t addr, uint32_t val, bool iswrite)
             {
               /* No.. More than one. */
 
-              lldbg("[repeats %d more times]\n", count);
+              llerr("[repeats %d more times]\n", count);
             }
         }
 
@@ -576,12 +576,12 @@ static void pic32mx_putreg(uint32_t val, uint32_t addr)
 #ifdef CONFIG_NET_DESCDEBUG
 static void pic32mx_dumptxdesc(struct pic32mx_txdesc_s *txdesc, const char *msg)
 {
-  lldbg("TX Descriptor [%p]: %s\n", txdesc, msg);
-  lldbg("   status: %08x\n", txdesc->status);
-  lldbg("  address: %08x [%08x]\n", txdesc->address, VIRT_ADDR(txdesc->address));
-  lldbg("     tsv1: %08x\n", txdesc->tsv1);
-  lldbg("     tsv2: %08x\n", txdesc->tsv2);
-  lldbg("   nexted: %08x [%08x]\n", txdesc->nexted, VIRT_ADDR(txdesc->nexted));
+  llerr("TX Descriptor [%p]: %s\n", txdesc, msg);
+  llerr("   status: %08x\n", txdesc->status);
+  llerr("  address: %08x [%08x]\n", txdesc->address, VIRT_ADDR(txdesc->address));
+  llerr("     tsv1: %08x\n", txdesc->tsv1);
+  llerr("     tsv2: %08x\n", txdesc->tsv2);
+  llerr("   nexted: %08x [%08x]\n", txdesc->nexted, VIRT_ADDR(txdesc->nexted));
 }
 #endif
 
@@ -603,12 +603,12 @@ static void pic32mx_dumptxdesc(struct pic32mx_txdesc_s *txdesc, const char *msg)
 #ifdef CONFIG_NET_DESCDEBUG
 static void pic32mx_dumprxdesc(struct pic32mx_rxdesc_s *rxdesc, const char *msg)
 {
-  lldbg("RX Descriptor [%p]: %s\n", rxdesc, msg);
-  lldbg("   status: %08x\n", rxdesc->status);
-  lldbg("  address: %08x [%08x]\n", rxdesc->address, VIRT_ADDR(rxdesc->address));
-  lldbg("     rsv1: %08x\n", rxdesc->rsv1);
-  lldbg("     rsv2: %08x\n", rxdesc->rsv2);
-  lldbg("   nexted: %08x [%08x]\n", rxdesc->nexted, VIRT_ADDR(rxdesc->nexted));
+  llerr("RX Descriptor [%p]: %s\n", rxdesc, msg);
+  llerr("   status: %08x\n", rxdesc->status);
+  llerr("  address: %08x [%08x]\n", rxdesc->address, VIRT_ADDR(rxdesc->address));
+  llerr("     rsv1: %08x\n", rxdesc->rsv1);
+  llerr("     rsv2: %08x\n", rxdesc->rsv2);
+  llerr("   nexted: %08x [%08x]\n", rxdesc->nexted, VIRT_ADDR(rxdesc->nexted));
 }
 #endif
 
@@ -1366,7 +1366,7 @@ static void pic32mx_rxdone(struct pic32mx_driver_s *priv)
 
       if ((rxdesc->rsv2 & RXDESC_RSV2_OK) == 0)
         {
-          nlldbg("ERROR. rsv1: %08x rsv2: %08x\n", rxdesc->rsv1, rxdesc->rsv2);
+          nllerr("ERROR. rsv1: %08x rsv2: %08x\n", rxdesc->rsv1, rxdesc->rsv2);
           NETDEV_RXERRORS(&priv->pd_dev);
           pic32mx_rxreturn(rxdesc);
         }
@@ -1379,7 +1379,7 @@ static void pic32mx_rxdone(struct pic32mx_driver_s *priv)
 
       else if (priv->pd_dev.d_len > CONFIG_NET_ETH_MTU)
         {
-          nlldbg("Too big. packet length: %d rxdesc: %08x\n",
+          nllerr("Too big. packet length: %d rxdesc: %08x\n",
                  priv->pd_dev.d_len, rxdesc->status);
           NETDEV_RXERRORS(&priv->pd_dev);
           pic32mx_rxreturn(rxdesc);
@@ -1390,7 +1390,7 @@ static void pic32mx_rxdone(struct pic32mx_driver_s *priv)
       else if ((rxdesc->status & (RXDESC_STATUS_EOP | RXDESC_STATUS_SOP)) !=
                (RXDESC_STATUS_EOP | RXDESC_STATUS_SOP))
         {
-          nlldbg("Fragment. packet length: %d rxdesc: %08x\n", priv->pd_dev.d_len, rxdesc->status);
+          nllerr("Fragment. packet length: %d rxdesc: %08x\n", priv->pd_dev.d_len, rxdesc->status);
           NETDEV_RXFRAGMENTS(&priv->pd_dev);
           pic32mx_rxreturn(rxdesc);
         }
@@ -1529,7 +1529,7 @@ static void pic32mx_rxdone(struct pic32mx_driver_s *priv)
             {
               /* Unrecognized... drop it. */
 
-              nlldbg("Unrecognized packet type dropped: %04x\n", ntohs(BUF->type));
+              nllerr("Unrecognized packet type dropped: %04x\n", ntohs(BUF->type));
               NETDEV_RXDROPPED(&priv->pd_dev);
             }
 
@@ -1691,7 +1691,7 @@ static int pic32mx_interrupt(int irq, void *context)
 
       if ((status & ETH_INT_RXOVFLW) != 0)
         {
-          nlldbg("RX Overrun. status: %08x\n", status);
+          nllerr("RX Overrun. status: %08x\n", status);
           NETDEV_RXERRORS(&priv->pd_dev);
         }
 
@@ -1702,7 +1702,7 @@ static int pic32mx_interrupt(int irq, void *context)
 
       if ((status & ETH_INT_RXBUFNA) != 0)
         {
-          nlldbg("RX buffer descriptor overrun. status: %08x\n", status);
+          nllerr("RX buffer descriptor overrun. status: %08x\n", status);
           NETDEV_RXERRORS(&priv->pd_dev);
         }
 
@@ -1713,7 +1713,7 @@ static int pic32mx_interrupt(int irq, void *context)
 
       if ((status & ETH_INT_RXBUSE) != 0)
         {
-          nlldbg("RX BVCI bus error. status: %08x\n", status);
+          nllerr("RX BVCI bus error. status: %08x\n", status);
           NETDEV_RXERRORS(&priv->pd_dev);
         }
 
@@ -1756,7 +1756,7 @@ static int pic32mx_interrupt(int irq, void *context)
 
       if ((status & ETH_INT_TXABORT) != 0)
         {
-          nlldbg("TX abort. status: %08x\n", status);
+          nllerr("TX abort. status: %08x\n", status);
           NETDEV_TXERRORS(&priv->pd_dev);
         }
 
@@ -1767,7 +1767,7 @@ static int pic32mx_interrupt(int irq, void *context)
 
       if ((status & ETH_INT_TXBUSE) != 0)
         {
-          nlldbg("TX BVCI bus error. status: %08x\n", status);
+          nllerr("TX BVCI bus error. status: %08x\n", status);
           NETDEV_TXERRORS(&priv->pd_dev);
         }
 
diff --git a/arch/mips/src/pic32mx/pic32mx-exception.c b/arch/mips/src/pic32mx/pic32mx-exception.c
index 756ebbe80d..66feb977f9 100644
--- a/arch/mips/src/pic32mx/pic32mx-exception.c
+++ b/arch/mips/src/pic32mx/pic32mx-exception.c
@@ -187,7 +187,7 @@ uint32_t *pic32mx_exception(uint32_t *regs)
       break;
     }
 #else
-  lldbg("EXCEPTION: CAUSE: %08x EPC: %08x\n", cause, epc);
+  llerr("EXCEPTION: CAUSE: %08x EPC: %08x\n", cause, epc);
 #endif
 #endif
 
diff --git a/arch/mips/src/pic32mx/pic32mx-gpio.c b/arch/mips/src/pic32mx/pic32mx-gpio.c
index 928ce85d9f..355d152477 100644
--- a/arch/mips/src/pic32mx/pic32mx-gpio.c
+++ b/arch/mips/src/pic32mx/pic32mx-gpio.c
@@ -321,14 +321,14 @@ void pic32mx_dumpgpio(uint32_t pinset, const char *msg)
       /* The following requires exclusive access to the GPIO registers */
 
       sched_lock();
-      lldbg("IOPORT%c pinset: %04x base: %08x -- %s\n",
+      llerr("IOPORT%c pinset: %04x base: %08x -- %s\n",
             'A'+port, pinset, base, msg);
-      lldbg("   TRIS: %08x   PORT: %08x    LAT: %08x    ODC: %08x\n",
+      llerr("   TRIS: %08x   PORT: %08x    LAT: %08x    ODC: %08x\n",
             getreg32(base + PIC32MX_IOPORT_TRIS_OFFSET),
             getreg32(base + PIC32MX_IOPORT_PORT_OFFSET),
             getreg32(base + PIC32MX_IOPORT_LAT_OFFSET),
             getreg32(base + PIC32MX_IOPORT_ODC_OFFSET));
-      lldbg("  CNCON: %08x   CNEN: %08x  CNPUE: %08x\n",
+      llerr("  CNCON: %08x   CNEN: %08x  CNPUE: %08x\n",
             getreg32(PIC32MX_IOPORT_CNCON),
             getreg32(PIC32MX_IOPORT_CNEN),
             getreg32(PIC32MX_IOPORT_CNPUE));
diff --git a/arch/mips/src/pic32mx/pic32mx-serial.c b/arch/mips/src/pic32mx/pic32mx-serial.c
index f36679aaa5..20a50bf2bb 100644
--- a/arch/mips/src/pic32mx/pic32mx-serial.c
+++ b/arch/mips/src/pic32mx/pic32mx-serial.c
@@ -500,7 +500,7 @@ static int up_interrupt(int irq, void *context)
            /* Clear the pending error interrupt */
 
            up_clrpend_irq(priv->irqe);
-           lldbg("ERROR: interrupt STA: %08x\n",
+           llerr("ERROR: interrupt STA: %08x\n",
                  up_serialin(priv, PIC32MX_UART_STA_OFFSET));
            handled = true;
         }
diff --git a/arch/mips/src/pic32mx/pic32mx-spi.c b/arch/mips/src/pic32mx/pic32mx-spi.c
index 2477936dfd..02a43d3eab 100644
--- a/arch/mips/src/pic32mx/pic32mx-spi.c
+++ b/arch/mips/src/pic32mx/pic32mx-spi.c
@@ -75,9 +75,9 @@
 /* Debug */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
@@ -329,7 +329,7 @@ static uint32_t spi_getreg(FAR struct pic32mx_dev_s *priv, unsigned int offset)
         {
            if (count == 4)
              {
-               lldbg("...\n");
+               llerr("...\n");
              }
           return value;
         }
@@ -345,7 +345,7 @@ static uint32_t spi_getreg(FAR struct pic32mx_dev_s *priv, unsigned int offset)
          {
            /* Yes.. then show how many times the value repeated */
 
-           lldbg("[repeats %d more times]\n", count-3);
+           llerr("[repeats %d more times]\n", count-3);
          }
 
        /* Save the new address, value, and count */
@@ -357,7 +357,7 @@ static uint32_t spi_getreg(FAR struct pic32mx_dev_s *priv, unsigned int offset)
 
   /* Show the register value read */
 
-  lldbg("%08x->%08x\n", addr, value);
+  llerr("%08x->%08x\n", addr, value);
   return value;
 }
 #else
@@ -395,7 +395,7 @@ static void spi_putreg(FAR struct pic32mx_dev_s *priv, unsigned int offset,
 
   /* Show the register value being written */
 
-  lldbg("%08x<-%08x\n", addr, value);
+  llerr("%08x<-%08x\n", addr, value);
 
   /* Then do the write */
 
diff --git a/arch/mips/src/pic32mx/pic32mx-usbdev.c b/arch/mips/src/pic32mx/pic32mx-usbdev.c
index 613e7eccfa..e6099bfb80 100644
--- a/arch/mips/src/pic32mx/pic32mx-usbdev.c
+++ b/arch/mips/src/pic32mx/pic32mx-usbdev.c
@@ -289,9 +289,9 @@
 #  undef CONFIG_PIC32MX_USBDEV_BDTDEBUG
 #  define CONFIG_PIC32MX_USBDEV_BDTDEBUG 1
 
-#  define regdbg lldbg
+#  define regdbg llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define reginfo lldbg
+#    define reginfo llerr
 #  else
 #    define reginfo(x...)
 #  endif
@@ -309,9 +309,9 @@
 
 #ifdef CONFIG_PIC32MX_USBDEV_BDTDEBUG
 
-#  define bdtdbg lldbg
+#  define bdtdbg llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define bdtinfo lldbg
+#    define bdtinfo llerr
 #  else
 #    define bdtinfo(x...)
 #  endif
@@ -637,7 +637,7 @@ static uint16_t pic32mx_getreg(uint32_t addr)
         {
            if (count == 4)
              {
-               lldbg("...\n");
+               llerr("...\n");
              }
           return val;
         }
@@ -653,7 +653,7 @@ static uint16_t pic32mx_getreg(uint32_t addr)
          {
            /* Yes.. then show how many times the value repeated */
 
-           lldbg("[repeats %d more times]\n", count-3);
+           llerr("[repeats %d more times]\n", count-3);
          }
 
        /* Save the new address, value, and count */
@@ -665,7 +665,7 @@ static uint16_t pic32mx_getreg(uint32_t addr)
 
   /* Show the register value read */
 
-  lldbg("%08x->%04x\n", addr, val);
+  llerr("%08x->%04x\n", addr, val);
   return val;
 }
 #endif
@@ -679,7 +679,7 @@ static void pic32mx_putreg(uint16_t val, uint32_t addr)
 {
   /* Show the register value being written */
 
-  lldbg("%08x<-%04x\n", addr, val);
+  llerr("%08x<-%04x\n", addr, val);
 
   /* Write the value */
 
@@ -2832,7 +2832,7 @@ static int pic32mx_interrupt(int irq, void *context)
   if ((usbir & USB_INT_UERR) != 0)
     {
       usbtrace(TRACE_INTDECODE(PIC32MX_TRACEINTID_UERR), usbir);
-      ulldbg("Error: EIR=%04x\n", pic32mx_getreg(PIC32MX_USB_EIR));
+      ullerr("Error: EIR=%04x\n", pic32mx_getreg(PIC32MX_USB_EIR));
 
       /* Clear all pending USB error interrupts */
 
@@ -3152,7 +3152,7 @@ static int pic32mx_epconfigure(struct usbdev_ep_s *ep,
   if (!ep || !desc)
     {
       usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_INVALIDPARMS), 0);
-      ulldbg("ERROR: ep=%p desc=%p\n");
+      ullerr("ERROR: ep=%p desc=%p\n");
       return -EINVAL;
     }
 #endif
@@ -3279,7 +3279,7 @@ static int pic32mx_epdisable(struct usbdev_ep_s *ep)
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_INVALIDPARMS), 0);
-      ulldbg("ERROR: ep=%p\n", ep);
+      ullerr("ERROR: ep=%p\n", ep);
       return -EINVAL;
     }
 #endif
@@ -3376,7 +3376,7 @@ static int pic32mx_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
   if (!req || !req->callback || !req->buf || !ep)
     {
       usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_INVALIDPARMS), 0);
-      ulldbg("ERROR: req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep);
+      ullerr("ERROR: req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep);
       return -EINVAL;
     }
 #endif
@@ -3388,7 +3388,7 @@ static int pic32mx_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
   if (!priv->driver)
     {
       usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_NOTCONFIGURED), priv->usbdev.speed);
-      ulldbg("ERROR: driver=%p\n", priv->driver);
+      ullerr("ERROR: driver=%p\n", priv->driver);
       return -ESHUTDOWN;
     }
 #endif
diff --git a/arch/mips/src/pic32mz/pic32mz-ethernet.c b/arch/mips/src/pic32mz/pic32mz-ethernet.c
index 2d60888a37..5c1ae7aa78 100644
--- a/arch/mips/src/pic32mz/pic32mz-ethernet.c
+++ b/arch/mips/src/pic32mz/pic32mz-ethernet.c
@@ -465,7 +465,7 @@ static void pic32mz_ethreset(struct pic32mz_driver_s *priv);
 #ifdef CONFIG_NET_REGDEBUG
 static void pic32mz_printreg(uint32_t addr, uint32_t val, bool iswrite)
 {
-  lldbg("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val);
+  llerr("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val);
 }
 #endif
 
@@ -515,7 +515,7 @@ static void pic32mz_checkreg(uint32_t addr, uint32_t val, bool iswrite)
             {
               /* No.. More than one. */
 
-              lldbg("[repeats %d more times]\n", count);
+              llerr("[repeats %d more times]\n", count);
             }
         }
 
@@ -594,12 +594,12 @@ static void pic32mz_putreg(uint32_t val, uint32_t addr)
 #ifdef CONFIG_NET_DESCDEBUG
 static void pic32mz_dumptxdesc(struct pic32mz_txdesc_s *txdesc, const char *msg)
 {
-  lldbg("TX Descriptor [%p]: %s\n", txdesc, msg);
-  lldbg("   status: %08x\n", txdesc->status);
-  lldbg("  address: %08x [%08x]\n", txdesc->address, VIRT_ADDR(txdesc->address));
-  lldbg("     tsv1: %08x\n", txdesc->tsv1);
-  lldbg("     tsv2: %08x\n", txdesc->tsv2);
-  lldbg("   nexted: %08x [%08x]\n", txdesc->nexted, VIRT_ADDR(txdesc->nexted));
+  llerr("TX Descriptor [%p]: %s\n", txdesc, msg);
+  llerr("   status: %08x\n", txdesc->status);
+  llerr("  address: %08x [%08x]\n", txdesc->address, VIRT_ADDR(txdesc->address));
+  llerr("     tsv1: %08x\n", txdesc->tsv1);
+  llerr("     tsv2: %08x\n", txdesc->tsv2);
+  llerr("   nexted: %08x [%08x]\n", txdesc->nexted, VIRT_ADDR(txdesc->nexted));
 }
 #endif
 
@@ -621,12 +621,12 @@ static void pic32mz_dumptxdesc(struct pic32mz_txdesc_s *txdesc, const char *msg)
 #ifdef CONFIG_NET_DESCDEBUG
 static void pic32mz_dumprxdesc(struct pic32mz_rxdesc_s *rxdesc, const char *msg)
 {
-  lldbg("RX Descriptor [%p]: %s\n", rxdesc, msg);
-  lldbg("   status: %08x\n", rxdesc->status);
-  lldbg("  address: %08x [%08x]\n", rxdesc->address, VIRT_ADDR(rxdesc->address));
-  lldbg("     rsv1: %08x\n", rxdesc->rsv1);
-  lldbg("     rsv2: %08x\n", rxdesc->rsv2);
-  lldbg("   nexted: %08x [%08x]\n", rxdesc->nexted, VIRT_ADDR(rxdesc->nexted));
+  llerr("RX Descriptor [%p]: %s\n", rxdesc, msg);
+  llerr("   status: %08x\n", rxdesc->status);
+  llerr("  address: %08x [%08x]\n", rxdesc->address, VIRT_ADDR(rxdesc->address));
+  llerr("     rsv1: %08x\n", rxdesc->rsv1);
+  llerr("     rsv2: %08x\n", rxdesc->rsv2);
+  llerr("   nexted: %08x [%08x]\n", rxdesc->nexted, VIRT_ADDR(rxdesc->nexted));
 }
 #endif
 
@@ -1384,7 +1384,7 @@ static void pic32mz_rxdone(struct pic32mz_driver_s *priv)
 
       if ((rxdesc->rsv2 & RXDESC_RSV2_OK) == 0)
         {
-          nlldbg("ERROR. rsv1: %08x rsv2: %08x\n", rxdesc->rsv1, rxdesc->rsv2);
+          nllerr("ERROR. rsv1: %08x rsv2: %08x\n", rxdesc->rsv1, rxdesc->rsv2);
           NETDEV_RXERRORS(&priv->pd_dev);
           pic32mz_rxreturn(rxdesc);
         }
@@ -1397,7 +1397,7 @@ static void pic32mz_rxdone(struct pic32mz_driver_s *priv)
 
       else if (priv->pd_dev.d_len > CONFIG_NET_ETH_MTU)
         {
-          nlldbg("Too big. packet length: %d rxdesc: %08x\n", priv->pd_dev.d_len, rxdesc->status);
+          nllerr("Too big. packet length: %d rxdesc: %08x\n", priv->pd_dev.d_len, rxdesc->status);
           NETDEV_RXERRORS(&priv->pd_dev);
           pic32mz_rxreturn(rxdesc);
         }
@@ -1407,7 +1407,7 @@ static void pic32mz_rxdone(struct pic32mz_driver_s *priv)
       else if ((rxdesc->status & (RXDESC_STATUS_EOP | RXDESC_STATUS_SOP)) !=
                (RXDESC_STATUS_EOP | RXDESC_STATUS_SOP))
         {
-          nlldbg("Fragment. packet length: %d rxdesc: %08x\n", priv->pd_dev.d_len, rxdesc->status);
+          nllerr("Fragment. packet length: %d rxdesc: %08x\n", priv->pd_dev.d_len, rxdesc->status);
           NETDEV_RXFRAGMENTS(&priv->pd_dev);
           pic32mz_rxreturn(rxdesc);
         }
@@ -1546,7 +1546,7 @@ static void pic32mz_rxdone(struct pic32mz_driver_s *priv)
             {
               /* Unrecognized... drop it. */
 
-              nlldbg("Unrecognized packet type dropped: %04x\n", ntohs(BUF->type));
+              nllerr("Unrecognized packet type dropped: %04x\n", ntohs(BUF->type));
               NETDEV_RXDROPPED(&priv->pd_dev);
             }
 
@@ -1708,7 +1708,7 @@ static int pic32mz_interrupt(int irq, void *context)
 
       if ((status & ETH_INT_RXOVFLW) != 0)
         {
-          nlldbg("RX Overrun. status: %08x\n", status);
+          nllerr("RX Overrun. status: %08x\n", status);
           NETDEV_RXERRORS(&priv->pd_dev);
         }
 
@@ -1719,7 +1719,7 @@ static int pic32mz_interrupt(int irq, void *context)
 
       if ((status & ETH_INT_RXBUFNA) != 0)
         {
-          nlldbg("RX buffer descriptor overrun. status: %08x\n", status);
+          nllerr("RX buffer descriptor overrun. status: %08x\n", status);
           NETDEV_RXERRORS(&priv->pd_dev);
         }
 
@@ -1730,7 +1730,7 @@ static int pic32mz_interrupt(int irq, void *context)
 
       if ((status & ETH_INT_RXBUSE) != 0)
         {
-          nlldbg("RX BVCI bus error. status: %08x\n", status);
+          nllerr("RX BVCI bus error. status: %08x\n", status);
           NETDEV_RXERRORS(&priv->pd_dev);
         }
 
@@ -1773,7 +1773,7 @@ static int pic32mz_interrupt(int irq, void *context)
 
       if ((status & ETH_INT_TXABORT) != 0)
         {
-          nlldbg("TX abort. status: %08x\n", status);
+          nllerr("TX abort. status: %08x\n", status);
           NETDEV_TXERRORS(&priv->pd_dev);
         }
 
@@ -1784,7 +1784,7 @@ static int pic32mz_interrupt(int irq, void *context)
 
       if ((status & ETH_INT_TXBUSE) != 0)
         {
-          nlldbg("TX BVCI bus error. status: %08x\n", status);
+          nllerr("TX BVCI bus error. status: %08x\n", status);
           NETDEV_TXERRORS(&priv->pd_dev);
         }
 
diff --git a/arch/mips/src/pic32mz/pic32mz-exception.c b/arch/mips/src/pic32mz/pic32mz-exception.c
index a370ca4c4b..e9cda39ba8 100644
--- a/arch/mips/src/pic32mz/pic32mz-exception.c
+++ b/arch/mips/src/pic32mz/pic32mz-exception.c
@@ -187,7 +187,7 @@ uint32_t *pic32mz_exception(uint32_t *regs)
       break;
     }
 #else
-  lldbg("EXCEPTION: CAUSE: %08x EPC: %08x\n", cause, epc);
+  llerr("EXCEPTION: CAUSE: %08x EPC: %08x\n", cause, epc);
 #endif
 #endif
 
diff --git a/arch/mips/src/pic32mz/pic32mz-gpio.c b/arch/mips/src/pic32mz/pic32mz-gpio.c
index a8707ca107..db8c6e5df8 100644
--- a/arch/mips/src/pic32mz/pic32mz-gpio.c
+++ b/arch/mips/src/pic32mz/pic32mz-gpio.c
@@ -325,14 +325,14 @@ void pic32mz_dumpgpio(uint32_t pinset, const char *msg)
       /* The following requires exclusive access to the GPIO registers */
 
       sched_lock();
-      lldbg("IOPORT%c pinset: %04x base: %08x -- %s\n",
+      llerr("IOPORT%c pinset: %04x base: %08x -- %s\n",
             'A'+port, pinset, base, msg);
-      lldbg("   TRIS: %08x   PORT: %08x    LAT: %08x    ODC: %08x\n",
+      llerr("   TRIS: %08x   PORT: %08x    LAT: %08x    ODC: %08x\n",
             getreg32(base + PIC32MZ_IOPORT_TRIS_OFFSET),
             getreg32(base + PIC32MZ_IOPORT_PORT_OFFSET),
             getreg32(base + PIC32MZ_IOPORT_LAT_OFFSET),
             getreg32(base + PIC32MZ_IOPORT_ODC_OFFSET));
-      lldbg("  CNCON: %08x   CNEN: %08x  CNPUE: %08x\n",
+      llerr("  CNCON: %08x   CNEN: %08x  CNPUE: %08x\n",
             getreg32(PIC32MZ_IOPORT_CNCON),
             getreg32(PIC32MZ_IOPORT_CNEN),
             getreg32(PIC32MZ_IOPORT_CNPUE));
diff --git a/arch/mips/src/pic32mz/pic32mz-serial.c b/arch/mips/src/pic32mz/pic32mz-serial.c
index 0679bf95ff..c9b56f3ff4 100644
--- a/arch/mips/src/pic32mz/pic32mz-serial.c
+++ b/arch/mips/src/pic32mz/pic32mz-serial.c
@@ -758,7 +758,7 @@ static int  up_interrupt(struct uart_dev_s *dev)
            /* Clear the pending error interrupt */
 
            up_clrpend_irq(priv->irqe);
-           lldbg("ERROR: interrupt STA: %08x\n",
+           llerr("ERROR: interrupt STA: %08x\n",
                  up_serialin(priv, PIC32MZ_UART_STA_OFFSET));
            handled = true;
         }
diff --git a/arch/mips/src/pic32mz/pic32mz-spi.c b/arch/mips/src/pic32mz/pic32mz-spi.c
index 344a1d3e71..504fe2ca95 100644
--- a/arch/mips/src/pic32mz/pic32mz-spi.c
+++ b/arch/mips/src/pic32mz/pic32mz-spi.c
@@ -70,9 +70,9 @@
 /* Debug */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
@@ -496,7 +496,7 @@ static bool spi_checkreg(struct pic32mz_dev_s *priv, uintptr_t regaddr,
         {
           /* Yes... show how many times we did it */
 
-          lldbg("...[Repeats %d times]...\n", priv->ntimes);
+          llerr("...[Repeats %d times]...\n", priv->ntimes);
         }
 
       /* Save information about the new access */
@@ -546,7 +546,7 @@ static uint32_t spi_getreg(FAR struct pic32mz_dev_s *priv,
     {
       /* Yes.. */
 
-      lldbg("%08lx->%08lx\n",
+      llerr("%08lx->%08lx\n",
             (unsigned long)regaddr, (unsigned long)regval);
     }
 
@@ -588,7 +588,7 @@ static void spi_putaddr(FAR struct pic32mz_dev_s *priv, uintptr_t regaddr,
     {
       /* Yes.. */
 
-      lldbg("%08lx<-%08lx\n",
+      llerr("%08lx<-%08lx\n",
       (unsigned long)regaddr, (unsigned long)regval);
     }
 
diff --git a/arch/sh/src/common/up_assert.c b/arch/sh/src/common/up_assert.c
index 47879c3240..ec63c54098 100644
--- a/arch/sh/src/common/up_assert.c
+++ b/arch/sh/src/common/up_assert.c
@@ -154,10 +154,10 @@ void up_assert(const uint8_t *filename, int lineno)
   board_autoled_on(LED_ASSERTION);
 
 #if CONFIG_TASK_NAME_SIZE > 0
-  lldbg("Assertion failed at file:%s line: %d task: %s\n",
+  llerr("Assertion failed at file:%s line: %d task: %s\n",
         filename, lineno, rtcb->name);
 #else
-  lldbg("Assertion failed at file:%s line: %d\n",
+  llerr("Assertion failed at file:%s line: %d\n",
         filename, lineno);
 #endif
 
diff --git a/arch/sh/src/common/up_exit.c b/arch/sh/src/common/up_exit.c
index c2c41763c8..e62462cec3 100644
--- a/arch/sh/src/common/up_exit.c
+++ b/arch/sh/src/common/up_exit.c
@@ -147,10 +147,10 @@ void _exit(int status)
 
   (void)up_irq_save();
 
-  slldbg("TCB=%p exiting\n", this_task());
+  sllerr("TCB=%p exiting\n", this_task());
 
 #if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
-  slldbg("Other tasks:\n");
+  sllerr("Other tasks:\n");
   sched_foreach(_up_dumponexit, NULL);
 #endif
 
diff --git a/arch/sh/src/common/up_initialize.c b/arch/sh/src/common/up_initialize.c
index 579b15fe7f..98c38fe504 100644
--- a/arch/sh/src/common/up_initialize.c
+++ b/arch/sh/src/common/up_initialize.c
@@ -82,13 +82,13 @@ static void up_calibratedelay(void)
 {
   int i;
 
-  slldbg("Beginning 100s delay\n");
+  sllerr("Beginning 100s delay\n");
   for (i = 0; i < 100; i++)
     {
       up_mdelay(1000);
     }
 
-  slldbg("End 100s delay\n");
+  sllerr("End 100s delay\n");
 }
 #else
 # define up_calibratedelay()
diff --git a/arch/sh/src/common/up_releasepending.c b/arch/sh/src/common/up_releasepending.c
index b91503cbe6..3112f52532 100644
--- a/arch/sh/src/common/up_releasepending.c
+++ b/arch/sh/src/common/up_releasepending.c
@@ -67,7 +67,7 @@ void up_release_pending(void)
 {
   struct tcb_s *rtcb = this_task();
 
-  slldbg("From TCB=%p\n", rtcb);
+  sllerr("From TCB=%p\n", rtcb);
 
   /* Merge the g_pendingtasks list into the ready-to-run task list */
 
diff --git a/arch/sh/src/common/up_reprioritizertr.c b/arch/sh/src/common/up_reprioritizertr.c
index e838cff0bb..8578dfef47 100644
--- a/arch/sh/src/common/up_reprioritizertr.c
+++ b/arch/sh/src/common/up_reprioritizertr.c
@@ -95,7 +95,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
       struct tcb_s *rtcb = this_task();
       bool switch_needed;
 
-      slldbg("TCB=%p PRI=%d\n", tcb, priority);
+      sllerr("TCB=%p PRI=%d\n", tcb, priority);
 
       /* Remove the tcb task from the ready-to-run list.
        * sched_removereadytorun will return true if we just
diff --git a/arch/sh/src/m16c/m16c_dumpstate.c b/arch/sh/src/m16c/m16c_dumpstate.c
index 4e29d7127c..39a19252ff 100644
--- a/arch/sh/src/m16c/m16c_dumpstate.c
+++ b/arch/sh/src/m16c/m16c_dumpstate.c
@@ -112,7 +112,7 @@ static void m16c_stackdump(uint16_t sp, uint16_t stack_base)
   for (stack = sp & ~7; stack < stack_base; stack += 8)
     {
       uint8_t *ptr = (uint8_t*)stack;
-      lldbg("%04x: %02x %02x %02x %02x %02x %02x %02x %02x\n",
+      llerr("%04x: %02x %02x %02x %02x %02x %02x %02x %02x\n",
              stack, ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7]);
     }
 }
@@ -131,14 +131,14 @@ static inline void m16c_registerdump(void)
     {
       /* Yes.. dump the interrupt registers */
 
-      lldbg("PC: %02x%02x%02x FLG: %02x00%02x FB: %02x%02x SB: %02x%02x SP: %02x%02x\n",
+      llerr("PC: %02x%02x%02x FLG: %02x00%02x FB: %02x%02x SB: %02x%02x SP: %02x%02x\n",
             ptr[REG_FLGPCHI] & 0xff, ptr[REG_PC], ptr[REG_PC+1],
             ptr[REG_FLGPCHI] >> 8, ptr[REG_FLG],
             ptr[REG_FB], ptr[REG_FB+1],
             ptr[REG_SB], ptr[REG_SB+1],
             ptr[REG_SP], ptr[REG_SP+1]);
 
-      lldbg("R0: %02x%02x R1: %02x%02x R2: %02x%02x A0: %02x%02x A1: %02x%02x\n",
+      llerr("R0: %02x%02x R1: %02x%02x R2: %02x%02x A0: %02x%02x A1: %02x%02x\n",
             ptr[REG_R0], ptr[REG_R0+1], ptr[REG_R1], ptr[REG_R1+1],
             ptr[REG_R2], ptr[REG_R2+1], ptr[REG_R3], ptr[REG_R3+1],
             ptr[REG_A0], ptr[REG_A0+1], ptr[REG_A1], ptr[REG_A1+1]);
@@ -194,10 +194,10 @@ void up_dumpstate(void)
 
   /* Show interrupt stack info */
 
-  lldbg("sp:     %04x\n", sp);
-  lldbg("IRQ stack:\n");
-  lldbg("  base: %04x\n", istackbase);
-  lldbg("  size: %04x\n", istacksize);
+  llerr("sp:     %04x\n", sp);
+  llerr("IRQ stack:\n");
+  llerr("  base: %04x\n", istackbase);
+  llerr("  size: %04x\n", istacksize);
 
   /* Does the current stack pointer lie within the interrupt
    * stack?
@@ -212,18 +212,18 @@ void up_dumpstate(void)
       /* Extract the user stack pointer from the register area */
 
       sp = m16c_getusersp();
-      lldbg("sp:     %04x\n", sp);
+      llerr("sp:     %04x\n", sp);
     }
 
   /* Show user stack info */
 
-  lldbg("User stack:\n");
-  lldbg("  base: %04x\n", ustackbase);
-  lldbg("  size: %04x\n", ustacksize);
+  llerr("User stack:\n");
+  llerr("  base: %04x\n", ustackbase);
+  llerr("  size: %04x\n", ustacksize);
 #else
-  lldbg("sp:         %04x\n", sp);
-  lldbg("stack base: %04x\n", ustackbase);
-  lldbg("stack size: %04x\n", ustacksize);
+  llerr("sp:         %04x\n", sp);
+  llerr("stack base: %04x\n", ustackbase);
+  llerr("stack size: %04x\n", ustacksize);
 #endif
 
   /* Dump the user stack if the stack pointer lies within the allocated user
@@ -233,7 +233,7 @@ void up_dumpstate(void)
   if (sp > ustackbase || sp <= ustackbase - ustacksize)
     {
 #if !defined(CONFIG_ARCH_INTERRUPTSTACK) || CONFIG_ARCH_INTERRUPTSTACK < 4
-      lldbg("ERROR: Stack pointer is not within allocated stack\n");
+      llerr("ERROR: Stack pointer is not within allocated stack\n");
 #endif
     }
   else
diff --git a/arch/sh/src/sh1/sh1_dumpstate.c b/arch/sh/src/sh1/sh1_dumpstate.c
index ed5edee427..1d36a6e058 100644
--- a/arch/sh/src/sh1/sh1_dumpstate.c
+++ b/arch/sh/src/sh1/sh1_dumpstate.c
@@ -99,7 +99,7 @@ static void sh1_stackdump(uint32_t sp, uint32_t stack_base)
   for (stack = sp & ~0x1f; stack < stack_base; stack += 32)
     {
       uint32_t *ptr = (uint32_t*)stack;
-      lldbg("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      llerr("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
              stack, ptr[0], ptr[1], ptr[2], ptr[3],
              ptr[4], ptr[5], ptr[6], ptr[7]);
     }
@@ -119,17 +119,17 @@ static inline void sh1_registerdump(void)
     {
       /* Yes.. dump the interrupt registers */
 
-      lldbg("PC: %08x SR=%08x\n",
+      llerr("PC: %08x SR=%08x\n",
             ptr[REG_PC], ptr[REG_SR]);
 
-      lldbg("PR: %08x GBR: %08x MACH: %08x MACL: %08x\n",
+      llerr("PR: %08x GBR: %08x MACH: %08x MACL: %08x\n",
             ptr[REG_PR], ptr[REG_GBR], ptr[REG_MACH], ptr[REG_MACL]);
 
-      lldbg("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n", 0,
+      llerr("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n", 0,
             ptr[REG_R0], ptr[REG_R1], ptr[REG_R2], ptr[REG_R3],
             ptr[REG_R4], ptr[REG_R5], ptr[REG_R6], ptr[REG_R7]);
 
-      lldbg("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n", 8,
+      llerr("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n", 8,
             ptr[REG_R8], ptr[REG_R9], ptr[REG_R10], ptr[REG_R11],
             ptr[REG_R12], ptr[REG_R13], ptr[REG_R14], ptr[REG_R15]);
     }
@@ -175,10 +175,10 @@ void up_dumpstate(void)
 
   /* Show interrupt stack info */
 
-  lldbg("sp:     %08x\n", sp);
-  lldbg("IRQ stack:\n");
-  lldbg("  base: %08x\n", istackbase);
-  lldbg("  size: %08x\n", istacksize);
+  llerr("sp:     %08x\n", sp);
+  llerr("IRQ stack:\n");
+  llerr("  base: %08x\n", istackbase);
+  llerr("  size: %08x\n", istacksize);
 
   /* Does the current stack pointer lie within the interrupt
    * stack?
@@ -195,18 +195,18 @@ void up_dumpstate(void)
        */
 
       sp = g_intstackbase;
-      lldbg("sp:     %08x\n", sp);
+      llerr("sp:     %08x\n", sp);
     }
 
   /* Show user stack info */
 
-  lldbg("User stack:\n");
-  lldbg("  base: %08x\n", ustackbase);
-  lldbg("  size: %08x\n", ustacksize);
+  llerr("User stack:\n");
+  llerr("  base: %08x\n", ustackbase);
+  llerr("  size: %08x\n", ustacksize);
 #else
-  lldbg("sp:         %08x\n", sp);
-  lldbg("stack base: %08x\n", ustackbase);
-  lldbg("stack size: %08x\n", ustacksize);
+  llerr("sp:         %08x\n", sp);
+  llerr("stack base: %08x\n", ustackbase);
+  llerr("stack size: %08x\n", ustacksize);
 #endif
 
   /* Dump the user stack if the stack pointer lies within the allocated user
@@ -216,7 +216,7 @@ void up_dumpstate(void)
   if (sp > ustackbase || sp <= ustackbase - ustacksize)
     {
 #if !defined(CONFIG_ARCH_INTERRUPTSTACK) || CONFIG_ARCH_INTERRUPTSTACK < 4
-      lldbg("ERROR: Stack pointer is not within allocated stack\n");
+      llerr("ERROR: Stack pointer is not within allocated stack\n");
 #endif
     }
   else
diff --git a/arch/sim/src/up_spiflash.c b/arch/sim/src/up_spiflash.c
index 4bab7d5fd0..c7f4a076d0 100644
--- a/arch/sim/src/up_spiflash.c
+++ b/arch/sim/src/up_spiflash.c
@@ -69,9 +69,9 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg lldbg
+#  define spidbg llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/arch/x86/src/common/up_assert.c b/arch/x86/src/common/up_assert.c
index 5039955757..1732b8d824 100644
--- a/arch/x86/src/common/up_assert.c
+++ b/arch/x86/src/common/up_assert.c
@@ -80,7 +80,7 @@
  * code.  We are going to print the task name if:
  *
  *  CONFIG_TASK_NAME_SIZE > 0 &&    <-- The task has a name
- *  (defined(CONFIG_DEBUG_FEATURES)    ||    <-- And the debug is enabled (lldbg used)
+ *  (defined(CONFIG_DEBUG_FEATURES)    ||    <-- And the debug is enabled (llerr used)
  *   defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used
  */
 
@@ -105,7 +105,7 @@ static void up_stackdump(uint32_t sp, uint32_t stack_base)
   for (stack = sp & ~0x1f; stack < stack_base; stack += 32)
     {
       uint32_t *ptr = (uint32_t*)stack;
-      lldbg("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      llerr("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
              stack, ptr[0], ptr[1], ptr[2], ptr[3],
              ptr[4], ptr[5], ptr[6], ptr[7]);
     }
@@ -176,10 +176,10 @@ static void up_dumpstate(void)
 
   /* Show interrupt stack info */
 
-  lldbg("sp:     %08x\n", sp);
-  lldbg("IRQ stack:\n");
-  lldbg("  base: %08x\n", istackbase);
-  lldbg("  size: %08x\n", istacksize);
+  llerr("sp:     %08x\n", sp);
+  llerr("IRQ stack:\n");
+  llerr("  base: %08x\n", istackbase);
+  llerr("  size: %08x\n", istacksize);
 
   /* Does the current stack pointer lie within the interrupt
    * stack?
@@ -196,18 +196,18 @@ static void up_dumpstate(void)
        */
 
       sp = g_intstackbase;
-      lldbg("sp:     %08x\n", sp);
+      llerr("sp:     %08x\n", sp);
     }
 
   /* Show user stack info */
 
-  lldbg("User stack:\n");
-  lldbg("  base: %08x\n", ustackbase);
-  lldbg("  size: %08x\n", ustacksize);
+  llerr("User stack:\n");
+  llerr("  base: %08x\n", ustackbase);
+  llerr("  size: %08x\n", ustacksize);
 #else
-  lldbg("sp:         %08x\n", sp);
-  lldbg("stack base: %08x\n", ustackbase);
-  lldbg("stack size: %08x\n", ustacksize);
+  llerr("sp:         %08x\n", sp);
+  llerr("stack base: %08x\n", ustackbase);
+  llerr("stack size: %08x\n", ustacksize);
 #endif
 
   /* Dump the user stack if the stack pointer lies within the allocated user
@@ -217,7 +217,7 @@ static void up_dumpstate(void)
   if (sp > ustackbase || sp <= ustackbase - ustacksize)
     {
 #if !defined(CONFIG_ARCH_INTERRUPTSTACK) || CONFIG_ARCH_INTERRUPTSTACK < 4
-      lldbg("ERROR: Stack pointer is not within allocated stack\n");
+      llerr("ERROR: Stack pointer is not within allocated stack\n");
 #endif
     }
   else
@@ -287,10 +287,10 @@ void up_assert(const uint8_t *filename, int lineno)
   board_autoled_on(LED_ASSERTION);
 
 #ifdef CONFIG_PRINT_TASKNAME
-  lldbg("Assertion failed at file:%s line: %d task: %s\n",
+  llerr("Assertion failed at file:%s line: %d task: %s\n",
         filename, lineno, rtcb->name);
 #else
-  lldbg("Assertion failed at file:%s line: %d\n",
+  llerr("Assertion failed at file:%s line: %d\n",
         filename, lineno);
 #endif
 
diff --git a/arch/x86/src/common/up_exit.c b/arch/x86/src/common/up_exit.c
index a776bd5b1b..350e65dec3 100644
--- a/arch/x86/src/common/up_exit.c
+++ b/arch/x86/src/common/up_exit.c
@@ -146,10 +146,10 @@ void _exit(int status)
 
   (void)up_irq_save();
 
-  slldbg("TCB=%p exiting\n", this_task());
+  sllerr("TCB=%p exiting\n", this_task());
 
 #if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
-  slldbg("Other tasks:\n");
+  sllerr("Other tasks:\n");
   sched_foreach(_up_dumponexit, NULL);
 #endif
 
diff --git a/arch/x86/src/common/up_initialize.c b/arch/x86/src/common/up_initialize.c
index 502aca2338..0c7baed29c 100644
--- a/arch/x86/src/common/up_initialize.c
+++ b/arch/x86/src/common/up_initialize.c
@@ -76,13 +76,13 @@ static void up_calibratedelay(void)
 {
   int i;
 
-  lldbg("Beginning 100s delay\n");
+  llerr("Beginning 100s delay\n");
   for (i = 0; i < 100; i++)
     {
       up_mdelay(1000);
     }
 
-  lldbg("End 100s delay\n");
+  llerr("End 100s delay\n");
 }
 #else
 # define up_calibratedelay()
diff --git a/arch/x86/src/common/up_releasepending.c b/arch/x86/src/common/up_releasepending.c
index 76137604bb..6b22f7b2d0 100644
--- a/arch/x86/src/common/up_releasepending.c
+++ b/arch/x86/src/common/up_releasepending.c
@@ -67,7 +67,7 @@ void up_release_pending(void)
 {
   struct tcb_s *rtcb = this_task();
 
-  slldbg("From TCB=%p\n", rtcb);
+  sllerr("From TCB=%p\n", rtcb);
 
   /* Merge the g_pendingtasks list into the ready-to-run task list */
 
diff --git a/arch/x86/src/common/up_reprioritizertr.c b/arch/x86/src/common/up_reprioritizertr.c
index 398199261d..7400fb1fce 100644
--- a/arch/x86/src/common/up_reprioritizertr.c
+++ b/arch/x86/src/common/up_reprioritizertr.c
@@ -95,7 +95,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
       struct tcb_s *rtcb = this_task();
       bool switch_needed;
 
-      slldbg("TCB=%p PRI=%d\n", tcb, priority);
+      sllerr("TCB=%p PRI=%d\n", tcb, priority);
 
       /* Remove the tcb task from the ready-to-run list.
        * sched_removereadytorun will return true if we just
diff --git a/arch/x86/src/i486/up_regdump.c b/arch/x86/src/i486/up_regdump.c
index dbf0599dda..52c74b1600 100644
--- a/arch/x86/src/i486/up_regdump.c
+++ b/arch/x86/src/i486/up_regdump.c
@@ -72,13 +72,13 @@
 
 void up_registerdump(uint32_t *regs)
 {
-  lldbg(" ds:%08x irq:%08x err:%08x\n",
+  llerr(" ds:%08x irq:%08x err:%08x\n",
         regs[REG_DS], regs[REG_IRQNO], regs[REG_ERRCODE]);
-  lldbg("edi:%08x esi:%08x ebp:%08x esp:%08x\n",
+  llerr("edi:%08x esi:%08x ebp:%08x esp:%08x\n",
         regs[REG_EDI], regs[REG_ESI], regs[REG_EBP], regs[REG_ESP]);
-  lldbg("ebx:%08x edx:%08x ecx:%08x eax:%08x\n",
+  llerr("ebx:%08x edx:%08x ecx:%08x eax:%08x\n",
         regs[REG_EBX], regs[REG_EDX], regs[REG_ECX], regs[REG_EAX]);
-  lldbg("eip:%08x  cs:%08x flg:%08x  sp:%08x ss:%08x\n",
+  llerr("eip:%08x  cs:%08x flg:%08x  sp:%08x ss:%08x\n",
         regs[REG_EIP], regs[REG_CS], regs[REG_EFLAGS], regs[REG_SP],
         regs[REG_SS]);
 }
diff --git a/arch/z16/src/common/up_assert.c b/arch/z16/src/common/up_assert.c
index bcefc234ae..ea941b805b 100644
--- a/arch/z16/src/common/up_assert.c
+++ b/arch/z16/src/common/up_assert.c
@@ -154,17 +154,17 @@ void up_assert(void)
 
 #ifdef CONFIG_HAVE_FILENAME
 #if CONFIG_TASK_NAME_SIZE > 0
-  lldbg("Assertion failed at file:%s line: %d task: %s\n",
+  llerr("Assertion failed at file:%s line: %d task: %s\n",
         filename, lineno, rtcb->name);
 #else
-  lldbg("Assertion failed at file:%s line: %d\n",
+  llerr("Assertion failed at file:%s line: %d\n",
         filename, lineno);
 #endif
 #else
 #if CONFIG_TASK_NAME_SIZE > 0
-  lldbg("Assertion failed: task: %s\n", rtcb->name);
+  llerr("Assertion failed: task: %s\n", rtcb->name);
 #else
-  lldbg("Assertion failed\n");
+  llerr("Assertion failed\n");
 #endif
 #endif
 
diff --git a/arch/z16/src/common/up_exit.c b/arch/z16/src/common/up_exit.c
index bb98e7f357..ba2aefb418 100644
--- a/arch/z16/src/common/up_exit.c
+++ b/arch/z16/src/common/up_exit.c
@@ -78,8 +78,8 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
   int i;
 #endif
 
-  lldbg("  TCB=%p name=%s\n", tcb, tcb->argv[0]);
-  lldbg("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
+  llerr("  TCB=%p name=%s\n", tcb, tcb->argv[0]);
+  llerr("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
 
 #if CONFIG_NFILE_DESCRIPTORS > 0
   filelist = tcb->group->tg_filelist;
@@ -88,7 +88,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
       struct inode *inode = filelist->fl_files[i].f_inode;
       if (inode)
         {
-          lldbg("      fd=%d refcount=%d\n",
+          llerr("      fd=%d refcount=%d\n",
                 i, inode->i_crefs);
         }
     }
@@ -102,11 +102,11 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
       if (filep->fs_fd >= 0)
         {
 #if CONFIG_STDIO_BUFFER_SIZE > 0
-          lldbg("      fd=%d nbytes=%d\n",
+          llerr("      fd=%d nbytes=%d\n",
                 filep->fs_fd,
                 filep->fs_bufpos - filep->fs_bufstart);
 #else
-          lldbg("      fd=%d\n", filep->fs_fd);
+          llerr("      fd=%d\n", filep->fs_fd);
 #endif
         }
     }
@@ -139,10 +139,10 @@ void _exit(int status)
 
   (void)up_irq_save();
 
-  slldbg("TCB=%p exiting\n", tcb);
+  sllerr("TCB=%p exiting\n", tcb);
 
 #if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
-  lldbg("Other tasks:\n");
+  llerr("Other tasks:\n");
   sched_foreach(_up_dumponexit, NULL);
 #endif
 
@@ -155,7 +155,7 @@ void _exit(int status)
    */
 
   tcb = this_task();
-  slldbg("New Active Task TCB=%p\n", tcb);
+  sllerr("New Active Task TCB=%p\n", tcb);
 
   /* Then switch contexts */
 
diff --git a/arch/z16/src/common/up_initialize.c b/arch/z16/src/common/up_initialize.c
index c7fc43bfbc..6251b2a41f 100644
--- a/arch/z16/src/common/up_initialize.c
+++ b/arch/z16/src/common/up_initialize.c
@@ -87,13 +87,13 @@ static void up_calibratedelay(void)
 {
   int i;
 
-  lldbg("Beginning 100s delay\n");
+  llerr("Beginning 100s delay\n");
   for (i = 0; i < 100; i++)
     {
       up_mdelay(1000);
     }
 
-  lldbg("End 100s delay\n");
+  llerr("End 100s delay\n");
 }
 #else
 # define up_calibratedelay()
diff --git a/arch/z16/src/common/up_registerdump.c b/arch/z16/src/common/up_registerdump.c
index 76cdff2481..9c7993da51 100644
--- a/arch/z16/src/common/up_registerdump.c
+++ b/arch/z16/src/common/up_registerdump.c
@@ -79,14 +79,14 @@
 static void up_registerdump(void)
 {
   FAR uint32_t *regs32 = (FAR uint32_t*)g_current_regs;
-  lldbg("R0 :%08x R1 :%08x R2 :%08x R3 :%08x "
+  llerr("R0 :%08x R1 :%08x R2 :%08x R3 :%08x "
         "R4 :%08x R5 :%08x R6 :%08x R7 :%08x\n"
         regs32[REG_R0/2],  regs32[REG_R1/2], regs32[REG_R2/2], regs32[REG_R3/2],
         regs32[REG_R4/2],  regs32[REG_R5/2], regs32[REG_R6/2], regs32[REG_R7/2]);
-  lldbg("R8 :%08x R9 :%08x R10:%08x R11:%08x R12:%08x R13:%08x\n"
+  llerr("R8 :%08x R9 :%08x R10:%08x R11:%08x R12:%08x R13:%08x\n"
         regs32[REG_R8/2],  regs32[REG_R9/2], regs32[REG_R10/2], regs3[REG_R11/2],
         regs32[REG_R12/2], regs32[REG_R13/2]);
-  lldbg("FP :%08x SP :%08x FLG:%04x\n"
+  llerr("FP :%08x SP :%08x FLG:%04x\n"
         regs32[REG_R14/2], regs32[REG_R15/2], g_current_regs[REG_FLAGS]);
 }
 
diff --git a/arch/z16/src/common/up_releasepending.c b/arch/z16/src/common/up_releasepending.c
index 2d0e09b5ac..90cae6fbb3 100644
--- a/arch/z16/src/common/up_releasepending.c
+++ b/arch/z16/src/common/up_releasepending.c
@@ -68,7 +68,7 @@ void up_release_pending(void)
 {
   FAR struct tcb_s *rtcb = this_task();
 
-  slldbg("From TCB=%p\n", rtcb);
+  sllerr("From TCB=%p\n", rtcb);
 
   /* Merge the g_pendingtasks list into the ready-to-run task list */
 
diff --git a/arch/z16/src/common/up_reprioritizertr.c b/arch/z16/src/common/up_reprioritizertr.c
index 4872db37f2..0083f855bd 100644
--- a/arch/z16/src/common/up_reprioritizertr.c
+++ b/arch/z16/src/common/up_reprioritizertr.c
@@ -96,7 +96,7 @@ void up_reprioritize_rtr(FAR struct tcb_s *tcb, uint8_t priority)
       FAR struct tcb_s *rtcb = this_task();
       bool switch_needed;
 
-      slldbg("TCB=%p PRI=%d\n", tcb, priority);
+      sllerr("TCB=%p PRI=%d\n", tcb, priority);
 
       /* Remove the tcb task from the ready-to-run list.
        * sched_removereadytorun will return true if we just
diff --git a/arch/z16/src/common/up_stackdump.c b/arch/z16/src/common/up_stackdump.c
index 9f95debe31..48f63bef37 100644
--- a/arch/z16/src/common/up_stackdump.c
+++ b/arch/z16/src/common/up_stackdump.c
@@ -74,13 +74,13 @@ static void up_stackdump(void)
   chipreg_t stack_base = (chipreg_t)rtcb->adj_stack_ptr;
   chipreg_t stack_size = (chipreg_t)rtcb->adj_stack_size;
 
-  lldbg("stack_base: %08x\n", stack_base);
-  lldbg("stack_size: %08x\n", stack_size);
-  lldbg("sp:         %08x\n", sp);
+  llerr("stack_base: %08x\n", stack_base);
+  llerr("stack_size: %08x\n", stack_size);
+  llerr("sp:         %08x\n", sp);
 
   if (sp >= stack_base || sp < stack_base - stack_size)
     {
-      lldbg("ERROR: Stack pointer is not within allocated stack\n");
+      llerr("ERROR: Stack pointer is not within allocated stack\n");
       return;
     }
   else
@@ -90,7 +90,7 @@ static void up_stackdump(void)
       for (stack = sp & ~0x0f; stack < stack_base; stack += 8*sizeof(chipreg_t))
         {
           chipreg_t *ptr = (chipreg_t*)stack;
-          lldbg("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+          llerr("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
                  stack, ptr[0], ptr[1], ptr[2], ptr[3],
                  ptr[4], ptr[5], ptr[6], ptr[7]);
         }
diff --git a/arch/z16/src/z16f/z16f_espi.c b/arch/z16/src/z16f/z16f_espi.c
index af357444a9..16676a280e 100644
--- a/arch/z16/src/z16f/z16f_espi.c
+++ b/arch/z16/src/z16f/z16f_espi.c
@@ -70,9 +70,9 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg    lldbg
+#  define spidbg    llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo (void)
 #  endif
@@ -231,7 +231,7 @@ static bool spi_checkreg(FAR struct z16f_spi_s *priv, bool wr, uint16_t regval,
         {
           /* Yes... show how many times we did it */
 
-          lldbg("...[Repeats %d times]...\n", priv->ntimes);
+          llerr("...[Repeats %d times]...\n", priv->ntimes);
         }
 
       /* Save information about the new access */
@@ -263,7 +263,7 @@ static uint8_t spi_getreg8(FAR struct z16f_spi_s *priv, uintptr_t regaddr)
 
   if (spi_checkreg(priv, false, (uint16_t)regval, regaddr))
     {
-      lldbg("%06x->%02x\n", regaddr, regval);
+      llerr("%06x->%02x\n", regaddr, regval);
     }
 
   return regval;
@@ -284,7 +284,7 @@ static void spi_putreg8(FAR struct z16f_spi_s *priv, uint8_t regval,
 {
   if (spi_checkreg(priv, true, (uint16_t)regval, regaddr))
     {
-      lldbg("%06x<-%02x\n", regaddr, regval);
+      llerr("%06x<-%02x\n", regaddr, regval);
     }
 
   putreg8(regval, regaddr);
@@ -305,7 +305,7 @@ static void spi_putreg16(FAR struct z16f_spi_s *priv, uint16_t regval,
 {
   if (spi_checkreg(priv, true, regval, regaddr))
     {
-      lldbg("%06x<-%04x\n", regaddr, regval);
+      llerr("%06x<-%04x\n", regaddr, regval);
     }
 
   putreg8(regval, regaddr);
diff --git a/arch/z80/src/common/up_assert.c b/arch/z80/src/common/up_assert.c
index a7b4733934..b459aa00af 100644
--- a/arch/z80/src/common/up_assert.c
+++ b/arch/z80/src/common/up_assert.c
@@ -157,17 +157,17 @@ void up_assert(void)
 
 #ifdef CONFIG_HAVE_FILENAME
 #if CONFIG_TASK_NAME_SIZE > 0
-  lldbg("Assertion failed at file:%s line: %d task: %s\n",
+  llerr("Assertion failed at file:%s line: %d task: %s\n",
         filename, lineno, rtcb->name);
 #else
-  lldbg("Assertion failed at file:%s line: %d\n",
+  llerr("Assertion failed at file:%s line: %d\n",
         filename, lineno);
 #endif
 #else
 #if CONFIG_TASK_NAME_SIZE > 0
-  lldbg("Assertion failed: task: %s\n", rtcb->name);
+  llerr("Assertion failed: task: %s\n", rtcb->name);
 #else
-  lldbg("Assertion failed\n");
+  llerr("Assertion failed\n");
 #endif
 #endif
 
diff --git a/arch/z80/src/common/up_exit.c b/arch/z80/src/common/up_exit.c
index 45efedd881..ddbf062f59 100644
--- a/arch/z80/src/common/up_exit.c
+++ b/arch/z80/src/common/up_exit.c
@@ -88,8 +88,8 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
   int i;
 #endif
 
-  lldbg("  TCB=%p name=%s\n", tcb, tcb->argv[0]);
-  lldbg("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
+  llerr("  TCB=%p name=%s\n", tcb, tcb->argv[0]);
+  llerr("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
 
 #if CONFIG_NFILE_DESCRIPTORS > 0
   filelist = tcb->group->tg_filelist;
@@ -98,7 +98,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
       struct inode *inode = filelist->fl_files[i].f_inode;
       if (inode)
         {
-          lldbg("      fd=%d refcount=%d\n",
+          llerr("      fd=%d refcount=%d\n",
                 i, inode->i_crefs);
         }
     }
@@ -112,11 +112,11 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
       if (filep->fs_fd >= 0)
         {
 #if CONFIG_STDIO_BUFFER_SIZE > 0
-          lldbg("      fd=%d nbytes=%d\n",
+          llerr("      fd=%d nbytes=%d\n",
                 filep->fs_fd,
                 filep->fs_bufpos - filep->fs_bufstart);
 #else
-          lldbg("      fd=%d\n", filep->fs_fd);
+          llerr("      fd=%d\n", filep->fs_fd);
 #endif
         }
     }
@@ -149,10 +149,10 @@ void _exit(int status)
 
   (void)up_irq_save();
 
-  slldbg("TCB=%p exiting\n", tcb);
+  sllerr("TCB=%p exiting\n", tcb);
 
 #if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
-  lldbg("Other tasks:\n");
+  llerr("Other tasks:\n");
   sched_foreach(_up_dumponexit, NULL);
 #endif
 
@@ -165,7 +165,7 @@ void _exit(int status)
    */
 
   tcb = this_task();
-  slldbg("New Active Task TCB=%p\n", tcb);
+  sllerr("New Active Task TCB=%p\n", tcb);
 
 #ifdef CONFIG_ARCH_ADDRENV
   /* Make sure that the address environment for the previously running
diff --git a/arch/z80/src/common/up_initialize.c b/arch/z80/src/common/up_initialize.c
index 17a1c037a9..585db52c62 100644
--- a/arch/z80/src/common/up_initialize.c
+++ b/arch/z80/src/common/up_initialize.c
@@ -75,13 +75,13 @@ static void up_calibratedelay(void)
 {
   int i;
 
-  lldbg("Beginning 100s delay\n");
+  llerr("Beginning 100s delay\n");
   for (i = 0; i < 100; i++)
     {
       up_mdelay(1000);
     }
 
-  lldbg("End 100s delay\n");
+  llerr("End 100s delay\n");
 }
 #else
 # define up_calibratedelay()
diff --git a/arch/z80/src/common/up_releasepending.c b/arch/z80/src/common/up_releasepending.c
index e4bc07a78f..411559b194 100644
--- a/arch/z80/src/common/up_releasepending.c
+++ b/arch/z80/src/common/up_releasepending.c
@@ -70,7 +70,7 @@ void up_release_pending(void)
 {
   FAR struct tcb_s *rtcb = this_task();
 
-  slldbg("From TCB=%p\n", rtcb);
+  sllerr("From TCB=%p\n", rtcb);
 
   /* Merge the g_pendingtasks list into the ready-to-run task list */
 
diff --git a/arch/z80/src/common/up_reprioritizertr.c b/arch/z80/src/common/up_reprioritizertr.c
index d710277563..ad6de96fbf 100644
--- a/arch/z80/src/common/up_reprioritizertr.c
+++ b/arch/z80/src/common/up_reprioritizertr.c
@@ -98,7 +98,7 @@ void up_reprioritize_rtr(FAR struct tcb_s *tcb, uint8_t priority)
       FAR struct tcb_s *rtcb = this_task();
       bool switch_needed;
 
-      slldbg("TCB=%p PRI=%d\n", tcb, priority);
+      sllerr("TCB=%p PRI=%d\n", tcb, priority);
 
       /* Remove the tcb task from the ready-to-run list.
        * sched_removereadytorun will return true if we just
diff --git a/arch/z80/src/common/up_stackdump.c b/arch/z80/src/common/up_stackdump.c
index b9a1bf1508..ee2d5ee31f 100644
--- a/arch/z80/src/common/up_stackdump.c
+++ b/arch/z80/src/common/up_stackdump.c
@@ -83,13 +83,13 @@ static void up_stackdump(void)
   uint16_t stack_base = (uint16_t)rtcb->adj_stack_ptr;
   uint16_t stack_size = (uint16_t)rtcb->adj_stack_size;
 
-  lldbg("stack_base: %04x\n", stack_base);
-  lldbg("stack_size: %04x\n", stack_size);
-  lldbg("sp:         %04x\n", sp);
+  llerr("stack_base: %04x\n", stack_base);
+  llerr("stack_size: %04x\n", stack_size);
+  llerr("sp:         %04x\n", sp);
 
   if (sp >= stack_base || sp < stack_base - stack_size)
     {
-      lldbg("ERROR: Stack pointer is not within allocated stack\n");
+      llerr("ERROR: Stack pointer is not within allocated stack\n");
       return;
     }
   else
@@ -99,7 +99,7 @@ static void up_stackdump(void)
       for (stack = sp & ~0x0f; stack < stack_base; stack += 8*sizeof(uint16_t))
         {
           uint16_t *ptr = (uint16_t*)stack;
-          lldbg("%04x: %04x %04x %04x %04x %04x %04x %04x %04x\n",
+          llerr("%04x: %04x %04x %04x %04x %04x %04x %04x %04x\n",
                  stack, ptr[0], ptr[1], ptr[2], ptr[3],
                  ptr[4], ptr[5], ptr[6], ptr[7]);
         }
diff --git a/arch/z80/src/ez80/ez80_emac.c b/arch/z80/src/ez80/ez80_emac.c
index 308f8231b2..f715cfcac2 100644
--- a/arch/z80/src/ez80/ez80_emac.c
+++ b/arch/z80/src/ez80/ez80_emac.c
@@ -2200,7 +2200,7 @@ int up_netinitialize(void)
   ret = irq_attach(EZ80_EMACSYS_IRQ, ez80emac_sysinterrupt);
   if (ret < 0)
     {
-      nlldbg("Unable to attach IRQ %d\n", EZ80_EMACSYS_IRQ);
+      nllerr("Unable to attach IRQ %d\n", EZ80_EMACSYS_IRQ);
       ret = -EAGAIN;
       goto errout;
     }
@@ -2208,7 +2208,7 @@ int up_netinitialize(void)
   ret = irq_attach(EZ80_EMACRX_IRQ, ez80emac_rxinterrupt);
   if (ret < 0)
     {
-      nlldbg("Unable to attach IRQ %d\n", EZ80_EMACRX_IRQ);
+      nllerr("Unable to attach IRQ %d\n", EZ80_EMACRX_IRQ);
       ret = -EAGAIN;
       goto errout;
     }
@@ -2216,7 +2216,7 @@ int up_netinitialize(void)
   ret = irq_attach(EZ80_EMACTX_IRQ, ez80emac_txinterrupt);
   if (ret < 0)
     {
-      nlldbg("Unable to attach IRQ %d\n", EZ80_EMACTX_IRQ);
+      nllerr("Unable to attach IRQ %d\n", EZ80_EMACTX_IRQ);
       ret = -EAGAIN;
       goto errout;
     }
diff --git a/arch/z80/src/ez80/ez80_registerdump.c b/arch/z80/src/ez80/ez80_registerdump.c
index c6025165d3..350af5a697 100644
--- a/arch/z80/src/ez80/ez80_registerdump.c
+++ b/arch/z80/src/ez80/ez80_registerdump.c
@@ -77,22 +77,22 @@ static void ez80_registerdump(void)
   if (g_current_regs)
     {
 #ifdef CONFIG_EZ80_Z80MODE
-      lldbg("AF: %04x  I: %04x\n",
+      llerr("AF: %04x  I: %04x\n",
             g_current_regs[XCPT_AF], g_current_regs[XCPT_I]);
-      lldbg("BC: %04x DE: %04x HL: %04x\n",
+      llerr("BC: %04x DE: %04x HL: %04x\n",
             g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]);
-      lldbg("IX: %04x IY: %04x\n",
+      llerr("IX: %04x IY: %04x\n",
             g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]);
-      lldbg("SP: %04x PC: %04x\n"
+      llerr("SP: %04x PC: %04x\n"
             g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]);
 #else
-      lldbg("AF: %06x  I: %06x\n",
+      llerr("AF: %06x  I: %06x\n",
             g_current_regs[XCPT_AF], g_current_regs[XCPT_I]);
-      lldbg("BC: %06x DE: %06x HL: %06x\n",
+      llerr("BC: %06x DE: %06x HL: %06x\n",
             g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]);
-      lldbg("IX: %06x IY: %06x\n",
+      llerr("IX: %06x IY: %06x\n",
             g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]);
-      lldbg("SP: %06x PC: %06x\n"
+      llerr("SP: %06x PC: %06x\n"
             g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]);
 #endif
     }
diff --git a/arch/z80/src/z180/z180_registerdump.c b/arch/z80/src/z180/z180_registerdump.c
index bf8713d6a2..322b0fc7c0 100644
--- a/arch/z80/src/z180/z180_registerdump.c
+++ b/arch/z80/src/z180/z180_registerdump.c
@@ -76,15 +76,15 @@ static void z180_registerdump(void)
 {
   if (g_current_regs)
     {
-      lldbg("AF: %04x  I: %04x\n",
+      llerr("AF: %04x  I: %04x\n",
             g_current_regs[XCPT_AF], g_current_regs[XCPT_I]);
-      lldbg("BC: %04x DE: %04x HL: %04x\n",
+      llerr("BC: %04x DE: %04x HL: %04x\n",
             g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]);
-      lldbg("IX: %04x IY: %04x\n",
+      llerr("IX: %04x IY: %04x\n",
             g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]);
-      lldbg("SP: %04x PC: %04x\n"
+      llerr("SP: %04x PC: %04x\n"
             g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]);
-      lldbg("CBAR: %02x BBR: %02x CBR: %02x\n"
+      llerr("CBAR: %02x BBR: %02x CBR: %02x\n"
             inp(Z180_MMU_CBAR), inp(Z180_MMU_BBR), inp(Z180_MMU_CBR));
     }
 }
diff --git a/arch/z80/src/z8/z8_registerdump.c b/arch/z80/src/z8/z8_registerdump.c
index f85273d27f..ffe393b068 100644
--- a/arch/z80/src/z8/z8_registerdump.c
+++ b/arch/z80/src/z8/z8_registerdump.c
@@ -71,7 +71,7 @@
 
 static inline void z8_dumpregs(FAR chipret_t *regs)
 {
-  lldbg("REGS: %04x %04x %04x %04x %04x %04x %04x %04x\n",
+  llerr("REGS: %04x %04x %04x %04x %04x %04x %04x %04x\n",
          regs[XCPT_RR0], regs[XCPT_RR2], regs[XCPT_RR4], regs[XCPT_RR6],
          regs[XCPT_RR8], regs[XCPT_RR10], regs[XCPT_RR12], regs[XCPT_RR14]);
 }
@@ -79,7 +79,7 @@ static inline void z8_dumpregs(FAR chipret_t *regs)
 static inline void z8_dumpstate(chipreg_t sp, chipreg_t pc, uint8_t irqctl,
                                 chipreg_t rpflags)
 {
-  lldbg("SP: %04x PC: %04x IRQCTL: %02x RP: %02x FLAGS: %02x\n",
+  llerr("SP: %04x PC: %04x IRQCTL: %02x RP: %02x FLAGS: %02x\n",
         sp, pc, irqctl & 0xff, rpflags >> 8, rpflags & 0xff);
 }
 
diff --git a/arch/z80/src/z80/z80_registerdump.c b/arch/z80/src/z80/z80_registerdump.c
index eaea63c7b4..b32b3cc7b0 100644
--- a/arch/z80/src/z80/z80_registerdump.c
+++ b/arch/z80/src/z80/z80_registerdump.c
@@ -76,13 +76,13 @@ static void z80_registerdump(void)
 {
   if (g_current_regs)
     {
-      lldbg("AF: %04x  I: %04x\n",
+      llerr("AF: %04x  I: %04x\n",
             g_current_regs[XCPT_AF], g_current_regs[XCPT_I]);
-      lldbg("BC: %04x DE: %04x HL: %04x\n",
+      llerr("BC: %04x DE: %04x HL: %04x\n",
             g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]);
-      lldbg("IX: %04x IY: %04x\n",
+      llerr("IX: %04x IY: %04x\n",
             g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]);
-      lldbg("SP: %04x PC: %04x\n"
+      llerr("SP: %04x PC: %04x\n"
             g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]);
     }
 }
diff --git a/binfmt/binfmt_schedunload.c b/binfmt/binfmt_schedunload.c
index 5a459d79ae..1347262ff4 100644
--- a/binfmt/binfmt_schedunload.c
+++ b/binfmt/binfmt_schedunload.c
@@ -209,7 +209,7 @@ static void unload_callback(int signo, siginfo_t *info, void *ucontext)
 
   if (!info || signo != SIGCHLD)
     {
-      blldbg("ERROR:Bad signal callback: signo=%d info=%p\n", signo, info);
+      bllerr("ERROR:Bad signal callback: signo=%d info=%p\n", signo, info);
       return;
     }
 
@@ -218,7 +218,7 @@ static void unload_callback(int signo, siginfo_t *info, void *ucontext)
   bin = unload_list_remove(info->si_pid);
   if (!bin)
     {
-      blldbg("ERROR: Could not find load info for PID=%d\n", info->si_pid);
+      bllerr("ERROR: Could not find load info for PID=%d\n", info->si_pid);
       return;
     }
 
@@ -227,7 +227,7 @@ static void unload_callback(int signo, siginfo_t *info, void *ucontext)
   ret = unload_module(bin);
   if (ret < 0)
     {
-      blldbg("ERROR: unload_module failed: %d\n", get_errno());
+      bllerr("ERROR: unload_module failed: %d\n", get_errno());
     }
 
   /* Free the load structure */
@@ -317,7 +317,7 @@ int schedule_unload(pid_t pid, FAR struct binary_s *bin)
       flags = enter_critical_section();
       if (unload_list_remove(pid) != bin)
         {
-          blldbg("ERROR: Failed to remove structure\n");
+          bllerr("ERROR: Failed to remove structure\n");
         }
 
       leave_critical_section(flags);
diff --git a/configs/arduino-due/src/sam_autoleds.c b/configs/arduino-due/src/sam_autoleds.c
index b84f34f1a5..f407e86cdd 100644
--- a/configs/arduino-due/src/sam_autoleds.c
+++ b/configs/arduino-due/src/sam_autoleds.c
@@ -100,7 +100,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/arduino-due/src/sam_userleds.c b/configs/arduino-due/src/sam_userleds.c
index 4279a4ab1e..e41418bf7b 100644
--- a/configs/arduino-due/src/sam_userleds.c
+++ b/configs/arduino-due/src/sam_userleds.c
@@ -60,7 +60,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/cc3200-launchpad/src/cc3200_autoleds.c b/configs/cc3200-launchpad/src/cc3200_autoleds.c
index f3cded9e76..6853edc88c 100644
--- a/configs/cc3200-launchpad/src/cc3200_autoleds.c
+++ b/configs/cc3200-launchpad/src/cc3200_autoleds.c
@@ -92,7 +92,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/cloudctrl/src/stm32_autoleds.c b/configs/cloudctrl/src/stm32_autoleds.c
index ef237c0652..11de1e7f21 100644
--- a/configs/cloudctrl/src/stm32_autoleds.c
+++ b/configs/cloudctrl/src/stm32_autoleds.c
@@ -63,7 +63,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/cloudctrl/src/stm32_spi.c b/configs/cloudctrl/src/stm32_spi.c
index d1eba035c1..cae199dd0e 100644
--- a/configs/cloudctrl/src/stm32_spi.c
+++ b/configs/cloudctrl/src/stm32_spi.c
@@ -65,9 +65,9 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/cloudctrl/src/stm32_usb.c b/configs/cloudctrl/src/stm32_usb.c
index 49f25d4330..e711536e91 100644
--- a/configs/cloudctrl/src/stm32_usb.c
+++ b/configs/cloudctrl/src/stm32_usb.c
@@ -301,7 +301,7 @@ xcpt_t stm32_setup_overcurrent(xcpt_t handler)
 #ifdef CONFIG_USBDEV
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ulldbg("resume: %d\n", resume);
+  ullerr("resume: %d\n", resume);
 }
 #endif
 
diff --git a/configs/cloudctrl/src/stm32_userleds.c b/configs/cloudctrl/src/stm32_userleds.c
index 79316352ac..4f48929edf 100644
--- a/configs/cloudctrl/src/stm32_userleds.c
+++ b/configs/cloudctrl/src/stm32_userleds.c
@@ -63,7 +63,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/demo9s12ne64/src/m9s12_leds.c b/configs/demo9s12ne64/src/m9s12_leds.c
index a5b357b803..167a365bb7 100644
--- a/configs/demo9s12ne64/src/m9s12_leds.c
+++ b/configs/demo9s12ne64/src/m9s12_leds.c
@@ -55,7 +55,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/demo9s12ne64/src/m9s12_spi.c b/configs/demo9s12ne64/src/m9s12_spi.c
index 329609850d..7348e30f14 100644
--- a/configs/demo9s12ne64/src/m9s12_spi.c
+++ b/configs/demo9s12ne64/src/m9s12_spi.c
@@ -60,9 +60,9 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/dk-tm4c129x/src/tm4c_ethernet.c b/configs/dk-tm4c129x/src/tm4c_ethernet.c
index 8594d75559..abe1dbb53d 100644
--- a/configs/dk-tm4c129x/src/tm4c_ethernet.c
+++ b/configs/dk-tm4c129x/src/tm4c_ethernet.c
@@ -84,7 +84,7 @@ void tiva_ethernetmac(struct ether_addr *ethaddr)
   user0 = getreg32(TIVA_FLASH_USERREG0);
   user1 = getreg32(TIVA_FLASH_USERREG1);
 
-  nlldbg("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
+  nllerr("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
   DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff);
 
   /* Re-format that MAC address the way that the network expects to see it */
diff --git a/configs/dk-tm4c129x/src/tm4c_ssi.c b/configs/dk-tm4c129x/src/tm4c_ssi.c
index 35122c8bf5..8164b61e20 100644
--- a/configs/dk-tm4c129x/src/tm4c_ssi.c
+++ b/configs/dk-tm4c129x/src/tm4c_ssi.c
@@ -62,7 +62,7 @@
 /* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define ssidbg lldbg
+#  define ssidbg llerr
 #else
 #  define ssidbg(x...)
 #endif
@@ -70,7 +70,7 @@
 /* Dump GPIO registers */
 
 #if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO)
-#  define ssiinfo lldbg
+#  define ssiinfo llerr
 #  define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m)
 #else
 #  define ssiinfo(x...)
diff --git a/configs/dk-tm4c129x/src/tm4c_userleds.c b/configs/dk-tm4c129x/src/tm4c_userleds.c
index 6d708ad1cc..f1d0cc8f59 100644
--- a/configs/dk-tm4c129x/src/tm4c_userleds.c
+++ b/configs/dk-tm4c129x/src/tm4c_userleds.c
@@ -71,7 +71,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/ea3131/src/lpc31_fillpage.c b/configs/ea3131/src/lpc31_fillpage.c
index 51c57f06a9..7f1b62b70a 100644
--- a/configs/ea3131/src/lpc31_fillpage.c
+++ b/configs/ea3131/src/lpc31_fillpage.c
@@ -412,7 +412,7 @@ int up_fillpage(FAR struct tcb_s *tcb, FAR void *vpage)
   off_t   offset;
 #endif
 
-  pglldbg("TCB: %p vpage: %p far: %08x\n", tcb, vpage, tcb->xcp.far);
+  pgllerr("TCB: %p vpage: %p far: %08x\n", tcb, vpage, tcb->xcp.far);
   DEBUGASSERT(tcb->xcp.far >= PG_PAGED_VBASE && tcb->xcp.far < PG_PAGED_VEND);
 
   /* If BINPATH is defined, then it is the full path to a file on a mounted file
@@ -475,7 +475,7 @@ int up_fillpage(FAR struct tcb_s *tcb, FAR void *vpage)
 
 int up_fillpage(FAR struct tcb_s *tcb, FAR void *vpage, up_pgcallback_t pg_callback)
 {
-  pglldbg("TCB: %p vpage: %d far: %08x\n", tcb, vpage, tcb->xcp.far);
+  pgllerr("TCB: %p vpage: %d far: %08x\n", tcb, vpage, tcb->xcp.far);
   DEBUGASSERT(tcb->xcp.far >= PG_PAGED_VBASE && tcb->xcp.far < PG_PAGED_VEND);
 
 #if defined(CONFIG_PAGING_BINPATH)
diff --git a/configs/ea3131/src/lpc31_leds.c b/configs/ea3131/src/lpc31_leds.c
index 396f014bd9..82a1c34a61 100644
--- a/configs/ea3131/src/lpc31_leds.c
+++ b/configs/ea3131/src/lpc31_leds.c
@@ -60,7 +60,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/ea3131/src/lpc31_spi.c b/configs/ea3131/src/lpc31_spi.c
index 2a71d33c27..c66f53b9ff 100644
--- a/configs/ea3131/src/lpc31_spi.c
+++ b/configs/ea3131/src/lpc31_spi.c
@@ -65,9 +65,9 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/ea3152/src/lpc31_fillpage.c b/configs/ea3152/src/lpc31_fillpage.c
index 09cb59c000..62745695cb 100644
--- a/configs/ea3152/src/lpc31_fillpage.c
+++ b/configs/ea3152/src/lpc31_fillpage.c
@@ -412,7 +412,7 @@ int up_fillpage(FAR struct tcb_s *tcb, FAR void *vpage)
   off_t   offset;
 #endif
 
-  pglldbg("TCB: %p vpage: %p far: %08x\n", tcb, vpage, tcb->xcp.far);
+  pgllerr("TCB: %p vpage: %p far: %08x\n", tcb, vpage, tcb->xcp.far);
   DEBUGASSERT(tcb->xcp.far >= PG_PAGED_VBASE && tcb->xcp.far < PG_PAGED_VEND);
 
   /* If BINPATH is defined, then it is the full path to a file on a mounted file
@@ -475,7 +475,7 @@ int up_fillpage(FAR struct tcb_s *tcb, FAR void *vpage)
 
 int up_fillpage(FAR struct tcb_s *tcb, FAR void *vpage, up_pgcallback_t pg_callback)
 {
-  pglldbg("TCB: %p vpage: %d far: %08x\n", tcb, vpage, tcb->xcp.far);
+  pgllerr("TCB: %p vpage: %d far: %08x\n", tcb, vpage, tcb->xcp.far);
   DEBUGASSERT(tcb->xcp.far >= PG_PAGED_VBASE && tcb->xcp.far < PG_PAGED_VEND);
 
 #if defined(CONFIG_PAGING_BINPATH)
diff --git a/configs/ea3152/src/lpc31_leds.c b/configs/ea3152/src/lpc31_leds.c
index 7810e06e1e..986c77af5e 100644
--- a/configs/ea3152/src/lpc31_leds.c
+++ b/configs/ea3152/src/lpc31_leds.c
@@ -60,7 +60,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/ea3152/src/lpc31_spi.c b/configs/ea3152/src/lpc31_spi.c
index 6347edf502..1436e65748 100644
--- a/configs/ea3152/src/lpc31_spi.c
+++ b/configs/ea3152/src/lpc31_spi.c
@@ -65,9 +65,9 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/eagle100/src/lm_ethernet.c b/configs/eagle100/src/lm_ethernet.c
index 7a33e1af6c..b556e1d7cd 100644
--- a/configs/eagle100/src/lm_ethernet.c
+++ b/configs/eagle100/src/lm_ethernet.c
@@ -83,7 +83,7 @@ void tiva_ethernetmac(struct ether_addr *ethaddr)
   user0 = getreg32(TIVA_FLASH_USERREG0);
   user1 = getreg32(TIVA_FLASH_USERREG1);
 
-  nlldbg("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
+  nllerr("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
   DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff);
 
   /* Re-format that MAC address the way that the network expects to see it */
diff --git a/configs/eagle100/src/lm_leds.c b/configs/eagle100/src/lm_leds.c
index 53282481ad..03f0b3e510 100644
--- a/configs/eagle100/src/lm_leds.c
+++ b/configs/eagle100/src/lm_leds.c
@@ -60,7 +60,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/eagle100/src/lm_ssi.c b/configs/eagle100/src/lm_ssi.c
index 09cfcb4451..f106382d05 100644
--- a/configs/eagle100/src/lm_ssi.c
+++ b/configs/eagle100/src/lm_ssi.c
@@ -65,9 +65,9 @@
 #undef SSI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SSI_DEBUG
-#  define ssidbg  lldbg
+#  define ssidbg  llerr
 #  ifdef SSI_VERBOSE
-#    define ssiinfo lldbg
+#    define ssiinfo llerr
 #  else
 #    define ssiinfo(x...)
 #  endif
diff --git a/configs/efm32-g8xx-stk/src/efm32_autoleds.c b/configs/efm32-g8xx-stk/src/efm32_autoleds.c
index d1d73ada95..ae7176c7a2 100644
--- a/configs/efm32-g8xx-stk/src/efm32_autoleds.c
+++ b/configs/efm32-g8xx-stk/src/efm32_autoleds.c
@@ -64,7 +64,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/efm32-g8xx-stk/src/efm32_userleds.c b/configs/efm32-g8xx-stk/src/efm32_userleds.c
index ce42e08b69..c09254f323 100644
--- a/configs/efm32-g8xx-stk/src/efm32_userleds.c
+++ b/configs/efm32-g8xx-stk/src/efm32_userleds.c
@@ -64,7 +64,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/efm32gg-stk3700/src/efm32_autoleds.c b/configs/efm32gg-stk3700/src/efm32_autoleds.c
index 598f7c04b8..c1f2c8b110 100644
--- a/configs/efm32gg-stk3700/src/efm32_autoleds.c
+++ b/configs/efm32gg-stk3700/src/efm32_autoleds.c
@@ -98,7 +98,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/efm32gg-stk3700/src/efm32_userleds.c b/configs/efm32gg-stk3700/src/efm32_userleds.c
index 093a151f97..53bbf90685 100644
--- a/configs/efm32gg-stk3700/src/efm32_userleds.c
+++ b/configs/efm32gg-stk3700/src/efm32_userleds.c
@@ -75,7 +75,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/ekk-lm3s9b96/src/lm_ethernet.c b/configs/ekk-lm3s9b96/src/lm_ethernet.c
index c3627e4a16..db8a560be5 100644
--- a/configs/ekk-lm3s9b96/src/lm_ethernet.c
+++ b/configs/ekk-lm3s9b96/src/lm_ethernet.c
@@ -84,7 +84,7 @@ void tiva_ethernetmac(struct ether_addr *ethaddr)
   user0 = getreg32(TIVA_FLASH_USERREG0);
   user1 = getreg32(TIVA_FLASH_USERREG1);
 
-  nlldbg("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
+  nllerr("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
   DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff);
 
   /* Re-format that MAC address the way that the network expects to see it */
diff --git a/configs/ekk-lm3s9b96/src/lm_leds.c b/configs/ekk-lm3s9b96/src/lm_leds.c
index 7abff4bbcc..0b188a81be 100644
--- a/configs/ekk-lm3s9b96/src/lm_leds.c
+++ b/configs/ekk-lm3s9b96/src/lm_leds.c
@@ -61,7 +61,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/ekk-lm3s9b96/src/lm_ssi.c b/configs/ekk-lm3s9b96/src/lm_ssi.c
index bef242e500..fc402edc1f 100644
--- a/configs/ekk-lm3s9b96/src/lm_ssi.c
+++ b/configs/ekk-lm3s9b96/src/lm_ssi.c
@@ -64,9 +64,9 @@
 #undef SSI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SSI_DEBUG
-#  define ssidbg  lldbg
+#  define ssidbg  llerr
 #  ifdef SSI_VERBOSE
-#    define ssiinfo lldbg
+#    define ssiinfo llerr
 #  else
 #    define ssiinfo(x...)
 #  endif
diff --git a/configs/fire-stm32v2/src/stm32_autoleds.c b/configs/fire-stm32v2/src/stm32_autoleds.c
index e70905831f..2d6b80528e 100644
--- a/configs/fire-stm32v2/src/stm32_autoleds.c
+++ b/configs/fire-stm32v2/src/stm32_autoleds.c
@@ -62,7 +62,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/fire-stm32v2/src/stm32_enc28j60.c b/configs/fire-stm32v2/src/stm32_enc28j60.c
index 2094f35aab..ac1e82381a 100644
--- a/configs/fire-stm32v2/src/stm32_enc28j60.c
+++ b/configs/fire-stm32v2/src/stm32_enc28j60.c
@@ -188,7 +188,7 @@ void up_netinitialize(void)
   spi = stm32_spibus_initialize(ENC28J60_SPI_PORTNO);
   if (!spi)
     {
-      nlldbg("Failed to initialize SPI port %d\n", ENC28J60_SPI_PORTNO);
+      nllerr("Failed to initialize SPI port %d\n", ENC28J60_SPI_PORTNO);
       return;
     }
 
@@ -201,7 +201,7 @@ void up_netinitialize(void)
   ret = enc_initialize(spi, &g_enclower.lower, ENC28J60_DEVNO);
   if (ret < 0)
     {
-      nlldbg("Failed to bind SPI port %d ENC28J60 device %d: %d\n",
+      nllerr("Failed to bind SPI port %d ENC28J60 device %d: %d\n",
              ENC28J60_SPI_PORTNO, ENC28J60_DEVNO, ret);
       return;
     }
diff --git a/configs/fire-stm32v2/src/stm32_spi.c b/configs/fire-stm32v2/src/stm32_spi.c
index 6f2bcb4177..2b7216e05b 100644
--- a/configs/fire-stm32v2/src/stm32_spi.c
+++ b/configs/fire-stm32v2/src/stm32_spi.c
@@ -63,9 +63,9 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/fire-stm32v2/src/stm32_usbdev.c b/configs/fire-stm32v2/src/stm32_usbdev.c
index 5beea44b78..5ba1c8cbfd 100644
--- a/configs/fire-stm32v2/src/stm32_usbdev.c
+++ b/configs/fire-stm32v2/src/stm32_usbdev.c
@@ -114,6 +114,6 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable)
 
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ulldbg("resume: %d\n", resume);
+  ullerr("resume: %d\n", resume);
 }
 
diff --git a/configs/fire-stm32v2/src/stm32_userleds.c b/configs/fire-stm32v2/src/stm32_userleds.c
index f4968c2974..3f2d1ff650 100644
--- a/configs/fire-stm32v2/src/stm32_userleds.c
+++ b/configs/fire-stm32v2/src/stm32_userleds.c
@@ -62,7 +62,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/freedom-kl25z/src/kl_led.c b/configs/freedom-kl25z/src/kl_led.c
index c5fe8d3831..3a0a75d690 100644
--- a/configs/freedom-kl25z/src/kl_led.c
+++ b/configs/freedom-kl25z/src/kl_led.c
@@ -86,9 +86,9 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledinfo lldbg
+#    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
diff --git a/configs/freedom-kl25z/src/kl_spi.c b/configs/freedom-kl25z/src/kl_spi.c
index 0a41ea3371..d5c3d56edc 100644
--- a/configs/freedom-kl25z/src/kl_spi.c
+++ b/configs/freedom-kl25z/src/kl_spi.c
@@ -58,9 +58,9 @@
 /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/freedom-kl26z/src/kl_led.c b/configs/freedom-kl26z/src/kl_led.c
index a6bc7f048f..53b328d158 100644
--- a/configs/freedom-kl26z/src/kl_led.c
+++ b/configs/freedom-kl26z/src/kl_led.c
@@ -86,9 +86,9 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledinfo lldbg
+#    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
diff --git a/configs/freedom-kl26z/src/kl_spi.c b/configs/freedom-kl26z/src/kl_spi.c
index 2c7151a7b4..c5d25a96a7 100644
--- a/configs/freedom-kl26z/src/kl_spi.c
+++ b/configs/freedom-kl26z/src/kl_spi.c
@@ -58,9 +58,9 @@
 /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/hymini-stm32v/src/stm32_leds.c b/configs/hymini-stm32v/src/stm32_leds.c
index 4b1b1e4684..e669700696 100644
--- a/configs/hymini-stm32v/src/stm32_leds.c
+++ b/configs/hymini-stm32v/src/stm32_leds.c
@@ -62,7 +62,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/hymini-stm32v/src/stm32_spi.c b/configs/hymini-stm32v/src/stm32_spi.c
index 2150e1833f..7983b3496a 100644
--- a/configs/hymini-stm32v/src/stm32_spi.c
+++ b/configs/hymini-stm32v/src/stm32_spi.c
@@ -64,9 +64,9 @@
 #define SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/hymini-stm32v/src/stm32_usbdev.c b/configs/hymini-stm32v/src/stm32_usbdev.c
index d7e868c903..49f7f83339 100644
--- a/configs/hymini-stm32v/src/stm32_usbdev.c
+++ b/configs/hymini-stm32v/src/stm32_usbdev.c
@@ -73,7 +73,7 @@
 
 void stm32_usbinitialize(void)
 {
-  ulldbg("called\n");
+  ullerr("called\n");
 
   /* USB Soft Connect Pullup */
   stm32_configgpio(GPIO_USB_PULLUP);
@@ -111,6 +111,6 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable)
 
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ulldbg("resume: %d\n", resume);
+  ullerr("resume: %d\n", resume);
 }
 
diff --git a/configs/kwikstik-k40/src/k40_leds.c b/configs/kwikstik-k40/src/k40_leds.c
index ee458ef185..334a038b9d 100644
--- a/configs/kwikstik-k40/src/k40_leds.c
+++ b/configs/kwikstik-k40/src/k40_leds.c
@@ -52,7 +52,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/kwikstik-k40/src/k40_spi.c b/configs/kwikstik-k40/src/k40_spi.c
index 710e9e56b2..4e55111754 100644
--- a/configs/kwikstik-k40/src/k40_spi.c
+++ b/configs/kwikstik-k40/src/k40_spi.c
@@ -60,9 +60,9 @@
 /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef CONFIG_DEBUG_SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/kwikstik-k40/src/k40_usbdev.c b/configs/kwikstik-k40/src/k40_usbdev.c
index cfd9f071e8..da038aa0a8 100644
--- a/configs/kwikstik-k40/src/k40_usbdev.c
+++ b/configs/kwikstik-k40/src/k40_usbdev.c
@@ -108,6 +108,6 @@ int kinetis_usbpullup(FAR struct usbdev_s *dev, bool enable)
 
 void kinetis_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ulldbg("resume: %d\n", resume);
+  ullerr("resume: %d\n", resume);
 #warning "Missing logic"
 }
diff --git a/configs/launchxl-tms57004/src/tms570_autoleds.c b/configs/launchxl-tms57004/src/tms570_autoleds.c
index a92cf59ebb..b51afadfd7 100644
--- a/configs/launchxl-tms57004/src/tms570_autoleds.c
+++ b/configs/launchxl-tms57004/src/tms570_autoleds.c
@@ -98,7 +98,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/lincoln60/src/lpc17_leds.c b/configs/lincoln60/src/lpc17_leds.c
index 5b8ab87951..1baafaafa8 100644
--- a/configs/lincoln60/src/lpc17_leds.c
+++ b/configs/lincoln60/src/lpc17_leds.c
@@ -65,9 +65,9 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledinfo lldbg
+#    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
diff --git a/configs/lm3s6432-s2e/src/lm_ethernet.c b/configs/lm3s6432-s2e/src/lm_ethernet.c
index c10d261adc..befbdd7c0c 100644
--- a/configs/lm3s6432-s2e/src/lm_ethernet.c
+++ b/configs/lm3s6432-s2e/src/lm_ethernet.c
@@ -83,7 +83,7 @@ void tiva_ethernetmac(struct ether_addr *ethaddr)
   user0 = getreg32(TIVA_FLASH_USERREG0);
   user1 = getreg32(TIVA_FLASH_USERREG1);
 
-  nlldbg("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
+  nllerr("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
   DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff);
 
   /* Re-format that MAC address the way that the network expects to see it */
diff --git a/configs/lm3s6432-s2e/src/lm_leds.c b/configs/lm3s6432-s2e/src/lm_leds.c
index dc97dbe180..360a75e1a5 100644
--- a/configs/lm3s6432-s2e/src/lm_leds.c
+++ b/configs/lm3s6432-s2e/src/lm_leds.c
@@ -60,7 +60,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/lm3s6432-s2e/src/lm_ssi.c b/configs/lm3s6432-s2e/src/lm_ssi.c
index 4b7ddac4e8..9f2c4818c1 100644
--- a/configs/lm3s6432-s2e/src/lm_ssi.c
+++ b/configs/lm3s6432-s2e/src/lm_ssi.c
@@ -63,9 +63,9 @@
 #undef SSI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SSI_DEBUG
-#  define ssidbg  lldbg
+#  define ssidbg  llerr
 #  ifdef SSI_VERBOSE
-#    define ssiinfo lldbg
+#    define ssiinfo llerr
 #  else
 #    define ssiinfo(x...)
 #  endif
diff --git a/configs/lm3s6965-ek/src/lm_ethernet.c b/configs/lm3s6965-ek/src/lm_ethernet.c
index 4a467dd459..d6e8725de3 100644
--- a/configs/lm3s6965-ek/src/lm_ethernet.c
+++ b/configs/lm3s6965-ek/src/lm_ethernet.c
@@ -83,7 +83,7 @@ void tiva_ethernetmac(struct ether_addr *ethaddr)
   user0 = getreg32(TIVA_FLASH_USERREG0);
   user1 = getreg32(TIVA_FLASH_USERREG1);
 
-  nlldbg("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
+  nllerr("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
   DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff);
 
   /* Re-format that MAC address the way that the network expects to see it */
diff --git a/configs/lm3s6965-ek/src/lm_leds.c b/configs/lm3s6965-ek/src/lm_leds.c
index 1f38fe65ae..7bd3bdea2e 100644
--- a/configs/lm3s6965-ek/src/lm_leds.c
+++ b/configs/lm3s6965-ek/src/lm_leds.c
@@ -60,7 +60,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/lm3s6965-ek/src/lm_oled.c b/configs/lm3s6965-ek/src/lm_oled.c
index f289c65bad..0d4f1fb2ba 100644
--- a/configs/lm3s6965-ek/src/lm_oled.c
+++ b/configs/lm3s6965-ek/src/lm_oled.c
@@ -114,7 +114,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
   spi = tiva_ssibus_initialize(0);
   if (!spi)
     {
-      glldbg("Failed to initialize SSI port 0\n");
+      gllerr("Failed to initialize SSI port 0\n");
     }
   else
     {
@@ -123,7 +123,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
       dev = rit_initialize(spi, devno);
       if (!dev)
         {
-          glldbg("Failed to bind SSI port 0 to OLED %d: %d\n", devno);
+          gllerr("Failed to bind SSI port 0 to OLED %d: %d\n", devno);
         }
      else
         {
diff --git a/configs/lm3s6965-ek/src/lm_ssi.c b/configs/lm3s6965-ek/src/lm_ssi.c
index 9e18cbe60e..12126e6940 100644
--- a/configs/lm3s6965-ek/src/lm_ssi.c
+++ b/configs/lm3s6965-ek/src/lm_ssi.c
@@ -65,9 +65,9 @@
 #undef SSI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SSI_DEBUG
-#  define ssidbg  lldbg
+#  define ssidbg  llerr
 #  ifdef SSI_VERBOSE
-#    define ssiinfo lldbg
+#    define ssiinfo llerr
 #  else
 #    define ssiinfo(x...)
 #  endif
diff --git a/configs/lm3s8962-ek/src/lm_ethernet.c b/configs/lm3s8962-ek/src/lm_ethernet.c
index a6d4da70e9..319e0fac59 100644
--- a/configs/lm3s8962-ek/src/lm_ethernet.c
+++ b/configs/lm3s8962-ek/src/lm_ethernet.c
@@ -83,7 +83,7 @@ void tiva_ethernetmac(struct ether_addr *ethaddr)
   user0 = getreg32(TIVA_FLASH_USERREG0);
   user1 = getreg32(TIVA_FLASH_USERREG1);
 
-  nlldbg("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
+  nllerr("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
   DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff);
 
   /* Re-format that MAC address the way that the network expects to see it */
diff --git a/configs/lm3s8962-ek/src/lm_leds.c b/configs/lm3s8962-ek/src/lm_leds.c
index 0274ddc1fd..b1fa2421d0 100644
--- a/configs/lm3s8962-ek/src/lm_leds.c
+++ b/configs/lm3s8962-ek/src/lm_leds.c
@@ -60,7 +60,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/lm3s8962-ek/src/lm_oled.c b/configs/lm3s8962-ek/src/lm_oled.c
index 74e5cd9164..93f5344286 100644
--- a/configs/lm3s8962-ek/src/lm_oled.c
+++ b/configs/lm3s8962-ek/src/lm_oled.c
@@ -113,7 +113,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
   spi = tiva_ssibus_initialize(0);
   if (!spi)
     {
-      glldbg("Failed to initialize SSI port 0\n");
+      gllerr("Failed to initialize SSI port 0\n");
     }
   else
     {
@@ -122,7 +122,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
       dev = rit_initialize(spi, devno);
       if (!dev)
         {
-          glldbg("Failed to bind SSI port 0 to OLED %d: %d\n", devno);
+          gllerr("Failed to bind SSI port 0 to OLED %d: %d\n", devno);
         }
      else
         {
diff --git a/configs/lm3s8962-ek/src/lm_ssi.c b/configs/lm3s8962-ek/src/lm_ssi.c
index a0a32472ac..3a068665cb 100644
--- a/configs/lm3s8962-ek/src/lm_ssi.c
+++ b/configs/lm3s8962-ek/src/lm_ssi.c
@@ -65,9 +65,9 @@
 #undef SSI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SSI_DEBUG
-#  define ssidbg  lldbg
+#  define ssidbg  llerr
 #  ifdef SSI_VERBOSE
-#    define ssiinfo lldbg
+#    define ssiinfo llerr
 #  else
 #    define ssiinfo(x...)
 #  endif
diff --git a/configs/lm4f120-launchpad/src/lm4f_autoleds.c b/configs/lm4f120-launchpad/src/lm4f_autoleds.c
index 0fcb45ffa8..b55efa7b95 100644
--- a/configs/lm4f120-launchpad/src/lm4f_autoleds.c
+++ b/configs/lm4f120-launchpad/src/lm4f_autoleds.c
@@ -102,7 +102,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/lm4f120-launchpad/src/lm4f_ssi.c b/configs/lm4f120-launchpad/src/lm4f_ssi.c
index 0acbe8f4d1..a11a168108 100644
--- a/configs/lm4f120-launchpad/src/lm4f_ssi.c
+++ b/configs/lm4f120-launchpad/src/lm4f_ssi.c
@@ -63,7 +63,7 @@
 /* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define ssidbg lldbg
+#  define ssidbg llerr
 #else
 #  define ssidbg(x...)
 #endif
@@ -71,7 +71,7 @@
 /* Dump GPIO registers */
 
 #if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO)
-#  define ssiinfo lldbg
+#  define ssiinfo llerr
 #  define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m)
 #else
 #  define ssiinfo(x...)
diff --git a/configs/lpc4330-xplorer/src/lpc43_autoleds.c b/configs/lpc4330-xplorer/src/lpc43_autoleds.c
index 2d67cde475..c12d1ba62e 100644
--- a/configs/lpc4330-xplorer/src/lpc43_autoleds.c
+++ b/configs/lpc4330-xplorer/src/lpc43_autoleds.c
@@ -95,10 +95,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define LED_VERBOSE 1
-#    define ledinfo lldbg
+#    define ledinfo llerr
 #  else
 #    undef LED_VERBOSE
 #    define ledinfo(x...)
diff --git a/configs/lpc4330-xplorer/src/lpc43_userleds.c b/configs/lpc4330-xplorer/src/lpc43_userleds.c
index 0de6d63063..07735ddec1 100644
--- a/configs/lpc4330-xplorer/src/lpc43_userleds.c
+++ b/configs/lpc4330-xplorer/src/lpc43_userleds.c
@@ -72,10 +72,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define LED_VERBOSE 1
-#    define ledinfo lldbg
+#    define ledinfo llerr
 #  else
 #    undef LED_VERBOSE
 #    define ledinfo(x...)
diff --git a/configs/lpc4357-evb/src/lpc43_autoleds.c b/configs/lpc4357-evb/src/lpc43_autoleds.c
index 31589a84da..dd589c240e 100644
--- a/configs/lpc4357-evb/src/lpc43_autoleds.c
+++ b/configs/lpc4357-evb/src/lpc43_autoleds.c
@@ -92,10 +92,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define LED_VERBOSE 1
-#    define ledinfo lldbg
+#    define ledinfo llerr
 #  else
 #    undef LED_VERBOSE
 #    define ledinfo(x...)
diff --git a/configs/lpc4357-evb/src/lpc43_userleds.c b/configs/lpc4357-evb/src/lpc43_userleds.c
index 29086a86d0..5ac10a9db0 100644
--- a/configs/lpc4357-evb/src/lpc43_userleds.c
+++ b/configs/lpc4357-evb/src/lpc43_userleds.c
@@ -83,10 +83,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define LED_VERBOSE 1
-#    define ledinfo lldbg
+#    define ledinfo llerr
 #  else
 #    undef LED_VERBOSE
 #    define ledinfo(x...)
diff --git a/configs/lpc4370-link2/src/lpc43_autoleds.c b/configs/lpc4370-link2/src/lpc43_autoleds.c
index 8e9edbf141..ac30ba5842 100644
--- a/configs/lpc4370-link2/src/lpc43_autoleds.c
+++ b/configs/lpc4370-link2/src/lpc43_autoleds.c
@@ -64,10 +64,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define LED_VERBOSE 1
-#    define ledinfo lldbg
+#    define ledinfo llerr
 #  else
 #    undef LED_VERBOSE
 #    define ledinfo(x...)
diff --git a/configs/lpc4370-link2/src/lpc43_userleds.c b/configs/lpc4370-link2/src/lpc43_userleds.c
index 294bf48078..da911674f0 100644
--- a/configs/lpc4370-link2/src/lpc43_userleds.c
+++ b/configs/lpc4370-link2/src/lpc43_userleds.c
@@ -65,10 +65,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define LED_VERBOSE 1
-#    define ledinfo lldbg
+#    define ledinfo llerr
 #  else
 #    undef LED_VERBOSE
 #    define ledinfo(x...)
diff --git a/configs/lpcxpresso-lpc1115/src/lpc11_leds.c b/configs/lpcxpresso-lpc1115/src/lpc11_leds.c
index 06bb3e57c5..8154cfa283 100644
--- a/configs/lpcxpresso-lpc1115/src/lpc11_leds.c
+++ b/configs/lpcxpresso-lpc1115/src/lpc11_leds.c
@@ -61,9 +61,9 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledinfo lldbg
+#    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
diff --git a/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c b/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c
index 08847387ca..22e07f92f3 100644
--- a/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c
+++ b/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c
@@ -64,9 +64,9 @@
 #undef SSP_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SSP_DEBUG
-#  define sspdbg  lldbg
+#  define sspdbg  llerr
 #  ifdef SSP_VERBOSE
-#    define sspinfo lldbg
+#    define sspinfo llerr
 #  else
 #    define sspinfo(x...)
 #  endif
diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_leds.c b/configs/lpcxpresso-lpc1768/src/lpc17_leds.c
index cd18e6846e..b6d77696b3 100644
--- a/configs/lpcxpresso-lpc1768/src/lpc17_leds.c
+++ b/configs/lpcxpresso-lpc1768/src/lpc17_leds.c
@@ -61,9 +61,9 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledinfo lldbg
+#    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_oled.c b/configs/lpcxpresso-lpc1768/src/lpc17_oled.c
index 5610c90c9c..9b93b6e48b 100644
--- a/configs/lpcxpresso-lpc1768/src/lpc17_oled.c
+++ b/configs/lpcxpresso-lpc1768/src/lpc17_oled.c
@@ -128,7 +128,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
   spi = lpc17_sspbus_initialize(1);
   if (!spi)
     {
-      glldbg("Failed to initialize SPI port 1\n");
+      gllerr("Failed to initialize SPI port 1\n");
     }
   else
     {
@@ -137,7 +137,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
       dev = ug_initialize(spi, devno);
       if (!dev)
         {
-          glldbg("Failed to bind SPI port 1 to OLED %d: %d\n", devno);
+          gllerr("Failed to bind SPI port 1 to OLED %d: %d\n", devno);
         }
      else
         {
diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c b/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c
index f3239e42a8..4de4225e13 100644
--- a/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c
+++ b/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c
@@ -64,9 +64,9 @@
 #undef SSP_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SSP_DEBUG
-#  define sspdbg  lldbg
+#  define sspdbg  llerr
 #  ifdef SSP_VERBOSE
-#    define sspinfo lldbg
+#    define sspinfo llerr
 #  else
 #    define sspinfo(x...)
 #  endif
diff --git a/configs/maple/src/stm32_leds.c b/configs/maple/src/stm32_leds.c
index 22f1d4e55a..21ebcd63e7 100644
--- a/configs/maple/src/stm32_leds.c
+++ b/configs/maple/src/stm32_leds.c
@@ -62,7 +62,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/maple/src/stm32_spi.c b/configs/maple/src/stm32_spi.c
index 9100c5632a..367c3923af 100644
--- a/configs/maple/src/stm32_spi.c
+++ b/configs/maple/src/stm32_spi.c
@@ -67,9 +67,9 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg lldbg
+#  define spidbg llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/maple/src/stm32_usbdev.c b/configs/maple/src/stm32_usbdev.c
index 5c00747708..6fdb963ec8 100644
--- a/configs/maple/src/stm32_usbdev.c
+++ b/configs/maple/src/stm32_usbdev.c
@@ -74,7 +74,7 @@
 
 void stm32_usbinitialize(void)
 {
-  ulldbg("called\n");
+  ullerr("called\n");
 
   /* USB Soft Connect Pullup */
 
@@ -113,5 +113,5 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable)
 
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ulldbg("resume: %d\n", resume);
+  ullerr("resume: %d\n", resume);
 }
diff --git a/configs/mbed/src/lpc17_leds.c b/configs/mbed/src/lpc17_leds.c
index c303cc33b9..ad5d98ad04 100644
--- a/configs/mbed/src/lpc17_leds.c
+++ b/configs/mbed/src/lpc17_leds.c
@@ -65,9 +65,9 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledinfo lldbg
+#    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
diff --git a/configs/mcu123-lpc214x/src/lpc2148_spi1.c b/configs/mcu123-lpc214x/src/lpc2148_spi1.c
index 3c1b5eca6e..1a550e1aaa 100644
--- a/configs/mcu123-lpc214x/src/lpc2148_spi1.c
+++ b/configs/mcu123-lpc214x/src/lpc2148_spi1.c
@@ -89,9 +89,9 @@
 /* Enables debug output from this file */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/mikroe-stm32f4/src/stm32_idle.c b/configs/mikroe-stm32f4/src/stm32_idle.c
index 12c855b497..4af462bb6b 100644
--- a/configs/mikroe-stm32f4/src/stm32_idle.c
+++ b/configs/mikroe-stm32f4/src/stm32_idle.c
@@ -125,7 +125,7 @@ static void up_idlepm(void)
 
   if (newstate != oldstate)
     {
-      lldbg("newstate= %d oldstate=%d\n", newstate, oldstate);
+      llerr("newstate= %d oldstate=%d\n", newstate, oldstate);
 
       flags = enter_critical_section();
 
diff --git a/configs/mikroe-stm32f4/src/stm32_spi.c b/configs/mikroe-stm32f4/src/stm32_spi.c
index e35b332c6a..1df1b6ee2f 100644
--- a/configs/mikroe-stm32f4/src/stm32_spi.c
+++ b/configs/mikroe-stm32f4/src/stm32_spi.c
@@ -69,9 +69,9 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/mikroe-stm32f4/src/stm32_usb.c b/configs/mikroe-stm32f4/src/stm32_usb.c
index 81e25dd12b..360dc363ba 100644
--- a/configs/mikroe-stm32f4/src/stm32_usb.c
+++ b/configs/mikroe-stm32f4/src/stm32_usb.c
@@ -300,7 +300,7 @@ xcpt_t stm32_setup_overcurrent(xcpt_t handler)
 #ifdef CONFIG_USBDEV
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ulldbg("resume: %d\n", resume);
+  ullerr("resume: %d\n", resume);
 }
 #endif
 
diff --git a/configs/mikroe-stm32f4/src/stm32_vs1053.c b/configs/mikroe-stm32f4/src/stm32_vs1053.c
index 7311ae07ed..d8506e34a6 100644
--- a/configs/mikroe-stm32f4/src/stm32_vs1053.c
+++ b/configs/mikroe-stm32f4/src/stm32_vs1053.c
@@ -187,7 +187,7 @@ void up_vs1053initialize(FAR struct spi_dev_s* spi)
   pVs1053 = vs1053_initialize(spi, &g_vs1053lower.lower, VS1053_DEVNO);
   if (pVs1053 == NULL)
     {
-      audlldbg("Failed to bind SPI port %d VS1053 device\n", VS1053_DEVNO);
+      audllerr("Failed to bind SPI port %d VS1053 device\n", VS1053_DEVNO);
       return;
     }
 
diff --git a/configs/mirtoo/src/pic32_leds.c b/configs/mirtoo/src/pic32_leds.c
index 99b3f8195b..bd5a9cbc3f 100644
--- a/configs/mirtoo/src/pic32_leds.c
+++ b/configs/mirtoo/src/pic32_leds.c
@@ -94,9 +94,9 @@
 /* Debug ********************************************************************/
 
 #if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS)
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledinfo lldbg
+#    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
diff --git a/configs/mirtoo/src/pic32_spi2.c b/configs/mirtoo/src/pic32_spi2.c
index bd3446a1d8..127c01b833 100644
--- a/configs/mirtoo/src/pic32_spi2.c
+++ b/configs/mirtoo/src/pic32_spi2.c
@@ -98,7 +98,7 @@
  */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  define spiinfo llinfo
 #else
 #  define spidbg(x...)
diff --git a/configs/moteino-mega/src/avr_leds.c b/configs/moteino-mega/src/avr_leds.c
index 3770e8e927..8920ebbe40 100644
--- a/configs/moteino-mega/src/avr_leds.c
+++ b/configs/moteino-mega/src/avr_leds.c
@@ -62,9 +62,9 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledinfo lldbg
+#    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
diff --git a/configs/ne64badge/src/m9s12_buttons.c b/configs/ne64badge/src/m9s12_buttons.c
index e35663b075..b4de029b42 100644
--- a/configs/ne64badge/src/m9s12_buttons.c
+++ b/configs/ne64badge/src/m9s12_buttons.c
@@ -61,9 +61,9 @@
 #undef BUTTON_VERBOSE /* Define to enable verbose debug */
 
 #ifdef BUTTON_DEBUG
-#  define btndbg  lldbg
+#  define btndbg  llerr
 #  ifdef BUTTON_VERBOSE
-#    define btninfo lldbg
+#    define btninfo llerr
 #  else
 #    define btninfo(x...)
 #  endif
diff --git a/configs/ne64badge/src/m9s12_leds.c b/configs/ne64badge/src/m9s12_leds.c
index 414b243000..6d82d0283d 100644
--- a/configs/ne64badge/src/m9s12_leds.c
+++ b/configs/ne64badge/src/m9s12_leds.c
@@ -57,9 +57,9 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledinfo lldbg
+#    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
diff --git a/configs/ne64badge/src/m9s12_spi.c b/configs/ne64badge/src/m9s12_spi.c
index 4e69581a86..c1586210f2 100644
--- a/configs/ne64badge/src/m9s12_spi.c
+++ b/configs/ne64badge/src/m9s12_spi.c
@@ -60,9 +60,9 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/ntosd-dm320/src/dm320_network.c b/configs/ntosd-dm320/src/dm320_network.c
index 5edeb32f39..a08f4a4e3f 100644
--- a/configs/ntosd-dm320/src/dm320_network.c
+++ b/configs/ntosd-dm320/src/dm320_network.c
@@ -79,7 +79,7 @@ void up_netinitialize(void)
    * width is 16-bits.
    */
 
-  nlldbg("CS4CTRL1=%04x CS4CTRL2=%04x\n",
+  nllerr("CS4CTRL1=%04x CS4CTRL2=%04x\n",
          getreg16(DM320_EMIF_CS4CTRL1), getreg16(DM320_EMIF_CS4CTRL2));
 
   /* It is assumed that bootloader has already configured CS4.  Here,
@@ -91,7 +91,7 @@ void up_netinitialize(void)
   GIO_INTERRUPT(GIO_DM9000A_INT);
   GIO_RISINGEDGE(GIO_DM9000A_INT);
 
-  nlldbg("GIO DIR0=%04x INV0=%04x IRQPORT=%04x IRQEDGE=%04x\n",
+  nllerr("GIO DIR0=%04x INV0=%04x IRQPORT=%04x IRQEDGE=%04x\n",
          getreg16(DM320_GIO_DIR0), getreg16(DM320_GIO_INV0),
          getreg16(DM320_GIO_IRQPORT), getreg16(DM320_GIO_IRQEDGE));
 
diff --git a/configs/nucleo-144/src/stm32_autoleds.c b/configs/nucleo-144/src/stm32_autoleds.c
index 5003ea4384..d09ca0114d 100644
--- a/configs/nucleo-144/src/stm32_autoleds.c
+++ b/configs/nucleo-144/src/stm32_autoleds.c
@@ -59,7 +59,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/nucleo-144/src/stm32_spi.c b/configs/nucleo-144/src/stm32_spi.c
index 498a664539..4b3dd05560 100644
--- a/configs/nucleo-144/src/stm32_spi.c
+++ b/configs/nucleo-144/src/stm32_spi.c
@@ -62,9 +62,9 @@
  ************************************************************************************/
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/nucleo-144/src/stm32_userleds.c b/configs/nucleo-144/src/stm32_userleds.c
index 1794a2845b..9325e07d19 100644
--- a/configs/nucleo-144/src/stm32_userleds.c
+++ b/configs/nucleo-144/src/stm32_userleds.c
@@ -61,7 +61,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/nucleo-f303re/src/stm32_autoleds.c b/configs/nucleo-f303re/src/stm32_autoleds.c
index 098fe24563..cd20b4eea7 100644
--- a/configs/nucleo-f303re/src/stm32_autoleds.c
+++ b/configs/nucleo-f303re/src/stm32_autoleds.c
@@ -62,7 +62,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/nucleo-f303re/src/stm32_can.c b/configs/nucleo-f303re/src/stm32_can.c
index c99a6773d5..96d5351f7e 100644
--- a/configs/nucleo-f303re/src/stm32_can.c
+++ b/configs/nucleo-f303re/src/stm32_can.c
@@ -62,12 +62,12 @@
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
 #  define caninfo   info
-#  define canlldbg  lldbg
+#  define canllerr  llerr
 #  define canllinfo llinfo
 #else
 #  define candbg(x...)
 #  define caninfo(x...)
-#  define canlldbg(x...)
+#  define canllerr(x...)
 #  define canllinfo(x...)
 #endif
 
diff --git a/configs/nucleo-f303re/src/stm32_pwm.c b/configs/nucleo-f303re/src/stm32_pwm.c
index 58c8942f46..fd7bf916e3 100644
--- a/configs/nucleo-f303re/src/stm32_pwm.c
+++ b/configs/nucleo-f303re/src/stm32_pwm.c
@@ -63,12 +63,12 @@
 #ifdef CONFIG_DEBUG_PWM
 #  define pwmdbg    dbg
 #  define pwminfo   info
-#  define pwmlldbg  lldbg
+#  define pwmllerr  llerr
 #  define pwmllinfo llinfo
 #else
 #  define pwmdbg(x...)
 #  define pwminfo(x...)
-#  define pwmlldbg(x...)
+#  define pwmllerr(x...)
 #  define pwmllinfo(x...)
 #endif
 
diff --git a/configs/nucleo-f303re/src/stm32_spi.c b/configs/nucleo-f303re/src/stm32_spi.c
index 28f4403518..8bf3a5a270 100644
--- a/configs/nucleo-f303re/src/stm32_spi.c
+++ b/configs/nucleo-f303re/src/stm32_spi.c
@@ -66,9 +66,9 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg lldbg
+#  define spidbg llerr
 #  ifdef SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/nucleo-f303re/src/stm32_userleds.c b/configs/nucleo-f303re/src/stm32_userleds.c
index bda0055d12..cd23d08ba5 100644
--- a/configs/nucleo-f303re/src/stm32_userleds.c
+++ b/configs/nucleo-f303re/src/stm32_userleds.c
@@ -61,7 +61,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/nucleo-f4x1re/src/stm32_autoleds.c b/configs/nucleo-f4x1re/src/stm32_autoleds.c
index 20882df345..306787b1a9 100644
--- a/configs/nucleo-f4x1re/src/stm32_autoleds.c
+++ b/configs/nucleo-f4x1re/src/stm32_autoleds.c
@@ -63,7 +63,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/nucleo-f4x1re/src/stm32_spi.c b/configs/nucleo-f4x1re/src/stm32_spi.c
index 91a3fcfc56..172998ff55 100644
--- a/configs/nucleo-f4x1re/src/stm32_spi.c
+++ b/configs/nucleo-f4x1re/src/stm32_spi.c
@@ -67,9 +67,9 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/nucleo-f4x1re/src/stm32_userleds.c b/configs/nucleo-f4x1re/src/stm32_userleds.c
index ad45a69390..951b2b7cfe 100644
--- a/configs/nucleo-f4x1re/src/stm32_userleds.c
+++ b/configs/nucleo-f4x1re/src/stm32_userleds.c
@@ -63,7 +63,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/nucleo-l476rg/src/stm32_autoleds.c b/configs/nucleo-l476rg/src/stm32_autoleds.c
index 667fd024a0..c94472e74e 100644
--- a/configs/nucleo-l476rg/src/stm32_autoleds.c
+++ b/configs/nucleo-l476rg/src/stm32_autoleds.c
@@ -63,7 +63,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/nucleo-l476rg/src/stm32_spi.c b/configs/nucleo-l476rg/src/stm32_spi.c
index a98a19c963..e359670b47 100644
--- a/configs/nucleo-l476rg/src/stm32_spi.c
+++ b/configs/nucleo-l476rg/src/stm32_spi.c
@@ -67,9 +67,9 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/nucleo-l476rg/src/stm32_userleds.c b/configs/nucleo-l476rg/src/stm32_userleds.c
index 0521655dc4..1745510298 100644
--- a/configs/nucleo-l476rg/src/stm32_userleds.c
+++ b/configs/nucleo-l476rg/src/stm32_userleds.c
@@ -63,7 +63,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/nutiny-nuc120/src/nuc_led.c b/configs/nutiny-nuc120/src/nuc_led.c
index 712fec27c5..8d8596c2f9 100644
--- a/configs/nutiny-nuc120/src/nuc_led.c
+++ b/configs/nutiny-nuc120/src/nuc_led.c
@@ -81,9 +81,9 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledinfo lldbg
+#    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
diff --git a/configs/olimex-lpc-h3131/src/lpc31_leds.c b/configs/olimex-lpc-h3131/src/lpc31_leds.c
index 6817a1d3f3..398afab3d3 100644
--- a/configs/olimex-lpc-h3131/src/lpc31_leds.c
+++ b/configs/olimex-lpc-h3131/src/lpc31_leds.c
@@ -62,7 +62,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/olimex-lpc-h3131/src/lpc31_spi.c b/configs/olimex-lpc-h3131/src/lpc31_spi.c
index f8a13297c0..3da8396047 100644
--- a/configs/olimex-lpc-h3131/src/lpc31_spi.c
+++ b/configs/olimex-lpc-h3131/src/lpc31_spi.c
@@ -65,9 +65,9 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/olimex-lpc1766stk/src/lpc17_can.c b/configs/olimex-lpc1766stk/src/lpc17_can.c
index 7a5e6f7941..43bddd81a9 100644
--- a/configs/olimex-lpc1766stk/src/lpc17_can.c
+++ b/configs/olimex-lpc1766stk/src/lpc17_can.c
@@ -79,12 +79,12 @@
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
 #  define caninfo   info
-#  define canlldbg  lldbg
+#  define canllerr  llerr
 #  define canllinfo llinfo
 #else
 #  define candbg(x...)
 #  define caninfo(x...)
-#  define canlldbg(x...)
+#  define canllerr(x...)
 #  define canllinfo(x...)
 #endif
 
diff --git a/configs/olimex-lpc1766stk/src/lpc17_hidmouse.c b/configs/olimex-lpc1766stk/src/lpc17_hidmouse.c
index 4bbd85984d..cda2a94a9c 100644
--- a/configs/olimex-lpc1766stk/src/lpc17_hidmouse.c
+++ b/configs/olimex-lpc1766stk/src/lpc17_hidmouse.c
@@ -62,8 +62,8 @@
 #ifndef CONFIG_DEBUG_INPUT
 #  undef  idbg
 #  define idbg    udbg
-#  undef  illdbg
-#  define illdbg  ulldbg
+#  undef  illerr
+#  define illerr  ullerr
 #  undef  iinfo
 #  define iinfo   uinfo
 #  undef  illinfo
diff --git a/configs/olimex-lpc1766stk/src/lpc17_lcd.c b/configs/olimex-lpc1766stk/src/lpc17_lcd.c
index 7861edf614..5443ad2e50 100644
--- a/configs/olimex-lpc1766stk/src/lpc17_lcd.c
+++ b/configs/olimex-lpc1766stk/src/lpc17_lcd.c
@@ -214,7 +214,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
   spi = lpc17_sspbus_initialize(0);
   if (!spi)
     {
-      glldbg("Failed to initialize SSP port 0\n");
+      gllerr("Failed to initialize SSP port 0\n");
     }
   else
     {
@@ -223,7 +223,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
       dev = nokia_lcdinitialize(spi, devno);
       if (!dev)
         {
-          glldbg("Failed to bind SSP port 0 to LCD %d: %d\n", devno);
+          gllerr("Failed to bind SSP port 0 to LCD %d: %d\n", devno);
         }
      else
         {
diff --git a/configs/olimex-lpc1766stk/src/lpc17_leds.c b/configs/olimex-lpc1766stk/src/lpc17_leds.c
index 7299f508fc..c26cd776d2 100644
--- a/configs/olimex-lpc1766stk/src/lpc17_leds.c
+++ b/configs/olimex-lpc1766stk/src/lpc17_leds.c
@@ -63,9 +63,9 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg lldbg
+#  define leddbg llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledinfo lldbg
+#    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
diff --git a/configs/olimex-lpc1766stk/src/lpc17_ssp.c b/configs/olimex-lpc1766stk/src/lpc17_ssp.c
index db562cc984..a993baafd6 100644
--- a/configs/olimex-lpc1766stk/src/lpc17_ssp.c
+++ b/configs/olimex-lpc1766stk/src/lpc17_ssp.c
@@ -81,9 +81,9 @@
  */
 
 #ifdef CONFIG_SSP_DEBUG
-#  define sspdbg  lldbg
+#  define sspdbg  llerr
 #  ifdef CONFIG_SSP_VERBOSE
-#    define sspinfo lldbg
+#    define sspinfo llerr
 #  else
 #    define sspinfo(x...)
 #  endif
diff --git a/configs/olimex-stm32-h405/src/stm32_autoleds.c b/configs/olimex-stm32-h405/src/stm32_autoleds.c
index 8003b79621..c3ce8056ec 100644
--- a/configs/olimex-stm32-h405/src/stm32_autoleds.c
+++ b/configs/olimex-stm32-h405/src/stm32_autoleds.c
@@ -60,7 +60,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/olimex-stm32-h405/src/stm32_can.c b/configs/olimex-stm32-h405/src/stm32_can.c
index 4cc0324e6b..695179d017 100644
--- a/configs/olimex-stm32-h405/src/stm32_can.c
+++ b/configs/olimex-stm32-h405/src/stm32_can.c
@@ -71,12 +71,12 @@
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
 #  define caninfo   info
-#  define canlldbg  lldbg
+#  define canllerr  llerr
 #  define canllinfo llinfo
 #else
 #  define candbg(x...)
 #  define caninfo(x...)
-#  define canlldbg(x...)
+#  define canllerr(x...)
 #  define canllinfo(x...)
 #endif
 
diff --git a/configs/olimex-stm32-h405/src/stm32_usb.c b/configs/olimex-stm32-h405/src/stm32_usb.c
index 438821fec2..d825f90752 100644
--- a/configs/olimex-stm32-h405/src/stm32_usb.c
+++ b/configs/olimex-stm32-h405/src/stm32_usb.c
@@ -110,7 +110,7 @@ void stm32_usbinitialize(void)
 #ifdef CONFIG_USBDEV
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ulldbg("resume: %d\n", resume);
+  ullerr("resume: %d\n", resume);
 }
 #endif
 
diff --git a/configs/olimex-stm32-h405/src/stm32_userleds.c b/configs/olimex-stm32-h405/src/stm32_userleds.c
index 00bb661f4e..34057f150d 100644
--- a/configs/olimex-stm32-h405/src/stm32_userleds.c
+++ b/configs/olimex-stm32-h405/src/stm32_userleds.c
@@ -57,7 +57,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/olimex-stm32-h407/src/stm32_autoleds.c b/configs/olimex-stm32-h407/src/stm32_autoleds.c
index 6f19d4a630..f1c65cafbc 100644
--- a/configs/olimex-stm32-h407/src/stm32_autoleds.c
+++ b/configs/olimex-stm32-h407/src/stm32_autoleds.c
@@ -63,7 +63,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/olimex-stm32-h407/src/stm32_can.c b/configs/olimex-stm32-h407/src/stm32_can.c
index d00cf068c8..3056d80a27 100644
--- a/configs/olimex-stm32-h407/src/stm32_can.c
+++ b/configs/olimex-stm32-h407/src/stm32_can.c
@@ -71,12 +71,12 @@
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
 #  define caninfo   info
-#  define canlldbg  lldbg
+#  define canllerr  llerr
 #  define canllinfo llinfo
 #else
 #  define candbg(x...)
 #  define caninfo(x...)
-#  define canlldbg(x...)
+#  define canllerr(x...)
 #  define canllinfo(x...)
 #endif
 
diff --git a/configs/olimex-stm32-h407/src/stm32_usb.c b/configs/olimex-stm32-h407/src/stm32_usb.c
index adee4357b4..2f925d437a 100644
--- a/configs/olimex-stm32-h407/src/stm32_usb.c
+++ b/configs/olimex-stm32-h407/src/stm32_usb.c
@@ -307,7 +307,7 @@ xcpt_t stm32_setup_overcurrent(xcpt_t handler)
 #ifdef CONFIG_USBDEV
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ulldbg("resume: %d\n", resume);
+  ullerr("resume: %d\n", resume);
 }
 #endif
 
diff --git a/configs/olimex-stm32-h407/src/stm32_userleds.c b/configs/olimex-stm32-h407/src/stm32_userleds.c
index a4dd9aa31f..7a5a58049c 100644
--- a/configs/olimex-stm32-h407/src/stm32_userleds.c
+++ b/configs/olimex-stm32-h407/src/stm32_userleds.c
@@ -62,7 +62,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/olimex-stm32-p107/src/stm32_can.c b/configs/olimex-stm32-p107/src/stm32_can.c
index 635d3ad5ff..dc48f06ae0 100644
--- a/configs/olimex-stm32-p107/src/stm32_can.c
+++ b/configs/olimex-stm32-p107/src/stm32_can.c
@@ -67,12 +67,12 @@
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
 #  define caninfo   info
-#  define canlldbg  lldbg
+#  define canllerr  llerr
 #  define canllinfo llinfo
 #else
 #  define candbg(x...)
 #  define caninfo(x...)
-#  define canlldbg(x...)
+#  define canllerr(x...)
 #  define canllinfo(x...)
 #endif
 
diff --git a/configs/olimex-stm32-p107/src/stm32_encx24j600.c b/configs/olimex-stm32-p107/src/stm32_encx24j600.c
index 39f3d012f0..daa818e2af 100644
--- a/configs/olimex-stm32-p107/src/stm32_encx24j600.c
+++ b/configs/olimex-stm32-p107/src/stm32_encx24j600.c
@@ -180,7 +180,7 @@ void up_netinitialize(void)
   spi = stm32_spibus_initialize(ENCX24J600_SPI_PORTNO);
   if (!spi)
     {
-      nlldbg("Failed to initialize SPI port %d\n", ENCX24J600_SPI_PORTNO);
+      nllerr("Failed to initialize SPI port %d\n", ENCX24J600_SPI_PORTNO);
       return;
     }
 
@@ -190,7 +190,7 @@ void up_netinitialize(void)
 
   if (ret < 0)
     {
-      nlldbg("Failed to bind SPI port %d ENCX24J600 device %d: %d\n",
+      nllerr("Failed to bind SPI port %d ENCX24J600 device %d: %d\n",
              ENCX24J600_SPI_PORTNO, ENCX24J600_DEVNO, ret);
       return;
     }
diff --git a/configs/olimex-stm32-p107/src/stm32_spi.c b/configs/olimex-stm32-p107/src/stm32_spi.c
index b45af59735..befcd373a3 100644
--- a/configs/olimex-stm32-p107/src/stm32_spi.c
+++ b/configs/olimex-stm32-p107/src/stm32_spi.c
@@ -64,9 +64,9 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/olimex-stm32-p207/src/stm32_autoleds.c b/configs/olimex-stm32-p207/src/stm32_autoleds.c
index 334b123e1c..d4c70ea380 100644
--- a/configs/olimex-stm32-p207/src/stm32_autoleds.c
+++ b/configs/olimex-stm32-p207/src/stm32_autoleds.c
@@ -60,7 +60,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/olimex-stm32-p207/src/stm32_can.c b/configs/olimex-stm32-p207/src/stm32_can.c
index 49fe8e8128..a6441e5513 100644
--- a/configs/olimex-stm32-p207/src/stm32_can.c
+++ b/configs/olimex-stm32-p207/src/stm32_can.c
@@ -71,12 +71,12 @@
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
 #  define caninfo   info
-#  define canlldbg  lldbg
+#  define canllerr  llerr
 #  define canllinfo llinfo
 #else
 #  define candbg(x...)
 #  define caninfo(x...)
-#  define canlldbg(x...)
+#  define canllerr(x...)
 #  define canllinfo(x...)
 #endif
 
diff --git a/configs/olimex-stm32-p207/src/stm32_usb.c b/configs/olimex-stm32-p207/src/stm32_usb.c
index 3f00e5a991..15358557b1 100644
--- a/configs/olimex-stm32-p207/src/stm32_usb.c
+++ b/configs/olimex-stm32-p207/src/stm32_usb.c
@@ -311,7 +311,7 @@ void stm32_usbhost_vbusdrive(int iface, bool enable)
 #ifdef CONFIG_USBDEV
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ulldbg("resume: %d\n", resume);
+  ullerr("resume: %d\n", resume);
 }
 #endif
 
diff --git a/configs/olimex-stm32-p207/src/stm32_userleds.c b/configs/olimex-stm32-p207/src/stm32_userleds.c
index b11a576508..b1656100f7 100644
--- a/configs/olimex-stm32-p207/src/stm32_userleds.c
+++ b/configs/olimex-stm32-p207/src/stm32_userleds.c
@@ -57,7 +57,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/olimex-strp711/src/str71_enc28j60.c b/configs/olimex-strp711/src/str71_enc28j60.c
index bd98539b2e..3e93da0fe6 100644
--- a/configs/olimex-strp711/src/str71_enc28j60.c
+++ b/configs/olimex-strp711/src/str71_enc28j60.c
@@ -216,7 +216,7 @@ void up_netinitialize(void)
   spi = str71_spibus_initialize(ENC28J60_SPI_PORTNO);
   if (!spi)
     {
-      nlldbg("Failed to initialize SPI port %d\n", ENC28J60_SPI_PORTNO);
+      nllerr("Failed to initialize SPI port %d\n", ENC28J60_SPI_PORTNO);
       return;
     }
 
@@ -225,7 +225,7 @@ void up_netinitialize(void)
   ret = str71x_xticonfig(ENC28J60_IRQ, false);
   if (ret < 0)
     {
-      nlldbg("Failed configure interrupt for IRQ %d: %d\n", ENC28J60_IRQ, ret);
+      nllerr("Failed configure interrupt for IRQ %d: %d\n", ENC28J60_IRQ, ret);
       return;
     }
 
@@ -240,7 +240,7 @@ void up_netinitialize(void)
   ret = enc_initialize(spi, &g_enclower, ENC28J60_DEVNO);
   if (ret < 0)
     {
-      nlldbg("Failed to bind SPI port %d ENC28J60 device %d: %d\n",
+      nllerr("Failed to bind SPI port %d ENC28J60 device %d: %d\n",
              ENC28J60_SPI_PORTNO, ENC28J60_DEVNO, ret);
       return;
     }
diff --git a/configs/olimexino-stm32/src/stm32_can.c b/configs/olimexino-stm32/src/stm32_can.c
index ebec02cda0..8197ca1a3f 100644
--- a/configs/olimexino-stm32/src/stm32_can.c
+++ b/configs/olimexino-stm32/src/stm32_can.c
@@ -70,12 +70,12 @@
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
 #  define caninfo   info
-#  define canlldbg  lldbg
+#  define canllerr  llerr
 #  define canllinfo llinfo
 #else
 #  define candbg(x...)
 #  define caninfo(x...)
-#  define canlldbg(x...)
+#  define canllerr(x...)
 #  define canllinfo(x...)
 #endif
 
diff --git a/configs/olimexino-stm32/src/stm32_leds.c b/configs/olimexino-stm32/src/stm32_leds.c
index f51b89e165..9a972d7983 100644
--- a/configs/olimexino-stm32/src/stm32_leds.c
+++ b/configs/olimexino-stm32/src/stm32_leds.c
@@ -59,9 +59,9 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg lldbg
+#  define leddbg llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledinfo lldbg
+#    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
diff --git a/configs/olimexino-stm32/src/stm32_spi.c b/configs/olimexino-stm32/src/stm32_spi.c
index e71ab183c0..9fab4ec2e7 100644
--- a/configs/olimexino-stm32/src/stm32_spi.c
+++ b/configs/olimexino-stm32/src/stm32_spi.c
@@ -65,9 +65,9 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/olimexino-stm32/src/stm32_usbdev.c b/configs/olimexino-stm32/src/stm32_usbdev.c
index 8e600c508f..30ea651457 100644
--- a/configs/olimexino-stm32/src/stm32_usbdev.c
+++ b/configs/olimexino-stm32/src/stm32_usbdev.c
@@ -90,7 +90,7 @@ void stm32_usb_set_pwr_callback(xcpt_t pwr_changed_handler)
 
 void stm32_usbinitialize(void)
 {
-  ulldbg("called\n");
+  ullerr("called\n");
 
   /* USB Soft Connect Pullup */
 
@@ -129,5 +129,5 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable)
 
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ulldbg("resume: %d\n", resume);
+  ullerr("resume: %d\n", resume);
 }
diff --git a/configs/open1788/src/lpc17_autoleds.c b/configs/open1788/src/lpc17_autoleds.c
index 30b44682a6..c004063ea0 100644
--- a/configs/open1788/src/lpc17_autoleds.c
+++ b/configs/open1788/src/lpc17_autoleds.c
@@ -139,9 +139,9 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg lldbg
+#  define leddbg llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledinfo lldbg
+#    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
diff --git a/configs/open1788/src/lpc17_ssp.c b/configs/open1788/src/lpc17_ssp.c
index c957a2442f..0cc9039aeb 100644
--- a/configs/open1788/src/lpc17_ssp.c
+++ b/configs/open1788/src/lpc17_ssp.c
@@ -64,9 +64,9 @@
 /* Debug ********************************************************************/
 
 #ifdef CONFIG_DEBUG_SPI
-#  define sspdbg  lldbg
+#  define sspdbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define sspinfo lldbg
+#    define sspinfo llerr
 #  else
 #    define sspinfo(x...)
 #  endif
diff --git a/configs/open1788/src/lpc17_userleds.c b/configs/open1788/src/lpc17_userleds.c
index 2f75e67847..8a3f1fef4f 100644
--- a/configs/open1788/src/lpc17_userleds.c
+++ b/configs/open1788/src/lpc17_userleds.c
@@ -65,9 +65,9 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg lldbg
+#  define leddbg llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledinfo lldbg
+#    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
diff --git a/configs/pcduino-a10/src/a1x_leds.c b/configs/pcduino-a10/src/a1x_leds.c
index 69b00d196b..9e2c6f2f4b 100644
--- a/configs/pcduino-a10/src/a1x_leds.c
+++ b/configs/pcduino-a10/src/a1x_leds.c
@@ -95,7 +95,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/pic32mx-starterkit/src/pic32mx_leds.c b/configs/pic32mx-starterkit/src/pic32mx_leds.c
index 705de956ad..a349698987 100644
--- a/configs/pic32mx-starterkit/src/pic32mx_leds.c
+++ b/configs/pic32mx-starterkit/src/pic32mx_leds.c
@@ -98,9 +98,9 @@
 /* Debug ********************************************************************/
 
 #if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS)
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledinfo lldbg
+#    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
diff --git a/configs/pic32mx-starterkit/src/pic32mx_spi.c b/configs/pic32mx-starterkit/src/pic32mx_spi.c
index 4b18174c1c..65374d648e 100644
--- a/configs/pic32mx-starterkit/src/pic32mx_spi.c
+++ b/configs/pic32mx-starterkit/src/pic32mx_spi.c
@@ -65,9 +65,9 @@
  */
 
 #ifdef CONFIG_SPI_DEBUG
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef CONFIG_SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/pic32mx7mmb/src/pic32_leds.c b/configs/pic32mx7mmb/src/pic32_leds.c
index 88cbbd164a..1cb9a6082f 100644
--- a/configs/pic32mx7mmb/src/pic32_leds.c
+++ b/configs/pic32mx7mmb/src/pic32_leds.c
@@ -101,9 +101,9 @@
 /* Debug ********************************************************************/
 
 #if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS)
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledinfo lldbg
+#    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
diff --git a/configs/pic32mx7mmb/src/pic32_spi.c b/configs/pic32mx7mmb/src/pic32_spi.c
index 1768e5ddd6..58ea77bfa8 100644
--- a/configs/pic32mx7mmb/src/pic32_spi.c
+++ b/configs/pic32mx7mmb/src/pic32_spi.c
@@ -81,7 +81,7 @@
  */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  define spiinfo llinfo
 #else
 #  define spidbg(x...)
diff --git a/configs/pic32mz-starterkit/src/pic32mz_autoleds.c b/configs/pic32mz-starterkit/src/pic32mz_autoleds.c
index db41f99420..e4f93f0ecd 100644
--- a/configs/pic32mz-starterkit/src/pic32mz_autoleds.c
+++ b/configs/pic32mz-starterkit/src/pic32mz_autoleds.c
@@ -94,9 +94,9 @@
 /* Debug ********************************************************************/
 
 #if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS)
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledinfo lldbg
+#    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
diff --git a/configs/pic32mz-starterkit/src/pic32mz_spi.c b/configs/pic32mz-starterkit/src/pic32mz_spi.c
index 04020e78d9..7cac4d15c8 100644
--- a/configs/pic32mz-starterkit/src/pic32mz_spi.c
+++ b/configs/pic32mz-starterkit/src/pic32mz_spi.c
@@ -59,9 +59,9 @@
 /* Debug */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef CONFIG_SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/pic32mz-starterkit/src/pic32mz_userleds.c b/configs/pic32mz-starterkit/src/pic32mz_userleds.c
index 57849364c3..f70c99c721 100644
--- a/configs/pic32mz-starterkit/src/pic32mz_userleds.c
+++ b/configs/pic32mz-starterkit/src/pic32mz_userleds.c
@@ -74,9 +74,9 @@
 /* Debug ********************************************************************/
 
 #if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS)
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledinfo lldbg
+#    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
diff --git a/configs/sabre-6quad/src/imx_autoleds.c b/configs/sabre-6quad/src/imx_autoleds.c
index 487f3d69cb..2c4f5e8fb0 100644
--- a/configs/sabre-6quad/src/imx_autoleds.c
+++ b/configs/sabre-6quad/src/imx_autoleds.c
@@ -87,7 +87,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/sabre-6quad/src/imx_bringup.c b/configs/sabre-6quad/src/imx_bringup.c
index d4ace48cd4..2d39dbcfc2 100644
--- a/configs/sabre-6quad/src/imx_bringup.c
+++ b/configs/sabre-6quad/src/imx_bringup.c
@@ -51,7 +51,7 @@
 /* Debug ********************************************************************/
 
 #ifdef CONFIG_BOARD_INITIALIZE
-#  define SYSLOG lldbg
+#  define SYSLOG llerr
 #else
 #  define SYSLOG dbg
 #endif
diff --git a/configs/sam3u-ek/src/sam_leds.c b/configs/sam3u-ek/src/sam_leds.c
index e2cc82a99f..abfbe76dba 100644
--- a/configs/sam3u-ek/src/sam_leds.c
+++ b/configs/sam3u-ek/src/sam_leds.c
@@ -63,7 +63,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/sam3u-ek/src/sam_spi.c b/configs/sam3u-ek/src/sam_spi.c
index 1b7768057e..95ec69e2ce 100644
--- a/configs/sam3u-ek/src/sam_spi.c
+++ b/configs/sam3u-ek/src/sam_spi.c
@@ -65,9 +65,9 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/sam3u-ek/src/sam_usbdev.c b/configs/sam3u-ek/src/sam_usbdev.c
index 6d189cee42..da36afc2da 100644
--- a/configs/sam3u-ek/src/sam_usbdev.c
+++ b/configs/sam3u-ek/src/sam_usbdev.c
@@ -75,5 +75,5 @@
 
 void sam_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ulldbg("resume: %d\n", resume);
+  ullerr("resume: %d\n", resume);
 }
diff --git a/configs/sam4e-ek/src/sam_ethernet.c b/configs/sam4e-ek/src/sam_ethernet.c
index 301cd94c37..69650ec0c9 100644
--- a/configs/sam4e-ek/src/sam_ethernet.c
+++ b/configs/sam4e-ek/src/sam_ethernet.c
@@ -75,10 +75,10 @@
 
 #ifdef CONFIG_NETDEV_PHY_DEBUG
 #  define phydbg    dbg
-#  define phylldbg  lldbg
+#  define phyllerr  llerr
 #else
 #  define phydbg(x...)
-#  define phylldbg(x...)
+#  define phyllerr(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/sam4e-ek/src/sam_leds.c b/configs/sam4e-ek/src/sam_leds.c
index 329ff4078d..cc405266d5 100644
--- a/configs/sam4e-ek/src/sam_leds.c
+++ b/configs/sam4e-ek/src/sam_leds.c
@@ -103,7 +103,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/sam4e-ek/src/sam_spi.c b/configs/sam4e-ek/src/sam_spi.c
index e94fbd6308..68b7469d20 100644
--- a/configs/sam4e-ek/src/sam_spi.c
+++ b/configs/sam4e-ek/src/sam_spi.c
@@ -65,9 +65,9 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/sam4e-ek/src/sam_udp.c b/configs/sam4e-ek/src/sam_udp.c
index 8c271ba90a..7ed32cb291 100644
--- a/configs/sam4e-ek/src/sam_udp.c
+++ b/configs/sam4e-ek/src/sam_udp.c
@@ -83,5 +83,5 @@
 
 void sam_udp_suspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ulldbg("resume: %d\n", resume);
+  ullerr("resume: %d\n", resume);
 }
diff --git a/configs/sam4l-xplained/src/sam_autoleds.c b/configs/sam4l-xplained/src/sam_autoleds.c
index 1a695ca3d3..fca3a16fb0 100644
--- a/configs/sam4l-xplained/src/sam_autoleds.c
+++ b/configs/sam4l-xplained/src/sam_autoleds.c
@@ -86,7 +86,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/sam4l-xplained/src/sam_spi.c b/configs/sam4l-xplained/src/sam_spi.c
index 9135e6dfb4..effc159407 100644
--- a/configs/sam4l-xplained/src/sam_spi.c
+++ b/configs/sam4l-xplained/src/sam_spi.c
@@ -60,9 +60,9 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/sam4l-xplained/src/sam_userleds.c b/configs/sam4l-xplained/src/sam_userleds.c
index d3849f6768..3d0c33fa96 100644
--- a/configs/sam4l-xplained/src/sam_userleds.c
+++ b/configs/sam4l-xplained/src/sam_userleds.c
@@ -71,7 +71,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/sam4s-xplained-pro/src/sam_autoleds.c b/configs/sam4s-xplained-pro/src/sam_autoleds.c
index 22b6688d0e..31af4fa757 100644
--- a/configs/sam4s-xplained-pro/src/sam_autoleds.c
+++ b/configs/sam4s-xplained-pro/src/sam_autoleds.c
@@ -79,7 +79,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/sam4s-xplained-pro/src/sam_tc.c b/configs/sam4s-xplained-pro/src/sam_tc.c
index a6e9fc7854..42c2e014fa 100644
--- a/configs/sam4s-xplained-pro/src/sam_tc.c
+++ b/configs/sam4s-xplained-pro/src/sam_tc.c
@@ -108,7 +108,7 @@
 
 #ifdef CONFIG_DEBUG_TIMER
 #  define tcdbg                 dbg
-#  define tclldbg               lldbg
+#  define tcllerr               llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define tcinfo              info
 #    define tcllinfo            llinfo
@@ -118,7 +118,7 @@
 #  endif
 #else
 #  define tcdbg(x...)
-#  define tclldbg(x...)
+#  define tcllerr(x...)
 #  define tcinfo(x...)
 #  define tcllinfo(x...)
 #endif
diff --git a/configs/sam4s-xplained-pro/src/sam_udp.c b/configs/sam4s-xplained-pro/src/sam_udp.c
index e47c37a9fb..6ea2507bec 100644
--- a/configs/sam4s-xplained-pro/src/sam_udp.c
+++ b/configs/sam4s-xplained-pro/src/sam_udp.c
@@ -84,5 +84,5 @@
 
 void sam_udp_suspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ulldbg("resume: %d\n", resume);
+  ullerr("resume: %d\n", resume);
 }
diff --git a/configs/sam4s-xplained-pro/src/sam_userleds.c b/configs/sam4s-xplained-pro/src/sam_userleds.c
index e7b604e529..bec9332670 100644
--- a/configs/sam4s-xplained-pro/src/sam_userleds.c
+++ b/configs/sam4s-xplained-pro/src/sam_userleds.c
@@ -61,7 +61,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/sam4s-xplained-pro/src/sam_wdt.c b/configs/sam4s-xplained-pro/src/sam_wdt.c
index f9ebfb46c6..a71115560d 100644
--- a/configs/sam4s-xplained-pro/src/sam_wdt.c
+++ b/configs/sam4s-xplained-pro/src/sam_wdt.c
@@ -91,7 +91,7 @@
 
 #ifdef CONFIG_DEBUG_WATCHDOG
 #  define wdgdbg                 dbg
-#  define wdglldbg               lldbg
+#  define wdgllerr               llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define wdginfo              info
 #    define wdgllinfo            llinfo
@@ -101,7 +101,7 @@
 #  endif
 #else
 #  define wdgdbg(x...)
-#  define wdglldbg(x...)
+#  define wdgllerr(x...)
 #  define wdginfo(x...)
 #  define wdgllinfo(x...)
 #endif
diff --git a/configs/sam4s-xplained/src/sam_autoleds.c b/configs/sam4s-xplained/src/sam_autoleds.c
index 289b3e01dd..238510c7c3 100644
--- a/configs/sam4s-xplained/src/sam_autoleds.c
+++ b/configs/sam4s-xplained/src/sam_autoleds.c
@@ -78,7 +78,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/sam4s-xplained/src/sam_userleds.c b/configs/sam4s-xplained/src/sam_userleds.c
index bd1411c800..06b3f83097 100644
--- a/configs/sam4s-xplained/src/sam_userleds.c
+++ b/configs/sam4s-xplained/src/sam_userleds.c
@@ -60,7 +60,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/sama5d2-xult/src/sam_autoleds.c b/configs/sama5d2-xult/src/sam_autoleds.c
index f7875f73a0..c18908e056 100644
--- a/configs/sama5d2-xult/src/sam_autoleds.c
+++ b/configs/sama5d2-xult/src/sam_autoleds.c
@@ -94,7 +94,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/sama5d2-xult/src/sam_bringup.c b/configs/sama5d2-xult/src/sam_bringup.c
index 3603c51d9a..e332c2d4e8 100644
--- a/configs/sama5d2-xult/src/sam_bringup.c
+++ b/configs/sama5d2-xult/src/sam_bringup.c
@@ -50,7 +50,7 @@
  ****************************************************************************/
 
 #ifdef CONFIG_BOARD_INITIALIZE
-#  define SYSLOG lldbg
+#  define SYSLOG llerr
 #else
 #  define SYSLOG dbg
 #endif
diff --git a/configs/sama5d2-xult/src/sam_userleds.c b/configs/sama5d2-xult/src/sam_userleds.c
index 03299f8d40..11f191b3a1 100644
--- a/configs/sama5d2-xult/src/sam_userleds.c
+++ b/configs/sama5d2-xult/src/sam_userleds.c
@@ -70,7 +70,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/sama5d3-xplained/src/sam_autoleds.c b/configs/sama5d3-xplained/src/sam_autoleds.c
index 468f74c33c..b9f84bb074 100644
--- a/configs/sama5d3-xplained/src/sam_autoleds.c
+++ b/configs/sama5d3-xplained/src/sam_autoleds.c
@@ -96,7 +96,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/sama5d3-xplained/src/sam_can.c b/configs/sama5d3-xplained/src/sam_can.c
index 390bd02e74..a8c59ecbb5 100644
--- a/configs/sama5d3-xplained/src/sam_can.c
+++ b/configs/sama5d3-xplained/src/sam_can.c
@@ -75,12 +75,12 @@
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
 #  define caninfo   info
-#  define canlldbg  lldbg
+#  define canllerr  llerr
 #  define canllinfo llinfo
 #else
 #  define candbg(x...)
 #  define caninfo(x...)
-#  define canlldbg(x...)
+#  define canllerr(x...)
 #  define canllinfo(x...)
 #endif
 
diff --git a/configs/sama5d3-xplained/src/sam_ethernet.c b/configs/sama5d3-xplained/src/sam_ethernet.c
index bcab38459f..75c9a7f0fc 100644
--- a/configs/sama5d3-xplained/src/sam_ethernet.c
+++ b/configs/sama5d3-xplained/src/sam_ethernet.c
@@ -85,10 +85,10 @@
 
 #ifdef CONFIG_NETDEV_PHY_DEBUG
 #  define phydbg    dbg
-#  define phylldbg  lldbg
+#  define phyllerr  llerr
 #else
 #  define phydbg(x...)
-#  define phylldbg(x...)
+#  define phyllerr(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/sama5d3-xplained/src/sam_spi.c b/configs/sama5d3-xplained/src/sam_spi.c
index 588e24a834..4806c9c61c 100644
--- a/configs/sama5d3-xplained/src/sam_spi.c
+++ b/configs/sama5d3-xplained/src/sam_spi.c
@@ -65,9 +65,9 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/sama5d3-xplained/src/sam_usb.c b/configs/sama5d3-xplained/src/sam_usb.c
index 2b1a7267f9..d071064d09 100644
--- a/configs/sama5d3-xplained/src/sam_usb.c
+++ b/configs/sama5d3-xplained/src/sam_usb.c
@@ -546,7 +546,7 @@ xcpt_t sam_setup_overcurrent(xcpt_t handler)
 #ifdef CONFIG_USBDEV
 void sam_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ulldbg("resume: %d\n", resume);
+  ullerr("resume: %d\n", resume);
 }
 #endif
 
diff --git a/configs/sama5d3-xplained/src/sam_userleds.c b/configs/sama5d3-xplained/src/sam_userleds.c
index 3b31c71813..2d85d2ef83 100644
--- a/configs/sama5d3-xplained/src/sam_userleds.c
+++ b/configs/sama5d3-xplained/src/sam_userleds.c
@@ -72,7 +72,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/sama5d3x-ek/src/sam_autoleds.c b/configs/sama5d3x-ek/src/sam_autoleds.c
index 03932ae879..79188d84f7 100644
--- a/configs/sama5d3x-ek/src/sam_autoleds.c
+++ b/configs/sama5d3x-ek/src/sam_autoleds.c
@@ -96,7 +96,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/sama5d3x-ek/src/sam_can.c b/configs/sama5d3x-ek/src/sam_can.c
index e6cc5093e3..176be69ce6 100644
--- a/configs/sama5d3x-ek/src/sam_can.c
+++ b/configs/sama5d3x-ek/src/sam_can.c
@@ -75,12 +75,12 @@
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
 #  define caninfo   info
-#  define canlldbg  lldbg
+#  define canllerr  llerr
 #  define canllinfo llinfo
 #else
 #  define candbg(x...)
 #  define caninfo(x...)
-#  define canlldbg(x...)
+#  define canllerr(x...)
 #  define canllinfo(x...)
 #endif
 
diff --git a/configs/sama5d3x-ek/src/sam_ethernet.c b/configs/sama5d3x-ek/src/sam_ethernet.c
index 57e304d75d..7a70518fe9 100644
--- a/configs/sama5d3x-ek/src/sam_ethernet.c
+++ b/configs/sama5d3x-ek/src/sam_ethernet.c
@@ -85,10 +85,10 @@
 
 #ifdef CONFIG_NETDEV_PHY_DEBUG
 #  define phydbg    dbg
-#  define phylldbg  lldbg
+#  define phyllerr  llerr
 #else
 #  define phydbg(x...)
-#  define phylldbg(x...)
+#  define phyllerr(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/sama5d3x-ek/src/sam_spi.c b/configs/sama5d3x-ek/src/sam_spi.c
index ef1c1d0b87..eb0287e72c 100644
--- a/configs/sama5d3x-ek/src/sam_spi.c
+++ b/configs/sama5d3x-ek/src/sam_spi.c
@@ -65,9 +65,9 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/sama5d3x-ek/src/sam_usb.c b/configs/sama5d3x-ek/src/sam_usb.c
index a3a774f036..73d6ab4766 100644
--- a/configs/sama5d3x-ek/src/sam_usb.c
+++ b/configs/sama5d3x-ek/src/sam_usb.c
@@ -538,7 +538,7 @@ xcpt_t sam_setup_overcurrent(xcpt_t handler)
 #ifdef CONFIG_USBDEV
 void sam_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ulldbg("resume: %d\n", resume);
+  ullerr("resume: %d\n", resume);
 }
 #endif
 
diff --git a/configs/sama5d3x-ek/src/sam_userleds.c b/configs/sama5d3x-ek/src/sam_userleds.c
index 4b623515ac..381d1be064 100644
--- a/configs/sama5d3x-ek/src/sam_userleds.c
+++ b/configs/sama5d3x-ek/src/sam_userleds.c
@@ -72,7 +72,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/sama5d4-ek/src/sam_autoleds.c b/configs/sama5d4-ek/src/sam_autoleds.c
index 41184e4a17..0d23aa40db 100644
--- a/configs/sama5d4-ek/src/sam_autoleds.c
+++ b/configs/sama5d4-ek/src/sam_autoleds.c
@@ -101,7 +101,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/sama5d4-ek/src/sam_bringup.c b/configs/sama5d4-ek/src/sam_bringup.c
index 2c0ca5cc8d..34b7e3dd43 100644
--- a/configs/sama5d4-ek/src/sam_bringup.c
+++ b/configs/sama5d4-ek/src/sam_bringup.c
@@ -72,7 +72,7 @@
 /* Debug ********************************************************************/
 
 #ifdef CONFIG_BOARD_INITIALIZE
-#  define SYSLOG lldbg
+#  define SYSLOG llerr
 #else
 #  define SYSLOG dbg
 #endif
diff --git a/configs/sama5d4-ek/src/sam_ethernet.c b/configs/sama5d4-ek/src/sam_ethernet.c
index 87b2a91dc8..25a73b375c 100644
--- a/configs/sama5d4-ek/src/sam_ethernet.c
+++ b/configs/sama5d4-ek/src/sam_ethernet.c
@@ -85,10 +85,10 @@
 
 #ifdef CONFIG_NETDEV_PHY_DEBUG
 #  define phydbg    dbg
-#  define phylldbg  lldbg
+#  define phyllerr  llerr
 #else
 #  define phydbg(x...)
-#  define phylldbg(x...)
+#  define phyllerr(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/sama5d4-ek/src/sam_spi.c b/configs/sama5d4-ek/src/sam_spi.c
index 9d62139275..1f60c27684 100644
--- a/configs/sama5d4-ek/src/sam_spi.c
+++ b/configs/sama5d4-ek/src/sam_spi.c
@@ -65,9 +65,9 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/sama5d4-ek/src/sam_usb.c b/configs/sama5d4-ek/src/sam_usb.c
index c0cf5af788..9540206bbb 100644
--- a/configs/sama5d4-ek/src/sam_usb.c
+++ b/configs/sama5d4-ek/src/sam_usb.c
@@ -539,7 +539,7 @@ xcpt_t sam_setup_overcurrent(xcpt_t handler)
 #ifdef CONFIG_USBDEV
 void sam_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ulldbg("resume: %d\n", resume);
+  ullerr("resume: %d\n", resume);
 }
 #endif
 
diff --git a/configs/sama5d4-ek/src/sam_userleds.c b/configs/sama5d4-ek/src/sam_userleds.c
index eab759d679..93ecf08241 100644
--- a/configs/sama5d4-ek/src/sam_userleds.c
+++ b/configs/sama5d4-ek/src/sam_userleds.c
@@ -76,7 +76,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/samd20-xplained/src/sam_autoleds.c b/configs/samd20-xplained/src/sam_autoleds.c
index eb032116e9..8cfd2e49f7 100644
--- a/configs/samd20-xplained/src/sam_autoleds.c
+++ b/configs/samd20-xplained/src/sam_autoleds.c
@@ -86,7 +86,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/samd20-xplained/src/sam_spi.c b/configs/samd20-xplained/src/sam_spi.c
index 6417b980b6..c9d6b6aaea 100644
--- a/configs/samd20-xplained/src/sam_spi.c
+++ b/configs/samd20-xplained/src/sam_spi.c
@@ -63,9 +63,9 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/samd20-xplained/src/sam_userleds.c b/configs/samd20-xplained/src/sam_userleds.c
index ca90196d01..18978a2974 100644
--- a/configs/samd20-xplained/src/sam_userleds.c
+++ b/configs/samd20-xplained/src/sam_userleds.c
@@ -71,7 +71,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/samd21-xplained/src/sam_autoleds.c b/configs/samd21-xplained/src/sam_autoleds.c
index bb06a515d7..2c5f018024 100644
--- a/configs/samd21-xplained/src/sam_autoleds.c
+++ b/configs/samd21-xplained/src/sam_autoleds.c
@@ -86,7 +86,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/samd21-xplained/src/sam_spi.c b/configs/samd21-xplained/src/sam_spi.c
index b44bf35b47..4905e3d4e5 100644
--- a/configs/samd21-xplained/src/sam_spi.c
+++ b/configs/samd21-xplained/src/sam_spi.c
@@ -63,9 +63,9 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/samd21-xplained/src/sam_userleds.c b/configs/samd21-xplained/src/sam_userleds.c
index b424805f75..037641bb5b 100644
--- a/configs/samd21-xplained/src/sam_userleds.c
+++ b/configs/samd21-xplained/src/sam_userleds.c
@@ -71,7 +71,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/same70-xplained/src/sam_autoleds.c b/configs/same70-xplained/src/sam_autoleds.c
index 9a68e179cd..bb07aa6e2f 100644
--- a/configs/same70-xplained/src/sam_autoleds.c
+++ b/configs/same70-xplained/src/sam_autoleds.c
@@ -86,7 +86,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/same70-xplained/src/sam_bringup.c b/configs/same70-xplained/src/sam_bringup.c
index e5631b8930..227899e750 100644
--- a/configs/same70-xplained/src/sam_bringup.c
+++ b/configs/same70-xplained/src/sam_bringup.c
@@ -79,7 +79,7 @@
 /* Debug ********************************************************************/
 
 #ifdef CONFIG_BOARD_INITIALIZE
-#  define SYSLOG lldbg
+#  define SYSLOG llerr
 #else
 #  define SYSLOG dbg
 #endif
diff --git a/configs/same70-xplained/src/sam_ethernet.c b/configs/same70-xplained/src/sam_ethernet.c
index 12c5846344..aeb40bac36 100644
--- a/configs/same70-xplained/src/sam_ethernet.c
+++ b/configs/same70-xplained/src/sam_ethernet.c
@@ -81,10 +81,10 @@
 
 #ifdef CONFIG_NETDEV_PHY_DEBUG
 #  define phydbg    dbg
-#  define phylldbg  lldbg
+#  define phyllerr  llerr
 #else
 #  define phydbg(x...)
-#  define phylldbg(x...)
+#  define phyllerr(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/same70-xplained/src/sam_mcan.c b/configs/same70-xplained/src/sam_mcan.c
index 1b0d2ef011..2ee8c62b1d 100644
--- a/configs/same70-xplained/src/sam_mcan.c
+++ b/configs/same70-xplained/src/sam_mcan.c
@@ -73,12 +73,12 @@
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
 #  define caninfo   info
-#  define canlldbg  lldbg
+#  define canllerr  llerr
 #  define canllinfo llinfo
 #else
 #  define candbg(x...)
 #  define caninfo(x...)
-#  define canlldbg(x...)
+#  define canllerr(x...)
 #  define canllinfo(x...)
 #endif
 
diff --git a/configs/same70-xplained/src/sam_spi.c b/configs/same70-xplained/src/sam_spi.c
index d1a090e332..ffb8c06079 100644
--- a/configs/same70-xplained/src/sam_spi.c
+++ b/configs/same70-xplained/src/sam_spi.c
@@ -65,9 +65,9 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/same70-xplained/src/sam_usbdev.c b/configs/same70-xplained/src/sam_usbdev.c
index e75322a37d..444cf8bbb2 100644
--- a/configs/same70-xplained/src/sam_usbdev.c
+++ b/configs/same70-xplained/src/sam_usbdev.c
@@ -94,5 +94,5 @@ void sam_usbinitialize(void)
 
 void sam_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ulldbg("resume: %d\n", resume);
+  ullerr("resume: %d\n", resume);
 }
diff --git a/configs/saml21-xplained/src/sam_autoleds.c b/configs/saml21-xplained/src/sam_autoleds.c
index 6a3f4a8505..2e60573f18 100644
--- a/configs/saml21-xplained/src/sam_autoleds.c
+++ b/configs/saml21-xplained/src/sam_autoleds.c
@@ -86,7 +86,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/saml21-xplained/src/sam_spi.c b/configs/saml21-xplained/src/sam_spi.c
index da3e2d67ec..6092ef8405 100644
--- a/configs/saml21-xplained/src/sam_spi.c
+++ b/configs/saml21-xplained/src/sam_spi.c
@@ -63,9 +63,9 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/saml21-xplained/src/sam_userleds.c b/configs/saml21-xplained/src/sam_userleds.c
index a21714d9b8..9710c1a7a1 100644
--- a/configs/saml21-xplained/src/sam_userleds.c
+++ b/configs/saml21-xplained/src/sam_userleds.c
@@ -71,7 +71,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/samv71-xult/src/sam_autoleds.c b/configs/samv71-xult/src/sam_autoleds.c
index d302980a64..a08b357467 100644
--- a/configs/samv71-xult/src/sam_autoleds.c
+++ b/configs/samv71-xult/src/sam_autoleds.c
@@ -102,7 +102,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/samv71-xult/src/sam_bringup.c b/configs/samv71-xult/src/sam_bringup.c
index dce34997e5..18565d424f 100644
--- a/configs/samv71-xult/src/sam_bringup.c
+++ b/configs/samv71-xult/src/sam_bringup.c
@@ -102,7 +102,7 @@
 /* Debug ********************************************************************/
 
 #ifdef CONFIG_BOARD_INITIALIZE
-#  define SYSLOG lldbg
+#  define SYSLOG llerr
 #else
 #  define SYSLOG dbg
 #endif
diff --git a/configs/samv71-xult/src/sam_ethernet.c b/configs/samv71-xult/src/sam_ethernet.c
index 86639b2894..88c486a428 100644
--- a/configs/samv71-xult/src/sam_ethernet.c
+++ b/configs/samv71-xult/src/sam_ethernet.c
@@ -81,10 +81,10 @@
 
 #ifdef CONFIG_NETDEV_PHY_DEBUG
 #  define phydbg    dbg
-#  define phylldbg  lldbg
+#  define phyllerr  llerr
 #else
 #  define phydbg(x...)
-#  define phylldbg(x...)
+#  define phyllerr(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/samv71-xult/src/sam_mcan.c b/configs/samv71-xult/src/sam_mcan.c
index 3a46d55d9f..c3d4f8bf8d 100644
--- a/configs/samv71-xult/src/sam_mcan.c
+++ b/configs/samv71-xult/src/sam_mcan.c
@@ -73,12 +73,12 @@
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
 #  define caninfo   info
-#  define canlldbg  lldbg
+#  define canllerr  llerr
 #  define canllinfo llinfo
 #else
 #  define candbg(x...)
 #  define caninfo(x...)
-#  define canlldbg(x...)
+#  define canllerr(x...)
 #  define canllinfo(x...)
 #endif
 
diff --git a/configs/samv71-xult/src/sam_spi.c b/configs/samv71-xult/src/sam_spi.c
index 82172a6041..35877918bc 100644
--- a/configs/samv71-xult/src/sam_spi.c
+++ b/configs/samv71-xult/src/sam_spi.c
@@ -65,9 +65,9 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/samv71-xult/src/sam_usbdev.c b/configs/samv71-xult/src/sam_usbdev.c
index 1e8173790c..cc718cf7ed 100644
--- a/configs/samv71-xult/src/sam_usbdev.c
+++ b/configs/samv71-xult/src/sam_usbdev.c
@@ -94,5 +94,5 @@ void sam_usbinitialize(void)
 
 void sam_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ulldbg("resume: %d\n", resume);
+  ullerr("resume: %d\n", resume);
 }
diff --git a/configs/shenzhou/src/stm32_autoleds.c b/configs/shenzhou/src/stm32_autoleds.c
index 9e22924ed7..507caa71f7 100644
--- a/configs/shenzhou/src/stm32_autoleds.c
+++ b/configs/shenzhou/src/stm32_autoleds.c
@@ -62,7 +62,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/shenzhou/src/stm32_can.c b/configs/shenzhou/src/stm32_can.c
index b1e6120512..0e70944eb7 100644
--- a/configs/shenzhou/src/stm32_can.c
+++ b/configs/shenzhou/src/stm32_can.c
@@ -68,12 +68,12 @@
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
 #  define caninfo   info
-#  define canlldbg  lldbg
+#  define canllerr  llerr
 #  define canllinfo llinfo
 #else
 #  define candbg(x...)
 #  define caninfo(x...)
-#  define canlldbg(x...)
+#  define canllerr(x...)
 #  define canllinfo(x...)
 #endif
 
diff --git a/configs/shenzhou/src/stm32_spi.c b/configs/shenzhou/src/stm32_spi.c
index e83eb0c62f..c0975d6b73 100644
--- a/configs/shenzhou/src/stm32_spi.c
+++ b/configs/shenzhou/src/stm32_spi.c
@@ -64,9 +64,9 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/shenzhou/src/stm32_usb.c b/configs/shenzhou/src/stm32_usb.c
index c63e80cda0..631e87c94f 100644
--- a/configs/shenzhou/src/stm32_usb.c
+++ b/configs/shenzhou/src/stm32_usb.c
@@ -300,7 +300,7 @@ xcpt_t stm32_setup_overcurrent(xcpt_t handler)
 #ifdef CONFIG_USBDEV
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ulldbg("resume: %d\n", resume);
+  ullerr("resume: %d\n", resume);
 }
 #endif
 
diff --git a/configs/shenzhou/src/stm32_userleds.c b/configs/shenzhou/src/stm32_userleds.c
index 66b9de9ea6..7fc3976970 100644
--- a/configs/shenzhou/src/stm32_userleds.c
+++ b/configs/shenzhou/src/stm32_userleds.c
@@ -62,7 +62,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/sim/src/sim_bringup.c b/configs/sim/src/sim_bringup.c
index c22cd81381..11489bace7 100644
--- a/configs/sim/src/sim_bringup.c
+++ b/configs/sim/src/sim_bringup.c
@@ -60,7 +60,7 @@ int trv_mount_world(int minor, FAR const char *mountpoint);
 /* Debug ********************************************************************/
 
 #ifdef CONFIG_BOARD_INITIALIZE
-#  define SYSLOG lldbg
+#  define SYSLOG llerr
 #else
 #  define SYSLOG dbg
 #endif
diff --git a/configs/spark/src/stm32_autoleds.c b/configs/spark/src/stm32_autoleds.c
index c39b53d312..f085b71a7b 100644
--- a/configs/spark/src/stm32_autoleds.c
+++ b/configs/spark/src/stm32_autoleds.c
@@ -64,7 +64,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/spark/src/stm32_spi.c b/configs/spark/src/stm32_spi.c
index a74a434d37..92015ce1ef 100644
--- a/configs/spark/src/stm32_spi.c
+++ b/configs/spark/src/stm32_spi.c
@@ -69,9 +69,9 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/spark/src/stm32_usbdev.c b/configs/spark/src/stm32_usbdev.c
index 87af0a3bc7..9b801a670a 100644
--- a/configs/spark/src/stm32_usbdev.c
+++ b/configs/spark/src/stm32_usbdev.c
@@ -74,7 +74,7 @@
 
 void stm32_usbinitialize(void)
 {
-  ulldbg("called\n");
+  ullerr("called\n");
 
   /* USB Soft Connect Pullup */
 
@@ -113,5 +113,5 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable)
 
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ulldbg("resume: %d\n", resume);
+  ullerr("resume: %d\n", resume);
 }
diff --git a/configs/spark/src/stm32_userleds.c b/configs/spark/src/stm32_userleds.c
index db66130c71..63fb4df0e2 100644
--- a/configs/spark/src/stm32_userleds.c
+++ b/configs/spark/src/stm32_userleds.c
@@ -63,7 +63,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/stm3210e-eval/src/stm32_can.c b/configs/stm3210e-eval/src/stm32_can.c
index c29c5b2a17..4b2f506538 100644
--- a/configs/stm3210e-eval/src/stm32_can.c
+++ b/configs/stm3210e-eval/src/stm32_can.c
@@ -68,12 +68,12 @@
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
 #  define caninfo   info
-#  define canlldbg  lldbg
+#  define canllerr  llerr
 #  define canllinfo llinfo
 #else
 #  define candbg(x...)
 #  define caninfo(x...)
-#  define canlldbg(x...)
+#  define canllerr(x...)
 #  define canllinfo(x...)
 #endif
 
diff --git a/configs/stm3210e-eval/src/stm32_idle.c b/configs/stm3210e-eval/src/stm32_idle.c
index c6352c221b..24bdfde3d1 100644
--- a/configs/stm3210e-eval/src/stm32_idle.c
+++ b/configs/stm3210e-eval/src/stm32_idle.c
@@ -229,7 +229,7 @@ static int stm32_rtc_alarm(time_t tv_sec, time_t tv_nsec, bool exti)
   ret = stm32_rtc_setalarm(&alarmtime, stm32_alarmcb);
   if (ret < 0)
     {
-      lldbg("Warning: The alarm is already set\n");
+      llerr("Warning: The alarm is already set\n");
     }
 
   return ret;
@@ -366,7 +366,7 @@ static void stm32_idlepm(void)
             ret = stm32_rtc_cancelalarm();
             if (ret < 0)
               {
-                lldbg("Warning: Cancel alarm failed\n");
+                llerr("Warning: Cancel alarm failed\n");
               }
 #endif
             /* Note:  See the additional PM_STANDBY related logic at the
diff --git a/configs/stm3210e-eval/src/stm32_leds.c b/configs/stm3210e-eval/src/stm32_leds.c
index fd61c85ce9..ba5876f4ff 100644
--- a/configs/stm3210e-eval/src/stm32_leds.c
+++ b/configs/stm3210e-eval/src/stm32_leds.c
@@ -62,7 +62,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/stm3210e-eval/src/stm32_spi.c b/configs/stm3210e-eval/src/stm32_spi.c
index efa7305b61..833bce97fe 100644
--- a/configs/stm3210e-eval/src/stm32_spi.c
+++ b/configs/stm3210e-eval/src/stm32_spi.c
@@ -63,9 +63,9 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/stm3210e-eval/src/stm32_usbdev.c b/configs/stm3210e-eval/src/stm32_usbdev.c
index 9864798835..58676d1dca 100644
--- a/configs/stm3210e-eval/src/stm32_usbdev.c
+++ b/configs/stm3210e-eval/src/stm32_usbdev.c
@@ -110,6 +110,6 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable)
 
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ulldbg("resume: %d\n", resume);
+  ullerr("resume: %d\n", resume);
 }
 
diff --git a/configs/stm3220g-eval/src/stm32_autoleds.c b/configs/stm3220g-eval/src/stm32_autoleds.c
index d2d428d868..688e1aa1ee 100644
--- a/configs/stm3220g-eval/src/stm32_autoleds.c
+++ b/configs/stm3220g-eval/src/stm32_autoleds.c
@@ -63,7 +63,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/stm3220g-eval/src/stm32_can.c b/configs/stm3220g-eval/src/stm32_can.c
index 192ccfa228..9e32e3c27b 100644
--- a/configs/stm3220g-eval/src/stm32_can.c
+++ b/configs/stm3220g-eval/src/stm32_can.c
@@ -76,12 +76,12 @@
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
 #  define caninfo   info
-#  define canlldbg  lldbg
+#  define canllerr  llerr
 #  define canllinfo llinfo
 #else
 #  define candbg(x...)
 #  define caninfo(x...)
-#  define canlldbg(x...)
+#  define canllerr(x...)
 #  define canllinfo(x...)
 #endif
 
diff --git a/configs/stm3220g-eval/src/stm32_spi.c b/configs/stm3220g-eval/src/stm32_spi.c
index ca42244f98..3980b6e7d5 100644
--- a/configs/stm3220g-eval/src/stm32_spi.c
+++ b/configs/stm3220g-eval/src/stm32_spi.c
@@ -63,9 +63,9 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/stm3220g-eval/src/stm32_usb.c b/configs/stm3220g-eval/src/stm32_usb.c
index e4ecae395d..db13541bb6 100644
--- a/configs/stm3220g-eval/src/stm32_usb.c
+++ b/configs/stm3220g-eval/src/stm32_usb.c
@@ -300,7 +300,7 @@ xcpt_t stm32_setup_overcurrent(xcpt_t handler)
 #ifdef CONFIG_USBDEV
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ulldbg("resume: %d\n", resume);
+  ullerr("resume: %d\n", resume);
 }
 #endif
 
diff --git a/configs/stm3220g-eval/src/stm32_userleds.c b/configs/stm3220g-eval/src/stm32_userleds.c
index 301ea4bdda..0fc42a3da1 100644
--- a/configs/stm3220g-eval/src/stm32_userleds.c
+++ b/configs/stm3220g-eval/src/stm32_userleds.c
@@ -62,7 +62,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/stm3240g-eval/src/stm32_autoleds.c b/configs/stm3240g-eval/src/stm32_autoleds.c
index fbfffffec1..500b834af8 100644
--- a/configs/stm3240g-eval/src/stm32_autoleds.c
+++ b/configs/stm3240g-eval/src/stm32_autoleds.c
@@ -63,7 +63,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/stm3240g-eval/src/stm32_can.c b/configs/stm3240g-eval/src/stm32_can.c
index e4071bf0d6..2af6a8add7 100644
--- a/configs/stm3240g-eval/src/stm32_can.c
+++ b/configs/stm3240g-eval/src/stm32_can.c
@@ -76,12 +76,12 @@
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
 #  define caninfo   info
-#  define canlldbg  lldbg
+#  define canllerr  llerr
 #  define canllinfo llinfo
 #else
 #  define candbg(x...)
 #  define caninfo(x...)
-#  define canlldbg(x...)
+#  define canllerr(x...)
 #  define canllinfo(x...)
 #endif
 
diff --git a/configs/stm3240g-eval/src/stm32_spi.c b/configs/stm3240g-eval/src/stm32_spi.c
index 3d77a12175..6a88d07937 100644
--- a/configs/stm3240g-eval/src/stm32_spi.c
+++ b/configs/stm3240g-eval/src/stm32_spi.c
@@ -63,9 +63,9 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/stm3240g-eval/src/stm32_usb.c b/configs/stm3240g-eval/src/stm32_usb.c
index d4943f02ce..6d65e66750 100644
--- a/configs/stm3240g-eval/src/stm32_usb.c
+++ b/configs/stm3240g-eval/src/stm32_usb.c
@@ -300,7 +300,7 @@ xcpt_t stm32_setup_overcurrent(xcpt_t handler)
 #ifdef CONFIG_USBDEV
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ulldbg("resume: %d\n", resume);
+  ullerr("resume: %d\n", resume);
 }
 #endif
 
diff --git a/configs/stm3240g-eval/src/stm32_userleds.c b/configs/stm3240g-eval/src/stm32_userleds.c
index 303eebdc81..781c36d6fc 100644
--- a/configs/stm3240g-eval/src/stm32_userleds.c
+++ b/configs/stm3240g-eval/src/stm32_userleds.c
@@ -62,7 +62,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/stm32_tiny/src/stm32_leds.c b/configs/stm32_tiny/src/stm32_leds.c
index 54767e6b5b..a57f77513a 100644
--- a/configs/stm32_tiny/src/stm32_leds.c
+++ b/configs/stm32_tiny/src/stm32_leds.c
@@ -61,7 +61,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/stm32_tiny/src/stm32_spi.c b/configs/stm32_tiny/src/stm32_spi.c
index 6ecb45feb8..41c30adfbe 100644
--- a/configs/stm32_tiny/src/stm32_spi.c
+++ b/configs/stm32_tiny/src/stm32_spi.c
@@ -66,9 +66,9 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg lldbg
+#  define spidbg llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/stm32_tiny/src/stm32_usbdev.c b/configs/stm32_tiny/src/stm32_usbdev.c
index 80e3671e3b..d27594b65a 100644
--- a/configs/stm32_tiny/src/stm32_usbdev.c
+++ b/configs/stm32_tiny/src/stm32_usbdev.c
@@ -74,7 +74,7 @@
 
 void stm32_usbinitialize(void)
 {
-  ulldbg("called\n");
+  ullerr("called\n");
 
   /* USB Soft Connect Pullup */
   stm32_configgpio(GPIO_USB_PULLUP);
@@ -112,6 +112,6 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable)
 
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ulldbg("resume: %d\n", resume);
+  ullerr("resume: %d\n", resume);
 }
 
diff --git a/configs/stm32f103-minimum/src/stm32_autoleds.c b/configs/stm32f103-minimum/src/stm32_autoleds.c
index 3ab744afd3..4c4c6e9707 100644
--- a/configs/stm32f103-minimum/src/stm32_autoleds.c
+++ b/configs/stm32f103-minimum/src/stm32_autoleds.c
@@ -61,7 +61,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/stm32f103-minimum/src/stm32_spi.c b/configs/stm32f103-minimum/src/stm32_spi.c
index 8866451219..0463578cc7 100644
--- a/configs/stm32f103-minimum/src/stm32_spi.c
+++ b/configs/stm32f103-minimum/src/stm32_spi.c
@@ -66,9 +66,9 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg lldbg
+#  define spidbg llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/stm32f103-minimum/src/stm32_usbdev.c b/configs/stm32f103-minimum/src/stm32_usbdev.c
index cc1d00df73..092196cd32 100644
--- a/configs/stm32f103-minimum/src/stm32_usbdev.c
+++ b/configs/stm32f103-minimum/src/stm32_usbdev.c
@@ -103,5 +103,5 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable)
 
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ulldbg("resume: %d\n", resume);
+  ullerr("resume: %d\n", resume);
 }
diff --git a/configs/stm32f3discovery/src/stm32_autoleds.c b/configs/stm32f3discovery/src/stm32_autoleds.c
index 7b74fdbeaf..de7c528095 100644
--- a/configs/stm32f3discovery/src/stm32_autoleds.c
+++ b/configs/stm32f3discovery/src/stm32_autoleds.c
@@ -61,7 +61,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/stm32f3discovery/src/stm32_spi.c b/configs/stm32f3discovery/src/stm32_spi.c
index 8a5b992773..29cdb076a4 100644
--- a/configs/stm32f3discovery/src/stm32_spi.c
+++ b/configs/stm32f3discovery/src/stm32_spi.c
@@ -64,9 +64,9 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/stm32f3discovery/src/stm32_usb.c b/configs/stm32f3discovery/src/stm32_usb.c
index bdeef5886d..7c071b91b9 100644
--- a/configs/stm32f3discovery/src/stm32_usb.c
+++ b/configs/stm32f3discovery/src/stm32_usb.c
@@ -121,7 +121,7 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable)
 
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ulldbg("resume: %d\n", resume);
+  ullerr("resume: %d\n", resume);
 }
 
 #endif /* CONFIG_STM32_USB */
diff --git a/configs/stm32f3discovery/src/stm32_userleds.c b/configs/stm32f3discovery/src/stm32_userleds.c
index 89eb1e6492..ed7e2dacdd 100644
--- a/configs/stm32f3discovery/src/stm32_userleds.c
+++ b/configs/stm32f3discovery/src/stm32_userleds.c
@@ -60,7 +60,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/stm32f429i-disco/src/stm32_autoleds.c b/configs/stm32f429i-disco/src/stm32_autoleds.c
index 1f11012077..4bec7993f2 100644
--- a/configs/stm32f429i-disco/src/stm32_autoleds.c
+++ b/configs/stm32f429i-disco/src/stm32_autoleds.c
@@ -63,7 +63,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/stm32f429i-disco/src/stm32_idle.c b/configs/stm32f429i-disco/src/stm32_idle.c
index 1654e0fed2..c71eaa61f0 100644
--- a/configs/stm32f429i-disco/src/stm32_idle.c
+++ b/configs/stm32f429i-disco/src/stm32_idle.c
@@ -125,7 +125,7 @@ static void stm32_idlepm(void)
 
   if (newstate != oldstate)
     {
-      lldbg("newstate= %d oldstate=%d\n", newstate, oldstate);
+      llerr("newstate= %d oldstate=%d\n", newstate, oldstate);
 
       flags = enter_critical_section();
 
diff --git a/configs/stm32f429i-disco/src/stm32_spi.c b/configs/stm32f429i-disco/src/stm32_spi.c
index 97d2de76ca..0b6fd21307 100644
--- a/configs/stm32f429i-disco/src/stm32_spi.c
+++ b/configs/stm32f429i-disco/src/stm32_spi.c
@@ -66,9 +66,9 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/stm32f429i-disco/src/stm32_usb.c b/configs/stm32f429i-disco/src/stm32_usb.c
index 0295efd903..d9fb2412b6 100644
--- a/configs/stm32f429i-disco/src/stm32_usb.c
+++ b/configs/stm32f429i-disco/src/stm32_usb.c
@@ -306,7 +306,7 @@ xcpt_t stm32_setup_overcurrent(xcpt_t handler)
 #ifdef CONFIG_USBDEV
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ulldbg("resume: %d\n", resume);
+  ullerr("resume: %d\n", resume);
 }
 #endif
 
diff --git a/configs/stm32f429i-disco/src/stm32_userleds.c b/configs/stm32f429i-disco/src/stm32_userleds.c
index 60176c905b..25856d939f 100644
--- a/configs/stm32f429i-disco/src/stm32_userleds.c
+++ b/configs/stm32f429i-disco/src/stm32_userleds.c
@@ -63,7 +63,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/stm32f4discovery/src/stm32_autoleds.c b/configs/stm32f4discovery/src/stm32_autoleds.c
index 36255cb24e..e500fd9a89 100644
--- a/configs/stm32f4discovery/src/stm32_autoleds.c
+++ b/configs/stm32f4discovery/src/stm32_autoleds.c
@@ -63,7 +63,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/stm32f4discovery/src/stm32_ethernet.c b/configs/stm32f4discovery/src/stm32_ethernet.c
index e9d53a9a49..9c3928e182 100644
--- a/configs/stm32f4discovery/src/stm32_ethernet.c
+++ b/configs/stm32f4discovery/src/stm32_ethernet.c
@@ -80,10 +80,10 @@
 
 #ifdef CONFIG_NETDEV_PHY_DEBUG
 #  define phydbg    dbg
-#  define phylldbg  lldbg
+#  define phyllerr  llerr
 #else
 #  define phydbg(x...)
-#  define phylldbg(x...)
+#  define phyllerr(x...)
 #endif
 
 /************************************************************************************
diff --git a/configs/stm32f4discovery/src/stm32_idle.c b/configs/stm32f4discovery/src/stm32_idle.c
index 0e0ead8360..6dc0f27b0b 100644
--- a/configs/stm32f4discovery/src/stm32_idle.c
+++ b/configs/stm32f4discovery/src/stm32_idle.c
@@ -122,7 +122,7 @@ static void stm32_idlepm(void)
 
   if (newstate != oldstate)
     {
-      lldbg("newstate= %d oldstate=%d\n", newstate, oldstate);
+      llerr("newstate= %d oldstate=%d\n", newstate, oldstate);
 
       flags = enter_critical_section();
 
diff --git a/configs/stm32f4discovery/src/stm32_spi.c b/configs/stm32f4discovery/src/stm32_spi.c
index 846db5a8e8..809da6a947 100644
--- a/configs/stm32f4discovery/src/stm32_spi.c
+++ b/configs/stm32f4discovery/src/stm32_spi.c
@@ -65,9 +65,9 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/stm32f4discovery/src/stm32_usb.c b/configs/stm32f4discovery/src/stm32_usb.c
index 11a722aa13..16028715b2 100644
--- a/configs/stm32f4discovery/src/stm32_usb.c
+++ b/configs/stm32f4discovery/src/stm32_usb.c
@@ -329,7 +329,7 @@ xcpt_t stm32_setup_overcurrent(xcpt_t handler)
 #ifdef CONFIG_USBDEV
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ulldbg("resume: %d\n", resume);
+  ullerr("resume: %d\n", resume);
 }
 #endif
 
diff --git a/configs/stm32f4discovery/src/stm32_userleds.c b/configs/stm32f4discovery/src/stm32_userleds.c
index fbfa7c5b16..2b5007e2d5 100644
--- a/configs/stm32f4discovery/src/stm32_userleds.c
+++ b/configs/stm32f4discovery/src/stm32_userleds.c
@@ -64,7 +64,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/stm32f746g-disco/src/stm32_autoleds.c b/configs/stm32f746g-disco/src/stm32_autoleds.c
index 59db81ec16..6873f3ad42 100644
--- a/configs/stm32f746g-disco/src/stm32_autoleds.c
+++ b/configs/stm32f746g-disco/src/stm32_autoleds.c
@@ -58,7 +58,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/stm32f746g-disco/src/stm32_spi.c b/configs/stm32f746g-disco/src/stm32_spi.c
index 3530c3c5d7..e7ba37dfcb 100644
--- a/configs/stm32f746g-disco/src/stm32_spi.c
+++ b/configs/stm32f746g-disco/src/stm32_spi.c
@@ -62,9 +62,9 @@
  ************************************************************************************/
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/stm32f746g-disco/src/stm32_userleds.c b/configs/stm32f746g-disco/src/stm32_userleds.c
index e59ba51693..90eae2c78a 100644
--- a/configs/stm32f746g-disco/src/stm32_userleds.c
+++ b/configs/stm32f746g-disco/src/stm32_userleds.c
@@ -56,7 +56,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/stm32l476vg-disco/src/stm32_appinit.c b/configs/stm32l476vg-disco/src/stm32_appinit.c
index 0c5591dcfa..f3ead2d0a9 100644
--- a/configs/stm32l476vg-disco/src/stm32_appinit.c
+++ b/configs/stm32l476vg-disco/src/stm32_appinit.c
@@ -93,7 +93,7 @@
 /* Debug ********************************************************************/
 
 #ifdef CONFIG_BOARD_INITIALIZE
-#  define SYSLOG lldbg
+#  define SYSLOG llerr
 #else
 #  define SYSLOG dbg
 #endif
diff --git a/configs/stm32l476vg-disco/src/stm32_autoleds.c b/configs/stm32l476vg-disco/src/stm32_autoleds.c
index fe53243641..8e1c7fe79a 100644
--- a/configs/stm32l476vg-disco/src/stm32_autoleds.c
+++ b/configs/stm32l476vg-disco/src/stm32_autoleds.c
@@ -63,7 +63,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/stm32l476vg-disco/src/stm32_spi.c b/configs/stm32l476vg-disco/src/stm32_spi.c
index 186f0f8f38..b27086cac3 100644
--- a/configs/stm32l476vg-disco/src/stm32_spi.c
+++ b/configs/stm32l476vg-disco/src/stm32_spi.c
@@ -67,9 +67,9 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/stm32l476vg-disco/src/stm32_userleds.c b/configs/stm32l476vg-disco/src/stm32_userleds.c
index eafb33b6d4..6bccba72e6 100644
--- a/configs/stm32l476vg-disco/src/stm32_userleds.c
+++ b/configs/stm32l476vg-disco/src/stm32_userleds.c
@@ -63,7 +63,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/stm32ldiscovery/src/stm32_autoleds.c b/configs/stm32ldiscovery/src/stm32_autoleds.c
index b903cb81a1..384bb91fef 100644
--- a/configs/stm32ldiscovery/src/stm32_autoleds.c
+++ b/configs/stm32ldiscovery/src/stm32_autoleds.c
@@ -78,7 +78,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/stm32ldiscovery/src/stm32_spi.c b/configs/stm32ldiscovery/src/stm32_spi.c
index e0a0638c70..d07d769133 100644
--- a/configs/stm32ldiscovery/src/stm32_spi.c
+++ b/configs/stm32ldiscovery/src/stm32_spi.c
@@ -65,9 +65,9 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/stm32ldiscovery/src/stm32_userleds.c b/configs/stm32ldiscovery/src/stm32_userleds.c
index 3e2fa4dbe9..7cef39eba0 100644
--- a/configs/stm32ldiscovery/src/stm32_userleds.c
+++ b/configs/stm32ldiscovery/src/stm32_userleds.c
@@ -60,7 +60,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/stm32vldiscovery/src/stm32_leds.c b/configs/stm32vldiscovery/src/stm32_leds.c
index 9c0a052e5c..a8ce8ec1b3 100644
--- a/configs/stm32vldiscovery/src/stm32_leds.c
+++ b/configs/stm32vldiscovery/src/stm32_leds.c
@@ -63,7 +63,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/sure-pic32mx/src/pic32mx_autoleds.c b/configs/sure-pic32mx/src/pic32mx_autoleds.c
index 7c9ef99b00..0a8f1b940b 100644
--- a/configs/sure-pic32mx/src/pic32mx_autoleds.c
+++ b/configs/sure-pic32mx/src/pic32mx_autoleds.c
@@ -89,9 +89,9 @@
 /* Debug ********************************************************************/
 
 #if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS)
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledinfo lldbg
+#    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
diff --git a/configs/sure-pic32mx/src/pic32mx_spi.c b/configs/sure-pic32mx/src/pic32mx_spi.c
index 6e2a0fa3d7..5104cbe4ec 100644
--- a/configs/sure-pic32mx/src/pic32mx_spi.c
+++ b/configs/sure-pic32mx/src/pic32mx_spi.c
@@ -130,9 +130,9 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/teensy-2.0/src/at90usb_leds.c b/configs/teensy-2.0/src/at90usb_leds.c
index a192722123..d3e194c401 100644
--- a/configs/teensy-2.0/src/at90usb_leds.c
+++ b/configs/teensy-2.0/src/at90usb_leds.c
@@ -62,9 +62,9 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledinfo lldbg
+#    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
diff --git a/configs/teensy-2.0/src/at90usb_spi.c b/configs/teensy-2.0/src/at90usb_spi.c
index cd67ae6ac2..2d14517ab8 100644
--- a/configs/teensy-2.0/src/at90usb_spi.c
+++ b/configs/teensy-2.0/src/at90usb_spi.c
@@ -87,9 +87,9 @@
  */
 
 #ifdef CONFIG_SPI_DEBUG
-#  define sspdbg  lldbg
+#  define sspdbg  llerr
 #  ifdef CONFIG_SPI_VERBOSE
-#    define sspinfo lldbg
+#    define sspinfo llerr
 #  else
 #    define sspinfo(x...)
 #  endif
diff --git a/configs/teensy-3.x/src/k20_spi.c b/configs/teensy-3.x/src/k20_spi.c
index d220304539..64e9072116 100644
--- a/configs/teensy-3.x/src/k20_spi.c
+++ b/configs/teensy-3.x/src/k20_spi.c
@@ -60,9 +60,9 @@
 /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef CONFIG_DEBUG_SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/teensy-3.x/src/k20_usbdev.c b/configs/teensy-3.x/src/k20_usbdev.c
index ca0ed25800..7df3d8d990 100644
--- a/configs/teensy-3.x/src/k20_usbdev.c
+++ b/configs/teensy-3.x/src/k20_usbdev.c
@@ -136,6 +136,6 @@ int kinetis_usbpullup(FAR struct usbdev_s *dev, bool enable)
 
 void kinetis_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ulldbg("resume: %d\n", resume);
+  ullerr("resume: %d\n", resume);
 #warning "Missing logic"
 }
diff --git a/configs/teensy-lc/src/kl_led.c b/configs/teensy-lc/src/kl_led.c
index daf26ed5c2..611174f222 100644
--- a/configs/teensy-lc/src/kl_led.c
+++ b/configs/teensy-lc/src/kl_led.c
@@ -61,9 +61,9 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledinfo lldbg
+#    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
diff --git a/configs/teensy-lc/src/kl_spi.c b/configs/teensy-lc/src/kl_spi.c
index 111900225e..073764252a 100644
--- a/configs/teensy-lc/src/kl_spi.c
+++ b/configs/teensy-lc/src/kl_spi.c
@@ -58,9 +58,9 @@
 /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/tm4c123g-launchpad/src/tm4c_autoleds.c b/configs/tm4c123g-launchpad/src/tm4c_autoleds.c
index f2cbb2ab61..b78c5fbcf2 100644
--- a/configs/tm4c123g-launchpad/src/tm4c_autoleds.c
+++ b/configs/tm4c123g-launchpad/src/tm4c_autoleds.c
@@ -102,7 +102,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/tm4c123g-launchpad/src/tm4c_ssi.c b/configs/tm4c123g-launchpad/src/tm4c_ssi.c
index 2cf79f11f9..ee306c0624 100644
--- a/configs/tm4c123g-launchpad/src/tm4c_ssi.c
+++ b/configs/tm4c123g-launchpad/src/tm4c_ssi.c
@@ -62,7 +62,7 @@
 /* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define ssidbg lldbg
+#  define ssidbg llerr
 #else
 #  define ssidbg(x...)
 #endif
@@ -70,7 +70,7 @@
 /* Dump GPIO registers */
 
 #if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO)
-#  define ssiinfo lldbg
+#  define ssiinfo llerr
 #  define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m)
 #else
 #  define ssiinfo(x...)
diff --git a/configs/tm4c1294-launchpad/src/tm4c_ethernet.c b/configs/tm4c1294-launchpad/src/tm4c_ethernet.c
index 3b70b23853..642b8ac0e6 100644
--- a/configs/tm4c1294-launchpad/src/tm4c_ethernet.c
+++ b/configs/tm4c1294-launchpad/src/tm4c_ethernet.c
@@ -84,7 +84,7 @@ void tiva_ethernetmac(struct ether_addr *ethaddr)
   user0 = getreg32(TIVA_FLASH_USERREG0);
   user1 = getreg32(TIVA_FLASH_USERREG1);
 
-  nlldbg("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
+  nllerr("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
   DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff);
 
   /* Re-format that MAC address the way that the network expects to see it */
diff --git a/configs/tm4c1294-launchpad/src/tm4c_userleds.c b/configs/tm4c1294-launchpad/src/tm4c_userleds.c
index 6e8d287652..443ee91bfd 100644
--- a/configs/tm4c1294-launchpad/src/tm4c_userleds.c
+++ b/configs/tm4c1294-launchpad/src/tm4c_userleds.c
@@ -72,7 +72,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/twr-k60n512/src/k60_leds.c b/configs/twr-k60n512/src/k60_leds.c
index a7130f7e62..d7b13fa413 100644
--- a/configs/twr-k60n512/src/k60_leds.c
+++ b/configs/twr-k60n512/src/k60_leds.c
@@ -124,7 +124,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/twr-k60n512/src/k60_spi.c b/configs/twr-k60n512/src/k60_spi.c
index 8f7b8145f4..42aad3c58b 100644
--- a/configs/twr-k60n512/src/k60_spi.c
+++ b/configs/twr-k60n512/src/k60_spi.c
@@ -60,9 +60,9 @@
 /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef CONFIG_DEBUG_SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/twr-k60n512/src/k60_usbdev.c b/configs/twr-k60n512/src/k60_usbdev.c
index b542834768..c9a7514ad9 100644
--- a/configs/twr-k60n512/src/k60_usbdev.c
+++ b/configs/twr-k60n512/src/k60_usbdev.c
@@ -108,7 +108,7 @@ int kinetis_usbpullup(FAR struct usbdev_s *dev, bool enable)
 
 void kinetis_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ulldbg("resume: %d\n", resume);
+  ullerr("resume: %d\n", resume);
 #warning "Missing logic"
 }
 
diff --git a/configs/u-blox-c027/src/lpc17_leds.c b/configs/u-blox-c027/src/lpc17_leds.c
index f7299b1c66..ba72d2cc81 100644
--- a/configs/u-blox-c027/src/lpc17_leds.c
+++ b/configs/u-blox-c027/src/lpc17_leds.c
@@ -61,9 +61,9 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledinfo lldbg
+#    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
diff --git a/configs/u-blox-c027/src/lpc17_ssp.c b/configs/u-blox-c027/src/lpc17_ssp.c
index 85d58d5564..cbec4fc42e 100644
--- a/configs/u-blox-c027/src/lpc17_ssp.c
+++ b/configs/u-blox-c027/src/lpc17_ssp.c
@@ -64,9 +64,9 @@
 #undef SSP_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SSP_DEBUG
-#  define sspdbg  lldbg
+#  define sspdbg  llerr
 #  ifdef SSP_VERBOSE
-#    define sspinfo lldbg
+#    define sspinfo llerr
 #  else
 #    define sspinfo(x...)
 #  endif
diff --git a/configs/u-blox-c027/src/lpc17_ubxmdm.c b/configs/u-blox-c027/src/lpc17_ubxmdm.c
index 0bcd837b4a..294593ffde 100644
--- a/configs/u-blox-c027/src/lpc17_ubxmdm.c
+++ b/configs/u-blox-c027/src/lpc17_ubxmdm.c
@@ -64,12 +64,12 @@
 #ifdef CONFIG_MODEM_U_BLOX_DEBUG
 #  define m_dbg    dbg
 #  define m_info   info
-#  define m_vlldbg  lldbg
+#  define m_vllerr  llerr
 #  define m_vllinfo llinfo
 #else
 #  define m_dbg(x...)
 #  define m_info(x...)
-#  define m_lldbg(x...)
+#  define m_llerr(x...)
 #  define m_llinfo(x...)
 #endif
 
diff --git a/configs/ubw32/src/pic32_leds.c b/configs/ubw32/src/pic32_leds.c
index db51c2dba8..a99f633e53 100644
--- a/configs/ubw32/src/pic32_leds.c
+++ b/configs/ubw32/src/pic32_leds.c
@@ -98,9 +98,9 @@
 /* Debug ********************************************************************/
 
 #if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS)
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledinfo lldbg
+#    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
diff --git a/configs/viewtool-stm32f107/src/stm32_can.c b/configs/viewtool-stm32f107/src/stm32_can.c
index 8e3a6b38a0..c667032a9f 100644
--- a/configs/viewtool-stm32f107/src/stm32_can.c
+++ b/configs/viewtool-stm32f107/src/stm32_can.c
@@ -67,12 +67,12 @@
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
 #  define caninfo   info
-#  define canlldbg  lldbg
+#  define canllerr  llerr
 #  define canllinfo llinfo
 #else
 #  define candbg(x...)
 #  define caninfo(x...)
-#  define canlldbg(x...)
+#  define canllerr(x...)
 #  define canllinfo(x...)
 #endif
 
diff --git a/configs/viewtool-stm32f107/src/stm32_leds.c b/configs/viewtool-stm32f107/src/stm32_leds.c
index fa65507488..5a7308d0e3 100644
--- a/configs/viewtool-stm32f107/src/stm32_leds.c
+++ b/configs/viewtool-stm32f107/src/stm32_leds.c
@@ -58,7 +58,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  define ledinfo llinfo
 #else
 #  define leddbg(x...)
diff --git a/configs/viewtool-stm32f107/src/stm32_spi.c b/configs/viewtool-stm32f107/src/stm32_spi.c
index 3b957acc52..645564fda4 100644
--- a/configs/viewtool-stm32f107/src/stm32_spi.c
+++ b/configs/viewtool-stm32f107/src/stm32_spi.c
@@ -63,9 +63,9 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/viewtool-stm32f107/src/stm32_usbdev.c b/configs/viewtool-stm32f107/src/stm32_usbdev.c
index 1c35e9bb50..54235c462a 100644
--- a/configs/viewtool-stm32f107/src/stm32_usbdev.c
+++ b/configs/viewtool-stm32f107/src/stm32_usbdev.c
@@ -118,7 +118,7 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable)
 
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ulldbg("resume: %d\n", resume);
+  ullerr("resume: %d\n", resume);
 }
 
 #endif /* CONFIG_STM32_OTGFS || CONFIG_STM32_USB*/
diff --git a/configs/zkit-arm-1769/src/lpc17_can.c b/configs/zkit-arm-1769/src/lpc17_can.c
index 89e5550973..dc866bd640 100644
--- a/configs/zkit-arm-1769/src/lpc17_can.c
+++ b/configs/zkit-arm-1769/src/lpc17_can.c
@@ -72,12 +72,12 @@
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
 #  define caninfo   info
-#  define canlldbg  lldbg
+#  define canllerr  llerr
 #  define canllinfo llinfo
 #else
 #  define candbg(x...)
 #  define caninfo(x...)
-#  define canlldbg(x...)
+#  define canllerr(x...)
 #  define canllinfo(x...)
 #endif
 
diff --git a/configs/zkit-arm-1769/src/lpc17_lcd.c b/configs/zkit-arm-1769/src/lpc17_lcd.c
index b58e46b853..43e8778a6a 100644
--- a/configs/zkit-arm-1769/src/lpc17_lcd.c
+++ b/configs/zkit-arm-1769/src/lpc17_lcd.c
@@ -76,9 +76,9 @@
 #undef LCD_VERBOSE /* Define to enable verbose debug */
 
 #ifdef LCD_DEBUG
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  ifdef LCD_VERBOSE
-#    define ledinfo lldbg
+#    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
@@ -118,7 +118,7 @@ int board_lcd_initialize(void)
   g_spidev = lpc17_sspbus_initialize(0);
   if (!g_spidev)
     {
-      glldbg("Failed to initialize SSP port 0\n");
+      gllerr("Failed to initialize SSP port 0\n");
       return 0;
     }
 
@@ -137,7 +137,7 @@ FAR struct lcd_dev_s *board_lcd_getdev(int lcddev)
   g_lcddev = st7567_initialize(g_spidev, lcddev);
   if (!g_lcddev)
     {
-      glldbg("Failed to bind SSI port 0 to OLCD %d: %d\n", lcddev);
+      gllerr("Failed to bind SSI port 0 to OLCD %d: %d\n", lcddev);
     }
   else
     {
diff --git a/configs/zkit-arm-1769/src/lpc17_leds.c b/configs/zkit-arm-1769/src/lpc17_leds.c
index 02d4b03cfe..a62b58f4d4 100644
--- a/configs/zkit-arm-1769/src/lpc17_leds.c
+++ b/configs/zkit-arm-1769/src/lpc17_leds.c
@@ -67,9 +67,9 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  lldbg
+#  define leddbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define ledinfo lldbg
+#    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
diff --git a/configs/zkit-arm-1769/src/lpc17_spi.c b/configs/zkit-arm-1769/src/lpc17_spi.c
index d28347c723..45c04fb456 100644
--- a/configs/zkit-arm-1769/src/lpc17_spi.c
+++ b/configs/zkit-arm-1769/src/lpc17_spi.c
@@ -66,9 +66,9 @@
 /* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/configs/zkit-arm-1769/src/lpc17_ssp.c b/configs/zkit-arm-1769/src/lpc17_ssp.c
index f0667b4bba..633e9107e5 100644
--- a/configs/zkit-arm-1769/src/lpc17_ssp.c
+++ b/configs/zkit-arm-1769/src/lpc17_ssp.c
@@ -66,9 +66,9 @@
 /* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define sspdbg  lldbg
+#  define sspdbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define sspinfo lldbg
+#    define sspinfo llerr
 #  else
 #    define sspinfo(x...)
 #  endif
diff --git a/configs/zp214xpa/src/lpc2148_spi1.c b/configs/zp214xpa/src/lpc2148_spi1.c
index c0336cef05..b07db4d85f 100644
--- a/configs/zp214xpa/src/lpc2148_spi1.c
+++ b/configs/zp214xpa/src/lpc2148_spi1.c
@@ -90,9 +90,9 @@
 /* Enables debug output from this file */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/crypto/crypto.c b/crypto/crypto.c
index e7c5594eb1..e0095ef6d1 100644
--- a/crypto/crypto.c
+++ b/crypto/crypto.c
@@ -81,7 +81,7 @@ int up_cryptoinitialize(void)
   res = crypto_test();
   if (res)
     {
-      cryptlldbg("crypto test failed\n");
+      cryptllerr("crypto test failed\n");
     }
   else
     {
diff --git a/crypto/testmngr.c b/crypto/testmngr.c
index c7fe86e78a..f95628f4a9 100644
--- a/crypto/testmngr.c
+++ b/crypto/testmngr.c
@@ -86,7 +86,7 @@ static int do_test_aes(FAR struct cipher_testvec *test, int mode, int encrypt)
 #define AES_CYPHER_TEST_ENCRYPT(mode, mode_str, count, template) \
   for (i = 0; i < count; i++) { \
     if (do_test_aes(template + i, mode, CYPHER_ENCRYPT)) { \
-      cryptlldbg("Failed " mode_str " encrypt test #%i\n", i); \
+      cryptllerr("Failed " mode_str " encrypt test #%i\n", i); \
       return -1; \
     } \
   }
@@ -94,7 +94,7 @@ static int do_test_aes(FAR struct cipher_testvec *test, int mode, int encrypt)
 #define AES_CYPHER_TEST_DECRYPT(mode, mode_str, count, template) \
   for (i = 0; i < count; i++) { \
     if (do_test_aes(template + i, mode, CYPHER_DECRYPT)) { \
-      cryptlldbg("Failed " mode_str " decrypt test #%i\n", i); \
+      cryptllerr("Failed " mode_str " decrypt test #%i\n", i); \
       return -1; \
     } \
   }
diff --git a/drivers/audio/i2schar.c b/drivers/audio/i2schar.c
index 27072548b5..95ebbb73ae 100644
--- a/drivers/audio/i2schar.c
+++ b/drivers/audio/i2schar.c
@@ -87,16 +87,16 @@
 
 #ifdef CONFIG_DEBUG_I2S
 #  define i2sdbg         dbg
-#  define i2slldbg       lldbg
+#  define i2sllerr       llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define i2sinfo      dbg
-#    define i2sllinfo    lldbg
+#    define i2sllinfo    llerr
 #  else
 #    define i2sinfo(x...)
 #  endif
 #else
 #  define i2sdbg(x...)
-#  define i2slldbg(x...)
+#  define i2sllerr(x...)
 #  define i2sinfo(x...)
 #  define i2sllinfo(x...)
 #endif
diff --git a/drivers/audio/wm8904.c b/drivers/audio/wm8904.c
index de116ac9b9..dcbce3c506 100644
--- a/drivers/audio/wm8904.c
+++ b/drivers/audio/wm8904.c
@@ -1345,7 +1345,7 @@ static void  wm8904_senddone(FAR struct i2s_dev_s *i2s,
                 CONFIG_WM8904_MSG_PRIO);
   if (ret < 0)
     {
-      audlldbg("ERROR: mq_send failed: %d\n", errno);
+      audllerr("ERROR: mq_send failed: %d\n", errno);
     }
 }
 
@@ -1971,7 +1971,7 @@ static int wm8904_interrupt(FAR const struct wm8904_lower_s *lower,
   ret = work_queue(LPWORK, &priv->work, wm8904_interrupt_work, priv, 0);
   if (ret < 0)
     {
-      audlldbg("ERROR: Failed to schedule work\n");
+      audllerr("ERROR: Failed to schedule work\n");
     }
 
   return OK;
diff --git a/drivers/can.c b/drivers/can.c
index bd5cd96220..fcdd4e2425 100644
--- a/drivers/can.c
+++ b/drivers/can.c
@@ -102,12 +102,12 @@
 #ifdef CONFIG_DEBUG_CAN
 #  define candbg    dbg
 #  define caninfo   info
-#  define canlldbg  lldbg
+#  define canllerr  llerr
 #  define canllinfo llinfo
 #else
 #  define candbg(x...)
 #  define caninfo(x...)
-#  define canlldbg(x...)
+#  define canllerr(x...)
 #  define canllinfo(x...)
 #endif
 
diff --git a/drivers/input/ads7843e.c b/drivers/input/ads7843e.c
index 2097c0774c..4626217afb 100644
--- a/drivers/input/ads7843e.c
+++ b/drivers/input/ads7843e.c
@@ -498,7 +498,7 @@ static int ads7843e_schedule(FAR struct ads7843e_dev_s *priv)
   ret = work_queue(HPWORK, &priv->work, ads7843e_worker, priv, 0);
   if (ret != 0)
     {
-      illdbg("Failed to queue work: %d\n", ret);
+      illerr("Failed to queue work: %d\n", ret);
     }
 
   return OK;
diff --git a/drivers/input/max11802.c b/drivers/input/max11802.c
index 1acee40807..97c9a6cc3f 100644
--- a/drivers/input/max11802.c
+++ b/drivers/input/max11802.c
@@ -463,7 +463,7 @@ static int max11802_schedule(FAR struct max11802_dev_s *priv)
   ret = work_queue(HPWORK, &priv->work, max11802_worker, priv, 0);
   if (ret != 0)
     {
-      illdbg("Failed to queue work: %d\n", ret);
+      illerr("Failed to queue work: %d\n", ret);
     }
 
   return OK;
diff --git a/drivers/input/mxt.c b/drivers/input/mxt.c
index f09455b4c9..6f09edade1 100644
--- a/drivers/input/mxt.c
+++ b/drivers/input/mxt.c
@@ -1097,7 +1097,7 @@ static int mxt_interrupt(FAR const struct mxt_lower_s *lower, FAR void *arg)
   ret = work_queue(HPWORK, &priv->work, mxt_worker, priv, 0);
   if (ret != 0)
     {
-      illdbg("Failed to queue work: %d\n", ret);
+      illerr("Failed to queue work: %d\n", ret);
     }
 
   /* Clear any pending interrupts and return success */
diff --git a/drivers/input/stmpe811_base.c b/drivers/input/stmpe811_base.c
index b491fe5b2e..863daf61f5 100644
--- a/drivers/input/stmpe811_base.c
+++ b/drivers/input/stmpe811_base.c
@@ -199,7 +199,7 @@ static int stmpe811_interrupt(int irq, FAR void *context)
       ret = work_queue(HPWORK, &priv->work, stmpe811_worker, priv, 0);
       if (ret != 0)
         {
-          illdbg("Failed to queue work: %d\n", ret);
+          illerr("Failed to queue work: %d\n", ret);
         }
     }
 
diff --git a/drivers/input/stmpe811_gpio.c b/drivers/input/stmpe811_gpio.c
index 267f26cf48..7d4fc5edb8 100644
--- a/drivers/input/stmpe811_gpio.c
+++ b/drivers/input/stmpe811_gpio.c
@@ -438,7 +438,7 @@ void stmpe811_gpioworker(FAR struct stmpe811_dev_s *priv)
             }
           else
             {
-              illdbg("No handler for PIN%d, GPIO_INTSTA: %02x\n", pin, regval);
+              illerr("No handler for PIN%d, GPIO_INTSTA: %02x\n", pin, regval);
             }
 
           /* Clear the pending GPIO interrupt by writing a '1' to the
diff --git a/drivers/input/stmpe811_tsc.c b/drivers/input/stmpe811_tsc.c
index 21ad19c2c7..d1cfa04bdc 100644
--- a/drivers/input/stmpe811_tsc.c
+++ b/drivers/input/stmpe811_tsc.c
@@ -786,7 +786,7 @@ static void stmpe811_timeout(int argc, uint32_t arg1, ...)
           ret = work_queue(HPWORK, &priv->timeout, stmpe811_timeoutworker, priv, 0);
           if (ret != 0)
             {
-              illdbg("Failed to queue work: %d\n", ret);
+              illerr("Failed to queue work: %d\n", ret);
             }
         }
     }
diff --git a/drivers/input/tsc2007.c b/drivers/input/tsc2007.c
index 8ab76b8e7e..5d478551c7 100644
--- a/drivers/input/tsc2007.c
+++ b/drivers/input/tsc2007.c
@@ -783,7 +783,7 @@ static int tsc2007_interrupt(int irq, FAR void *context)
   ret = work_queue(HPWORK, &priv->work, tsc2007_worker, priv, 0);
   if (ret != 0)
     {
-      illdbg("Failed to queue work: %d\n", ret);
+      illerr("Failed to queue work: %d\n", ret);
     }
 
   /* Clear any pending interrupts and return success */
diff --git a/drivers/lcd/ssd1306_i2c.c b/drivers/lcd/ssd1306_i2c.c
index 1a5edaa6d1..30ca9a664f 100644
--- a/drivers/lcd/ssd1306_i2c.c
+++ b/drivers/lcd/ssd1306_i2c.c
@@ -71,7 +71,7 @@ void ssd1306_sendbyte(FAR struct ssd1306_dev_s *priv, uint8_t regval)
   int ret;
 
 #ifdef CONFIG_LCD_SSD1306_REGDEBUG
-  lldbg("-> 0x%02x\n", regval);
+  llerr("-> 0x%02x\n", regval);
 #endif
 
   /* Setup to the data to be transferred.  Two bytes:  The SSD1306 register
diff --git a/drivers/lcd/ssd1306_spi.c b/drivers/lcd/ssd1306_spi.c
index f40a59cdf8..dfa7acfc02 100644
--- a/drivers/lcd/ssd1306_spi.c
+++ b/drivers/lcd/ssd1306_spi.c
@@ -89,7 +89,7 @@ static inline void ssd1306_configspi(FAR struct spi_dev_s *spi)
 void ssd1306_sendbyte(FAR struct ssd1306_dev_s *priv, uint8_t regval)
 {
 #ifdef CONFIG_LCD_SSD1306_REGDEBUG
-  lldbg("->0x%02x\n", regval);
+  llerr("->0x%02x\n", regval);
 #endif
 
   /* Send byte value to display */
diff --git a/drivers/leds/rgbled.c b/drivers/leds/rgbled.c
index 4760abf207..8a457a391c 100644
--- a/drivers/leds/rgbled.c
+++ b/drivers/leds/rgbled.c
@@ -75,12 +75,12 @@
 #ifdef CONFIG_DEBUG_RGBLED
 #  define pwmdbg    dbg
 #  define pwminfo   info
-#  define pwmlldbg  lldbg
+#  define pwmllerr  llerr
 #  define pwmllinfo llinfo
 #else
 #  define pwmdbg(x...)
 #  define pwminfo(x...)
-#  define pwmlldbg(x...)
+#  define pwmllerr(x...)
 #  define pwmllinfo(x...)
 #endif
 
diff --git a/drivers/leds/userled_upper.c b/drivers/leds/userled_upper.c
index dd074db27a..397f9aab8b 100644
--- a/drivers/leds/userled_upper.c
+++ b/drivers/leds/userled_upper.c
@@ -67,9 +67,9 @@
 #endif
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define ddbg lldbg
+#  define ddbg llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define dinfo lldbg
+#    define dinfo llerr
 #  else
 #    define dinfo(x...)
 #  endif
diff --git a/drivers/modem/u-blox.c b/drivers/modem/u-blox.c
index 6fedc5645a..fac7ec1ce2 100644
--- a/drivers/modem/u-blox.c
+++ b/drivers/modem/u-blox.c
@@ -60,12 +60,12 @@
 #ifdef CONFIG_MODEM_U_BLOX_DEBUG
 #  define m_dbg    dbg
 #  define m_info   info
-#  define m_vlldbg  lldbg
+#  define m_vllerr  llerr
 #  define m_vllinfo llinfo
 #else
 #  define m_dbg(x...)
 #  define m_info(x...)
-#  define m_lldbg(x...)
+#  define m_llerr(x...)
 #  define m_llinfo(x...)
 #endif
 
diff --git a/drivers/mtd/sst26.c b/drivers/mtd/sst26.c
index 16d867c0ab..c92b90bd17 100644
--- a/drivers/mtd/sst26.c
+++ b/drivers/mtd/sst26.c
@@ -209,12 +209,12 @@
 
 #ifdef CONFIG_SST26_DEBUG
 # define sstdbg(format, ...)    dbg(format, ##__VA_ARGS__)
-# define sstlldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
+# define sstllerr(format, ...)  llerr(format, ##__VA_ARGS__)
 # define sstinfo(format, ...)   info(format, ##__VA_ARGS__)
 # define sstllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 # define sstdbg(x...)
-# define sstlldbg(x...)
+# define sstllerr(x...)
 # define sstinfo(x...)
 # define sstllinfo(x...)
 #endif
@@ -340,7 +340,7 @@ static inline int sst26_readid(struct sst26_dev_s *priv)
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
   sst26_unlock(priv->dev);
 
-  lldbg("manufacturer: %02x memory: %02x capacity: %02x\n",
+  llerr("manufacturer: %02x memory: %02x capacity: %02x\n",
         manufacturer, memory, capacity);
 
   /* Check for a valid manufacturer and memory type */
diff --git a/drivers/net/dm90x0.c b/drivers/net/dm90x0.c
index 798bb3e38f..26b29c2904 100644
--- a/drivers/net/dm90x0.c
+++ b/drivers/net/dm90x0.c
@@ -1722,13 +1722,13 @@ int dm9x_initialize(void)
 
   vid = (((uint16_t)getreg(DM9X_VIDH)) << 8) | (uint16_t)getreg(DM9X_VIDL);
   pid = (((uint16_t)getreg(DM9X_PIDH)) << 8) | (uint16_t)getreg(DM9X_PIDL);
-  nlldbg("I/O base: %08x VID: %04x PID: %04x\n", CONFIG_DM9X_BASE, vid, pid);
+  nllerr("I/O base: %08x VID: %04x PID: %04x\n", CONFIG_DM9X_BASE, vid, pid);
 
   /* Check if a DM90x0 chip is recognized at this I/O base */
 
   if (vid != DM9X_DAVICOMVID || (pid != DM9X_DM9000PID && pid != DM9X_DM9010PID))
     {
-      nlldbg("DM90x0 vendor/product ID not found at this base address\n");
+      nllerr("DM90x0 vendor/product ID not found at this base address\n");
       return -ENODEV;
     }
 
@@ -1738,7 +1738,7 @@ int dm9x_initialize(void)
     {
       /* We could not attach the ISR to the ISR */
 
-      nlldbg("irq_attach() failed\n");
+      nllerr("irq_attach() failed\n");
       return -EAGAIN;
     }
 
@@ -1767,7 +1767,7 @@ int dm9x_initialize(void)
       mptr[i] = getreg(j);
     }
 
-  nlldbg("MAC: %0x:%0x:%0x:%0x:%0x:%0x\n",
+  nllerr("MAC: %0x:%0x:%0x:%0x:%0x:%0x\n",
          mptr[0], mptr[1], mptr[2], mptr[3], mptr[4], mptr[5]);
 
   /* Register the device with the OS so that socket IOCTLs can be performed */
diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c
index ecc2d4a2e1..3f3e64c92c 100644
--- a/drivers/net/enc28j60.c
+++ b/drivers/net/enc28j60.c
@@ -1484,7 +1484,7 @@ static void enc_rxdispatch(FAR struct enc_driver_s *priv)
   else
 #endif
     {
-      nlldbg("Unsupported packet type dropped (%02x)\n", htons(BUF->type));
+      nllerr("Unsupported packet type dropped (%02x)\n", htons(BUF->type));
       NETDEV_RXDROPPED(&priv->dev);
     }
 }
@@ -1550,7 +1550,7 @@ static void enc_pktif(FAR struct enc_driver_s *priv)
 
   if ((rxstat & RXSTAT_OK) == 0)
     {
-      nlldbg("ERROR: RXSTAT: %04x\n", rxstat);
+      nllerr("ERROR: RXSTAT: %04x\n", rxstat);
       NETDEV_RXERRORS(&priv->dev);
     }
 
@@ -1558,7 +1558,7 @@ static void enc_pktif(FAR struct enc_driver_s *priv)
 
   else if (pktlen > (CONFIG_NET_ETH_MTU + 4) || pktlen <= (ETH_HDRLEN + 4))
     {
-      nlldbg("Bad packet size dropped (%d)\n", pktlen);
+      nllerr("Bad packet size dropped (%d)\n", pktlen);
       NETDEV_RXERRORS(&priv->dev);
     }
 
@@ -1878,7 +1878,7 @@ static void enc_toworker(FAR void *arg)
   net_lock_t lock;
   int ret;
 
-  nlldbg("Tx timeout\n");
+  nllerr("Tx timeout\n");
   DEBUGASSERT(priv);
 
   /* Get exclusive access to the network */
@@ -2067,7 +2067,7 @@ static int enc_ifup(struct net_driver_s *dev)
   FAR struct enc_driver_s *priv = (FAR struct enc_driver_s *)dev->d_private;
   int ret;
 
-  nlldbg("Bringing up: %d.%d.%d.%d\n",
+  nllerr("Bringing up: %d.%d.%d.%d\n",
          dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
         (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 
@@ -2139,7 +2139,7 @@ static int enc_ifdown(struct net_driver_s *dev)
   irqstate_t flags;
   int ret;
 
-  nlldbg("Taking down: %d.%d.%d.%d\n",
+  nllerr("Taking down: %d.%d.%d.%d\n",
          dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
          (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 
@@ -2473,7 +2473,7 @@ static int enc_reset(FAR struct enc_driver_s *priv)
 {
   uint8_t regval;
 
-  nlldbg("Reset\n");
+  nllerr("Reset\n");
 
   /* Configure SPI for the ENC28J60 */
 
@@ -2524,7 +2524,7 @@ static int enc_reset(FAR struct enc_driver_s *priv)
   regval = enc_rdbreg(priv, ENC_EREVID);
   if (regval == 0x00 || regval == 0xff)
     {
-      nlldbg("Bad Rev ID: %02x\n", regval);
+      nllerr("Bad Rev ID: %02x\n", regval);
       return -ENODEV;
     }
 
diff --git a/drivers/net/encx24j600.c b/drivers/net/encx24j600.c
index 67582d5c2d..1ce5a53f25 100644
--- a/drivers/net/encx24j600.c
+++ b/drivers/net/encx24j600.c
@@ -1127,7 +1127,7 @@ static int enc_txenqueue(FAR struct enc_driver_s *priv)
     }
   else
     {
-      nlldbg("no free descriptors\n");
+      nllerr("no free descriptors\n");
       ret = -ENOMEM;
     }
 
@@ -1612,7 +1612,7 @@ static void enc_rxdispatch(FAR struct enc_driver_s *priv)
 
           enc_rxrmpkt(priv, descr);
 
-          nlldbg("Unsupported packet type dropped (%02x)\n", htons(BUF->type));
+          nllerr("Unsupported packet type dropped (%02x)\n", htons(BUF->type));
           NETDEV_RXDROPPED(&priv->dev);
         }
 
@@ -1707,7 +1707,7 @@ static void enc_pktif(FAR struct enc_driver_s *priv)
 
       if ((rxstat & RXSTAT_OK) == 0)
         {
-          nlldbg("ERROR: RXSTAT: %08x\n", rxstat);
+          nllerr("ERROR: RXSTAT: %08x\n", rxstat);
 
           /* Discard packet */
 
@@ -1719,7 +1719,7 @@ static void enc_pktif(FAR struct enc_driver_s *priv)
 
       else if (pktlen > (CONFIG_NET_ETH_MTU + 4) || pktlen <= (ETH_HDRLEN + 4))
         {
-          nlldbg("Bad packet size dropped (%d)\n", pktlen);
+          nllerr("Bad packet size dropped (%d)\n", pktlen);
 
           /* Discard packet */
 
@@ -1774,17 +1774,17 @@ static void enc_rxabtif(FAR struct enc_driver_s *priv)
 #if 0
   /* Free the last received packet from the RX queue */
 
-  nlldbg("rx abort\n");
-  nlldbg("ESTAT:   %04x\n", enc_rdreg(priv, ENC_ESTAT));
-  nlldbg("EIR:     %04x\n", enc_rdreg(priv, ENC_EIR));
-  nlldbg("ERXTAIL: %04x\n", enc_rdreg(priv, ENC_ERXTAIL));
-  nlldbg("ERXHAED: %04x\n", enc_rdreg(priv, ENC_ERXHEAD));
+  nllerr("rx abort\n");
+  nllerr("ESTAT:   %04x\n", enc_rdreg(priv, ENC_ESTAT));
+  nllerr("EIR:     %04x\n", enc_rdreg(priv, ENC_EIR));
+  nllerr("ERXTAIL: %04x\n", enc_rdreg(priv, ENC_ERXTAIL));
+  nllerr("ERXHAED: %04x\n", enc_rdreg(priv, ENC_ERXHEAD));
 
   descr = (FAR struct enc_descr_s *)sq_peek(&priv->rxqueue);
 
   while (descr != NULL)
     {
-      nlldbg("addr: %04x len: %d\n", descr->addr, descr->len);
+      nllerr("addr: %04x len: %d\n", descr->addr, descr->len);
       descr = (FAR struct enc_descr_s *)sq_next(descr);
     }
 
@@ -1797,7 +1797,7 @@ static void enc_rxabtif(FAR struct enc_driver_s *priv)
     {
       enc_rxrmpkt(priv, descr);
 
-      nlldbg("pending packet freed\n");
+      nllerr("pending packet freed\n");
     }
   else
     {
@@ -2043,7 +2043,7 @@ static void enc_toworker(FAR void *arg)
   net_lock_t lock;
   int ret;
 
-  nlldbg("Tx timeout\n");
+  nllerr("Tx timeout\n");
   DEBUGASSERT(priv);
 
   /* Get exclusive access to the network. */
@@ -2231,7 +2231,7 @@ static int enc_ifup(struct net_driver_s *dev)
   FAR struct enc_driver_s *priv = (FAR struct enc_driver_s *)dev->d_private;
   int ret;
 
-  nlldbg("Bringing up: %d.%d.%d.%d\n",
+  nllerr("Bringing up: %d.%d.%d.%d\n",
          dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
         (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 
@@ -2307,7 +2307,7 @@ static int enc_ifdown(struct net_driver_s *dev)
   irqstate_t flags;
   int ret;
 
-  nlldbg("Taking down: %d.%d.%d.%d\n",
+  nllerr("Taking down: %d.%d.%d.%d\n",
          dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
          (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 
@@ -2742,7 +2742,7 @@ static int enc_reset(FAR struct enc_driver_s *priv)
 
   if (ret != OK)
     {
-      nlldbg("ERROR: encx24j600 clock failed to become ready\n");
+      nllerr("ERROR: encx24j600 clock failed to become ready\n");
       return -ENODEV;
     }
 
@@ -2756,7 +2756,7 @@ static int enc_reset(FAR struct enc_driver_s *priv)
 
   if (regval != 0x0000)
     {
-      nlldbg("ERROR: encx24j600 seems not to be reset properly\n");
+      nllerr("ERROR: encx24j600 seems not to be reset properly\n");
       return -ENODEV;
     }
 
@@ -2813,7 +2813,7 @@ static int enc_reset(FAR struct enc_driver_s *priv)
 #if 0
   if (ret != OK)
     {
-      nlldbg("ERROR: encx24j600 failed to establish link\n");
+      nllerr("ERROR: encx24j600 failed to establish link\n");
       return -ENODEV;
     }
 #endif
diff --git a/drivers/net/phy_notify.c b/drivers/net/phy_notify.c
index 73cf2af033..b78cc65810 100644
--- a/drivers/net/phy_notify.c
+++ b/drivers/net/phy_notify.c
@@ -83,10 +83,10 @@
 
 #ifdef CONFIG_NETDEV_PHY_DEBUG
 #  define phydbg    dbg
-#  define phylldbg  lldbg
+#  define phyllerr  llerr
 #else
 #  define phydbg(x...)
-#  define phylldbg(x...)
+#  define phyllerr(x...)
 #endif
 
 /****************************************************************************
@@ -266,7 +266,7 @@ static int phy_handler(FAR struct phy_notify_s *client)
   int ret;
 
   DEBUGASSERT(client && client->assigned && client->enable);
-  phylldbg("Entry client %d, signalling PID=%d with signal %d\n",
+  phyllerr("Entry client %d, signalling PID=%d with signal %d\n",
            client->index, client->pid, client->signo);
 
   /* Disable further interrupts */
@@ -287,7 +287,7 @@ static int phy_handler(FAR struct phy_notify_s *client)
       int errcode = errno;
       DEBUGASSERT(errcode > 0);
 
-      nlldbg("ERROR: sigqueue failed: %d\n", errcode);
+      nllerr("ERROR: sigqueue failed: %d\n", errcode);
       UNUSED(errcode);
     }
 
diff --git a/drivers/net/telnet.c b/drivers/net/telnet.c
index c2ddfc44c9..903921f09f 100644
--- a/drivers/net/telnet.c
+++ b/drivers/net/telnet.c
@@ -447,7 +447,7 @@ static void telnet_sendopt(FAR struct telnet_dev_s *priv, uint8_t option,
   telnet_dumpbuffer("Send optbuf", optbuf, 4);
   if (psock_send(&priv->td_psock, optbuf, 4, 0) < 0)
     {
-      nlldbg("Failed to send TELNET_IAC\n");
+      nllerr("Failed to send TELNET_IAC\n");
     }
 }
 
@@ -548,7 +548,7 @@ static int telnet_close(FAR struct file *filep)
       ret = asprintf(&devpath, TELNETD_DEVFMT, priv->td_minor);
       if (ret < 0)
         {
-          nlldbg("ERROR: Failed to allocate the driver path\n");
+          nllerr("ERROR: Failed to allocate the driver path\n");
         }
       else
         {
@@ -566,7 +566,7 @@ static int telnet_close(FAR struct file *filep)
 
               if (ret != -EBUSY)
                 {
-                  nlldbg("Failed to unregister the driver %s: %d\n",
+                  nllerr("Failed to unregister the driver %s: %d\n",
                          devpath, ret);
                 }
             }
@@ -706,7 +706,7 @@ static ssize_t telnet_write(FAR struct file *filep, FAR const char *buffer, size
           ret = psock_send(&priv->td_psock, priv->td_txbuffer, ncopied, 0);
           if (ret < 0)
             {
-              nlldbg("psock_send failed '%s': %d\n", priv->td_txbuffer, ret);
+              nllerr("psock_send failed '%s': %d\n", priv->td_txbuffer, ret);
               return ret;
             }
 
@@ -723,7 +723,7 @@ static ssize_t telnet_write(FAR struct file *filep, FAR const char *buffer, size
       ret = psock_send(&priv->td_psock, priv->td_txbuffer, ncopied, 0);
       if (ret < 0)
         {
-          nlldbg("psock_send failed '%s': %d\n", priv->td_txbuffer, ret);
+          nllerr("psock_send failed '%s': %d\n", priv->td_txbuffer, ret);
           return ret;
         }
     }
@@ -767,7 +767,7 @@ static int telnet_session(FAR struct telnet_session_s *session)
   priv = (FAR struct telnet_dev_s*)malloc(sizeof(struct telnet_dev_s));
   if (!priv)
     {
-      nlldbg("Failed to allocate the driver data structure\n");
+      nllerr("Failed to allocate the driver data structure\n");
       return -ENOMEM;
     }
 
@@ -788,7 +788,7 @@ static int telnet_session(FAR struct telnet_session_s *session)
   psock = sockfd_socket(session->ts_sd);
   if (!psock)
     {
-      nlldbg("Failed to convert sd=%d to a socket structure\n", session->ts_sd);
+      nllerr("Failed to convert sd=%d to a socket structure\n", session->ts_sd);
       ret = -EINVAL;
       goto errout_with_dev;
     }
@@ -796,7 +796,7 @@ static int telnet_session(FAR struct telnet_session_s *session)
   ret = net_clone(psock, &priv->td_psock);
   if (ret < 0)
     {
-      nlldbg("net_clone failed: %d\n", ret);
+      nllerr("net_clone failed: %d\n", ret);
       goto errout_with_dev;
     }
 
@@ -834,7 +834,7 @@ static int telnet_session(FAR struct telnet_session_s *session)
 
   if (ret >= 0)
     {
-      nlldbg("ERROR: Too many sessions\n");
+      nllerr("ERROR: Too many sessions\n");
       ret = -ENFILE;
       goto errout_with_semaphore;
     }
@@ -844,7 +844,7 @@ static int telnet_session(FAR struct telnet_session_s *session)
   ret = register_driver(session->ts_devpath, &g_telnet_fops, 0666, priv);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to register the driver %s: %d\n",
+      nllerr("ERROR: Failed to register the driver %s: %d\n",
              session->ts_devpath, ret);
       goto errout_with_semaphore;
     }
diff --git a/drivers/pipes/pipe_common.c b/drivers/pipes/pipe_common.c
index 3d45b8fdac..fe728c2f35 100644
--- a/drivers/pipes/pipe_common.c
+++ b/drivers/pipes/pipe_common.c
@@ -521,7 +521,7 @@ ssize_t pipecommon_write(FAR struct file *filep, FAR const char *buffer,
    * be called from interrupt level.  This actually happens fairly commonly
    * IF dbg() is called from interrupt handlers and stdout is being redirected
    * via a pipe.  In that case, the debug output will try to go out the pipe
-   * (interrupt handlers should use the lldbg() APIs).
+   * (interrupt handlers should use the llerr() APIs).
    *
    * On the other hand, it would be very valuable to be able to feed the pipe
    * from an interrupt handler!  TODO:  Consider disabling interrupts instead
diff --git a/drivers/pwm.c b/drivers/pwm.c
index 103b78755a..0b0e173d4e 100644
--- a/drivers/pwm.c
+++ b/drivers/pwm.c
@@ -73,12 +73,12 @@
 #ifdef CONFIG_DEBUG_PWM
 #  define pwmdbg    dbg
 #  define pwminfo   info
-#  define pwmlldbg  lldbg
+#  define pwmllerr  llerr
 #  define pwmllinfo llinfo
 #else
 #  define pwmdbg(x...)
 #  define pwminfo(x...)
-#  define pwmlldbg(x...)
+#  define pwmllerr(x...)
 #  define pwmllinfo(x...)
 #endif
 
diff --git a/drivers/sensors/adxl345_base.c b/drivers/sensors/adxl345_base.c
index a1cdeeecdb..e96aff0838 100644
--- a/drivers/sensors/adxl345_base.c
+++ b/drivers/sensors/adxl345_base.c
@@ -305,7 +305,7 @@ static void adxl345_interrupt(FAR struct adxl345_config_s *config, FAR void *arg
       ret = work_queue(HPWORK, &priv->work, adxl345_worker, priv, 0);
       if (ret != 0)
         {
-          snlldbg("Failed to queue work: %d\n", ret);
+          snllerr("Failed to queue work: %d\n", ret);
         }
     }
 
diff --git a/drivers/spi/spi_bitbang.c b/drivers/spi/spi_bitbang.c
index ec3a1512e1..75667fd135 100644
--- a/drivers/spi/spi_bitbang.c
+++ b/drivers/spi/spi_bitbang.c
@@ -89,9 +89,9 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg lldbg
+#  define spidbg llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/drivers/timers/ds3231.c b/drivers/timers/ds3231.c
index 630ba72259..8dbed20dec 100644
--- a/drivers/timers/ds3231.c
+++ b/drivers/timers/ds3231.c
@@ -86,12 +86,12 @@
 #ifdef CONFIG_DEBUG_RTC
 #  define rtcdbg    dbg
 #  define rtcinfo   info
-#  define rtclldbg  lldbg
+#  define rtcllerr  llerr
 #  define rtcllinfo llinfo
 #else
 #  define rtcdbg(x...)
 #  define rtcinfo(x...)
-#  define rtclldbg(x...)
+#  define rtcllerr(x...)
 #  define rtcllinfo(x...)
 #endif
 
@@ -143,17 +143,17 @@ static struct ds3231_dev_s g_ds3231;
 #ifdef CONFIG_DEBUG_RTC
 static void rtc_dumptime(FAR struct tm *tp, FAR const char *msg)
 {
-  rtclldbg("%s:\n", msg);
-  rtclldbg("   tm_sec: %08x\n", tp->tm_sec);
-  rtclldbg("   tm_min: %08x\n", tp->tm_min);
-  rtclldbg("  tm_hour: %08x\n", tp->tm_hour);
-  rtclldbg("  tm_mday: %08x\n", tp->tm_mday);
-  rtclldbg("   tm_mon: %08x\n", tp->tm_mon);
-  rtclldbg("  tm_year: %08x\n", tp->tm_year);
+  rtcllerr("%s:\n", msg);
+  rtcllerr("   tm_sec: %08x\n", tp->tm_sec);
+  rtcllerr("   tm_min: %08x\n", tp->tm_min);
+  rtcllerr("  tm_hour: %08x\n", tp->tm_hour);
+  rtcllerr("  tm_mday: %08x\n", tp->tm_mday);
+  rtcllerr("   tm_mon: %08x\n", tp->tm_mon);
+  rtcllerr("  tm_year: %08x\n", tp->tm_year);
 #if defined(CONFIG_LIBC_LOCALTIME) || defined(CONFIG_TIME_EXTENDED)
-  rtclldbg("  tm_wday: %08x\n", tp->tm_wday);
-  rtclldbg("  tm_yday: %08x\n", tp->tm_yday);
-  rtclldbg(" tm_isdst: %08x\n", tp->tm_isdst);
+  rtcllerr("  tm_wday: %08x\n", tp->tm_wday);
+  rtcllerr("  tm_yday: %08x\n", tp->tm_yday);
+  rtcllerr(" tm_isdst: %08x\n", tp->tm_isdst);
 #endif
 }
 #else
diff --git a/drivers/timers/pcf85263.c b/drivers/timers/pcf85263.c
index 93619f2d93..7a9f22145f 100644
--- a/drivers/timers/pcf85263.c
+++ b/drivers/timers/pcf85263.c
@@ -86,12 +86,12 @@
 #ifdef CONFIG_DEBUG_RTC
 #  define rtcdbg    dbg
 #  define rtcinfo   info
-#  define rtclldbg  lldbg
+#  define rtcllerr  llerr
 #  define rtcllinfo llinfo
 #else
 #  define rtcdbg(x...)
 #  define rtcinfo(x...)
-#  define rtclldbg(x...)
+#  define rtcllerr(x...)
 #  define rtcllinfo(x...)
 #endif
 
@@ -143,17 +143,17 @@ static struct pcf85263_dev_s g_pcf85263;
 #ifdef CONFIG_DEBUG_RTC
 static void rtc_dumptime(FAR struct tm *tp, FAR const char *msg)
 {
-  rtclldbg("%s:\n", msg);
-  rtclldbg("   tm_sec: %08x\n", tp->tm_sec);
-  rtclldbg("   tm_min: %08x\n", tp->tm_min);
-  rtclldbg("  tm_hour: %08x\n", tp->tm_hour);
-  rtclldbg("  tm_mday: %08x\n", tp->tm_mday);
-  rtclldbg("   tm_mon: %08x\n", tp->tm_mon);
-  rtclldbg("  tm_year: %08x\n", tp->tm_year);
+  rtcllerr("%s:\n", msg);
+  rtcllerr("   tm_sec: %08x\n", tp->tm_sec);
+  rtcllerr("   tm_min: %08x\n", tp->tm_min);
+  rtcllerr("  tm_hour: %08x\n", tp->tm_hour);
+  rtcllerr("  tm_mday: %08x\n", tp->tm_mday);
+  rtcllerr("   tm_mon: %08x\n", tp->tm_mon);
+  rtcllerr("  tm_year: %08x\n", tp->tm_year);
 #if defined(CONFIG_LIBC_LOCALTIME) || defined(CONFIG_TIME_EXTENDED)
-  rtclldbg("  tm_wday: %08x\n", tp->tm_wday);
-  rtclldbg("  tm_yday: %08x\n", tp->tm_yday);
-  rtclldbg(" tm_isdst: %08x\n", tp->tm_isdst);
+  rtcllerr("  tm_wday: %08x\n", tp->tm_wday);
+  rtcllerr("  tm_yday: %08x\n", tp->tm_yday);
+  rtcllerr(" tm_isdst: %08x\n", tp->tm_isdst);
 #endif
 }
 #else
diff --git a/drivers/timers/timer.c b/drivers/timers/timer.c
index 2a976cc22c..ead1d4d905 100644
--- a/drivers/timers/timer.c
+++ b/drivers/timers/timer.c
@@ -66,12 +66,12 @@
 #ifdef CONFIG_DEBUG_TIMER
 #  define tmrdbg    dbg
 #  define tmrinfo   info
-#  define tmrlldbg  lldbg
+#  define tmrllerr  llerr
 #  define tmrllinfo llinfo
 #else
 #  define tmrdbg(x...)
 #  define tmrinfo(x...)
-#  define tmrlldbg(x...)
+#  define tmrllerr(x...)
 #  define tmrllinfo(x...)
 #endif
 
diff --git a/drivers/timers/watchdog.c b/drivers/timers/watchdog.c
index b538d1c55b..3f73efd2fe 100644
--- a/drivers/timers/watchdog.c
+++ b/drivers/timers/watchdog.c
@@ -65,12 +65,12 @@
 #ifdef CONFIG_DEBUG_WATCHDOG
 #  define wddbg    dbg
 #  define wdinfo   info
-#  define wdlldbg  lldbg
+#  define wdllerr  llerr
 #  define wdllinfo llinfo
 #else
 #  define wddbg(x...)
 #  define wdinfo(x...)
-#  define wdlldbg(x...)
+#  define wdllerr(x...)
 #  define wdllinfo(x...)
 #endif
 
diff --git a/drivers/usbhost/usbhost_hidkbd.c b/drivers/usbhost/usbhost_hidkbd.c
index 5df339962d..5d2a54e48a 100644
--- a/drivers/usbhost/usbhost_hidkbd.c
+++ b/drivers/usbhost/usbhost_hidkbd.c
@@ -178,8 +178,8 @@
 #ifndef CONFIG_DEBUG_INPUT
 #  undef  idbg
 #  define idbg    udbg
-#  undef  illdbg
-#  define illdbg  ulldbg
+#  undef  illerr
+#  define illerr  ullerr
 #  undef  iinfo
 #  define iinfo   uinfo
 #  undef  illinfo
@@ -1524,7 +1524,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
 
   if ((found & USBHOST_RQDFOUND) != USBHOST_RQDFOUND)
     {
-      ulldbg("ERROR: Found IF:%s EPIN:%s\n",
+      ullerr("ERROR: Found IF:%s EPIN:%s\n",
              (found & USBHOST_IFFOUND) != 0  ? "YES" : "NO",
              (found & USBHOST_EPINFOUND) != 0 ? "YES" : "NO");
       return -EINVAL;
diff --git a/drivers/usbhost/usbhost_hidmouse.c b/drivers/usbhost/usbhost_hidmouse.c
index b655ee689b..86536dba22 100644
--- a/drivers/usbhost/usbhost_hidmouse.c
+++ b/drivers/usbhost/usbhost_hidmouse.c
@@ -199,8 +199,8 @@
 #ifndef CONFIG_DEBUG_INPUT
 #  undef  idbg
 #  define idbg    udbg
-#  undef  illdbg
-#  define illdbg  ulldbg
+#  undef  illerr
+#  define illerr  ullerr
 #  undef  iinfo
 #  define iinfo   uinfo
 #  undef  illinfo
@@ -1613,7 +1613,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
 
   if ((found & USBHOST_ALLFOUND) != USBHOST_ALLFOUND)
     {
-      ulldbg("ERROR: Found IF:%s EPIN:%s\n",
+      ullerr("ERROR: Found IF:%s EPIN:%s\n",
              (found & USBHOST_IFFOUND) != 0  ? "YES" : "NO",
              (found & USBHOST_EPINFOUND) != 0 ? "YES" : "NO");
       return -EINVAL;
diff --git a/drivers/usbhost/usbhost_hub.c b/drivers/usbhost/usbhost_hub.c
index bc6ce5dac0..4bec1b4973 100644
--- a/drivers/usbhost/usbhost_hub.c
+++ b/drivers/usbhost/usbhost_hub.c
@@ -463,7 +463,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_class_s *hubclass,
 
   if (found != USBHOST_ALLFOUND)
     {
-      ulldbg("ERROR: Found IF=%s EPIN=%s\n",
+      ullerr("ERROR: Found IF=%s EPIN=%s\n",
              (found & USBHOST_IFFOUND) != 0  ? "YES" : "NO",
              (found & USBHOST_EPINFOUND) != 0 ? "YES" : "NO");
       return -EINVAL;
@@ -1190,7 +1190,7 @@ static void usbhost_callback(FAR void *arg, ssize_t nbytes)
       if (nbytes != -EAGAIN)
 #endif
         {
-          ulldbg("ERROR: Transfer failed: %d\n", (int)nbytes);
+          ullerr("ERROR: Transfer failed: %d\n", (int)nbytes);
         }
 
       /* Indicate there there is nothing to do.  So when the work is
diff --git a/drivers/usbhost/usbhost_skeleton.c b/drivers/usbhost/usbhost_skeleton.c
index a4250031aa..ae03f341af 100644
--- a/drivers/usbhost/usbhost_skeleton.c
+++ b/drivers/usbhost/usbhost_skeleton.c
@@ -576,7 +576,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
 
   if (found != USBHOST_ALLFOUND)
     {
-      ulldbg("ERROR: Found IF:%s BIN:%s BOUT:%s\n",
+      ullerr("ERROR: Found IF:%s BIN:%s BOUT:%s\n",
              (found & USBHOST_IFFOUND) != 0  ? "YES" : "NO",
              (found & USBHOST_BINFOUND) != 0 ? "YES" : "NO",
              (found & USBHOST_BOUTFOUND) != 0 ? "YES" : "NO");
diff --git a/drivers/usbhost/usbhost_storage.c b/drivers/usbhost/usbhost_storage.c
index e3f6a8769a..e8075c77a6 100644
--- a/drivers/usbhost/usbhost_storage.c
+++ b/drivers/usbhost/usbhost_storage.c
@@ -1161,7 +1161,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
 
   if (found != USBHOST_ALLFOUND)
     {
-      ulldbg("ERROR: Found IF:%s BIN:%s BOUT:%s\n",
+      ullerr("ERROR: Found IF:%s BIN:%s BOUT:%s\n",
              (found & USBHOST_IFFOUND) != 0  ? "YES" : "NO",
              (found & USBHOST_BINFOUND) != 0 ? "YES" : "NO",
              (found & USBHOST_BOUTFOUND) != 0 ? "YES" : "NO");
diff --git a/drivers/wireless/cc3000/cc3000.c b/drivers/wireless/cc3000/cc3000.c
index 12413070df..dd7cc44bd0 100644
--- a/drivers/wireless/cc3000/cc3000.c
+++ b/drivers/wireless/cc3000/cc3000.c
@@ -124,7 +124,7 @@ CCASSERT(sizeof(cc3000_buffer_desc) <= CONFIG_MQ_MAXMSGSIZE);
 #  define PROBE(pin,state)
 #endif
 
-#define waitlldbg(x,...)
+#define waitllerr(x,...)
 
 /****************************************************************************
  * Private Types
@@ -500,7 +500,7 @@ static void * select_thread_func(FAR void *arg)
               if (priv->sockets[s].sd == CLOSE_SLOT)
                 {
                   priv->sockets[s].sd = FREE_SLOT;
-                  waitlldbg("Close\n");
+                  waitllerr("Close\n");
                   int count;
                   do
                     {
@@ -509,7 +509,7 @@ static void * select_thread_func(FAR void *arg)
                         {
                           /* Release the waiting threads */
 
-                          waitlldbg("Closed Signaled %d\n", count);
+                          waitllerr("Closed Signaled %d\n", count);
                           sem_post(&priv->sockets[s].semwait);
                         }
                     }
@@ -556,17 +556,17 @@ static void * select_thread_func(FAR void *arg)
             {
               if (ret > 0 && CC3000_FD_ISSET(priv->sockets[s].sd, &readsds)) /* and has pending data */
                 {
-                  waitlldbg("Signaled %d\n", priv->sockets[s].sd);
+                  waitllerr("Signaled %d\n", priv->sockets[s].sd);
                   sem_post(&priv->sockets[s].semwait);                       /* release the waiting thread */
                 }
               else if (ret > 0 && CC3000_FD_ISSET(priv->sockets[s].sd, &exceptsds)) /* or has pending exception */
                 {
-                  waitlldbg("Signaled %d (exception)\n", priv->sockets[s].sd);
+                  waitllerr("Signaled %d (exception)\n", priv->sockets[s].sd);
                   sem_post(&priv->sockets[s].semwait);                       /* release the waiting thread */
                 }
               else if (priv->sockets[s].received_closed_event)               /* or remote has closed connection and we have now read all of HW buffer. */
                 {
-                  waitlldbg("Signaled %d (closed & empty)\n", priv->sockets[s].sd);
+                  waitllerr("Signaled %d (closed & empty)\n", priv->sockets[s].sd);
                   priv->sockets[s].emptied_and_remotely_closed = true;
                   sem_post(&priv->sockets[s].semwait);                       /* release the waiting thread */
                 }
diff --git a/drivers/wireless/cc3000/cc3000drv.c b/drivers/wireless/cc3000/cc3000drv.c
index d56e66af8a..3b5cac58d5 100644
--- a/drivers/wireless/cc3000/cc3000drv.c
+++ b/drivers/wireless/cc3000/cc3000drv.c
@@ -65,9 +65,9 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  lldbg
+#  define spidbg  llerr
 #  ifdef SPI_VERBOSE
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
@@ -223,7 +223,7 @@ static void *unsoliced_thread_func(void *parameter)
                           sizeof(spiconf.rx_buffer), 0);
       if (nbytes > 0)
         {
-          nlldbg("%d Processed\n", nbytes);
+          nllerr("%d Processed\n", nbytes);
           spiconf.pfRxHandler(spiconf.rx_buffer.pbuffer);
         }
     }
diff --git a/drivers/wireless/cc3000/socket.c b/drivers/wireless/cc3000/socket.c
index 9653d06ed7..a44b9b0bdb 100644
--- a/drivers/wireless/cc3000/socket.c
+++ b/drivers/wireless/cc3000/socket.c
@@ -62,7 +62,7 @@
 #  define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 #endif
 
-#define waitlldbg(x,...) // lldbg
+#define waitllerr(x,...) // llerr
 
 /****************************************************************************
  * Private Types
@@ -194,13 +194,13 @@ int cc3000_closesocket(int sockfd)
   int ret;
 
 #ifdef CONFIG_CC3000_MT
-  waitlldbg("remove\n");
+  waitllerr("remove\n");
   cc3000_remove_socket(sockfd);
 #endif
   cc3000_lib_lock();
-  waitlldbg("Call closesocketl\n");
+  waitllerr("Call closesocketl\n");
   ret = cc3000_closesocket_impl(sockfd);
-  waitlldbg("return closesocket\n");
+  waitllerr("return closesocket\n");
   cc3000_lib_unlock();
   return ret;
 }
@@ -596,9 +596,9 @@ ssize_t cc3000_recv(int sockfd, FAR void *buf, size_t len, int flags)
   ssize_t ret;
 
 #ifdef CONFIG_CC3000_MT
-  waitlldbg("wait\n");
+  waitllerr("wait\n");
   ret = cc3000_wait_data(sockfd);
-  waitlldbg("wait %d\n", ret);
+  waitllerr("wait %d\n", ret);
 
   if (ret == -ECONNABORTED)
     {
@@ -612,9 +612,9 @@ ssize_t cc3000_recv(int sockfd, FAR void *buf, size_t len, int flags)
 #endif
 
   cc3000_lib_lock();
-  waitlldbg("recv\n");
+  waitllerr("recv\n");
   ret = cc3000_recv_impl(sockfd, buf, len, flags);
-  waitlldbg("recv %d\n", ret);
+  waitllerr("recv %d\n", ret);
   cc3000_lib_unlock();
   return ret;
 }
diff --git a/drivers/wireless/ieee802154/mrf24j40.c b/drivers/wireless/ieee802154/mrf24j40.c
index fa7cfd815d..35a7ecbbe8 100644
--- a/drivers/wireless/ieee802154/mrf24j40.c
+++ b/drivers/wireless/ieee802154/mrf24j40.c
@@ -779,7 +779,7 @@ static int mrf24j40_settxpower(FAR struct ieee802154_dev_s *ieee,
       return -EINVAL;
     }
 
-  lldbg("remaining attenuation: %d mBm\n",txpwr);
+  llerr("remaining attenuation: %d mBm\n",txpwr);
 
   switch(txpwr/100)
     {
diff --git a/graphics/vnc/server/vnc_server.h b/graphics/vnc/server/vnc_server.h
index 07863fbf5b..182e7d038b 100644
--- a/graphics/vnc/server/vnc_server.h
+++ b/graphics/vnc/server/vnc_server.h
@@ -187,24 +187,24 @@
 #ifdef CONFIG_VNCSERVER_UPDATE_DEBUG
 #  ifdef CONFIG_CPP_HAVE_VARARGS
 #    define upddbg(format, ...)    dbg(format, ##__VA_ARGS__)
-#    define updlldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
+#    define updllerr(format, ...)  llerr(format, ##__VA_ARGS__)
 #    define updinfo(format, ...)   info(format, ##__VA_ARGS__)
 #    define updllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #  else
 #   define upddbg                  dbg
-#   define updlldbg                lldbg
+#   define updllerr                llerr
 #   define updinfo                 info
 #   define updllinfo               llinfo
 #  endif
 #else
 #  ifdef CONFIG_CPP_HAVE_VARARGS
 #    define upddbg(x...)
-#    define updlldbg(x...)
+#    define updllerr(x...)
 #    define updinfo(x...)
 #    define updllinfo(x...)
 #  else
 #    define upddbg                 (void)
-#    define updlldbg               (void)
+#    define updllerr               (void)
 #    define updinfo                (void)
 #    define updllinfo              (void)
 #  endif
diff --git a/include/debug.h b/include/debug.h
index b2810cdc56..bc825b35af 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -101,7 +101,7 @@
  *    conditions that are potential errors (or perhaps real errors with non-
  *    fatal consequences).
  *
- * [a-z]lldbg() -- Identical to [a-z]llinfo() except that it also requires that
+ * [a-z]llerr() -- Identical to [a-z]llinfo() except that it also requires that
  *    CONFIG_DEBUG_FEATURES be defined. This is intended for important error-related
  *    information that you probably not want to suppress during normal debug
  *    general debugging.
@@ -137,15 +137,15 @@
    __arch_syslog(LOG_ERR, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
 
 # ifdef CONFIG_ARCH_LOWPUTC
-#  define lldbg(format, ...) \
+#  define llerr(format, ...) \
    __arch_lowsyslog(LOG_ERR, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
 # else
-#  define lldbg(x...)
+#  define llerr(x...)
 # endif
 #else /* CONFIG_DEBUG_FEATURES */
 
 #  define dbg(x...)
-#  define lldbg(x...)
+#  define llerr(x...)
 #endif
 
 #ifdef CONFIG_DEBUG_WARN
@@ -182,14 +182,14 @@
 
 #ifdef CONFIG_DEBUG_MM
 #  define mdbg(format, ...)    dbg(format, ##__VA_ARGS__)
-#  define mlldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
+#  define mllerr(format, ...)  llerr(format, ##__VA_ARGS__)
 #  define mwarn(format, ...)   warn(format, ##__VA_ARGS__)
 #  define mllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
 #  define minfo(format, ...)   info(format, ##__VA_ARGS__)
 #  define mllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 #  define mdbg(x...)
-#  define mlldbg(x...)
+#  define mllerr(x...)
 #  define mwarn(x...)
 #  define mllwarn(x...)
 #  define minfo(x...)
@@ -198,14 +198,14 @@
 
 #ifdef CONFIG_DEBUG_SCHED
 #  define sdbg(format, ...)    dbg(format, ##__VA_ARGS__)
-#  define slldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
+#  define sllerr(format, ...)  llerr(format, ##__VA_ARGS__)
 #  define swarn(format, ...)   warn(format, ##__VA_ARGS__)
 #  define sllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
 #  define sinfo(format, ...)   info(format, ##__VA_ARGS__)
 #  define sllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 #  define sdbg(x...)
-#  define slldbg(x...)
+#  define sllerr(x...)
 #  define swarn(x...)
 #  define sllwarn(x...)
 #  define sinfo(x...)
@@ -214,14 +214,14 @@
 
 #ifdef CONFIG_DEBUG_PAGING
 #  define pgdbg(format, ...)    dbg(format, ##__VA_ARGS__)
-#  define pglldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
+#  define pgllerr(format, ...)  llerr(format, ##__VA_ARGS__)
 #  define pgwarn(format, ...)   warn(format, ##__VA_ARGS__)
 #  define pgllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
 #  define pginfo(format, ...)   info(format, ##__VA_ARGS__)
 #  define pgllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 #  define pgdbg(x...)
-#  define pglldbg(x...)
+#  define pgllerr(x...)
 #  define pgwarn(x...)
 #  define pgllwarn(x...)
 #  define pginfo(x...)
@@ -230,14 +230,14 @@
 
 #ifdef CONFIG_DEBUG_DMA
 #  define dmadbg(format, ...)    dbg(format, ##__VA_ARGS__)
-#  define dmalldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
+#  define dmallerr(format, ...)  llerr(format, ##__VA_ARGS__)
 #  define dmawarn(format, ...)   warn(format, ##__VA_ARGS__)
 #  define dmallwarn(format, ...) llwarn(format, ##__VA_ARGS__)
 #  define dmainfo(format, ...)   info(format, ##__VA_ARGS__)
 #  define dmallinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 #  define dmadbg(x...)
-#  define dmalldbg(x...)
+#  define dmallerr(x...)
 #  define dmawarn(x...)
 #  define dmallwarn(x...)
 #  define dmainfo(x...)
@@ -246,14 +246,14 @@
 
 #ifdef CONFIG_DEBUG_NET
 #  define ndbg(format, ...)    dbg(format, ##__VA_ARGS__)
-#  define nlldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
+#  define nllerr(format, ...)  llerr(format, ##__VA_ARGS__)
 #  define nwarn(format, ...)   warn(format, ##__VA_ARGS__)
 #  define nllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
 #  define ninfo(format, ...)   info(format, ##__VA_ARGS__)
 #  define nllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 #  define ndbg(x...)
-#  define nlldbg(x...)
+#  define nllerr(x...)
 #  define nwarn(x...)
 #  define nllwarn(x...)
 #  define ninfo(x...)
@@ -262,14 +262,14 @@
 
 #ifdef CONFIG_DEBUG_USB
 #  define udbg(format, ...)    dbg(format, ##__VA_ARGS__)
-#  define ulldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
+#  define ullerr(format, ...)  llerr(format, ##__VA_ARGS__)
 #  define uwarn(format, ...)   warn(format, ##__VA_ARGS__)
 #  define ullwarn(format, ...) llwarn(format, ##__VA_ARGS__)
 #  define uinfo(format, ...)   info(format, ##__VA_ARGS__)
 #  define ullinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 #  define udbg(x...)
-#  define ulldbg(x...)
+#  define ullerr(x...)
 #  define uwarn(x...)
 #  define ullwarn(x...)
 #  define uinfo(x...)
@@ -278,14 +278,14 @@
 
 #ifdef CONFIG_DEBUG_FS
 #  define fdbg(format, ...)    dbg(format, ##__VA_ARGS__)
-#  define flldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
+#  define fllerr(format, ...)  llerr(format, ##__VA_ARGS__)
 #  define fwarn(format, ...)   warn(format, ##__VA_ARGS__)
 #  define fllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
 #  define finfo(format, ...)   info(format, ##__VA_ARGS__)
 #  define fllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 #  define fdbg(x...)
-#  define flldbg(x...)
+#  define fllerr(x...)
 #  define fwarn(x...)
 #  define fllwarn(x...)
 #  define finfo(x...)
@@ -294,14 +294,14 @@
 
 #ifdef CONFIG_DEBUG_CRYPTO
 #  define cryptdbg(format, ...)    dbg(format, ##__VA_ARGS__)
-#  define cryptlldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
+#  define cryptllerr(format, ...)  llerr(format, ##__VA_ARGS__)
 #  define cryptwarn(format, ...)   warn(format, ##__VA_ARGS__)
 #  define cryptllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
 #  define cryptinfo(format, ...)   info(format, ##__VA_ARGS__)
 #  define cryptllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 #  define cryptdbg(x...)
-#  define cryptlldbg(x...)
+#  define cryptllerr(x...)
 #  define cryptwarn(x...)
 #  define cryptllwarn(x...)
 #  define cryptinfo(x...)
@@ -310,14 +310,14 @@
 
 #ifdef CONFIG_DEBUG_INPUT
 #  define idbg(format, ...)    dbg(format, ##__VA_ARGS__)
-#  define illdbg(format, ...)  lldbg(format, ##__VA_ARGS__)
+#  define illerr(format, ...)  llerr(format, ##__VA_ARGS__)
 #  define iwarn(format, ...)   warn(format, ##__VA_ARGS__)
 #  define illwarn(format, ...) llwarn(format, ##__VA_ARGS__)
 #  define iinfo(format, ...)   info(format, ##__VA_ARGS__)
 #  define illinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 #  define idbg(x...)
-#  define illdbg(x...)
+#  define illerr(x...)
 #  define iwarn(x...)
 #  define illwarn(x...)
 #  define iinfo(x...)
@@ -326,14 +326,14 @@
 
 #ifdef CONFIG_DEBUG_SENSORS
 #  define sndbg(format, ...)    dbg(format, ##__VA_ARGS__)
-#  define snlldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
+#  define snllerr(format, ...)  llerr(format, ##__VA_ARGS__)
 #  define snwarn(format, ...)   warn(format, ##__VA_ARGS__)
 #  define snllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
 #  define sninfo(format, ...)   info(format, ##__VA_ARGS__)
 #  define snllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 #  define sndbg(x...)
-#  define snlldbg(x...)
+#  define snllerr(x...)
 #  define snwarn(x...)
 #  define snllwarn(x...)
 #  define sninfo(x...)
@@ -342,14 +342,14 @@
 
 #ifdef CONFIG_DEBUG_ANALOG
 #  define adbg(format, ...)    dbg(format, ##__VA_ARGS__)
-#  define alldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
+#  define allerr(format, ...)  llerr(format, ##__VA_ARGS__)
 #  define awarn(format, ...)   warn(format, ##__VA_ARGS__)
 #  define allwarn(format, ...) llwarn(format, ##__VA_ARGS__)
 #  define ainfo(format, ...)   info(format, ##__VA_ARGS__)
 #  define allinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 #  define adbg(x...)
-#  define alldbg(x...)
+#  define allerr(x...)
 #  define awarn(x...)
 #  define allwarn(x...)
 #  define ainfo(x...)
@@ -358,14 +358,14 @@
 
 #ifdef CONFIG_DEBUG_GRAPHICS
 #  define gdbg(format, ...)    dbg(format, ##__VA_ARGS__)
-#  define glldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
+#  define gllerr(format, ...)  llerr(format, ##__VA_ARGS__)
 #  define gwarn(format, ...)   warn(format, ##__VA_ARGS__)
 #  define gllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
 #  define ginfo(format, ...)   info(format, ##__VA_ARGS__)
 #  define gllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 #  define gdbg(x...)
-#  define glldbg(x...)
+#  define gllerr(x...)
 #  define gwarn(x...)
 #  define gllwarn(x...)
 #  define ginfo(x...)
@@ -374,14 +374,14 @@
 
 #ifdef CONFIG_DEBUG_BINFMT
 #  define bdbg(format, ...)    dbg(format, ##__VA_ARGS__)
-#  define blldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
+#  define bllerr(format, ...)  llerr(format, ##__VA_ARGS__)
 #  define bwarn(format, ...)   warn(format, ##__VA_ARGS__)
 #  define bllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
 #  define binfo(format, ...)   info(format, ##__VA_ARGS__)
 #  define bllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 #  define bdbg(x...)
-#  define blldbg(x...)
+#  define bllerr(x...)
 #  define bwarn(x...)
 #  define bllwarn(x...)
 #  define binfo(x...)
@@ -390,14 +390,14 @@
 
 #ifdef CONFIG_DEBUG_LIB
 #  define ldbg(format, ...)    dbg(format, ##__VA_ARGS__)
-#  define llldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
+#  define lllerr(format, ...)  llerr(format, ##__VA_ARGS__)
 #  define lwarn(format, ...)   warn(format, ##__VA_ARGS__)
 #  define lllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
 #  define linfo(format, ...)   info(format, ##__VA_ARGS__)
 #  define lllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 #  define ldbg(x...)
-#  define llldbg(x...)
+#  define lllerr(x...)
 #  define lwarn(x...)
 #  define lllwarn(x...)
 #  define linfo(x...)
@@ -406,14 +406,14 @@
 
 #ifdef CONFIG_DEBUG_AUDIO
 #  define auddbg(format, ...)    dbg(format, ##__VA_ARGS__)
-#  define audlldbg(format, ...)  lldbg(format, ##__VA_ARGS__)
+#  define audllerr(format, ...)  llerr(format, ##__VA_ARGS__)
 #  define audwarn(format, ...)   warn(format, ##__VA_ARGS__)
 #  define audllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
 #  define audinfo(format, ...)   info(format, ##__VA_ARGS__)
 #  define audllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 #  define auddbg(x...)
-#  define audlldbg(x...)
+#  define audllerr(x...)
 #  define audwarn(x...)
 #  define audllwarn(x...)
 #  define audinfo(x...)
@@ -426,11 +426,11 @@
 
 #ifdef CONFIG_DEBUG_FEATURES
 #  ifndef CONFIG_ARCH_LOWPUTC
-#    define lldbg     (void)
+#    define llerr     (void)
 #  endif
 #else
 #  define dbg         (void)
-#  define lldbg       (void)
+#  define llerr       (void)
 #endif
 
 #ifdef CONFIG_DEBUG_WARN
@@ -455,14 +455,14 @@
 
 #ifdef CONFIG_DEBUG_MM
 #  define mdbg        dbg
-#  define mlldbg      lldbg
+#  define mllerr      llerr
 #  define mwarn       warn
 #  define mllwarn     llwarn
 #  define minfo       info
 #  define mllinfo     llinfo
 #else
 #  define mdbg        (void)
-#  define mlldbg      (void)
+#  define mllerr      (void)
 #  define mwarn       (void)
 #  define mllwarn     (void)
 #  define minfo       (void)
@@ -471,14 +471,14 @@
 
 #ifdef CONFIG_DEBUG_SCHED
 #  define sdbg        dbg
-#  define slldbg      lldbg
+#  define sllerr      llerr
 #  define swarn       warn
 #  define sllwarn     llwarn
 #  define sinfo       info
 #  define sllinfo     llinfo
 #else
 #  define sdbg        (void)
-#  define slldbg      (void)
+#  define sllerr      (void)
 #  define swarn       (void)
 #  define sllwarn     (void)
 #  define sinfo       (void)
@@ -487,14 +487,14 @@
 
 #ifdef CONFIG_DEBUG_PAGING
 #  define pgdbg       dbg
-#  define pglldbg     lldbg
+#  define pgllerr     llerr
 #  define pgwarn      warn
 #  define pgllwarn    llwarn
 #  define pginfo      info
 #  define pgllinfo    llinfo
 #else
 #  define pgdbg       (void)
-#  define pglldbg     (void)
+#  define pgllerr     (void)
 #  define pgwarn      (void)
 #  define pgllwarn    (void)
 #  define pginfo      (void)
@@ -503,14 +503,14 @@
 
 #ifdef CONFIG_DEBUG_DMA
 #  define dmadbg      dbg
-#  define dmalldbg    lldbg
+#  define dmallerr    llerr
 #  define dmawarn     warn
 #  define dmallwarn   llwarn
 #  define dmainfo     info
 #  define dmallinfo   llinfo
 #else
 #  define dmadbg      (void)
-#  define dmalldbg    (void)
+#  define dmallerr    (void)
 #  define dmawarn     (void)
 #  define dmallwarn   (void)
 #  define dmainfo     (void)
@@ -519,14 +519,14 @@
 
 #ifdef CONFIG_DEBUG_NET
 #  define ndbg        dbg
-#  define nlldbg      lldbg
+#  define nllerr      llerr
 #  define nwarn       warn
 #  define nllwarn     llwarn
 #  define ninfo       info
 #  define nllinfo     llinfo
 #else
 #  define ndbg        (void)
-#  define nlldbg      (void)
+#  define nllerr      (void)
 #  define nwarn       (void)
 #  define nllwarn     (void)
 #  define ninfo       (void)
@@ -535,14 +535,14 @@
 
 #ifdef CONFIG_DEBUG_USB
 #  define udbg        dbg
-#  define ulldbg      lldbg
+#  define ullerr      llerr
 #  define uwarn       warn
 #  define ullwarn     llwarn
 #  define uinfo       info
 #  define ullinfo     llinfo
 #else
 #  define udbg        (void)
-#  define ulldbg      (void)
+#  define ullerr      (void)
 #  define uwarn       (void)
 #  define ullwarn     (void)
 #  define uinfo       (void)
@@ -551,14 +551,14 @@
 
 #ifdef CONFIG_DEBUG_FS
 #  define fdbg        dbg
-#  define flldbg      lldbg
+#  define fllerr      llerr
 #  define fwarn       warn
 #  define fllwarn     llwarn
 #  define finfo       info
 #  define fllinfo     llinfo
 #else
 #  define fdbg        (void)
-#  define flldbg      (void)
+#  define fllerr      (void)
 #  define fwarn       (void)
 #  define fllwarn     (void)
 #  define finfo       (void)
@@ -567,14 +567,14 @@
 
 #ifdef CONFIG_DEBUG_CRYPTO
 #  define cryptdbg    dbg
-#  define cryptlldbg  lldbg
+#  define cryptllerr  llerr
 #  define cryptwarn   warn
 #  define cryptllwarn llwarn
 #  define cryptinfo   info
 #  define cryptllinfo llinfo
 #else
 #  define cryptdbg    (void)
-#  define cryptlldbg  (void)
+#  define cryptllerr  (void)
 #  define cryptwarn   (void)
 #  define cryptllwarn (void)
 #  define cryptinfo   (void)
@@ -583,14 +583,14 @@
 
 #ifdef CONFIG_DEBUG_INPUT
 #  define idbg        dbg
-#  define illdbg      lldbg
+#  define illerr      llerr
 #  define iwarn       warn
 #  define illwarn     llwarn
 #  define iinfo       info
 #  define illinfo     llinfo
 #else
 #  define idbg        (void)
-#  define illdbg      (void)
+#  define illerr      (void)
 #  define iwarn       (void)
 #  define illwarn     (void)
 #  define iinfo       (void)
@@ -599,14 +599,14 @@
 
 #ifdef CONFIG_DEBUG_SENSORS
 #  define sndbg       dbg
-#  define snlldbg     lldbg
+#  define snllerr     llerr
 #  define snwarn      warn
 #  define snllwarn    llwarn
 #  define sninfo      info
 #  define snllinfo    llinfo
 #else
 #  define sndbg       (void)
-#  define snlldbg     (void)
+#  define snllerr     (void)
 #  define snwarn      (void)
 #  define snllwarn    (void)
 #  define sninfo      (void)
@@ -615,14 +615,14 @@
 
 #ifdef CONFIG_DEBUG_ANALOG
 #  define adbg        dbg
-#  define alldbg      lldbg
+#  define allerr      llerr
 #  define awarn       warn
 #  define allwarn     llwarn
 #  define ainfo       info
 #  define allinfo     llinfo
 #else
 #  define adbg        (void)
-#  define alldbg      (void)
+#  define allerr      (void)
 #  define awarn       (void)
 #  define allwarn     (void)
 #  define ainfo       (void)
@@ -631,14 +631,14 @@
 
 #ifdef CONFIG_DEBUG_GRAPHICS
 #  define gdbg        dbg
-#  define glldbg      lldbg
+#  define gllerr      llerr
 #  define gwarn       warn
 #  define gllwarn     llwarn
 #  define ginfo       info
 #  define gllinfo     llinfo
 #else
 #  define gdbg        (void)
-#  define glldbg      (void)
+#  define gllerr      (void)
 #  define gwarn       (void)
 #  define gllwarn     (void)
 #  define ginfo       (void)
@@ -647,14 +647,14 @@
 
 #ifdef CONFIG_DEBUG_BINFMT
 #  define bdbg        dbg
-#  define blldbg      lldbg
+#  define bllerr      llerr
 #  define bwarn       warn
 #  define bllwarn     llwarn
 #  define binfo       info
 #  define bllinfo     llinfo
 #else
 #  define bdbg        (void)
-#  define blldbg      (void)
+#  define bllerr      (void)
 #  define bwarn       (void)
 #  define bllwarn     (void)
 #  define binfo       (void)
@@ -663,14 +663,14 @@
 
 #ifdef CONFIG_DEBUG_LIB
 #  define ldbg        dbg
-#  define llldbg      lldbg
+#  define lllerr      llerr
 #  define lwarn       warn
 #  define lllwarn     llwarn
 #  define linfo       info
 #  define lllinfo     llinfo
 #else
 #  define ldbg        (void)
-#  define llldbg      (void)
+#  define lllerr      (void)
 #  define lwarn       (void)
 #  define lllwarn     (void)
 #  define linfo       (void)
@@ -679,14 +679,14 @@
 
 #ifdef CONFIG_DEBUG_AUDIO
 #  define auddbg      dbg
-#  define audlldbg    lldbg
+#  define audllerr    llerr
 #  define audwarn     warn
 #  define audllwarn   llwarn
 #  define audinfo     info
 #  define audllinfo   llinfo
 #else
 #  define auddbg      (void)
-#  define audlldbg    (void)
+#  define audllerr    (void)
 #  define audwarn     (void)
 #  define audllwarn   (void)
 #  define audinfo     (void)
@@ -843,7 +843,7 @@ void lib_dumpbuffer(FAR const char *msg, FAR const uint8_t *buffer,
 int dbg(const char *format, ...);
 
 # ifdef CONFIG_ARCH_LOWPUTC
-int lldbg(const char *format, ...);
+int llerr(const char *format, ...);
 # endif
 #endif /* CONFIG_DEBUG_FEATURES */
 
diff --git a/include/nuttx/spi/spi_bitbang.c b/include/nuttx/spi/spi_bitbang.c
index 0c5f852376..5876d3d8ce 100644
--- a/include/nuttx/spi/spi_bitbang.c
+++ b/include/nuttx/spi/spi_bitbang.c
@@ -75,9 +75,9 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg lldbg
+#  define spidbg llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/include/nuttx/spi/spi_bitbang.h b/include/nuttx/spi/spi_bitbang.h
index 8debf10211..33571b1bf2 100644
--- a/include/nuttx/spi/spi_bitbang.h
+++ b/include/nuttx/spi/spi_bitbang.h
@@ -62,9 +62,9 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg lldbg
+#  define spidbg llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo lldbg
+#    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
diff --git a/include/nuttx/wireless/nrf24l01.h b/include/nuttx/wireless/nrf24l01.h
index 32dc20db02..94f7f8383b 100644
--- a/include/nuttx/wireless/nrf24l01.h
+++ b/include/nuttx/wireless/nrf24l01.h
@@ -92,12 +92,12 @@
 
 #ifdef NRF24L01_DEBUG
 # define wdbg(format, ...)           dbg(format, ##__VA_ARGS__)
-# define wlldbg(format, ...)         lldbg(format, ##__VA_ARGS__)
+# define wllerr(format, ...)         llerr(format, ##__VA_ARGS__)
 # define winfo(format, ...)          info(format, ##__VA_ARGS__)
 # define wllinfo(format, ...)        llinfo(format, ##__VA_ARGS__)
 #else
 # define wdbg(x...)
-# define wlldbg(x...)
+# define wllerr(x...)
 # define winfo(x...)
 # define wllinfo(x...)
 #endif
diff --git a/libc/misc/lib_dbg.c b/libc/misc/lib_dbg.c
index 219b1ec79c..d04c719b1a 100644
--- a/libc/misc/lib_dbg.c
+++ b/libc/misc/lib_dbg.c
@@ -51,7 +51,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: dbg, lldbg, info
+ * Name: dbg, llerr, info
  *
  * Description:
  *  If the cross-compiler's pre-processor does not support variable
@@ -73,7 +73,7 @@ int dbg(const char *format, ...)
 }
 
 #ifdef CONFIG_ARCH_LOWPUTC
-int lldbg(const char *format, ...)
+int llerr(const char *format, ...)
 {
   va_list ap;
   int     ret;
diff --git a/mm/mm_heap/mm_initialize.c b/mm/mm_heap/mm_initialize.c
index bd9d4f524a..bb76d76544 100644
--- a/mm/mm_heap/mm_initialize.c
+++ b/mm/mm_heap/mm_initialize.c
@@ -96,7 +96,7 @@ void mm_addregion(FAR struct mm_heap_s *heap, FAR void *heapstart,
   heapend  = MM_ALIGN_DOWN((uintptr_t)heapstart + (uintptr_t)heapsize);
   heapsize = heapend - heapbase;
 
-  mlldbg("Region %d: base=%p size=%u\n", IDX+1, heapstart, heapsize);
+  mllerr("Region %d: base=%p size=%u\n", IDX+1, heapstart, heapsize);
 
   /* Add the size of this region to the total size of the heap */
 
@@ -157,7 +157,7 @@ void mm_initialize(FAR struct mm_heap_s *heap, FAR void *heapstart,
 {
   int i;
 
-  mlldbg("Heap: start=%p size=%u\n", heapstart, heapsize);
+  mllerr("Heap: start=%p size=%u\n", heapstart, heapsize);
 
   /* The following two lines have cause problems for some older ZiLog
    * compilers in the past (but not the more recent).  Life is easier if we
diff --git a/net/arp/arp_arpin.c b/net/arp/arp_arpin.c
index c84f4bfa81..438125f7bd 100644
--- a/net/arp/arp_arpin.c
+++ b/net/arp/arp_arpin.c
@@ -96,7 +96,7 @@ void arp_arpin(FAR struct net_driver_s *dev)
 
   if (dev->d_len < (sizeof(struct arp_hdr_s) + ETH_HDRLEN))
     {
-      nlldbg("Too small\n");
+      nllerr("Too small\n");
       dev->d_len = 0;
       return;
     }
diff --git a/net/arp/arp_dump.c b/net/arp/arp_dump.c
index 50ea5a27e5..ba916db2f2 100644
--- a/net/arp/arp_dump.c
+++ b/net/arp/arp_dump.c
@@ -69,16 +69,16 @@
 
 void arp_dump(FAR struct arp_hdr_s *arp)
 {
-  nlldbg("  HW type: %04x Protocol: %04x\n",
+  nllerr("  HW type: %04x Protocol: %04x\n",
          arp->ah_hwtype, arp->ah_protocol);
-  nlldbg("  HW len: %02x Proto len: %02x Operation: %04x\n",
+  nllerr("  HW len: %02x Proto len: %02x Operation: %04x\n",
          arp->ah_hwlen, arp->ah_protolen, arp->ah_opcode);
-  nlldbg("  Sender MAC: %02x:%02x:%02x:%02x:%02x:%02x IP: %d.%d.%d.%d\n",
+  nllerr("  Sender MAC: %02x:%02x:%02x:%02x:%02x:%02x IP: %d.%d.%d.%d\n",
          arp->ah_shwaddr[0], arp->ah_shwaddr[1], arp->ah_shwaddr[2],
          arp->ah_shwaddr[3], arp->ah_shwaddr[4], arp->ah_shwaddr[5],
          arp->ah_sipaddr[0] & 0xff, arp->ah_sipaddr[0] >> 8,
          arp->ah_sipaddr[1] & 0xff, arp->ah_sipaddr[1] >> 8);
-  nlldbg("  Dest MAC:   %02x:%02x:%02x:%02x:%02x:%02x IP: %d.%d.%d.%d\n",
+  nllerr("  Dest MAC:   %02x:%02x:%02x:%02x:%02x:%02x IP: %d.%d.%d.%d\n",
          arp->ah_dhwaddr[0], arp->ah_dhwaddr[1], arp->ah_dhwaddr[2],
          arp->ah_dhwaddr[3], arp->ah_dhwaddr[4], arp->ah_dhwaddr[5],
          arp->ah_dipaddr[0] & 0xff, arp->ah_dipaddr[0] >> 8,
diff --git a/net/arp/arp_send.c b/net/arp/arp_send.c
index f9ec518d41..1807ed1ee0 100644
--- a/net/arp/arp_send.c
+++ b/net/arp/arp_send.c
@@ -110,7 +110,7 @@ static uint16_t arp_send_interrupt(FAR struct net_driver_s *dev,
 
       if ((flags & NETDEV_DOWN) != 0)
         {
-          nlldbg("ERROR: Interface is down\n");
+          nllerr("ERROR: Interface is down\n");
           arp_send_terminate(state, -ENETUNREACH);
           return flags;
         }
diff --git a/net/devif/devif_callback.c b/net/devif/devif_callback.c
index 6923bd6b1c..2508f2d0f0 100644
--- a/net/devif/devif_callback.c
+++ b/net/devif/devif_callback.c
@@ -260,7 +260,7 @@ FAR struct devif_callback_s *
 #ifdef CONFIG_DEBUG_FEATURES
   else
     {
-      nlldbg("Failed to allocate callback\n");
+      nllerr("Failed to allocate callback\n");
     }
 #endif
 
diff --git a/net/devif/ipv4_input.c b/net/devif/ipv4_input.c
index bd00690833..9b02f2ac3f 100644
--- a/net/devif/ipv4_input.c
+++ b/net/devif/ipv4_input.c
@@ -339,7 +339,7 @@ int ipv4_input(FAR struct net_driver_s *dev)
       g_netstats.ipv4.drop++;
       g_netstats.ipv4.vhlerr++;
 #endif
-      nlldbg("Invalid IP version or header length: %02x\n", pbuf->vhl);
+      nllerr("Invalid IP version or header length: %02x\n", pbuf->vhl);
       goto drop;
     }
 
@@ -348,7 +348,7 @@ int ipv4_input(FAR struct net_driver_s *dev)
   hdrlen = NET_LL_HDRLEN(dev);
   if ((hdrlen + IPv4_HDRLEN) > dev->d_len)
     {
-      nlldbg("Packet shorter than IPv4 header\n");
+      nllerr("Packet shorter than IPv4 header\n");
       goto drop;
     }
 
@@ -368,7 +368,7 @@ int ipv4_input(FAR struct net_driver_s *dev)
     }
   else
     {
-      nlldbg("IP packet shorter than length in IP header\n");
+      nllerr("IP packet shorter than length in IP header\n");
       goto drop;
     }
 
@@ -387,7 +387,7 @@ int ipv4_input(FAR struct net_driver_s *dev)
       g_netstats.ipv4.drop++;
       g_netstats.ipv4.fragerr++;
 #endif
-      nlldbg("IP fragment dropped\n");
+      nllerr("IP fragment dropped\n");
       goto drop;
 #endif /* CONFIG_NET_TCP_REASSEMBLY */
     }
@@ -413,7 +413,7 @@ int ipv4_input(FAR struct net_driver_s *dev)
 #ifdef CONFIG_NET_ICMP
   if (net_ipv4addr_cmp(dev->d_ipaddr, INADDR_ANY))
     {
-      nlldbg("No IP address assigned\n");
+      nllerr("No IP address assigned\n");
       goto drop;
     }
 
@@ -446,7 +446,7 @@ int ipv4_input(FAR struct net_driver_s *dev)
       g_netstats.ipv4.drop++;
       g_netstats.ipv4.chkerr++;
 #endif
-      nlldbg("Bad IP checksum\n");
+      nllerr("Bad IP checksum\n");
       goto drop;
     }
 
@@ -494,7 +494,7 @@ int ipv4_input(FAR struct net_driver_s *dev)
         g_netstats.ipv4.protoerr++;
 #endif
 
-        nlldbg("Unrecognized IP protocol\n");
+        nllerr("Unrecognized IP protocol\n");
         goto drop;
     }
 
diff --git a/net/devif/ipv6_input.c b/net/devif/ipv6_input.c
index dcb2610626..0378b2c270 100644
--- a/net/devif/ipv6_input.c
+++ b/net/devif/ipv6_input.c
@@ -151,7 +151,7 @@ int ipv6_input(FAR struct net_driver_s *dev)
       g_netstats.ipv6.vhlerr++;
 #endif
 
-      nlldbg("ERROR: Invalid IPv6 version: %d\n", ipv6->vtc >> 4);
+      nllerr("ERROR: Invalid IPv6 version: %d\n", ipv6->vtc >> 4);
       goto drop;
     }
 
@@ -160,7 +160,7 @@ int ipv6_input(FAR struct net_driver_s *dev)
   hdrlen = NET_LL_HDRLEN(dev);
   if ((hdrlen + IPv6_HDRLEN) > dev->d_len)
     {
-      nlldbg("Packet shorter than IPv6 header\n");
+      nllerr("Packet shorter than IPv6 header\n");
       goto drop;
     }
 
@@ -187,7 +187,7 @@ int ipv6_input(FAR struct net_driver_s *dev)
     }
   else
     {
-      nlldbg("ERROR: IP packet shorter than length in IP header\n");
+      nllerr("ERROR: IP packet shorter than length in IP header\n");
       goto drop;
     }
 
@@ -216,7 +216,7 @@ int ipv6_input(FAR struct net_driver_s *dev)
        * packets.
        */
 
-      nlldbg("ERROR: No IP address assigned\n");
+      nllerr("ERROR: No IP address assigned\n");
       goto drop;
     }
 
@@ -279,7 +279,7 @@ int ipv6_input(FAR struct net_driver_s *dev)
         g_netstats.ipv6.protoerr++;
 #endif
 
-        nlldbg("ERROR: Unrecognized IP protocol: %04x\n", ipv6->proto);
+        nllerr("ERROR: Unrecognized IP protocol: %04x\n", ipv6->proto);
         goto drop;
     }
 
diff --git a/net/icmp/icmp_input.c b/net/icmp/icmp_input.c
index 36b0e02e55..befda6bf04 100644
--- a/net/icmp/icmp_input.c
+++ b/net/icmp/icmp_input.c
@@ -164,7 +164,7 @@ void icmp_input(FAR struct net_driver_s *dev)
 
   else
     {
-      nlldbg("Unknown ICMP cmd: %d\n", picmp->type);
+      nllerr("Unknown ICMP cmd: %d\n", picmp->type);
       goto typeerr;
     }
 
diff --git a/net/icmp/icmp_ping.c b/net/icmp/icmp_ping.c
index a155d8d2f6..b674ce440d 100644
--- a/net/icmp/icmp_ping.c
+++ b/net/icmp/icmp_ping.c
@@ -162,7 +162,7 @@ static uint16_t ping_interrupt(FAR struct net_driver_s *dev, FAR void *conn,
 
       if ((flags & NETDEV_DOWN) != 0)
         {
-          nlldbg("ERROR: Interface is down\n");
+          nllerr("ERROR: Interface is down\n");
           pstate->png_result = -ENETUNREACH;
           goto end_wait;
         }
@@ -262,12 +262,12 @@ static uint16_t ping_interrupt(FAR struct net_driver_s *dev, FAR void *conn,
                * that the destination address is not reachable.
                */
 
-              nlldbg("Not reachable\n");
+              nllerr("Not reachable\n");
               failcode = -ENETUNREACH;
             }
           else
             {
-              nlldbg("Ping timeout\n");
+              nllerr("Ping timeout\n");
               failcode = -ETIMEDOUT;
             }
 
@@ -416,7 +416,7 @@ int icmp_ping(in_addr_t addr, uint16_t id, uint16_t seqno, uint16_t datalen,
     }
   else
     {
-      nlldbg("Return error=%d\n", -state.png_result);
+      nllerr("Return error=%d\n", -state.png_result);
       return state.png_result;
     }
 }
diff --git a/net/icmpv6/icmpv6_autoconfig.c b/net/icmpv6/icmpv6_autoconfig.c
index d7f7b2fbb7..3465931658 100644
--- a/net/icmpv6/icmpv6_autoconfig.c
+++ b/net/icmpv6/icmpv6_autoconfig.c
@@ -127,7 +127,7 @@ static uint16_t icmpv6_router_interrupt(FAR struct net_driver_s *dev,
 
       if ((flags & NETDEV_DOWN) != 0)
         {
-          nlldbg("ERROR: Interface is down\n");
+          nllerr("ERROR: Interface is down\n");
           icmpv6_router_terminate(state, -ENETUNREACH);
           return flags;
         }
diff --git a/net/icmpv6/icmpv6_input.c b/net/icmpv6/icmpv6_input.c
index 95fdece263..a0ef963589 100644
--- a/net/icmpv6/icmpv6_input.c
+++ b/net/icmpv6/icmpv6_input.c
@@ -307,7 +307,7 @@ void icmpv6_input(FAR struct net_driver_s *dev)
 
     default:
       {
-        nlldbg("Unknown ICMPv6 type: %d\n", icmp->type);
+        nllerr("Unknown ICMPv6 type: %d\n", icmp->type);
         goto icmpv6_type_error;
       }
     }
diff --git a/net/icmpv6/icmpv6_ping.c b/net/icmpv6/icmpv6_ping.c
index 0ed83ec956..9a959a0177 100644
--- a/net/icmpv6/icmpv6_ping.c
+++ b/net/icmpv6/icmpv6_ping.c
@@ -261,7 +261,7 @@ static uint16_t ping_interrupt(FAR struct net_driver_s *dev, FAR void *conn,
 
       if ((flags & NETDEV_DOWN) != 0)
         {
-          nlldbg("ERROR: Interface is down\n");
+          nllerr("ERROR: Interface is down\n");
           pstate->png_result = -ENETUNREACH;
           goto end_wait;
         }
@@ -336,12 +336,12 @@ static uint16_t ping_interrupt(FAR struct net_driver_s *dev, FAR void *conn,
                * reason is that the destination address is not reachable.
                */
 
-              nlldbg("Not reachable\n");
+              nllerr("Not reachable\n");
               failcode = -ENETUNREACH;
             }
           else
             {
-              nlldbg("Ping timeout\n");
+              nllerr("Ping timeout\n");
               failcode = -ETIMEDOUT;
             }
 
@@ -490,7 +490,7 @@ int icmpv6_ping(net_ipv6addr_t addr, uint16_t id, uint16_t seqno,
     }
   else
     {
-      nlldbg("Return error=%d\n", -state.png_result);
+      nllerr("Return error=%d\n", -state.png_result);
       return state.png_result;
     }
 }
diff --git a/net/igmp/igmp_group.c b/net/igmp/igmp_group.c
index b95fe66f7f..9a1af28807 100644
--- a/net/igmp/igmp_group.c
+++ b/net/igmp/igmp_group.c
@@ -89,24 +89,24 @@
 #ifdef CONFIG_CPP_HAVE_VARARGS
 #  ifdef IGMP_GRPDEBUG
 #    define grpdbg(format, ...)    ndbg(format, ##__VA_ARGS__)
-#    define grplldbg(format, ...)  nlldbg(format, ##__VA_ARGS__)
+#    define grpllerr(format, ...)  nllerr(format, ##__VA_ARGS__)
 #    define grpinfo(format, ...)   ninfo(format, ##__VA_ARGS__)
 #    define grpllinfo(format, ...) nllinfo(format, ##__VA_ARGS__)
 #  else
 #    define grpdbg(x...)
-#    define grplldbg(x...)
+#    define grpllerr(x...)
 #    define grpinfo(x...)
 #    define grpllinfo(x...)
 #  endif
 #else
 #  ifdef IGMP_GRPDEBUG
 #    define grpdbg    ndbg
-#    define grplldbg  nlldbg
+#    define grpllerr  nllerr
 #    define grpinfo   ninfo
 #    define grpllinfo nllinfo
 #  else
 #    define grpdbg    (void)
-#    define grplldbg  (void)
+#    define grpllerr  (void)
 #    define grpinfo   (void)
 #    define grpllinfo (void)
 #  endif
@@ -194,7 +194,7 @@ void igmp_grpinit(void)
   FAR struct igmp_group_s *group;
   int i;
 
-  grplldbg("Initializing\n");
+  grpllerr("Initializing\n");
 
 #if CONFIG_PREALLOC_IGMPGROUPS > 0
   for (i = 0; i < CONFIG_PREALLOC_IGMPGROUPS; i++)
@@ -226,20 +226,20 @@ FAR struct igmp_group_s *igmp_grpalloc(FAR struct net_driver_s *dev,
   if (up_interrupt_context())
     {
 #if CONFIG_PREALLOC_IGMPGROUPS > 0
-      grplldbg("Use a pre-allocated group entry\n");
+      grpllerr("Use a pre-allocated group entry\n");
       group = igmp_grpprealloc();
 #else
-      grplldbg("Cannot allocate from interrupt handler\n");
+      grpllerr("Cannot allocate from interrupt handler\n");
       group = NULL;
 #endif
     }
   else
     {
-      grplldbg("Allocate from the heap\n");
+      grpllerr("Allocate from the heap\n");
       group = igmp_grpheapalloc();
     }
 
-  grplldbg("group: %p\n", group);
+  grpllerr("group: %p\n", group);
 
   /* Check if we successfully allocated a group structure */
 
@@ -285,7 +285,7 @@ FAR struct igmp_group_s *igmp_grpfind(FAR struct net_driver_s *dev,
   FAR struct igmp_group_s *group;
   net_lock_t flags;
 
-  grplldbg("Searching for addr %08x\n", (int)*addr);
+  grpllerr("Searching for addr %08x\n", (int)*addr);
 
   /* We must disable interrupts because we don't which context we were
    * called from.
@@ -296,10 +296,10 @@ FAR struct igmp_group_s *igmp_grpfind(FAR struct net_driver_s *dev,
        group;
        group = group->next)
     {
-      grplldbg("Compare: %08x vs. %08x\n", group->grpaddr, *addr);
+      grpllerr("Compare: %08x vs. %08x\n", group->grpaddr, *addr);
       if (net_ipv4addr_cmp(group->grpaddr, *addr))
         {
-          grplldbg("Match!\n");
+          grpllerr("Match!\n");
           break;
         }
     }
@@ -325,13 +325,13 @@ FAR struct igmp_group_s *igmp_grpallocfind(FAR struct net_driver_s *dev,
 {
   FAR struct igmp_group_s *group = igmp_grpfind(dev, addr);
 
-  grplldbg("group: %p addr: %08x\n", group, (int)*addr);
+  grpllerr("group: %p addr: %08x\n", group, (int)*addr);
   if (!group)
     {
       group = igmp_grpalloc(dev, addr);
     }
 
-  grplldbg("group: %p\n", group);
+  grpllerr("group: %p\n", group);
   return group;
 }
 
@@ -350,7 +350,7 @@ void igmp_grpfree(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group)
 {
   net_lock_t flags;
 
-  grplldbg("Free: %p flags: %02x\n", group, group->flags);
+  grpllerr("Free: %p flags: %02x\n", group, group->flags);
 
   /* Cancel the wdog */
 
@@ -376,7 +376,7 @@ void igmp_grpfree(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group)
 #if CONFIG_PREALLOC_IGMPGROUPS > 0
   if (IS_PREALLOCATED(group->flags))
     {
-      grplldbg("Put back on free list\n");
+      grpllerr("Put back on free list\n");
       sq_addlast((FAR sq_entry_t *)group, &g_freelist);
       net_unlock(flags);
     }
@@ -388,7 +388,7 @@ void igmp_grpfree(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group)
        */
 
       net_unlock(flags);
-      grplldbg("Call sched_kfree()\n");
+      grpllerr("Call sched_kfree()\n");
       sched_kfree(group);
     }
 }
diff --git a/net/igmp/igmp_input.c b/net/igmp/igmp_input.c
index 66b1601bbe..d8bba1d153 100644
--- a/net/igmp/igmp_input.c
+++ b/net/igmp/igmp_input.c
@@ -124,7 +124,7 @@ void igmp_input(struct net_driver_s *dev)
   if (dev->d_len < NET_LL_HDRLEN(dev) + IPIGMP_HDRLEN)
     {
       IGMP_STATINCR(g_netstats.igmp.length_errors);
-      nlldbg("Length error\n");
+      nllerr("Length error\n");
       return;
     }
 
@@ -133,7 +133,7 @@ void igmp_input(struct net_driver_s *dev)
   if (net_chksum((FAR uint16_t *)&IGMPBUF->type, IGMP_HDRLEN) != 0)
     {
       IGMP_STATINCR(g_netstats.igmp.chksum_errors);
-      nlldbg("Checksum error\n");
+      nllerr("Checksum error\n");
       return;
     }
 
@@ -143,7 +143,7 @@ void igmp_input(struct net_driver_s *dev)
   group = igmp_grpallocfind(dev, &destipaddr);
   if (!group)
     {
-      nlldbg("Failed to allocate/find group: %08x\n", destipaddr);
+      nllerr("Failed to allocate/find group: %08x\n", destipaddr);
       return;
     }
 
@@ -192,7 +192,7 @@ void igmp_input(struct net_driver_s *dev)
                     IGMP_STATINCR(g_netstats.igmp.v1_received);
                     IGMPBUF->maxresp = 10;
 
-                    nlldbg("V1 not implemented\n");
+                    nllerr("V1 not implemented\n");
                   }
 
                 IGMP_STATINCR(g_netstats.igmp.query_received);
@@ -241,7 +241,7 @@ void igmp_input(struct net_driver_s *dev)
             nllinfo("Unicast query\n");
             IGMP_STATINCR(g_netstats.igmp.ucast_query);
 
-            nlldbg("Query to a specific group with the group address as destination\n");
+            nllerr("Query to a specific group with the group address as destination\n");
 
             ticks = net_dsec2tick((int)IGMPBUF->maxresp);
             if (IS_IDLEMEMBER(group->flags) || igmp_cmptimer(group, ticks))
@@ -270,7 +270,7 @@ void igmp_input(struct net_driver_s *dev)
 
       default:
         {
-          nlldbg("Unexpected msg %02x\n", IGMPBUF->type);
+          nllerr("Unexpected msg %02x\n", IGMPBUF->type);
         }
       break;
     }
diff --git a/net/igmp/igmp_timer.c b/net/igmp/igmp_timer.c
index ef6d75cef0..78dd618601 100644
--- a/net/igmp/igmp_timer.c
+++ b/net/igmp/igmp_timer.c
@@ -74,24 +74,24 @@
 #ifdef CONFIG_CPP_HAVE_VARARGS
 #  ifdef IGMP_GTMRDEBUG
 #    define gtmrdbg(format, ...)    ndbg(format, ##__VA_ARGS__)
-#    define gtmrlldbg(format, ...)  nlldbg(format, ##__VA_ARGS__)
+#    define gtmrllerr(format, ...)  nllerr(format, ##__VA_ARGS__)
 #    define gtmrinfo(format, ...)   ninfo(format, ##__VA_ARGS__)
 #    define gtmrllinfo(format, ...) nllinfo(format, ##__VA_ARGS__)
 #  else
 #    define gtmrdbg(x...)
-#    define gtmrlldbg(x...)
+#    define gtmrllerr(x...)
 #    define gtmrinfo(x...)
 #    define gtmrllinfo(x...)
 #  endif
 #else
 #  ifdef IGMP_GTMRDEBUG
 #    define gtmrdbg    ndbg
-#    define gtmrlldbg  nlldbg
+#    define gtmrllerr  nllerr
 #    define gtmrinfo   ninfo
 #    define gtmrllinfo nllinfo
 #  else
 #    define gtmrdbg    (void)
-#    define gtmrlldbg  (void)
+#    define gtmrllerr  (void)
 #    define gtmrinfo   (void)
 #    define gtmrllinfo (void)
 #  endif
@@ -170,7 +170,7 @@ void igmp_startticks(FAR struct igmp_group_s *group, unsigned int ticks)
 
   /* Start the timer */
 
-  gtmrlldbg("ticks: %d\n", ticks);
+  gtmrllerr("ticks: %d\n", ticks);
 
   ret = wd_start(group->wdog, ticks, igmp_timeout, 1, (uint32_t)group);
 
diff --git a/net/iob/iob_add_queue.c b/net/iob/iob_add_queue.c
index d749c56276..c6df88ef0a 100644
--- a/net/iob/iob_add_queue.c
+++ b/net/iob/iob_add_queue.c
@@ -150,7 +150,7 @@ int iob_tryadd_queue(FAR struct iob_s *iob, FAR struct iob_queue_s *iobq)
   qentry = iob_tryalloc_qentry();
   if (!qentry)
     {
-      nlldbg("ERROR: Failed to allocate a container\n");
+      nllerr("ERROR: Failed to allocate a container\n");
       return -ENOMEM;
     }
 
diff --git a/net/iob/iob_trimtail.c b/net/iob/iob_trimtail.c
index f89cdeee22..6ab2add71e 100644
--- a/net/iob/iob_trimtail.c
+++ b/net/iob/iob_trimtail.c
@@ -72,7 +72,7 @@ FAR struct iob_s *iob_trimtail(FAR struct iob_s *iob, unsigned int trimlen)
   FAR struct iob_s *last;
   int len;
 
-  nlldbg("iob=%p pktlen=%d trimlen=%d\n", iob, iob->io_pktlen, trimlen);
+  nllerr("iob=%p pktlen=%d trimlen=%d\n", iob, iob->io_pktlen, trimlen);
 
   if (iob && trimlen > 0)
     {
diff --git a/net/netdev/netdev_register.c b/net/netdev/netdev_register.c
index 11982d9eeb..dfa0b6710d 100644
--- a/net/netdev/netdev_register.c
+++ b/net/netdev/netdev_register.c
@@ -248,7 +248,7 @@ int netdev_register(FAR struct net_driver_s *dev, enum net_lltype_e lltype)
 #endif
 
           default:
-            nlldbg("ERROR: Unrecognized link type: %d\n", lltype);
+            nllerr("ERROR: Unrecognized link type: %d\n", lltype);
             return -EINVAL;
         }
 
@@ -319,13 +319,13 @@ int netdev_register(FAR struct net_driver_s *dev, enum net_lltype_e lltype)
       net_unlock(save);
 
 #ifdef CONFIG_NET_ETHERNET
-      nlldbg("Registered MAC: %02x:%02x:%02x:%02x:%02x:%02x as dev: %s\n",
+      nllerr("Registered MAC: %02x:%02x:%02x:%02x:%02x:%02x as dev: %s\n",
              dev->d_mac.ether_addr_octet[0], dev->d_mac.ether_addr_octet[1],
              dev->d_mac.ether_addr_octet[2], dev->d_mac.ether_addr_octet[3],
              dev->d_mac.ether_addr_octet[4], dev->d_mac.ether_addr_octet[5],
              dev->d_ifname);
 #else
-      nlldbg("Registered dev: %s\n", dev->d_ifname);
+      nllerr("Registered dev: %s\n", dev->d_ifname);
 #endif
       return OK;
     }
diff --git a/net/netdev/netdev_unregister.c b/net/netdev/netdev_unregister.c
index fc326dcf31..f8861c7fad 100644
--- a/net/netdev/netdev_unregister.c
+++ b/net/netdev/netdev_unregister.c
@@ -128,13 +128,13 @@ int netdev_unregister(FAR struct net_driver_s *dev)
       net_unlock(save);
 
 #ifdef CONFIG_NET_ETHERNET
-      nlldbg("Unregistered MAC: %02x:%02x:%02x:%02x:%02x:%02x as dev: %s\n",
+      nllerr("Unregistered MAC: %02x:%02x:%02x:%02x:%02x:%02x as dev: %s\n",
              dev->d_mac.ether_addr_octet[0], dev->d_mac.ether_addr_octet[1],
              dev->d_mac.ether_addr_octet[2], dev->d_mac.ether_addr_octet[3],
              dev->d_mac.ether_addr_octet[4], dev->d_mac.ether_addr_octet[5],
              dev->d_ifname);
 #else
-      nlldbg("Registered dev: %s\n", dev->d_ifname);
+      nllerr("Registered dev: %s\n", dev->d_ifname);
 #endif
       return OK;
     }
diff --git a/net/pkt/pkt_input.c b/net/pkt/pkt_input.c
index 27b3af4d25..102ef81ae3 100644
--- a/net/pkt/pkt_input.c
+++ b/net/pkt/pkt_input.c
@@ -118,7 +118,7 @@ int pkt_input(struct net_driver_s *dev)
     }
   else
     {
-      nlldbg("No listener\n");
+      nllerr("No listener\n");
     }
 
   return ret;
diff --git a/net/pkt/pkt_poll.c b/net/pkt/pkt_poll.c
index dc4f5a92d0..697377d401 100644
--- a/net/pkt/pkt_poll.c
+++ b/net/pkt/pkt_poll.c
@@ -78,7 +78,7 @@
 
 void pkt_poll(FAR struct net_driver_s *dev, FAR struct pkt_conn_s *conn)
 {
-  nlldbg("IN\n");
+  nllerr("IN\n");
 
   /* Verify that the packet connection is valid */
 
diff --git a/net/socket/net_close.c b/net/socket/net_close.c
index f400e21e4e..f994cf6609 100644
--- a/net/socket/net_close.c
+++ b/net/socket/net_close.c
@@ -209,7 +209,7 @@ static uint16_t netclose_interrupt(FAR struct net_driver_s *dev,
     {
       /* Yes.. Wake up the waiting thread and report the timeout */
 
-      nlldbg("CLOSE timeout\n");
+      nllerr("CLOSE timeout\n");
       pstate->cl_result = -ETIMEDOUT;
       goto end_wait;
     }
diff --git a/net/socket/net_sendfile.c b/net/socket/net_sendfile.c
index 53a76349ad..b310943ea1 100644
--- a/net/socket/net_sendfile.c
+++ b/net/socket/net_sendfile.c
@@ -206,7 +206,7 @@ static uint16_t ack_interrupt(FAR struct net_driver_s *dev, FAR void *pvconn,
     }
   else if ((flags & TCP_REXMIT) != 0)
     {
-      nlldbg("REXMIT\n");
+      nllerr("REXMIT\n");
 
       /* Yes.. in this case, reset the number of bytes that have been sent
        * to the number of bytes that have been ACKed.
@@ -221,7 +221,7 @@ static uint16_t ack_interrupt(FAR struct net_driver_s *dev, FAR void *pvconn,
     {
       /* Report not connected */
 
-      nlldbg("Lost connection\n");
+      nllerr("Lost connection\n");
 
       net_lostconnection(pstate->snd_sock, flags);
       pstate->snd_sent = -ENOTCONN;
@@ -345,7 +345,7 @@ static uint16_t sendfile_interrupt(FAR struct net_driver_s *dev, FAR void *pvcon
     {
       /* Report not connected */
 
-      nlldbg("Lost connection\n");
+      nllerr("Lost connection\n");
 
       net_lostconnection(pstate->snd_sock, flags);
       pstate->snd_sent = -ENOTCONN;
@@ -386,7 +386,7 @@ static uint16_t sendfile_interrupt(FAR struct net_driver_s *dev, FAR void *pvcon
           if (ret < 0)
             {
               int errcode = get_errno();
-              nlldbg("failed to lseek: %d\n", errcode);
+              nllerr("failed to lseek: %d\n", errcode);
               pstate->snd_sent = -errcode;
               goto end_wait;
             }
@@ -395,7 +395,7 @@ static uint16_t sendfile_interrupt(FAR struct net_driver_s *dev, FAR void *pvcon
           if (ret < 0)
             {
               int errcode = get_errno();
-              nlldbg("failed to read from input file: %d\n", errcode);
+              nllerr("failed to read from input file: %d\n", errcode);
               pstate->snd_sent = -errcode;
               goto end_wait;
             }
@@ -430,7 +430,7 @@ static uint16_t sendfile_interrupt(FAR struct net_driver_s *dev, FAR void *pvcon
         }
       else
         {
-          nlldbg("Window full, wait for ack\n");
+          nllerr("Window full, wait for ack\n");
           goto wait;
         }
     }
@@ -444,7 +444,7 @@ static uint16_t sendfile_interrupt(FAR struct net_driver_s *dev, FAR void *pvcon
     {
       /* Yes.. report the timeout */
 
-      nlldbg("SEND timeout\n");
+      nllerr("SEND timeout\n");
       pstate->snd_sent = -ETIMEDOUT;
       goto end_wait;
     }
@@ -687,7 +687,7 @@ ssize_t net_sendfile(int outfd, struct file *infile, off_t *offset,
 
   if (state.snd_datacb == NULL)
     {
-      nlldbg("Failed to allocate data callback\n");
+      nllerr("Failed to allocate data callback\n");
       errcode = ENOMEM;
       goto errout_locked;
     }
@@ -696,7 +696,7 @@ ssize_t net_sendfile(int outfd, struct file *infile, off_t *offset,
 
   if (state.snd_ackcb == NULL)
     {
-      nlldbg("Failed to allocate ack callback\n");
+      nllerr("Failed to allocate ack callback\n");
       errcode = ENOMEM;
       goto errout_datacb;
     }
diff --git a/net/socket/recvfrom.c b/net/socket/recvfrom.c
index 50b45bee9f..470296475c 100644
--- a/net/socket/recvfrom.c
+++ b/net/socket/recvfrom.c
@@ -1136,7 +1136,7 @@ static uint16_t recvfrom_udp_interrupt(FAR struct net_driver_s *dev,
         {
           /* Terminate the transfer with an error. */
 
-          nlldbg("ERROR: Network is down\n");
+          nllerr("ERROR: Network is down\n");
           recvfrom_udp_terminate(pstate, -ENETUNREACH);
         }
 
diff --git a/net/tcp/tcp_backlog.c b/net/tcp/tcp_backlog.c
index 1a7d73b833..0e85141c58 100644
--- a/net/tcp/tcp_backlog.c
+++ b/net/tcp/tcp_backlog.c
@@ -109,7 +109,7 @@ int tcp_backlogcreate(FAR struct tcp_conn_s *conn, int nblg)
       bls = (FAR struct tcp_backlog_s *)kmm_zalloc(size);
       if (!bls)
         {
-          nlldbg("Failed to allocate backlog\n");
+          nllerr("Failed to allocate backlog\n");
           return -ENOMEM;
         }
 
@@ -239,7 +239,7 @@ int tcp_backlogadd(FAR struct tcp_conn_s *conn, FAR struct tcp_conn_s *blconn)
       blc = (FAR struct tcp_blcontainer_s *)sq_remfirst(&bls->bl_free);
       if (!blc)
         {
-          nlldbg("Failed to allocate container\n");
+          nllerr("Failed to allocate container\n");
           ret = -ENOMEM;
         }
       else
@@ -390,7 +390,7 @@ int tcp_backlogdelete(FAR struct tcp_conn_s *conn,
             }
         }
 
-      nlldbg("Failed to find pending connection\n");
+      nllerr("Failed to find pending connection\n");
       return -EINVAL;
     }
 
diff --git a/net/tcp/tcp_callback.c b/net/tcp/tcp_callback.c
index 7571821842..e5df8f1fe3 100644
--- a/net/tcp/tcp_callback.c
+++ b/net/tcp/tcp_callback.c
@@ -245,7 +245,7 @@ uint16_t tcp_datahandler(FAR struct tcp_conn_s *conn, FAR uint8_t *buffer,
   iob = iob_tryalloc(true);
   if (iob == NULL)
     {
-      nlldbg("ERROR: Failed to create new I/O buffer chain\n");
+      nllerr("ERROR: Failed to create new I/O buffer chain\n");
       return 0;
     }
 
@@ -258,7 +258,7 @@ uint16_t tcp_datahandler(FAR struct tcp_conn_s *conn, FAR uint8_t *buffer,
        * not free any I/O buffers.
        */
 
-      nlldbg("ERROR: Failed to add data to the I/O buffer chain: %d\n", ret);
+      nllerr("ERROR: Failed to add data to the I/O buffer chain: %d\n", ret);
       (void)iob_free_chain(iob);
       return 0;
     }
@@ -270,7 +270,7 @@ uint16_t tcp_datahandler(FAR struct tcp_conn_s *conn, FAR uint8_t *buffer,
   ret = iob_tryadd_queue(iob, &conn->readahead);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to queue the I/O buffer chain: %d\n", ret);
+      nllerr("ERROR: Failed to queue the I/O buffer chain: %d\n", ret);
       (void)iob_free_chain(iob);
       return 0;
     }
diff --git a/net/tcp/tcp_conn.c b/net/tcp/tcp_conn.c
index d4ff81e8ff..57b477af90 100644
--- a/net/tcp/tcp_conn.c
+++ b/net/tcp/tcp_conn.c
@@ -760,7 +760,7 @@ FAR struct tcp_conn_s *tcp_alloc(uint8_t domain)
 
       if (conn != NULL)
         {
-          nlldbg("Closing unestablished connection: %p\n", conn);
+          nllerr("Closing unestablished connection: %p\n", conn);
 
           /* Yes... free it.  This will remove the connection from the list
            * of active connections and release all resources held by the
diff --git a/net/tcp/tcp_input.c b/net/tcp/tcp_input.c
index 88286266b2..3a4cc55674 100644
--- a/net/tcp/tcp_input.c
+++ b/net/tcp/tcp_input.c
@@ -126,7 +126,7 @@ static void tcp_input(FAR struct net_driver_s *dev, unsigned int iplen)
       g_netstats.tcp.drop++;
       g_netstats.tcp.chkerr++;
 #endif
-      nlldbg("Bad TCP checksum\n");
+      nllerr("Bad TCP checksum\n");
       goto drop;
     }
 
@@ -206,7 +206,7 @@ static void tcp_input(FAR struct net_driver_s *dev, unsigned int iplen)
 #ifdef CONFIG_NET_STATISTICS
               g_netstats.tcp.syndrop++;
 #endif
-              nlldbg("No free TCP connections\n");
+              nllerr("No free TCP connections\n");
               goto drop;
             }
 
@@ -308,7 +308,7 @@ found:
   if ((tcp->flags & TCP_RST) != 0)
     {
       conn->tcpstateflags = TCP_CLOSED;
-      nlldbg("RESET - TCP state: TCP_CLOSED\n");
+      nllerr("RESET - TCP state: TCP_CLOSED\n");
 
       (void)tcp_callback(dev, conn, TCP_ABORT);
       goto drop;
@@ -398,7 +398,7 @@ found:
 
           if ((conn->tcpstateflags & TCP_STATE_MASK) == TCP_ESTABLISHED)
             {
-              nlldbg("ERROR: conn->sndseq %d, conn->unacked %d\n",
+              nllerr("ERROR: conn->sndseq %d, conn->unacked %d\n",
                      tcp_getsequence(conn->sndseq), conn->unacked);
               goto reset;
             }
diff --git a/net/tcp/tcp_send_buffered.c b/net/tcp/tcp_send_buffered.c
index f5a70176f2..5d1b163b8b 100644
--- a/net/tcp/tcp_send_buffered.c
+++ b/net/tcp/tcp_send_buffered.c
@@ -566,7 +566,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev,
 
           if (++WRB_NRTX(wrb) >= TCP_MAXRTX)
             {
-              nlldbg("Expiring wrb=%p nrtx=%u\n", wrb, WRB_NRTX(wrb));
+              nllerr("Expiring wrb=%p nrtx=%u\n", wrb, WRB_NRTX(wrb));
 
               /* The maximum retry count as been exhausted. Remove the write
                * buffer at the head of the queue.
@@ -631,7 +631,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev,
 
           if (++WRB_NRTX(wrb) >= TCP_MAXRTX)
             {
-              nlldbg("Expiring wrb=%p nrtx=%u\n", wrb, WRB_NRTX(wrb));
+              nllerr("Expiring wrb=%p nrtx=%u\n", wrb, WRB_NRTX(wrb));
 
               /* Return the write buffer to the free list */
 
diff --git a/net/tcp/tcp_send_unbuffered.c b/net/tcp/tcp_send_unbuffered.c
index 53b8941499..ea3c5c42cb 100644
--- a/net/tcp/tcp_send_unbuffered.c
+++ b/net/tcp/tcp_send_unbuffered.c
@@ -570,7 +570,7 @@ static uint16_t tcpsend_interrupt(FAR struct net_driver_s *dev,
     {
       /* Yes.. report the timeout */
 
-      nlldbg("SEND timeout\n");
+      nllerr("SEND timeout\n");
       pstate->snd_sent = -ETIMEDOUT;
       goto end_wait;
     }
diff --git a/net/udp/udp_callback.c b/net/udp/udp_callback.c
index e53e806c51..be6f59d5cb 100644
--- a/net/udp/udp_callback.c
+++ b/net/udp/udp_callback.c
@@ -98,7 +98,7 @@ static uint16_t udp_datahandler(FAR struct net_driver_s *dev, FAR struct udp_con
   iob = iob_tryalloc(true);
   if (iob == NULL)
     {
-      nlldbg("ERROR: Failed to create new I/O buffer chain\n");
+      nllerr("ERROR: Failed to create new I/O buffer chain\n");
       return 0;
     }
 
@@ -178,7 +178,7 @@ static uint16_t udp_datahandler(FAR struct net_driver_s *dev, FAR struct udp_con
        * not free any I/O buffers.
        */
 
-      nlldbg("ERROR: Failed to add data to the I/O buffer chain: %d\n", ret);
+      nllerr("ERROR: Failed to add data to the I/O buffer chain: %d\n", ret);
       (void)iob_free_chain(iob);
       return 0;
     }
@@ -191,7 +191,7 @@ static uint16_t udp_datahandler(FAR struct net_driver_s *dev, FAR struct udp_con
        * not free any I/O buffers.
        */
 
-      nlldbg("ERROR: Failed to add data to the I/O buffer chain: %d\n", ret);
+      nllerr("ERROR: Failed to add data to the I/O buffer chain: %d\n", ret);
       (void)iob_free_chain(iob);
       return 0;
     }
@@ -208,7 +208,7 @@ static uint16_t udp_datahandler(FAR struct net_driver_s *dev, FAR struct udp_con
            * does not free any I/O buffers.
            */
 
-          nlldbg("ERROR: Failed to add data to the I/O buffer chain: %d\n",
+          nllerr("ERROR: Failed to add data to the I/O buffer chain: %d\n",
                  ret);
           (void)iob_free_chain(iob);
           return 0;
@@ -220,7 +220,7 @@ static uint16_t udp_datahandler(FAR struct net_driver_s *dev, FAR struct udp_con
   ret = iob_tryadd_queue(iob, &conn->readahead);
   if (ret < 0)
     {
-      nlldbg("ERROR: Failed to queue the I/O buffer chain: %d\n", ret);
+      nllerr("ERROR: Failed to queue the I/O buffer chain: %d\n", ret);
       (void)iob_free_chain(iob);
       return 0;
     }
diff --git a/net/udp/udp_input.c b/net/udp/udp_input.c
index 75d0ff40a8..e1f1b19c5c 100644
--- a/net/udp/udp_input.c
+++ b/net/udp/udp_input.c
@@ -149,7 +149,7 @@ static int udp_input(FAR struct net_driver_s *dev, unsigned int iplen)
       g_netstats.udp.drop++;
       g_netstats.udp.chkerr++;
 #endif
-      nlldbg("Bad UDP checksum\n");
+      nllerr("Bad UDP checksum\n");
       dev->d_len = 0;
     }
   else
@@ -207,7 +207,7 @@ static int udp_input(FAR struct net_driver_s *dev, unsigned int iplen)
         }
       else
         {
-          nlldbg("No listener on UDP port\n");
+          nllerr("No listener on UDP port\n");
           dev->d_len = 0;
         }
     }
diff --git a/net/udp/udp_psock_sendto.c b/net/udp/udp_psock_sendto.c
index 0b001e153b..40136453e1 100644
--- a/net/udp/udp_psock_sendto.c
+++ b/net/udp/udp_psock_sendto.c
@@ -235,7 +235,7 @@ static uint16_t sendto_interrupt(FAR struct net_driver_s *dev, FAR void *conn,
         {
           /* Terminate the transfer with an error. */
 
-          nlldbg("ERROR: Network is down\n");
+          nllerr("ERROR: Network is down\n");
           pstate->st_sndlen = -ENETUNREACH;
         }
 
@@ -257,7 +257,7 @@ static uint16_t sendto_interrupt(FAR struct net_driver_s *dev, FAR void *conn,
             {
               /* Yes.. report the timeout */
 
-              nlldbg("ERROR: SEND timeout\n");
+              nllerr("ERROR: SEND timeout\n");
               pstate->st_sndlen = -ETIMEDOUT;
             }
           else
diff --git a/sched/group/group_setupidlefiles.c b/sched/group/group_setupidlefiles.c
index c5ed320f5e..622244859d 100644
--- a/sched/group/group_setupidlefiles.c
+++ b/sched/group/group_setupidlefiles.c
@@ -120,12 +120,12 @@ int group_setupidlefiles(FAR struct task_tcb_s *tcb)
 
       if (fd > 0)
         {
-          slldbg("Open /dev/console fd: %d\n", fd);
+          sllerr("Open /dev/console fd: %d\n", fd);
           (void)close(fd);
         }
       else
         {
-          slldbg("Failed to open /dev/console: %d\n", errno);
+          sllerr("Failed to open /dev/console: %d\n", errno);
         }
       return -ENFILE;
     }
diff --git a/sched/init/os_start.c b/sched/init/os_start.c
index 5a50c1b2fc..be4a26f265 100644
--- a/sched/init/os_start.c
+++ b/sched/init/os_start.c
@@ -372,7 +372,7 @@ void os_start(void)
 #endif
   int i;
 
-  slldbg("Entry\n");
+  sllerr("Entry\n");
 
   /* Boot up is complete */
 
diff --git a/sched/irq/irq_unexpectedisr.c b/sched/irq/irq_unexpectedisr.c
index 191d0a2194..2b3249a8f9 100644
--- a/sched/irq/irq_unexpectedisr.c
+++ b/sched/irq/irq_unexpectedisr.c
@@ -61,7 +61,7 @@
 int irq_unexpected_isr(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  lldbg("irq: %d\n", irq);
+  llerr("irq: %d\n", irq);
   PANIC();
   return OK; /* Won't get here */
 }
diff --git a/sched/paging/pg_miss.c b/sched/paging/pg_miss.c
index ebc10c2953..cdc709dc17 100644
--- a/sched/paging/pg_miss.c
+++ b/sched/paging/pg_miss.c
@@ -132,7 +132,7 @@ void pg_miss(void)
    * always present in memory.
    */
 
-  pglldbg("Blocking TCB: %p PID: %d\n", ftcb, ftcb->pid);
+  pgllerr("Blocking TCB: %p PID: %d\n", ftcb, ftcb->pid);
   DEBUGASSERT(g_pgworker != ftcb->pid);
 
   /* Block the currently executing task
@@ -171,7 +171,7 @@ void pg_miss(void)
 
   if (!g_pftcb)
     {
-      pglldbg("Signaling worker. PID: %d\n", g_pgworker);
+      pgllerr("Signaling worker. PID: %d\n", g_pgworker);
       kill(g_pgworker, SIGWORK);
     }
 }
diff --git a/sched/paging/pg_worker.c b/sched/paging/pg_worker.c
index 914ab604ed..cfefb9f233 100644
--- a/sched/paging/pg_worker.c
+++ b/sched/paging/pg_worker.c
@@ -198,7 +198,7 @@ static void pg_callback(FAR struct tcb_s *tcb, int result)
 
   /* Signal the page fill worker thread (in any event) */
 
-  pglldbg("Signaling worker. PID: %d\n", g_pgworker);
+  pgllerr("Signaling worker. PID: %d\n", g_pgworker);
   kill(g_pgworker, SIGWORK);
 }
 #endif
@@ -308,7 +308,7 @@ static inline bool pg_dequeue(void)
            * virtual address space -- just restart it.
            */
 
-          pglldbg("Restarting TCB: %p\n", g_pftcb);
+          pgllerr("Restarting TCB: %p\n", g_pftcb);
           up_unblock_task(g_pftcb);
         }
     }
@@ -422,7 +422,7 @@ static inline bool pg_startfill(void)
       return true;
     }
 
-  pglldbg("Queue empty\n");
+  pgllerr("Queue empty\n");
   return false;
 }
 
@@ -490,7 +490,7 @@ static inline void pg_fillcomplete(void)
    * received the fill ready-to-run.
    */
 
-  pglldbg("Restarting TCB: %p\n", g_pftcb);
+  pgllerr("Restarting TCB: %p\n", g_pftcb);
   up_unblock_task(g_pftcb);
 }
 
@@ -532,7 +532,7 @@ int pg_worker(int argc, char *argv[])
    * fill completions should occur while this thread sleeps.
    */
 
-  pglldbg("Started\n");
+  pgllerr("Started\n");
   (void)up_irq_save();
   for (; ; )
     {
@@ -580,7 +580,7 @@ int pg_worker(int argc, char *argv[])
                * task that was blocked waiting for this page fill.
                */
 
-              pglldbg("Restarting TCB: %p\n", g_pftcb);
+              pgllerr("Restarting TCB: %p\n", g_pftcb);
               up_unblock_task(g_pftcb);
 
               /* Yes .. Start the next asynchronous fill.  Check the return
@@ -608,7 +608,7 @@ int pg_worker(int argc, char *argv[])
 #ifdef CONFIG_PAGING_TIMEOUT_TICKS
           else
             {
-              lldbg("Timeout!\n");
+              llerr("Timeout!\n");
               ASSERT(clock_systimer() - g_starttime < CONFIG_PAGING_TIMEOUT_TICKS);
             }
 #endif
diff --git a/sched/sched/sched_sporadic.c b/sched/sched/sched_sporadic.c
index d31837d3f1..8969df7875 100644
--- a/sched/sched/sched_sporadic.c
+++ b/sched/sched/sched_sporadic.c
@@ -150,7 +150,7 @@ static int sporadic_set_lowpriority(FAR struct tcb_s *tcb)
   if (ret < 0)
     {
       int errcode = get_errno();
-      slldbg("ERROR: sched_reprioritize failed: %d\n", errcode);
+      sllerr("ERROR: sched_reprioritize failed: %d\n", errcode);
       return -errcode;
     }
 
@@ -218,7 +218,7 @@ static int sporadic_set_hipriority(FAR struct tcb_s *tcb)
   if (ret < 0)
     {
       int errcode = get_errno();
-      slldbg("ERROR: sched_reprioritize failed: %d\n", errcode);
+      sllerr("ERROR: sched_reprioritize failed: %d\n", errcode);
       return -errcode;
     }
 
@@ -771,7 +771,7 @@ int sched_sporadic_initialize(FAR struct tcb_s *tcb)
   sporadic = (FAR struct sporadic_s *)kmm_zalloc(sizeof(struct sporadic_s));
   if (sporadic == NULL)
     {
-      slldbg("ERROR: Failed to allocate sporadic data structure\n");
+      sllerr("ERROR: Failed to allocate sporadic data structure\n");
       return -ENOMEM;
     }
 
@@ -1078,7 +1078,7 @@ int sched_sporadic_resume(FAR struct tcb_s *tcb)
                * failure from the standpoint of higher level logic.
                */
 
-              slldbg("Failed to allocate timer, nrepls=%d\n",
+              sllerr("Failed to allocate timer, nrepls=%d\n",
                      sporadic->nrepls);
             }
         }
diff --git a/sched/sched/sched_timerexpiration.c b/sched/sched/sched_timerexpiration.c
index ee34099687..7889b2e8e9 100644
--- a/sched/sched/sched_timerexpiration.c
+++ b/sched/sched/sched_timerexpiration.c
@@ -362,7 +362,7 @@ static void sched_timer_start(unsigned int ticks)
 
       if (ret < 0)
         {
-          slldbg("ERROR: up_timer_start/up_alarm_start failed: %d\n");
+          sllerr("ERROR: up_timer_start/up_alarm_start failed: %d\n");
           UNUSED(ret);
         }
     }
diff --git a/sched/wqueue/kwork_hpthread.c b/sched/wqueue/kwork_hpthread.c
index e09e825cee..22217b66fa 100644
--- a/sched/wqueue/kwork_hpthread.c
+++ b/sched/wqueue/kwork_hpthread.c
@@ -165,7 +165,7 @@ int work_hpstart(void)
       int errcode = errno;
       DEBUGASSERT(errcode > 0);
 
-      slldbg("kernel_thread failed: %d\n", errcode);
+      sllerr("kernel_thread failed: %d\n", errcode);
       return -errcode;
     }
 
diff --git a/sched/wqueue/kwork_lpthread.c b/sched/wqueue/kwork_lpthread.c
index 1e5ffb47e9..8c8958cbf8 100644
--- a/sched/wqueue/kwork_lpthread.c
+++ b/sched/wqueue/kwork_lpthread.c
@@ -212,7 +212,7 @@ int work_lpstart(void)
           int errcode = errno;
           DEBUGASSERT(errcode > 0);
 
-          slldbg("kernel_thread %d failed: %d\n", wndx, errcode);
+          sllerr("kernel_thread %d failed: %d\n", wndx, errcode);
           sched_unlock();
           return -errcode;
         }
-- 
GitLab


From a1469a3e95f9c1fd5525e0ec37bc4185e5227b48 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sat, 11 Jun 2016 15:50:49 -0600
Subject: [PATCH 24/91] Add CONFIG_DEBUG_ERROR.  Change names of *dbg() *
 *err()

---
 Kconfig                                       |  14 +-
 arch/arm/src/arm/up_elf.c                     |  14 +-
 arch/arm/src/arm/up_schedulesigaction.c       |   4 +-
 arch/arm/src/arm/up_sigdeliver.c              |   4 +-
 arch/arm/src/armv6-m/up_elf.c                 |  16 +-
 arch/arm/src/armv6-m/up_hardfault.c           |  20 +-
 arch/arm/src/armv6-m/up_schedulesigaction.c   |   4 +-
 arch/arm/src/armv6-m/up_sigdeliver.c          |   4 +-
 arch/arm/src/armv6-m/up_svcall.c              |  26 +--
 arch/arm/src/armv7-a/arm_addrenv.c            |   8 +-
 arch/arm/src/armv7-a/arm_addrenv_kstack.c     |   2 +-
 arch/arm/src/armv7-a/arm_addrenv_ustack.c     |   2 +-
 arch/arm/src/armv7-a/arm_addrenv_utils.c      |   2 +-
 arch/arm/src/armv7-a/arm_elf.c                |  14 +-
 arch/arm/src/armv7-a/arm_schedulesigaction.c  |   4 +-
 arch/arm/src/armv7-a/arm_sigdeliver.c         |   4 +-
 arch/arm/src/armv7-a/arm_syscall.c            |  22 +-
 arch/arm/src/armv7-a/gic.h                    |   4 +-
 arch/arm/src/armv7-m/mpu.h                    |   2 +-
 arch/arm/src/armv7-m/up_elf.c                 |  16 +-
 arch/arm/src/armv7-m/up_hardfault.c           |  28 +--
 arch/arm/src/armv7-m/up_memfault.c            |  20 +-
 arch/arm/src/armv7-m/up_ramvec_attach.c       |   4 +-
 arch/arm/src/armv7-m/up_ramvec_initialize.c   |   4 +-
 arch/arm/src/armv7-m/up_schedulesigaction.c   |   4 +-
 arch/arm/src/armv7-m/up_sigdeliver.c          |   4 +-
 arch/arm/src/armv7-m/up_svcall.c              |  26 +--
 arch/arm/src/armv7-r/arm_elf.c                |  14 +-
 arch/arm/src/armv7-r/arm_schedulesigaction.c  |   4 +-
 arch/arm/src/armv7-r/arm_sigdeliver.c         |   4 +-
 arch/arm/src/armv7-r/arm_syscall.c            |  22 +-
 arch/arm/src/armv7-r/mpu.h                    |   2 +-
 arch/arm/src/c5471/c5471_ethernet.c           |  34 +--
 arch/arm/src/c5471/c5471_watchdog.c           |  36 +--
 arch/arm/src/calypso/calypso_spi.c            |  10 +-
 arch/arm/src/calypso/calypso_uwire.c          |   8 +-
 arch/arm/src/common/up_createstack.c          |   2 +-
 arch/arm/src/common/up_exit.c                 |  10 +-
 arch/arm/src/common/up_vfork.c                |   4 +-
 arch/arm/src/dm320/dm320_framebuffer.c        |   4 +-
 arch/arm/src/efm32/efm32_adc.c                |   2 +-
 arch/arm/src/efm32/efm32_dma.c                |  44 ++--
 arch/arm/src/efm32/efm32_i2c.c                |   8 +-
 arch/arm/src/efm32/efm32_irq.c                |  18 +-
 arch/arm/src/efm32/efm32_pwm.c                |   8 +-
 arch/arm/src/efm32/efm32_rmu.c                |   4 +-
 arch/arm/src/efm32/efm32_rmu.h                |   4 +-
 arch/arm/src/efm32/efm32_rtc_burtc.c          |  18 +-
 arch/arm/src/efm32/efm32_spi.c                |  16 +-
 arch/arm/src/efm32/efm32_timer.c              |   6 +-
 arch/arm/src/efm32/efm32_usbdev.c             |   6 +-
 arch/arm/src/efm32/efm32_usbhost.c            |  30 +--
 arch/arm/src/kinetis/kinetis_enet.c           |  10 +-
 arch/arm/src/kinetis/kinetis_irq.c            |  18 +-
 arch/arm/src/kinetis/kinetis_pwm.c            |  10 +-
 arch/arm/src/kinetis/kinetis_sdhc.c           |  72 +++---
 arch/arm/src/kinetis/kinetis_start.c          |   2 +-
 arch/arm/src/kinetis/kinetis_usbdev.c         |  40 ++--
 arch/arm/src/kl/kl_irq.c                      |   8 +-
 arch/arm/src/kl/kl_pwm.c                      |  10 +-
 arch/arm/src/kl/kl_spi.c                      |   8 +-
 arch/arm/src/lpc11xx/lpc11_i2c.c              |   2 +-
 arch/arm/src/lpc11xx/lpc11_irq.c              |   8 +-
 arch/arm/src/lpc11xx/lpc11_serial.c           |   2 +-
 arch/arm/src/lpc11xx/lpc11_spi.c              |  10 +-
 arch/arm/src/lpc11xx/lpc11_ssp.c              |  16 +-
 arch/arm/src/lpc11xx/lpc11_timer.c            |  24 +-
 arch/arm/src/lpc17xx/lpc176x_rtc.c            |   4 +-
 arch/arm/src/lpc17xx/lpc17_can.c              |  16 +-
 arch/arm/src/lpc17xx/lpc17_dac.c              |   2 +-
 arch/arm/src/lpc17xx/lpc17_ethernet.c         |  40 ++--
 arch/arm/src/lpc17xx/lpc17_gpdma.c            |  38 ++--
 arch/arm/src/lpc17xx/lpc17_i2c.c              |   2 +-
 arch/arm/src/lpc17xx/lpc17_irq.c              |  18 +-
 arch/arm/src/lpc17xx/lpc17_lcd.c              |   8 +-
 arch/arm/src/lpc17xx/lpc17_mcpwm.c            |   6 +-
 arch/arm/src/lpc17xx/lpc17_pwm.c              |   6 +-
 arch/arm/src/lpc17xx/lpc17_sdcard.c           |  44 ++--
 arch/arm/src/lpc17xx/lpc17_serial.c           |   2 +-
 arch/arm/src/lpc17xx/lpc17_spi.c              |  10 +-
 arch/arm/src/lpc17xx/lpc17_ssp.c              |  16 +-
 arch/arm/src/lpc17xx/lpc17_timer.c            |  24 +-
 arch/arm/src/lpc17xx/lpc17_usbhost.c          |  40 ++--
 arch/arm/src/lpc214x/lpc214x_serial.c         |   2 +-
 arch/arm/src/lpc2378/lpc23xx_i2c.c            |   2 +-
 arch/arm/src/lpc2378/lpc23xx_serial.c         |   2 +-
 arch/arm/src/lpc2378/lpc23xx_spi.c            |  10 +-
 arch/arm/src/lpc31xx/lpc31_ehci.c             |  30 +--
 arch/arm/src/lpc31xx/lpc31_serial.c           |   2 +-
 arch/arm/src/lpc43xx/lpc43_dac.c              |   2 +-
 arch/arm/src/lpc43xx/lpc43_ehci.c             |  30 +--
 arch/arm/src/lpc43xx/lpc43_ethernet.c         |  34 +--
 arch/arm/src/lpc43xx/lpc43_gpdma.c            |   4 +-
 arch/arm/src/lpc43xx/lpc43_gpio.c             |   2 +-
 arch/arm/src/lpc43xx/lpc43_i2c.c              |   2 +-
 arch/arm/src/lpc43xx/lpc43_irq.c              |  18 +-
 arch/arm/src/lpc43xx/lpc43_serial.c           |   2 +-
 arch/arm/src/lpc43xx/lpc43_spi.c              |  10 +-
 arch/arm/src/lpc43xx/lpc43_spifi.c            |  18 +-
 arch/arm/src/lpc43xx/lpc43_ssp.c              |  12 +-
 arch/arm/src/nuc1xx/nuc_irq.c                 |   8 +-
 arch/arm/src/sam34/sam4cm_freerun.c           |   4 +-
 arch/arm/src/sam34/sam4cm_oneshot.c           |   4 +-
 arch/arm/src/sam34/sam4cm_tc.c                |   8 +-
 arch/arm/src/sam34/sam4cm_tc.h                |   4 +-
 arch/arm/src/sam34/sam_dmac.c                 |  32 +--
 arch/arm/src/sam34/sam_hsmci.c                |  74 +++----
 arch/arm/src/sam34/sam_irq.c                  |  18 +-
 arch/arm/src/sam34/sam_rtc.c                  |   4 +-
 arch/arm/src/sam34/sam_rtt.c                  |   6 +-
 arch/arm/src/sam34/sam_spi.c                  |  24 +-
 arch/arm/src/sam34/sam_tc.c                   |   6 +-
 arch/arm/src/sam34/sam_twi.c                  |   8 +-
 arch/arm/src/sam34/sam_wdt.c                  |   6 +-
 arch/arm/src/sama5/sam_adc.c                  |  10 +-
 arch/arm/src/sama5/sam_can.c                  |  20 +-
 arch/arm/src/sama5/sam_dmac.c                 |  48 ++--
 arch/arm/src/sama5/sam_ehci.c                 |  32 +--
 arch/arm/src/sama5/sam_emaca.c                |  14 +-
 arch/arm/src/sama5/sam_emacb.c                |  22 +-
 arch/arm/src/sama5/sam_freerun.c              |   4 +-
 arch/arm/src/sama5/sam_hsmci.c                |  56 ++---
 arch/arm/src/sama5/sam_lcd.c                  |  10 +-
 arch/arm/src/sama5/sam_memories.c             |   6 +-
 arch/arm/src/sama5/sam_nand.c                 |  66 +++---
 arch/arm/src/sama5/sam_ohci.c                 |   4 +-
 arch/arm/src/sama5/sam_oneshot.c              |   4 +-
 arch/arm/src/sama5/sam_pck.c                  |   6 +-
 arch/arm/src/sama5/sam_pmecc.c                |  12 +-
 arch/arm/src/sama5/sam_pwm.c                  |  10 +-
 arch/arm/src/sama5/sam_rtc.c                  |   4 +-
 arch/arm/src/sama5/sam_spi.c                  |  24 +-
 arch/arm/src/sama5/sam_ssc.c                  |  52 ++---
 arch/arm/src/sama5/sam_tc.c                   |   8 +-
 arch/arm/src/sama5/sam_tc.h                   |   4 +-
 arch/arm/src/sama5/sam_trng.c                 |   4 +-
 arch/arm/src/sama5/sam_tsd.c                  |  12 +-
 arch/arm/src/sama5/sam_twi.c                  |  12 +-
 arch/arm/src/sama5/sam_udphs.c                |   2 +-
 arch/arm/src/sama5/sam_wdt.c                  |   8 +-
 arch/arm/src/sama5/sam_xdmac.c                |  54 ++---
 arch/arm/src/samdl/sam_dmac.c                 |  20 +-
 arch/arm/src/samdl/sam_irq.c                  |   8 +-
 arch/arm/src/samdl/sam_spi.c                  |  14 +-
 arch/arm/src/samv7/sam_emac.c                 |  24 +-
 arch/arm/src/samv7/sam_freerun.c              |   4 +-
 arch/arm/src/samv7/sam_hsmci.c                |  60 ++---
 arch/arm/src/samv7/sam_irq.c                  |  18 +-
 arch/arm/src/samv7/sam_mcan.c                 |  32 +--
 arch/arm/src/samv7/sam_oneshot.c              |   4 +-
 arch/arm/src/samv7/sam_pck.c                  |   4 +-
 arch/arm/src/samv7/sam_qspi.c                 |  22 +-
 arch/arm/src/samv7/sam_rswdt.c                |   8 +-
 arch/arm/src/samv7/sam_spi.c                  |  24 +-
 arch/arm/src/samv7/sam_spi_slave.c            |   8 +-
 arch/arm/src/samv7/sam_ssc.c                  |  52 ++---
 arch/arm/src/samv7/sam_tc.c                   |   6 +-
 arch/arm/src/samv7/sam_tc.h                   |   4 +-
 arch/arm/src/samv7/sam_trng.c                 |   4 +-
 arch/arm/src/samv7/sam_twihs.c                |  12 +-
 arch/arm/src/samv7/sam_usbdevhs.c             |   2 +-
 arch/arm/src/samv7/sam_wdt.c                  |   8 +-
 arch/arm/src/samv7/sam_xdmac.c                |  48 ++--
 arch/arm/src/stm32/stm32_adc.c                |  16 +-
 arch/arm/src/stm32/stm32_can.c                |   6 +-
 arch/arm/src/stm32/stm32_dac.c                |  12 +-
 arch/arm/src/stm32/stm32_dma2d.c              |  64 +++---
 arch/arm/src/stm32/stm32_eth.c                |  34 +--
 arch/arm/src/stm32/stm32_i2c.c                |  10 +-
 arch/arm/src/stm32/stm32_i2c_alt.c            |  28 +--
 arch/arm/src/stm32/stm32_irq.c                |  18 +-
 arch/arm/src/stm32/stm32_iwdg.c               |  10 +-
 arch/arm/src/stm32/stm32_ltdc.c               |  74 +++----
 arch/arm/src/stm32/stm32_otgfsdev.c           |   6 +-
 arch/arm/src/stm32/stm32_otgfshost.c          |  30 +--
 arch/arm/src/stm32/stm32_otghsdev.c           |   6 +-
 arch/arm/src/stm32/stm32_otghshost.c          |  30 +--
 arch/arm/src/stm32/stm32_procfs_ccm.c         |  10 +-
 arch/arm/src/stm32/stm32_pwm.c                |  18 +-
 arch/arm/src/stm32/stm32_qencoder.c           |   6 +-
 arch/arm/src/stm32/stm32_rtcc.c               |   4 +-
 arch/arm/src/stm32/stm32_sdio.c               |  44 ++--
 arch/arm/src/stm32/stm32_spi.c                |   6 +-
 arch/arm/src/stm32/stm32_wwdg.c               |   8 +-
 arch/arm/src/stm32/stm32f10xxx_dma.c          |  12 +-
 arch/arm/src/stm32/stm32f20xxx_dma.c          |  20 +-
 arch/arm/src/stm32/stm32f30xxx_i2c.c          |  10 +-
 arch/arm/src/stm32/stm32f40xxx_dma.c          |  20 +-
 arch/arm/src/stm32/stm32f40xxx_rtcc.c         |   4 +-
 arch/arm/src/stm32f7/stm32_dma.c              |  20 +-
 arch/arm/src/stm32f7/stm32_ethernet.c         |  24 +-
 arch/arm/src/stm32f7/stm32_irq.c              |  18 +-
 arch/arm/src/stm32f7/stm32_procfs_dtcm.c      |  10 +-
 arch/arm/src/stm32l4/stm32l4_can.c            |   6 +-
 arch/arm/src/stm32l4/stm32l4_i2c.c            |  10 +-
 arch/arm/src/stm32l4/stm32l4_irq.c            |  18 +-
 arch/arm/src/stm32l4/stm32l4_qspi.c           |  18 +-
 arch/arm/src/stm32l4/stm32l4_rtcc.c           |   4 +-
 arch/arm/src/stm32l4/stm32l4_spi.c            |   6 +-
 arch/arm/src/stm32l4/stm32l4x6xx_dma.c        |  14 +-
 arch/arm/src/tiva/lm3s_ethernet.c             |   2 +-
 arch/arm/src/tiva/tiva_adclib.c               |   4 +-
 arch/arm/src/tiva/tiva_adclow.c               |  10 +-
 arch/arm/src/tiva/tiva_gpio.h                 |   4 +-
 arch/arm/src/tiva/tiva_i2c.c                  |  16 +-
 arch/arm/src/tiva/tiva_irq.c                  |  18 +-
 arch/arm/src/tiva/tiva_ssi.c                  |  20 +-
 arch/arm/src/tiva/tiva_timer.h                |   4 +-
 arch/arm/src/tiva/tiva_timerlow32.c           |   6 +-
 arch/arm/src/tiva/tm4c_ethernet.c             |  26 +--
 arch/avr/src/avr/up_createstack.c             |   2 +-
 arch/avr/src/avr/up_schedulesigaction.c       |   4 +-
 arch/avr/src/avr/up_sigdeliver.c              |   4 +-
 arch/avr/src/avr/up_spi.c                     |  10 +-
 arch/avr/src/avr32/up_createstack.c           |   2 +-
 arch/avr/src/avr32/up_schedulesigaction.c     |   4 +-
 arch/avr/src/avr32/up_sigdeliver.c            |   4 +-
 arch/avr/src/common/up_exit.c                 |  10 +-
 arch/hc/src/common/up_createstack.c           |   2 +-
 arch/hc/src/common/up_exit.c                  |  10 +-
 arch/hc/src/m9s12/m9s12_ethernet.c            |   2 +-
 arch/mips/src/common/up_createstack.c         |   2 +-
 arch/mips/src/common/up_exit.c                |  10 +-
 arch/mips/src/mips32/up_schedulesigaction.c   |   4 +-
 arch/mips/src/mips32/up_sigdeliver.c          |   2 +-
 arch/mips/src/mips32/up_swint0.c              |  22 +-
 arch/mips/src/mips32/up_vfork.c               |   4 +-
 arch/mips/src/pic32mx/pic32mx-ethernet.c      |  36 +--
 arch/mips/src/pic32mx/pic32mx-spi.c           |  14 +-
 arch/mips/src/pic32mx/pic32mx-usbdev.c        |  40 ++--
 arch/mips/src/pic32mz/pic32mz-ethernet.c      |  38 ++--
 arch/mips/src/pic32mz/pic32mz-spi.c           |  16 +-
 arch/rgmp/src/x86/com.c                       |  18 +-
 arch/sh/src/common/up_createstack.c           |   2 +-
 arch/sh/src/common/up_exit.c                  |  10 +-
 arch/sh/src/m16c/m16c_schedulesigaction.c     |   4 +-
 arch/sh/src/m16c/m16c_serial.c                |  10 +-
 arch/sh/src/m16c/m16c_sigdeliver.c            |   4 +-
 arch/sh/src/sh1/sh1_irq.c                     |   4 +-
 arch/sh/src/sh1/sh1_schedulesigaction.c       |   4 +-
 arch/sh/src/sh1/sh1_sigdeliver.c              |   4 +-
 arch/sim/src/board_lcd.c                      |   8 +-
 arch/sim/src/up_blocktask.c                   |   6 +-
 arch/sim/src/up_deviceimage.c                 |   6 +-
 arch/sim/src/up_elf.c                         |   2 +-
 arch/sim/src/up_exit.c                        |   6 +-
 arch/sim/src/up_framebuffer.c                 |  36 +--
 arch/sim/src/up_releasepending.c              |   6 +-
 arch/sim/src/up_reprioritizertr.c             |   6 +-
 arch/sim/src/up_smpsignal.c                   |   2 +-
 arch/sim/src/up_spiflash.c                    |   4 +-
 arch/sim/src/up_touchscreen.c                 |   4 +-
 arch/sim/src/up_unblocktask.c                 |   6 +-
 arch/x86/src/common/up_elf.c                  |   2 +-
 arch/x86/src/common/up_exit.c                 |  10 +-
 arch/x86/src/i486/up_createstack.c            |   2 +-
 arch/x86/src/i486/up_schedulesigaction.c      |   4 +-
 arch/x86/src/i486/up_sigdeliver.c             |   4 +-
 arch/x86/src/qemu/qemu_vga.c                  |   4 +-
 arch/z16/src/common/up_blocktask.c            |   2 +-
 arch/z16/src/common/up_createstack.c          |   2 +-
 arch/z16/src/common/up_schedulesigaction.c    |   4 +-
 arch/z16/src/common/up_sigdeliver.c           |   4 +-
 arch/z16/src/common/up_unblocktask.c          |   2 +-
 arch/z16/src/z16f/z16f_espi.c                 |   6 +-
 arch/z80/src/common/up_blocktask.c            |   2 +-
 arch/z80/src/common/up_createstack.c          |   2 +-
 arch/z80/src/common/up_unblocktask.c          |   2 +-
 arch/z80/src/ez80/ez80_emac.c                 |  50 ++---
 arch/z80/src/ez80/ez80_i2c.c                  |  18 +-
 arch/z80/src/ez80/ez80_schedulesigaction.c    |   2 +-
 arch/z80/src/ez80/ez80_sigdeliver.c           |   4 +-
 arch/z80/src/z180/z180_mmu.c                  |   6 +-
 arch/z80/src/z180/z180_schedulesigaction.c    |   2 +-
 arch/z80/src/z180/z180_sigdeliver.c           |   4 +-
 arch/z80/src/z8/z8_i2c.c                      |   2 +-
 arch/z80/src/z8/z8_schedulesigaction.c        |   2 +-
 arch/z80/src/z8/z8_sigdeliver.c               |   4 +-
 arch/z80/src/z80/z80_schedulesigaction.c      |   2 +-
 arch/z80/src/z80/z80_sigdeliver.c             |   4 +-
 audio/audio.c                                 |   4 +-
 audio/pcm_decode.c                            |  48 ++--
 binfmt/binfmt_copyargv.c                      |   4 +-
 binfmt/binfmt_dumpmodule.c                    |  22 +-
 binfmt/binfmt_exec.c                          |  14 +-
 binfmt/binfmt_execmodule.c                    |  16 +-
 binfmt/binfmt_loadmodule.c                    |   4 +-
 binfmt/binfmt_unloadmodule.c                  |   6 +-
 binfmt/builtin.c                              |   8 +-
 binfmt/elf.c                                  |  94 ++++----
 binfmt/libelf/libelf_addrenv.c                |   8 +-
 binfmt/libelf/libelf_bind.c                   |  22 +-
 binfmt/libelf/libelf_ctors.c                  |   6 +-
 binfmt/libelf/libelf_dtors.c                  |   6 +-
 binfmt/libelf/libelf_init.c                   |  12 +-
 binfmt/libelf/libelf_iobuffer.c               |   4 +-
 binfmt/libelf/libelf_load.c                   |  16 +-
 binfmt/libelf/libelf_read.c                   |   6 +-
 binfmt/libelf/libelf_sections.c               |  18 +-
 binfmt/libelf/libelf_symbols.c                |  18 +-
 binfmt/libelf/libelf_verify.c                 |   6 +-
 binfmt/libnxflat/libnxflat_addrenv.c          |  12 +-
 binfmt/libnxflat/libnxflat_bind.c             |  22 +-
 binfmt/libnxflat/libnxflat_init.c             |   6 +-
 binfmt/libnxflat/libnxflat_load.c             |  10 +-
 binfmt/libnxflat/libnxflat_read.c             |   6 +-
 binfmt/libnxflat/libnxflat_verify.c           |   4 +-
 binfmt/nxflat.c                               |  52 ++---
 binfmt/pcode.c                                |  26 +--
 configs/arduino-due/src/sam_autoleds.c        |   4 +-
 configs/arduino-due/src/sam_mmcsd.c           |   4 +-
 configs/arduino-due/src/sam_touchscreen.c     |   6 +-
 configs/arduino-due/src/sam_userleds.c        |   4 +-
 .../cc3200-launchpad/src/cc3200_autoleds.c    |   4 +-
 configs/cloudctrl/src/stm32_adc.c             |   4 +-
 configs/cloudctrl/src/stm32_autoleds.c        |   4 +-
 configs/cloudctrl/src/stm32_spi.c             |   8 +-
 configs/cloudctrl/src/stm32_usb.c             |   4 +-
 configs/cloudctrl/src/stm32_userleds.c        |   4 +-
 configs/cloudctrl/src/stm32_w25.c             |  10 +-
 configs/compal_e99/src/ssd1783.c              |   6 +-
 configs/demo9s12ne64/src/m9s12_leds.c         |   4 +-
 configs/demo9s12ne64/src/m9s12_spi.c          |   4 +-
 configs/dk-tm4c129x/src/tm4c_bringup.c        |   8 +-
 configs/dk-tm4c129x/src/tm4c_ssi.c            |   8 +-
 configs/dk-tm4c129x/src/tm4c_timer.c          |   2 +-
 configs/dk-tm4c129x/src/tm4c_userleds.c       |   4 +-
 configs/ea3131/src/lpc31_leds.c               |   4 +-
 configs/ea3131/src/lpc31_spi.c                |   6 +-
 configs/ea3131/src/lpc31_usbhost.c            |   8 +-
 configs/ea3152/src/lpc31_leds.c               |   4 +-
 configs/ea3152/src/lpc31_spi.c                |   6 +-
 configs/eagle100/src/lm_leds.c                |   6 +-
 configs/eagle100/src/lm_ssi.c                 |   8 +-
 configs/efm32-g8xx-stk/src/efm32_autoleds.c   |   4 +-
 configs/efm32-g8xx-stk/src/efm32_userleds.c   |   4 +-
 configs/efm32gg-stk3700/src/efm32_autoleds.c  |   4 +-
 configs/efm32gg-stk3700/src/efm32_userleds.c  |   4 +-
 configs/ekk-lm3s9b96/src/lm_leds.c            |   6 +-
 configs/ekk-lm3s9b96/src/lm_ssi.c             |   8 +-
 configs/fire-stm32v2/src/stm32_appinit.c      |   4 +-
 configs/fire-stm32v2/src/stm32_autoleds.c     |   4 +-
 configs/fire-stm32v2/src/stm32_mmcsd.c        |   4 +-
 configs/fire-stm32v2/src/stm32_spi.c          |   8 +-
 configs/fire-stm32v2/src/stm32_userleds.c     |   4 +-
 configs/fire-stm32v2/src/stm32_w25.c          |  10 +-
 configs/freedom-kl25z/src/kl_adxl345.c        |   8 +-
 configs/freedom-kl25z/src/kl_appinit.c        |   2 +-
 configs/freedom-kl25z/src/kl_led.c            |   4 +-
 configs/freedom-kl25z/src/kl_pwm.c            |   4 +-
 configs/freedom-kl25z/src/kl_spi.c            |   4 +-
 configs/freedom-kl25z/src/kl_wifi.c           |   6 +-
 configs/freedom-kl26z/src/kl_led.c            |   4 +-
 configs/freedom-kl26z/src/kl_pwm.c            |   4 +-
 configs/freedom-kl26z/src/kl_spi.c            |   4 +-
 configs/hymini-stm32v/src/stm32_leds.c        |   4 +-
 configs/hymini-stm32v/src/stm32_r61505u.c     |  46 ++--
 configs/hymini-stm32v/src/stm32_spi.c         |  10 +-
 configs/hymini-stm32v/src/stm32_ssd1289.c     |  46 ++--
 configs/hymini-stm32v/src/stm32_ts.c          |   4 +-
 configs/kwikstik-k40/src/k40_lcd.c            |   4 +-
 configs/kwikstik-k40/src/k40_leds.c           |   4 +-
 configs/kwikstik-k40/src/k40_spi.c            |  10 +-
 .../launchxl-tms57004/src/tms570_autoleds.c   |   4 +-
 configs/lincoln60/src/lpc17_leds.c            |   4 +-
 configs/lm3s6432-s2e/src/lm_leds.c            |   6 +-
 configs/lm3s6432-s2e/src/lm_ssi.c             |   8 +-
 configs/lm3s6965-ek/src/lm_leds.c             |   6 +-
 configs/lm3s6965-ek/src/lm_oled.c             |   4 +-
 configs/lm3s6965-ek/src/lm_ssi.c              |   8 +-
 configs/lm3s8962-ek/src/lm_leds.c             |   6 +-
 configs/lm3s8962-ek/src/lm_oled.c             |   4 +-
 configs/lm3s8962-ek/src/lm_ssi.c              |   8 +-
 configs/lm4f120-launchpad/src/lm4f_autoleds.c |   6 +-
 configs/lm4f120-launchpad/src/lm4f_ssi.c      |   8 +-
 configs/lpc4330-xplorer/src/lpc43_appinit.c   |   8 +-
 configs/lpc4330-xplorer/src/lpc43_autoleds.c  |   4 +-
 configs/lpc4330-xplorer/src/lpc43_userleds.c  |   4 +-
 configs/lpc4337-ws/src/lpc43_adc.c            |   4 +-
 configs/lpc4337-ws/src/lpc43_appinit.c        |   4 +-
 configs/lpc4357-evb/src/lpc43_appinit.c       |   8 +-
 configs/lpc4357-evb/src/lpc43_autoleds.c      |   4 +-
 configs/lpc4357-evb/src/lpc43_userleds.c      |   4 +-
 configs/lpc4370-link2/src/lpc43_adc.c         |   4 +-
 configs/lpc4370-link2/src/lpc43_appinit.c     |   4 +-
 configs/lpc4370-link2/src/lpc43_autoleds.c    |   4 +-
 configs/lpc4370-link2/src/lpc43_userleds.c    |   4 +-
 configs/lpcxpresso-lpc1115/src/lpc11_adc.c    |   4 +-
 configs/lpcxpresso-lpc1115/src/lpc11_dac.c    |   4 +-
 configs/lpcxpresso-lpc1115/src/lpc11_leds.c   |   4 +-
 configs/lpcxpresso-lpc1115/src/lpc11_pwm.c    |  12 +-
 configs/lpcxpresso-lpc1115/src/lpc11_ssp.c    |  14 +-
 configs/lpcxpresso-lpc1768/src/lpc17_adc.c    |   4 +-
 configs/lpcxpresso-lpc1768/src/lpc17_dac.c    |   4 +-
 configs/lpcxpresso-lpc1768/src/lpc17_leds.c   |   4 +-
 configs/lpcxpresso-lpc1768/src/lpc17_oled.c   |   4 +-
 configs/lpcxpresso-lpc1768/src/lpc17_pwm.c    |  12 +-
 configs/lpcxpresso-lpc1768/src/lpc17_ssp.c    |  14 +-
 configs/maple/src/stm32_lcd.c                 |  22 +-
 configs/maple/src/stm32_leds.c                |   4 +-
 configs/maple/src/stm32_spi.c                 |   6 +-
 configs/mbed/src/lpc17_adc.c                  |   4 +-
 configs/mbed/src/lpc17_dac.c                  |   4 +-
 configs/mbed/src/lpc17_hidkbd.c               |   2 +-
 configs/mbed/src/lpc17_leds.c                 |   4 +-
 configs/mbed/src/lpc17_pwm.c                  |  12 +-
 configs/mcu123-lpc214x/src/lpc2148_spi1.c     |  20 +-
 configs/mikroe-stm32f4/src/stm32_mio283qt2.c  |   6 +-
 configs/mikroe-stm32f4/src/stm32_mio283qt9a.c |   6 +-
 configs/mikroe-stm32f4/src/stm32_pwm.c        |   4 +-
 configs/mikroe-stm32f4/src/stm32_qencoder.c   |   2 +-
 configs/mikroe-stm32f4/src/stm32_spi.c        |   8 +-
 .../mikroe-stm32f4/src/stm32_touchscreen.c    |  16 +-
 configs/mikroe-stm32f4/src/stm32_usb.c        |   4 +-
 configs/mikroe-stm32f4/src/stm32_vs1053.c     |   2 +-
 configs/mirtoo/README.txt                     |   6 +-
 configs/mirtoo/src/pic32_appinit.c            |  10 +-
 configs/mirtoo/src/pic32_leds.c               |   4 +-
 configs/mirtoo/src/pic32_spi2.c               |   6 +-
 configs/moteino-mega/src/avr_leds.c           |   4 +-
 configs/ne64badge/src/m9s12_buttons.c         |   4 +-
 configs/ne64badge/src/m9s12_leds.c            |   4 +-
 configs/ne64badge/src/m9s12_spi.c             |   4 +-
 configs/nucleo-144/src/stm32_appinitialize.c  |   4 +-
 configs/nucleo-144/src/stm32_autoleds.c       |   4 +-
 configs/nucleo-144/src/stm32_sdio.c           |   4 +-
 configs/nucleo-144/src/stm32_spi.c            |  16 +-
 configs/nucleo-144/src/stm32_userleds.c       |   4 +-
 configs/nucleo-f303re/src/stm32_adc.c         |   4 +-
 configs/nucleo-f303re/src/stm32_autoleds.c    |   4 +-
 configs/nucleo-f303re/src/stm32_can.c         |   8 +-
 configs/nucleo-f303re/src/stm32_pwm.c         |   8 +-
 configs/nucleo-f303re/src/stm32_spi.c         |  10 +-
 configs/nucleo-f303re/src/stm32_ssd1351.c     |   8 +-
 configs/nucleo-f303re/src/stm32_userleds.c    |   4 +-
 configs/nucleo-f4x1re/src/stm32_adc.c         |   4 +-
 configs/nucleo-f4x1re/src/stm32_ajoystick.c   |  14 +-
 configs/nucleo-f4x1re/src/stm32_autoleds.c    |   4 +-
 configs/nucleo-f4x1re/src/stm32_spi.c         |  12 +-
 configs/nucleo-f4x1re/src/stm32_userleds.c    |   4 +-
 configs/nucleo-f4x1re/src/stm32_wireless.c    |   6 +-
 configs/nucleo-l476rg/src/stm32_adc.c         |   4 +-
 configs/nucleo-l476rg/src/stm32_ajoystick.c   |  14 +-
 configs/nucleo-l476rg/src/stm32_appinit.c     |   4 +-
 configs/nucleo-l476rg/src/stm32_autoleds.c    |   4 +-
 configs/nucleo-l476rg/src/stm32_spi.c         |  12 +-
 configs/nucleo-l476rg/src/stm32_userleds.c    |   4 +-
 configs/nucleo-l476rg/src/stm32_wireless.c    |   6 +-
 configs/nutiny-nuc120/src/nuc_led.c           |   4 +-
 configs/olimex-lpc-h3131/src/lpc31_leds.c     |   4 +-
 configs/olimex-lpc-h3131/src/lpc31_mmcsd.c    |   4 +-
 configs/olimex-lpc-h3131/src/lpc31_spi.c      |   6 +-
 configs/olimex-lpc-h3131/src/lpc31_usbhost.c  |  10 +-
 configs/olimex-lpc1766stk/src/lpc17_can.c     |   8 +-
 configs/olimex-lpc1766stk/src/lpc17_hidkbd.c  |   2 +-
 .../olimex-lpc1766stk/src/lpc17_hidmouse.c    |  10 +-
 configs/olimex-lpc1766stk/src/lpc17_lcd.c     |   4 +-
 configs/olimex-lpc1766stk/src/lpc17_leds.c    |   4 +-
 configs/olimex-lpc1766stk/src/lpc17_ssp.c     |  12 +-
 configs/olimex-stm32-h405/src/stm32_adc.c     |   4 +-
 .../olimex-stm32-h405/src/stm32_autoleds.c    |   4 +-
 configs/olimex-stm32-h405/src/stm32_can.c     |   8 +-
 .../olimex-stm32-h405/src/stm32_userleds.c    |   4 +-
 configs/olimex-stm32-h407/src/stm32_adc.c     |   4 +-
 .../olimex-stm32-h407/src/stm32_autoleds.c    |   4 +-
 configs/olimex-stm32-h407/src/stm32_can.c     |   8 +-
 configs/olimex-stm32-h407/src/stm32_sdio.c    |   4 +-
 configs/olimex-stm32-h407/src/stm32_usb.c     |   6 +-
 .../olimex-stm32-h407/src/stm32_userleds.c    |   4 +-
 configs/olimex-stm32-p107/src/stm32_can.c     |   8 +-
 configs/olimex-stm32-p107/src/stm32_spi.c     |   6 +-
 configs/olimex-stm32-p207/src/stm32_adc.c     |   4 +-
 .../olimex-stm32-p207/src/stm32_autoleds.c    |   4 +-
 configs/olimex-stm32-p207/src/stm32_can.c     |   8 +-
 configs/olimex-stm32-p207/src/stm32_usb.c     |   6 +-
 .../olimex-stm32-p207/src/stm32_userleds.c    |   4 +-
 configs/olimexino-stm32/src/stm32_can.c       |   8 +-
 configs/olimexino-stm32/src/stm32_leds.c      |   4 +-
 configs/olimexino-stm32/src/stm32_spi.c       |  10 +-
 configs/open1788/src/lpc17_autoleds.c         |   4 +-
 configs/open1788/src/lpc17_ssp.c              |  16 +-
 configs/open1788/src/lpc17_touchscreen.c      |   6 +-
 configs/open1788/src/lpc17_userleds.c         |   4 +-
 .../pcblogic-pic32mx/src/pic32mx_lcd1602.c    |   4 +-
 configs/pcduino-a10/src/a1x_leds.c            |   4 +-
 configs/pic32mx-starterkit/src/pic32mx_leds.c |   4 +-
 configs/pic32mx-starterkit/src/pic32mx_spi.c  |  20 +-
 configs/pic32mx7mmb/src/pic32_leds.c          |   4 +-
 configs/pic32mx7mmb/src/pic32_mio283qt2.c     |   6 +-
 configs/pic32mx7mmb/src/pic32_spi.c           |  20 +-
 configs/pic32mx7mmb/src/pic32_touchscreen.c   |  10 +-
 .../pic32mz-starterkit/src/pic32mz_autoleds.c |   4 +-
 configs/pic32mz-starterkit/src/pic32mz_spi.c  |  28 +--
 .../pic32mz-starterkit/src/pic32mz_userleds.c |   4 +-
 configs/sabre-6quad/src/imx_autoleds.c        |   4 +-
 configs/sabre-6quad/src/imx_bringup.c         |   2 +-
 configs/sam3u-ek/src/sam_lcd.c                |  22 +-
 configs/sam3u-ek/src/sam_leds.c               |   4 +-
 configs/sam3u-ek/src/sam_spi.c                |   4 +-
 configs/sam3u-ek/src/sam_touchscreen.c        |   6 +-
 configs/sam4e-ek/src/sam_ads7843e.c           |   6 +-
 configs/sam4e-ek/src/sam_at25.c               |  10 +-
 configs/sam4e-ek/src/sam_ethernet.c           |  20 +-
 configs/sam4e-ek/src/sam_hsmci.c              |   4 +-
 configs/sam4e-ek/src/sam_ili9325.c            |   6 +-
 configs/sam4e-ek/src/sam_ili9341.c            |   6 +-
 configs/sam4e-ek/src/sam_leds.c               |   4 +-
 configs/sam4e-ek/src/sam_spi.c                |   4 +-
 configs/sam4l-xplained/src/sam_autoleds.c     |   4 +-
 configs/sam4l-xplained/src/sam_mmcsd.c        |   4 +-
 configs/sam4l-xplained/src/sam_slcd.c         |   4 +-
 configs/sam4l-xplained/src/sam_spi.c          |   4 +-
 .../sam4l-xplained/src/sam_ug2832hsweg04.c    |   8 +-
 configs/sam4l-xplained/src/sam_userleds.c     |   4 +-
 configs/sam4s-xplained-pro/src/sam_autoleds.c |   4 +-
 configs/sam4s-xplained-pro/src/sam_hsmci.c    |   6 +-
 configs/sam4s-xplained-pro/src/sam_tc.c       |  20 +-
 configs/sam4s-xplained-pro/src/sam_userleds.c |   4 +-
 configs/sam4s-xplained-pro/src/sam_wdt.c      |  16 +-
 configs/sam4s-xplained/src/sam_autoleds.c     |   4 +-
 configs/sam4s-xplained/src/sam_userleds.c     |   4 +-
 configs/sama5d2-xult/src/sam_autoleds.c       |   4 +-
 configs/sama5d2-xult/src/sam_bringup.c        |   2 +-
 configs/sama5d2-xult/src/sam_userleds.c       |   4 +-
 configs/sama5d3-xplained/src/sam_adc.c        |   4 +-
 configs/sama5d3-xplained/src/sam_ajoystick.c  |  14 +-
 configs/sama5d3-xplained/src/sam_at25.c       |  10 +-
 configs/sama5d3-xplained/src/sam_autoleds.c   |   4 +-
 configs/sama5d3-xplained/src/sam_can.c        |   8 +-
 configs/sama5d3-xplained/src/sam_ethernet.c   |  28 +--
 configs/sama5d3-xplained/src/sam_hsmci.c      |   8 +-
 configs/sama5d3-xplained/src/sam_i2schar.c    |   4 +-
 configs/sama5d3-xplained/src/sam_nandflash.c  |   8 +-
 configs/sama5d3-xplained/src/sam_pwm.c        |   4 +-
 configs/sama5d3-xplained/src/sam_spi.c        |   4 +-
 configs/sama5d3-xplained/src/sam_usb.c        |  26 +--
 configs/sama5d3-xplained/src/sam_userleds.c   |   4 +-
 configs/sama5d3x-ek/src/sam_adc.c             |   4 +-
 configs/sama5d3x-ek/src/sam_at24.c            |  10 +-
 configs/sama5d3x-ek/src/sam_at25.c            |  10 +-
 configs/sama5d3x-ek/src/sam_autoleds.c        |   4 +-
 configs/sama5d3x-ek/src/sam_can.c             |   8 +-
 configs/sama5d3x-ek/src/sam_ethernet.c        |  28 +--
 configs/sama5d3x-ek/src/sam_hsmci.c           |   8 +-
 configs/sama5d3x-ek/src/sam_i2schar.c         |   4 +-
 configs/sama5d3x-ek/src/sam_nandflash.c       |   8 +-
 configs/sama5d3x-ek/src/sam_ov2640.c          |  12 +-
 configs/sama5d3x-ek/src/sam_pwm.c             |   4 +-
 configs/sama5d3x-ek/src/sam_spi.c             |   4 +-
 configs/sama5d3x-ek/src/sam_touchscreen.c     |   6 +-
 configs/sama5d3x-ek/src/sam_usb.c             |  24 +-
 configs/sama5d3x-ek/src/sam_userleds.c        |   4 +-
 configs/sama5d3x-ek/src/sam_wm8904.c          |  14 +-
 configs/sama5d4-ek/src/sam_adc.c              |   4 +-
 configs/sama5d4-ek/src/sam_at25.c             |  14 +-
 configs/sama5d4-ek/src/sam_audio_null.c       |   8 +-
 configs/sama5d4-ek/src/sam_autoleds.c         |   4 +-
 configs/sama5d4-ek/src/sam_automount.c        |   6 +-
 configs/sama5d4-ek/src/sam_bringup.c          |   6 +-
 configs/sama5d4-ek/src/sam_ethernet.c         |  28 +--
 configs/sama5d4-ek/src/sam_hsmci.c            |   8 +-
 configs/sama5d4-ek/src/sam_maxtouch.c         |   6 +-
 configs/sama5d4-ek/src/sam_nandflash.c        |   8 +-
 configs/sama5d4-ek/src/sam_pmic.c             |   2 +-
 configs/sama5d4-ek/src/sam_pwm.c              |   4 +-
 configs/sama5d4-ek/src/sam_spi.c              |   4 +-
 configs/sama5d4-ek/src/sam_usb.c              |  24 +-
 configs/sama5d4-ek/src/sam_userleds.c         |   4 +-
 configs/sama5d4-ek/src/sam_wm8904.c           |  14 +-
 configs/samd20-xplained/src/sam_autoleds.c    |   4 +-
 configs/samd20-xplained/src/sam_mmcsd.c       |   4 +-
 configs/samd20-xplained/src/sam_spi.c         |   4 +-
 .../samd20-xplained/src/sam_ug2832hsweg04.c   |   8 +-
 configs/samd20-xplained/src/sam_userleds.c    |   4 +-
 configs/samd21-xplained/src/sam_autoleds.c    |   4 +-
 configs/samd21-xplained/src/sam_mmcsd.c       |   4 +-
 configs/samd21-xplained/src/sam_spi.c         |   4 +-
 .../samd21-xplained/src/sam_ug2832hsweg04.c   |   8 +-
 configs/samd21-xplained/src/sam_userleds.c    |   4 +-
 configs/same70-xplained/src/sam_at24config.c  |   8 +-
 configs/same70-xplained/src/sam_autoleds.c    |   4 +-
 configs/same70-xplained/src/sam_bringup.c     |   6 +-
 configs/same70-xplained/src/sam_ethernet.c    |  34 +--
 configs/same70-xplained/src/sam_hsmci.c       |   8 +-
 configs/same70-xplained/src/sam_mcan.c        |   8 +-
 configs/same70-xplained/src/sam_spi.c         |   4 +-
 configs/saml21-xplained/src/sam_autoleds.c    |   4 +-
 configs/saml21-xplained/src/sam_mmcsd.c       |   4 +-
 configs/saml21-xplained/src/sam_spi.c         |   4 +-
 .../saml21-xplained/src/sam_ug2832hsweg04.c   |   8 +-
 configs/saml21-xplained/src/sam_userleds.c    |   4 +-
 configs/samv71-xult/src/sam_at24config.c      |   8 +-
 configs/samv71-xult/src/sam_audio_null.c      |   8 +-
 configs/samv71-xult/src/sam_autoleds.c        |   4 +-
 configs/samv71-xult/src/sam_bringup.c         |   6 +-
 configs/samv71-xult/src/sam_ethernet.c        |  34 +--
 configs/samv71-xult/src/sam_hsmci.c           |   8 +-
 configs/samv71-xult/src/sam_ili9488.c         |  30 +--
 configs/samv71-xult/src/sam_maxtouch.c        |   6 +-
 configs/samv71-xult/src/sam_mcan.c            |   8 +-
 configs/samv71-xult/src/sam_spi.c             |   4 +-
 configs/samv71-xult/src/sam_wm8904.c          |  14 +-
 configs/shenzhou/src/stm32_adc.c              |   4 +-
 configs/shenzhou/src/stm32_autoleds.c         |   4 +-
 configs/shenzhou/src/stm32_can.c              |   8 +-
 configs/shenzhou/src/stm32_ili93xx.c          |  22 +-
 configs/shenzhou/src/stm32_mmcsd.c            |   4 +-
 configs/shenzhou/src/stm32_spi.c              |   8 +-
 configs/shenzhou/src/stm32_ssd1289.c          |  16 +-
 configs/shenzhou/src/stm32_touchscreen.c      |   6 +-
 configs/shenzhou/src/stm32_usb.c              |   4 +-
 configs/shenzhou/src/stm32_userleds.c         |   4 +-
 configs/shenzhou/src/stm32_w25.c              |  10 +-
 configs/sim/src/sim_bringup.c                 |   2 +-
 configs/sim/src/sim_touchscreen.c             |  12 +-
 configs/spark/src/stm32_appinit.c             |   8 +-
 configs/spark/src/stm32_autoleds.c            |   4 +-
 configs/spark/src/stm32_composite.c           |  14 +-
 configs/spark/src/stm32_spi.c                 |  10 +-
 configs/spark/src/stm32_userleds.c            |   4 +-
 configs/spark/src/stm32_wireless.c            |   6 +-
 configs/stm3210e-eval/src/stm32_adc.c         |   4 +-
 configs/stm3210e-eval/src/stm32_appinit.c     |   4 +-
 configs/stm3210e-eval/src/stm32_can.c         |   8 +-
 configs/stm3210e-eval/src/stm32_lcd.c         |  58 ++---
 configs/stm3210e-eval/src/stm32_leds.c        |   4 +-
 configs/stm3210e-eval/src/stm32_spi.c         |  10 +-
 configs/stm3220g-eval/src/stm32_adc.c         |   4 +-
 configs/stm3220g-eval/src/stm32_appinit.c     |   4 +-
 configs/stm3220g-eval/src/stm32_autoleds.c    |   4 +-
 configs/stm3220g-eval/src/stm32_can.c         |   8 +-
 configs/stm3220g-eval/src/stm32_lcd.c         |  10 +-
 configs/stm3220g-eval/src/stm32_pwm.c         |   4 +-
 configs/stm3220g-eval/src/stm32_spi.c         |  10 +-
 configs/stm3220g-eval/src/stm32_stmpe811.c    |   8 +-
 configs/stm3220g-eval/src/stm32_usb.c         |   4 +-
 configs/stm3220g-eval/src/stm32_userleds.c    |   4 +-
 configs/stm3240g-eval/src/stm32_adc.c         |   4 +-
 configs/stm3240g-eval/src/stm32_appinit.c     |   8 +-
 configs/stm3240g-eval/src/stm32_autoleds.c    |   4 +-
 configs/stm3240g-eval/src/stm32_boot.c        |   6 +-
 configs/stm3240g-eval/src/stm32_can.c         |   8 +-
 configs/stm3240g-eval/src/stm32_lcd.c         |  10 +-
 configs/stm3240g-eval/src/stm32_pwm.c         |   4 +-
 configs/stm3240g-eval/src/stm32_spi.c         |  10 +-
 configs/stm3240g-eval/src/stm32_stmpe811.c    |   8 +-
 configs/stm3240g-eval/src/stm32_usb.c         |   4 +-
 configs/stm3240g-eval/src/stm32_userleds.c    |   4 +-
 configs/stm32_tiny/src/stm32_leds.c           |   4 +-
 configs/stm32_tiny/src/stm32_pwm.c            |   4 +-
 configs/stm32_tiny/src/stm32_spi.c            |   4 +-
 configs/stm32_tiny/src/stm32_wireless.c       |   4 +-
 .../stm32f103-minimum/src/stm32_autoleds.c    |   4 +-
 configs/stm32f103-minimum/src/stm32_spi.c     |   4 +-
 configs/stm32f3discovery/src/stm32_autoleds.c |   4 +-
 configs/stm32f3discovery/src/stm32_pwm.c      |   4 +-
 configs/stm32f3discovery/src/stm32_qencoder.c |   2 +-
 configs/stm32f3discovery/src/stm32_spi.c      |  10 +-
 configs/stm32f3discovery/src/stm32_userleds.c |   4 +-
 configs/stm32f429i-disco/src/stm32_appinit.c  |   8 +-
 configs/stm32f429i-disco/src/stm32_autoleds.c |   4 +-
 .../stm32f429i-disco/src/stm32_ili93414ws.c   |  10 +-
 configs/stm32f429i-disco/src/stm32_lcd.c      |   8 +-
 configs/stm32f429i-disco/src/stm32_spi.c      |  12 +-
 configs/stm32f429i-disco/src/stm32_usb.c      |   6 +-
 configs/stm32f429i-disco/src/stm32_userleds.c |   4 +-
 configs/stm32f4discovery/src/stm32_autoleds.c |   4 +-
 .../stm32f4discovery/src/stm32_bh1750fvi.c    |   4 +-
 configs/stm32f4discovery/src/stm32_bmp180.c   |   4 +-
 configs/stm32f4discovery/src/stm32_bringup.c  |  16 +-
 configs/stm32f4discovery/src/stm32_ethernet.c |  14 +-
 configs/stm32f4discovery/src/stm32_max31855.c |   2 +-
 configs/stm32f4discovery/src/stm32_max6675.c  |   2 +-
 configs/stm32f4discovery/src/stm32_pca9635.c  |   4 +-
 configs/stm32f4discovery/src/stm32_pwm.c      |   4 +-
 configs/stm32f4discovery/src/stm32_qencoder.c |   2 +-
 configs/stm32f4discovery/src/stm32_rgbled.c   |   8 +-
 configs/stm32f4discovery/src/stm32_sdio.c     |   4 +-
 configs/stm32f4discovery/src/stm32_spi.c      |  10 +-
 configs/stm32f4discovery/src/stm32_ssd1289.c  |   6 +-
 configs/stm32f4discovery/src/stm32_ssd1351.c  |   8 +-
 .../src/stm32_ug2864ambag01.c                 |   8 +-
 .../src/stm32_ug2864hsweg01.c                 |   8 +-
 configs/stm32f4discovery/src/stm32_usb.c      |  10 +-
 configs/stm32f4discovery/src/stm32_userleds.c |   4 +-
 configs/stm32f746g-disco/src/stm32_autoleds.c |   4 +-
 configs/stm32f746g-disco/src/stm32_spi.c      |  14 +-
 configs/stm32f746g-disco/src/stm32_userleds.c |   4 +-
 configs/stm32l476vg-disco/src/stm32_appinit.c |   6 +-
 .../stm32l476vg-disco/src/stm32_autoleds.c    |   4 +-
 configs/stm32l476vg-disco/src/stm32_spi.c     |  12 +-
 .../stm32l476vg-disco/src/stm32_userleds.c    |   4 +-
 configs/stm32ldiscovery/src/stm32_autoleds.c  |   4 +-
 configs/stm32ldiscovery/src/stm32_lcd.c       |   4 +-
 configs/stm32ldiscovery/src/stm32_pwm.c       |   4 +-
 configs/stm32ldiscovery/src/stm32_qencoder.c  |   2 +-
 configs/stm32ldiscovery/src/stm32_spi.c       |  10 +-
 configs/stm32ldiscovery/src/stm32_userleds.c  |   4 +-
 configs/stm32vldiscovery/src/stm32_leds.c     |   4 +-
 configs/sure-pic32mx/src/pic32mx_autoleds.c   |   4 +-
 configs/sure-pic32mx/src/pic32mx_lcd1602.c    |   4 +-
 configs/sure-pic32mx/src/pic32mx_spi.c        |   4 +-
 configs/teensy-2.0/src/at90usb_leds.c         |   4 +-
 configs/teensy-2.0/src/at90usb_spi.c          |   8 +-
 configs/teensy-3.x/src/k20_pwm.c              |  12 +-
 configs/teensy-3.x/src/k20_spi.c              |  10 +-
 configs/teensy-lc/src/kl_led.c                |   4 +-
 configs/teensy-lc/src/kl_pwm.c                |   4 +-
 configs/teensy-lc/src/kl_spi.c                |   4 +-
 .../tm4c123g-launchpad/src/tm4c_autoleds.c    |   6 +-
 configs/tm4c123g-launchpad/src/tm4c_ssi.c     |   8 +-
 configs/tm4c1294-launchpad/src/tm4c_bringup.c |   6 +-
 configs/tm4c1294-launchpad/src/tm4c_timer.c   |   2 +-
 .../tm4c1294-launchpad/src/tm4c_userleds.c    |   4 +-
 configs/twr-k60n512/src/k60_leds.c            |   4 +-
 configs/twr-k60n512/src/k60_spi.c             |  10 +-
 configs/u-blox-c027/src/lpc17_adc.c           |   4 +-
 configs/u-blox-c027/src/lpc17_dac.c           |   4 +-
 configs/u-blox-c027/src/lpc17_leds.c          |   4 +-
 configs/u-blox-c027/src/lpc17_pwm.c           |  12 +-
 configs/u-blox-c027/src/lpc17_ssp.c           |  14 +-
 configs/u-blox-c027/src/lpc17_ubxmdm.c        |   4 +-
 configs/ubw32/src/pic32_leds.c                |   4 +-
 configs/us7032evb1/shterm/shterm.c            |   2 +-
 .../viewtool-stm32f107/src/stm32_appinit.c    |   4 +-
 configs/viewtool-stm32f107/src/stm32_can.c    |   8 +-
 configs/viewtool-stm32f107/src/stm32_leds.c   |   4 +-
 configs/viewtool-stm32f107/src/stm32_mmcsd.c  |   4 +-
 .../viewtool-stm32f107/src/stm32_mpl115a.c    |   2 +-
 configs/viewtool-stm32f107/src/stm32_spi.c    |  10 +-
 .../viewtool-stm32f107/src/stm32_ssd1289.c    |  46 ++--
 .../src/stm32_touchscreen.c                   |   6 +-
 configs/zkit-arm-1769/src/lpc17_adc.c         |   4 +-
 configs/zkit-arm-1769/src/lpc17_can.c         |  12 +-
 configs/zkit-arm-1769/src/lpc17_dac.c         |   4 +-
 configs/zkit-arm-1769/src/lpc17_lcd.c         |   4 +-
 configs/zkit-arm-1769/src/lpc17_leds.c        |   4 +-
 configs/zkit-arm-1769/src/lpc17_spi.c         |  10 +-
 configs/zkit-arm-1769/src/lpc17_ssp.c         |  14 +-
 configs/zp214xpa/src/lpc2148_spi1.c           |  26 +--
 configs/zp214xpa/src/lpc2148_ug2864ambag01.c  |   8 +-
 drivers/analog/ad5410.c                       |   2 +-
 drivers/analog/adc.c                          |   2 +-
 drivers/analog/ads1242.c                      |  14 +-
 drivers/analog/ads1255.c                      |   2 +-
 drivers/analog/pga11x.c                       |   6 +-
 drivers/audio/audio_null.c                    |  12 +-
 drivers/audio/i2schar.c                       |  14 +-
 drivers/audio/vs1053.c                        |  36 +--
 drivers/audio/wm8904.c                        |  32 +--
 drivers/bch/bchdev_register.c                 |   4 +-
 drivers/bch/bchdev_unregister.c               |   4 +-
 drivers/bch/bchlib_cache.c                    |   4 +-
 drivers/bch/bchlib_read.c                     |   2 +-
 drivers/bch/bchlib_setup.c                    |  12 +-
 drivers/bch/bchlib_write.c                    |   4 +-
 drivers/can.c                                 |   6 +-
 drivers/i2c/i2c_driver.c                      |   4 +-
 drivers/input/ads7843e.c                      |  18 +-
 drivers/input/max11802.c                      |  20 +-
 drivers/input/mxt.c                           |  58 ++---
 drivers/input/stmpe811_adc.c                  |   8 +-
 drivers/input/stmpe811_base.c                 |  12 +-
 drivers/input/stmpe811_gpio.c                 |  10 +-
 drivers/input/stmpe811_tsc.c                  |  14 +-
 drivers/input/tsc2007.c                       |  24 +-
 drivers/lcd/ili9341.c                         |  16 +-
 drivers/lcd/memlcd.c                          |  16 +-
 drivers/lcd/mio283qt2.c                       |   8 +-
 drivers/lcd/mio283qt9a.c                      |   6 +-
 drivers/lcd/nokia6100.c                       |  14 +-
 drivers/lcd/p14201.c                          |  20 +-
 drivers/lcd/pcf8574_lcd_backpack.c            |   4 +-
 drivers/lcd/ra8875.c                          |  10 +-
 drivers/lcd/skeleton.c                        |   4 +-
 drivers/lcd/ssd1289.c                         |  16 +-
 drivers/lcd/ssd1306.h                         |   4 +-
 drivers/lcd/ssd1306_i2c.c                     |   4 +-
 drivers/lcd/ssd1351.c                         |   4 +-
 drivers/lcd/st7565.c                          |   4 +-
 drivers/lcd/st7567.c                          |   4 +-
 drivers/lcd/ug-2864ambag01.c                  |   4 +-
 drivers/lcd/ug-9664hswag01.c                  |   4 +-
 drivers/leds/pca9635pw.c                      |  28 +--
 drivers/leds/rgbled.c                         |   6 +-
 drivers/leds/userled_upper.c                  |   4 +-
 drivers/loop/losetup.c                        |  20 +-
 drivers/mmcsd/mmcsd_sdio.c                    | 132 +++++------
 drivers/mmcsd/mmcsd_spi.c                     | 100 ++++-----
 drivers/modem/u-blox.c                        |  10 +-
 drivers/mtd/at24xx.c                          |   2 +-
 drivers/mtd/at25.c                            |   4 +-
 drivers/mtd/at45db.c                          |   4 +-
 drivers/mtd/filemtd.c                         |  10 +-
 drivers/mtd/ftl.c                             |  30 +--
 drivers/mtd/hamming.c                         |   6 +-
 drivers/mtd/is25xp.c                          |   2 +-
 drivers/mtd/m25px.c                           |   2 +-
 drivers/mtd/mtd_config.c                      |   2 +-
 drivers/mtd/mtd_nand.c                        |  32 +--
 drivers/mtd/mtd_nandecc.c                     |   8 +-
 drivers/mtd/mtd_onfi.c                        |   4 +-
 drivers/mtd/mtd_partition.c                   |  26 +--
 drivers/mtd/mtd_procfs.c                      |   6 +-
 drivers/mtd/mtd_rwbuffer.c                    |  10 +-
 drivers/mtd/n25qxxx.c                         |  36 +--
 drivers/mtd/rammtd.c                          |   6 +-
 drivers/mtd/ramtron.c                         |   4 +-
 drivers/mtd/s25fl1.c                          |  36 +--
 drivers/mtd/sector512.c                       |  18 +-
 drivers/mtd/smart.c                           | 186 ++++++++--------
 drivers/mtd/sst25.c                           |   4 +-
 drivers/mtd/sst25xx.c                         |   2 +-
 drivers/mtd/sst26.c                           |   6 +-
 drivers/mtd/sst39vf.c                         |   4 +-
 drivers/mtd/w25.c                             |   4 +-
 drivers/net/cs89x0.c                          |   4 +-
 drivers/net/dm90x0.c                          |  28 +--
 drivers/net/e1000.c                           |   2 +-
 drivers/net/ftmac100.c                        |   6 +-
 drivers/net/loopback.c                        |   6 +-
 drivers/net/phy_notify.c                      |  16 +-
 drivers/net/skeleton.c                        |   4 +-
 drivers/net/slip.c                            |  14 +-
 drivers/net/tun.c                             |   4 +-
 drivers/net/vnet.c                            |   2 +-
 drivers/pipes/pipe_common.c                   |   6 +-
 drivers/power/battery_charger.c               |   4 +-
 drivers/power/battery_gauge.c                 |   4 +-
 drivers/power/bq2425x.c                       |  50 ++---
 drivers/power/max1704x.c                      |  14 +-
 drivers/pwm.c                                 |   6 +-
 drivers/ramdisk.c                             |   2 +-
 drivers/rwbuffer.c                            |  16 +-
 drivers/sensors/adxl345_base.c                |   8 +-
 drivers/sensors/adxl345_i2c.c                 |  12 +-
 drivers/sensors/adxl345_spi.c                 |   6 +-
 drivers/sensors/as5048b.c                     |  66 +++---
 drivers/sensors/bh1750fvi.c                   |  38 ++--
 drivers/sensors/bmp180.c                      |  22 +-
 drivers/sensors/lm75.c                        |  50 ++---
 drivers/sensors/lm92.c                        |  66 +++---
 drivers/sensors/lsm9ds1.c                     |  34 +--
 drivers/sensors/max31855.c                    |  18 +-
 drivers/sensors/max6675.c                     |  14 +-
 drivers/sensors/mb7040.c                      |  22 +-
 drivers/sensors/mcp9844.c                     |  18 +-
 drivers/sensors/mpl115a.c                     |  24 +-
 drivers/sensors/ms58xx.c                      |  54 ++---
 drivers/sensors/qencoder.c                    |   2 +-
 drivers/sercomm/console.c                     |   2 +-
 drivers/serial/serial.c                       |   2 +-
 drivers/serial/uart_16550.c                   |   2 +-
 drivers/spi/spi_bitbang.c                     |   6 +-
 drivers/timers/cs2100-cp.c                    |  96 ++++----
 drivers/timers/ds3231.c                       |  12 +-
 drivers/timers/pcf85263.c                     |  12 +-
 drivers/timers/timer.c                        |  10 +-
 drivers/timers/watchdog.c                     |  10 +-
 drivers/usbhost/usbhost_cdcacm.c              |  46 ++--
 drivers/usbhost/usbhost_devaddr.c             |   2 +-
 drivers/usbhost/usbhost_enumerate.c           |  24 +-
 drivers/usbhost/usbhost_hidkbd.c              |  22 +-
 drivers/usbhost/usbhost_hidmouse.c            |  24 +-
 drivers/usbhost/usbhost_hub.c                 |  44 ++--
 drivers/usbhost/usbhost_skeleton.c            |   8 +-
 drivers/usbhost/usbhost_storage.c             |  30 +--
 drivers/video/ov2640.c                        |  46 ++--
 drivers/wireless/cc3000/cc3000.c              |  10 +-
 drivers/wireless/cc3000/cc3000drv.c           |   4 +-
 drivers/wireless/cc3000/socket.c              |   4 +-
 drivers/wireless/ieee802154/mrf24j40.c        |  34 +--
 drivers/wireless/nrf24l01.c                   |  14 +-
 drivers/wireless/pn532.c                      |  42 ++--
 fs/aio/aio_fsync.c                            |   2 +-
 fs/aio/aio_read.c                             |   2 +-
 fs/aio/aio_signal.c                           |   6 +-
 fs/aio/aio_write.c                            |   4 +-
 fs/binfs/fs_binfs.c                           |   4 +-
 fs/driver/fs_blockproxy.c                     |   8 +-
 fs/driver/fs_closeblockdriver.c               |   2 +-
 fs/driver/fs_findblockdriver.c                |   6 +-
 fs/driver/fs_openblockdriver.c                |   4 +-
 fs/fat/fs_configfat.c                         |  38 ++--
 fs/fat/fs_fat32.c                             |   4 +-
 fs/fat/fs_fat32util.c                         |  50 ++---
 fs/fat/fs_mkfatfs.c                           |  26 +--
 fs/mmap/fs_mmap.c                             |   6 +-
 fs/mmap/fs_munmap.c                           |   4 +-
 fs/mmap/fs_rammap.c                           |   8 +-
 fs/mount/fs_automount.c                       |  26 +--
 fs/mount/fs_mount.c                           |  14 +-
 fs/nfs/nfs_util.c                             |  24 +-
 fs/nfs/nfs_vfsops.c                           |  88 ++++----
 fs/nfs/rpc_clnt.c                             |  52 ++---
 fs/nxffs/nxffs_block.c                        |   4 +-
 fs/nxffs/nxffs_blockstats.c                   |  26 +--
 fs/nxffs/nxffs_cache.c                        |   8 +-
 fs/nxffs/nxffs_dump.c                         |   6 +-
 fs/nxffs/nxffs_initialize.c                   |  26 +--
 fs/nxffs/nxffs_inode.c                        |   8 +-
 fs/nxffs/nxffs_ioctl.c                        |   4 +-
 fs/nxffs/nxffs_open.c                         |  50 ++---
 fs/nxffs/nxffs_pack.c                         |  32 +--
 fs/nxffs/nxffs_read.c                         |  16 +-
 fs/nxffs/nxffs_reformat.c                     |  14 +-
 fs/nxffs/nxffs_stat.c                         |   2 +-
 fs/nxffs/nxffs_unlink.c                       |   8 +-
 fs/nxffs/nxffs_write.c                        |  32 +--
 fs/procfs/fs_procfs.c                         |   6 +-
 fs/procfs/fs_procfscpuload.c                  |  10 +-
 fs/procfs/fs_procfskmm.c                      |  10 +-
 fs/procfs/fs_procfsproc.c                     |  42 ++--
 fs/procfs/fs_procfsuptime.c                   |  10 +-
 fs/procfs/fs_skeleton.c                       |   8 +-
 fs/romfs/fs_romfs.c                           |  62 +++---
 fs/romfs/fs_romfsutil.c                       |   2 +-
 fs/smartfs/smartfs_procfs.c                   |   8 +-
 fs/smartfs/smartfs_smart.c                    |  34 +--
 fs/smartfs/smartfs_utils.c                    |  48 ++--
 fs/tmpfs/fs_tmpfs.c                           |   2 +-
 fs/unionfs/fs_unionfs.c                       |  12 +-
 fs/vfs/fs_epoll.c                             |   4 +-
 graphics/nxbe/nxbe_bitmap.c                   |   4 +-
 graphics/nxbe/nxbe_clipper.c                  |   2 +-
 graphics/nxbe/nxbe_configure.c                |  10 +-
 graphics/nxmu/nx_start.c                      |  12 +-
 graphics/nxmu/nxmu_reportposition.c           |   2 +-
 graphics/nxmu/nxmu_sendclient.c               |   2 +-
 graphics/nxmu/nxmu_server.c                   |  20 +-
 graphics/nxsu/nx_open.c                       |   4 +-
 graphics/nxterm/nxterm_driver.c               |   2 +-
 graphics/nxterm/nxterm_font.c                 |   2 +-
 graphics/nxterm/nxterm_kbdin.c                |  14 +-
 graphics/nxterm/nxterm_redraw.c               |   2 +-
 graphics/nxterm/nxterm_register.c             |   6 +-
 graphics/nxterm/nxterm_scroll.c               |   8 +-
 graphics/vnc/server/vnc_fbdev.c               |  30 +--
 graphics/vnc/server/vnc_negotiate.c           |  50 ++---
 graphics/vnc/server/vnc_raw.c                 |   4 +-
 graphics/vnc/server/vnc_receiver.c            |  32 +--
 graphics/vnc/server/vnc_rre.c                 |   4 +-
 graphics/vnc/server/vnc_server.c              |  14 +-
 graphics/vnc/server/vnc_server.h              |   8 +-
 graphics/vnc/server/vnc_updater.c             |   8 +-
 include/debug.h                               | 207 +++++++++---------
 include/nuttx/mm/shm.h                        |   8 +-
 include/nuttx/spi/spi_bitbang.c               |   4 +-
 include/nuttx/spi/spi_bitbang.h               |   4 +-
 include/nuttx/wireless/nrf24l01.h             |   4 +-
 libc/aio/lio_listio.c                         |  12 +-
 libc/misc/lib_dbg.c                           |   6 +-
 libc/misc/lib_slcddecode.c                    |  12 +-
 libc/netdb/lib_dnsaddserver.c                 |   8 +-
 libc/netdb/lib_dnsbind.c                      |   6 +-
 libc/netdb/lib_dnscache.c                     |   2 +-
 libc/netdb/lib_dnsforeach.c                   |   8 +-
 libc/netdb/lib_dnsquery.c                     |  20 +-
 libc/netdb/lib_gethostbyaddrr.c               |   2 +-
 libc/netdb/lib_gethostbynamer.c               |   2 +-
 libc/pthread/pthread_attrdestroy.c            |   4 +-
 libc/pthread/pthread_attrgetaffinity.c        |   2 +-
 libc/pthread/pthread_attrgetinheritsched.c    |   4 +-
 libc/pthread/pthread_attrgetschedparam.c      |   4 +-
 libc/pthread/pthread_attrgetschedpolicy.c     |   4 +-
 libc/pthread/pthread_attrgetstacksize.c       |   4 +-
 libc/pthread/pthread_attrinit.c               |   4 +-
 libc/pthread/pthread_attrsetaffinity.c        |   2 +-
 libc/pthread/pthread_attrsetinheritsched.c    |   4 +-
 libc/pthread/pthread_attrsetschedparam.c      |   4 +-
 libc/pthread/pthread_attrsetschedpolicy.c     |   4 +-
 libc/pthread/pthread_attrsetstacksize.c       |   4 +-
 libc/pthread/pthread_condattrdestroy.c        |   4 +-
 libc/pthread/pthread_condattrinit.c           |   4 +-
 libc/pthread/pthread_mutexattrdestroy.c       |   4 +-
 libc/pthread/pthread_mutexattrgetpshared.c    |   4 +-
 libc/pthread/pthread_mutexattrinit.c          |   4 +-
 libc/pthread/pthread_mutexattrsetpshared.c    |   4 +-
 libc/spawn/lib_psa_dump.c                     |  30 +--
 libc/spawn/lib_psfa_dump.c                    |  12 +-
 libc/stdio/lib_dtoa.c                         |  12 +-
 libc/time/lib_gmtimer.c                       |   6 +-
 libc/time/lib_mktime.c                        |   4 +-
 libnx/nxfonts/nxfonts_getfont.c               |   6 +-
 libnx/nxmu/nx_bitmap.c                        |   2 +-
 libnx/nxmu/nx_connect.c                       |   8 +-
 libnx/nxmu/nx_disconnect.c                    |   2 +-
 libnx/nxmu/nx_eventhandler.c                  |   4 +-
 libnx/nxmu/nx_getrectangle.c                  |   2 +-
 libnx/nxmu/nx_redrawreq.c                     |   2 +-
 libnx/nxmu/nxmu_sendserver.c                  |   2 +-
 libxx/libxx_new.cxx                           |   2 +-
 libxx/libxx_newa.cxx                          |   2 +-
 libxx/libxx_stdthrow.cxx                      |   8 +-
 mm/mm_gran/mm_gran.h                          |   8 +-
 mm/mm_gran/mm_pgalloc.c                       |   8 +-
 mm/mm_heap/mm_malloc.c                        |   2 +-
 mm/mm_heap/mm_sem.c                           |  22 +-
 mm/shm/shm_initialize.c                       |   2 +-
 mm/shm/shmat.c                                |   6 +-
 mm/shm/shmctl.c                               |   4 +-
 mm/shm/shmdt.c                                |   6 +-
 mm/shm/shmget.c                               |   8 +-
 net/arp/arp_send.c                            |   8 +-
 net/icmp/icmp_ping.c                          |   4 +-
 net/icmpv6/icmpv6_autoconfig.c                |  14 +-
 net/icmpv6/icmpv6_neighbor.c                  |   4 +-
 net/icmpv6/icmpv6_ping.c                      |   4 +-
 net/igmp/igmp_group.c                         |   8 +-
 net/igmp/igmp_leave.c                         |   4 +-
 net/igmp/igmp_timer.c                         |  12 +-
 net/iob/iob_add_queue.c                       |   2 +-
 net/iob/iob_clone.c                           |   2 +-
 net/iob/iob_contig.c                          |   2 +-
 net/iob/iob_copyin.c                          |   4 +-
 net/iob/iob_dump.c                            |   2 +-
 net/local/local_accept.c                      |   6 +-
 net/local/local_connect.c                     |  12 +-
 net/local/local_fifo.c                        |  10 +-
 net/local/local_netpoll.c                     |   2 +-
 net/local/local_recvfrom.c                    |  22 +-
 net/local/local_recvutils.c                   |   6 +-
 net/local/local_send.c                        |   2 +-
 net/local/local_sendpacket.c                  |   2 +-
 net/local/local_sendto.c                      |   8 +-
 net/procfs/net_procfs.c                       |  18 +-
 net/route/net_addroute.c                      |   4 +-
 net/socket/bind.c                             |   4 +-
 net/socket/net_clone.c                        |   2 +-
 net/socket/net_sendfile.c                     |   6 +-
 net/socket/net_vfcntl.c                       |   2 +-
 net/socket/recvfrom.c                         |   6 +-
 net/socket/sendto.c                           |  12 +-
 net/tcp/tcp_conn.c                            |  12 +-
 net/tcp/tcp_send_buffered.c                   |  14 +-
 net/tcp/tcp_send_unbuffered.c                 |   6 +-
 net/tcp/tcp_wrbuffer.c                        |   2 +-
 net/udp/udp_psock_sendto.c                    |   6 +-
 sched/clock/clock_getres.c                    |   6 +-
 sched/clock/clock_gettime.c                   |   6 +-
 sched/clock/clock_settime.c                   |   6 +-
 sched/group/group_addrenv.c                   |   2 +-
 sched/group/group_childstatus.c               |   4 +-
 sched/group/group_join.c                      |   2 +-
 sched/init/os_smpstart.c                      |   6 +-
 sched/init/os_start.c                         |   2 +-
 sched/module/mod_bind.c                       |  18 +-
 sched/module/mod_init.c                       |  12 +-
 sched/module/mod_insmod.c                     |  82 +++----
 sched/module/mod_iobuffer.c                   |   4 +-
 sched/module/mod_load.c                       |   8 +-
 sched/module/mod_procfs.c                     |   6 +-
 sched/module/mod_read.c                       |   6 +-
 sched/module/mod_registry.c                   |   2 +-
 sched/module/mod_rmmod.c                      |   6 +-
 sched/module/mod_sections.c                   |  18 +-
 sched/module/mod_symbols.c                    |  18 +-
 sched/module/mod_verify.c                     |   6 +-
 sched/pthread/pthread_completejoin.c          |   4 +-
 sched/pthread/pthread_condbroadcast.c         |   4 +-
 sched/pthread/pthread_conddestroy.c           |   4 +-
 sched/pthread/pthread_condinit.c              |   4 +-
 sched/pthread/pthread_condsignal.c            |   8 +-
 sched/pthread/pthread_condtimedwait.c         |  10 +-
 sched/pthread/pthread_condwait.c              |   8 +-
 sched/pthread/pthread_create.c                |   4 +-
 sched/pthread/pthread_detach.c                |   6 +-
 sched/pthread/pthread_exit.c                  |   2 +-
 sched/pthread/pthread_getaffinity.c           |   2 +-
 sched/pthread/pthread_getschedparam.c         |   4 +-
 sched/pthread/pthread_join.c                  |  14 +-
 sched/pthread/pthread_mutexdestroy.c          |   4 +-
 sched/pthread/pthread_mutexinit.c             |   4 +-
 sched/pthread/pthread_mutexlock.c             |   6 +-
 sched/pthread/pthread_mutextrylock.c          |   4 +-
 sched/pthread/pthread_mutexunlock.c           |   6 +-
 sched/pthread/pthread_setaffinity.c           |   2 +-
 sched/pthread/pthread_setschedparam.c         |   2 +-
 sched/semaphore/sem_holder.c                  |  16 +-
 sched/signal/sig_deliver.c                    |   2 +-
 sched/signal/sig_dispatch.c                   |   2 +-
 sched/signal/sig_mqnotempty.c                 |   4 +-
 sched/signal/sig_nanosleep.c                  |   4 +-
 sched/signal/sig_queue.c                      |   4 +-
 sched/task/task_create.c                      |   2 +-
 sched/task/task_execv.c                       |   2 +-
 sched/task/task_posixspawn.c                  |  10 +-
 sched/task/task_prctl.c                       |   8 +-
 sched/task/task_spawn.c                       |  10 +-
 sched/task/task_spawnparms.c                  |   8 +-
 sched/task/task_vfork.c                       |   4 +-
 1091 files changed, 5976 insertions(+), 5971 deletions(-)

diff --git a/Kconfig b/Kconfig
index 12e8887d3b..2881c6cce8 100644
--- a/Kconfig
+++ b/Kconfig
@@ -413,13 +413,21 @@ if DEBUG_FEATURES
 
 comment "Debug SYSLOG Output Controls"
 
+config DEBUG_ERROR
+	bool "Enable Error Output"
+	default n
+	---help---
+		Enables output from err() statements.  Errors are significant system
+		exceptions that require immediate attention.
+
 config DEBUG_WARN
 	bool "Enable Warnings Output"
 	default n
+	depends on DEBUG_ERROR
 	---help---
-		Enables output from warning statements.  Warnings are considered to
-		be potential errors or errors that will not have serious
-		consequences.
+		Enables output from warn() statements.  Warnings are considered to
+		be various unexpected conditions, potential errors or errors that will
+		not have serious consequences.
 
 config DEBUG_INFO
 	bool "Enable Informational Debug Output"
diff --git a/arch/arm/src/arm/up_elf.c b/arch/arm/src/arm/up_elf.c
index bb6a09d7cc..06c0c5157c 100644
--- a/arch/arm/src/arm/up_elf.c
+++ b/arch/arm/src/arm/up_elf.c
@@ -86,7 +86,7 @@ bool up_checkarch(FAR const Elf32_Ehdr *ehdr)
 
   if (ehdr->e_machine != EM_ARM)
     {
-      bdbg("Not for ARM: e_machine=%04x\n", ehdr->e_machine);
+      berr("Not for ARM: e_machine=%04x\n", ehdr->e_machine);
       return -ENOEXEC;
     }
 
@@ -94,7 +94,7 @@ bool up_checkarch(FAR const Elf32_Ehdr *ehdr)
 
   if (ehdr->e_ident[EI_CLASS] != ELFCLASS32)
     {
-      bdbg("Need 32-bit objects: e_ident[EI_CLASS]=%02x\n", ehdr->e_ident[EI_CLASS]);
+      berr("Need 32-bit objects: e_ident[EI_CLASS]=%02x\n", ehdr->e_ident[EI_CLASS]);
       return -ENOEXEC;
     }
 
@@ -106,7 +106,7 @@ bool up_checkarch(FAR const Elf32_Ehdr *ehdr)
   if (ehdr->e_ident[EI_DATA] != ELFDATA2LSB)
 #endif
     {
-      bdbg("Wrong endian-ness: e_ident[EI_DATA]=%02x\n", ehdr->e_ident[EI_DATA]);
+      berr("Wrong endian-ness: e_ident[EI_DATA]=%02x\n", ehdr->e_ident[EI_DATA]);
       return -ENOEXEC;
     }
 
@@ -114,7 +114,7 @@ bool up_checkarch(FAR const Elf32_Ehdr *ehdr)
 
   if ((ehdr->e_entry & 3) != 0)
     {
-      bdbg("Entry point is not properly aligned: %08x\n", ehdr->e_entry);
+      berr("Entry point is not properly aligned: %08x\n", ehdr->e_entry);
       return -ENOEXEC
     }
 
@@ -185,7 +185,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
         offset += sym->st_value - addr;
         if (offset & 3 || offset <= (int32_t) 0xfe000000 || offset >= (int32_t) 0x02000000)
           {
-            bdbg("  ERROR: PC24 [%d] relocation out of range, offset=%08lx\n",
+            berr("  ERROR: PC24 [%d] relocation out of range, offset=%08lx\n",
                  ELF32_R_TYPE(rel->r_info), offset);
 
             return -EINVAL;
@@ -256,7 +256,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
       break;
 
     default:
-      bdbg("Unsupported relocation: %d\n", ELF32_R_TYPE(rel->r_info));
+      berr("Unsupported relocation: %d\n", ELF32_R_TYPE(rel->r_info));
       return -EINVAL;
     }
 
@@ -266,6 +266,6 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
 int up_relocateadd(FAR const Elf32_Rela *rel, FAR const Elf32_Sym *sym,
                    uintptr_t addr)
 {
-  bdbg("RELA relocation not supported\n");
+  berr("RELA relocation not supported\n");
   return -ENOSYS;
 }
diff --git a/arch/arm/src/arm/up_schedulesigaction.c b/arch/arm/src/arm/up_schedulesigaction.c
index 3972b77921..5b99b2059a 100644
--- a/arch/arm/src/arm/up_schedulesigaction.c
+++ b/arch/arm/src/arm/up_schedulesigaction.c
@@ -94,7 +94,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
 {
   irqstate_t flags;
 
-  sdbg("tcb=0x%p sigdeliver=0x%p\n", tcb, sigdeliver);
+  serr("tcb=0x%p sigdeliver=0x%p\n", tcb, sigdeliver);
 
   /* Make sure that interrupts are disabled */
 
@@ -108,7 +108,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
        * being delivered to the currently executing task.
        */
 
-      sdbg("rtcb=0x%p CURRENT_REGS=0x%p\n", this_task(), CURRENT_REGS);
+      serr("rtcb=0x%p CURRENT_REGS=0x%p\n", this_task(), CURRENT_REGS);
 
       if (tcb == this_task())
         {
diff --git a/arch/arm/src/arm/up_sigdeliver.c b/arch/arm/src/arm/up_sigdeliver.c
index c03511d4df..0b3b6ea266 100644
--- a/arch/arm/src/arm/up_sigdeliver.c
+++ b/arch/arm/src/arm/up_sigdeliver.c
@@ -95,7 +95,7 @@ void up_sigdeliver(void)
 
   board_autoled_on(LED_SIGNAL);
 
-  sdbg("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
+  serr("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
         rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
   ASSERT(rtcb->xcp.sigdeliver != NULL);
 
@@ -126,7 +126,7 @@ void up_sigdeliver(void)
    * errno that is needed by the user logic (it is probably EINTR).
    */
 
-  sdbg("Resuming\n");
+  serr("Resuming\n");
   (void)up_irq_save();
   rtcb->pterrno = saved_errno;
 
diff --git a/arch/arm/src/armv6-m/up_elf.c b/arch/arm/src/armv6-m/up_elf.c
index 6e101ffe60..ad0b4d8dad 100644
--- a/arch/arm/src/armv6-m/up_elf.c
+++ b/arch/arm/src/armv6-m/up_elf.c
@@ -86,7 +86,7 @@ bool up_checkarch(FAR const Elf32_Ehdr *ehdr)
 
   if (ehdr->e_machine != EM_ARM)
     {
-      bdbg("Not for ARM: e_machine=%04x\n", ehdr->e_machine);
+      berr("Not for ARM: e_machine=%04x\n", ehdr->e_machine);
       return -ENOEXEC;
     }
 
@@ -94,7 +94,7 @@ bool up_checkarch(FAR const Elf32_Ehdr *ehdr)
 
   if (ehdr->e_ident[EI_CLASS] != ELFCLASS32)
     {
-      bdbg("Need 32-bit objects: e_ident[EI_CLASS]=%02x\n", ehdr->e_ident[EI_CLASS]);
+      berr("Need 32-bit objects: e_ident[EI_CLASS]=%02x\n", ehdr->e_ident[EI_CLASS]);
       return -ENOEXEC;
     }
 
@@ -106,7 +106,7 @@ bool up_checkarch(FAR const Elf32_Ehdr *ehdr)
   if (ehdr->e_ident[EI_DATA] != ELFDATA2LSB)
 #endif
     {
-      bdbg("Wrong endian-ness: e_ident[EI_DATA]=%02x\n", ehdr->e_ident[EI_DATA]);
+      berr("Wrong endian-ness: e_ident[EI_DATA]=%02x\n", ehdr->e_ident[EI_DATA]);
       return -ENOEXEC;
     }
 
@@ -181,7 +181,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
         offset += sym->st_value - addr;
         if (offset & 3 || offset <= (int32_t) 0xfe000000 || offset >= (int32_t) 0x02000000)
           {
-            bdbg("  ERROR: PC24 [%d] relocation out of range, offset=%08lx\n",
+            berr("  ERROR: PC24 [%d] relocation out of range, offset=%08lx\n",
                  ELF32_R_TYPE(rel->r_info), offset);
 
             return -EINVAL;
@@ -290,7 +290,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
 
         if (ELF32_ST_TYPE(sym->st_info) == STT_FUNC && (offset & 1) == 0)
           {
-            bdbg("  ERROR: JUMP24 [%d] requires odd offset, offset=%08lx\n",
+            berr("  ERROR: JUMP24 [%d] requires odd offset, offset=%08lx\n",
                  ELF32_R_TYPE(rel->r_info), offset);
 
             return -EINVAL;
@@ -300,7 +300,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
 
         if (offset <= (int32_t)0xff000000 || offset >= (int32_t)0x01000000)
           {
-            bdbg("  ERROR: JUMP24 [%d] relocation out of range, branch taget=%08lx\n",
+            berr("  ERROR: JUMP24 [%d] relocation out of range, branch taget=%08lx\n",
                  ELF32_R_TYPE(rel->r_info), offset);
 
             return -EINVAL;
@@ -451,7 +451,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
       break;
 
     default:
-      bdbg("Unsupported relocation: %d\n", ELF32_R_TYPE(rel->r_info));
+      berr("Unsupported relocation: %d\n", ELF32_R_TYPE(rel->r_info));
       return -EINVAL;
     }
 
@@ -461,6 +461,6 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
 int up_relocateadd(FAR const Elf32_Rela *rel, FAR const Elf32_Sym *sym,
                    uintptr_t addr)
 {
-  bdbg("RELA relocation not supported\n");
+  berr("RELA relocation not supported\n");
   return -ENOSYS;
 }
diff --git a/arch/arm/src/armv6-m/up_hardfault.c b/arch/arm/src/armv6-m/up_hardfault.c
index 6260d4ac2c..873a76d972 100644
--- a/arch/arm/src/armv6-m/up_hardfault.c
+++ b/arch/arm/src/armv6-m/up_hardfault.c
@@ -55,9 +55,9 @@
  ****************************************************************************/
 
 #ifdef CONFIG_DEBUG_HARDFAULT
-# define hfdbg(format, ...) llerr(format, ##__VA_ARGS__)
+# define hferr(format, ...) llerr(format, ##__VA_ARGS__)
 #else
-# define hfdbg(x...)
+# define hferr(x...)
 #endif
 
 #define INSN_SVC0        0xdf00 /* insn: svc 0 */
@@ -118,7 +118,7 @@ int up_hardfault(int irq, FAR void *context)
       /* Fetch the instruction that caused the Hard fault */
 
       uint16_t insn = *pc;
-      hfdbg("  PC: %p INSN: %04x\n", pc, insn);
+      hferr("  PC: %p INSN: %04x\n", pc, insn);
 
       /* If this was the instruction 'svc 0', then forward processing
        * to the SVCall handler
@@ -126,7 +126,7 @@ int up_hardfault(int irq, FAR void *context)
 
       if (insn == INSN_SVC0)
         {
-          hfdbg("Forward SVCall\n");
+          hferr("Forward SVCall\n");
           return up_svcall(irq, context);
         }
     }
@@ -134,17 +134,17 @@ int up_hardfault(int irq, FAR void *context)
 #if defined(CONFIG_DEBUG_HARDFAULT)
   /* Dump some hard fault info */
 
-  hfdbg("\nHard Fault:\n");
-  hfdbg("  IRQ: %d regs: %p\n", irq, regs);
-  hfdbg("  PRIMASK: %08x IPSR: %08x\n",
+  hferr("\nHard Fault:\n");
+  hferr("  IRQ: %d regs: %p\n", irq, regs);
+  hferr("  PRIMASK: %08x IPSR: %08x\n",
         getprimask(), getipsr());
-  hfdbg("  R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+  hferr("  R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
         regs[REG_R0],  regs[REG_R1],  regs[REG_R2],  regs[REG_R3],
         regs[REG_R4],  regs[REG_R5],  regs[REG_R6],  regs[REG_R7]);
-  hfdbg("  R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+  hferr("  R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
         regs[REG_R8],  regs[REG_R9],  regs[REG_R10], regs[REG_R11],
         regs[REG_R12], regs[REG_R13], regs[REG_R14], regs[REG_R15]);
-  hfdbg("  xPSR: %08x PRIMASK: %08x (saved)\n",
+  hferr("  xPSR: %08x PRIMASK: %08x (saved)\n",
         CURRENT_REGS[REG_XPSR],  CURRENT_REGS[REG_PRIMASK]);
 #endif
 
diff --git a/arch/arm/src/armv6-m/up_schedulesigaction.c b/arch/arm/src/armv6-m/up_schedulesigaction.c
index be9505a9c2..bf9fdf1c49 100644
--- a/arch/arm/src/armv6-m/up_schedulesigaction.c
+++ b/arch/arm/src/armv6-m/up_schedulesigaction.c
@@ -107,7 +107,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
 {
   irqstate_t flags;
 
-  sdbg("tcb=0x%p sigdeliver=0x%p\n", tcb, sigdeliver);
+  serr("tcb=0x%p sigdeliver=0x%p\n", tcb, sigdeliver);
 
   /* Make sure that interrupts are disabled */
 
@@ -121,7 +121,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
        * to the currently executing task.
        */
 
-      sdbg("rtcb=0x%p CURRENT_REGS=0x%p\n", this_task(), CURRENT_REGS);
+      serr("rtcb=0x%p CURRENT_REGS=0x%p\n", this_task(), CURRENT_REGS);
 
       if (tcb == this_task())
         {
diff --git a/arch/arm/src/armv6-m/up_sigdeliver.c b/arch/arm/src/armv6-m/up_sigdeliver.c
index 84b89542a2..4f40b97665 100644
--- a/arch/arm/src/armv6-m/up_sigdeliver.c
+++ b/arch/arm/src/armv6-m/up_sigdeliver.c
@@ -100,7 +100,7 @@ void up_sigdeliver(void)
 
   board_autoled_on(LED_SIGNAL);
 
-  sdbg("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
+  serr("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
         rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
   ASSERT(rtcb->xcp.sigdeliver != NULL);
 
@@ -135,7 +135,7 @@ void up_sigdeliver(void)
    * errno that is needed by the user logic (it is probably EINTR).
    */
 
-  sdbg("Resuming\n");
+  serr("Resuming\n");
   (void)up_irq_save();
   rtcb->pterrno = saved_errno;
 
diff --git a/arch/arm/src/armv6-m/up_svcall.c b/arch/arm/src/armv6-m/up_svcall.c
index da66f30461..a24fc12f2f 100644
--- a/arch/arm/src/armv6-m/up_svcall.c
+++ b/arch/arm/src/armv6-m/up_svcall.c
@@ -69,9 +69,9 @@
  */
 
 #if defined(CONFIG_DEBUG_SYSCALL) || defined(CONFIG_DEBUG_SVCALL)
-# define svcdbg(format, ...) llerr(format, ##__VA_ARGS__)
+# define svcerr(format, ...) llerr(format, ##__VA_ARGS__)
 #else
-# define svcdbg(x...)
+# define svcerr(x...)
 #endif
 
 /****************************************************************************
@@ -174,18 +174,18 @@ int up_svcall(int irq, FAR void *context)
   if (cmd > SYS_switch_context)
 # endif
     {
-      svcdbg("SVCALL Entry: regs: %p cmd: %d\n", regs, cmd);
-      svcdbg("  R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      svcerr("SVCALL Entry: regs: %p cmd: %d\n", regs, cmd);
+      svcerr("  R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
              regs[REG_R0],  regs[REG_R1],  regs[REG_R2],  regs[REG_R3],
              regs[REG_R4],  regs[REG_R5],  regs[REG_R6],  regs[REG_R7]);
-      svcdbg("  R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      svcerr("  R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
              regs[REG_R8],  regs[REG_R9],  regs[REG_R10], regs[REG_R11],
              regs[REG_R12], regs[REG_R13], regs[REG_R14], regs[REG_R15]);
 # ifdef CONFIG_BUILD_PROTECTED
-      svcdbg(" PSR: %08x PRIMASK: %08x EXC_RETURN: %08x\n",
+      svcerr(" PSR: %08x PRIMASK: %08x EXC_RETURN: %08x\n",
              regs[REG_XPSR], regs[REG_PRIMASK], regs[REG_EXC_RETURN]);
 # else
-      svcdbg(" PSR: %08x PRIMASK: %08x\n",
+      svcerr(" PSR: %08x PRIMASK: %08x\n",
              regs[REG_XPSR], regs[REG_PRIMASK]);
 # endif
     }
@@ -486,30 +486,30 @@ int up_svcall(int irq, FAR void *context)
   if (regs != CURRENT_REGS)
 # endif
     {
-      svcdbg("SVCall Return:\n");
-      svcdbg("  R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      svcerr("SVCall Return:\n");
+      svcerr("  R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
              CURRENT_REGS[REG_R0],  CURRENT_REGS[REG_R1],
              CURRENT_REGS[REG_R2],  CURRENT_REGS[REG_R3],
              CURRENT_REGS[REG_R4],  CURRENT_REGS[REG_R5],
              CURRENT_REGS[REG_R6],  CURRENT_REGS[REG_R7]);
-      svcdbg("  R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      svcerr("  R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
              CURRENT_REGS[REG_R8],  CURRENT_REGS[REG_R9],
              CURRENT_REGS[REG_R10], CURRENT_REGS[REG_R11],
              CURRENT_REGS[REG_R12], CURRENT_REGS[REG_R13],
              CURRENT_REGS[REG_R14], CURRENT_REGS[REG_R15]);
 #ifdef CONFIG_BUILD_PROTECTED
-      svcdbg(" PSR: %08x PRIMASK: %08x EXC_RETURN: %08x\n",
+      svcerr(" PSR: %08x PRIMASK: %08x EXC_RETURN: %08x\n",
              CURRENT_REGS[REG_XPSR], CURRENT_REGS[REG_PRIMASK],
              CURRENT_REGS[REG_EXC_RETURN]);
 #else
-      svcdbg(" PSR: %08x PRIMASK: %08x\n",
+      svcerr(" PSR: %08x PRIMASK: %08x\n",
              CURRENT_REGS[REG_XPSR], CURRENT_REGS[REG_PRIMASK]);
 #endif
     }
 # ifdef CONFIG_DEBUG_SVCALL
   else
     {
-      svcdbg("SVCall Return: %d\n", regs[REG_R0]);
+      svcerr("SVCall Return: %d\n", regs[REG_R0]);
     }
 # endif
 #endif
diff --git a/arch/arm/src/armv7-a/arm_addrenv.c b/arch/arm/src/armv7-a/arm_addrenv.c
index 92ab46cabd..7d2818283d 100644
--- a/arch/arm/src/armv7-a/arm_addrenv.c
+++ b/arch/arm/src/armv7-a/arm_addrenv.c
@@ -278,7 +278,7 @@ int up_addrenv_create(size_t textsize, size_t datasize, size_t heapsize,
                                   MMU_L2_UTEXTFLAGS);
   if (ret < 0)
     {
-      bdbg("ERROR: Failed to create .text region: %d\n", ret);
+      berr("ERROR: Failed to create .text region: %d\n", ret);
       goto errout;
     }
 
@@ -293,7 +293,7 @@ int up_addrenv_create(size_t textsize, size_t datasize, size_t heapsize,
                                   MMU_L2_UDATAFLAGS);
   if (ret < 0)
     {
-      bdbg("ERROR: Failed to create .bss/.data region: %d\n", ret);
+      berr("ERROR: Failed to create .bss/.data region: %d\n", ret);
       goto errout;
     }
 
@@ -305,7 +305,7 @@ int up_addrenv_create(size_t textsize, size_t datasize, size_t heapsize,
   ret = up_addrenv_initdata((uintptr_t)addrenv->data[0] & PMD_PTE_PADDR_MASK);
   if (ret < 0)
     {
-      bdbg("ERROR: Failed to initialize .bss/.data region: %d\n", ret);
+      berr("ERROR: Failed to initialize .bss/.data region: %d\n", ret);
       goto errout;
     }
 #endif
@@ -318,7 +318,7 @@ int up_addrenv_create(size_t textsize, size_t datasize, size_t heapsize,
                                   MMU_L2_UDATAFLAGS);
   if (ret < 0)
     {
-      bdbg("ERROR: Failed to create heap region: %d\n", ret);
+      berr("ERROR: Failed to create heap region: %d\n", ret);
       goto errout;
     }
 
diff --git a/arch/arm/src/armv7-a/arm_addrenv_kstack.c b/arch/arm/src/armv7-a/arm_addrenv_kstack.c
index 2172023d9a..5bb2b688b5 100644
--- a/arch/arm/src/armv7-a/arm_addrenv_kstack.c
+++ b/arch/arm/src/armv7-a/arm_addrenv_kstack.c
@@ -153,7 +153,7 @@ int up_addrenv_kstackalloc(FAR struct tcb_s *tcb)
   tcb->xcp.kstack = (FAR uint32_t *)kmm_memalign(8, ARCH_KERNEL_STACKSIZE);
   if (!tcb->xcp.kstack)
     {
-      bdbg("ERROR: Failed to allocate the kernel stack\n");
+      berr("ERROR: Failed to allocate the kernel stack\n");
       return -ENOMEM;
     }
 
diff --git a/arch/arm/src/armv7-a/arm_addrenv_ustack.c b/arch/arm/src/armv7-a/arm_addrenv_ustack.c
index bf8d135564..4b7be01bd6 100644
--- a/arch/arm/src/armv7-a/arm_addrenv_ustack.c
+++ b/arch/arm/src/armv7-a/arm_addrenv_ustack.c
@@ -163,7 +163,7 @@ int up_addrenv_ustackalloc(FAR struct tcb_s *tcb, size_t stacksize)
                                   MMU_L2_UDATAFLAGS);
   if (ret < 0)
     {
-      bdbg("ERROR: Failed to create stack region: %d\n", ret);
+      berr("ERROR: Failed to create stack region: %d\n", ret);
       up_addrenv_ustackfree(tcb);
       return ret;
     }
diff --git a/arch/arm/src/armv7-a/arm_addrenv_utils.c b/arch/arm/src/armv7-a/arm_addrenv_utils.c
index afc2650a89..2eb58623af 100644
--- a/arch/arm/src/armv7-a/arm_addrenv_utils.c
+++ b/arch/arm/src/armv7-a/arm_addrenv_utils.c
@@ -98,7 +98,7 @@ int arm_addrenv_create_region(FAR uintptr_t **list, unsigned int listlen,
   npages = MM_NPAGES(regionsize);
   if (npages > (listlen << (20 - MM_PGSHIFT)))
     {
-      bdbg("ERROR: npages=%u listlen=%u\n", npages, listlen);
+      berr("ERROR: npages=%u listlen=%u\n", npages, listlen);
       return -E2BIG;
     }
 
diff --git a/arch/arm/src/armv7-a/arm_elf.c b/arch/arm/src/armv7-a/arm_elf.c
index ada27e19cc..e262095e5c 100644
--- a/arch/arm/src/armv7-a/arm_elf.c
+++ b/arch/arm/src/armv7-a/arm_elf.c
@@ -74,7 +74,7 @@ bool up_checkarch(FAR const Elf32_Ehdr *ehdr)
 
   if (ehdr->e_machine != EM_ARM)
     {
-      bdbg("Not for ARM: e_machine=%04x\n", ehdr->e_machine);
+      berr("Not for ARM: e_machine=%04x\n", ehdr->e_machine);
       return -ENOEXEC;
     }
 
@@ -82,7 +82,7 @@ bool up_checkarch(FAR const Elf32_Ehdr *ehdr)
 
   if (ehdr->e_ident[EI_CLASS] != ELFCLASS32)
     {
-      bdbg("Need 32-bit objects: e_ident[EI_CLASS]=%02x\n", ehdr->e_ident[EI_CLASS]);
+      berr("Need 32-bit objects: e_ident[EI_CLASS]=%02x\n", ehdr->e_ident[EI_CLASS]);
       return -ENOEXEC;
     }
 
@@ -94,7 +94,7 @@ bool up_checkarch(FAR const Elf32_Ehdr *ehdr)
   if (ehdr->e_ident[EI_DATA] != ELFDATA2LSB)
 #endif
     {
-      bdbg("Wrong endian-ness: e_ident[EI_DATA]=%02x\n", ehdr->e_ident[EI_DATA]);
+      berr("Wrong endian-ness: e_ident[EI_DATA]=%02x\n", ehdr->e_ident[EI_DATA]);
       return -ENOEXEC;
     }
 
@@ -102,7 +102,7 @@ bool up_checkarch(FAR const Elf32_Ehdr *ehdr)
 
   if ((ehdr->e_entry & 3) != 0)
     {
-      bdbg("Entry point is not properly aligned: %08x\n", ehdr->e_entry);
+      berr("Entry point is not properly aligned: %08x\n", ehdr->e_entry);
       return -ENOEXEC;
     }
 
@@ -175,7 +175,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
         offset += sym->st_value - addr;
         if (offset & 3 || offset <= (int32_t) 0xfe000000 || offset >= (int32_t) 0x02000000)
           {
-            bdbg("  ERROR: PC24 [%d] relocation out of range, offset=%08lx\n",
+            berr("  ERROR: PC24 [%d] relocation out of range, offset=%08lx\n",
                  ELF32_R_TYPE(rel->r_info), offset);
 
             return -EINVAL;
@@ -246,7 +246,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
       break;
 
     default:
-      bdbg("Unsupported relocation: %d\n", ELF32_R_TYPE(rel->r_info));
+      berr("Unsupported relocation: %d\n", ELF32_R_TYPE(rel->r_info));
       return -EINVAL;
     }
 
@@ -256,6 +256,6 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
 int up_relocateadd(FAR const Elf32_Rela *rel, FAR const Elf32_Sym *sym,
                    uintptr_t addr)
 {
-  bdbg("RELA relocation not supported\n");
+  berr("RELA relocation not supported\n");
   return -ENOSYS;
 }
diff --git a/arch/arm/src/armv7-a/arm_schedulesigaction.c b/arch/arm/src/armv7-a/arm_schedulesigaction.c
index 3dfe5fc285..74648c8fa5 100644
--- a/arch/arm/src/armv7-a/arm_schedulesigaction.c
+++ b/arch/arm/src/armv7-a/arm_schedulesigaction.c
@@ -94,7 +94,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
 {
   irqstate_t flags;
 
-  sdbg("tcb=0x%p sigdeliver=0x%p\n", tcb, sigdeliver);
+  serr("tcb=0x%p sigdeliver=0x%p\n", tcb, sigdeliver);
 
   /* Make sure that interrupts are disabled */
 
@@ -108,7 +108,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
        * to the currently executing task.
        */
 
-      sdbg("rtcb=0x%p CURRENT_REGS=0x%p\n", this_task(), CURRENT_REGS);
+      serr("rtcb=0x%p CURRENT_REGS=0x%p\n", this_task(), CURRENT_REGS);
 
       if (tcb == this_task())
         {
diff --git a/arch/arm/src/armv7-a/arm_sigdeliver.c b/arch/arm/src/armv7-a/arm_sigdeliver.c
index 32f1e0b40d..8009386492 100644
--- a/arch/arm/src/armv7-a/arm_sigdeliver.c
+++ b/arch/arm/src/armv7-a/arm_sigdeliver.c
@@ -83,7 +83,7 @@ void up_sigdeliver(void)
 
   board_autoled_on(LED_SIGNAL);
 
-  sdbg("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
+  serr("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
         rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
   ASSERT(rtcb->xcp.sigdeliver != NULL);
 
@@ -114,7 +114,7 @@ void up_sigdeliver(void)
    * errno that is needed by the user logic (it is probably EINTR).
    */
 
-  sdbg("Resuming\n");
+  serr("Resuming\n");
   (void)up_irq_save();
   rtcb->pterrno = saved_errno;
 
diff --git a/arch/arm/src/armv7-a/arm_syscall.c b/arch/arm/src/armv7-a/arm_syscall.c
index d6845595f6..b0b8201756 100644
--- a/arch/arm/src/armv7-a/arm_syscall.c
+++ b/arch/arm/src/armv7-a/arm_syscall.c
@@ -71,9 +71,9 @@
 /* Debug ********************************************************************/
 
 #if defined(CONFIG_DEBUG_SYSCALL)
-# define svcdbg(format, ...) llerr(format, ##__VA_ARGS__)
+# define svcerr(format, ...) llerr(format, ##__VA_ARGS__)
 #else
-# define svcdbg(x...)
+# define svcerr(x...)
 #endif
 
 /****************************************************************************
@@ -179,14 +179,14 @@ uint32_t *arm_syscall(uint32_t *regs)
    */
 
 #if defined(CONFIG_DEBUG_SYSCALL)
-  svcdbg("SYSCALL Entry: regs: %p cmd: %d\n", regs, cmd);
-  svcdbg("  R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+  svcerr("SYSCALL Entry: regs: %p cmd: %d\n", regs, cmd);
+  svcerr("  R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
          regs[REG_R0],  regs[REG_R1],  regs[REG_R2],  regs[REG_R3],
          regs[REG_R4],  regs[REG_R5],  regs[REG_R6],  regs[REG_R7]);
-  svcdbg("  R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+  svcerr("  R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
          regs[REG_R8],  regs[REG_R9],  regs[REG_R10], regs[REG_R11],
          regs[REG_R12], regs[REG_R13], regs[REG_R14], regs[REG_R15]);
-  svcdbg("CPSR: %08x\n", regs[REG_CPSR]);
+  svcerr("CPSR: %08x\n", regs[REG_CPSR]);
 #endif
 
   /* Handle the SVCall according to the command in R0 */
@@ -480,7 +480,7 @@ uint32_t *arm_syscall(uint32_t *regs)
 
           regs[REG_R0] -= CONFIG_SYS_RESERVED;
 #else
-          svcdbg("ERROR: Bad SYS call: %d\n", regs[REG_R0]);
+          svcerr("ERROR: Bad SYS call: %d\n", regs[REG_R0]);
 #endif
 
 #ifdef CONFIG_ARCH_KERNEL_STACK
@@ -504,14 +504,14 @@ uint32_t *arm_syscall(uint32_t *regs)
 #if defined(CONFIG_DEBUG_SYSCALL)
   /* Report what happened */
 
-  svcdbg("SYSCALL Exit: regs: %p\n", regs);
-  svcdbg("  R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+  svcerr("SYSCALL Exit: regs: %p\n", regs);
+  svcerr("  R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
          regs[REG_R0],  regs[REG_R1],  regs[REG_R2],  regs[REG_R3],
          regs[REG_R4],  regs[REG_R5],  regs[REG_R6],  regs[REG_R7]);
-  svcdbg("  R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+  svcerr("  R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
          regs[REG_R8],  regs[REG_R9],  regs[REG_R10], regs[REG_R11],
          regs[REG_R12], regs[REG_R13], regs[REG_R14], regs[REG_R15]);
-  svcdbg("CPSR: %08x\n", regs[REG_CPSR]);
+  svcerr("CPSR: %08x\n", regs[REG_CPSR]);
 #endif
 
   /* Return the last value of curent_regs.  This supports context switches
diff --git a/arch/arm/src/armv7-a/gic.h b/arch/arm/src/armv7-a/gic.h
index 0e0220e75b..2131c105ef 100644
--- a/arch/arm/src/armv7-a/gic.h
+++ b/arch/arm/src/armv7-a/gic.h
@@ -594,12 +594,12 @@
 /* Debug */
 
 #ifdef CONFIG_DEBUG_IRQ
-#  define gicdbg(format, ...)    dbg(format, ##__VA_ARGS__)
+#  define gicerr(format, ...)    err(format, ##__VA_ARGS__)
 #  define gicllerr(format, ...)  llerr(format, ##__VA_ARGS__)
 #  define gicinfo(format, ...)   info(format, ##__VA_ARGS__)
 #  define gicllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
-#  define gicdbg(x...)
+#  define gicerr(x...)
 #  define gicllerr(x...)
 #  define gicinfo(x...)
 #  define gicllinfo(x...)
diff --git a/arch/arm/src/armv7-m/mpu.h b/arch/arm/src/armv7-m/mpu.h
index 8ca9a0293c..c58403dcf7 100644
--- a/arch/arm/src/armv7-m/mpu.h
+++ b/arch/arm/src/armv7-m/mpu.h
@@ -221,7 +221,7 @@ static inline void mpu_showtype(void)
 {
 #ifdef CONFIG_DEBUG_FEATURES
   uint32_t regval = getreg32(MPU_TYPE);
-  dbg("%s MPU Regions: data=%d instr=%d\n",
+  err("%s MPU Regions: data=%d instr=%d\n",
       (regval & MPU_TYPE_SEPARATE) != 0 ? "Separate" : "Unified",
       (regval & MPU_TYPE_DREGION_MASK) >> MPU_TYPE_DREGION_SHIFT,
       (regval & MPU_TYPE_IREGION_MASK) >> MPU_TYPE_IREGION_SHIFT);
diff --git a/arch/arm/src/armv7-m/up_elf.c b/arch/arm/src/armv7-m/up_elf.c
index e3c2a8c1d3..e45e2dbe24 100644
--- a/arch/arm/src/armv7-m/up_elf.c
+++ b/arch/arm/src/armv7-m/up_elf.c
@@ -82,7 +82,7 @@ bool up_checkarch(FAR const Elf32_Ehdr *ehdr)
 
   if (ehdr->e_machine != EM_ARM)
     {
-      bdbg("Not for ARM: e_machine=%04x\n", ehdr->e_machine);
+      berr("Not for ARM: e_machine=%04x\n", ehdr->e_machine);
       return -ENOEXEC;
     }
 
@@ -90,7 +90,7 @@ bool up_checkarch(FAR const Elf32_Ehdr *ehdr)
 
   if (ehdr->e_ident[EI_CLASS] != ELFCLASS32)
     {
-      bdbg("Need 32-bit objects: e_ident[EI_CLASS]=%02x\n", ehdr->e_ident[EI_CLASS]);
+      berr("Need 32-bit objects: e_ident[EI_CLASS]=%02x\n", ehdr->e_ident[EI_CLASS]);
       return -ENOEXEC;
     }
 
@@ -102,7 +102,7 @@ bool up_checkarch(FAR const Elf32_Ehdr *ehdr)
   if (ehdr->e_ident[EI_DATA] != ELFDATA2LSB)
 #endif
     {
-      bdbg("Wrong endian-ness: e_ident[EI_DATA]=%02x\n", ehdr->e_ident[EI_DATA]);
+      berr("Wrong endian-ness: e_ident[EI_DATA]=%02x\n", ehdr->e_ident[EI_DATA]);
       return -ENOEXEC;
     }
 
@@ -177,7 +177,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
         offset += sym->st_value - addr;
         if (offset & 3 || offset <= (int32_t) 0xfe000000 || offset >= (int32_t) 0x02000000)
           {
-            bdbg("  ERROR: PC24 [%d] relocation out of range, offset=%08lx\n",
+            berr("  ERROR: PC24 [%d] relocation out of range, offset=%08lx\n",
                  ELF32_R_TYPE(rel->r_info), offset);
 
             return -EINVAL;
@@ -298,7 +298,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
 
         if (ELF32_ST_TYPE(sym->st_info) == STT_FUNC && (offset & 1) == 0)
           {
-            bdbg("  ERROR: JUMP24 [%d] requires odd offset, offset=%08lx\n",
+            berr("  ERROR: JUMP24 [%d] requires odd offset, offset=%08lx\n",
                  ELF32_R_TYPE(rel->r_info), offset);
 
             return -EINVAL;
@@ -308,7 +308,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
 
         if (offset <= (int32_t)0xff000000 || offset >= (int32_t)0x01000000)
           {
-            bdbg("  ERROR: JUMP24 [%d] relocation out of range, branch taget=%08lx\n",
+            berr("  ERROR: JUMP24 [%d] relocation out of range, branch taget=%08lx\n",
                  ELF32_R_TYPE(rel->r_info), offset);
 
             return -EINVAL;
@@ -461,7 +461,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
       break;
 
     default:
-      bdbg("Unsupported relocation: %d\n", ELF32_R_TYPE(rel->r_info));
+      berr("Unsupported relocation: %d\n", ELF32_R_TYPE(rel->r_info));
       return -EINVAL;
     }
 
@@ -471,7 +471,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
 int up_relocateadd(FAR const Elf32_Rela *rel, FAR const Elf32_Sym *sym,
                    uintptr_t addr)
 {
-  bdbg("RELA relocation not supported\n");
+  berr("RELA relocation not supported\n");
   return -ENOSYS;
 }
 
diff --git a/arch/arm/src/armv7-m/up_hardfault.c b/arch/arm/src/armv7-m/up_hardfault.c
index e65f08534f..b08466258f 100644
--- a/arch/arm/src/armv7-m/up_hardfault.c
+++ b/arch/arm/src/armv7-m/up_hardfault.c
@@ -60,9 +60,9 @@
  */
 
 #ifdef CONFIG_DEBUG_HARDFAULT
-# define hfdbg(format, ...) llerr(format, ##__VA_ARGS__)
+# define hferr(format, ...) llerr(format, ##__VA_ARGS__)
 #else
-# define hfdbg(x...)
+# define hferr(x...)
 #endif
 
 #define INSN_SVC0        0xdf00 /* insn: svc 0 */
@@ -127,7 +127,7 @@ int up_hardfault(int irq, FAR void *context)
       /* Fetch the instruction that caused the Hard fault */
 
       uint16_t insn = *pc;
-      hfdbg("  PC: %p INSN: %04x\n", pc, insn);
+      hferr("  PC: %p INSN: %04x\n", pc, insn);
 
       /* If this was the instruction 'svc 0', then forward processing
        * to the SVCall handler
@@ -135,7 +135,7 @@ int up_hardfault(int irq, FAR void *context)
 
       if (insn == INSN_SVC0)
         {
-          hfdbg("Forward SVCall\n");
+          hferr("Forward SVCall\n");
           return up_svcall(irq, context);
         }
     }
@@ -143,37 +143,37 @@ int up_hardfault(int irq, FAR void *context)
 
   /* Dump some hard fault info */
 
-  hfdbg("Hard Fault:\n");
-  hfdbg("  IRQ: %d regs: %p\n", irq, regs);
-  hfdbg("  BASEPRI: %08x PRIMASK: %08x IPSR: %08x CONTROL: %08x\n",
+  hferr("Hard Fault:\n");
+  hferr("  IRQ: %d regs: %p\n", irq, regs);
+  hferr("  BASEPRI: %08x PRIMASK: %08x IPSR: %08x CONTROL: %08x\n",
         getbasepri(), getprimask(), getipsr(), getcontrol());
-  hfdbg("  CFAULTS: %08x HFAULTS: %08x DFAULTS: %08x BFAULTADDR: %08x AFAULTS: %08x\n",
+  hferr("  CFAULTS: %08x HFAULTS: %08x DFAULTS: %08x BFAULTADDR: %08x AFAULTS: %08x\n",
         getreg32(NVIC_CFAULTS), getreg32(NVIC_HFAULTS),
         getreg32(NVIC_DFAULTS), getreg32(NVIC_BFAULT_ADDR),
         getreg32(NVIC_AFAULTS));
-  hfdbg("  R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+  hferr("  R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
         regs[REG_R0],  regs[REG_R1],  regs[REG_R2],  regs[REG_R3],
         regs[REG_R4],  regs[REG_R5],  regs[REG_R6],  regs[REG_R7]);
-  hfdbg("  R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+  hferr("  R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
         regs[REG_R8],  regs[REG_R9],  regs[REG_R10], regs[REG_R11],
         regs[REG_R12], regs[REG_R13], regs[REG_R14], regs[REG_R15]);
 
 #ifdef CONFIG_ARMV7M_USEBASEPRI
 #  ifdef REG_EXC_RETURN
-  hfdbg("  xPSR: %08x BASEPRI: %08x EXC_RETURN: %08x (saved)\n",
+  hferr("  xPSR: %08x BASEPRI: %08x EXC_RETURN: %08x (saved)\n",
         CURRENT_REGS[REG_XPSR],  CURRENT_REGS[REG_BASEPRI],
         CURRENT_REGS[REG_EXC_RETURN]);
 #  else
-  hfdbg("  xPSR: %08x BASEPRI: %08x (saved)\n",
+  hferr("  xPSR: %08x BASEPRI: %08x (saved)\n",
         CURRENT_REGS[REG_XPSR],  CURRENT_REGS[REG_BASEPRI]);
 #  endif
 #else
 #  ifdef REG_EXC_RETURN
-  hfdbg("  xPSR: %08x PRIMASK: %08x EXC_RETURN: %08x (saved)\n",
+  hferr("  xPSR: %08x PRIMASK: %08x EXC_RETURN: %08x (saved)\n",
         CURRENT_REGS[REG_XPSR],  CURRENT_REGS[REG_PRIMASK],
         CURRENT_REGS[REG_EXC_RETURN]);
 #  else
-  hfdbg("  xPSR: %08x PRIMASK: %08x (saved)\n",
+  hferr("  xPSR: %08x PRIMASK: %08x (saved)\n",
         CURRENT_REGS[REG_XPSR],  CURRENT_REGS[REG_PRIMASK]);
 #  endif
 #endif
diff --git a/arch/arm/src/armv7-m/up_memfault.c b/arch/arm/src/armv7-m/up_memfault.c
index 40881f722c..629304d6d2 100644
--- a/arch/arm/src/armv7-m/up_memfault.c
+++ b/arch/arm/src/armv7-m/up_memfault.c
@@ -55,9 +55,9 @@
 #undef DEBUG_MEMFAULTS         /* Define to debug memory management faults */
 
 #ifdef DEBUG_MEMFAULTS
-# define mfdbg(format, ...) llerr(format, ##__VA_ARGS__)
+# define mferr(format, ...) llerr(format, ##__VA_ARGS__)
 #else
-# define mfdbg(x...)
+# define mferr(x...)
 #endif
 
 /****************************************************************************
@@ -93,34 +93,34 @@ int up_memfault(int irq, FAR void *context)
 
   (void)up_irq_save();
   llerr("PANIC!!! Memory Management Fault:\n");
-  mfdbg("  IRQ: %d context: %p\n", irq, regs);
+  mferr("  IRQ: %d context: %p\n", irq, regs);
   llerr("  CFAULTS: %08x MMFAR: %08x\n",
         getreg32(NVIC_CFAULTS), getreg32(NVIC_MEMMANAGE_ADDR));
-  mfdbg("  BASEPRI: %08x PRIMASK: %08x IPSR: %08x CONTROL: %08x\n",
+  mferr("  BASEPRI: %08x PRIMASK: %08x IPSR: %08x CONTROL: %08x\n",
         getbasepri(), getprimask(), getipsr(), getcontrol());
-  mfdbg("  R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+  mferr("  R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
         regs[REG_R0],  regs[REG_R1],  regs[REG_R2],  regs[REG_R3],
         regs[REG_R4],  regs[REG_R5],  regs[REG_R6],  regs[REG_R7]);
-  mfdbg("  R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+  mferr("  R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
         regs[REG_R8],  regs[REG_R9],  regs[REG_R10], regs[REG_R11],
         regs[REG_R12], regs[REG_R13], regs[REG_R14], regs[REG_R15]);
 
 #ifdef CONFIG_ARMV7M_USEBASEPRI
 #  ifdef REG_EXC_RETURN
-  mfdbg("  xPSR: %08x BASEPRI: %08x EXC_RETURN: %08x (saved)\n",
+  mferr("  xPSR: %08x BASEPRI: %08x EXC_RETURN: %08x (saved)\n",
         CURRENT_REGS[REG_XPSR],  CURRENT_REGS[REG_BASEPRI],
         CURRENT_REGS[REG_EXC_RETURN]);
 #  else
-  mfdbg("  xPSR: %08x BASEPRI: %08x (saved)\n",
+  mferr("  xPSR: %08x BASEPRI: %08x (saved)\n",
         CURRENT_REGS[REG_XPSR],  CURRENT_REGS[REG_BASEPRI]);
 #  endif
 #else
 #  ifdef REG_EXC_RETURN
-  mfdbg("  xPSR: %08x PRIMASK: %08x EXC_RETURN: %08x (saved)\n",
+  mferr("  xPSR: %08x PRIMASK: %08x EXC_RETURN: %08x (saved)\n",
         CURRENT_REGS[REG_XPSR],  CURRENT_REGS[REG_PRIMASK],
         CURRENT_REGS[REG_EXC_RETURN]);
 #  else
-  mfdbg("  xPSR: %08x PRIMASK: %08x (saved)\n",
+  mferr("  xPSR: %08x PRIMASK: %08x (saved)\n",
         CURRENT_REGS[REG_XPSR],  CURRENT_REGS[REG_PRIMASK]);
 #  endif
 #endif
diff --git a/arch/arm/src/armv7-m/up_ramvec_attach.c b/arch/arm/src/armv7-m/up_ramvec_attach.c
index 60ba6e8590..fc3439d6a0 100644
--- a/arch/arm/src/armv7-m/up_ramvec_attach.c
+++ b/arch/arm/src/armv7-m/up_ramvec_attach.c
@@ -59,10 +59,10 @@
  */
 
 #ifdef CONFIG_DEBUG_IRQ
-#  define intdbg    llerr
+#  define interr    llerr
 #  define intinfo   llinfo
 #else
-#  define intdbg(x...)
+#  define interr(x...)
 #  define intinfo(x...)
 #endif
 
diff --git a/arch/arm/src/armv7-m/up_ramvec_initialize.c b/arch/arm/src/armv7-m/up_ramvec_initialize.c
index 9ff31cc902..354e5eaf4b 100644
--- a/arch/arm/src/armv7-m/up_ramvec_initialize.c
+++ b/arch/arm/src/armv7-m/up_ramvec_initialize.c
@@ -78,10 +78,10 @@
  */
 
 #ifdef CONFIG_DEBUG_IRQ
-#  define intdbg    llerr
+#  define interr    llerr
 #  define intinfo   llinfo
 #else
-#  define intdbg(x...)
+#  define interr(x...)
 #  define intinfo(x...)
 #endif
 
diff --git a/arch/arm/src/armv7-m/up_schedulesigaction.c b/arch/arm/src/armv7-m/up_schedulesigaction.c
index c44298c14e..d24906dd3b 100644
--- a/arch/arm/src/armv7-m/up_schedulesigaction.c
+++ b/arch/arm/src/armv7-m/up_schedulesigaction.c
@@ -95,7 +95,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
 {
   irqstate_t flags;
 
-  sdbg("tcb=0x%p sigdeliver=0x%p\n", tcb, sigdeliver);
+  serr("tcb=0x%p sigdeliver=0x%p\n", tcb, sigdeliver);
   DEBUGASSERT(tcb != NULL && sigdeliver != NULL);
 
   /* Make sure that interrupts are disabled */
@@ -110,7 +110,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
        * to the currently executing task.
        */
 
-      sdbg("rtcb=0x%p CURRENT_REGS=0x%p\n", this_task(), CURRENT_REGS);
+      serr("rtcb=0x%p CURRENT_REGS=0x%p\n", this_task(), CURRENT_REGS);
 
       if (tcb == this_task())
         {
diff --git a/arch/arm/src/armv7-m/up_sigdeliver.c b/arch/arm/src/armv7-m/up_sigdeliver.c
index bfa672aa7a..16f05b5adc 100644
--- a/arch/arm/src/armv7-m/up_sigdeliver.c
+++ b/arch/arm/src/armv7-m/up_sigdeliver.c
@@ -95,7 +95,7 @@ void up_sigdeliver(void)
 
   board_autoled_on(LED_SIGNAL);
 
-  sdbg("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
+  serr("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
         rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
   ASSERT(rtcb->xcp.sigdeliver != NULL);
 
@@ -138,7 +138,7 @@ void up_sigdeliver(void)
    * errno that is needed by the user logic (it is probably EINTR).
    */
 
-  sdbg("Resuming\n");
+  serr("Resuming\n");
   (void)up_irq_save();
   rtcb->pterrno = saved_errno;
 
diff --git a/arch/arm/src/armv7-m/up_svcall.c b/arch/arm/src/armv7-m/up_svcall.c
index d6f5cacdb8..70eef08054 100644
--- a/arch/arm/src/armv7-m/up_svcall.c
+++ b/arch/arm/src/armv7-m/up_svcall.c
@@ -70,9 +70,9 @@
  */
 
 #if defined(CONFIG_DEBUG_SYSCALL) || defined(CONFIG_DEBUG_SVCALL)
-# define svcdbg(format, ...) llerr(format, ##__VA_ARGS__)
+# define svcerr(format, ...) llerr(format, ##__VA_ARGS__)
 #else
-# define svcdbg(x...)
+# define svcerr(x...)
 #endif
 
 /****************************************************************************
@@ -169,18 +169,18 @@ int up_svcall(int irq, FAR void *context)
   if (cmd > SYS_switch_context)
 # endif
     {
-      svcdbg("SVCALL Entry: regs: %p cmd: %d\n", regs, cmd);
-      svcdbg("  R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      svcerr("SVCALL Entry: regs: %p cmd: %d\n", regs, cmd);
+      svcerr("  R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
              regs[REG_R0],  regs[REG_R1],  regs[REG_R2],  regs[REG_R3],
              regs[REG_R4],  regs[REG_R5],  regs[REG_R6],  regs[REG_R7]);
-      svcdbg("  R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      svcerr("  R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
              regs[REG_R8],  regs[REG_R9],  regs[REG_R10], regs[REG_R11],
              regs[REG_R12], regs[REG_R13], regs[REG_R14], regs[REG_R15]);
 # ifdef REG_EXC_RETURN
-      svcdbg(" PSR: %08x EXC_RETURN: %08x\n",
+      svcerr(" PSR: %08x EXC_RETURN: %08x\n",
              regs[REG_XPSR], regs[REG_EXC_RETURN]);
 # else
-      svcdbg(" PSR: %08x\n", regs[REG_XPSR]);
+      svcerr(" PSR: %08x\n", regs[REG_XPSR]);
 # endif
     }
 #endif
@@ -488,28 +488,28 @@ int up_svcall(int irq, FAR void *context)
   if (regs != CURRENT_REGS)
 # endif
     {
-      svcdbg("SVCall Return:\n");
-      svcdbg("  R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      svcerr("SVCall Return:\n");
+      svcerr("  R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
              CURRENT_REGS[REG_R0],  CURRENT_REGS[REG_R1],
              CURRENT_REGS[REG_R2],  CURRENT_REGS[REG_R3],
              CURRENT_REGS[REG_R4],  CURRENT_REGS[REG_R5],
              CURRENT_REGS[REG_R6],  CURRENT_REGS[REG_R7]);
-      svcdbg("  R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      svcerr("  R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
              CURRENT_REGS[REG_R8],  CURRENT_REGS[REG_R9],
              CURRENT_REGS[REG_R10], CURRENT_REGS[REG_R11],
              CURRENT_REGS[REG_R12], CURRENT_REGS[REG_R13],
              CURRENT_REGS[REG_R14], CURRENT_REGS[REG_R15]);
 # ifdef REG_EXC_RETURN
-      svcdbg(" PSR: %08x EXC_RETURN: %08x\n",
+      svcerr(" PSR: %08x EXC_RETURN: %08x\n",
              CURRENT_REGS[REG_XPSR], CURRENT_REGS[REG_EXC_RETURN]);
 # else
-      svcdbg(" PSR: %08x\n", CURRENT_REGS[REG_XPSR]);
+      svcerr(" PSR: %08x\n", CURRENT_REGS[REG_XPSR]);
 # endif
     }
 # ifdef CONFIG_DEBUG_SVCALL
   else
     {
-      svcdbg("SVCall Return: %d\n", regs[REG_R0]);
+      svcerr("SVCall Return: %d\n", regs[REG_R0]);
     }
 # endif
 #endif
diff --git a/arch/arm/src/armv7-r/arm_elf.c b/arch/arm/src/armv7-r/arm_elf.c
index 71ee69450b..0d7b40cd49 100644
--- a/arch/arm/src/armv7-r/arm_elf.c
+++ b/arch/arm/src/armv7-r/arm_elf.c
@@ -86,7 +86,7 @@ bool up_checkarch(FAR const Elf32_Ehdr *ehdr)
 
   if (ehdr->e_machine != EM_ARM)
     {
-      bdbg("Not for ARM: e_machine=%04x\n", ehdr->e_machine);
+      berr("Not for ARM: e_machine=%04x\n", ehdr->e_machine);
       return -ENOEXEC;
     }
 
@@ -94,7 +94,7 @@ bool up_checkarch(FAR const Elf32_Ehdr *ehdr)
 
   if (ehdr->e_ident[EI_CLASS] != ELFCLASS32)
     {
-      bdbg("Need 32-bit objects: e_ident[EI_CLASS]=%02x\n", ehdr->e_ident[EI_CLASS]);
+      berr("Need 32-bit objects: e_ident[EI_CLASS]=%02x\n", ehdr->e_ident[EI_CLASS]);
       return -ENOEXEC;
     }
 
@@ -106,7 +106,7 @@ bool up_checkarch(FAR const Elf32_Ehdr *ehdr)
   if (ehdr->e_ident[EI_DATA] != ELFDATA2LSB)
 #endif
     {
-      bdbg("Wrong endian-ness: e_ident[EI_DATA]=%02x\n", ehdr->e_ident[EI_DATA]);
+      berr("Wrong endian-ness: e_ident[EI_DATA]=%02x\n", ehdr->e_ident[EI_DATA]);
       return -ENOEXEC;
     }
 
@@ -114,7 +114,7 @@ bool up_checkarch(FAR const Elf32_Ehdr *ehdr)
 
   if ((ehdr->e_entry & 3) != 0)
     {
-      bdbg("Entry point is not properly aligned: %08x\n", ehdr->e_entry);
+      berr("Entry point is not properly aligned: %08x\n", ehdr->e_entry);
       return -ENOEXEC;
     }
 
@@ -187,7 +187,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
         offset += sym->st_value - addr;
         if (offset & 3 || offset <= (int32_t) 0xfe000000 || offset >= (int32_t) 0x02000000)
           {
-            bdbg("  ERROR: PC24 [%d] relocation out of range, offset=%08lx\n",
+            berr("  ERROR: PC24 [%d] relocation out of range, offset=%08lx\n",
                  ELF32_R_TYPE(rel->r_info), offset);
 
             return -EINVAL;
@@ -258,7 +258,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
       break;
 
     default:
-      bdbg("Unsupported relocation: %d\n", ELF32_R_TYPE(rel->r_info));
+      berr("Unsupported relocation: %d\n", ELF32_R_TYPE(rel->r_info));
       return -EINVAL;
     }
 
@@ -268,6 +268,6 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
 int up_relocateadd(FAR const Elf32_Rela *rel, FAR const Elf32_Sym *sym,
                    uintptr_t addr)
 {
-  bdbg("RELA relocation not supported\n");
+  berr("RELA relocation not supported\n");
   return -ENOSYS;
 }
diff --git a/arch/arm/src/armv7-r/arm_schedulesigaction.c b/arch/arm/src/armv7-r/arm_schedulesigaction.c
index 692debff2f..3ece5d8acf 100644
--- a/arch/arm/src/armv7-r/arm_schedulesigaction.c
+++ b/arch/arm/src/armv7-r/arm_schedulesigaction.c
@@ -94,7 +94,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
 {
   irqstate_t flags;
 
-  sdbg("tcb=0x%p sigdeliver=0x%p\n", tcb, sigdeliver);
+  serr("tcb=0x%p sigdeliver=0x%p\n", tcb, sigdeliver);
 
   /* Make sure that interrupts are disabled */
 
@@ -108,7 +108,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
        * to the currently executing task.
        */
 
-      sdbg("rtcb=0x%p CURRENT_REGS=0x%p\n", this_task(), CURRENT_REGS);
+      serr("rtcb=0x%p CURRENT_REGS=0x%p\n", this_task(), CURRENT_REGS);
 
       if (tcb == this_task())
         {
diff --git a/arch/arm/src/armv7-r/arm_sigdeliver.c b/arch/arm/src/armv7-r/arm_sigdeliver.c
index f638b35bfd..1a4f9b966d 100644
--- a/arch/arm/src/armv7-r/arm_sigdeliver.c
+++ b/arch/arm/src/armv7-r/arm_sigdeliver.c
@@ -83,7 +83,7 @@ void up_sigdeliver(void)
 
   board_autoled_on(LED_SIGNAL);
 
-  sdbg("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
+  serr("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
         rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
   ASSERT(rtcb->xcp.sigdeliver != NULL);
 
@@ -114,7 +114,7 @@ void up_sigdeliver(void)
    * errno that is needed by the user logic (it is probably EINTR).
    */
 
-  sdbg("Resuming\n");
+  serr("Resuming\n");
   (void)up_irq_save();
   rtcb->pterrno = saved_errno;
 
diff --git a/arch/arm/src/armv7-r/arm_syscall.c b/arch/arm/src/armv7-r/arm_syscall.c
index ce4a60bb8b..5bf59d595e 100644
--- a/arch/arm/src/armv7-r/arm_syscall.c
+++ b/arch/arm/src/armv7-r/arm_syscall.c
@@ -69,9 +69,9 @@
 /* Debug ********************************************************************/
 
 #if defined(CONFIG_DEBUG_SYSCALL)
-# define svcdbg(format, ...) llerr(format, ##__VA_ARGS__)
+# define svcerr(format, ...) llerr(format, ##__VA_ARGS__)
 #else
-# define svcdbg(x...)
+# define svcerr(x...)
 #endif
 
 /****************************************************************************
@@ -177,14 +177,14 @@ uint32_t *arm_syscall(uint32_t *regs)
    */
 
 #if defined(CONFIG_DEBUG_SYSCALL)
-  svcdbg("SYSCALL Entry: regs: %p cmd: %d\n", regs, cmd);
-  svcdbg("  R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+  svcerr("SYSCALL Entry: regs: %p cmd: %d\n", regs, cmd);
+  svcerr("  R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
          regs[REG_R0],  regs[REG_R1],  regs[REG_R2],  regs[REG_R3],
          regs[REG_R4],  regs[REG_R5],  regs[REG_R6],  regs[REG_R7]);
-  svcdbg("  R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+  svcerr("  R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
          regs[REG_R8],  regs[REG_R9],  regs[REG_R10], regs[REG_R11],
          regs[REG_R12], regs[REG_R13], regs[REG_R14], regs[REG_R15]);
-  svcdbg("CPSR: %08x\n", regs[REG_CPSR]);
+  svcerr("CPSR: %08x\n", regs[REG_CPSR]);
 #endif
 
   /* Handle the SVCall according to the command in R0 */
@@ -478,7 +478,7 @@ uint32_t *arm_syscall(uint32_t *regs)
 
           regs[REG_R0] -= CONFIG_SYS_RESERVED;
 #else
-          svcdbg("ERROR: Bad SYS call: %d\n", regs[REG_R0]);
+          svcerr("ERROR: Bad SYS call: %d\n", regs[REG_R0]);
 #endif
 
 #ifdef CONFIG_ARCH_KERNEL_STACK
@@ -502,14 +502,14 @@ uint32_t *arm_syscall(uint32_t *regs)
 #if defined(CONFIG_DEBUG_SYSCALL)
   /* Report what happened */
 
-  svcdbg("SYSCALL Exit: regs: %p\n", regs);
-  svcdbg("  R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+  svcerr("SYSCALL Exit: regs: %p\n", regs);
+  svcerr("  R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
          regs[REG_R0],  regs[REG_R1],  regs[REG_R2],  regs[REG_R3],
          regs[REG_R4],  regs[REG_R5],  regs[REG_R6],  regs[REG_R7]);
-  svcdbg("  R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+  svcerr("  R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
          regs[REG_R8],  regs[REG_R9],  regs[REG_R10], regs[REG_R11],
          regs[REG_R12], regs[REG_R13], regs[REG_R14], regs[REG_R15]);
-  svcdbg("CPSR: %08x\n", regs[REG_CPSR]);
+  svcerr("CPSR: %08x\n", regs[REG_CPSR]);
 #endif
 
   /* Return the last value of curent_regs.  This supports context switches
diff --git a/arch/arm/src/armv7-r/mpu.h b/arch/arm/src/armv7-r/mpu.h
index 26d5f9373d..7428e9cac2 100644
--- a/arch/arm/src/armv7-r/mpu.h
+++ b/arch/arm/src/armv7-r/mpu.h
@@ -361,7 +361,7 @@ static inline void mpu_showtype(void)
 {
 #ifdef CONFIG_DEBUG_FEATURES
   uint32_t regval = mpu_get_mpuir();
-  dbg("%s MPU Regions: data=%d instr=%d\n",
+  err("%s MPU Regions: data=%d instr=%d\n",
       (regval & MPUIR_SEPARATE) != 0 ? "Separate" : "Unified",
       (regval & MPUIR_DREGION_MASK) >> MPUIR_DREGION_SHIFT,
       (regval & MPUIR_IREGION_MASK) >> MPUIR_IREGION_SHIFT);
diff --git a/arch/arm/src/c5471/c5471_ethernet.c b/arch/arm/src/c5471/c5471_ethernet.c
index f59b028f21..38d894e74e 100644
--- a/arch/arm/src/c5471/c5471_ethernet.c
+++ b/arch/arm/src/c5471/c5471_ethernet.c
@@ -737,22 +737,22 @@ static int c5471_phyinit (void)
   phyid = (c5471_mdread(0, MD_PHY_MSB_REG) << 16) | c5471_mdread(0, MD_PHY_LSB_REG);
   if (phyid != LU3X31_T64_PHYID)
     {
-      ndbg("Unrecognized PHY ID: %08x\n", phyid);
+      nerr("Unrecognized PHY ID: %08x\n", phyid);
       return ERROR;
     }
 
   /* Next, Set desired network rate, 10BaseT, 100BaseT, or auto. */
 
 #ifdef CONFIG_C5471_AUTONEGOTIATION
-  ndbg("Setting PHY Transceiver for Autonegotiation\n");
+  nerr("Setting PHY Transceiver for Autonegotiation\n");
   c5471_mdwrite(0, MD_PHY_CONTROL_REG, MODE_AUTONEG);
 #endif
 #ifdef CONFIG_C5471_BASET100
-  ndbg("Setting PHY Transceiver for 100BaseT FullDuplex\n");
+  nerr("Setting PHY Transceiver for 100BaseT FullDuplex\n");
   c5471_mdwrite(0, MD_PHY_CONTROL_REG, MODE_100MBIT_FULLDUP);
 #endif
 #ifdef CONFIG_C5471_BASET10
-  ndbg("Setting PHY Transceiver for 10BaseT FullDuplex\n");
+  nerr("Setting PHY Transceiver for 10BaseT FullDuplex\n");
   c5471_mdwrite(0, MD_PHY_CONTROL_REG, MODE_10MBIT_FULLDUP);
 #endif
 
@@ -1371,7 +1371,7 @@ static void c5471_receive(struct c5471_driver_s *c5471)
     {
       /* Increment the count of dropped packets */
 
-      ndbg("Too big! packetlen: %d\n", packetlen);
+      nerr("Too big! packetlen: %d\n", packetlen);
       c5471->c_rxdropped++;
     }
 #endif
@@ -1680,7 +1680,7 @@ static int c5471_ifup(struct net_driver_s *dev)
   struct c5471_driver_s *c5471 = (struct c5471_driver_s *)dev->d_private;
   volatile uint32_t clearbits;
 
-  ndbg("Bringing up: %d.%d.%d.%d\n",
+  nerr("Bringing up: %d.%d.%d.%d\n",
        dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
        (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 
@@ -1742,7 +1742,7 @@ static int c5471_ifdown(struct net_driver_s *dev)
   struct c5471_driver_s *c5471 = (struct c5471_driver_s *)dev->d_private;
   irqstate_t flags;
 
-  ndbg("Stopping\n");
+  nerr("Stopping\n");
 
   /* Disable the Ethernet interrupt */
 
@@ -1798,7 +1798,7 @@ static int c5471_txavail(struct net_driver_s *dev)
   struct c5471_driver_s *c5471 = (struct c5471_driver_s *)dev->d_private;
   irqstate_t flags;
 
-  ndbg("Polling\n");
+  nerr("Polling\n");
   flags = enter_critical_section();
 
   /* Ignore the notification if the interface is not yet up */
@@ -1951,7 +1951,7 @@ static void c5471_eimconfig(struct c5471_driver_s *c5471)
 
   /* TX ENET 0 */
 
-  ndbg("TX ENET0 desc: %08x pbuf: %08x\n", desc, pbuf);
+  nerr("TX ENET0 desc: %08x pbuf: %08x\n", desc, pbuf);
   putreg32((desc & 0x0000ffff), ENET0_TDBA); /* 16-bit offset address */
   for (i = NUM_DESC_TX-1; i >= 0; i--)
     {
@@ -1978,7 +1978,7 @@ static void c5471_eimconfig(struct c5471_driver_s *c5471)
 
   /* RX ENET 0 */
 
-  ndbg("RX ENET0 desc: %08x pbuf: %08x\n", desc, pbuf);
+  nerr("RX ENET0 desc: %08x pbuf: %08x\n", desc, pbuf);
   putreg32((desc & 0x0000ffff), ENET0_RDBA); /* 16-bit offset address */
   for (i = NUM_DESC_RX-1; i >= 0; i--)
     {
@@ -2005,7 +2005,7 @@ static void c5471_eimconfig(struct c5471_driver_s *c5471)
 
   /* TX CPU */
 
-  ndbg("TX CPU desc: %08x pbuf: %08x\n", desc, pbuf);
+  nerr("TX CPU desc: %08x pbuf: %08x\n", desc, pbuf);
   c5471->c_txcpudesc = desc;
   putreg32((desc & 0x0000ffff), EIM_CPU_TXBA); /* 16-bit offset address */
   for (i = NUM_DESC_TX-1; i >= 0; i--)
@@ -2035,7 +2035,7 @@ static void c5471_eimconfig(struct c5471_driver_s *c5471)
 
   /* RX CPU */
 
-  ndbg("RX CPU desc: %08x pbuf: %08x\n", desc, pbuf);
+  nerr("RX CPU desc: %08x pbuf: %08x\n", desc, pbuf);
   c5471->c_rxcpudesc = desc;
   putreg32((desc & 0x0000ffff), EIM_CPU_RXBA); /* 16-bit offset address */
   for (i = NUM_DESC_RX-1; i >= 0; i--)
@@ -2063,7 +2063,7 @@ static void c5471_eimconfig(struct c5471_driver_s *c5471)
       pbuf += sizeof(uint32_t); /* Ether Module's "Buffer Usage Word" */
     }
 
-  ndbg("END desc: %08x pbuf: %08x\n", desc, pbuf);
+  nerr("END desc: %08x pbuf: %08x\n", desc, pbuf);
 
   /* Save the descriptor packet size */
 
@@ -2150,13 +2150,13 @@ static void c5471_eimconfig(struct c5471_driver_s *c5471)
 static void c5471_reset(struct c5471_driver_s *c5471)
 {
 #if defined(CONFIG_C5471_PHY_LU3X31T_T64)
-  ndbg("EIM reset\n");
+  nerr("EIM reset\n");
   c5471_eimreset(c5471);
 #endif
-  ndbg("PHY init\n");
+  nerr("PHY init\n");
   c5471_phyinit();
 
-  ndbg("EIM config\n");
+  nerr("EIM config\n");
   c5471_eimconfig(c5471);
 }
 
@@ -2178,7 +2178,7 @@ static void c5471_macassign(struct c5471_driver_s *c5471)
   uint8_t *mptr = dev->d_mac.ether_addr_octet;
   register uint32_t tmp;
 
-  ndbg("MAC: %0x:%0x:%0x:%0x:%0x:%0x\n",
+  nerr("MAC: %0x:%0x:%0x:%0x:%0x:%0x\n",
         mptr[0], mptr[1], mptr[2], mptr[3], mptr[4], mptr[5]);
 
   /* Set CPU port MAC address. S/W will only see incoming packets that match
diff --git a/arch/arm/src/c5471/c5471_watchdog.c b/arch/arm/src/c5471/c5471_watchdog.c
index 2143246d6e..011357fb5c 100644
--- a/arch/arm/src/c5471/c5471_watchdog.c
+++ b/arch/arm/src/c5471/c5471_watchdog.c
@@ -155,7 +155,7 @@ static inline unsigned int wdt_prescaletoptv(unsigned int prescale)
         }
     }
 
-  dbg("prescale=%d -> ptv=%d\n", prescale, ptv);
+  err("prescale=%d -> ptv=%d\n", prescale, ptv);
   return ptv;
 }
 
@@ -173,7 +173,7 @@ static int wdt_setusec(uint32_t usec)
   uint32_t divisor   = 1;
   uint32_t mode;
 
-  dbg("usec=%d\n", usec);
+  err("usec=%d\n", usec);
 
   /* Calculate a value of prescaler and divisor that will be able
    * to count to the usec.  It may not be exact or the best
@@ -186,7 +186,7 @@ static int wdt_setusec(uint32_t usec)
   do
     {
       divisor = (CLOCK_MHZx2 * usec) / (prescaler * 2);
-      dbg("divisor=0x%x prescaler=0x%x\n", divisor, prescaler);
+      err("divisor=0x%x prescaler=0x%x\n", divisor, prescaler);
 
       if (divisor >= 0x10000)
         {
@@ -194,7 +194,7 @@ static int wdt_setusec(uint32_t usec)
             {
               /* This is the max possible ~2.5 seconds. */
 
-              dbg("prescaler=0x%x too big!\n", prescaler);
+              err("prescaler=0x%x too big!\n", prescaler);
               return ERROR;
             }
 
@@ -207,19 +207,19 @@ static int wdt_setusec(uint32_t usec)
     }
   while (divisor >= 0x10000);
 
-  dbg("prescaler=0x%x divisor=0x%x\n", prescaler, divisor);
+  err("prescaler=0x%x divisor=0x%x\n", prescaler, divisor);
 
   mode  = wdt_prescaletoptv(prescaler);
   mode &= ~C5471_TIMER_AUTORELOAD; /* One shot mode. */
   mode |= divisor << 5;
-  dbg("mode=0x%x\n", mode);
+  err("mode=0x%x\n", mode);
 
   c5471_wdt_cntl = mode;
 
   /* Now start the watchdog */
 
   c5471_wdt_cntl |= C5471_TIMER_STARTBIT;
-  dbg("cntl_timer=0x%x\n", c5471_wdt_cntl);
+  err("cntl_timer=0x%x\n", c5471_wdt_cntl);
 
   return 0;
 }
@@ -234,17 +234,17 @@ static int wdt_setusec(uint32_t usec)
 
 static int wdt_interrupt(int irq, void *context)
 {
-  dbg("expired\n");
+  err("expired\n");
 
 #if defined(CONFIG_SOFTWARE_REBOOT)
 #  if defined(CONFIG_SOFTWARE_TEST)
-  dbg("  Test only\n");
+  err("  Test only\n");
 #  else
-  dbg("  Re-booting\n");
+  err("  Re-booting\n");
 #    warning "Add logic to reset CPU here"
 #  endif
 #else
-  dbg("  No reboot\n");
+  err("  No reboot\n");
 #endif
   return OK;
 }
@@ -259,7 +259,7 @@ static ssize_t wdt_read(struct file *filep, char *buffer, size_t buflen)
    * not work if the user provides a buffer smaller than 18 bytes.
    */
 
-  dbg("buflen=%d\n", buflen);
+  err("buflen=%d\n", buflen);
   if (buflen >= 18)
     {
       sprintf(buffer, "%08x %08x\n", c5471_wdt_cntl, c5471_wdt_count);
@@ -274,7 +274,7 @@ static ssize_t wdt_read(struct file *filep, char *buffer, size_t buflen)
 
 static ssize_t wdt_write(struct file *filep, const char *buffer, size_t buflen)
 {
-  dbg("buflen=%d\n", buflen);
+  err("buflen=%d\n", buflen);
   if (buflen)
     {
       /* Reset the timer to the maximum delay */
@@ -292,7 +292,7 @@ static ssize_t wdt_write(struct file *filep, const char *buffer, size_t buflen)
 
 static int wdt_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 {
-  dbg("ioctl Call: cmd=0x%x arg=0x%x", cmd, arg);
+  err("ioctl Call: cmd=0x%x arg=0x%x", cmd, arg);
 
   /* Process the IOCTL command (see arch/watchdog.h) */
 
@@ -315,7 +315,7 @@ static int wdt_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
 static int wdt_open(struct file *filep)
 {
-  dbg("");
+  err("");
 
   if (g_wdtopen)
     {
@@ -339,7 +339,7 @@ static int wdt_open(struct file *filep)
 
 static int wdt_close(struct file *filep)
 {
-  dbg("");
+  err("");
 
   /* The task controlling the watchdog has terminated.  Take the timer
    *  the
@@ -367,7 +367,7 @@ int up_wdtinit(void)
 {
   int ret;
 
-  dbg("C547x Watchdog Driver\n");
+  err("C547x Watchdog Driver\n");
 
   /* Register as /dev/wdt */
 
@@ -379,7 +379,7 @@ int up_wdtinit(void)
 
   /* Register for an interrupt level callback through wdt_interrupt */
 
-  dbg("Attach to IRQ=%d\n", C5471_IRQ_WATCHDOG);
+  err("Attach to IRQ=%d\n", C5471_IRQ_WATCHDOG);
 
   /* Make sure that the timer is stopped */
 
diff --git a/arch/arm/src/calypso/calypso_spi.c b/arch/arm/src/calypso/calypso_spi.c
index e3b063a559..fb5f871dfb 100644
--- a/arch/arm/src/calypso/calypso_spi.c
+++ b/arch/arm/src/calypso/calypso_spi.c
@@ -216,7 +216,7 @@ int spi_xfer(uint8_t dev_idx, uint8_t bitlen, const void *dout, void *din)
       tmp <<= (32-bitlen);    /* align to MSB */
     }
 
-  dbg("spi_xfer(dev_idx=%u, bitlen=%u, data_out=0x%08x): ",
+  err("spi_xfer(dev_idx=%u, bitlen=%u, data_out=0x%08x): ",
       dev_idx, bitlen, tmp);
 
   /* fill transmit registers */
@@ -236,14 +236,14 @@ int spi_xfer(uint8_t dev_idx, uint8_t bitlen, const void *dout, void *din)
     }
 
   putreg16(reg_ctrl, SPI_REG(REG_CTRL));
-  dbg("reg_ctrl=0x%04x ", reg_ctrl);
+  err("reg_ctrl=0x%04x ", reg_ctrl);
 
   /* wait until the transfer is complete */
 
   while (1)
     {
       reg_status = getreg16(SPI_REG(REG_STATUS));
-      dbg("status=0x%04x ", reg_status);
+      err("status=0x%04x ", reg_status);
       if (din && (reg_status & SPI_STATUS_RE))
         {
           break;
@@ -262,7 +262,7 @@ int spi_xfer(uint8_t dev_idx, uint8_t bitlen, const void *dout, void *din)
     {
       tmp = getreg16(SPI_REG(REG_RX_MSB)) << 16;
       tmp |= getreg16(SPI_REG(REG_RX_LSB));
-      dbg("data_in=0x%08x ", tmp);
+      err("data_in=0x%08x ", tmp);
 
       if (bitlen <= 8)
         {
@@ -278,7 +278,7 @@ int spi_xfer(uint8_t dev_idx, uint8_t bitlen, const void *dout, void *din)
         }
     }
 
-  dbg("\n");
+  err("\n");
 
   return 0;
 }
diff --git a/arch/arm/src/calypso/calypso_uwire.c b/arch/arm/src/calypso/calypso_uwire.c
index d837a7abdc..ee932b2924 100644
--- a/arch/arm/src/calypso/calypso_uwire.c
+++ b/arch/arm/src/calypso/calypso_uwire.c
@@ -112,7 +112,7 @@ int uwire_xfer(int cs, int bitlen, const void *dout, void *din)
 
   /* FIXME uwire_init always selects CS0 for now */
 
-  dbg("uwire_xfer(dev_idx=%u, bitlen=%u\n", cs, bitlen);
+  err("uwire_xfer(dev_idx=%u, bitlen=%u\n", cs, bitlen);
 
   /* select the chip */
 
@@ -128,7 +128,7 @@ int uwire_xfer(int cs, int bitlen, const void *dout, void *din)
 
       tmp <<= 16 - bitlen; /* align to MSB */
       putreg16(tmp, UWIRE_REG(REG_DATA));
-      dbg(", data_out=0x%04hx", tmp);
+      err(", data_out=0x%04hx", tmp);
     }
 
   tmp = (dout ? UWIRE_CSR_BITS_WR(bitlen) : 0) |
@@ -142,7 +142,7 @@ int uwire_xfer(int cs, int bitlen, const void *dout, void *din)
       _uwire_wait(UWIRE_CSR_RDRB, UWIRE_CSR_RDRB);
 
       tmp = getreg16(UWIRE_REG(REG_DATA));
-      dbg(", data_in=0x%08x", tmp);
+      err(", data_in=0x%08x", tmp);
 
       if (bitlen <= 8)
           *(uint8_t *)din = tmp & 0xff;
@@ -155,7 +155,7 @@ int uwire_xfer(int cs, int bitlen, const void *dout, void *din)
   putreg16(UWIRE_CSR_IDX(0) | 0, UWIRE_REG(REG_CSR));
   _uwire_wait(UWIRE_CSR_CSRB, 0);
 
-  dbg(")\n");
+  err(")\n");
 
   return 0;
 }
diff --git a/arch/arm/src/common/up_createstack.c b/arch/arm/src/common/up_createstack.c
index 1aa06a31c3..70d83a83a5 100644
--- a/arch/arm/src/common/up_createstack.c
+++ b/arch/arm/src/common/up_createstack.c
@@ -210,7 +210,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
 
       if (!tcb->stack_alloc_ptr)
         {
-          sdbg("ERROR: Failed to allocate stack, size %d\n", stack_size);
+          serr("ERROR: Failed to allocate stack, size %d\n", stack_size);
         }
 #endif
     }
diff --git a/arch/arm/src/common/up_exit.c b/arch/arm/src/common/up_exit.c
index b58ba08a44..be084481fd 100644
--- a/arch/arm/src/common/up_exit.c
+++ b/arch/arm/src/common/up_exit.c
@@ -77,8 +77,8 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
   int i;
 #endif
 
-  sdbg("  TCB=%p name=%s pid=%d\n", tcb, tcb->argv[0], tcb->pid);
-  sdbg("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
+  serr("  TCB=%p name=%s pid=%d\n", tcb, tcb->argv[0], tcb->pid);
+  serr("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
 
 #if CONFIG_NFILE_DESCRIPTORS > 0
   filelist = tcb->group->tg_filelist;
@@ -87,7 +87,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
       struct inode *inode = filelist->fl_files[i].f_inode;
       if (inode)
         {
-          sdbg("      fd=%d refcount=%d\n",
+          serr("      fd=%d refcount=%d\n",
                i, inode->i_crefs);
         }
     }
@@ -101,11 +101,11 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
       if (filep->fs_fd >= 0)
         {
 #if CONFIG_STDIO_BUFFER_SIZE > 0
-          sdbg("      fd=%d nbytes=%d\n",
+          serr("      fd=%d nbytes=%d\n",
                filep->fs_fd,
                filep->fs_bufpos - filep->fs_bufstart);
 #else
-          sdbg("      fd=%d\n", filep->fs_fd);
+          serr("      fd=%d\n", filep->fs_fd);
 #endif
         }
     }
diff --git a/arch/arm/src/common/up_vfork.c b/arch/arm/src/common/up_vfork.c
index 1d8e8c5de1..e655ab15b4 100644
--- a/arch/arm/src/common/up_vfork.c
+++ b/arch/arm/src/common/up_vfork.c
@@ -143,7 +143,7 @@ pid_t up_vfork(const struct vfork_s *context)
   child = task_vforksetup((start_t)(context->lr & ~1));
   if (!child)
     {
-      sdbg("ERROR: task_vforksetup failed\n");
+      serr("ERROR: task_vforksetup failed\n");
       return (pid_t)ERROR;
     }
 
@@ -162,7 +162,7 @@ pid_t up_vfork(const struct vfork_s *context)
                         parent->flags & TCB_FLAG_TTYPE_MASK);
   if (ret != OK)
     {
-      sdbg("ERROR: up_create_stack failed: %d\n", ret);
+      serr("ERROR: up_create_stack failed: %d\n", ret);
       task_vforkabort(child, -ret);
       return (pid_t)ERROR;
     }
diff --git a/arch/arm/src/dm320/dm320_framebuffer.c b/arch/arm/src/dm320/dm320_framebuffer.c
index b753adc274..ca81e8a848 100644
--- a/arch/arm/src/dm320/dm320_framebuffer.c
+++ b/arch/arm/src/dm320/dm320_framebuffer.c
@@ -928,7 +928,7 @@ static void dm320_hwinitialize(void)
   /* Set up the rectangular cursor with defaults */
 
 #ifdef CONFIG_FB_HWCURSOR
-  gdbg("Initialize rectangular cursor\n");
+  gerr("Initialize rectangular cursor\n");
 
   putreg16(0, DM320_OSD_CURXP);
   putreg16(0, DM320_OSD_CURYP);
@@ -1385,7 +1385,7 @@ int up_fbinitialize(int display)
   ret = dm320_allocvideomemory();
   if (ret != 0)
     {
-      gdbg("Failed to allocate video buffers\n");
+      gerr("Failed to allocate video buffers\n");
       return ret;
     }
 
diff --git a/arch/arm/src/efm32/efm32_adc.c b/arch/arm/src/efm32/efm32_adc.c
index 0053a874bd..bc652fc59e 100644
--- a/arch/arm/src/efm32/efm32_adc.c
+++ b/arch/arm/src/efm32/efm32_adc.c
@@ -1298,7 +1298,7 @@ struct adc_dev_s *efm32_adcinitialize(int intf, const uint8_t *chanlist, int nch
   else
 #endif
     {
-      adbg("No ADC interface defined\n");
+      aerr("No ADC interface defined\n");
       return NULL;
     }
 
diff --git a/arch/arm/src/efm32/efm32_dma.c b/arch/arm/src/efm32/efm32_dma.c
index c6c7af4e48..de260de00d 100644
--- a/arch/arm/src/efm32/efm32_dma.c
+++ b/arch/arm/src/efm32/efm32_dma.c
@@ -804,29 +804,29 @@ void efm32_dmadump(DMA_HANDLE handle, const struct efm32_dmaregs_s *regs,
 {
   struct dma_channel_s *dmach = (struct dma_channel_s *)handle;
 
-  dmadbg("%s\n", msg);
-  dmadbg("  DMA Registers:\n");
-  dmadbg("        STATUS: %08x\n", regs->status);
-  dmadbg("      CTRLBASE: %08x\n", regs->ctrlbase);
-  dmadbg("   ALTCTRLBASE: %08x\n", regs->altctrlbase);
-  dmadbg("  CHWAITSTATUS: %08x\n", regs->chwaitstatus);
-  dmadbg("   CHUSEBURSTS: %08x\n", regs->chusebursts);
-  dmadbg("    CHREQMASKS: %08x\n", regs->chreqmasks);
-  dmadbg("         CHENS: %08x\n", regs->chens);
-  dmadbg("        CHALTS: %08x\n", regs->chalts);
-  dmadbg("        CHPRIS: %08x\n", regs->chpris);
-  dmadbg("        ERRORC: %08x\n", regs->errorc);
-  dmadbg("   CHREQSTATUS: %08x\n", regs->chreqstatus);
-  dmadbg("  CHSREQSTATUS: %08x\n", regs->chsreqstatus);
-  dmadbg("           IEN: %08x\n", regs->ien);
+  dmaerr("%s\n", msg);
+  dmaerr("  DMA Registers:\n");
+  dmaerr("        STATUS: %08x\n", regs->status);
+  dmaerr("      CTRLBASE: %08x\n", regs->ctrlbase);
+  dmaerr("   ALTCTRLBASE: %08x\n", regs->altctrlbase);
+  dmaerr("  CHWAITSTATUS: %08x\n", regs->chwaitstatus);
+  dmaerr("   CHUSEBURSTS: %08x\n", regs->chusebursts);
+  dmaerr("    CHREQMASKS: %08x\n", regs->chreqmasks);
+  dmaerr("         CHENS: %08x\n", regs->chens);
+  dmaerr("        CHALTS: %08x\n", regs->chalts);
+  dmaerr("        CHPRIS: %08x\n", regs->chpris);
+  dmaerr("        ERRORC: %08x\n", regs->errorc);
+  dmaerr("   CHREQSTATUS: %08x\n", regs->chreqstatus);
+  dmaerr("  CHSREQSTATUS: %08x\n", regs->chsreqstatus);
+  dmaerr("           IEN: %08x\n", regs->ien);
 #if defined(CONFIG_EFM32_EFM32GG)
-  dmadbg("          CTRL: %08x\n", regs->ctrl);
-  dmadbg("           RDS: %08x\n", regs->rds);
-  dmadbg("         LOOP0: %08x\n", regs->loop0);
-  dmadbg("         LOOP1: %08x\n", regs->loop1);
-  dmadbg("         RECT0: %08x\n", regs->rect0);
+  dmaerr("          CTRL: %08x\n", regs->ctrl);
+  dmaerr("           RDS: %08x\n", regs->rds);
+  dmaerr("         LOOP0: %08x\n", regs->loop0);
+  dmaerr("         LOOP1: %08x\n", regs->loop1);
+  dmaerr("         RECT0: %08x\n", regs->rect0);
 #endif
-  dmadbg("  DMA Channel %d Registers:\n", dmach->chan);
-  dmadbg("        CHCTRL: %08x\n", regs->chnctrl);
+  dmaerr("  DMA Channel %d Registers:\n", dmach->chan);
+  dmaerr("        CHCTRL: %08x\n", regs->chnctrl);
 }
 #endif
diff --git a/arch/arm/src/efm32/efm32_i2c.c b/arch/arm/src/efm32/efm32_i2c.c
index aef2df814e..f12118f512 100644
--- a/arch/arm/src/efm32/efm32_i2c.c
+++ b/arch/arm/src/efm32/efm32_i2c.c
@@ -137,10 +137,10 @@
 /* CONFIG_DEBUG_I2C + CONFIG_DEBUG_FEATURES enables general I2C debug output. */
 
 #ifdef CONFIG_DEBUG_I2C
-#  define i2cdbg dbg
+#  define i2cerr err
 #  define i2cinfo info
 #else
-#  define i2cdbg(x...)
+#  define i2cerr(x...)
 #  define i2cinfo(x...)
 #endif
 
@@ -761,7 +761,7 @@ static void efm32_i2c_tracenew(FAR struct efm32_i2c_priv_s *priv)
 
           if (priv->tndx >= (CONFIG_I2C_NTRACE - 1))
             {
-              i2cdbg("Trace table overflow\n");
+              i2cerr("Trace table overflow\n");
               return;
             }
 
@@ -1536,7 +1536,7 @@ static int efm32_i2c_transfer(FAR struct i2c_master_s *dev,
     {
       ret = -ETIMEDOUT;
 
-      i2cdbg("Timed out: I2Cx_STATE: 0x%04x I2Cx_STATUS: 0x%08x\n",
+      i2cerr("Timed out: I2Cx_STATE: 0x%04x I2Cx_STATUS: 0x%08x\n",
              efm32_i2c_getreg(priv, EFM32_I2C_STATE_OFFSET),
              efm32_i2c_getreg(priv, EFM32_I2C_STATUS_OFFSET));
 
diff --git a/arch/arm/src/efm32/efm32_irq.c b/arch/arm/src/efm32/efm32_irq.c
index 4ad702d4ab..f22d4a44ae 100644
--- a/arch/arm/src/efm32/efm32_irq.c
+++ b/arch/arm/src/efm32/efm32_irq.c
@@ -155,7 +155,7 @@ static void efm32_dumpnvic(const char *msg, int irq)
 
 /****************************************************************************
  * Name: efm32_nmi, efm32_busfault, efm32_usagefault, efm32_pendsv,
- *       efm32_dbgmonitor, efm32_pendsv, efm32_reserved
+ *       efm32_errmonitor, efm32_pendsv, efm32_reserved
  *
  * Description:
  *   Handlers for various exceptions.  None are handled and all are fatal
@@ -168,7 +168,7 @@ static void efm32_dumpnvic(const char *msg, int irq)
 static int efm32_nmi(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! NMI received\n");
+  err("PANIC!!! NMI received\n");
   PANIC();
   return 0;
 }
@@ -176,7 +176,7 @@ static int efm32_nmi(int irq, FAR void *context)
 static int efm32_busfault(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS));
+  err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS));
   PANIC();
   return 0;
 }
@@ -184,7 +184,7 @@ static int efm32_busfault(int irq, FAR void *context)
 static int efm32_usagefault(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS));
+  err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS));
   PANIC();
   return 0;
 }
@@ -192,15 +192,15 @@ static int efm32_usagefault(int irq, FAR void *context)
 static int efm32_pendsv(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! PendSV received\n");
+  err("PANIC!!! PendSV received\n");
   PANIC();
   return 0;
 }
 
-static int efm32_dbgmonitor(int irq, FAR void *context)
+static int efm32_errmonitor(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Debug Monitor received\n");
+  err("PANIC!!! Debug Monitor received\n");
   PANIC();
   return 0;
 }
@@ -208,7 +208,7 @@ static int efm32_dbgmonitor(int irq, FAR void *context)
 static int efm32_reserved(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Reserved interrupt\n");
+  err("PANIC!!! Reserved interrupt\n");
   PANIC();
   return 0;
 }
@@ -456,7 +456,7 @@ void up_irqinitialize(void)
   irq_attach(EFM32_IRQ_BUSFAULT, efm32_busfault);
   irq_attach(EFM32_IRQ_USAGEFAULT, efm32_usagefault);
   irq_attach(EFM32_IRQ_PENDSV, efm32_pendsv);
-  irq_attach(EFM32_IRQ_DBGMONITOR, efm32_dbgmonitor);
+  irq_attach(EFM32_IRQ_DBGMONITOR, efm32_errmonitor);
   irq_attach(EFM32_IRQ_RESERVED, efm32_reserved);
 #endif
 
diff --git a/arch/arm/src/efm32/efm32_pwm.c b/arch/arm/src/efm32/efm32_pwm.c
index 3794c177c8..815ae7ed96 100644
--- a/arch/arm/src/efm32/efm32_pwm.c
+++ b/arch/arm/src/efm32/efm32_pwm.c
@@ -82,7 +82,7 @@
 #endif
 
 #ifdef CONFIG_DEBUG_PWM
-#  define pwmdbg              dbg
+#  define pwmerr              err
 #  define pwmllerr            llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define pwminfo           info
@@ -94,7 +94,7 @@
 #    define pwm_dumpgpio(p,m)
 #  endif
 #else
-#  define pwmdbg(x...)
+#  define pwmerr(x...)
 #  define pwmllerr(x...)
 #  define pwminfo(x...)
 #  define pwmllinfo(x...)
@@ -414,7 +414,7 @@ static int pwm_timer(FAR struct efm32_pwmtimer_s *priv,
 
   if (efm32_timer_set_freq(priv->base, priv->pclk, info->frequency) < 0)
     {
-      pwmdbg("Cannot set TIMER frequency %dHz from clock %dHz\n",
+      pwmerr("Cannot set TIMER frequency %dHz from clock %dHz\n",
              info->frequency, priv->pclk);
       return -EINVAL;
     }
@@ -933,7 +933,7 @@ FAR struct pwm_lowerhalf_s *efm32_pwminitialize(int timer)
 #endif
 
       default:
-        pwmdbg("No such timer configured\n");
+        pwmerr("No such timer configured\n");
         return NULL;
     }
 
diff --git a/arch/arm/src/efm32/efm32_rmu.c b/arch/arm/src/efm32/efm32_rmu.c
index 6b77564b24..1d30cb2b40 100644
--- a/arch/arm/src/efm32/efm32_rmu.c
+++ b/arch/arm/src/efm32/efm32_rmu.c
@@ -262,7 +262,7 @@ void efm32_rmu_initialize(void)
     }
 
 #ifdef CONFIG_EFM32_RMU_DEBUG
-  rmudbg("RMU => reg = 0x%08X\n", g_efm32_rstcause);
+  rmuerr("RMU => reg = 0x%08X\n", g_efm32_rstcause);
   for (; ; )
     {
       const char *str;
@@ -273,7 +273,7 @@ void efm32_rmu_initialize(void)
           break;
         }
 
-      rmudbg("RMU => %s\n", str);
+      rmuerr("RMU => %s\n", str);
     }
 #endif
 }
diff --git a/arch/arm/src/efm32/efm32_rmu.h b/arch/arm/src/efm32/efm32_rmu.h
index dec1a00464..d633c9f73c 100644
--- a/arch/arm/src/efm32/efm32_rmu.h
+++ b/arch/arm/src/efm32/efm32_rmu.h
@@ -56,14 +56,14 @@
 #endif
 
 #ifdef CONFIG_EFM32_RMU_DEBUG
-#  define rmudbg llerr
+#  define rmuerr llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define rmuinfo llerr
 #  else
 #    define rmuinfo(x...)
 #  endif
 #else
-#  define rmudbg(x...)
+#  define rmuerr(x...)
 #  define rmuinfo(x...)
 #endif
 
diff --git a/arch/arm/src/efm32/efm32_rtc_burtc.c b/arch/arm/src/efm32/efm32_rtc_burtc.c
index ed32518f7b..779c922e59 100644
--- a/arch/arm/src/efm32/efm32_rtc_burtc.c
+++ b/arch/arm/src/efm32/efm32_rtc_burtc.c
@@ -131,9 +131,9 @@
 #define __CNT_ZERO_REG          EFM32_BURTC_RET_REG(1)
 
 #if defined CONFIG_DEBUG_FEATURES && defined CONFIG_RTC_DEBUG
-#   define burtcdbg llerr
+#   define burtcerr llerr
 #else
-#   define burtcdbg(x...)
+#   define burtcerr(x...)
 #endif
 
 /************************************************************************************
@@ -191,7 +191,7 @@ static int efm32_rtc_burtc_interrupt(int irq, void *context)
 
   if (source & BURTC_IF_LFXOFAIL)
     {
-      burtcdbg("BURTC_IF_LFXOFAIL");
+      burtcerr("BURTC_IF_LFXOFAIL");
     }
 
 #ifdef CONFIG_RTC_HIRES
@@ -245,7 +245,7 @@ static void efm32_rtc_burtc_init(void)
   regval = g_efm32_rstcause;
   regval2 = getreg32(EFM32_BURTC_CTRL);
 
-  burtcdbg("BURTC RESETCAUSE=0x%08X BURTC_CTRL=0x%08X\n", regval, regval2);
+  burtcerr("BURTC RESETCAUSE=0x%08X BURTC_CTRL=0x%08X\n", regval, regval2);
 
   if (!(regval2 & BURTC_CTRL_RSTEN) &&
       !(regval  & RMU_RSTCAUSE_BUBODREG) &&
@@ -262,11 +262,11 @@ static void efm32_rtc_burtc_init(void)
 
       /* restore saved base time */
 
-      burtcdbg("BURTC OK\n");
+      burtcerr("BURTC OK\n");
       return;
     }
 
-  burtcdbg("BURTC RESETED\n");
+  burtcerr("BURTC RESETED\n");
 
   /* Disable reset of BackupDomain */
 
@@ -358,7 +358,7 @@ static uint64_t efm32_get_burtc_tick(void)
 
   val = (uint64_t)cnt_carry*__CNT_TOP + cnt + cnt_zero;
 
-  burtcdbg("Get Tick carry %u zero %u reg %u\n", cnt_carry, cnt_carry,cnt);
+  burtcerr("Get Tick carry %u zero %u reg %u\n", cnt_carry, cnt_carry,cnt);
 
   return val;
 }
@@ -449,7 +449,7 @@ int up_rtc_gettime(FAR struct timespec *tp)
   tp->tv_sec  = val  / CONFIG_RTC_FREQUENCY;
   tp->tv_nsec = (val % CONFIG_RTC_FREQUENCY)*(NSEC_PER_SEC/CONFIG_RTC_FREQUENCY);
 
-  burtcdbg("Get RTC %u.%09u\n", tp->tv_sec, tp->tv_nsec);
+  burtcerr("Get RTC %u.%09u\n", tp->tv_sec, tp->tv_nsec);
 
   return OK;
 }
@@ -499,7 +499,7 @@ int up_rtc_settime(FAR const struct timespec *tp)
   cnt_carry = val / __CNT_TOP;
   cnt       = val % __CNT_TOP;
 
-  burtcdbg("Set RTC %u.%09u carry %u zero %u reg %u\n",
+  burtcerr("Set RTC %u.%09u carry %u zero %u reg %u\n",
            tp->tv_sec, tp->tv_nsec, cnt_carry, cnt, cnt_reg);
 
   putreg32(cnt_carry, __CNT_CARRY_REG);
diff --git a/arch/arm/src/efm32/efm32_spi.c b/arch/arm/src/efm32/efm32_spi.c
index 5fce18d3ae..7eafb1a779 100644
--- a/arch/arm/src/efm32/efm32_spi.c
+++ b/arch/arm/src/efm32/efm32_spi.c
@@ -100,14 +100,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg llerr
+#  define spierr llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -1456,7 +1456,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
       ret = wd_start(priv->wdog, (int)ticks, spi_dma_timeout, 1, (uint32_t)priv);
       if (ret < 0)
         {
-          spidbg("ERROR: Failed to start timeout\n");
+          spierr("ERROR: Failed to start timeout\n");
         }
 
       /* Then wait for each to complete.  TX should complete first */
@@ -1594,7 +1594,7 @@ static int spi_portinitialize(struct efm32_spidev_s *priv)
   priv->rxdmach = efm32_dmachannel();
   if (!priv->rxdmach)
     {
-      spidbg("ERROR: Failed to allocate the RX DMA channel for SPI port: %d\n",
+      spierr("ERROR: Failed to allocate the RX DMA channel for SPI port: %d\n",
              port);
       goto errout;
     }
@@ -1602,7 +1602,7 @@ static int spi_portinitialize(struct efm32_spidev_s *priv)
   priv->txdmach = efm32_dmachannel();
   if (!priv->txdmach)
     {
-      spidbg("ERROR: Failed to allocate the TX DMA channel for SPI port: %d\n",
+      spierr("ERROR: Failed to allocate the TX DMA channel for SPI port: %d\n",
              port);
       goto errout_with_rxdmach;
     }
@@ -1612,7 +1612,7 @@ static int spi_portinitialize(struct efm32_spidev_s *priv)
   priv->wdog = wd_create();
   if (!priv->wdog)
     {
-      spidbg("ERROR: Failed to create a timer for SPI port: %d\n", port);
+      spierr("ERROR: Failed to create a timer for SPI port: %d\n", port);
       goto errout_with_txdmach;
     }
 
@@ -1709,7 +1709,7 @@ struct spi_dev_s *efm32_spibus_initialize(int port)
   else
 #endif
     {
-      spidbg("ERROR: Unsupported SPI port: %d\n", port);
+      spierr("ERROR: Unsupported SPI port: %d\n", port);
       return NULL;
     }
 
@@ -1731,7 +1731,7 @@ struct spi_dev_s *efm32_spibus_initialize(int port)
       ret = spi_portinitialize(priv);
       if (ret < 0)
         {
-          spidbg("ERROR: Failed to initialize SPI port %d\n", port);
+          spierr("ERROR: Failed to initialize SPI port %d\n", port);
           leave_critical_section(flags);
           return NULL;
         }
diff --git a/arch/arm/src/efm32/efm32_timer.c b/arch/arm/src/efm32/efm32_timer.c
index e44121e411..a1350a9154 100644
--- a/arch/arm/src/efm32/efm32_timer.c
+++ b/arch/arm/src/efm32/efm32_timer.c
@@ -68,7 +68,7 @@
 #endif
 
 #ifdef CONFIG_DEBUG_TIMER
-#  define efm32_timerdbg              dbg
+#  define efm32_timererr              err
 #  define efm32_timerllerr            llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define efm32_timerinfo           info
@@ -80,7 +80,7 @@
 #    define efm32_timer_dumpgpio(p,m)
 #  endif
 #else
-#  define efm32_timerdbg(x...)
+#  define efm32_timererr(x...)
 #  define efm32_timerllerr(x...)
 #  define efm32_timerinfo(x...)
 #  define efm32_timerllinfo(x...)
@@ -262,7 +262,7 @@ int efm32_timer_set_freq(uintptr_t base, uint32_t clk_freq, uint32_t freq)
 
   reload = (clk_freq / prescaler / freq);
 
-  efm32_timerdbg("Source: %4xHz Div: %4x Reload: %4x \n",
+  efm32_timererr("Source: %4xHz Div: %4x Reload: %4x \n",
                  clk_freq, prescaler, reload);
 
   putreg32(reload, base + EFM32_TIMER_TOP_OFFSET);
diff --git a/arch/arm/src/efm32/efm32_usbdev.c b/arch/arm/src/efm32/efm32_usbdev.c
index fe0a85f15d..a6f4c7362c 100644
--- a/arch/arm/src/efm32/efm32_usbdev.c
+++ b/arch/arm/src/efm32/efm32_usbdev.c
@@ -3799,7 +3799,7 @@ static int efm32_epout_configure(FAR struct efm32_ep_s *privep, uint8_t eptype,
             break;
 
           default:
-            udbg("Unsupported maxpacket: %d\n", maxpacket);
+            uerr("Unsupported maxpacket: %d\n", maxpacket);
             return -EINVAL;
         }
     }
@@ -3894,7 +3894,7 @@ static int efm32_epin_configure(FAR struct efm32_ep_s *privep, uint8_t eptype,
             break;
 
           default:
-            udbg("Unsupported maxpacket: %d\n", maxpacket);
+            uerr("Unsupported maxpacket: %d\n", maxpacket);
             return -EINVAL;
         }
     }
@@ -5482,7 +5482,7 @@ void up_usbinitialize(void)
   ret = irq_attach(EFM32_IRQ_USB, efm32_usbinterrupt);
   if (ret < 0)
     {
-      udbg("irq_attach failed\n", ret);
+      uerr("irq_attach failed\n", ret);
       goto errout;
     }
 
diff --git a/arch/arm/src/efm32/efm32_usbhost.c b/arch/arm/src/efm32/efm32_usbhost.c
index 8c18363062..55786d14e0 100644
--- a/arch/arm/src/efm32/efm32_usbhost.c
+++ b/arch/arm/src/efm32/efm32_usbhost.c
@@ -1362,7 +1362,7 @@ static int efm32_ctrlep_alloc(FAR struct efm32_usbhost_s *priv,
   ctrlep = (FAR struct efm32_ctrlinfo_s *)kmm_malloc(sizeof(struct efm32_ctrlinfo_s));
   if (ctrlep == NULL)
     {
-      udbg("ERROR: Failed to allocate control endpoint container\n");
+      uerr("ERROR: Failed to allocate control endpoint container\n");
       return -ENOMEM;
     }
 
@@ -1372,7 +1372,7 @@ static int efm32_ctrlep_alloc(FAR struct efm32_usbhost_s *priv,
                              hport->funcaddr, hport->speed, ctrlep);
   if (ret < 0)
     {
-      udbg("ERROR: efm32_ctrlchan_alloc failed: %d\n", ret);
+      uerr("ERROR: efm32_ctrlchan_alloc failed: %d\n", ret);
       kmm_free(ctrlep);
       return ret;
     }
@@ -1424,7 +1424,7 @@ static int efm32_xfrep_alloc(FAR struct efm32_usbhost_s *priv,
   chidx = efm32_chan_alloc(priv);
   if (chidx < 0)
     {
-      udbg("ERROR: Failed to allocate a host channel\n");
+      uerr("ERROR: Failed to allocate a host channel\n");
       return -ENOMEM;
     }
 
@@ -1934,7 +1934,7 @@ static ssize_t efm32_in_transfer(FAR struct efm32_usbhost_s *priv, int chidx,
       ret = efm32_in_setup(priv, chidx);
       if (ret < 0)
         {
-          udbg("ERROR: efm32_in_setup failed: %d\n", ret);
+          uerr("ERROR: efm32_in_setup failed: %d\n", ret);
           return  (ssize_t)ret;
         }
 
@@ -1965,7 +1965,7 @@ static ssize_t efm32_in_transfer(FAR struct efm32_usbhost_s *priv, int chidx,
             {
               /* Break out and return the error */
 
-              udbg("ERROR: efm32_chan_wait failed: %d\n", ret);
+              uerr("ERROR: efm32_chan_wait failed: %d\n", ret);
               return (ssize_t)ret;
             }
         }
@@ -2010,7 +2010,7 @@ static void efm32_in_next(FAR struct efm32_usbhost_s *priv,
           return;
         }
 
-      udbg("ERROR: efm32_in_setup failed: %d\n", ret);
+      uerr("ERROR: efm32_in_setup failed: %d\n", ret);
       result = ret;
     }
 
@@ -2068,7 +2068,7 @@ static int efm32_in_asynch(FAR struct efm32_usbhost_s *priv, int chidx,
   ret = efm32_chan_asynchsetup(priv, chan, callback, arg);
   if (ret < 0)
     {
-      udbg("ERROR: efm32_chan_asynchsetup failed: %d\n", ret);
+      uerr("ERROR: efm32_chan_asynchsetup failed: %d\n", ret);
       return ret;
     }
 
@@ -2077,7 +2077,7 @@ static int efm32_in_asynch(FAR struct efm32_usbhost_s *priv, int chidx,
   ret = efm32_in_setup(priv, chidx);
   if (ret < 0)
     {
-      udbg("ERROR: efm32_in_setup failed: %d\n", ret);
+      uerr("ERROR: efm32_in_setup failed: %d\n", ret);
     }
 
   /* And return with the transfer pending */
@@ -2203,7 +2203,7 @@ static ssize_t efm32_out_transfer(FAR struct efm32_usbhost_s *priv, int chidx,
       ret = efm32_out_setup(priv, chidx);
       if (ret < 0)
         {
-          udbg("ERROR: efm32_out_setup failed: %d\n", ret);
+          uerr("ERROR: efm32_out_setup failed: %d\n", ret);
           return (ssize_t)ret;
         }
 
@@ -2231,7 +2231,7 @@ static ssize_t efm32_out_transfer(FAR struct efm32_usbhost_s *priv, int chidx,
             {
               /* Break out and return the error */
 
-              udbg("ERROR: efm32_chan_wait failed: %d\n", ret);
+              uerr("ERROR: efm32_chan_wait failed: %d\n", ret);
               return (ssize_t)ret;
             }
 
@@ -2296,7 +2296,7 @@ static void efm32_out_next(FAR struct efm32_usbhost_s *priv,
           return;
         }
 
-      udbg("ERROR: efm32_out_setup failed: %d\n", ret);
+      uerr("ERROR: efm32_out_setup failed: %d\n", ret);
       result = ret;
     }
 
@@ -2354,7 +2354,7 @@ static int efm32_out_asynch(FAR struct efm32_usbhost_s *priv, int chidx,
   ret = efm32_chan_asynchsetup(priv, chan, callback, arg);
   if (ret < 0)
     {
-      udbg("ERROR: efm32_chan_asynchsetup failed: %d\n", ret);
+      uerr("ERROR: efm32_chan_asynchsetup failed: %d\n", ret);
       return ret;
     }
 
@@ -2363,7 +2363,7 @@ static int efm32_out_asynch(FAR struct efm32_usbhost_s *priv, int chidx,
   ret = efm32_out_setup(priv, chidx);
   if (ret < 0)
     {
-      udbg("ERROR: efm32_out_setup failed: %d\n", ret);
+      uerr("ERROR: efm32_out_setup failed: %d\n", ret);
     }
 
   /* And return with the transfer pending */
@@ -3932,7 +3932,7 @@ static int efm32_rh_enumerate(FAR struct efm32_usbhost_s *priv,
   ret = efm32_ctrlchan_alloc(priv, 0, 0, priv->rhport.hport.speed, &priv->ep0);
   if (ret < 0)
     {
-      udbg("ERROR: Failed to allocate a control endpoint: %d\n", ret);
+      uerr("ERROR: Failed to allocate a control endpoint: %d\n", ret);
     }
 
   return ret;
@@ -3978,7 +3978,7 @@ static int efm32_enumerate(FAR struct usbhost_connection_s *conn,
     {
       /* Return to the disconnected state */
 
-      udbg("ERROR: Enumeration failed: %d\n", ret);
+      uerr("ERROR: Enumeration failed: %d\n", ret);
       efm32_gint_disconnected(priv);
     }
 
diff --git a/arch/arm/src/kinetis/kinetis_enet.c b/arch/arm/src/kinetis/kinetis_enet.c
index 3328587c1c..b8e0ed627e 100644
--- a/arch/arm/src/kinetis/kinetis_enet.c
+++ b/arch/arm/src/kinetis/kinetis_enet.c
@@ -918,7 +918,7 @@ static int kinetis_ifup(struct net_driver_s *dev)
   uint8_t *mac = dev->d_mac.ether_addr_octet;
   uint32_t regval;
 
-  ndbg("Bringing up: %d.%d.%d.%d\n",
+  nerr("Bringing up: %d.%d.%d.%d\n",
        dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
        (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 
@@ -1695,7 +1695,7 @@ int kinetis_netinitialize(int intf)
     {
       /* We could not attach the ISR to the interrupt */
 
-      ndbg("Failed to attach EMACTMR IRQ\n");
+      nerr("Failed to attach EMACTMR IRQ\n");
       return -EAGAIN;
     }
 #endif
@@ -1706,7 +1706,7 @@ int kinetis_netinitialize(int intf)
     {
       /* We could not attach the ISR to the interrupt */
 
-      ndbg("Failed to attach EMACTX IRQ\n");
+      nerr("Failed to attach EMACTX IRQ\n");
       return -EAGAIN;
     }
 
@@ -1716,7 +1716,7 @@ int kinetis_netinitialize(int intf)
     {
       /* We could not attach the ISR to the interrupt */
 
-      ndbg("Failed to attach EMACRX IRQ\n");
+      nerr("Failed to attach EMACRX IRQ\n");
       return -EAGAIN;
     }
 
@@ -1726,7 +1726,7 @@ int kinetis_netinitialize(int intf)
     {
       /* We could not attach the ISR to the interrupt */
 
-      ndbg("Failed to attach EMACMISC IRQ\n");
+      nerr("Failed to attach EMACMISC IRQ\n");
       return -EAGAIN;
     }
 
diff --git a/arch/arm/src/kinetis/kinetis_irq.c b/arch/arm/src/kinetis/kinetis_irq.c
index 10abcf8e5f..45b147af67 100644
--- a/arch/arm/src/kinetis/kinetis_irq.c
+++ b/arch/arm/src/kinetis/kinetis_irq.c
@@ -159,7 +159,7 @@ static void kinetis_dumpnvic(const char *msg, int irq)
 
 /****************************************************************************
  * Name: kinetis_nmi, kinetis_busfault, kinetis_usagefault, kinetis_pendsv,
- *       kinetis_dbgmonitor, kinetis_pendsv, kinetis_reserved
+ *       kinetis_errmonitor, kinetis_pendsv, kinetis_reserved
  *
  * Description:
  *   Handlers for various execptions.  None are handled and all are fatal
@@ -172,7 +172,7 @@ static void kinetis_dumpnvic(const char *msg, int irq)
 static int kinetis_nmi(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! NMI received\n");
+  err("PANIC!!! NMI received\n");
   PANIC();
   return 0;
 }
@@ -180,7 +180,7 @@ static int kinetis_nmi(int irq, FAR void *context)
 static int kinetis_busfault(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Bus fault recived\n");
+  err("PANIC!!! Bus fault recived\n");
   PANIC();
   return 0;
 }
@@ -188,7 +188,7 @@ static int kinetis_busfault(int irq, FAR void *context)
 static int kinetis_usagefault(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Usage fault received\n");
+  err("PANIC!!! Usage fault received\n");
   PANIC();
   return 0;
 }
@@ -196,15 +196,15 @@ static int kinetis_usagefault(int irq, FAR void *context)
 static int kinetis_pendsv(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! PendSV received\n");
+  err("PANIC!!! PendSV received\n");
   PANIC();
   return 0;
 }
 
-static int kinetis_dbgmonitor(int irq, FAR void *context)
+static int kinetis_errmonitor(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Debug Monitor received\n");
+  err("PANIC!!! Debug Monitor received\n");
   PANIC();
   return 0;
 }
@@ -212,7 +212,7 @@ static int kinetis_dbgmonitor(int irq, FAR void *context)
 static int kinetis_reserved(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Reserved interrupt\n");
+  err("PANIC!!! Reserved interrupt\n");
   PANIC();
   return 0;
 }
@@ -428,7 +428,7 @@ void up_irqinitialize(void)
   irq_attach(KINETIS_IRQ_BUSFAULT, kinetis_busfault);
   irq_attach(KINETIS_IRQ_USAGEFAULT, kinetis_usagefault);
   irq_attach(KINETIS_IRQ_PENDSV, kinetis_pendsv);
-  irq_attach(KINETIS_IRQ_DBGMONITOR, kinetis_dbgmonitor);
+  irq_attach(KINETIS_IRQ_DBGMONITOR, kinetis_errmonitor);
   irq_attach(KINETIS_IRQ_RESERVED, kinetis_reserved);
 #endif
 
diff --git a/arch/arm/src/kinetis/kinetis_pwm.c b/arch/arm/src/kinetis/kinetis_pwm.c
index 214b3249a3..1f552d8e4b 100644
--- a/arch/arm/src/kinetis/kinetis_pwm.c
+++ b/arch/arm/src/kinetis/kinetis_pwm.c
@@ -83,7 +83,7 @@
 #endif
 
 #ifdef CONFIG_DEBUG_PWM
-#  define pwmdbg              dbg
+#  define pwmerr              err
 #  define pwmllerr            llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define pwminfo           info
@@ -95,7 +95,7 @@
 #    define pwm_dumpgpio(p,m)
 #  endif
 #else
-#  define pwmdbg(x...)
+#  define pwmerr(x...)
 #  define pwmllerr(x...)
 #  define pwminfo(x...)
 #  define pwmllinfo(x...)
@@ -519,7 +519,7 @@ static int pwm_timer(FAR struct kinetis_pwmtimer_s *priv,
         break;
 
       default:
-        pwmdbg("No such channel: %d\n", priv->channel);
+        pwmerr("No such channel: %d\n", priv->channel);
         return -EINVAL;
     }
 
@@ -711,7 +711,7 @@ static int pwm_stop(FAR struct pwm_lowerhalf_s *dev)
         break;
 
       default:
-        pwmdbg("No such channel: %d\n", priv->channel);
+        pwmerr("No such channel: %d\n", priv->channel);
         return -EINVAL;
     }
 
@@ -798,7 +798,7 @@ FAR struct pwm_lowerhalf_s *kinetis_pwminitialize(int timer)
 #endif
 
       default:
-        pwmdbg("No such timer configured\n");
+        pwmerr("No such timer configured\n");
         return NULL;
     }
 
diff --git a/arch/arm/src/kinetis/kinetis_sdhc.c b/arch/arm/src/kinetis/kinetis_sdhc.c
index 7c6f2d421f..0b2214cb2b 100644
--- a/arch/arm/src/kinetis/kinetis_sdhc.c
+++ b/arch/arm/src/kinetis/kinetis_sdhc.c
@@ -574,29 +574,29 @@ static void kinetis_sample(struct kinetis_dev_s *priv, int index)
 static void kinetis_dumpsample(struct kinetis_dev_s *priv,
                                struct kinetis_sdhcregs_s *regs, const char *msg)
 {
-  fdbg("SDHC Registers: %s\n", msg);
-  fdbg("   DSADDR[%08x]: %08x\n", KINETIS_SDHC_DSADDR,    regs->dsaddr);
-  fdbg("  BLKATTR[%08x]: %08x\n", KINETIS_SDHC_BLKATTR,   regs->blkattr);
-  fdbg("   CMDARG[%08x]: %08x\n", KINETIS_SDHC_CMDARG,    regs->cmdarg);
-  fdbg("   XFERTY[%08x]: %08x\n", KINETIS_SDHC_XFERTYP,   regs->xferty);
-  fdbg("  CMDRSP0[%08x]: %08x\n", KINETIS_SDHC_CMDRSP0,   regs->cmdrsp0);
-  fdbg("  CMDRSP1[%08x]: %08x\n", KINETIS_SDHC_CMDRSP1,   regs->cmdrsp1);
-  fdbg("  CMDRSP2[%08x]: %08x\n", KINETIS_SDHC_CMDRSP2,   regs->cmdrsp2);
-  fdbg("  CMDRSP3[%08x]: %08x\n", KINETIS_SDHC_CMDRSP3,   regs->cmdrsp3);
-  fdbg("  PRSSTAT[%08x]: %08x\n", KINETIS_SDHC_PRSSTAT,   regs->prsstat);
-  fdbg("   PROCTL[%08x]: %08x\n", KINETIS_SDHC_PROCTL,    regs->proctl);
-  fdbg("   SYSCTL[%08x]: %08x\n", KINETIS_SDHC_SYSCTL,    regs->sysctl);
-  fdbg("  IRQSTAT[%08x]: %08x\n", KINETIS_SDHC_IRQSTAT,   regs->irqstat);
-  fdbg("IRQSTATEN[%08x]: %08x\n", KINETIS_SDHC_IRQSTATEN, regs->irqstaten);
-  fdbg(" IRQSIGEN[%08x]: %08x\n", KINETIS_SDHC_IRQSIGEN,  regs->irqsigen);
-  fdbg("  AC12ERR[%08x]: %08x\n", KINETIS_SDHC_AC12ERR,   regs->ac12err);
-  fdbg(" HTCAPBLT[%08x]: %08x\n", KINETIS_SDHC_HTCAPBLT,  regs->htcapblt);
-  fdbg("      WML[%08x]: %08x\n", KINETIS_SDHC_WML,       regs->wml);
-  fdbg("   ADMAES[%08x]: %08x\n", KINETIS_SDHC_ADMAES,    regs->admaes);
-  fdbg("  ADSADDR[%08x]: %08x\n", KINETIS_SDHC_ADSADDR,   regs->adsaddr);
-  fdbg("   VENDOR[%08x]: %08x\n", KINETIS_SDHC_VENDOR,    regs->vendor);
-  fdbg("  MMCBOOT[%08x]: %08x\n", KINETIS_SDHC_MMCBOOT,   regs->mmcboot);
-  fdbg("  HOSTVER[%08x]: %08x\n", KINETIS_SDHC_HOSTVER,   regs->hostver);
+  ferr("SDHC Registers: %s\n", msg);
+  ferr("   DSADDR[%08x]: %08x\n", KINETIS_SDHC_DSADDR,    regs->dsaddr);
+  ferr("  BLKATTR[%08x]: %08x\n", KINETIS_SDHC_BLKATTR,   regs->blkattr);
+  ferr("   CMDARG[%08x]: %08x\n", KINETIS_SDHC_CMDARG,    regs->cmdarg);
+  ferr("   XFERTY[%08x]: %08x\n", KINETIS_SDHC_XFERTYP,   regs->xferty);
+  ferr("  CMDRSP0[%08x]: %08x\n", KINETIS_SDHC_CMDRSP0,   regs->cmdrsp0);
+  ferr("  CMDRSP1[%08x]: %08x\n", KINETIS_SDHC_CMDRSP1,   regs->cmdrsp1);
+  ferr("  CMDRSP2[%08x]: %08x\n", KINETIS_SDHC_CMDRSP2,   regs->cmdrsp2);
+  ferr("  CMDRSP3[%08x]: %08x\n", KINETIS_SDHC_CMDRSP3,   regs->cmdrsp3);
+  ferr("  PRSSTAT[%08x]: %08x\n", KINETIS_SDHC_PRSSTAT,   regs->prsstat);
+  ferr("   PROCTL[%08x]: %08x\n", KINETIS_SDHC_PROCTL,    regs->proctl);
+  ferr("   SYSCTL[%08x]: %08x\n", KINETIS_SDHC_SYSCTL,    regs->sysctl);
+  ferr("  IRQSTAT[%08x]: %08x\n", KINETIS_SDHC_IRQSTAT,   regs->irqstat);
+  ferr("IRQSTATEN[%08x]: %08x\n", KINETIS_SDHC_IRQSTATEN, regs->irqstaten);
+  ferr(" IRQSIGEN[%08x]: %08x\n", KINETIS_SDHC_IRQSIGEN,  regs->irqsigen);
+  ferr("  AC12ERR[%08x]: %08x\n", KINETIS_SDHC_AC12ERR,   regs->ac12err);
+  ferr(" HTCAPBLT[%08x]: %08x\n", KINETIS_SDHC_HTCAPBLT,  regs->htcapblt);
+  ferr("      WML[%08x]: %08x\n", KINETIS_SDHC_WML,       regs->wml);
+  ferr("   ADMAES[%08x]: %08x\n", KINETIS_SDHC_ADMAES,    regs->admaes);
+  ferr("  ADSADDR[%08x]: %08x\n", KINETIS_SDHC_ADSADDR,   regs->adsaddr);
+  ferr("   VENDOR[%08x]: %08x\n", KINETIS_SDHC_VENDOR,    regs->vendor);
+  ferr("  MMCBOOT[%08x]: %08x\n", KINETIS_SDHC_MMCBOOT,   regs->mmcboot);
+  ferr("  HOSTVER[%08x]: %08x\n", KINETIS_SDHC_HOSTVER,   regs->hostver);
 }
 #endif
 
@@ -1840,7 +1840,7 @@ static int kinetis_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t ar
     {
       if (--timeout <= 0)
         {
-          fdbg("ERROR: Timeout cmd: %08x PRSSTAT: %08x\n",
+          ferr("ERROR: Timeout cmd: %08x PRSSTAT: %08x\n",
                cmd, getreg32(KINETIS_SDHC_PRSSTAT));
 
           return -EBUSY;
@@ -2079,7 +2079,7 @@ static int kinetis_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
     {
       if (--timeout <= 0)
         {
-          fdbg("ERROR: Timeout cmd: %08x IRQSTAT: %08x\n",
+          ferr("ERROR: Timeout cmd: %08x IRQSTAT: %08x\n",
                cmd, getreg32(KINETIS_SDHC_IRQSTAT));
 
           return -ETIMEDOUT;
@@ -2090,7 +2090,7 @@ static int kinetis_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
 
   if ((getreg32(KINETIS_SDHC_IRQSTAT) & errors) != 0)
     {
-      fdbg("ERROR: cmd: %08x errors: %08x IRQSTAT: %08x\n",
+      ferr("ERROR: cmd: %08x errors: %08x IRQSTAT: %08x\n",
            cmd, errors, getreg32(KINETIS_SDHC_IRQSTAT));
       ret = -EIO;
     }
@@ -2155,7 +2155,7 @@ static int kinetis_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd,
 #ifdef CONFIG_DEBUG_FEATURES
   if (!rshort)
     {
-      fdbg("ERROR: rshort=NULL\n");
+      ferr("ERROR: rshort=NULL\n");
       ret = -EINVAL;
     }
 
@@ -2165,7 +2165,7 @@ static int kinetis_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd,
            (cmd & MMCSD_RESPONSE_MASK) != MMCSD_R1B_RESPONSE &&
            (cmd & MMCSD_RESPONSE_MASK) != MMCSD_R6_RESPONSE)
     {
-      fdbg("ERROR: Wrong response CMD=%08x\n", cmd);
+      ferr("ERROR: Wrong response CMD=%08x\n", cmd);
       ret = -EINVAL;
     }
   else
@@ -2176,12 +2176,12 @@ static int kinetis_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd,
       regval = getreg32(KINETIS_SDHC_IRQSTAT);
       if ((regval & SDHC_INT_CTOE) != 0)
         {
-          fdbg("ERROR: Command timeout: %08x\n", regval);
+          ferr("ERROR: Command timeout: %08x\n", regval);
           ret = -ETIMEDOUT;
         }
       else if ((regval & SDHC_INT_CCE) != 0)
         {
-          fdbg("ERROR: CRC failure: %08x\n", regval);
+          ferr("ERROR: CRC failure: %08x\n", regval);
           ret = -EIO;
         }
     }
@@ -2214,7 +2214,7 @@ static int kinetis_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t r
 
   if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R2_RESPONSE)
     {
-      fdbg("ERROR: Wrong response CMD=%08x\n", cmd);
+      ferr("ERROR: Wrong response CMD=%08x\n", cmd);
       ret = -EINVAL;
     }
   else
@@ -2225,12 +2225,12 @@ static int kinetis_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t r
       regval = getreg32(KINETIS_SDHC_IRQSTAT);
       if (regval & SDHC_INT_CTOE)
         {
-          fdbg("ERROR: Timeout IRQSTAT: %08x\n", regval);
+          ferr("ERROR: Timeout IRQSTAT: %08x\n", regval);
           ret = -ETIMEDOUT;
         }
       else if (regval & SDHC_INT_CCE)
         {
-          fdbg("ERROR: CRC fail IRQSTAT: %08x\n", regval);
+          ferr("ERROR: CRC fail IRQSTAT: %08x\n", regval);
           ret = -EIO;
         }
     }
@@ -2267,7 +2267,7 @@ static int kinetis_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t
   if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R3_RESPONSE &&
       (cmd & MMCSD_RESPONSE_MASK) != MMCSD_R7_RESPONSE)
     {
-      fdbg("ERROR: Wrong response CMD=%08x\n", cmd);
+      ferr("ERROR: Wrong response CMD=%08x\n", cmd);
       ret = -EINVAL;
     }
   else
@@ -2280,7 +2280,7 @@ static int kinetis_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t
       regval = getreg32(KINETIS_SDHC_IRQSTAT);
       if (regval & SDHC_INT_CTOE)
         {
-          fdbg("ERROR: Timeout IRQSTAT: %08x\n", regval);
+          ferr("ERROR: Timeout IRQSTAT: %08x\n", regval);
           ret = -ETIMEDOUT;
         }
     }
@@ -2416,7 +2416,7 @@ static sdio_eventset_t kinetis_eventwait(FAR struct sdio_dev_s *dev,
                        1, (uint32_t)priv);
       if (ret != OK)
         {
-          fdbg("ERROR: wd_start failed: %d\n", ret);
+          ferr("ERROR: wd_start failed: %d\n", ret);
         }
     }
 
diff --git a/arch/arm/src/kinetis/kinetis_start.c b/arch/arm/src/kinetis/kinetis_start.c
index f686e77915..4b0451acf8 100644
--- a/arch/arm/src/kinetis/kinetis_start.c
+++ b/arch/arm/src/kinetis/kinetis_start.c
@@ -156,7 +156,7 @@ void __start(void)
 
   /* Show reset status */
 
-  dbg("Reset status: %02x:%02x\n",
+  err("Reset status: %02x:%02x\n",
       getreg8(KINETIS_SMC_SRSH), getreg8(KINETIS_SMC_SRSL));
 
   /* Then start NuttX */
diff --git a/arch/arm/src/kinetis/kinetis_usbdev.c b/arch/arm/src/kinetis/kinetis_usbdev.c
index 9a8d5c75ab..dee28aed0a 100644
--- a/arch/arm/src/kinetis/kinetis_usbdev.c
+++ b/arch/arm/src/kinetis/kinetis_usbdev.c
@@ -369,7 +369,7 @@ const struct trace_msg_t g_usb_trace_strings_deverror[] =
 #  undef CONFIG_KHCI_USBDEV_BDTDEBUG
 #  define CONFIG_KHCI_USBDEV_BDTDEBUG 1
 
-#  define regdbg llerr
+#  define regerr llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define reginfo llerr
 #  else
@@ -380,7 +380,7 @@ const struct trace_msg_t g_usb_trace_strings_deverror[] =
 
 #  define khci_getreg(addr)      getreg8(addr)
 #  define khci_putreg(val,addr)  putreg8(val,addr)
-#  define regdbg(x...)
+#  define regerr(x...)
 #  define reginfo(x...)
 
 #endif
@@ -389,7 +389,7 @@ const struct trace_msg_t g_usb_trace_strings_deverror[] =
 
 #ifdef CONFIG_KHCI_USBDEV_BDTDEBUG
 
-#  define bdtdbg llerr
+#  define bdterr llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define bdtinfo llerr
 #  else
@@ -398,7 +398,7 @@ const struct trace_msg_t g_usb_trace_strings_deverror[] =
 
 #else
 
-#  define bdtdbg(x...)
+#  define bdterr(x...)
 #  define bdtinfo(x...)
 
 #endif
@@ -953,7 +953,7 @@ static void khci_epwrite(struct khci_ep_s *privep,
 
   /* And, finally, give the BDT to the USB */
 
-  bdtdbg("EP%d BDT IN [%p] {%08x, %08x}\n",
+  bdterr("EP%d BDT IN [%p] {%08x, %08x}\n",
          USB_EPNO(privep->ep.eplog), bdt, status, bdt->addr);
 
   bdt->status = status;
@@ -994,7 +994,7 @@ static void khci_wrcomplete(struct khci_usbdev_s *priv,
           epno, privreq->req.len, privreq->req.xfrd,
           privreq->inflight[0], privreq->inflight[1]);
 #endif
-  bdtdbg("EP%d BDT IN [%p] {%08x, %08x}\n",
+  bdterr("EP%d BDT IN [%p] {%08x, %08x}\n",
          epno, bdtin, bdtin->status, bdtin->addr);
 
   /* We should own the BDT that just completed. But NULLify the entire BDT IN.
@@ -1419,7 +1419,7 @@ static int khci_rdcomplete(struct khci_usbdev_s *priv,
 
   ullinfo("EP%d: len=%d xfrd=%d\n",
           epno, privreq->req.len, privreq->req.xfrd);
-  bdtdbg("EP%d BDT OUT [%p] {%08x, %08x}\n",
+  bdterr("EP%d BDT OUT [%p] {%08x, %08x}\n",
          epno, bdtout, bdtout->status, bdtout->addr);
 
   /* We should own the BDT that just completed */
@@ -1563,7 +1563,7 @@ static int khci_ep0rdsetup(struct khci_usbdev_s *priv, uint8_t *dest,
 
   /* Then give the BDT to the USB */
 
-  bdtdbg("EP0 BDT OUT [%p] {%08x, %08x}\n", bdtout, status, bdtout->addr);
+  bdterr("EP0 BDT OUT [%p] {%08x, %08x}\n", bdtout, status, bdtout->addr);
   bdtout->status = status;
 
   priv->ctrlstate = CTRLSTATE_RDREQUEST;
@@ -1664,7 +1664,7 @@ static int khci_rdsetup(struct khci_ep_s *privep, uint8_t *dest, int readlen)
 
   /* Then give the BDT to the USB */
 
-  bdtdbg("EP%d BDT OUT [%p] {%08x, %08x}\n",  epno, bdtout, status, bdtout->addr);
+  bdterr("EP%d BDT OUT [%p] {%08x, %08x}\n",  epno, bdtout, status, bdtout->addr);
 
   bdtout->status = status;
   return OK;
@@ -2676,7 +2676,7 @@ static void khci_ep0transfer(struct khci_usbdev_s *priv, uint16_t ustat)
       bdt   = &g_bdt[index];
       priv->eplist[0].bdtout = bdt;
 
-      bdtdbg("EP0 BDT OUT [%p] {%08x, %08x}\n", bdt, bdt->status, bdt->addr);
+      bdterr("EP0 BDT OUT [%p] {%08x, %08x}\n", bdt, bdt->status, bdt->addr);
 
       /* Check the current EP0 OUT buffer contains a SETUP packet */
 
@@ -3299,7 +3299,7 @@ static int khci_epconfigure(struct usbdev_ep_s *ep,
       bdt->status = 0;
       bdt->addr   = 0;
 
-      bdtdbg("EP%d BDT IN [%p] {%08x, %08x}\n", epno, bdt, bdt->status, bdt->addr);
+      bdterr("EP%d BDT IN [%p] {%08x, %08x}\n", epno, bdt, bdt->status, bdt->addr);
 
       /* Now do the same for the other buffer. */
 
@@ -3307,7 +3307,7 @@ static int khci_epconfigure(struct usbdev_ep_s *ep,
       bdt->status = 0;
       bdt->addr   = 0;
 
-      bdtdbg("EP%d BDT IN [%p] {%08x, %08x}\n", epno, bdt, bdt->status, bdt->addr);
+      bdterr("EP%d BDT IN [%p] {%08x, %08x}\n", epno, bdt, bdt->status, bdt->addr);
     }
 
   if (!epin || bidi)
@@ -3321,7 +3321,7 @@ static int khci_epconfigure(struct usbdev_ep_s *ep,
       bdt->status = 0;
       bdt->addr   = 0;
 
-      bdtdbg("EP%d BDT OUT [%p] {%08x, %08x}\n", epno, bdt, bdt->status, bdt->addr);
+      bdterr("EP%d BDT OUT [%p] {%08x, %08x}\n", epno, bdt, bdt->status, bdt->addr);
 
       /* Now do the same for the other buffer. */
 
@@ -3329,7 +3329,7 @@ static int khci_epconfigure(struct usbdev_ep_s *ep,
       bdt->status = 0;
       bdt->addr   = 0;
 
-      bdtdbg("EP%d BDT OUT [%p] {%08x, %08x}\n", epno, bdt, bdt->status, bdt->addr);
+      bdterr("EP%d BDT OUT [%p] {%08x, %08x}\n", epno, bdt, bdt->status, bdt->addr);
     }
 
   /* Get the maxpacket size of the endpoint. */
@@ -3666,9 +3666,9 @@ static int khci_epbdtstall(struct usbdev_ep_s *ep, bool resume, bool epin)
           bdt->addr          = (uint8_t *)physaddr;
           bdt->status        = (USB_BDT_UOWN | bytecount);
 
-          bdtdbg("EP0 BDT IN [%p] {%08x, %08x}\n",
+          bdterr("EP0 BDT IN [%p] {%08x, %08x}\n",
                  bdt, bdt->status, bdt->addr);
-          bdtdbg("EP0 BDT IN [%p] {%08x, %08x}\n",
+          bdterr("EP0 BDT IN [%p] {%08x, %08x}\n",
                  otherbdt, otherbdt->status, otherbdt->addr);
         }
       else
@@ -3683,9 +3683,9 @@ static int khci_epbdtstall(struct usbdev_ep_s *ep, bool resume, bool epin)
           bdt->addr        = 0;
           bdt->status      = 0;
 
-          bdtdbg("EP%d BDT %s [%p] {%08x, %08x}\n",
+          bdterr("EP%d BDT %s [%p] {%08x, %08x}\n",
                  epno, epin ? "IN" : "OUT", bdt, bdt->status, bdt->addr);
-          bdtdbg("EP%d BDT %s [%p] {%08x, %08x}\n",
+          bdterr("EP%d BDT %s [%p] {%08x, %08x}\n",
                  epno, epin ? "IN" : "OUT", otherbdt, otherbdt->status, otherbdt->addr);
 
           /* Restart any queued requests (after a delay so that we can be assured
@@ -3718,9 +3718,9 @@ static int khci_epbdtstall(struct usbdev_ep_s *ep, bool resume, bool epin)
 
       khci_rqstop(privep);
 
-      bdtdbg("EP%d BDT %s [%p] {%08x, %08x}\n",
+      bdterr("EP%d BDT %s [%p] {%08x, %08x}\n",
              epno, epin ? "IN" : "OUT", bdt, bdt->status, bdt->addr);
-      bdtdbg("EP%d BDT %s [%p] {%08x, %08x}\n",
+      bdterr("EP%d BDT %s [%p] {%08x, %08x}\n",
              epno, epin ? "IN" : "OUT", otherbdt, otherbdt->status, otherbdt->addr);
     }
 
diff --git a/arch/arm/src/kl/kl_irq.c b/arch/arm/src/kl/kl_irq.c
index af104dd9c6..bb9ac77db2 100644
--- a/arch/arm/src/kl/kl_irq.c
+++ b/arch/arm/src/kl/kl_irq.c
@@ -128,7 +128,7 @@ static void kl_dumpnvic(const char *msg, int irq)
 
 /****************************************************************************
  * Name: kl_nmi, kl_busfault, kl_usagefault, kl_pendsv,
- *       kl_dbgmonitor, kl_pendsv, kl_reserved
+ *       kl_errmonitor, kl_pendsv, kl_reserved
  *
  * Description:
  *   Handlers for various execptions.  None are handled and all are fatal
@@ -141,7 +141,7 @@ static void kl_dumpnvic(const char *msg, int irq)
 static int kl_nmi(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! NMI received\n");
+  err("PANIC!!! NMI received\n");
   PANIC();
   return 0;
 }
@@ -149,7 +149,7 @@ static int kl_nmi(int irq, FAR void *context)
 static int kl_pendsv(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! PendSV received\n");
+  err("PANIC!!! PendSV received\n");
   PANIC();
   return 0;
 }
@@ -157,7 +157,7 @@ static int kl_pendsv(int irq, FAR void *context)
 static int kl_reserved(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Reserved interrupt\n");
+  err("PANIC!!! Reserved interrupt\n");
   PANIC();
   return 0;
 }
diff --git a/arch/arm/src/kl/kl_pwm.c b/arch/arm/src/kl/kl_pwm.c
index 7fef072a84..3ff80e32f0 100644
--- a/arch/arm/src/kl/kl_pwm.c
+++ b/arch/arm/src/kl/kl_pwm.c
@@ -80,7 +80,7 @@
 #endif
 
 #ifdef CONFIG_DEBUG_PWM
-#  define pwmdbg              dbg
+#  define pwmerr              err
 #  define pwmllerr            llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define pwminfo           info
@@ -92,7 +92,7 @@
 #    define pwm_dumpgpio(p,m)
 #  endif
 #else
-#  define pwmdbg(x...)
+#  define pwmerr(x...)
 #  define pwmllerr(x...)
 #  define pwminfo(x...)
 #  define pwmllinfo(x...)
@@ -483,7 +483,7 @@ static int pwm_timer(FAR struct kl_pwmtimer_s *priv,
         break;
 
       default:
-        pwmdbg("No such channel: %d\n", priv->channel);
+        pwmerr("No such channel: %d\n", priv->channel);
         return -EINVAL;
     }
 
@@ -663,7 +663,7 @@ static int pwm_stop(FAR struct pwm_lowerhalf_s *dev)
         break;
 
       default:
-        pwmdbg("No such channel: %d\n", priv->channel);
+        pwmerr("No such channel: %d\n", priv->channel);
         return -EINVAL;
     }
 
@@ -750,7 +750,7 @@ FAR struct pwm_lowerhalf_s *kl_pwminitialize(int timer)
 #endif
 
       default:
-        pwmdbg("No such timer configured\n");
+        pwmerr("No such timer configured\n");
         return NULL;
     }
 
diff --git a/arch/arm/src/kl/kl_spi.c b/arch/arm/src/kl/kl_spi.c
index b4fb53ac04..50553e3cf7 100644
--- a/arch/arm/src/kl/kl_spi.c
+++ b/arch/arm/src/kl/kl_spi.c
@@ -71,14 +71,14 @@
  */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -364,7 +364,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
   priv->frequency = frequency;
   priv->actual    = actual;
 
-  spidbg("Frequency %d->%d\n", frequency, actual);
+  spierr("Frequency %d->%d\n", frequency, actual);
   return actual;
 }
 
@@ -687,7 +687,7 @@ FAR struct spi_dev_s *kl_spibus_initialize(int port)
   else
 #endif
     {
-      spidbg("ERROR: Port %d not configured\n", port);
+      spierr("ERROR: Port %d not configured\n", port);
       return NULL;
     }
 
diff --git a/arch/arm/src/lpc11xx/lpc11_i2c.c b/arch/arm/src/lpc11xx/lpc11_i2c.c
index f838629fb2..6d4c60f852 100644
--- a/arch/arm/src/lpc11xx/lpc11_i2c.c
+++ b/arch/arm/src/lpc11xx/lpc11_i2c.c
@@ -485,7 +485,7 @@ struct i2c_master_s *lpc11_i2cbus_initialize(int port)
 
   if (port > 1)
     {
-      dbg("lpc I2C Only support 0,1\n");
+      err("lpc I2C Only support 0,1\n");
       return NULL;
     }
 
diff --git a/arch/arm/src/lpc11xx/lpc11_irq.c b/arch/arm/src/lpc11xx/lpc11_irq.c
index a5de46bc6e..d48cec28f8 100644
--- a/arch/arm/src/lpc11xx/lpc11_irq.c
+++ b/arch/arm/src/lpc11xx/lpc11_irq.c
@@ -124,7 +124,7 @@ static void lpc11_dumpnvic(const char *msg, int irq)
 
 /****************************************************************************
  * Name: lpc11_nmi, lpc11_busfault, lpc11_usagefault, lpc11_pendsv,
- *       lpc11_dbgmonitor, lpc11_pendsv, lpc11_reserved
+ *       lpc11_errmonitor, lpc11_pendsv, lpc11_reserved
  *
  * Description:
  *   Handlers for various execptions.  None are handled and all are fatal
@@ -137,7 +137,7 @@ static void lpc11_dumpnvic(const char *msg, int irq)
 static int lpc11_nmi(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! NMI received\n");
+  err("PANIC!!! NMI received\n");
   PANIC();
   return 0;
 }
@@ -145,7 +145,7 @@ static int lpc11_nmi(int irq, FAR void *context)
 static int lpc11_pendsv(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! PendSV received\n");
+  err("PANIC!!! PendSV received\n");
   PANIC();
   return 0;
 }
@@ -153,7 +153,7 @@ static int lpc11_pendsv(int irq, FAR void *context)
 static int lpc11_reserved(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Reserved interrupt\n");
+  err("PANIC!!! Reserved interrupt\n");
   PANIC();
   return 0;
 }
diff --git a/arch/arm/src/lpc11xx/lpc11_serial.c b/arch/arm/src/lpc11xx/lpc11_serial.c
index 02f6ef37d3..331c4df7c2 100644
--- a/arch/arm/src/lpc11xx/lpc11_serial.c
+++ b/arch/arm/src/lpc11xx/lpc11_serial.c
@@ -638,7 +638,7 @@ static int up_interrupt(int irq, void *context)
 
           default:
             {
-              dbg("Unexpected IIR: %02x\n", status);
+              err("Unexpected IIR: %02x\n", status);
               break;
             }
         }
diff --git a/arch/arm/src/lpc11xx/lpc11_spi.c b/arch/arm/src/lpc11xx/lpc11_spi.c
index 7e9c7c0a20..2354977bff 100644
--- a/arch/arm/src/lpc11xx/lpc11_spi.c
+++ b/arch/arm/src/lpc11xx/lpc11_spi.c
@@ -80,14 +80,14 @@
  */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -292,7 +292,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev,
   priv->frequency = frequency;
   priv->actual    = actual;
 
-  spidbg("Frequency %d->%d\n", frequency, actual);
+  spierr("Frequency %d->%d\n", frequency, actual);
   return actual;
 }
 
@@ -456,7 +456,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer,
   FAR uint8_t *ptr = (FAR uint8_t *)buffer;
   uint8_t data;
 
-  spidbg("nwords: %d\n", nwords);
+  spierr("nwords: %d\n", nwords);
   while (nwords)
     {
       /* Write the data to transmitted to the SPI Data Register */
@@ -503,7 +503,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer,
 {
   FAR uint8_t *ptr = (FAR uint8_t *)buffer;
 
-  spidbg("nwords: %d\n", nwords);
+  spierr("nwords: %d\n", nwords);
   while (nwords)
     {
       /* Write some dummy data to the SPI Data Register in order to clock the
diff --git a/arch/arm/src/lpc11xx/lpc11_ssp.c b/arch/arm/src/lpc11xx/lpc11_ssp.c
index 201227ae94..ab34fd40f8 100644
--- a/arch/arm/src/lpc11xx/lpc11_ssp.c
+++ b/arch/arm/src/lpc11xx/lpc11_ssp.c
@@ -81,14 +81,14 @@
  */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define sspdbg  llerr
+#  define ssperr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define sspdbg(x...)
+#  define ssperr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -474,7 +474,7 @@ static uint32_t ssp_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
   priv->frequency = frequency;
   priv->actual    = actual;
 
-  sspdbg("Frequency %d->%d\n", frequency, actual);
+  ssperr("Frequency %d->%d\n", frequency, actual);
   return actual;
 }
 
@@ -525,7 +525,7 @@ static void ssp_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode)
           break;
 
         default:
-          sspdbg("Bad mode: %d\n", mode);
+          ssperr("Bad mode: %d\n", mode);
           DEBUGASSERT(FALSE);
           return;
         }
@@ -613,7 +613,7 @@ static uint16_t ssp_send(FAR struct spi_dev_s *dev, uint16_t wd)
   /* Get the value from the RX FIFO and return it */
 
   regval = ssp_getreg(priv, LPC11_SSP_DR_OFFSET);
-  sspdbg("%04x->%04x\n", wd, regval);
+  ssperr("%04x->%04x\n", wd, regval);
   return (uint16_t)regval;
 }
 
@@ -651,7 +651,7 @@ static void ssp_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer,
 
   /* Loop while thre are bytes remaining to be sent */
 
-  sspdbg("nwords: %d\n", nwords);
+  ssperr("nwords: %d\n", nwords);
   u.pv = buffer;
   while (nwords > 0)
     {
@@ -679,7 +679,7 @@ static void ssp_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer,
 
   /* Then discard all card responses until the RX & TX FIFOs are emptied. */
 
-  sspdbg("discarding\n");
+  ssperr("discarding\n");
   do
     {
       /* Is there anything in the RX fifo? */
@@ -744,7 +744,7 @@ static void ssp_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer,
    * occurred).
    */
 
-  sspdbg("nwords: %d\n", nwords);
+  ssperr("nwords: %d\n", nwords);
   u.pv = buffer;
   while (nwords || rxpending)
     {
diff --git a/arch/arm/src/lpc11xx/lpc11_timer.c b/arch/arm/src/lpc11xx/lpc11_timer.c
index 4791df3fc7..cb18e4c158 100644
--- a/arch/arm/src/lpc11xx/lpc11_timer.c
+++ b/arch/arm/src/lpc11xx/lpc11_timer.c
@@ -89,7 +89,7 @@
 #endif
 
 #ifdef CONFIG_DEBUG_PWM
-#  define pwmdbg              dbg
+#  define pwmerr              err
 #  define pwmllerr            llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define pwminfo           info
@@ -101,7 +101,7 @@
 #    define pwm_dumpgpio(p,m)
 #  endif
 #else
-#  define pwmdbg(x...)
+#  define pwmerr(x...)
 #  define pwmllerr(x...)
 #  define pwminfo(x...)
 #  define pwmllinfo(x...)
@@ -245,8 +245,8 @@ static void timer_putreg(struct lpc11_timer_s *priv, int offset,
 #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);
-  pwmdbg("  CR1: %04x CR2:  %04x SMCR:  %04x DIER:  %04x\n",
+  pwmerr("%s:\n", msg);
+  pwmerr("  CR1: %04x CR2:  %04x SMCR:  %04x DIER:  %04x\n",
           timer_getreg(priv, LPC11_PWM_MR0_OFFSET),
           timer_getreg(priv, LPC11_PWM_MR1_OFFSET),
           timer_getreg(priv, LPC11_PWM_MR2_OFFSET),
@@ -254,7 +254,7 @@ static void timer_dumpregs(struct lpc11_timer_s *priv, FAR const char *msg)
 #if defined(CONFIG_LPC11_TMR0)
   if (priv->timtype == TIMTYPE_ADVANCED)
     {
-      pwmdbg("  RCR: %04x BDTR: %04x DCR:   %04x DMAR:  %04x\n",
+      pwmerr("  RCR: %04x BDTR: %04x DCR:   %04x DMAR:  %04x\n",
               timer_getreg(priv, LPC11_PWM_MR0_OFFSET),
               timer_getreg(priv, LPC11_PWM_MR1_OFFSET),
               timer_getreg(priv, LPC11_PWM_MR2_OFFSET),
@@ -263,7 +263,7 @@ static void timer_dumpregs(struct lpc11_timer_s *priv, FAR const char *msg)
   else
 #endif
     {
-      pwmdbg("  DCR: %04x DMAR: %04x\n",
+      pwmerr("  DCR: %04x DMAR: %04x\n",
               timer_getreg(priv, LPC11_PWM_MR2_OFFSET),
               timer_getreg(priv, LPC11_PWM_MR3_OFFSET));
     }
@@ -469,7 +469,7 @@ static int timer_shutdown(FAR struct pwm_lowerhalf_s *dev)
   FAR struct lpc11_timer_s *priv = (FAR struct lpc11_timer_s *)dev;
   uint32_t pincfg;
 
-  pwmdbg("TIM%d pincfg: %08x\n", priv->timid, priv->pincfg);
+  pwmerr("TIM%d pincfg: %08x\n", priv->timid, priv->pincfg);
 
   /* Make sure that the output has been stopped */
 
@@ -525,7 +525,7 @@ static int timer_stop(FAR struct pwm_lowerhalf_s *dev)
   uint32_t regval;
   irqstate_t flags;
 
-  pwmdbg("TIM%d\n", priv->timid);
+  pwmerr("TIM%d\n", priv->timid);
 
   /* Disable interrupts momentary to stop any ongoing timer processing and
    * to prevent any concurrent access to the reset register.
@@ -551,7 +551,7 @@ static int timer_stop(FAR struct pwm_lowerhalf_s *dev)
 
   leave_critical_section(flags);
 
-  pwmdbg("regaddr: %08x resetbit: %08x\n", regaddr, resetbit);
+  pwmerr("regaddr: %08x resetbit: %08x\n", regaddr, resetbit);
   timer_dumpregs(priv, "After stop");
   return OK;
 }
@@ -580,7 +580,7 @@ static int timer_ioctl(FAR struct pwm_lowerhalf_s *dev, int cmd,
 
   /* There are no platform-specific ioctl commands */
 
-  pwmdbg("TIM%d\n", priv->timid);
+  pwmerr("TIM%d\n", priv->timid);
 #endif
   return -ENOTTY;
 }
@@ -610,7 +610,7 @@ FAR struct pwm_lowerhalf_s *lpc11_timerinitialize(int timer)
 {
   FAR struct lpc11_timer_s *lower;
 
-  pwmdbg("TIM%d\n", timer);
+  pwmerr("TIM%d\n", timer);
 
   switch (timer)
     {
@@ -624,7 +624,7 @@ FAR struct pwm_lowerhalf_s *lpc11_timerinitialize(int timer)
 #endif
 
       default:
-        pwmdbg("No such timer configured\n");
+        pwmerr("No such timer configured\n");
         return NULL;
     }
 
diff --git a/arch/arm/src/lpc17xx/lpc176x_rtc.c b/arch/arm/src/lpc17xx/lpc176x_rtc.c
index a16030b48d..1ffbbf93f4 100644
--- a/arch/arm/src/lpc17xx/lpc176x_rtc.c
+++ b/arch/arm/src/lpc17xx/lpc176x_rtc.c
@@ -81,12 +81,12 @@
 /* Debug ****************************************************************************/
 
 #ifdef CONFIG_DEBUG_RTC
-#  define rtcdbg    dbg
+#  define rtcerr    err
 #  define rtcinfo   info
 #  define rtcllerr  llerr
 #  define rtcllinfo llinfo
 #else
-#  define rtcdbg(x...)
+#  define rtcerr(x...)
 #  define rtcinfo(x...)
 #  define rtcllerr(x...)
 #  define rtcllinfo(x...)
diff --git a/arch/arm/src/lpc17xx/lpc17_can.c b/arch/arm/src/lpc17xx/lpc17_can.c
index 5678f41546..725a68332e 100644
--- a/arch/arm/src/lpc17xx/lpc17_can.c
+++ b/arch/arm/src/lpc17xx/lpc17_can.c
@@ -166,16 +166,16 @@
 
 #ifdef CONFIG_DEBUG_CAN
 #  ifdef CONFIG_CAN_REGDEBUG
-#    define candbg  llerr
+#    define canerr  llerr
 #    define caninfo llinfo
 #  else
-#    define candbg  dbg
+#    define canerr  err
 #    define caninfo info
 #  endif
 #  define canllerr  llerr
 #  define canllinfo llinfo
 #else
-#  define candbg(x...)
+#  define canerr(x...)
 #  define caninfo(x...)
 #  define canllerr(x...)
 #  define canllinfo(x...)
@@ -520,7 +520,7 @@ static void can_reset(FAR struct can_dev_s *dev)
   ret = can_bittiming(priv);
   if (ret != OK)
     {
-      candbg("ERROR: Failed to set bit timing: %d\n", ret);
+      canerr("ERROR: Failed to set bit timing: %d\n", ret);
     }
 
   /* Restart the CAN */
@@ -697,7 +697,7 @@ static void can_txint(FAR struct can_dev_s *dev, bool enable)
 
 static int can_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg)
 {
-  dbg("Fix me:Not Implemented\n");
+  err("Fix me:Not Implemented\n");
   return 0;
 }
 
@@ -717,7 +717,7 @@ static int can_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg)
 
 static int can_remoterequest(FAR struct can_dev_s *dev, uint16_t id)
 {
-  dbg("Fix me:Not Implemented\n");
+  err("Fix me:Not Implemented\n");
   return 0;
 }
 
@@ -878,7 +878,7 @@ static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg)
     }
   else
     {
-      candbg("No available transmission buffer, SR: %08x\n", regval);
+      canerr("No available transmission buffer, SR: %08x\n", regval);
       ret = -EBUSY;
     }
 
@@ -1299,7 +1299,7 @@ FAR struct can_dev_s *lpc17_caninitialize(int port)
   else
 #endif
     {
-      candbg("Unsupported port: %d\n", port);
+      canerr("Unsupported port: %d\n", port);
       leave_critical_section(flags);
       return NULL;
     }
diff --git a/arch/arm/src/lpc17xx/lpc17_dac.c b/arch/arm/src/lpc17xx/lpc17_dac.c
index d5100c5e50..6508b09683 100644
--- a/arch/arm/src/lpc17xx/lpc17_dac.c
+++ b/arch/arm/src/lpc17xx/lpc17_dac.c
@@ -172,7 +172,7 @@ static int  dac_send(FAR struct dac_dev_s *dev, FAR struct dac_msg_s *msg)
 
 static int  dac_ioctl(FAR struct dac_dev_s *dev, int cmd, unsigned long arg)
 {
-  dbg("Fix me:Not Implemented\n");
+  err("Fix me:Not Implemented\n");
   return 0;
 }
 
diff --git a/arch/arm/src/lpc17xx/lpc17_ethernet.c b/arch/arm/src/lpc17xx/lpc17_ethernet.c
index fbf3172687..369112368b 100644
--- a/arch/arm/src/lpc17xx/lpc17_ethernet.c
+++ b/arch/arm/src/lpc17xx/lpc17_ethernet.c
@@ -415,7 +415,7 @@ static void lpc17_ethreset(struct lpc17_driver_s *priv);
 #ifdef CONFIG_NET_REGDEBUG
 static void lpc17_printreg(uint32_t addr, uint32_t val, bool iswrite)
 {
-  dbg("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val);
+  err("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val);
 }
 #endif
 
@@ -465,7 +465,7 @@ static void lpc17_checkreg(uint32_t addr, uint32_t val, bool iswrite)
             {
               /* No.. More than one. */
 
-              dbg("[repeats %d more times]\n", count);
+              err("[repeats %d more times]\n", count);
             }
         }
 
@@ -1720,7 +1720,7 @@ static int lpc17_ifup(struct net_driver_s *dev)
   uint32_t regval;
   int ret;
 
-  ndbg("Bringing up: %d.%d.%d.%d\n",
+  nerr("Bringing up: %d.%d.%d.%d\n",
        dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
        (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 
@@ -1733,7 +1733,7 @@ static int lpc17_ifup(struct net_driver_s *dev)
   ret = lpc17_phyinit(priv);
   if (ret != 0)
     {
-      ndbg("lpc17_phyinit failed: %d\n", ret);
+      nerr("lpc17_phyinit failed: %d\n", ret);
       return ret;
     }
 
@@ -2319,14 +2319,14 @@ static void lpc17_showpins(void)
 #if defined(CONFIG_NET_REGDEBUG) && defined(LPC17_HAVE_PHY)
 static void lpc17_showmii(uint8_t phyaddr, const char *msg)
 {
-  dbg("PHY " LPC17_PHYNAME ": %s\n", msg);
-  dbg("  MCR:       %04x\n", lpc17_phyread(phyaddr, MII_MCR));
-  dbg("  MSR:       %04x\n", lpc17_phyread(phyaddr, MII_MSR));
-  dbg("  ADVERTISE: %04x\n", lpc17_phyread(phyaddr, MII_ADVERTISE));
-  dbg("  LPA:       %04x\n", lpc17_phyread(phyaddr, MII_LPA));
-  dbg("  EXPANSION: %04x\n", lpc17_phyread(phyaddr, MII_EXPANSION));
+  err("PHY " LPC17_PHYNAME ": %s\n", msg);
+  err("  MCR:       %04x\n", lpc17_phyread(phyaddr, MII_MCR));
+  err("  MSR:       %04x\n", lpc17_phyread(phyaddr, MII_MSR));
+  err("  ADVERTISE: %04x\n", lpc17_phyread(phyaddr, MII_ADVERTISE));
+  err("  LPA:       %04x\n", lpc17_phyread(phyaddr, MII_LPA));
+  err("  EXPANSION: %04x\n", lpc17_phyread(phyaddr, MII_EXPANSION));
 #ifdef CONFIG_ETH0_PHY_KS8721
-  dbg("  10BTCR:    %04x\n", lpc17_phyread(phyaddr, MII_KS8721_10BTCR));
+  err("  10BTCR:    %04x\n", lpc17_phyread(phyaddr, MII_KS8721_10BTCR));
 #endif
 }
 #endif
@@ -2462,7 +2462,7 @@ static inline int lpc17_phyreset(uint8_t phyaddr)
         }
     }
 
-  ndbg("Reset failed. MCR: %04x\n", phyreg);
+  nerr("Reset failed. MCR: %04x\n", phyreg);
   return -ETIMEDOUT;
 }
 #endif
@@ -2509,7 +2509,7 @@ static inline int lpc17_phyautoneg(uint8_t phyaddr)
         }
     }
 
-  ndbg("Auto-negotiation failed. MSR: %04x\n", phyreg);
+  nerr("Auto-negotiation failed. MSR: %04x\n", phyreg);
   return -ETIMEDOUT;
 }
 #endif
@@ -2593,7 +2593,7 @@ static int lpc17_phymode(uint8_t phyaddr, uint8_t mode)
 #endif
     }
 
-  ndbg("Link failed. MSR: %04x\n", phyreg);
+  nerr("Link failed. MSR: %04x\n", phyreg);
   return -ETIMEDOUT;
 }
 #endif
@@ -2673,7 +2673,7 @@ static inline int lpc17_phyinit(struct lpc17_driver_s *priv)
     {
       /* Failed to find PHY at any location */
 
-      ndbg("No PHY detected\n");
+      nerr("No PHY detected\n");
       return -ENODEV;
     }
   ninfo("phyaddr: %d\n", phyaddr);
@@ -2760,7 +2760,7 @@ static inline int lpc17_phyinit(struct lpc17_driver_s *priv)
         break;
 
       default:
-        ndbg("Unrecognized mode: %04x\n", phyreg);
+        nerr("Unrecognized mode: %04x\n", phyreg);
         return -ENODEV;
     }
 
@@ -2788,7 +2788,7 @@ static inline int lpc17_phyinit(struct lpc17_driver_s *priv)
         break;
 
       default:
-        ndbg("Unrecognized mode: %04x\n", phyreg);
+        nerr("Unrecognized mode: %04x\n", phyreg);
         return -ENODEV;
     }
 
@@ -2816,7 +2816,7 @@ static inline int lpc17_phyinit(struct lpc17_driver_s *priv)
         break;
 
       default:
-        ndbg("Unrecognized mode: %04x\n", phyreg);
+        nerr("Unrecognized mode: %04x\n", phyreg);
         return -ENODEV;
     }
 
@@ -2862,7 +2862,7 @@ static inline int lpc17_phyinit(struct lpc17_driver_s *priv)
       }
     else
       {
-        ndbg("Unrecognized mode: %04x\n", phyreg);
+        nerr("Unrecognized mode: %04x\n", phyreg);
         return -ENODEV;
       }
   }
@@ -2871,7 +2871,7 @@ static inline int lpc17_phyinit(struct lpc17_driver_s *priv)
 #  warning "PHY Unknown: speed and duplex are bogus"
 #endif
 
-  ndbg("%dBase-T %s duplex\n",
+  nerr("%dBase-T %s duplex\n",
        (priv->lp_mode & LPC17_SPEED_MASK) ==  LPC17_SPEED_100 ? 100 : 10,
        (priv->lp_mode & LPC17_DUPLEX_MASK) == LPC17_DUPLEX_FULL ?"full" : "half");
 
diff --git a/arch/arm/src/lpc17xx/lpc17_gpdma.c b/arch/arm/src/lpc17xx/lpc17_gpdma.c
index 4a93267718..7b692c2535 100644
--- a/arch/arm/src/lpc17xx/lpc17_gpdma.c
+++ b/arch/arm/src/lpc17xx/lpc17_gpdma.c
@@ -707,47 +707,47 @@ void lpc17_dmadump(DMA_HANDLE handle, const struct lpc17_dmaregs_s *regs,
 
   /* Dump the sampled global DMA registers */
 
-  dmadbg("Global GPDMA Registers: %s\n", msg);
-  dmadbg("       INTST[%08x]: %08x\n",
+  dmaerr("Global GPDMA Registers: %s\n", msg);
+  dmaerr("       INTST[%08x]: %08x\n",
          LPC17_DMA_INTST, regs->gbl.intst);
-  dmadbg("     INTTCST[%08x]: %08x\n",
+  dmaerr("     INTTCST[%08x]: %08x\n",
          LPC17_DMA_INTTCST, regs->gbl.inttcst);
-  dmadbg("    INTERRST[%08x]: %08x\n",
+  dmaerr("    INTERRST[%08x]: %08x\n",
          LPC17_DMA_INTERRST, regs->gbl.interrst);
-  dmadbg("  RAWINTTCST[%08x]: %08x\n",
+  dmaerr("  RAWINTTCST[%08x]: %08x\n",
          LPC17_DMA_RAWINTTCST, regs->gbl.rawinttcst);
-  dmadbg(" RAWINTERRST[%08x]: %08x\n",
+  dmaerr(" RAWINTERRST[%08x]: %08x\n",
          LPC17_DMA_RAWINTERRST, regs->gbl.rawinterrst);
-  dmadbg("   ENBLDCHNS[%08x]: %08x\n",
+  dmaerr("   ENBLDCHNS[%08x]: %08x\n",
          LPC17_DMA_ENBLDCHNS, regs->gbl.enbldchns);
-  dmadbg("    SOFTBREQ[%08x]: %08x\n",
+  dmaerr("    SOFTBREQ[%08x]: %08x\n",
          LPC17_DMA_SOFTBREQ, regs->gbl.softbreq);
-  dmadbg("    SOFTSREQ[%08x]: %08x\n",
+  dmaerr("    SOFTSREQ[%08x]: %08x\n",
          LPC17_DMA_SOFTSREQ, regs->gbl.softsreq);
-  dmadbg("   SOFTLBREQ[%08x]: %08x\n",
+  dmaerr("   SOFTLBREQ[%08x]: %08x\n",
          LPC17_DMA_SOFTLBREQ, regs->gbl.softlbreq);
-  dmadbg("   SOFTLSREQ[%08x]: %08x\n",
+  dmaerr("   SOFTLSREQ[%08x]: %08x\n",
          LPC17_DMA_SOFTLSREQ, regs->gbl.softlsreq);
-  dmadbg("      CONFIG[%08x]: %08x\n",
+  dmaerr("      CONFIG[%08x]: %08x\n",
          LPC17_DMA_CONFIG, regs->gbl.config);
-  dmadbg("        SYNC[%08x]: %08x\n",
+  dmaerr("        SYNC[%08x]: %08x\n",
          LPC17_DMA_SYNC, regs->gbl.sync);
 
   /* Dump the DMA channel registers */
 
   base = LPC17_DMACH_BASE((uint32_t)dmach->chn);
 
-  dmadbg("Channel GPDMA Registers: %d\n", dmach->chn);
+  dmaerr("Channel GPDMA Registers: %d\n", dmach->chn);
 
-  dmadbg("     SRCADDR[%08x]: %08x\n",
+  dmaerr("     SRCADDR[%08x]: %08x\n",
          base + LPC17_DMACH_SRCADDR_OFFSET, regs->ch.srcaddr);
-  dmadbg("    DESTADDR[%08x]: %08x\n",
+  dmaerr("    DESTADDR[%08x]: %08x\n",
          base + LPC17_DMACH_DESTADDR_OFFSET, regs->ch.destaddr);
-  dmadbg("         LLI[%08x]: %08x\n",
+  dmaerr("         LLI[%08x]: %08x\n",
          base + LPC17_DMACH_LLI_OFFSET, regs->ch.lli);
-  dmadbg("     CONTROL[%08x]: %08x\n",
+  dmaerr("     CONTROL[%08x]: %08x\n",
          base + LPC17_DMACH_CONTROL_OFFSET, regs->ch.control);
-  dmadbg("      CONFIG[%08x]: %08x\n",
+  dmaerr("      CONFIG[%08x]: %08x\n",
          base + LPC17_DMACH_CONFIG_OFFSET, regs->ch.config);
 }
 #endif /* CONFIG_DEBUG_DMA */
diff --git a/arch/arm/src/lpc17xx/lpc17_i2c.c b/arch/arm/src/lpc17xx/lpc17_i2c.c
index 9b106fdda4..7b5346e9f3 100644
--- a/arch/arm/src/lpc17xx/lpc17_i2c.c
+++ b/arch/arm/src/lpc17xx/lpc17_i2c.c
@@ -485,7 +485,7 @@ struct i2c_master_s *lpc17_i2cbus_initialize(int port)
 
   if (port > 1)
     {
-      dbg("lpc I2C Only support 0,1\n");
+      err("lpc I2C Only support 0,1\n");
       return NULL;
     }
 
diff --git a/arch/arm/src/lpc17xx/lpc17_irq.c b/arch/arm/src/lpc17xx/lpc17_irq.c
index 47467d32b6..9029d7b1c2 100644
--- a/arch/arm/src/lpc17xx/lpc17_irq.c
+++ b/arch/arm/src/lpc17xx/lpc17_irq.c
@@ -137,7 +137,7 @@ static void lpc17_dumpnvic(const char *msg, int irq)
 
 /****************************************************************************
  * Name: lpc17_nmi, lpc17_busfault, lpc17_usagefault, lpc17_pendsv,
- *       lpc17_dbgmonitor, lpc17_pendsv, lpc17_reserved
+ *       lpc17_errmonitor, lpc17_pendsv, lpc17_reserved
  *
  * Description:
  *   Handlers for various execptions.  None are handled and all are fatal
@@ -150,7 +150,7 @@ static void lpc17_dumpnvic(const char *msg, int irq)
 static int lpc17_nmi(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! NMI received\n");
+  err("PANIC!!! NMI received\n");
   PANIC();
   return 0;
 }
@@ -158,7 +158,7 @@ static int lpc17_nmi(int irq, FAR void *context)
 static int lpc17_busfault(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Bus fault recived\n");
+  err("PANIC!!! Bus fault recived\n");
   PANIC();
   return 0;
 }
@@ -166,7 +166,7 @@ static int lpc17_busfault(int irq, FAR void *context)
 static int lpc17_usagefault(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Usage fault received\n");
+  err("PANIC!!! Usage fault received\n");
   PANIC();
   return 0;
 }
@@ -174,15 +174,15 @@ static int lpc17_usagefault(int irq, FAR void *context)
 static int lpc17_pendsv(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! PendSV received\n");
+  err("PANIC!!! PendSV received\n");
   PANIC();
   return 0;
 }
 
-static int lpc17_dbgmonitor(int irq, FAR void *context)
+static int lpc17_errmonitor(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Debug Monitor received\n");
+  err("PANIC!!! Debug Monitor received\n");
   PANIC();
   return 0;
 }
@@ -190,7 +190,7 @@ static int lpc17_dbgmonitor(int irq, FAR void *context)
 static int lpc17_reserved(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Reserved interrupt\n");
+  err("PANIC!!! Reserved interrupt\n");
   PANIC();
   return 0;
 }
@@ -400,7 +400,7 @@ void up_irqinitialize(void)
   irq_attach(LPC17_IRQ_BUSFAULT, lpc17_busfault);
   irq_attach(LPC17_IRQ_USAGEFAULT, lpc17_usagefault);
   irq_attach(LPC17_IRQ_PENDSV, lpc17_pendsv);
-  irq_attach(LPC17_IRQ_DBGMONITOR, lpc17_dbgmonitor);
+  irq_attach(LPC17_IRQ_DBGMONITOR, lpc17_errmonitor);
   irq_attach(LPC17_IRQ_RESERVED, lpc17_reserved);
 #endif
 
diff --git a/arch/arm/src/lpc17xx/lpc17_lcd.c b/arch/arm/src/lpc17xx/lpc17_lcd.c
index 0c0af0cd7c..5abf5d319e 100644
--- a/arch/arm/src/lpc17xx/lpc17_lcd.c
+++ b/arch/arm/src/lpc17xx/lpc17_lcd.c
@@ -209,7 +209,7 @@ static int lpc17_getvideoinfo(FAR struct fb_vtable_s *vtable,
       return OK;
     }
 
-  gdbg("Returning EINVAL\n");
+  gerr("Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -227,7 +227,7 @@ static int lpc17_getplaneinfo(FAR struct fb_vtable_s *vtable, int planeno,
       return OK;
     }
 
-  gdbg("Returning EINVAL\n");
+  gerr("Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -403,7 +403,7 @@ static int lpc17_getcursor(FAR struct fb_vtable_s *vtable,
       return OK;
     }
 
-  gdbg("Returning EINVAL\n");
+  gerr("Returning EINVAL\n");
   return -EINVAL;
 }
 #endif
@@ -443,7 +443,7 @@ static int lpc17_setcursor(FAR struct fb_vtable_s *vtable,
       return OK;
     }
 
-  gdbg("Returning EINVAL\n");
+  gerr("Returning EINVAL\n");
   return -EINVAL;
 }
 #endif
diff --git a/arch/arm/src/lpc17xx/lpc17_mcpwm.c b/arch/arm/src/lpc17xx/lpc17_mcpwm.c
index b882af8950..0d0f1db15a 100644
--- a/arch/arm/src/lpc17xx/lpc17_mcpwm.c
+++ b/arch/arm/src/lpc17xx/lpc17_mcpwm.c
@@ -88,7 +88,7 @@
 #endif
 
 #ifdef CONFIG_DEBUG_PWM
-#  define pwmdbg              dbg
+#  define pwmerr              err
 #  define pwmllerr            llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define pwminfo           info
@@ -100,7 +100,7 @@
 #    define pwm_dumpgpio(p,m)
 #  endif
 #else
-#  define pwmdbg(x...)
+#  define pwmerr(x...)
 #  define pwmllerr(x...)
 #  define pwminfo(x...)
 #  define pwmllinfo(x...)
@@ -674,7 +674,7 @@ FAR struct pwm_lowerhalf_s *lpc17_mcpwminitialize(int timer)
 #endif
 
       default:
-        pwmdbg("No such timer configured\n");
+        pwmerr("No such timer configured\n");
         return NULL;
     }
 
diff --git a/arch/arm/src/lpc17xx/lpc17_pwm.c b/arch/arm/src/lpc17xx/lpc17_pwm.c
index a2c9f6c39f..2d668b07b2 100644
--- a/arch/arm/src/lpc17xx/lpc17_pwm.c
+++ b/arch/arm/src/lpc17xx/lpc17_pwm.c
@@ -106,7 +106,7 @@
 #endif
 
 #ifdef CONFIG_DEBUG_PWM
-#  define pwmdbg              dbg
+#  define pwmerr              err
 #  define pwmllerr            llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define pwminfo           info
@@ -118,7 +118,7 @@
 #    define pwm_dumpgpio(p,m)
 #  endif
 #else
-#  define pwmdbg(x...)
+#  define pwmerr(x...)
 #  define pwmllerr(x...)
 #  define pwminfo(x...)
 #  define pwmllinfo(x...)
@@ -645,7 +645,7 @@ FAR struct pwm_lowerhalf_s *lpc17_pwminitialize(int timer)
 #endif
 
       default:
-        pwmdbg("No such timer configured\n");
+        pwmerr("No such timer configured\n");
         return NULL;
     }
 
diff --git a/arch/arm/src/lpc17xx/lpc17_sdcard.c b/arch/arm/src/lpc17xx/lpc17_sdcard.c
index 225bd5465a..1143d4ca1f 100644
--- a/arch/arm/src/lpc17xx/lpc17_sdcard.c
+++ b/arch/arm/src/lpc17xx/lpc17_sdcard.c
@@ -722,16 +722,16 @@ static void lpc17_sample(struct lpc17_dev_s *priv, int index)
 #ifdef CONFIG_DEBUG_SDIO
 static void lpc17_sdcard_dump(struct lpc17_sdcard_regs_s *regs, const char *msg)
 {
-  fdbg("SD Card Registers: %s\n", msg);
-  fdbg("  POWER[%08x]: %08x\n", LPC17_SDCARD_PWR,     regs->pwr);
-  fdbg("  CLKCR[%08x]: %08x\n", LPC17_SDCARD_CLOCK,   regs->clkcr);
-  fdbg("  DCTRL[%08x]: %08x\n", LPC17_SDCARD_DCTRL,   regs->dctrl);
-  fdbg(" DTIMER[%08x]: %08x\n", LPC17_SDCARD_DTIMER,  regs->dtimer);
-  fdbg("   DLEN[%08x]: %08x\n", LPC17_SDCARD_DLEN,    regs->dlen);
-  fdbg(" DCOUNT[%08x]: %08x\n", LPC17_SDCARD_DCOUNT,  regs->dcount);
-  fdbg("    STA[%08x]: %08x\n", LPC17_SDCARD_STATUS,  regs->sta);
-  fdbg("   MASK[%08x]: %08x\n", LPC17_SDCARD_MASK0,   regs->mask);
-  fdbg("FIFOCNT[%08x]: %08x\n", LPC17_SDCARD_FIFOCNT, regs->fifocnt);
+  ferr("SD Card Registers: %s\n", msg);
+  ferr("  POWER[%08x]: %08x\n", LPC17_SDCARD_PWR,     regs->pwr);
+  ferr("  CLKCR[%08x]: %08x\n", LPC17_SDCARD_CLOCK,   regs->clkcr);
+  ferr("  DCTRL[%08x]: %08x\n", LPC17_SDCARD_DCTRL,   regs->dctrl);
+  ferr(" DTIMER[%08x]: %08x\n", LPC17_SDCARD_DTIMER,  regs->dtimer);
+  ferr("   DLEN[%08x]: %08x\n", LPC17_SDCARD_DLEN,    regs->dlen);
+  ferr(" DCOUNT[%08x]: %08x\n", LPC17_SDCARD_DCOUNT,  regs->dcount);
+  ferr("    STA[%08x]: %08x\n", LPC17_SDCARD_STATUS,  regs->sta);
+  ferr("   MASK[%08x]: %08x\n", LPC17_SDCARD_MASK0,   regs->mask);
+  ferr("FIFOCNT[%08x]: %08x\n", LPC17_SDCARD_FIFOCNT, regs->fifocnt);
 }
 #endif
 
@@ -1920,7 +1920,7 @@ static int lpc17_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
     {
       if (--timeout <= 0)
         {
-          fdbg("ERROR: Timeout cmd: %08x events: %08x STA: %08x\n",
+          ferr("ERROR: Timeout cmd: %08x events: %08x STA: %08x\n",
                cmd, events, getreg32(LPC17_SDCARD_STATUS));
 
           return -ETIMEDOUT;
@@ -1987,7 +1987,7 @@ static int lpc17_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t
 #ifdef CONFIG_DEBUG_FEATURES
   if (!rshort)
     {
-      fdbg("ERROR: rshort=NULL\n");
+      ferr("ERROR: rshort=NULL\n");
       ret = -EINVAL;
     }
 
@@ -1997,7 +1997,7 @@ static int lpc17_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t
            (cmd & MMCSD_RESPONSE_MASK) != MMCSD_R1B_RESPONSE &&
            (cmd & MMCSD_RESPONSE_MASK) != MMCSD_R6_RESPONSE)
     {
-      fdbg("ERROR: Wrong response CMD=%08x\n", cmd);
+      ferr("ERROR: Wrong response CMD=%08x\n", cmd);
       ret = -EINVAL;
     }
   else
@@ -2008,12 +2008,12 @@ static int lpc17_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t
       regval = getreg32(LPC17_SDCARD_STATUS);
       if ((regval & SDCARD_STATUS_CTIMEOUT) != 0)
         {
-          fdbg("ERROR: Command timeout: %08x\n", regval);
+          ferr("ERROR: Command timeout: %08x\n", regval);
           ret = -ETIMEDOUT;
         }
       else if ((regval & SDCARD_STATUS_CCRCFAIL) != 0)
         {
-          fdbg("ERROR: CRC failure: %08x\n", regval);
+          ferr("ERROR: CRC failure: %08x\n", regval);
           ret = -EIO;
         }
 #ifdef CONFIG_DEBUG_FEATURES
@@ -2024,7 +2024,7 @@ static int lpc17_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t
           respcmd = getreg32(LPC17_SDCARD_RESPCMD);
           if ((uint8_t)(respcmd & SDCARD_RESPCMD_MASK) != (cmd & MMCSD_CMDIDX_MASK))
             {
-              fdbg("ERROR: RESCMD=%02x CMD=%08x\n", respcmd, cmd);
+              ferr("ERROR: RESCMD=%02x CMD=%08x\n", respcmd, cmd);
               ret = -EINVAL;
             }
         }
@@ -2057,7 +2057,7 @@ static int lpc17_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlo
 
   if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R2_RESPONSE)
     {
-      fdbg("ERROR: Wrong response CMD=%08x\n", cmd);
+      ferr("ERROR: Wrong response CMD=%08x\n", cmd);
       ret = -EINVAL;
     }
   else
@@ -2068,12 +2068,12 @@ static int lpc17_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlo
       regval = getreg32(LPC17_SDCARD_STATUS);
       if (regval & SDCARD_STATUS_CTIMEOUT)
         {
-          fdbg("ERROR: Timeout STA: %08x\n", regval);
+          ferr("ERROR: Timeout STA: %08x\n", regval);
           ret = -ETIMEDOUT;
         }
       else if (regval & SDCARD_STATUS_CCRCFAIL)
         {
-          fdbg("ERROR: CRC fail STA: %08x\n", regval);
+          ferr("ERROR: CRC fail STA: %08x\n", regval);
           ret = -EIO;
         }
     }
@@ -2111,7 +2111,7 @@ static int lpc17_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *r
   if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R3_RESPONSE &&
       (cmd & MMCSD_RESPONSE_MASK) != MMCSD_R7_RESPONSE)
     {
-      fdbg("ERROR: Wrong response CMD=%08x\n", cmd);
+      ferr("ERROR: Wrong response CMD=%08x\n", cmd);
       ret = -EINVAL;
     }
   else
@@ -2124,7 +2124,7 @@ static int lpc17_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *r
       regval = getreg32(LPC17_SDCARD_STATUS);
       if (regval & SDCARD_STATUS_CTIMEOUT)
         {
-          fdbg("ERROR: Timeout STA: %08x\n", regval);
+          ferr("ERROR: Timeout STA: %08x\n", regval);
           ret = -ETIMEDOUT;
         }
     }
@@ -2269,7 +2269,7 @@ static sdio_eventset_t lpc17_eventwait(FAR struct sdio_dev_s *dev,
                        1, (uint32_t)priv);
       if (ret != OK)
         {
-          fdbg("ERROR: wd_start failed: %d\n", ret);
+          ferr("ERROR: wd_start failed: %d\n", ret);
         }
     }
 
diff --git a/arch/arm/src/lpc17xx/lpc17_serial.c b/arch/arm/src/lpc17xx/lpc17_serial.c
index 6dda0aabc3..94a92873d2 100644
--- a/arch/arm/src/lpc17xx/lpc17_serial.c
+++ b/arch/arm/src/lpc17xx/lpc17_serial.c
@@ -1153,7 +1153,7 @@ static int up_interrupt(int irq, void *context)
 
           default:
             {
-              dbg("Unexpected IIR: %02x\n", status);
+              err("Unexpected IIR: %02x\n", status);
               break;
             }
         }
diff --git a/arch/arm/src/lpc17xx/lpc17_spi.c b/arch/arm/src/lpc17xx/lpc17_spi.c
index a7ccc2b2f1..a3a4f28b0f 100644
--- a/arch/arm/src/lpc17xx/lpc17_spi.c
+++ b/arch/arm/src/lpc17xx/lpc17_spi.c
@@ -80,14 +80,14 @@
  */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -287,7 +287,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
   priv->frequency = frequency;
   priv->actual    = actual;
 
-  spidbg("Frequency %d->%d\n", frequency, actual);
+  spierr("Frequency %d->%d\n", frequency, actual);
   return actual;
 }
 
@@ -449,7 +449,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size
   FAR uint8_t *ptr = (FAR uint8_t *)buffer;
   uint8_t data;
 
-  spidbg("nwords: %d\n", nwords);
+  spierr("nwords: %d\n", nwords);
   while (nwords)
     {
       /* Write the data to transmitted to the SPI Data Register */
@@ -494,7 +494,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw
 {
   FAR uint8_t *ptr = (FAR uint8_t *)buffer;
 
-  spidbg("nwords: %d\n", nwords);
+  spierr("nwords: %d\n", nwords);
   while (nwords)
     {
       /* Write some dummy data to the SPI Data Register in order to clock the
diff --git a/arch/arm/src/lpc17xx/lpc17_ssp.c b/arch/arm/src/lpc17xx/lpc17_ssp.c
index ad6fc44c87..25d2ef42ff 100644
--- a/arch/arm/src/lpc17xx/lpc17_ssp.c
+++ b/arch/arm/src/lpc17xx/lpc17_ssp.c
@@ -81,14 +81,14 @@
  */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define sspdbg  llerr
+#  define ssperr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define sspdbg(x...)
+#  define ssperr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -470,7 +470,7 @@ static uint32_t ssp_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
   priv->frequency = frequency;
   priv->actual    = actual;
 
-  sspdbg("Frequency %d->%d\n", frequency, actual);
+  ssperr("Frequency %d->%d\n", frequency, actual);
   return actual;
 }
 
@@ -521,7 +521,7 @@ static void ssp_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode)
           break;
 
         default:
-          sspdbg("Bad mode: %d\n", mode);
+          ssperr("Bad mode: %d\n", mode);
           DEBUGASSERT(FALSE);
           return;
         }
@@ -609,7 +609,7 @@ static uint16_t ssp_send(FAR struct spi_dev_s *dev, uint16_t wd)
   /* Get the value from the RX FIFO and return it */
 
   regval = ssp_getreg(priv, LPC17_SSP_DR_OFFSET);
-  sspdbg("%04x->%04x\n", wd, regval);
+  ssperr("%04x->%04x\n", wd, regval);
   return (uint16_t)regval;
 }
 
@@ -646,7 +646,7 @@ static void ssp_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size
 
   /* Loop while thre are bytes remaining to be sent */
 
-  sspdbg("nwords: %d\n", nwords);
+  ssperr("nwords: %d\n", nwords);
   u.pv = buffer;
   while (nwords > 0)
     {
@@ -674,7 +674,7 @@ static void ssp_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size
 
   /* Then discard all card responses until the RX & TX FIFOs are emptied. */
 
-  sspdbg("discarding\n");
+  ssperr("discarding\n");
   do
     {
       /* Is there anything in the RX fifo? */
@@ -735,7 +735,7 @@ static void ssp_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw
 
   /* While there is remaining to be sent (and no synchronization error has occurred) */
 
-  sspdbg("nwords: %d\n", nwords);
+  ssperr("nwords: %d\n", nwords);
   u.pv = buffer;
   while (nwords || rxpending)
     {
diff --git a/arch/arm/src/lpc17xx/lpc17_timer.c b/arch/arm/src/lpc17xx/lpc17_timer.c
index 2fe7cc56cb..d609b1f4f5 100644
--- a/arch/arm/src/lpc17xx/lpc17_timer.c
+++ b/arch/arm/src/lpc17xx/lpc17_timer.c
@@ -89,7 +89,7 @@
 #endif
 
 #ifdef CONFIG_DEBUG_PWM
-#  define pwmdbg              dbg
+#  define pwmerr              err
 #  define pwmllerr            llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define pwminfo           info
@@ -101,7 +101,7 @@
 #    define pwm_dumpgpio(p,m)
 #  endif
 #else
-#  define pwmdbg(x...)
+#  define pwmerr(x...)
 #  define pwmllerr(x...)
 #  define pwminfo(x...)
 #  define pwmllinfo(x...)
@@ -245,8 +245,8 @@ static void timer_putreg(struct lpc17_timer_s *priv, int offset,
 #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);
-  pwmdbg("  CR1: %04x CR2:  %04x SMCR:  %04x DIER:  %04x\n",
+  pwmerr("%s:\n", msg);
+  pwmerr("  CR1: %04x CR2:  %04x SMCR:  %04x DIER:  %04x\n",
           timer_getreg(priv, LPC17_PWM_MR0_OFFSET),
           timer_getreg(priv, LPC17_PWM_MR1_OFFSET),
           timer_getreg(priv, LPC17_PWM_MR2_OFFSET),
@@ -254,7 +254,7 @@ static void timer_dumpregs(struct lpc17_timer_s *priv, FAR const char *msg)
 #if defined(CONFIG_LPC17_TMR0)
   if (priv->timtype == TIMTYPE_ADVANCED)
     {
-      pwmdbg("  RCR: %04x BDTR: %04x DCR:   %04x DMAR:  %04x\n",
+      pwmerr("  RCR: %04x BDTR: %04x DCR:   %04x DMAR:  %04x\n",
               timer_getreg(priv, LPC17_PWM_MR0_OFFSET),
               timer_getreg(priv, LPC17_PWM_MR1_OFFSET),
               timer_getreg(priv, LPC17_PWM_MR2_OFFSET),
@@ -263,7 +263,7 @@ static void timer_dumpregs(struct lpc17_timer_s *priv, FAR const char *msg)
   else
 #endif
     {
-      pwmdbg("  DCR: %04x DMAR: %04x\n",
+      pwmerr("  DCR: %04x DMAR: %04x\n",
               timer_getreg(priv, LPC17_PWM_MR2_OFFSET),
               timer_getreg(priv, LPC17_PWM_MR3_OFFSET));
     }
@@ -469,7 +469,7 @@ static int timer_shutdown(FAR struct pwm_lowerhalf_s *dev)
   FAR struct lpc17_timer_s *priv = (FAR struct lpc17_timer_s *)dev;
   uint32_t pincfg;
 
-  pwmdbg("TIM%d pincfg: %08x\n", priv->timid, priv->pincfg);
+  pwmerr("TIM%d pincfg: %08x\n", priv->timid, priv->pincfg);
 
   /* Make sure that the output has been stopped */
 
@@ -525,7 +525,7 @@ static int timer_stop(FAR struct pwm_lowerhalf_s *dev)
   uint32_t regval;
   irqstate_t flags;
 
-  pwmdbg("TIM%d\n", priv->timid);
+  pwmerr("TIM%d\n", priv->timid);
 
   /* Disable interrupts momentary to stop any ongoing timer processing and
    * to prevent any concurrent access to the reset register.
@@ -551,7 +551,7 @@ static int timer_stop(FAR struct pwm_lowerhalf_s *dev)
 
   leave_critical_section(flags);
 
-  pwmdbg("regaddr: %08x resetbit: %08x\n", regaddr, resetbit);
+  pwmerr("regaddr: %08x resetbit: %08x\n", regaddr, resetbit);
   timer_dumpregs(priv, "After stop");
   return OK;
 }
@@ -579,7 +579,7 @@ static int timer_ioctl(FAR struct pwm_lowerhalf_s *dev, int cmd, unsigned long a
 
   /* There are no platform-specific ioctl commands */
 
-  pwmdbg("TIM%d\n", priv->timid);
+  pwmerr("TIM%d\n", priv->timid);
 #endif
   return -ENOTTY;
 }
@@ -609,7 +609,7 @@ FAR struct pwm_lowerhalf_s *lpc17_timerinitialize(int timer)
 {
   FAR struct lpc17_timer_s *lower;
 
-  pwmdbg("TIM%d\n", timer);
+  pwmerr("TIM%d\n", timer);
 
   switch (timer)
     {
@@ -623,7 +623,7 @@ FAR struct pwm_lowerhalf_s *lpc17_timerinitialize(int timer)
 #endif
 
       default:
-        pwmdbg("No such timer configured\n");
+        pwmerr("No such timer configured\n");
         return NULL;
     }
 
diff --git a/arch/arm/src/lpc17xx/lpc17_usbhost.c b/arch/arm/src/lpc17xx/lpc17_usbhost.c
index d11c0eb4f9..c128b18217 100644
--- a/arch/arm/src/lpc17xx/lpc17_usbhost.c
+++ b/arch/arm/src/lpc17xx/lpc17_usbhost.c
@@ -1547,7 +1547,7 @@ static int lpc17_ctrltd(struct lpc17_usbhost_s *priv, struct lpc17_ed_s *ed,
   xfrinfo = lpc17_alloc_xfrinfo();
   if (xfrinfo == NULL)
     {
-      udbg("ERROR: lpc17_alloc_xfrinfo failed\n");
+      uerr("ERROR: lpc17_alloc_xfrinfo failed\n");
       return -ENOMEM;
     }
 
@@ -1566,7 +1566,7 @@ static int lpc17_ctrltd(struct lpc17_usbhost_s *priv, struct lpc17_ed_s *ed,
   ret = lpc17_wdhwait(priv, ed);
   if (ret < 0)
     {
-      udbg("ERROR: Device disconnected\n");
+      uerr("ERROR: Device disconnected\n");
       goto errout_with_xfrinfo;
     }
 
@@ -1607,7 +1607,7 @@ static int lpc17_ctrltd(struct lpc17_usbhost_s *priv, struct lpc17_ed_s *ed,
         }
       else
         {
-          udbg("ERROR: Bad TD completion status: %d\n", xfrinfo->tdstatus);
+          uerr("ERROR: Bad TD completion status: %d\n", xfrinfo->tdstatus);
           ret = xfrinfo->tdstatus == TD_CC_STALL ? -EPERM : -EIO;
         }
     }
@@ -1967,7 +1967,7 @@ static int lpc17_wait(struct usbhost_connection_s *conn,
               *hport = connport;
               leave_critical_section(flags);
 
-              udbg("RHport Connected: %s\n",
+              uerr("RHport Connected: %s\n",
                    connport->connected ? "YES" : "NO");
 
               return OK;
@@ -1987,7 +1987,7 @@ static int lpc17_wait(struct usbhost_connection_s *conn,
           *hport = connport;
           leave_critical_section(flags);
 
-          udbg("Hub port Connected: %s\n", connport->connected ? "YES" : "NO");
+          uerr("Hub port Connected: %s\n", connport->connected ? "YES" : "NO");
           return OK;
         }
 #endif
@@ -2041,7 +2041,7 @@ static int lpc17_rh_enumerate(struct usbhost_connection_s *conn,
     {
       /* No, return an error */
 
-      udbg("Not connected\n");
+      uerr("Not connected\n");
       return -ENODEV;
     }
 
@@ -2093,7 +2093,7 @@ static int lpc17_enumerate(FAR struct usbhost_connection_s *conn,
   ret = usbhost_enumerate(hport, &hport->devclass);
   if (ret < 0)
     {
-      udbg("ERROR: Enumeration failed: %d\n", ret);
+      uerr("ERROR: Enumeration failed: %d\n", ret);
     }
 
   return ret;
@@ -2299,7 +2299,7 @@ static int lpc17_epalloc(struct usbhost_driver_s *drvr,
         {
           /* No.. destroy it and report the error */
 
-          udbg("ERROR: Failed to queue ED for transfer type: %d\n", ed->xfrtype);
+          uerr("ERROR: Failed to queue ED for transfer type: %d\n", ed->xfrtype);
           sem_destroy(&ed->wdhsem);
           lpc17_edfree(ed);
         }
@@ -2947,7 +2947,7 @@ static ssize_t lpc17_transfer(struct usbhost_driver_s *drvr, usbhost_ep_t ep,
   xfrinfo = lpc17_alloc_xfrinfo();
   if (xfrinfo == NULL)
     {
-      udbg("ERROR: lpc17_alloc_xfrinfo failed\n");
+      uerr("ERROR: lpc17_alloc_xfrinfo failed\n");
       nbytes = -ENOMEM;
       goto errout_with_sem;
     }
@@ -2966,7 +2966,7 @@ static ssize_t lpc17_transfer(struct usbhost_driver_s *drvr, usbhost_ep_t ep,
   ret = lpc17_dma_alloc(priv, ed, buffer, buflen, &alloc);
   if (ret < 0)
     {
-      udbg("ERROR: lpc17_dma_alloc failed: %d\n", ret);
+      uerr("ERROR: lpc17_dma_alloc failed: %d\n", ret);
       nbytes = (ssize_t)ret;
       goto errout_with_xfrinfo;
     }
@@ -2987,7 +2987,7 @@ static ssize_t lpc17_transfer(struct usbhost_driver_s *drvr, usbhost_ep_t ep,
   ret = lpc17_wdhwait(priv, ed);
   if (ret < 0)
     {
-      udbg("ERROR: Device disconnected\n");
+      uerr("ERROR: Device disconnected\n");
       nbytes = (ssize_t)ret;
       goto errout_with_buffers;
     }
@@ -2997,7 +2997,7 @@ static ssize_t lpc17_transfer(struct usbhost_driver_s *drvr, usbhost_ep_t ep,
   ret = lpc17_transfer_common(priv, ed, buffer, buflen);
   if (ret < 0)
     {
-      udbg("ERROR: lpc17_transfer_common failed: %d\n", ret);
+      uerr("ERROR: lpc17_transfer_common failed: %d\n", ret);
       nbytes = (ssize_t)ret;
       goto errout_with_wdhwait;
     }
@@ -3021,7 +3021,7 @@ static ssize_t lpc17_transfer(struct usbhost_driver_s *drvr, usbhost_ep_t ep,
        * might understand.
        */
 
-      udbg("ERROR: Bad TD completion status: %d\n", xfrinfo->tdstatus);
+      uerr("ERROR: Bad TD completion status: %d\n", xfrinfo->tdstatus);
 
       switch (xfrinfo->tdstatus)
         {
@@ -3111,7 +3111,7 @@ static void lpc17_asynch_completion(struct lpc17_usbhost_s *priv,
        * might understand.
        */
 
-      udbg("ERROR: Bad TD completion status: %d\n", xfrinfo->tdstatus);
+      uerr("ERROR: Bad TD completion status: %d\n", xfrinfo->tdstatus);
 
       switch (xfrinfo->tdstatus)
         {
@@ -3213,7 +3213,7 @@ static int lpc17_asynch(struct usbhost_driver_s *drvr, usbhost_ep_t ep,
   xfrinfo = lpc17_alloc_xfrinfo();
   if (xfrinfo == NULL)
     {
-      udbg("ERROR: lpc17_alloc_xfrinfo failed\n");
+      uerr("ERROR: lpc17_alloc_xfrinfo failed\n");
       ret = -ENOMEM;
       goto errout_with_sem;
     }
@@ -3234,7 +3234,7 @@ static int lpc17_asynch(struct usbhost_driver_s *drvr, usbhost_ep_t ep,
   ret = lpc17_dma_alloc(priv, ed, buffer, buflen, &xfrinfo->alloc);
   if (ret < 0)
     {
-      udbg("ERROR: lpc17_dma_alloc failed: %d\n", ret);
+      uerr("ERROR: lpc17_dma_alloc failed: %d\n", ret);
       goto errout_with_sem;
     }
 
@@ -3251,7 +3251,7 @@ static int lpc17_asynch(struct usbhost_driver_s *drvr, usbhost_ep_t ep,
   ret = lpc17_transfer_common(priv, ed, buffer, buflen);
   if (ret < 0)
     {
-      udbg("ERROR: lpc17_transfer_common failed: %d\n", ret);
+      uerr("ERROR: lpc17_transfer_common failed: %d\n", ret);
       goto errout_with_asynch;
     }
 
@@ -3695,7 +3695,7 @@ struct usbhost_connection_s *lpc17_usbhost_initialize(int controller)
   lpc17_configgpio(GPIO_USB_OVRCR);   /* USB port Over-Current status */
   usbhost_dumpgpio();
 
-  udbg("Initializing Host Stack\n");
+  uerr("Initializing Host Stack\n");
 
   /* Show AHB SRAM memory map */
 
@@ -3825,7 +3825,7 @@ struct usbhost_connection_s *lpc17_usbhost_initialize(int controller)
 
   if (irq_attach(LPC17_IRQ_USB, lpc17_usbinterrupt) != 0)
     {
-      udbg("Failed to attach IRQ\n");
+      uerr("Failed to attach IRQ\n");
       return NULL;
     }
 
@@ -3850,7 +3850,7 @@ struct usbhost_connection_s *lpc17_usbhost_initialize(int controller)
   /* Enable interrupts at the interrupt controller */
 
   up_enable_irq(LPC17_IRQ_USB); /* enable USB interrupt */
-  udbg("USB host Initialized, Device connected:%s\n",
+  uerr("USB host Initialized, Device connected:%s\n",
        priv->connected ? "YES" : "NO");
 
   return &g_usbconn;
diff --git a/arch/arm/src/lpc214x/lpc214x_serial.c b/arch/arm/src/lpc214x/lpc214x_serial.c
index f3ddd0cdd4..b0bcafd44e 100644
--- a/arch/arm/src/lpc214x/lpc214x_serial.c
+++ b/arch/arm/src/lpc214x/lpc214x_serial.c
@@ -549,7 +549,7 @@ static int up_interrupt(int irq, void *context)
 
           default:
             {
-              dbg("Unexpected IIR: %02x\n", status);
+              err("Unexpected IIR: %02x\n", status);
               break;
             }
         }
diff --git a/arch/arm/src/lpc2378/lpc23xx_i2c.c b/arch/arm/src/lpc2378/lpc23xx_i2c.c
index 54efbc52c0..d3bec89884 100644
--- a/arch/arm/src/lpc2378/lpc23xx_i2c.c
+++ b/arch/arm/src/lpc2378/lpc23xx_i2c.c
@@ -490,7 +490,7 @@ struct i2c_master_s *lpc2378_i2cbus_initialize(int port)
 
   if (port > 1)
     {
-      dbg("lpc I2C Only support 0,1\n");
+      err("lpc I2C Only support 0,1\n");
       return NULL;
     }
 
diff --git a/arch/arm/src/lpc2378/lpc23xx_serial.c b/arch/arm/src/lpc2378/lpc23xx_serial.c
index d582fe5de3..9ea299783d 100644
--- a/arch/arm/src/lpc2378/lpc23xx_serial.c
+++ b/arch/arm/src/lpc2378/lpc23xx_serial.c
@@ -667,7 +667,7 @@ static int up_interrupt(int irq, void *context)
 
         default:
           {
-            dbg("Unexpected IIR: %02x\n", status);
+            err("Unexpected IIR: %02x\n", status);
             break;
           }
         }
diff --git a/arch/arm/src/lpc2378/lpc23xx_spi.c b/arch/arm/src/lpc2378/lpc23xx_spi.c
index c1daf9f13c..1260105373 100644
--- a/arch/arm/src/lpc2378/lpc23xx_spi.c
+++ b/arch/arm/src/lpc2378/lpc23xx_spi.c
@@ -79,14 +79,14 @@
 /* CONFIG_DEBUG_SPI enables debug output from this file */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -289,7 +289,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
   priv->frequency = frequency;
   priv->actual    = actual;
 
-  spidbg("Frequency %d->%d\n", frequency, actual);
+  spierr("Frequency %d->%d\n", frequency, actual);
   return actual;
 }
 
@@ -453,7 +453,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size
   FAR uint8_t *ptr = (FAR uint8_t *)buffer;
   uint8_t data;
 
-  spidbg("nwords: %d\n", nwords);
+  spierr("nwords: %d\n", nwords);
   while (nwords)
     {
       /* Write the data to transmitted to the SPI Data Register */
@@ -498,7 +498,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw
 {
   FAR uint8_t *ptr = (FAR uint8_t *)buffer;
 
-  spidbg("nwords: %d\n", nwords);
+  spierr("nwords: %d\n", nwords);
   while (nwords)
     {
       /* Write some dummy data to the SPI Data Register in order to clock the
diff --git a/arch/arm/src/lpc31xx/lpc31_ehci.c b/arch/arm/src/lpc31xx/lpc31_ehci.c
index 0b161ac75c..d77700e327 100644
--- a/arch/arm/src/lpc31xx/lpc31_ehci.c
+++ b/arch/arm/src/lpc31xx/lpc31_ehci.c
@@ -1463,11 +1463,11 @@ static int lpc31_qh_flush(struct lpc31_qh_s *qh)
 #ifdef CONFIG_LPC31_EHCI_REGDEBUG
 static void lpc31_qtd_print(struct lpc31_qtd_s *qtd)
 {
-  udbg("  QTD[%p]:\n", qtd);
-  udbg("    hw:\n");
-  udbg("      nqp: %08x alt: %08x token: %08x\n",
+  uerr("  QTD[%p]:\n", qtd);
+  uerr("    hw:\n");
+  uerr("      nqp: %08x alt: %08x token: %08x\n",
        qtd->hw.nqp, qtd->hw.alt, qtd->hw.token);
-  udbg("      bpl: %08x %08x %08x %08x %08x\n",
+  uerr("      bpl: %08x %08x %08x %08x %08x\n",
        qtd->hw.bpl[0], qtd->hw.bpl[1], qtd->hw.bpl[2],
        qtd->hw.bpl[3], qtd->hw.bpl[4]);
 }
@@ -1487,29 +1487,29 @@ static void lpc31_qh_print(struct lpc31_qh_s *qh)
   struct lpc31_epinfo_s *epinfo;
   struct ehci_overlay_s *overlay;
 
-  udbg("QH[%p]:\n", qh);
-  udbg("  hw:\n");
-  udbg("    hlp: %08x epchar: %08x epcaps: %08x cqp: %08x\n",
+  uerr("QH[%p]:\n", qh);
+  uerr("  hw:\n");
+  uerr("    hlp: %08x epchar: %08x epcaps: %08x cqp: %08x\n",
        qh->hw.hlp, qh->hw.epchar, qh->hw.epcaps, qh->hw.cqp);
 
   overlay = &qh->hw.overlay;
-  udbg("  overlay:\n");
-  udbg("    nqp: %08x alt: %08x token: %08x\n",
+  uerr("  overlay:\n");
+  uerr("    nqp: %08x alt: %08x token: %08x\n",
        overlay->nqp, overlay->alt, overlay->token);
-  udbg("    bpl: %08x %08x %08x %08x %08x\n",
+  uerr("    bpl: %08x %08x %08x %08x %08x\n",
        overlay->bpl[0], overlay->bpl[1], overlay->bpl[2],
        overlay->bpl[3], overlay->bpl[4]);
 
-  udbg("  fqp:\n", qh->fqp);
+  uerr("  fqp:\n", qh->fqp);
 
   epinfo = qh->epinfo;
-  udbg("  epinfo[%p]:\n", epinfo);
+  uerr("  epinfo[%p]:\n", epinfo);
   if (epinfo)
     {
-      udbg("    EP%d DIR=%s FA=%08x TYPE=%d MaxPacket=%d\n",
+      uerr("    EP%d DIR=%s FA=%08x TYPE=%d MaxPacket=%d\n",
            epinfo->epno, epinfo->dirin ? "IN" : "OUT", epinfo->devaddr,
            epinfo->xfrtype, epinfo->maxpacket);
-      udbg("    Toggle=%d iocwait=%d speed=%d result=%d\n",
+      uerr("    Toggle=%d iocwait=%d speed=%d result=%d\n",
            epinfo->toggle, epinfo->iocwait, epinfo->speed, epinfo->result);
     }
 }
@@ -4222,7 +4222,7 @@ static int lpc31_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
   ret = lpc31_async_setup(rhport, ep0info, req, buffer, len);
   if (ret < 0)
     {
-      udbg("ERROR: lpc31_async_setup failed: %d\n", ret);
+      uerr("ERROR: lpc31_async_setup failed: %d\n", ret);
       goto errout_with_iocwait;
     }
 
diff --git a/arch/arm/src/lpc31xx/lpc31_serial.c b/arch/arm/src/lpc31xx/lpc31_serial.c
index e64e91352e..c3b9b3f509 100644
--- a/arch/arm/src/lpc31xx/lpc31_serial.c
+++ b/arch/arm/src/lpc31xx/lpc31_serial.c
@@ -560,7 +560,7 @@ static int up_interrupt(int irq, void *context)
 
           default:
             {
-              dbg("Unexpected IIR: %02x\n", status);
+              err("Unexpected IIR: %02x\n", status);
               break;
             }
         }
diff --git a/arch/arm/src/lpc43xx/lpc43_dac.c b/arch/arm/src/lpc43xx/lpc43_dac.c
index 16fa92a365..b9ab14b874 100644
--- a/arch/arm/src/lpc43xx/lpc43_dac.c
+++ b/arch/arm/src/lpc43xx/lpc43_dac.c
@@ -173,7 +173,7 @@ static int  dac_send(FAR struct dac_dev_s *dev, FAR struct dac_msg_s *msg)
 
 static int  dac_ioctl(FAR struct dac_dev_s *dev, int cmd, unsigned long arg)
 {
-  dbg("Fix me:Not Implemented\n");
+  err("Fix me:Not Implemented\n");
   return 0;
 }
 
diff --git a/arch/arm/src/lpc43xx/lpc43_ehci.c b/arch/arm/src/lpc43xx/lpc43_ehci.c
index d69b9a796d..a0d4d1160e 100644
--- a/arch/arm/src/lpc43xx/lpc43_ehci.c
+++ b/arch/arm/src/lpc43xx/lpc43_ehci.c
@@ -1350,11 +1350,11 @@ static int lpc43_qh_discard(struct lpc43_qh_s *qh)
 #ifdef CONFIG_LPC43_EHCI_REGDEBUG
 static void lpc43_qtd_print(struct lpc43_qtd_s *qtd)
 {
-  udbg("  QTD[%p]:\n", qtd);
-  udbg("    hw:\n");
-  udbg("      nqp: %08x alt: %08x token: %08x\n",
+  uerr("  QTD[%p]:\n", qtd);
+  uerr("    hw:\n");
+  uerr("      nqp: %08x alt: %08x token: %08x\n",
        qtd->hw.nqp, qtd->hw.alt, qtd->hw.token);
-  udbg("      bpl: %08x %08x %08x %08x %08x\n",
+  uerr("      bpl: %08x %08x %08x %08x %08x\n",
        qtd->hw.bpl[0], qtd->hw.bpl[1], qtd->hw.bpl[2],
        qtd->hw.bpl[3], qtd->hw.bpl[4]);
 }
@@ -1374,29 +1374,29 @@ static void lpc43_qh_print(struct lpc43_qh_s *qh)
   struct lpc43_epinfo_s *epinfo;
   struct ehci_overlay_s *overlay;
 
-  udbg("QH[%p]:\n", qh);
-  udbg("  hw:\n");
-  udbg("    hlp: %08x epchar: %08x epcaps: %08x cqp: %08x\n",
+  uerr("QH[%p]:\n", qh);
+  uerr("  hw:\n");
+  uerr("    hlp: %08x epchar: %08x epcaps: %08x cqp: %08x\n",
        qh->hw.hlp, qh->hw.epchar, qh->hw.epcaps, qh->hw.cqp);
 
   overlay = &qh->hw.overlay;
-  udbg("  overlay:\n");
-  udbg("    nqp: %08x alt: %08x token: %08x\n",
+  uerr("  overlay:\n");
+  uerr("    nqp: %08x alt: %08x token: %08x\n",
        overlay->nqp, overlay->alt, overlay->token);
-  udbg("    bpl: %08x %08x %08x %08x %08x\n",
+  uerr("    bpl: %08x %08x %08x %08x %08x\n",
        overlay->bpl[0], overlay->bpl[1], overlay->bpl[2],
        overlay->bpl[3], overlay->bpl[4]);
 
-  udbg("  fqp:\n", qh->fqp);
+  uerr("  fqp:\n", qh->fqp);
 
   epinfo = qh->epinfo;
-  udbg("  epinfo[%p]:\n", epinfo);
+  uerr("  epinfo[%p]:\n", epinfo);
   if (epinfo)
     {
-      udbg("    EP%d DIR=%s FA=%08x TYPE=%d MaxPacket=%d\n",
+      uerr("    EP%d DIR=%s FA=%08x TYPE=%d MaxPacket=%d\n",
            epinfo->epno, epinfo->dirin ? "IN" : "OUT", epinfo->devaddr,
            epinfo->xfrtype, epinfo->maxpacket);
-      udbg("    Toggle=%d iocwait=%d speed=%d result=%d\n",
+      uerr("    Toggle=%d iocwait=%d speed=%d result=%d\n",
            epinfo->toggle, epinfo->iocwait, epinfo->speed, epinfo->result);
     }
 }
@@ -4046,7 +4046,7 @@ static int lpc43_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
   ret = lpc43_async_setup(rhport, ep0info, req, buffer, len);
   if (ret < 0)
     {
-      udbg("ERROR: lpc43_async_setup failed: %d\n", ret);
+      uerr("ERROR: lpc43_async_setup failed: %d\n", ret);
       goto errout_with_iocwait;
     }
 
diff --git a/arch/arm/src/lpc43xx/lpc43_ethernet.c b/arch/arm/src/lpc43xx/lpc43_ethernet.c
index 89d37cc88b..37e39dee6d 100644
--- a/arch/arm/src/lpc43xx/lpc43_ethernet.c
+++ b/arch/arm/src/lpc43xx/lpc43_ethernet.c
@@ -2381,12 +2381,12 @@ static int lpc43_ifup(struct net_driver_s *dev)
   int ret;
 
 #ifdef CONFIG_NET_IPv4
-  ndbg("Bringing up: %d.%d.%d.%d\n",
+  nerr("Bringing up: %d.%d.%d.%d\n",
        dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
        (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 #endif
 #ifdef CONFIG_NET_IPv6
-  ndbg("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
+  nerr("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
        dev->d_ipv6addr[0], dev->d_ipv6addr[1], dev->d_ipv6addr[2],
        dev->d_ipv6addr[3], dev->d_ipv6addr[4], dev->d_ipv6addr[5],
        dev->d_ipv6addr[6], dev->d_ipv6addr[7]);
@@ -2435,7 +2435,7 @@ static int lpc43_ifdown(struct net_driver_s *dev)
   FAR struct lpc43_ethmac_s *priv = (FAR struct lpc43_ethmac_s *)dev->d_private;
   irqstate_t flags;
 
-  ndbg("Taking the network down\n");
+  nerr("Taking the network down\n");
 
   /* Disable the Ethernet interrupt */
 
@@ -3065,7 +3065,7 @@ static int lpc43_phyread(uint16_t phydevaddr, uint16_t phyregaddr, uint16_t *val
         }
     }
 
-  ndbg("MII transfer timed out: phydevaddr: %04x phyregaddr: %04x\n",
+  nerr("MII transfer timed out: phydevaddr: %04x phyregaddr: %04x\n",
        phydevaddr, phyregaddr);
 
   return -ETIMEDOUT;
@@ -3124,7 +3124,7 @@ static int lpc43_phywrite(uint16_t phydevaddr, uint16_t phyregaddr, uint16_t val
         }
     }
 
-  ndbg("MII transfer timed out: phydevaddr: %04x phyregaddr: %04x value: %04x\n",
+  nerr("MII transfer timed out: phydevaddr: %04x phyregaddr: %04x value: %04x\n",
        phydevaddr, phyregaddr, value);
 
   return -ETIMEDOUT;
@@ -3161,7 +3161,7 @@ static inline int lpc43_dm9161(FAR struct lpc43_ethmac_s *priv)
   ret = lpc43_phyread(CONFIG_LPC43_PHYADDR, MII_PHYID1, &phyval);
   if (ret < 0)
     {
-      ndbg("Failed to read the PHY ID1: %d\n", ret);
+      nerr("Failed to read the PHY ID1: %d\n", ret);
       return ret;
     }
 
@@ -3179,7 +3179,7 @@ static inline int lpc43_dm9161(FAR struct lpc43_ethmac_s *priv)
   ret = lpc43_phyread(CONFIG_LPC43_PHYADDR, 16, &phyval);
   if (ret < 0)
     {
-      ndbg("Failed to read the PHY Register 0x10: %d\n", ret);
+      nerr("Failed to read the PHY Register 0x10: %d\n", ret);
       return ret;
     }
 
@@ -3236,7 +3236,7 @@ static int lpc43_phyinit(FAR struct lpc43_ethmac_s *priv)
   ret = lpc43_phywrite(CONFIG_LPC43_PHYADDR, MII_MCR, MII_MCR_RESET);
   if (ret < 0)
     {
-      ndbg("Failed to reset the PHY: %d\n", ret);
+      nerr("Failed to reset the PHY: %d\n", ret);
       return ret;
     }
 
@@ -3248,7 +3248,7 @@ static int lpc43_phyinit(FAR struct lpc43_ethmac_s *priv)
   ret = lpc43_phy_boardinitialize(0);
   if (ret < 0)
     {
-      ndbg("Failed to initialize the PHY: %d\n", ret);
+      nerr("Failed to initialize the PHY: %d\n", ret);
       return ret;
     }
 #endif
@@ -3273,7 +3273,7 @@ static int lpc43_phyinit(FAR struct lpc43_ethmac_s *priv)
       ret = lpc43_phyread(CONFIG_LPC43_PHYADDR, MII_MSR, &phyval);
       if (ret < 0)
         {
-          ndbg("Failed to read the PHY MSR: %d\n", ret);
+          nerr("Failed to read the PHY MSR: %d\n", ret);
           return ret;
         }
       else if ((phyval & MII_MSR_LINKSTATUS) != 0)
@@ -3284,7 +3284,7 @@ static int lpc43_phyinit(FAR struct lpc43_ethmac_s *priv)
 
   if (timeout >= PHY_RETRY_TIMEOUT)
     {
-      ndbg("Timed out waiting for link status: %04x\n", phyval);
+      nerr("Timed out waiting for link status: %04x\n", phyval);
       return -ETIMEDOUT;
     }
 
@@ -3293,7 +3293,7 @@ static int lpc43_phyinit(FAR struct lpc43_ethmac_s *priv)
   ret = lpc43_phywrite(CONFIG_LPC43_PHYADDR, MII_MCR, MII_MCR_ANENABLE);
   if (ret < 0)
     {
-      ndbg("Failed to enable auto-negotiation: %d\n", ret);
+      nerr("Failed to enable auto-negotiation: %d\n", ret);
       return ret;
     }
 
@@ -3304,7 +3304,7 @@ static int lpc43_phyinit(FAR struct lpc43_ethmac_s *priv)
       ret = lpc43_phyread(CONFIG_LPC43_PHYADDR, MII_MSR, &phyval);
       if (ret < 0)
         {
-          ndbg("Failed to read the PHY MSR: %d\n", ret);
+          nerr("Failed to read the PHY MSR: %d\n", ret);
           return ret;
         }
       else if ((phyval & MII_MSR_ANEGCOMPLETE) != 0)
@@ -3315,7 +3315,7 @@ static int lpc43_phyinit(FAR struct lpc43_ethmac_s *priv)
 
   if (timeout >= PHY_RETRY_TIMEOUT)
     {
-      ndbg("Timed out waiting for auto-negotiation\n");
+      nerr("Timed out waiting for auto-negotiation\n");
       return -ETIMEDOUT;
     }
 
@@ -3324,7 +3324,7 @@ static int lpc43_phyinit(FAR struct lpc43_ethmac_s *priv)
   ret = lpc43_phyread(CONFIG_LPC43_PHYADDR, CONFIG_LPC43_PHYSR, &phyval);
   if (ret < 0)
     {
-      ndbg("Failed to read PHY status register\n");
+      nerr("Failed to read PHY status register\n");
       return ret;
     }
 
@@ -3418,7 +3418,7 @@ static int lpc43_phyinit(FAR struct lpc43_ethmac_s *priv)
   ret = lpc43_phywrite(CONFIG_LPC43_PHYADDR, MII_MCR, phyval);
   if (ret < 0)
     {
-     ndbg("Failed to write the PHY MCR: %d\n", ret);
+     nerr("Failed to write the PHY MCR: %d\n", ret);
       return ret;
     }
 
@@ -3434,7 +3434,7 @@ static int lpc43_phyinit(FAR struct lpc43_ethmac_s *priv)
 #endif
 #endif
 
-  ndbg("Duplex: %s Speed: %d MBps\n",
+  nerr("Duplex: %s Speed: %d MBps\n",
        priv->fduplex ? "FULL" : "HALF",
        priv->mbps100 ? 100 : 10);
 
diff --git a/arch/arm/src/lpc43xx/lpc43_gpdma.c b/arch/arm/src/lpc43xx/lpc43_gpdma.c
index c82de2a826..242b169952 100644
--- a/arch/arm/src/lpc43xx/lpc43_gpdma.c
+++ b/arch/arm/src/lpc43xx/lpc43_gpdma.c
@@ -67,7 +67,7 @@
 #undef DMA_VERBOSE   /* Define to enable verbose debug */
 
 #ifdef DMA_DEBUG
-#  define dmadbg  llerr
+#  define dmaerr  llerr
 #  ifdef DMA_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -75,7 +75,7 @@
 #  endif
 #else
 #  undef DMA_VERBOSE
-#  define dmadbg(x...)
+#  define dmaerr(x...)
 #  define spiinfo(x...)
 #endif
 
diff --git a/arch/arm/src/lpc43xx/lpc43_gpio.c b/arch/arm/src/lpc43xx/lpc43_gpio.c
index cda1757cd3..783c66c060 100644
--- a/arch/arm/src/lpc43xx/lpc43_gpio.c
+++ b/arch/arm/src/lpc43xx/lpc43_gpio.c
@@ -198,7 +198,7 @@ int lpc43_gpio_config(uint16_t gpiocfg)
         break;
 
       default :
-        sdbg("ERROR: Unrecognized pin mode: %04x\n", gpiocfg);
+        serr("ERROR: Unrecognized pin mode: %04x\n", gpiocfg);
         ret = -EINVAL;
         break;
     }
diff --git a/arch/arm/src/lpc43xx/lpc43_i2c.c b/arch/arm/src/lpc43xx/lpc43_i2c.c
index a7ddfa4726..9bc4f4b6e0 100644
--- a/arch/arm/src/lpc43xx/lpc43_i2c.c
+++ b/arch/arm/src/lpc43xx/lpc43_i2c.c
@@ -464,7 +464,7 @@ struct i2c_master_s *lpc43_i2cbus_initialize(int port)
 
   if (port > 1)
     {
-      dbg("lpc I2C Only support 0,1\n");
+      err("lpc I2C Only support 0,1\n");
       return NULL;
     }
 
diff --git a/arch/arm/src/lpc43xx/lpc43_irq.c b/arch/arm/src/lpc43xx/lpc43_irq.c
index cb2d1c502a..a792163de3 100644
--- a/arch/arm/src/lpc43xx/lpc43_irq.c
+++ b/arch/arm/src/lpc43xx/lpc43_irq.c
@@ -146,7 +146,7 @@ static void lpc43_dumpnvic(const char *msg, int irq)
 
 /****************************************************************************
  * Name: lpc43_nmi, lpc43_busfault, lpc43_usagefault, lpc43_pendsv,
- *       lpc43_dbgmonitor, lpc43_pendsv, lpc43_reserved
+ *       lpc43_errmonitor, lpc43_pendsv, lpc43_reserved
  *
  * Description:
  *   Handlers for various exceptions.  None are handled and all are fatal
@@ -159,7 +159,7 @@ static void lpc43_dumpnvic(const char *msg, int irq)
 static int lpc43_nmi(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! NMI received\n");
+  err("PANIC!!! NMI received\n");
   PANIC();
   return 0;
 }
@@ -167,7 +167,7 @@ static int lpc43_nmi(int irq, FAR void *context)
 static int lpc43_busfault(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Bus fault recived\n");
+  err("PANIC!!! Bus fault recived\n");
   PANIC();
   return 0;
 }
@@ -175,7 +175,7 @@ static int lpc43_busfault(int irq, FAR void *context)
 static int lpc43_usagefault(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Usage fault received\n");
+  err("PANIC!!! Usage fault received\n");
   PANIC();
   return 0;
 }
@@ -183,15 +183,15 @@ static int lpc43_usagefault(int irq, FAR void *context)
 static int lpc43_pendsv(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! PendSV received\n");
+  err("PANIC!!! PendSV received\n");
   PANIC();
   return 0;
 }
 
-static int lpc43_dbgmonitor(int irq, FAR void *context)
+static int lpc43_errmonitor(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Debug Monitor received\n");
+  err("PANIC!!! Debug Monitor received\n");
   PANIC();
   return 0;
 }
@@ -199,7 +199,7 @@ static int lpc43_dbgmonitor(int irq, FAR void *context)
 static int lpc43_reserved(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Reserved interrupt\n");
+  err("PANIC!!! Reserved interrupt\n");
   PANIC();
   return 0;
 }
@@ -435,7 +435,7 @@ void up_irqinitialize(void)
   irq_attach(LPC43_IRQ_BUSFAULT, lpc43_busfault);
   irq_attach(LPC43_IRQ_USAGEFAULT, lpc43_usagefault);
   irq_attach(LPC43_IRQ_PENDSV, lpc43_pendsv);
-  irq_attach(LPC43_IRQ_DBGMONITOR, lpc43_dbgmonitor);
+  irq_attach(LPC43_IRQ_DBGMONITOR, lpc43_errmonitor);
   irq_attach(LPC43_IRQ_RESERVED, lpc43_reserved);
 #endif
 
diff --git a/arch/arm/src/lpc43xx/lpc43_serial.c b/arch/arm/src/lpc43xx/lpc43_serial.c
index 78778b609e..1e045e13d7 100644
--- a/arch/arm/src/lpc43xx/lpc43_serial.c
+++ b/arch/arm/src/lpc43xx/lpc43_serial.c
@@ -873,7 +873,7 @@ static int up_interrupt(int irq, void *context)
 
           default:
             {
-              dbg("Unexpected IIR: %02x\n", status);
+              err("Unexpected IIR: %02x\n", status);
               break;
             }
         }
diff --git a/arch/arm/src/lpc43xx/lpc43_spi.c b/arch/arm/src/lpc43xx/lpc43_spi.c
index a5e6254ce1..1d425bc5ff 100644
--- a/arch/arm/src/lpc43xx/lpc43_spi.c
+++ b/arch/arm/src/lpc43xx/lpc43_spi.c
@@ -67,7 +67,7 @@
 /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
@@ -75,7 +75,7 @@
 #  endif
 #else
 #  undef CONFIG_DEBUG_INFO
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -274,7 +274,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
   priv->frequency = frequency;
   priv->actual    = actual;
 
-  spidbg("Frequency %d->%d\n", frequency, actual);
+  spierr("Frequency %d->%d\n", frequency, actual);
   return actual;
 }
 
@@ -436,7 +436,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size
   FAR uint8_t *ptr = (FAR uint8_t *)buffer;
   uint8_t data;
 
-  spidbg("nwords: %d\n", nwords);
+  spierr("nwords: %d\n", nwords);
   while (nwords)
     {
       /* Write the data to transmitted to the SPI Data Register */
@@ -481,7 +481,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw
 {
   FAR uint8_t *ptr = (FAR uint8_t *)buffer;
 
-  spidbg("nwords: %d\n", nwords);
+  spierr("nwords: %d\n", nwords);
   while (nwords)
     {
       /* Write some dummy data to the SPI Data Register in order to clock the
diff --git a/arch/arm/src/lpc43xx/lpc43_spifi.c b/arch/arm/src/lpc43xx/lpc43_spifi.c
index 101f355546..71920dc477 100644
--- a/arch/arm/src/lpc43xx/lpc43_spifi.c
+++ b/arch/arm/src/lpc43xx/lpc43_spifi.c
@@ -388,7 +388,7 @@ static void lpc43_blockerase(struct lpc43_dev_s *priv, off_t sector)
   result = SPIFI_ERASE(priv, &priv->rom, &priv->operands);
   if (result != 0)
     {
-      fdbg("ERROR: SPIFI_ERASE failed: %05x\n", result);
+      ferr("ERROR: SPIFI_ERASE failed: %05x\n", result);
     }
 }
 
@@ -417,7 +417,7 @@ static inline int lpc43_chiperase(struct lpc43_dev_s *priv)
   result = SPIFI_ERASE(priv, &priv->rom, &priv->operands);
   if (result != 0)
     {
-      fdbg("ERROR: SPIFI_ERASE failed: %05x\n", result);
+      ferr("ERROR: SPIFI_ERASE failed: %05x\n", result);
       return -EIO;
     }
 
@@ -463,7 +463,7 @@ static int lpc43_pagewrite(FAR struct lpc43_dev_s *priv, FAR uint8_t *dest,
   result = SPIFI_PROGRAM(priv, &priv->rom, src, &priv->operands);
   if (result != 0)
     {
-      fdbg("ERROR: SPIFI_PROGRAM failed: %05x\n", result);
+      ferr("ERROR: SPIFI_PROGRAM failed: %05x\n", result);
       return -EIO;
     }
 
@@ -475,7 +475,7 @@ static int lpc43_pagewrite(FAR struct lpc43_dev_s *priv, FAR uint8_t *dest,
   result = lpc43_verify(priv, dest, src, nbytes);
   if (result != 0)
     {
-      fdbg("ERROR: lpc43_verify failed: %05x\n", result);
+      ferr("ERROR: lpc43_verify failed: %05x\n", result);
       return -EIO;
     }
 #endif
@@ -523,7 +523,7 @@ static void lpc43_cacheflush(struct lpc43_dev_s *priv)
       ret = lpc43_pagewrite(priv, dest, priv->cache, SPIFI_BLKSIZE);
       if (ret < 0)
         {
-          fdbg("ERROR: lpc43_pagewrite failed: %d\n", ret);
+          ferr("ERROR: lpc43_pagewrite failed: %d\n", ret);
         }
 
       /* The case is no long dirty and the FLASH is no longer erased */
@@ -798,7 +798,7 @@ static ssize_t lpc43_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, size_t
   ret = lpc43_pagewrite(priv, dest, buffer, nblocks << SPIFI_512SHIFT);
   if (ret < 0)
     {
-      fdbg("ERROR: lpc43_pagewrite failed: %d\n", ret);
+      ferr("ERROR: lpc43_pagewrite failed: %d\n", ret);
       return ret;
     }
 #endif
@@ -1025,7 +1025,7 @@ static inline int lpc43_rominit(FAR struct lpc43_dev_s *priv)
                       S_RCVCLK | S_FULLCLK, SCLK_MHZ);
   if (result != 0)
     {
-      fdbg("ERROR: SPIFI_INIT failed: %05x\n", result);
+      ferr("ERROR: SPIFI_INIT failed: %05x\n", result);
 
       /* Try again */
 
@@ -1033,7 +1033,7 @@ static inline int lpc43_rominit(FAR struct lpc43_dev_s *priv)
                           S_RCVCLK | S_FULLCLK, SCLK_MHZ);
       if (result != 0)
         {
-          fdbg("ERROR: SPIFI_INIT failed: %05x\n", result);
+          ferr("ERROR: SPIFI_INIT failed: %05x\n", result);
           return -ENODEV;
         }
     }
@@ -1201,7 +1201,7 @@ FAR struct mtd_dev_s *lpc43_spifi_initialize(void)
     {
       /* Allocation failed! Discard all of that work we just did and return NULL */
 
-      fdbg("ERROR: Allocation failed\n");
+      ferr("ERROR: Allocation failed\n");
       return NULL;
     }
 #endif
diff --git a/arch/arm/src/lpc43xx/lpc43_ssp.c b/arch/arm/src/lpc43xx/lpc43_ssp.c
index 4767ac057f..ae66e5753f 100644
--- a/arch/arm/src/lpc43xx/lpc43_ssp.c
+++ b/arch/arm/src/lpc43xx/lpc43_ssp.c
@@ -76,7 +76,7 @@
  */
 
 #ifdef CONFIG_SSP_DEBUG
-#  define sspdbg  llerr
+#  define ssperr  llerr
 #  ifdef CONFIG_SSP_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -84,7 +84,7 @@
 #  endif
 #else
 #  undef CONFIG_SSP_VERBOSE
-#  define sspdbg(x...)
+#  define ssperr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -378,7 +378,7 @@ static uint32_t ssp_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
   priv->frequency = frequency;
   priv->actual    = actual;
 
-  sspdbg("Frequency %d->%d\n", frequency, actual);
+  ssperr("Frequency %d->%d\n", frequency, actual);
   return actual;
 }
 
@@ -429,7 +429,7 @@ static void ssp_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode)
           break;
 
         default:
-          sspdbg("Bad mode: %d\n", mode);
+          ssperr("Bad mode: %d\n", mode);
           DEBUGASSERT(FALSE);
           return;
         }
@@ -517,7 +517,7 @@ static uint16_t ssp_send(FAR struct spi_dev_s *dev, uint16_t wd)
   /* Get the value from the RX FIFO and return it */
 
   regval = ssp_getreg(priv, LPC43_SSP_DR_OFFSET);
-  sspdbg("%04x->%04x\n", wd, regval);
+  ssperr("%04x->%04x\n", wd, regval);
   return (uint16_t)regval;
 }
 
@@ -564,7 +564,7 @@ static void ssp_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
 
   /* While there is remaining to be sent (and no synchronization error has occurred) */
 
-  sspdbg("nwords: %d\n", nwords);
+  ssperr("nwords: %d\n", nwords);
 
   tx.pv = txbuffer;
   rx.pv = rxbuffer;
diff --git a/arch/arm/src/nuc1xx/nuc_irq.c b/arch/arm/src/nuc1xx/nuc_irq.c
index 961d7c8405..ff4d6f0e61 100644
--- a/arch/arm/src/nuc1xx/nuc_irq.c
+++ b/arch/arm/src/nuc1xx/nuc_irq.c
@@ -128,7 +128,7 @@ static void nuc_dumpnvic(const char *msg, int irq)
 
 /****************************************************************************
  * Name: nuc_nmi, nuc_busfault, nuc_usagefault, nuc_pendsv,
- *       nuc_dbgmonitor, nuc_pendsv, nuc_reserved
+ *       nuc_errmonitor, nuc_pendsv, nuc_reserved
  *
  * Description:
  *   Handlers for various execptions.  None are handled and all are fatal
@@ -141,7 +141,7 @@ static void nuc_dumpnvic(const char *msg, int irq)
 static int nuc_nmi(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! NMI received\n");
+  err("PANIC!!! NMI received\n");
   PANIC();
   return 0;
 }
@@ -149,7 +149,7 @@ static int nuc_nmi(int irq, FAR void *context)
 static int nuc_pendsv(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! PendSV received\n");
+  err("PANIC!!! PendSV received\n");
   PANIC();
   return 0;
 }
@@ -157,7 +157,7 @@ static int nuc_pendsv(int irq, FAR void *context)
 static int nuc_reserved(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Reserved interrupt\n");
+  err("PANIC!!! Reserved interrupt\n");
   PANIC();
   return 0;
 }
diff --git a/arch/arm/src/sam34/sam4cm_freerun.c b/arch/arm/src/sam34/sam4cm_freerun.c
index 429ae813c5..1b74144713 100644
--- a/arch/arm/src/sam34/sam4cm_freerun.c
+++ b/arch/arm/src/sam34/sam4cm_freerun.c
@@ -133,7 +133,7 @@ int sam_freerun_initialize(struct sam_freerun_s *freerun, int chan,
   ret = sam_tc_divisor(frequency, &divisor, &cmr);
   if (ret < 0)
     {
-      tcdbg("ERROR: sam_tc_divisor failed: %d\n", ret);
+      tcerr("ERROR: sam_tc_divisor failed: %d\n", ret);
       return ret;
     }
 
@@ -172,7 +172,7 @@ int sam_freerun_initialize(struct sam_freerun_s *freerun, int chan,
   freerun->tch = sam_tc_allocate(chan, cmr);
   if (!freerun->tch)
     {
-      tcdbg("ERROR: Failed to allocate timer channel %d\n", chan);
+      tcerr("ERROR: Failed to allocate timer channel %d\n", chan);
       return -EBUSY;
     }
 
diff --git a/arch/arm/src/sam34/sam4cm_oneshot.c b/arch/arm/src/sam34/sam4cm_oneshot.c
index 79a668ee0f..6ce9858d4c 100644
--- a/arch/arm/src/sam34/sam4cm_oneshot.c
+++ b/arch/arm/src/sam34/sam4cm_oneshot.c
@@ -160,7 +160,7 @@ int sam_oneshot_initialize(struct sam_oneshot_s *oneshot, int chan,
   ret = sam_tc_divisor(frequency, &divisor, &cmr);
   if (ret < 0)
     {
-      tcdbg("ERROR: sam_tc_divisor failed: %d\n", ret);
+      tcerr("ERROR: sam_tc_divisor failed: %d\n", ret);
       return ret;
     }
 
@@ -200,7 +200,7 @@ int sam_oneshot_initialize(struct sam_oneshot_s *oneshot, int chan,
   oneshot->tch = sam_tc_allocate(chan, cmr);
   if (!oneshot->tch)
     {
-      tcdbg("ERROR: Failed to allocate timer channel %d\n", chan);
+      tcerr("ERROR: Failed to allocate timer channel %d\n", chan);
       return -EBUSY;
     }
 
diff --git a/arch/arm/src/sam34/sam4cm_tc.c b/arch/arm/src/sam34/sam4cm_tc.c
index 9edcbe9d8c..5a7be95409 100644
--- a/arch/arm/src/sam34/sam4cm_tc.c
+++ b/arch/arm/src/sam34/sam4cm_tc.c
@@ -757,7 +757,7 @@ static inline struct sam_chan_s *sam_tc_initialize(int channel)
     {
       /* Timer/counter is not invalid or not enabled */
 
-      tcdbg("ERROR: Bad channel number: %d\n", channel);
+      tcerr("ERROR: Bad channel number: %d\n", channel);
       return NULL;
     }
 
@@ -770,7 +770,7 @@ static inline struct sam_chan_s *sam_tc_initialize(int channel)
     {
       /* Initialize the channel. */
 
-      tcdbg("Initializing TC%d\n", chconfig->chan);
+      tcerr("Initializing TC%d\n", chconfig->chan);
 
       memset(chan, 0, sizeof(struct sam_chan_s));
       sem_init(&chan->exclsem, 0, 1);
@@ -831,7 +831,7 @@ static inline struct sam_chan_s *sam_tc_initialize(int channel)
     {
       /* No.. return a failure */
 
-      tcdbg("Channel %d is in-used\n", channel);
+      tcerr("Channel %d is in-used\n", channel);
       sam_givesem(chan);
       return NULL;
     }
@@ -1246,7 +1246,7 @@ int sam_tc_divisor(uint32_t frequency, uint32_t *div, uint32_t *tcclks)
         {
           /* If no divisor can be found, return -ERANGE */
 
-          tcdbg("Lower bound search failed\n");
+          tcerr("Lower bound search failed\n");
           return -ERANGE;
         }
     }
diff --git a/arch/arm/src/sam34/sam4cm_tc.h b/arch/arm/src/sam34/sam4cm_tc.h
index 8476619aef..f3b32a1a6f 100644
--- a/arch/arm/src/sam34/sam4cm_tc.h
+++ b/arch/arm/src/sam34/sam4cm_tc.h
@@ -83,12 +83,12 @@
 /* Timer/counter debug output */
 
 #ifdef CONFIG_SAM34_TC_DEBUG
-#  define tcdbg    dbg
+#  define tcerr    err
 #  define tcinfo   info
 #  define tcllerr  llerr
 #  define tcllinfo llinfo
 #else
-#  define tcdbg(x...)
+#  define tcerr(x...)
 #  define tcinfo(x...)
 #  define tcllerr(x...)
 #  define tcllinfo(x...)
diff --git a/arch/arm/src/sam34/sam_dmac.c b/arch/arm/src/sam34/sam_dmac.c
index d3d2899286..7eb31148cb 100644
--- a/arch/arm/src/sam34/sam_dmac.c
+++ b/arch/arm/src/sam34/sam_dmac.c
@@ -1780,22 +1780,22 @@ void sam_dmadump(DMA_HANDLE handle, const struct sam_dmaregs_s *regs,
 {
   struct sam_dma_s *dmach = (struct sam_dma_s *)handle;
 
-  dmadbg("%s\n", msg);
-  dmadbg("  DMA Global Registers:\n");
-  dmadbg("      GCFG[%08x]: %08x\n", SAM_DMAC_GCFG, regs->gcfg);
-  dmadbg("        EN[%08x]: %08x\n", SAM_DMAC_EN, regs->en);
-  dmadbg("      SREQ[%08x]: %08x\n", SAM_DMAC_SREQ, regs->sreq);
-  dmadbg("      CREQ[%08x]: %08x\n", SAM_DMAC_CREQ, regs->creq);
-  dmadbg("      LAST[%08x]: %08x\n", SAM_DMAC_LAST, regs->last);
-  dmadbg("    EBCIMR[%08x]: %08x\n", SAM_DMAC_EBCIMR, regs->ebcimr);
-  dmadbg("      CHSR[%08x]: %08x\n", SAM_DMAC_CHSR, regs->chsr);
-  dmadbg("  DMA Channel Registers:\n");
-  dmadbg("     SADDR[%08x]: %08x\n", dmach->base + SAM_DMACHAN_SADDR_OFFSET, regs->saddr);
-  dmadbg("     DADDR[%08x]: %08x\n", dmach->base + SAM_DMACHAN_DADDR_OFFSET, regs->daddr);
-  dmadbg("      DSCR[%08x]: %08x\n", dmach->base + SAM_DMACHAN_DSCR_OFFSET, regs->dscr);
-  dmadbg("     CTRLA[%08x]: %08x\n", dmach->base + SAM_DMACHAN_CTRLA_OFFSET, regs->ctrla);
-  dmadbg("     CTRLB[%08x]: %08x\n", dmach->base + SAM_DMACHAN_CTRLB_OFFSET, regs->ctrlb);
-  dmadbg("       CFG[%08x]: %08x\n", dmach->base + SAM_DMACHAN_CFG_OFFSET, regs->cfg);
+  dmaerr("%s\n", msg);
+  dmaerr("  DMA Global Registers:\n");
+  dmaerr("      GCFG[%08x]: %08x\n", SAM_DMAC_GCFG, regs->gcfg);
+  dmaerr("        EN[%08x]: %08x\n", SAM_DMAC_EN, regs->en);
+  dmaerr("      SREQ[%08x]: %08x\n", SAM_DMAC_SREQ, regs->sreq);
+  dmaerr("      CREQ[%08x]: %08x\n", SAM_DMAC_CREQ, regs->creq);
+  dmaerr("      LAST[%08x]: %08x\n", SAM_DMAC_LAST, regs->last);
+  dmaerr("    EBCIMR[%08x]: %08x\n", SAM_DMAC_EBCIMR, regs->ebcimr);
+  dmaerr("      CHSR[%08x]: %08x\n", SAM_DMAC_CHSR, regs->chsr);
+  dmaerr("  DMA Channel Registers:\n");
+  dmaerr("     SADDR[%08x]: %08x\n", dmach->base + SAM_DMACHAN_SADDR_OFFSET, regs->saddr);
+  dmaerr("     DADDR[%08x]: %08x\n", dmach->base + SAM_DMACHAN_DADDR_OFFSET, regs->daddr);
+  dmaerr("      DSCR[%08x]: %08x\n", dmach->base + SAM_DMACHAN_DSCR_OFFSET, regs->dscr);
+  dmaerr("     CTRLA[%08x]: %08x\n", dmach->base + SAM_DMACHAN_CTRLA_OFFSET, regs->ctrla);
+  dmaerr("     CTRLB[%08x]: %08x\n", dmach->base + SAM_DMACHAN_CTRLB_OFFSET, regs->ctrlb);
+  dmaerr("       CFG[%08x]: %08x\n", dmach->base + SAM_DMACHAN_CFG_OFFSET, regs->cfg);
 }
 #endif /* CONFIG_DEBUG_DMA */
 #endif /* CONFIG_SAM34_DMAC0 */
diff --git a/arch/arm/src/sam34/sam_hsmci.c b/arch/arm/src/sam34/sam_hsmci.c
index 7b36cac7fb..f07fdf5be3 100644
--- a/arch/arm/src/sam34/sam_hsmci.c
+++ b/arch/arm/src/sam34/sam_hsmci.c
@@ -831,38 +831,38 @@ static void sam_hsmcisample(struct sam_hsmciregs_s *regs)
 #if defined(CONFIG_SAM34_HSMCI_XFRDEBUG) || defined(CONFIG_SAM34_HSMCI_CMDDEBUG)
 static void sam_hsmcidump(struct sam_hsmciregs_s *regs, const char *msg)
 {
-  fdbg("HSMCI Registers: %s\n", msg);
-  fdbg("     MR[%08x]: %08x\n", SAM_HSMCI_MR,       regs->mr);
-  fdbg("   DTOR[%08x]: %08x\n", SAM_HSMCI_DTOR,     regs->dtor);
-  fdbg("   SDCR[%08x]: %08x\n", SAM_HSMCI_SDCR,     regs->sdcr);
-  fdbg("   ARGR[%08x]: %08x\n", SAM_HSMCI_ARGR,     regs->argr);
-  fdbg("   BLKR[%08x]: %08x\n", SAM_HSMCI_BLKR,     regs->blkr);
-  fdbg("  CSTOR[%08x]: %08x\n", SAM_HSMCI_CSTOR,    regs->cstor);
-  fdbg("  RSPR0[%08x]: %08x\n", SAM_HSMCI_RSPR0,    regs->rsp0);
-  fdbg("  RSPR1[%08x]: %08x\n", SAM_HSMCI_RSPR1,    regs->rsp1);
-  fdbg("  RSPR2[%08x]: %08x\n", SAM_HSMCI_RSPR2,    regs->rsp2);
-  fdbg("  RSPR3[%08x]: %08x\n", SAM_HSMCI_RSPR3,    regs->rsp3);
-  fdbg("     SR[%08x]: %08x\n", SAM_HSMCI_SR,       regs->sr);
-  fdbg("    IMR[%08x]: %08x\n", SAM_HSMCI_IMR,      regs->imr);
+  ferr("HSMCI Registers: %s\n", msg);
+  ferr("     MR[%08x]: %08x\n", SAM_HSMCI_MR,       regs->mr);
+  ferr("   DTOR[%08x]: %08x\n", SAM_HSMCI_DTOR,     regs->dtor);
+  ferr("   SDCR[%08x]: %08x\n", SAM_HSMCI_SDCR,     regs->sdcr);
+  ferr("   ARGR[%08x]: %08x\n", SAM_HSMCI_ARGR,     regs->argr);
+  ferr("   BLKR[%08x]: %08x\n", SAM_HSMCI_BLKR,     regs->blkr);
+  ferr("  CSTOR[%08x]: %08x\n", SAM_HSMCI_CSTOR,    regs->cstor);
+  ferr("  RSPR0[%08x]: %08x\n", SAM_HSMCI_RSPR0,    regs->rsp0);
+  ferr("  RSPR1[%08x]: %08x\n", SAM_HSMCI_RSPR1,    regs->rsp1);
+  ferr("  RSPR2[%08x]: %08x\n", SAM_HSMCI_RSPR2,    regs->rsp2);
+  ferr("  RSPR3[%08x]: %08x\n", SAM_HSMCI_RSPR3,    regs->rsp3);
+  ferr("     SR[%08x]: %08x\n", SAM_HSMCI_SR,       regs->sr);
+  ferr("    IMR[%08x]: %08x\n", SAM_HSMCI_IMR,      regs->imr);
 #if defined(CONFIG_ARCH_CHIP_SAM3U)
-  fdbg("    DMA[%08x]: %08x\n", SAM_HSMCI_DMA,      regs->dma);
+  ferr("    DMA[%08x]: %08x\n", SAM_HSMCI_DMA,      regs->dma);
 #endif
-  fdbg("    CFG[%08x]: %08x\n", SAM_HSMCI_CFG,      regs->cfg);
-  fdbg("   WPMR[%08x]: %08x\n", SAM_HSMCI_WPMR,     regs->wpmr);
-  fdbg("   WPSR[%08x]: %08x\n", SAM_HSMCI_WPSR,     regs->wpsr);
+  ferr("    CFG[%08x]: %08x\n", SAM_HSMCI_CFG,      regs->cfg);
+  ferr("   WPMR[%08x]: %08x\n", SAM_HSMCI_WPMR,     regs->wpmr);
+  ferr("   WPSR[%08x]: %08x\n", SAM_HSMCI_WPSR,     regs->wpsr);
 
 #ifdef CONFIG_SAM34_PDCA
-  fdbg("HSMCI PDC Registers:\n");
-  fdbg("    RPR[%08x]: %08x\n", SAM_HSMCI_PDC_RPR,  regs->pdc_rpr);
-  fdbg("    RCR[%08x]: %08x\n", SAM_HSMCI_PDC_RCR,  regs->pdc_rcr);
-  fdbg("    TPR[%08x]: %08x\n", SAM_HSMCI_PDC_TPR,  regs->pdc_tpr);
-  fdbg("    TCR[%08x]: %08x\n", SAM_HSMCI_PDC_TCR,  regs->pdc_tcr);
-  fdbg("   RNPR[%08x]: %08x\n", SAM_HSMCI_PDC_RNPR, regs->pdc_rnpr);
-  fdbg("   RNCR[%08x]: %08x\n", SAM_HSMCI_PDC_RNCR, regs->pdc_rncr);
-  fdbg("   TNPR[%08x]: %08x\n", SAM_HSMCI_PDC_TNPR, regs->pdc_tnpr);
-  fdbg("   TNCR[%08x]: %08x\n", SAM_HSMCI_PDC_TNCR, regs->pdc_tncr);
-//fdbg("    TCR[%08x]: %08x\n", SAM_HSMCI_PDC_PTCR, regs->pdc_ptcr);
-  fdbg("   PTSR[%08x]: %08x\n", SAM_HSMCI_PDC_PTSR, regs->pdc_ptsr);
+  ferr("HSMCI PDC Registers:\n");
+  ferr("    RPR[%08x]: %08x\n", SAM_HSMCI_PDC_RPR,  regs->pdc_rpr);
+  ferr("    RCR[%08x]: %08x\n", SAM_HSMCI_PDC_RCR,  regs->pdc_rcr);
+  ferr("    TPR[%08x]: %08x\n", SAM_HSMCI_PDC_TPR,  regs->pdc_tpr);
+  ferr("    TCR[%08x]: %08x\n", SAM_HSMCI_PDC_TCR,  regs->pdc_tcr);
+  ferr("   RNPR[%08x]: %08x\n", SAM_HSMCI_PDC_RNPR, regs->pdc_rnpr);
+  ferr("   RNCR[%08x]: %08x\n", SAM_HSMCI_PDC_RNCR, regs->pdc_rncr);
+  ferr("   TNPR[%08x]: %08x\n", SAM_HSMCI_PDC_TNPR, regs->pdc_tnpr);
+  ferr("   TNCR[%08x]: %08x\n", SAM_HSMCI_PDC_TNCR, regs->pdc_tncr);
+//ferr("    TCR[%08x]: %08x\n", SAM_HSMCI_PDC_PTCR, regs->pdc_ptcr);
+  ferr("   PTSR[%08x]: %08x\n", SAM_HSMCI_PDC_PTSR, regs->pdc_ptsr);
 #endif
 }
 #endif
@@ -1933,7 +1933,7 @@ static int sam_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
             {
               /* Yes.. Was the error some kind of timeout? */
 
-              fdbg("ERROR: cmd: %08x events: %08x SR: %08x\n",
+              ferr("ERROR: cmd: %08x events: %08x SR: %08x\n",
                    cmd, priv->cmdrmask, sr);
 
               if ((pending & HSMCI_RESPONSE_TIMEOUT_ERRORS) != 0)
@@ -1963,7 +1963,7 @@ static int sam_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
        }
       else if (--timeout <= 0)
         {
-          fdbg("ERROR: Timeout cmd: %08x events: %08x SR: %08x\n",
+          ferr("ERROR: Timeout cmd: %08x events: %08x SR: %08x\n",
                cmd, priv->cmdrmask, sr);
 
           priv->wkupevent = SDIOWAIT_TIMEOUT;
@@ -2038,7 +2038,7 @@ static int sam_recvshort(FAR struct sdio_dev_s *dev,
 #ifdef CONFIG_DEBUG_FEATURES
   if (!rshort)
     {
-      fdbg("ERROR: rshort=NULL\n");
+      ferr("ERROR: rshort=NULL\n");
       ret = -EINVAL;
     }
 
@@ -2050,7 +2050,7 @@ static int sam_recvshort(FAR struct sdio_dev_s *dev,
            (cmd & MMCSD_RESPONSE_MASK) != MMCSD_R3_RESPONSE &&
            (cmd & MMCSD_RESPONSE_MASK) != MMCSD_R7_RESPONSE)
     {
-      fdbg("ERROR: Wrong response CMD=%08x\n", cmd);
+      ferr("ERROR: Wrong response CMD=%08x\n", cmd);
       ret = -EINVAL;
     }
   else
@@ -2100,7 +2100,7 @@ static int sam_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlong
 
   if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R2_RESPONSE)
     {
-      fdbg("ERROR: Wrong response CMD=%08x\n", cmd);
+      ferr("ERROR: Wrong response CMD=%08x\n", cmd);
       ret = -EINVAL;
     }
   else
@@ -2282,7 +2282,7 @@ static sdio_eventset_t sam_eventwait(FAR struct sdio_dev_s *dev,
                        1, (uint32_t)priv);
       if (ret != OK)
         {
-          fdbg("ERROR: wd_start failed: %d\n", ret);
+          ferr("ERROR: wd_start failed: %d\n", ret);
         }
     }
 
@@ -2472,7 +2472,7 @@ static int sam_dmarecvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer,
 
 #ifdef CONFIG_SAM34_PDCA
   modifyreg32(SAM_HSMCI_MR, 0, HSMCI_MR_PDCMODE);
-  fdbg("SAM_HSMCI_MR = 0x%08X\n", getreg32(SAM_HSMCI_MR));
+  ferr("SAM_HSMCI_MR = 0x%08X\n", getreg32(SAM_HSMCI_MR));
   putreg32((uint32_t)buffer, SAM_HSMCI_PDC_RPR);
   putreg32(buflen/4, SAM_HSMCI_PDC_RCR);
   putreg32(PDC_PTCR_RXTEN, SAM_HSMCI_PDC_PTCR);
@@ -2541,7 +2541,7 @@ static int sam_dmasendsetup(FAR struct sdio_dev_s *dev,
 
 #ifdef CONFIG_SAM34_PDCA
   modifyreg32(SAM_HSMCI_MR, 0, HSMCI_MR_PDCMODE);
-  fdbg("SAM_HSMCI_MR = 0x%08X\n", getreg32(SAM_HSMCI_MR));
+  ferr("SAM_HSMCI_MR = 0x%08X\n", getreg32(SAM_HSMCI_MR));
   putreg32((uint32_t)buffer, SAM_HSMCI_PDC_TPR);
   putreg32(buflen/4, SAM_HSMCI_PDC_TCR);
   putreg32(PDC_PTCR_TXTEN, SAM_HSMCI_PDC_PTCR);
@@ -2663,7 +2663,7 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno)
 
   struct sam_dev_s *priv = &g_sdiodev;
 
-  fdbg("slotno: %d\n", slotno);
+  ferr("slotno: %d\n", slotno);
 
   /* Initialize the HSMCI slot structure */
 
diff --git a/arch/arm/src/sam34/sam_irq.c b/arch/arm/src/sam34/sam_irq.c
index d1a1de2407..3eee00dbdc 100644
--- a/arch/arm/src/sam34/sam_irq.c
+++ b/arch/arm/src/sam34/sam_irq.c
@@ -161,7 +161,7 @@ static void sam_dumpnvic(const char *msg, int irq)
 #endif
 
 /****************************************************************************
- * Name: sam_nmi, sam_busfault, sam_usagefault, sam_pendsv, sam_dbgmonitor,
+ * Name: sam_nmi, sam_busfault, sam_usagefault, sam_pendsv, sam_errmonitor,
  *       sam_pendsv, sam_reserved
  *
  * Description:
@@ -175,7 +175,7 @@ static void sam_dumpnvic(const char *msg, int irq)
 static int sam_nmi(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! NMI received\n");
+  err("PANIC!!! NMI received\n");
   PANIC();
   return 0;
 }
@@ -183,7 +183,7 @@ static int sam_nmi(int irq, FAR void *context)
 static int sam_busfault(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS));
+  err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS));
   PANIC();
   return 0;
 }
@@ -191,7 +191,7 @@ static int sam_busfault(int irq, FAR void *context)
 static int sam_usagefault(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS));
+  err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS));
   PANIC();
   return 0;
 }
@@ -199,15 +199,15 @@ static int sam_usagefault(int irq, FAR void *context)
 static int sam_pendsv(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! PendSV received\n");
+  err("PANIC!!! PendSV received\n");
   PANIC();
   return 0;
 }
 
-static int sam_dbgmonitor(int irq, FAR void *context)
+static int sam_errmonitor(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Debug Monitor received\n");
+  err("PANIC!!! Debug Monitor received\n");
   PANIC();
   return 0;
 }
@@ -215,7 +215,7 @@ static int sam_dbgmonitor(int irq, FAR void *context)
 static int sam_reserved(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Reserved interrupt\n");
+  err("PANIC!!! Reserved interrupt\n");
   PANIC();
   return 0;
 }
@@ -464,7 +464,7 @@ void up_irqinitialize(void)
   irq_attach(SAM_IRQ_BUSFAULT, sam_busfault);
   irq_attach(SAM_IRQ_USAGEFAULT, sam_usagefault);
   irq_attach(SAM_IRQ_PENDSV, sam_pendsv);
-  irq_attach(SAM_IRQ_DBGMONITOR, sam_dbgmonitor);
+  irq_attach(SAM_IRQ_DBGMONITOR, sam_errmonitor);
   irq_attach(SAM_IRQ_RESERVED, sam_reserved);
 #endif
 
diff --git a/arch/arm/src/sam34/sam_rtc.c b/arch/arm/src/sam34/sam_rtc.c
index 39a9c7b111..698a9df295 100644
--- a/arch/arm/src/sam34/sam_rtc.c
+++ b/arch/arm/src/sam34/sam_rtc.c
@@ -89,12 +89,12 @@
 /* Debug ****************************************************************************/
 
 #ifdef CONFIG_DEBUG_RTC
-#  define rtcdbg    dbg
+#  define rtcerr    err
 #  define rtcinfo   info
 #  define rtcllerr  llerr
 #  define rtcllinfo llinfo
 #else
-#  define rtcdbg(x...)
+#  define rtcerr(x...)
 #  define rtcinfo(x...)
 #  define rtcllerr(x...)
 #  define rtcllinfo(x...)
diff --git a/arch/arm/src/sam34/sam_rtt.c b/arch/arm/src/sam34/sam_rtt.c
index f5f8b7e822..e2972e00ba 100644
--- a/arch/arm/src/sam34/sam_rtt.c
+++ b/arch/arm/src/sam34/sam_rtt.c
@@ -81,10 +81,10 @@
  */
 
 #ifdef CONFIG_DEBUG_RTT
-#  define rttdbg    llerr
+#  define rtterr    llerr
 #  define rttinfo   llinfo
 #else
-#  define rttdbg(x...)
+#  define rtterr(x...)
 #  define rttinfo(x...)
 #endif
 
@@ -537,7 +537,7 @@ static int sam34_settimeout(FAR struct timer_lowerhalf_s *lower,
 
   if (timeout < 1 || timeout > RTT_MAXTIMEOUT)
     {
-      rttdbg("Cannot represent timeout=%lu > %lu\n",
+      rtterr("Cannot represent timeout=%lu > %lu\n",
             timeout, RTT_MAXTIMEOUT);
       return -ERANGE;
     }
diff --git a/arch/arm/src/sam34/sam_spi.c b/arch/arm/src/sam34/sam_spi.c
index 80c2b3dc2c..04860eb4bf 100644
--- a/arch/arm/src/sam34/sam_spi.c
+++ b/arch/arm/src/sam34/sam_spi.c
@@ -148,14 +148,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg llerr
+#  define spierr llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -1076,7 +1076,7 @@ static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency)
   spics->frequency = frequency;
   spics->actual    = actual;
 
-  spidbg("Frequency %d->%d\n", frequency, actual);
+  spierr("Frequency %d->%d\n", frequency, actual);
   return actual;
 }
 
@@ -1543,7 +1543,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
   ret = sam_dmarxsetup(spics->rxdma, regaddr, memaddr, nwords);
   if (ret < 0)
     {
-      dmadbg("ERROR: sam_dmarxsetup failed: %d\n", ret);
+      dmaerr("ERROR: sam_dmarxsetup failed: %d\n", ret);
       return;
     }
 
@@ -1557,7 +1557,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
   ret = sam_dmatxsetup(spics->txdma, regaddr, memaddr, nwords);
   if (ret < 0)
     {
-      dmadbg("ERROR: sam_dmatxsetup failed: %d\n", ret);
+      dmaerr("ERROR: sam_dmatxsetup failed: %d\n", ret);
       return;
     }
 
@@ -1569,7 +1569,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
   ret = sam_dmastart(spics->rxdma, spi_rxcallback, (void *)spics);
   if (ret < 0)
     {
-      dmadbg("ERROR: RX sam_dmastart failed: %d\n", ret);
+      dmaerr("ERROR: RX sam_dmastart failed: %d\n", ret);
       return;
     }
 
@@ -1578,7 +1578,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
   ret = sam_dmastart(spics->txdma, spi_txcallback, (void *)spics);
   if (ret < 0)
     {
-      dmadbg("ERROR: RX sam_dmastart failed: %d\n", ret);
+      dmaerr("ERROR: RX sam_dmastart failed: %d\n", ret);
       sam_dmastop(spics->rxdma);
       return;
     }
@@ -1600,7 +1600,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
                      (wdentry_t)spi_dmatimeout, 1, (uint32_t)spics);
       if (ret != OK)
         {
-           spidbg("ERROR: wd_start failed: %d\n", ret);
+           spierr("ERROR: wd_start failed: %d\n", ret);
         }
 
       /* Wait for the DMA complete */
@@ -1651,7 +1651,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
 
   if (spics->result)
     {
-      spidbg("ERROR: DMA failed with result: %d\n", spics->result);
+      spierr("ERROR: DMA failed with result: %d\n", spics->result);
     }
 }
 #endif /* CONFIG_SAM34_SPI_DMA */
@@ -1764,7 +1764,7 @@ struct spi_dev_s *sam_spibus_initialize(int port)
   spics = (struct sam_spics_s *)zalloc(sizeof(struct sam_spics_s));
   if (!spics)
     {
-      spidbg("ERROR: Failed to allocate a chip select structure\n");
+      spierr("ERROR: Failed to allocate a chip select structure\n");
       return NULL;
     }
 
@@ -1787,7 +1787,7 @@ struct spi_dev_s *sam_spibus_initialize(int port)
       spics->rxdma = sam_dmachannel(0);
       if (!spics->rxdma)
         {
-          spidbg("ERROR: Failed to allocate the RX DMA channel\n");
+          spierr("ERROR: Failed to allocate the RX DMA channel\n");
           spics->candma = false;
         }
     }
@@ -1797,7 +1797,7 @@ struct spi_dev_s *sam_spibus_initialize(int port)
       spics->txdma = sam_dmachannel(0);
       if (!spics->txdma)
         {
-          spidbg("ERROR: Failed to allocate the TX DMA channel\n");
+          spierr("ERROR: Failed to allocate the TX DMA channel\n");
           sam_dmafree(spics->rxdma);
           spics->rxdma  = NULL;
           spics->candma = false;
diff --git a/arch/arm/src/sam34/sam_tc.c b/arch/arm/src/sam34/sam_tc.c
index f16894f788..d18da143a3 100644
--- a/arch/arm/src/sam34/sam_tc.c
+++ b/arch/arm/src/sam34/sam_tc.c
@@ -79,10 +79,10 @@
  */
 
 #ifdef CONFIG_DEBUG_TIMER
-#  define tcdbg    llerr
+#  define tcerr    llerr
 #  define tcinfo   llinfo
 #else
-#  define tcdbg(x...)
+#  define tcerr(x...)
 #  define tcinfo(x...)
 #endif
 
@@ -486,7 +486,7 @@ static int sam34_settimeout(FAR struct timer_lowerhalf_s *lower,
 
   if (timeout < 1 || timeout > TC_MAXTIMEOUT)
     {
-      tcdbg("Cannot represent timeout=%lu > %lu\n",
+      tcerr("Cannot represent timeout=%lu > %lu\n",
             timeout, TC_MAXTIMEOUT);
       return -ERANGE;
     }
diff --git a/arch/arm/src/sam34/sam_twi.c b/arch/arm/src/sam34/sam_twi.c
index 6a720f181c..dcf324770b 100644
--- a/arch/arm/src/sam34/sam_twi.c
+++ b/arch/arm/src/sam34/sam_twi.c
@@ -99,12 +99,12 @@
 /* CONFIG_DEBUG_I2C + CONFIG_DEBUG_FEATURES enables general I2C debug output. */
 
 #ifdef CONFIG_DEBUG_I2C
-#  define i2cdbg    dbg
+#  define i2cerr    err
 #  define i2cinfo   info
 #  define i2cllerr  llerr
 #  define i2cllinfo llinfo
 #else
-#  define i2cdbg(x...)
+#  define i2cerr(x...)
 #  define i2cinfo(x...)
 #  define i2cllerr(x...)
 #  define i2cllinfo(x...)
@@ -742,7 +742,7 @@ static int twi_transfer(FAR struct i2c_master_s *dev,
   ret = twi_wait(priv);
   if (ret < 0)
     {
-      i2cdbg("ERROR: Transfer failed: %d\n", ret);
+      i2cerr("ERROR: Transfer failed: %d\n", ret);
     }
 
   leave_critical_section(flags);
@@ -985,7 +985,7 @@ struct i2c_master_s *sam_i2cbus_initialize(int bus)
 #endif
     {
       leave_critical_section(flags);
-      i2cdbg("ERROR: Unsupported bus: TWI%d\n", bus);
+      i2cerr("ERROR: Unsupported bus: TWI%d\n", bus);
       return NULL;
     }
 
diff --git a/arch/arm/src/sam34/sam_wdt.c b/arch/arm/src/sam34/sam_wdt.c
index 37ae65e5bf..8fc5abf70c 100644
--- a/arch/arm/src/sam34/sam_wdt.c
+++ b/arch/arm/src/sam34/sam_wdt.c
@@ -88,10 +88,10 @@
  */
 
 #ifdef CONFIG_DEBUG_WATCHDOG
-#  define wddbg    llerr
+#  define wderr    llerr
 #  define wdinfo   llinfo
 #else
-#  define wddbg(x...)
+#  define wderr(x...)
 #  define wdinfo(x...)
 #endif
 
@@ -477,7 +477,7 @@ static int sam34_settimeout(FAR struct watchdog_lowerhalf_s *lower,
 
   if (timeout < 1 || timeout > WDT_MAXTIMEOUT)
     {
-      wddbg("Cannot represent timeout=%d > %d\n",
+      wderr("Cannot represent timeout=%d > %d\n",
             timeout, WDT_MAXTIMEOUT);
       return -ERANGE;
     }
diff --git a/arch/arm/src/sama5/sam_adc.c b/arch/arm/src/sama5/sam_adc.c
index e92091db05..35bb4ea9fe 100644
--- a/arch/arm/src/sama5/sam_adc.c
+++ b/arch/arm/src/sama5/sam_adc.c
@@ -1285,7 +1285,7 @@ static int sam_adc_settimer(struct sam_adc_s *priv, uint32_t frequency,
   ret = sam_tc_divisor(frequency, &div, &tcclks);
   if (ret < 0)
     {
-      adbg("ERROR: sam_tc_divisor failed: %d\n", ret);
+      aerr("ERROR: sam_tc_divisor failed: %d\n", ret);
       return ret;
     }
 
@@ -1304,7 +1304,7 @@ static int sam_adc_settimer(struct sam_adc_s *priv, uint32_t frequency,
   priv->tc = sam_tc_allocate(channel, mode);
   if (!priv->tc)
     {
-      adbg("ERROR: Failed to allocate channel %d mode %08x\n", channel, mode);
+      aerr("ERROR: Failed to allocate channel %d mode %08x\n", channel, mode);
       return -EINVAL;
     }
 
@@ -1436,7 +1436,7 @@ static int sam_adc_trigger(struct sam_adc_s *priv)
 #endif
   if (ret < 0)
     {
-      adbg("ERROR: sam_adc_settimer failed: %d\n", ret);
+      aerr("ERROR: sam_adc_settimer failed: %d\n", ret);
       return ret;
     }
 
@@ -2056,7 +2056,7 @@ struct adc_dev_s *sam_adc_initialize(void)
         }
       else
         {
-          adbg("ERROR: Cannot realize ADC input frequency\n");
+          aerr("ERROR: Cannot realize ADC input frequency\n");
           return NULL;
         }
 
@@ -2108,7 +2108,7 @@ struct adc_dev_s *sam_adc_initialize(void)
       ret = irq_attach(SAM_IRQ_ADC, sam_adc_interrupt);
       if (ret < 0)
         {
-          adbg("ERROR: Failed to attach IRQ %d: %d\n", SAM_IRQ_ADC, ret);
+          aerr("ERROR: Failed to attach IRQ %d: %d\n", SAM_IRQ_ADC, ret);
           return NULL;
         }
 
diff --git a/arch/arm/src/sama5/sam_can.c b/arch/arm/src/sama5/sam_can.c
index bda4b8b4dc..d563f8d0f3 100644
--- a/arch/arm/src/sama5/sam_can.c
+++ b/arch/arm/src/sama5/sam_can.c
@@ -127,12 +127,12 @@
 /* Non-standard debug that may be enabled just for testing CAN */
 
 #ifdef CONFIG_DEBUG_CAN
-#  define candbg    dbg
+#  define canerr    err
 #  define caninfo   info
 #  define canllerr  llerr
 #  define canllinfo llinfo
 #else
-#  define candbg(x...)
+#  define canerr(x...)
 #  define caninfo(x...)
 #  define canllerr(x...)
 #  define canllinfo(x...)
@@ -722,7 +722,7 @@ static int can_recvsetup(FAR struct sam_can_s *priv)
       mbndx = can_mballoc(priv);
       if (mbndx < 0)
         {
-          candbg("ERROR: Failed to allocate mailbox %d: %d\n", mbno, mbndx);
+          canerr("ERROR: Failed to allocate mailbox %d: %d\n", mbno, mbndx);
           return mbndx;
         }
 
@@ -1119,7 +1119,7 @@ static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg)
   mbndx = can_mballoc(priv);
   if (mbndx < 0)
     {
-      candbg("ERROR: CAN%d failed to allocate a mailbox: %d\n",
+      canerr("ERROR: CAN%d failed to allocate a mailbox: %d\n",
              priv->config->port, mbndx);
       return mbndx;
     }
@@ -1708,7 +1708,7 @@ static int can_bittiming(struct sam_can_s *priv)
     {
       /* The BRP field must be within the range 1 - 0x7f */
 
-      candbg("CAN%d: baud %d too high\n", config->port, config->baud);
+      canerr("CAN%d: baud %d too high\n", config->port, config->baud);
       return -EINVAL;
     }
 
@@ -1756,7 +1756,7 @@ static int can_bittiming(struct sam_can_s *priv)
 
   if ((propag + phase1 + phase2) != (uint32_t)(tq - 4))
     {
-      candbg("CAN%d: Could not realize baud %d\n", config->port, config->baud);
+      canerr("CAN%d: Could not realize baud %d\n", config->port, config->baud);
       return -EINVAL;
     }
 
@@ -1890,7 +1890,7 @@ static int can_hwinitialize(struct sam_can_s *priv)
     }
   else
     {
-      candbg("ERROR: Cannot realize CAN input frequency\n");
+      canerr("ERROR: Cannot realize CAN input frequency\n");
       return -EINVAL;
     }
 
@@ -1912,7 +1912,7 @@ static int can_hwinitialize(struct sam_can_s *priv)
   ret = can_bittiming(priv);
   if (ret < 0)
     {
-      candbg("ERROR: Failed to set bit timing: %d\n", ret);
+      canerr("ERROR: Failed to set bit timing: %d\n", ret);
       return ret;
     }
 
@@ -1922,7 +1922,7 @@ static int can_hwinitialize(struct sam_can_s *priv)
   ret = can_autobaud(priv);
   if (ret < 0)
     {
-      candbg("ERROR: can_autobaud failed: %d\n", ret);
+      canerr("ERROR: can_autobaud failed: %d\n", ret);
       return ret;
     }
 #endif
@@ -1999,7 +1999,7 @@ FAR struct can_dev_s *sam_caninitialize(int port)
   else
 #endif
     {
-      candbg("ERROR: Unsupported port %d\n", port);
+      canerr("ERROR: Unsupported port %d\n", port);
       return NULL;
     }
 
diff --git a/arch/arm/src/sama5/sam_dmac.c b/arch/arm/src/sama5/sam_dmac.c
index 794cac2373..db6bad2ce6 100644
--- a/arch/arm/src/sama5/sam_dmac.c
+++ b/arch/arm/src/sama5/sam_dmac.c
@@ -657,7 +657,7 @@ static uint8_t sam_channel(uint8_t pid, const struct sam_pidmap_s *table,
         }
     }
 
-  dmadbg("No channel found for pid %d\n", pid);
+  dmaerr("No channel found for pid %d\n", pid);
   DEBUGPANIC();
   return 0x3f;
 }
@@ -2002,7 +2002,7 @@ DMA_HANDLE sam_dmachannel(uint8_t dmacno, uint32_t chflags)
 #endif
 
     {
-      dmadbg("ERROR: Bad DMAC number: %d\n", dmacno);
+      dmaerr("ERROR: Bad DMAC number: %d\n", dmacno);
       DEBUGPANIC();
       return (DMA_HANDLE)NULL;
     }
@@ -2051,7 +2051,7 @@ DMA_HANDLE sam_dmachannel(uint8_t dmacno, uint32_t chflags)
     }
   else
     {
-      dmadbg("ERROR: Failed allocate DMAC%d channel\n", (int)dmacno);
+      dmaerr("ERROR: Failed allocate DMAC%d channel\n", (int)dmacno);
     }
 
   return (DMA_HANDLE)dmach;
@@ -2414,27 +2414,27 @@ void sam_dmadump(DMA_HANDLE handle, const struct sam_dmaregs_s *regs,
   struct sam_dmach_s *dmach = (struct sam_dmach_s *)handle;
   struct sam_dmac_s *dmac = sam_controller(dmach);
 
-  dmadbg("%s\n", msg);
-  dmadbg("  DMA Global Registers:\n");
-  dmadbg("      GCFG[%08x]: %08x\n", dmac->base + SAM_DMAC_GCFG_OFFSET, regs->gcfg);
-  dmadbg("        EN[%08x]: %08x\n", dmac->base + SAM_DMAC_EN_OFFSET, regs->en);
-  dmadbg("      SREQ[%08x]: %08x\n", dmac->base + SAM_DMAC_SREQ_OFFSET, regs->sreq);
-  dmadbg("      CREQ[%08x]: %08x\n", dmac->base + SAM_DMAC_CREQ_OFFSET, regs->creq);
-  dmadbg("      LAST[%08x]: %08x\n", dmac->base + SAM_DMAC_LAST_OFFSET, regs->last);
-  dmadbg("    EBCIMR[%08x]: %08x\n", dmac->base + SAM_DMAC_EBCIMR_OFFSET, regs->ebcimr);
-  dmadbg("    EBCISR[%08x]: %08x\n", dmac->base + SAM_DMAC_EBCISR_OFFSET, regs->ebcisr);
-  dmadbg("      CHSR[%08x]: %08x\n", dmac->base + SAM_DMAC_CHSR_OFFSET, regs->chsr);
-  dmadbg("      WPMR[%08x]: %08x\n", dmac->base + SAM_DMAC_WPMR_OFFSET, regs->wpmr);
-  dmadbg("      WPSR[%08x]: %08x\n", dmac->base + SAM_DMAC_WPSR_OFFSET, regs->wpsr);
-  dmadbg("  DMA Channel Registers:\n");
-  dmadbg("     SADDR[%08x]: %08x\n", dmach->base + SAM_DMAC_CH_SADDR_OFFSET, regs->saddr);
-  dmadbg("     DADDR[%08x]: %08x\n", dmach->base + SAM_DMAC_CH_DADDR_OFFSET, regs->daddr);
-  dmadbg("      DSCR[%08x]: %08x\n", dmach->base + SAM_DMAC_CH_DSCR_OFFSET, regs->dscr);
-  dmadbg("     CTRLA[%08x]: %08x\n", dmach->base + SAM_DMAC_CH_CTRLA_OFFSET, regs->ctrla);
-  dmadbg("     CTRLB[%08x]: %08x\n", dmach->base + SAM_DMAC_CH_CTRLB_OFFSET, regs->ctrlb);
-  dmadbg("       CFG[%08x]: %08x\n", dmach->base + SAM_DMAC_CH_CFG_OFFSET, regs->cfg);
-  dmadbg("      SPIP[%08x]: %08x\n", dmach->base + SAM_DMAC_CH_SPIP_OFFSET, regs->spip);
-  dmadbg("      DPIP[%08x]: %08x\n", dmach->base + SAM_DMAC_CH_DPIP_OFFSET, regs->dpip);
+  dmaerr("%s\n", msg);
+  dmaerr("  DMA Global Registers:\n");
+  dmaerr("      GCFG[%08x]: %08x\n", dmac->base + SAM_DMAC_GCFG_OFFSET, regs->gcfg);
+  dmaerr("        EN[%08x]: %08x\n", dmac->base + SAM_DMAC_EN_OFFSET, regs->en);
+  dmaerr("      SREQ[%08x]: %08x\n", dmac->base + SAM_DMAC_SREQ_OFFSET, regs->sreq);
+  dmaerr("      CREQ[%08x]: %08x\n", dmac->base + SAM_DMAC_CREQ_OFFSET, regs->creq);
+  dmaerr("      LAST[%08x]: %08x\n", dmac->base + SAM_DMAC_LAST_OFFSET, regs->last);
+  dmaerr("    EBCIMR[%08x]: %08x\n", dmac->base + SAM_DMAC_EBCIMR_OFFSET, regs->ebcimr);
+  dmaerr("    EBCISR[%08x]: %08x\n", dmac->base + SAM_DMAC_EBCISR_OFFSET, regs->ebcisr);
+  dmaerr("      CHSR[%08x]: %08x\n", dmac->base + SAM_DMAC_CHSR_OFFSET, regs->chsr);
+  dmaerr("      WPMR[%08x]: %08x\n", dmac->base + SAM_DMAC_WPMR_OFFSET, regs->wpmr);
+  dmaerr("      WPSR[%08x]: %08x\n", dmac->base + SAM_DMAC_WPSR_OFFSET, regs->wpsr);
+  dmaerr("  DMA Channel Registers:\n");
+  dmaerr("     SADDR[%08x]: %08x\n", dmach->base + SAM_DMAC_CH_SADDR_OFFSET, regs->saddr);
+  dmaerr("     DADDR[%08x]: %08x\n", dmach->base + SAM_DMAC_CH_DADDR_OFFSET, regs->daddr);
+  dmaerr("      DSCR[%08x]: %08x\n", dmach->base + SAM_DMAC_CH_DSCR_OFFSET, regs->dscr);
+  dmaerr("     CTRLA[%08x]: %08x\n", dmach->base + SAM_DMAC_CH_CTRLA_OFFSET, regs->ctrla);
+  dmaerr("     CTRLB[%08x]: %08x\n", dmach->base + SAM_DMAC_CH_CTRLB_OFFSET, regs->ctrlb);
+  dmaerr("       CFG[%08x]: %08x\n", dmach->base + SAM_DMAC_CH_CFG_OFFSET, regs->cfg);
+  dmaerr("      SPIP[%08x]: %08x\n", dmach->base + SAM_DMAC_CH_SPIP_OFFSET, regs->spip);
+  dmaerr("      DPIP[%08x]: %08x\n", dmach->base + SAM_DMAC_CH_DPIP_OFFSET, regs->dpip);
 }
 #endif /* CONFIG_DEBUG_DMA */
 #endif /* CONFIG_SAMA5_DMAC0 || CONFIG_SAMA5_DMAC1 */
diff --git a/arch/arm/src/sama5/sam_ehci.c b/arch/arm/src/sama5/sam_ehci.c
index 7773652fc3..9dc19e57ab 100644
--- a/arch/arm/src/sama5/sam_ehci.c
+++ b/arch/arm/src/sama5/sam_ehci.c
@@ -1275,11 +1275,11 @@ static int sam_qh_flush(struct sam_qh_s *qh)
 #ifdef CONFIG_SAMA5_EHCI_REGDEBUG
 static void sam_qtd_print(struct sam_qtd_s *qtd)
 {
-  udbg("  QTD[%p]:\n", qtd);
-  udbg("    hw:\n");
-  udbg("      nqp: %08x alt: %08x token: %08x\n",
+  uerr("  QTD[%p]:\n", qtd);
+  uerr("    hw:\n");
+  uerr("      nqp: %08x alt: %08x token: %08x\n",
        qtd->hw.nqp, qtd->hw.alt, qtd->hw.token);
-  udbg("      bpl: %08x %08x %08x %08x %08x\n",
+  uerr("      bpl: %08x %08x %08x %08x %08x\n",
        qtd->hw.bpl[0], qtd->hw.bpl[1], qtd->hw.bpl[2],
        qtd->hw.bpl[3], qtd->hw.bpl[4]);
 }
@@ -1299,29 +1299,29 @@ static void sam_qh_print(struct sam_qh_s *qh)
   struct sam_epinfo_s *epinfo;
   struct ehci_overlay_s *overlay;
 
-  udbg("QH[%p]:\n", qh);
-  udbg("  hw:\n");
-  udbg("    hlp: %08x epchar: %08x epcaps: %08x cqp: %08x\n",
+  uerr("QH[%p]:\n", qh);
+  uerr("  hw:\n");
+  uerr("    hlp: %08x epchar: %08x epcaps: %08x cqp: %08x\n",
        qh->hw.hlp, qh->hw.epchar, qh->hw.epcaps, qh->hw.cqp);
 
   overlay = &qh->hw.overlay;
-  udbg("  overlay:\n");
-  udbg("    nqp: %08x alt: %08x token: %08x\n",
+  uerr("  overlay:\n");
+  uerr("    nqp: %08x alt: %08x token: %08x\n",
        overlay->nqp, overlay->alt, overlay->token);
-  udbg("    bpl: %08x %08x %08x %08x %08x\n",
+  uerr("    bpl: %08x %08x %08x %08x %08x\n",
        overlay->bpl[0], overlay->bpl[1], overlay->bpl[2],
        overlay->bpl[3], overlay->bpl[4]);
 
-  udbg("  fqp:\n", qh->fqp);
+  uerr("  fqp:\n", qh->fqp);
 
   epinfo = qh->epinfo;
-  udbg("  epinfo[%p]:\n", epinfo);
+  uerr("  epinfo[%p]:\n", epinfo);
   if (epinfo)
     {
-      udbg("    EP%d DIR=%s FA=%08x TYPE=%d MaxPacket=%d\n",
+      uerr("    EP%d DIR=%s FA=%08x TYPE=%d MaxPacket=%d\n",
            epinfo->epno, epinfo->dirin ? "IN" : "OUT", epinfo->devaddr,
            epinfo->xfrtype, epinfo->maxpacket);
-      udbg("    Toggle=%d iocwait=%d speed=%d result=%d\n",
+      uerr("    Toggle=%d iocwait=%d speed=%d result=%d\n",
            epinfo->toggle, epinfo->iocwait, epinfo->speed, epinfo->result);
     }
 }
@@ -4042,7 +4042,7 @@ static int sam_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
   ret = sam_async_setup(rhport, ep0info, req, buffer, len);
   if (ret < 0)
     {
-      udbg("ERROR: sam_async_setup failed: %d\n", ret);
+      uerr("ERROR: sam_async_setup failed: %d\n", ret);
       goto errout_with_iocwait;
     }
 
@@ -4160,7 +4160,7 @@ static ssize_t sam_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep,
 
   if (ret < 0)
     {
-      udbg("ERROR: Transfer setup failed: %d\n", ret);
+      uerr("ERROR: Transfer setup failed: %d\n", ret);
       goto errout_with_iocwait;
     }
 
diff --git a/arch/arm/src/sama5/sam_emaca.c b/arch/arm/src/sama5/sam_emaca.c
index 5f263b8b69..86d0b5ffa1 100644
--- a/arch/arm/src/sama5/sam_emaca.c
+++ b/arch/arm/src/sama5/sam_emaca.c
@@ -2996,7 +2996,7 @@ static int sam_phyinit(struct sam_emac_s *priv)
   mck = BOARD_MCK_FREQUENCY;
   if (mck > (160*1000*1000))
     {
-      ndbg("ERROR: Cannot realize PHY clock\n");
+      nerr("ERROR: Cannot realize PHY clock\n");
       return -EINVAL;
     }
   else if (mck > (80*1000*1000))
@@ -3501,7 +3501,7 @@ int sam_emac_initialize(void)
   priv->txpoll = wd_create();
   if (!priv->txpoll)
     {
-      ndbg("ERROR: Failed to create periodic poll timer\n");
+      nerr("ERROR: Failed to create periodic poll timer\n");
       ret = -EAGAIN;
       goto errout;
     }
@@ -3509,7 +3509,7 @@ int sam_emac_initialize(void)
   priv->txtimeout = wd_create();         /* Create TX timeout timer */
   if (!priv->txtimeout)
     {
-      ndbg("ERROR: Failed to create periodic poll timer\n");
+      nerr("ERROR: Failed to create periodic poll timer\n");
       ret = -EAGAIN;
       goto errout_with_txpoll;
     }
@@ -3523,7 +3523,7 @@ int sam_emac_initialize(void)
   ret = sam_buffer_initialize(priv);
   if (ret < 0)
     {
-      ndbg("ERROR: sam_buffer_initialize failed: %d\n", ret);
+      nerr("ERROR: sam_buffer_initialize failed: %d\n", ret);
       goto errout_with_txtimeout;
     }
 
@@ -3534,7 +3534,7 @@ int sam_emac_initialize(void)
   ret = irq_attach(SAM_IRQ_EMAC, sam_emac_interrupt);
   if (ret < 0)
     {
-      ndbg("ERROR: Failed to attach the handler to the IRQ%d\n", SAM_IRQ_EMAC);
+      nerr("ERROR: Failed to attach the handler to the IRQ%d\n", SAM_IRQ_EMAC);
       goto errout_with_buffers;
     }
 
@@ -3547,7 +3547,7 @@ int sam_emac_initialize(void)
   ret = sam_ifdown(&priv->dev);
   if (ret < 0)
     {
-      ndbg("ERROR: Failed to put the interface in the down state: %d\n", ret);
+      nerr("ERROR: Failed to put the interface in the down state: %d\n", ret);
       goto errout_with_buffers;
     }
 
@@ -3559,7 +3559,7 @@ int sam_emac_initialize(void)
       return ret;
     }
 
-  ndbg("ERROR: netdev_register() failed: %d\n", ret);
+  nerr("ERROR: netdev_register() failed: %d\n", ret);
 
 errout_with_buffers:
   sam_buffer_free(priv);
diff --git a/arch/arm/src/sama5/sam_emacb.c b/arch/arm/src/sama5/sam_emacb.c
index 5452e8d0f8..f36722abb8 100644
--- a/arch/arm/src/sama5/sam_emacb.c
+++ b/arch/arm/src/sama5/sam_emacb.c
@@ -2377,12 +2377,12 @@ static int sam_ifup(struct net_driver_s *dev)
   int ret;
 
 #ifdef CONFIG_NET_IPv4
-  ndbg("Bringing up: %d.%d.%d.%d\n",
+  nerr("Bringing up: %d.%d.%d.%d\n",
        dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
        (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 #endif
 #ifdef CONFIG_NET_IPv6
-  ndbg("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
+  nerr("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
        dev->d_ipv6addr[0], dev->d_ipv6addr[1], dev->d_ipv6addr[2],
        dev->d_ipv6addr[3], dev->d_ipv6addr[4], dev->d_ipv6addr[5],
        dev->d_ipv6addr[6], dev->d_ipv6addr[7]);
@@ -3198,7 +3198,7 @@ static int sam_phyintenable(struct sam_emac_s *priv)
   else
 #endif
     {
-      ndbg("ERROR: Unsupported PHY type: %d\n", priv->phytype);
+      nerr("ERROR: Unsupported PHY type: %d\n", priv->phytype);
       ret = -ENOSYS;
     }
 
@@ -3869,7 +3869,7 @@ static int sam_phyinit(struct sam_emac_s *priv)
   mck = BOARD_MCK_FREQUENCY;
   if (mck > (160*1000*1000))
     {
-      ndbg("ERROR: Cannot realize PHY clock\n");
+      nerr("ERROR: Cannot realize PHY clock\n");
       return -EINVAL;
     }
   else if (mck > (80*1000*1000))
@@ -4545,7 +4545,7 @@ int sam_emac_initialize(int intf)
   else
 #endif
     {
-      ndbg("ERROR:  Interface %d not supported\n", intf);
+      nerr("ERROR:  Interface %d not supported\n", intf);
       return -EINVAL;
     }
 
@@ -4574,7 +4574,7 @@ int sam_emac_initialize(int intf)
   priv->txpoll = wd_create();
   if (!priv->txpoll)
     {
-      ndbg("ERROR: Failed to create periodic poll timer\n");
+      nerr("ERROR: Failed to create periodic poll timer\n");
       ret = -EAGAIN;
       goto errout;
     }
@@ -4582,7 +4582,7 @@ int sam_emac_initialize(int intf)
   priv->txtimeout = wd_create();     /* Create TX timeout timer */
   if (!priv->txtimeout)
     {
-      ndbg("ERROR: Failed to create periodic poll timer\n");
+      nerr("ERROR: Failed to create periodic poll timer\n");
       ret = -EAGAIN;
       goto errout_with_txpoll;
     }
@@ -4596,7 +4596,7 @@ int sam_emac_initialize(int intf)
   ret = sam_buffer_initialize(priv);
   if (ret < 0)
     {
-      ndbg("ERROR: sam_buffer_initialize failed: %d\n", ret);
+      nerr("ERROR: sam_buffer_initialize failed: %d\n", ret);
       goto errout_with_txtimeout;
     }
 
@@ -4607,7 +4607,7 @@ int sam_emac_initialize(int intf)
   ret = irq_attach(priv->attr->irq, priv->attr->handler);
   if (ret < 0)
     {
-      ndbg("ERROR: Failed to attach the handler to the IRQ%d\n", priv->attr->irq);
+      nerr("ERROR: Failed to attach the handler to the IRQ%d\n", priv->attr->irq);
       goto errout_with_buffers;
     }
 
@@ -4620,7 +4620,7 @@ int sam_emac_initialize(int intf)
   ret = sam_ifdown(&priv->dev);
   if (ret < 0)
     {
-      ndbg("ERROR: Failed to put the interface in the down state: %d\n", ret);
+      nerr("ERROR: Failed to put the interface in the down state: %d\n", ret);
       goto errout_with_buffers;
     }
 
@@ -4632,7 +4632,7 @@ int sam_emac_initialize(int intf)
       return ret;
     }
 
-  ndbg("ERROR: netdev_register() failed: %d\n", ret);
+  nerr("ERROR: netdev_register() failed: %d\n", ret);
 
 errout_with_buffers:
   sam_buffer_free(priv);
diff --git a/arch/arm/src/sama5/sam_freerun.c b/arch/arm/src/sama5/sam_freerun.c
index 0828660151..dfc5f7a62b 100644
--- a/arch/arm/src/sama5/sam_freerun.c
+++ b/arch/arm/src/sama5/sam_freerun.c
@@ -150,7 +150,7 @@ int sam_freerun_initialize(struct sam_freerun_s *freerun, int chan,
   ret = sam_tc_divisor(frequency, &divisor, &cmr);
   if (ret < 0)
     {
-      tcdbg("ERROR: sam_tc_divisor failed: %d\n", ret);
+      tcerr("ERROR: sam_tc_divisor failed: %d\n", ret);
       return ret;
     }
 
@@ -189,7 +189,7 @@ int sam_freerun_initialize(struct sam_freerun_s *freerun, int chan,
   freerun->tch = sam_tc_allocate(chan, cmr);
   if (!freerun->tch)
     {
-      tcdbg("ERROR: Failed to allocate timer channel %d\n", chan);
+      tcerr("ERROR: Failed to allocate timer channel %d\n", chan);
       return -EBUSY;
     }
 
diff --git a/arch/arm/src/sama5/sam_hsmci.c b/arch/arm/src/sama5/sam_hsmci.c
index b33eaa9c6a..5bb44bec4d 100644
--- a/arch/arm/src/sama5/sam_hsmci.c
+++ b/arch/arm/src/sama5/sam_hsmci.c
@@ -1003,23 +1003,23 @@ static void sam_hsmcisample(struct sam_dev_s *priv,
 static void sam_hsmcidump(struct sam_dev_s *priv,
                           struct sam_hsmciregs_s *regs, const char *msg)
 {
-  fdbg("HSMCI Registers: %s\n", msg);
-  fdbg("      MR[%08x]: %08x\n", priv->base + SAM_HSMCI_MR_OFFSET,    regs->mr);
-  fdbg("    DTOR[%08x]: %08x\n", priv->base + SAM_HSMCI_DTOR_OFFSET,  regs->dtor);
-  fdbg("    SDCR[%08x]: %08x\n", priv->base + SAM_HSMCI_SDCR_OFFSET,  regs->sdcr);
-  fdbg("    ARGR[%08x]: %08x\n", priv->base + SAM_HSMCI_ARGR_OFFSET,  regs->argr);
-  fdbg("    BLKR[%08x]: %08x\n", priv->base + SAM_HSMCI_BLKR_OFFSET,  regs->blkr);
-  fdbg("   CSTOR[%08x]: %08x\n", priv->base + SAM_HSMCI_CSTOR_OFFSET, regs->cstor);
-  fdbg("   RSPR0[%08x]: %08x\n", priv->base + SAM_HSMCI_RSPR0_OFFSET, regs->rsp0);
-  fdbg("   RSPR1[%08x]: %08x\n", priv->base + SAM_HSMCI_RSPR1_OFFSET, regs->rsp1);
-  fdbg("   RSPR2[%08x]: %08x\n", priv->base + SAM_HSMCI_RSPR2_OFFSET, regs->rsp2);
-  fdbg("   RSPR3[%08x]: %08x\n", priv->base + SAM_HSMCI_RSPR3_OFFSET, regs->rsp3);
-  fdbg("      SR[%08x]: %08x\n", priv->base + SAM_HSMCI_SR_OFFSET,    regs->sr);
-  fdbg("     IMR[%08x]: %08x\n", priv->base + SAM_HSMCI_IMR_OFFSET,   regs->imr);
-  fdbg("     DMA[%08x]: %08x\n", priv->base + SAM_HSMCI_DMA_OFFSET,   regs->dma);
-  fdbg("     CFG[%08x]: %08x\n", priv->base + SAM_HSMCI_CFG_OFFSET,   regs->cfg);
-  fdbg("    WPMR[%08x]: %08x\n", priv->base + SAM_HSMCI_WPMR_OFFSET,  regs->wpmr);
-  fdbg("    WPSR[%08x]: %08x\n", priv->base + SAM_HSMCI_WPSR_OFFSET,  regs->wpsr);
+  ferr("HSMCI Registers: %s\n", msg);
+  ferr("      MR[%08x]: %08x\n", priv->base + SAM_HSMCI_MR_OFFSET,    regs->mr);
+  ferr("    DTOR[%08x]: %08x\n", priv->base + SAM_HSMCI_DTOR_OFFSET,  regs->dtor);
+  ferr("    SDCR[%08x]: %08x\n", priv->base + SAM_HSMCI_SDCR_OFFSET,  regs->sdcr);
+  ferr("    ARGR[%08x]: %08x\n", priv->base + SAM_HSMCI_ARGR_OFFSET,  regs->argr);
+  ferr("    BLKR[%08x]: %08x\n", priv->base + SAM_HSMCI_BLKR_OFFSET,  regs->blkr);
+  ferr("   CSTOR[%08x]: %08x\n", priv->base + SAM_HSMCI_CSTOR_OFFSET, regs->cstor);
+  ferr("   RSPR0[%08x]: %08x\n", priv->base + SAM_HSMCI_RSPR0_OFFSET, regs->rsp0);
+  ferr("   RSPR1[%08x]: %08x\n", priv->base + SAM_HSMCI_RSPR1_OFFSET, regs->rsp1);
+  ferr("   RSPR2[%08x]: %08x\n", priv->base + SAM_HSMCI_RSPR2_OFFSET, regs->rsp2);
+  ferr("   RSPR3[%08x]: %08x\n", priv->base + SAM_HSMCI_RSPR3_OFFSET, regs->rsp3);
+  ferr("      SR[%08x]: %08x\n", priv->base + SAM_HSMCI_SR_OFFSET,    regs->sr);
+  ferr("     IMR[%08x]: %08x\n", priv->base + SAM_HSMCI_IMR_OFFSET,   regs->imr);
+  ferr("     DMA[%08x]: %08x\n", priv->base + SAM_HSMCI_DMA_OFFSET,   regs->dma);
+  ferr("     CFG[%08x]: %08x\n", priv->base + SAM_HSMCI_CFG_OFFSET,   regs->cfg);
+  ferr("    WPMR[%08x]: %08x\n", priv->base + SAM_HSMCI_WPMR_OFFSET,  regs->wpmr);
+  ferr("    WPSR[%08x]: %08x\n", priv->base + SAM_HSMCI_WPSR_OFFSET,  regs->wpsr);
 }
 #endif
 
@@ -1093,7 +1093,7 @@ static void sam_xfrdumpone(struct sam_dev_s *priv, int index,
     }
   else
     {
-      fdbg("%s: Not collected\n", msg);
+      ferr("%s: Not collected\n", msg);
     }
 }
 #endif
@@ -2253,7 +2253,7 @@ static int sam_sendsetup(FAR struct sdio_dev_s *dev, FAR const uint8_t *buffer,
         {
           /* Some fatal error has occurred */
 
-          fdbg("ERROR: sr %08x\n", sr);
+          ferr("ERROR: sr %08x\n", sr);
           return -EIO;
         }
       else if ((sr & HSMCI_INT_TXRDY) != 0)
@@ -2388,7 +2388,7 @@ static int sam_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
             {
               /* Yes.. Was the error some kind of timeout? */
 
-              fdbg("ERROR: cmd: %08x events: %08x SR: %08x\n",
+              ferr("ERROR: cmd: %08x events: %08x SR: %08x\n",
                    cmd, priv->cmdrmask, sr);
 
               if ((pending & HSMCI_RESPONSE_TIMEOUT_ERRORS) != 0)
@@ -2418,7 +2418,7 @@ static int sam_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
        }
       else if (--timeout <= 0)
         {
-          fdbg("ERROR: Timeout cmd: %08x events: %08x SR: %08x\n",
+          ferr("ERROR: Timeout cmd: %08x events: %08x SR: %08x\n",
                cmd, priv->cmdrmask, sr);
 
           priv->wkupevent = SDIOWAIT_TIMEOUT;
@@ -2493,7 +2493,7 @@ static int sam_recvshort(FAR struct sdio_dev_s *dev,
 #ifdef CONFIG_DEBUG_FEATURES
   if (!rshort)
     {
-      fdbg("ERROR: rshort=NULL\n");
+      ferr("ERROR: rshort=NULL\n");
       ret = -EINVAL;
     }
 
@@ -2505,7 +2505,7 @@ static int sam_recvshort(FAR struct sdio_dev_s *dev,
            (cmd & MMCSD_RESPONSE_MASK) != MMCSD_R3_RESPONSE &&
            (cmd & MMCSD_RESPONSE_MASK) != MMCSD_R7_RESPONSE)
     {
-      fdbg("ERROR: Wrong response CMD=%08x\n", cmd);
+      ferr("ERROR: Wrong response CMD=%08x\n", cmd);
       ret = -EINVAL;
     }
   else
@@ -2555,7 +2555,7 @@ static int sam_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlong
 
   if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R2_RESPONSE)
     {
-      fdbg("ERROR: Wrong response CMD=%08x\n", cmd);
+      ferr("ERROR: Wrong response CMD=%08x\n", cmd);
       ret = -EINVAL;
     }
   else
@@ -2746,7 +2746,7 @@ static sdio_eventset_t sam_eventwait(FAR struct sdio_dev_s *dev,
                        1, (uint32_t)priv);
       if (ret != OK)
         {
-           fdbg("ERROR: wd_start failed: %d\n", ret);
+           ferr("ERROR: wd_start failed: %d\n", ret);
         }
     }
 
@@ -3150,7 +3150,7 @@ static void sam_callback(void *arg)
         {
           /* NOTE: Currently, work_cancel only returns success */
 
-          fdbg("ERROR: Failed to cancel work: %d\n", ret);
+          ferr("ERROR: Failed to cancel work: %d\n", ret);
         }
 
       fllinfo("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg);
@@ -3160,7 +3160,7 @@ static void sam_callback(void *arg)
         {
           /* NOTE: Currently, work_queue only returns success */
 
-          fdbg("ERROR: Failed to schedule work: %d\n", ret);
+          ferr("ERROR: Failed to schedule work: %d\n", ret);
         }
     }
 
@@ -3199,7 +3199,7 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno)
    * for now, an* HSMCI peripheral does correspond to a slot.
    */
 
-  fdbg("slotno: %d\n", slotno);
+  ferr("slotno: %d\n", slotno);
 
 #ifdef CONFIG_SAMA5_HSMCI0
   if (slotno == 0)
diff --git a/arch/arm/src/sama5/sam_lcd.c b/arch/arm/src/sama5/sam_lcd.c
index fe5b77b568..b1a0fd9760 100644
--- a/arch/arm/src/sama5/sam_lcd.c
+++ b/arch/arm/src/sama5/sam_lcd.c
@@ -1108,7 +1108,7 @@ static int sam_base_getvideoinfo(struct fb_vtable_s *vtable,
       return OK;
     }
 
-  gdbg("ERROR: Returning EINVAL\n");
+  gerr("ERROR: Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -1130,7 +1130,7 @@ static int sam_base_getplaneinfo(struct fb_vtable_s *vtable, int planeno,
       return OK;
     }
 
-  gdbg("Returning EINVAL\n");
+  gerr("Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -1186,7 +1186,7 @@ static int sam_hcr_getcursor(struct fb_vtable_s *vtable,
       return OK;
     }
 
-  gdbg("Returning EINVAL\n");
+  gerr("Returning EINVAL\n");
   return -EINVAL;
 }
 #endif
@@ -1226,7 +1226,7 @@ static int sam_hcr_setcursor(struct fb_vtable_s *vtable,
       return OK;
     }
 
-  gdbg("Returning EINVAL\n");
+  gerr("Returning EINVAL\n");
   return -EINVAL;
 }
 #endif
@@ -1391,7 +1391,7 @@ static int sam_setclut(struct sam_layer_s *layer,
 
   if (offset >= SAM_LCDC_NCLUT)
     {
-      gdbg("ERROR: CLUT offset is out of range: %d\n", offset);
+      gerr("ERROR: CLUT offset is out of range: %d\n", offset);
       return -EINVAL;
     }
 
diff --git a/arch/arm/src/sama5/sam_memories.c b/arch/arm/src/sama5/sam_memories.c
index 231545ed55..d6b18aa792 100644
--- a/arch/arm/src/sama5/sam_memories.c
+++ b/arch/arm/src/sama5/sam_memories.c
@@ -766,7 +766,7 @@ uintptr_t sam_physregaddr(uintptr_t virtregaddr)
    * address
    */
 
-  dbg("Bad virtual address: %08lx\n", virtregaddr);
+  err("Bad virtual address: %08lx\n", virtregaddr);
   DEBUGPANIC();
   return virtregaddr;
 }
@@ -925,7 +925,7 @@ uintptr_t sam_physramaddr(uintptr_t virtramaddr)
 
   if (virtramaddr != 0)
     {
-      dbg("Bad virtual address: %08lx\n", virtramaddr);
+      err("Bad virtual address: %08lx\n", virtramaddr);
       DEBUGPANIC();
     }
 
@@ -1058,7 +1058,7 @@ uintptr_t sam_virtramaddr(uintptr_t physramaddr)
 
   if (physramaddr != 0)
     {
-      dbg("Bad physical address: %08lx\n|", physramaddr);
+      err("Bad physical address: %08lx\n|", physramaddr);
       DEBUGPANIC();
     }
 
diff --git a/arch/arm/src/sama5/sam_nand.c b/arch/arm/src/sama5/sam_nand.c
index bb8b63645a..425120b8d3 100644
--- a/arch/arm/src/sama5/sam_nand.c
+++ b/arch/arm/src/sama5/sam_nand.c
@@ -1325,7 +1325,7 @@ static int nand_dma_read(struct sam_nandcs_s *priv,
   ret = sam_dmarxsetup(priv->dma, psrc, pdest, nbytes);
   if (ret < 0)
     {
-      fdbg("ERROR: sam_dmarxsetup failed: %d\n", ret);
+      ferr("ERROR: sam_dmarxsetup failed: %d\n", ret);
       return ret;
     }
 
@@ -1344,7 +1344,7 @@ static int nand_dma_read(struct sam_nandcs_s *priv,
   ret = nand_wait_dma(priv);
   if (ret < 0)
     {
-      fdbg("ERROR: DMA failed: %d\n", ret);
+      ferr("ERROR: DMA failed: %d\n", ret);
     }
 
   nand_dma_sample(priv, DMA_END_TRANSFER);
@@ -1410,7 +1410,7 @@ static int nand_dma_write(struct sam_nandcs_s *priv,
   ret = sam_dmatxsetup(priv->dma, pdest, psrc, nbytes);
   if (ret < 0)
     {
-      fdbg("ERROR: sam_dmatxsetup failed: %d\n", ret);
+      ferr("ERROR: sam_dmatxsetup failed: %d\n", ret);
       return ret;
     }
 
@@ -1429,7 +1429,7 @@ static int nand_dma_write(struct sam_nandcs_s *priv,
   ret = nand_wait_dma(priv);
   if (ret < 0)
     {
-      fdbg("ERROR: DMA failed: %d\n", ret);
+      ferr("ERROR: DMA failed: %d\n", ret);
     }
 
   nand_dma_sample(priv, DMA_END_TRANSFER);
@@ -1655,7 +1655,7 @@ static int nand_read_pmecc(struct sam_nandcs_s *priv, off_t block,
       break;
 
     default:
-      fdbg("ERROR:  Unsupported page size: %d\n", pagesize);
+      ferr("ERROR:  Unsupported page size: %d\n", pagesize);
       return -EINVAL;
     }
 
@@ -1719,7 +1719,7 @@ static int nand_read_pmecc(struct sam_nandcs_s *priv, off_t block,
 #endif
   if (ret < 0)
     {
-      fdbg("ERROR: nand_read for data region failed: %d\n", ret);
+      ferr("ERROR: nand_read for data region failed: %d\n", ret);
       return ret;
     }
 
@@ -1732,7 +1732,7 @@ static int nand_read_pmecc(struct sam_nandcs_s *priv, off_t block,
 #endif
   if (ret < 0)
     {
-      fdbg("ERROR: nand_read for spare region failed: %d\n", ret);
+      ferr("ERROR: nand_read for spare region failed: %d\n", ret);
       return ret;
     }
 
@@ -1957,7 +1957,7 @@ static int nand_readpage_noecc(struct sam_nandcs_s *priv, off_t block,
       break;
 
     default:
-      fdbg("ERROR:  Unsupported page size: %d\n", pagesize);
+      ferr("ERROR:  Unsupported page size: %d\n", pagesize);
       return -EINVAL;
     }
 
@@ -1987,7 +1987,7 @@ static int nand_readpage_noecc(struct sam_nandcs_s *priv, off_t block,
       ret = nand_nfcsram_read(priv, (uint8_t *)data, pagesize, 0);
       if (ret < 0)
         {
-          fdbg("ERROR: nand_nfcsram_read for data region failed: %d\n", ret);
+          ferr("ERROR: nand_nfcsram_read for data region failed: %d\n", ret);
           return ret;
         }
     }
@@ -2003,7 +2003,7 @@ static int nand_readpage_noecc(struct sam_nandcs_s *priv, off_t block,
       ret = nand_nfcsram_read(priv, (uint8_t *)spare, sparesize, offset);
       if (ret < 0)
         {
-          fdbg("ERROR: nand_nfcsram_read for spare region failed: %d\n", ret);
+          ferr("ERROR: nand_nfcsram_read for spare region failed: %d\n", ret);
           return ret;
         }
     }
@@ -2049,7 +2049,7 @@ static int nand_readpage_pmecc(struct sam_nandcs_s *priv, off_t block,
   ret = pmecc_configure(priv, false);
   if (ret < 0)
     {
-      fdbg("ERROR: pmecc_configure failed: %d\n", ret);
+      ferr("ERROR: pmecc_configure failed: %d\n", ret);
       goto errout;
     }
 
@@ -2060,7 +2060,7 @@ static int nand_readpage_pmecc(struct sam_nandcs_s *priv, off_t block,
   ret = nand_read_pmecc(priv, block, page, data);
   if (ret < 0)
     {
-      fdbg("ERROR: Block %d page %d Failed to read page\n",
+      ferr("ERROR: Block %d page %d Failed to read page\n",
            block, page, ret);
       goto errout;
     }
@@ -2076,7 +2076,7 @@ static int nand_readpage_pmecc(struct sam_nandcs_s *priv, off_t block,
       ret = nand_readpage_noecc(priv, block, page, NULL, priv->raw.spare);
       if (ret < 0)
         {
-          fdbg("ERROR: Block %d page %d Failed to re-read spare area: %d\n",
+          ferr("ERROR: Block %d page %d Failed to re-read spare area: %d\n",
                block, page, ret);
           goto errout;
         }
@@ -2098,13 +2098,13 @@ static int nand_readpage_pmecc(struct sam_nandcs_s *priv, off_t block,
         {
           /* Yes.. clear sector errors */
 
-          fdbg("Block=%d page=%d has been erased: %08x\n",
+          ferr("Block=%d page=%d has been erased: %08x\n",
                block, page, regval);
           regval = 0;
         }
       else
         {
-          fdbg("ERROR: block=%d page=%d Corrupted sectors: %08x\n",
+          ferr("ERROR: block=%d page=%d Corrupted sectors: %08x\n",
                block, page, regval);
         }
     }
@@ -2114,7 +2114,7 @@ static int nand_readpage_pmecc(struct sam_nandcs_s *priv, off_t block,
   ret = pmecc_correction(regval, (uintptr_t)data);
   if (ret < 0)
     {
-      fdbg("ERROR: block=%d page=%d Unrecoverable data error: %d\n",
+      ferr("ERROR: block=%d page=%d Unrecoverable data error: %d\n",
            block, page, ret);
     }
 
@@ -2191,7 +2191,7 @@ static int nand_writepage_noecc(struct sam_nandcs_s *priv, off_t block,
       break;
 
     default:
-      fdbg("ERROR:  Unsupported page size: %d\n", pagesize);
+      ferr("ERROR:  Unsupported page size: %d\n", pagesize);
       return -EINVAL;
     }
 
@@ -2220,7 +2220,7 @@ static int nand_writepage_noecc(struct sam_nandcs_s *priv, off_t block,
       ret = nand_nfcsram_write(priv, (uint8_t *)data, pagesize, 0);
       if (ret < 0)
         {
-          fdbg("ERROR: nand_nfcsram_write for data region failed: %d\n", ret);
+          ferr("ERROR: nand_nfcsram_write for data region failed: %d\n", ret);
           return ret;
         }
 
@@ -2229,7 +2229,7 @@ static int nand_writepage_noecc(struct sam_nandcs_s *priv, off_t block,
           ret = nand_nfcsram_write(priv, (uint8_t *)spare, sparesize, pagesize);
           if (ret < 0)
             {
-              fdbg("ERROR: nand_nfcsram_write for data region failed: %d\n", ret);
+              ferr("ERROR: nand_nfcsram_write for data region failed: %d\n", ret);
               return ret;
             }
         }
@@ -2257,7 +2257,7 @@ static int nand_writepage_noecc(struct sam_nandcs_s *priv, off_t block,
       ret = nand_operation_complete(priv);
       if (ret < 0)
         {
-          fdbg("ERROR: Failed writing data area: %d\n", ret);
+          ferr("ERROR: Failed writing data area: %d\n", ret);
         }
     }
 
@@ -2272,7 +2272,7 @@ static int nand_writepage_noecc(struct sam_nandcs_s *priv, off_t block,
       ret = nand_write(priv, (uint8_t *)spare, sparesize, 0);
       if (ret < 0)
         {
-          fdbg("ERROR: nand_write for spare region failed: %d\n", ret);
+          ferr("ERROR: nand_write for spare region failed: %d\n", ret);
           ret = -EPERM;
         }
 
@@ -2331,7 +2331,7 @@ static int nand_writepage_pmecc(struct sam_nandcs_s *priv, off_t block,
   ret = pmecc_configure(priv, false);
   if (ret < 0)
     {
-      fdbg("ERROR: pmecc_configure failed: %d\n", ret);
+      ferr("ERROR: pmecc_configure failed: %d\n", ret);
       goto errout;
     }
 
@@ -2352,7 +2352,7 @@ static int nand_writepage_pmecc(struct sam_nandcs_s *priv, off_t block,
   ret = nand_nfcsram_write(priv, (uint8_t *)data, pagesize, 0);
   if (ret < 0)
     {
-      fdbg("ERROR: Block %d page %d nand_nfcsram_write for data region failed: %d\n",
+      ferr("ERROR: Block %d page %d nand_nfcsram_write for data region failed: %d\n",
            block, page, ret);
       goto errout;
     }
@@ -2417,7 +2417,7 @@ static int nand_writepage_pmecc(struct sam_nandcs_s *priv, off_t block,
   ret = nand_write(priv, (uint8_t *)data, pagesize, 0);
   if (ret < 0)
     {
-      fdbg("ERROR: Block %d page %d nand_write for data region failed: %d\n",
+      ferr("ERROR: Block %d page %d nand_write for data region failed: %d\n",
            block, page, ret);
       goto errout;
     }
@@ -2474,7 +2474,7 @@ static int nand_writepage_pmecc(struct sam_nandcs_s *priv, off_t block,
   ret = nand_write(priv, (uint8_t *)g_nand.ecctab, eccsize, 0);
   if (ret < 0)
     {
-      fdbg("ERROR: Block %d page %d nand_write for spare region failed: %d\n",
+      ferr("ERROR: Block %d page %d nand_write for spare region failed: %d\n",
            block, page, ret);
       goto errout;
     }
@@ -2487,7 +2487,7 @@ static int nand_writepage_pmecc(struct sam_nandcs_s *priv, off_t block,
   ret = nand_operation_complete(priv);
   if (ret < 0)
     {
-      fdbg("ERROR: Block %d page %d Failed writing data area: %d\n",
+      ferr("ERROR: Block %d page %d Failed writing data area: %d\n",
            block, page, ret);
     }
 
@@ -2536,7 +2536,7 @@ static inline int nand_tryeraseblock(struct sam_nandcs_s *priv, off_t block)
   ret = nand_operation_complete(priv);
   if (ret < 0)
     {
-      fdbg("ERROR: Block %d Could not erase: %d\n", block, ret);
+      ferr("ERROR: Block %d Could not erase: %d\n", block, ret);
     }
 
   return ret;
@@ -2572,7 +2572,7 @@ static int nand_eraseblock(struct nand_raw_s *raw, off_t block)
       retries--;
     }
 
-  fdbg("ERROR: Block %d Failed to erase after %d tries\n",
+  ferr("ERROR: Block %d Failed to erase after %d tries\n",
        (int)block, NAND_ERASE_NRETRIES);
 
   nand_unlock();
@@ -2923,7 +2923,7 @@ struct mtd_dev_s *sam_nand_initialize(int cs)
   else
 #endif
     {
-      fdbg("ERROR: CS%d unsupported or invalid\n", cs);
+      ferr("ERROR: CS%d unsupported or invalid\n", cs);
       return NULL;
     }
 
@@ -2983,7 +2983,7 @@ struct mtd_dev_s *sam_nand_initialize(int cs)
       ret = irq_attach(SAM_IRQ_HSMC, hsmc_interrupt);
       if (ret < 0)
         {
-          fdbg("Failed to attach HSMC IRQ (%d)", SAM_IRQ_HSMC);
+          ferr("Failed to attach HSMC IRQ (%d)", SAM_IRQ_HSMC);
           return NULL;
         }
 #endif
@@ -3013,7 +3013,7 @@ struct mtd_dev_s *sam_nand_initialize(int cs)
   ret = board_nandflash_config(cs);
   if (ret < 0)
     {
-      fdbg("ERROR: board_nandflash_config failed for CS%d: %d\n",
+      ferr("ERROR: board_nandflash_config failed for CS%d: %d\n",
            cs, ret);
       return NULL;
     }
@@ -3029,7 +3029,7 @@ struct mtd_dev_s *sam_nand_initialize(int cs)
   mtd = nand_initialize(&priv->raw);
   if (!mtd)
     {
-      fdbg("ERROR: CS%d nand_initialize failed %d\n", cs);
+      ferr("ERROR: CS%d nand_initialize failed %d\n", cs);
       return NULL;
     }
 
@@ -3043,7 +3043,7 @@ struct mtd_dev_s *sam_nand_initialize(int cs)
   priv->dma = sam_dmachannel(NAND_DMAC, 0);
   if (!priv->dma)
     {
-      fdbg("ERROR: Failed to allocate the DMA channel for CS%d\n", cs);
+      ferr("ERROR: Failed to allocate the DMA channel for CS%d\n", cs);
     }
 #endif
 
diff --git a/arch/arm/src/sama5/sam_ohci.c b/arch/arm/src/sama5/sam_ohci.c
index 1dd7dcb9eb..9996dd18f8 100644
--- a/arch/arm/src/sama5/sam_ohci.c
+++ b/arch/arm/src/sama5/sam_ohci.c
@@ -3342,7 +3342,7 @@ static ssize_t sam_transfer(struct usbhost_driver_s *drvr, usbhost_ep_t ep,
   ret = sam_transfer_common(rhport, eplist, buffer, buflen);
   if (ret < 0)
     {
-      udbg("ERROR: sam_transfer_common failed: %d\n", ret);
+      uerr("ERROR: sam_transfer_common failed: %d\n", ret);
       goto errout;
     }
 
@@ -3593,7 +3593,7 @@ static int sam_asynch(struct usbhost_driver_s *drvr, usbhost_ep_t ep,
   ret = sam_transfer_common(rhport, eplist, buffer, buflen);
   if (ret < 0)
     {
-      udbg("ERROR: sam_transfer_common failed: %d\n", ret);
+      uerr("ERROR: sam_transfer_common failed: %d\n", ret);
       goto errout;
     }
 
diff --git a/arch/arm/src/sama5/sam_oneshot.c b/arch/arm/src/sama5/sam_oneshot.c
index cb53ea11f7..62872ea4dd 100644
--- a/arch/arm/src/sama5/sam_oneshot.c
+++ b/arch/arm/src/sama5/sam_oneshot.c
@@ -177,7 +177,7 @@ int sam_oneshot_initialize(struct sam_oneshot_s *oneshot, int chan,
   ret = sam_tc_divisor(frequency, &divisor, &cmr);
   if (ret < 0)
     {
-      tcdbg("ERROR: sam_tc_divisor failed: %d\n", ret);
+      tcerr("ERROR: sam_tc_divisor failed: %d\n", ret);
       return ret;
     }
 
@@ -217,7 +217,7 @@ int sam_oneshot_initialize(struct sam_oneshot_s *oneshot, int chan,
   oneshot->tch = sam_tc_allocate(chan, cmr);
   if (!oneshot->tch)
     {
-      tcdbg("ERROR: Failed to allocate timer channel %d\n", chan);
+      tcerr("ERROR: Failed to allocate timer channel %d\n", chan);
       return -EBUSY;
     }
 
diff --git a/arch/arm/src/sama5/sam_pck.c b/arch/arm/src/sama5/sam_pck.c
index 11202c5d56..9b7e406a38 100644
--- a/arch/arm/src/sama5/sam_pck.c
+++ b/arch/arm/src/sama5/sam_pck.c
@@ -151,7 +151,7 @@ uint32_t sam_pck_configure(enum pckid_e pckid, enum pckid_clksrc_e clksrc,
       break;
 
     default:
-      dbg("ERROR: Unknown clock source\n");
+      err("ERROR: Unknown clock source\n");
       return 0;
     }
 
@@ -213,8 +213,8 @@ uint32_t sam_pck_configure(enum pckid_e pckid, enum pckid_clksrc_e clksrc,
     }
   else
     {
-      sdbg("ERROR: frequency cannot be realized.\n");
-      sdbg("       frequency=%lu clkin=%lu\n",
+      serr("ERROR: frequency cannot be realized.\n");
+      serr("       frequency=%lu clkin=%lu\n",
            (unsigned long)frequency, (unsigned long)clkin);
       return 0;
     }
diff --git a/arch/arm/src/sama5/sam_pmecc.c b/arch/arm/src/sama5/sam_pmecc.c
index c1f42478a3..d055d0b6b3 100644
--- a/arch/arm/src/sama5/sam_pmecc.c
+++ b/arch/arm/src/sama5/sam_pmecc.c
@@ -632,7 +632,7 @@ static uint32_t pmecc_errorcorrection(uintptr_t sectorbase,
 
           if (bytepos < sectorsz + nand_getreg(SAM_HSMC_PMECCSADDR))
             {
-              fdbg("Correct error bit @[Byte %d, Bit %d]\n",
+              ferr("Correct error bit @[Byte %d, Bit %d]\n",
                       (int)bytepos, (int)bitpos);
 
               if (*(uint8_t *)(sectorbase + bytepos) & (1 << bitpos))
@@ -870,7 +870,7 @@ static int pmecc_pagelayout(uint16_t datasize, uint16_t eccsize)
   bcherr512   = pmecc_bcherr512(nsectors512, eccsize);
   if (bcherr512 < 0)
     {
-      fdbg("WARNING: Cannot realize 512B sectors\n");
+      ferr("WARNING: Cannot realize 512B sectors\n");
     }
   else
     {
@@ -895,7 +895,7 @@ static int pmecc_pagelayout(uint16_t datasize, uint16_t eccsize)
 
   if (bcherr1k < 0)
     {
-      fdbg("WARNING: Cannot realize 1KB sectors\n");
+      ferr("WARNING: Cannot realize 1KB sectors\n");
     }
   else
     {
@@ -1059,7 +1059,7 @@ int pmecc_configure(struct sam_nandcs_s *priv, bool protected)
   ret = pmecc_pagelayout(priv->raw.model.pagesize, eccsize);
   if (ret < 0)
     {
-      fdbg("ERROR: pmecc_pagelayout failed: %d\n", ret);
+      ferr("ERROR: pmecc_pagelayout failed: %d\n", ret);
       return ret;
     }
 
@@ -1114,7 +1114,7 @@ int pmecc_configure(struct sam_nandcs_s *priv, bool protected)
           g_pmecc.desc.pagesize = HSMC_PMECCFG_PAGESIZE_8SEC;
           break;
       default:
-        fdbg("ERROR: Unsupported sectors per page: %d\n", sectorsperpage);
+        ferr("ERROR: Unsupported sectors per page: %d\n", sectorsperpage);
         return -EINVAL;
     }
 
@@ -1148,7 +1148,7 @@ int pmecc_configure(struct sam_nandcs_s *priv, bool protected)
 
   if (g_pmecc.desc.eccend > priv->raw.model.sparesize)
     {
-      fdbg("ERROR: No room for ECC in spare bytes %d > %d\n",
+      ferr("ERROR: No room for ECC in spare bytes %d > %d\n",
            g_pmecc.desc.eccend, priv->raw.model.sparesize);
 
       return -ENOSPC;
diff --git a/arch/arm/src/sama5/sam_pwm.c b/arch/arm/src/sama5/sam_pwm.c
index aacfc21f6c..ea53643377 100644
--- a/arch/arm/src/sama5/sam_pwm.c
+++ b/arch/arm/src/sama5/sam_pwm.c
@@ -401,7 +401,7 @@
 #endif
 
 #ifdef CONFIG_DEBUG_PWM
-#  define pwmdbg              dbg
+#  define pwmerr              err
 #  define pwmllerr            llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define pwminfo           info
@@ -411,7 +411,7 @@
 #    define pwmllinfo(x...)
 #  endif
 #else
-#  define pwmdbg(x...)
+#  define pwmerr(x...)
 #  define pwmllerr(x...)
 #  define pwminfo(x...)
 #  define pwmllinfo(x...)
@@ -1124,7 +1124,7 @@ static int pwm_start(FAR struct pwm_lowerhalf_s *dev,
 #endif
 
     default:
-      pwmdbg("ERROR: Invalid or unsupported clock source value: %d\n", chan->clksrc);
+      pwmerr("ERROR: Invalid or unsupported clock source value: %d\n", chan->clksrc);
       return -EINVAL;
     }
 
@@ -1336,7 +1336,7 @@ FAR struct pwm_lowerhalf_s *sam_pwminitialize(int channel)
 #endif
 
       default:
-        pwmdbg("ERROR: Channel invalid or not configured: %d\n", channel);
+        pwmerr("ERROR: Channel invalid or not configured: %d\n", channel);
         return NULL;
     }
 
@@ -1366,7 +1366,7 @@ FAR struct pwm_lowerhalf_s *sam_pwminitialize(int channel)
       ret = irq_attach(SAM_IRQ_PWM, pwm_interrupt);
       if (ret < 0)
         {
-          pwmdbg("ERROR: Failed to attach IRQ%d\n", channel);
+          pwmerr("ERROR: Failed to attach IRQ%d\n", channel);
           return NULL;
 
         }
diff --git a/arch/arm/src/sama5/sam_rtc.c b/arch/arm/src/sama5/sam_rtc.c
index d195cbc329..06fe78d4b1 100644
--- a/arch/arm/src/sama5/sam_rtc.c
+++ b/arch/arm/src/sama5/sam_rtc.c
@@ -86,12 +86,12 @@
 /* Debug ****************************************************************************/
 
 #ifdef CONFIG_DEBUG_RTC
-#  define rtcdbg    dbg
+#  define rtcerr    err
 #  define rtcinfo   info
 #  define rtcllerr  llerr
 #  define rtcllinfo llinfo
 #else
-#  define rtcdbg(x...)
+#  define rtcerr(x...)
 #  define rtcinfo(x...)
 #  define rtcllerr(x...)
 #  define rtcllinfo(x...)
diff --git a/arch/arm/src/sama5/sam_spi.c b/arch/arm/src/sama5/sam_spi.c
index e3cd70944d..920257f79f 100644
--- a/arch/arm/src/sama5/sam_spi.c
+++ b/arch/arm/src/sama5/sam_spi.c
@@ -141,14 +141,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg llerr
+#  define spierr llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -1065,7 +1065,7 @@ static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency)
   spics->frequency = frequency;
   spics->actual    = actual;
 
-  spidbg("Frequency %d->%d\n", frequency, actual);
+  spierr("Frequency %d->%d\n", frequency, actual);
   return actual;
 }
 
@@ -1476,7 +1476,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
   ret = sam_dmarxsetup(spics->rxdma, paddr, maddr, nwords);
   if (ret < 0)
     {
-      dmadbg("ERROR: sam_dmarxsetup failed: %d\n", ret);
+      dmaerr("ERROR: sam_dmarxsetup failed: %d\n", ret);
       return;
     }
 
@@ -1488,7 +1488,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
   ret = sam_dmatxsetup(spics->txdma, paddr, maddr, nwords);
   if (ret < 0)
     {
-      dmadbg("ERROR: sam_dmatxsetup failed: %d\n", ret);
+      dmaerr("ERROR: sam_dmatxsetup failed: %d\n", ret);
       return;
     }
 
@@ -1500,7 +1500,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
   ret = sam_dmastart(spics->rxdma, spi_rxcallback, (void *)spics);
   if (ret < 0)
     {
-      dmadbg("ERROR: RX sam_dmastart failed: %d\n", ret);
+      dmaerr("ERROR: RX sam_dmastart failed: %d\n", ret);
       return;
     }
 
@@ -1509,7 +1509,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
   ret = sam_dmastart(spics->txdma, spi_txcallback, (void *)spics);
   if (ret < 0)
     {
-      dmadbg("ERROR: RX sam_dmastart failed: %d\n", ret);
+      dmaerr("ERROR: RX sam_dmastart failed: %d\n", ret);
       sam_dmastop(spics->rxdma);
       return;
     }
@@ -1531,7 +1531,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
                      (wdentry_t)spi_dmatimeout, 1, (uint32_t)spics);
       if (ret != OK)
         {
-           spidbg("ERROR: wd_start failed: %d\n", ret);
+           spierr("ERROR: wd_start failed: %d\n", ret);
         }
 
       /* Wait for the DMA complete */
@@ -1582,7 +1582,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
 
   if (spics->result)
     {
-      spidbg("ERROR: DMA failed with result: %d\n", spics->result);
+      spierr("ERROR: DMA failed with result: %d\n", spics->result);
     }
 }
 #endif /* CONFIG_SAMA5_SPI_DMA */
@@ -1692,7 +1692,7 @@ struct spi_dev_s *sam_spibus_initialize(int port)
   spics = (struct sam_spics_s *)zalloc(sizeof(struct sam_spics_s));
   if (!spics)
     {
-      spidbg("ERROR: Failed to allocate a chip select structure\n");
+      spierr("ERROR: Failed to allocate a chip select structure\n");
       return NULL;
     }
 
@@ -1715,7 +1715,7 @@ struct spi_dev_s *sam_spibus_initialize(int port)
       spics->rxdma = sam_dmachannel(spino, 0);
       if (!spics->rxdma)
         {
-          spidbg("ERROR: Failed to allocate the RX DMA channel\n");
+          spierr("ERROR: Failed to allocate the RX DMA channel\n");
           spics->candma = false;
         }
     }
@@ -1725,7 +1725,7 @@ struct spi_dev_s *sam_spibus_initialize(int port)
       spics->txdma = sam_dmachannel(spino, 0);
       if (!spics->txdma)
         {
-          spidbg("ERROR: Failed to allocate the TX DMA channel\n");
+          spierr("ERROR: Failed to allocate the TX DMA channel\n");
           sam_dmafree(spics->rxdma);
           spics->rxdma  = NULL;
           spics->candma = false;
diff --git a/arch/arm/src/sama5/sam_ssc.c b/arch/arm/src/sama5/sam_ssc.c
index 8fdf222e04..61b790ad04 100644
--- a/arch/arm/src/sama5/sam_ssc.c
+++ b/arch/arm/src/sama5/sam_ssc.c
@@ -414,16 +414,16 @@
 #endif
 
 #ifdef CONFIG_DEBUG_I2S
-#  define i2sdbg         dbg
+#  define i2serr         err
 #  define i2sllerr       llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define i2sinfo      dbg
+#    define i2sinfo      err
 #    define i2sllinfo    llerr
 #  else
 #    define i2sinfo(x...)
 #  endif
 #else
-#  define i2sdbg(x...)
+#  define i2serr(x...)
 #  define i2sllerr(x...)
 #  define i2sinfo(x...)
 #  define i2sllinfo(x...)
@@ -2077,7 +2077,7 @@ static int ssc_checkwidth(struct sam_ssc_s *priv, int bits)
       break;
 
     default:
-      i2sdbg("ERROR: Unsupported or invalid data width: %d\n", bits);
+      i2serr("ERROR: Unsupported or invalid data width: %d\n", bits);
       return (bits < 2 || bits > 32) ? -EINVAL : -ENOSYS;
     }
 
@@ -2155,7 +2155,7 @@ static uint32_t ssc_rxdatawidth(struct i2s_dev_s *dev, int bits)
   ret = ssc_checkwidth(priv, bits);
   if (ret < 0)
     {
-      i2sdbg("ERROR: ssc_checkwidth failed: %d\n", ret);
+      i2serr("ERROR: ssc_checkwidth failed: %d\n", ret);
       return 0;
     }
 
@@ -2164,7 +2164,7 @@ static uint32_t ssc_rxdatawidth(struct i2s_dev_s *dev, int bits)
   ret = ssc_dma_flags(priv, &dmaflags);
   if (ret < 0)
     {
-      i2sdbg("ERROR: ssc_dma_flags failed: %d\n", ret);
+      i2serr("ERROR: ssc_dma_flags failed: %d\n", ret);
       return 0;
     }
 
@@ -2253,7 +2253,7 @@ static int ssc_receive(struct i2s_dev_s *dev, struct ap_buffer_s *apb,
 
   if (!priv->rxenab)
     {
-      i2sdbg("ERROR: SSC%d has no receiver\n", priv->sscno);
+      i2serr("ERROR: SSC%d has no receiver\n", priv->sscno);
       ret = -EAGAIN;
       goto errout_with_exclsem;
     }
@@ -2292,7 +2292,7 @@ errout_with_exclsem:
   return ret;
 
 #else
-  i2sdbg("ERROR: SSC%d has no receiver\n", priv->sscno);
+  i2serr("ERROR: SSC%d has no receiver\n", priv->sscno);
   UNUSED(priv);
   return -ENOSYS;
 #endif
@@ -2366,7 +2366,7 @@ static uint32_t ssc_txdatawidth(struct i2s_dev_s *dev, int bits)
   ret = ssc_checkwidth(priv, bits);
   if (ret < 0)
     {
-      i2sdbg("ERROR: ssc_checkwidth failed: %d\n", ret);
+      i2serr("ERROR: ssc_checkwidth failed: %d\n", ret);
       return 0;
     }
 
@@ -2375,7 +2375,7 @@ static uint32_t ssc_txdatawidth(struct i2s_dev_s *dev, int bits)
   ret = ssc_dma_flags(priv, &dmaflags);
   if (ret < 0)
     {
-      i2sdbg("ERROR: ssc_dma_flags failed: %d\n", ret);
+      i2serr("ERROR: ssc_dma_flags failed: %d\n", ret);
       return 0;
     }
 
@@ -2470,7 +2470,7 @@ static int ssc_send(struct i2s_dev_s *dev, struct ap_buffer_s *apb,
 
   if (!priv->txenab)
     {
-      i2sdbg("ERROR: SSC%d has no transmitter\n", priv->sscno);
+      i2serr("ERROR: SSC%d has no transmitter\n", priv->sscno);
       ret = -EAGAIN;
       goto errout_with_exclsem;
     }
@@ -2509,7 +2509,7 @@ errout_with_exclsem:
   return ret;
 
 #else
-  i2sdbg("ERROR: SSC%d has no transmitter\n", priv->sscno);
+  i2serr("ERROR: SSC%d has no transmitter\n", priv->sscno);
   UNUSED(priv);
   return -ENOSYS;
 #endif
@@ -2563,7 +2563,7 @@ static int ssc_rx_configure(struct sam_ssc_s *priv)
 
     case SSC_CLKSRC_NONE: /* No clock */
     default:
-      i2sdbg("ERROR:  No receiver clock\n");
+      i2serr("ERROR:  No receiver clock\n");
       return -EINVAL;
     }
 
@@ -2584,7 +2584,7 @@ static int ssc_rx_configure(struct sam_ssc_s *priv)
       break;
 
     default:
-      i2sdbg("ERROR: Invalid clock output selection\n");
+      i2serr("ERROR: Invalid clock output selection\n");
       return -EINVAL;
     }
 
@@ -2688,7 +2688,7 @@ static int ssc_tx_configure(struct sam_ssc_s *priv)
 
     case SSC_CLKSRC_NONE: /* No clock */
     default:
-      i2sdbg("ERROR:  No transmitter clock\n");
+      i2serr("ERROR:  No transmitter clock\n");
       return -EINVAL;
     }
 
@@ -2709,7 +2709,7 @@ static int ssc_tx_configure(struct sam_ssc_s *priv)
       break;
 
     default:
-      i2sdbg("ERROR: Invalid clock output selection\n");
+      i2serr("ERROR: Invalid clock output selection\n");
       return -EINVAL;
     }
 
@@ -2968,7 +2968,7 @@ static int ssc_dma_flags(struct sam_ssc_s *priv, uint32_t *dmaflags)
       break;
 
     default:
-      i2sdbg("ERROR: Unsupported data width: %d\n", priv->datalen);
+      i2serr("ERROR: Unsupported data width: %d\n", priv->datalen);
       return -ENOSYS;
     }
 
@@ -3001,7 +3001,7 @@ static int ssc_dma_allocate(struct sam_ssc_s *priv)
   ret = ssc_dma_flags(priv, &dmaflags);
   if (ret < 0)
     {
-      i2sdbg("ERROR: ssc_dma_flags failed: %d\n", ret);
+      i2serr("ERROR: ssc_dma_flags failed: %d\n", ret);
       return ret;
     }
 
@@ -3018,7 +3018,7 @@ static int ssc_dma_allocate(struct sam_ssc_s *priv)
       priv->rx.dma = sam_dmachannel(priv->sscno, dmaflags);
       if (!priv->rx.dma)
         {
-          i2sdbg("ERROR: Failed to allocate the RX DMA channel\n");
+          i2serr("ERROR: Failed to allocate the RX DMA channel\n");
           goto errout;
         }
 
@@ -3027,7 +3027,7 @@ static int ssc_dma_allocate(struct sam_ssc_s *priv)
       priv->rx.dog = wd_create();
       if (!priv->rx.dog)
         {
-          i2sdbg("ERROR: Failed to create the RX DMA watchdog\n");
+          i2serr("ERROR: Failed to create the RX DMA watchdog\n");
           goto errout;
         }
     }
@@ -3041,7 +3041,7 @@ static int ssc_dma_allocate(struct sam_ssc_s *priv)
       priv->tx.dma = sam_dmachannel(priv->sscno, dmaflags);
       if (!priv->tx.dma)
         {
-          i2sdbg("ERROR: Failed to allocate the TX DMA channel\n");
+          i2serr("ERROR: Failed to allocate the TX DMA channel\n");
           goto errout;
         }
 
@@ -3050,7 +3050,7 @@ static int ssc_dma_allocate(struct sam_ssc_s *priv)
       priv->tx.dog = wd_create();
       if (!priv->tx.dog)
         {
-          i2sdbg("ERROR: Failed to create the TX DMA watchdog\n");
+          i2serr("ERROR: Failed to create the TX DMA watchdog\n");
           goto errout;
         }
     }
@@ -3441,7 +3441,7 @@ struct i2s_dev_s *sam_ssc_initialize(int port)
   priv = (struct sam_ssc_s *)zalloc(sizeof(struct sam_ssc_s));
   if (!priv)
     {
-      i2sdbg("ERROR: Failed to allocate a chip select structure\n");
+      i2serr("ERROR: Failed to allocate a chip select structure\n");
       return NULL;
     }
 
@@ -3475,7 +3475,7 @@ struct i2s_dev_s *sam_ssc_initialize(int port)
   else
 #endif /* CONFIG_SAMA5_SSC1 */
     {
-      i2sdbg("ERROR:  Unsupported I2S port: %d\n", port);
+      i2serr("ERROR:  Unsupported I2S port: %d\n", port);
       goto errout_with_alloc;
     }
 
@@ -3496,7 +3496,7 @@ struct i2s_dev_s *sam_ssc_initialize(int port)
   ret = ssc_rx_configure(priv);
   if (ret < 0)
     {
-      i2sdbg("ERROR: Failed to configure the receiver: %d\n", ret);
+      i2serr("ERROR: Failed to configure the receiver: %d\n", ret);
       goto errout_with_clocking;
     }
 
@@ -3505,7 +3505,7 @@ struct i2s_dev_s *sam_ssc_initialize(int port)
   ret = ssc_tx_configure(priv);
   if (ret < 0)
     {
-      i2sdbg("ERROR: Failed to configure the transmitter: %d\n", ret);
+      i2serr("ERROR: Failed to configure the transmitter: %d\n", ret);
       goto errout_with_clocking;
     }
 
diff --git a/arch/arm/src/sama5/sam_tc.c b/arch/arm/src/sama5/sam_tc.c
index 9a6c091ede..6ce38f0ee2 100644
--- a/arch/arm/src/sama5/sam_tc.c
+++ b/arch/arm/src/sama5/sam_tc.c
@@ -953,7 +953,7 @@ static inline struct sam_chan_s *sam_tc_initialize(int channel)
     {
       /* Timer/counter is not invalid or not enabled */
 
-      tcdbg("ERROR: Bad channel number: %d\n", channel);
+      tcerr("ERROR: Bad channel number: %d\n", channel);
       return NULL;
     }
 
@@ -976,7 +976,7 @@ static inline struct sam_chan_s *sam_tc_initialize(int channel)
 
       for (i = 0, ch = tcconfig->chfirst; i < SAM_TC_NCHANNELS; i++)
         {
-          tcdbg("Initializing TC%d channel %d\n", tcconfig->tc, ch);
+          tcerr("Initializing TC%d channel %d\n", tcconfig->tc, ch);
 
           /* Initialize the channel data structure */
 
@@ -1057,7 +1057,7 @@ static inline struct sam_chan_s *sam_tc_initialize(int channel)
     {
       /* No.. return a failure */
 
-      tcdbg("Channel %d is in-used\n", channel);
+      tcerr("Channel %d is in-used\n", channel);
       sam_givesem(tc);
       return NULL;
     }
@@ -1478,7 +1478,7 @@ int sam_tc_divisor(uint32_t frequency, uint32_t *div, uint32_t *tcclks)
         {
           /* If no divisor can be found, return -ERANGE */
 
-          tcdbg("Lower bound search failed\n");
+          tcerr("Lower bound search failed\n");
           return -ERANGE;
         }
     }
diff --git a/arch/arm/src/sama5/sam_tc.h b/arch/arm/src/sama5/sam_tc.h
index 8d19b5566c..dec7b783e4 100644
--- a/arch/arm/src/sama5/sam_tc.h
+++ b/arch/arm/src/sama5/sam_tc.h
@@ -86,12 +86,12 @@
 /* Timer/counter debug output */
 
 #ifdef CONFIG_SAMA5_TC_DEBUG
-#  define tcdbg    dbg
+#  define tcerr    err
 #  define tcinfo   info
 #  define tcllerr  llerr
 #  define tcllinfo llinfo
 #else
-#  define tcdbg(x...)
+#  define tcerr(x...)
 #  define tcinfo(x...)
 #  define tcllerr(x...)
 #  define tcllinfo(x...)
diff --git a/arch/arm/src/sama5/sam_trng.c b/arch/arm/src/sama5/sam_trng.c
index eb9ee65c27..a3eb102640 100644
--- a/arch/arm/src/sama5/sam_trng.c
+++ b/arch/arm/src/sama5/sam_trng.c
@@ -362,7 +362,7 @@ void up_rnginitialize(void)
 
   if (irq_attach(SAM_IRQ_TRNG, sam_interrupt))
     {
-      fdbg("ERROR: Failed to attach to IRQ%d\n", SAM_IRQ_TRNG);
+      ferr("ERROR: Failed to attach to IRQ%d\n", SAM_IRQ_TRNG);
       return;
     }
 
@@ -379,7 +379,7 @@ void up_rnginitialize(void)
   ret = register_driver("/dev/random", &g_trngops, 0644, NULL);
   if (ret < 0)
     {
-      fdbg("ERROR: Failed to register /dev/random\n");
+      ferr("ERROR: Failed to register /dev/random\n");
       return;
     }
 
diff --git a/arch/arm/src/sama5/sam_tsd.c b/arch/arm/src/sama5/sam_tsd.c
index ce1e2f67be..de28c0a953 100644
--- a/arch/arm/src/sama5/sam_tsd.c
+++ b/arch/arm/src/sama5/sam_tsd.c
@@ -391,7 +391,7 @@ static int sam_tsd_waitsample(struct sam_tsd_s *priv, struct sam_sample_s *sampl
            * the failure now.
            */
 
-          idbg("ERROR: sem_wait: %d\n", errno);
+          ierr("ERROR: sem_wait: %d\n", errno);
           DEBUGASSERT(errno == EINTR);
           ret = -EINTR;
           goto errout;
@@ -644,7 +644,7 @@ static void sam_tsd_bottomhalf(void *arg)
 
       if (xraw == 0 || xraw >= xscale || yraw == 0 || yraw > yscale)
         {
-          idbg("Discarding: x %d:%d y %d:%d\n", xraw, xscale);
+          ierr("Discarding: x %d:%d y %d:%d\n", xraw, xscale);
           goto ignored;
         }
 
@@ -936,7 +936,7 @@ static ssize_t sam_tsd_read(struct file *filep, char *buffer, size_t len)
        * handle smaller reads... but why?
        */
 
-      idbg("ERROR: Unsupported read size: %d\n", len);
+      ierr("ERROR: Unsupported read size: %d\n", len);
       return -ENOSYS;
     }
 
@@ -968,7 +968,7 @@ static ssize_t sam_tsd_read(struct file *filep, char *buffer, size_t len)
         {
           /* We might have been awakened by a signal */
 
-          idbg("ERROR: sam_tsd_waitsample: %d\n", ret);
+          ierr("ERROR: sam_tsd_waitsample: %d\n", ret);
           goto errout;
         }
     }
@@ -1679,7 +1679,7 @@ int sam_tsd_register(struct sam_adc_s *adc, int minor)
   ret = register_driver(devname, &g_tsdops, 0666, priv);
   if (ret < 0)
     {
-      idbg("ERROR: register_driver() failed: %d\n", ret);
+      ierr("ERROR: register_driver() failed: %d\n", ret);
       goto errout_with_priv;
     }
 
@@ -1724,7 +1724,7 @@ void sam_tsd_interrupt(uint32_t pending)
       ret = sam_tsd_schedule(priv);
       if (ret < 0)
         {
-          idbg("ERROR: sam_tsd_schedule failed: %d\n", ret);
+          ierr("ERROR: sam_tsd_schedule failed: %d\n", ret);
         }
     }
 }
diff --git a/arch/arm/src/sama5/sam_twi.c b/arch/arm/src/sama5/sam_twi.c
index 8f813afe4b..c08135a1ce 100644
--- a/arch/arm/src/sama5/sam_twi.c
+++ b/arch/arm/src/sama5/sam_twi.c
@@ -127,12 +127,12 @@
 /* CONFIG_DEBUG_I2C + CONFIG_DEBUG_FEATURES enables general I2C debug output. */
 
 #ifdef CONFIG_DEBUG_I2C
-#  define i2cdbg    dbg
+#  define i2cerr    err
 #  define i2cinfo   info
 #  define i2cllerr  llerr
 #  define i2cllinfo llinfo
 #else
-#  define i2cdbg(x...)
+#  define i2cerr(x...)
 #  define i2cinfo(x...)
 #  define i2cllerr(x...)
 #  define i2cllinfo(x...)
@@ -887,7 +887,7 @@ static int twi_transfer(FAR struct i2c_master_s *dev,
   ret = twi_wait(priv, size);
   if (ret < 0)
     {
-      i2cdbg("ERROR: Transfer failed: %d\n", ret);
+      i2cerr("ERROR: Transfer failed: %d\n", ret);
     }
 
   leave_critical_section(flags);
@@ -1287,7 +1287,7 @@ struct i2c_master_s *sam_i2cbus_initialize(int bus)
   else
 #endif
     {
-      i2cdbg("ERROR: Unsupported bus: TWI%d\n", bus);
+      i2cerr("ERROR: Unsupported bus: TWI%d\n", bus);
       return NULL;
     }
 
@@ -1300,7 +1300,7 @@ struct i2c_master_s *sam_i2cbus_initialize(int bus)
   priv->timeout = wd_create();
   if (priv->timeout == NULL)
     {
-      idbg("ERROR: Failed to allocate a timer\n");
+      ierr("ERROR: Failed to allocate a timer\n");
       goto errout_with_irq;
     }
 
@@ -1309,7 +1309,7 @@ struct i2c_master_s *sam_i2cbus_initialize(int bus)
   ret = irq_attach(priv->attr->irq, priv->attr->handler);
   if (ret < 0)
     {
-      idbg("ERROR: Failed to attach irq %d\n", priv->attr->irq);
+      ierr("ERROR: Failed to attach irq %d\n", priv->attr->irq);
       goto errout_with_wdog;
     }
 
diff --git a/arch/arm/src/sama5/sam_udphs.c b/arch/arm/src/sama5/sam_udphs.c
index baf24cdb58..00f85e6381 100644
--- a/arch/arm/src/sama5/sam_udphs.c
+++ b/arch/arm/src/sama5/sam_udphs.c
@@ -4300,7 +4300,7 @@ static void sam_sw_setup(struct sam_usbdev_s *priv)
     kmm_memalign(16, CONFIG_SAMA5_UDPHS_NDTDS * sizeof(struct sam_dtd_s));
   if (!priv->dtdpool)
     {
-      udbg("ERROR: Failed to allocate the DMA transfer descriptor pool\n");
+      uerr("ERROR: Failed to allocate the DMA transfer descriptor pool\n");
       return NULL;
     }
 
diff --git a/arch/arm/src/sama5/sam_wdt.c b/arch/arm/src/sama5/sam_wdt.c
index 88546618d9..60b079df58 100644
--- a/arch/arm/src/sama5/sam_wdt.c
+++ b/arch/arm/src/sama5/sam_wdt.c
@@ -87,10 +87,10 @@
  */
 
 #ifdef CONFIG_DEBUG_WATCHDOG
-#  define wddbg    llerr
+#  define wderr    llerr
 #  define wdinfo   llinfo
 #else
-#  define wddbg(x...)
+#  define wderr(x...)
 #  define wdinfo(x...)
 #endif
 
@@ -463,7 +463,7 @@ static int sam_settimeout(FAR struct watchdog_lowerhalf_s *lower,
 
   if (timeout < WDT_MINTIMEOUT || timeout >= WDT_MAXTIMEOUT)
     {
-      wddbg("Cannot represent timeout: %d < %d > %d\n",
+      wderr("Cannot represent timeout: %d < %d > %d\n",
             WDT_MINTIMEOUT, timeout, WDT_MAXTIMEOUT);
       return -ERANGE;
     }
@@ -574,7 +574,7 @@ static xcpt_t sam_capture(FAR struct watchdog_lowerhalf_s *lower,
                             xcpt_t handler)
 {
 #ifndef CONFIG_SAMA5_WDT_INTERRUPT
-  wddbg("ERROR: Not configured for this mode\n");
+  wderr("ERROR: Not configured for this mode\n");
   return NULL;
 #else
   FAR struct sam_lowerhalf_s *priv = (FAR struct sam_lowerhalf_s *)lower;
diff --git a/arch/arm/src/sama5/sam_xdmac.c b/arch/arm/src/sama5/sam_xdmac.c
index 74105e6147..93989db63a 100644
--- a/arch/arm/src/sama5/sam_xdmac.c
+++ b/arch/arm/src/sama5/sam_xdmac.c
@@ -807,7 +807,7 @@ static uint8_t sam_channel(uint8_t pid, const struct sam_pidmap_s *table,
         }
     }
 
-  dmadbg("No channel found for pid %d\n", pid);
+  dmaerr("No channel found for pid %d\n", pid);
   DEBUGPANIC();
   return 0x3f;
 }
@@ -2039,7 +2039,7 @@ DMA_HANDLE sam_dmachannel(uint8_t dmacno, uint32_t chflags)
 #endif
 
     {
-      dmadbg("ERROR: Bad XDMAC number: %d\n", dmacno);
+      dmaerr("ERROR: Bad XDMAC number: %d\n", dmacno);
       DEBUGPANIC();
       return (DMA_HANDLE)NULL;
     }
@@ -2088,7 +2088,7 @@ DMA_HANDLE sam_dmachannel(uint8_t dmacno, uint32_t chflags)
     }
   else
     {
-      dmadbg("ERROR: Failed allocate XDMAC%d channel\n", (int)dmacno);
+      dmaerr("ERROR: Failed allocate XDMAC%d channel\n", (int)dmacno);
     }
 
   return (DMA_HANDLE)xdmach;
@@ -2465,30 +2465,30 @@ void sam_dmadump(DMA_HANDLE handle, const struct sam_dmaregs_s *regs,
   struct sam_xdmach_s *xdmach = (struct sam_xdmach_s *)handle;
   struct sam_xdmac_s *xdmac = sam_controller(xdmach);
 
-  dmadbg("%s\n", msg);
-  dmadbg("  DMA Global Registers:\n");
-  dmadbg("     GTYPE[%08x]: %08x\n", xdmac->base + SAM_XDMAC_GTYPE_OFFSET, regs->gtype);
-  dmadbg("      GCFG[%08x]: %08x\n", xdmac->base + SAM_XDMAC_GCFG_OFFSET, regs->gcfg);
-  dmadbg("      GWAC[%08x]: %08x\n", xdmac->base + SAM_XDMAC_GWAC_OFFSET, regs->gwac);
-  dmadbg("       GIM[%08x]: %08x\n", xdmac->base + SAM_XDMAC_GIM_OFFSET, regs->gim);
-  dmadbg("       GIS[%08x]: %08x\n", xdmac->base + SAM_XDMAC_GIS_OFFSET, regs->gis);
-  dmadbg("        GS[%08x]: %08x\n", xdmac->base + SAM_XDMAC_GS_OFFSET, regs->gs);
-  dmadbg("       GRS[%08x]: %08x\n", xdmac->base + SAM_XDMAC_GRS_OFFSET, regs->grs);
-  dmadbg("       GWS[%08x]: %08x\n", xdmac->base + SAM_XDMAC_GWS_OFFSET, regs->gws);
-  dmadbg("      GSWS[%08x]: %08x\n", xdmac->base + SAM_XDMAC_GSWS_OFFSET, regs->gsws);
-  dmadbg("  DMA Channel Registers:\n");
-  dmadbg("       CIM[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CIM_OFFSET, regs->cim);
-  dmadbg("       CIS[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CIS_OFFSET, regs->cis);
-  dmadbg("       CSA[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CSA_OFFSET, regs->csa);
-  dmadbg("       CDA[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CDA_OFFSET, regs->cda);
-  dmadbg("      CNDA[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CNDA_OFFSET, regs->cnda);
-  dmadbg("      CNDC[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CNDC_OFFSET, regs->cndc);
-  dmadbg("      CUBC[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CUBC_OFFSET, regs->cubc);
-  dmadbg("       CBC[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CBC_OFFSET, regs->cbc);
-  dmadbg("        CC[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CC_OFFSET, regs->cc);
-  dmadbg("    CDSMSP[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CDSMSP_OFFSET, regs->cdsmsp);
-  dmadbg("      CSUS[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CSUS_OFFSET, regs->csus);
-  dmadbg("      CDUS[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CDUS_OFFSET, regs->cdus);
+  dmaerr("%s\n", msg);
+  dmaerr("  DMA Global Registers:\n");
+  dmaerr("     GTYPE[%08x]: %08x\n", xdmac->base + SAM_XDMAC_GTYPE_OFFSET, regs->gtype);
+  dmaerr("      GCFG[%08x]: %08x\n", xdmac->base + SAM_XDMAC_GCFG_OFFSET, regs->gcfg);
+  dmaerr("      GWAC[%08x]: %08x\n", xdmac->base + SAM_XDMAC_GWAC_OFFSET, regs->gwac);
+  dmaerr("       GIM[%08x]: %08x\n", xdmac->base + SAM_XDMAC_GIM_OFFSET, regs->gim);
+  dmaerr("       GIS[%08x]: %08x\n", xdmac->base + SAM_XDMAC_GIS_OFFSET, regs->gis);
+  dmaerr("        GS[%08x]: %08x\n", xdmac->base + SAM_XDMAC_GS_OFFSET, regs->gs);
+  dmaerr("       GRS[%08x]: %08x\n", xdmac->base + SAM_XDMAC_GRS_OFFSET, regs->grs);
+  dmaerr("       GWS[%08x]: %08x\n", xdmac->base + SAM_XDMAC_GWS_OFFSET, regs->gws);
+  dmaerr("      GSWS[%08x]: %08x\n", xdmac->base + SAM_XDMAC_GSWS_OFFSET, regs->gsws);
+  dmaerr("  DMA Channel Registers:\n");
+  dmaerr("       CIM[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CIM_OFFSET, regs->cim);
+  dmaerr("       CIS[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CIS_OFFSET, regs->cis);
+  dmaerr("       CSA[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CSA_OFFSET, regs->csa);
+  dmaerr("       CDA[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CDA_OFFSET, regs->cda);
+  dmaerr("      CNDA[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CNDA_OFFSET, regs->cnda);
+  dmaerr("      CNDC[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CNDC_OFFSET, regs->cndc);
+  dmaerr("      CUBC[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CUBC_OFFSET, regs->cubc);
+  dmaerr("       CBC[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CBC_OFFSET, regs->cbc);
+  dmaerr("        CC[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CC_OFFSET, regs->cc);
+  dmaerr("    CDSMSP[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CDSMSP_OFFSET, regs->cdsmsp);
+  dmaerr("      CSUS[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CSUS_OFFSET, regs->csus);
+  dmaerr("      CDUS[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CDUS_OFFSET, regs->cdus);
 }
 #endif /* CONFIG_DEBUG_DMA */
 #endif /* CONFIG_SAMA5_XDMAC0 || CONFIG_SAMA5_XDMAC1 */
diff --git a/arch/arm/src/samdl/sam_dmac.c b/arch/arm/src/samdl/sam_dmac.c
index 4eafd93790..f1afd24ff0 100644
--- a/arch/arm/src/samdl/sam_dmac.c
+++ b/arch/arm/src/samdl/sam_dmac.c
@@ -1274,7 +1274,7 @@ void sam_dmasample(DMA_HANDLE handle, struct sam_dmaregs_s *regs)
   regs->crcdatain  = getreg32(SAM_DMAC_CRCDATAIN);  /* CRC Data Input Register */
   regs->crcchksum  = getreg32(SAM_DMAC_CRCCHKSUM);  /* CRC Checksum Register */
   regs->crcstatus  = getreg8(SAM_DMAC_CRCSTATUS);   /* CRC Status Register */
-  regs->dbgctrl    = getreg8(SAM_DMAC_DBGCTRL);     /* Debug Control Register */
+  regs->errctrl    = getreg8(SAM_DMAC_DBGCTRL);     /* Debug Control Register */
   regs->qosctrl    = getreg8(SAM_DMAC_QOSCTRL);     /* Quality of Service Control Register */
   regs->swtrigctrl = getreg32(SAM_DMAC_SWTRIGCTRL); /* Software Trigger Control Register */
   regs->prictrl0   = getreg32(SAM_DMAC_PRICTRL0);   /* Priority Control 0 Register */
@@ -1310,19 +1310,19 @@ void sam_dmadump(DMA_HANDLE handle, const struct sam_dmaregs_s *regs,
 {
   struct sam_dmach_s *dmach = (struct sam_dmach_s *)handle;
 
-  dmadbg("%s\n", msg);
-  dmadbg("  DMAC Registers:\n");
-  dmadbg("         CTRL: %04x      CRCCTRL: %04x      CRCDATAIN: %08x  CRCCHKSUM: %08x\n",
+  dmaerr("%s\n", msg);
+  dmaerr("  DMAC Registers:\n");
+  dmaerr("         CTRL: %04x      CRCCTRL: %04x      CRCDATAIN: %08x  CRCCHKSUM: %08x\n",
          regs->ctrl, regs->crcctrl, regs->crcdatain, regs->crcchksum);
-  dmadbg("    CRCSTATUS: %02x        DBGCTRL: %02x          QOSCTRL: %02x       SWTRIGCTRL: %08x\n",
-         regs->crcstatus, regs->dbgctrl, regs->qosctrl, regs->swtrigctrl);
-  dmadbg("     PRICTRL0: %08x  INTPEND: %04x     INSTSTATUS: %08x     BUSYCH: %08x\n",
+  dmaerr("    CRCSTATUS: %02x        DBGCTRL: %02x          QOSCTRL: %02x       SWTRIGCTRL: %08x\n",
+         regs->crcstatus, regs->errctrl, regs->qosctrl, regs->swtrigctrl);
+  dmaerr("     PRICTRL0: %08x  INTPEND: %04x     INSTSTATUS: %08x     BUSYCH: %08x\n",
          regs->prictrl0, regs->intpend, regs->intstatus, regs->busych);
-  dmadbg("       PENDCH: %08x   ACTIVE: %08x   BASEADDR: %08x    WRBADDR: %08x\n",
+  dmaerr("       PENDCH: %08x   ACTIVE: %08x   BASEADDR: %08x    WRBADDR: %08x\n",
          regs->pendch, regs->active, regs->baseaddr, regs->wrbaddr);
-  dmadbg("         CHID: %02x       CHCRTRLA: %02x         CHCRTRLB: %08x   CHINFLAG: %02x\n",
+  dmaerr("         CHID: %02x       CHCRTRLA: %02x         CHCRTRLB: %08x   CHINFLAG: %02x\n",
          regs->chid, regs->chctrla, regs->chctrlb, regs->chintflag,
-  dmadbg("     CHSTATUS: %02x\n",
+  dmaerr("     CHSTATUS: %02x\n",
          regs->chstatus);
 }
 #endif /* CONFIG_DEBUG_DMA */
diff --git a/arch/arm/src/samdl/sam_irq.c b/arch/arm/src/samdl/sam_irq.c
index a67f403b53..9fc2469883 100644
--- a/arch/arm/src/samdl/sam_irq.c
+++ b/arch/arm/src/samdl/sam_irq.c
@@ -84,7 +84,7 @@ volatile uint32_t *g_current_regs[1];
 
 /****************************************************************************
  * Name: sam_nmi, sam_busfault, sam_usagefault, sam_pendsv,
- *       sam_dbgmonitor, sam_pendsv, sam_reserved
+ *       sam_errmonitor, sam_pendsv, sam_reserved
  *
  * Description:
  *   Handlers for various execptions.  None are handled and all are fatal
@@ -97,7 +97,7 @@ volatile uint32_t *g_current_regs[1];
 static int sam_nmi(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! NMI received\n");
+  err("PANIC!!! NMI received\n");
   PANIC();
   return 0;
 }
@@ -105,7 +105,7 @@ static int sam_nmi(int irq, FAR void *context)
 static int sam_pendsv(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! PendSV received\n");
+  err("PANIC!!! PendSV received\n");
   PANIC();
   return 0;
 }
@@ -113,7 +113,7 @@ static int sam_pendsv(int irq, FAR void *context)
 static int sam_reserved(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Reserved interrupt\n");
+  err("PANIC!!! Reserved interrupt\n");
   PANIC();
   return 0;
 }
diff --git a/arch/arm/src/samdl/sam_spi.c b/arch/arm/src/samdl/sam_spi.c
index e16f4cd730..9a58a954ee 100644
--- a/arch/arm/src/samdl/sam_spi.c
+++ b/arch/arm/src/samdl/sam_spi.c
@@ -91,14 +91,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg llerr
+#  define spierr llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -944,7 +944,7 @@ static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency)
     {
       /* Set the frequency to the maximum */
 
-      spidbg("ERROR: Cannot realize frequency: %ld\n", (long)frequency);
+      spierr("ERROR: Cannot realize frequency: %ld\n", (long)frequency);
       frequency = maxfreq;
     }
 
@@ -975,7 +975,7 @@ static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency)
 
   if (baud > 255)
     {
-      spidbg("ERROR: BAUD is out of range: %ld\n", (long)baud);
+      spierr("ERROR: BAUD is out of range: %ld\n", (long)baud);
       baud = 255;
     }
 
@@ -1281,7 +1281,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
       data = spi_getreg16(priv, SAM_SPI_STATUS_OFFSET);
       if ((data & SPI_STATUS_BUFOVF) != 0)
         {
-          spidbg("ERROR: Buffer overflow!\n");
+          spierr("ERROR: Buffer overflow!\n");
 
           /* Clear the buffer overflow flag */
 
@@ -1488,7 +1488,7 @@ struct spi_dev_s *sam_spibus_initialize(int port)
   else
 #endif
     {
-      spidbg("ERROR: Unsupported port: %d\n", port);
+      spierr("ERROR: Unsupported port: %d\n", port);
       return NULL;
     }
 
@@ -1570,7 +1570,7 @@ struct spi_dev_s *sam_spibus_initialize(int port)
   ret = irq_attach(priv->irq, priv->handler);
   if (ret < 0)
     {
-      spidbg("ERROR: Failed to attach interrupt: %d\n", irq);
+      spierr("ERROR: Failed to attach interrupt: %d\n", irq);
       return NULL;
     }
 
diff --git a/arch/arm/src/samv7/sam_emac.c b/arch/arm/src/samv7/sam_emac.c
index 1e5e80a840..b11150ffaa 100644
--- a/arch/arm/src/samv7/sam_emac.c
+++ b/arch/arm/src/samv7/sam_emac.c
@@ -2824,12 +2824,12 @@ static int sam_ifup(struct net_driver_s *dev)
   int ret;
 
 #ifdef CONFIG_NET_IPv4
-  ndbg("Bringing up: %d.%d.%d.%d\n",
+  nerr("Bringing up: %d.%d.%d.%d\n",
        dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
        (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 #endif
 #ifdef CONFIG_NET_IPv6
-  ndbg("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
+  nerr("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
        dev->d_ipv6addr[0], dev->d_ipv6addr[1], dev->d_ipv6addr[2],
        dev->d_ipv6addr[3], dev->d_ipv6addr[4], dev->d_ipv6addr[5],
        dev->d_ipv6addr[6], dev->d_ipv6addr[7]);
@@ -3652,7 +3652,7 @@ static int sam_phyintenable(struct sam_emac_s *priv)
   else
 #endif
     {
-      ndbg("ERROR: Unsupported PHY type: %d\n", priv->phytype);
+      nerr("ERROR: Unsupported PHY type: %d\n", priv->phytype);
       ret = -ENOSYS;
     }
 
@@ -4329,7 +4329,7 @@ static int sam_phyinit(struct sam_emac_s *priv)
   mck = BOARD_MCK_FREQUENCY;
   if (mck > (240*1000*1000))
     {
-      ndbg("ERROR: Cannot realize PHY clock\n");
+      nerr("ERROR: Cannot realize PHY clock\n");
       return -EINVAL;
     }
   else if (mck > (160*1000*1000))
@@ -5111,7 +5111,7 @@ int sam_emac_initialize(int intf)
   else
 #endif
     {
-      ndbg("ERROR:  Interface %d not supported\n", intf);
+      nerr("ERROR:  Interface %d not supported\n", intf);
       return -EINVAL;
     }
 
@@ -5140,7 +5140,7 @@ int sam_emac_initialize(int intf)
   priv->txpoll = wd_create();
   if (!priv->txpoll)
     {
-      ndbg("ERROR: Failed to create periodic poll timer\n");
+      nerr("ERROR: Failed to create periodic poll timer\n");
       ret = -EAGAIN;
       goto errout;
     }
@@ -5148,7 +5148,7 @@ int sam_emac_initialize(int intf)
   priv->txtimeout = wd_create();     /* Create TX timeout timer */
   if (!priv->txtimeout)
     {
-      ndbg("ERROR: Failed to create periodic poll timer\n");
+      nerr("ERROR: Failed to create periodic poll timer\n");
       ret = -EAGAIN;
       goto errout_with_txpoll;
     }
@@ -5162,7 +5162,7 @@ int sam_emac_initialize(int intf)
   ret = sam_buffer_allocate(priv);
   if (ret < 0)
     {
-      ndbg("ERROR: sam_buffer_allocate failed: %d\n", ret);
+      nerr("ERROR: sam_buffer_allocate failed: %d\n", ret);
       goto errout_with_txtimeout;
     }
 
@@ -5173,7 +5173,7 @@ int sam_emac_initialize(int intf)
   ret = irq_attach(priv->attr->irq, priv->attr->handler);
   if (ret < 0)
     {
-      ndbg("ERROR: Failed to attach the handler to the IRQ%d\n", priv->attr->irq);
+      nerr("ERROR: Failed to attach the handler to the IRQ%d\n", priv->attr->irq);
       goto errout_with_buffers;
     }
 
@@ -5186,7 +5186,7 @@ int sam_emac_initialize(int intf)
   ret = sam_ifdown(&priv->dev);
   if (ret < 0)
     {
-      ndbg("ERROR: Failed to put the interface in the down state: %d\n", ret);
+      nerr("ERROR: Failed to put the interface in the down state: %d\n", ret);
       goto errout_with_buffers;
     }
 
@@ -5198,7 +5198,7 @@ int sam_emac_initialize(int intf)
       return ret;
     }
 
-  ndbg("ERROR: netdev_register() failed: %d\n", ret);
+  nerr("ERROR: netdev_register() failed: %d\n", ret);
 
 errout_with_buffers:
   sam_buffer_free(priv);
@@ -5261,7 +5261,7 @@ int sam_emac_setmacaddr(int intf, uint8_t mac[6])
   else
 #endif
     {
-      ndbg("ERROR:  Interface %d not supported\n", intf);
+      nerr("ERROR:  Interface %d not supported\n", intf);
       return -EINVAL;
     }
 
diff --git a/arch/arm/src/samv7/sam_freerun.c b/arch/arm/src/samv7/sam_freerun.c
index b4c438781b..70747f867a 100644
--- a/arch/arm/src/samv7/sam_freerun.c
+++ b/arch/arm/src/samv7/sam_freerun.c
@@ -136,7 +136,7 @@ int sam_freerun_initialize(struct sam_freerun_s *freerun, int chan,
   ret = sam_tc_clockselect(frequency, &cmr, &actual);
   if (ret < 0)
     {
-      tcdbg("ERROR: sam_tc_clockselect failed: %d\n", ret);
+      tcerr("ERROR: sam_tc_clockselect failed: %d\n", ret);
       return ret;
     }
 
@@ -175,7 +175,7 @@ int sam_freerun_initialize(struct sam_freerun_s *freerun, int chan,
   freerun->tch = sam_tc_allocate(chan, cmr);
   if (!freerun->tch)
     {
-      tcdbg("ERROR: Failed to allocate timer channel %d\n", chan);
+      tcerr("ERROR: Failed to allocate timer channel %d\n", chan);
       return -EBUSY;
     }
 
diff --git a/arch/arm/src/samv7/sam_hsmci.c b/arch/arm/src/samv7/sam_hsmci.c
index 836af1f394..8c487a75fd 100644
--- a/arch/arm/src/samv7/sam_hsmci.c
+++ b/arch/arm/src/samv7/sam_hsmci.c
@@ -933,25 +933,25 @@ static void sam_hsmcisample(struct sam_dev_s *priv,
 static void sam_hsmcidump(struct sam_dev_s *priv,
                           struct sam_hsmciregs_s *regs, const char *msg)
 {
-  fdbg("HSMCI Registers: %s\n", msg);
-  fdbg("      MR[%08x]: %08x\n", priv->base + SAM_HSMCI_MR_OFFSET,    regs->mr);
-  fdbg("    DTOR[%08x]: %08x\n", priv->base + SAM_HSMCI_DTOR_OFFSET,  regs->dtor);
-  fdbg("    SDCR[%08x]: %08x\n", priv->base + SAM_HSMCI_SDCR_OFFSET,  regs->sdcr);
-  fdbg("    ARGR[%08x]: %08x\n", priv->base + SAM_HSMCI_ARGR_OFFSET,  regs->argr);
-  fdbg("    BLKR[%08x]: %08x\n", priv->base + SAM_HSMCI_BLKR_OFFSET,  regs->blkr);
-  fdbg("   CSTOR[%08x]: %08x\n", priv->base + SAM_HSMCI_CSTOR_OFFSET, regs->cstor);
+  ferr("HSMCI Registers: %s\n", msg);
+  ferr("      MR[%08x]: %08x\n", priv->base + SAM_HSMCI_MR_OFFSET,    regs->mr);
+  ferr("    DTOR[%08x]: %08x\n", priv->base + SAM_HSMCI_DTOR_OFFSET,  regs->dtor);
+  ferr("    SDCR[%08x]: %08x\n", priv->base + SAM_HSMCI_SDCR_OFFSET,  regs->sdcr);
+  ferr("    ARGR[%08x]: %08x\n", priv->base + SAM_HSMCI_ARGR_OFFSET,  regs->argr);
+  ferr("    BLKR[%08x]: %08x\n", priv->base + SAM_HSMCI_BLKR_OFFSET,  regs->blkr);
+  ferr("   CSTOR[%08x]: %08x\n", priv->base + SAM_HSMCI_CSTOR_OFFSET, regs->cstor);
 #if 0 /* Reading these can cause loss of response data */
-  fdbg("   RSPR0[%08x]: %08x\n", priv->base + SAM_HSMCI_RSPR0_OFFSET, regs->rsp0);
-  fdbg("   RSPR1[%08x]: %08x\n", priv->base + SAM_HSMCI_RSPR1_OFFSET, regs->rsp1);
-  fdbg("   RSPR2[%08x]: %08x\n", priv->base + SAM_HSMCI_RSPR2_OFFSET, regs->rsp2);
-  fdbg("   RSPR3[%08x]: %08x\n", priv->base + SAM_HSMCI_RSPR3_OFFSET, regs->rsp3);
-#endif
-  fdbg("      SR[%08x]: %08x\n", priv->base + SAM_HSMCI_SR_OFFSET,    regs->sr);
-  fdbg("     IMR[%08x]: %08x\n", priv->base + SAM_HSMCI_IMR_OFFSET,   regs->imr);
-  fdbg("     DMA[%08x]: %08x\n", priv->base + SAM_HSMCI_DMA_OFFSET,   regs->dma);
-  fdbg("     CFG[%08x]: %08x\n", priv->base + SAM_HSMCI_CFG_OFFSET,   regs->cfg);
-  fdbg("    WPMR[%08x]: %08x\n", priv->base + SAM_HSMCI_WPMR_OFFSET,  regs->wpmr);
-  fdbg("    WPSR[%08x]: %08x\n", priv->base + SAM_HSMCI_WPSR_OFFSET,  regs->wpsr);
+  ferr("   RSPR0[%08x]: %08x\n", priv->base + SAM_HSMCI_RSPR0_OFFSET, regs->rsp0);
+  ferr("   RSPR1[%08x]: %08x\n", priv->base + SAM_HSMCI_RSPR1_OFFSET, regs->rsp1);
+  ferr("   RSPR2[%08x]: %08x\n", priv->base + SAM_HSMCI_RSPR2_OFFSET, regs->rsp2);
+  ferr("   RSPR3[%08x]: %08x\n", priv->base + SAM_HSMCI_RSPR3_OFFSET, regs->rsp3);
+#endif
+  ferr("      SR[%08x]: %08x\n", priv->base + SAM_HSMCI_SR_OFFSET,    regs->sr);
+  ferr("     IMR[%08x]: %08x\n", priv->base + SAM_HSMCI_IMR_OFFSET,   regs->imr);
+  ferr("     DMA[%08x]: %08x\n", priv->base + SAM_HSMCI_DMA_OFFSET,   regs->dma);
+  ferr("     CFG[%08x]: %08x\n", priv->base + SAM_HSMCI_CFG_OFFSET,   regs->cfg);
+  ferr("    WPMR[%08x]: %08x\n", priv->base + SAM_HSMCI_WPMR_OFFSET,  regs->wpmr);
+  ferr("    WPSR[%08x]: %08x\n", priv->base + SAM_HSMCI_WPSR_OFFSET,  regs->wpsr);
 }
 #endif
 
@@ -1025,7 +1025,7 @@ static void sam_xfrdumpone(struct sam_dev_s *priv, int index,
     }
   else
     {
-      fdbg("%s: Not collected\n", msg);
+      ferr("%s: Not collected\n", msg);
     }
 }
 #endif
@@ -2239,7 +2239,7 @@ static int sam_sendsetup(FAR struct sdio_dev_s *dev, FAR const uint8_t *buffer,
         {
           /* Some fatal error has occurred */
 
-          fdbg("ERROR: sr %08x\n", sr);
+          ferr("ERROR: sr %08x\n", sr);
           return -EIO;
         }
       else if ((sr & HSMCI_INT_TXRDY) != 0)
@@ -2419,7 +2419,7 @@ static int sam_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
             {
               /* Yes.. Was the error some kind of timeout? */
 
-              fdbg("ERROR: cmd: %08x events: %08x SR: %08x\n",
+              ferr("ERROR: cmd: %08x events: %08x SR: %08x\n",
                    cmd, priv->cmdrmask, sr);
 
               if ((pending & HSMCI_RESPONSE_TIMEOUT_ERRORS) != 0)
@@ -2449,7 +2449,7 @@ static int sam_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
        }
       else if (--timeout <= 0)
         {
-          fdbg("ERROR: Timeout cmd: %08x events: %08x SR: %08x\n",
+          ferr("ERROR: Timeout cmd: %08x events: %08x SR: %08x\n",
                cmd, priv->cmdrmask, sr);
 
           priv->wkupevent = SDIOWAIT_TIMEOUT;
@@ -2524,7 +2524,7 @@ static int sam_recvshort(FAR struct sdio_dev_s *dev,
 #ifdef CONFIG_DEBUG_FEATURES
   if (!rshort)
     {
-      fdbg("ERROR: rshort=NULL\n");
+      ferr("ERROR: rshort=NULL\n");
       ret = -EINVAL;
     }
 
@@ -2536,7 +2536,7 @@ static int sam_recvshort(FAR struct sdio_dev_s *dev,
            (cmd & MMCSD_RESPONSE_MASK) != MMCSD_R3_RESPONSE &&
            (cmd & MMCSD_RESPONSE_MASK) != MMCSD_R7_RESPONSE)
     {
-      fdbg("ERROR: Wrong response CMD=%08x\n", cmd);
+      ferr("ERROR: Wrong response CMD=%08x\n", cmd);
       ret = -EINVAL;
     }
   else
@@ -2587,7 +2587,7 @@ static int sam_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd,
 
   if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R2_RESPONSE)
     {
-      fdbg("ERROR: Wrong response CMD=%08x\n", cmd);
+      ferr("ERROR: Wrong response CMD=%08x\n", cmd);
       ret = -EINVAL;
     }
   else
@@ -2597,7 +2597,7 @@ static int sam_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd,
 
   if ((priv->wkupevent & SDIOWAIT_TIMEOUT) != 0)
     {
-      fdbg("ERROR: timeout\n");
+      ferr("ERROR: timeout\n");
       ret = -EINVAL;
     }
 
@@ -2605,7 +2605,7 @@ static int sam_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd,
 
   else if ((priv->wkupevent & SDIOWAIT_ERROR) != 0)
     {
-      fdbg("ERROR: Other error\n");
+      ferr("ERROR: Other error\n");
       ret = -EIO;
     }
 
@@ -2781,7 +2781,7 @@ static sdio_eventset_t sam_eventwait(FAR struct sdio_dev_s *dev,
                        1, (uint32_t)priv);
       if (ret != OK)
         {
-           fdbg("ERROR: wd_start failed: %d\n", ret);
+           ferr("ERROR: wd_start failed: %d\n", ret);
         }
     }
 
@@ -3213,7 +3213,7 @@ static void sam_callback(void *arg)
         {
           /* NOTE: Currently, work_cancel only returns success */
 
-          fdbg("ERROR: Failed to cancel work: %d\n", ret);
+          ferr("ERROR: Failed to cancel work: %d\n", ret);
         }
 
       fllinfo("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg);
@@ -3223,7 +3223,7 @@ static void sam_callback(void *arg)
         {
           /* NOTE: Currently, work_queue only returns success */
 
-          fdbg("ERROR: Failed to schedule work: %d\n", ret);
+          ferr("ERROR: Failed to schedule work: %d\n", ret);
         }
     }
 
diff --git a/arch/arm/src/samv7/sam_irq.c b/arch/arm/src/samv7/sam_irq.c
index 2c0a1a54c5..dc5b013f61 100644
--- a/arch/arm/src/samv7/sam_irq.c
+++ b/arch/arm/src/samv7/sam_irq.c
@@ -161,7 +161,7 @@ static void sam_dumpnvic(const char *msg, int irq)
 #endif
 
 /****************************************************************************
- * Name: sam_nmi, sam_busfault, sam_usagefault, sam_pendsv, sam_dbgmonitor,
+ * Name: sam_nmi, sam_busfault, sam_usagefault, sam_pendsv, sam_errmonitor,
  *       sam_pendsv, sam_reserved
  *
  * Description:
@@ -175,7 +175,7 @@ static void sam_dumpnvic(const char *msg, int irq)
 static int sam_nmi(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! NMI received\n");
+  err("PANIC!!! NMI received\n");
   PANIC();
   return 0;
 }
@@ -183,7 +183,7 @@ static int sam_nmi(int irq, FAR void *context)
 static int sam_busfault(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS));
+  err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS));
   PANIC();
   return 0;
 }
@@ -191,7 +191,7 @@ static int sam_busfault(int irq, FAR void *context)
 static int sam_usagefault(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS));
+  err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS));
   PANIC();
   return 0;
 }
@@ -199,15 +199,15 @@ static int sam_usagefault(int irq, FAR void *context)
 static int sam_pendsv(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! PendSV received\n");
+  err("PANIC!!! PendSV received\n");
   PANIC();
   return 0;
 }
 
-static int sam_dbgmonitor(int irq, FAR void *context)
+static int sam_errmonitor(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Debug Monitor received\n");
+  err("PANIC!!! Debug Monitor received\n");
   PANIC();
   return 0;
 }
@@ -215,7 +215,7 @@ static int sam_dbgmonitor(int irq, FAR void *context)
 static int sam_reserved(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Reserved interrupt\n");
+  err("PANIC!!! Reserved interrupt\n");
   PANIC();
   return 0;
 }
@@ -464,7 +464,7 @@ void up_irqinitialize(void)
   irq_attach(SAM_IRQ_BUSFAULT, sam_busfault);
   irq_attach(SAM_IRQ_USAGEFAULT, sam_usagefault);
   irq_attach(SAM_IRQ_PENDSV, sam_pendsv);
-  irq_attach(SAM_IRQ_DBGMONITOR, sam_dbgmonitor);
+  irq_attach(SAM_IRQ_DBGMONITOR, sam_errmonitor);
   irq_attach(SAM_IRQ_RESERVED, sam_reserved);
 #endif
 
diff --git a/arch/arm/src/samv7/sam_mcan.c b/arch/arm/src/samv7/sam_mcan.c
index fe2dfb2c41..d02a094bdf 100644
--- a/arch/arm/src/samv7/sam_mcan.c
+++ b/arch/arm/src/samv7/sam_mcan.c
@@ -794,23 +794,23 @@
 #endif
 
 #ifdef CONFIG_DEBUG_CAN
-#  define candbg    dbg
+#  define canerr    err
 #  define caninfo   info
 #  define canllerr  llerr
 #  define canllinfo llinfo
 
 #  ifdef CONFIG_SAMV7_MCAN_REGDEBUG
-#    define canregdbg llerr
+#    define canregerr llerr
 #  else
-#    define canregdbg(x...)
+#    define canregerr(x...)
 #  endif
 
 #else
-#  define candbg(x...)
+#  define canerr(x...)
 #  define caninfo(x...)
 #  define canllerr(x...)
 #  define canllinfo(x...)
-#  define canregdbg(x...)
+#  define canregerr(x...)
 #endif
 
 /****************************************************************************
@@ -1502,7 +1502,7 @@ static void mcan_buffer_reserve(FAR struct sam_mcan_s *priv)
 
           if (sval > 0)
             {
-              candbg("ERROR: TX FIFOQ full but txfsem is %d\n", sval);
+              canerr("ERROR: TX FIFOQ full but txfsem is %d\n", sval);
               sem_reset(&priv->txfsem, 0);
             }
         }
@@ -1520,7 +1520,7 @@ static void mcan_buffer_reserve(FAR struct sam_mcan_s *priv)
 
       else if (sval <= 0)
         {
-          candbg("ERROR: TX FIFOQ not full but txfsem is %d\n", sval);
+          canerr("ERROR: TX FIFOQ not full but txfsem is %d\n", sval);
 
           /* Less than zero means that another thread is waiting */
 
@@ -1551,7 +1551,7 @@ static void mcan_buffer_reserve(FAR struct sam_mcan_s *priv)
 
       if (tffl > priv->config->ntxfifoq)
         {
-          candbg("ERROR: TX FIFO reports %d but max is %d\n",
+          canerr("ERROR: TX FIFO reports %d but max is %d\n",
                  tffl, priv->config->ntxfifoq);
           tffl = priv->config->ntxfifoq;
         }
@@ -1564,7 +1564,7 @@ static void mcan_buffer_reserve(FAR struct sam_mcan_s *priv)
 
       if (sval != tffl)
         {
-          candbg("ERROR: TX FIFO reports %d but txfsem is %d\n", tffl, sval);
+          canerr("ERROR: TX FIFO reports %d but txfsem is %d\n", tffl, sval);
 
           /* Reset the semaphore count to the Tx FIFO free level. */
 
@@ -1620,7 +1620,7 @@ static void mcan_buffer_release(FAR struct sam_mcan_s *priv)
     }
   else
     {
-      candbg("ERROR: txfsem would increment beyond %d\n",
+      canerr("ERROR: txfsem would increment beyond %d\n",
               priv->config->ntxfifoq);
     }
 }
@@ -2612,7 +2612,7 @@ static int mcan_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg)
       /* Unsupported/unrecognized command */
 
       default:
-        candbg("ERROR: Unrecognized command: %04x\n", cmd);
+        canerr("ERROR: Unrecognized command: %04x\n", cmd);
         break;
     }
 
@@ -2756,7 +2756,7 @@ static int mcan_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg)
     }
 
   txbuffer[0] = regval;
-  canregdbg("T0: %08x\n", regval);
+  canregerr("T0: %08x\n", regval);
 
   /* Format word T1:
    *   Data Length Code (DLC)            - Value from message structure
@@ -2765,7 +2765,7 @@ static int mcan_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg)
    */
 
   txbuffer[1] = BUFFER_R1_DLC(msg->cm_hdr.ch_dlc);
-  canregdbg("T1: %08x\n", txbuffer[1]);
+  canregerr("T1: %08x\n", txbuffer[1]);
 
   /* Followed by the amount of data corresponding to the DLC (T2..) */
 
@@ -3194,7 +3194,7 @@ static void mcan_receive(FAR struct can_dev_s *dev, FAR uint32_t *rxbuffer,
   /* Work R0 contains the CAN ID */
 
   regval = *rxbuffer++;
-  canregdbg("R0: %08x\n", regval);
+  canregerr("R0: %08x\n", regval);
 
 #ifdef CONFIG_CAN_ERRORS
   hdr.ch_error  = 0;
@@ -3240,7 +3240,7 @@ static void mcan_receive(FAR struct can_dev_s *dev, FAR uint32_t *rxbuffer,
   /* Word R1 contains the DLC and timestamp */
 
   regval = *rxbuffer++;
-  canregdbg("R1: %08x\n", regval);
+  canregerr("R1: %08x\n", regval);
 
   hdr.ch_dlc = (regval & BUFFER_R1_DLC_MASK) >> BUFFER_R1_DLC_SHIFT;
 
@@ -3935,7 +3935,7 @@ FAR struct can_dev_s *sam_mcan_initialize(int port)
   else
 #endif
     {
-      candbg("ERROR: Unsupported port %d\n", port);
+      canerr("ERROR: Unsupported port %d\n", port);
       return NULL;
     }
 
diff --git a/arch/arm/src/samv7/sam_oneshot.c b/arch/arm/src/samv7/sam_oneshot.c
index bc0fb34015..4400c57d93 100644
--- a/arch/arm/src/samv7/sam_oneshot.c
+++ b/arch/arm/src/samv7/sam_oneshot.c
@@ -178,7 +178,7 @@ int sam_oneshot_initialize(struct sam_oneshot_s *oneshot, int chan,
   ret = sam_tc_clockselect(frequency, &cmr, &actual);
   if (ret < 0)
     {
-      tcdbg("ERROR: sam_tc_clockselect failed: %d\n", ret);
+      tcerr("ERROR: sam_tc_clockselect failed: %d\n", ret);
       return ret;
     }
 
@@ -218,7 +218,7 @@ int sam_oneshot_initialize(struct sam_oneshot_s *oneshot, int chan,
   oneshot->tch = sam_tc_allocate(chan, cmr);
   if (!oneshot->tch)
     {
-      tcdbg("ERROR: Failed to allocate timer channel %d\n", chan);
+      tcerr("ERROR: Failed to allocate timer channel %d\n", chan);
       return -EBUSY;
     }
 
diff --git a/arch/arm/src/samv7/sam_pck.c b/arch/arm/src/samv7/sam_pck.c
index c4dc27d029..ddfc7371fa 100644
--- a/arch/arm/src/samv7/sam_pck.c
+++ b/arch/arm/src/samv7/sam_pck.c
@@ -128,7 +128,7 @@ uint32_t sam_pck_configure(enum pckid_e pckid, enum pckid_clksrc_e clksrc,
       break;
 
     default:
-      dbg("ERROR: Unknown clock source\n");
+      err("ERROR: Unknown clock source\n");
       return 0;
     }
 
@@ -272,7 +272,7 @@ uint32_t sam_pck_frequency(enum pckid_e pckid)
       break;
 
     default:
-      dbg("ERROR: Unknown clock source\n");
+      err("ERROR: Unknown clock source\n");
       return 0;
     }
 
diff --git a/arch/arm/src/samv7/sam_qspi.c b/arch/arm/src/samv7/sam_qspi.c
index 6a19f5e83d..ac0446c2a0 100644
--- a/arch/arm/src/samv7/sam_qspi.c
+++ b/arch/arm/src/samv7/sam_qspi.c
@@ -154,14 +154,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define qspidbg llerr
+#  define qspierr llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define qspiinfo llerr
 #  else
 #    define qspiinfo(x...)
 #  endif
 #else
-#  define qspidbg(x...)
+#  define qspierr(x...)
 #  define qspiinfo(x...)
 #endif
 
@@ -866,7 +866,7 @@ static int qspi_memory_dma(struct sam_qspidev_s *priv,
 
   if (ret < 0)
     {
-      qspidbg("ERROR: DMA setup failed: %d\n", ret);
+      qspierr("ERROR: DMA setup failed: %d\n", ret);
       return ret;
     }
 
@@ -882,7 +882,7 @@ static int qspi_memory_dma(struct sam_qspidev_s *priv,
   ret = sam_dmastart(priv->dmach, qspi_dma_callback, (void *)priv);
   if (ret < 0)
     {
-      qspidbg("ERROR: sam_dmastart failed: %d\n", ret);
+      qspierr("ERROR: sam_dmastart failed: %d\n", ret);
       return ret;
     }
 
@@ -903,7 +903,7 @@ static int qspi_memory_dma(struct sam_qspidev_s *priv,
                      (wdentry_t)qspi_dma_timeout, 1, (uint32_t)priv);
       if (ret != OK)
         {
-           qspidbg("ERROR: wd_start failed: %d\n", ret);
+           qspierr("ERROR: wd_start failed: %d\n", ret);
         }
 
       /* Wait for the DMA complete */
@@ -961,7 +961,7 @@ static int qspi_memory_dma(struct sam_qspidev_s *priv,
 
   if (priv->result)
     {
-      qspidbg("ERROR: DMA failed with result: %d\n", priv->result);
+      qspierr("ERROR: DMA failed with result: %d\n", priv->result);
     }
 
   return priv->result;
@@ -1778,7 +1778,7 @@ struct qspi_dev_s *sam_qspi_initialize(int intf)
   else
 #endif
     {
-      qspidbg("ERROR: QSPI%d not supported\n", intf);
+      qspierr("ERROR: QSPI%d not supported\n", intf);
       return NULL;
     }
 
@@ -1801,7 +1801,7 @@ struct qspi_dev_s *sam_qspi_initialize(int intf)
           priv->dmach = sam_dmachannel(0, 0);
           if (!priv->dmach)
             {
-              qspidbg("ERROR: Failed to allocate the DMA channel\n");
+              qspierr("ERROR: Failed to allocate the DMA channel\n");
               priv->candma = false;
             }
         }
@@ -1817,7 +1817,7 @@ struct qspi_dev_s *sam_qspi_initialize(int intf)
       priv->dmadog = wd_create();
       if (priv->dmadog == NULL)
         {
-          qspidbg("ERROR: Failed to create wdog\n");
+          qspierr("ERROR: Failed to create wdog\n");
           goto errout_with_dmahandles;
         }
 #endif
@@ -1828,7 +1828,7 @@ struct qspi_dev_s *sam_qspi_initialize(int intf)
       ret = irq_attach(priv->irq, priv->handler);
       if (ret < 0)
         {
-          qspidbg("ERROR: Failed to attach irq %d\n", priv->irq);
+          qspierr("ERROR: Failed to attach irq %d\n", priv->irq);
           goto errout_with_dmadog;
         }
 #endif
@@ -1840,7 +1840,7 @@ struct qspi_dev_s *sam_qspi_initialize(int intf)
       ret = qspi_hw_initialize(priv);
       if (ret < 0)
         {
-          qspidbg("ERROR: Failed to initialize QSPI hardware\n");
+          qspierr("ERROR: Failed to initialize QSPI hardware\n");
           goto errout_with_irq;
         }
 
diff --git a/arch/arm/src/samv7/sam_rswdt.c b/arch/arm/src/samv7/sam_rswdt.c
index c241027a19..a176d22d9c 100644
--- a/arch/arm/src/samv7/sam_rswdt.c
+++ b/arch/arm/src/samv7/sam_rswdt.c
@@ -87,10 +87,10 @@
  */
 
 #ifdef CONFIG_DEBUG_WATCHDOG
-#  define wddbg    llerr
+#  define wderr    llerr
 #  define wdinfo   llinfo
 #else
-#  define wddbg(x...)
+#  define wderr(x...)
 #  define wdinfo(x...)
 #endif
 
@@ -463,7 +463,7 @@ static int sam_settimeout(FAR struct watchdog_lowerhalf_s *lower,
 
   if (timeout < RSWDT_MINTIMEOUT || timeout >= RSWDT_MAXTIMEOUT)
     {
-      wddbg("Cannot represent timeout: %d < %d > %d\n",
+      wderr("Cannot represent timeout: %d < %d > %d\n",
             RSWDT_MINTIMEOUT, timeout, RSWDT_MAXTIMEOUT);
       return -ERANGE;
     }
@@ -574,7 +574,7 @@ static xcpt_t sam_capture(FAR struct watchdog_lowerhalf_s *lower,
                             xcpt_t handler)
 {
 #ifndef CONFIG_SAMV7_RSWDT_INTERRUPT
-  wddbg("ERROR: Not configured for this mode\n");
+  wderr("ERROR: Not configured for this mode\n");
   return NULL;
 #else
   FAR struct sam_lowerhalf_s *priv = (FAR struct sam_lowerhalf_s *)lower;
diff --git a/arch/arm/src/samv7/sam_spi.c b/arch/arm/src/samv7/sam_spi.c
index 68d997440d..f9fee7548a 100644
--- a/arch/arm/src/samv7/sam_spi.c
+++ b/arch/arm/src/samv7/sam_spi.c
@@ -136,14 +136,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg llerr
+#  define spierr llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -1086,7 +1086,7 @@ static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency)
   spics->frequency = frequency;
   spics->actual    = actual;
 
-  spidbg("Frequency %d->%d\n", frequency, actual);
+  spierr("Frequency %d->%d\n", frequency, actual);
   return actual;
 }
 
@@ -1549,7 +1549,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
   ret = sam_dmarxsetup(spics->rxdma, regaddr, memaddr, nwords);
   if (ret < 0)
     {
-      dmadbg("ERROR: sam_dmarxsetup failed: %d\n", ret);
+      dmaerr("ERROR: sam_dmarxsetup failed: %d\n", ret);
       return;
     }
 
@@ -1563,7 +1563,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
   ret = sam_dmatxsetup(spics->txdma, regaddr, memaddr, nwords);
   if (ret < 0)
     {
-      dmadbg("ERROR: sam_dmatxsetup failed: %d\n", ret);
+      dmaerr("ERROR: sam_dmatxsetup failed: %d\n", ret);
       return;
     }
 
@@ -1575,7 +1575,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
   ret = sam_dmastart(spics->rxdma, spi_rxcallback, (void *)spics);
   if (ret < 0)
     {
-      dmadbg("ERROR: RX sam_dmastart failed: %d\n", ret);
+      dmaerr("ERROR: RX sam_dmastart failed: %d\n", ret);
       return;
     }
 
@@ -1584,7 +1584,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
   ret = sam_dmastart(spics->txdma, spi_txcallback, (void *)spics);
   if (ret < 0)
     {
-      dmadbg("ERROR: RX sam_dmastart failed: %d\n", ret);
+      dmaerr("ERROR: RX sam_dmastart failed: %d\n", ret);
       sam_dmastop(spics->rxdma);
       return;
     }
@@ -1606,7 +1606,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
                      (wdentry_t)spi_dmatimeout, 1, (uint32_t)spics);
       if (ret != OK)
         {
-           spidbg("ERROR: wd_start failed: %d\n", ret);
+           spierr("ERROR: wd_start failed: %d\n", ret);
         }
 
       /* Wait for the DMA complete */
@@ -1657,7 +1657,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
 
   if (spics->result)
     {
-      spidbg("ERROR: DMA failed with result: %d\n", spics->result);
+      spierr("ERROR: DMA failed with result: %d\n", spics->result);
     }
 }
 #endif /* CONFIG_SAMV7_SPI_DMA */
@@ -1770,7 +1770,7 @@ FAR struct spi_dev_s *sam_spibus_initialize(int port)
   spics = (struct sam_spics_s *)zalloc(sizeof(struct sam_spics_s));
   if (!spics)
     {
-      spidbg("ERROR: Failed to allocate a chip select structure\n");
+      spierr("ERROR: Failed to allocate a chip select structure\n");
       return NULL;
     }
 
@@ -1790,7 +1790,7 @@ FAR struct spi_dev_s *sam_spibus_initialize(int port)
       spics->rxdma = sam_dmachannel(0, 0);
       if (!spics->rxdma)
         {
-          spidbg("ERROR: Failed to allocate the RX DMA channel\n");
+          spierr("ERROR: Failed to allocate the RX DMA channel\n");
           spics->candma = false;
         }
     }
@@ -1800,7 +1800,7 @@ FAR struct spi_dev_s *sam_spibus_initialize(int port)
       spics->txdma = sam_dmachannel(0, 0);
       if (!spics->txdma)
         {
-          spidbg("ERROR: Failed to allocate the TX DMA channel\n");
+          spierr("ERROR: Failed to allocate the TX DMA channel\n");
           sam_dmafree(spics->rxdma);
           spics->rxdma  = NULL;
           spics->candma = false;
diff --git a/arch/arm/src/samv7/sam_spi_slave.c b/arch/arm/src/samv7/sam_spi_slave.c
index 5d8d4987e6..f854b11ba0 100644
--- a/arch/arm/src/samv7/sam_spi_slave.c
+++ b/arch/arm/src/samv7/sam_spi_slave.c
@@ -85,14 +85,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg llerr
+#  define spierr llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -464,7 +464,7 @@ static int spi_interrupt(struct sam_spidev_s *priv)
         {
           /* If debug is enabled, report any overrun errors */
 
-          spidbg("Error: Overrun (OVRES): %08x\n", pending);
+          spierr("Error: Overrun (OVRES): %08x\n", pending);
 
           /* OVRES was cleared by the status read. */
         }
@@ -531,7 +531,7 @@ static int spi_interrupt(struct sam_spidev_s *priv)
         {
           /* If debug is enabled, report any overrun errors */
 
-          spidbg("Error: Underrun (UNDEX): %08x\n", pending);
+          spierr("Error: Underrun (UNDEX): %08x\n", pending);
 
           /* UNDES was cleared by the status read. */
         }
diff --git a/arch/arm/src/samv7/sam_ssc.c b/arch/arm/src/samv7/sam_ssc.c
index bc3d7644e4..d83471706c 100644
--- a/arch/arm/src/samv7/sam_ssc.c
+++ b/arch/arm/src/samv7/sam_ssc.c
@@ -387,16 +387,16 @@
 #endif
 
 #ifdef CONFIG_DEBUG_I2S
-#  define i2sdbg         dbg
+#  define i2serr         err
 #  define i2sllerr       llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define i2sinfo      dbg
+#    define i2sinfo      err
 #    define i2sllinfo    llerr
 #  else
 #    define i2sinfo(x...)
 #  endif
 #else
-#  define i2sdbg(x...)
+#  define i2serr(x...)
 #  define i2sllerr(x...)
 #  define i2sinfo(x...)
 #  define i2sllinfo(x...)
@@ -2054,7 +2054,7 @@ static int ssc_checkwidth(struct sam_ssc_s *priv, int bits)
       break;
 
     default:
-      i2sdbg("ERROR: Unsupported or invalid data width: %d\n", bits);
+      i2serr("ERROR: Unsupported or invalid data width: %d\n", bits);
       return (bits < 2 || bits > 32) ? -EINVAL : -ENOSYS;
     }
 
@@ -2132,7 +2132,7 @@ static uint32_t ssc_rxdatawidth(struct i2s_dev_s *dev, int bits)
   ret = ssc_checkwidth(priv, bits);
   if (ret < 0)
     {
-      i2sdbg("ERROR: ssc_checkwidth failed: %d\n", ret);
+      i2serr("ERROR: ssc_checkwidth failed: %d\n", ret);
       return 0;
     }
 
@@ -2141,7 +2141,7 @@ static uint32_t ssc_rxdatawidth(struct i2s_dev_s *dev, int bits)
   ret = ssc_dma_flags(priv, &dmaflags);
   if (ret < 0)
     {
-      i2sdbg("ERROR: ssc_dma_flags failed: %d\n", ret);
+      i2serr("ERROR: ssc_dma_flags failed: %d\n", ret);
       return 0;
     }
 
@@ -2230,7 +2230,7 @@ static int ssc_receive(struct i2s_dev_s *dev, struct ap_buffer_s *apb,
 
   if (!priv->rxenab)
     {
-      i2sdbg("ERROR: SSC%d has no receiver\n", priv->sscno);
+      i2serr("ERROR: SSC%d has no receiver\n", priv->sscno);
       ret = -EAGAIN;
       goto errout_with_exclsem;
     }
@@ -2269,7 +2269,7 @@ errout_with_exclsem:
   return ret;
 
 #else
-  i2sdbg("ERROR: SSC%d has no receiver\n", priv->sscno);
+  i2serr("ERROR: SSC%d has no receiver\n", priv->sscno);
   UNUSED(priv);
   return -ENOSYS;
 #endif
@@ -2343,7 +2343,7 @@ static uint32_t ssc_txdatawidth(struct i2s_dev_s *dev, int bits)
   ret = ssc_checkwidth(priv, bits);
   if (ret < 0)
     {
-      i2sdbg("ERROR: ssc_checkwidth failed: %d\n", ret);
+      i2serr("ERROR: ssc_checkwidth failed: %d\n", ret);
       return 0;
     }
 
@@ -2352,7 +2352,7 @@ static uint32_t ssc_txdatawidth(struct i2s_dev_s *dev, int bits)
   ret = ssc_dma_flags(priv, &dmaflags);
   if (ret < 0)
     {
-      i2sdbg("ERROR: ssc_dma_flags failed: %d\n", ret);
+      i2serr("ERROR: ssc_dma_flags failed: %d\n", ret);
       return 0;
     }
 
@@ -2447,7 +2447,7 @@ static int ssc_send(struct i2s_dev_s *dev, struct ap_buffer_s *apb,
 
   if (!priv->txenab)
     {
-      i2sdbg("ERROR: SSC%d has no transmitter\n", priv->sscno);
+      i2serr("ERROR: SSC%d has no transmitter\n", priv->sscno);
       ret = -EAGAIN;
       goto errout_with_exclsem;
     }
@@ -2486,7 +2486,7 @@ errout_with_exclsem:
   return ret;
 
 #else
-  i2sdbg("ERROR: SSC%d has no transmitter\n", priv->sscno);
+  i2serr("ERROR: SSC%d has no transmitter\n", priv->sscno);
   UNUSED(priv);
   return -ENOSYS;
 #endif
@@ -2540,7 +2540,7 @@ static int ssc_rx_configure(struct sam_ssc_s *priv)
 
     case SSC_CLKSRC_NONE: /* No clock */
     default:
-      i2sdbg("ERROR:  No receiver clock\n");
+      i2serr("ERROR:  No receiver clock\n");
       return -EINVAL;
     }
 
@@ -2561,7 +2561,7 @@ static int ssc_rx_configure(struct sam_ssc_s *priv)
       break;
 
     default:
-      i2sdbg("ERROR: Invalid clock output selection\n");
+      i2serr("ERROR: Invalid clock output selection\n");
       return -EINVAL;
     }
 
@@ -2665,7 +2665,7 @@ static int ssc_tx_configure(struct sam_ssc_s *priv)
 
     case SSC_CLKSRC_NONE: /* No clock */
     default:
-      i2sdbg("ERROR:  No transmitter clock\n");
+      i2serr("ERROR:  No transmitter clock\n");
       return -EINVAL;
     }
 
@@ -2686,7 +2686,7 @@ static int ssc_tx_configure(struct sam_ssc_s *priv)
       break;
 
     default:
-      i2sdbg("ERROR: Invalid clock output selection\n");
+      i2serr("ERROR: Invalid clock output selection\n");
       return -EINVAL;
     }
 
@@ -2945,7 +2945,7 @@ static int ssc_dma_flags(struct sam_ssc_s *priv, uint32_t *dmaflags)
       break;
 
     default:
-      i2sdbg("ERROR: Unsupported data width: %d\n", priv->datalen);
+      i2serr("ERROR: Unsupported data width: %d\n", priv->datalen);
       return -ENOSYS;
     }
 
@@ -2978,7 +2978,7 @@ static int ssc_dma_allocate(struct sam_ssc_s *priv)
   ret = ssc_dma_flags(priv, &dmaflags);
   if (ret < 0)
     {
-      i2sdbg("ERROR: ssc_dma_flags failed: %d\n", ret);
+      i2serr("ERROR: ssc_dma_flags failed: %d\n", ret);
       return ret;
     }
 
@@ -2992,7 +2992,7 @@ static int ssc_dma_allocate(struct sam_ssc_s *priv)
       priv->rx.dma = sam_dmachannel(0, dmaflags);
       if (!priv->rx.dma)
         {
-          i2sdbg("ERROR: Failed to allocate the RX DMA channel\n");
+          i2serr("ERROR: Failed to allocate the RX DMA channel\n");
           goto errout;
         }
 
@@ -3001,7 +3001,7 @@ static int ssc_dma_allocate(struct sam_ssc_s *priv)
       priv->rx.dog = wd_create();
       if (!priv->rx.dog)
         {
-          i2sdbg("ERROR: Failed to create the RX DMA watchdog\n");
+          i2serr("ERROR: Failed to create the RX DMA watchdog\n");
           goto errout;
         }
     }
@@ -3015,7 +3015,7 @@ static int ssc_dma_allocate(struct sam_ssc_s *priv)
       priv->tx.dma = sam_dmachannel(0, dmaflags);
       if (!priv->tx.dma)
         {
-          i2sdbg("ERROR: Failed to allocate the TX DMA channel\n");
+          i2serr("ERROR: Failed to allocate the TX DMA channel\n");
           goto errout;
         }
 
@@ -3024,7 +3024,7 @@ static int ssc_dma_allocate(struct sam_ssc_s *priv)
       priv->tx.dog = wd_create();
       if (!priv->tx.dog)
         {
-          i2sdbg("ERROR: Failed to create the TX DMA watchdog\n");
+          i2serr("ERROR: Failed to create the TX DMA watchdog\n");
           goto errout;
         }
     }
@@ -3415,7 +3415,7 @@ struct i2s_dev_s *sam_ssc_initialize(int port)
   priv = (struct sam_ssc_s *)zalloc(sizeof(struct sam_ssc_s));
   if (!priv)
     {
-      i2sdbg("ERROR: Failed to allocate a chip select structure\n");
+      i2serr("ERROR: Failed to allocate a chip select structure\n");
       return NULL;
     }
 
@@ -3449,7 +3449,7 @@ struct i2s_dev_s *sam_ssc_initialize(int port)
   else
 #endif /* CONFIG_SAMV7_SSC1 */
     {
-      i2sdbg("ERROR:  Unsupported I2S port: %d\n", port);
+      i2serr("ERROR:  Unsupported I2S port: %d\n", port);
       goto errout_with_alloc;
     }
 
@@ -3470,7 +3470,7 @@ struct i2s_dev_s *sam_ssc_initialize(int port)
   ret = ssc_rx_configure(priv);
   if (ret < 0)
     {
-      i2sdbg("ERROR: Failed to configure the receiver: %d\n", ret);
+      i2serr("ERROR: Failed to configure the receiver: %d\n", ret);
       goto errout_with_clocking;
     }
 
@@ -3479,7 +3479,7 @@ struct i2s_dev_s *sam_ssc_initialize(int port)
   ret = ssc_tx_configure(priv);
   if (ret < 0)
     {
-      i2sdbg("ERROR: Failed to configure the transmitter: %d\n", ret);
+      i2serr("ERROR: Failed to configure the transmitter: %d\n", ret);
       goto errout_with_clocking;
     }
 
diff --git a/arch/arm/src/samv7/sam_tc.c b/arch/arm/src/samv7/sam_tc.c
index 30ac1a8fb6..50f2bad062 100644
--- a/arch/arm/src/samv7/sam_tc.c
+++ b/arch/arm/src/samv7/sam_tc.c
@@ -1066,7 +1066,7 @@ static int sam_tc_mcksrc(uint32_t frequency, uint32_t *tcclks,
     {
       /* If no divisor can be found, return -ERANGE */
 
-      tcdbg("Lower bound search failed\n");
+      tcerr("Lower bound search failed\n");
       return -ERANGE;
     }
 
@@ -1169,7 +1169,7 @@ static inline struct sam_chan_s *sam_tc_initialize(int channel)
     {
       /* Timer/counter is not invalid or not enabled */
 
-      tcdbg("ERROR: Bad channel number: %d\n", channel);
+      tcerr("ERROR: Bad channel number: %d\n", channel);
       return NULL;
     }
 
@@ -1225,7 +1225,7 @@ static inline struct sam_chan_s *sam_tc_initialize(int channel)
     {
       /* Yes.. return a failure */
 
-      tcdbg("Channel %d is in-use\n", channel);
+      tcerr("Channel %d is in-use\n", channel);
       sam_givesem(tc);
       return NULL;
     }
diff --git a/arch/arm/src/samv7/sam_tc.h b/arch/arm/src/samv7/sam_tc.h
index bf6f279703..508b297f09 100644
--- a/arch/arm/src/samv7/sam_tc.h
+++ b/arch/arm/src/samv7/sam_tc.h
@@ -87,12 +87,12 @@
 /* Timer/counter debug output */
 
 #ifdef CONFIG_SAMV7_TC_DEBUG
-#  define tcdbg    dbg
+#  define tcerr    err
 #  define tcinfo   info
 #  define tcllerr  llerr
 #  define tcllinfo llinfo
 #else
-#  define tcdbg(x...)
+#  define tcerr(x...)
 #  define tcinfo(x...)
 #  define tcllerr(x...)
 #  define tcllinfo(x...)
diff --git a/arch/arm/src/samv7/sam_trng.c b/arch/arm/src/samv7/sam_trng.c
index 392e6af70f..7dc29a77d8 100644
--- a/arch/arm/src/samv7/sam_trng.c
+++ b/arch/arm/src/samv7/sam_trng.c
@@ -363,7 +363,7 @@ void up_rnginitialize(void)
 
   if (irq_attach(SAM_IRQ_TRNG, sam_interrupt))
     {
-      fdbg("ERROR: Failed to attach to IRQ%d\n", SAM_IRQ_TRNG);
+      ferr("ERROR: Failed to attach to IRQ%d\n", SAM_IRQ_TRNG);
       return;
     }
 
@@ -380,7 +380,7 @@ void up_rnginitialize(void)
   ret = register_driver("/dev/random", &g_trngops, 0644, NULL);
   if (ret < 0)
     {
-      fdbg("ERROR: Failed to register /dev/random\n");
+      ferr("ERROR: Failed to register /dev/random\n");
       return;
     }
 
diff --git a/arch/arm/src/samv7/sam_twihs.c b/arch/arm/src/samv7/sam_twihs.c
index 9319b2b65f..67f989d842 100644
--- a/arch/arm/src/samv7/sam_twihs.c
+++ b/arch/arm/src/samv7/sam_twihs.c
@@ -124,12 +124,12 @@
 /* CONFIG_DEBUG_I2C + CONFIG_DEBUG_FEATURES enables general I2C debug output. */
 
 #ifdef CONFIG_DEBUG_I2C
-#  define i2cdbg    dbg
+#  define i2cerr    err
 #  define i2cinfo   info
 #  define i2cllerr  llerr
 #  define i2cllinfo llinfo
 #else
-#  define i2cdbg(x...)
+#  define i2cerr(x...)
 #  define i2cinfo(x...)
 #  define i2cllerr(x...)
 #  define i2cllinfo(x...)
@@ -917,7 +917,7 @@ static int twi_transfer(FAR struct i2c_master_s *dev,
   ret = twi_wait(priv, size);
   if (ret < 0)
     {
-      i2cdbg("ERROR: Transfer failed: %d\n", ret);
+      i2cerr("ERROR: Transfer failed: %d\n", ret);
     }
 
   leave_critical_section(flags);
@@ -1303,7 +1303,7 @@ struct i2c_master_s *sam_i2cbus_initialize(int bus)
   else
 #endif
     {
-      i2cdbg("ERROR: Unsupported bus: TWIHS%d\n", bus);
+      i2cerr("ERROR: Unsupported bus: TWIHS%d\n", bus);
       return NULL;
     }
 
@@ -1320,7 +1320,7 @@ struct i2c_master_s *sam_i2cbus_initialize(int bus)
       priv->timeout = wd_create();
       if (priv->timeout == NULL)
         {
-          idbg("ERROR: Failed to allocate a timer\n");
+          ierr("ERROR: Failed to allocate a timer\n");
           goto errout_with_irq;
         }
 
@@ -1329,7 +1329,7 @@ struct i2c_master_s *sam_i2cbus_initialize(int bus)
       ret = irq_attach(priv->attr->irq, priv->attr->handler);
       if (ret < 0)
         {
-          idbg("ERROR: Failed to attach irq %d\n", priv->attr->irq);
+          ierr("ERROR: Failed to attach irq %d\n", priv->attr->irq);
           goto errout_with_wdog;
         }
 
diff --git a/arch/arm/src/samv7/sam_usbdevhs.c b/arch/arm/src/samv7/sam_usbdevhs.c
index cb58f3bff1..8c8cde272a 100644
--- a/arch/arm/src/samv7/sam_usbdevhs.c
+++ b/arch/arm/src/samv7/sam_usbdevhs.c
@@ -4692,7 +4692,7 @@ static void sam_sw_setup(struct sam_usbdev_s *priv)
     kmm_memalign(16, CONFIG_SAMV7_USBDEVHS_NDTDS * sizeof(struct sam_dtd_s));
   if (!priv->dtdpool)
      {
-      udbg("ERROR: Failed to allocate the DMA transfer descriptor pool\n");
+      uerr("ERROR: Failed to allocate the DMA transfer descriptor pool\n");
       return NULL;
     }
 
diff --git a/arch/arm/src/samv7/sam_wdt.c b/arch/arm/src/samv7/sam_wdt.c
index b8d59b9363..e55405785c 100644
--- a/arch/arm/src/samv7/sam_wdt.c
+++ b/arch/arm/src/samv7/sam_wdt.c
@@ -87,10 +87,10 @@
  */
 
 #ifdef CONFIG_DEBUG_WATCHDOG
-#  define wddbg    llerr
+#  define wderr    llerr
 #  define wdinfo   llinfo
 #else
-#  define wddbg(x...)
+#  define wderr(x...)
 #  define wdinfo(x...)
 #endif
 
@@ -463,7 +463,7 @@ static int sam_settimeout(FAR struct watchdog_lowerhalf_s *lower,
 
   if (timeout < WDT_MINTIMEOUT || timeout >= WDT_MAXTIMEOUT)
     {
-      wddbg("Cannot represent timeout: %d < %d > %d\n",
+      wderr("Cannot represent timeout: %d < %d > %d\n",
             WDT_MINTIMEOUT, timeout, WDT_MAXTIMEOUT);
       return -ERANGE;
     }
@@ -574,7 +574,7 @@ static xcpt_t sam_capture(FAR struct watchdog_lowerhalf_s *lower,
                             xcpt_t handler)
 {
 #ifndef CONFIG_SAMV7_WDT_INTERRUPT
-  wddbg("ERROR: Not configured for this mode\n");
+  wderr("ERROR: Not configured for this mode\n");
   return NULL;
 #else
   FAR struct sam_lowerhalf_s *priv = (FAR struct sam_lowerhalf_s *)lower;
diff --git a/arch/arm/src/samv7/sam_xdmac.c b/arch/arm/src/samv7/sam_xdmac.c
index c9a2591f37..24a5eaf9fa 100644
--- a/arch/arm/src/samv7/sam_xdmac.c
+++ b/arch/arm/src/samv7/sam_xdmac.c
@@ -551,7 +551,7 @@ static uint8_t sam_channel(uint8_t pid, const struct sam_pidmap_s *table,
         }
     }
 
-  dmadbg("No channel found for pid %d\n", pid);
+  dmaerr("No channel found for pid %d\n", pid);
   DEBUGPANIC();
   return 0x3f;
 }
@@ -1702,7 +1702,7 @@ DMA_HANDLE sam_dmachannel(uint8_t dmacno, uint32_t chflags)
     }
   else
     {
-      dmadbg("ERROR: Failed allocate XDMAC%d channel\n", (int)dmacno);
+      dmaerr("ERROR: Failed allocate XDMAC%d channel\n", (int)dmacno);
     }
 
   return (DMA_HANDLE)xdmach;
@@ -2076,28 +2076,28 @@ void sam_dmadump(DMA_HANDLE handle, const struct sam_dmaregs_s *regs,
 {
   struct sam_xdmach_s *xdmach = (struct sam_xdmach_s *)handle;
 
-  dmadbg("%s\n", msg);
-  dmadbg("  DMA Global Registers:\n");
-  dmadbg("     GTYPE[%08x]: %08x\n", SAM_XDMAC_GTYPE, regs->gtype);
-  dmadbg("      GCFG[%08x]: %08x\n", SAM_XDMAC_GCFG, regs->gcfg);
-  dmadbg("      GWAC[%08x]: %08x\n", SAM_XDMAC_GWAC, regs->gwac);
-  dmadbg("       GIM[%08x]: %08x\n", SAM_XDMAC_GIM, regs->gim);
-  dmadbg("        GS[%08x]: %08x\n", SAM_XDMAC_GS, regs->gs);
-  dmadbg("       GRS[%08x]: %08x\n", SAM_XDMAC_GRS, regs->grs);
-  dmadbg("       GWS[%08x]: %08x\n", SAM_XDMAC_GWS, regs->gws);
-  dmadbg("      GSWS[%08x]: %08x\n", SAM_XDMAC_GSWS, regs->gsws);
-  dmadbg("  DMA Channel Registers:\n");
-  dmadbg("       CIM[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CIM_OFFSET, regs->cim);
-  dmadbg("       CSA[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CSA_OFFSET, regs->csa);
-  dmadbg("       CDA[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CDA_OFFSET, regs->cda);
-  dmadbg("      CNDA[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CNDA_OFFSET, regs->cnda);
-  dmadbg("      CNDC[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CNDC_OFFSET, regs->cndc);
-  dmadbg("      CUBC[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CUBC_OFFSET, regs->cubc);
-  dmadbg("       CBC[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CBC_OFFSET, regs->cbc);
-  dmadbg("        CC[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CC_OFFSET, regs->cc);
-  dmadbg("    CDSMSP[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CDSMSP_OFFSET, regs->cdsmsp);
-  dmadbg("      CSUS[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CSUS_OFFSET, regs->csus);
-  dmadbg("      CDUS[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CDUS_OFFSET, regs->cdus);
+  dmaerr("%s\n", msg);
+  dmaerr("  DMA Global Registers:\n");
+  dmaerr("     GTYPE[%08x]: %08x\n", SAM_XDMAC_GTYPE, regs->gtype);
+  dmaerr("      GCFG[%08x]: %08x\n", SAM_XDMAC_GCFG, regs->gcfg);
+  dmaerr("      GWAC[%08x]: %08x\n", SAM_XDMAC_GWAC, regs->gwac);
+  dmaerr("       GIM[%08x]: %08x\n", SAM_XDMAC_GIM, regs->gim);
+  dmaerr("        GS[%08x]: %08x\n", SAM_XDMAC_GS, regs->gs);
+  dmaerr("       GRS[%08x]: %08x\n", SAM_XDMAC_GRS, regs->grs);
+  dmaerr("       GWS[%08x]: %08x\n", SAM_XDMAC_GWS, regs->gws);
+  dmaerr("      GSWS[%08x]: %08x\n", SAM_XDMAC_GSWS, regs->gsws);
+  dmaerr("  DMA Channel Registers:\n");
+  dmaerr("       CIM[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CIM_OFFSET, regs->cim);
+  dmaerr("       CSA[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CSA_OFFSET, regs->csa);
+  dmaerr("       CDA[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CDA_OFFSET, regs->cda);
+  dmaerr("      CNDA[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CNDA_OFFSET, regs->cnda);
+  dmaerr("      CNDC[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CNDC_OFFSET, regs->cndc);
+  dmaerr("      CUBC[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CUBC_OFFSET, regs->cubc);
+  dmaerr("       CBC[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CBC_OFFSET, regs->cbc);
+  dmaerr("        CC[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CC_OFFSET, regs->cc);
+  dmaerr("    CDSMSP[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CDSMSP_OFFSET, regs->cdsmsp);
+  dmaerr("      CSUS[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CSUS_OFFSET, regs->csus);
+  dmaerr("      CDUS[%08x]: %08x\n", xdmach->base + SAM_XDMACH_CDUS_OFFSET, regs->cdus);
 }
 #endif /* CONFIG_DEBUG_DMA */
 #endif /* CONFIG_SAMV7_XDMAC */
diff --git a/arch/arm/src/stm32/stm32_adc.c b/arch/arm/src/stm32/stm32_adc.c
index ac8d4636c2..d730923a22 100644
--- a/arch/arm/src/stm32/stm32_adc.c
+++ b/arch/arm/src/stm32/stm32_adc.c
@@ -906,7 +906,7 @@ static int adc_timinit(FAR struct stm32_dev_s *priv)
 
   if (prescaler < 1)
     {
-      adbg("WARNING: Prescaler underflowed.\n");
+      aerr("WARNING: Prescaler underflowed.\n");
       prescaler = 1;
     }
 
@@ -914,7 +914,7 @@ static int adc_timinit(FAR struct stm32_dev_s *priv)
 
   else if (prescaler > 65536)
     {
-      adbg("WARNING: Prescaler overflowed.\n");
+      aerr("WARNING: Prescaler overflowed.\n");
       prescaler = 65536;
     }
 
@@ -923,12 +923,12 @@ static int adc_timinit(FAR struct stm32_dev_s *priv)
   reload = timclk / priv->freq;
   if (reload < 1)
     {
-      adbg("WARNING: Reload value underflowed.\n");
+      aerr("WARNING: Reload value underflowed.\n");
       reload = 1;
     }
   else if (reload > 65535)
     {
-      adbg("WARNING: Reload value overflowed.\n");
+      aerr("WARNING: Reload value overflowed.\n");
       reload = 65535;
     }
 
@@ -1070,7 +1070,7 @@ static int adc_timinit(FAR struct stm32_dev_s *priv)
         break;
 
       default:
-        adbg("No such trigger: %d\n", priv->trigger);
+        aerr("No such trigger: %d\n", priv->trigger);
         return -EINVAL;
     }
 
@@ -2002,7 +2002,7 @@ static void adc_reset(FAR struct adc_dev_s *dev)
       ret = adc_timinit(priv);
       if (ret < 0)
         {
-          adbg("adc_timinit failed: %d\n", ret);
+          aerr("adc_timinit failed: %d\n", ret);
         }
     }
 #ifndef CONFIG_ADC_NO_STARTUP_CONV
@@ -2680,7 +2680,7 @@ static int adc_ioctl(FAR struct adc_dev_s *dev, int cmd, unsigned long arg)
 #endif /* CONFIG_STM32_STM32L15XX */
 
       default:
-        adbg("ERROR: Unknown cmd: %d\n", cmd);
+        aerr("ERROR: Unknown cmd: %d\n", cmd);
         ret = -ENOTTY;
         break;
     }
@@ -3012,7 +3012,7 @@ struct adc_dev_s *stm32_adcinitialize(int intf, FAR const uint8_t *chanlist,
         break;
 #endif
       default:
-        adbg("No ADC interface defined\n");
+        aerr("No ADC interface defined\n");
         return NULL;
     }
 
diff --git a/arch/arm/src/stm32/stm32_can.c b/arch/arm/src/stm32/stm32_can.c
index 73feb048c7..34c326cfe8 100644
--- a/arch/arm/src/stm32/stm32_can.c
+++ b/arch/arm/src/stm32/stm32_can.c
@@ -85,12 +85,12 @@
 /* Non-standard debug that may be enabled just for testing CAN */
 
 #ifdef CONFIG_DEBUG_CAN
-#  define candbg    dbg
+#  define canerr    err
 #  define caninfo   info
 #  define canllerr  llerr
 #  define canllinfo llinfo
 #else
-#  define candbg(x...)
+#  define canerr(x...)
 #  define caninfo(x...)
 #  define canllerr(x...)
 #  define canllinfo(x...)
@@ -1745,7 +1745,7 @@ FAR struct can_dev_s *stm32_caninitialize(int port)
   else
 #endif
     {
-      candbg("ERROR: Unsupported port %d\n", port);
+      canerr("ERROR: Unsupported port %d\n", port);
       return NULL;
     }
 
diff --git a/arch/arm/src/stm32/stm32_dac.c b/arch/arm/src/stm32/stm32_dac.c
index 9f879f3166..a2cfcea92f 100644
--- a/arch/arm/src/stm32/stm32_dac.c
+++ b/arch/arm/src/stm32/stm32_dac.c
@@ -852,7 +852,7 @@ static int dac_timinit(FAR struct stm32_chan_s *chan)
         break;
 #endif
       default:
-        adbg("Could not enable timer\n");
+        aerr("Could not enable timer\n");
         break;
     }
 
@@ -1016,7 +1016,7 @@ static int dac_chaninit(FAR struct stm32_chan_s *chan)
       chan->dma = stm32_dmachannel(chan->dmachan);
       if (!chan->dma)
         {
-          adbg("Failed to allocate a DMA channel\n");
+          aerr("Failed to allocate a DMA channel\n");
           return -EBUSY;
         }
 
@@ -1025,7 +1025,7 @@ static int dac_chaninit(FAR struct stm32_chan_s *chan)
       ret = dac_timinit(chan);
       if (ret < 0)
         {
-          adbg("Failed to initialize the DMA timer: %d\n", ret);
+          aerr("Failed to initialize the DMA timer: %d\n", ret);
           return ret;
         }
     }
@@ -1128,7 +1128,7 @@ FAR struct dac_dev_s *stm32_dacinitialize(int intf)
   else
 #endif
     {
-      adbg("No such DAC interface: %d\n", intf);
+      aerr("No such DAC interface: %d\n", intf);
       errno = ENODEV;
       return NULL;
     }
@@ -1138,7 +1138,7 @@ FAR struct dac_dev_s *stm32_dacinitialize(int intf)
   ret = dac_blockinit();
   if (ret < 0)
     {
-      adbg("Failed to initialize the DAC block: %d\n", ret);
+      aerr("Failed to initialize the DAC block: %d\n", ret);
       errno = -ret;
       return NULL;
     }
@@ -1149,7 +1149,7 @@ FAR struct dac_dev_s *stm32_dacinitialize(int intf)
   ret  = dac_chaninit(chan);
   if (ret < 0)
     {
-      adbg("Failed to initialize DAC channel %d: %d\n", intf, ret);
+      aerr("Failed to initialize DAC channel %d: %d\n", intf, ret);
       errno = -ret;
       return NULL;
     }
diff --git a/arch/arm/src/stm32/stm32_dma2d.c b/arch/arm/src/stm32/stm32_dma2d.c
index 213e4bfa67..06325fe28d 100644
--- a/arch/arm/src/stm32/stm32_dma2d.c
+++ b/arch/arm/src/stm32/stm32_dma2d.c
@@ -137,10 +137,10 @@
 /* Debug option */
 
 #ifdef CONFIG_STM32_DMA2D_REGDEBUG
-#  define regdbg       dbg
+#  define regerr       err
 #  define reginfo      info
 #else
-#  define regdbg(x...)
+#  define regerr(x...)
 #  define reginfo(x...)
 #endif
 
@@ -469,7 +469,7 @@ static int stm32_dma2dirq(int irq, void *context)
 
       if (ret != OK)
         {
-          dbg("sem_post() failed\n");
+          err("sem_post() failed\n");
           return ret;
         }
     }
@@ -512,7 +512,7 @@ static int stm32_dma2d_waitforirq(void)
 
       if (ret != OK)
         {
-          dbg("sem_wait() failed\n");
+          err("sem_wait() failed\n");
           return ret;
         }
     }
@@ -711,7 +711,7 @@ static int stm32_dma2d_pixelformat(uint8_t fmt, uint8_t *fmtmap)
         break;
 #endif
       default:
-        gdbg("ERROR: Returning EINVAL\n");
+        gerr("ERROR: Returning EINVAL\n");
         return -EINVAL;
     }
 
@@ -756,7 +756,7 @@ static int stm32_dma2d_bpp(uint8_t fmt, uint8_t *bpp)
         break;
 #endif
       default:
-        gdbg("ERROR: Returning EINVAL\n");
+        gerr("ERROR: Returning EINVAL\n");
         return -EINVAL;
     }
 
@@ -1055,7 +1055,7 @@ static int stm32_dma2d_loutpfc(FAR const struct stm32_dma2d_s *layer)
     {
       /* Destination layer doesn't support CLUT output */
 
-      gdbg("ERROR: Returning ENOSYS, "
+      gerr("ERROR: Returning ENOSYS, "
             "output to layer with CLUT format not supported.\n");
       return -ENOSYS;
     }
@@ -1183,7 +1183,7 @@ static int stm32_dma2dgetvideoinfo(FAR struct dma2d_layer_s *layer,
       return OK;
     }
 
-  gdbg("ERROR: Returning EINVAL\n");
+  gerr("ERROR: Returning EINVAL\n");
   return -ENOSYS;
 }
 
@@ -1220,7 +1220,7 @@ static int stm32_dma2dgetplaneinfo(FAR struct dma2d_layer_s *layer, int planeno,
       return OK;
     }
 
-  gdbg("ERROR: Returning EINVAL\n");
+  gerr("ERROR: Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -1254,7 +1254,7 @@ static int stm32_dma2dgetlid(FAR struct dma2d_layer_s *layer, int *lid)
       return OK;
     }
 
-  gdbg("ERROR: Returning EINVAL\n");
+  gerr("ERROR: Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -1320,13 +1320,13 @@ static int stm32_dma2dsetclut(FAR struct dma2d_layer_s *layer,
 
       if (priv->fmt != DMA2D_PF_L8)
         {
-          gdbg("Error: CLUT is not supported for the pixel format: %d\n",
+          gerr("Error: CLUT is not supported for the pixel format: %d\n",
                     priv->vinfo.fmt);
           ret = -EINVAL;
         }
       else if (cmap->first >= STM32_DMA2D_NCLUT)
         {
-          gdbg("Error: only %d color table entries supported\n",
+          gerr("Error: only %d color table entries supported\n",
                     STM32_DMA2D_NCLUT);
           ret = -EINVAL;
         }
@@ -1374,7 +1374,7 @@ static int stm32_dma2dsetclut(FAR struct dma2d_layer_s *layer,
       return ret;
     }
 
-  gdbg("ERROR: Returning EINVAL\n");
+  gerr("ERROR: Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -1409,13 +1409,13 @@ static int stm32_dma2dgetclut(FAR struct dma2d_layer_s *layer,
 
       if (priv->fmt != DMA2D_PF_L8)
         {
-          gdbg("Error: CLUT is not supported for the pixel format: %d\n",
+          gerr("Error: CLUT is not supported for the pixel format: %d\n",
                     priv->vinfo.fmt);
           ret = -EINVAL;
         }
       else if (cmap->first >= STM32_DMA2D_NCLUT)
         {
-          gdbg("Error: only %d color table entries supported\n",
+          gerr("Error: only %d color table entries supported\n",
                     STM32_DMA2D_NCLUT);
           ret = -EINVAL;
         }
@@ -1461,7 +1461,7 @@ static int stm32_dma2dgetclut(FAR struct dma2d_layer_s *layer,
       return ret;
     }
 
-  gdbg("ERROR: Returning EINVAL\n");
+  gerr("ERROR: Returning EINVAL\n");
   return -EINVAL;
 }
 #endif
@@ -1502,7 +1502,7 @@ static int stm32_dma2dsetalpha(FAR struct dma2d_layer_s *layer, uint8_t alpha)
       return OK;
     }
 
-  gdbg("ERROR: Returning EINVAL\n");
+  gerr("ERROR: Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -1537,7 +1537,7 @@ static int stm32_dma2dgetalpha(FAR struct dma2d_layer_s *layer, uint8_t *alpha)
       return OK;
     }
 
-  gdbg("ERROR: Returning EINVAL\n");
+  gerr("ERROR: Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -1588,7 +1588,7 @@ static int stm32_dma2dsetblendmode(FAR struct dma2d_layer_s *layer,
       return OK;
     }
 
-  gdbg("ERROR: Returning EINVAL\n");
+  gerr("ERROR: Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -1624,7 +1624,7 @@ static int stm32_dma2dgetblendmode(FAR struct dma2d_layer_s *layer,
       return OK;
     }
 
-  gdbg("ERROR: Returning EINVAL\n");
+  gerr("ERROR: Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -1718,7 +1718,7 @@ static int stm32_dma2dblit(FAR struct dma2d_layer_s *dest,
           if (ret != OK)
             {
               ret = -ECANCELED;
-              gdbg("ERROR: Returning ECANCELED\n");
+              gerr("ERROR: Returning ECANCELED\n");
             }
         }
 
@@ -1727,7 +1727,7 @@ static int stm32_dma2dblit(FAR struct dma2d_layer_s *dest,
   else
     {
       ret = -EINVAL;
-      gdbg("ERROR: Returning EINVAL\n");
+      gerr("ERROR: Returning EINVAL\n");
     }
 
   return ret;
@@ -1832,7 +1832,7 @@ static int stm32_dma2dblend(FAR struct dma2d_layer_s *dest,
           if (ret != OK)
             {
               ret = -ECANCELED;
-              gdbg("ERROR: Returning ECANCELED\n");
+              gerr("ERROR: Returning ECANCELED\n");
             }
         }
 
@@ -1841,7 +1841,7 @@ static int stm32_dma2dblend(FAR struct dma2d_layer_s *dest,
   else
     {
       ret = -EINVAL;
-      gdbg("ERROR: Returning EINVAL\n");
+      gerr("ERROR: Returning EINVAL\n");
     }
 
   return ret;
@@ -1912,7 +1912,7 @@ static int stm32_dma2dfillarea(FAR struct dma2d_layer_s *layer,
           if (ret != OK)
             {
               ret = -ECANCELED;
-              gdbg("ERROR: Returning ECANCELED\n");
+              gerr("ERROR: Returning ECANCELED\n");
             }
         }
 
@@ -1921,7 +1921,7 @@ static int stm32_dma2dfillarea(FAR struct dma2d_layer_s *layer,
   else
     {
       ret = -EINVAL;
-      gdbg("ERROR: Returning EINVAL\n");
+      gerr("ERROR: Returning EINVAL\n");
     }
 
   return ret;
@@ -1954,7 +1954,7 @@ FAR struct dma2d_layer_s * up_dma2dgetlayer(int lid)
       return &priv->dma2d;
     }
 
-  gdbg("ERROR: EINVAL, Unknown layer identifier\n");
+  gerr("ERROR: EINVAL, Unknown layer identifier\n");
   errno = EINVAL;
   return NULL;
 }
@@ -2069,19 +2069,19 @@ FAR struct dma2d_layer_s *up_dma2dcreatelayer(fb_coord_t width,
               /* free the layer struture */
 
               kmm_free(layer);
-              gdbg("ERROR: ENOMEM, Unable to allocate layer buffer\n");
+              gerr("ERROR: ENOMEM, Unable to allocate layer buffer\n");
               errno = ENOMEM;
             }
         }
       else
         {
-          gdbg("ERROR: ENOMEM, unable to allocate layer structure\n");
+          gerr("ERROR: ENOMEM, unable to allocate layer structure\n");
           errno = ENOMEM;
         }
     }
   else
     {
-      gdbg("ERROR: EINVAL, no free layer available\n");
+      gerr("ERROR: EINVAL, no free layer available\n");
       errno = EINVAL;
     }
 
@@ -2148,7 +2148,7 @@ int up_dma2dremovelayer(FAR struct dma2d_layer_s *layer)
 
 int up_dma2dinitialize(void)
 {
-  dbg("Initialize DMA2D driver\n");
+  err("Initialize DMA2D driver\n");
 
   if (g_initialized == false)
     {
@@ -2272,7 +2272,7 @@ FAR struct dma2d_layer_s * stm32_dma2dinitltdc(FAR struct stm32_ltdc_s *layer)
 
   if (ret != OK)
     {
-      dbg("Returning -EINVAL, unsupported pixel format: %d\n",
+      err("Returning -EINVAL, unsupported pixel format: %d\n",
             layer->vinfo.fmt);
       errno = -EINVAL;
       return NULL;
diff --git a/arch/arm/src/stm32/stm32_eth.c b/arch/arm/src/stm32/stm32_eth.c
index 837289db1e..e2708372ba 100644
--- a/arch/arm/src/stm32/stm32_eth.c
+++ b/arch/arm/src/stm32/stm32_eth.c
@@ -2447,12 +2447,12 @@ static int stm32_ifup(struct net_driver_s *dev)
   int ret;
 
 #ifdef CONFIG_NET_IPv4
-  ndbg("Bringing up: %d.%d.%d.%d\n",
+  nerr("Bringing up: %d.%d.%d.%d\n",
        dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
        (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 #endif
 #ifdef CONFIG_NET_IPv6
-  ndbg("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
+  nerr("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
        dev->d_ipv6addr[0], dev->d_ipv6addr[1], dev->d_ipv6addr[2],
        dev->d_ipv6addr[3], dev->d_ipv6addr[4], dev->d_ipv6addr[5],
        dev->d_ipv6addr[6], dev->d_ipv6addr[7]);
@@ -2500,7 +2500,7 @@ static int stm32_ifdown(struct net_driver_s *dev)
   FAR struct stm32_ethmac_s *priv = (FAR struct stm32_ethmac_s *)dev->d_private;
   irqstate_t flags;
 
-  ndbg("Taking the network down\n");
+  nerr("Taking the network down\n");
 
   /* Disable the Ethernet interrupt */
 
@@ -3129,7 +3129,7 @@ static int stm32_phyread(uint16_t phydevaddr, uint16_t phyregaddr, uint16_t *val
         }
     }
 
-  ndbg("MII transfer timed out: phydevaddr: %04x phyregaddr: %04x\n",
+  nerr("MII transfer timed out: phydevaddr: %04x phyregaddr: %04x\n",
        phydevaddr, phyregaddr);
 
   return -ETIMEDOUT;
@@ -3188,7 +3188,7 @@ static int stm32_phywrite(uint16_t phydevaddr, uint16_t phyregaddr, uint16_t val
         }
     }
 
-  ndbg("MII transfer timed out: phydevaddr: %04x phyregaddr: %04x value: %04x\n",
+  nerr("MII transfer timed out: phydevaddr: %04x phyregaddr: %04x value: %04x\n",
        phydevaddr, phyregaddr, value);
 
   return -ETIMEDOUT;
@@ -3225,7 +3225,7 @@ static inline int stm32_dm9161(FAR struct stm32_ethmac_s *priv)
   ret = stm32_phyread(CONFIG_STM32_PHYADDR, MII_PHYID1, &phyval);
   if (ret < 0)
     {
-      ndbg("Failed to read the PHY ID1: %d\n", ret);
+      nerr("Failed to read the PHY ID1: %d\n", ret);
       return ret;
     }
 
@@ -3243,7 +3243,7 @@ static inline int stm32_dm9161(FAR struct stm32_ethmac_s *priv)
   ret = stm32_phyread(CONFIG_STM32_PHYADDR, 16, &phyval);
   if (ret < 0)
     {
-      ndbg("Failed to read the PHY Register 0x10: %d\n", ret);
+      nerr("Failed to read the PHY Register 0x10: %d\n", ret);
       return ret;
     }
 
@@ -3300,7 +3300,7 @@ static int stm32_phyinit(FAR struct stm32_ethmac_s *priv)
   ret = stm32_phywrite(CONFIG_STM32_PHYADDR, MII_MCR, MII_MCR_RESET);
   if (ret < 0)
     {
-      ndbg("Failed to reset the PHY: %d\n", ret);
+      nerr("Failed to reset the PHY: %d\n", ret);
       return ret;
     }
   up_mdelay(PHY_RESET_DELAY);
@@ -3311,7 +3311,7 @@ static int stm32_phyinit(FAR struct stm32_ethmac_s *priv)
   ret = stm32_phy_boardinitialize(0);
   if (ret < 0)
     {
-      ndbg("Failed to initialize the PHY: %d\n", ret);
+      nerr("Failed to initialize the PHY: %d\n", ret);
       return ret;
     }
 #endif
@@ -3336,7 +3336,7 @@ static int stm32_phyinit(FAR struct stm32_ethmac_s *priv)
       ret = stm32_phyread(CONFIG_STM32_PHYADDR, MII_MSR, &phyval);
       if (ret < 0)
         {
-          ndbg("Failed to read the PHY MSR: %d\n", ret);
+          nerr("Failed to read the PHY MSR: %d\n", ret);
           return ret;
         }
       else if ((phyval & MII_MSR_LINKSTATUS) != 0)
@@ -3347,7 +3347,7 @@ static int stm32_phyinit(FAR struct stm32_ethmac_s *priv)
 
   if (timeout >= PHY_RETRY_TIMEOUT)
     {
-      ndbg("Timed out waiting for link status: %04x\n", phyval);
+      nerr("Timed out waiting for link status: %04x\n", phyval);
       return -ETIMEDOUT;
     }
 
@@ -3356,7 +3356,7 @@ static int stm32_phyinit(FAR struct stm32_ethmac_s *priv)
   ret = stm32_phywrite(CONFIG_STM32_PHYADDR, MII_MCR, MII_MCR_ANENABLE);
   if (ret < 0)
     {
-      ndbg("Failed to enable auto-negotiation: %d\n", ret);
+      nerr("Failed to enable auto-negotiation: %d\n", ret);
       return ret;
     }
 
@@ -3367,7 +3367,7 @@ static int stm32_phyinit(FAR struct stm32_ethmac_s *priv)
       ret = stm32_phyread(CONFIG_STM32_PHYADDR, MII_MSR, &phyval);
       if (ret < 0)
         {
-          ndbg("Failed to read the PHY MSR: %d\n", ret);
+          nerr("Failed to read the PHY MSR: %d\n", ret);
           return ret;
         }
       else if ((phyval & MII_MSR_ANEGCOMPLETE) != 0)
@@ -3378,7 +3378,7 @@ static int stm32_phyinit(FAR struct stm32_ethmac_s *priv)
 
   if (timeout >= PHY_RETRY_TIMEOUT)
     {
-      ndbg("Timed out waiting for auto-negotiation\n");
+      nerr("Timed out waiting for auto-negotiation\n");
       return -ETIMEDOUT;
     }
 
@@ -3387,7 +3387,7 @@ static int stm32_phyinit(FAR struct stm32_ethmac_s *priv)
   ret = stm32_phyread(CONFIG_STM32_PHYADDR, CONFIG_STM32_PHYSR, &phyval);
   if (ret < 0)
     {
-      ndbg("Failed to read PHY status register\n");
+      nerr("Failed to read PHY status register\n");
       return ret;
     }
 
@@ -3457,7 +3457,7 @@ static int stm32_phyinit(FAR struct stm32_ethmac_s *priv)
   ret = stm32_phywrite(CONFIG_STM32_PHYADDR, MII_MCR, phyval);
   if (ret < 0)
     {
-     ndbg("Failed to write the PHY MCR: %d\n", ret);
+     nerr("Failed to write the PHY MCR: %d\n", ret);
       return ret;
     }
   up_mdelay(PHY_CONFIG_DELAY);
@@ -3472,7 +3472,7 @@ static int stm32_phyinit(FAR struct stm32_ethmac_s *priv)
 #endif
 #endif
 
-  ndbg("Duplex: %s Speed: %d MBps\n",
+  nerr("Duplex: %s Speed: %d MBps\n",
        priv->fduplex ? "FULL" : "HALF",
        priv->mbps100 ? 100 : 10);
 
diff --git a/arch/arm/src/stm32/stm32_i2c.c b/arch/arm/src/stm32/stm32_i2c.c
index 6b4728cf6a..0b81465f4a 100644
--- a/arch/arm/src/stm32/stm32_i2c.c
+++ b/arch/arm/src/stm32/stm32_i2c.c
@@ -165,10 +165,10 @@
 /* CONFIG_DEBUG_I2C + CONFIG_DEBUG_FEATURES enables general I2C debug output. */
 
 #ifdef CONFIG_DEBUG_I2C
-#  define i2cdbg dbg
+#  define i2cerr err
 #  define i2cinfo info
 #else
-#  define i2cdbg(x...)
+#  define i2cerr(x...)
 #  define i2cinfo(x...)
 #endif
 
@@ -859,7 +859,7 @@ static void stm32_i2c_tracenew(FAR struct stm32_i2c_priv_s *priv, uint32_t statu
 
           if (priv->tndx >= (CONFIG_I2C_NTRACE-1))
             {
-              i2cdbg("Trace table overflow\n");
+              i2cerr("Trace table overflow\n");
               return;
             }
 
@@ -900,7 +900,7 @@ static void stm32_i2c_traceevent(FAR struct stm32_i2c_priv_s *priv,
 
       if (priv->tndx >= (CONFIG_I2C_NTRACE-1))
         {
-          i2cdbg("Trace table overflow\n");
+          i2cerr("Trace table overflow\n");
           return;
         }
 
@@ -1695,7 +1695,7 @@ static int stm32_i2c_transfer(FAR struct i2c_master_s *dev, FAR struct i2c_msg_s
       status = stm32_i2c_getstatus(priv);
       ret = -ETIMEDOUT;
 
-      i2cdbg("Timed out: CR1: 0x%04x status: 0x%08x\n",
+      i2cerr("Timed out: CR1: 0x%04x status: 0x%08x\n",
              stm32_i2c_getreg(priv, STM32_I2C_CR1_OFFSET), status);
 
       /* "Note: When the STOP, START or PEC bit is set, the software must
diff --git a/arch/arm/src/stm32/stm32_i2c_alt.c b/arch/arm/src/stm32/stm32_i2c_alt.c
index 3ed1e6939d..4ea697320a 100644
--- a/arch/arm/src/stm32/stm32_i2c_alt.c
+++ b/arch/arm/src/stm32/stm32_i2c_alt.c
@@ -172,10 +172,10 @@
 /* CONFIG_DEBUG_I2C + CONFIG_DEBUG_FEATURES enables general I2C debug output. */
 
 #ifdef CONFIG_DEBUG_I2C
-#  define i2cdbg dbg
+#  define i2cerr err
 #  define i2cinfo info
 #else
-#  define i2cdbg(x...)
+#  define i2cerr(x...)
 #  define i2cinfo(x...)
 #endif
 
@@ -867,7 +867,7 @@ static void stm32_i2c_tracenew(FAR struct stm32_i2c_priv_s *priv, uint16_t statu
 
           if (priv->tndx >= (CONFIG_I2C_NTRACE-1))
             {
-              i2cdbg("Trace table overflow\n");
+              i2cerr("Trace table overflow\n");
               return;
             }
 
@@ -908,7 +908,7 @@ static void stm32_i2c_traceevent(FAR struct stm32_i2c_priv_s *priv,
 
       if (priv->tndx >= (CONFIG_I2C_NTRACE-1))
         {
-          i2cdbg("Trace table overflow\n");
+          i2cerr("Trace table overflow\n");
           return;
         }
 
@@ -1382,7 +1382,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv)
         {
           /* TODO: untested!! */
 
-          i2cdbg(" An empty message has been detected, ignoring and passing to next message.\n");
+          i2cerr(" An empty message has been detected, ignoring and passing to next message.\n");
 
           /* Trace event */
 
@@ -1609,14 +1609,14 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv)
             }
           else
             {
-              i2cdbg("Write mode: next message has an unrecognized flag.\n");
+              i2cerr("Write mode: next message has an unrecognized flag.\n");
               stm32_i2c_traceevent(priv, I2CEVENT_WRITE_FLAG_ERROR, priv->msgv->flags);
             }
 
         }
       else
         {
-          i2cdbg("Write mode error.\n");
+          i2cerr("Write mode error.\n");
           stm32_i2c_traceevent(priv, I2CEVENT_WRITE_ERROR, 0);
         }
     }
@@ -1783,8 +1783,8 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv)
 
       else
         {
-          i2cdbg("I2C read mode no correct state detected\n");
-          i2cdbg(" state %i, dcnt=%i\n", status, priv->dcnt);
+          i2cerr("I2C read mode no correct state detected\n");
+          i2cerr(" state %i, dcnt=%i\n", status, priv->dcnt);
 
           /* set condition to terminate ISR and wake waiting thread */
 
@@ -1809,7 +1809,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv)
       /* Read rest of the state */
 
       status |= (stm32_i2c_getreg(priv, STM32_I2C_SR2_OFFSET) << 16);
-      i2cdbg("Empty call to ISR: Stopping ISR\n");
+      i2cerr("Empty call to ISR: Stopping ISR\n");
       stm32_i2c_traceevent(priv, I2CEVENT_ISR_EMPTY_CALL, 0);
     }
 
@@ -1833,8 +1833,8 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv)
 
       status |= (stm32_i2c_getreg(priv, STM32_I2C_SR2_OFFSET) << 16);
 
-      i2cdbg(" No correct state detected(start bit, read or write) \n");
-      i2cdbg(" state %i\n", status);
+      i2cerr(" No correct state detected(start bit, read or write) \n");
+      i2cerr(" state %i\n", status);
 
       /* set condition to terminate ISR and wake waiting thread */
 
@@ -2126,7 +2126,7 @@ static int stm32_i2c_transfer(FAR struct i2c_master_s *dev, FAR struct i2c_msg_s
       status = stm32_i2c_getstatus(priv);
       ret = -ETIMEDOUT;
 
-      i2cdbg("Timed out: CR1: 0x%04x status: 0x%08x\n",
+      i2cerr("Timed out: CR1: 0x%04x status: 0x%08x\n",
              stm32_i2c_getreg(priv, STM32_I2C_CR1_OFFSET), status);
 
       /* "Note: When the STOP, START or PEC bit is set, the software must
@@ -2156,7 +2156,7 @@ static int stm32_i2c_transfer(FAR struct i2c_master_s *dev, FAR struct i2c_msg_s
        * Note: this commentary is found in both places.
        *
        */
-      i2cdbg("Check if the address was valid\n");
+      i2cerr("Check if the address was valid\n");
       stm32_i2c_sendstop(priv);
 #endif
       /* Clear busy flag in case of timeout */
diff --git a/arch/arm/src/stm32/stm32_irq.c b/arch/arm/src/stm32/stm32_irq.c
index f79a045b5c..8b6f57db6a 100644
--- a/arch/arm/src/stm32/stm32_irq.c
+++ b/arch/arm/src/stm32/stm32_irq.c
@@ -149,7 +149,7 @@ static void stm32_dumpnvic(const char *msg, int irq)
 
 /****************************************************************************
  * Name: stm32_nmi, stm32_busfault, stm32_usagefault, stm32_pendsv,
- *       stm32_dbgmonitor, stm32_pendsv, stm32_reserved
+ *       stm32_errmonitor, stm32_pendsv, stm32_reserved
  *
  * Description:
  *   Handlers for various execptions.  None are handled and all are fatal
@@ -162,7 +162,7 @@ static void stm32_dumpnvic(const char *msg, int irq)
 static int stm32_nmi(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! NMI received\n");
+  err("PANIC!!! NMI received\n");
   PANIC();
   return 0;
 }
@@ -170,7 +170,7 @@ static int stm32_nmi(int irq, FAR void *context)
 static int stm32_busfault(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS));
+  err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS));
   PANIC();
   return 0;
 }
@@ -178,7 +178,7 @@ static int stm32_busfault(int irq, FAR void *context)
 static int stm32_usagefault(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS));
+  err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS));
   PANIC();
   return 0;
 }
@@ -186,15 +186,15 @@ static int stm32_usagefault(int irq, FAR void *context)
 static int stm32_pendsv(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! PendSV received\n");
+  err("PANIC!!! PendSV received\n");
   PANIC();
   return 0;
 }
 
-static int stm32_dbgmonitor(int irq, FAR void *context)
+static int stm32_errmonitor(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Debug Monitor received\n");
+  err("PANIC!!! Debug Monitor received\n");
   PANIC();
   return 0;
 }
@@ -202,7 +202,7 @@ static int stm32_dbgmonitor(int irq, FAR void *context)
 static int stm32_reserved(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Reserved interrupt\n");
+  err("PANIC!!! Reserved interrupt\n");
   PANIC();
   return 0;
 }
@@ -416,7 +416,7 @@ void up_irqinitialize(void)
   irq_attach(STM32_IRQ_BUSFAULT, stm32_busfault);
   irq_attach(STM32_IRQ_USAGEFAULT, stm32_usagefault);
   irq_attach(STM32_IRQ_PENDSV, stm32_pendsv);
-  irq_attach(STM32_IRQ_DBGMONITOR, stm32_dbgmonitor);
+  irq_attach(STM32_IRQ_DBGMONITOR, stm32_errmonitor);
   irq_attach(STM32_IRQ_RESERVED, stm32_reserved);
 #endif
 
diff --git a/arch/arm/src/stm32/stm32_iwdg.c b/arch/arm/src/stm32/stm32_iwdg.c
index 72489e6002..a4fda31c89 100644
--- a/arch/arm/src/stm32/stm32_iwdg.c
+++ b/arch/arm/src/stm32/stm32_iwdg.c
@@ -51,7 +51,7 @@
 
 #include "up_arch.h"
 #include "stm32_rcc.h"
-#include "chip/stm32_dbgmcu.h"
+#include "chip/stm32_errmcu.h"
 #include "stm32_wdg.h"
 
 #if defined(CONFIG_WATCHDOG) && defined(CONFIG_STM32_IWDG)
@@ -112,10 +112,10 @@
  */
 
 #ifdef CONFIG_DEBUG_WATCHDOG
-#  define wddbg    llerr
+#  define wderr    llerr
 #  define wdinfo   llinfo
 #else
-#  define wddbg(x...)
+#  define wderr(x...)
 #  define wdinfo(x...)
 #endif
 
@@ -523,7 +523,7 @@ static int stm32_settimeout(FAR struct watchdog_lowerhalf_s *lower,
 
   if (timeout < 1 || timeout > IWDG_MAXTIMEOUT)
     {
-      wddbg("Cannot represent timeout=%d > %d\n",
+      wderr("Cannot represent timeout=%d > %d\n",
             timeout, IWDG_MAXTIMEOUT);
       return -ERANGE;
     }
@@ -536,7 +536,7 @@ static int stm32_settimeout(FAR struct watchdog_lowerhalf_s *lower,
 #ifdef CONFIG_STM32_IWDG_ONETIMESETUP
   if (priv->started)
     {
-      wddbg("Timer is already started\n");
+      wderr("Timer is already started\n");
       return -EBUSY;
     }
 #endif
diff --git a/arch/arm/src/stm32/stm32_ltdc.c b/arch/arm/src/stm32/stm32_ltdc.c
index 678aceda7e..9ad25dfeed 100644
--- a/arch/arm/src/stm32/stm32_ltdc.c
+++ b/arch/arm/src/stm32/stm32_ltdc.c
@@ -283,10 +283,10 @@
 /* Debug option */
 
 #ifdef CONFIG_STM32_LTDC_REGDEBUG
-#  define regdbg       dbg
+#  define regerr       err
 #  define reginfo      info
 #else
-#  define regdbg(x...)
+#  define regerr(x...)
 #  define reginfo(x...)
 #endif
 
@@ -1155,7 +1155,7 @@ static int stm32_ltdcirq(int irq, void *context)
 
           if (ret != OK)
             {
-              dbg("sem_post() failed\n");
+              err("sem_post() failed\n");
               return ret;
             }
         }
@@ -1202,7 +1202,7 @@ static int stm32_ltdc_waitforirq(void)
 
       if (ret != OK)
         {
-          dbg("sem_wait() failed\n");
+          err("sem_wait() failed\n");
         }
     }
 
@@ -1519,7 +1519,7 @@ static int stm32_ltdc_lvalidatearea(FAR struct stm32_layer_s *layer,
       (srcypos > ypos + yres - 1))
 
     {
-      gdbg("layer coordinates out of valid area: xpos = %d > %d, \
+      gerr("layer coordinates out of valid area: xpos = %d > %d, \
            ypos = %d > %d, width = %d > %d, height = %d > %d, \
            srcxpos = %d > %d, srcypos = %d > %d",
            xpos, vinfo->xres - 1,
@@ -1529,7 +1529,7 @@ static int stm32_ltdc_lvalidatearea(FAR struct stm32_layer_s *layer,
            srcxpos, xpos + xres - 1,
            srcypos, ypos + yres - 1);
 
-      gdbg("Returning EINVAL\n");
+      gerr("Returning EINVAL\n");
       return -EINVAL;
     }
 
@@ -2203,7 +2203,7 @@ static int stm32_getvideoinfo(struct fb_vtable_s *vtable,
       return stm32_lgetvideoinfo(ltdc, vinfo);
     }
 
-  gdbg("ERROR: Returning EINVAL\n");
+  gerr("ERROR: Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -2238,7 +2238,7 @@ static int stm32_getplaneinfo(struct fb_vtable_s *vtable, int planeno,
       return stm32_lgetplaneinfo(ltdc, planeno, pinfo);
     }
 
-  gdbg("Returning EINVAL\n");
+  gerr("Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -2325,7 +2325,7 @@ static int stm32_lgetvideoinfo(struct ltdc_layer_s *layer,
       return OK;
     }
 
-  gdbg("Returning EINVAL\n");
+  gerr("Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -2358,7 +2358,7 @@ static int stm32_lgetplaneinfo(struct ltdc_layer_s *layer, int planeno,
       return OK;
     }
 
-  gdbg("Returning EINVAL\n");
+  gerr("Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -2394,13 +2394,13 @@ static int stm32_setclut(struct ltdc_layer_s *layer,
 
       if (priv->state.vinfo.fmt != FB_FMT_RGB8)
         {
-          gdbg("Error: CLUT is not supported for the pixel format: %d\n",
+          gerr("Error: CLUT is not supported for the pixel format: %d\n",
                     priv->state.vinfo.fmt);
           ret = -EINVAL;
         }
       else if (cmap->first >= STM32_LTDC_NCLUT)
         {
-          gdbg("Error: only %d color table entries supported\n",
+          gerr("Error: only %d color table entries supported\n",
                     STM32_LTDC_NCLUT);
           ret = -EINVAL;
         }
@@ -2418,7 +2418,7 @@ static int stm32_setclut(struct ltdc_layer_s *layer,
       return ret;
     }
 
-  gdbg("Returning EINVAL\n");
+  gerr("Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -2460,13 +2460,13 @@ static int stm32_getclut(struct ltdc_layer_s *layer,
 #else
       if (priv->state.vinfo.fmt != FB_FMT_RGB8)
         {
-          gdbg("Error: CLUT is not supported for the pixel format: %d\n",
+          gerr("Error: CLUT is not supported for the pixel format: %d\n",
                     priv->state.vinfo.fmt);
           ret = -EINVAL;
         }
       else if (cmap->first >= STM32_LTDC_NCLUT)
         {
-          gdbg("Error: only %d color table entries supported\n",
+          gerr("Error: only %d color table entries supported\n",
                     STM32_LTDC_NCLUT);
           ret = -EINVAL;
         }
@@ -2512,7 +2512,7 @@ static int stm32_getclut(struct ltdc_layer_s *layer,
       return ret;
     }
 
-  gdbg("Returning EINVAL\n");
+  gerr("Returning EINVAL\n");
   return -EINVAL;
 }
 #endif /* STM32_LAYER_CLUT_SIZE */
@@ -2583,7 +2583,7 @@ static int stm32_getlid(FAR struct ltdc_layer_s *layer, int *lid,
 #endif
           default:
             ret = EINVAL;
-            gdbg("Returning EINVAL\n");
+            gerr("Returning EINVAL\n");
             break;
         }
 
@@ -2592,7 +2592,7 @@ static int stm32_getlid(FAR struct ltdc_layer_s *layer, int *lid,
       return ret;
     }
 
-  gdbg("Returning EINVAL\n");
+  gerr("Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -2629,7 +2629,7 @@ static int stm32_setcolor(FAR struct ltdc_layer_s *layer, uint32_t argb)
       return OK;
     }
 
-  gdbg("Returning EINVAL\n");
+  gerr("Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -2663,7 +2663,7 @@ static int stm32_getcolor(FAR struct ltdc_layer_s *layer, uint32_t *argb)
       return OK;
     }
 
-  gdbg("Returning EINVAL\n");
+  gerr("Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -2700,7 +2700,7 @@ static int stm32_setcolorkey(FAR struct ltdc_layer_s *layer, uint32_t rgb)
       return OK;
     }
 
-  gdbg("Returning EINVAL\n");
+  gerr("Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -2734,7 +2734,7 @@ static int stm32_getcolorkey(FAR struct ltdc_layer_s *layer, uint32_t *rgb)
       return OK;
     }
 
-  gdbg("Returning EINVAL\n");
+  gerr("Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -2775,7 +2775,7 @@ static int stm32_setalpha(FAR struct ltdc_layer_s *layer, uint8_t alpha)
       return OK;
     }
 
-  gdbg("Returning EINVAL\n");
+  gerr("Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -2809,7 +2809,7 @@ static int stm32_getalpha(FAR struct ltdc_layer_s *layer, uint8_t *alpha)
       return OK;
     }
 
-  gdbg("Returning EINVAL\n");
+  gerr("Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -2926,7 +2926,7 @@ static int stm32_setblendmode(FAR struct ltdc_layer_s *layer, uint32_t mode)
         }
       if (blendmode)
         {
-          gdbg("Unknown blendmode %02x\n", blendmode);
+          gerr("Unknown blendmode %02x\n", blendmode);
           ret = -EINVAL;
         }
 
@@ -2942,7 +2942,7 @@ static int stm32_setblendmode(FAR struct ltdc_layer_s *layer, uint32_t mode)
       return ret;
     }
 
-  gdbg("Returning EINVAL\n");
+  gerr("Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -2975,7 +2975,7 @@ static int stm32_getblendmode(FAR struct ltdc_layer_s *layer, uint32_t *mode)
       return OK;
     }
 
-  gdbg("Returning EINVAL\n");
+  gerr("Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -3039,7 +3039,7 @@ static int stm32_setarea(FAR struct ltdc_layer_s *layer,
       return ret;
     }
 
-  gdbg("Returning EINVAL\n");
+  gerr("Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -3080,7 +3080,7 @@ static int stm32_getarea(FAR struct ltdc_layer_s *layer,
       return OK;
     }
 
-  gdbg("Returning EINVAL\n");
+  gerr("Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -3156,7 +3156,7 @@ static int stm32_update(FAR struct ltdc_layer_s *layer, uint32_t mode)
 
       if (stm32_ltdc_waitforirq() != OK)
         {
-          gdbg("Returning ECANCELED\n");
+          gerr("Returning ECANCELED\n");
           return -ECANCELED;
         }
 
@@ -3238,7 +3238,7 @@ static int stm32_update(FAR struct ltdc_layer_s *layer, uint32_t mode)
       return OK;
     }
 
-  gdbg("Returning EINVAL\n");
+  gerr("Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -3286,7 +3286,7 @@ static int stm32_blit(FAR struct ltdc_layer_s *dest,
       return ret;
     }
 
-  gdbg("Returning EINVAL\n");
+  gerr("Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -3342,7 +3342,7 @@ static int stm32_blend(FAR struct ltdc_layer_s *dest,
       return ret;
     }
 
-  gdbg("Returning EINVAL\n");
+  gerr("Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -3383,7 +3383,7 @@ static int stm32_fillarea(FAR struct ltdc_layer_s *layer,
       return ret;
     }
 
-  gdbg("Returning EINVAL\n");
+  gerr("Returning EINVAL\n");
   return -EINVAL;
 }
 #endif
@@ -3413,7 +3413,7 @@ FAR struct ltdc_layer_s *stm32_ltdcgetlayer(int lid)
       return (FAR struct ltdc_layer_s *) &LAYER(lid);
     }
 
-  gdbg("EINVAL\n");
+  gerr("EINVAL\n");
   errno = EINVAL;
   return NULL;
 }
@@ -3436,7 +3436,7 @@ int stm32_ltdcinitialize(void)
   int   ret;
 #endif
 
-  dbg("Initialize LTDC driver\n");
+  err("Initialize LTDC driver\n");
 
   if (g_initialized == true)
     {
@@ -3600,6 +3600,6 @@ void stm32_backlight(bool blon)
 {
   /* Set default backlight level CONFIG_STM32_LTDC_DEFBACKLIGHT */
 
-  gdbg("Not supported\n");
+  gerr("Not supported\n");
 }
 #endif
diff --git a/arch/arm/src/stm32/stm32_otgfsdev.c b/arch/arm/src/stm32/stm32_otgfsdev.c
index 82b6a9fb83..8481142f88 100644
--- a/arch/arm/src/stm32/stm32_otgfsdev.c
+++ b/arch/arm/src/stm32/stm32_otgfsdev.c
@@ -3801,7 +3801,7 @@ static int stm32_epout_configure(FAR struct stm32_ep_s *privep, uint8_t eptype,
             break;
 
           default:
-            udbg("Unsupported maxpacket: %d\n", maxpacket);
+            uerr("Unsupported maxpacket: %d\n", maxpacket);
             return -EINVAL;
         }
     }
@@ -3896,7 +3896,7 @@ static int stm32_epin_configure(FAR struct stm32_ep_s *privep, uint8_t eptype,
             break;
 
           default:
-            udbg("Unsupported maxpacket: %d\n", maxpacket);
+            uerr("Unsupported maxpacket: %d\n", maxpacket);
             return -EINVAL;
         }
     }
@@ -5447,7 +5447,7 @@ void up_usbinitialize(void)
   ret = irq_attach(STM32_IRQ_OTGFS, stm32_usbinterrupt);
   if (ret < 0)
     {
-      udbg("irq_attach failed\n", ret);
+      uerr("irq_attach failed\n", ret);
       goto errout;
     }
 
diff --git a/arch/arm/src/stm32/stm32_otgfshost.c b/arch/arm/src/stm32/stm32_otgfshost.c
index 113c7c2551..912919a940 100644
--- a/arch/arm/src/stm32/stm32_otgfshost.c
+++ b/arch/arm/src/stm32/stm32_otgfshost.c
@@ -1284,7 +1284,7 @@ static int stm32_ctrlep_alloc(FAR struct stm32_usbhost_s *priv,
   ctrlep = (FAR struct stm32_ctrlinfo_s *)kmm_malloc(sizeof(struct stm32_ctrlinfo_s));
   if (ctrlep == NULL)
     {
-      udbg("ERROR: Failed to allocate control endpoint container\n");
+      uerr("ERROR: Failed to allocate control endpoint container\n");
       return -ENOMEM;
     }
 
@@ -1294,7 +1294,7 @@ static int stm32_ctrlep_alloc(FAR struct stm32_usbhost_s *priv,
                              hport->funcaddr, hport->speed, ctrlep);
   if (ret < 0)
     {
-      udbg("ERROR: stm32_ctrlchan_alloc failed: %d\n", ret);
+      uerr("ERROR: stm32_ctrlchan_alloc failed: %d\n", ret);
       kmm_free(ctrlep);
       return ret;
     }
@@ -1346,7 +1346,7 @@ static int stm32_xfrep_alloc(FAR struct stm32_usbhost_s *priv,
   chidx = stm32_chan_alloc(priv);
   if (chidx < 0)
     {
-      udbg("ERROR: Failed to allocate a host channel\n");
+      uerr("ERROR: Failed to allocate a host channel\n");
       return -ENOMEM;
     }
 
@@ -1856,7 +1856,7 @@ static ssize_t stm32_in_transfer(FAR struct stm32_usbhost_s *priv, int chidx,
       ret = stm32_in_setup(priv, chidx);
       if (ret < 0)
         {
-          udbg("ERROR: stm32_in_setup failed: %d\n", ret);
+          uerr("ERROR: stm32_in_setup failed: %d\n", ret);
           return (ssize_t)ret;
         }
 
@@ -1887,7 +1887,7 @@ static ssize_t stm32_in_transfer(FAR struct stm32_usbhost_s *priv, int chidx,
             {
               /* Break out and return the error */
 
-              udbg("ERROR: stm32_chan_wait failed: %d\n", ret);
+              uerr("ERROR: stm32_chan_wait failed: %d\n", ret);
               return (ssize_t)ret;
             }
         }
@@ -1932,7 +1932,7 @@ static void stm32_in_next(FAR struct stm32_usbhost_s *priv,
           return;
         }
 
-      udbg("ERROR: stm32_in_setup failed: %d\n", ret);
+      uerr("ERROR: stm32_in_setup failed: %d\n", ret);
       result = ret;
     }
 
@@ -1990,7 +1990,7 @@ static int stm32_in_asynch(FAR struct stm32_usbhost_s *priv, int chidx,
   ret = stm32_chan_asynchsetup(priv, chan, callback, arg);
   if (ret < 0)
     {
-      udbg("ERROR: stm32_chan_asynchsetup failed: %d\n", ret);
+      uerr("ERROR: stm32_chan_asynchsetup failed: %d\n", ret);
       return ret;
     }
 
@@ -1999,7 +1999,7 @@ static int stm32_in_asynch(FAR struct stm32_usbhost_s *priv, int chidx,
   ret = stm32_in_setup(priv, chidx);
   if (ret < 0)
     {
-      udbg("ERROR: stm32_in_setup failed: %d\n", ret);
+      uerr("ERROR: stm32_in_setup failed: %d\n", ret);
     }
 
   /* And return with the transfer pending */
@@ -2125,7 +2125,7 @@ static ssize_t stm32_out_transfer(FAR struct stm32_usbhost_s *priv, int chidx,
       ret = stm32_out_setup(priv, chidx);
       if (ret < 0)
         {
-          udbg("ERROR: stm32_out_setup failed: %d\n", ret);
+          uerr("ERROR: stm32_out_setup failed: %d\n", ret);
           return (ssize_t)ret;
         }
 
@@ -2153,7 +2153,7 @@ static ssize_t stm32_out_transfer(FAR struct stm32_usbhost_s *priv, int chidx,
             {
               /* Break out and return the error */
 
-              udbg("ERROR: stm32_chan_wait failed: %d\n", ret);
+              uerr("ERROR: stm32_chan_wait failed: %d\n", ret);
               return (ssize_t)ret;
             }
 
@@ -2218,7 +2218,7 @@ static void stm32_out_next(FAR struct stm32_usbhost_s *priv,
           return;
         }
 
-      udbg("ERROR: stm32_out_setup failed: %d\n", ret);
+      uerr("ERROR: stm32_out_setup failed: %d\n", ret);
       result = ret;
     }
 
@@ -2276,7 +2276,7 @@ static int stm32_out_asynch(FAR struct stm32_usbhost_s *priv, int chidx,
   ret = stm32_chan_asynchsetup(priv, chan, callback, arg);
   if (ret < 0)
     {
-      udbg("ERROR: stm32_chan_asynchsetup failed: %d\n", ret);
+      uerr("ERROR: stm32_chan_asynchsetup failed: %d\n", ret);
       return ret;
     }
 
@@ -2285,7 +2285,7 @@ static int stm32_out_asynch(FAR struct stm32_usbhost_s *priv, int chidx,
   ret = stm32_out_setup(priv, chidx);
   if (ret < 0)
     {
-      udbg("ERROR: stm32_out_setup failed: %d\n", ret);
+      uerr("ERROR: stm32_out_setup failed: %d\n", ret);
     }
 
   /* And return with the transfer pending */
@@ -3865,7 +3865,7 @@ static int stm32_rh_enumerate(FAR struct stm32_usbhost_s *priv,
   ret = stm32_ctrlchan_alloc(priv, 0, 0, priv->rhport.hport.speed, &priv->ep0);
   if (ret < 0)
     {
-      udbg("ERROR: Failed to allocate a control endpoint: %d\n", ret);
+      uerr("ERROR: Failed to allocate a control endpoint: %d\n", ret);
     }
 
   return ret;
@@ -3911,7 +3911,7 @@ static int stm32_enumerate(FAR struct usbhost_connection_s *conn,
     {
       /* Return to the disconnected state */
 
-      udbg("ERROR: Enumeration failed: %d\n", ret);
+      uerr("ERROR: Enumeration failed: %d\n", ret);
       stm32_gint_disconnected(priv);
     }
 
diff --git a/arch/arm/src/stm32/stm32_otghsdev.c b/arch/arm/src/stm32/stm32_otghsdev.c
index b63831a8ce..64b53eec4c 100644
--- a/arch/arm/src/stm32/stm32_otghsdev.c
+++ b/arch/arm/src/stm32/stm32_otghsdev.c
@@ -3801,7 +3801,7 @@ static int stm32_epout_configure(FAR struct stm32_ep_s *privep, uint8_t eptype,
             break;
 
           default:
-            udbg("Unsupported maxpacket: %d\n", maxpacket);
+            uerr("Unsupported maxpacket: %d\n", maxpacket);
             return -EINVAL;
         }
     }
@@ -3896,7 +3896,7 @@ static int stm32_epin_configure(FAR struct stm32_ep_s *privep, uint8_t eptype,
             break;
 
           default:
-            udbg("Unsupported maxpacket: %d\n", maxpacket);
+            uerr("Unsupported maxpacket: %d\n", maxpacket);
             return -EINVAL;
         }
     }
@@ -5436,7 +5436,7 @@ void up_usbinitialize(void)
   ret = irq_attach(STM32_IRQ_OTGHS, stm32_usbinterrupt);
   if (ret < 0)
     {
-      udbg("irq_attach failed\n", ret);
+      uerr("irq_attach failed\n", ret);
       goto errout;
     }
 
diff --git a/arch/arm/src/stm32/stm32_otghshost.c b/arch/arm/src/stm32/stm32_otghshost.c
index 6ae9aa788c..b93e185c96 100644
--- a/arch/arm/src/stm32/stm32_otghshost.c
+++ b/arch/arm/src/stm32/stm32_otghshost.c
@@ -1284,7 +1284,7 @@ static int stm32_ctrlep_alloc(FAR struct stm32_usbhost_s *priv,
   ctrlep = (FAR struct stm32_ctrlinfo_s *)kmm_malloc(sizeof(struct stm32_ctrlinfo_s));
   if (ctrlep == NULL)
     {
-      udbg("ERROR: Failed to allocate control endpoint container\n");
+      uerr("ERROR: Failed to allocate control endpoint container\n");
       return -ENOMEM;
     }
 
@@ -1294,7 +1294,7 @@ static int stm32_ctrlep_alloc(FAR struct stm32_usbhost_s *priv,
                              hport->funcaddr, hport->speed, ctrlep);
   if (ret < 0)
     {
-      udbg("ERROR: stm32_ctrlchan_alloc failed: %d\n", ret);
+      uerr("ERROR: stm32_ctrlchan_alloc failed: %d\n", ret);
       kmm_free(ctrlep);
       return ret;
     }
@@ -1346,7 +1346,7 @@ static int stm32_xfrep_alloc(FAR struct stm32_usbhost_s *priv,
   chidx = stm32_chan_alloc(priv);
   if (chidx < 0)
     {
-      udbg("ERROR: Failed to allocate a host channel\n");
+      uerr("ERROR: Failed to allocate a host channel\n");
       return -ENOMEM;
     }
 
@@ -1856,7 +1856,7 @@ static ssize_t stm32_in_transfer(FAR struct stm32_usbhost_s *priv, int chidx,
       ret = stm32_in_setup(priv, chidx);
       if (ret < 0)
         {
-          udbg("ERROR: stm32_in_setup failed: %d\n", ret);
+          uerr("ERROR: stm32_in_setup failed: %d\n", ret);
           return (ssize_t)ret;
         }
 
@@ -1887,7 +1887,7 @@ static ssize_t stm32_in_transfer(FAR struct stm32_usbhost_s *priv, int chidx,
             {
               /* Break out and return the error */
 
-              udbg("ERROR: stm32_chan_wait failed: %d\n", ret);
+              uerr("ERROR: stm32_chan_wait failed: %d\n", ret);
               return (ssize_t)ret;
             }
         }
@@ -1932,7 +1932,7 @@ static void stm32_in_next(FAR struct stm32_usbhost_s *priv,
           return;
         }
 
-      udbg("ERROR: stm32_in_setup failed: %d\n", ret);
+      uerr("ERROR: stm32_in_setup failed: %d\n", ret);
       result = ret;
     }
 
@@ -1990,7 +1990,7 @@ static int stm32_in_asynch(FAR struct stm32_usbhost_s *priv, int chidx,
   ret = stm32_chan_asynchsetup(priv, chan, callback, arg);
   if (ret < 0)
     {
-      udbg("ERROR: stm32_chan_asynchsetup failed: %d\n", ret);
+      uerr("ERROR: stm32_chan_asynchsetup failed: %d\n", ret);
       return ret;
     }
 
@@ -1999,7 +1999,7 @@ static int stm32_in_asynch(FAR struct stm32_usbhost_s *priv, int chidx,
   ret = stm32_in_setup(priv, chidx);
   if (ret < 0)
     {
-      udbg("ERROR: stm32_in_setup failed: %d\n", ret);
+      uerr("ERROR: stm32_in_setup failed: %d\n", ret);
     }
 
   /* And return with the transfer pending */
@@ -2125,7 +2125,7 @@ static ssize_t stm32_out_transfer(FAR struct stm32_usbhost_s *priv, int chidx,
       ret = stm32_out_setup(priv, chidx);
       if (ret < 0)
         {
-          udbg("ERROR: stm32_out_setup failed: %d\n", ret);
+          uerr("ERROR: stm32_out_setup failed: %d\n", ret);
           return (ssize_t)ret;
         }
 
@@ -2153,7 +2153,7 @@ static ssize_t stm32_out_transfer(FAR struct stm32_usbhost_s *priv, int chidx,
             {
               /* Break out and return the error */
 
-              udbg("ERROR: stm32_chan_wait failed: %d\n", ret);
+              uerr("ERROR: stm32_chan_wait failed: %d\n", ret);
               return (ssize_t)ret;
             }
 
@@ -2218,7 +2218,7 @@ static void stm32_out_next(FAR struct stm32_usbhost_s *priv,
           return;
         }
 
-      udbg("ERROR: stm32_out_setup failed: %d\n", ret);
+      uerr("ERROR: stm32_out_setup failed: %d\n", ret);
       result = ret;
     }
 
@@ -2276,7 +2276,7 @@ static int stm32_out_asynch(FAR struct stm32_usbhost_s *priv, int chidx,
   ret = stm32_chan_asynchsetup(priv, chan, callback, arg);
   if (ret < 0)
     {
-      udbg("ERROR: stm32_chan_asynchsetup failed: %d\n", ret);
+      uerr("ERROR: stm32_chan_asynchsetup failed: %d\n", ret);
       return ret;
     }
 
@@ -2285,7 +2285,7 @@ static int stm32_out_asynch(FAR struct stm32_usbhost_s *priv, int chidx,
   ret = stm32_out_setup(priv, chidx);
   if (ret < 0)
     {
-      udbg("ERROR: stm32_out_setup failed: %d\n", ret);
+      uerr("ERROR: stm32_out_setup failed: %d\n", ret);
     }
 
   /* And return with the transfer pending */
@@ -3865,7 +3865,7 @@ static int stm32_rh_enumerate(FAR struct stm32_usbhost_s *priv,
   ret = stm32_ctrlchan_alloc(priv, 0, 0, priv->rhport.hport.speed, &priv->ep0);
   if (ret < 0)
     {
-      udbg("ERROR: Failed to allocate a control endpoint: %d\n", ret);
+      uerr("ERROR: Failed to allocate a control endpoint: %d\n", ret);
     }
 
   return ret;
@@ -3911,7 +3911,7 @@ static int stm32_enumerate(FAR struct usbhost_connection_s *conn,
     {
       /* Return to the disconnected state */
 
-      udbg("ERROR: Enumeration failed: %d\n", ret);
+      uerr("ERROR: Enumeration failed: %d\n", ret);
       stm32_gint_disconnected(priv);
     }
 
diff --git a/arch/arm/src/stm32/stm32_procfs_ccm.c b/arch/arm/src/stm32/stm32_procfs_ccm.c
index 816f37977e..51d1022146 100644
--- a/arch/arm/src/stm32/stm32_procfs_ccm.c
+++ b/arch/arm/src/stm32/stm32_procfs_ccm.c
@@ -152,7 +152,7 @@ static int ccm_open(FAR struct file *filep, FAR const char *relpath,
 
   if ((oflags & O_WRONLY) != 0 || (oflags & O_RDONLY) == 0)
     {
-      fdbg("ERROR: Only O_RDONLY supported\n");
+      ferr("ERROR: Only O_RDONLY supported\n");
       return -EACCES;
     }
 
@@ -160,7 +160,7 @@ static int ccm_open(FAR struct file *filep, FAR const char *relpath,
 
   if (strcmp(relpath, "ccm") != 0)
     {
-      fdbg("ERROR: relpath is '%s'\n", relpath);
+      ferr("ERROR: relpath is '%s'\n", relpath);
       return -ENOENT;
     }
 
@@ -169,7 +169,7 @@ static int ccm_open(FAR struct file *filep, FAR const char *relpath,
   priv = (FAR struct ccm_file_s *)kmm_zalloc(sizeof(struct ccm_file_s));
   if (!priv)
     {
-      fdbg("ERROR: Failed to allocate file attributes\n");
+      ferr("ERROR: Failed to allocate file attributes\n");
       return -ENOMEM;
     }
 
@@ -285,7 +285,7 @@ static int ccm_dup(FAR const struct file *oldp, FAR struct file *newp)
   newpriv = (FAR struct ccm_file_s *)kmm_zalloc(sizeof(struct ccm_file_s));
   if (!newpriv)
     {
-      fdbg("ERROR: Failed to allocate file attributes\n");
+      ferr("ERROR: Failed to allocate file attributes\n");
       return -ENOMEM;
     }
 
@@ -303,7 +303,7 @@ static int ccm_stat(const char *relpath, struct stat *buf)
 {
   if (strcmp(relpath, "ccm") != 0)
     {
-      fdbg("ERROR: relpath is '%s'\n", relpath);
+      ferr("ERROR: relpath is '%s'\n", relpath);
       return -ENOENT;
     }
 
diff --git a/arch/arm/src/stm32/stm32_pwm.c b/arch/arm/src/stm32/stm32_pwm.c
index d43461d661..53e28f6ae1 100644
--- a/arch/arm/src/stm32/stm32_pwm.c
+++ b/arch/arm/src/stm32/stm32_pwm.c
@@ -122,7 +122,7 @@
 #endif
 
 #ifdef CONFIG_DEBUG_PWM
-#  define pwmdbg              dbg
+#  define pwmerr              err
 #  define pwmllerr            llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define pwminfo           info
@@ -134,7 +134,7 @@
 #    define pwm_dumpgpio(p,m)
 #  endif
 #else
-#  define pwmdbg(x...)
+#  define pwmerr(x...)
 #  define pwmllerr(x...)
 #  define pwminfo(x...)
 #  define pwmllinfo(x...)
@@ -1209,7 +1209,7 @@ static int pwm_timer(FAR struct stm32_pwmtimer_s *priv,
             break;
 
           default:
-            pwmdbg("No such timer mode: %u\n", (unsigned int)priv->mode);
+            pwmerr("No such timer mode: %u\n", (unsigned int)priv->mode);
             return -EINVAL;
         }
     }
@@ -1336,7 +1336,7 @@ static int pwm_timer(FAR struct stm32_pwmtimer_s *priv,
 
       if (j >= PWM_NCHANNELS)
         {
-          pwmdbg("No such channel: %u\n", channel);
+          pwmerr("No such channel: %u\n", channel);
           return -EINVAL;
         }
 #else
@@ -1387,7 +1387,7 @@ static int pwm_timer(FAR struct stm32_pwmtimer_s *priv,
 #endif
 
           default:
-            pwmdbg("No such mode: %u\n", (unsigned int)mode);
+            pwmerr("No such mode: %u\n", (unsigned int)mode);
             return -EINVAL;
         }
 
@@ -1494,7 +1494,7 @@ static int pwm_timer(FAR struct stm32_pwmtimer_s *priv,
             break;
 
           default:
-            pwmdbg("No such channel: %u\n", channel);
+            pwmerr("No such channel: %u\n", channel);
             return -EINVAL;
         }
     }
@@ -1707,7 +1707,7 @@ static  int pwm_update_duty(FAR struct stm32_pwmtimer_s *priv, uint8_t channel,
         break;
 
       default:
-        pwmdbg("No such channel: %u\n", channel);
+        pwmerr("No such channel: %u\n", channel);
         return -EINVAL;
     }
 
@@ -2149,7 +2149,7 @@ static int pwm_start(FAR struct pwm_lowerhalf_s *dev,
 
       if (priv->timtype != TIMTYPE_ADVANCED)
         {
-          pwmdbg("ERROR: TIM%u cannot support pulse count: %u\n",
+          pwmerr("ERROR: TIM%u cannot support pulse count: %u\n",
                  priv->timid, info->count);
           return -EPERM;
         }
@@ -2527,7 +2527,7 @@ FAR struct pwm_lowerhalf_s *stm32_pwminitialize(int timer)
 #endif
 
       default:
-        pwmdbg("No such timer configured\n");
+        pwmerr("No such timer configured\n");
         return NULL;
     }
 
diff --git a/arch/arm/src/stm32/stm32_qencoder.c b/arch/arm/src/stm32/stm32_qencoder.c
index 8c856b25c4..584ea46a47 100644
--- a/arch/arm/src/stm32/stm32_qencoder.c
+++ b/arch/arm/src/stm32/stm32_qencoder.c
@@ -1270,7 +1270,7 @@ int stm32_qeinitialize(FAR const char *devpath, int tim)
   priv = stm32_tim2lower(tim);
   if (!priv)
     {
-      sndbg("TIM%d support not configured\n", tim);
+      snerr("TIM%d support not configured\n", tim);
       return -ENXIO;
     }
 
@@ -1278,7 +1278,7 @@ int stm32_qeinitialize(FAR const char *devpath, int tim)
 
   if (priv->inuse)
     {
-      sndbg("TIM%d is in-used\n", tim);
+      snerr("TIM%d is in-used\n", tim);
       return -EBUSY;
     }
 
@@ -1287,7 +1287,7 @@ int stm32_qeinitialize(FAR const char *devpath, int tim)
   ret = qe_register(devpath, (FAR struct qe_lowerhalf_s *)priv);
   if (ret < 0)
     {
-      sndbg("qe_register failed: %d\n", ret);
+      snerr("qe_register failed: %d\n", ret);
       return ret;
     }
 
diff --git a/arch/arm/src/stm32/stm32_rtcc.c b/arch/arm/src/stm32/stm32_rtcc.c
index 72ffc26fe3..7a55f9c46e 100644
--- a/arch/arm/src/stm32/stm32_rtcc.c
+++ b/arch/arm/src/stm32/stm32_rtcc.c
@@ -126,12 +126,12 @@
 /* Debug ****************************************************************************/
 
 #ifdef CONFIG_DEBUG_RTC
-#  define rtcdbg    dbg
+#  define rtcerr    err
 #  define rtcinfo   info
 #  define rtcllerr  llerr
 #  define rtcllinfo llinfo
 #else
-#  define rtcdbg(x...)
+#  define rtcerr(x...)
 #  define rtcinfo(x...)
 #  define rtcllerr(x...)
 #  define rtcllinfo(x...)
diff --git a/arch/arm/src/stm32/stm32_sdio.c b/arch/arm/src/stm32/stm32_sdio.c
index c9686a4b75..49bf6f1bcf 100644
--- a/arch/arm/src/stm32/stm32_sdio.c
+++ b/arch/arm/src/stm32/stm32_sdio.c
@@ -810,16 +810,16 @@ static void stm32_sample(struct stm32_dev_s *priv, int index)
 #ifdef CONFIG_SDIO_XFRDEBUG
 static void stm32_sdiodump(struct stm32_sdioregs_s *regs, const char *msg)
 {
-  fdbg("SDIO Registers: %s\n", msg);
-  fdbg("  POWER[%08x]: %08x\n", STM32_SDIO_POWER,   regs->power);
-  fdbg("  CLKCR[%08x]: %08x\n", STM32_SDIO_CLKCR,   regs->clkcr);
-  fdbg("  DCTRL[%08x]: %08x\n", STM32_SDIO_DCTRL,   regs->dctrl);
-  fdbg(" DTIMER[%08x]: %08x\n", STM32_SDIO_DTIMER,  regs->dtimer);
-  fdbg("   DLEN[%08x]: %08x\n", STM32_SDIO_DLEN,    regs->dlen);
-  fdbg(" DCOUNT[%08x]: %08x\n", STM32_SDIO_DCOUNT,  regs->dcount);
-  fdbg("    STA[%08x]: %08x\n", STM32_SDIO_STA,     regs->sta);
-  fdbg("   MASK[%08x]: %08x\n", STM32_SDIO_MASK,    regs->mask);
-  fdbg("FIFOCNT[%08x]: %08x\n", STM32_SDIO_FIFOCNT, regs->fifocnt);
+  ferr("SDIO Registers: %s\n", msg);
+  ferr("  POWER[%08x]: %08x\n", STM32_SDIO_POWER,   regs->power);
+  ferr("  CLKCR[%08x]: %08x\n", STM32_SDIO_CLKCR,   regs->clkcr);
+  ferr("  DCTRL[%08x]: %08x\n", STM32_SDIO_DCTRL,   regs->dctrl);
+  ferr(" DTIMER[%08x]: %08x\n", STM32_SDIO_DTIMER,  regs->dtimer);
+  ferr("   DLEN[%08x]: %08x\n", STM32_SDIO_DLEN,    regs->dlen);
+  ferr(" DCOUNT[%08x]: %08x\n", STM32_SDIO_DCOUNT,  regs->dcount);
+  ferr("    STA[%08x]: %08x\n", STM32_SDIO_STA,     regs->sta);
+  ferr("   MASK[%08x]: %08x\n", STM32_SDIO_MASK,    regs->mask);
+  ferr("FIFOCNT[%08x]: %08x\n", STM32_SDIO_FIFOCNT, regs->fifocnt);
 }
 #endif
 
@@ -2025,7 +2025,7 @@ static int stm32_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
     {
       if (--timeout <= 0)
         {
-          fdbg("ERROR: Timeout cmd: %08x events: %08x STA: %08x\n",
+          ferr("ERROR: Timeout cmd: %08x events: %08x STA: %08x\n",
                cmd, events, getreg32(STM32_SDIO_STA));
 
           return -ETIMEDOUT;
@@ -2092,7 +2092,7 @@ static int stm32_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t
 #ifdef CONFIG_DEBUG_FEATURES
   if (!rshort)
     {
-      fdbg("ERROR: rshort=NULL\n");
+      ferr("ERROR: rshort=NULL\n");
       ret = -EINVAL;
     }
 
@@ -2102,7 +2102,7 @@ static int stm32_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t
            (cmd & MMCSD_RESPONSE_MASK) != MMCSD_R1B_RESPONSE &&
            (cmd & MMCSD_RESPONSE_MASK) != MMCSD_R6_RESPONSE)
     {
-      fdbg("ERROR: Wrong response CMD=%08x\n", cmd);
+      ferr("ERROR: Wrong response CMD=%08x\n", cmd);
       ret = -EINVAL;
     }
   else
@@ -2113,12 +2113,12 @@ static int stm32_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t
       regval = getreg32(STM32_SDIO_STA);
       if ((regval & SDIO_STA_CTIMEOUT) != 0)
         {
-          fdbg("ERROR: Command timeout: %08x\n", regval);
+          ferr("ERROR: Command timeout: %08x\n", regval);
           ret = -ETIMEDOUT;
         }
       else if ((regval & SDIO_STA_CCRCFAIL) != 0)
         {
-          fdbg("ERROR: CRC failure: %08x\n", regval);
+          ferr("ERROR: CRC failure: %08x\n", regval);
           ret = -EIO;
         }
 #ifdef CONFIG_DEBUG_FEATURES
@@ -2129,7 +2129,7 @@ static int stm32_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t
           respcmd = getreg32(STM32_SDIO_RESPCMD);
           if ((uint8_t)(respcmd & SDIO_RESPCMD_MASK) != (cmd & MMCSD_CMDIDX_MASK))
             {
-              fdbg("ERROR: RESCMD=%02x CMD=%08x\n", respcmd, cmd);
+              ferr("ERROR: RESCMD=%02x CMD=%08x\n", respcmd, cmd);
               ret = -EINVAL;
             }
         }
@@ -2162,7 +2162,7 @@ static int stm32_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlo
 
   if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R2_RESPONSE)
     {
-      fdbg("ERROR: Wrong response CMD=%08x\n", cmd);
+      ferr("ERROR: Wrong response CMD=%08x\n", cmd);
       ret = -EINVAL;
     }
   else
@@ -2173,12 +2173,12 @@ static int stm32_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlo
       regval = getreg32(STM32_SDIO_STA);
       if (regval & SDIO_STA_CTIMEOUT)
         {
-          fdbg("ERROR: Timeout STA: %08x\n", regval);
+          ferr("ERROR: Timeout STA: %08x\n", regval);
           ret = -ETIMEDOUT;
         }
       else if (regval & SDIO_STA_CCRCFAIL)
         {
-          fdbg("ERROR: CRC fail STA: %08x\n", regval);
+          ferr("ERROR: CRC fail STA: %08x\n", regval);
           ret = -EIO;
         }
     }
@@ -2216,7 +2216,7 @@ static int stm32_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *r
   if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R3_RESPONSE &&
       (cmd & MMCSD_RESPONSE_MASK) != MMCSD_R7_RESPONSE)
     {
-      fdbg("ERROR: Wrong response CMD=%08x\n", cmd);
+      ferr("ERROR: Wrong response CMD=%08x\n", cmd);
       ret = -EINVAL;
     }
   else
@@ -2229,7 +2229,7 @@ static int stm32_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *r
       regval = getreg32(STM32_SDIO_STA);
       if (regval & SDIO_STA_CTIMEOUT)
         {
-          fdbg("ERROR: Timeout STA: %08x\n", regval);
+          ferr("ERROR: Timeout STA: %08x\n", regval);
           ret = -ETIMEDOUT;
         }
     }
@@ -2384,7 +2384,7 @@ static sdio_eventset_t stm32_eventwait(FAR struct sdio_dev_s *dev,
                        1, (uint32_t)priv);
       if (ret != OK)
         {
-          fdbg("ERROR: wd_start failed: %d\n", ret);
+          ferr("ERROR: wd_start failed: %d\n", ret);
         }
     }
 
diff --git a/arch/arm/src/stm32/stm32_spi.c b/arch/arm/src/stm32/stm32_spi.c
index 803935fea5..8b871665a5 100644
--- a/arch/arm/src/stm32/stm32_spi.c
+++ b/arch/arm/src/stm32/stm32_spi.c
@@ -165,14 +165,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg llerr
+#  define spierr llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -1692,7 +1692,7 @@ FAR struct spi_dev_s *stm32_spibus_initialize(int bus)
   else
 #endif
     {
-      spidbg("ERROR: Unsupbused SPI bus: %d\n", bus);
+      spierr("ERROR: Unsupbused SPI bus: %d\n", bus);
       return NULL;
     }
 
diff --git a/arch/arm/src/stm32/stm32_wwdg.c b/arch/arm/src/stm32/stm32_wwdg.c
index 2f9074867d..b2f9a616f7 100644
--- a/arch/arm/src/stm32/stm32_wwdg.c
+++ b/arch/arm/src/stm32/stm32_wwdg.c
@@ -49,7 +49,7 @@
 #include 
 
 #include "up_arch.h"
-#include "chip/stm32_dbgmcu.h"
+#include "chip/stm32_errmcu.h"
 #include "stm32_wdg.h"
 
 #if defined(CONFIG_WATCHDOG) && defined(CONFIG_STM32_WWDG)
@@ -88,10 +88,10 @@
  */
 
 #ifdef CONFIG_DEBUG_WATCHDOG
-#  define wddbg    llerr
+#  define wderr    llerr
 #  define wdinfo   llinfo
 #else
-#  define wddbg(x...)
+#  define wderr(x...)
 #  define wdinfo(x...)
 #endif
 
@@ -513,7 +513,7 @@ static int stm32_settimeout(FAR struct watchdog_lowerhalf_s *lower,
 
   if (timeout < 1 || timeout > WWDG_MAXTIMEOUT)
     {
-      wddbg("Cannot represent timeout=%d > %d\n",
+      wderr("Cannot represent timeout=%d > %d\n",
             timeout, WWDG_MAXTIMEOUT);
       return -ERANGE;
     }
diff --git a/arch/arm/src/stm32/stm32f10xxx_dma.c b/arch/arm/src/stm32/stm32f10xxx_dma.c
index a452e65eb8..32f485c447 100644
--- a/arch/arm/src/stm32/stm32f10xxx_dma.c
+++ b/arch/arm/src/stm32/stm32f10xxx_dma.c
@@ -741,12 +741,12 @@ void stm32_dmadump(DMA_HANDLE handle, const struct stm32_dmaregs_s *regs,
   struct stm32_dma_s *dmach = (struct stm32_dma_s *)handle;
   uint32_t dmabase = DMA_BASE(dmach->base);
 
-  dmadbg("DMA Registers: %s\n", msg);
-  dmadbg("   ISRC[%08x]: %08x\n", dmabase + STM32_DMA_ISR_OFFSET, regs->isr);
-  dmadbg("    CCR[%08x]: %08x\n", dmach->base + STM32_DMACHAN_CCR_OFFSET, regs->ccr);
-  dmadbg("  CNDTR[%08x]: %08x\n", dmach->base + STM32_DMACHAN_CNDTR_OFFSET, regs->cndtr);
-  dmadbg("   CPAR[%08x]: %08x\n", dmach->base + STM32_DMACHAN_CPAR_OFFSET, regs->cpar);
-  dmadbg("   CMAR[%08x]: %08x\n", dmach->base + STM32_DMACHAN_CMAR_OFFSET, regs->cmar);
+  dmaerr("DMA Registers: %s\n", msg);
+  dmaerr("   ISRC[%08x]: %08x\n", dmabase + STM32_DMA_ISR_OFFSET, regs->isr);
+  dmaerr("    CCR[%08x]: %08x\n", dmach->base + STM32_DMACHAN_CCR_OFFSET, regs->ccr);
+  dmaerr("  CNDTR[%08x]: %08x\n", dmach->base + STM32_DMACHAN_CNDTR_OFFSET, regs->cndtr);
+  dmaerr("   CPAR[%08x]: %08x\n", dmach->base + STM32_DMACHAN_CPAR_OFFSET, regs->cpar);
+  dmaerr("   CMAR[%08x]: %08x\n", dmach->base + STM32_DMACHAN_CMAR_OFFSET, regs->cmar);
 }
 #endif
 
diff --git a/arch/arm/src/stm32/stm32f20xxx_dma.c b/arch/arm/src/stm32/stm32f20xxx_dma.c
index 39c40f59f6..8dbe917e93 100644
--- a/arch/arm/src/stm32/stm32f20xxx_dma.c
+++ b/arch/arm/src/stm32/stm32f20xxx_dma.c
@@ -606,7 +606,7 @@ void stm32_dmasetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr,
   uint32_t regoffset;
   uint32_t regval;
 
-  dmadbg("paddr: %08x maddr: %08x ntransfers: %d scr: %08x\n",
+  dmaerr("paddr: %08x maddr: %08x ntransfers: %d scr: %08x\n",
          paddr, maddr, ntransfers, scr);
 
   /* "If the stream is enabled, disable it by resetting the EN bit in the
@@ -1010,15 +1010,15 @@ void stm32_dmadump(DMA_HANDLE handle, const struct stm32_dmaregs_s *regs,
   struct stm32_dma_s *dmast = (struct stm32_dma_s *)handle;
   uint32_t dmabase = DMA_BASE(dmast->base);
 
-  dmadbg("DMA Registers: %s\n", msg);
-  dmadbg("   LISR[%08x]: %08x\n", dmabase + STM32_DMA_LISR_OFFSET, regs->lisr);
-  dmadbg("   HISR[%08x]: %08x\n", dmabase + STM32_DMA_HISR_OFFSET, regs->hisr);
-  dmadbg("    SCR[%08x]: %08x\n", dmast->base + STM32_DMA_SCR_OFFSET, regs->scr);
-  dmadbg("  SNDTR[%08x]: %08x\n", dmast->base + STM32_DMA_SNDTR_OFFSET, regs->sndtr);
-  dmadbg("   SPAR[%08x]: %08x\n", dmast->base + STM32_DMA_SPAR_OFFSET, regs->spar);
-  dmadbg("  SM0AR[%08x]: %08x\n", dmast->base + STM32_DMA_SM0AR_OFFSET, regs->sm0ar);
-  dmadbg("  SM1AR[%08x]: %08x\n", dmast->base + STM32_DMA_SM1AR_OFFSET, regs->sm1ar);
-  dmadbg("   SFCR[%08x]: %08x\n", dmast->base + STM32_DMA_SFCR_OFFSET, regs->sfcr);
+  dmaerr("DMA Registers: %s\n", msg);
+  dmaerr("   LISR[%08x]: %08x\n", dmabase + STM32_DMA_LISR_OFFSET, regs->lisr);
+  dmaerr("   HISR[%08x]: %08x\n", dmabase + STM32_DMA_HISR_OFFSET, regs->hisr);
+  dmaerr("    SCR[%08x]: %08x\n", dmast->base + STM32_DMA_SCR_OFFSET, regs->scr);
+  dmaerr("  SNDTR[%08x]: %08x\n", dmast->base + STM32_DMA_SNDTR_OFFSET, regs->sndtr);
+  dmaerr("   SPAR[%08x]: %08x\n", dmast->base + STM32_DMA_SPAR_OFFSET, regs->spar);
+  dmaerr("  SM0AR[%08x]: %08x\n", dmast->base + STM32_DMA_SM0AR_OFFSET, regs->sm0ar);
+  dmaerr("  SM1AR[%08x]: %08x\n", dmast->base + STM32_DMA_SM1AR_OFFSET, regs->sm1ar);
+  dmaerr("   SFCR[%08x]: %08x\n", dmast->base + STM32_DMA_SFCR_OFFSET, regs->sfcr);
 }
 #endif
 
diff --git a/arch/arm/src/stm32/stm32f30xxx_i2c.c b/arch/arm/src/stm32/stm32f30xxx_i2c.c
index d3ed1ae31c..5f989bf0cd 100644
--- a/arch/arm/src/stm32/stm32f30xxx_i2c.c
+++ b/arch/arm/src/stm32/stm32f30xxx_i2c.c
@@ -157,10 +157,10 @@
 /* CONFIG_DEBUG_I2C + CONFIG_DEBUG_FEATURES enables general I2C debug output. */
 
 #ifdef CONFIG_DEBUG_I2C
-#  define i2cdbg dbg
+#  define i2cerr err
 #  define i2cinfo info
 #else
-#  define i2cdbg(x...)
+#  define i2cerr(x...)
 #  define i2cinfo(x...)
 #endif
 
@@ -975,7 +975,7 @@ static void stm32_i2c_tracenew(FAR struct stm32_i2c_priv_s *priv,
 
           if (priv->tndx >= (CONFIG_I2C_NTRACE-1))
             {
-              i2cdbg("Trace table overflow\n");
+              i2cerr("Trace table overflow\n");
               return;
             }
 
@@ -1016,7 +1016,7 @@ static void stm32_i2c_traceevent(FAR struct stm32_i2c_priv_s *priv,
 
       if (priv->tndx >= (CONFIG_I2C_NTRACE-1))
         {
-          i2cdbg("Trace table overflow\n");
+          i2cerr("Trace table overflow\n");
           return;
         }
 
@@ -1709,7 +1709,7 @@ static int stm32_i2c_transfer(FAR struct i2c_master_s *dev, FAR struct i2c_msg_s
       status = stm32_i2c_getstatus(priv);
       ret = -ETIMEDOUT;
 
-      i2cdbg("Timed out: CR1: %04x status: %08x\n",
+      i2cerr("Timed out: CR1: %04x status: %08x\n",
              stm32_i2c_getreg(priv, STM32_I2C_CR1_OFFSET), status);
 
       /* "Note: When the STOP, START or PEC bit is set, the software must
diff --git a/arch/arm/src/stm32/stm32f40xxx_dma.c b/arch/arm/src/stm32/stm32f40xxx_dma.c
index 0ca3bc31ce..b7a968c84b 100644
--- a/arch/arm/src/stm32/stm32f40xxx_dma.c
+++ b/arch/arm/src/stm32/stm32f40xxx_dma.c
@@ -605,7 +605,7 @@ void stm32_dmasetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr,
   uint32_t regoffset;
   uint32_t regval;
 
-  dmadbg("paddr: %08x maddr: %08x ntransfers: %d scr: %08x\n",
+  dmaerr("paddr: %08x maddr: %08x ntransfers: %d scr: %08x\n",
          paddr, maddr, ntransfers, scr);
 
 #ifdef CONFIG_STM32_DMACAPABLE
@@ -1038,15 +1038,15 @@ void stm32_dmadump(DMA_HANDLE handle, const struct stm32_dmaregs_s *regs,
   struct stm32_dma_s *dmast = (struct stm32_dma_s *)handle;
   uint32_t dmabase = DMA_BASE(dmast->base);
 
-  dmadbg("DMA Registers: %s\n", msg);
-  dmadbg("   LISR[%08x]: %08x\n", dmabase + STM32_DMA_LISR_OFFSET, regs->lisr);
-  dmadbg("   HISR[%08x]: %08x\n", dmabase + STM32_DMA_HISR_OFFSET, regs->hisr);
-  dmadbg("    SCR[%08x]: %08x\n", dmast->base + STM32_DMA_SCR_OFFSET, regs->scr);
-  dmadbg("  SNDTR[%08x]: %08x\n", dmast->base + STM32_DMA_SNDTR_OFFSET, regs->sndtr);
-  dmadbg("   SPAR[%08x]: %08x\n", dmast->base + STM32_DMA_SPAR_OFFSET, regs->spar);
-  dmadbg("  SM0AR[%08x]: %08x\n", dmast->base + STM32_DMA_SM0AR_OFFSET, regs->sm0ar);
-  dmadbg("  SM1AR[%08x]: %08x\n", dmast->base + STM32_DMA_SM1AR_OFFSET, regs->sm1ar);
-  dmadbg("   SFCR[%08x]: %08x\n", dmast->base + STM32_DMA_SFCR_OFFSET, regs->sfcr);
+  dmaerr("DMA Registers: %s\n", msg);
+  dmaerr("   LISR[%08x]: %08x\n", dmabase + STM32_DMA_LISR_OFFSET, regs->lisr);
+  dmaerr("   HISR[%08x]: %08x\n", dmabase + STM32_DMA_HISR_OFFSET, regs->hisr);
+  dmaerr("    SCR[%08x]: %08x\n", dmast->base + STM32_DMA_SCR_OFFSET, regs->scr);
+  dmaerr("  SNDTR[%08x]: %08x\n", dmast->base + STM32_DMA_SNDTR_OFFSET, regs->sndtr);
+  dmaerr("   SPAR[%08x]: %08x\n", dmast->base + STM32_DMA_SPAR_OFFSET, regs->spar);
+  dmaerr("  SM0AR[%08x]: %08x\n", dmast->base + STM32_DMA_SM0AR_OFFSET, regs->sm0ar);
+  dmaerr("  SM1AR[%08x]: %08x\n", dmast->base + STM32_DMA_SM1AR_OFFSET, regs->sm1ar);
+  dmaerr("   SFCR[%08x]: %08x\n", dmast->base + STM32_DMA_SFCR_OFFSET, regs->sfcr);
 }
 #endif
 
diff --git a/arch/arm/src/stm32/stm32f40xxx_rtcc.c b/arch/arm/src/stm32/stm32f40xxx_rtcc.c
index d016e20559..4600ce97fa 100644
--- a/arch/arm/src/stm32/stm32f40xxx_rtcc.c
+++ b/arch/arm/src/stm32/stm32f40xxx_rtcc.c
@@ -134,12 +134,12 @@
 /* Debug ****************************************************************************/
 
 #ifdef CONFIG_DEBUG_RTC
-#  define rtcdbg             dbg
+#  define rtcerr             err
 #  define rtcinfo            info
 #  define rtcllerr           llerr
 #  define rtcllinfo          llinfo
 #else
-#  define rtcdbg(x...)
+#  define rtcerr(x...)
 #  define rtcinfo(x...)
 #  define rtcllerr(x...)
 #  define rtcllinfo(x...)
diff --git a/arch/arm/src/stm32f7/stm32_dma.c b/arch/arm/src/stm32f7/stm32_dma.c
index 1b7f821d33..cddacbc115 100644
--- a/arch/arm/src/stm32f7/stm32_dma.c
+++ b/arch/arm/src/stm32f7/stm32_dma.c
@@ -606,7 +606,7 @@ void stm32_dmasetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr,
   uint32_t regoffset;
   uint32_t regval;
 
-  dmadbg("paddr: %08x maddr: %08x ntransfers: %d scr: %08x\n",
+  dmaerr("paddr: %08x maddr: %08x ntransfers: %d scr: %08x\n",
          paddr, maddr, ntransfers, scr);
 
 #ifdef CONFIG_STM32_DMACAPABLE
@@ -1040,15 +1040,15 @@ void stm32_dmadump(DMA_HANDLE handle, const struct stm32_dmaregs_s *regs,
   struct stm32_dma_s *dmast = (struct stm32_dma_s *)handle;
   uint32_t dmabase = DMA_BASE(dmast->base);
 
-  dmadbg("DMA Registers: %s\n", msg);
-  dmadbg("   LISR[%08x]: %08x\n", dmabase + STM32_DMA_LISR_OFFSET, regs->lisr);
-  dmadbg("   HISR[%08x]: %08x\n", dmabase + STM32_DMA_HISR_OFFSET, regs->hisr);
-  dmadbg("    SCR[%08x]: %08x\n", dmast->base + STM32_DMA_SCR_OFFSET, regs->scr);
-  dmadbg("  SNDTR[%08x]: %08x\n", dmast->base + STM32_DMA_SNDTR_OFFSET, regs->sndtr);
-  dmadbg("   SPAR[%08x]: %08x\n", dmast->base + STM32_DMA_SPAR_OFFSET, regs->spar);
-  dmadbg("  SM0AR[%08x]: %08x\n", dmast->base + STM32_DMA_SM0AR_OFFSET, regs->sm0ar);
-  dmadbg("  SM1AR[%08x]: %08x\n", dmast->base + STM32_DMA_SM1AR_OFFSET, regs->sm1ar);
-  dmadbg("   SFCR[%08x]: %08x\n", dmast->base + STM32_DMA_SFCR_OFFSET, regs->sfcr);
+  dmaerr("DMA Registers: %s\n", msg);
+  dmaerr("   LISR[%08x]: %08x\n", dmabase + STM32_DMA_LISR_OFFSET, regs->lisr);
+  dmaerr("   HISR[%08x]: %08x\n", dmabase + STM32_DMA_HISR_OFFSET, regs->hisr);
+  dmaerr("    SCR[%08x]: %08x\n", dmast->base + STM32_DMA_SCR_OFFSET, regs->scr);
+  dmaerr("  SNDTR[%08x]: %08x\n", dmast->base + STM32_DMA_SNDTR_OFFSET, regs->sndtr);
+  dmaerr("   SPAR[%08x]: %08x\n", dmast->base + STM32_DMA_SPAR_OFFSET, regs->spar);
+  dmaerr("  SM0AR[%08x]: %08x\n", dmast->base + STM32_DMA_SM0AR_OFFSET, regs->sm0ar);
+  dmaerr("  SM1AR[%08x]: %08x\n", dmast->base + STM32_DMA_SM1AR_OFFSET, regs->sm1ar);
+  dmaerr("   SFCR[%08x]: %08x\n", dmast->base + STM32_DMA_SFCR_OFFSET, regs->sfcr);
 }
 #endif
 
diff --git a/arch/arm/src/stm32f7/stm32_ethernet.c b/arch/arm/src/stm32f7/stm32_ethernet.c
index d2aae9bfa2..4845e564d5 100644
--- a/arch/arm/src/stm32f7/stm32_ethernet.c
+++ b/arch/arm/src/stm32f7/stm32_ethernet.c
@@ -3363,7 +3363,7 @@ static inline int stm32_dm9161(struct stm32_ethmac_s *priv)
   ret = stm32_phyread(CONFIG_STM32F7_PHYADDR, MII_PHYID1, &phyval);
   if (ret < 0)
     {
-      ndbg("ERROR: Failed to read the PHY ID1: %d\n", ret);
+      nerr("ERROR: Failed to read the PHY ID1: %d\n", ret);
       return ret;
     }
 
@@ -3381,7 +3381,7 @@ static inline int stm32_dm9161(struct stm32_ethmac_s *priv)
   ret = stm32_phyread(CONFIG_STM32F7_PHYADDR, 16, &phyval);
   if (ret < 0)
     {
-      ndbg("ERROR: Failed to read the PHY Register 0x10: %d\n", ret);
+      nerr("ERROR: Failed to read the PHY Register 0x10: %d\n", ret);
       return ret;
     }
 
@@ -3438,7 +3438,7 @@ static int stm32_phyinit(struct stm32_ethmac_s *priv)
   ret = stm32_phywrite(CONFIG_STM32F7_PHYADDR, MII_MCR, MII_MCR_RESET);
   if (ret < 0)
     {
-      ndbg("ERROR: Failed to reset the PHY: %d\n", ret);
+      nerr("ERROR: Failed to reset the PHY: %d\n", ret);
       return ret;
     }
   up_mdelay(PHY_RESET_DELAY);
@@ -3449,7 +3449,7 @@ static int stm32_phyinit(struct stm32_ethmac_s *priv)
   ret = stm32_phy_boardinitialize(0);
   if (ret < 0)
     {
-      ndbg("ERROR: Failed to initialize the PHY: %d\n", ret);
+      nerr("ERROR: Failed to initialize the PHY: %d\n", ret);
       return ret;
     }
 #endif
@@ -3474,7 +3474,7 @@ static int stm32_phyinit(struct stm32_ethmac_s *priv)
       ret = stm32_phyread(CONFIG_STM32F7_PHYADDR, MII_MSR, &phyval);
       if (ret < 0)
         {
-          ndbg("ERROR: Failed to read the PHY MSR: %d\n", ret);
+          nerr("ERROR: Failed to read the PHY MSR: %d\n", ret);
           return ret;
         }
       else if ((phyval & MII_MSR_LINKSTATUS) != 0)
@@ -3485,7 +3485,7 @@ static int stm32_phyinit(struct stm32_ethmac_s *priv)
 
   if (timeout >= PHY_RETRY_TIMEOUT)
     {
-      ndbg("ERROR: Timed out waiting for link status: %04x\n", phyval);
+      nerr("ERROR: Timed out waiting for link status: %04x\n", phyval);
       return -ETIMEDOUT;
     }
 
@@ -3494,7 +3494,7 @@ static int stm32_phyinit(struct stm32_ethmac_s *priv)
   ret = stm32_phywrite(CONFIG_STM32F7_PHYADDR, MII_MCR, MII_MCR_ANENABLE);
   if (ret < 0)
     {
-      ndbg("ERROR: Failed to enable auto-negotiation: %d\n", ret);
+      nerr("ERROR: Failed to enable auto-negotiation: %d\n", ret);
       return ret;
     }
 
@@ -3505,7 +3505,7 @@ static int stm32_phyinit(struct stm32_ethmac_s *priv)
       ret = stm32_phyread(CONFIG_STM32F7_PHYADDR, MII_MSR, &phyval);
       if (ret < 0)
         {
-          ndbg("ERROR: Failed to read the PHY MSR: %d\n", ret);
+          nerr("ERROR: Failed to read the PHY MSR: %d\n", ret);
           return ret;
         }
       else if ((phyval & MII_MSR_ANEGCOMPLETE) != 0)
@@ -3516,7 +3516,7 @@ static int stm32_phyinit(struct stm32_ethmac_s *priv)
 
   if (timeout >= PHY_RETRY_TIMEOUT)
     {
-      ndbg("ERROR: Timed out waiting for auto-negotiation\n");
+      nerr("ERROR: Timed out waiting for auto-negotiation\n");
       return -ETIMEDOUT;
     }
 
@@ -3525,7 +3525,7 @@ static int stm32_phyinit(struct stm32_ethmac_s *priv)
   ret = stm32_phyread(CONFIG_STM32F7_PHYADDR, CONFIG_STM32F7_PHYSR, &phyval);
   if (ret < 0)
     {
-      ndbg("ERROR: Failed to read PHY status register\n");
+      nerr("ERROR: Failed to read PHY status register\n");
       return ret;
     }
 
@@ -3543,7 +3543,7 @@ static int stm32_phyinit(struct stm32_ethmac_s *priv)
   switch (phyval & CONFIG_STM32F7_PHYSR_ALTMODE)
     {
       default:
-        ndbg("ERROR: Unrecognized PHY status setting\n");
+        nerr("ERROR: Unrecognized PHY status setting\n");
 
       case CONFIG_STM32F7_PHYSR_10HD:
         priv->fduplex = 0;
@@ -3597,7 +3597,7 @@ static int stm32_phyinit(struct stm32_ethmac_s *priv)
   ret = stm32_phywrite(CONFIG_STM32F7_PHYADDR, MII_MCR, phyval);
   if (ret < 0)
     {
-     ndbg("ERROR: Failed to write the PHY MCR: %d\n", ret);
+     nerr("ERROR: Failed to write the PHY MCR: %d\n", ret);
       return ret;
     }
 
diff --git a/arch/arm/src/stm32f7/stm32_irq.c b/arch/arm/src/stm32f7/stm32_irq.c
index 125555cbcb..7a541270de 100644
--- a/arch/arm/src/stm32f7/stm32_irq.c
+++ b/arch/arm/src/stm32f7/stm32_irq.c
@@ -173,7 +173,7 @@ static void stm32_dumpnvic(const char *msg, int irq)
 #endif
 
 /****************************************************************************
- * Name: stm32_nmi, stm32_busfault, stm32_usagefault, stm32_pendsv, stm32_dbgmonitor,
+ * Name: stm32_nmi, stm32_busfault, stm32_usagefault, stm32_pendsv, stm32_errmonitor,
  *       stm32_pendsv, stm32_reserved
  *
  * Description:
@@ -187,7 +187,7 @@ static void stm32_dumpnvic(const char *msg, int irq)
 static int stm32_nmi(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! NMI received\n");
+  err("PANIC!!! NMI received\n");
   PANIC();
   return 0;
 }
@@ -195,7 +195,7 @@ static int stm32_nmi(int irq, FAR void *context)
 static int stm32_busfault(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS));
+  err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS));
   PANIC();
   return 0;
 }
@@ -203,7 +203,7 @@ static int stm32_busfault(int irq, FAR void *context)
 static int stm32_usagefault(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS));
+  err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS));
   PANIC();
   return 0;
 }
@@ -211,15 +211,15 @@ static int stm32_usagefault(int irq, FAR void *context)
 static int stm32_pendsv(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! PendSV received\n");
+  err("PANIC!!! PendSV received\n");
   PANIC();
   return 0;
 }
 
-static int stm32_dbgmonitor(int irq, FAR void *context)
+static int stm32_errmonitor(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Debug Monitor received\n");
+  err("PANIC!!! Debug Monitor received\n");
   PANIC();
   return 0;
 }
@@ -227,7 +227,7 @@ static int stm32_dbgmonitor(int irq, FAR void *context)
 static int stm32_reserved(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Reserved interrupt\n");
+  err("PANIC!!! Reserved interrupt\n");
   PANIC();
   return 0;
 }
@@ -498,7 +498,7 @@ void up_irqinitialize(void)
   irq_attach(STM32_IRQ_BUSFAULT, stm32_busfault);
   irq_attach(STM32_IRQ_USAGEFAULT, stm32_usagefault);
   irq_attach(STM32_IRQ_PENDSV, stm32_pendsv);
-  irq_attach(STM32_IRQ_DBGMONITOR, stm32_dbgmonitor);
+  irq_attach(STM32_IRQ_DBGMONITOR, stm32_errmonitor);
   irq_attach(STM32_IRQ_RESERVED, stm32_reserved);
 #endif
 
diff --git a/arch/arm/src/stm32f7/stm32_procfs_dtcm.c b/arch/arm/src/stm32f7/stm32_procfs_dtcm.c
index 59faa89318..30c54f2387 100644
--- a/arch/arm/src/stm32f7/stm32_procfs_dtcm.c
+++ b/arch/arm/src/stm32f7/stm32_procfs_dtcm.c
@@ -157,7 +157,7 @@ static int dtcm_open(FAR struct file *filep, FAR const char *relpath,
 
   if ((oflags & O_WRONLY) != 0 || (oflags & O_RDONLY) == 0)
     {
-      fdbg("ERROR: Only O_RDONLY supported\n");
+      ferr("ERROR: Only O_RDONLY supported\n");
       return -EACCES;
     }
 
@@ -165,7 +165,7 @@ static int dtcm_open(FAR struct file *filep, FAR const char *relpath,
 
   if (strcmp(relpath, "dtcm") != 0)
     {
-      fdbg("ERROR: relpath is '%s'\n", relpath);
+      ferr("ERROR: relpath is '%s'\n", relpath);
       return -ENOENT;
     }
 
@@ -174,7 +174,7 @@ static int dtcm_open(FAR struct file *filep, FAR const char *relpath,
   priv = (FAR struct dtcm_file_s *)kmm_zalloc(sizeof(struct dtcm_file_s));
   if (!priv)
     {
-      fdbg("ERROR: Failed to allocate file attributes\n");
+      ferr("ERROR: Failed to allocate file attributes\n");
       return -ENOMEM;
     }
 
@@ -290,7 +290,7 @@ static int dtcm_dup(FAR const struct file *oldp, FAR struct file *newp)
   newpriv = (FAR struct dtcm_file_s *)kmm_zalloc(sizeof(struct dtcm_file_s));
   if (!newpriv)
     {
-      fdbg("ERROR: Failed to allocate file attributes\n");
+      ferr("ERROR: Failed to allocate file attributes\n");
       return -ENOMEM;
     }
 
@@ -308,7 +308,7 @@ static int dtcm_stat(const char *relpath, struct stat *buf)
 {
   if (strcmp(relpath, "dtcm") != 0)
     {
-      fdbg("ERROR: relpath is '%s'\n", relpath);
+      ferr("ERROR: relpath is '%s'\n", relpath);
       return -ENOENT;
     }
 
diff --git a/arch/arm/src/stm32l4/stm32l4_can.c b/arch/arm/src/stm32l4/stm32l4_can.c
index bb4e049312..5a23b36cbf 100644
--- a/arch/arm/src/stm32l4/stm32l4_can.c
+++ b/arch/arm/src/stm32l4/stm32l4_can.c
@@ -86,12 +86,12 @@
 /* Non-standard debug that may be enabled just for testing CAN */
 
 #ifdef CONFIG_DEBUG_CAN
-#  define candbg    dbg
+#  define canerr    err
 #  define caninfo   info
 #  define canllerr  llerr
 #  define canllinfo llinfo
 #else
-#  define candbg(x...)
+#  define canerr(x...)
 #  define caninfo(x...)
 #  define canllerr(x...)
 #  define canllinfo(x...)
@@ -1588,7 +1588,7 @@ FAR struct can_dev_s *stm32l4_caninitialize(int port)
   else
 #endif
     {
-      candbg("ERROR: Unsupported port %d\n", port);
+      canerr("ERROR: Unsupported port %d\n", port);
       return NULL;
     }
 
diff --git a/arch/arm/src/stm32l4/stm32l4_i2c.c b/arch/arm/src/stm32l4/stm32l4_i2c.c
index 679739d995..49088d947b 100644
--- a/arch/arm/src/stm32l4/stm32l4_i2c.c
+++ b/arch/arm/src/stm32l4/stm32l4_i2c.c
@@ -149,10 +149,10 @@
 /* CONFIG_DEBUG_I2C + CONFIG_DEBUG_FEATURES enables general I2C debug output. */
 
 #ifdef CONFIG_DEBUG_I2C
-#  define i2cdbg dbg
+#  define i2cerr err
 #  define i2cinfo info
 #else
-#  define i2cdbg(x...)
+#  define i2cerr(x...)
 #  define i2cinfo(x...)
 #endif
 
@@ -919,7 +919,7 @@ static void stm32l4_i2c_tracenew(FAR struct stm32l4_i2c_priv_s *priv,
 
           if (priv->tndx >= (CONFIG_I2C_NTRACE-1))
             {
-              i2cdbg("Trace table overflow\n");
+              i2cerr("Trace table overflow\n");
               return;
             }
 
@@ -960,7 +960,7 @@ static void stm32l4_i2c_traceevent(FAR struct stm32l4_i2c_priv_s *priv,
 
       if (priv->tndx >= (CONFIG_I2C_NTRACE-1))
         {
-          i2cdbg("Trace table overflow\n");
+          i2cerr("Trace table overflow\n");
           return;
         }
 
@@ -1731,7 +1731,7 @@ static int stm32l4_i2c_transfer(FAR struct i2c_master_s *dev, FAR struct i2c_msg
       status = stm32l4_i2c_getstatus(priv);
       ret = -ETIMEDOUT;
 
-      i2cdbg("Timed out: CR1: %08x status: %08x\n",
+      i2cerr("Timed out: CR1: %08x status: %08x\n",
              stm32l4_i2c_getreg32(priv, STM32L4_I2C_CR1_OFFSET), status);
 
       /* "Note: When the STOP, START or PEC bit is set, the software must
diff --git a/arch/arm/src/stm32l4/stm32l4_irq.c b/arch/arm/src/stm32l4/stm32l4_irq.c
index 2a11ef105f..93903c8924 100644
--- a/arch/arm/src/stm32l4/stm32l4_irq.c
+++ b/arch/arm/src/stm32l4/stm32l4_irq.c
@@ -148,7 +148,7 @@ static void stm32l4_dumpnvic(const char *msg, int irq)
 
 /****************************************************************************
  * Name: stm32l4_nmi, stm32l4_busfault, stm32l4_usagefault, stm32l4_pendsv,
- *       stm32l4_dbgmonitor, stm32l4_pendsv, stm32l4_reserved
+ *       stm32l4_errmonitor, stm32l4_pendsv, stm32l4_reserved
  *
  * Description:
  *   Handlers for various execptions.  None are handled and all are fatal
@@ -161,7 +161,7 @@ static void stm32l4_dumpnvic(const char *msg, int irq)
 static int stm32l4_nmi(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! NMI received\n");
+  err("PANIC!!! NMI received\n");
   PANIC();
   return 0;
 }
@@ -169,7 +169,7 @@ static int stm32l4_nmi(int irq, FAR void *context)
 static int stm32l4_busfault(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS));
+  err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS));
   PANIC();
   return 0;
 }
@@ -177,7 +177,7 @@ static int stm32l4_busfault(int irq, FAR void *context)
 static int stm32l4_usagefault(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS));
+  err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS));
   PANIC();
   return 0;
 }
@@ -185,15 +185,15 @@ static int stm32l4_usagefault(int irq, FAR void *context)
 static int stm32l4_pendsv(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! PendSV received\n");
+  err("PANIC!!! PendSV received\n");
   PANIC();
   return 0;
 }
 
-static int stm32l4_dbgmonitor(int irq, FAR void *context)
+static int stm32l4_errmonitor(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Debug Monitor received\n");
+  err("PANIC!!! Debug Monitor received\n");
   PANIC();
   return 0;
 }
@@ -201,7 +201,7 @@ static int stm32l4_dbgmonitor(int irq, FAR void *context)
 static int stm32l4_reserved(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Reserved interrupt\n");
+  err("PANIC!!! Reserved interrupt\n");
   PANIC();
   return 0;
 }
@@ -411,7 +411,7 @@ void up_irqinitialize(void)
   irq_attach(STM32L4_IRQ_BUSFAULT, stm32l4_busfault);
   irq_attach(STM32L4_IRQ_USAGEFAULT, stm32l4_usagefault);
   irq_attach(STM32L4_IRQ_PENDSV, stm32l4_pendsv);
-  irq_attach(STM32L4_IRQ_DBGMONITOR, stm32l4_dbgmonitor);
+  irq_attach(STM32L4_IRQ_DBGMONITOR, stm32l4_errmonitor);
   irq_attach(STM32L4_IRQ_RESERVED, stm32l4_reserved);
 #endif
 
diff --git a/arch/arm/src/stm32l4/stm32l4_qspi.c b/arch/arm/src/stm32l4/stm32l4_qspi.c
index 459b921ab6..90fb091d55 100644
--- a/arch/arm/src/stm32l4/stm32l4_qspi.c
+++ b/arch/arm/src/stm32l4/stm32l4_qspi.c
@@ -101,14 +101,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define qspidbg llerr
+#  define qspierr llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define qspiinfo llerr
 #  else
 #    define qspiinfo(x...)
 #  endif
 #else
-#  define qspidbg(x...)
+#  define qspierr(x...)
 #  define qspiinfo(x...)
 #endif
 
@@ -1472,7 +1472,7 @@ static int qspi_memory_dma(struct stm32l4_qspidev_s *priv,
                      (wdentry_t)qspi_dma_timeout, 1, (uint32_t)priv);
       if (ret != OK)
         {
-           qspidbg("ERROR: wd_start failed: %d\n", ret);
+           qspierr("ERROR: wd_start failed: %d\n", ret);
         }
 
       /* Wait for the DMA complete */
@@ -1535,7 +1535,7 @@ static int qspi_memory_dma(struct stm32l4_qspidev_s *priv,
 
   if (priv->result)
     {
-      qspidbg("ERROR: DMA failed with result: %d\n", priv->result);
+      qspierr("ERROR: DMA failed with result: %d\n", priv->result);
     }
 
   return priv->result;
@@ -2497,7 +2497,7 @@ struct qspi_dev_s *stm32l4_qspi_initialize(int intf)
     }
   else
     {
-      qspidbg("ERROR: QSPI%d not supported\n", intf);
+      qspierr("ERROR: QSPI%d not supported\n", intf);
       return NULL;
     }
 
@@ -2520,7 +2520,7 @@ struct qspi_dev_s *stm32l4_qspi_initialize(int intf)
           priv->dmach = stm32l4_dmachannel(DMACHAN_QUADSPI);
           if (!priv->dmach)
             {
-              qspidbg("ERROR: Failed to allocate the DMA channel\n");
+              qspierr("ERROR: Failed to allocate the DMA channel\n");
               priv->candma = false;
             }
         }
@@ -2536,7 +2536,7 @@ struct qspi_dev_s *stm32l4_qspi_initialize(int intf)
       priv->dmadog = wd_create();
       if (priv->dmadog == NULL)
         {
-          qspidbg("ERROR: Failed to create wdog\n");
+          qspierr("ERROR: Failed to create wdog\n");
           goto errout_with_dmahandles;
         }
 #endif
@@ -2547,7 +2547,7 @@ struct qspi_dev_s *stm32l4_qspi_initialize(int intf)
       ret = irq_attach(priv->irq, priv->handler);
       if (ret < 0)
         {
-          qspidbg("ERROR: Failed to attach irq %d\n", priv->irq);
+          qspierr("ERROR: Failed to attach irq %d\n", priv->irq);
           goto errout_with_dmadog;
         }
 
@@ -2564,7 +2564,7 @@ struct qspi_dev_s *stm32l4_qspi_initialize(int intf)
       ret = qspi_hw_initialize(priv);
       if (ret < 0)
         {
-          qspidbg("ERROR: Failed to initialize QSPI hardware\n");
+          qspierr("ERROR: Failed to initialize QSPI hardware\n");
           goto errout_with_irq;
         }
 
diff --git a/arch/arm/src/stm32l4/stm32l4_rtcc.c b/arch/arm/src/stm32l4/stm32l4_rtcc.c
index 1d959e688a..d2d055fcbd 100644
--- a/arch/arm/src/stm32l4/stm32l4_rtcc.c
+++ b/arch/arm/src/stm32l4/stm32l4_rtcc.c
@@ -119,12 +119,12 @@
 /* Debug ****************************************************************************/
 
 #ifdef CONFIG_DEBUG_RTC
-#  define rtcdbg    dbg
+#  define rtcerr    err
 #  define rtcinfo   info
 #  define rtcllerr  llerr
 #  define rtcllinfo llinfo
 #else
-#  define rtcdbg(x...)
+#  define rtcerr(x...)
 #  define rtcinfo(x...)
 #  define rtcllerr(x...)
 #  define rtcllinfo(x...)
diff --git a/arch/arm/src/stm32l4/stm32l4_spi.c b/arch/arm/src/stm32l4/stm32l4_spi.c
index 05d6409035..dc8811dfd9 100644
--- a/arch/arm/src/stm32l4/stm32l4_spi.c
+++ b/arch/arm/src/stm32l4/stm32l4_spi.c
@@ -146,14 +146,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg llerr
+#  define spierr llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -1627,7 +1627,7 @@ FAR struct spi_dev_s *stm32l4_spibus_initialize(int bus)
   else
 #endif
     {
-      spidbg("ERROR: Unsupbused SPI bus: %d\n", bus);
+      spierr("ERROR: Unsupbused SPI bus: %d\n", bus);
       return NULL;
     }
 
diff --git a/arch/arm/src/stm32l4/stm32l4x6xx_dma.c b/arch/arm/src/stm32l4/stm32l4x6xx_dma.c
index eb91e3a754..e854d32261 100644
--- a/arch/arm/src/stm32l4/stm32l4x6xx_dma.c
+++ b/arch/arm/src/stm32l4/stm32l4x6xx_dma.c
@@ -762,13 +762,13 @@ void stm32l4_dmadump(DMA_HANDLE handle, const struct stm32l4_dmaregs_s *regs,
   struct stm32l4_dma_s *dmach = (struct stm32l4_dma_s *)handle;
   uint32_t dmabase = DMA_BASE(dmach->base);
 
-  dmadbg("DMA Registers: %s\n", msg);
-  dmadbg("    ISR[%08x]: %08x\n", dmabase + STM32L4_DMA_ISR_OFFSET, regs->isr);
-  dmadbg("  CSELR[%08x]: %08x\n", dmabase + STM32L4_DMA_CSELR_OFFSET, regs->cselr);
-  dmadbg("    CCR[%08x]: %08x\n", dmach->base + STM32L4_DMACHAN_CCR_OFFSET, regs->ccr);
-  dmadbg("  CNDTR[%08x]: %08x\n", dmach->base + STM32L4_DMACHAN_CNDTR_OFFSET, regs->cndtr);
-  dmadbg("   CPAR[%08x]: %08x\n", dmach->base + STM32L4_DMACHAN_CPAR_OFFSET, regs->cpar);
-  dmadbg("   CMAR[%08x]: %08x\n", dmach->base + STM32L4_DMACHAN_CMAR_OFFSET, regs->cmar);
+  dmaerr("DMA Registers: %s\n", msg);
+  dmaerr("    ISR[%08x]: %08x\n", dmabase + STM32L4_DMA_ISR_OFFSET, regs->isr);
+  dmaerr("  CSELR[%08x]: %08x\n", dmabase + STM32L4_DMA_CSELR_OFFSET, regs->cselr);
+  dmaerr("    CCR[%08x]: %08x\n", dmach->base + STM32L4_DMACHAN_CCR_OFFSET, regs->ccr);
+  dmaerr("  CNDTR[%08x]: %08x\n", dmach->base + STM32L4_DMACHAN_CNDTR_OFFSET, regs->cndtr);
+  dmaerr("   CPAR[%08x]: %08x\n", dmach->base + STM32L4_DMACHAN_CPAR_OFFSET, regs->cpar);
+  dmaerr("   CMAR[%08x]: %08x\n", dmach->base + STM32L4_DMACHAN_CMAR_OFFSET, regs->cmar);
 }
 #endif
 
diff --git a/arch/arm/src/tiva/lm3s_ethernet.c b/arch/arm/src/tiva/lm3s_ethernet.c
index 9a9f72e97b..bc22d7439d 100644
--- a/arch/arm/src/tiva/lm3s_ethernet.c
+++ b/arch/arm/src/tiva/lm3s_ethernet.c
@@ -1455,7 +1455,7 @@ static inline int tiva_ethinitialize(int intf)
 
   /* Check if the Ethernet module is present */
 
-  ndbg("Setting up eth%d\n", intf);
+  nerr("Setting up eth%d\n", intf);
 
 #if TIVA_NETHCONTROLLERS > 1
 # error "This debug check only works with one interface"
diff --git a/arch/arm/src/tiva/tiva_adclib.c b/arch/arm/src/tiva/tiva_adclib.c
index cb561682ed..8376e51cc8 100644
--- a/arch/arm/src/tiva/tiva_adclib.c
+++ b/arch/arm/src/tiva/tiva_adclib.c
@@ -417,7 +417,7 @@ void tiva_adc_irq_attach(uint8_t adc, uint8_t sse, xcpt_t isr)
   ret = irq_attach(irq, isr);
   if (ret < 0)
     {
-      adbg("ERROR: Failed to attach IRQ %d: %d\n", irq, ret);
+      aerr("ERROR: Failed to attach IRQ %d: %d\n", irq, ret);
       return;
     }
 
@@ -446,7 +446,7 @@ void tiva_adc_irq_detach(uint8_t adc, uint8_t sse)
   ret = irq_detach(irq);
   if (ret < 0)
     {
-      adbg("ERROR: Failed to detach IRQ %d: %d\n", irq, ret);
+      aerr("ERROR: Failed to detach IRQ %d: %d\n", irq, ret);
       return;
     }
 }
diff --git a/arch/arm/src/tiva/tiva_adclow.c b/arch/arm/src/tiva/tiva_adclow.c
index 9e4ecd59b0..809cb65b3b 100644
--- a/arch/arm/src/tiva/tiva_adclow.c
+++ b/arch/arm/src/tiva/tiva_adclow.c
@@ -753,7 +753,7 @@ static void tiva_adc_interrupt(struct tiva_adc_sse_s *sse)
   ret = work_queue(HPWORK, &sse->work, tiva_adc_read, sse, 0);
   if (ret != 0)
     {
-      adbg("ERROR: Failed to queue work: %d ADC.SSE: %d.%d\n",
+      aerr("ERROR: Failed to queue work: %d ADC.SSE: %d.%d\n",
            ret, sse->adc, sse->num);
     }
 }
@@ -879,7 +879,7 @@ int tiva_adc_initialize(const char *devpath, struct tiva_adc_cfg_s *cfg,
   adc = tiva_adc_struct_init(cfg);
   if (adc == NULL)
     {
-      adbg("Invalid ADC device number: expected=%d actual=%d\n",
+      aerr("Invalid ADC device number: expected=%d actual=%d\n",
             0, cfg->adc);
       return -ENODEV;
     }
@@ -888,7 +888,7 @@ int tiva_adc_initialize(const char *devpath, struct tiva_adc_cfg_s *cfg,
 
   if (tiva_adc_enable(adc->devno, true) < 0)
     {
-      adbg("ERROR: failure to power ADC peripheral (devno=%d)\n",
+      aerr("ERROR: failure to power ADC peripheral (devno=%d)\n",
             cfg->adc);
       return ret;
     }
@@ -912,7 +912,7 @@ int tiva_adc_initialize(const char *devpath, struct tiva_adc_cfg_s *cfg,
 
   if (adc->dev == NULL)
     {
-      adbg("ERROR: Failed to get interface %s\n", devpath);
+      aerr("ERROR: Failed to get interface %s\n", devpath);
       return -ENODEV;
     }
 
@@ -925,7 +925,7 @@ int tiva_adc_initialize(const char *devpath, struct tiva_adc_cfg_s *cfg,
   ret = adc_register(devpath, adc->dev);
   if (ret < 0)
     {
-      adbg("ERROR: Failed to register %s to character driver: %d\n",
+      aerr("ERROR: Failed to register %s to character driver: %d\n",
             devpath, ret);
       return ret;
     }
diff --git a/arch/arm/src/tiva/tiva_gpio.h b/arch/arm/src/tiva/tiva_gpio.h
index 2d8f12e2c3..17f3957f07 100644
--- a/arch/arm/src/tiva/tiva_gpio.h
+++ b/arch/arm/src/tiva/tiva_gpio.h
@@ -326,12 +326,12 @@
 #endif
 
 #ifdef CONFIG_DEBUG_GPIO
-# define gpiodbg(format, ...)    dbg(format, ##__VA_ARGS__)
+# define gpioerr(format, ...)    err(format, ##__VA_ARGS__)
 # define gpiollerr(format, ...)  llerr(format, ##__VA_ARGS__)
 # define gpioinfo(format, ...)   info(format, ##__VA_ARGS__)
 # define gpiollinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
-# define gpiodbg(x...)
+# define gpioerr(x...)
 # define gpiollerr(x...)
 # define gpioinfo(x...)
 # define gpiollinfo(x...)
diff --git a/arch/arm/src/tiva/tiva_i2c.c b/arch/arm/src/tiva/tiva_i2c.c
index 0c83dc1b15..375f52ff4a 100644
--- a/arch/arm/src/tiva/tiva_i2c.c
+++ b/arch/arm/src/tiva/tiva_i2c.c
@@ -122,10 +122,10 @@
 /* CONFIG_DEBUG_I2C + CONFIG_DEBUG_FEATURES enables general I2C debug output. */
 
 #ifdef CONFIG_DEBUG_I2C
-#  define i2cdbg dbg
+#  define i2cerr err
 #  define i2cinfo info
 #else
-#  define i2cdbg(x...)
+#  define i2cerr(x...)
 #  define i2cinfo(x...)
 #endif
 
@@ -968,7 +968,7 @@ static void tiva_i2c_tracenew(struct tiva_i2c_priv_s *priv, uint32_t status)
 
           if (priv->tndx >= (CONFIG_I2C_NTRACE-1))
             {
-              i2cdbg("I2C%d: ERROR: Trace table overflow\n", priv->config->devno);
+              i2cerr("I2C%d: ERROR: Trace table overflow\n", priv->config->devno);
               return;
             }
 
@@ -1017,7 +1017,7 @@ static void tiva_i2c_traceevent(struct tiva_i2c_priv_s *priv,
 
           if (priv->tndx >= (CONFIG_I2C_NTRACE-1))
             {
-              i2cdbg("I2C%d: ERROR: Trace table overflow\n", priv->config->devno);
+              i2cerr("I2C%d: ERROR: Trace table overflow\n", priv->config->devno);
               return;
             }
 
@@ -1916,7 +1916,7 @@ static int tiva_i2c_transfer(struct i2c_master_s *dev, struct i2c_msg_s *msgv,
 
   if (tiva_i2c_sem_waitdone(priv) < 0)
     {
-      i2cdbg("I2C%d: ERROR: Timed out\n", priv->config->devno);
+      i2cerr("I2C%d: ERROR: Timed out\n", priv->config->devno);
       ret = -ETIMEDOUT;
     }
 #if 0 /* I2CM_CS_CLKTO */
@@ -1925,7 +1925,7 @@ static int tiva_i2c_transfer(struct i2c_master_s *dev, struct i2c_msg_s *msgv,
   else if ((priv->mstatus & (I2CM_CS_ERROR | I2CM_CS_ARBLST)) != 0)
 #endif
     {
-      i2cdbg("I2C%d: ERROR:  I2C error status: %08x\n",
+      i2cerr("I2C%d: ERROR:  I2C error status: %08x\n",
              priv->config->devno, priv->mstatus);
 
       if ((priv->mstatus & I2CM_CS_ARBLST) != 0)
@@ -1972,7 +1972,7 @@ static int tiva_i2c_transfer(struct i2c_master_s *dev, struct i2c_msg_s *msgv,
        * other bits are valid.
        */
 
-      i2cdbg("I2C%d: ERROR:  I2C still busy: %08x\n",
+      i2cerr("I2C%d: ERROR:  I2C still busy: %08x\n",
              priv->config->devno, regval);
 
       /* Reset and reinitialize the I2C hardware */
@@ -2221,7 +2221,7 @@ struct i2c_master_s *tiva_i2cbus_initialize(int port)
 #endif
 
     default:
-      i2cdbg("I2C%d: ERROR: Not supported\n", port);
+      i2cerr("I2C%d: ERROR: Not supported\n", port);
       return NULL;
     }
 
diff --git a/arch/arm/src/tiva/tiva_irq.c b/arch/arm/src/tiva/tiva_irq.c
index 121d93bdfb..7e51ab03f8 100644
--- a/arch/arm/src/tiva/tiva_irq.c
+++ b/arch/arm/src/tiva/tiva_irq.c
@@ -186,7 +186,7 @@ static void tiva_dumpnvic(const char *msg, int irq)
 
 /****************************************************************************
  * Name: tiva_nmi, tiva_busfault, tiva_usagefault, tiva_pendsv,
- *       tiva_dbgmonitor, tiva_pendsv, tiva_reserved
+ *       tiva_errmonitor, tiva_pendsv, tiva_reserved
  *
  * Description:
  *   Handlers for various execptions.  None are handled and all are fatal
@@ -199,7 +199,7 @@ static void tiva_dumpnvic(const char *msg, int irq)
 static int tiva_nmi(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! NMI received\n");
+  err("PANIC!!! NMI received\n");
   PANIC();
   return 0;
 }
@@ -207,7 +207,7 @@ static int tiva_nmi(int irq, FAR void *context)
 static int tiva_busfault(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Bus fault recived\n");
+  err("PANIC!!! Bus fault recived\n");
   PANIC();
   return 0;
 }
@@ -215,7 +215,7 @@ static int tiva_busfault(int irq, FAR void *context)
 static int tiva_usagefault(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Usage fault received\n");
+  err("PANIC!!! Usage fault received\n");
   PANIC();
   return 0;
 }
@@ -223,15 +223,15 @@ static int tiva_usagefault(int irq, FAR void *context)
 static int tiva_pendsv(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! PendSV received\n");
+  err("PANIC!!! PendSV received\n");
   PANIC();
   return 0;
 }
 
-static int tiva_dbgmonitor(int irq, FAR void *context)
+static int tiva_errmonitor(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Debug Monitor received\n");
+  err("PANIC!!! Debug Monitor received\n");
   PANIC();
   return 0;
 }
@@ -239,7 +239,7 @@ static int tiva_dbgmonitor(int irq, FAR void *context)
 static int tiva_reserved(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  dbg("PANIC!!! Reserved interrupt\n");
+  err("PANIC!!! Reserved interrupt\n");
   PANIC();
   return 0;
 }
@@ -482,7 +482,7 @@ void up_irqinitialize(void)
   irq_attach(TIVA_IRQ_BUSFAULT, tiva_busfault);
   irq_attach(TIVA_IRQ_USAGEFAULT, tiva_usagefault);
   irq_attach(TIVA_IRQ_PENDSV, tiva_pendsv);
-  irq_attach(TIVA_IRQ_DBGMONITOR, tiva_dbgmonitor);
+  irq_attach(TIVA_IRQ_DBGMONITOR, tiva_errmonitor);
   irq_attach(TIVA_IRQ_RESERVED, tiva_reserved);
 #endif
 
diff --git a/arch/arm/src/tiva/tiva_ssi.c b/arch/arm/src/tiva/tiva_ssi.c
index a49ed5b023..eb8972bb0b 100644
--- a/arch/arm/src/tiva/tiva_ssi.c
+++ b/arch/arm/src/tiva/tiva_ssi.c
@@ -73,10 +73,10 @@
 #undef SSI_DEBUG  /* Define to enable debug */
 
 #ifdef SSI_DEBUG
-#  define ssidbg  llerr
+#  define ssierr  llerr
 #  define ssiinfo llinfo
 #else
-#  define ssidbg(x...)
+#  define ssierr(x...)
 #  define ssiinfo(x...)
 #endif
 
@@ -841,7 +841,7 @@ static int ssi_transfer(struct tiva_ssidev_s *priv, const void *txbuffer,
 #endif
   int ntxd;
 
-  ssidbg("txbuffer: %p rxbuffer: %p nwords: %d\n", txbuffer, rxbuffer, nwords);
+  ssierr("txbuffer: %p rxbuffer: %p nwords: %d\n", txbuffer, rxbuffer, nwords);
 
   /* Set up to perform the transfer */
 
@@ -913,7 +913,7 @@ static int ssi_transfer(struct tiva_ssidev_s *priv, const void *txbuffer,
       ssi_semtake(&priv->xfrsem);
     }
   while (priv->nrxwords < priv->nwords);
-  ssidbg("Transfer complete\n");
+  ssierr("Transfer complete\n");
 
 #else
   /* Perform the transfer using polling logic.  This will totally
@@ -1025,7 +1025,7 @@ static int ssi_interrupt(int irq, void *context)
 #ifdef SSI_DEBUG
   if ((regval & SSI_RIS_ROR) != 0)
     {
-      ssidbg("Rx FIFO Overrun!\n");
+      ssierr("Rx FIFO Overrun!\n");
     }
 #endif
 
@@ -1056,7 +1056,7 @@ static int ssi_interrupt(int irq, void *context)
 
       /* Wake up the waiting thread */
 
-      ssidbg("Transfer complete\n");
+      ssierr("Transfer complete\n");
       ssi_semgive(&priv->xfrsem);
     }
 
@@ -1137,7 +1137,7 @@ static uint32_t ssi_setfrequencyinternal(struct tiva_ssidev_s *priv,
   uint32_t scr;
   uint32_t actual;
 
-  ssidbg("frequency: %d\n", frequency);
+  ssierr("frequency: %d\n", frequency);
   DEBUGASSERT(frequency);
 
   /* Has the frequency changed? */
@@ -1261,7 +1261,7 @@ static void ssi_setmodeinternal(struct tiva_ssidev_s *priv, enum spi_mode_e mode
   uint32_t modebits;
   uint32_t regval;
 
-  ssidbg("mode: %d\n", mode);
+  ssierr("mode: %d\n", mode);
   DEBUGASSERT(priv);
 
   /* Has the number of bits per word changed? */
@@ -1340,7 +1340,7 @@ static void ssi_setbitsinternal(struct tiva_ssidev_s *priv, int nbits)
 {
   uint32_t regval;
 
-  ssidbg("nbits: %d\n", nbits);
+  ssierr("nbits: %d\n", nbits);
   DEBUGASSERT(priv);
   if (nbits != priv->nbits && nbits >= 4 && nbits <= 16)
     {
@@ -1507,7 +1507,7 @@ FAR struct spi_dev_s *tiva_ssibus_initialize(int port)
   struct tiva_ssidev_s *priv;
   irqstate_t flags;
 
-  ssidbg("port: %d\n", port);
+  ssierr("port: %d\n", port);
 
   /* Set up for the selected port */
 
diff --git a/arch/arm/src/tiva/tiva_timer.h b/arch/arm/src/tiva/tiva_timer.h
index 3b8135247b..16dacb92bd 100644
--- a/arch/arm/src/tiva/tiva_timer.h
+++ b/arch/arm/src/tiva/tiva_timer.h
@@ -134,10 +134,10 @@
  */
 
 #ifdef CONFIG_DEBUG_TIMER
-#  define timdbg  llerr
+#  define timerr  llerr
 #  define timinfo llinfo
 #else
-#  define timdbg(x...)
+#  define timerr(x...)
 #  define timinfo(x...)
 #endif
 
diff --git a/arch/arm/src/tiva/tiva_timerlow32.c b/arch/arm/src/tiva/tiva_timerlow32.c
index 8840ba55d6..c96b8a4570 100644
--- a/arch/arm/src/tiva/tiva_timerlow32.c
+++ b/arch/arm/src/tiva/tiva_timerlow32.c
@@ -565,7 +565,7 @@ int tiva_timer_initialize(FAR const char *devpath,
   priv = (struct tiva_lowerhalf_s *)kmm_zalloc(sizeof(struct tiva_lowerhalf_s));
   if (!priv)
     {
-      timdbg("ERROR: Failed to allocate driver structure\n");
+      timerr("ERROR: Failed to allocate driver structure\n");
       return -ENOMEM;
     }
 
@@ -577,7 +577,7 @@ int tiva_timer_initialize(FAR const char *devpath,
 #else
   if (config->cmn.alternate)
     {
-      timdbg("ERROR: Alternate clock unsupported on TM4C123 architecture\n");
+      timerr("ERROR: Alternate clock unsupported on TM4C123 architecture\n");
       return -ENOMEM;
     }
   else
@@ -599,7 +599,7 @@ int tiva_timer_initialize(FAR const char *devpath,
   priv->handle = tiva_gptm_configure((const struct tiva_gptmconfig_s *)&priv->config);
   if (!priv->handle)
     {
-      timdbg("ERROR: Failed to create timer handle\n");
+      timerr("ERROR: Failed to create timer handle\n");
       ret = -EINVAL;
       goto errout_with_alloc;
     }
diff --git a/arch/arm/src/tiva/tm4c_ethernet.c b/arch/arm/src/tiva/tm4c_ethernet.c
index dfff51354b..56080a416e 100644
--- a/arch/arm/src/tiva/tm4c_ethernet.c
+++ b/arch/arm/src/tiva/tm4c_ethernet.c
@@ -2488,12 +2488,12 @@ static int tiva_ifup(struct net_driver_s *dev)
   int ret;
 
 #ifdef CONFIG_NET_IPv4
-  ndbg("Bringing up: %d.%d.%d.%d\n",
+  nerr("Bringing up: %d.%d.%d.%d\n",
        dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
        (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 #endif
 #ifdef CONFIG_NET_IPv6
-  ndbg("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
+  nerr("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
        dev->d_ipv6addr[0], dev->d_ipv6addr[1], dev->d_ipv6addr[2],
        dev->d_ipv6addr[3], dev->d_ipv6addr[4], dev->d_ipv6addr[5],
        dev->d_ipv6addr[6], dev->d_ipv6addr[7]);
@@ -3236,7 +3236,7 @@ static int tiva_phyread(uint16_t phydevaddr, uint16_t phyregaddr, uint16_t *valu
         }
     }
 
-  ndbg("MII transfer timed out: phydevaddr: %04x phyregaddr: %04x\n",
+  nerr("MII transfer timed out: phydevaddr: %04x phyregaddr: %04x\n",
        phydevaddr, phyregaddr);
 
   return -ETIMEDOUT;
@@ -3295,7 +3295,7 @@ static int tiva_phywrite(uint16_t phydevaddr, uint16_t phyregaddr, uint16_t valu
         }
     }
 
-  ndbg("MII transfer timed out: phydevaddr: %04x phyregaddr: %04x value: %04x\n",
+  nerr("MII transfer timed out: phydevaddr: %04x phyregaddr: %04x value: %04x\n",
        phydevaddr, phyregaddr, value);
 
   return -ETIMEDOUT;
@@ -3343,7 +3343,7 @@ static int tiva_phyinit(FAR struct tiva_ethmac_s *priv)
   ret = tiva_phywrite(CONFIG_TIVA_PHYADDR, MII_MCR, MII_MCR_RESET);
   if (ret < 0)
     {
-      ndbg("Failed to reset the PHY: %d\n", ret);
+      nerr("Failed to reset the PHY: %d\n", ret);
       return ret;
     }
 
@@ -3359,7 +3359,7 @@ static int tiva_phyinit(FAR struct tiva_ethmac_s *priv)
       ret = tiva_phyread(CONFIG_TIVA_PHYADDR, MII_MSR, &phyval);
       if (ret < 0)
         {
-          ndbg("Failed to read the PHY MSR: %d\n", ret);
+          nerr("Failed to read the PHY MSR: %d\n", ret);
           return ret;
         }
       else if ((phyval & MII_MSR_LINKSTATUS) != 0)
@@ -3370,7 +3370,7 @@ static int tiva_phyinit(FAR struct tiva_ethmac_s *priv)
 
   if (timeout >= PHY_RETRY_TIMEOUT)
     {
-      ndbg("Timed out waiting for link status: %04x\n", phyval);
+      nerr("Timed out waiting for link status: %04x\n", phyval);
       return -ETIMEDOUT;
     }
 
@@ -3379,7 +3379,7 @@ static int tiva_phyinit(FAR struct tiva_ethmac_s *priv)
   ret = tiva_phywrite(CONFIG_TIVA_PHYADDR, MII_MCR, MII_MCR_ANENABLE);
   if (ret < 0)
     {
-      ndbg("Failed to enable auto-negotiation: %d\n", ret);
+      nerr("Failed to enable auto-negotiation: %d\n", ret);
       return ret;
     }
 
@@ -3390,7 +3390,7 @@ static int tiva_phyinit(FAR struct tiva_ethmac_s *priv)
       ret = tiva_phyread(CONFIG_TIVA_PHYADDR, MII_MSR, &phyval);
       if (ret < 0)
         {
-          ndbg("Failed to read the PHY MSR: %d\n", ret);
+          nerr("Failed to read the PHY MSR: %d\n", ret);
           return ret;
         }
       else if ((phyval & MII_MSR_ANEGCOMPLETE) != 0)
@@ -3401,7 +3401,7 @@ static int tiva_phyinit(FAR struct tiva_ethmac_s *priv)
 
   if (timeout >= PHY_RETRY_TIMEOUT)
     {
-      ndbg("Timed out waiting for auto-negotiation\n");
+      nerr("Timed out waiting for auto-negotiation\n");
       return -ETIMEDOUT;
     }
 
@@ -3410,7 +3410,7 @@ static int tiva_phyinit(FAR struct tiva_ethmac_s *priv)
   ret = tiva_phyread(CONFIG_TIVA_PHYADDR, CONFIG_TIVA_PHYSR, &phyval);
   if (ret < 0)
     {
-      ndbg("Failed to read PHY status register\n");
+      nerr("Failed to read PHY status register\n");
       return ret;
     }
 
@@ -3480,7 +3480,7 @@ static int tiva_phyinit(FAR struct tiva_ethmac_s *priv)
   ret = tiva_phywrite(CONFIG_TIVA_PHYADDR, MII_MCR, phyval);
   if (ret < 0)
     {
-     ndbg("Failed to write the PHY MCR: %d\n", ret);
+     nerr("Failed to write the PHY MCR: %d\n", ret);
       return ret;
     }
   up_mdelay(PHY_CONFIG_DELAY);
@@ -3495,7 +3495,7 @@ static int tiva_phyinit(FAR struct tiva_ethmac_s *priv)
 #endif
 #endif
 
-  ndbg("Duplex: %s Speed: %d MBps\n",
+  nerr("Duplex: %s Speed: %d MBps\n",
        priv->fduplex ? "FULL" : "HALF",
        priv->mbps100 ? 100 : 10);
 
diff --git a/arch/avr/src/avr/up_createstack.c b/arch/avr/src/avr/up_createstack.c
index 6d6dce9d47..54efb1a3fb 100644
--- a/arch/avr/src/avr/up_createstack.c
+++ b/arch/avr/src/avr/up_createstack.c
@@ -127,7 +127,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
 
       if (!tcb->stack_alloc_ptr)
         {
-          sdbg("ERROR: Failed to allocate stack, size %d\n", stack_size);
+          serr("ERROR: Failed to allocate stack, size %d\n", stack_size);
         }
 #endif
     }
diff --git a/arch/avr/src/avr/up_schedulesigaction.c b/arch/avr/src/avr/up_schedulesigaction.c
index 5c6cbf52ee..6d067f8fc2 100644
--- a/arch/avr/src/avr/up_schedulesigaction.c
+++ b/arch/avr/src/avr/up_schedulesigaction.c
@@ -94,7 +94,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
 {
   irqstate_t flags;
 
-  sdbg("tcb=0x%p sigdeliver=0x%p\n", tcb, sigdeliver);
+  serr("tcb=0x%p sigdeliver=0x%p\n", tcb, sigdeliver);
 
   /* Make sure that interrupts are disabled */
 
@@ -108,7 +108,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
        * being delivered to the currently executing task.
        */
 
-      sdbg("rtcb=0x%p g_current_regs=0x%p\n", this_task(), g_current_regs);
+      serr("rtcb=0x%p g_current_regs=0x%p\n", this_task(), g_current_regs);
 
       if (tcb == this_task())
         {
diff --git a/arch/avr/src/avr/up_sigdeliver.c b/arch/avr/src/avr/up_sigdeliver.c
index e786cba00c..96163e20f8 100644
--- a/arch/avr/src/avr/up_sigdeliver.c
+++ b/arch/avr/src/avr/up_sigdeliver.c
@@ -82,7 +82,7 @@ void up_sigdeliver(void)
 
   board_autoled_on(LED_SIGNAL);
 
-  sdbg("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
+  serr("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
         rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
   ASSERT(rtcb->xcp.sigdeliver != NULL);
 
@@ -117,7 +117,7 @@ void up_sigdeliver(void)
    * errno that is needed by the user logic (it is probably EINTR).
    */
 
-  sdbg("Resuming\n");
+  serr("Resuming\n");
   (void)up_irq_save();
   rtcb->pterrno = saved_errno;
 
diff --git a/arch/avr/src/avr/up_spi.c b/arch/avr/src/avr/up_spi.c
index d3c0c56eed..66cf745e92 100644
--- a/arch/avr/src/avr/up_spi.c
+++ b/arch/avr/src/avr/up_spi.c
@@ -72,7 +72,7 @@
 #undef SPI_VERBOSE   /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -80,7 +80,7 @@
 #  endif
 #else
 #  undef SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -269,7 +269,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
       actual          = priv->actual;
     }
 
-  spidbg("Frequency %d->%d\n", frequency, actual);
+  spierr("Frequency %d->%d\n", frequency, actual);
   return actual;
 }
 
@@ -408,7 +408,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size
 {
   FAR uint8_t *ptr = (FAR uint8_t *)buffer;
 
-  spidbg("nwords: %d\n", nwords);
+  spierr("nwords: %d\n", nwords);
   while (nwords-- > 0)
     {
       (void)spi_send(dev, (uint16_t)*ptr++);
@@ -439,7 +439,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw
 {
   FAR uint8_t *ptr = (FAR uint8_t *)buffer;
 
-  spidbg("nwords: %d\n", nwords);
+  spierr("nwords: %d\n", nwords);
   while (nwords-- > 0)
     {
       *ptr++ = spi_send(dev, (uint16_t)0xff);
diff --git a/arch/avr/src/avr32/up_createstack.c b/arch/avr/src/avr32/up_createstack.c
index 59c470383f..6bc17519bc 100644
--- a/arch/avr/src/avr32/up_createstack.c
+++ b/arch/avr/src/avr32/up_createstack.c
@@ -145,7 +145,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
 
       if (!tcb->stack_alloc_ptr)
         {
-          sdbg("ERROR: Failed to allocate stack, size %d\n", stack_size);
+          serr("ERROR: Failed to allocate stack, size %d\n", stack_size);
         }
 #endif
     }
diff --git a/arch/avr/src/avr32/up_schedulesigaction.c b/arch/avr/src/avr32/up_schedulesigaction.c
index 838c1382c2..f9bb311fe8 100644
--- a/arch/avr/src/avr32/up_schedulesigaction.c
+++ b/arch/avr/src/avr32/up_schedulesigaction.c
@@ -94,7 +94,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
 {
   irqstate_t flags;
 
-  sdbg("tcb=0x%p sigdeliver=0x%p\n", tcb, sigdeliver);
+  serr("tcb=0x%p sigdeliver=0x%p\n", tcb, sigdeliver);
 
   /* Make sure that interrupts are disabled */
 
@@ -108,7 +108,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
        * being delivered to the currently executing task.
        */
 
-      sdbg("rtcb=0x%p g_current_regs=0x%p\n", this_task(), g_current_regs);
+      serr("rtcb=0x%p g_current_regs=0x%p\n", this_task(), g_current_regs);
 
       if (tcb == this_task())
         {
diff --git a/arch/avr/src/avr32/up_sigdeliver.c b/arch/avr/src/avr32/up_sigdeliver.c
index 883bec9742..ded924df87 100644
--- a/arch/avr/src/avr32/up_sigdeliver.c
+++ b/arch/avr/src/avr32/up_sigdeliver.c
@@ -86,7 +86,7 @@ void up_sigdeliver(void)
 
   board_autoled_on(LED_SIGNAL);
 
-  sdbg("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
+  serr("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
         rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
   ASSERT(rtcb->xcp.sigdeliver != NULL);
 
@@ -117,7 +117,7 @@ void up_sigdeliver(void)
    * errno that is needed by the user logic (it is probably EINTR).
    */
 
-  sdbg("Resuming\n");
+  serr("Resuming\n");
   (void)up_irq_save();
   rtcb->pterrno = saved_errno;
 
diff --git a/arch/avr/src/common/up_exit.c b/arch/avr/src/common/up_exit.c
index 7002118a7f..2ceb474129 100644
--- a/arch/avr/src/common/up_exit.c
+++ b/arch/avr/src/common/up_exit.c
@@ -77,8 +77,8 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
   int i;
 #endif
 
-  sdbg("  TCB=%p name=%s pid=%d\n", tcb, tcb->argv[0], tcb->pid);
-  sdbg("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
+  serr("  TCB=%p name=%s pid=%d\n", tcb, tcb->argv[0], tcb->pid);
+  serr("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
 
 #if CONFIG_NFILE_DESCRIPTORS > 0
   filelist = tcb->group->tg_filelist;
@@ -87,7 +87,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
       struct inode *inode = filelist->fl_files[i].f_inode;
       if (inode)
         {
-          sdbg("      fd=%d refcount=%d\n",
+          serr("      fd=%d refcount=%d\n",
                i, inode->i_crefs);
         }
     }
@@ -101,11 +101,11 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
       if (filep->fs_fd >= 0)
         {
 #if CONFIG_STDIO_BUFFER_SIZE > 0
-          sdbg("      fd=%d nbytes=%d\n",
+          serr("      fd=%d nbytes=%d\n",
                filep->fs_fd,
                filep->fs_bufpos - filep->fs_bufstart);
 #else
-          sdbg("      fd=%d\n", filep->fs_fd);
+          serr("      fd=%d\n", filep->fs_fd);
 #endif
         }
     }
diff --git a/arch/hc/src/common/up_createstack.c b/arch/hc/src/common/up_createstack.c
index 9ae87865d0..f09b98a87a 100644
--- a/arch/hc/src/common/up_createstack.c
+++ b/arch/hc/src/common/up_createstack.c
@@ -142,7 +142,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
 
       if (!tcb->stack_alloc_ptr)
         {
-          sdbg("ERROR: Failed to allocate stack, size %d\n", stack_size);
+          serr("ERROR: Failed to allocate stack, size %d\n", stack_size);
         }
 #endif
     }
diff --git a/arch/hc/src/common/up_exit.c b/arch/hc/src/common/up_exit.c
index 47a23f7d9e..78e82c6088 100644
--- a/arch/hc/src/common/up_exit.c
+++ b/arch/hc/src/common/up_exit.c
@@ -85,8 +85,8 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
   int i;
 #endif
 
-  sdbg("  TCB=%p name=%s pid=%d\n", tcb, tcb->argv[0], tcb->pid);
-  sdbg("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
+  serr("  TCB=%p name=%s pid=%d\n", tcb, tcb->argv[0], tcb->pid);
+  serr("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
 
 #if CONFIG_NFILE_DESCRIPTORS > 0
   filelist = tcb->group->tg_filelist;
@@ -95,7 +95,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
       struct inode *inode = filelist->fl_files[i].f_inode;
       if (inode)
         {
-          sdbg("      fd=%d refcount=%d\n",
+          serr("      fd=%d refcount=%d\n",
                i, inode->i_crefs);
         }
     }
@@ -109,11 +109,11 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
       if (filep->fs_fd >= 0)
         {
 #if CONFIG_STDIO_BUFFER_SIZE > 0
-          sdbg("      fd=%d nbytes=%d\n",
+          serr("      fd=%d nbytes=%d\n",
                filep->fs_fd,
                filep->fs_bufpos - filep->fs_bufstart);
 #else
-          sdbg("      fd=%d\n", filep->fs_fd);
+          serr("      fd=%d\n", filep->fs_fd);
 #endif
         }
     }
diff --git a/arch/hc/src/m9s12/m9s12_ethernet.c b/arch/hc/src/m9s12/m9s12_ethernet.c
index 4b9dbfeef7..a96de8c408 100644
--- a/arch/hc/src/m9s12/m9s12_ethernet.c
+++ b/arch/hc/src/m9s12/m9s12_ethernet.c
@@ -549,7 +549,7 @@ static int emac_ifup(struct net_driver_s *dev)
 {
   FAR struct emac_driver_s *priv = (FAR struct emac_driver_s *)dev->d_private;
 
-  ndbg("Bringing up: %d.%d.%d.%d\n",
+  nerr("Bringing up: %d.%d.%d.%d\n",
        dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
        (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24 );
 
diff --git a/arch/mips/src/common/up_createstack.c b/arch/mips/src/common/up_createstack.c
index e4f9520b3b..69d5ff0486 100644
--- a/arch/mips/src/common/up_createstack.c
+++ b/arch/mips/src/common/up_createstack.c
@@ -163,7 +163,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
 
       if (!tcb->stack_alloc_ptr)
         {
-          sdbg("ERROR: Failed to allocate stack, size %d\n", stack_size);
+          serr("ERROR: Failed to allocate stack, size %d\n", stack_size);
         }
 #endif
     }
diff --git a/arch/mips/src/common/up_exit.c b/arch/mips/src/common/up_exit.c
index 00c23ba782..ad1dbeb343 100644
--- a/arch/mips/src/common/up_exit.c
+++ b/arch/mips/src/common/up_exit.c
@@ -87,8 +87,8 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
   int i;
 #endif
 
-  sdbg("  TCB=%p name=%s pid=%d\n", tcb, tcb->argv[0], tcb->pid);
-  sdbg("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
+  serr("  TCB=%p name=%s pid=%d\n", tcb, tcb->argv[0], tcb->pid);
+  serr("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
 
 #if CONFIG_NFILE_DESCRIPTORS > 0
   filelist = tcb->group->tg_filelist;
@@ -97,7 +97,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
       struct inode *inode = filelist->fl_files[i].f_inode;
       if (inode)
         {
-          sdbg("      fd=%d refcount=%d\n",
+          serr("      fd=%d refcount=%d\n",
                i, inode->i_crefs);
         }
     }
@@ -111,11 +111,11 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
       if (filep->fs_fd >= 0)
         {
 #if CONFIG_STDIO_BUFFER_SIZE > 0
-          sdbg("      fd=%d nbytes=%d\n",
+          serr("      fd=%d nbytes=%d\n",
                filep->fs_fd,
                filep->fs_bufpos - filep->fs_bufstart);
 #else
-          sdbg("      fd=%d\n", filep->fs_fd);
+          serr("      fd=%d\n", filep->fs_fd);
 #endif
         }
     }
diff --git a/arch/mips/src/mips32/up_schedulesigaction.c b/arch/mips/src/mips32/up_schedulesigaction.c
index 86cba18c74..2af3169ee6 100644
--- a/arch/mips/src/mips32/up_schedulesigaction.c
+++ b/arch/mips/src/mips32/up_schedulesigaction.c
@@ -95,7 +95,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
   irqstate_t flags;
   uint32_t status;
 
-  sdbg("tcb=0x%p sigdeliver=0x%p\n", tcb, sigdeliver);
+  serr("tcb=0x%p sigdeliver=0x%p\n", tcb, sigdeliver);
 
   /* Make sure that interrupts are disabled */
 
@@ -109,7 +109,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
        * being delivered to the currently executing task.
        */
 
-      sdbg("rtcb=0x%p g_current_regs=0x%p\n", this_task(), g_current_regs);
+      serr("rtcb=0x%p g_current_regs=0x%p\n", this_task(), g_current_regs);
 
       if (tcb == this_task())
         {
diff --git a/arch/mips/src/mips32/up_sigdeliver.c b/arch/mips/src/mips32/up_sigdeliver.c
index 5237a697b7..c514731ca1 100644
--- a/arch/mips/src/mips32/up_sigdeliver.c
+++ b/arch/mips/src/mips32/up_sigdeliver.c
@@ -96,7 +96,7 @@ void up_sigdeliver(void)
 
   board_autoled_on(LED_SIGNAL);
 
-  sdbg("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
+  serr("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
         rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
   ASSERT(rtcb->xcp.sigdeliver != NULL);
 
diff --git a/arch/mips/src/mips32/up_swint0.c b/arch/mips/src/mips32/up_swint0.c
index 12c79b0f15..6e23087108 100644
--- a/arch/mips/src/mips32/up_swint0.c
+++ b/arch/mips/src/mips32/up_swint0.c
@@ -65,9 +65,9 @@
  */
 
 #ifdef CONFIG_DEBUG_SYSCALL
-# define swidbg(format, ...) llerr(format, ##__VA_ARGS__)
+# define swierr(format, ...) llerr(format, ##__VA_ARGS__)
 #else
-# define swidbg(x...)
+# define swierr(x...)
 #endif
 
 /****************************************************************************
@@ -89,23 +89,23 @@
 #ifdef CONFIG_DEBUG_SYSCALL
 static void up_registerdump(const uint32_t *regs)
 {
-  swidbg("MFLO:%08x MFHI:%08x EPC:%08x STATUS:%08x\n",
+  swierr("MFLO:%08x MFHI:%08x EPC:%08x STATUS:%08x\n",
          regs[REG_MFLO], regs[REG_MFHI], regs[REG_EPC], regs[REG_STATUS]);
-  swidbg("AT:%08x V0:%08x V1:%08x A0:%08x A1:%08x A2:%08x A3:%08x\n",
+  swierr("AT:%08x V0:%08x V1:%08x A0:%08x A1:%08x A2:%08x A3:%08x\n",
          regs[REG_AT], regs[REG_V0], regs[REG_V1], regs[REG_A0],
          regs[REG_A1], regs[REG_A2], regs[REG_A3]);
-  swidbg("T0:%08x T1:%08x T2:%08x T3:%08x T4:%08x T5:%08x T6:%08x T7:%08x\n",
+  swierr("T0:%08x T1:%08x T2:%08x T3:%08x T4:%08x T5:%08x T6:%08x T7:%08x\n",
          regs[REG_T0], regs[REG_T1], regs[REG_T2], regs[REG_T3],
          regs[REG_T4], regs[REG_T5], regs[REG_T6], regs[REG_T7]);
-  swidbg("S0:%08x S1:%08x S2:%08x S3:%08x S4:%08x S5:%08x S6:%08x S7:%08x\n",
+  swierr("S0:%08x S1:%08x S2:%08x S3:%08x S4:%08x S5:%08x S6:%08x S7:%08x\n",
          regs[REG_S0], regs[REG_S1], regs[REG_S2], regs[REG_S3],
          regs[REG_S4], regs[REG_S5], regs[REG_S6], regs[REG_S7]);
 #ifdef MIPS32_SAVE_GP
-  swidbg("T8:%08x T9:%08x GP:%08x SP:%08x FP:%08x RA:%08x\n",
+  swierr("T8:%08x T9:%08x GP:%08x SP:%08x FP:%08x RA:%08x\n",
          regs[REG_T8], regs[REG_T9], regs[REG_GP], regs[REG_SP],
          regs[REG_FP], regs[REG_RA]);
 #else
-  swidbg("T8:%08x T9:%08x SP:%08x FP:%08x RA:%08x\n",
+  swierr("T8:%08x T9:%08x SP:%08x FP:%08x RA:%08x\n",
          regs[REG_T8], regs[REG_T9], regs[REG_SP], regs[REG_FP],
          regs[REG_RA]);
 #endif
@@ -168,7 +168,7 @@ int up_swint0(int irq, FAR void *context)
    */
 
 #ifdef CONFIG_DEBUG_SYSCALL
-  swidbg("Entry: regs: %p cmd: %d\n", regs, regs[REG_R4]);
+  swierr("Entry: regs: %p cmd: %d\n", regs, regs[REG_R4]);
   up_registerdump(regs);
 #endif
 
@@ -300,12 +300,12 @@ int up_swint0(int irq, FAR void *context)
 #ifdef CONFIG_DEBUG_SYSCALL
   if (regs != g_current_regs)
     {
-      swidbg("SWInt Return: Context switch!\n");
+      swierr("SWInt Return: Context switch!\n");
       up_registerdump((const uint32_t *)g_current_regs);
     }
   else
     {
-      swidbg("SWInt Return: %d\n", regs[REG_V0]);
+      swierr("SWInt Return: %d\n", regs[REG_V0]);
     }
 #endif
 
diff --git a/arch/mips/src/mips32/up_vfork.c b/arch/mips/src/mips32/up_vfork.c
index 552ffa335a..4ceb0a7215 100644
--- a/arch/mips/src/mips32/up_vfork.c
+++ b/arch/mips/src/mips32/up_vfork.c
@@ -152,7 +152,7 @@ pid_t up_vfork(const struct vfork_s *context)
   child = task_vforksetup((start_t)context->ra);
   if (!child)
     {
-      sdbg("task_vforksetup failed\n");
+      serr("task_vforksetup failed\n");
       return (pid_t)ERROR;
     }
 
@@ -171,7 +171,7 @@ pid_t up_vfork(const struct vfork_s *context)
                         parent->flags & TCB_FLAG_TTYPE_MASK);
   if (ret != OK)
     {
-      sdbg("up_create_stack failed: %d\n", ret);
+      serr("up_create_stack failed: %d\n", ret);
       task_vforkabort(child, -ret);
       return (pid_t)ERROR;
     }
diff --git a/arch/mips/src/pic32mx/pic32mx-ethernet.c b/arch/mips/src/pic32mx/pic32mx-ethernet.c
index ceb1c98906..0ae50a7357 100644
--- a/arch/mips/src/pic32mx/pic32mx-ethernet.c
+++ b/arch/mips/src/pic32mx/pic32mx-ethernet.c
@@ -1921,7 +1921,7 @@ static int pic32mx_ifup(struct net_driver_s *dev)
   uint32_t regval;
   int ret;
 
-  ndbg("Bringing up: %d.%d.%d.%d\n",
+  nerr("Bringing up: %d.%d.%d.%d\n",
        dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
        (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 
@@ -2011,7 +2011,7 @@ static int pic32mx_ifup(struct net_driver_s *dev)
   ret = pic32mx_phyinit(priv);
   if (ret != 0)
     {
-      ndbg("pic32mx_phyinit failed: %d\n", ret);
+      nerr("pic32mx_phyinit failed: %d\n", ret);
       return ret;
     }
 
@@ -2373,14 +2373,14 @@ static int pic32mx_rmmac(struct net_driver_s *dev, const uint8_t *mac)
 #if defined(CONFIG_NET_REGDEBUG) && defined(PIC32MX_HAVE_PHY)
 static void pic32mx_showmii(uint8_t phyaddr, const char *msg)
 {
-  dbg("PHY " PIC32MX_PHYNAME ": %s\n", msg);
-  dbg("  MCR:       %04x\n", pic32mx_phyread(phyaddr, MII_MCR));
-  dbg("  MSR:       %04x\n", pic32mx_phyread(phyaddr, MII_MSR));
-  dbg("  ADVERTISE: %04x\n", pic32mx_phyread(phyaddr, MII_ADVERTISE));
-  dbg("  LPA:       %04x\n", pic32mx_phyread(phyaddr, MII_LPA));
-  dbg("  EXPANSION: %04x\n", pic32mx_phyread(phyaddr, MII_EXPANSION));
+  err("PHY " PIC32MX_PHYNAME ": %s\n", msg);
+  err("  MCR:       %04x\n", pic32mx_phyread(phyaddr, MII_MCR));
+  err("  MSR:       %04x\n", pic32mx_phyread(phyaddr, MII_MSR));
+  err("  ADVERTISE: %04x\n", pic32mx_phyread(phyaddr, MII_ADVERTISE));
+  err("  LPA:       %04x\n", pic32mx_phyread(phyaddr, MII_LPA));
+  err("  EXPANSION: %04x\n", pic32mx_phyread(phyaddr, MII_EXPANSION));
 #ifdef CONFIG_ETH0_PHY_KS8721
-  dbg("  10BTCR:    %04x\n", pic32mx_phyread(phyaddr, MII_KS8721_10BTCR));
+  err("  10BTCR:    %04x\n", pic32mx_phyread(phyaddr, MII_KS8721_10BTCR));
 #endif
 }
 #endif
@@ -2543,7 +2543,7 @@ static inline int pic32mx_phyreset(uint8_t phyaddr)
         }
     }
 
-  ndbg("Reset failed. MCR: %04x\n", phyreg);
+  nerr("Reset failed. MCR: %04x\n", phyreg);
   return -ETIMEDOUT;
 }
 #endif
@@ -2590,7 +2590,7 @@ static inline int pic32mx_phyautoneg(uint8_t phyaddr)
         }
     }
 
-  ndbg("Auto-negotiation failed. MSR: %04x\n", phyreg);
+  nerr("Auto-negotiation failed. MSR: %04x\n", phyreg);
   return -ETIMEDOUT;
 }
 #endif
@@ -2669,7 +2669,7 @@ static int pic32mx_phymode(uint8_t phyaddr, uint8_t mode)
 #endif
     }
 
-  ndbg("Link failed. MSR: %04x\n", phyreg);
+  nerr("Link failed. MSR: %04x\n", phyreg);
   return -ETIMEDOUT;
 }
 #endif
@@ -2738,7 +2738,7 @@ static inline int pic32mx_phyinit(struct pic32mx_driver_s *priv)
       ret = pic32mx_phyreset(phyaddr);
       if (ret < 0)
         {
-          ndbg("Failed to reset PHY at address %d\n", phyaddr);
+          nerr("Failed to reset PHY at address %d\n", phyaddr);
           continue;
         }
 
@@ -2771,7 +2771,7 @@ static inline int pic32mx_phyinit(struct pic32mx_driver_s *priv)
     {
       /* Failed to find PHY at any location */
 
-      ndbg("No PHY detected\n");
+      nerr("No PHY detected\n");
       return -ENODEV;
     }
   ninfo("phyaddr: %d\n", phyaddr);
@@ -2875,7 +2875,7 @@ static inline int pic32mx_phyinit(struct pic32mx_driver_s *priv)
         priv->pd_mode = PIC32MX_100BASET_FD;
         break;
       default:
-        ndbg("Unrecognized mode: %04x\n", phyreg);
+        nerr("Unrecognized mode: %04x\n", phyreg);
         return -ENODEV;
     }
 #elif defined(CONFIG_ETH0_PHY_DP83848C)
@@ -2898,7 +2898,7 @@ static inline int pic32mx_phyinit(struct pic32mx_driver_s *priv)
         priv->pd_mode = PIC32MX_10BASET_FD;
         break;
       default:
-        ndbg("Unrecognized mode: %04x\n", phyreg);
+        nerr("Unrecognized mode: %04x\n", phyreg);
         return -ENODEV;
     }
 #elif defined(CONFIG_ETH0_PHY_LAN8720)
@@ -2943,7 +2943,7 @@ static inline int pic32mx_phyinit(struct pic32mx_driver_s *priv)
       }
     else
       {
-        ndbg("Unrecognized mode: %04x\n", phyreg);
+        nerr("Unrecognized mode: %04x\n", phyreg);
         return -ENODEV;
       }
   }
@@ -2951,7 +2951,7 @@ static inline int pic32mx_phyinit(struct pic32mx_driver_s *priv)
 #  warning "PHY Unknown: speed and duplex are bogus"
 #endif
 
-  ndbg("%dBase-T %s duplex\n",
+  nerr("%dBase-T %s duplex\n",
        (priv->pd_mode & PIC32MX_SPEED_MASK) ==  PIC32MX_SPEED_100 ? 100 : 10,
        (priv->pd_mode & PIC32MX_DUPLEX_MASK) == PIC32MX_DUPLEX_FULL ?"full" : "half");
 
diff --git a/arch/mips/src/pic32mx/pic32mx-spi.c b/arch/mips/src/pic32mx/pic32mx-spi.c
index 02a43d3eab..94e20314fc 100644
--- a/arch/mips/src/pic32mx/pic32mx-spi.c
+++ b/arch/mips/src/pic32mx/pic32mx-spi.c
@@ -75,14 +75,14 @@
 /* Debug */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -526,7 +526,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
   priv->frequency = frequency;
   priv->actual    = actual;
 
-  spidbg("New frequency: %d Actual: %d\n", frequency, actual);
+  spierr("New frequency: %d Actual: %d\n", frequency, actual);
   return actual;
 }
 
@@ -665,7 +665,7 @@ static void spi_setbits(FAR struct spi_dev_s *dev, int nbits)
         }
       else
         {
-          spidbg("Unsupported nbits: %d\n", nbits);
+          spierr("Unsupported nbits: %d\n", nbits);
           return;
         }
 
@@ -897,7 +897,7 @@ FAR struct spi_dev_s *pic32mx_spibus_initialize(int port)
   else
 #endif
    {
-     spidbg("Unsuppport port: %d\n", port);
+     spierr("Unsuppport port: %d\n", port);
      return NULL;
    }
 
@@ -926,7 +926,7 @@ FAR struct spi_dev_s *pic32mx_spibus_initialize(int port)
   ret = irq_attach(priv->vector, spi_interrupt);
   if (ret < 0)
     {
-      spidbg("Failed to attach vector: %d port: %d\n", priv->vector, port);
+      spierr("Failed to attach vector: %d port: %d\n", priv->vector, port);
       goto errout;
     }
 #endif
@@ -976,7 +976,7 @@ FAR struct spi_dev_s *pic32mx_spibus_initialize(int port)
   ret = up_prioritize_irq(priv->vector, CONFIG_PIC32MX_SPI_PRIORITY)
   if (ret < 0)
     {
-      spidbg("up_prioritize_irq failed: %d\n", ret);
+      spierr("up_prioritize_irq failed: %d\n", ret);
       goto errout;
     }
 #endif
diff --git a/arch/mips/src/pic32mx/pic32mx-usbdev.c b/arch/mips/src/pic32mx/pic32mx-usbdev.c
index e6099bfb80..948df83d89 100644
--- a/arch/mips/src/pic32mx/pic32mx-usbdev.c
+++ b/arch/mips/src/pic32mx/pic32mx-usbdev.c
@@ -289,7 +289,7 @@
 #  undef CONFIG_PIC32MX_USBDEV_BDTDEBUG
 #  define CONFIG_PIC32MX_USBDEV_BDTDEBUG 1
 
-#  define regdbg llerr
+#  define regerr llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define reginfo llerr
 #  else
@@ -300,7 +300,7 @@
 
 #  define pic32mx_getreg(addr)      getreg16(addr)
 #  define pic32mx_putreg(val,addr)  putreg16(val,addr)
-#  define regdbg(x...)
+#  define regerr(x...)
 #  define reginfo(x...)
 
 #endif
@@ -309,7 +309,7 @@
 
 #ifdef CONFIG_PIC32MX_USBDEV_BDTDEBUG
 
-#  define bdtdbg llerr
+#  define bdterr llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define bdtinfo llerr
 #  else
@@ -318,7 +318,7 @@
 
 #else
 
-#  define bdtdbg(x...)
+#  define bdterr(x...)
 #  define bdtinfo(x...)
 
 #endif
@@ -874,7 +874,7 @@ static void pic32mx_epwrite(struct pic32mx_ep_s *privep,
 
   /* And, finally, give the BDT to the USB */
 
-  bdtdbg("EP%d BDT IN [%p] {%08x, %08x}\n",
+  bdterr("EP%d BDT IN [%p] {%08x, %08x}\n",
          USB_EPNO(privep->ep.eplog), bdt, status, bdt->addr);
 
   bdt->status = status;
@@ -915,7 +915,7 @@ static void pic32mx_wrcomplete(struct pic32mx_usbdev_s *priv,
           epno, privreq->req.len, privreq->req.xfrd,
           privreq->inflight[0], privreq->inflight[1]);
 #endif
-  bdtdbg("EP%d BDT IN [%p] {%08x, %08x}\n",
+  bdterr("EP%d BDT IN [%p] {%08x, %08x}\n",
          epno, bdtin, bdtin->status, bdtin->addr);
 
   /* We should own the BDT that just completed. But NULLify the entire BDT IN.
@@ -1340,7 +1340,7 @@ static int pic32mx_rdcomplete(struct pic32mx_usbdev_s *priv,
 
   ullinfo("EP%d: len=%d xfrd=%d\n",
           epno, privreq->req.len, privreq->req.xfrd);
-  bdtdbg("EP%d BDT OUT [%p] {%08x, %08x}\n",
+  bdterr("EP%d BDT OUT [%p] {%08x, %08x}\n",
          epno, bdtout, bdtout->status, bdtout->addr);
 
   /* We should own the BDT that just completed */
@@ -1484,7 +1484,7 @@ static int pic32mx_ep0rdsetup(struct pic32mx_usbdev_s *priv, uint8_t *dest,
 
   /* Then give the BDT to the USB */
 
-  bdtdbg("EP0 BDT OUT [%p] {%08x, %08x}\n", bdtout, status, bdtout->addr);
+  bdterr("EP0 BDT OUT [%p] {%08x, %08x}\n", bdtout, status, bdtout->addr);
   bdtout->status = status;
 
   priv->ctrlstate = CTRLSTATE_RDREQUEST;
@@ -1585,7 +1585,7 @@ static int pic32mx_rdsetup(struct pic32mx_ep_s *privep, uint8_t *dest, int readl
 
   /* Then give the BDT to the USB */
 
-  bdtdbg("EP%d BDT OUT [%p] {%08x, %08x}\n",  epno, bdtout, status, bdtout->addr);
+  bdterr("EP%d BDT OUT [%p] {%08x, %08x}\n",  epno, bdtout, status, bdtout->addr);
 
   bdtout->status = status;
   return OK;
@@ -2596,7 +2596,7 @@ static void pic32mx_ep0transfer(struct pic32mx_usbdev_s *priv, uint16_t ustat)
       bdt   = &g_bdt[index];
       priv->eplist[0].bdtout = bdt;
 
-      bdtdbg("EP0 BDT OUT [%p] {%08x, %08x}\n", bdt, bdt->status, bdt->addr);
+      bdterr("EP0 BDT OUT [%p] {%08x, %08x}\n", bdt, bdt->status, bdt->addr);
 
       /* Check the current EP0 OUT buffer contains a SETUP packet */
 
@@ -3210,7 +3210,7 @@ static int pic32mx_epconfigure(struct usbdev_ep_s *ep,
       bdt->status = 0;
       bdt->addr   = 0;
 
-      bdtdbg("EP%d BDT IN [%p] {%08x, %08x}\n", epno, bdt, bdt->status, bdt->addr);
+      bdterr("EP%d BDT IN [%p] {%08x, %08x}\n", epno, bdt, bdt->status, bdt->addr);
 
       /* Now do the same for the other buffer. */
 
@@ -3218,7 +3218,7 @@ static int pic32mx_epconfigure(struct usbdev_ep_s *ep,
       bdt->status = 0;
       bdt->addr   = 0;
 
-      bdtdbg("EP%d BDT IN [%p] {%08x, %08x}\n", epno, bdt, bdt->status, bdt->addr);
+      bdterr("EP%d BDT IN [%p] {%08x, %08x}\n", epno, bdt, bdt->status, bdt->addr);
     }
 
   if (!epin || bidi)
@@ -3232,7 +3232,7 @@ static int pic32mx_epconfigure(struct usbdev_ep_s *ep,
       bdt->status = 0;
       bdt->addr   = 0;
 
-      bdtdbg("EP%d BDT OUT [%p] {%08x, %08x}\n", epno, bdt, bdt->status, bdt->addr);
+      bdterr("EP%d BDT OUT [%p] {%08x, %08x}\n", epno, bdt, bdt->status, bdt->addr);
 
       /* Now do the same for the other buffer. */
 
@@ -3240,7 +3240,7 @@ static int pic32mx_epconfigure(struct usbdev_ep_s *ep,
       bdt->status = 0;
       bdt->addr   = 0;
 
-      bdtdbg("EP%d BDT OUT [%p] {%08x, %08x}\n", epno, bdt, bdt->status, bdt->addr);
+      bdterr("EP%d BDT OUT [%p] {%08x, %08x}\n", epno, bdt, bdt->status, bdt->addr);
     }
 
   /* Get the maxpacket size of the endpoint. */
@@ -3575,9 +3575,9 @@ static int pic32mx_epbdtstall(struct usbdev_ep_s *ep, bool resume, bool epin)
           bdt->addr          = (uint8_t *)physaddr;
           bdt->status        = (USB_BDT_UOWN | bytecount);
 
-          bdtdbg("EP0 BDT IN [%p] {%08x, %08x}\n",
+          bdterr("EP0 BDT IN [%p] {%08x, %08x}\n",
                  bdt, bdt->status, bdt->addr);
-          bdtdbg("EP0 BDT IN [%p] {%08x, %08x}\n",
+          bdterr("EP0 BDT IN [%p] {%08x, %08x}\n",
                  otherbdt, otherbdt->status, otherbdt->addr);
         }
       else
@@ -3592,9 +3592,9 @@ static int pic32mx_epbdtstall(struct usbdev_ep_s *ep, bool resume, bool epin)
           bdt->addr        = 0;
           bdt->status      = 0;
 
-          bdtdbg("EP%d BDT %s [%p] {%08x, %08x}\n",
+          bdterr("EP%d BDT %s [%p] {%08x, %08x}\n",
                  epno, epin ? "IN" : "OUT", bdt, bdt->status, bdt->addr);
-          bdtdbg("EP%d BDT %s [%p] {%08x, %08x}\n",
+          bdterr("EP%d BDT %s [%p] {%08x, %08x}\n",
                  epno, epin ? "IN" : "OUT", otherbdt, otherbdt->status, otherbdt->addr);
 
           /* Restart any queued requests (after a delay so that we can be assured
@@ -3627,9 +3627,9 @@ static int pic32mx_epbdtstall(struct usbdev_ep_s *ep, bool resume, bool epin)
 
       pic32mx_rqstop(privep);
 
-      bdtdbg("EP%d BDT %s [%p] {%08x, %08x}\n",
+      bdterr("EP%d BDT %s [%p] {%08x, %08x}\n",
              epno, epin ? "IN" : "OUT", bdt, bdt->status, bdt->addr);
-      bdtdbg("EP%d BDT %s [%p] {%08x, %08x}\n",
+      bdterr("EP%d BDT %s [%p] {%08x, %08x}\n",
              epno, epin ? "IN" : "OUT", otherbdt, otherbdt->status, otherbdt->addr);
     }
 
diff --git a/arch/mips/src/pic32mz/pic32mz-ethernet.c b/arch/mips/src/pic32mz/pic32mz-ethernet.c
index 5c1ae7aa78..af83f64f2a 100644
--- a/arch/mips/src/pic32mz/pic32mz-ethernet.c
+++ b/arch/mips/src/pic32mz/pic32mz-ethernet.c
@@ -1938,7 +1938,7 @@ static int pic32mz_ifup(struct net_driver_s *dev)
   uint32_t regval;
   int ret;
 
-  ndbg("Bringing up: %d.%d.%d.%d\n",
+  nerr("Bringing up: %d.%d.%d.%d\n",
        dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
        (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 
@@ -2028,7 +2028,7 @@ static int pic32mz_ifup(struct net_driver_s *dev)
   ret = pic32mz_phyinit(priv);
   if (ret != 0)
     {
-      ndbg("pic32mz_phyinit failed: %d\n", ret);
+      nerr("pic32mz_phyinit failed: %d\n", ret);
       return ret;
     }
 
@@ -2105,7 +2105,7 @@ static int pic32mz_ifup(struct net_driver_s *dev)
   priv->pd_dev.d_mac.ether_addr_octet[0] = (uint32_t)(regval & 0xff);
   priv->pd_dev.d_mac.ether_addr_octet[1] = (uint32_t)((regval >> 8) & 0xff);
 
-  ndbg("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+  nerr("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
          dev->d_mac.ether_addr_octet[0], dev->d_mac.ether_addr_octet[1],
          dev->d_mac.ether_addr_octet[2], dev->d_mac.ether_addr_octet[3],
          dev->d_mac.ether_addr_octet[4], dev->d_mac.ether_addr_octet[5]);
@@ -2396,14 +2396,14 @@ static int pic32mz_rmmac(struct net_driver_s *dev, const uint8_t *mac)
 #if defined(CONFIG_NET_REGDEBUG) && defined(PIC32MZ_HAVE_PHY)
 static void pic32mz_showmii(uint8_t phyaddr, const char *msg)
 {
-  dbg("PHY " PIC32MZ_PHYNAME ": %s\n", msg);
-  dbg("  MCR:       %04x\n", pic32mz_phyread(phyaddr, MII_MCR));
-  dbg("  MSR:       %04x\n", pic32mz_phyread(phyaddr, MII_MSR));
-  dbg("  ADVERTISE: %04x\n", pic32mz_phyread(phyaddr, MII_ADVERTISE));
-  dbg("  LPA:       %04x\n", pic32mz_phyread(phyaddr, MII_LPA));
-  dbg("  EXPANSION: %04x\n", pic32mz_phyread(phyaddr, MII_EXPANSION));
+  err("PHY " PIC32MZ_PHYNAME ": %s\n", msg);
+  err("  MCR:       %04x\n", pic32mz_phyread(phyaddr, MII_MCR));
+  err("  MSR:       %04x\n", pic32mz_phyread(phyaddr, MII_MSR));
+  err("  ADVERTISE: %04x\n", pic32mz_phyread(phyaddr, MII_ADVERTISE));
+  err("  LPA:       %04x\n", pic32mz_phyread(phyaddr, MII_LPA));
+  err("  EXPANSION: %04x\n", pic32mz_phyread(phyaddr, MII_EXPANSION));
 #ifdef CONFIG_ETH0_PHY_KS8721
-  dbg("  10BTCR:    %04x\n", pic32mz_phyread(phyaddr, MII_KS8721_10BTCR));
+  err("  10BTCR:    %04x\n", pic32mz_phyread(phyaddr, MII_KS8721_10BTCR));
 #endif
 }
 #endif
@@ -2566,7 +2566,7 @@ static inline int pic32mz_phyreset(uint8_t phyaddr)
         }
     }
 
-  ndbg("Reset failed. MCR: %04x\n", phyreg);
+  nerr("Reset failed. MCR: %04x\n", phyreg);
   return -ETIMEDOUT;
 }
 #endif
@@ -2613,7 +2613,7 @@ static inline int pic32mz_phyautoneg(uint8_t phyaddr)
         }
     }
 
-  ndbg("Auto-negotiation failed. MSR: %04x\n", phyreg);
+  nerr("Auto-negotiation failed. MSR: %04x\n", phyreg);
   return -ETIMEDOUT;
 }
 #endif
@@ -2692,7 +2692,7 @@ static int pic32mz_phymode(uint8_t phyaddr, uint8_t mode)
 #endif
     }
 
-  ndbg("Link failed. MSR: %04x\n", phyreg);
+  nerr("Link failed. MSR: %04x\n", phyreg);
   return -ETIMEDOUT;
 }
 #endif
@@ -2761,7 +2761,7 @@ static inline int pic32mz_phyinit(struct pic32mz_driver_s *priv)
       ret = pic32mz_phyreset(phyaddr);
       if (ret < 0)
         {
-          ndbg("Failed to reset PHY at address %d\n", phyaddr);
+          nerr("Failed to reset PHY at address %d\n", phyaddr);
           continue;
         }
 
@@ -2794,7 +2794,7 @@ static inline int pic32mz_phyinit(struct pic32mz_driver_s *priv)
     {
       /* Failed to find PHY at any location */
 
-      ndbg("No PHY detected\n");
+      nerr("No PHY detected\n");
       return -ENODEV;
     }
   ninfo("phyaddr: %d\n", phyaddr);
@@ -2898,7 +2898,7 @@ static inline int pic32mz_phyinit(struct pic32mz_driver_s *priv)
         priv->pd_mode = PIC32MZ_100BASET_FD;
         break;
       default:
-        ndbg("Unrecognized mode: %04x\n", phyreg);
+        nerr("Unrecognized mode: %04x\n", phyreg);
         return -ENODEV;
     }
 #elif defined(CONFIG_ETH0_PHY_DP83848C)
@@ -2921,7 +2921,7 @@ static inline int pic32mz_phyinit(struct pic32mz_driver_s *priv)
         priv->pd_mode = PIC32MZ_10BASET_FD;
         break;
       default:
-        ndbg("Unrecognized mode: %04x\n", phyreg);
+        nerr("Unrecognized mode: %04x\n", phyreg);
         return -ENODEV;
     }
 #elif defined(CONFIG_ETH0_PHY_LAN8720) || defined(CONFIG_ETH0_PHY_LAN8740) || defined(CONFIG_ETH0_PHY_LAN8740A)
@@ -2966,7 +2966,7 @@ static inline int pic32mz_phyinit(struct pic32mz_driver_s *priv)
       }
     else
       {
-        ndbg("Unrecognized mode: %04x\n", phyreg);
+        nerr("Unrecognized mode: %04x\n", phyreg);
         return -ENODEV;
       }
   }
@@ -2974,7 +2974,7 @@ static inline int pic32mz_phyinit(struct pic32mz_driver_s *priv)
 #  warning "PHY Unknown: speed and duplex are bogus"
 #endif
 
-  ndbg("%dBase-T %s duplex\n",
+  nerr("%dBase-T %s duplex\n",
        (priv->pd_mode & PIC32MZ_SPEED_MASK) ==  PIC32MZ_SPEED_100 ? 100 : 10,
        (priv->pd_mode & PIC32MZ_DUPLEX_MASK) == PIC32MZ_DUPLEX_FULL ?"full" : "half");
 
diff --git a/arch/mips/src/pic32mz/pic32mz-spi.c b/arch/mips/src/pic32mz/pic32mz-spi.c
index 504fe2ca95..956128eaeb 100644
--- a/arch/mips/src/pic32mz/pic32mz-spi.c
+++ b/arch/mips/src/pic32mz/pic32mz-spi.c
@@ -70,14 +70,14 @@
 /* Debug */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -887,7 +887,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
   priv->frequency = frequency;
   priv->actual    = actual;
 
-  spidbg("New frequency: %d Actual: %d\n", frequency, actual);
+  spierr("New frequency: %d Actual: %d\n", frequency, actual);
   return actual;
 }
 
@@ -1025,7 +1025,7 @@ static void spi_setbits(FAR struct spi_dev_s *dev, int nbits)
         }
       else
         {
-          spidbg("Unsupported nbits: %d\n", nbits);
+          spierr("Unsupported nbits: %d\n", nbits);
           return;
         }
 
@@ -1275,7 +1275,7 @@ FAR struct spi_dev_s *pic32mz_spibus_initialize(int port)
   else
 #endif
    {
-     spidbg("Unsuppport port: %d\n", port);
+     spierr("Unsuppport port: %d\n", port);
      return NULL;
    }
 
@@ -1311,7 +1311,7 @@ FAR struct spi_dev_s *pic32mz_spibus_initialize(int port)
   ret = irq_attach(priv->config->rxirq, spi_interrupt);
   if (ret < 0)
     {
-      spidbg("Failed to attach RX interrupt: %d port: %d\n",
+      spierr("Failed to attach RX interrupt: %d port: %d\n",
              priv->config->rxirq, port);
       goto errout;
     }
@@ -1319,7 +1319,7 @@ FAR struct spi_dev_s *pic32mz_spibus_initialize(int port)
   ret = irq_attach(priv->config->txirq, spi_interrupt);
   if (ret < 0)
     {
-      spidbg("Failed to attach TX interrupt: %d port: %d\n",
+      spierr("Failed to attach TX interrupt: %d port: %d\n",
              priv->tconfig->xirq, port);
       goto errout_with_rxirq;
     }
@@ -1327,7 +1327,7 @@ FAR struct spi_dev_s *pic32mz_spibus_initialize(int port)
   ret = irq_attach(priv->config->firq, spi_interrupt);
   if (ret < 0)
     {
-      spidbg("Failed to attach fault interrupt: %d port: %d\n",
+      spierr("Failed to attach fault interrupt: %d port: %d\n",
              priv->config->firq, port);
       goto errout_with_txirq;
     }
diff --git a/arch/rgmp/src/x86/com.c b/arch/rgmp/src/x86/com.c
index c31e301a7b..018293ee66 100644
--- a/arch/rgmp/src/x86/com.c
+++ b/arch/rgmp/src/x86/com.c
@@ -255,7 +255,7 @@ static int up_setup(struct uart_dev_s *dev)
     inb(base+COM_IIR);
     inb(base+COM_RX);
     if (inb(base+COM_LSR) == 0xff) {
-        dbg("COM %d does not exist\n", base);
+        err("COM %d does not exist\n", base);
         return -1;
     }
 
@@ -583,41 +583,41 @@ void up_serialinit(void)
 #ifdef CONFIG_COM1
     dev = up_alloc_com(COM1, 4);
     if (dev == NULL)
-        dbg("alloc com1 fail\n");
+        err("alloc com1 fail\n");
     else {
         errcode = uart_register("/dev/ttyS0", dev);
         if (errcode)
-            dbg("register com1 fail\n");
+            err("register com1 fail\n");
     }
 #endif
 #ifdef CONFIG_COM2
     dev = up_alloc_com(COM2, 3);
     if (dev == NULL)
-        dbg("alloc com2 fail\n");
+        err("alloc com2 fail\n");
     else {
         errcode = uart_register("/dev/ttyS1", dev);
         if (errcode)
-            dbg("register com2 fail\n");
+            err("register com2 fail\n");
     }
 #endif
 #ifdef CONFIG_COM3
     dev = up_alloc_com(COM3, 4);
     if (dev == NULL)
-        dbg("alloc com3 fail\n");
+        err("alloc com3 fail\n");
     else {
         errcode = uart_register("/dev/ttyS2", dev);
         if (errcode)
-            dbg("register com3 fail\n");
+            err("register com3 fail\n");
     }
 #endif
 #ifdef CONFIG_COM4
     dev = up_alloc_com(COM4, 3);
     if (dev == NULL)
-        dbg("alloc com4 fail\n");
+        err("alloc com4 fail\n");
     else {
         errcode = uart_register("/dev/ttyS3", dev);
         if (errcode)
-            dbg("register com4 fail\n");
+            err("register com4 fail\n");
     }
 #endif
 }
diff --git a/arch/sh/src/common/up_createstack.c b/arch/sh/src/common/up_createstack.c
index da20268328..3a2a411811 100644
--- a/arch/sh/src/common/up_createstack.c
+++ b/arch/sh/src/common/up_createstack.c
@@ -142,7 +142,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
 
       if (!tcb->stack_alloc_ptr)
         {
-          sdbg("ERROR: Failed to allocate stack, size %d\n", stack_size);
+          serr("ERROR: Failed to allocate stack, size %d\n", stack_size);
         }
 #endif
     }
diff --git a/arch/sh/src/common/up_exit.c b/arch/sh/src/common/up_exit.c
index e62462cec3..1ee0f1695d 100644
--- a/arch/sh/src/common/up_exit.c
+++ b/arch/sh/src/common/up_exit.c
@@ -86,8 +86,8 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
   int i;
 #endif
 
-  sdbg("  TCB=%p name=%s\n", tcb, tcb->argv[0]);
-  sdbg("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
+  serr("  TCB=%p name=%s\n", tcb, tcb->argv[0]);
+  serr("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
 
 #if CONFIG_NFILE_DESCRIPTORS > 0
   filelist = tcb->group->tg_filelist;
@@ -96,7 +96,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
       struct inode *inode = filelist->fl_files[i].f_inode;
       if (inode)
         {
-          sdbg("      fd=%d refcount=%d\n",
+          serr("      fd=%d refcount=%d\n",
                i, inode->i_crefs);
         }
     }
@@ -110,11 +110,11 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
       if (filep->fs_fd >= 0)
         {
 #if CONFIG_STDIO_BUFFER_SIZE > 0
-          sdbg("      fd=%d nbytes=%d\n",
+          serr("      fd=%d nbytes=%d\n",
                filep->fs_fd,
                filep->fs_bufpos - filep->fs_bufstart);
 #else
-          sdbg("      fd=%d\n", filep->fs_fd);
+          serr("      fd=%d\n", filep->fs_fd);
 #endif
         }
     }
diff --git a/arch/sh/src/m16c/m16c_schedulesigaction.c b/arch/sh/src/m16c/m16c_schedulesigaction.c
index 682d329987..7394dce29c 100644
--- a/arch/sh/src/m16c/m16c_schedulesigaction.c
+++ b/arch/sh/src/m16c/m16c_schedulesigaction.c
@@ -93,7 +93,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
 {
   irqstate_t flags;
 
-  sdbg("tcb=0x%p sigdeliver=0x%p\n", tcb, sigdeliver);
+  serr("tcb=0x%p sigdeliver=0x%p\n", tcb, sigdeliver);
 
   /* Make sure that interrupts are disabled */
 
@@ -107,7 +107,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
        * being delivered to the currently executing task.
        */
 
-      sdbg("rtcb=0x%p g_current_regs=0x%p\n", this_task(), g_current_regs);
+      serr("rtcb=0x%p g_current_regs=0x%p\n", this_task(), g_current_regs);
 
       if (tcb == this_task())
         {
diff --git a/arch/sh/src/m16c/m16c_serial.c b/arch/sh/src/m16c/m16c_serial.c
index a366e3b57d..b89d70e898 100644
--- a/arch/sh/src/m16c/m16c_serial.c
+++ b/arch/sh/src/m16c/m16c_serial.c
@@ -588,7 +588,7 @@ static int up_setup(struct uart_dev_s *dev)
   else
 #endif
     {
-      dbg("Invalid UART #\n");
+      err("Invalid UART #\n");
     }
 
   /* Set UART transmit/receive control register 1 to enable transmit and receive */
@@ -613,7 +613,7 @@ static int up_setup(struct uart_dev_s *dev)
     }
   else
     {
-      dbg("Invalid bits=%d\n", priv->bits);
+      err("Invalid bits=%d\n", priv->bits);
     }
 
   if (priv->parity != 0)
@@ -665,7 +665,7 @@ static int up_setup(struct uart_dev_s *dev)
   else
 #endif
     {
-      dbg("Invalid UART #\n");
+      err("Invalid UART #\n");
     }
 
   /* Read any data left in the RX fifo */
@@ -872,7 +872,7 @@ static void m16c_rxint(struct up_dev_s *dev, bool enable)
   else
 #endif
     {
-      dbg("Invalid UART #\n");
+      err("Invalid UART #\n");
       return;
     }
 
@@ -1027,7 +1027,7 @@ static void m16c_txint(struct up_dev_s *dev, bool enable)
   else
 #endif
     {
-      dbg("Invalid UART #\n");
+      err("Invalid UART #\n");
       return;
     }
 
diff --git a/arch/sh/src/m16c/m16c_sigdeliver.c b/arch/sh/src/m16c/m16c_sigdeliver.c
index 3b595ed7ef..c8612c5000 100644
--- a/arch/sh/src/m16c/m16c_sigdeliver.c
+++ b/arch/sh/src/m16c/m16c_sigdeliver.c
@@ -95,7 +95,7 @@ void up_sigdeliver(void)
 
   board_autoled_on(LED_SIGNAL);
 
-  sdbg("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
+  serr("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
         rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
   ASSERT(rtcb->xcp.sigdeliver != NULL);
 
@@ -128,7 +128,7 @@ void up_sigdeliver(void)
    * errno that is needed by the user logic (it is probably EINTR).
    */
 
-  sdbg("Resuming\n");
+  serr("Resuming\n");
   (void)up_irq_save();
   rtcb->pterrno = saved_errno;
 
diff --git a/arch/sh/src/sh1/sh1_irq.c b/arch/sh/src/sh1/sh1_irq.c
index 3a0651efd4..3f5ce17b4f 100644
--- a/arch/sh/src/sh1/sh1_irq.c
+++ b/arch/sh/src/sh1/sh1_irq.c
@@ -95,7 +95,7 @@ void up_prioritize_irq(int irq, int priority)
 #ifdef CONFIG_DEBUG_FEATURES
   if ((unsigned) irq > NR_IRQS || (unsigned)priority > 15)
     {
-      dbg("Invalid parameters\n");
+      err("Invalid parameters\n");
       return;
     }
 #endif
@@ -260,7 +260,7 @@ void up_prioritize_irq(int irq, int priority)
 #endif
 
     default:
-      dbg("Invalid irq=%d\n", irq);
+      err("Invalid irq=%d\n", irq);
       return;
     }
 
diff --git a/arch/sh/src/sh1/sh1_schedulesigaction.c b/arch/sh/src/sh1/sh1_schedulesigaction.c
index 4c6e7c1659..d1f87406d5 100644
--- a/arch/sh/src/sh1/sh1_schedulesigaction.c
+++ b/arch/sh/src/sh1/sh1_schedulesigaction.c
@@ -93,7 +93,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
 {
   irqstate_t flags;
 
-  sdbg("tcb=0x%p sigdeliver=0x%p\n", tcb, sigdeliver);
+  serr("tcb=0x%p sigdeliver=0x%p\n", tcb, sigdeliver);
 
   /* Make sure that interrupts are disabled */
 
@@ -107,7 +107,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
        * being delivered to the currently executing task.
        */
 
-      sdbg("rtcb=0x%p g_current_regs=0x%p\n", this_task(), g_current_regs);
+      serr("rtcb=0x%p g_current_regs=0x%p\n", this_task(), g_current_regs);
 
       if (tcb == this_task())
         {
diff --git a/arch/sh/src/sh1/sh1_sigdeliver.c b/arch/sh/src/sh1/sh1_sigdeliver.c
index eead3c06f2..7a408d293d 100644
--- a/arch/sh/src/sh1/sh1_sigdeliver.c
+++ b/arch/sh/src/sh1/sh1_sigdeliver.c
@@ -95,7 +95,7 @@ void up_sigdeliver(void)
 
   board_autoled_on(LED_SIGNAL);
 
-  sdbg("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
+  serr("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
         rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
   ASSERT(rtcb->xcp.sigdeliver != NULL);
 
@@ -127,7 +127,7 @@ void up_sigdeliver(void)
    * errno that is needed by the user logic (it is probably EINTR).
    */
 
-  sdbg("Resuming\n");
+  serr("Resuming\n");
   (void)up_irq_save();
   rtcb->pterrno = saved_errno;
 
diff --git a/arch/sim/src/board_lcd.c b/arch/sim/src/board_lcd.c
index 592c4a7cb2..e2afcbaeae 100644
--- a/arch/sim/src/board_lcd.c
+++ b/arch/sim/src/board_lcd.c
@@ -116,9 +116,9 @@
 #endif
 
 #ifdef CONFIG_DEBUG_LCD
-# define lcddbg(format, ...)  info(format, ##__VA_ARGS__)
+# define lcderr(format, ...)  info(format, ##__VA_ARGS__)
 #else
-# define lcddbg(x...)
+# define lcderr(x...)
 #endif
 
 /****************************************************************************
@@ -257,7 +257,7 @@ static struct sim_dev_s g_lcddev =
 static int sim_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer,
                        size_t npixels)
 {
-  lcddbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  lcderr("row: %d col: %d npixels: %d\n", row, col, npixels);
   return OK;
 }
 
@@ -278,7 +278,7 @@ static int sim_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer,
 static int sim_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
                        size_t npixels)
 {
-  lcddbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  lcderr("row: %d col: %d npixels: %d\n", row, col, npixels);
   return -ENOSYS;
 }
 
diff --git a/arch/sim/src/up_blocktask.c b/arch/sim/src/up_blocktask.c
index ccc3920489..bf65f35eae 100644
--- a/arch/sim/src/up_blocktask.c
+++ b/arch/sim/src/up_blocktask.c
@@ -83,7 +83,7 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state)
   ASSERT((tcb->task_state >= FIRST_READY_TO_RUN_STATE) &&
          (tcb->task_state <= LAST_READY_TO_RUN_STATE));
 
-  sdbg("Blocking TCB=%p\n", tcb);
+  serr("Blocking TCB=%p\n", tcb);
 
   /* Remove the tcb task from the ready-to-run list.  If we
    * are blocking the task at the head of the task list (the
@@ -127,7 +127,7 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state)
            */
 
           rtcb = this_task();
-          sdbg("New Active Task TCB=%p\n", rtcb);
+          serr("New Active Task TCB=%p\n", rtcb);
 
           /* The way that we handle signals in the simulation is kind of
            * a kludge.  This would be unsafe in a truly multi-threaded, interrupt
@@ -136,7 +136,7 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state)
 
           if (rtcb->xcp.sigdeliver)
             {
-              sdbg("Delivering signals TCB=%p\n", rtcb);
+              serr("Delivering signals TCB=%p\n", rtcb);
               ((sig_deliver_t)rtcb->xcp.sigdeliver)(rtcb);
               rtcb->xcp.sigdeliver = NULL;
             }
diff --git a/arch/sim/src/up_deviceimage.c b/arch/sim/src/up_deviceimage.c
index f50944bd2e..059b268498 100644
--- a/arch/sim/src/up_deviceimage.c
+++ b/arch/sim/src/up_deviceimage.c
@@ -58,7 +58,7 @@
  ****************************************************************************/
 
 #ifdef VFAT_STANDALONE
-# define sdbg(format, ...) printf(format, ##__VA_ARGS__)
+# define serr(format, ...) printf(format, ##__VA_ARGS__)
 # define kmm_malloc(size)   malloc(size)
 # define kmm_free(mem)     free(mem)
 #endif
@@ -223,7 +223,7 @@ char *up_deviceimage(void)
   ret           = inflateInit(&strm);
   if (ret != Z_OK)
     {
-      sdbg("inflateInit FAILED: ret=%d msg=\"%s\"\n",
+      serr("inflateInit FAILED: ret=%d msg=\"%s\"\n",
            ret, strm.msg ? strm.msg : "No message");
       return NULL;
     }
@@ -260,7 +260,7 @@ char *up_deviceimage(void)
           case Z_DATA_ERROR:
           case Z_MEM_ERROR:
           case Z_STREAM_ERROR:
-              sdbg("inflate FAILED: ret=%d msg=\"%s\"\n",
+              serr("inflate FAILED: ret=%d msg=\"%s\"\n",
                     ret, strm.msg ? strm.msg : "No message");
               (void)inflateEnd(&strm);
               kmm_free(pbuffer);
diff --git a/arch/sim/src/up_elf.c b/arch/sim/src/up_elf.c
index ecc4f2d2fe..2e17cadeaa 100644
--- a/arch/sim/src/up_elf.c
+++ b/arch/sim/src/up_elf.c
@@ -138,7 +138,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
 int up_relocateadd(FAR const Elf32_Rela *rel, FAR const Elf32_Sym *sym,
                    uintptr_t addr)
 {
-  bdbg("Not supported\n");
+  berr("Not supported\n");
   return -ENOSYS;
 }
 
diff --git a/arch/sim/src/up_exit.c b/arch/sim/src/up_exit.c
index a022405d76..318a3dbcfb 100644
--- a/arch/sim/src/up_exit.c
+++ b/arch/sim/src/up_exit.c
@@ -67,7 +67,7 @@ void _exit(int status)
 {
   FAR struct tcb_s *tcb;
 
-  sdbg("TCB=%p exiting\n", tcb);
+  serr("TCB=%p exiting\n", tcb);
 
   /* Destroy the task at the head of the ready to run list. */
 
@@ -78,7 +78,7 @@ void _exit(int status)
    */
 
   tcb = this_task();
-  sdbg("New Active Task TCB=%p\n", tcb);
+  serr("New Active Task TCB=%p\n", tcb);
 
   /* The way that we handle signals in the simulation is kind of
    * a kludge.  This would be unsafe in a truly multi-threaded, interrupt
@@ -87,7 +87,7 @@ void _exit(int status)
 
   if (tcb->xcp.sigdeliver)
     {
-      sdbg("Delivering signals TCB=%p\n", tcb);
+      serr("Delivering signals TCB=%p\n", tcb);
       ((sig_deliver_t)tcb->xcp.sigdeliver)(tcb);
       tcb->xcp.sigdeliver = NULL;
     }
diff --git a/arch/sim/src/up_framebuffer.c b/arch/sim/src/up_framebuffer.c
index 847fcd0b6a..b621a4aa4d 100644
--- a/arch/sim/src/up_framebuffer.c
+++ b/arch/sim/src/up_framebuffer.c
@@ -191,13 +191,13 @@ struct fb_vtable_s g_fbobject =
 static int up_getvideoinfo(FAR struct fb_vtable_s *vtable,
                            FAR struct fb_videoinfo_s *vinfo)
 {
-  dbg("vtable=%p vinfo=%p\n", vtable, vinfo);
+  err("vtable=%p vinfo=%p\n", vtable, vinfo);
   if (vtable && vinfo)
     {
       memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s));
       return OK;
     }
-  dbg("Returning EINVAL\n");
+  err("Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -208,13 +208,13 @@ static int up_getvideoinfo(FAR struct fb_vtable_s *vtable,
 static int up_getplaneinfo(FAR struct fb_vtable_s *vtable, int planeno,
                            FAR struct fb_planeinfo_s *pinfo)
 {
-  dbg("vtable=%p planeno=%d pinfo=%p\n", vtable, planeno, pinfo);
+  err("vtable=%p planeno=%d pinfo=%p\n", vtable, planeno, pinfo);
   if (vtable && planeno == 0 && pinfo)
     {
       memcpy(pinfo, &g_planeinfo, sizeof(struct fb_planeinfo_s));
       return OK;
     }
-  dbg("Returning EINVAL\n");
+  err("Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -228,7 +228,7 @@ static int up_getcmap(FAR struct fb_vtable_s *vtable, FAR struct fb_cmap_s *cmap
   int len;
   int i;
 
-  dbg("vtable=%p cmap=%p len=%d\n", vtable, cmap, cmap->len);
+  err("vtable=%p cmap=%p len=%d\n", vtable, cmap, cmap->len);
   if (vtable && cmap)
     {
       for (i = cmap->first, len = 0; i < 256 && len < cmap->len; i++, len++)
@@ -244,7 +244,7 @@ static int up_getcmap(FAR struct fb_vtable_s *vtable, FAR struct fb_cmap_s *cmap
       cmap->len = len;
       return OK;
     }
-  dbg("Returning EINVAL\n");
+  err("Returning EINVAL\n");
   return -EINVAL;
 }
 #endif
@@ -259,12 +259,12 @@ static int up_putcmap(FAR struct fb_vtable_s *vtable, FAR const struct fb_cmap_s
 #ifdef CONFIG_SIM_X11FB
   return up_x11cmap(cmap->first, cmap->len, cmap->red, cmap->green, cmap->blue, NULL);
 #else
-  dbg("vtable=%p cmap=%p len=%d\n", vtable, cmap, cmap->len);
+  err("vtable=%p cmap=%p len=%d\n", vtable, cmap, cmap->len);
   if (vtable && cmap)
     {
       return OK;
     }
-  dbg("Returning EINVAL\n");
+  err("Returning EINVAL\n");
   return -EINVAL;
 #endif
 }
@@ -278,23 +278,23 @@ static int up_putcmap(FAR struct fb_vtable_s *vtable, FAR const struct fb_cmap_s
 static int up_getcursor(FAR struct fb_vtable_s *vtable,
                         FAR struct fb_cursorattrib_s *attrib)
 {
-  dbg("vtable=%p attrib=%p\n", vtable, attrib);
+  err("vtable=%p attrib=%p\n", vtable, attrib);
   if (vtable && attrib)
     {
 #ifdef CONFIG_FB_HWCURSORIMAGE
       attrib->fmt      = FB_FMT;
 #endif
-      dbg("pos:      (x=%d, y=%d)\n", g_cpos.x, g_cpos.y);
+      err("pos:      (x=%d, y=%d)\n", g_cpos.x, g_cpos.y);
       attrib->pos      = g_cpos;
 #ifdef CONFIG_FB_HWCURSORSIZE
       attrib->mxsize.h = CONFIG_SIM_FBHEIGHT;
       attrib->mxsize.w = CONFIG_SIM_FBWIDTH;
-      dbg("size:     (h=%d, w=%d)\n", g_csize.h, g_csize.w);
+      err("size:     (h=%d, w=%d)\n", g_csize.h, g_csize.w);
       attrib->size     = g_csize;
 #endif
       return OK;
     }
-  dbg("Returning EINVAL\n");
+  err("Returning EINVAL\n");
   return -EINVAL;
 }
 #endif
@@ -307,32 +307,32 @@ static int up_getcursor(FAR struct fb_vtable_s *vtable,
 static int up_setcursor(FAR struct fb_vtable_s *vtable,
                        FAR struct fb_setcursor_s *setttings)
 {
-  dbg("vtable=%p setttings=%p\n", vtable, setttings);
+  err("vtable=%p setttings=%p\n", vtable, setttings);
   if (vtable && setttings)
     {
-      dbg("flags:   %02x\n", settings->flags);
+      err("flags:   %02x\n", settings->flags);
       if ((flags & FB_CUR_SETPOSITION) != 0)
         {
           g_cpos = settings->pos;
-          dbg("pos:     (h:%d, w:%d)\n", g_cpos.x, g_cpos.y);
+          err("pos:     (h:%d, w:%d)\n", g_cpos.x, g_cpos.y);
         }
 #ifdef CONFIG_FB_HWCURSORSIZE
       if ((flags & FB_CUR_SETSIZE) != 0)
         {
           g_csize = settings->size;
-          dbg("size:    (h:%d, w:%d)\n", g_csize.h, g_csize.w);
+          err("size:    (h:%d, w:%d)\n", g_csize.h, g_csize.w);
         }
 #endif
 #ifdef CONFIG_FB_HWCURSORIMAGE
       if ((flags & FB_CUR_SETIMAGE) != 0)
         {
-          dbg("image:   (h:%d, w:%d) @ %p\n",
+          err("image:   (h:%d, w:%d) @ %p\n",
               settings->img.height, settings->img.width, settings->img.image);
         }
 #endif
       return OK;
     }
-  dbg("Returning EINVAL\n");
+  err("Returning EINVAL\n");
   return -EINVAL;
 }
 #endif
diff --git a/arch/sim/src/up_releasepending.c b/arch/sim/src/up_releasepending.c
index 386b58589a..8b92003340 100644
--- a/arch/sim/src/up_releasepending.c
+++ b/arch/sim/src/up_releasepending.c
@@ -66,7 +66,7 @@ void up_release_pending(void)
 {
   FAR struct tcb_s *rtcb = this_task();
 
-  sdbg("From TCB=%p\n", rtcb);
+  serr("From TCB=%p\n", rtcb);
 
   /* Merge the g_pendingtasks list into the ready-to-run task list */
 
@@ -93,7 +93,7 @@ void up_release_pending(void)
            */
 
           rtcb = this_task();
-          sdbg("New Active Task TCB=%p\n", rtcb);
+          serr("New Active Task TCB=%p\n", rtcb);
 
           /* The way that we handle signals in the simulation is kind of
            * a kludge.  This would be unsafe in a truly multi-threaded, interrupt
@@ -102,7 +102,7 @@ void up_release_pending(void)
 
           if (rtcb->xcp.sigdeliver)
             {
-              sdbg("Delivering signals TCB=%p\n", rtcb);
+              serr("Delivering signals TCB=%p\n", rtcb);
               ((sig_deliver_t)rtcb->xcp.sigdeliver)(rtcb);
               rtcb->xcp.sigdeliver = NULL;
             }
diff --git a/arch/sim/src/up_reprioritizertr.c b/arch/sim/src/up_reprioritizertr.c
index 39c981c648..0c50facd24 100644
--- a/arch/sim/src/up_reprioritizertr.c
+++ b/arch/sim/src/up_reprioritizertr.c
@@ -95,7 +95,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
       FAR struct tcb_s *rtcb = this_task();
       bool switch_needed;
 
-      sdbg("TCB=%p PRI=%d\n", tcb, priority);
+      serr("TCB=%p PRI=%d\n", tcb, priority);
 
       /* Remove the tcb task from the ready-to-run list.
        * sched_removereadytorun will return true if we just
@@ -148,7 +148,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
                */
 
               rtcb = this_task();
-              sdbg("New Active Task TCB=%p\n", rtcb);
+              serr("New Active Task TCB=%p\n", rtcb);
 
               /* The way that we handle signals in the simulation is kind of
                * a kludge.  This would be unsafe in a truly multi-threaded, interrupt
@@ -157,7 +157,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
 
               if (rtcb->xcp.sigdeliver)
                 {
-                  sdbg("Delivering signals TCB=%p\n", rtcb);
+                  serr("Delivering signals TCB=%p\n", rtcb);
                   ((sig_deliver_t)rtcb->xcp.sigdeliver)(rtcb);
                   rtcb->xcp.sigdeliver = NULL;
                 }
diff --git a/arch/sim/src/up_smpsignal.c b/arch/sim/src/up_smpsignal.c
index 58582d0df9..b69bfb75ab 100644
--- a/arch/sim/src/up_smpsignal.c
+++ b/arch/sim/src/up_smpsignal.c
@@ -112,7 +112,7 @@ void sim_cpu_pause(int cpu, volatile spinlock_t *wait,
 
       if (rtcb->xcp.sigdeliver)
         {
-          sdbg("CPU%d: Delivering signals TCB=%p\n", cpu, rtcb);
+          serr("CPU%d: Delivering signals TCB=%p\n", cpu, rtcb);
           ((sig_deliver_t)rtcb->xcp.sigdeliver)(rtcb);
           rtcb->xcp.sigdeliver = NULL;
         }
diff --git a/arch/sim/src/up_spiflash.c b/arch/sim/src/up_spiflash.c
index c7f4a076d0..3b182a8129 100644
--- a/arch/sim/src/up_spiflash.c
+++ b/arch/sim/src/up_spiflash.c
@@ -69,14 +69,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg llerr
+#  define spierr llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
diff --git a/arch/sim/src/up_touchscreen.c b/arch/sim/src/up_touchscreen.c
index 93218e45bb..2869bcf0bb 100644
--- a/arch/sim/src/up_touchscreen.c
+++ b/arch/sim/src/up_touchscreen.c
@@ -670,7 +670,7 @@ int board_tsc_setup(int minor)
   ret = register_driver(devname, &up_fops, 0666, priv);
   if (ret < 0)
     {
-      idbg("register_driver() failed: %d\n", ret);
+      ierr("register_driver() failed: %d\n", ret);
       goto errout_with_priv;
     }
 
@@ -737,7 +737,7 @@ void board_tsc_teardown(void)
   ret = unregister_driver(devname);
   if (ret < 0)
     {
-      idbg("uregister_driver() failed: %d\n", ret);
+      ierr("uregister_driver() failed: %d\n", ret);
     }
 
   /* Clean up any resources.  Ouch!  While we are holding the semaphore? */
diff --git a/arch/sim/src/up_unblocktask.c b/arch/sim/src/up_unblocktask.c
index 148b551973..60bee25261 100644
--- a/arch/sim/src/up_unblocktask.c
+++ b/arch/sim/src/up_unblocktask.c
@@ -77,7 +77,7 @@ void up_unblock_task(FAR struct tcb_s *tcb)
   ASSERT((tcb->task_state >= FIRST_BLOCKED_STATE) &&
          (tcb->task_state <= LAST_BLOCKED_STATE));
 
-  sdbg("Unblocking TCB=%p\n", tcb);
+  serr("Unblocking TCB=%p\n", tcb);
 
   /* Remove the task from the blocked task list */
 
@@ -107,7 +107,7 @@ void up_unblock_task(FAR struct tcb_s *tcb)
            */
 
           rtcb = this_task();
-          sdbg("New Active Task TCB=%p\n", rtcb);
+          serr("New Active Task TCB=%p\n", rtcb);
 
           /* The way that we handle signals in the simulation is kind of
            * a kludge.  This would be unsafe in a truly multi-threaded, interrupt
@@ -116,7 +116,7 @@ void up_unblock_task(FAR struct tcb_s *tcb)
 
           if (rtcb->xcp.sigdeliver)
             {
-              sdbg("Delivering signals TCB=%p\n", rtcb);
+              serr("Delivering signals TCB=%p\n", rtcb);
               ((sig_deliver_t)rtcb->xcp.sigdeliver)(rtcb);
               rtcb->xcp.sigdeliver = NULL;
             }
diff --git a/arch/x86/src/common/up_elf.c b/arch/x86/src/common/up_elf.c
index 894f865786..f150799543 100644
--- a/arch/x86/src/common/up_elf.c
+++ b/arch/x86/src/common/up_elf.c
@@ -146,7 +146,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
 int up_relocateadd(FAR const Elf32_Rela *rel, FAR const Elf32_Sym *sym,
                    uintptr_t addr)
 {
-  bdbg("Not supported\n");
+  berr("Not supported\n");
   return -ENOSYS;
 }
 
diff --git a/arch/x86/src/common/up_exit.c b/arch/x86/src/common/up_exit.c
index 350e65dec3..463cb8c5cf 100644
--- a/arch/x86/src/common/up_exit.c
+++ b/arch/x86/src/common/up_exit.c
@@ -85,8 +85,8 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
   int i;
 #endif
 
-  sdbg("  TCB=%p name=%s pid=%d\n", tcb, tcb->argv[0], tcb->pid);
-  sdbg("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
+  serr("  TCB=%p name=%s pid=%d\n", tcb, tcb->argv[0], tcb->pid);
+  serr("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
 
 #if CONFIG_NFILE_DESCRIPTORS > 0
   filelist = tcb->group->tg_filelist;
@@ -95,7 +95,7 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
       struct inode *inode = filelist->fl_files[i].f_inode;
       if (inode)
         {
-          sdbg("      fd=%d refcount=%d\n",
+          serr("      fd=%d refcount=%d\n",
                i, inode->i_crefs);
         }
     }
@@ -109,11 +109,11 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
       if (filep->fs_fd >= 0)
         {
 #if CONFIG_STDIO_BUFFER_SIZE > 0
-          sdbg("      fd=%d nbytes=%d\n",
+          serr("      fd=%d nbytes=%d\n",
                filep->fs_fd,
                filep->fs_bufpos - filep->fs_bufstart);
 #else
-          sdbg("      fd=%d\n", filep->fs_fd);
+          serr("      fd=%d\n", filep->fs_fd);
 #endif
         }
     }
diff --git a/arch/x86/src/i486/up_createstack.c b/arch/x86/src/i486/up_createstack.c
index 61992d2740..f51d6f2ca2 100644
--- a/arch/x86/src/i486/up_createstack.c
+++ b/arch/x86/src/i486/up_createstack.c
@@ -144,7 +144,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
 
       if (!tcb->stack_alloc_ptr)
         {
-          sdbg("ERROR: Failed to allocate stack, size %d\n", stack_size);
+          serr("ERROR: Failed to allocate stack, size %d\n", stack_size);
         }
 #endif
     }
diff --git a/arch/x86/src/i486/up_schedulesigaction.c b/arch/x86/src/i486/up_schedulesigaction.c
index 60604e8827..6719699bb2 100644
--- a/arch/x86/src/i486/up_schedulesigaction.c
+++ b/arch/x86/src/i486/up_schedulesigaction.c
@@ -101,7 +101,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
 {
   irqstate_t flags;
 
-  sdbg("tcb=0x%p sigdeliver=0x%p\n", tcb, sigdeliver);
+  serr("tcb=0x%p sigdeliver=0x%p\n", tcb, sigdeliver);
 
   /* Make sure that interrupts are disabled */
 
@@ -115,7 +115,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
        * to the currently executing task.
        */
 
-      sdbg("rtcb=0x%p g_current_regs=0x%p\n", this_task(), g_current_regs);
+      serr("rtcb=0x%p g_current_regs=0x%p\n", this_task(), g_current_regs);
 
       if (tcb == this_task())
         {
diff --git a/arch/x86/src/i486/up_sigdeliver.c b/arch/x86/src/i486/up_sigdeliver.c
index e807c3d616..1411786d5a 100644
--- a/arch/x86/src/i486/up_sigdeliver.c
+++ b/arch/x86/src/i486/up_sigdeliver.c
@@ -95,7 +95,7 @@ void up_sigdeliver(void)
 
   board_autoled_on(LED_SIGNAL);
 
-  sdbg("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
+  serr("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
         rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
   ASSERT(rtcb->xcp.sigdeliver != NULL);
 
@@ -126,7 +126,7 @@ void up_sigdeliver(void)
    * errno that is needed by the user logic (it is probably EINTR).
    */
 
-  sdbg("Resuming\n");
+  serr("Resuming\n");
   (void)up_irq_save();
   rtcb->pterrno = saved_errno;
 
diff --git a/arch/x86/src/qemu/qemu_vga.c b/arch/x86/src/qemu/qemu_vga.c
index ec56c8aaa8..1513339332 100644
--- a/arch/x86/src/qemu/qemu_vga.c
+++ b/arch/x86/src/qemu/qemu_vga.c
@@ -498,7 +498,7 @@ FAR struct lcd_dev_s *qemu_vga_initialize(void)
   int ret = init_graph_vga(VGA_XRES, VGA_YRES, 1);
   if (ret < 0)
     {
-      gdbg("ERROR: init_graph_vga returned %d\n",ret);
+      gerr("ERROR: init_graph_vga returned %d\n",ret);
     }
 
   memset(g_pscreen, 0, VGA_XRES * VGA_YRES);
@@ -510,7 +510,7 @@ void qemu_vga(void)
   int ret = init_graph_vga(VGA_XRES, VGA_YRES, 1);
   if (ret < 0)
     {
-      gdbg("ERROR: init_graph_vga returned %d\n",ret);
+      gerr("ERROR: init_graph_vga returned %d\n",ret);
     }
 
   memset(g_pscreen, g_bg_color, VGA_XRES * VGA_YRES);
diff --git a/arch/z16/src/common/up_blocktask.c b/arch/z16/src/common/up_blocktask.c
index e165e74a73..dd8ea8ef17 100644
--- a/arch/z16/src/common/up_blocktask.c
+++ b/arch/z16/src/common/up_blocktask.c
@@ -83,7 +83,7 @@ void up_block_task(FAR struct tcb_s *tcb, tstate_t task_state)
   ASSERT((tcb->task_state >= FIRST_READY_TO_RUN_STATE) &&
          (tcb->task_state <= LAST_READY_TO_RUN_STATE));
 
-  /* dbg("Blocking TCB=%p\n", tcb); */
+  /* err("Blocking TCB=%p\n", tcb); */
 
   /* Remove the tcb task from the ready-to-run list.  If we
    * are blocking the task at the head of the task list (the
diff --git a/arch/z16/src/common/up_createstack.c b/arch/z16/src/common/up_createstack.c
index db9296dd1c..2c35e68aef 100644
--- a/arch/z16/src/common/up_createstack.c
+++ b/arch/z16/src/common/up_createstack.c
@@ -125,7 +125,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
 
       if (!tcb->stack_alloc_ptr)
         {
-          sdbg("ERROR: Failed to allocate stack, size %d\n", stack_size);
+          serr("ERROR: Failed to allocate stack, size %d\n", stack_size);
         }
 #endif
     }
diff --git a/arch/z16/src/common/up_schedulesigaction.c b/arch/z16/src/common/up_schedulesigaction.c
index 0592b88335..090c641f60 100644
--- a/arch/z16/src/common/up_schedulesigaction.c
+++ b/arch/z16/src/common/up_schedulesigaction.c
@@ -92,7 +92,7 @@ void up_schedule_sigaction(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver)
 {
   irqstate_t flags;
 
-  dbg("tcb=0x%p sigdeliver=0x%06x\n", tcb, (uint32_t)sigdeliver);
+  err("tcb=0x%p sigdeliver=0x%06x\n", tcb, (uint32_t)sigdeliver);
 
   /* Make sure that interrupts are disabled */
 
@@ -106,7 +106,7 @@ void up_schedule_sigaction(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver)
        * being delivered to the currently executing task.
        */
 
-      dbg("rtcb=0x%p g_current_regs=0x%p\n", this_task(), g_current_regs);
+      err("rtcb=0x%p g_current_regs=0x%p\n", this_task(), g_current_regs);
 
       if (tcb == this_task())
         {
diff --git a/arch/z16/src/common/up_sigdeliver.c b/arch/z16/src/common/up_sigdeliver.c
index 9861f0096e..cbe9e95ca6 100644
--- a/arch/z16/src/common/up_sigdeliver.c
+++ b/arch/z16/src/common/up_sigdeliver.c
@@ -84,7 +84,7 @@ void up_sigdeliver(void)
 
   board_autoled_on(LED_SIGNAL);
 
-  sdbg("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
+  serr("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
         rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
   ASSERT(rtcb->xcp.sigdeliver != NULL);
 
@@ -119,7 +119,7 @@ void up_sigdeliver(void)
    * errno that is needed by the user logic (it is probably EINTR).
    */
 
-  sdbg("Resuming\n");
+  serr("Resuming\n");
   (void)up_irq_save();
   rtcb->pterrno = saved_errno;
 
diff --git a/arch/z16/src/common/up_unblocktask.c b/arch/z16/src/common/up_unblocktask.c
index 96eb7675ac..26aac84675 100644
--- a/arch/z16/src/common/up_unblocktask.c
+++ b/arch/z16/src/common/up_unblocktask.c
@@ -79,7 +79,7 @@ void up_unblock_task(FAR struct tcb_s *tcb)
   ASSERT((tcb->task_state >= FIRST_BLOCKED_STATE) &&
          (tcb->task_state <= LAST_BLOCKED_STATE));
 
-  /* dbg("Unblocking TCB=%p\n", tcb); */
+  /* err("Unblocking TCB=%p\n", tcb); */
 
   /* Remove the task from the blocked task list */
 
diff --git a/arch/z16/src/z16f/z16f_espi.c b/arch/z16/src/z16f/z16f_espi.c
index 16676a280e..31971a11fd 100644
--- a/arch/z16/src/z16f/z16f_espi.c
+++ b/arch/z16/src/z16f/z16f_espi.c
@@ -70,14 +70,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg    llerr
+#  define spierr    llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo (void)
 #  endif
 #else
-#  define spidbg    (void)
+#  define spierr    (void)
 #  define spiinfo   (void)
 #endif
 
@@ -476,7 +476,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
   priv->frequency = frequency;
   priv->actual    = actual;
 
-  spidbg("Frequency %d->%d\n", frequency, actual);
+  spierr("Frequency %d->%d\n", frequency, actual);
   return actual;
 }
 
diff --git a/arch/z80/src/common/up_blocktask.c b/arch/z80/src/common/up_blocktask.c
index 831de41317..8d0bcfc3a0 100644
--- a/arch/z80/src/common/up_blocktask.c
+++ b/arch/z80/src/common/up_blocktask.c
@@ -85,7 +85,7 @@ void up_block_task(FAR struct tcb_s *tcb, tstate_t task_state)
   ASSERT((tcb->task_state >= FIRST_READY_TO_RUN_STATE) &&
          (tcb->task_state <= LAST_READY_TO_RUN_STATE));
 
-  /* dbg("Blocking TCB=%p\n", tcb); */
+  /* err("Blocking TCB=%p\n", tcb); */
 
   /* Remove the tcb task from the ready-to-run list.  If we
    * are blocking the task at the head of the task list (the
diff --git a/arch/z80/src/common/up_createstack.c b/arch/z80/src/common/up_createstack.c
index b38a0b9a61..a0a2bc2507 100644
--- a/arch/z80/src/common/up_createstack.c
+++ b/arch/z80/src/common/up_createstack.c
@@ -142,7 +142,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
 
       if (!tcb->stack_alloc_ptr)
         {
-          sdbg("ERROR: Failed to allocate stack, size %d\n", stack_size);
+          serr("ERROR: Failed to allocate stack, size %d\n", stack_size);
         }
 #endif
     }
diff --git a/arch/z80/src/common/up_unblocktask.c b/arch/z80/src/common/up_unblocktask.c
index f110172052..a3bad89b49 100644
--- a/arch/z80/src/common/up_unblocktask.c
+++ b/arch/z80/src/common/up_unblocktask.c
@@ -81,7 +81,7 @@ void up_unblock_task(FAR struct tcb_s *tcb)
   ASSERT((tcb->task_state >= FIRST_BLOCKED_STATE) &&
          (tcb->task_state <= LAST_BLOCKED_STATE));
 
-  /* dbg("Unblocking TCB=%p\n", tcb); */
+  /* err("Unblocking TCB=%p\n", tcb); */
 
   /* Remove the task from the blocked task list */
 
diff --git a/arch/z80/src/ez80/ez80_emac.c b/arch/z80/src/ez80/ez80_emac.c
index f715cfcac2..12feabae9e 100644
--- a/arch/z80/src/ez80/ez80_emac.c
+++ b/arch/z80/src/ez80/ez80_emac.c
@@ -578,7 +578,7 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
   phyval = ez80emac_miiread(priv, MII_PHYID1);
   if (phyval != MII_PHYID1_AM79C874)
     {
-      ndbg("Not an Am79c874 PHY: PHY1=%04x vs %04x\n", phyval, MII_PHYID1_AM79C874);
+      nerr("Not an Am79c874 PHY: PHY1=%04x vs %04x\n", phyval, MII_PHYID1_AM79C874);
       ret = -ENODEV;
       goto dumpregs;
     }
@@ -586,7 +586,7 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
   phyval = ez80emac_miiread(priv, MII_PHYID2);
   if (phyval != MII_PHYID2_AM79C874)
     {
-      ndbg("Not an Am79c874 PHY: PHY2=%04x vs %04x\n", phyval, MII_PHYID2_AM79C874);
+      nerr("Not an Am79c874 PHY: PHY2=%04x vs %04x\n", phyval, MII_PHYID2_AM79C874);
       ret = -ENODEV;
       goto dumpregs;
     }
@@ -618,7 +618,7 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
 
 #if CONFIG_EZ80_PHYCONFIG == EZ80_EMAC_AUTONEG
 
-   ndbg("Configure autonegotiation\n");
+   nerr("Configure autonegotiation\n");
    if (bauto)
     {
       ez80emac_miiwrite(priv, MII_ADVERTISE,
@@ -628,12 +628,12 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
     }
   else
     {
-      ndbg("Am79c784 is not capable of autonegotiation\n");
+      nerr("Am79c784 is not capable of autonegotiation\n");
     }
 
 #elif CONFIG_EZ80_PHYCONFIG == EZ80_EMAC_100BFD
 
-  ndbg("100BASETX full duplex\n");
+  nerr("100BASETX full duplex\n");
   phyval |= MII_MCR_SPEED100 | MII_MCR_FULLDPLX;
   ez80emac_miiwrite(priv, MII_ADVERTISE,
                     MII_ADVERTISE_100BASETXFULL|MII_ADVERTISE_100BASETXHALF|
@@ -642,7 +642,7 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
 
 #elif CONFIG_EZ80_PHYCONFIG == EZ80_EMAC_100BHD
 
-  ndbg("100BASETX half duplex\n");
+  nerr("100BASETX half duplex\n");
   phyval |= MII_MCR_SPEED100;
   ez80emac_miiwrite(priv, MII_ADVERTISE,
                     MII_ADVERTISE_100BASETXHALF|MII_ADVERTISE_10BASETXFULL|
@@ -650,14 +650,14 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
 
 #elif CONFIG_EZ80_PHYCONFIG == EZ80_EMAC_10BFD
 
-  ndbg("10BASETX full duplex\n");
+  nerr("10BASETX full duplex\n");
   phyval |= MII_MCR_FULLDPLX;
   ez80emac_miiwrite(priv, MII_ADVERTISE,
                     MII_ADVERTISE_10BASETXFULL|MII_ADVERTISE_10BASETXHALF|MII_ADVERTISE_CSMA);
 
 #elif CONFIG_EZ80_PHYCONFIG == EZ80_EMAC_10BHD
 
-  ndbg("10BASETX half duplex\n");
+  nerr("10BASETX half duplex\n");
   ez80emac_miiwrite(priv, MII_ADVERTISE,
                     MII_ADVERTISE_10BASETXHALF|MII_ADVERTISE_CSMA);
 
@@ -681,7 +681,7 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
 
   if ((phyval & MII_MSR_LINKSTATUS) == 0)
     {
-      ndbg("Failed to establish link\n");
+      nerr("Failed to establish link\n");
       ret = -ETIMEDOUT;
     }
   else
@@ -731,21 +731,21 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
 
   if (!ez80emac_miipoll(priv, MII_MCR, MII_MCR_ANRESTART, false))
     {
-      ndbg("Autonegotiation didn't start.\n");
+      nerr("Autonegotiation didn't start.\n");
     }
 
   /* Wait for auto-negotiation to complete */
 
   if (!ez80emac_miipoll(priv, MII_MSR, MII_MSR_ANEGCOMPLETE, true))
     {
-      ndbg("Autonegotiation didn't complete.\n");
+      nerr("Autonegotiation didn't complete.\n");
     }
 
   /* Wait link */
 
   if (!ez80emac_miipoll(priv, MII_MSR, MII_MSR_LINKSTATUS, true))
     {
-      ndbg("Link is down!\n");
+      nerr("Link is down!\n");
       priv->blinkok = false;
     }
   else
@@ -763,7 +763,7 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
 
   if ((advertise & MII_ADVERTISE_100BASETXFULL) && (lpa & MII_LPA_100BASETXFULL))
     {
-      ndbg("100BASETX full duplex\n");
+      nerr("100BASETX full duplex\n");
       regval            = inp(EZ80_EMAC_CFG1);
       regval           |= EMAC_CFG1_FULLHD; /* Enable full duplex mode */
       outp(EZ80_EMAC_CFG1, regval);
@@ -775,7 +775,7 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
 
   else if ((advertise & MII_ADVERTISE_100BASETXHALF) && (lpa & MII_LPA_100BASETXHALF))
     {
-      ndbg("100BASETX half duplex\n");
+      nerr("100BASETX half duplex\n");
       regval            = inp(EZ80_EMAC_CFG1);
       regval           &= ~EMAC_CFG1_FULLHD; /* Disable full duplex mode */
       outp(EZ80_EMAC_CFG1, regval);
@@ -787,7 +787,7 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
 
   else if ((advertise & MII_ADVERTISE_10BASETXFULL) && (lpa & MII_LPA_10BASETXFULL))
     {
-      ndbg("10BASETX full duplex\n");
+      nerr("10BASETX full duplex\n");
       regval            = inp(EZ80_EMAC_CFG1);
       regval           |= EMAC_CFG1_FULLHD; /* Enable full duplex mode */
       outp(EZ80_EMAC_CFG1, regval);
@@ -799,7 +799,7 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
 
   else if ((advertise & MII_ADVERTISE_10BASETXHALF) && (lpa & MII_LPA_10BASETXHALF))
     {
-      ndbg("10BASETX half duplex\n");
+      nerr("10BASETX half duplex\n");
       regval            = inp(EZ80_EMAC_CFG1);
       regval           &= ~EMAC_CFG1_FULLHD; /* Disable full duplex mode */
       outp(EZ80_EMAC_CFG1, regval);
@@ -808,7 +808,7 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
     }
   else
     {
-      ndbg("No valid connection; force 10Mbps half-duplex.\n");
+      nerr("No valid connection; force 10Mbps half-duplex.\n");
       regval            = inp(EZ80_EMAC_CFG1);
       regval           &= ~EMAC_CFG1_FULLHD; /* Disable full duplex mode */
       outp(EZ80_EMAC_CFG1, regval);
@@ -1400,7 +1400,7 @@ static int ez80emac_receive(struct ez80emac_driver_s *priv)
       else
 #endif
         {
-          ndbg("Unsupported packet type dropped (%02x)\n", ETHBUF->type);
+          nerr("Unsupported packet type dropped (%02x)\n", ETHBUF->type);
           EMAC_STAT(priv, rx_dropped);
         }
 
@@ -1458,7 +1458,7 @@ static int ez80emac_txinterrupt(int irq, FAR void *context)
     {
       if ((txhead->stat & EMAC_TXDESC_ABORT) != 0)
         {
-          ndbg("Descriptor %p aborted {%06x, %u, %04x} trp=%02x%02x\n",
+          nerr("Descriptor %p aborted {%06x, %u, %04x} trp=%02x%02x\n",
                txhead, txhead->np, txhead->pktsize, txhead->stat,
                inp(EZ80_EMAC_TRP_H), inp(EZ80_EMAC_TRP_L));
 
@@ -1604,7 +1604,7 @@ static int ez80emac_sysinterrupt(int irq, FAR void *context)
 
   if ((istat & EMAC_ISTAT_TXFSMERR) != 0)
     {
-      ndbg("Tx FSMERR txhead=%p {%06x, %u, %04x} trp=%02x%02x istat=%02x\n",
+      nerr("Tx FSMERR txhead=%p {%06x, %u, %04x} trp=%02x%02x istat=%02x\n",
            priv->txhead, priv->txhead->np, priv->txhead->pktsize, priv->txhead->stat,
            inp(EZ80_EMAC_TRP_H), inp(EZ80_EMAC_TRP_L), istat);
 
@@ -1620,7 +1620,7 @@ static int ez80emac_sysinterrupt(int irq, FAR void *context)
 
   if ((istat & EMAC_ISTAT_RXOVR) != 0)
     {
-      ndbg("Rx OVR rxnext=%p {%06x, %u, %04x} rrp=%02x%02x rwp=%02x%02x blkslft=%02x istat=%02x\n",
+      nerr("Rx OVR rxnext=%p {%06x, %u, %04x} rrp=%02x%02x rwp=%02x%02x blkslft=%02x istat=%02x\n",
            priv->rxnext, priv->rxnext->np, priv->rxnext->pktsize, priv->rxnext->stat,
            inp(EZ80_EMAC_RRP_H), inp(EZ80_EMAC_RRP_L),
            inp(EZ80_EMAC_RWP_H), inp(EZ80_EMAC_RWP_L),
@@ -1728,11 +1728,11 @@ static int ez80emac_ifup(FAR struct net_driver_s *dev)
   uint8_t regval;
   int ret;
 
-  ndbg("Bringing up: MAC %02x:%02x:%02x:%02x:%02x:%02x\n",
+  nerr("Bringing up: MAC %02x:%02x:%02x:%02x:%02x:%02x\n",
        dev->d_mac.ether_addr_octet[0], dev->d_mac.ether_addr_octet[1],
        dev->d_mac.ether_addr_octet[2], dev->d_mac.ether_addr_octet[3],
        dev->d_mac.ether_addr_octet[4], dev->d_mac.ether_addr_octet[5]);
-  ndbg("             IP  %d.%d.%d.%d\n",
+  nerr("             IP  %d.%d.%d.%d\n",
        dev->d_ipaddr >> 24,       (dev->d_ipaddr >> 16) & 0xff,
       (dev->d_ipaddr >> 8) & 0xff, dev->d_ipaddr & 0xff);
 
@@ -2094,7 +2094,7 @@ static int ez80_emacinitialize(void)
   ez80emac_miiwrite(priv, MII_MCR, MII_MCR_RESET);
   if (!ez80emac_miipoll(priv, MII_MCR, MII_MCR_RESET, false))
     {
-      ndbg("PHY reset error.\n");
+      nerr("PHY reset error.\n");
     }
 
   /*  Initialize MAC */
@@ -2149,7 +2149,7 @@ static int ez80_emacinitialize(void)
   ez80emac_miiwrite(priv, MII_MCR, MII_MCR_RESET);
   if (!ez80emac_miipoll(priv, MII_MCR, MII_MCR_RESET, false))
     {
-      ndbg("PHY reset error.\n");
+      nerr("PHY reset error.\n");
       ret = -EIO;
       goto errout;
     }
diff --git a/arch/z80/src/ez80/ez80_i2c.c b/arch/z80/src/ez80/ez80_i2c.c
index d9bec997c2..73f78fc2e7 100644
--- a/arch/z80/src/ez80/ez80_i2c.c
+++ b/arch/z80/src/ez80/ez80_i2c.c
@@ -404,7 +404,7 @@ static int ez80_i2c_sendaddr(struct ez80_i2cdev_s *priv, uint8_t readbit)
     {
       /* This error should never occur */
 
-      dbg("Bad START status: %02x\n", sr);
+      err("Bad START status: %02x\n", sr);
       ez80_i2c_clriflg();
       return -EIO;
     }
@@ -426,7 +426,7 @@ static int ez80_i2c_sendaddr(struct ez80_i2cdev_s *priv, uint8_t readbit)
       sr = ez80_i2c_waitiflg();
       if (sr != I2C_SR_MADDRWRACK && sr != I2C_SR_MADDRWR)
         {
-          dbg("Bad ADDR8 status: %02x\n", sr);
+          err("Bad ADDR8 status: %02x\n", sr);
           goto failure;
         }
     }
@@ -445,7 +445,7 @@ static int ez80_i2c_sendaddr(struct ez80_i2cdev_s *priv, uint8_t readbit)
       sr = ez80_i2c_waitiflg();
       if (sr != I2C_SR_MADDRWRACK && sr != I2C_SR_MADDRWR)
         {
-         dbg("Bad ADDR10H status: %02x\n", sr);
+         err("Bad ADDR10H status: %02x\n", sr);
          goto failure;
         }
 
@@ -459,7 +459,7 @@ static int ez80_i2c_sendaddr(struct ez80_i2cdev_s *priv, uint8_t readbit)
       sr = ez80_i2c_waitiflg();
       if (sr != I2C_SR_MADDR2WRACK && sr != I2C_SR_MADDR2WR)
         {
-          dbg("Bad ADDR10L status: %02x\n", sr);
+          err("Bad ADDR10L status: %02x\n", sr);
           goto failure;
         }
     }
@@ -479,12 +479,12 @@ failure:
                              * Call address received, ACK transmitted */
       case I2C_SR_ARBLOST4: /* Arbitration lost in address as master, slave
                              * address and Read bit received, ACK transmitted */
-        dbg("Arbitration lost: %02x\n", sr);
+        err("Arbitration lost: %02x\n", sr);
         ez80_i2c_clriflg();
         return -EAGAIN;
 
       default:
-        dbg("Unexpected status: %02x\n", sr);
+        err("Unexpected status: %02x\n", sr);
         ez80_i2c_clriflg();
         return -EIO;
     }
@@ -634,7 +634,7 @@ static int ez80_i2c_read_transfer(FAR struct ez80_i2cdev_s *priv,
              * this will cause the whole transfer to start over
              */
 
-            dbg("Arbitration lost: %02x\n", regval);
+            err("Arbitration lost: %02x\n", regval);
             ez80_i2c_clriflg();
             break;
           }
@@ -643,7 +643,7 @@ static int ez80_i2c_read_transfer(FAR struct ez80_i2cdev_s *priv,
 
         else
           {
-            dbg("Unexpected status: %02x\n", regval);
+            err("Unexpected status: %02x\n", regval);
             ez80_i2c_clriflg();
             return-EIO;
           }
@@ -731,7 +731,7 @@ static int ez80_i2c_write_transfer(FAR struct ez80_i2cdev_s *priv,
           sr = ez80_i2c_waitiflg();
           if (sr != I2C_SR_MDATAWRACK && sr != I2C_SR_MDATAWR)
             {
-              dbg("Bad DATA status: %02x\n", sr);
+              err("Bad DATA status: %02x\n", sr);
               ez80_i2c_clriflg();
               if (sr == I2C_SR_ARBLOST1)
                 {
diff --git a/arch/z80/src/ez80/ez80_schedulesigaction.c b/arch/z80/src/ez80/ez80_schedulesigaction.c
index 33d6c11b5f..b8de5d3c73 100644
--- a/arch/z80/src/ez80/ez80_schedulesigaction.c
+++ b/arch/z80/src/ez80/ez80_schedulesigaction.c
@@ -125,7 +125,7 @@ void up_schedule_sigaction(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver)
 {
   irqstate_t flags;
 
-  sdbg("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver);
+  serr("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver);
 
   /* Make sure that interrupts are disabled */
 
diff --git a/arch/z80/src/ez80/ez80_sigdeliver.c b/arch/z80/src/ez80/ez80_sigdeliver.c
index 657961ce59..3532758f63 100644
--- a/arch/z80/src/ez80/ez80_sigdeliver.c
+++ b/arch/z80/src/ez80/ez80_sigdeliver.c
@@ -95,7 +95,7 @@ void up_sigdeliver(void)
 
   board_autoled_on(LED_SIGNAL);
 
-  sdbg("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
+  serr("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
         rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
   ASSERT(rtcb->xcp.sigdeliver != NULL);
 
@@ -127,7 +127,7 @@ void up_sigdeliver(void)
    * errno that is needed by the user logic (it is probably EINTR).
    */
 
-  sdbg("Resuming\n");
+  serr("Resuming\n");
   (void)up_irq_save();
   rtcb->pterrno = saved_errno;
 
diff --git a/arch/z80/src/z180/z180_mmu.c b/arch/z80/src/z180/z180_mmu.c
index e3612dc9f0..53e6183d0b 100644
--- a/arch/z80/src/z180/z180_mmu.c
+++ b/arch/z80/src/z180/z180_mmu.c
@@ -258,7 +258,7 @@ int up_addrenv_create(size_t textsize, size_t datasize, size_t heapsize,
     {
       /* No address environment... but I suppose that is not an error */
 
-      sdbg("ERROR: npages is zero\n");
+      serr("ERROR: npages is zero\n");
       return OK;
     }
 
@@ -273,7 +273,7 @@ int up_addrenv_create(size_t textsize, size_t datasize, size_t heapsize,
   cbr = z180_mmu_alloccbr();
   if (!cbr)
     {
-      sdbg("ERROR: No free CBR structures\n");
+      serr("ERROR: No free CBR structures\n");
       ret = -ENOMEM;
       goto errout_with_irq;
     }
@@ -287,7 +287,7 @@ int up_addrenv_create(size_t textsize, size_t datasize, size_t heapsize,
 #endif
   if (!alloc)
     {
-      sdbg("ERROR: Failed to allocate %d pages\n", npages);
+      serr("ERROR: Failed to allocate %d pages\n", npages);
       ret = -ENOMEM;
       goto errout_with_cbr;
     }
diff --git a/arch/z80/src/z180/z180_schedulesigaction.c b/arch/z80/src/z180/z180_schedulesigaction.c
index a29a4b9d8a..360f06bb1a 100644
--- a/arch/z80/src/z180/z180_schedulesigaction.c
+++ b/arch/z80/src/z180/z180_schedulesigaction.c
@@ -125,7 +125,7 @@ void up_schedule_sigaction(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver)
 {
   irqstate_t flags;
 
-  dbg("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver);
+  err("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver);
 
   /* Make sure that interrupts are disabled */
 
diff --git a/arch/z80/src/z180/z180_sigdeliver.c b/arch/z80/src/z180/z180_sigdeliver.c
index e058d5a116..42925eb31a 100644
--- a/arch/z80/src/z180/z180_sigdeliver.c
+++ b/arch/z80/src/z180/z180_sigdeliver.c
@@ -94,7 +94,7 @@ void up_sigdeliver(void)
 
   board_autoled_on(LED_SIGNAL);
 
-  sdbg("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
+  serr("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
        rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
   ASSERT(rtcb->xcp.sigdeliver != NULL);
 
@@ -126,7 +126,7 @@ void up_sigdeliver(void)
    * errno that is needed by the user logic (it is probably EINTR).
    */
 
-  sdbg("Resuming\n");
+  serr("Resuming\n");
   (void)up_irq_save();
   rtcb->pterrno = saved_errno;
 
diff --git a/arch/z80/src/z8/z8_i2c.c b/arch/z80/src/z8/z8_i2c.c
index cc3508a564..cf8c347068 100644
--- a/arch/z80/src/z8/z8_i2c.c
+++ b/arch/z80/src/z8/z8_i2c.c
@@ -236,7 +236,7 @@ static uint16_t z8_i2c_getbrg(uint32_t frequency)
 
   if (frequency > 400*1000)
     {
-      dbg("Invalid inputs\n");
+      err("Invalid inputs\n");
       frequency = 400*1000;
     }
 
diff --git a/arch/z80/src/z8/z8_schedulesigaction.c b/arch/z80/src/z8/z8_schedulesigaction.c
index 2e6de089ec..94d9dc0541 100644
--- a/arch/z80/src/z8/z8_schedulesigaction.c
+++ b/arch/z80/src/z8/z8_schedulesigaction.c
@@ -125,7 +125,7 @@ void up_schedule_sigaction(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver)
 {
   irqstate_t flags;
 
-  dbg("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver);
+  err("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver);
 
   /* Make sure that interrupts are disabled */
 
diff --git a/arch/z80/src/z8/z8_sigdeliver.c b/arch/z80/src/z8/z8_sigdeliver.c
index 1cbb7e2159..0edcb9e8c7 100644
--- a/arch/z80/src/z8/z8_sigdeliver.c
+++ b/arch/z80/src/z8/z8_sigdeliver.c
@@ -109,7 +109,7 @@ void up_sigdeliver(void)
 
   board_autoled_on(LED_SIGNAL);
 
-  sdbg("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
+  serr("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
        rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
   ASSERT(rtcb->xcp.sigdeliver != NULL);
 
@@ -141,7 +141,7 @@ void up_sigdeliver(void)
    * errno that is needed by the user logic (it is probably EINTR).
    */
 
-  sdbg("Resuming\n");
+  serr("Resuming\n");
   (void)up_irq_save();
   rtcb->pterrno = saved_errno;
 
diff --git a/arch/z80/src/z80/z80_schedulesigaction.c b/arch/z80/src/z80/z80_schedulesigaction.c
index eb0c9c5554..a90d495c3c 100644
--- a/arch/z80/src/z80/z80_schedulesigaction.c
+++ b/arch/z80/src/z80/z80_schedulesigaction.c
@@ -125,7 +125,7 @@ void up_schedule_sigaction(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver)
 {
   irqstate_t flags;
 
-  dbg("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver);
+  err("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver);
 
   /* Make sure that interrupts are disabled */
 
diff --git a/arch/z80/src/z80/z80_sigdeliver.c b/arch/z80/src/z80/z80_sigdeliver.c
index b56d1afd32..198ac4b4c7 100644
--- a/arch/z80/src/z80/z80_sigdeliver.c
+++ b/arch/z80/src/z80/z80_sigdeliver.c
@@ -94,7 +94,7 @@ void up_sigdeliver(void)
 
   board_autoled_on(LED_SIGNAL);
 
-  sdbg("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
+  serr("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
        rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
   ASSERT(rtcb->xcp.sigdeliver != NULL);
 
@@ -126,7 +126,7 @@ void up_sigdeliver(void)
    * errno that is needed by the user logic (it is probably EINTR).
    */
 
-  sdbg("Resuming\n");
+  serr("Resuming\n");
   (void)up_irq_save();
   rtcb->pterrno = saved_errno;
 
diff --git a/audio/audio.c b/audio/audio.c
index e8caf0a4b8..8b35368174 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -832,7 +832,7 @@ static void audio_callback(FAR void *handle, uint16_t reason,
 
       default:
         {
-          auddbg("Unknown callback reason code %d\n", reason);
+          auderr("Unknown callback reason code %d\n", reason);
           break;
         }
     }
@@ -885,7 +885,7 @@ int audio_register(FAR const char *name, FAR struct audio_lowerhalf_s *dev)
   upper = (FAR struct audio_upperhalf_s *)kmm_zalloc(sizeof(struct audio_upperhalf_s));
   if (!upper)
     {
-      auddbg("Allocation failed\n");
+      auderr("Allocation failed\n");
       return -ENOMEM;
     }
 
diff --git a/audio/pcm_decode.c b/audio/pcm_decode.c
index f650045dd5..28dafc41a9 100644
--- a/audio/pcm_decode.c
+++ b/audio/pcm_decode.c
@@ -259,23 +259,23 @@ static void pcm_callback(FAR void *arg, uint16_t reason,
 #ifdef CONFIG_PCM_DEBUG
 static void pcm_dump(FAR const struct wav_header_s *wav)
 {
-  dbg("Wave file header\n");
-  dbg("  Header Chunk:\n");
-  dbg("    Chunk ID:        0x%08x\n", wav->hdr.chunkid);
-  dbg("    Chunk Size:      %u\n",     wav->hdr.chunklen);
-  dbg("    Format:          0x%08x\n", wav->hdr.format);
-  dbg("  Format Chunk:\n");
-  dbg("    Chunk ID:        0x%08x\n", wav->fmt.chunkid);
-  dbg("    Chunk Size:      %u\n",     wav->fmt.chunklen);
-  dbg("    Audio Format:    0x%04x\n", wav->fmt.format);
-  dbg("    Num. Channels:   %d\n",     wav->fmt.nchannels);
-  dbg("    Sample Rate:     %u\n",     wav->fmt.samprate);
-  dbg("    Byte Rate:       %u\n",     wav->fmt.byterate);
-  dbg("    Block Align:     %d\n",     wav->fmt.align);
-  dbg("    Bits Per Sample: %d\n",     wav->fmt.bpsamp);
-  dbg("  Data Chunk:\n");
-  dbg("    Chunk ID:        0x%08x\n", wav->data.chunkid);
-  dbg("    Chunk Size:      %u\n",     wav->data.chunklen);
+  err("Wave file header\n");
+  err("  Header Chunk:\n");
+  err("    Chunk ID:        0x%08x\n", wav->hdr.chunkid);
+  err("    Chunk Size:      %u\n",     wav->hdr.chunklen);
+  err("    Format:          0x%08x\n", wav->hdr.format);
+  err("  Format Chunk:\n");
+  err("    Chunk ID:        0x%08x\n", wav->fmt.chunkid);
+  err("    Chunk Size:      %u\n",     wav->fmt.chunklen);
+  err("    Audio Format:    0x%04x\n", wav->fmt.format);
+  err("    Num. Channels:   %d\n",     wav->fmt.nchannels);
+  err("    Sample Rate:     %u\n",     wav->fmt.samprate);
+  err("    Byte Rate:       %u\n",     wav->fmt.byterate);
+  err("    Block Align:     %d\n",     wav->fmt.align);
+  err("    Bits Per Sample: %d\n",     wav->fmt.bpsamp);
+  err("  Data Chunk:\n");
+  err("    Chunk ID:        0x%08x\n", wav->data.chunkid);
+  err("    Chunk Size:      %u\n",     wav->data.chunklen);
 }
 #endif
 
@@ -398,14 +398,14 @@ static bool pcm_parsewav(FAR struct pcm_decode_s *priv, uint8_t *data)
 
       if (priv->bpsamp != 8 && priv->bpsamp != 16)
         {
-          auddbg("ERROR: Cannot support bits per sample of %d in this mode\n",
+          auderr("ERROR: Cannot support bits per sample of %d in this mode\n",
                  priv->bpsamp);
           return -EINVAL;
         }
 
       if (priv->nchannels != 1 && priv->nchannels != 2)
         {
-          auddbg("ERROR: Cannot support number of channles of %d in this mode\n",
+          auderr("ERROR: Cannot support number of channles of %d in this mode\n",
                  priv->nchannels);
           return -EINVAL;
         }
@@ -691,7 +691,7 @@ static int pcm_getcaps(FAR struct audio_lowerhalf_s *dev, int type,
   ret = lower->ops->getcaps(lower, type, caps);
   if (ret < 0)
     {
-      auddbg("Lower getcaps() failed: %d\n", ret);
+      auderr("Lower getcaps() failed: %d\n", ret);
       return ret;
     }
 
@@ -1100,7 +1100,7 @@ static int pcm_enqueuebuffer(FAR struct audio_lowerhalf_s *dev,
 #endif
           if (ret < 0)
             {
-              auddbg("ERROR: Failed to set PCM configuration: %d\n", ret);
+              auderr("ERROR: Failed to set PCM configuration: %d\n", ret);
               return ret;
             }
 
@@ -1135,7 +1135,7 @@ static int pcm_enqueuebuffer(FAR struct audio_lowerhalf_s *dev,
             }
         }
 
-      auddbg("ERROR: Invalid PCM WAV file\n");
+      auderr("ERROR: Invalid PCM WAV file\n");
 
       /* The normal protocol for streaming errors is as follows:
        *
@@ -1161,7 +1161,7 @@ static int pcm_enqueuebuffer(FAR struct audio_lowerhalf_s *dev,
 
   /* This is not a WAV file! */
 
-  auddbg("ERROR: Invalid PCM WAV file\n");
+  auderr("ERROR: Invalid PCM WAV file\n");
   return -EINVAL;
 }
 
@@ -1378,7 +1378,7 @@ FAR struct audio_lowerhalf_s *
   priv = (FAR struct pcm_decode_s *)kmm_zalloc(sizeof(struct pcm_decode_s));
   if (!priv)
     {
-      auddbg("ERROR: Failed to allocate driver structure\n");
+      auderr("ERROR: Failed to allocate driver structure\n");
       return NULL;
     }
 
diff --git a/binfmt/binfmt_copyargv.c b/binfmt/binfmt_copyargv.c
index 612c0ec005..f0a594f5a6 100644
--- a/binfmt/binfmt_copyargv.c
+++ b/binfmt/binfmt_copyargv.c
@@ -114,7 +114,7 @@ int binfmt_copyargv(FAR struct binary_s *bin, FAR char * const *argv)
 
           if (nargs > MAX_EXEC_ARGS)
             {
-              bdbg("ERROR: Too many arguments: %lu\n", (unsigned long)argvsize);
+              berr("ERROR: Too many arguments: %lu\n", (unsigned long)argvsize);
               return -E2BIG;
             }
         }
@@ -129,7 +129,7 @@ int binfmt_copyargv(FAR struct binary_s *bin, FAR char * const *argv)
           bin->argbuffer = (FAR char *)kmm_malloc(argvsize + argsize);
           if (!bin->argbuffer)
             {
-              bdbg("ERROR: Failed to allocate the argument buffer\n");
+              berr("ERROR: Failed to allocate the argument buffer\n");
               return -ENOMEM;
             }
 
diff --git a/binfmt/binfmt_dumpmodule.c b/binfmt/binfmt_dumpmodule.c
index d4b534ce9c..a28f4cefee 100644
--- a/binfmt/binfmt_dumpmodule.c
+++ b/binfmt/binfmt_dumpmodule.c
@@ -86,21 +86,21 @@ int dump_module(FAR const struct binary_s *bin)
 {
   if (bin)
     {
-      bdbg("Module:\n");
-      bdbg("  filename:  %s\n", bin->filename);
-      bdbg("  argv:      %p\n", bin->argv);
-      bdbg("  entrypt:   %p\n", bin->entrypt);
-      bdbg("  mapped:    %p size=%d\n", bin->mapped, bin->mapsize);
-      bdbg("  alloc:     %p %p %p\n", bin->alloc[0], bin->alloc[1], bin->alloc[2]);
+      berr("Module:\n");
+      berr("  filename:  %s\n", bin->filename);
+      berr("  argv:      %p\n", bin->argv);
+      berr("  entrypt:   %p\n", bin->entrypt);
+      berr("  mapped:    %p size=%d\n", bin->mapped, bin->mapsize);
+      berr("  alloc:     %p %p %p\n", bin->alloc[0], bin->alloc[1], bin->alloc[2]);
 #ifdef CONFIG_BINFMT_CONSTRUCTORS
-      bdbg("  ctors:     %p nctors=%d\n", bin->ctors, bin->nctors);
-      bdbg("  dtors:     %p ndtors=%d\n", bin->dtors, bin->ndtors);
+      berr("  ctors:     %p nctors=%d\n", bin->ctors, bin->nctors);
+      berr("  dtors:     %p ndtors=%d\n", bin->dtors, bin->ndtors);
 #endif
 #ifdef CONFIG_ARCH_ADDRENV
-      bdbg("  addrenv:   %p\n", bin->addrenv);
+      berr("  addrenv:   %p\n", bin->addrenv);
 #endif
-      bdbg("  stacksize: %d\n", bin->stacksize);
-      bdbg("  unload:    %p\n", bin->unload);
+      berr("  stacksize: %d\n", bin->stacksize);
+      berr("  unload:    %p\n", bin->unload);
     }
 
   return OK;
diff --git a/binfmt/binfmt_exec.c b/binfmt/binfmt_exec.c
index 6352b0f981..2e6f074b79 100644
--- a/binfmt/binfmt_exec.c
+++ b/binfmt/binfmt_exec.c
@@ -94,7 +94,7 @@ int exec(FAR const char *filename, FAR char * const *argv,
   bin = (FAR struct binary_s *)kmm_zalloc(sizeof(struct binary_s));
   if (!bin)
     {
-      bdbg("ERROR: Failed to allocate binary_s\n");
+      berr("ERROR: Failed to allocate binary_s\n");
       errcode = ENOMEM;
       goto errout;
     }
@@ -111,7 +111,7 @@ int exec(FAR const char *filename, FAR char * const *argv,
   if (ret < 0)
     {
       errcode = -ret;
-      bdbg("ERROR: Failed to copy argv[]: %d\n", errcode);
+      berr("ERROR: Failed to copy argv[]: %d\n", errcode);
       goto errout_with_bin;
     }
 
@@ -121,7 +121,7 @@ int exec(FAR const char *filename, FAR char * const *argv,
   if (ret < 0)
     {
       errcode = get_errno();
-      bdbg("ERROR: Failed to load program '%s': %d\n", filename, errcode);
+      berr("ERROR: Failed to load program '%s': %d\n", filename, errcode);
       goto errout_with_argv;
     }
 
@@ -138,7 +138,7 @@ int exec(FAR const char *filename, FAR char * const *argv,
   if (pid < 0)
     {
       errcode = get_errno();
-      bdbg("ERROR: Failed to execute program '%s': %d\n", filename, errcode);
+      berr("ERROR: Failed to execute program '%s': %d\n", filename, errcode);
       goto errout_with_lock;
     }
 
@@ -150,7 +150,7 @@ int exec(FAR const char *filename, FAR char * const *argv,
   if (ret < 0)
     {
       errcode = get_errno();
-      bdbg("ERROR: Failed to schedule unload '%s': %d\n", filename, errcode);
+      berr("ERROR: Failed to schedule unload '%s': %d\n", filename, errcode);
     }
 
   sched_unlock();
@@ -183,7 +183,7 @@ errout:
   if (ret < 0)
     {
       errcode = get_errno();
-      bdbg("ERROR: Failed to load program '%s': %d\n", filename, errcode);
+      berr("ERROR: Failed to load program '%s': %d\n", filename, errcode);
       goto errout;
     }
 
@@ -193,7 +193,7 @@ errout:
   if (ret < 0)
     {
       errcode = get_errno();
-      bdbg("ERROR: Failed to execute program '%s': %d\n", filename, errcode);
+      berr("ERROR: Failed to execute program '%s': %d\n", filename, errcode);
       goto errout_with_module;
     }
 
diff --git a/binfmt/binfmt_execmodule.c b/binfmt/binfmt_execmodule.c
index 32b35c15aa..eef50068a5 100644
--- a/binfmt/binfmt_execmodule.c
+++ b/binfmt/binfmt_execmodule.c
@@ -172,7 +172,7 @@ int exec_module(FAR const struct binary_s *binp)
   ret = up_addrenv_select(&binp->addrenv, &oldenv);
   if (ret < 0)
     {
-      bdbg("ERROR: up_addrenv_select() failed: %d\n", ret);
+      berr("ERROR: up_addrenv_select() failed: %d\n", ret);
       errcode = -ret;
       goto errout_with_tcb;
     }
@@ -203,7 +203,7 @@ int exec_module(FAR const struct binary_s *binp)
   if (ret < 0)
     {
       errcode = get_errno();
-      bdbg("task_init() failed: %d\n", errcode);
+      berr("task_init() failed: %d\n", errcode);
       goto errout_with_addrenv;
     }
 
@@ -224,7 +224,7 @@ int exec_module(FAR const struct binary_s *binp)
   ret = up_addrenv_kstackalloc(&tcb->cmn);
   if (ret < 0)
     {
-      bdbg("ERROR: up_addrenv_select() failed: %d\n", ret);
+      berr("ERROR: up_addrenv_select() failed: %d\n", ret);
       errcode = -ret;
       goto errout_with_tcbinit;
     }
@@ -236,7 +236,7 @@ int exec_module(FAR const struct binary_s *binp)
   ret = shm_group_initialize(tcb->cmn.group);
   if (ret < 0)
     {
-      bdbg("ERROR: shm_group_initialize() failed: %d\n", ret);
+      berr("ERROR: shm_group_initialize() failed: %d\n", ret);
       errcode = -ret;
       goto errout_with_tcbinit;
     }
@@ -261,7 +261,7 @@ int exec_module(FAR const struct binary_s *binp)
   if (ret < 0)
     {
       errcode = -ret;
-      bdbg("ERROR: up_addrenv_clone() failed: %d\n", ret);
+      berr("ERROR: up_addrenv_clone() failed: %d\n", ret);
       goto errout_with_tcbinit;
     }
 
@@ -289,7 +289,7 @@ int exec_module(FAR const struct binary_s *binp)
   if (ret < 0)
     {
       errcode = get_errno();
-      bdbg("task_activate() failed: %d\n", errcode);
+      berr("task_activate() failed: %d\n", errcode);
       goto errout_with_tcbinit;
     }
 
@@ -299,7 +299,7 @@ int exec_module(FAR const struct binary_s *binp)
   ret = up_addrenv_restore(&oldenv);
   if (ret < 0)
     {
-      bdbg("ERROR: up_addrenv_select() failed: %d\n", ret);
+      berr("ERROR: up_addrenv_select() failed: %d\n", ret);
       errcode = -ret;
       goto errout_with_tcbinit;
     }
@@ -323,7 +323,7 @@ errout_with_tcb:
 
 errout:
   set_errno(errcode);
-  bdbg("returning errno: %d\n", errcode);
+  berr("returning errno: %d\n", errcode);
   return ERROR;
 }
 
diff --git a/binfmt/binfmt_loadmodule.c b/binfmt/binfmt_loadmodule.c
index c8b319f685..9cd80a8f42 100644
--- a/binfmt/binfmt_loadmodule.c
+++ b/binfmt/binfmt_loadmodule.c
@@ -91,7 +91,7 @@ static int load_default_priority(FAR struct binary_s *bin)
   ret = sched_getparam(0, ¶m);
   if (ret < 0)
     {
-      bdbg("ERROR: sched_getparam failed: %d\n", get_errno());
+      berr("ERROR: sched_getparam failed: %d\n", get_errno());
       return ERROR;
     }
 
@@ -262,7 +262,7 @@ int load_module(FAR struct binary_s *bin)
 
   if (ret < 0)
     {
-      bdbg("ERROR: Returning errno %d\n", -ret);
+      berr("ERROR: Returning errno %d\n", -ret);
       set_errno(-ret);
       return ERROR;
     }
diff --git a/binfmt/binfmt_unloadmodule.c b/binfmt/binfmt_unloadmodule.c
index 05e459d658..25b9cef121 100644
--- a/binfmt/binfmt_unloadmodule.c
+++ b/binfmt/binfmt_unloadmodule.c
@@ -99,7 +99,7 @@ static inline int exec_dtors(FAR struct binary_s *binp)
   ret = up_addrenv_select(&binp->addrenv, &oldenv);
   if (ret < 0)
     {
-      bdbg("ERROR: up_addrenv_select() failed: %d\n", ret);
+      berr("ERROR: up_addrenv_select() failed: %d\n", ret);
       return ret;
     }
 #endif
@@ -161,7 +161,7 @@ int unload_module(FAR struct binary_s *binp)
           ret = binp->unload(binp);
           if (ret < 0)
             {
-              bdbg("binp->unload() failed: %d\n", ret);
+              berr("binp->unload() failed: %d\n", ret);
               set_errno(-ret);
               return ERROR;
             }
@@ -173,7 +173,7 @@ int unload_module(FAR struct binary_s *binp)
       ret = exec_dtors(binp);
       if (ret < 0)
         {
-          bdbg("exec_ctors() failed: %d\n", ret);
+          berr("exec_ctors() failed: %d\n", ret);
           set_errno(-ret);
           return ERROR;
         }
diff --git a/binfmt/builtin.c b/binfmt/builtin.c
index 695be24ef5..88ad846c7f 100644
--- a/binfmt/builtin.c
+++ b/binfmt/builtin.c
@@ -103,7 +103,7 @@ static int builtin_loadbinary(struct binary_s *binp)
   if (fd < 0)
     {
       int errval = get_errno();
-      bdbg("ERROR: Failed to open binary %s: %d\n", binp->filename, errval);
+      berr("ERROR: Failed to open binary %s: %d\n", binp->filename, errval);
       return -errval;
     }
 
@@ -115,7 +115,7 @@ static int builtin_loadbinary(struct binary_s *binp)
   if (ret < 0)
     {
       int errval = get_errno();
-      bdbg("ERROR: FIOC_FILENAME ioctl failed: %d\n", errval);
+      berr("ERROR: FIOC_FILENAME ioctl failed: %d\n", errval);
       close(fd);
       return -errval;
     }
@@ -128,7 +128,7 @@ static int builtin_loadbinary(struct binary_s *binp)
   if (index < 0)
     {
       int errval = get_errno();
-      bdbg("ERROR: %s is not a builtin application\n", filename);
+      berr("ERROR: %s is not a builtin application\n", filename);
       close(fd);
       return -errval;
 
@@ -176,7 +176,7 @@ int builtin_initialize(void)
   ret = register_binfmt(&g_builtin_binfmt);
   if (ret != 0)
     {
-      bdbg("Failed to register binfmt: %d\n", ret);
+      berr("Failed to register binfmt: %d\n", ret);
     }
 
   return ret;
diff --git a/binfmt/elf.c b/binfmt/elf.c
index ab08515dd9..37b1e117cd 100644
--- a/binfmt/elf.c
+++ b/binfmt/elf.c
@@ -115,58 +115,58 @@ static void elf_dumploadinfo(FAR struct elf_loadinfo_s *loadinfo)
 {
   int i;
 
-  bdbg("LOAD_INFO:\n");
-  bdbg("  textalloc:    %08lx\n", (long)loadinfo->textalloc);
-  bdbg("  dataalloc:    %08lx\n", (long)loadinfo->dataalloc);
-  bdbg("  textsize:     %ld\n",   (long)loadinfo->textsize);
-  bdbg("  datasize:     %ld\n",   (long)loadinfo->datasize);
-  bdbg("  filelen:      %ld\n",   (long)loadinfo->filelen);
+  berr("LOAD_INFO:\n");
+  berr("  textalloc:    %08lx\n", (long)loadinfo->textalloc);
+  berr("  dataalloc:    %08lx\n", (long)loadinfo->dataalloc);
+  berr("  textsize:     %ld\n",   (long)loadinfo->textsize);
+  berr("  datasize:     %ld\n",   (long)loadinfo->datasize);
+  berr("  filelen:      %ld\n",   (long)loadinfo->filelen);
 #ifdef CONFIG_BINFMT_CONSTRUCTORS
-  bdbg("  ctoralloc:    %08lx\n", (long)loadinfo->ctoralloc);
-  bdbg("  ctors:        %08lx\n", (long)loadinfo->ctors);
-  bdbg("  nctors:       %d\n",    loadinfo->nctors);
-  bdbg("  dtoralloc:    %08lx\n", (long)loadinfo->dtoralloc);
-  bdbg("  dtors:        %08lx\n", (long)loadinfo->dtors);
-  bdbg("  ndtors:       %d\n",    loadinfo->ndtors);
+  berr("  ctoralloc:    %08lx\n", (long)loadinfo->ctoralloc);
+  berr("  ctors:        %08lx\n", (long)loadinfo->ctors);
+  berr("  nctors:       %d\n",    loadinfo->nctors);
+  berr("  dtoralloc:    %08lx\n", (long)loadinfo->dtoralloc);
+  berr("  dtors:        %08lx\n", (long)loadinfo->dtors);
+  berr("  ndtors:       %d\n",    loadinfo->ndtors);
 #endif
-  bdbg("  filfd:        %d\n",    loadinfo->filfd);
-  bdbg("  symtabidx:    %d\n",    loadinfo->symtabidx);
-  bdbg("  strtabidx:    %d\n",    loadinfo->strtabidx);
+  berr("  filfd:        %d\n",    loadinfo->filfd);
+  berr("  symtabidx:    %d\n",    loadinfo->symtabidx);
+  berr("  strtabidx:    %d\n",    loadinfo->strtabidx);
 
-  bdbg("ELF Header:\n");
-  bdbg("  e_ident:      %02x %02x %02x %02x\n",
+  berr("ELF Header:\n");
+  berr("  e_ident:      %02x %02x %02x %02x\n",
     loadinfo->ehdr.e_ident[0], loadinfo->ehdr.e_ident[1],
     loadinfo->ehdr.e_ident[2], loadinfo->ehdr.e_ident[3]);
-  bdbg("  e_type:       %04x\n",  loadinfo->ehdr.e_type);
-  bdbg("  e_machine:    %04x\n",  loadinfo->ehdr.e_machine);
-  bdbg("  e_version:    %08x\n",  loadinfo->ehdr.e_version);
-  bdbg("  e_entry:      %08lx\n", (long)loadinfo->ehdr.e_entry);
-  bdbg("  e_phoff:      %d\n",    loadinfo->ehdr.e_phoff);
-  bdbg("  e_shoff:      %d\n",    loadinfo->ehdr.e_shoff);
-  bdbg("  e_flags:      %08x\n" , loadinfo->ehdr.e_flags);
-  bdbg("  e_ehsize:     %d\n",    loadinfo->ehdr.e_ehsize);
-  bdbg("  e_phentsize:  %d\n",    loadinfo->ehdr.e_phentsize);
-  bdbg("  e_phnum:      %d\n",    loadinfo->ehdr.e_phnum);
-  bdbg("  e_shentsize:  %d\n",    loadinfo->ehdr.e_shentsize);
-  bdbg("  e_shnum:      %d\n",    loadinfo->ehdr.e_shnum);
-  bdbg("  e_shstrndx:   %d\n",    loadinfo->ehdr.e_shstrndx);
+  berr("  e_type:       %04x\n",  loadinfo->ehdr.e_type);
+  berr("  e_machine:    %04x\n",  loadinfo->ehdr.e_machine);
+  berr("  e_version:    %08x\n",  loadinfo->ehdr.e_version);
+  berr("  e_entry:      %08lx\n", (long)loadinfo->ehdr.e_entry);
+  berr("  e_phoff:      %d\n",    loadinfo->ehdr.e_phoff);
+  berr("  e_shoff:      %d\n",    loadinfo->ehdr.e_shoff);
+  berr("  e_flags:      %08x\n" , loadinfo->ehdr.e_flags);
+  berr("  e_ehsize:     %d\n",    loadinfo->ehdr.e_ehsize);
+  berr("  e_phentsize:  %d\n",    loadinfo->ehdr.e_phentsize);
+  berr("  e_phnum:      %d\n",    loadinfo->ehdr.e_phnum);
+  berr("  e_shentsize:  %d\n",    loadinfo->ehdr.e_shentsize);
+  berr("  e_shnum:      %d\n",    loadinfo->ehdr.e_shnum);
+  berr("  e_shstrndx:   %d\n",    loadinfo->ehdr.e_shstrndx);
 
   if (loadinfo->shdr && loadinfo->ehdr.e_shnum > 0)
     {
       for (i = 0; i < loadinfo->ehdr.e_shnum; i++)
         {
           FAR Elf32_Shdr *shdr = &loadinfo->shdr[i];
-          bdbg("Sections %d:\n", i);
-          bdbg("  sh_name:      %08x\n", shdr->sh_name);
-          bdbg("  sh_type:      %08x\n", shdr->sh_type);
-          bdbg("  sh_flags:     %08x\n", shdr->sh_flags);
-          bdbg("  sh_addr:      %08x\n", shdr->sh_addr);
-          bdbg("  sh_offset:    %d\n",   shdr->sh_offset);
-          bdbg("  sh_size:      %d\n",   shdr->sh_size);
-          bdbg("  sh_link:      %d\n",   shdr->sh_link);
-          bdbg("  sh_info:      %d\n",   shdr->sh_info);
-          bdbg("  sh_addralign: %d\n",   shdr->sh_addralign);
-          bdbg("  sh_entsize:   %d\n",   shdr->sh_entsize);
+          berr("Sections %d:\n", i);
+          berr("  sh_name:      %08x\n", shdr->sh_name);
+          berr("  sh_type:      %08x\n", shdr->sh_type);
+          berr("  sh_flags:     %08x\n", shdr->sh_flags);
+          berr("  sh_addr:      %08x\n", shdr->sh_addr);
+          berr("  sh_offset:    %d\n",   shdr->sh_offset);
+          berr("  sh_size:      %d\n",   shdr->sh_size);
+          berr("  sh_link:      %d\n",   shdr->sh_link);
+          berr("  sh_info:      %d\n",   shdr->sh_info);
+          berr("  sh_addralign: %d\n",   shdr->sh_addralign);
+          berr("  sh_entsize:   %d\n",   shdr->sh_entsize);
         }
     }
 }
@@ -193,7 +193,7 @@ static void elf_dumpentrypt(FAR struct binary_s *binp,
   ret = elf_addrenv_select(loadinfo);
   if (ret < 0)
     {
-      bdbg("ERROR: elf_addrenv_select() failed: %d\n", ret);
+      berr("ERROR: elf_addrenv_select() failed: %d\n", ret);
       return;
     }
 #endif
@@ -207,7 +207,7 @@ static void elf_dumpentrypt(FAR struct binary_s *binp,
   ret = elf_addrenv_restore(loadinfo);
   if (ret < 0)
     {
-      bdbg("ERROR: elf_addrenv_restore() failed: %d\n", ret);
+      berr("ERROR: elf_addrenv_restore() failed: %d\n", ret);
     }
 #endif
 }
@@ -237,7 +237,7 @@ static int elf_loadbinary(FAR struct binary_s *binp)
   elf_dumploadinfo(&loadinfo);
   if (ret != 0)
     {
-      bdbg("Failed to initialize for load of ELF program: %d\n", ret);
+      berr("Failed to initialize for load of ELF program: %d\n", ret);
       goto errout;
     }
 
@@ -247,7 +247,7 @@ static int elf_loadbinary(FAR struct binary_s *binp)
   elf_dumploadinfo(&loadinfo);
   if (ret != 0)
     {
-      bdbg("Failed to load ELF program binary: %d\n", ret);
+      berr("Failed to load ELF program binary: %d\n", ret);
       goto errout_with_init;
     }
 
@@ -256,7 +256,7 @@ static int elf_loadbinary(FAR struct binary_s *binp)
   ret = elf_bind(&loadinfo, binp->exports, binp->nexports);
   if (ret != 0)
     {
-      bdbg("Failed to bind symbols program binary: %d\n", ret);
+      berr("Failed to bind symbols program binary: %d\n", ret);
       goto errout_with_load;
     }
 
@@ -343,7 +343,7 @@ int elf_initialize(void)
   ret = register_binfmt(&g_elfbinfmt);
   if (ret != 0)
     {
-      bdbg("Failed to register binfmt: %d\n", ret);
+      berr("Failed to register binfmt: %d\n", ret);
     }
 
   return ret;
diff --git a/binfmt/libelf/libelf_addrenv.c b/binfmt/libelf/libelf_addrenv.c
index 3c01279b2c..5e358f58e4 100644
--- a/binfmt/libelf/libelf_addrenv.c
+++ b/binfmt/libelf/libelf_addrenv.c
@@ -101,7 +101,7 @@ int elf_addrenv_alloc(FAR struct elf_loadinfo_s *loadinfo, size_t textsize,
   ret = up_addrenv_create(textsize, datasize, heapsize, &loadinfo->addrenv);
   if (ret < 0)
     {
-      bdbg("ERROR: up_addrenv_create failed: %d\n", ret);
+      berr("ERROR: up_addrenv_create failed: %d\n", ret);
       return ret;
     }
 
@@ -114,14 +114,14 @@ int elf_addrenv_alloc(FAR struct elf_loadinfo_s *loadinfo, size_t textsize,
   ret = up_addrenv_vtext(&loadinfo->addrenv, &vtext);
   if (ret < 0)
     {
-      bdbg("ERROR: up_addrenv_vtext failed: %d\n", ret);
+      berr("ERROR: up_addrenv_vtext failed: %d\n", ret);
       return ret;
     }
 
   ret = up_addrenv_vdata(&loadinfo->addrenv, textsize, &vdata);
   if (ret < 0)
     {
-      bdbg("ERROR: up_adup_addrenv_vdatadrenv_vtext failed: %d\n", ret);
+      berr("ERROR: up_adup_addrenv_vdatadrenv_vtext failed: %d\n", ret);
       return ret;
     }
 
@@ -170,7 +170,7 @@ void elf_addrenv_free(FAR struct elf_loadinfo_s *loadinfo)
   ret = up_addrenv_destroy(&loadinfo->addrenv);
   if (ret < 0)
     {
-      bdbg("ERROR: up_addrenv_destroy failed: %d\n", ret);
+      berr("ERROR: up_addrenv_destroy failed: %d\n", ret);
     }
 #else
   /* If there is an allocation for the ELF image, free it */
diff --git a/binfmt/libelf/libelf_bind.c b/binfmt/libelf/libelf_bind.c
index 009e17c7df..5239f0523c 100644
--- a/binfmt/libelf/libelf_bind.c
+++ b/binfmt/libelf/libelf_bind.c
@@ -103,7 +103,7 @@ static inline int elf_readrel(FAR struct elf_loadinfo_s *loadinfo,
 
   if (index < 0 || index > (relsec->sh_size / sizeof(Elf32_Rel)))
     {
-      bdbg("Bad relocation symbol index: %d\n", index);
+      berr("Bad relocation symbol index: %d\n", index);
       return -EINVAL;
     }
 
@@ -156,7 +156,7 @@ static int elf_relocate(FAR struct elf_loadinfo_s *loadinfo, int relidx,
       ret = elf_readrel(loadinfo, relsec, i, &rel);
       if (ret < 0)
         {
-          bdbg("Section %d reloc %d: Failed to read relocation entry: %d\n",
+          berr("Section %d reloc %d: Failed to read relocation entry: %d\n",
                relidx, i, ret);
           return ret;
         }
@@ -172,7 +172,7 @@ static int elf_relocate(FAR struct elf_loadinfo_s *loadinfo, int relidx,
       ret = elf_readsym(loadinfo, symidx, &sym);
       if (ret < 0)
         {
-          bdbg("Section %d reloc %d: Failed to read symbol[%d]: %d\n",
+          berr("Section %d reloc %d: Failed to read symbol[%d]: %d\n",
                relidx, i, symidx, ret);
           return ret;
         }
@@ -194,13 +194,13 @@ static int elf_relocate(FAR struct elf_loadinfo_s *loadinfo, int relidx,
 
           if (ret == -ESRCH)
             {
-              bdbg("Section %d reloc %d: Undefined symbol[%d] has no name: %d\n",
+              berr("Section %d reloc %d: Undefined symbol[%d] has no name: %d\n",
                   relidx, i, symidx, ret);
               psym = NULL;
             }
           else
             {
-              bdbg("Section %d reloc %d: Failed to get value of symbol[%d]: %d\n",
+              berr("Section %d reloc %d: Failed to get value of symbol[%d]: %d\n",
                   relidx, i, symidx, ret);
               return ret;
             }
@@ -210,7 +210,7 @@ static int elf_relocate(FAR struct elf_loadinfo_s *loadinfo, int relidx,
 
       if (rel.r_offset < 0 || rel.r_offset > dstsec->sh_size - sizeof(uint32_t))
         {
-          bdbg("Section %d reloc %d: Relocation address out of range, offset %d size %d\n",
+          berr("Section %d reloc %d: Relocation address out of range, offset %d size %d\n",
                relidx, i, rel.r_offset, dstsec->sh_size);
           return -EINVAL;
         }
@@ -222,7 +222,7 @@ static int elf_relocate(FAR struct elf_loadinfo_s *loadinfo, int relidx,
       ret = up_relocate(&rel, psym, addr);
       if (ret < 0)
         {
-          bdbg("ERROR: Section %d reloc %d: Relocation failed: %d\n", relidx, i, ret);
+          berr("ERROR: Section %d reloc %d: Relocation failed: %d\n", relidx, i, ret);
           return ret;
         }
     }
@@ -233,7 +233,7 @@ static int elf_relocate(FAR struct elf_loadinfo_s *loadinfo, int relidx,
 static int elf_relocateadd(FAR struct elf_loadinfo_s *loadinfo, int relidx,
                            FAR const struct symtab_s *exports, int nexports)
 {
-  bdbg("Not implemented\n");
+  berr("Not implemented\n");
   return -ENOSYS;
 }
 
@@ -278,7 +278,7 @@ int elf_bind(FAR struct elf_loadinfo_s *loadinfo,
   ret = elf_allocbuffer(loadinfo);
   if (ret < 0)
     {
-      bdbg("elf_allocbuffer failed: %d\n", ret);
+      berr("elf_allocbuffer failed: %d\n", ret);
       return -ENOMEM;
     }
 
@@ -291,7 +291,7 @@ int elf_bind(FAR struct elf_loadinfo_s *loadinfo,
   ret = elf_addrenv_select(loadinfo);
   if (ret < 0)
     {
-      bdbg("ERROR: elf_addrenv_select() failed: %d\n", ret);
+      berr("ERROR: elf_addrenv_select() failed: %d\n", ret);
       return ret;
     }
 #endif
@@ -352,7 +352,7 @@ int elf_bind(FAR struct elf_loadinfo_s *loadinfo,
   status = elf_addrenv_restore(loadinfo);
   if (status < 0)
     {
-      bdbg("ERROR: elf_addrenv_restore() failed: %d\n", status);
+      berr("ERROR: elf_addrenv_restore() failed: %d\n", status);
       if (ret == OK)
         {
           ret = status;
diff --git a/binfmt/libelf/libelf_ctors.c b/binfmt/libelf/libelf_ctors.c
index 7d7a872027..b957038bc3 100644
--- a/binfmt/libelf/libelf_ctors.c
+++ b/binfmt/libelf/libelf_ctors.c
@@ -103,7 +103,7 @@ int elf_loadctors(FAR struct elf_loadinfo_s *loadinfo)
   ret = elf_allocbuffer(loadinfo);
   if (ret < 0)
     {
-      bdbg("elf_allocbuffer failed: %d\n", ret);
+      berr("elf_allocbuffer failed: %d\n", ret);
       return -ENOMEM;
     }
 
@@ -166,7 +166,7 @@ int elf_loadctors(FAR struct elf_loadinfo_s *loadinfo)
           loadinfo->ctoralloc = (binfmt_ctor_t *)kumm_malloc(ctorsize);
           if (!loadinfo->ctoralloc)
             {
-              bdbg("Failed to allocate memory for .ctors\n");
+              berr("Failed to allocate memory for .ctors\n");
               return -ENOMEM;
             }
 
@@ -178,7 +178,7 @@ int elf_loadctors(FAR struct elf_loadinfo_s *loadinfo)
                          shdr->sh_offset);
           if (ret < 0)
             {
-              bdbg("Failed to allocate .ctors: %d\n", ret);
+              berr("Failed to allocate .ctors: %d\n", ret);
               return ret;
             }
 
diff --git a/binfmt/libelf/libelf_dtors.c b/binfmt/libelf/libelf_dtors.c
index 75a6264b3c..6d0b0cff1a 100644
--- a/binfmt/libelf/libelf_dtors.c
+++ b/binfmt/libelf/libelf_dtors.c
@@ -103,7 +103,7 @@ int elf_loaddtors(FAR struct elf_loadinfo_s *loadinfo)
   ret = elf_allocbuffer(loadinfo);
   if (ret < 0)
     {
-      bdbg("elf_allocbuffer failed: %d\n", ret);
+      berr("elf_allocbuffer failed: %d\n", ret);
       return -ENOMEM;
     }
 
@@ -166,7 +166,7 @@ int elf_loaddtors(FAR struct elf_loadinfo_s *loadinfo)
           loadinfo->ctoralloc = (binfmt_dtor_t *)kumm_malloc(dtorsize);
           if (!loadinfo->ctoralloc)
             {
-              bdbg("Failed to allocate memory for .dtors\n");
+              berr("Failed to allocate memory for .dtors\n");
               return -ENOMEM;
             }
 
@@ -178,7 +178,7 @@ int elf_loaddtors(FAR struct elf_loadinfo_s *loadinfo)
                          shdr->sh_offset);
           if (ret < 0)
             {
-              bdbg("Failed to allocate .dtors: %d\n", ret);
+              berr("Failed to allocate .dtors: %d\n", ret);
               return ret;
             }
 
diff --git a/binfmt/libelf/libelf_init.c b/binfmt/libelf/libelf_init.c
index 9efa1e4b2c..7307261df6 100644
--- a/binfmt/libelf/libelf_init.c
+++ b/binfmt/libelf/libelf_init.c
@@ -102,7 +102,7 @@ static inline int elf_filelen(FAR struct elf_loadinfo_s *loadinfo,
   if (ret < 0)
     {
       int errval = errno;
-      bdbg("Failed to stat file: %d\n", errval);
+      berr("Failed to stat file: %d\n", errval);
       return -errval;
     }
 
@@ -110,7 +110,7 @@ static inline int elf_filelen(FAR struct elf_loadinfo_s *loadinfo,
 
   if (!S_ISREG(buf.st_mode))
     {
-      bdbg("Not a regular file.  mode: %d\n", buf.st_mode);
+      berr("Not a regular file.  mode: %d\n", buf.st_mode);
       return -ENOENT;
     }
 
@@ -156,7 +156,7 @@ int elf_init(FAR const char *filename, FAR struct elf_loadinfo_s *loadinfo)
   ret = elf_filelen(loadinfo, filename);
   if (ret < 0)
     {
-      bdbg("elf_filelen failed: %d\n", ret);
+      berr("elf_filelen failed: %d\n", ret);
       return ret;
     }
 
@@ -166,7 +166,7 @@ int elf_init(FAR const char *filename, FAR struct elf_loadinfo_s *loadinfo)
   if (loadinfo->filfd < 0)
     {
       int errval = errno;
-      bdbg("Failed to open ELF binary %s: %d\n", filename, errval);
+      berr("Failed to open ELF binary %s: %d\n", filename, errval);
       return -errval;
     }
 
@@ -175,7 +175,7 @@ int elf_init(FAR const char *filename, FAR struct elf_loadinfo_s *loadinfo)
   ret = elf_read(loadinfo, (FAR uint8_t *)&loadinfo->ehdr, sizeof(Elf32_Ehdr), 0);
   if (ret < 0)
     {
-      bdbg("Failed to read ELF header: %d\n", ret);
+      berr("Failed to read ELF header: %d\n", ret);
       return ret;
     }
 
@@ -193,7 +193,7 @@ int elf_init(FAR const char *filename, FAR struct elf_loadinfo_s *loadinfo)
        * is not correctly formed.
        */
 
-      bdbg("Bad ELF header: %d\n", ret);
+      berr("Bad ELF header: %d\n", ret);
       return ret;
     }
 
diff --git a/binfmt/libelf/libelf_iobuffer.c b/binfmt/libelf/libelf_iobuffer.c
index 6e97781a37..29abb492de 100644
--- a/binfmt/libelf/libelf_iobuffer.c
+++ b/binfmt/libelf/libelf_iobuffer.c
@@ -87,7 +87,7 @@ int elf_allocbuffer(FAR struct elf_loadinfo_s *loadinfo)
       loadinfo->iobuffer = (FAR uint8_t *)kmm_malloc(CONFIG_ELF_BUFFERSIZE);
       if (!loadinfo->iobuffer)
         {
-          bdbg("Failed to allocate an I/O buffer\n");
+          berr("Failed to allocate an I/O buffer\n");
           return -ENOMEM;
         }
 
@@ -123,7 +123,7 @@ int elf_reallocbuffer(FAR struct elf_loadinfo_s *loadinfo, size_t increment)
    buffer = kmm_realloc((FAR void *)loadinfo->iobuffer, newsize);
    if (!buffer)
     {
-      bdbg("Failed to reallocate the I/O buffer\n");
+      berr("Failed to reallocate the I/O buffer\n");
       return -ENOMEM;
     }
 
diff --git a/binfmt/libelf/libelf_load.c b/binfmt/libelf/libelf_load.c
index e8f19766ee..5b589323f0 100644
--- a/binfmt/libelf/libelf_load.c
+++ b/binfmt/libelf/libelf_load.c
@@ -196,7 +196,7 @@ static inline int elf_loadfile(FAR struct elf_loadinfo_s *loadinfo)
           ret = elf_read(loadinfo, *pptr, shdr->sh_size, shdr->sh_offset);
           if (ret < 0)
             {
-              bdbg("ERROR: Failed to read section %d: %d\n", i, ret);
+              berr("ERROR: Failed to read section %d: %d\n", i, ret);
               return ret;
             }
         }
@@ -258,7 +258,7 @@ int elf_load(FAR struct elf_loadinfo_s *loadinfo)
   ret = elf_loadshdrs(loadinfo);
   if (ret < 0)
     {
-      bdbg("ERROR: elf_loadshdrs failed: %d\n", ret);
+      berr("ERROR: elf_loadshdrs failed: %d\n", ret);
       goto errout_with_buffers;
     }
 
@@ -286,7 +286,7 @@ int elf_load(FAR struct elf_loadinfo_s *loadinfo)
   ret = elf_addrenv_alloc(loadinfo, loadinfo->textsize, loadinfo->datasize, heapsize);
   if (ret < 0)
     {
-      bdbg("ERROR: elf_addrenv_alloc() failed: %d\n", ret);
+      berr("ERROR: elf_addrenv_alloc() failed: %d\n", ret);
       goto errout_with_buffers;
     }
 
@@ -299,7 +299,7 @@ int elf_load(FAR struct elf_loadinfo_s *loadinfo)
   ret = elf_addrenv_select(loadinfo);
   if (ret < 0)
     {
-      bdbg("ERROR: elf_addrenv_select() failed: %d\n", ret);
+      berr("ERROR: elf_addrenv_select() failed: %d\n", ret);
       goto errout_with_buffers;
     }
 #endif
@@ -309,7 +309,7 @@ int elf_load(FAR struct elf_loadinfo_s *loadinfo)
   ret = elf_loadfile(loadinfo);
   if (ret < 0)
     {
-      bdbg("ERROR: elf_loadfile failed: %d\n", ret);
+      berr("ERROR: elf_loadfile failed: %d\n", ret);
       goto errout_with_addrenv;
     }
 
@@ -319,14 +319,14 @@ int elf_load(FAR struct elf_loadinfo_s *loadinfo)
   ret = elf_loadctors(loadinfo);
   if (ret < 0)
     {
-      bdbg("ERROR: elf_loadctors failed: %d\n", ret);
+      berr("ERROR: elf_loadctors failed: %d\n", ret);
       goto errout_with_addrenv;
     }
 
   ret = elf_loaddtors(loadinfo);
   if (ret < 0)
     {
-      bdbg("ERROR: elf_loaddtors failed: %d\n", ret);
+      berr("ERROR: elf_loaddtors failed: %d\n", ret);
       goto errout_with_addrenv;
     }
 #endif
@@ -349,7 +349,7 @@ int elf_load(FAR struct elf_loadinfo_s *loadinfo)
   ret = elf_addrenv_restore(loadinfo);
   if (ret < 0)
     {
-      bdbg("ERROR: elf_addrenv_restore() failed: %d\n", ret);
+      berr("ERROR: elf_addrenv_restore() failed: %d\n", ret);
       goto errout_with_buffers;
     }
 #endif
diff --git a/binfmt/libelf/libelf_read.c b/binfmt/libelf/libelf_read.c
index d0b801768b..cdadf4444e 100644
--- a/binfmt/libelf/libelf_read.c
+++ b/binfmt/libelf/libelf_read.c
@@ -127,7 +127,7 @@ int elf_read(FAR struct elf_loadinfo_s *loadinfo, FAR uint8_t *buffer,
       if (rpos != offset)
         {
           int errval = errno;
-          bdbg("Failed to seek to position %lu: %d\n",
+          berr("Failed to seek to position %lu: %d\n",
                (unsigned long)offset, errval);
           return -errval;
         }
@@ -143,14 +143,14 @@ int elf_read(FAR struct elf_loadinfo_s *loadinfo, FAR uint8_t *buffer,
 
            if (errval != EINTR)
              {
-               bdbg("Read from offset %lu failed: %d\n",
+               berr("Read from offset %lu failed: %d\n",
                     (unsigned long)offset, errval);
                return -errval;
              }
          }
        else if (nbytes == 0)
          {
-           bdbg("Unexpected end of file\n");
+           berr("Unexpected end of file\n");
            return -ENODATA;
          }
        else
diff --git a/binfmt/libelf/libelf_sections.c b/binfmt/libelf/libelf_sections.c
index a34bac2eb8..8f4369d367 100644
--- a/binfmt/libelf/libelf_sections.c
+++ b/binfmt/libelf/libelf_sections.c
@@ -93,7 +93,7 @@ static inline int elf_sectname(FAR struct elf_loadinfo_s *loadinfo,
   shstrndx = loadinfo->ehdr.e_shstrndx;
   if (shstrndx == SHN_UNDEF)
     {
-      bdbg("No section header string table\n");
+      berr("No section header string table\n");
       return -EINVAL;
     }
 
@@ -126,7 +126,7 @@ static inline int elf_sectname(FAR struct elf_loadinfo_s *loadinfo,
         {
           if (loadinfo->filelen <= offset)
             {
-              bdbg("At end of file\n");
+              berr("At end of file\n");
               return -EINVAL;
             }
 
@@ -139,7 +139,7 @@ static inline int elf_sectname(FAR struct elf_loadinfo_s *loadinfo,
       ret = elf_read(loadinfo, buffer, readlen, offset);
       if (ret < 0)
         {
-          bdbg("Failed to read section name\n");
+          berr("Failed to read section name\n");
           return ret;
         }
 
@@ -159,7 +159,7 @@ static inline int elf_sectname(FAR struct elf_loadinfo_s *loadinfo,
       ret = elf_reallocbuffer(loadinfo, CONFIG_ELF_BUFFERINCR);
       if (ret < 0)
         {
-          bdbg("elf_reallocbuffer failed: %d\n", ret);
+          berr("elf_reallocbuffer failed: %d\n", ret);
           return ret;
         }
     }
@@ -196,7 +196,7 @@ int elf_loadshdrs(FAR struct elf_loadinfo_s *loadinfo)
 
   if (loadinfo->ehdr.e_shnum < 1)
     {
-      bdbg("No sections(?)\n");
+      berr("No sections(?)\n");
       return -EINVAL;
     }
 
@@ -205,7 +205,7 @@ int elf_loadshdrs(FAR struct elf_loadinfo_s *loadinfo)
   shdrsize = (size_t)loadinfo->ehdr.e_shentsize * (size_t)loadinfo->ehdr.e_shnum;
   if (loadinfo->ehdr.e_shoff + shdrsize > loadinfo->filelen)
     {
-      bdbg("Insufficent space in file for section header table\n");
+      berr("Insufficent space in file for section header table\n");
       return -ESPIPE;
     }
 
@@ -214,7 +214,7 @@ int elf_loadshdrs(FAR struct elf_loadinfo_s *loadinfo)
   loadinfo->shdr = (FAR FAR Elf32_Shdr *)kmm_malloc(shdrsize);
   if (!loadinfo->shdr)
     {
-      bdbg("Failed to allocate the section header table. Size: %ld\n",
+      berr("Failed to allocate the section header table. Size: %ld\n",
            (long)shdrsize);
       return -ENOMEM;
     }
@@ -225,7 +225,7 @@ int elf_loadshdrs(FAR struct elf_loadinfo_s *loadinfo)
                  loadinfo->ehdr.e_shoff);
   if (ret < 0)
     {
-      bdbg("Failed to read section header table: %d\n", ret);
+      berr("Failed to read section header table: %d\n", ret);
     }
 
   return ret;
@@ -264,7 +264,7 @@ int elf_findsection(FAR struct elf_loadinfo_s *loadinfo,
       ret  = elf_sectname(loadinfo, shdr);
       if (ret < 0)
         {
-          bdbg("elf_sectname failed: %d\n", ret);
+          berr("elf_sectname failed: %d\n", ret);
           return ret;
         }
 
diff --git a/binfmt/libelf/libelf_symbols.c b/binfmt/libelf/libelf_symbols.c
index e63531a085..ba67034e54 100644
--- a/binfmt/libelf/libelf_symbols.c
+++ b/binfmt/libelf/libelf_symbols.c
@@ -97,7 +97,7 @@ static int elf_symname(FAR struct elf_loadinfo_s *loadinfo,
 
   if (sym->st_name == 0)
     {
-      bdbg("Symbol has no name\n");
+      berr("Symbol has no name\n");
       return -ESRCH;
     }
 
@@ -116,7 +116,7 @@ static int elf_symname(FAR struct elf_loadinfo_s *loadinfo,
         {
           if (loadinfo->filelen <= offset)
             {
-              bdbg("At end of file\n");
+              berr("At end of file\n");
               return -EINVAL;
             }
 
@@ -129,7 +129,7 @@ static int elf_symname(FAR struct elf_loadinfo_s *loadinfo,
       ret = elf_read(loadinfo, buffer, readlen, offset);
       if (ret < 0)
         {
-          bdbg("elf_read failed: %d\n", ret);
+          berr("elf_read failed: %d\n", ret);
           return ret;
         }
 
@@ -149,7 +149,7 @@ static int elf_symname(FAR struct elf_loadinfo_s *loadinfo,
       ret = elf_reallocbuffer(loadinfo, CONFIG_ELF_BUFFERINCR);
       if (ret < 0)
         {
-          bdbg("elf_reallocbuffer failed: %d\n", ret);
+          berr("elf_reallocbuffer failed: %d\n", ret);
           return ret;
         }
     }
@@ -195,7 +195,7 @@ int elf_findsymtab(FAR struct elf_loadinfo_s *loadinfo)
 
   if (loadinfo->symtabidx == 0)
     {
-      bdbg("No symbols in ELF file\n");
+      berr("No symbols in ELF file\n");
       return -EINVAL;
     }
 
@@ -229,7 +229,7 @@ int elf_readsym(FAR struct elf_loadinfo_s *loadinfo, int index,
 
   if (index < 0 || index > (symtab->sh_size / sizeof(Elf32_Sym)))
     {
-      bdbg("Bad relocation symbol index: %d\n", index);
+      berr("Bad relocation symbol index: %d\n", index);
       return -EINVAL;
     }
 
@@ -278,7 +278,7 @@ int elf_symvalue(FAR struct elf_loadinfo_s *loadinfo, FAR Elf32_Sym *sym,
       {
         /* NuttX ELF modules should be compiled with -fno-common. */
 
-        bdbg("SHN_COMMON: Re-compile with -fno-common\n");
+        berr("SHN_COMMON: Re-compile with -fno-common\n");
         return -ENOSYS;
       }
 
@@ -303,7 +303,7 @@ int elf_symvalue(FAR struct elf_loadinfo_s *loadinfo, FAR Elf32_Sym *sym,
              * indicate the nameless symbol.
              */
 
-            bdbg("SHN_UNDEF: Failed to get symbol name: %d\n", ret);
+            berr("SHN_UNDEF: Failed to get symbol name: %d\n", ret);
             return ret;
           }
 
@@ -316,7 +316,7 @@ int elf_symvalue(FAR struct elf_loadinfo_s *loadinfo, FAR Elf32_Sym *sym,
 #endif
         if (!symbol)
           {
-            bdbg("SHN_UNDEF: Exported symbol \"%s\" not found\n", loadinfo->iobuffer);
+            berr("SHN_UNDEF: Exported symbol \"%s\" not found\n", loadinfo->iobuffer);
             return -ENOENT;
           }
 
diff --git a/binfmt/libelf/libelf_verify.c b/binfmt/libelf/libelf_verify.c
index 4e79991433..26cb51ae7c 100644
--- a/binfmt/libelf/libelf_verify.c
+++ b/binfmt/libelf/libelf_verify.c
@@ -87,7 +87,7 @@ int elf_verifyheader(FAR const Elf32_Ehdr *ehdr)
 {
   if (!ehdr)
     {
-      bdbg("NULL ELF header!");
+      berr("NULL ELF header!");
       return -ENOEXEC;
     }
 
@@ -104,7 +104,7 @@ int elf_verifyheader(FAR const Elf32_Ehdr *ehdr)
 
   if (ehdr->e_type != ET_REL)
     {
-      bdbg("Not a relocatable file: e_type=%d\n", ehdr->e_type);
+      berr("Not a relocatable file: e_type=%d\n", ehdr->e_type);
       return -EINVAL;
     }
 
@@ -112,7 +112,7 @@ int elf_verifyheader(FAR const Elf32_Ehdr *ehdr)
 
   if (up_checkarch(ehdr))
     {
-      bdbg("Not a supported architecture\n");
+      berr("Not a supported architecture\n");
       return -ENOEXEC;
     }
 
diff --git a/binfmt/libnxflat/libnxflat_addrenv.c b/binfmt/libnxflat/libnxflat_addrenv.c
index 92840dc02d..9ca8add7cc 100644
--- a/binfmt/libnxflat/libnxflat_addrenv.c
+++ b/binfmt/libnxflat/libnxflat_addrenv.c
@@ -103,7 +103,7 @@ int nxflat_addrenv_alloc(FAR struct nxflat_loadinfo_s *loadinfo, size_t envsize)
   dspace = (FAR struct dspace_s *)kmm_malloc(sizeof(struct dspace_s));
   if (dspace == 0)
     {
-      bdbg("ERROR: Failed to allocate DSpace\n");
+      berr("ERROR: Failed to allocate DSpace\n");
       return -ENOMEM;
     }
 
@@ -124,7 +124,7 @@ int nxflat_addrenv_alloc(FAR struct nxflat_loadinfo_s *loadinfo, size_t envsize)
   ret = up_addrenv_create(0, envsize, heapsize, &loadinfo->addrenv);
   if (ret < 0)
     {
-      bdbg("ERROR: up_addrenv_create failed: %d\n", ret);
+      berr("ERROR: up_addrenv_create failed: %d\n", ret);
       goto errout_with_dspace;
     }
 
@@ -137,7 +137,7 @@ int nxflat_addrenv_alloc(FAR struct nxflat_loadinfo_s *loadinfo, size_t envsize)
   ret = up_addrenv_vdata(&loadinfo->addrenv, 0, &vdata);
   if (ret < 0)
     {
-      bdbg("ERROR: up_addrenv_vdata failed: %d\n", ret);
+      berr("ERROR: up_addrenv_vdata failed: %d\n", ret);
       goto errout_with_addrenv;
     }
 
@@ -148,7 +148,7 @@ int nxflat_addrenv_alloc(FAR struct nxflat_loadinfo_s *loadinfo, size_t envsize)
   ret = up_addrenv_select(loadinfo->addrenv, &oldenv);
   if (ret < 0)
     {
-      bdbg("ERROR: up_addrenv_select failed: %d\n", ret);
+      berr("ERROR: up_addrenv_select failed: %d\n", ret);
       goto errout_with_addrenv;
     }
 
@@ -157,7 +157,7 @@ int nxflat_addrenv_alloc(FAR struct nxflat_loadinfo_s *loadinfo, size_t envsize)
   ret = up_addrenv_restore(oldenv);
   if (ret < 0)
     {
-      bdbg("ERROR: up_addrenv_restore failed: %d\n", ret);
+      berr("ERROR: up_addrenv_restore failed: %d\n", ret);
       goto errout_with_addrenv;
     }
 
@@ -227,7 +227,7 @@ void nxflat_addrenv_free(FAR struct nxflat_loadinfo_s *loadinfo)
       ret = up_addrenv_destroy(loadinfo->addrenv);
       if (ret < 0)
         {
-          bdbg("ERROR: up_addrenv_destroy failed: %d\n", ret);
+          berr("ERROR: up_addrenv_destroy failed: %d\n", ret);
         }
 
       loadinfo->addrenv = 0;
diff --git a/binfmt/libnxflat/libnxflat_bind.c b/binfmt/libnxflat/libnxflat_bind.c
index 4239517153..71c3b8d57d 100644
--- a/binfmt/libnxflat/libnxflat_bind.c
+++ b/binfmt/libnxflat/libnxflat_bind.c
@@ -117,7 +117,7 @@ static inline int nxflat_bindrel32i(FAR struct nxflat_loadinfo_s *loadinfo,
     }
   else
     {
-      bdbg("Offset: %08 does not lie in D-Space size: %08x\n",
+      berr("Offset: %08 does not lie in D-Space size: %08x\n",
            offset, loadinfo->dsize);
       return -EINVAL;
     }
@@ -156,7 +156,7 @@ static inline int nxflat_bindrel32d(FAR struct nxflat_loadinfo_s *loadinfo,
     }
   else
     {
-      bdbg("Offset: %08 does not lie in D-Space size: %08x\n",
+      berr("Offset: %08 does not lie in D-Space size: %08x\n",
            offset, loadinfo->dsize);
       return -EINVAL;
     }
@@ -198,7 +198,7 @@ static inline int nxflat_bindrel32id(FAR struct nxflat_loadinfo_s *loadinfo,
     }
   else
     {
-      bdbg("Offset: %08 does not lie in D-Space size: %08x\n",
+      berr("Offset: %08 does not lie in D-Space size: %08x\n",
            offset, loadinfo->dsize);
       return -EINVAL;
     }
@@ -265,7 +265,7 @@ static inline int nxflat_gotrelocs(FAR struct nxflat_loadinfo_s *loadinfo)
   ret = nxflat_addrenv_select(loadinfo);
   if (ret < 0)
     {
-      bdbg("ERROR: nxflat_addrenv_select() failed: %d\n", ret);
+      berr("ERROR: nxflat_addrenv_select() failed: %d\n", ret);
       return ret;
     }
 #endif
@@ -329,7 +329,7 @@ static inline int nxflat_gotrelocs(FAR struct nxflat_loadinfo_s *loadinfo)
 
         default:
           {
-            bdbg("ERROR: Unrecognized relocation type: %d\n", NXFLAT_RELOC_TYPE(reloc.r_info));
+            berr("ERROR: Unrecognized relocation type: %d\n", NXFLAT_RELOC_TYPE(reloc.r_info));
             result = -EINVAL;
           }
           break;
@@ -359,7 +359,7 @@ static inline int nxflat_gotrelocs(FAR struct nxflat_loadinfo_s *loadinfo)
   ret = nxflat_addrenv_restore(loadinfo);
   if (ret < 0)
     {
-      bdbg("ERROR: nxflat_addrenv_restore() failed: %d\n", ret);
+      berr("ERROR: nxflat_addrenv_restore() failed: %d\n", ret);
     }
 #endif
 
@@ -418,7 +418,7 @@ static inline int nxflat_bindimports(FAR struct nxflat_loadinfo_s *loadinfo,
   ret = nxflat_addrenv_select(loadinfo);
   if (ret < 0)
     {
-      bdbg("ERROR: nxflat_addrenv_select() failed: %d\n", ret);
+      berr("ERROR: nxflat_addrenv_select() failed: %d\n", ret);
       return ret;
     }
 #endif
@@ -473,7 +473,7 @@ static inline int nxflat_bindimports(FAR struct nxflat_loadinfo_s *loadinfo,
 #endif
           if (!symbol)
             {
-              bdbg("Exported symbol \"%s\" not found\n", symname);
+              berr("Exported symbol \"%s\" not found\n", symname);
 #ifdef CONFIG_ARCH_ADDRENV
               (void)nxflat_addrenv_restore(loadinfo);
 #endif
@@ -504,7 +504,7 @@ static inline int nxflat_bindimports(FAR struct nxflat_loadinfo_s *loadinfo,
   ret = nxflat_addrenv_restore(loadinfo);
   if (ret < 0)
     {
-      bdbg("ERROR: nxflat_addrenv_restore() failed: %d\n", ret);
+      berr("ERROR: nxflat_addrenv_restore() failed: %d\n", ret);
     }
 
   return ret;
@@ -542,7 +542,7 @@ static inline int nxflat_clearbss(FAR struct nxflat_loadinfo_s *loadinfo)
   ret = nxflat_addrenv_select(loadinfo);
   if (ret < 0)
     {
-      bdbg("ERROR: nxflat_addrenv_select() failed: %d\n", ret);
+      berr("ERROR: nxflat_addrenv_select() failed: %d\n", ret);
       return ret;
     }
 #endif
@@ -558,7 +558,7 @@ static inline int nxflat_clearbss(FAR struct nxflat_loadinfo_s *loadinfo)
   ret = nxflat_addrenv_restore(loadinfo);
   if (ret < 0)
     {
-      bdbg("ERROR: nxflat_addrenv_restore() failed: %d\n", ret);
+      berr("ERROR: nxflat_addrenv_restore() failed: %d\n", ret);
     }
 
   return ret;
diff --git a/binfmt/libnxflat/libnxflat_init.c b/binfmt/libnxflat/libnxflat_init.c
index 826614f2d9..eff6cd8b29 100644
--- a/binfmt/libnxflat/libnxflat_init.c
+++ b/binfmt/libnxflat/libnxflat_init.c
@@ -112,7 +112,7 @@ int nxflat_init(const char *filename, struct nxflat_loadinfo_s *loadinfo)
   if (loadinfo->filfd < 0)
     {
       int errval = errno;
-      bdbg("Failed to open NXFLAT binary %s: %d\n", filename, errval);
+      berr("Failed to open NXFLAT binary %s: %d\n", filename, errval);
       return -errval;
     }
 
@@ -122,7 +122,7 @@ int nxflat_init(const char *filename, struct nxflat_loadinfo_s *loadinfo)
                     sizeof(struct nxflat_hdr_s), 0);
   if (ret < 0)
     {
-      bdbg("Failed to read NXFLAT header: %d\n", ret);
+      berr("Failed to read NXFLAT header: %d\n", ret);
       return ret;
     }
 
@@ -140,7 +140,7 @@ int nxflat_init(const char *filename, struct nxflat_loadinfo_s *loadinfo)
        * done so.
        */
 
-      bdbg("Bad NXFLAT header\n");
+      berr("Bad NXFLAT header\n");
       return -ENOEXEC;
     }
 
diff --git a/binfmt/libnxflat/libnxflat_load.c b/binfmt/libnxflat/libnxflat_load.c
index 8e5dea7062..c849daf7de 100644
--- a/binfmt/libnxflat/libnxflat_load.c
+++ b/binfmt/libnxflat/libnxflat_load.c
@@ -150,7 +150,7 @@ int nxflat_load(struct nxflat_loadinfo_s *loadinfo)
                                     MAP_SHARED | MAP_FILE, loadinfo->filfd, 0);
   if (loadinfo->ispace == (uint32_t)MAP_FAILED)
     {
-      bdbg("Failed to map NXFLAT ISpace: %d\n", errno);
+      berr("Failed to map NXFLAT ISpace: %d\n", errno);
       return -errno;
     }
 
@@ -163,7 +163,7 @@ int nxflat_load(struct nxflat_loadinfo_s *loadinfo)
   ret = nxflat_addrenv_alloc(loadinfo, loadinfo->dsize);
   if (ret < 0)
     {
-      bdbg("ERROR: nxflat_addrenv_alloc() failed: %d\n", ret);
+      berr("ERROR: nxflat_addrenv_alloc() failed: %d\n", ret);
       return ret;
     }
 
@@ -180,7 +180,7 @@ int nxflat_load(struct nxflat_loadinfo_s *loadinfo)
   ret = nxflat_addrenv_select(loadinfo);
   if (ret < 0)
     {
-      bdbg("ERROR: nxflat_addrenv_select() failed: %d\n", ret);
+      berr("ERROR: nxflat_addrenv_select() failed: %d\n", ret);
       return ret;
     }
 #endif
@@ -193,7 +193,7 @@ int nxflat_load(struct nxflat_loadinfo_s *loadinfo)
                     dreadsize, doffset);
   if (ret < 0)
     {
-      bdbg("Failed to read .data section: %d\n", ret);
+      berr("Failed to read .data section: %d\n", ret);
       goto errout;
     }
 
@@ -206,7 +206,7 @@ int nxflat_load(struct nxflat_loadinfo_s *loadinfo)
   ret = nxflat_addrenv_restore(loadinfo);
   if (ret < 0)
     {
-      bdbg("ERROR: nxflat_addrenv_restore() failed: %d\n", ret);
+      berr("ERROR: nxflat_addrenv_restore() failed: %d\n", ret);
       return ret;
     }
 #endif
diff --git a/binfmt/libnxflat/libnxflat_read.c b/binfmt/libnxflat/libnxflat_read.c
index bb3d4b5b16..678dd6d671 100644
--- a/binfmt/libnxflat/libnxflat_read.c
+++ b/binfmt/libnxflat/libnxflat_read.c
@@ -129,7 +129,7 @@ int nxflat_read(struct nxflat_loadinfo_s *loadinfo, char *buffer, int readsize,
       if (rpos != offset)
         {
           int errval = errno;
-          bdbg("Failed to seek to position %d: %d\n", offset, errval);
+          berr("Failed to seek to position %d: %d\n", offset, errval);
           return -errval;
         }
 
@@ -141,13 +141,13 @@ int nxflat_read(struct nxflat_loadinfo_s *loadinfo, char *buffer, int readsize,
            int errval = errno;
            if (errval != EINTR)
              {
-               bdbg("Read from offset %d failed: %d\n", offset, errval);
+               berr("Read from offset %d failed: %d\n", offset, errval);
                return -errval;
              }
          }
        else if (nbytes == 0)
          {
-           bdbg("Unexpected end of file\n");
+           berr("Unexpected end of file\n");
            return -ENODATA;
          }
        else
diff --git a/binfmt/libnxflat/libnxflat_verify.c b/binfmt/libnxflat/libnxflat_verify.c
index e645fdf925..76d8354edf 100644
--- a/binfmt/libnxflat/libnxflat_verify.c
+++ b/binfmt/libnxflat/libnxflat_verify.c
@@ -79,7 +79,7 @@ int nxflat_verifyheader(const struct nxflat_hdr_s *header)
 {
   if (!header)
     {
-      bdbg("NULL NXFLAT header!");
+      berr("NULL NXFLAT header!");
       return -ENOEXEC;
     }
 
@@ -91,7 +91,7 @@ int nxflat_verifyheader(const struct nxflat_hdr_s *header)
 
   if (strncmp(header->h_magic, NXFLAT_MAGIC, 4) != 0)
     {
-      bdbg("Unrecognized magic=\"%c%c%c%c\"\n",
+      berr("Unrecognized magic=\"%c%c%c%c\"\n",
       header->h_magic[0], header->h_magic[1],
       header->h_magic[2], header->h_magic[3]);
       return -ENOEXEC;
diff --git a/binfmt/nxflat.c b/binfmt/nxflat.c
index 1e2eddf3a2..c2f1c06f78 100644
--- a/binfmt/nxflat.c
+++ b/binfmt/nxflat.c
@@ -107,31 +107,31 @@ static void nxflat_dumploadinfo(struct nxflat_loadinfo_s *loadinfo)
 {
   unsigned long dsize = loadinfo->datasize + loadinfo->bsssize;
 
-  bdbg("LOAD_INFO:\n");
-  bdbg("  ISPACE:\n");
-  bdbg("    ispace:       %08lx\n", loadinfo->ispace);
-  bdbg("    entryoffs:    %08lx\n", loadinfo->entryoffs);
-  bdbg("    isize:        %08lx\n", loadinfo->isize);
-
-  bdbg("  DSPACE:\n");
-  bdbg("    dspace:       %08lx\n", loadinfo->dspace);
+  berr("LOAD_INFO:\n");
+  berr("  ISPACE:\n");
+  berr("    ispace:       %08lx\n", loadinfo->ispace);
+  berr("    entryoffs:    %08lx\n", loadinfo->entryoffs);
+  berr("    isize:        %08lx\n", loadinfo->isize);
+
+  berr("  DSPACE:\n");
+  berr("    dspace:       %08lx\n", loadinfo->dspace);
   if (loadinfo->dspace != NULL)
     {
-      bdbg("      crefs:      %d\n",    loadinfo->dspace->crefs);
-      bdbg("      region:     %08lx\n", loadinfo->dspace->region);
+      berr("      crefs:      %d\n",    loadinfo->dspace->crefs);
+      berr("      region:     %08lx\n", loadinfo->dspace->region);
     }
-  bdbg("    datasize:     %08lx\n", loadinfo->datasize);
-  bdbg("    bsssize:      %08lx\n", loadinfo->bsssize);
-  bdbg("      (pad):      %08lx\n", loadinfo->dsize - dsize);
-  bdbg("    stacksize:    %08lx\n", loadinfo->stacksize);
-  bdbg("    dsize:        %08lx\n", loadinfo->dsize);
-
-  bdbg("  RELOCS:\n");
-  bdbg("    relocstart:   %08lx\n", loadinfo->relocstart);
-  bdbg("    reloccount:   %d\n",    loadinfo->reloccount);
-
-  bdbg("  HANDLES:\n");
-  bdbg("    filfd:        %d\n",    loadinfo->filfd);
+  berr("    datasize:     %08lx\n", loadinfo->datasize);
+  berr("    bsssize:      %08lx\n", loadinfo->bsssize);
+  berr("      (pad):      %08lx\n", loadinfo->dsize - dsize);
+  berr("    stacksize:    %08lx\n", loadinfo->stacksize);
+  berr("    dsize:        %08lx\n", loadinfo->dsize);
+
+  berr("  RELOCS:\n");
+  berr("    relocstart:   %08lx\n", loadinfo->relocstart);
+  berr("    reloccount:   %d\n",    loadinfo->reloccount);
+
+  berr("  HANDLES:\n");
+  berr("    filfd:        %d\n",    loadinfo->filfd);
 }
 #else
 # define nxflat_dumploadinfo(i)
@@ -159,7 +159,7 @@ static int nxflat_loadbinary(struct binary_s *binp)
   nxflat_dumploadinfo(&loadinfo);
   if (ret != 0)
     {
-      bdbg("Failed to initialize for load of NXFLAT program: %d\n", ret);
+      berr("Failed to initialize for load of NXFLAT program: %d\n", ret);
       goto errout;
     }
 
@@ -169,7 +169,7 @@ static int nxflat_loadbinary(struct binary_s *binp)
   nxflat_dumploadinfo(&loadinfo);
   if (ret != 0)
     {
-      bdbg("Failed to load NXFLAT program binary: %d\n", ret);
+      berr("Failed to load NXFLAT program binary: %d\n", ret);
       goto errout_with_init;
     }
 
@@ -178,7 +178,7 @@ static int nxflat_loadbinary(struct binary_s *binp)
   ret = nxflat_bind(&loadinfo, binp->exports, binp->nexports);
   if (ret != 0)
     {
-      bdbg("Failed to bind symbols program binary: %d\n", ret);
+      berr("Failed to bind symbols program binary: %d\n", ret);
       goto errout_with_load;
     }
 
@@ -256,7 +256,7 @@ int nxflat_initialize(void)
   ret = register_binfmt(&g_nxflatbinfmt);
   if (ret != 0)
     {
-      bdbg("Failed to register binfmt: %d\n", ret);
+      berr("Failed to register binfmt: %d\n", ret);
     }
   return ret;
 }
diff --git a/binfmt/pcode.c b/binfmt/pcode.c
index 74b42e4ca5..3913d38ed5 100644
--- a/binfmt/pcode.c
+++ b/binfmt/pcode.c
@@ -174,7 +174,7 @@ static int pcode_mount_testfs(void)
                          NSECTORS(ROMFS_IMG_LEN), SECTORSIZE);
   if (ret < 0)
     {
-      bdbg("ERROR: romdisk_register failed: %d\n", ret);
+      berr("ERROR: romdisk_register failed: %d\n", ret);
       return ret;
     }
 
@@ -190,7 +190,7 @@ static int pcode_mount_testfs(void)
       int errval = get_errno();
       DEBUGASSERT(errval > 0);
 
-      bdbg("ERROR: mount(%s,%s,romfs) failed: %d\n",
+      berr("ERROR: mount(%s,%s,romfs) failed: %d\n",
            CONFIG_PCODE_TEST_DEVPATH, CONFIG_PCODE_TEST_MOUNTPOINT, errval);
       return -errval;
     }
@@ -266,7 +266,7 @@ static int pcode_proxy(int argc, char **argv)
   ret = on_exit(pcode_onexit, binp);
   if (ret < 0)
     {
-      bdbg("ERROR: on_exit failed: %d\n", get_errno());
+      berr("ERROR: on_exit failed: %d\n", get_errno());
       kmm_free(fullpath);
       return EXIT_FAILURE;
     }
@@ -283,7 +283,7 @@ static int pcode_proxy(int argc, char **argv)
 
   if (ret < 0)
     {
-      bdbg("ERROR: Execution failed\n");
+      berr("ERROR: Execution failed\n");
       return EXIT_FAILURE;
     }
 
@@ -318,7 +318,7 @@ static int pcode_load(struct binary_s *binp)
   if (fd < 0)
     {
       int errval = get_errno();
-      bdbg("ERROR: Failed to open binary %s: %d\n", binp->filename, errval);
+      berr("ERROR: Failed to open binary %s: %d\n", binp->filename, errval);
       return -errval;
     }
 
@@ -341,12 +341,12 @@ static int pcode_load(struct binary_s *binp)
 
           if (errval != EINTR)
             {
-              bdbg("ERROR: read failed: %d\n", errval);
+              berr("ERROR: read failed: %d\n", errval);
               ret = -errval;
               goto errout_with_fd;
             }
 
-          bdbg("Interrupted by a signal\n");
+          berr("Interrupted by a signal\n");
         }
       else
         {
@@ -366,7 +366,7 @@ static int pcode_load(struct binary_s *binp)
 
   if (memcmp(&hdr.fh_ident, FHI_POFF_MAG, 4) != 0 || hdr.fh_type != FHT_EXEC)
     {
-      dbg("ERROR: File is not a P-code executable: %d\n");
+      err("ERROR: File is not a P-code executable: %d\n");
       ret = -ENOEXEC;
       goto errout_with_fd;
     }
@@ -399,7 +399,7 @@ static int pcode_load(struct binary_s *binp)
   g_pcode_handoff.fullpath = strdup(binp->filename);
   if (!g_pcode_handoff.fullpath)
     {
-      bdbg("ERROR: Failed to duplicate the full path: %d\n",
+      berr("ERROR: Failed to duplicate the full path: %d\n",
            binp->filename);
 
       sem_post(&g_pcode_handoff.exclsem);
@@ -473,7 +473,7 @@ int pcode_initialize(void)
   ret = pcode_mount_testfs();
   if (ret < 0)
     {
-      bdbg("ERROR: Failed to mount test file system: %d\n", ret);
+      berr("ERROR: Failed to mount test file system: %d\n", ret);
       return ret;
     }
 
@@ -484,7 +484,7 @@ int pcode_initialize(void)
   ret = register_binfmt(&g_pcode_binfmt);
   if (ret != 0)
     {
-      bdbg("Failed to register binfmt: %d\n", ret);
+      berr("Failed to register binfmt: %d\n", ret);
     }
 
   return ret;
@@ -513,7 +513,7 @@ void pcode_uninitialize(void)
       int errval = get_errno();
       DEBUGASSERT(errval > 0);
 
-      bdbg("ERROR: unregister_binfmt() failed: %d\n", errval);
+      berr("ERROR: unregister_binfmt() failed: %d\n", errval);
       UNUSED(errval);
     }
 
@@ -524,7 +524,7 @@ void pcode_uninitialize(void)
       int errval = get_errno();
       DEBUGASSERT(errval > 0);
 
-      bdbg("ERROR: umount(%s) failed: %d\n", CONFIG_PCODE_TEST_MOUNTPOINT, errval);
+      berr("ERROR: umount(%s) failed: %d\n", CONFIG_PCODE_TEST_MOUNTPOINT, errval);
       UNUSED(errval);
     }
 #endif
diff --git a/configs/arduino-due/src/sam_autoleds.c b/configs/arduino-due/src/sam_autoleds.c
index f407e86cdd..8fb0ea7104 100644
--- a/configs/arduino-due/src/sam_autoleds.c
+++ b/configs/arduino-due/src/sam_autoleds.c
@@ -100,10 +100,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/arduino-due/src/sam_mmcsd.c b/configs/arduino-due/src/sam_mmcsd.c
index c0437411a9..3edad36db0 100644
--- a/configs/arduino-due/src/sam_mmcsd.c
+++ b/configs/arduino-due/src/sam_mmcsd.c
@@ -259,7 +259,7 @@ int sam_sdinitialize(int minor)
   spi = sam_mmcsd_spiinitialize();
   if (!spi)
     {
-      fdbg("Failed to bit bang SPI for the MMC/SD slot\n");
+      ferr("Failed to bit bang SPI for the MMC/SD slot\n");
       return -ENODEV;
     }
 
@@ -273,7 +273,7 @@ int sam_sdinitialize(int minor)
   ret = mmcsd_spislotinitialize(minor, SAM34_MMCSDSLOTNO, spi);
   if (ret < 0)
     {
-      fdbg("Failed to bind  bit bang SPI device to MMC/SD slot %d: %d\n",
+      ferr("Failed to bind  bit bang SPI device to MMC/SD slot %d: %d\n",
             SAM34_MMCSDSLOTNO, ret);
       return ret;
     }
diff --git a/configs/arduino-due/src/sam_touchscreen.c b/configs/arduino-due/src/sam_touchscreen.c
index 13ea83febe..6f105ff2bf 100644
--- a/configs/arduino-due/src/sam_touchscreen.c
+++ b/configs/arduino-due/src/sam_touchscreen.c
@@ -359,7 +359,7 @@ int board_tsc_setup(int minor)
   static bool initialized = false;
   int ret;
 
-  idbg("minor %d\n", minor);
+  ierr("minor %d\n", minor);
   DEBUGASSERT(minor == 0);
 
   /* Have we already initialized?  Since we never uninitialize we must prevent
@@ -383,7 +383,7 @@ int board_tsc_setup(int minor)
       dev = sam_tsc_spiinitialize();
       if (!dev)
         {
-          idbg("Failed to initialize bit bang SPI\n");
+          ierr("Failed to initialize bit bang SPI\n");
           return -ENODEV;
         }
 
@@ -392,7 +392,7 @@ int board_tsc_setup(int minor)
       ret = ads7843e_register(dev, &g_tscinfo, CONFIG_ADS7843E_DEVMINOR);
       if (ret < 0)
         {
-          idbg("Failed to register touchscreen device\n");
+          ierr("Failed to register touchscreen device\n");
           /* up_spiuninitialize(dev); */
           return -ENODEV;
         }
diff --git a/configs/arduino-due/src/sam_userleds.c b/configs/arduino-due/src/sam_userleds.c
index e41418bf7b..f13ddd40cc 100644
--- a/configs/arduino-due/src/sam_userleds.c
+++ b/configs/arduino-due/src/sam_userleds.c
@@ -60,10 +60,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/cc3200-launchpad/src/cc3200_autoleds.c b/configs/cc3200-launchpad/src/cc3200_autoleds.c
index 6853edc88c..e515b4536a 100644
--- a/configs/cc3200-launchpad/src/cc3200_autoleds.c
+++ b/configs/cc3200-launchpad/src/cc3200_autoleds.c
@@ -92,10 +92,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/cloudctrl/src/stm32_adc.c b/configs/cloudctrl/src/stm32_adc.c
index 9774efba20..ba10061c0b 100644
--- a/configs/cloudctrl/src/stm32_adc.c
+++ b/configs/cloudctrl/src/stm32_adc.c
@@ -146,7 +146,7 @@ int board_adc_setup(void)
       adc = stm32_adcinitialize(1, g_chanlist, ADC1_NCHANNELS);
       if (adc == NULL)
         {
-          adbg("ERROR: Failed to get ADC interface\n");
+          aerr("ERROR: Failed to get ADC interface\n");
           return -ENODEV;
         }
 
@@ -155,7 +155,7 @@ int board_adc_setup(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          adbg("adc_register failed: %d\n", ret);
+          aerr("adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/cloudctrl/src/stm32_autoleds.c b/configs/cloudctrl/src/stm32_autoleds.c
index 11de1e7f21..c0a82e6fbd 100644
--- a/configs/cloudctrl/src/stm32_autoleds.c
+++ b/configs/cloudctrl/src/stm32_autoleds.c
@@ -63,10 +63,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/cloudctrl/src/stm32_spi.c b/configs/cloudctrl/src/stm32_spi.c
index cae199dd0e..5bcfe53763 100644
--- a/configs/cloudctrl/src/stm32_spi.c
+++ b/configs/cloudctrl/src/stm32_spi.c
@@ -65,14 +65,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -141,7 +141,7 @@ void weak_function stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
   /* SPI1 connects to the SD CARD and to the SPI FLASH */
 
@@ -163,7 +163,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
 }
 
diff --git a/configs/cloudctrl/src/stm32_usb.c b/configs/cloudctrl/src/stm32_usb.c
index e711536e91..44b6fd02c6 100644
--- a/configs/cloudctrl/src/stm32_usb.c
+++ b/configs/cloudctrl/src/stm32_usb.c
@@ -185,7 +185,7 @@ int stm32_usbhost_initialize(void)
   ret = usbhost_msc_initialize();
   if (ret != OK)
     {
-      udbg("ERROR: Failed to register the mass storage class\n");
+      uerr("ERROR: Failed to register the mass storage class\n");
     }
 #endif
 
@@ -195,7 +195,7 @@ int stm32_usbhost_initialize(void)
   ret = usbhost_cdcacm_initialize();
   if (ret != OK)
     {
-      udbg("ERROR: Failed to register the CDC/ACM serial class\n");
+      uerr("ERROR: Failed to register the CDC/ACM serial class\n");
     }
 #endif
 
diff --git a/configs/cloudctrl/src/stm32_userleds.c b/configs/cloudctrl/src/stm32_userleds.c
index 4f48929edf..006a62bd45 100644
--- a/configs/cloudctrl/src/stm32_userleds.c
+++ b/configs/cloudctrl/src/stm32_userleds.c
@@ -63,10 +63,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/cloudctrl/src/stm32_w25.c b/configs/cloudctrl/src/stm32_w25.c
index da059d35b9..df43ab8045 100644
--- a/configs/cloudctrl/src/stm32_w25.c
+++ b/configs/cloudctrl/src/stm32_w25.c
@@ -107,7 +107,7 @@ int stm32_w25initialize(int minor)
   spi = stm32_spibus_initialize(1);
   if (!spi)
     {
-      fdbg("ERROR: Failed to initialize SPI port 2\n");
+      ferr("ERROR: Failed to initialize SPI port 2\n");
       return -ENODEV;
     }
 
@@ -116,7 +116,7 @@ int stm32_w25initialize(int minor)
   mtd = w25_initialize(spi);
   if (!mtd)
     {
-      fdbg("ERROR: Failed to bind SPI port 2 to the SST 25 FLASH driver\n");
+      ferr("ERROR: Failed to bind SPI port 2 to the SST 25 FLASH driver\n");
       return -ENODEV;
     }
 
@@ -126,7 +126,7 @@ int stm32_w25initialize(int minor)
   ret = ftl_initialize(minor, mtd);
   if (ret < 0)
     {
-      fdbg("ERROR: Initialize the FTL layer\n");
+      ferr("ERROR: Initialize the FTL layer\n");
       return ret;
     }
 #else
@@ -135,7 +135,7 @@ int stm32_w25initialize(int minor)
   ret = nxffs_initialize(mtd);
   if (ret < 0)
     {
-      fdbg("ERROR: NXFFS initialization failed: %d\n", -ret);
+      ferr("ERROR: NXFFS initialization failed: %d\n", -ret);
       return ret;
     }
 
@@ -145,7 +145,7 @@ int stm32_w25initialize(int minor)
   ret = mount(NULL, devname, "nxffs", 0, NULL);
   if (ret < 0)
     {
-      fdbg("ERROR: Failed to mount the NXFFS volume: %d\n", errno);
+      ferr("ERROR: Failed to mount the NXFFS volume: %d\n", errno);
       return ret;
     }
 #endif
diff --git a/configs/compal_e99/src/ssd1783.c b/configs/compal_e99/src/ssd1783.c
index b858fef0c2..66831938b4 100644
--- a/configs/compal_e99/src/ssd1783.c
+++ b/configs/compal_e99/src/ssd1783.c
@@ -78,9 +78,9 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-# define lcddbg(format, ...)  info(format, ##__VA_ARGS__)
+# define lcderr(format, ...)  info(format, ##__VA_ARGS__)
 #else
-# define lcddbg(x...)
+# define lcderr(x...)
 #endif
 
 /** This should be put elsewhere */
@@ -250,7 +250,7 @@ static void lcd_write_prepare(unsigned int x1, unsigned int x2, unsigned int y1,
     { CMD,  0x5c },                  /* enter write display ram mode */
     { END,  0x00 }
   };
-  dbg("x1:%d, x2:%d, y1:%d, y2:%d\n",x1, x2,y1, y2);
+  err("x1:%d, x2:%d, y1:%d, y2:%d\n",x1, x2,y1, y2);
   fb_ssd1783_send_cmdlist(prepare_disp_write_cmds);
 }
 
diff --git a/configs/demo9s12ne64/src/m9s12_leds.c b/configs/demo9s12ne64/src/m9s12_leds.c
index 167a365bb7..8d11ce1e0e 100644
--- a/configs/demo9s12ne64/src/m9s12_leds.c
+++ b/configs/demo9s12ne64/src/m9s12_leds.c
@@ -55,10 +55,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/demo9s12ne64/src/m9s12_spi.c b/configs/demo9s12ne64/src/m9s12_spi.c
index 7348e30f14..312aebffc7 100644
--- a/configs/demo9s12ne64/src/m9s12_spi.c
+++ b/configs/demo9s12ne64/src/m9s12_spi.c
@@ -60,7 +60,7 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -68,7 +68,7 @@
 #  endif
 #else
 #  undef SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
diff --git a/configs/dk-tm4c129x/src/tm4c_bringup.c b/configs/dk-tm4c129x/src/tm4c_bringup.c
index 72fcac0292..b6ddd0be28 100644
--- a/configs/dk-tm4c129x/src/tm4c_bringup.c
+++ b/configs/dk-tm4c129x/src/tm4c_bringup.c
@@ -86,14 +86,14 @@ static void tm4c_i2c_register(int bus)
   i2c = tiva_i2cbus_initialize(bus);
   if (i2c == NULL)
     {
-      dbg("ERROR: Failed to get I2C%d interface\n", bus);
+      err("ERROR: Failed to get I2C%d interface\n", bus);
     }
   else
     {
       ret = i2c_register(i2c, bus);
       if (ret < 0)
         {
-          dbg("ERROR: Failed to register I2C%d driver: %d\n", bus, ret);
+          err("ERROR: Failed to register I2C%d driver: %d\n", bus, ret);
           tiva_i2cbus_uninitialize(i2c);
         }
     }
@@ -174,7 +174,7 @@ int tm4c_bringup(void)
   ret = tiva_tmp100_initialize(TMP100_DEVNAME);
   if (ret < 0)
     {
-      dbg("ERROR: Failed to initialize TMP100 driver: %d\n", ret);
+      err("ERROR: Failed to initialize TMP100 driver: %d\n", ret);
     }
 #endif
 
@@ -184,7 +184,7 @@ int tm4c_bringup(void)
   ret = tiva_timer_configure();
   if (ret < 0)
     {
-      dbg("ERROR: Failed to initialize timer driver: %d\n", ret);
+      err("ERROR: Failed to initialize timer driver: %d\n", ret);
     }
 #endif
 
diff --git a/configs/dk-tm4c129x/src/tm4c_ssi.c b/configs/dk-tm4c129x/src/tm4c_ssi.c
index 8164b61e20..5eae9d3c87 100644
--- a/configs/dk-tm4c129x/src/tm4c_ssi.c
+++ b/configs/dk-tm4c129x/src/tm4c_ssi.c
@@ -62,9 +62,9 @@
 /* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define ssidbg llerr
+#  define ssierr llerr
 #else
-#  define ssidbg(x...)
+#  define ssierr(x...)
 #endif
 
 /* Dump GPIO registers */
@@ -118,14 +118,14 @@ void weak_function tm4c_ssidev_initialize(void)
 
 void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  ssidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  ssierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   ssi_dumpgpio("tiva_ssiselect() Entry");
   ssi_dumpgpio("tiva_ssiselect() Exit");
 }
 
 uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  ssidbg("Returning SPI_STATUS_PRESENT\n");
+  ssierr("Returning SPI_STATUS_PRESENT\n");
   return SPI_STATUS_PRESENT;
 }
 
diff --git a/configs/dk-tm4c129x/src/tm4c_timer.c b/configs/dk-tm4c129x/src/tm4c_timer.c
index 2249293279..1690fd0ba6 100644
--- a/configs/dk-tm4c129x/src/tm4c_timer.c
+++ b/configs/dk-tm4c129x/src/tm4c_timer.c
@@ -107,7 +107,7 @@ int tiva_timer_configure(void)
   ret = tiva_timer_register(CONFIG_DK_TM4C129X_TIMER_DEVNAME, GPTM, ALTCLK);
   if (ret < 0)
     {
-      timdbg("ERROR: Failed to register timer driver: %d\n", ret);
+      timerr("ERROR: Failed to register timer driver: %d\n", ret);
     }
 
   return ret;
diff --git a/configs/dk-tm4c129x/src/tm4c_userleds.c b/configs/dk-tm4c129x/src/tm4c_userleds.c
index f1d0cc8f59..9ac0b86d8b 100644
--- a/configs/dk-tm4c129x/src/tm4c_userleds.c
+++ b/configs/dk-tm4c129x/src/tm4c_userleds.c
@@ -71,10 +71,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/ea3131/src/lpc31_leds.c b/configs/ea3131/src/lpc31_leds.c
index 82a1c34a61..dcff8610b5 100644
--- a/configs/ea3131/src/lpc31_leds.c
+++ b/configs/ea3131/src/lpc31_leds.c
@@ -60,10 +60,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/ea3131/src/lpc31_spi.c b/configs/ea3131/src/lpc31_spi.c
index c66f53b9ff..e71c7fd974 100644
--- a/configs/ea3131/src/lpc31_spi.c
+++ b/configs/ea3131/src/lpc31_spi.c
@@ -65,7 +65,7 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -73,7 +73,7 @@
 #  endif
 #else
 #  undef SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -127,7 +127,7 @@ void weak_function lpc31_spidev_intialize(void)
 
 void lpc31_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
diff --git a/configs/ea3131/src/lpc31_usbhost.c b/configs/ea3131/src/lpc31_usbhost.c
index 9ab9dd7ffa..a1b86a759f 100644
--- a/configs/ea3131/src/lpc31_usbhost.c
+++ b/configs/ea3131/src/lpc31_usbhost.c
@@ -206,7 +206,7 @@ int lpc31_usbhost_initialize(void)
   ret = usbhost_cdcacm_initialize();
   if (ret != OK)
     {
-      udbg("ERROR: Failed to register the CDC/ACM serial class\n");
+      uerr("ERROR: Failed to register the CDC/ACM serial class\n");
     }
 #endif
 
@@ -216,7 +216,7 @@ int lpc31_usbhost_initialize(void)
   ret = usbhost_kbdinit();
   if (ret != OK)
     {
-      udbg("ERROR: Failed to register the KBD class\n");
+      uerr("ERROR: Failed to register the KBD class\n");
     }
 #endif
 
@@ -225,7 +225,7 @@ int lpc31_usbhost_initialize(void)
   g_ehciconn = lpc31_ehci_initialize(0);
   if (!g_ehciconn)
     {
-      udbg("ERROR: lpc31_ehci_initialize failed\n");
+      uerr("ERROR: lpc31_ehci_initialize failed\n");
       return -ENODEV;
     }
 
@@ -235,7 +235,7 @@ int lpc31_usbhost_initialize(void)
                     (main_t)ehci_waiter, (FAR char * const *)NULL);
   if (pid < 0)
     {
-      udbg("ERROR: Failed to create ehci_waiter task: %d\n", ret);
+      uerr("ERROR: Failed to create ehci_waiter task: %d\n", ret);
       return -ENODEV;
     }
 
diff --git a/configs/ea3152/src/lpc31_leds.c b/configs/ea3152/src/lpc31_leds.c
index 986c77af5e..ad0c91bf04 100644
--- a/configs/ea3152/src/lpc31_leds.c
+++ b/configs/ea3152/src/lpc31_leds.c
@@ -60,10 +60,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/ea3152/src/lpc31_spi.c b/configs/ea3152/src/lpc31_spi.c
index 1436e65748..8ecd50e111 100644
--- a/configs/ea3152/src/lpc31_spi.c
+++ b/configs/ea3152/src/lpc31_spi.c
@@ -65,7 +65,7 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -73,7 +73,7 @@
 #  endif
 #else
 #  undef SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -127,7 +127,7 @@ void weak_function lpc31_spidev_intialize(void)
 
 void lpc31_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
diff --git a/configs/eagle100/src/lm_leds.c b/configs/eagle100/src/lm_leds.c
index 03f0b3e510..91cabe6afa 100644
--- a/configs/eagle100/src/lm_leds.c
+++ b/configs/eagle100/src/lm_leds.c
@@ -60,10 +60,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
@@ -100,7 +100,7 @@ static uint8_t g_nest;
 #ifdef CONFIG_ARCH_LEDS
 void board_autoled_initialize(void)
 {
-  leddbg("Initializing\n");
+  lederr("Initializing\n");
 
   /* Configure Port E, Bit 1 as an output, initial value=OFF */
 
diff --git a/configs/eagle100/src/lm_ssi.c b/configs/eagle100/src/lm_ssi.c
index f106382d05..f0a1fbb28f 100644
--- a/configs/eagle100/src/lm_ssi.c
+++ b/configs/eagle100/src/lm_ssi.c
@@ -65,7 +65,7 @@
 #undef SSI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SSI_DEBUG
-#  define ssidbg  llerr
+#  define ssierr  llerr
 #  ifdef SSI_VERBOSE
 #    define ssiinfo llerr
 #  else
@@ -73,7 +73,7 @@
 #  endif
 #else
 #  undef SSI_VERBOSE
-#  define ssidbg(x...)
+#  define ssierr(x...)
 #  define ssiinfo(x...)
 #endif
 
@@ -127,7 +127,7 @@ void weak_function lm_ssidev_initialize(void)
 
 void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  ssidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  ssierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   if (devid == SPIDEV_MMCSD)
     {
       /* Assert the CS pin to the card */
@@ -140,7 +140,7 @@ void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool select
 
 uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  ssidbg("Returning SPI_STATUS_PRESENT\n");
+  ssierr("Returning SPI_STATUS_PRESENT\n");
   return SPI_STATUS_PRESENT;
 }
 
diff --git a/configs/efm32-g8xx-stk/src/efm32_autoleds.c b/configs/efm32-g8xx-stk/src/efm32_autoleds.c
index ae7176c7a2..9038b795e3 100644
--- a/configs/efm32-g8xx-stk/src/efm32_autoleds.c
+++ b/configs/efm32-g8xx-stk/src/efm32_autoleds.c
@@ -64,10 +64,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/efm32-g8xx-stk/src/efm32_userleds.c b/configs/efm32-g8xx-stk/src/efm32_userleds.c
index c09254f323..ec4ca87c51 100644
--- a/configs/efm32-g8xx-stk/src/efm32_userleds.c
+++ b/configs/efm32-g8xx-stk/src/efm32_userleds.c
@@ -64,10 +64,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/efm32gg-stk3700/src/efm32_autoleds.c b/configs/efm32gg-stk3700/src/efm32_autoleds.c
index c1f2c8b110..23cf753454 100644
--- a/configs/efm32gg-stk3700/src/efm32_autoleds.c
+++ b/configs/efm32gg-stk3700/src/efm32_autoleds.c
@@ -98,10 +98,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/efm32gg-stk3700/src/efm32_userleds.c b/configs/efm32gg-stk3700/src/efm32_userleds.c
index 53bbf90685..72f808bb31 100644
--- a/configs/efm32gg-stk3700/src/efm32_userleds.c
+++ b/configs/efm32gg-stk3700/src/efm32_userleds.c
@@ -75,10 +75,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/ekk-lm3s9b96/src/lm_leds.c b/configs/ekk-lm3s9b96/src/lm_leds.c
index 0b188a81be..8df76950a4 100644
--- a/configs/ekk-lm3s9b96/src/lm_leds.c
+++ b/configs/ekk-lm3s9b96/src/lm_leds.c
@@ -61,10 +61,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
@@ -97,7 +97,7 @@ static uint8_t g_nest;
 #ifdef CONFIG_ARCH_LEDS
 void board_autoled_initialize(void)
 {
-  leddbg("Initializing\n");
+  lederr("Initializing\n");
 
   /* Configure Port D, Bit 0 as an output, initial value=OFF */
 
diff --git a/configs/ekk-lm3s9b96/src/lm_ssi.c b/configs/ekk-lm3s9b96/src/lm_ssi.c
index fc402edc1f..1e4e379213 100644
--- a/configs/ekk-lm3s9b96/src/lm_ssi.c
+++ b/configs/ekk-lm3s9b96/src/lm_ssi.c
@@ -64,7 +64,7 @@
 #undef SSI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SSI_DEBUG
-#  define ssidbg  llerr
+#  define ssierr  llerr
 #  ifdef SSI_VERBOSE
 #    define ssiinfo llerr
 #  else
@@ -72,7 +72,7 @@
 #  endif
 #else
 #  undef SSI_VERBOSE
-#  define ssidbg(x...)
+#  define ssierr(x...)
 #  define ssiinfo(x...)
 #endif
 
@@ -133,7 +133,7 @@ void weak_function lm_ssidev_initialize(void)
 
 void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  ssidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  ssierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   ssi_dumpgpio("tiva_ssiselect() Entry");
   if (devid == SPIDEV_MMCSD)
     {
@@ -154,7 +154,7 @@ void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool select
 
 uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  ssidbg("Returning SPI_STATUS_PRESENT\n");
+  ssierr("Returning SPI_STATUS_PRESENT\n");
   return SPI_STATUS_PRESENT;
 }
 #endif
diff --git a/configs/fire-stm32v2/src/stm32_appinit.c b/configs/fire-stm32v2/src/stm32_appinit.c
index e8711ef204..7e894cc4af 100644
--- a/configs/fire-stm32v2/src/stm32_appinit.c
+++ b/configs/fire-stm32v2/src/stm32_appinit.c
@@ -147,14 +147,14 @@ static void stm32_i2c_register(int bus)
   i2c = stm32_i2cbus_initialize(bus);
   if (i2c == NULL)
     {
-      dbg("ERROR: Failed to get I2C%d interface\n", bus);
+      err("ERROR: Failed to get I2C%d interface\n", bus);
     }
   else
     {
       ret = i2c_register(i2c, bus);
       if (ret < 0)
         {
-          dbg("ERROR: Failed to register I2C%d driver: %d\n", bus, ret);
+          err("ERROR: Failed to register I2C%d driver: %d\n", bus, ret);
           stm32_i2cbus_uninitialize(i2c);
         }
     }
diff --git a/configs/fire-stm32v2/src/stm32_autoleds.c b/configs/fire-stm32v2/src/stm32_autoleds.c
index 2d6b80528e..6db2e6aea5 100644
--- a/configs/fire-stm32v2/src/stm32_autoleds.c
+++ b/configs/fire-stm32v2/src/stm32_autoleds.c
@@ -62,10 +62,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/fire-stm32v2/src/stm32_mmcsd.c b/configs/fire-stm32v2/src/stm32_mmcsd.c
index a356d8eeb9..3bbd49d892 100644
--- a/configs/fire-stm32v2/src/stm32_mmcsd.c
+++ b/configs/fire-stm32v2/src/stm32_mmcsd.c
@@ -93,7 +93,7 @@ int stm32_sdinitialize(int minor)
   sdio = sdio_initialize(STM32_MMCSDSLOTNO);
   if (!sdio)
     {
-      fdbg("Failed to initialize SDIO slot %d\n", STM32_MMCSDSLOTNO);
+      ferr("Failed to initialize SDIO slot %d\n", STM32_MMCSDSLOTNO);
       return -ENODEV;
     }
 
@@ -104,7 +104,7 @@ int stm32_sdinitialize(int minor)
   ret = mmcsd_slotinitialize(minor, sdio);
   if (ret != OK)
     {
-      fdbg("Failed to bind SDIO slot %d to the MMC/SD driver, minor=%d\n",
+      ferr("Failed to bind SDIO slot %d to the MMC/SD driver, minor=%d\n",
               STM32_MMCSDSLOTNO, minor);
     }
 
diff --git a/configs/fire-stm32v2/src/stm32_spi.c b/configs/fire-stm32v2/src/stm32_spi.c
index 2b7216e05b..b040fdc0c9 100644
--- a/configs/fire-stm32v2/src/stm32_spi.c
+++ b/configs/fire-stm32v2/src/stm32_spi.c
@@ -63,7 +63,7 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -71,7 +71,7 @@
 #  endif
 #else
 #  undef SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -159,7 +159,7 @@ void weak_function stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
 #if 0 /* Need to study this */
   if (devid == SPIDEV_LCD)
@@ -196,7 +196,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
   if (devid == SPIDEV_AUDIO)
     {
diff --git a/configs/fire-stm32v2/src/stm32_userleds.c b/configs/fire-stm32v2/src/stm32_userleds.c
index 3f2d1ff650..26484ff2e7 100644
--- a/configs/fire-stm32v2/src/stm32_userleds.c
+++ b/configs/fire-stm32v2/src/stm32_userleds.c
@@ -62,10 +62,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/fire-stm32v2/src/stm32_w25.c b/configs/fire-stm32v2/src/stm32_w25.c
index 3fad2929b2..34940b5c62 100644
--- a/configs/fire-stm32v2/src/stm32_w25.c
+++ b/configs/fire-stm32v2/src/stm32_w25.c
@@ -106,7 +106,7 @@ int stm32_w25initialize(int minor)
   spi = stm32_spibus_initialize(1);
   if (!spi)
     {
-      fdbg("ERROR: Failed to initialize SPI port 2\n");
+      ferr("ERROR: Failed to initialize SPI port 2\n");
       return -ENODEV;
     }
 
@@ -115,7 +115,7 @@ int stm32_w25initialize(int minor)
   mtd = w25_initialize(spi);
   if (!mtd)
     {
-      fdbg("ERROR: Failed to bind SPI port 2 to the SST 25 FLASH driver\n");
+      ferr("ERROR: Failed to bind SPI port 2 to the SST 25 FLASH driver\n");
       return -ENODEV;
     }
 
@@ -125,7 +125,7 @@ int stm32_w25initialize(int minor)
   ret = ftl_initialize(minor, mtd);
   if (ret < 0)
     {
-      fdbg("ERROR: Initialize the FTL layer\n");
+      ferr("ERROR: Initialize the FTL layer\n");
       return ret;
     }
 #else
@@ -134,7 +134,7 @@ int stm32_w25initialize(int minor)
   ret = nxffs_initialize(mtd);
   if (ret < 0)
     {
-      fdbg("ERROR: NXFFS initialization failed: %d\n", -ret);
+      ferr("ERROR: NXFFS initialization failed: %d\n", -ret);
       return ret;
     }
 
@@ -144,7 +144,7 @@ int stm32_w25initialize(int minor)
   ret = mount(NULL, devname, "nxffs", 0, NULL);
   if (ret < 0)
     {
-      fdbg("ERROR: Failed to mount the NXFFS volume: %d\n", errno);
+      ferr("ERROR: Failed to mount the NXFFS volume: %d\n", errno);
       return ret;
     }
 #endif
diff --git a/configs/freedom-kl25z/src/kl_adxl345.c b/configs/freedom-kl25z/src/kl_adxl345.c
index a6fab92a64..e0dcd781ea 100644
--- a/configs/freedom-kl25z/src/kl_adxl345.c
+++ b/configs/freedom-kl25z/src/kl_adxl345.c
@@ -257,7 +257,7 @@ int adxl345_archinitialize(int minor)
   FAR struct spi_dev_s *dev;
   int ret;
 
-  sndbg("minor %d\n", minor);
+  snerr("minor %d\n", minor);
   DEBUGASSERT(minor == 0);
 
   /* Check if we are already initialized */
@@ -275,7 +275,7 @@ int adxl345_archinitialize(int minor)
       dev = kl_spibus_initialize(CONFIG_ADXL345_SPIDEV);
       if (!dev)
         {
-          sndbg("Failed to initialize SPI bus %d\n", CONFIG_ADXL345_SPIDEV);
+          snerr("Failed to initialize SPI bus %d\n", CONFIG_ADXL345_SPIDEV);
           return -ENODEV;
         }
 
@@ -285,7 +285,7 @@ int adxl345_archinitialize(int minor)
         adxl345_instantiate(dev, (FAR struct adxl345_config_s *)&g_adxl345config);
       if (!g_adxl345config.handle)
         {
-          sndbg("Failed to instantiate the ADXL345 driver\n");
+          snerr("Failed to instantiate the ADXL345 driver\n");
           return -ENODEV;
         }
 
@@ -294,7 +294,7 @@ int adxl345_archinitialize(int minor)
       ret = adxl345_register(g_adxl345config.handle, CONFIG_ADXL345_DEVMINOR);
       if (ret < 0)
         {
-          sndbg("Failed to register ADXL345 driver: %d\n", ret);
+          snerr("Failed to register ADXL345 driver: %d\n", ret);
           return ret;
         }
     }
diff --git a/configs/freedom-kl25z/src/kl_appinit.c b/configs/freedom-kl25z/src/kl_appinit.c
index a00e675cdd..f0126fdd31 100644
--- a/configs/freedom-kl25z/src/kl_appinit.c
+++ b/configs/freedom-kl25z/src/kl_appinit.c
@@ -86,7 +86,7 @@ int board_app_initialize(uintptr_t arg)
   ret = adxl345_archinitialize(0);
   if (ret < 0)
     {
-      dbg("ERROR: adxl345_archinitialize failed: %d\n", ret);
+      err("ERROR: adxl345_archinitialize failed: %d\n", ret);
     }
 #endif
   return OK;
diff --git a/configs/freedom-kl25z/src/kl_led.c b/configs/freedom-kl25z/src/kl_led.c
index 3a0a75d690..dc2a20ee52 100644
--- a/configs/freedom-kl25z/src/kl_led.c
+++ b/configs/freedom-kl25z/src/kl_led.c
@@ -86,14 +86,14 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/freedom-kl25z/src/kl_pwm.c b/configs/freedom-kl25z/src/kl_pwm.c
index 0d0a73aeb9..18b51097d1 100644
--- a/configs/freedom-kl25z/src/kl_pwm.c
+++ b/configs/freedom-kl25z/src/kl_pwm.c
@@ -98,7 +98,7 @@ int board_pwm_setup(void)
       pwm = kl_pwminitialize(0);
       if (!pwm)
         {
-          adbg("Failed to get the KL25 PWM lower half\n");
+          aerr("Failed to get the KL25 PWM lower half\n");
           return -ENODEV;
         }
 
@@ -107,7 +107,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          adbg("pwm_register failed: %d\n", ret);
+          aerr("pwm_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/freedom-kl25z/src/kl_spi.c b/configs/freedom-kl25z/src/kl_spi.c
index d5c3d56edc..33747807d9 100644
--- a/configs/freedom-kl25z/src/kl_spi.c
+++ b/configs/freedom-kl25z/src/kl_spi.c
@@ -58,14 +58,14 @@
 /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
diff --git a/configs/freedom-kl25z/src/kl_wifi.c b/configs/freedom-kl25z/src/kl_wifi.c
index fa59ac10ae..12924682d8 100644
--- a/configs/freedom-kl25z/src/kl_wifi.c
+++ b/configs/freedom-kl25z/src/kl_wifi.c
@@ -289,7 +289,7 @@ int wireless_archinitialize(size_t max_rx_size)
 
   /* Init SPI bus */
 
-  idbg("minor %d\n", minor);
+  ierr("minor %d\n", minor);
   DEBUGASSERT(CONFIG_CC3000_DEVMINOR == 0);
 
 #ifdef CONFIG_CC3000_PROBES
@@ -304,7 +304,7 @@ int wireless_archinitialize(size_t max_rx_size)
   spi = kl_spibus_initialize(CONFIG_CC3000_SPIDEV);
   if (!spi)
     {
-      idbg("Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV);
+      ierr("Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV);
       return -ENODEV;
     }
 
@@ -314,7 +314,7 @@ int wireless_archinitialize(size_t max_rx_size)
   int ret = cc3000_register(spi, &g_cc3000_info.dev, CONFIG_CC3000_DEVMINOR);
   if (ret < 0)
     {
-      idbg("Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV);
+      ierr("Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV);
       return -ENODEV;
     }
 
diff --git a/configs/freedom-kl26z/src/kl_led.c b/configs/freedom-kl26z/src/kl_led.c
index 53b328d158..8d4847cda4 100644
--- a/configs/freedom-kl26z/src/kl_led.c
+++ b/configs/freedom-kl26z/src/kl_led.c
@@ -86,14 +86,14 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/freedom-kl26z/src/kl_pwm.c b/configs/freedom-kl26z/src/kl_pwm.c
index 4faf9cabe8..e57a9936bb 100644
--- a/configs/freedom-kl26z/src/kl_pwm.c
+++ b/configs/freedom-kl26z/src/kl_pwm.c
@@ -98,7 +98,7 @@ int board_pwm_setup(void)
       pwm = kl_pwminitialize(0);
       if (!pwm)
         {
-          adbg("Failed to get the KL26 PWM lower half\n");
+          aerr("Failed to get the KL26 PWM lower half\n");
           return -ENODEV;
         }
 
@@ -107,7 +107,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          adbg("pwm_register failed: %d\n", ret);
+          aerr("pwm_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/freedom-kl26z/src/kl_spi.c b/configs/freedom-kl26z/src/kl_spi.c
index c5d25a96a7..d6e7fbea66 100644
--- a/configs/freedom-kl26z/src/kl_spi.c
+++ b/configs/freedom-kl26z/src/kl_spi.c
@@ -58,14 +58,14 @@
 /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
diff --git a/configs/hymini-stm32v/src/stm32_leds.c b/configs/hymini-stm32v/src/stm32_leds.c
index e669700696..0f72b14429 100644
--- a/configs/hymini-stm32v/src/stm32_leds.c
+++ b/configs/hymini-stm32v/src/stm32_leds.c
@@ -62,10 +62,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/hymini-stm32v/src/stm32_r61505u.c b/configs/hymini-stm32v/src/stm32_r61505u.c
index 579ff1f2ec..8f23b6a344 100644
--- a/configs/hymini-stm32v/src/stm32_r61505u.c
+++ b/configs/hymini-stm32v/src/stm32_r61505u.c
@@ -94,9 +94,9 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-# define lcddbg(format, ...)  info(format, ##__VA_ARGS__)
+# define lcderr(format, ...)  info(format, ##__VA_ARGS__)
 #else
-# define lcddbg(x...)
+# define lcderr(x...)
 #endif
 
 /* This should be put elsewhere (possibly include/nuttx/compiler.h) */
@@ -880,26 +880,26 @@ static void lcd_backlight(void)
 
   /* Dump timer3 registers */
 
-  lcddbg("APB1ENR: %08x\n", getreg32(STM32_RCC_APB1ENR));
-  lcddbg("CR1:     %04x\n", getreg32(STM32_TIM3_CR1));
-  lcddbg("CR2:     %04x\n", getreg32(STM32_TIM3_CR2));
-  lcddbg("SMCR:    %04x\n", getreg32(STM32_TIM3_SMCR));
-  lcddbg("DIER:    %04x\n", getreg32(STM32_TIM3_DIER));
-  lcddbg("SR:      %04x\n", getreg32(STM32_TIM3_SR));
-  lcddbg("EGR:     %04x\n", getreg32(STM32_TIM3_EGR));
-  lcddbg("CCMR1:   %04x\n", getreg32(STM32_TIM3_CCMR1));
-  lcddbg("CCMR2:   %04x\n", getreg32(STM32_TIM3_CCMR2));
-  lcddbg("CCER:    %04x\n", getreg32(STM32_TIM3_CCER));
-  lcddbg("CNT:     %04x\n", getreg32(STM32_TIM3_CNT));
-  lcddbg("PSC:     %04x\n", getreg32(STM32_TIM3_PSC));
-  lcddbg("ARR:     %04x\n", getreg32(STM32_TIM3_ARR));
-  lcddbg("CCR1:    %04x\n", getreg32(STM32_TIM3_CCR1));
-  lcddbg("CCR2:    %04x\n", getreg32(STM32_TIM3_CCR2));
-  lcddbg("CCR3:    %04x\n", getreg32(STM32_TIM3_CCR3));
-  lcddbg("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
-  lcddbg("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
-  lcddbg("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
-  lcddbg("DMAR:    %04x\n", getreg32(STM32_TIM3_DMAR));
+  lcderr("APB1ENR: %08x\n", getreg32(STM32_RCC_APB1ENR));
+  lcderr("CR1:     %04x\n", getreg32(STM32_TIM3_CR1));
+  lcderr("CR2:     %04x\n", getreg32(STM32_TIM3_CR2));
+  lcderr("SMCR:    %04x\n", getreg32(STM32_TIM3_SMCR));
+  lcderr("DIER:    %04x\n", getreg32(STM32_TIM3_DIER));
+  lcderr("SR:      %04x\n", getreg32(STM32_TIM3_SR));
+  lcderr("EGR:     %04x\n", getreg32(STM32_TIM3_EGR));
+  lcderr("CCMR1:   %04x\n", getreg32(STM32_TIM3_CCMR1));
+  lcderr("CCMR2:   %04x\n", getreg32(STM32_TIM3_CCMR2));
+  lcderr("CCER:    %04x\n", getreg32(STM32_TIM3_CCER));
+  lcderr("CNT:     %04x\n", getreg32(STM32_TIM3_CNT));
+  lcderr("PSC:     %04x\n", getreg32(STM32_TIM3_PSC));
+  lcderr("ARR:     %04x\n", getreg32(STM32_TIM3_ARR));
+  lcderr("CCR1:    %04x\n", getreg32(STM32_TIM3_CCR1));
+  lcderr("CCR2:    %04x\n", getreg32(STM32_TIM3_CCR2));
+  lcderr("CCR3:    %04x\n", getreg32(STM32_TIM3_CCR3));
+  lcderr("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
+  lcderr("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
+  lcderr("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
+  lcderr("DMAR:    %04x\n", getreg32(STM32_TIM3_DMAR));
 }
 #endif
 
@@ -938,7 +938,7 @@ int board_lcd_initialize(void)
     {
       /* Not a R61505U ? */
 
-      gdbg("board_lcd_initialize: LCD ctrl is not a R61505U");
+      gerr("board_lcd_initialize: LCD ctrl is not a R61505U");
       return ERROR;
     }
 
diff --git a/configs/hymini-stm32v/src/stm32_spi.c b/configs/hymini-stm32v/src/stm32_spi.c
index 7983b3496a..c8c781f644 100644
--- a/configs/hymini-stm32v/src/stm32_spi.c
+++ b/configs/hymini-stm32v/src/stm32_spi.c
@@ -64,7 +64,7 @@
 #define SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -72,7 +72,7 @@
 #  endif
 #else
 #  undef SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -135,7 +135,7 @@ void stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
   if (devid == SPIDEV_TOUCHSCREEN)
   {
@@ -154,7 +154,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -166,7 +166,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
diff --git a/configs/hymini-stm32v/src/stm32_ssd1289.c b/configs/hymini-stm32v/src/stm32_ssd1289.c
index 264be5d900..7bd48a1529 100644
--- a/configs/hymini-stm32v/src/stm32_ssd1289.c
+++ b/configs/hymini-stm32v/src/stm32_ssd1289.c
@@ -104,10 +104,10 @@
 
 /* Debug ******************************************************************************/
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg         dbg
+#  define lcderr         err
 #  define lcdinfo        info
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -359,26 +359,26 @@ static void init_lcd_backlight(void)
 
   /* Dump timer3 registers */
 
-  lcddbg("APB1ENR: %08x\n", getreg32(STM32_RCC_APB1ENR));
-  lcddbg("CR1:     %04x\n", getreg32(STM32_TIM3_CR1));
-  lcddbg("CR2:     %04x\n", getreg32(STM32_TIM3_CR2));
-  lcddbg("SMCR:    %04x\n", getreg32(STM32_TIM3_SMCR));
-  lcddbg("DIER:    %04x\n", getreg32(STM32_TIM3_DIER));
-  lcddbg("SR:      %04x\n", getreg32(STM32_TIM3_SR));
-  lcddbg("EGR:     %04x\n", getreg32(STM32_TIM3_EGR));
-  lcddbg("CCMR1:   %04x\n", getreg32(STM32_TIM3_CCMR1));
-  lcddbg("CCMR2:   %04x\n", getreg32(STM32_TIM3_CCMR2));
-  lcddbg("CCER:    %04x\n", getreg32(STM32_TIM3_CCER));
-  lcddbg("CNT:     %04x\n", getreg32(STM32_TIM3_CNT));
-  lcddbg("PSC:     %04x\n", getreg32(STM32_TIM3_PSC));
-  lcddbg("ARR:     %04x\n", getreg32(STM32_TIM3_ARR));
-  lcddbg("CCR1:    %04x\n", getreg32(STM32_TIM3_CCR1));
-  lcddbg("CCR2:    %04x\n", getreg32(STM32_TIM3_CCR2));
-  lcddbg("CCR3:    %04x\n", getreg32(STM32_TIM3_CCR3));
-  lcddbg("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
-  lcddbg("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
-  lcddbg("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
-  lcddbg("DMAR:    %04x\n", getreg32(STM32_TIM3_DMAR));
+  lcderr("APB1ENR: %08x\n", getreg32(STM32_RCC_APB1ENR));
+  lcderr("CR1:     %04x\n", getreg32(STM32_TIM3_CR1));
+  lcderr("CR2:     %04x\n", getreg32(STM32_TIM3_CR2));
+  lcderr("SMCR:    %04x\n", getreg32(STM32_TIM3_SMCR));
+  lcderr("DIER:    %04x\n", getreg32(STM32_TIM3_DIER));
+  lcderr("SR:      %04x\n", getreg32(STM32_TIM3_SR));
+  lcderr("EGR:     %04x\n", getreg32(STM32_TIM3_EGR));
+  lcderr("CCMR1:   %04x\n", getreg32(STM32_TIM3_CCMR1));
+  lcderr("CCMR2:   %04x\n", getreg32(STM32_TIM3_CCMR2));
+  lcderr("CCER:    %04x\n", getreg32(STM32_TIM3_CCER));
+  lcderr("CNT:     %04x\n", getreg32(STM32_TIM3_CNT));
+  lcderr("PSC:     %04x\n", getreg32(STM32_TIM3_PSC));
+  lcderr("ARR:     %04x\n", getreg32(STM32_TIM3_ARR));
+  lcderr("CCR1:    %04x\n", getreg32(STM32_TIM3_CCR1));
+  lcderr("CCR2:    %04x\n", getreg32(STM32_TIM3_CCR2));
+  lcderr("CCR3:    %04x\n", getreg32(STM32_TIM3_CCR3));
+  lcderr("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
+  lcderr("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
+  lcderr("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
+  lcderr("DMAR:    %04x\n", getreg32(STM32_TIM3_DMAR));
 }
 
 /************************************************************************************
@@ -496,7 +496,7 @@ int board_lcd_initialize(void)
       g_ssd1289drvr = ssd1289_lcdinitialize(&g_ssd1289);
       if (!g_ssd1289drvr)
         {
-          lcddbg("ERROR: ssd1289_lcdinitialize failed\n");
+          lcderr("ERROR: ssd1289_lcdinitialize failed\n");
           return -ENODEV;
         }
     }
diff --git a/configs/hymini-stm32v/src/stm32_ts.c b/configs/hymini-stm32v/src/stm32_ts.c
index 6edda3f41e..77e83d66f2 100644
--- a/configs/hymini-stm32v/src/stm32_ts.c
+++ b/configs/hymini-stm32v/src/stm32_ts.c
@@ -153,12 +153,12 @@ int board_tsc_setup(int minor)
 {
   FAR struct spi_dev_s *dev;
 
-  idbg("minor %d\n", minor);
+  ierr("minor %d\n", minor);
 
   dev = stm32_spibus_initialize(1);
   if (!dev)
     {
-      idbg("Failed to initialize SPI bus\n");
+      ierr("Failed to initialize SPI bus\n");
       return -ENODEV;
     }
 
diff --git a/configs/kwikstik-k40/src/k40_lcd.c b/configs/kwikstik-k40/src/k40_lcd.c
index e9d4b00420..a1d9985531 100644
--- a/configs/kwikstik-k40/src/k40_lcd.c
+++ b/configs/kwikstik-k40/src/k40_lcd.c
@@ -61,9 +61,9 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-# define lcddbg(format, ...)  info(format, ##__VA_ARGS__)
+# define lcderr(format, ...)  info(format, ##__VA_ARGS__)
 #else
-# define lcddbg(x...)
+# define lcderr(x...)
 #endif
 
 /**************************************************************************************
diff --git a/configs/kwikstik-k40/src/k40_leds.c b/configs/kwikstik-k40/src/k40_leds.c
index 334a038b9d..277da4de96 100644
--- a/configs/kwikstik-k40/src/k40_leds.c
+++ b/configs/kwikstik-k40/src/k40_leds.c
@@ -52,10 +52,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/kwikstik-k40/src/k40_spi.c b/configs/kwikstik-k40/src/k40_spi.c
index 4e55111754..ec06535419 100644
--- a/configs/kwikstik-k40/src/k40_spi.c
+++ b/configs/kwikstik-k40/src/k40_spi.c
@@ -60,7 +60,7 @@
 /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef CONFIG_DEBUG_SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -68,7 +68,7 @@
 #  endif
 #else
 #  undef CONFIG_DEBUG_SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -121,7 +121,7 @@ void weak_function kinetis_spidev_initialize(void)
 #ifdef CONFIG_KINETIS_SPI1
 void kinetis_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 # warning "Missing logic"
 }
 
@@ -135,7 +135,7 @@ uint8_t kinetis_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_KINETIS_SPI2
 void kinetis_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 # warning "Missing logic"
 }
 
@@ -149,7 +149,7 @@ uint8_t kinetis_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_KINETIS_SPI3
 void kinetis_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 # warning "Missing logic"
 }
 
diff --git a/configs/launchxl-tms57004/src/tms570_autoleds.c b/configs/launchxl-tms57004/src/tms570_autoleds.c
index b51afadfd7..0bf1c51abd 100644
--- a/configs/launchxl-tms57004/src/tms570_autoleds.c
+++ b/configs/launchxl-tms57004/src/tms570_autoleds.c
@@ -98,10 +98,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/lincoln60/src/lpc17_leds.c b/configs/lincoln60/src/lpc17_leds.c
index 1baafaafa8..9a99465a32 100644
--- a/configs/lincoln60/src/lpc17_leds.c
+++ b/configs/lincoln60/src/lpc17_leds.c
@@ -65,14 +65,14 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/lm3s6432-s2e/src/lm_leds.c b/configs/lm3s6432-s2e/src/lm_leds.c
index 360a75e1a5..276a168c4a 100644
--- a/configs/lm3s6432-s2e/src/lm_leds.c
+++ b/configs/lm3s6432-s2e/src/lm_leds.c
@@ -60,10 +60,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
@@ -96,7 +96,7 @@ static uint8_t g_nest;
 #ifdef CONFIG_ARCH_LEDS
 void board_autoled_initialize(void)
 {
-  leddbg("Initializing\n");
+  lederr("Initializing\n");
 
   /* Configure Port F, Bit 2 as an output, initial value=OFF */
 
diff --git a/configs/lm3s6432-s2e/src/lm_ssi.c b/configs/lm3s6432-s2e/src/lm_ssi.c
index 9f2c4818c1..250b29bddc 100644
--- a/configs/lm3s6432-s2e/src/lm_ssi.c
+++ b/configs/lm3s6432-s2e/src/lm_ssi.c
@@ -63,7 +63,7 @@
 #undef SSI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SSI_DEBUG
-#  define ssidbg  llerr
+#  define ssierr  llerr
 #  ifdef SSI_VERBOSE
 #    define ssiinfo llerr
 #  else
@@ -71,7 +71,7 @@
 #  endif
 #else
 #  undef SSI_VERBOSE
-#  define ssidbg(x...)
+#  define ssierr(x...)
 #  define ssiinfo(x...)
 #endif
 
@@ -129,7 +129,7 @@ void weak_function lm_ssidev_initialize(void)
 
 void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  ssidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  ssierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   ssi_dumpgpio("tiva_ssiselect() Entry");
 
   if (devid == SPIDEV_MMCSD)
@@ -144,7 +144,7 @@ void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool select
 
 uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  ssidbg("Returning SPI_STATUS_PRESENT\n");
+  ssierr("Returning SPI_STATUS_PRESENT\n");
   return SPI_STATUS_PRESENT;
 }
 
diff --git a/configs/lm3s6965-ek/src/lm_leds.c b/configs/lm3s6965-ek/src/lm_leds.c
index 7bd3bdea2e..95c4695739 100644
--- a/configs/lm3s6965-ek/src/lm_leds.c
+++ b/configs/lm3s6965-ek/src/lm_leds.c
@@ -60,10 +60,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
@@ -96,7 +96,7 @@ static uint8_t g_nest;
 #ifdef CONFIG_ARCH_LEDS
 void board_autoled_initialize(void)
 {
-  leddbg("Initializing\n");
+  lederr("Initializing\n");
 
   /* Configure Port E, Bit 1 as an output, initial value=OFF */
 
diff --git a/configs/lm3s6965-ek/src/lm_oled.c b/configs/lm3s6965-ek/src/lm_oled.c
index 0d4f1fb2ba..f9eb8d8644 100644
--- a/configs/lm3s6965-ek/src/lm_oled.c
+++ b/configs/lm3s6965-ek/src/lm_oled.c
@@ -73,11 +73,11 @@
 #endif
 
 #ifdef CONFIG_LCD_RITDEBUG
-#  define ritdbg(format, ...) info(format, ##__VA_ARGS__)
+#  define riterr(format, ...) info(format, ##__VA_ARGS__)
 #  define oleddc_dumpgpio(m)  tiva_dumpgpio(OLEDDC_GPIO, m)
 #  define oledcs_dumpgpio(m)  tiva_dumpgpio(OLEDCS_GPIO, m)
 #else
-#  define ritdbg(x...)
+#  define riterr(x...)
 #  define oleddc_dumpgpio(m)
 #  define oledcs_dumpgpio(m)
 #endif
diff --git a/configs/lm3s6965-ek/src/lm_ssi.c b/configs/lm3s6965-ek/src/lm_ssi.c
index 12126e6940..600e1f2ccf 100644
--- a/configs/lm3s6965-ek/src/lm_ssi.c
+++ b/configs/lm3s6965-ek/src/lm_ssi.c
@@ -65,7 +65,7 @@
 #undef SSI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SSI_DEBUG
-#  define ssidbg  llerr
+#  define ssierr  llerr
 #  ifdef SSI_VERBOSE
 #    define ssiinfo llerr
 #  else
@@ -73,7 +73,7 @@
 #  endif
 #else
 #  undef SSI_VERBOSE
-#  define ssidbg(x...)
+#  define ssierr(x...)
 #  define ssiinfo(x...)
 #endif
 
@@ -134,7 +134,7 @@ void weak_function lm_ssidev_initialize(void)
 
 void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  ssidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  ssierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   ssi_dumpgpio("tiva_ssiselect() Entry");
 
   if (devid == SPIDEV_MMCSD)
@@ -156,7 +156,7 @@ void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool select
 
 uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  ssidbg("Returning SPI_STATUS_PRESENT\n");
+  ssierr("Returning SPI_STATUS_PRESENT\n");
   return SPI_STATUS_PRESENT;
 }
 
diff --git a/configs/lm3s8962-ek/src/lm_leds.c b/configs/lm3s8962-ek/src/lm_leds.c
index b1fa2421d0..bf8eb48ddc 100644
--- a/configs/lm3s8962-ek/src/lm_leds.c
+++ b/configs/lm3s8962-ek/src/lm_leds.c
@@ -60,10 +60,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
@@ -96,7 +96,7 @@ static uint8_t g_nest;
 #ifdef CONFIG_ARCH_LEDS
 void board_autoled_initialize(void)
 {
-  leddbg("Initializing\n");
+  lederr("Initializing\n");
 
   /* Configure Port E, Bit 1 as an output, initial value=OFF */
 
diff --git a/configs/lm3s8962-ek/src/lm_oled.c b/configs/lm3s8962-ek/src/lm_oled.c
index 93f5344286..d42049227b 100644
--- a/configs/lm3s8962-ek/src/lm_oled.c
+++ b/configs/lm3s8962-ek/src/lm_oled.c
@@ -72,11 +72,11 @@
 #endif
 
 #ifdef CONFIG_LCD_RITDEBUG
-#  define ritdbg(format, ...) info(format, ##__VA_ARGS__)
+#  define riterr(format, ...) info(format, ##__VA_ARGS__)
 #  define oleddc_dumpgpio(m)  tiva_dumpgpio(OLEDDC_GPIO, m)
 #  define oledcs_dumpgpio(m)  tiva_dumpgpio(OLEDCS_GPIO, m)
 #else
-#  define ritdbg(x...)
+#  define riterr(x...)
 #  define oleddc_dumpgpio(m)
 #  define oledcs_dumpgpio(m)
 #endif
diff --git a/configs/lm3s8962-ek/src/lm_ssi.c b/configs/lm3s8962-ek/src/lm_ssi.c
index 3a068665cb..60fc30bfec 100644
--- a/configs/lm3s8962-ek/src/lm_ssi.c
+++ b/configs/lm3s8962-ek/src/lm_ssi.c
@@ -65,7 +65,7 @@
 #undef SSI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SSI_DEBUG
-#  define ssidbg  llerr
+#  define ssierr  llerr
 #  ifdef SSI_VERBOSE
 #    define ssiinfo llerr
 #  else
@@ -73,7 +73,7 @@
 #  endif
 #else
 #  undef SSI_VERBOSE
-#  define ssidbg(x...)
+#  define ssierr(x...)
 #  define ssiinfo(x...)
 #endif
 
@@ -134,7 +134,7 @@ void weak_function lm_ssidev_initialize(void)
 
 void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  ssidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  ssierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   ssi_dumpgpio("tiva_ssiselect() Entry");
 
   if (devid == SPIDEV_MMCSD)
@@ -156,7 +156,7 @@ void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool select
 
 uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  ssidbg("Returning SPI_STATUS_PRESENT\n");
+  ssierr("Returning SPI_STATUS_PRESENT\n");
   return SPI_STATUS_PRESENT;
 }
 
diff --git a/configs/lm4f120-launchpad/src/lm4f_autoleds.c b/configs/lm4f120-launchpad/src/lm4f_autoleds.c
index b55efa7b95..0e7fe05da3 100644
--- a/configs/lm4f120-launchpad/src/lm4f_autoleds.c
+++ b/configs/lm4f120-launchpad/src/lm4f_autoleds.c
@@ -102,10 +102,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
@@ -140,7 +140,7 @@
 #ifdef CONFIG_ARCH_LEDS
 void lm4f_led_initialize(void)
 {
-  leddbg("Initializing\n");
+  lederr("Initializing\n");
 
   /* Configure Port E, Bit 1 as an output, initial value=OFF */
 
diff --git a/configs/lm4f120-launchpad/src/lm4f_ssi.c b/configs/lm4f120-launchpad/src/lm4f_ssi.c
index a11a168108..68aaab1553 100644
--- a/configs/lm4f120-launchpad/src/lm4f_ssi.c
+++ b/configs/lm4f120-launchpad/src/lm4f_ssi.c
@@ -63,9 +63,9 @@
 /* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define ssidbg llerr
+#  define ssierr llerr
 #else
-#  define ssidbg(x...)
+#  define ssierr(x...)
 #endif
 
 /* Dump GPIO registers */
@@ -119,14 +119,14 @@ void weak_function lm4f_spidev_initialize(void)
 
 void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  ssidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  ssierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   ssi_dumpgpio("tiva_ssiselect() Entry");
   ssi_dumpgpio("tiva_ssiselect() Exit");
 }
 
 uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  ssidbg("Returning SPI_STATUS_PRESENT\n");
+  ssierr("Returning SPI_STATUS_PRESENT\n");
   return SPI_STATUS_PRESENT;
 }
 
diff --git a/configs/lpc4330-xplorer/src/lpc43_appinit.c b/configs/lpc4330-xplorer/src/lpc43_appinit.c
index 48225e0dde..751daad901 100644
--- a/configs/lpc4330-xplorer/src/lpc43_appinit.c
+++ b/configs/lpc4330-xplorer/src/lpc43_appinit.c
@@ -90,7 +90,7 @@ static int nsh_spifi_initialize(void)
   mtd = lpc43_spifi_initialize();
   if (!mtd)
     {
-      fdbg("ERROR: lpc43_spifi_initialize failed\n");
+      ferr("ERROR: lpc43_spifi_initialize failed\n");
       return -ENODEV;
     }
 
@@ -100,7 +100,7 @@ static int nsh_spifi_initialize(void)
   ret = ftl_initialize(CONFIG_SPIFI_DEVNO, mtd);
   if (ret < 0)
     {
-      fdbg("ERROR: Initializing the FTL layer: %d\n", ret);
+      ferr("ERROR: Initializing the FTL layer: %d\n", ret);
       return ret;
     }
 #else
@@ -109,7 +109,7 @@ static int nsh_spifi_initialize(void)
   ret = nxffs_initialize(mtd);
   if (ret < 0)
     {
-      fdbg("ERROR: NXFFS initialization failed: %d\n", ret);
+      ferr("ERROR: NXFFS initialization failed: %d\n", ret);
       return ret;
     }
 
@@ -118,7 +118,7 @@ static int nsh_spifi_initialize(void)
   ret = mount(NULL, "/mnt/spifi", "nxffs", 0, NULL);
   if (ret < 0)
     {
-      fdbg("ERROR: Failed to mount the NXFFS volume: %d\n", errno);
+      ferr("ERROR: Failed to mount the NXFFS volume: %d\n", errno);
       return ret;
     }
 #endif
diff --git a/configs/lpc4330-xplorer/src/lpc43_autoleds.c b/configs/lpc4330-xplorer/src/lpc43_autoleds.c
index c12d1ba62e..5c541622fe 100644
--- a/configs/lpc4330-xplorer/src/lpc43_autoleds.c
+++ b/configs/lpc4330-xplorer/src/lpc43_autoleds.c
@@ -95,7 +95,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define LED_VERBOSE 1
 #    define ledinfo llerr
@@ -105,7 +105,7 @@
 #  endif
 #else
 #  undef LED_VERBOSE
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/lpc4330-xplorer/src/lpc43_userleds.c b/configs/lpc4330-xplorer/src/lpc43_userleds.c
index 07735ddec1..22db426237 100644
--- a/configs/lpc4330-xplorer/src/lpc43_userleds.c
+++ b/configs/lpc4330-xplorer/src/lpc43_userleds.c
@@ -72,7 +72,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define LED_VERBOSE 1
 #    define ledinfo llerr
@@ -82,7 +82,7 @@
 #  endif
 #else
 #  undef LED_VERBOSE
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/lpc4337-ws/src/lpc43_adc.c b/configs/lpc4337-ws/src/lpc43_adc.c
index 0bb398369a..0e5f77ca46 100644
--- a/configs/lpc4337-ws/src/lpc43_adc.c
+++ b/configs/lpc4337-ws/src/lpc43_adc.c
@@ -86,7 +86,7 @@ int board_adc_setup(void)
       adc = lpc43_adcinitialize();
       if (adc == NULL)
         {
-          adbg("ERROR: Failed to get ADC interface\n");
+          aerr("ERROR: Failed to get ADC interface\n");
           return -ENODEV;
         }
 
@@ -95,7 +95,7 @@ int board_adc_setup(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          adbg("adc_register failed: %d\n", ret);
+          aerr("adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/lpc4337-ws/src/lpc43_appinit.c b/configs/lpc4337-ws/src/lpc43_appinit.c
index 976b78a418..b9dadd3090 100644
--- a/configs/lpc4337-ws/src/lpc43_appinit.c
+++ b/configs/lpc4337-ws/src/lpc43_appinit.c
@@ -70,14 +70,14 @@ static void lpc43_i2c_register(int bus)
   i2c = lpc43_i2cbus_initialize(bus);
   if (i2c == NULL)
     {
-      dbg("ERROR: Failed to get I2C%d interface\n", bus);
+      err("ERROR: Failed to get I2C%d interface\n", bus);
     }
   else
     {
       ret = i2c_register(i2c, bus);
       if (ret < 0)
         {
-          dbg("ERROR: Failed to register I2C%d driver: %d\n", bus, ret);
+          err("ERROR: Failed to register I2C%d driver: %d\n", bus, ret);
           lpc43_i2cbus_uninitialize(i2c);
         }
     }
diff --git a/configs/lpc4357-evb/src/lpc43_appinit.c b/configs/lpc4357-evb/src/lpc43_appinit.c
index 43efc040ce..aea4aaaa19 100644
--- a/configs/lpc4357-evb/src/lpc43_appinit.c
+++ b/configs/lpc4357-evb/src/lpc43_appinit.c
@@ -90,7 +90,7 @@ static int nsh_spifi_initialize(void)
   mtd = lpc43_spifi_initialize();
   if (!mtd)
     {
-      fdbg("ERROR: lpc43_spifi_initialize failed\n");
+      ferr("ERROR: lpc43_spifi_initialize failed\n");
       return -ENODEV;
     }
 
@@ -100,7 +100,7 @@ static int nsh_spifi_initialize(void)
   ret = ftl_initialize(CONFIG_SPIFI_DEVNO, mtd);
   if (ret < 0)
     {
-      fdbg("ERROR: Initializing the FTL layer: %d\n", ret);
+      ferr("ERROR: Initializing the FTL layer: %d\n", ret);
       return ret;
     }
 #else
@@ -109,7 +109,7 @@ static int nsh_spifi_initialize(void)
   ret = nxffs_initialize(mtd);
   if (ret < 0)
     {
-      fdbg("ERROR: NXFFS initialization failed: %d\n", ret);
+      ferr("ERROR: NXFFS initialization failed: %d\n", ret);
       return ret;
     }
 
@@ -118,7 +118,7 @@ static int nsh_spifi_initialize(void)
   ret = mount(NULL, "/mnt/spifi", "nxffs", 0, NULL);
   if (ret < 0)
     {
-      fdbg("ERROR: Failed to mount the NXFFS volume: %d\n", errno);
+      ferr("ERROR: Failed to mount the NXFFS volume: %d\n", errno);
       return ret;
     }
 #endif
diff --git a/configs/lpc4357-evb/src/lpc43_autoleds.c b/configs/lpc4357-evb/src/lpc43_autoleds.c
index dd589c240e..831a65ed2e 100644
--- a/configs/lpc4357-evb/src/lpc43_autoleds.c
+++ b/configs/lpc4357-evb/src/lpc43_autoleds.c
@@ -92,7 +92,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define LED_VERBOSE 1
 #    define ledinfo llerr
@@ -102,7 +102,7 @@
 #  endif
 #else
 #  undef LED_VERBOSE
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/lpc4357-evb/src/lpc43_userleds.c b/configs/lpc4357-evb/src/lpc43_userleds.c
index 5ac10a9db0..7db57acecd 100644
--- a/configs/lpc4357-evb/src/lpc43_userleds.c
+++ b/configs/lpc4357-evb/src/lpc43_userleds.c
@@ -83,7 +83,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define LED_VERBOSE 1
 #    define ledinfo llerr
@@ -93,7 +93,7 @@
 #  endif
 #else
 #  undef LED_VERBOSE
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/lpc4370-link2/src/lpc43_adc.c b/configs/lpc4370-link2/src/lpc43_adc.c
index 531b25ad7e..10eeaffcc8 100644
--- a/configs/lpc4370-link2/src/lpc43_adc.c
+++ b/configs/lpc4370-link2/src/lpc43_adc.c
@@ -86,7 +86,7 @@ int board_adc_setup(void)
       adc = lpc43_adcinitialize();
       if (adc == NULL)
         {
-          adbg("ERROR: Failed to get ADC interface\n");
+          aerr("ERROR: Failed to get ADC interface\n");
           return -ENODEV;
         }
 
@@ -95,7 +95,7 @@ int board_adc_setup(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          adbg("adc_register failed: %d\n", ret);
+          aerr("adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/lpc4370-link2/src/lpc43_appinit.c b/configs/lpc4370-link2/src/lpc43_appinit.c
index 660fb2e5f7..a2f013613d 100644
--- a/configs/lpc4370-link2/src/lpc43_appinit.c
+++ b/configs/lpc4370-link2/src/lpc43_appinit.c
@@ -70,14 +70,14 @@ static void lpc43_i2c_register(int bus)
   i2c = lpc43_i2cbus_initialize(bus);
   if (i2c == NULL)
     {
-      dbg("ERROR: Failed to get I2C%d interface\n", bus);
+      err("ERROR: Failed to get I2C%d interface\n", bus);
     }
   else
     {
       ret = i2c_register(i2c, bus);
       if (ret < 0)
         {
-          dbg("ERROR: Failed to register I2C%d driver: %d\n", bus, ret);
+          err("ERROR: Failed to register I2C%d driver: %d\n", bus, ret);
           lpc43_i2cbus_uninitialize(i2c);
         }
     }
diff --git a/configs/lpc4370-link2/src/lpc43_autoleds.c b/configs/lpc4370-link2/src/lpc43_autoleds.c
index ac30ba5842..63050c2df6 100644
--- a/configs/lpc4370-link2/src/lpc43_autoleds.c
+++ b/configs/lpc4370-link2/src/lpc43_autoleds.c
@@ -64,7 +64,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define LED_VERBOSE 1
 #    define ledinfo llerr
@@ -74,7 +74,7 @@
 #  endif
 #else
 #  undef LED_VERBOSE
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/lpc4370-link2/src/lpc43_userleds.c b/configs/lpc4370-link2/src/lpc43_userleds.c
index da911674f0..0625b9077c 100644
--- a/configs/lpc4370-link2/src/lpc43_userleds.c
+++ b/configs/lpc4370-link2/src/lpc43_userleds.c
@@ -65,7 +65,7 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define LED_VERBOSE 1
 #    define ledinfo llerr
@@ -75,7 +75,7 @@
 #  endif
 #else
 #  undef LED_VERBOSE
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/lpcxpresso-lpc1115/src/lpc11_adc.c b/configs/lpcxpresso-lpc1115/src/lpc11_adc.c
index 0b76f0c41c..93d6c0f7b9 100644
--- a/configs/lpcxpresso-lpc1115/src/lpc11_adc.c
+++ b/configs/lpcxpresso-lpc1115/src/lpc11_adc.c
@@ -98,7 +98,7 @@ int adc_devinit(void)
       adc = lpc11_adcinitialize();
       if (adc == NULL)
         {
-          adbg("ERROR: Failed to get ADC interface\n");
+          aerr("ERROR: Failed to get ADC interface\n");
           return -ENODEV;
         }
 
@@ -107,7 +107,7 @@ int adc_devinit(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          adbg("adc_register failed: %d\n", ret);
+          aerr("adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/lpcxpresso-lpc1115/src/lpc11_dac.c b/configs/lpcxpresso-lpc1115/src/lpc11_dac.c
index 3447f33036..420805ae8e 100644
--- a/configs/lpcxpresso-lpc1115/src/lpc11_dac.c
+++ b/configs/lpcxpresso-lpc1115/src/lpc11_dac.c
@@ -83,14 +83,14 @@ int dac_devinit(void)
     dac = lpc11_dacinitialize();
     if (dac == NULL)
       {
-        adbg("ERROR: Failed to get dac interface\n");
+        aerr("ERROR: Failed to get dac interface\n");
         return -ENODEV;
       }
 
     ret = dac_register("/dev/dac0", dac);
     if (ret < 0)
       {
-        adbg("dac_register failed: %d\n", ret);
+        aerr("dac_register failed: %d\n", ret);
         return ret;
       }
 
diff --git a/configs/lpcxpresso-lpc1115/src/lpc11_leds.c b/configs/lpcxpresso-lpc1115/src/lpc11_leds.c
index 8154cfa283..ff96ed7aed 100644
--- a/configs/lpcxpresso-lpc1115/src/lpc11_leds.c
+++ b/configs/lpcxpresso-lpc1115/src/lpc11_leds.c
@@ -61,14 +61,14 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/lpcxpresso-lpc1115/src/lpc11_pwm.c b/configs/lpcxpresso-lpc1115/src/lpc11_pwm.c
index d42ff511c0..1821e4cd5c 100644
--- a/configs/lpcxpresso-lpc1115/src/lpc11_pwm.c
+++ b/configs/lpcxpresso-lpc1115/src/lpc11_pwm.c
@@ -96,7 +96,7 @@ int pwm_devinit(void)
       pwm = lpc11_pwminitialize(0);
       if (!pwm)
         {
-          adbg("Failed to get the LPC17XX PWM lower half\n");
+          aerr("Failed to get the LPC17XX PWM lower half\n");
           return -ENODEV;
         }
 
@@ -105,14 +105,14 @@ int pwm_devinit(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          adbg("pwm_register failed: %d\n", ret);
+          aerr("pwm_register failed: %d\n", ret);
           return ret;
         }
 
       mcpwm = lpc11_mcpwminitialize(0);
       if (!mcpwm)
         {
-          adbg("Failed to get the LPC17XX MOTOR PWM lower half\n");
+          aerr("Failed to get the LPC17XX MOTOR PWM lower half\n");
           return -ENODEV;
         }
 
@@ -121,14 +121,14 @@ int pwm_devinit(void)
       ret = pwm_register("/dev/mcpwm0", mcpwm);
       if (ret < 0)
         {
-          adbg("mcpwm_register failed: %d\n", ret);
+          aerr("mcpwm_register failed: %d\n", ret);
           return ret;
         }
 
       timer = lpc11_timerinitialize(0);
       if (!timer)
         {
-          adbg("Failed to get the LPC17XX TIMER lower half\n");
+          aerr("Failed to get the LPC17XX TIMER lower half\n");
           return -ENODEV;
         }
 
@@ -137,7 +137,7 @@ int pwm_devinit(void)
       ret = pwm_register("/dev/timer0", timer);
       if (ret < 0)
         {
-          adbg("timer_register failed: %d\n", ret);
+          aerr("timer_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c b/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c
index 22e07f92f3..be82e42668 100644
--- a/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c
+++ b/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c
@@ -64,7 +64,7 @@
 #undef SSP_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SSP_DEBUG
-#  define sspdbg  llerr
+#  define ssperr  llerr
 #  ifdef SSP_VERBOSE
 #    define sspinfo llerr
 #  else
@@ -72,7 +72,7 @@
 #  endif
 #else
 #  undef SSP_VERBOSE
-#  define sspdbg(x...)
+#  define ssperr(x...)
 #  define sspinfo(x...)
 #endif
 
@@ -154,7 +154,7 @@ void weak_function lpcxpresso_sspdev_initialize(void)
 #ifdef CONFIG_LPC17_SSP0
 void  lpc11_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  sspdbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   ssp_dumpgpio("lpc11_ssp0select() Entry");
 
 #warning "Assert CS here (false)"
@@ -164,7 +164,7 @@ void  lpc11_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel
 
 uint8_t lpc11_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  sspdbg("Returning SPI_STATUS_PRESENT\n");
+  ssperr("Returning SPI_STATUS_PRESENT\n");
   return SPI_STATUS_PRESENT;
 }
 #endif
@@ -172,7 +172,7 @@ uint8_t lpc11_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_LPC17_SSP1
 void  lpc11_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  sspdbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   ssp_dumpgpio("lpc11_ssp1select() Entry");
 
   if (devid == SPIDEV_MMCSD)
@@ -200,12 +200,12 @@ uint8_t lpc11_ssp1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 
       if (lpc11_gpioread(LPCXPRESSO_SD_CD) == 0)
         {
-          sspdbg("Returning SPI_STATUS_PRESENT\n");
+          ssperr("Returning SPI_STATUS_PRESENT\n");
           return SPI_STATUS_PRESENT;
         }
     }
 
-  sspdbg("Returning zero\n");
+  ssperr("Returning zero\n");
   return 0;
 }
 #endif
diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_adc.c b/configs/lpcxpresso-lpc1768/src/lpc17_adc.c
index dd7fc837ea..3cb72e2e93 100644
--- a/configs/lpcxpresso-lpc1768/src/lpc17_adc.c
+++ b/configs/lpcxpresso-lpc1768/src/lpc17_adc.c
@@ -99,7 +99,7 @@ int board_adc_setup(void)
       adc = lpc17_adcinitialize();
       if (adc == NULL)
         {
-          adbg("ERROR: Failed to get ADC interface\n");
+          aerr("ERROR: Failed to get ADC interface\n");
           return -ENODEV;
         }
 
@@ -108,7 +108,7 @@ int board_adc_setup(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          adbg("adc_register failed: %d\n", ret);
+          aerr("adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_dac.c b/configs/lpcxpresso-lpc1768/src/lpc17_dac.c
index f27c4edf61..73657d135a 100644
--- a/configs/lpcxpresso-lpc1768/src/lpc17_dac.c
+++ b/configs/lpcxpresso-lpc1768/src/lpc17_dac.c
@@ -79,14 +79,14 @@ int dac_devinit(void)
     dac = lpc17_dacinitialize();
     if (dac == NULL)
       {
-        adbg("ERROR: Failed to get dac interface\n");
+        aerr("ERROR: Failed to get dac interface\n");
         return -ENODEV;
       }
 
     ret = dac_register("/dev/dac0", dac);
     if (ret < 0)
       {
-        adbg("dac_register failed: %d\n", ret);
+        aerr("dac_register failed: %d\n", ret);
         return ret;
       }
 
diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_leds.c b/configs/lpcxpresso-lpc1768/src/lpc17_leds.c
index b6d77696b3..011854e7c3 100644
--- a/configs/lpcxpresso-lpc1768/src/lpc17_leds.c
+++ b/configs/lpcxpresso-lpc1768/src/lpc17_leds.c
@@ -61,14 +61,14 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_oled.c b/configs/lpcxpresso-lpc1768/src/lpc17_oled.c
index 9b93b6e48b..4b3b9f5e12 100644
--- a/configs/lpcxpresso-lpc1768/src/lpc17_oled.c
+++ b/configs/lpcxpresso-lpc1768/src/lpc17_oled.c
@@ -85,11 +85,11 @@
 #endif
 
 #ifdef CONFIG_DEBUG_LCD
-#  define ugdbg(format, ...)  info(format, ##__VA_ARGS__)
+#  define ugerr(format, ...)  info(format, ##__VA_ARGS__)
 #  define oleddc_dumpgpio(m)  lpc17_dumpgpio(LPCXPRESSO_OLED_POWER, m)
 #  define oledcs_dumpgpio(m)  lpc17_dumpgpio(LPCXPRESSO_OLED_CS, m)
 #else
-#  define ugdbg(x...)
+#  define ugerr(x...)
 #  define oleddc_dumpgpio(m)
 #  define oledcs_dumpgpio(m)
 #endif
diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_pwm.c b/configs/lpcxpresso-lpc1768/src/lpc17_pwm.c
index 565c33a181..746a529a3b 100644
--- a/configs/lpcxpresso-lpc1768/src/lpc17_pwm.c
+++ b/configs/lpcxpresso-lpc1768/src/lpc17_pwm.c
@@ -98,7 +98,7 @@ int board_pwm_setup(void)
       pwm = lpc17_pwminitialize(0);
       if (!pwm)
         {
-          adbg("Failed to get the LPC17XX PWM lower half\n");
+          aerr("Failed to get the LPC17XX PWM lower half\n");
           return -ENODEV;
         }
 
@@ -107,14 +107,14 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          adbg("pwm_register failed: %d\n", ret);
+          aerr("pwm_register failed: %d\n", ret);
           return ret;
         }
 
       mcpwm = lpc17_mcpwminitialize(0);
       if (!mcpwm)
         {
-          adbg("Failed to get the LPC17XX MOTOR PWM lower half\n");
+          aerr("Failed to get the LPC17XX MOTOR PWM lower half\n");
           return -ENODEV;
         }
 
@@ -123,14 +123,14 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/mcpwm0", mcpwm);
       if (ret < 0)
         {
-          adbg("mcpwm_register failed: %d\n", ret);
+          aerr("mcpwm_register failed: %d\n", ret);
           return ret;
         }
 
       timer = lpc17_timerinitialize(0);
       if (!timer)
         {
-          adbg("Failed to get the LPC17XX TIMER lower half\n");
+          aerr("Failed to get the LPC17XX TIMER lower half\n");
           return -ENODEV;
         }
 
@@ -139,7 +139,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/timer0", timer);
       if (ret < 0)
         {
-          adbg("timer_register failed: %d\n", ret);
+          aerr("timer_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c b/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c
index 4de4225e13..082210b880 100644
--- a/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c
+++ b/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c
@@ -64,7 +64,7 @@
 #undef SSP_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SSP_DEBUG
-#  define sspdbg  llerr
+#  define ssperr  llerr
 #  ifdef SSP_VERBOSE
 #    define sspinfo llerr
 #  else
@@ -72,7 +72,7 @@
 #  endif
 #else
 #  undef SSP_VERBOSE
-#  define sspdbg(x...)
+#  define ssperr(x...)
 #  define sspinfo(x...)
 #endif
 
@@ -154,7 +154,7 @@ void weak_function lpcxpresso_sspdev_initialize(void)
 #ifdef CONFIG_LPC17_SSP0
 void  lpc17_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  sspdbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   ssp_dumpgpio("lpc17_ssp0select() Entry");
 
 #warning "Assert CS here (false)"
@@ -164,7 +164,7 @@ void  lpc17_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel
 
 uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  sspdbg("Returning SPI_STATUS_PRESENT\n");
+  ssperr("Returning SPI_STATUS_PRESENT\n");
   return SPI_STATUS_PRESENT;
 }
 #endif
@@ -172,7 +172,7 @@ uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_LPC17_SSP1
 void  lpc17_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  sspdbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   ssp_dumpgpio("lpc17_ssp1select() Entry");
 
   if (devid == SPIDEV_MMCSD)
@@ -200,12 +200,12 @@ uint8_t lpc17_ssp1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 
       if (lpc17_gpioread(LPCXPRESSO_SD_CD) == 0)
         {
-          sspdbg("Returning SPI_STATUS_PRESENT\n");
+          ssperr("Returning SPI_STATUS_PRESENT\n");
           return SPI_STATUS_PRESENT;
         }
     }
 
-  sspdbg("Returning zero\n");
+  ssperr("Returning zero\n");
   return 0;
 }
 #endif
diff --git a/configs/maple/src/stm32_lcd.c b/configs/maple/src/stm32_lcd.c
index 13b7ba2c62..c273ba54c6 100644
--- a/configs/maple/src/stm32_lcd.c
+++ b/configs/maple/src/stm32_lcd.c
@@ -84,9 +84,9 @@
 #endif
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg(format, ...)  info(format, ##__VA_ARGS__)
+#  define lcderr(format, ...)  info(format, ##__VA_ARGS__)
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #endif
 
 /****************************************************************************
@@ -107,7 +107,7 @@ static int up_lcdextcominisr(int irq, void *context)
   STM32_TIM_ACKINT(tim, 0);
   if (g_isr == NULL)
     {
-      lcddbg("error, irq not attached, disabled\n");
+      lcderr("error, irq not attached, disabled\n");
       STM32_TIM_DISABLEINT(tim, 0);
       return OK;
     }
@@ -117,7 +117,7 @@ static int up_lcdextcominisr(int irq, void *context)
 
 static int up_lcdirqattach(xcpt_t isr)
 {
-  lcddbg("%s IRQ\n", isr == NULL ? "Detach" : "Attach");
+  lcderr("%s IRQ\n", isr == NULL ? "Detach" : "Attach");
 
   if (isr != NULL)
     {
@@ -135,7 +135,7 @@ static int up_lcdirqattach(xcpt_t isr)
 
 static void up_lcddispcontrol(bool on)
 {
-  lcddbg("set: %s\n", on ? "on" : "off");
+  lcderr("set: %s\n", on ? "on" : "off");
 
   if (on)
     {
@@ -159,7 +159,7 @@ static void up_lcdsetpolarity(bool pol)
 
 static void up_lcdsetvcomfreq(unsigned int freq)
 {
-  lcddbg("freq: %d\n", freq);
+  lcderr("freq: %d\n", freq);
   DEBUGASSERT(freq >= 1 && freq <= 60);
   STM32_TIM_SETPERIOD(tim, TIMER_FREQ / freq);
 }
@@ -190,17 +190,17 @@ static FAR struct memlcd_priv_s memlcd_priv =
 
 FAR int board_lcd_initialize(void)
 {
-  lcddbg("Initializing lcd\n");
+  lcderr("Initializing lcd\n");
 
-  lcddbg("init spi1\n");
+  lcderr("init spi1\n");
   spi = stm32_spibus_initialize(1);
   DEBUGASSERT(spi);
 
-  lcddbg("configure related io\n");
+  lcderr("configure related io\n");
   stm32_configgpio(GPIO_MEMLCD_EXTCOMIN);
   stm32_configgpio(GPIO_MEMLCD_DISP);
 
-  lcddbg("configure EXTCOMIN timer\n");
+  lcderr("configure EXTCOMIN timer\n");
   if (tim == NULL)
     {
       tim = stm32_tim_init(2);
@@ -210,7 +210,7 @@ FAR int board_lcd_initialize(void)
       STM32_TIM_SETMODE(tim, STM32_TIM_MODE_UP);
     }
 
-  lcddbg("init lcd\n");
+  lcderr("init lcd\n");
   l_lcddev = memlcd_initialize(spi, &memlcd_priv, 0);
   DEBUGASSERT(l_lcddev);
 
diff --git a/configs/maple/src/stm32_leds.c b/configs/maple/src/stm32_leds.c
index 21ebcd63e7..dd7bc6d305 100644
--- a/configs/maple/src/stm32_leds.c
+++ b/configs/maple/src/stm32_leds.c
@@ -62,10 +62,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/maple/src/stm32_spi.c b/configs/maple/src/stm32_spi.c
index 367c3923af..881adf8d72 100644
--- a/configs/maple/src/stm32_spi.c
+++ b/configs/maple/src/stm32_spi.c
@@ -67,14 +67,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg llerr
+#  define spierr llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -134,7 +134,7 @@ void weak_function stm32_spidev_initialize(void)
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
                       bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
 #  if defined(CONFIG_LCD_SHARP_MEMLCD)
   if (devid == SPIDEV_DISPLAY)
diff --git a/configs/mbed/src/lpc17_adc.c b/configs/mbed/src/lpc17_adc.c
index aea44427e0..b8f0724d7f 100644
--- a/configs/mbed/src/lpc17_adc.c
+++ b/configs/mbed/src/lpc17_adc.c
@@ -101,7 +101,7 @@ int board_adc_setup(void)
       adc = lpc17_adcinitialize();
       if (adc == NULL)
         {
-          adbg("ERROR: Failed to get ADC interface\n");
+          aerr("ERROR: Failed to get ADC interface\n");
           return -ENODEV;
         }
 
@@ -110,7 +110,7 @@ int board_adc_setup(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          adbg("adc_register failed: %d\n", ret);
+          aerr("adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/mbed/src/lpc17_dac.c b/configs/mbed/src/lpc17_dac.c
index 6f18a1411d..d3a4733278 100644
--- a/configs/mbed/src/lpc17_dac.c
+++ b/configs/mbed/src/lpc17_dac.c
@@ -81,14 +81,14 @@ int dac_devinit(void)
     dac = lpc17_dacinitialize();
     if (dac == NULL)
       {
-        adbg("ERROR: Failed to get dac interface\n");
+        aerr("ERROR: Failed to get dac interface\n");
         return -ENODEV;
       }
 
     ret = dac_register("/dev/dac0", dac);
     if (ret < 0)
       {
-        adbg("dac_register failed: %d\n", ret);
+        aerr("dac_register failed: %d\n", ret);
         return ret;
       }
 
diff --git a/configs/mbed/src/lpc17_hidkbd.c b/configs/mbed/src/lpc17_hidkbd.c
index 38fbca9033..fc17d82de7 100644
--- a/configs/mbed/src/lpc17_hidkbd.c
+++ b/configs/mbed/src/lpc17_hidkbd.c
@@ -76,7 +76,7 @@ struct usbhost_connection_s *arch_usbhost_initialize(void)
   ret = usbhost_hub_initialize();
   if (ret < 0)
     {
-      udbg("ERROR: usbhost_hub_initialize failed: %d\n", ret);
+      uerr("ERROR: usbhost_hub_initialize failed: %d\n", ret);
     }
 #endif
 
diff --git a/configs/mbed/src/lpc17_leds.c b/configs/mbed/src/lpc17_leds.c
index ad5d98ad04..9b318c34a7 100644
--- a/configs/mbed/src/lpc17_leds.c
+++ b/configs/mbed/src/lpc17_leds.c
@@ -65,14 +65,14 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/mbed/src/lpc17_pwm.c b/configs/mbed/src/lpc17_pwm.c
index d3021d7063..6cc6f33101 100644
--- a/configs/mbed/src/lpc17_pwm.c
+++ b/configs/mbed/src/lpc17_pwm.c
@@ -100,7 +100,7 @@ int board_pwm_setup(void)
       pwm = lpc17_pwminitialize(0);
       if (!pwm)
         {
-          adbg("Failed to get the LPC17XX PWM lower half\n");
+          aerr("Failed to get the LPC17XX PWM lower half\n");
           return -ENODEV;
         }
 
@@ -109,14 +109,14 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          adbg("pwm_register failed: %d\n", ret);
+          aerr("pwm_register failed: %d\n", ret);
           return ret;
         }
 
       mcpwm = lpc17_mcpwminitialize(0);
       if (!mcpwm)
         {
-          adbg("Failed to get the LPC17XX MOTOR PWM lower half\n");
+          aerr("Failed to get the LPC17XX MOTOR PWM lower half\n");
           return -ENODEV;
         }
 
@@ -125,14 +125,14 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/mcpwm0", mcpwm);
       if (ret < 0)
         {
-          adbg("mcpwm_register failed: %d\n", ret);
+          aerr("mcpwm_register failed: %d\n", ret);
           return ret;
         }
 
       timer = lpc17_timerinitialize(0);
       if (!timer)
         {
-          adbg("Failed to get the LPC17XX TIMER lower half\n");
+          aerr("Failed to get the LPC17XX TIMER lower half\n");
           return -ENODEV;
         }
 
@@ -141,7 +141,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/timer0", timer);
       if (ret < 0)
         {
-          adbg("timer_register failed: %d\n", ret);
+          aerr("timer_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/mcu123-lpc214x/src/lpc2148_spi1.c b/configs/mcu123-lpc214x/src/lpc2148_spi1.c
index 1a550e1aaa..336a0b0d61 100644
--- a/configs/mcu123-lpc214x/src/lpc2148_spi1.c
+++ b/configs/mcu123-lpc214x/src/lpc2148_spi1.c
@@ -89,14 +89,14 @@
 /* Enables debug output from this file */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -232,14 +232,14 @@ static void spi_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel
     {
       /* Enable slave select (low enables) */
 
-      spidbg("CS asserted\n");
+      spierr("CS asserted\n");
       putreg32(bit, CS_CLR_REGISTER);
     }
   else
     {
       /* Disable slave select (low enables) */
 
-      spidbg("CS de-asserted\n");
+      spierr("CS de-asserted\n");
       putreg32(bit, CS_SET_REGISTER);
 
       /* Wait for the TX FIFO not full indication */
@@ -296,7 +296,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
   divisor = (divisor + 1) & ~1;
   putreg8(divisor, LPC214X_SPI1_CPSR);
 
-  spidbg("Frequency %d->%d\n", frequency, LPC214X_PCLKFREQ / divisor);
+  spierr("Frequency %d->%d\n", frequency, LPC214X_PCLKFREQ / divisor);
   return LPC214X_PCLKFREQ / divisor;
 }
 
@@ -321,7 +321,7 @@ static uint8_t spi_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
    * board.
    */
 
-  spidbg("Return SPI_STATUS_PRESENT\n");
+  spierr("Return SPI_STATUS_PRESENT\n");
   return SPI_STATUS_PRESENT;
 }
 
@@ -392,7 +392,7 @@ static uint16_t spi_send(FAR struct spi_dev_s *dev, uint16_t wd)
   /* Get the value from the RX FIFO and return it */
 
   regval = getreg16(LPC214X_SPI1_DR);
-  spidbg("%04x->%04x\n", wd, regval);
+  spierr("%04x->%04x\n", wd, regval);
   return regval;
 }
 
@@ -422,7 +422,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size
 
   /* Loop while thre are bytes remaining to be sent */
 
-  spidbg("nwords: %d\n", nwords);
+  spierr("nwords: %d\n", nwords);
   while (nwords > 0)
     {
       /* While the TX FIFO is not full and there are bytes left to send */
@@ -439,7 +439,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size
 
   /* Then discard all card responses until the RX & TX FIFOs are emptied. */
 
-  spidbg("discarding\n");
+  spierr("discarding\n");
   do
     {
       /* Is there anything in the RX fifo? */
@@ -493,7 +493,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw
 
   /* While there is remaining to be sent (and no synchronization error has occurred) */
 
-  spidbg("nwords: %d\n", nwords);
+  spierr("nwords: %d\n", nwords);
   while (nwords || rxpending)
     {
       /* Fill the transmit FIFO with 0xff...
diff --git a/configs/mikroe-stm32f4/src/stm32_mio283qt2.c b/configs/mikroe-stm32f4/src/stm32_mio283qt2.c
index 9abd9ebe04..f889efe80b 100644
--- a/configs/mikroe-stm32f4/src/stm32_mio283qt2.c
+++ b/configs/mikroe-stm32f4/src/stm32_mio283qt2.c
@@ -120,10 +120,10 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg       dbg
+#  define lcderr       err
 #  define lcdinfo      info
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -519,7 +519,7 @@ int board_lcd_initialize(void)
       g_stm32f4_lcd.drvr = mio283qt2_lcdinitialize(&g_stm32f4_lcd.dev);
       if (!g_stm32f4_lcd.drvr)
         {
-          lcddbg("ERROR: mio283qt2_lcdinitialize failed\n");
+          lcderr("ERROR: mio283qt2_lcdinitialize failed\n");
           return -ENODEV;
         }
     }
diff --git a/configs/mikroe-stm32f4/src/stm32_mio283qt9a.c b/configs/mikroe-stm32f4/src/stm32_mio283qt9a.c
index c007e5aebe..ae2e8555a4 100644
--- a/configs/mikroe-stm32f4/src/stm32_mio283qt9a.c
+++ b/configs/mikroe-stm32f4/src/stm32_mio283qt9a.c
@@ -121,10 +121,10 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg       dbg
+#  define lcderr       err
 #  define lcdinfo      info
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -520,7 +520,7 @@ int board_lcd_initialize(void)
       g_stm32f4_lcd.drvr = mio283qt9a_lcdinitialize(&g_stm32f4_lcd.dev);
       if (!g_stm32f4_lcd.drvr)
         {
-          lcddbg("ERROR: mio283qt9a_lcdinitialize failed\n");
+          lcderr("ERROR: mio283qt9a_lcdinitialize failed\n");
           return -ENODEV;
         }
     }
diff --git a/configs/mikroe-stm32f4/src/stm32_pwm.c b/configs/mikroe-stm32f4/src/stm32_pwm.c
index 11f0ea7c25..11a0f2b38c 100644
--- a/configs/mikroe-stm32f4/src/stm32_pwm.c
+++ b/configs/mikroe-stm32f4/src/stm32_pwm.c
@@ -119,7 +119,7 @@ int board_pwm_setup(void)
       pwm = stm32_pwminitialize(STM32F4DISCOVERY_PWMTIMER);
       if (!pwm)
         {
-          dbg("Failed to get the STM32 PWM lower half\n");
+          err("Failed to get the STM32 PWM lower half\n");
           return -ENODEV;
         }
 
@@ -128,7 +128,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          adbg("pwm_register failed: %d\n", ret);
+          aerr("pwm_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/mikroe-stm32f4/src/stm32_qencoder.c b/configs/mikroe-stm32f4/src/stm32_qencoder.c
index e2014a7530..4cd7738402 100644
--- a/configs/mikroe-stm32f4/src/stm32_qencoder.c
+++ b/configs/mikroe-stm32f4/src/stm32_qencoder.c
@@ -149,7 +149,7 @@ int qe_devinit(void)
       ret = stm32_qeinitialize("/dev/qe0", TIMID);
       if (ret < 0)
         {
-          sndbg("stm32_qeinitialize failed: %d\n", ret);
+          snerr("stm32_qeinitialize failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/mikroe-stm32f4/src/stm32_spi.c b/configs/mikroe-stm32f4/src/stm32_spi.c
index 1df1b6ee2f..f38ede5164 100644
--- a/configs/mikroe-stm32f4/src/stm32_spi.c
+++ b/configs/mikroe-stm32f4/src/stm32_spi.c
@@ -69,7 +69,7 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -77,7 +77,7 @@
 #  endif
 #else
 #  undef SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -211,7 +211,7 @@ uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -223,7 +223,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
diff --git a/configs/mikroe-stm32f4/src/stm32_touchscreen.c b/configs/mikroe-stm32f4/src/stm32_touchscreen.c
index 9965812de8..35b05c439e 100644
--- a/configs/mikroe-stm32f4/src/stm32_touchscreen.c
+++ b/configs/mikroe-stm32f4/src/stm32_touchscreen.c
@@ -530,7 +530,7 @@ static uint16_t tc_adc_read_sample(void)
 
   if (count > 0)
     {
-      idbg("Count = %d\n", count);
+      ierr("Count = %d\n", count);
     }
 
   return retval;
@@ -1017,7 +1017,7 @@ static void tc_worker(FAR void *arg)
 
           /* Notify any waiters that new touchscreen data is available */
 
-          idbg("1:X=%d, Y=%d\n", priv->sample.x, priv->sample.y);
+          ierr("1:X=%d, Y=%d\n", priv->sample.x, priv->sample.y);
 
           tc_notify(priv);
         }
@@ -1089,7 +1089,7 @@ static void tc_worker(FAR void *arg)
 
               /* Notify any waiters that nes touchscreen data is available */
 
-              idbg("2:X=%d, Y=%d\n", priv->sample.x, priv->sample.y);
+              ierr("2:X=%d, Y=%d\n", priv->sample.x, priv->sample.y);
 
               tc_notify(priv);
             }
@@ -1413,7 +1413,7 @@ static int tc_poll(FAR struct file *filep, FAR struct pollfd *fds,
 
       if ((fds->events & POLLIN) == 0)
         {
-          idbg("Missing POLLIN: revents: %08x\n", fds->revents);
+          ierr("Missing POLLIN: revents: %08x\n", fds->revents);
           ret = -EDEADLK;
           goto errout;
         }
@@ -1438,7 +1438,7 @@ static int tc_poll(FAR struct file *filep, FAR struct pollfd *fds,
 
       if (i >= CONFIG_TOUCHSCREEN_NPOLLWAITERS)
         {
-          idbg("No availabled slot found: %d\n", i);
+          ierr("No availabled slot found: %d\n", i);
           fds->priv    = NULL;
           ret          = -EBUSY;
           goto errout;
@@ -1533,7 +1533,7 @@ int board_tsc_setup(int minor)
   priv = (FAR struct tc_dev_s *)kmm_malloc(sizeof(struct tc_dev_s));
   if (!priv)
     {
-      idbg("kmm_malloc(%d) failed\n", sizeof(struct tc_dev_s));
+      ierr("kmm_malloc(%d) failed\n", sizeof(struct tc_dev_s));
       return -ENOMEM;
     }
 #endif
@@ -1552,7 +1552,7 @@ int board_tsc_setup(int minor)
   ret = register_driver(devname, &tc_fops, 0666, priv);
   if (ret < 0)
     {
-      idbg("register_driver() failed: %d\n", ret);
+      ierr("register_driver() failed: %d\n", ret);
       goto errout_with_priv;
     }
 
@@ -1564,7 +1564,7 @@ int board_tsc_setup(int minor)
   ret = work_queue(HPWORK, &priv->work, tc_worker, priv, 0);
   if (ret != 0)
     {
-      idbg("Failed to queue work: %d\n", ret);
+      ierr("Failed to queue work: %d\n", ret);
       goto errout_with_priv;
     }
 
diff --git a/configs/mikroe-stm32f4/src/stm32_usb.c b/configs/mikroe-stm32f4/src/stm32_usb.c
index 360dc363ba..2553d0d97d 100644
--- a/configs/mikroe-stm32f4/src/stm32_usb.c
+++ b/configs/mikroe-stm32f4/src/stm32_usb.c
@@ -184,7 +184,7 @@ int stm32_usbhost_initialize(void)
   ret = usbhost_msc_initialize();
   if (ret != OK)
     {
-      udbg("ERROR: Failed to register the mass storage class: %d\n", ret);
+      uerr("ERROR: Failed to register the mass storage class: %d\n", ret);
     }
 #endif
 
@@ -194,7 +194,7 @@ int stm32_usbhost_initialize(void)
   ret = usbhost_cdcacm_initialize();
   if (ret != OK)
     {
-      udbg("ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
+      uerr("ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
     }
 #endif
 
diff --git a/configs/mikroe-stm32f4/src/stm32_vs1053.c b/configs/mikroe-stm32f4/src/stm32_vs1053.c
index d8506e34a6..e45ebfad7c 100644
--- a/configs/mikroe-stm32f4/src/stm32_vs1053.c
+++ b/configs/mikroe-stm32f4/src/stm32_vs1053.c
@@ -197,7 +197,7 @@ void up_vs1053initialize(FAR struct spi_dev_s* spi)
   ret = audio_register(name, pVs1053);
   if (ret < 0)
     {
-      auddbg("up_vs1053initialize: Failed to register VS1053 Audio device\n");
+      auderr("up_vs1053initialize: Failed to register VS1053 Audio device\n");
     }
 
   audllinfo("Bound SPI port to VS1053 device %s\n", name);
diff --git a/configs/mirtoo/README.txt b/configs/mirtoo/README.txt
index 483e1d50a2..35fbb83c6a 100644
--- a/configs/mirtoo/README.txt
+++ b/configs/mirtoo/README.txt
@@ -592,7 +592,7 @@ Analog Input
   spi = pic32mx_spibus_initialize(2);
   if (!spi)
     {
-      dbg("ERROR: Failed to initialize SPI port 2\n");
+      err("ERROR: Failed to initialize SPI port 2\n");
       return -ENODEV;
     }
 
@@ -601,7 +601,7 @@ Analog Input
   handle = pga11x_initialize(spi);
   if (!handle)
     {
-      dbg("ERROR: Failed to bind SPI port 2 to the PGA117 driver\n");
+      err("ERROR: Failed to bind SPI port 2 to the PGA117 driver\n");
       return -ENODEV;
     }
 
@@ -617,7 +617,7 @@ Analog Input
   ret = pga11x_select(handle, &settings);
   if (ret < 0)
     {
-      dbg("ERROR: Failed to select channel 2, gain 2\n");
+      err("ERROR: Failed to select channel 2, gain 2\n");
       return -EIO;
     }
 
diff --git a/configs/mirtoo/src/pic32_appinit.c b/configs/mirtoo/src/pic32_appinit.c
index 9fad1495bf..2cf57476dd 100644
--- a/configs/mirtoo/src/pic32_appinit.c
+++ b/configs/mirtoo/src/pic32_appinit.c
@@ -125,7 +125,7 @@ int board_app_initialize(uintptr_t arg)
   spi = pic32mx_spibus_initialize(2);
   if (!spi)
     {
-      fdbg("ERROR: Failed to initialize SPI port 2\n");
+      ferr("ERROR: Failed to initialize SPI port 2\n");
       return -ENODEV;
     }
 
@@ -134,7 +134,7 @@ int board_app_initialize(uintptr_t arg)
   mtd = sst25_initialize(spi);
   if (!mtd)
     {
-      fdbg("ERROR: Failed to bind SPI port 2 to the SST 25 FLASH driver\n");
+      ferr("ERROR: Failed to bind SPI port 2 to the SST 25 FLASH driver\n");
       return -ENODEV;
     }
 
@@ -144,7 +144,7 @@ int board_app_initialize(uintptr_t arg)
   ret = ftl_initialize(CONFIG_NSH_MMCSDMINOR, mtd);
   if (ret < 0)
     {
-      fdbg("ERROR: Initialize the FTL layer\n");
+      ferr("ERROR: Initialize the FTL layer\n");
       return ret;
     }
 #else
@@ -153,7 +153,7 @@ int board_app_initialize(uintptr_t arg)
   ret = nxffs_initialize(mtd);
   if (ret < 0)
     {
-      fdbg("ERROR: NXFFS initialization failed: %d\n", -ret);
+      ferr("ERROR: NXFFS initialization failed: %d\n", -ret);
       return ret;
     }
 
@@ -162,7 +162,7 @@ int board_app_initialize(uintptr_t arg)
   ret = mount(NULL, "/mnt/sst25", "nxffs", 0, NULL);
   if (ret < 0)
     {
-      fdbg("ERROR: Failed to mount the NXFFS volume: %d\n", errno);
+      ferr("ERROR: Failed to mount the NXFFS volume: %d\n", errno);
       return ret;
     }
 #endif
diff --git a/configs/mirtoo/src/pic32_leds.c b/configs/mirtoo/src/pic32_leds.c
index bd5a9cbc3f..9d42fb6c25 100644
--- a/configs/mirtoo/src/pic32_leds.c
+++ b/configs/mirtoo/src/pic32_leds.c
@@ -94,7 +94,7 @@
 /* Debug ********************************************************************/
 
 #if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS)
-#  define leddbg  llerr
+#  define lederr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define ledinfo llerr
 #  else
@@ -103,7 +103,7 @@
 #else
 #  undef CONFIG_DEBUG_LEDS
 #  undef CONFIG_DEBUG_INFO
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/mirtoo/src/pic32_spi2.c b/configs/mirtoo/src/pic32_spi2.c
index 127c01b833..0a857e9735 100644
--- a/configs/mirtoo/src/pic32_spi2.c
+++ b/configs/mirtoo/src/pic32_spi2.c
@@ -98,10 +98,10 @@
  */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  llerr
+#  define spierr  llerr
 #  define spiinfo llinfo
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -175,7 +175,7 @@ enum spi_dev_e;
 
 void  pic32mx_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
   if (devid == SPIDEV_FLASH)
     {
diff --git a/configs/moteino-mega/src/avr_leds.c b/configs/moteino-mega/src/avr_leds.c
index 8920ebbe40..c6f7712e33 100644
--- a/configs/moteino-mega/src/avr_leds.c
+++ b/configs/moteino-mega/src/avr_leds.c
@@ -62,14 +62,14 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/ne64badge/src/m9s12_buttons.c b/configs/ne64badge/src/m9s12_buttons.c
index b4de029b42..ecd4c6741b 100644
--- a/configs/ne64badge/src/m9s12_buttons.c
+++ b/configs/ne64badge/src/m9s12_buttons.c
@@ -61,7 +61,7 @@
 #undef BUTTON_VERBOSE /* Define to enable verbose debug */
 
 #ifdef BUTTON_DEBUG
-#  define btndbg  llerr
+#  define btnerr  llerr
 #  ifdef BUTTON_VERBOSE
 #    define btninfo llerr
 #  else
@@ -69,7 +69,7 @@
 #  endif
 #else
 #  undef BUTTON_VERBOSE
-#  define btndbg(x...)
+#  define btnerr(x...)
 #  define btninfo(x...)
 #endif
 
diff --git a/configs/ne64badge/src/m9s12_leds.c b/configs/ne64badge/src/m9s12_leds.c
index 6d82d0283d..1c8705a0f7 100644
--- a/configs/ne64badge/src/m9s12_leds.c
+++ b/configs/ne64badge/src/m9s12_leds.c
@@ -57,14 +57,14 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/ne64badge/src/m9s12_spi.c b/configs/ne64badge/src/m9s12_spi.c
index c1586210f2..051c98c065 100644
--- a/configs/ne64badge/src/m9s12_spi.c
+++ b/configs/ne64badge/src/m9s12_spi.c
@@ -60,7 +60,7 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -68,7 +68,7 @@
 #  endif
 #else
 #  undef SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
diff --git a/configs/nucleo-144/src/stm32_appinitialize.c b/configs/nucleo-144/src/stm32_appinitialize.c
index df411ad94e..447a2ee8f6 100644
--- a/configs/nucleo-144/src/stm32_appinitialize.c
+++ b/configs/nucleo-144/src/stm32_appinitialize.c
@@ -114,7 +114,7 @@ int board_app_initialize(uintptr_t arg)
   ret = stm32_spidev_bus_init();
   if (ret != OK)
     {
-      fdbg("ERROR: Failed to initialize SPI interfaces: %d\n", ret);
+      ferr("ERROR: Failed to initialize SPI interfaces: %d\n", ret);
       return ret;
     }
 #endif
@@ -126,7 +126,7 @@ int board_app_initialize(uintptr_t arg)
   ret = stm32_sdio_initialize();
   if (ret != OK)
     {
-      fdbg("ERROR: Failed to initialize MMC/SD driver: %d\n", ret);
+      ferr("ERROR: Failed to initialize MMC/SD driver: %d\n", ret);
       return ret;
     }
 #endif
diff --git a/configs/nucleo-144/src/stm32_autoleds.c b/configs/nucleo-144/src/stm32_autoleds.c
index d09ca0114d..1a4756301b 100644
--- a/configs/nucleo-144/src/stm32_autoleds.c
+++ b/configs/nucleo-144/src/stm32_autoleds.c
@@ -59,10 +59,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/nucleo-144/src/stm32_sdio.c b/configs/nucleo-144/src/stm32_sdio.c
index 84c34feae8..447740e40d 100644
--- a/configs/nucleo-144/src/stm32_sdio.c
+++ b/configs/nucleo-144/src/stm32_sdio.c
@@ -140,7 +140,7 @@ int stm32_sdio_initialize(void)
   g_sdio_dev = sdio_initialize(SDIO_SLOTNO);
   if (!g_sdio_dev)
     {
-      fdbg("Failed to initialize SDIO slot %d\n", SDIO_SLOTNO);
+      ferr("Failed to initialize SDIO slot %d\n", SDIO_SLOTNO);
       return -ENODEV;
     }
 
@@ -151,7 +151,7 @@ int stm32_sdio_initialize(void)
   ret = mmcsd_slotinitialize(SDIO_MINOR, g_sdio_dev);
   if (ret != OK)
     {
-      fdbg("Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
+      ferr("Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
       return ret;
     }
 
diff --git a/configs/nucleo-144/src/stm32_spi.c b/configs/nucleo-144/src/stm32_spi.c
index 4b3dd05560..f94d02edc4 100644
--- a/configs/nucleo-144/src/stm32_spi.c
+++ b/configs/nucleo-144/src/stm32_spi.c
@@ -62,7 +62,7 @@
  ************************************************************************************/
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -70,7 +70,7 @@
 #  endif
 #else
 #  undef SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -228,7 +228,7 @@ void weak_function stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32F7_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   stm32_gpiowrite(g_spigpio[i], !selected);
 }
 
@@ -241,7 +241,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32F7_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   stm32_gpiowrite(g_spigpio[i], !selected);
 }
 
@@ -254,7 +254,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32F7_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   stm32_gpiowrite(g_spigpio[i], !selected);
 }
 
@@ -271,7 +271,7 @@ uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 
 void stm32_spi4select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   stm32_gpiowrite(g_spigpio[i], !selected);
 }
 
@@ -288,7 +288,7 @@ uint8_t stm32_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 
 void stm32_spi5select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   stm32_gpiowrite(g_spigpio[i], !selected);
 }
 
@@ -304,7 +304,7 @@ uint8_t stm32_spi5status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #  endif
 void stm32_spi5select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   stm32_gpiowrite(g_spigpio[i], !selected);
 }
 
diff --git a/configs/nucleo-144/src/stm32_userleds.c b/configs/nucleo-144/src/stm32_userleds.c
index 9325e07d19..15eb3039f0 100644
--- a/configs/nucleo-144/src/stm32_userleds.c
+++ b/configs/nucleo-144/src/stm32_userleds.c
@@ -61,10 +61,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/nucleo-f303re/src/stm32_adc.c b/configs/nucleo-f303re/src/stm32_adc.c
index 35d8ad5c3f..98282ba957 100644
--- a/configs/nucleo-f303re/src/stm32_adc.c
+++ b/configs/nucleo-f303re/src/stm32_adc.c
@@ -222,7 +222,7 @@ int board_adc_setup(void)
       adc = stm32_adcinitialize(ADC_PORT, g_chanlist, ADC_NCHANNELS);
       if (adc == NULL)
         {
-          adbg("ERROR: Failed to get ADC interface\n");
+          aerr("ERROR: Failed to get ADC interface\n");
           return -ENODEV;
         }
 
@@ -231,7 +231,7 @@ int board_adc_setup(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          adbg("adc_register failed: %d\n", ret);
+          aerr("adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/nucleo-f303re/src/stm32_autoleds.c b/configs/nucleo-f303re/src/stm32_autoleds.c
index cd20b4eea7..5941f5eb9a 100644
--- a/configs/nucleo-f303re/src/stm32_autoleds.c
+++ b/configs/nucleo-f303re/src/stm32_autoleds.c
@@ -62,10 +62,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/nucleo-f303re/src/stm32_can.c b/configs/nucleo-f303re/src/stm32_can.c
index 96d5351f7e..b89826195e 100644
--- a/configs/nucleo-f303re/src/stm32_can.c
+++ b/configs/nucleo-f303re/src/stm32_can.c
@@ -60,12 +60,12 @@
 /* Non-standard debug that may be enabled just for testing CAN */
 
 #ifdef CONFIG_DEBUG_CAN
-#  define candbg    dbg
+#  define canerr    err
 #  define caninfo   info
 #  define canllerr  llerr
 #  define canllinfo llinfo
 #else
-#  define candbg(x...)
+#  define canerr(x...)
 #  define caninfo(x...)
 #  define canllerr(x...)
 #  define canllinfo(x...)
@@ -111,7 +111,7 @@ int board_can_initialize(void)
       can = stm32_caninitialize(1);
       if (can == NULL)
         {
-          candbg("ERROR: Failed to get CAN interface\n");
+          canerr("ERROR: Failed to get CAN interface\n");
           return -ENODEV;
         }
 
@@ -120,7 +120,7 @@ int board_can_initialize(void)
       ret = can_register("/dev/can0", can);
       if (ret < 0)
         {
-          candbg("ERROR: can_register failed: %d\n", ret);
+          canerr("ERROR: can_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/nucleo-f303re/src/stm32_pwm.c b/configs/nucleo-f303re/src/stm32_pwm.c
index fd7bf916e3..da5fc9c2d6 100644
--- a/configs/nucleo-f303re/src/stm32_pwm.c
+++ b/configs/nucleo-f303re/src/stm32_pwm.c
@@ -61,12 +61,12 @@
 /* Non-standard debug that may be enabled just for testing PWM */
 
 #ifdef CONFIG_DEBUG_PWM
-#  define pwmdbg    dbg
+#  define pwmerr    err
 #  define pwminfo   info
 #  define pwmllerr  llerr
 #  define pwmllinfo llinfo
 #else
-#  define pwmdbg(x...)
+#  define pwmerr(x...)
 #  define pwminfo(x...)
 #  define pwmllerr(x...)
 #  define pwmllinfo(x...)
@@ -112,7 +112,7 @@ int board_pwm_setup(void)
       pwm = stm32_pwminitialize(NUCLEO_F303RE_PWMTIMER);
       if (pwm == NULL)
         {
-          pwmdbg("Failed to get the STM32 PWM lower half\n");
+          pwmerr("Failed to get the STM32 PWM lower half\n");
           return -ENODEV;
         }
 
@@ -121,7 +121,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          pwmdbg("pwm_register failed: %d\n", ret);
+          pwmerr("pwm_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/nucleo-f303re/src/stm32_spi.c b/configs/nucleo-f303re/src/stm32_spi.c
index 8bf3a5a270..800b0f0e96 100644
--- a/configs/nucleo-f303re/src/stm32_spi.c
+++ b/configs/nucleo-f303re/src/stm32_spi.c
@@ -66,7 +66,7 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg llerr
+#  define spierr llerr
 #  ifdef SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -74,7 +74,7 @@
 #  endif
 #else
 #  undef SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -132,7 +132,7 @@ void weak_function stm32_spidev_initialize(void)
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
                       bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
 #if defined(CONFIG_LCD_SSD1351)
   if (devid == SPIDEV_DISPLAY)
@@ -152,7 +152,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
                       bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -165,7 +165,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
                       bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
diff --git a/configs/nucleo-f303re/src/stm32_ssd1351.c b/configs/nucleo-f303re/src/stm32_ssd1351.c
index e58561c53d..b915c110bc 100644
--- a/configs/nucleo-f303re/src/stm32_ssd1351.c
+++ b/configs/nucleo-f303re/src/stm32_ssd1351.c
@@ -74,10 +74,10 @@
 /* Debug ********************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg(format, ...)  dbg(format, ##__VA_ARGS__)
+#  define lcderr(format, ...)  err(format, ##__VA_ARGS__)
 #  define lcdinfo(format, ...) info(format, ##__VA_ARGS__)
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -114,7 +114,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
   spi = stm32_spibus_initialize(1);
   if (spi == NULL)
     {
-      lcddbg("Failed to initialize SPI port 1\n");
+      lcderr("Failed to initialize SPI port 1\n");
     }
   else
     {
@@ -123,7 +123,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
       dev = ssd1351_initialize(spi, devno);
       if (dev == NULL)
         {
-          lcddbg("Failed to bind SPI port 1 to OLED %d: %d\n", devno);
+          lcderr("Failed to bind SPI port 1 to OLED %d: %d\n", devno);
         }
      else
         {
diff --git a/configs/nucleo-f303re/src/stm32_userleds.c b/configs/nucleo-f303re/src/stm32_userleds.c
index cd23d08ba5..d1969ad0d6 100644
--- a/configs/nucleo-f303re/src/stm32_userleds.c
+++ b/configs/nucleo-f303re/src/stm32_userleds.c
@@ -61,10 +61,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/nucleo-f4x1re/src/stm32_adc.c b/configs/nucleo-f4x1re/src/stm32_adc.c
index e6aaf7cc4c..0a82058cfe 100644
--- a/configs/nucleo-f4x1re/src/stm32_adc.c
+++ b/configs/nucleo-f4x1re/src/stm32_adc.c
@@ -137,7 +137,7 @@ int board_adc_initialize(void)
       adc = stm32_adcinitialize(1, g_adc1_chanlist, ADC1_NCHANNELS);
       if (adc == NULL)
         {
-          adbg("ERROR: Failed to get ADC interface\n");
+          aerr("ERROR: Failed to get ADC interface\n");
           return -ENODEV;
         }
 
@@ -146,7 +146,7 @@ int board_adc_initialize(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          adbg("adc_register failed: %d\n", ret);
+          aerr("adc_register failed: %d\n", ret);
           return ret;
         }
 #endif
diff --git a/configs/nucleo-f4x1re/src/stm32_ajoystick.c b/configs/nucleo-f4x1re/src/stm32_ajoystick.c
index b412069d54..d4cb9d374e 100644
--- a/configs/nucleo-f4x1re/src/stm32_ajoystick.c
+++ b/configs/nucleo-f4x1re/src/stm32_ajoystick.c
@@ -212,14 +212,14 @@ static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower,
       int errcode = get_errno();
       if (errcode != EINTR)
         {
-          idbg("ERROR: read failed: %d\n", errcode);
+          ierr("ERROR: read failed: %d\n", errcode);
         }
 
       return -errcode;
     }
   else if (nread < NJOYSTICK_CHANNELS * sizeof(struct adc_msg_s))
     {
-      idbg("ERROR: read too small: %ld\n", (long)nread);
+      ierr("ERROR: read too small: %ld\n", (long)nread);
       return -EIO;
     }
 
@@ -266,7 +266,7 @@ static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower,
 
   if (have != 3)
     {
-      idbg("ERROR: Could not find joystick channels\n");
+      ierr("ERROR: Could not find joystick channels\n");
       return -EIO;
     }
 
@@ -460,7 +460,7 @@ int board_ajoy_initialize(void)
   ret = board_adc_initialize();
   if (ret < 0)
     {
-      idbg("ERROR: board_adc_initialize() failed: %d\n", ret);
+      ierr("ERROR: board_adc_initialize() failed: %d\n", ret);
       return ret;
     }
 
@@ -470,7 +470,7 @@ int board_ajoy_initialize(void)
   if (fd < 0)
     {
       int errcode = get_errno();
-      idbg("ERROR: Failed to open /dev/adc0: %d\n", errcode);
+      ierr("ERROR: Failed to open /dev/adc0: %d\n", errcode);
       return -errcode;
     }
 
@@ -481,7 +481,7 @@ int board_ajoy_initialize(void)
   ret = file_detach(fd, &g_adcfile);
   if (ret < 0)
     {
-      idbg("ERROR: Failed to detach from file descriptor: %d\n", ret);
+      ierr("ERROR: Failed to detach from file descriptor: %d\n", ret);
       (void)close(fd);
       return ret;
     }
@@ -506,7 +506,7 @@ int board_ajoy_initialize(void)
   ret = ajoy_register("/dev/ajoy0", &g_ajoylower);
   if (ret < 0)
     {
-      idbg("ERROR: ajoy_register failed: %d\n", ret);
+      ierr("ERROR: ajoy_register failed: %d\n", ret);
 #ifndef NO_JOYSTICK_ADC
       file_close_detached(&g_adcfile);
 #endif
diff --git a/configs/nucleo-f4x1re/src/stm32_autoleds.c b/configs/nucleo-f4x1re/src/stm32_autoleds.c
index 306787b1a9..242517858b 100644
--- a/configs/nucleo-f4x1re/src/stm32_autoleds.c
+++ b/configs/nucleo-f4x1re/src/stm32_autoleds.c
@@ -63,10 +63,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/nucleo-f4x1re/src/stm32_spi.c b/configs/nucleo-f4x1re/src/stm32_spi.c
index 172998ff55..ea86096b6f 100644
--- a/configs/nucleo-f4x1re/src/stm32_spi.c
+++ b/configs/nucleo-f4x1re/src/stm32_spi.c
@@ -67,14 +67,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -111,7 +111,7 @@ void weak_function stm32_spidev_initialize(void)
   g_spi1 = stm32_spibus_initialize(1);
   if (!g_spi1)
     {
-      spidbg("[boot] FAILED to initialize SPI port 1\n");
+      spierr("[boot] FAILED to initialize SPI port 1\n");
     }
 
 #ifdef CONFIG_WL_CC3000
@@ -166,7 +166,7 @@ void weak_function stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
 #ifdef CONFIG_WL_CC3000
   if (devid == SPIDEV_WIRELESS)
@@ -192,7 +192,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
 #ifdef CONFIG_WL_CC3000
   if (devid == SPIDEV_WIRELESS)
@@ -211,7 +211,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
diff --git a/configs/nucleo-f4x1re/src/stm32_userleds.c b/configs/nucleo-f4x1re/src/stm32_userleds.c
index 951b2b7cfe..b75a12d63b 100644
--- a/configs/nucleo-f4x1re/src/stm32_userleds.c
+++ b/configs/nucleo-f4x1re/src/stm32_userleds.c
@@ -63,10 +63,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/nucleo-f4x1re/src/stm32_wireless.c b/configs/nucleo-f4x1re/src/stm32_wireless.c
index 2ed8a1bd69..07680a724d 100644
--- a/configs/nucleo-f4x1re/src/stm32_wireless.c
+++ b/configs/nucleo-f4x1re/src/stm32_wireless.c
@@ -280,7 +280,7 @@ int wireless_archinitialize(size_t max_rx_size)
 
   /* Init SPI bus */
 
-  idbg("minor %d\n", minor);
+  ierr("minor %d\n", minor);
   DEBUGASSERT(CONFIG_CC3000_DEVMINOR == 0);
 
 #ifdef CONFIG_CC3000_PROBES
@@ -295,7 +295,7 @@ int wireless_archinitialize(size_t max_rx_size)
   spi = stm32_spibus_initialize(CONFIG_CC3000_SPIDEV);
   if (!spi)
     {
-      idbg("Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV);
+      ierr("Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV);
       return -ENODEV;
     }
 
@@ -305,7 +305,7 @@ int wireless_archinitialize(size_t max_rx_size)
   int ret = cc3000_register(spi, &g_cc3000_info.dev, CONFIG_CC3000_DEVMINOR);
   if (ret < 0)
     {
-      idbg("Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV);
+      ierr("Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV);
       return -ENODEV;
     }
 
diff --git a/configs/nucleo-l476rg/src/stm32_adc.c b/configs/nucleo-l476rg/src/stm32_adc.c
index 45329b3817..0148f769ad 100644
--- a/configs/nucleo-l476rg/src/stm32_adc.c
+++ b/configs/nucleo-l476rg/src/stm32_adc.c
@@ -137,7 +137,7 @@ int board_adc_initialize(void)
       adc = stm32_adcinitialize(1, g_adc1_chanlist, ADC1_NCHANNELS);
       if (adc == NULL)
         {
-          adbg("ERROR: Failed to get ADC interface\n");
+          aerr("ERROR: Failed to get ADC interface\n");
           return -ENODEV;
         }
 
@@ -146,7 +146,7 @@ int board_adc_initialize(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          adbg("adc_register failed: %d\n", ret);
+          aerr("adc_register failed: %d\n", ret);
           return ret;
         }
 #endif
diff --git a/configs/nucleo-l476rg/src/stm32_ajoystick.c b/configs/nucleo-l476rg/src/stm32_ajoystick.c
index 460440323e..1eaf3db609 100644
--- a/configs/nucleo-l476rg/src/stm32_ajoystick.c
+++ b/configs/nucleo-l476rg/src/stm32_ajoystick.c
@@ -211,14 +211,14 @@ static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower,
       int errcode = get_errno();
       if (errcode != EINTR)
         {
-          idbg("ERROR: read failed: %d\n", errcode);
+          ierr("ERROR: read failed: %d\n", errcode);
         }
 
       return -errcode;
     }
   else if (nread < NJOYSTICK_CHANNELS * sizeof(struct adc_msg_s))
     {
-      idbg("ERROR: read too small: %ld\n", (long)nread);
+      ierr("ERROR: read too small: %ld\n", (long)nread);
       return -EIO;
     }
 
@@ -265,7 +265,7 @@ static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower,
 
   if (have != 3)
     {
-      idbg("ERROR: Could not find joystick channels\n");
+      ierr("ERROR: Could not find joystick channels\n");
       return -EIO;
     }
 
@@ -459,7 +459,7 @@ int board_ajoy_initialize(void)
   ret = board_adc_initialize();
   if (ret < 0)
     {
-      idbg("ERROR: board_adc_initialize() failed: %d\n", ret);
+      ierr("ERROR: board_adc_initialize() failed: %d\n", ret);
       return ret;
     }
 
@@ -469,7 +469,7 @@ int board_ajoy_initialize(void)
   if (fd < 0)
     {
       int errcode = get_errno();
-      idbg("ERROR: Failed to open /dev/adc0: %d\n", errcode);
+      ierr("ERROR: Failed to open /dev/adc0: %d\n", errcode);
       return -errcode;
     }
 
@@ -480,7 +480,7 @@ int board_ajoy_initialize(void)
   ret = file_detach(fd, &g_adcfile);
   if (ret < 0)
     {
-      idbg("ERROR: Failed to detach from file descriptor: %d\n", ret);
+      ierr("ERROR: Failed to detach from file descriptor: %d\n", ret);
       (void)close(fd);
       return ret;
     }
@@ -505,7 +505,7 @@ int board_ajoy_initialize(void)
   ret = ajoy_register("/dev/ajoy0", &g_ajoylower);
   if (ret < 0)
     {
-      idbg("ERROR: ajoy_register failed: %d\n", ret);
+      ierr("ERROR: ajoy_register failed: %d\n", ret);
 #ifndef NO_JOYSTICK_ADC
       file_close_detached(&g_adcfile);
 #endif
diff --git a/configs/nucleo-l476rg/src/stm32_appinit.c b/configs/nucleo-l476rg/src/stm32_appinit.c
index 96190c07c5..9910184bf8 100644
--- a/configs/nucleo-l476rg/src/stm32_appinit.c
+++ b/configs/nucleo-l476rg/src/stm32_appinit.c
@@ -143,7 +143,7 @@ int board_app_initialize(uintptr_t arg)
   rtclower = stm32l4_rtc_lowerhalf();
   if (!rtclower)
     {
-      sdbg("ERROR: Failed to instantiate the RTC lower-half driver\n");
+      serr("ERROR: Failed to instantiate the RTC lower-half driver\n");
       return -ENOMEM;
     }
   else
@@ -155,7 +155,7 @@ int board_app_initialize(uintptr_t arg)
       ret = rtc_initialize(0, rtclower);
       if (ret < 0)
         {
-          sdbg("ERROR: Failed to bind/register the RTC driver: %d\n", ret);
+          serr("ERROR: Failed to bind/register the RTC driver: %d\n", ret);
           return ret;
         }
     }
diff --git a/configs/nucleo-l476rg/src/stm32_autoleds.c b/configs/nucleo-l476rg/src/stm32_autoleds.c
index c94472e74e..45d84d7778 100644
--- a/configs/nucleo-l476rg/src/stm32_autoleds.c
+++ b/configs/nucleo-l476rg/src/stm32_autoleds.c
@@ -63,10 +63,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/nucleo-l476rg/src/stm32_spi.c b/configs/nucleo-l476rg/src/stm32_spi.c
index e359670b47..a5dec3a6db 100644
--- a/configs/nucleo-l476rg/src/stm32_spi.c
+++ b/configs/nucleo-l476rg/src/stm32_spi.c
@@ -67,14 +67,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -111,7 +111,7 @@ void weak_function stm32_spiinitialize(void)
   g_spi1 = up_spiinitialize(1);
   if (!g_spi1)
     {
-      spidbg("[boot] FAILED to initialize SPI port 1\n");
+      spierr("[boot] FAILED to initialize SPI port 1\n");
     }
 
 #ifdef CONFIG_WL_CC3000
@@ -166,7 +166,7 @@ void weak_function stm32_spiinitialize(void)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
 #ifdef CONFIG_WL_CC3000
   if (devid == SPIDEV_WIRELESS)
@@ -192,7 +192,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
 #ifdef CONFIG_WL_CC3000
   if (devid == SPIDEV_WIRELESS)
@@ -211,7 +211,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
diff --git a/configs/nucleo-l476rg/src/stm32_userleds.c b/configs/nucleo-l476rg/src/stm32_userleds.c
index 1745510298..a2ebbe3dd5 100644
--- a/configs/nucleo-l476rg/src/stm32_userleds.c
+++ b/configs/nucleo-l476rg/src/stm32_userleds.c
@@ -63,10 +63,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/nucleo-l476rg/src/stm32_wireless.c b/configs/nucleo-l476rg/src/stm32_wireless.c
index 10c4c28c1b..bdd8f2f6af 100644
--- a/configs/nucleo-l476rg/src/stm32_wireless.c
+++ b/configs/nucleo-l476rg/src/stm32_wireless.c
@@ -280,7 +280,7 @@ int wireless_archinitialize(size_t max_rx_size)
 
   /* Init SPI bus */
 
-  idbg("minor %d\n", minor);
+  ierr("minor %d\n", minor);
   DEBUGASSERT(CONFIG_CC3000_DEVMINOR == 0);
 
 #ifdef CONFIG_CC3000_PROBES
@@ -295,7 +295,7 @@ int wireless_archinitialize(size_t max_rx_size)
   spi = up_spiinitialize(CONFIG_CC3000_SPIDEV);
   if (!spi)
     {
-      idbg("Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV);
+      ierr("Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV);
       return -ENODEV;
     }
 
@@ -305,7 +305,7 @@ int wireless_archinitialize(size_t max_rx_size)
   int ret = cc3000_register(spi, &g_cc3000_info.dev, CONFIG_CC3000_DEVMINOR);
   if (ret < 0)
     {
-      idbg("Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV);
+      ierr("Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV);
       return -ENODEV;
     }
 
diff --git a/configs/nutiny-nuc120/src/nuc_led.c b/configs/nutiny-nuc120/src/nuc_led.c
index 8d8596c2f9..2d76cb7489 100644
--- a/configs/nutiny-nuc120/src/nuc_led.c
+++ b/configs/nutiny-nuc120/src/nuc_led.c
@@ -81,14 +81,14 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/olimex-lpc-h3131/src/lpc31_leds.c b/configs/olimex-lpc-h3131/src/lpc31_leds.c
index 398afab3d3..613e4063dc 100644
--- a/configs/olimex-lpc-h3131/src/lpc31_leds.c
+++ b/configs/olimex-lpc-h3131/src/lpc31_leds.c
@@ -62,10 +62,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/olimex-lpc-h3131/src/lpc31_mmcsd.c b/configs/olimex-lpc-h3131/src/lpc31_mmcsd.c
index 9e243a9a61..e5ccb3691a 100644
--- a/configs/olimex-lpc-h3131/src/lpc31_mmcsd.c
+++ b/configs/olimex-lpc-h3131/src/lpc31_mmcsd.c
@@ -80,7 +80,7 @@ int lpc31_mmcsd_initialize(int slot, int minor)
   sdio = sdio_initialize(slot);
   if (!sdio)
     {
-      fdbg("ERROR: Failed to initialize SDIO slot %d\n", slot);
+      ferr("ERROR: Failed to initialize SDIO slot %d\n", slot);
       return -ENODEV;
     }
 
@@ -90,7 +90,7 @@ int lpc31_mmcsd_initialize(int slot, int minor)
   ret = mmcsd_slotinitialize(minor, sdio);
   if (ret != OK)
     {
-      fdbg("ERROR: Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
+      ferr("ERROR: Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
       return ret;
     }
 
diff --git a/configs/olimex-lpc-h3131/src/lpc31_spi.c b/configs/olimex-lpc-h3131/src/lpc31_spi.c
index 3da8396047..0d91d346b4 100644
--- a/configs/olimex-lpc-h3131/src/lpc31_spi.c
+++ b/configs/olimex-lpc-h3131/src/lpc31_spi.c
@@ -65,7 +65,7 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -73,7 +73,7 @@
 #  endif
 #else
 #  undef SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -127,7 +127,7 @@ void weak_function lpc31_spidev_intialize(void)
 
 void lpc31_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
diff --git a/configs/olimex-lpc-h3131/src/lpc31_usbhost.c b/configs/olimex-lpc-h3131/src/lpc31_usbhost.c
index cb98d49c06..a52f94d458 100644
--- a/configs/olimex-lpc-h3131/src/lpc31_usbhost.c
+++ b/configs/olimex-lpc-h3131/src/lpc31_usbhost.c
@@ -195,7 +195,7 @@ int lpc31_usbhost_initialize(void)
   ret = usbhost_msc_initialize();
   if (ret != OK)
     {
-      udbg("ERROR: Failed to register the mass storage class: %d\n", ret);
+      uerr("ERROR: Failed to register the mass storage class: %d\n", ret);
     }
 #endif
 
@@ -205,7 +205,7 @@ int lpc31_usbhost_initialize(void)
   ret = usbhost_cdcacm_initialize();
   if (ret != OK)
     {
-      udbg("ERROR: Failed to register the CDC/ACM serial class\n");
+      uerr("ERROR: Failed to register the CDC/ACM serial class\n");
     }
 #endif
 
@@ -215,7 +215,7 @@ int lpc31_usbhost_initialize(void)
   ret = usbhost_kbdinit();
   if (ret != OK)
     {
-      udbg("ERROR: Failed to register the KBD class\n");
+      uerr("ERROR: Failed to register the KBD class\n");
     }
 #endif
 
@@ -224,7 +224,7 @@ int lpc31_usbhost_initialize(void)
   g_ehciconn = lpc31_ehci_initialize(0);
   if (!g_ehciconn)
     {
-      udbg("ERROR: lpc31_ehci_initialize failed\n");
+      uerr("ERROR: lpc31_ehci_initialize failed\n");
       return -ENODEV;
     }
 
@@ -234,7 +234,7 @@ int lpc31_usbhost_initialize(void)
                     (main_t)ehci_waiter, (FAR char * const *)NULL);
   if (pid < 0)
     {
-      udbg("ERROR: Failed to create ehci_waiter task: %d\n", ret);
+      uerr("ERROR: Failed to create ehci_waiter task: %d\n", ret);
       return -ENODEV;
     }
 
diff --git a/configs/olimex-lpc1766stk/src/lpc17_can.c b/configs/olimex-lpc1766stk/src/lpc17_can.c
index 43bddd81a9..3fe2c05cbf 100644
--- a/configs/olimex-lpc1766stk/src/lpc17_can.c
+++ b/configs/olimex-lpc1766stk/src/lpc17_can.c
@@ -77,12 +77,12 @@
 /* Non-standard debug that may be enabled just for testing CAN */
 
 #ifdef CONFIG_DEBUG_CAN
-#  define candbg    dbg
+#  define canerr    err
 #  define caninfo   info
 #  define canllerr  llerr
 #  define canllinfo llinfo
 #else
-#  define candbg(x...)
+#  define canerr(x...)
 #  define caninfo(x...)
 #  define canllerr(x...)
 #  define canllinfo(x...)
@@ -120,7 +120,7 @@ int board_can_initialize(void)
       can = lpc17_caninitialize(CAN_PORT);
       if (can == NULL)
         {
-          candbg("ERROR:  Failed to get CAN interface\n");
+          canerr("ERROR:  Failed to get CAN interface\n");
           return -ENODEV;
         }
 
@@ -129,7 +129,7 @@ int board_can_initialize(void)
       ret = can_register("/dev/can0", can);
       if (ret < 0)
         {
-          candbg("ERROR: can_register failed: %d\n", ret);
+          canerr("ERROR: can_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/olimex-lpc1766stk/src/lpc17_hidkbd.c b/configs/olimex-lpc1766stk/src/lpc17_hidkbd.c
index 7c0d304fd1..a92e00774e 100644
--- a/configs/olimex-lpc1766stk/src/lpc17_hidkbd.c
+++ b/configs/olimex-lpc1766stk/src/lpc17_hidkbd.c
@@ -76,7 +76,7 @@ struct usbhost_connection_s *arch_usbhost_initialize(void)
   ret = usbhost_hub_initialize();
   if (ret < 0)
     {
-      udbg("ERROR: usbhost_hub_initialize failed: %d\n", ret);
+      uerr("ERROR: usbhost_hub_initialize failed: %d\n", ret);
     }
 #endif
 
diff --git a/configs/olimex-lpc1766stk/src/lpc17_hidmouse.c b/configs/olimex-lpc1766stk/src/lpc17_hidmouse.c
index cda2a94a9c..003b6e9e53 100644
--- a/configs/olimex-lpc1766stk/src/lpc17_hidmouse.c
+++ b/configs/olimex-lpc1766stk/src/lpc17_hidmouse.c
@@ -60,8 +60,8 @@
  */
 
 #ifndef CONFIG_DEBUG_INPUT
-#  undef  idbg
-#  define idbg    udbg
+#  undef  ierr
+#  define ierr    uerr
 #  undef  illerr
 #  define illerr  ullerr
 #  undef  iinfo
@@ -114,7 +114,7 @@ int board_tsc_setup(int minor)
   static bool initialized = false;
   int ret;
 
-  idbg("minor %d\n", minor);
+  ierr("minor %d\n", minor);
   DEBUGASSERT(minor == 0);
 
   /* Have we already initialized?  Since we never uninitialize we must prevent
@@ -131,7 +131,7 @@ int board_tsc_setup(int minor)
       ret = usbhost_hub_initialize();
       if (ret < 0)
         {
-          idbg("ERROR: usbhost_hub_initialize failed: %d\n", ret);
+          ierr("ERROR: usbhost_hub_initialize failed: %d\n", ret);
         }
 #endif
 
@@ -140,7 +140,7 @@ int board_tsc_setup(int minor)
       ret = usbhost_mouse_init();
       if (ret < 0)
         {
-          idbg("Failed to register USB HID mouse device class\n");
+          ierr("Failed to register USB HID mouse device class\n");
           return -ENODEV;
         }
 
diff --git a/configs/olimex-lpc1766stk/src/lpc17_lcd.c b/configs/olimex-lpc1766stk/src/lpc17_lcd.c
index 5443ad2e50..9ed0623a0f 100644
--- a/configs/olimex-lpc1766stk/src/lpc17_lcd.c
+++ b/configs/olimex-lpc1766stk/src/lpc17_lcd.c
@@ -89,10 +89,10 @@
 #endif
 
 #ifdef CONFIG_LCD_NOKIADBG
-#  define lcddbg(format, ...) info(format, ##__VA_ARGS__)
+#  define lcderr(format, ...) info(format, ##__VA_ARGS__)
 #  define lcd_dumpgpio(m)     lpc17_dumpgpio(LPC1766STK_LCD_RST, m)
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcd_dumpgpio(m)
 #endif
 
diff --git a/configs/olimex-lpc1766stk/src/lpc17_leds.c b/configs/olimex-lpc1766stk/src/lpc17_leds.c
index c26cd776d2..207883a8ea 100644
--- a/configs/olimex-lpc1766stk/src/lpc17_leds.c
+++ b/configs/olimex-lpc1766stk/src/lpc17_leds.c
@@ -63,14 +63,14 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg llerr
+#  define lederr llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/olimex-lpc1766stk/src/lpc17_ssp.c b/configs/olimex-lpc1766stk/src/lpc17_ssp.c
index a993baafd6..ed659ad932 100644
--- a/configs/olimex-lpc1766stk/src/lpc17_ssp.c
+++ b/configs/olimex-lpc1766stk/src/lpc17_ssp.c
@@ -81,7 +81,7 @@
  */
 
 #ifdef CONFIG_SSP_DEBUG
-#  define sspdbg  llerr
+#  define ssperr  llerr
 #  ifdef CONFIG_SSP_VERBOSE
 #    define sspinfo llerr
 #  else
@@ -89,7 +89,7 @@
 #  endif
 #else
 #  undef CONFIG_SSP_VERBOSE
-#  define sspdbg(x...)
+#  define ssperr(x...)
 #  define sspinfo(x...)
 #endif
 
@@ -284,7 +284,7 @@ void weak_function lpc1766stk_sspdev_initialize(void)
 #ifdef CONFIG_LPC17_SSP0
 void  lpc17_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  sspdbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   if (devid == SPIDEV_DISPLAY)
     {
       /* Assert/de-assert the CS pin to the card */
@@ -297,7 +297,7 @@ void  lpc17_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel
 
 uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  sspdbg("Returning nothing\n");
+  ssperr("Returning nothing\n");
   return 0;
 }
 #endif
@@ -305,7 +305,7 @@ uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_LPC17_SSP1
 void  lpc17_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  sspdbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   if (devid == SPIDEV_MMCSD)
     {
       /* Assert/de-assert the CS pin to the card */
@@ -318,7 +318,7 @@ void  lpc17_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel
 
 uint8_t lpc17_ssp1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  sspdbg("Returning SPI_STATUS_PRESENT\n");
+  ssperr("Returning SPI_STATUS_PRESENT\n");
   return SPI_STATUS_PRESENT;
 }
 #endif
diff --git a/configs/olimex-stm32-h405/src/stm32_adc.c b/configs/olimex-stm32-h405/src/stm32_adc.c
index cc3a9ef0ed..aed729e149 100644
--- a/configs/olimex-stm32-h405/src/stm32_adc.c
+++ b/configs/olimex-stm32-h405/src/stm32_adc.c
@@ -159,7 +159,7 @@ int stm32_adc_initialize(void)
       adc = stm32_adcinitialize(1, g_chanlist, ADC1_NCHANNELS);
       if (adc == NULL)
         {
-          adbg("ERROR: Failed to get ADC interface\n");
+          aerr("ERROR: Failed to get ADC interface\n");
           return -ENODEV;
         }
 
@@ -168,7 +168,7 @@ int stm32_adc_initialize(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          adbg("adc_register failed: %d\n", ret);
+          aerr("adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/olimex-stm32-h405/src/stm32_autoleds.c b/configs/olimex-stm32-h405/src/stm32_autoleds.c
index c3ce8056ec..884c89bfc3 100644
--- a/configs/olimex-stm32-h405/src/stm32_autoleds.c
+++ b/configs/olimex-stm32-h405/src/stm32_autoleds.c
@@ -60,10 +60,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/olimex-stm32-h405/src/stm32_can.c b/configs/olimex-stm32-h405/src/stm32_can.c
index 695179d017..12e08951f5 100644
--- a/configs/olimex-stm32-h405/src/stm32_can.c
+++ b/configs/olimex-stm32-h405/src/stm32_can.c
@@ -69,12 +69,12 @@
 /* Non-standard debug that may be enabled just for testing CAN */
 
 #ifdef CONFIG_DEBUG_CAN
-#  define candbg    dbg
+#  define canerr    err
 #  define caninfo   info
 #  define canllerr  llerr
 #  define canllinfo llinfo
 #else
-#  define candbg(x...)
+#  define canerr(x...)
 #  define caninfo(x...)
 #  define canllerr(x...)
 #  define canllinfo(x...)
@@ -125,7 +125,7 @@ int stm32_can_initialize(void)
       can = stm32_caninitialize(CAN_PORT);
       if (can == NULL)
         {
-          candbg("ERROR:  Failed to get CAN interface\n");
+          canerr("ERROR:  Failed to get CAN interface\n");
           return -ENODEV;
         }
 
@@ -134,7 +134,7 @@ int stm32_can_initialize(void)
       ret = can_register("/dev/can0", can);
       if (ret < 0)
         {
-          candbg("ERROR: can_register failed: %d\n", ret);
+          canerr("ERROR: can_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/olimex-stm32-h405/src/stm32_userleds.c b/configs/olimex-stm32-h405/src/stm32_userleds.c
index 34057f150d..83ab5ee2f3 100644
--- a/configs/olimex-stm32-h405/src/stm32_userleds.c
+++ b/configs/olimex-stm32-h405/src/stm32_userleds.c
@@ -57,10 +57,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/olimex-stm32-h407/src/stm32_adc.c b/configs/olimex-stm32-h407/src/stm32_adc.c
index a7f3e6aa32..211b403eb4 100644
--- a/configs/olimex-stm32-h407/src/stm32_adc.c
+++ b/configs/olimex-stm32-h407/src/stm32_adc.c
@@ -159,7 +159,7 @@ int stm32_adc_initialize(void)
       adc = stm32_adcinitialize(1, g_chanlist, ADC1_NCHANNELS);
       if (adc == NULL)
         {
-          adbg("ERROR: Failed to get ADC interface\n");
+          aerr("ERROR: Failed to get ADC interface\n");
           return -ENODEV;
         }
 
@@ -168,7 +168,7 @@ int stm32_adc_initialize(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          adbg("adc_register failed: %d\n", ret);
+          aerr("adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/olimex-stm32-h407/src/stm32_autoleds.c b/configs/olimex-stm32-h407/src/stm32_autoleds.c
index f1c65cafbc..5ec4fae864 100644
--- a/configs/olimex-stm32-h407/src/stm32_autoleds.c
+++ b/configs/olimex-stm32-h407/src/stm32_autoleds.c
@@ -63,10 +63,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/olimex-stm32-h407/src/stm32_can.c b/configs/olimex-stm32-h407/src/stm32_can.c
index 3056d80a27..2ff1514954 100644
--- a/configs/olimex-stm32-h407/src/stm32_can.c
+++ b/configs/olimex-stm32-h407/src/stm32_can.c
@@ -69,12 +69,12 @@
 /* Non-standard debug that may be enabled just for testing CAN */
 
 #ifdef CONFIG_DEBUG_CAN
-#  define candbg    dbg
+#  define canerr    err
 #  define caninfo   info
 #  define canllerr  llerr
 #  define canllinfo llinfo
 #else
-#  define candbg(x...)
+#  define canerr(x...)
 #  define caninfo(x...)
 #  define canllerr(x...)
 #  define canllinfo(x...)
@@ -121,7 +121,7 @@ int stm32_can_initialize(void)
       can = stm32_caninitialize(CAN_PORT);
       if (can == NULL)
         {
-          candbg("ERROR:  Failed to get CAN interface\n");
+          canerr("ERROR:  Failed to get CAN interface\n");
           return -ENODEV;
         }
 
@@ -130,7 +130,7 @@ int stm32_can_initialize(void)
       ret = can_register("/dev/can0", can);
       if (ret < 0)
         {
-          candbg("ERROR: can_register failed: %d\n", ret);
+          canerr("ERROR: can_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/olimex-stm32-h407/src/stm32_sdio.c b/configs/olimex-stm32-h407/src/stm32_sdio.c
index 53598f5e80..8c5ffa7cbd 100644
--- a/configs/olimex-stm32-h407/src/stm32_sdio.c
+++ b/configs/olimex-stm32-h407/src/stm32_sdio.c
@@ -139,7 +139,7 @@ int stm32_sdio_initialize(void)
   g_sdio_dev = sdio_initialize(SDIO_SLOTNO);
   if (!g_sdio_dev)
     {
-      fdbg("Failed to initialize SDIO slot %d\n", SDIO_SLOTNO);
+      ferr("Failed to initialize SDIO slot %d\n", SDIO_SLOTNO);
       return -ENODEV;
     }
 
@@ -150,7 +150,7 @@ int stm32_sdio_initialize(void)
   ret = mmcsd_slotinitialize(SDIO_MINOR, g_sdio_dev);
   if (ret != OK)
     {
-      fdbg("Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
+      ferr("Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
       return ret;
     }
 
diff --git a/configs/olimex-stm32-h407/src/stm32_usb.c b/configs/olimex-stm32-h407/src/stm32_usb.c
index 2f925d437a..d954374967 100644
--- a/configs/olimex-stm32-h407/src/stm32_usb.c
+++ b/configs/olimex-stm32-h407/src/stm32_usb.c
@@ -181,7 +181,7 @@ int stm32_usbhost_initialize(void)
   ret = usbhost_hub_initialize();
   if (ret < 0)
     {
-      udbg("ERROR: usbhost_hub_initialize failed: %d\n", ret);
+      uerr("ERROR: usbhost_hub_initialize failed: %d\n", ret);
     }
 #endif
 
@@ -191,7 +191,7 @@ int stm32_usbhost_initialize(void)
   ret = usbhost_msc_initialize();
   if (ret != OK)
     {
-      udbg("ERROR: Failed to register the mass storage class: %d\n", ret);
+      uerr("ERROR: Failed to register the mass storage class: %d\n", ret);
     }
 #endif
 
@@ -201,7 +201,7 @@ int stm32_usbhost_initialize(void)
   ret = usbhost_cdcacm_initialize();
   if (ret != OK)
     {
-      udbg("ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
+      uerr("ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
     }
 #endif
 
diff --git a/configs/olimex-stm32-h407/src/stm32_userleds.c b/configs/olimex-stm32-h407/src/stm32_userleds.c
index 7a5a58049c..859548637e 100644
--- a/configs/olimex-stm32-h407/src/stm32_userleds.c
+++ b/configs/olimex-stm32-h407/src/stm32_userleds.c
@@ -62,10 +62,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/olimex-stm32-p107/src/stm32_can.c b/configs/olimex-stm32-p107/src/stm32_can.c
index dc48f06ae0..84bd103adf 100644
--- a/configs/olimex-stm32-p107/src/stm32_can.c
+++ b/configs/olimex-stm32-p107/src/stm32_can.c
@@ -65,12 +65,12 @@
 /* Non-standard debug that may be enabled just for testing CAN */
 
 #ifdef CONFIG_DEBUG_CAN
-#  define candbg    dbg
+#  define canerr    err
 #  define caninfo   info
 #  define canllerr  llerr
 #  define canllinfo llinfo
 #else
-#  define candbg(x...)
+#  define canerr(x...)
 #  define caninfo(x...)
 #  define canllerr(x...)
 #  define canllinfo(x...)
@@ -108,7 +108,7 @@ int board_can_initialize(void)
       can = stm32_caninitialize(CAN_PORT);
       if (can == NULL)
         {
-          candbg("ERROR:  Failed to get CAN interface\n");
+          canerr("ERROR:  Failed to get CAN interface\n");
           return -ENODEV;
         }
 
@@ -117,7 +117,7 @@ int board_can_initialize(void)
       ret = can_register("/dev/can0", can);
       if (ret < 0)
         {
-          candbg("ERROR: can_register failed: %d\n", ret);
+          canerr("ERROR: can_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/olimex-stm32-p107/src/stm32_spi.c b/configs/olimex-stm32-p107/src/stm32_spi.c
index befcd373a3..3b84b1f907 100644
--- a/configs/olimex-stm32-p107/src/stm32_spi.c
+++ b/configs/olimex-stm32-p107/src/stm32_spi.c
@@ -64,7 +64,7 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -72,7 +72,7 @@
 #  endif
 #else
 #  undef SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -136,7 +136,7 @@ void weak_function stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
   if (devid == SPIDEV_ETHERNET)
     {
diff --git a/configs/olimex-stm32-p207/src/stm32_adc.c b/configs/olimex-stm32-p207/src/stm32_adc.c
index 96fc837b97..293f4d27d4 100644
--- a/configs/olimex-stm32-p207/src/stm32_adc.c
+++ b/configs/olimex-stm32-p207/src/stm32_adc.c
@@ -151,7 +151,7 @@ int stm32_adc_initialize(void)
       adc = stm32_adcinitialize(1, g_chanlist, ADC1_NCHANNELS);
       if (adc == NULL)
         {
-          adbg("ERROR: Failed to get ADC interface\n");
+          aerr("ERROR: Failed to get ADC interface\n");
           return -ENODEV;
         }
 
@@ -160,7 +160,7 @@ int stm32_adc_initialize(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          adbg("adc_register failed: %d\n", ret);
+          aerr("adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/olimex-stm32-p207/src/stm32_autoleds.c b/configs/olimex-stm32-p207/src/stm32_autoleds.c
index d4c70ea380..04cca5a6c5 100644
--- a/configs/olimex-stm32-p207/src/stm32_autoleds.c
+++ b/configs/olimex-stm32-p207/src/stm32_autoleds.c
@@ -60,10 +60,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/olimex-stm32-p207/src/stm32_can.c b/configs/olimex-stm32-p207/src/stm32_can.c
index a6441e5513..1c223eb100 100644
--- a/configs/olimex-stm32-p207/src/stm32_can.c
+++ b/configs/olimex-stm32-p207/src/stm32_can.c
@@ -69,12 +69,12 @@
 /* Non-standard debug that may be enabled just for testing CAN */
 
 #ifdef CONFIG_DEBUG_CAN
-#  define candbg    dbg
+#  define canerr    err
 #  define caninfo   info
 #  define canllerr  llerr
 #  define canllinfo llinfo
 #else
-#  define candbg(x...)
+#  define canerr(x...)
 #  define caninfo(x...)
 #  define canllerr(x...)
 #  define canllinfo(x...)
@@ -125,7 +125,7 @@ int stm32_can_initialize(void)
       can = stm32_caninitialize(CAN_PORT);
       if (can == NULL)
         {
-          candbg("ERROR:  Failed to get CAN interface\n");
+          canerr("ERROR:  Failed to get CAN interface\n");
           return -ENODEV;
         }
 
@@ -134,7 +134,7 @@ int stm32_can_initialize(void)
       ret = can_register("/dev/can0", can);
       if (ret < 0)
         {
-          candbg("ERROR: can_register failed: %d\n", ret);
+          canerr("ERROR: can_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/olimex-stm32-p207/src/stm32_usb.c b/configs/olimex-stm32-p207/src/stm32_usb.c
index 15358557b1..ed6572dd44 100644
--- a/configs/olimex-stm32-p207/src/stm32_usb.c
+++ b/configs/olimex-stm32-p207/src/stm32_usb.c
@@ -185,7 +185,7 @@ int stm32_usbhost_initialize(void)
   ret = usbhost_hub_initialize();
   if (ret < 0)
     {
-      udbg("ERROR: usbhost_hub_initialize failed: %d\n", ret);
+      uerr("ERROR: usbhost_hub_initialize failed: %d\n", ret);
     }
 #endif
 
@@ -195,7 +195,7 @@ int stm32_usbhost_initialize(void)
   ret = usbhost_msc_initialize();
   if (ret != OK)
     {
-      udbg("ERROR: Failed to register the mass storage class: %d\n", ret);
+      uerr("ERROR: Failed to register the mass storage class: %d\n", ret);
     }
 #endif
 
@@ -205,7 +205,7 @@ int stm32_usbhost_initialize(void)
   ret = usbhost_cdcacm_initialize();
   if (ret != OK)
     {
-      udbg("ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
+      uerr("ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
     }
 #endif
 
diff --git a/configs/olimex-stm32-p207/src/stm32_userleds.c b/configs/olimex-stm32-p207/src/stm32_userleds.c
index b1656100f7..8d5f76abf1 100644
--- a/configs/olimex-stm32-p207/src/stm32_userleds.c
+++ b/configs/olimex-stm32-p207/src/stm32_userleds.c
@@ -57,10 +57,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/olimexino-stm32/src/stm32_can.c b/configs/olimexino-stm32/src/stm32_can.c
index 8197ca1a3f..1433a60dca 100644
--- a/configs/olimexino-stm32/src/stm32_can.c
+++ b/configs/olimexino-stm32/src/stm32_can.c
@@ -68,12 +68,12 @@
 /* Non-standard debug that may be enabled just for testing CAN */
 
 #ifdef CONFIG_DEBUG_CAN
-#  define candbg    dbg
+#  define canerr    err
 #  define caninfo   info
 #  define canllerr  llerr
 #  define canllinfo llinfo
 #else
-#  define candbg(x...)
+#  define canerr(x...)
 #  define caninfo(x...)
 #  define canllerr(x...)
 #  define canllinfo(x...)
@@ -111,7 +111,7 @@ int board_can_initialize(void)
       can = stm32_caninitialize(CAN_PORT);
       if (can == NULL)
         {
-          candbg("ERROR:  Failed to get CAN interface\n");
+          canerr("ERROR:  Failed to get CAN interface\n");
           return -ENODEV;
         }
 
@@ -120,7 +120,7 @@ int board_can_initialize(void)
       ret = can_register("/dev/can0", can);
       if (ret < 0)
         {
-          candbg("ERROR: can_register failed: %d\n", ret);
+          canerr("ERROR: can_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/olimexino-stm32/src/stm32_leds.c b/configs/olimexino-stm32/src/stm32_leds.c
index 9a972d7983..e0b583b4a7 100644
--- a/configs/olimexino-stm32/src/stm32_leds.c
+++ b/configs/olimexino-stm32/src/stm32_leds.c
@@ -59,14 +59,14 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg llerr
+#  define lederr llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/olimexino-stm32/src/stm32_spi.c b/configs/olimexino-stm32/src/stm32_spi.c
index 9fab4ec2e7..8dce537409 100644
--- a/configs/olimexino-stm32/src/stm32_spi.c
+++ b/configs/olimexino-stm32/src/stm32_spi.c
@@ -65,7 +65,7 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -73,7 +73,7 @@
 #  endif
 #else
 #  undef SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -135,7 +135,7 @@ void weak_function stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   if (devid == SPIDEV_USER)
     {
       stm32_gpiowrite(USER_CSn, !selected);
@@ -151,7 +151,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #if defined(CONFIG_MMCSD)
   if (devid == SPIDEV_MMCSD)
     {
@@ -171,7 +171,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
diff --git a/configs/open1788/src/lpc17_autoleds.c b/configs/open1788/src/lpc17_autoleds.c
index c004063ea0..808ddef8df 100644
--- a/configs/open1788/src/lpc17_autoleds.c
+++ b/configs/open1788/src/lpc17_autoleds.c
@@ -139,14 +139,14 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg llerr
+#  define lederr llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/open1788/src/lpc17_ssp.c b/configs/open1788/src/lpc17_ssp.c
index 0cc9039aeb..c8be1a5da0 100644
--- a/configs/open1788/src/lpc17_ssp.c
+++ b/configs/open1788/src/lpc17_ssp.c
@@ -64,14 +64,14 @@
 /* Debug ********************************************************************/
 
 #ifdef CONFIG_DEBUG_SPI
-#  define sspdbg  llerr
+#  define ssperr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define sspinfo llerr
 #  else
 #    define sspinfo(x...)
 #  endif
 #else
-#  define sspdbg(x...)
+#  define ssperr(x...)
 #  define sspinfo(x...)
 #endif
 
@@ -158,12 +158,12 @@ void weak_function open1788_sspdev_initialize(void)
 #ifdef CONFIG_LPC17_SSP0
 void  lpc17_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  sspdbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  sspdbg("Returning nothing\n");
+  ssperr("Returning nothing\n");
   return 0;
 }
 #endif
@@ -171,7 +171,7 @@ uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_LPC17_SSP1
 void  lpc17_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  sspdbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   if (devid == SPIDEV_TOUCHSCREEN)
     {
       /* Assert/de-assert the CS pin to the touchscreen */
@@ -184,7 +184,7 @@ void  lpc17_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel
 
 uint8_t lpc17_ssp1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  sspdbg("Returning nothing\n");
+  ssperr("Returning nothing\n");
   return 0;
 }
 #endif
@@ -192,12 +192,12 @@ uint8_t lpc17_ssp1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_LPC17_SSP2
 void  lpc17_ssp2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  sspdbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t lpc17_ssp2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  sspdbg("Returning nothing\n");
+  ssperr("Returning nothing\n");
   return 0;
 }
 #endif
diff --git a/configs/open1788/src/lpc17_touchscreen.c b/configs/open1788/src/lpc17_touchscreen.c
index 097ec3550f..1dcf9bb560 100644
--- a/configs/open1788/src/lpc17_touchscreen.c
+++ b/configs/open1788/src/lpc17_touchscreen.c
@@ -277,7 +277,7 @@ int board_tsc_setup(int minor)
   FAR struct spi_dev_s *dev;
   int ret;
 
-  idbg("initialized:%d minor:%d\n", initialized, minor);
+  ierr("initialized:%d minor:%d\n", initialized, minor);
   DEBUGASSERT(minor == 0);
 
   /* Since there is no uninitialized logic, this initialization can be
@@ -301,7 +301,7 @@ int board_tsc_setup(int minor)
       dev = lpc17_sspbus_initialize(CONFIG_ADS7843E_SPIDEV);
       if (!dev)
         {
-          idbg("Failed to initialize SPI bus %d\n", CONFIG_ADS7843E_SPIDEV);
+          ierr("Failed to initialize SPI bus %d\n", CONFIG_ADS7843E_SPIDEV);
           return -ENODEV;
         }
 
@@ -310,7 +310,7 @@ int board_tsc_setup(int minor)
       ret = ads7843e_register(dev, &g_tscinfo, CONFIG_ADS7843E_DEVMINOR);
       if (ret < 0)
         {
-          idbg("Failed to register touchscreen device minor=%d\n",
+          ierr("Failed to register touchscreen device minor=%d\n",
                CONFIG_ADS7843E_DEVMINOR);
        /* up_spiuninitialize(dev); */
           return -ENODEV;
diff --git a/configs/open1788/src/lpc17_userleds.c b/configs/open1788/src/lpc17_userleds.c
index 8a3f1fef4f..8f541c3713 100644
--- a/configs/open1788/src/lpc17_userleds.c
+++ b/configs/open1788/src/lpc17_userleds.c
@@ -65,14 +65,14 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg llerr
+#  define lederr llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c b/configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c
index 43027711d5..f62dcb0545 100644
--- a/configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c
+++ b/configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c
@@ -140,10 +140,10 @@
 /* Debug ********************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg         dbg
+#  define lcderr         err
 #  define lcdinfo        info
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
diff --git a/configs/pcduino-a10/src/a1x_leds.c b/configs/pcduino-a10/src/a1x_leds.c
index 9e2c6f2f4b..eaa44f00fc 100644
--- a/configs/pcduino-a10/src/a1x_leds.c
+++ b/configs/pcduino-a10/src/a1x_leds.c
@@ -95,10 +95,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/pic32mx-starterkit/src/pic32mx_leds.c b/configs/pic32mx-starterkit/src/pic32mx_leds.c
index a349698987..9177aa6613 100644
--- a/configs/pic32mx-starterkit/src/pic32mx_leds.c
+++ b/configs/pic32mx-starterkit/src/pic32mx_leds.c
@@ -98,7 +98,7 @@
 /* Debug ********************************************************************/
 
 #if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS)
-#  define leddbg  llerr
+#  define lederr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define ledinfo llerr
 #  else
@@ -107,7 +107,7 @@
 #else
 #  undef CONFIG_DEBUG_LEDS
 #  undef CONFIG_DEBUG_INFO
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/pic32mx-starterkit/src/pic32mx_spi.c b/configs/pic32mx-starterkit/src/pic32mx_spi.c
index 65374d648e..1884607ad9 100644
--- a/configs/pic32mx-starterkit/src/pic32mx_spi.c
+++ b/configs/pic32mx-starterkit/src/pic32mx_spi.c
@@ -65,7 +65,7 @@
  */
 
 #ifdef CONFIG_SPI_DEBUG
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef CONFIG_SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -73,7 +73,7 @@
 #  endif
 #else
 #  undef CONFIG_SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -134,13 +134,13 @@ enum spi_dev_e;
 #ifdef CONFIG_PIC32MX_SPI1
 void  pic32mx_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
 uint8_t pic32mx_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  spidbg("Returning nothing\n");
+  spierr("Returning nothing\n");
 #warning "Missing logic"
   return 0;
 }
@@ -156,13 +156,13 @@ int pic32mx_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
 #ifdef CONFIG_PIC32MX_SPI1
 void  pic32mx_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
 uint8_t pic32mx_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  spidbg("Returning nothing\n");
+  spierr("Returning nothing\n");
 #warning "Missing logic"
   return 0;
 }
@@ -178,13 +178,13 @@ int pic32mx_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
 #ifdef CONFIG_PIC32MX_SPI3
 void  pic32mx_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
 uint8_t pic32mx_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  spidbg("Returning nothing\n");
+  spierr("Returning nothing\n");
 #warning "Missing logic"
   return 0;
 }
@@ -200,13 +200,13 @@ int pic32mx_spi3cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
 #ifdef CONFIG_PIC32MX_SPI4
 void  pic32mx_spi4select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
 uint8_t pic32mx_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  spidbg("Returning nothing\n");
+  spierr("Returning nothing\n");
 #warning "Missing logic"
   return 0;
 }
diff --git a/configs/pic32mx7mmb/src/pic32_leds.c b/configs/pic32mx7mmb/src/pic32_leds.c
index 1cb9a6082f..83c01668cd 100644
--- a/configs/pic32mx7mmb/src/pic32_leds.c
+++ b/configs/pic32mx7mmb/src/pic32_leds.c
@@ -101,7 +101,7 @@
 /* Debug ********************************************************************/
 
 #if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS)
-#  define leddbg  llerr
+#  define lederr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define ledinfo llerr
 #  else
@@ -110,7 +110,7 @@
 #else
 #  undef CONFIG_DEBUG_LEDS
 #  undef CONFIG_DEBUG_INFO
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/pic32mx7mmb/src/pic32_mio283qt2.c b/configs/pic32mx7mmb/src/pic32_mio283qt2.c
index d083041692..972a2fbd67 100644
--- a/configs/pic32mx7mmb/src/pic32_mio283qt2.c
+++ b/configs/pic32mx7mmb/src/pic32_mio283qt2.c
@@ -139,10 +139,10 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg       dbg
+#  define lcderr       err
 #  define lcdinfo      info
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -468,7 +468,7 @@ int board_lcd_initialize(void)
       g_pic32mx7mmb_lcd.drvr = mio283qt2_lcdinitialize(&g_pic32mx7mmb_lcd.dev);
       if (!g_pic32mx7mmb_lcd.drvr)
         {
-          lcddbg("ERROR: mio283qt2_lcdinitialize failed\n");
+          lcderr("ERROR: mio283qt2_lcdinitialize failed\n");
           return -ENODEV;
         }
     }
diff --git a/configs/pic32mx7mmb/src/pic32_spi.c b/configs/pic32mx7mmb/src/pic32_spi.c
index 58ea77bfa8..1b62c22f0c 100644
--- a/configs/pic32mx7mmb/src/pic32_spi.c
+++ b/configs/pic32mx7mmb/src/pic32_spi.c
@@ -81,10 +81,10 @@
  */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  llerr
+#  define spierr  llerr
 #  define spiinfo llinfo
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -150,7 +150,7 @@ enum spi_dev_e;
 #ifdef CONFIG_PIC32MX_SPI1
 void  pic32mx_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
   if (devid == SPIDEV_MMCSD)
     {
@@ -179,7 +179,7 @@ uint8_t pic32mx_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
         }
     }
 
-  spidbg("Returning %02x\n", ret);
+  spierr("Returning %02x\n", ret);
   return ret;
 }
 #ifdef CONFIG_SPI_CMDDATA
@@ -194,13 +194,13 @@ int pic32mx_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
 #ifdef CONFIG_PIC32MX_SPI2
 void  pic31mx_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
 uint8_t pic31mx_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  spidbg("Returning nothing\n");
+  spierr("Returning nothing\n");
 #warning "Missing logic"
   return 0;
 }
@@ -217,13 +217,13 @@ int pic31mx_spi2cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
 #ifdef CONFIG_PIC32MX_SPI3
 void  pic32mx_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
 uint8_t pic32mx_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  spidbg("Returning nothing\n");
+  spierr("Returning nothing\n");
 #warning "Missing logic"
   return 0;
 }
@@ -240,13 +240,13 @@ int pic32mx_spi3cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
 #ifdef CONFIG_PIC32MX_SPI4
 void  pic32mx_spi4select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
 uint8_t pic32mx_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  spidbg("Returning nothing\n");
+  spierr("Returning nothing\n");
 #warning "Missing logic"
   return 0;
 }
diff --git a/configs/pic32mx7mmb/src/pic32_touchscreen.c b/configs/pic32mx7mmb/src/pic32_touchscreen.c
index 1d07e0a06c..6359ea07bd 100644
--- a/configs/pic32mx7mmb/src/pic32_touchscreen.c
+++ b/configs/pic32mx7mmb/src/pic32_touchscreen.c
@@ -1282,7 +1282,7 @@ static int tc_poll(FAR struct file *filep, FAR struct pollfd *fds,
 
       if ((fds->events & POLLIN) == 0)
         {
-          idbg("Missing POLLIN: revents: %08x\n", fds->revents);
+          ierr("Missing POLLIN: revents: %08x\n", fds->revents);
           ret = -EDEADLK;
           goto errout;
         }
@@ -1307,7 +1307,7 @@ static int tc_poll(FAR struct file *filep, FAR struct pollfd *fds,
 
       if (i >= CONFIG_TOUCHSCREEN_NPOLLWAITERS)
         {
-          idbg("No availabled slot found: %d\n", i);
+          ierr("No availabled slot found: %d\n", i);
           fds->priv    = NULL;
           ret          = -EBUSY;
           goto errout;
@@ -1389,7 +1389,7 @@ int board_tsc_setup(int minor)
   priv = (FAR struct tc_dev_s *)kmm_malloc(sizeof(struct tc_dev_s));
   if (!priv)
     {
-      idbg("kmm_malloc(%d) failed\n", sizeof(struct tc_dev_s));
+      ierr("kmm_malloc(%d) failed\n", sizeof(struct tc_dev_s));
       return -ENOMEM;
     }
 #endif
@@ -1408,7 +1408,7 @@ int board_tsc_setup(int minor)
   ret = register_driver(devname, &tc_fops, 0666, priv);
   if (ret < 0)
     {
-      idbg("register_driver() failed: %d\n", ret);
+      ierr("register_driver() failed: %d\n", ret);
       goto errout_with_priv;
     }
 
@@ -1420,7 +1420,7 @@ int board_tsc_setup(int minor)
   ret = work_queue(HPWORK, &priv->work, tc_worker, priv, 0);
   if (ret != 0)
     {
-      idbg("Failed to queue work: %d\n", ret);
+      ierr("Failed to queue work: %d\n", ret);
       goto errout_with_priv;
     }
 
diff --git a/configs/pic32mz-starterkit/src/pic32mz_autoleds.c b/configs/pic32mz-starterkit/src/pic32mz_autoleds.c
index e4f93f0ecd..31d14aa3cf 100644
--- a/configs/pic32mz-starterkit/src/pic32mz_autoleds.c
+++ b/configs/pic32mz-starterkit/src/pic32mz_autoleds.c
@@ -94,7 +94,7 @@
 /* Debug ********************************************************************/
 
 #if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS)
-#  define leddbg  llerr
+#  define lederr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define ledinfo llerr
 #  else
@@ -103,7 +103,7 @@
 #else
 #  undef CONFIG_DEBUG_LEDS
 #  undef CONFIG_DEBUG_INFO
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/pic32mz-starterkit/src/pic32mz_spi.c b/configs/pic32mz-starterkit/src/pic32mz_spi.c
index 7cac4d15c8..8207b478b6 100644
--- a/configs/pic32mz-starterkit/src/pic32mz_spi.c
+++ b/configs/pic32mz-starterkit/src/pic32mz_spi.c
@@ -59,7 +59,7 @@
 /* Debug */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef CONFIG_SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -67,7 +67,7 @@
 #  endif
 #else
 #  undef CONFIG_SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -128,13 +128,13 @@ enum spi_dev_e;
 #ifdef CONFIG_PIC32MZ_SPI1
 void  pic32mz_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
 uint8_t pic32mz_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  spidbg("Returning nothing\n");
+  spierr("Returning nothing\n");
 #warning "Missing logic"
   return 0;
 }
@@ -150,13 +150,13 @@ int pic32mz_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
 #ifdef CONFIG_PIC32MZ_SPI2
 void  pic32mz_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
 uint8_t pic32mz_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  spidbg("Returning nothing\n");
+  spierr("Returning nothing\n");
 #warning "Missing logic"
   return 0;
 }
@@ -172,13 +172,13 @@ int pic32mz_spi2cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
 #ifdef CONFIG_PIC32MZ_SPI3
 void  pic32mz_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
 uint8_t pic32mz_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  spidbg("Returning nothing\n");
+  spierr("Returning nothing\n");
 #warning "Missing logic"
   return 0;
 }
@@ -194,13 +194,13 @@ int pic32mz_spi3cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
 #ifdef CONFIG_PIC32MZ_SPI4
 void  pic32mz_spi4select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
 uint8_t pic32mz_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  spidbg("Returning nothing\n");
+  spierr("Returning nothing\n");
 #warning "Missing logic"
   return 0;
 }
@@ -216,13 +216,13 @@ int pic32mz_spi4cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
 #ifdef CONFIG_PIC32MZ_SPI5
 void  pic32mz_spi5select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
 uint8_t pic32mz_spi5status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  spidbg("Returning nothing\n");
+  spierr("Returning nothing\n");
 #warning "Missing logic"
   return 0;
 }
@@ -238,13 +238,13 @@ int pic32mz_spi5cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
 #ifdef CONFIG_PIC32MZ_SPI6
 void  pic32mz_spi6select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
 uint8_t pic32mz_spi6status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  spidbg("Returning nothing\n");
+  spierr("Returning nothing\n");
 #warning "Missing logic"
   return 0;
 }
diff --git a/configs/pic32mz-starterkit/src/pic32mz_userleds.c b/configs/pic32mz-starterkit/src/pic32mz_userleds.c
index f70c99c721..169376a691 100644
--- a/configs/pic32mz-starterkit/src/pic32mz_userleds.c
+++ b/configs/pic32mz-starterkit/src/pic32mz_userleds.c
@@ -74,7 +74,7 @@
 /* Debug ********************************************************************/
 
 #if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS)
-#  define leddbg  llerr
+#  define lederr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define ledinfo llerr
 #  else
@@ -83,7 +83,7 @@
 #else
 #  undef CONFIG_DEBUG_LEDS
 #  undef CONFIG_DEBUG_INFO
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/sabre-6quad/src/imx_autoleds.c b/configs/sabre-6quad/src/imx_autoleds.c
index 2c4f5e8fb0..7800acfa9c 100644
--- a/configs/sabre-6quad/src/imx_autoleds.c
+++ b/configs/sabre-6quad/src/imx_autoleds.c
@@ -87,10 +87,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/sabre-6quad/src/imx_bringup.c b/configs/sabre-6quad/src/imx_bringup.c
index 2d39dbcfc2..051da9635f 100644
--- a/configs/sabre-6quad/src/imx_bringup.c
+++ b/configs/sabre-6quad/src/imx_bringup.c
@@ -53,7 +53,7 @@
 #ifdef CONFIG_BOARD_INITIALIZE
 #  define SYSLOG llerr
 #else
-#  define SYSLOG dbg
+#  define SYSLOG err
 #endif
 
 /****************************************************************************
diff --git a/configs/sam3u-ek/src/sam_lcd.c b/configs/sam3u-ek/src/sam_lcd.c
index 467d199eb8..f93e1e467f 100644
--- a/configs/sam3u-ek/src/sam_lcd.c
+++ b/configs/sam3u-ek/src/sam_lcd.c
@@ -160,16 +160,16 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_LCD_REGDEBUG
-#  define regdbg(format, ...)  info(format, ##__VA_ARGS__)
+#  define regerr(format, ...)  info(format, ##__VA_ARGS__)
 #else
-#  define regdbg(x...)
+#  define regerr(x...)
 #endif
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg(format, ...)  dbg(format, ##__VA_ARGS__)
+#  define lcderr(format, ...)  err(format, ##__VA_ARGS__)
 #  define lcdinfo(format, ...) info(format, ##__VA_ARGS__)
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -438,7 +438,7 @@ static struct sam_dev_s g_lcddev_s =
 
 static void sam_putreg(uint16_t reg,  uint16_t data)
 {
-  regdbg("base: %08x RS: %04x data: %04x\n", LCD_BASE, LCD_BASE + HX843X_LCD_RS, data);
+  regerr("base: %08x RS: %04x data: %04x\n", LCD_BASE, LCD_BASE + HX843X_LCD_RS, data);
   putreg16(reg, LCD_BASE);
   putreg16(data, LCD_BASE + HX843X_LCD_RS);
 }
@@ -457,7 +457,7 @@ static uint16_t sam_getreg(uint16_t reg)
   uint16_t data;
   putreg16(reg, LCD_BASE);
   data = getreg16(LCD_BASE + HX843X_LCD_RS);
-  regdbg("base: %08x RS: %04x data: %04x\n", LCD_BASE, LCD_BASE + HX843X_LCD_RS, data);
+  regerr("base: %08x RS: %04x data: %04x\n", LCD_BASE, LCD_BASE + HX843X_LCD_RS, data);
   return data;
 }
 #endif
@@ -586,7 +586,7 @@ static void sam_dumpreg(uint8_t startreg, uint8_t endreg)
   for (addr = startreg; addr <= endreg; addr++)
     {
       value = sam_getreg(addr);
-      lcddbg(" %02x: %04x\n", addr, value);
+      lcderr(" %02x: %04x\n", addr, value);
     }
 }
 #endif
@@ -912,7 +912,7 @@ int board_lcd_initialize(void)
   /* Enable SMC peripheral clock */
 
   putreg32((1 << SAM_PID_SMC), SAM_PMC_PCER);
-  regdbg("PMC PCSR: %08x SMC: %08x\n", getreg32(SAM_PMC_PCSR), (1 << SAM_PID_SMC));
+  regerr("PMC PCSR: %08x SMC: %08x\n", getreg32(SAM_PMC_PCSR), (1 << SAM_PID_SMC));
 
   /* Configure SMC CS2 */
 
@@ -932,10 +932,10 @@ int board_lcd_initialize(void)
   regval |= (SMCCS_MODE_READMODE)  | (SMCCS_MODE_WRITEMODE) | (SMCCS_MODE_DBW_16BITS);
   putreg32(regval, SAM_SMCCS_MODE(2));
 
-  regdbg("SMC SETUP[%08x]: %08x PULSE[%08x]: %08x\n",
+  regerr("SMC SETUP[%08x]: %08x PULSE[%08x]: %08x\n",
          SAM_SMCCS_SETUP(2), getreg32(SAM_SMCCS_SETUP(2)),
          SAM_SMCCS_PULSE(2), getreg32(SAM_SMCCS_PULSE(2)));
-  regdbg("    CYCLE[%08x]: %08x MODE[%08x]:  %08x\n",
+  regerr("    CYCLE[%08x]: %08x MODE[%08x]:  %08x\n",
          SAM_SMCCS_CYCLE(2), getreg32(SAM_SMCCS_CYCLE(2)),
          SAM_SMCCS_MODE(2),  getreg32(SAM_SMCCS_MODE(2)));
 
@@ -946,7 +946,7 @@ int board_lcd_initialize(void)
   lcdinfo("Chip ID: %04x\n", hxregval);
   if (hxregval != HX8347_CHIPID)
     {
-      lcddbg("Bad chip ID: %04x Expected: %04x\n", hxregval, HX8347_CHIPID);
+      lcderr("Bad chip ID: %04x Expected: %04x\n", hxregval, HX8347_CHIPID);
       return -ENODEV;
     }
 #endif
diff --git a/configs/sam3u-ek/src/sam_leds.c b/configs/sam3u-ek/src/sam_leds.c
index abfbe76dba..e84145669d 100644
--- a/configs/sam3u-ek/src/sam_leds.c
+++ b/configs/sam3u-ek/src/sam_leds.c
@@ -63,10 +63,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/sam3u-ek/src/sam_spi.c b/configs/sam3u-ek/src/sam_spi.c
index 95ec69e2ce..e6546c65e0 100644
--- a/configs/sam3u-ek/src/sam_spi.c
+++ b/configs/sam3u-ek/src/sam_spi.c
@@ -65,7 +65,7 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -73,7 +73,7 @@
 #  endif
 #else
 #  undef SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
diff --git a/configs/sam3u-ek/src/sam_touchscreen.c b/configs/sam3u-ek/src/sam_touchscreen.c
index 8b7b042a70..0c10f8ae1e 100644
--- a/configs/sam3u-ek/src/sam_touchscreen.c
+++ b/configs/sam3u-ek/src/sam_touchscreen.c
@@ -238,7 +238,7 @@ int board_tsc_setup(int minor)
   FAR struct spi_dev_s *dev;
   int ret;
 
-  idbg("minor %d\n", minor);
+  ierr("minor %d\n", minor);
   DEBUGASSERT(minor == 0);
 
   /* Configure and enable the ADS7843E interrupt pin as an input */
@@ -255,7 +255,7 @@ int board_tsc_setup(int minor)
   dev = sam_spibus_initialize(TSC_CSNUM);
   if (!dev)
     {
-      idbg("Failed to initialize SPI chip select %d\n", TSC_CSNUM);
+      ierr("Failed to initialize SPI chip select %d\n", TSC_CSNUM);
       return -ENODEV;
     }
 
@@ -264,7 +264,7 @@ int board_tsc_setup(int minor)
   ret = ads7843e_register(dev, &g_tscinfo, CONFIG_ADS7843E_DEVMINOR);
   if (ret < 0)
     {
-      idbg("Failed to initialize SPI chip select %d\n", TSC_CSNUM);
+      ierr("Failed to initialize SPI chip select %d\n", TSC_CSNUM);
       /* sam_spibus_uninitialize(dev); */
       return -ENODEV;
     }
diff --git a/configs/sam4e-ek/src/sam_ads7843e.c b/configs/sam4e-ek/src/sam_ads7843e.c
index 6487c39b29..01e35b06d9 100644
--- a/configs/sam4e-ek/src/sam_ads7843e.c
+++ b/configs/sam4e-ek/src/sam_ads7843e.c
@@ -235,7 +235,7 @@ int board_tsc_setup(int minor)
   FAR struct spi_dev_s *dev;
   int ret;
 
-  idbg("minor %d\n", minor);
+  ierr("minor %d\n", minor);
   DEBUGASSERT(minor == 0);
 
   /* Configure and enable the ADS7843E interrupt pin as an input */
@@ -252,7 +252,7 @@ int board_tsc_setup(int minor)
   dev = sam_spibus_initialize(TSC_CSNUM);
   if (!dev)
     {
-      idbg("Failed to initialize SPI chip select %d\n", TSC_CSNUM);
+      ierr("Failed to initialize SPI chip select %d\n", TSC_CSNUM);
       return -ENODEV;
     }
 
@@ -261,7 +261,7 @@ int board_tsc_setup(int minor)
   ret = ads7843e_register(dev, &g_tscinfo, CONFIG_ADS7843E_DEVMINOR);
   if (ret < 0)
     {
-      idbg("Failed to initialize SPI chip select %d\n", TSC_CSNUM);
+      ierr("Failed to initialize SPI chip select %d\n", TSC_CSNUM);
       /* sam_spibus_uninitialize(dev); */
       return -ENODEV;
     }
diff --git a/configs/sam4e-ek/src/sam_at25.c b/configs/sam4e-ek/src/sam_at25.c
index 2b3473d6d9..27c61c7c9e 100644
--- a/configs/sam4e-ek/src/sam_at25.c
+++ b/configs/sam4e-ek/src/sam_at25.c
@@ -88,7 +88,7 @@ int sam_at25_automount(int minor)
       spi = sam_spibus_initialize(FLASH_CSNUM);
       if (!spi)
         {
-          fdbg("ERROR: Failed to initialize SPI port %d\n", FLASH_CSNUM);
+          ferr("ERROR: Failed to initialize SPI port %d\n", FLASH_CSNUM);
           return -ENODEV;
         }
 
@@ -97,7 +97,7 @@ int sam_at25_automount(int minor)
       mtd = at25_initialize(spi);
       if (!mtd)
         {
-          fdbg("ERROR: Failed to bind SPI port %d to the AT25 FLASH driver\n");
+          ferr("ERROR: Failed to bind SPI port %d to the AT25 FLASH driver\n");
           return -ENODEV;
         }
 
@@ -109,7 +109,7 @@ int sam_at25_automount(int minor)
       ret = ftl_initialize(minor, mtd);
       if (ret < 0)
         {
-          fdbg("ERROR: Failed to initialize the FTL layer: %d\n", ret);
+          ferr("ERROR: Failed to initialize the FTL layer: %d\n", ret);
           return ret;
         }
 
@@ -119,7 +119,7 @@ int sam_at25_automount(int minor)
       ret = nxffs_initialize(mtd);
       if (ret < 0)
         {
-          fdbg("ERROR: NXFFS initialization failed: %d\n", ret);
+          ferr("ERROR: NXFFS initialization failed: %d\n", ret);
           return ret;
         }
 
@@ -128,7 +128,7 @@ int sam_at25_automount(int minor)
       ret = mount(NULL, "/mnt/at25", "nxffs", 0, NULL);
       if (ret < 0)
         {
-          fdbg("ERROR: Failed to mount the NXFFS volume: %d\n", errno);
+          ferr("ERROR: Failed to mount the NXFFS volume: %d\n", errno);
           return ret;
         }
 #endif
diff --git a/configs/sam4e-ek/src/sam_ethernet.c b/configs/sam4e-ek/src/sam_ethernet.c
index 69650ec0c9..f243414a50 100644
--- a/configs/sam4e-ek/src/sam_ethernet.c
+++ b/configs/sam4e-ek/src/sam_ethernet.c
@@ -74,10 +74,10 @@
  */
 
 #ifdef CONFIG_NETDEV_PHY_DEBUG
-#  define phydbg    dbg
+#  define phyerr    err
 #  define phyllerr  llerr
 #else
-#  define phydbg(x...)
+#  define phyerr(x...)
 #  define phyllerr(x...)
 #endif
 
@@ -100,7 +100,7 @@ static xcpt_t g_emac_handler;
 #ifdef CONFIG_SAM34_GPIOD_IRQ
 static void sam_emac_phy_enable(bool enable)
 {
-  phydbg("IRQ%d: enable=%d\n", SAM_PHY_IRQ, enable);
+  phyerr("IRQ%d: enable=%d\n", SAM_PHY_IRQ, enable);
   if (enable)
     {
       sam_gpioirqenable(SAM_PHY_IRQ);
@@ -126,7 +126,7 @@ static void sam_emac_phy_enable(bool enable)
 
 void weak_function sam_netinitialize(void)
 {
-  phydbg("Configuring %08x\n", GPIO_PHY_IRQ);
+  phyerr("Configuring %08x\n", GPIO_PHY_IRQ);
   sam_configgpio(GPIO_PHY_IRQ);
 }
 
@@ -206,11 +206,11 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
   DEBUGASSERT(intf);
 
   ninfo("%s: handler=%p\n", intf, handler);
-  phydbg("EMAC: devname=%s\n", SAM34_EMAC_DEVNAME);
+  phyerr("EMAC: devname=%s\n", SAM34_EMAC_DEVNAME);
 
   if (strcmp(intf, SAM34_EMAC_DEVNAME) == 0)
     {
-      phydbg("Select EMAC\n");
+      phyerr("Select EMAC\n");
       phandler = &g_emac_handler;
       pinset   = GPIO_PHY_IRQ;
       irq      = SAM_PHY_IRQ;
@@ -218,7 +218,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
     }
   else
     {
-      ndbg("Unsupported interface: %s\n", intf);
+      nerr("Unsupported interface: %s\n", intf);
       return NULL;
     }
 
@@ -237,15 +237,15 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
 
   if (handler)
     {
-      phydbg("Configure pin: %08x\n", pinset);
+      phyerr("Configure pin: %08x\n", pinset);
       sam_gpioirq(pinset);
 
-      phydbg("Attach IRQ%d\n", irq);
+      phyerr("Attach IRQ%d\n", irq);
       (void)irq_attach(irq, handler);
     }
   else
     {
-      phydbg("Detach IRQ%d\n", irq);
+      phyerr("Detach IRQ%d\n", irq);
       (void)irq_detach(irq);
       enabler = NULL;
     }
diff --git a/configs/sam4e-ek/src/sam_hsmci.c b/configs/sam4e-ek/src/sam_hsmci.c
index 89f332e51f..d9d0d675ab 100644
--- a/configs/sam4e-ek/src/sam_hsmci.c
+++ b/configs/sam4e-ek/src/sam_hsmci.c
@@ -144,7 +144,7 @@ int sam_hsmci_initialize(int minor)
       g_hsmci.hsmci = sdio_initialize(0);
       if (!g_hsmci.hsmci)
         {
-          fdbg("Failed to initialize SDIO\n");
+          ferr("Failed to initialize SDIO\n");
           return -ENODEV;
         }
 
@@ -153,7 +153,7 @@ int sam_hsmci_initialize(int minor)
       ret = mmcsd_slotinitialize(minor, g_hsmci.hsmci);
       if (ret != OK)
         {
-          fdbg("Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
+          ferr("Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/sam4e-ek/src/sam_ili9325.c b/configs/sam4e-ek/src/sam_ili9325.c
index a589d40ab2..ab0bf49c59 100644
--- a/configs/sam4e-ek/src/sam_ili9325.c
+++ b/configs/sam4e-ek/src/sam_ili9325.c
@@ -269,10 +269,10 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg              dbg
+#  define lcderr              err
 #  define lcdinfo             info
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -1292,7 +1292,7 @@ static inline int sam_lcd_initialize(void)
 
   if (id != ILI9325_DEVICE_CODE)
     {
-      lcddbg("ERROR: Unsupported LCD: %04x\n", id);
+      lcderr("ERROR: Unsupported LCD: %04x\n", id);
       return -ENODEV;
     }
 
diff --git a/configs/sam4e-ek/src/sam_ili9341.c b/configs/sam4e-ek/src/sam_ili9341.c
index 26aa294945..d6164b9e77 100644
--- a/configs/sam4e-ek/src/sam_ili9341.c
+++ b/configs/sam4e-ek/src/sam_ili9341.c
@@ -272,10 +272,10 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg              dbg
+#  define lcderr              err
 #  define lcdinfo             info
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -1171,7 +1171,7 @@ static inline int sam_lcd_initialize(void)
   id = ((uint16_t)buffer[2] << 8) | (uint16_t)buffer[3];
   if (id != ILI9341_DEVICE_CODE)
     {
-      lcddbg("ERROR: Unsupported LCD: %04x\n", id);
+      lcderr("ERROR: Unsupported LCD: %04x\n", id);
       return -ENODEV;
     }
 
diff --git a/configs/sam4e-ek/src/sam_leds.c b/configs/sam4e-ek/src/sam_leds.c
index cc405266d5..35bcf7cff4 100644
--- a/configs/sam4e-ek/src/sam_leds.c
+++ b/configs/sam4e-ek/src/sam_leds.c
@@ -103,10 +103,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/sam4e-ek/src/sam_spi.c b/configs/sam4e-ek/src/sam_spi.c
index 68b7469d20..a18c85a47a 100644
--- a/configs/sam4e-ek/src/sam_spi.c
+++ b/configs/sam4e-ek/src/sam_spi.c
@@ -65,7 +65,7 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -73,7 +73,7 @@
 #  endif
 #else
 #  undef SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
diff --git a/configs/sam4l-xplained/src/sam_autoleds.c b/configs/sam4l-xplained/src/sam_autoleds.c
index fca3a16fb0..57b82a508a 100644
--- a/configs/sam4l-xplained/src/sam_autoleds.c
+++ b/configs/sam4l-xplained/src/sam_autoleds.c
@@ -86,10 +86,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/sam4l-xplained/src/sam_mmcsd.c b/configs/sam4l-xplained/src/sam_mmcsd.c
index c752a35622..f4603d8107 100644
--- a/configs/sam4l-xplained/src/sam_mmcsd.c
+++ b/configs/sam4l-xplained/src/sam_mmcsd.c
@@ -99,7 +99,7 @@ int sam_sdinitialize(int minor)
   spi = sam_spibus_initialize(SD_CSNO);
   if (!spi)
     {
-      fdbg("Failed to initialize SPI chip select %d\n", SD_CSNO);
+      ferr("Failed to initialize SPI chip select %d\n", SD_CSNO);
       return -ENODEV;
     }
 
@@ -113,7 +113,7 @@ int sam_sdinitialize(int minor)
   ret = mmcsd_spislotinitialize(minor, SAM34_MMCSDSLOTNO, spi);
   if (ret < 0)
     {
-      fdbg("Failed to bind SPI chip select %d to MMC/SD slot %d: %d\n",
+      ferr("Failed to bind SPI chip select %d to MMC/SD slot %d: %d\n",
             SD_CSNO, SAM34_MMCSDSLOTNO, ret);
       return ret;
     }
diff --git a/configs/sam4l-xplained/src/sam_slcd.c b/configs/sam4l-xplained/src/sam_slcd.c
index 9b53b14724..391673d521 100644
--- a/configs/sam4l-xplained/src/sam_slcd.c
+++ b/configs/sam4l-xplained/src/sam_slcd.c
@@ -251,10 +251,10 @@
 /* Debug ********************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg              dbg
+#  define lcderr              err
 #  define lcdinfo             info
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
diff --git a/configs/sam4l-xplained/src/sam_spi.c b/configs/sam4l-xplained/src/sam_spi.c
index effc159407..4aad0f04d9 100644
--- a/configs/sam4l-xplained/src/sam_spi.c
+++ b/configs/sam4l-xplained/src/sam_spi.c
@@ -60,7 +60,7 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -68,7 +68,7 @@
 #  endif
 #else
 #  undef SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
diff --git a/configs/sam4l-xplained/src/sam_ug2832hsweg04.c b/configs/sam4l-xplained/src/sam_ug2832hsweg04.c
index 8cf093533b..a6a7e9cfda 100644
--- a/configs/sam4l-xplained/src/sam_ug2832hsweg04.c
+++ b/configs/sam4l-xplained/src/sam_ug2832hsweg04.c
@@ -117,10 +117,10 @@
 /* Debug ********************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg(format, ...)   dbg(format, ##__VA_ARGS__)
+#  define lcderr(format, ...)   err(format, ##__VA_ARGS__)
 #  define lcdinfo(format, ...)  info(format, ##__VA_ARGS__)
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -157,7 +157,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
   spi = sam_spibus_initialize(OLED_CSNO);
   if (!spi)
     {
-      lcddbg("Failed to initialize SPI port 1\n");
+      lcderr("Failed to initialize SPI port 1\n");
     }
   else
     {
@@ -166,7 +166,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
       dev = ssd1306_initialize(spi, devno);
       if (!dev)
         {
-          lcddbg("Failed to bind SPI port 1 to OLED %d: %d\n", devno);
+          lcderr("Failed to bind SPI port 1 to OLED %d: %d\n", devno);
         }
      else
         {
diff --git a/configs/sam4l-xplained/src/sam_userleds.c b/configs/sam4l-xplained/src/sam_userleds.c
index 3d0c33fa96..ad9d3a3000 100644
--- a/configs/sam4l-xplained/src/sam_userleds.c
+++ b/configs/sam4l-xplained/src/sam_userleds.c
@@ -71,10 +71,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/sam4s-xplained-pro/src/sam_autoleds.c b/configs/sam4s-xplained-pro/src/sam_autoleds.c
index 31af4fa757..537892c59a 100644
--- a/configs/sam4s-xplained-pro/src/sam_autoleds.c
+++ b/configs/sam4s-xplained-pro/src/sam_autoleds.c
@@ -79,10 +79,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/sam4s-xplained-pro/src/sam_hsmci.c b/configs/sam4s-xplained-pro/src/sam_hsmci.c
index 40cfd428d0..d7404ddd37 100644
--- a/configs/sam4s-xplained-pro/src/sam_hsmci.c
+++ b/configs/sam4s-xplained-pro/src/sam_hsmci.c
@@ -135,7 +135,7 @@ static int sam_hsmci_cardetect_int(int irq, void *regs)
 int sam_hsmci_initialize(void)
 {
   int ret;
-  fdbg("Initializing SDIO\n");
+  ferr("Initializing SDIO\n");
 
   /* Have we already initialized? */
 
@@ -147,7 +147,7 @@ int sam_hsmci_initialize(void)
       g_hsmci.hsmci = sdio_initialize(CONFIG_NSH_MMCSDSLOTNO);
       if (!g_hsmci.hsmci)
         {
-          fdbg("Failed to initialize SDIO\n");
+          ferr("Failed to initialize SDIO\n");
           return -ENODEV;
         }
 
@@ -156,7 +156,7 @@ int sam_hsmci_initialize(void)
       ret = mmcsd_slotinitialize(CONFIG_NSH_MMCSDMINOR, g_hsmci.hsmci);
       if (ret != OK)
         {
-          fdbg("Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
+          ferr("Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/sam4s-xplained-pro/src/sam_tc.c b/configs/sam4s-xplained-pro/src/sam_tc.c
index 42c2e014fa..ab036d212b 100644
--- a/configs/sam4s-xplained-pro/src/sam_tc.c
+++ b/configs/sam4s-xplained-pro/src/sam_tc.c
@@ -107,7 +107,7 @@
 #endif
 
 #ifdef CONFIG_DEBUG_TIMER
-#  define tcdbg                 dbg
+#  define tcerr                 err
 #  define tcllerr               llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define tcinfo              info
@@ -117,7 +117,7 @@
 #    define tcllinfo(x...)
 #  endif
 #else
-#  define tcdbg(x...)
+#  define tcerr(x...)
 #  define tcllerr(x...)
 #  define tcinfo(x...)
 #  define tcllinfo(x...)
@@ -211,7 +211,7 @@ int sam_timerinitialize(void)
   fd = open(CONFIG_SAM4S_XPLAINED_PRO_SCHED_TIMER_DEVPATH, O_RDONLY);
   if (fd < 0)
     {
-      tcdbg("open %s failed: %d\n",
+      tcerr("open %s failed: %d\n",
             CONFIG_SAM4S_XPLAINED_PRO_SCHED_TIMER_DEVPATH, errno);
       goto errout;
     }
@@ -222,7 +222,7 @@ int sam_timerinitialize(void)
   ret = ioctl(fd, TCIOC_SETTIMEOUT, (unsigned long)USEC_PER_TICK);
   if (ret < 0)
     {
-      tcdbg("ioctl(TCIOC_SETTIMEOUT) failed: %d\n", errno);
+      tcerr("ioctl(TCIOC_SETTIMEOUT) failed: %d\n", errno);
       goto errout_with_dev;
     }
 
@@ -235,7 +235,7 @@ int sam_timerinitialize(void)
     ret = ioctl(fd, TCIOC_SETHANDLER, (unsigned long)&tccb);
     if (ret < 0)
       {
-        tcdbg("ioctl(TCIOC_SETHANDLER) failed: %d\n", errno);
+        tcerr("ioctl(TCIOC_SETHANDLER) failed: %d\n", errno);
         goto errout_with_dev;
       }
   }
@@ -246,7 +246,7 @@ int sam_timerinitialize(void)
   ret = ioctl(fd, TCIOC_START, 0);
   if (ret < 0)
     {
-      tcdbg("ioctl(TCIOC_START) failed: %d\n", errno);
+      tcerr("ioctl(TCIOC_START) failed: %d\n", errno);
       goto errout_with_dev;
     }
 #endif
@@ -259,7 +259,7 @@ int sam_timerinitialize(void)
   fd = open(CONFIG_SAM4S_XPLAINED_PRO_CPULOAD_TIMER_DEVPATH, O_RDONLY);
   if (fd < 0)
     {
-      tcdbg("open %s failed: %d\n",
+      tcerr("open %s failed: %d\n",
             CONFIG_SAM4S_XPLAINED_PRO_CPULOAD_TIMER_DEVPATH, errno);
       goto errout;
     }
@@ -272,7 +272,7 @@ int sam_timerinitialize(void)
              (unsigned long)1000000 / CONFIG_SCHED_CPULOAD_TICKSPERSEC);
   if (ret < 0)
     {
-      tcdbg("ioctl(TCIOC_SETTIMEOUT) failed: %d\n", errno);
+      tcerr("ioctl(TCIOC_SETTIMEOUT) failed: %d\n", errno);
       goto errout_with_dev;
     }
 
@@ -286,7 +286,7 @@ int sam_timerinitialize(void)
     ret = ioctl(fd, TCIOC_SETHANDLER, (unsigned long)&tccb);
     if (ret < 0)
       {
-        tcdbg("ioctl(TCIOC_SETHANDLER) failed: %d\n", errno);
+        tcerr("ioctl(TCIOC_SETHANDLER) failed: %d\n", errno);
         goto errout_with_dev;
       }
   }
@@ -297,7 +297,7 @@ int sam_timerinitialize(void)
   ret = ioctl(fd, TCIOC_START, 0);
   if (ret < 0)
     {
-      tcdbg("ioctl(TCIOC_START) failed: %d\n", errno);
+      tcerr("ioctl(TCIOC_START) failed: %d\n", errno);
       goto errout_with_dev;
     }
 #endif
diff --git a/configs/sam4s-xplained-pro/src/sam_userleds.c b/configs/sam4s-xplained-pro/src/sam_userleds.c
index bec9332670..4e41ddb13d 100644
--- a/configs/sam4s-xplained-pro/src/sam_userleds.c
+++ b/configs/sam4s-xplained-pro/src/sam_userleds.c
@@ -61,10 +61,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/sam4s-xplained-pro/src/sam_wdt.c b/configs/sam4s-xplained-pro/src/sam_wdt.c
index a71115560d..1229069905 100644
--- a/configs/sam4s-xplained-pro/src/sam_wdt.c
+++ b/configs/sam4s-xplained-pro/src/sam_wdt.c
@@ -90,7 +90,7 @@
 #endif
 
 #ifdef CONFIG_DEBUG_WATCHDOG
-#  define wdgdbg                 dbg
+#  define wdgerr                 err
 #  define wdgllerr               llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define wdginfo              info
@@ -100,7 +100,7 @@
 #    define wdgllinfo(x...)
 #  endif
 #else
-#  define wdgdbg(x...)
+#  define wdgerr(x...)
 #  define wdgllerr(x...)
 #  define wdginfo(x...)
 #  define wdgllinfo(x...)
@@ -128,7 +128,7 @@ static int wdog_daemon(int argc, char *argv[])
   fd = open(CONFIG_WATCHDOG_DEVPATH, O_RDONLY);
   if (fd < 0)
     {
-      wdgdbg("open %s failed: %d\n", CONFIG_WATCHDOG_DEVPATH, errno);
+      wdgerr("open %s failed: %d\n", CONFIG_WATCHDOG_DEVPATH, errno);
       goto errout;
     }
 
@@ -138,7 +138,7 @@ static int wdog_daemon(int argc, char *argv[])
   ret = ioctl(fd, WDIOC_START, 0);
   if (ret < 0)
     {
-      wdgdbg("ioctl(WDIOC_START) failed: %d\n", errno);
+      wdgerr("ioctl(WDIOC_START) failed: %d\n", errno);
       goto errout_with_dev;
     }
 
@@ -151,7 +151,7 @@ static int wdog_daemon(int argc, char *argv[])
       ret = ioctl(fd, WDIOC_KEEPALIVE, 0);
       if (ret < 0)
         {
-          wdgdbg("ioctl(WDIOC_KEEPALIVE) failed: %d\n", errno);
+          wdgerr("ioctl(WDIOC_KEEPALIVE) failed: %d\n", errno);
           goto errout_with_dev;
         }
     }
@@ -190,7 +190,7 @@ int sam_watchdog_initialize(void)
   fd = open(CONFIG_WATCHDOG_DEVPATH, O_RDONLY);
   if (fd < 0)
     {
-      wdgdbg("open %s failed: %d\n", CONFIG_WATCHDOG_DEVPATH, errno);
+      wdgerr("open %s failed: %d\n", CONFIG_WATCHDOG_DEVPATH, errno);
       goto errout;
     }
 
@@ -200,7 +200,7 @@ int sam_watchdog_initialize(void)
   ret = ioctl(fd, WDIOC_SETTIMEOUT, (unsigned long)CONFIG_WDT_TIMEOUT);
   if (ret < 0)
     {
-      wdgdbg("ioctl(WDIOC_SETTIMEOUT) failed: %d\n", errno);
+      wdgerr("ioctl(WDIOC_SETTIMEOUT) failed: %d\n", errno);
       goto errout_with_dev;
     }
 
@@ -210,7 +210,7 @@ int sam_watchdog_initialize(void)
   ret = ioctl(fd, WDIOC_MINTIME, (unsigned long)CONFIG_WDT_MINTIME);
   if (ret < 0)
     {
-      wdgdbg("ioctl(WDIOC_MINTIME) failed: %d\n", errno);
+      wdgerr("ioctl(WDIOC_MINTIME) failed: %d\n", errno);
       goto errout_with_dev;
     }
 
diff --git a/configs/sam4s-xplained/src/sam_autoleds.c b/configs/sam4s-xplained/src/sam_autoleds.c
index 238510c7c3..b1763f91bb 100644
--- a/configs/sam4s-xplained/src/sam_autoleds.c
+++ b/configs/sam4s-xplained/src/sam_autoleds.c
@@ -78,10 +78,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/sam4s-xplained/src/sam_userleds.c b/configs/sam4s-xplained/src/sam_userleds.c
index 06b3f83097..dbf687bdd4 100644
--- a/configs/sam4s-xplained/src/sam_userleds.c
+++ b/configs/sam4s-xplained/src/sam_userleds.c
@@ -60,10 +60,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/sama5d2-xult/src/sam_autoleds.c b/configs/sama5d2-xult/src/sam_autoleds.c
index c18908e056..c565cf8d19 100644
--- a/configs/sama5d2-xult/src/sam_autoleds.c
+++ b/configs/sama5d2-xult/src/sam_autoleds.c
@@ -94,10 +94,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/sama5d2-xult/src/sam_bringup.c b/configs/sama5d2-xult/src/sam_bringup.c
index e332c2d4e8..133e3f5199 100644
--- a/configs/sama5d2-xult/src/sam_bringup.c
+++ b/configs/sama5d2-xult/src/sam_bringup.c
@@ -52,7 +52,7 @@
 #ifdef CONFIG_BOARD_INITIALIZE
 #  define SYSLOG llerr
 #else
-#  define SYSLOG dbg
+#  define SYSLOG err
 #endif
 
 /****************************************************************************
diff --git a/configs/sama5d2-xult/src/sam_userleds.c b/configs/sama5d2-xult/src/sam_userleds.c
index 11f191b3a1..af44730d15 100644
--- a/configs/sama5d2-xult/src/sam_userleds.c
+++ b/configs/sama5d2-xult/src/sam_userleds.c
@@ -70,10 +70,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/sama5d3-xplained/src/sam_adc.c b/configs/sama5d3-xplained/src/sam_adc.c
index f770ba5d22..876669ad56 100644
--- a/configs/sama5d3-xplained/src/sam_adc.c
+++ b/configs/sama5d3-xplained/src/sam_adc.c
@@ -88,7 +88,7 @@ int board_adc_initialize(void)
       adc = sam_adc_initialize();
       if (adc == NULL)
         {
-          adbg("ERROR: Failed to get ADC interface\n");
+          aerr("ERROR: Failed to get ADC interface\n");
           return -ENODEV;
         }
 
@@ -97,7 +97,7 @@ int board_adc_initialize(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          adbg("adc_register failed: %d\n", ret);
+          aerr("adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/sama5d3-xplained/src/sam_ajoystick.c b/configs/sama5d3-xplained/src/sam_ajoystick.c
index e1e1a1c485..f068cf2ef9 100644
--- a/configs/sama5d3-xplained/src/sam_ajoystick.c
+++ b/configs/sama5d3-xplained/src/sam_ajoystick.c
@@ -193,14 +193,14 @@ static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower,
       int errcode = get_errno();
       if (errcode != EINTR)
         {
-          idbg("ERROR: read failed: %d\n", errcode);
+          ierr("ERROR: read failed: %d\n", errcode);
         }
 
       return -errcode;
     }
   else if (nread < 2 * sizeof(struct adc_msg_s))
     {
-      idbg("ERROR: read too small: %ld\n", (long)nread);
+      ierr("ERROR: read too small: %ld\n", (long)nread);
       return -EIO;
     }
 
@@ -235,7 +235,7 @@ static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower,
 
   if (have != 3)
     {
-      idbg("ERROR: Could not find joystack channels\n");
+      ierr("ERROR: Could not find joystack channels\n");
       return -EIO;
     }
 
@@ -410,7 +410,7 @@ int sam_ajoy_initialization(void)
   ret = board_adc_initialize();
   if (ret < 0)
     {
-      idbg("ERROR: board_adc_initialize() failed: %d\n", ret);
+      ierr("ERROR: board_adc_initialize() failed: %d\n", ret);
       return ret;
     }
 
@@ -420,7 +420,7 @@ int sam_ajoy_initialization(void)
   if (fd < 0)
     {
       int errcode = get_errno();
-      idbg("ERROR: Failed to open /dev/adc0: %d\n", errcode);
+      ierr("ERROR: Failed to open /dev/adc0: %d\n", errcode);
       return -errcode;
     }
 
@@ -431,7 +431,7 @@ int sam_ajoy_initialization(void)
   ret = file_detach(fd, &g_adcfile);
   if (ret < 0)
     {
-      idbg("ERROR: Failed to detach from file descriptor: %d\n", ret);
+      ierr("ERROR: Failed to detach from file descriptor: %d\n", ret);
       (void)close(fd);
       return ret;
     }
@@ -458,7 +458,7 @@ int sam_ajoy_initialization(void)
   ret = ajoy_register("/dev/ajoy0", &g_ajoylower);
   if (ret < 0)
     {
-      idbg("ERROR: ajoy_register failed: %d\n", ret);
+      ierr("ERROR: ajoy_register failed: %d\n", ret);
       file_close_detached(&g_adcfile);
     }
 
diff --git a/configs/sama5d3-xplained/src/sam_at25.c b/configs/sama5d3-xplained/src/sam_at25.c
index a6ef86fc06..6e83029119 100644
--- a/configs/sama5d3-xplained/src/sam_at25.c
+++ b/configs/sama5d3-xplained/src/sam_at25.c
@@ -87,7 +87,7 @@ int sam_at25_automount(int minor)
       spi = sam_spibus_initialize(AT25_PORT);
       if (!spi)
         {
-          fdbg("ERROR: Failed to initialize SPI port %d\n", AT25_PORT);
+          ferr("ERROR: Failed to initialize SPI port %d\n", AT25_PORT);
           return -ENODEV;
         }
 
@@ -96,7 +96,7 @@ int sam_at25_automount(int minor)
       mtd = at25_initialize(spi);
       if (!mtd)
         {
-          fdbg("ERROR: Failed to bind SPI port %d to the AT25 FLASH driver\n");
+          ferr("ERROR: Failed to bind SPI port %d to the AT25 FLASH driver\n");
           return -ENODEV;
         }
 
@@ -106,7 +106,7 @@ int sam_at25_automount(int minor)
       ret = ftl_initialize(AT25_MINOR, mtd);
       if (ret < 0)
         {
-          fdbg("ERROR: Failed to initialize the FTL layer: %d\n", ret);
+          ferr("ERROR: Failed to initialize the FTL layer: %d\n", ret);
           return ret;
         }
 
@@ -116,7 +116,7 @@ int sam_at25_automount(int minor)
       ret = nxffs_initialize(mtd);
       if (ret < 0)
         {
-          fdbg("ERROR: NXFFS initialization failed: %d\n", ret);
+          ferr("ERROR: NXFFS initialization failed: %d\n", ret);
           return ret;
         }
 
@@ -125,7 +125,7 @@ int sam_at25_automount(int minor)
       ret = mount(NULL, "/mnt/at25", "nxffs", 0, NULL);
       if (ret < 0)
         {
-          fdbg("ERROR: Failed to mount the NXFFS volume: %d\n", errno);
+          ferr("ERROR: Failed to mount the NXFFS volume: %d\n", errno);
           return ret;
         }
 #endif
diff --git a/configs/sama5d3-xplained/src/sam_autoleds.c b/configs/sama5d3-xplained/src/sam_autoleds.c
index b9f84bb074..046ab9a7f9 100644
--- a/configs/sama5d3-xplained/src/sam_autoleds.c
+++ b/configs/sama5d3-xplained/src/sam_autoleds.c
@@ -96,10 +96,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/sama5d3-xplained/src/sam_can.c b/configs/sama5d3-xplained/src/sam_can.c
index a8c59ecbb5..8cf06c3b9b 100644
--- a/configs/sama5d3-xplained/src/sam_can.c
+++ b/configs/sama5d3-xplained/src/sam_can.c
@@ -73,12 +73,12 @@
 /* Non-standard debug that may be enabled just for testing CAN */
 
 #ifdef CONFIG_DEBUG_CAN
-#  define candbg    dbg
+#  define canerr    err
 #  define caninfo   info
 #  define canllerr  llerr
 #  define canllinfo llinfo
 #else
-#  define candbg(x...)
+#  define canerr(x...)
 #  define caninfo(x...)
 #  define canllerr(x...)
 #  define canllinfo(x...)
@@ -116,7 +116,7 @@ int board_can_initialize(void)
       can = sam_caninitialize(CAN_PORT);
       if (can == NULL)
         {
-          candbg("ERROR:  Failed to get CAN interface\n");
+          canerr("ERROR:  Failed to get CAN interface\n");
           return -ENODEV;
         }
 
@@ -125,7 +125,7 @@ int board_can_initialize(void)
       ret = can_register("/dev/can0", can);
       if (ret < 0)
         {
-          candbg("ERROR: can_register failed: %d\n", ret);
+          canerr("ERROR: can_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/sama5d3-xplained/src/sam_ethernet.c b/configs/sama5d3-xplained/src/sam_ethernet.c
index 75c9a7f0fc..d7a29ed54e 100644
--- a/configs/sama5d3-xplained/src/sam_ethernet.c
+++ b/configs/sama5d3-xplained/src/sam_ethernet.c
@@ -84,10 +84,10 @@
  */
 
 #ifdef CONFIG_NETDEV_PHY_DEBUG
-#  define phydbg    dbg
+#  define phyerr    err
 #  define phyllerr  llerr
 #else
-#  define phydbg(x...)
+#  define phyerr(x...)
 #  define phyllerr(x...)
 #endif
 
@@ -116,7 +116,7 @@ static xcpt_t g_gmac_handler;
 #ifdef CONFIG_SAMA5_EMACA
 static void sam_emac_phy_enable(bool enable)
 {
-  phydbg("IRQ%d: enable=%d\n", IRQ_INT_ETH1, enable);
+  phyerr("IRQ%d: enable=%d\n", IRQ_INT_ETH1, enable);
   if (enable)
     {
       sam_pioirqenable(IRQ_INT_ETH1);
@@ -132,7 +132,7 @@ static void sam_emac_phy_enable(bool enable)
 #ifdef CONFIG_SAMA5_GMAC
 static void sam_gmac_phy_enable(bool enable)
 {
-  phydbg("IRQ%d: enable=%d\n", IRQ_INT_ETH0, enable);
+  phyerr("IRQ%d: enable=%d\n", IRQ_INT_ETH0, enable);
   if (enable)
     {
       sam_pioirqenable(IRQ_INT_ETH0);
@@ -179,7 +179,7 @@ void weak_function sam_netinitialize(void)
    * The KSZ8051 PHY interrupt is available on PE30 INT_ETH1
   */
 
-  phydbg("Configuring %08x\n", PIO_INT_ETH1);
+  phyerr("Configuring %08x\n", PIO_INT_ETH1);
   sam_configpio(PIO_INT_ETH1);
 #endif
 
@@ -196,7 +196,7 @@ void weak_function sam_netinitialize(void)
    * The KSZ9021/31 interrupt is available on PB35 INT_GETH0
    */
 
-  phydbg("Configuring %08x\n", PIO_INT_ETH0);
+  phyerr("Configuring %08x\n", PIO_INT_ETH0);
   sam_configpio(PIO_INT_ETH0);
 #endif
 }
@@ -278,16 +278,16 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
 
   ninfo("%s: handler=%p\n", intf, handler);
 #ifdef CONFIG_SAMA5_EMACA
-  phydbg("EMAC: devname=%s\n", SAMA5_EMAC_DEVNAME);
+  phyerr("EMAC: devname=%s\n", SAMA5_EMAC_DEVNAME);
 #endif
 #ifdef CONFIG_SAMA5_GMAC
-  phydbg("GMAC: devname=%s\n", SAMA5_GMAC_DEVNAME);
+  phyerr("GMAC: devname=%s\n", SAMA5_GMAC_DEVNAME);
 #endif
 
 #ifdef CONFIG_SAMA5_EMACA
   if (strcmp(intf, SAMA5_EMAC_DEVNAME) == 0)
     {
-      phydbg("Select EMAC\n");
+      phyerr("Select EMAC\n");
       phandler = &g_emac_handler;
       pinset   = PIO_INT_ETH1;
       irq      = IRQ_INT_ETH1;
@@ -298,7 +298,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
 #ifdef CONFIG_SAMA5_GMAC
   if (strcmp(intf, SAMA5_GMAC_DEVNAME) == 0)
     {
-      phydbg("Select GMAC\n");
+      phyerr("Select GMAC\n");
       phandler = &g_gmac_handler;
       pinset   = PIO_INT_ETH0;
       irq      = IRQ_INT_ETH0;
@@ -307,7 +307,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
   else
 #endif
     {
-      ndbg("Unsupported interface: %s\n", intf);
+      nerr("Unsupported interface: %s\n", intf);
       return NULL;
     }
 
@@ -326,15 +326,15 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
 
   if (handler)
     {
-      phydbg("Configure pin: %08x\n", pinset);
+      phyerr("Configure pin: %08x\n", pinset);
       sam_pioirq(pinset);
 
-      phydbg("Attach IRQ%d\n", irq);
+      phyerr("Attach IRQ%d\n", irq);
       (void)irq_attach(irq, handler);
     }
   else
     {
-      phydbg("Detach IRQ%d\n", irq);
+      phyerr("Detach IRQ%d\n", irq);
       (void)irq_detach(irq);
       enabler = NULL;
     }
diff --git a/configs/sama5d3-xplained/src/sam_hsmci.c b/configs/sama5d3-xplained/src/sam_hsmci.c
index 2db5dd8d16..a3416189fb 100644
--- a/configs/sama5d3-xplained/src/sam_hsmci.c
+++ b/configs/sama5d3-xplained/src/sam_hsmci.c
@@ -257,7 +257,7 @@ int sam_hsmci_initialize(int slotno, int minor)
   state = sam_hsmci_state(slotno);
   if (!state)
     {
-      fdbg("No state for slotno %d\n", slotno);
+      ferr("No state for slotno %d\n", slotno);
       return -EINVAL;
     }
 
@@ -271,7 +271,7 @@ int sam_hsmci_initialize(int slotno, int minor)
   state->hsmci = sdio_initialize(slotno);
   if (!state->hsmci)
     {
-      fdbg("Failed to initialize SDIO slot %d\n",  slotno);
+      ferr("Failed to initialize SDIO slot %d\n",  slotno);
       return -ENODEV;
     }
 
@@ -280,7 +280,7 @@ int sam_hsmci_initialize(int slotno, int minor)
   ret = mmcsd_slotinitialize(minor, state->hsmci);
   if (ret != OK)
     {
-      fdbg("Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
+      ferr("Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
       return ret;
     }
 
@@ -317,7 +317,7 @@ bool sam_cardinserted(int slotno)
   state = sam_hsmci_state(slotno);
   if (!state)
     {
-      fdbg("No state for slotno %d\n", slotno);
+      ferr("No state for slotno %d\n", slotno);
       return false;
     }
 
diff --git a/configs/sama5d3-xplained/src/sam_i2schar.c b/configs/sama5d3-xplained/src/sam_i2schar.c
index 8842c1046f..67d271edc6 100644
--- a/configs/sama5d3-xplained/src/sam_i2schar.c
+++ b/configs/sama5d3-xplained/src/sam_i2schar.c
@@ -99,7 +99,7 @@ int i2schar_devinit(void)
       i2s = sam_ssc_initialize(CONFIG_SAMA5D3XPLAINED_SSC_PORT);
       if (!i2s)
         {
-          dbg("ERROR: Failed to get the SAMA5 SSC/I2S driver for SSC%d\n",
+          err("ERROR: Failed to get the SAMA5 SSC/I2S driver for SSC%d\n",
               CONFIG_SAMA5D3XPLAINED_SSC_PORT);
           return -ENODEV;
         }
@@ -109,7 +109,7 @@ int i2schar_devinit(void)
       ret = i2schar_register(i2s, CONFIG_SAMA5D3XPLAINED_I2SCHAR_MINOR);
       if (ret < 0)
         {
-          adbg("ERROR: i2schar_register failed: %d\n", ret);
+          aerr("ERROR: i2schar_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/sama5d3-xplained/src/sam_nandflash.c b/configs/sama5d3-xplained/src/sam_nandflash.c
index 270b3624da..69157cc3fa 100644
--- a/configs/sama5d3-xplained/src/sam_nandflash.c
+++ b/configs/sama5d3-xplained/src/sam_nandflash.c
@@ -186,7 +186,7 @@ int sam_nand_automount(int minor)
       mtd = sam_nand_initialize(HSMC_CS3);
       if (!mtd)
         {
-          fdbg("ERROR: Failed to create the NAND driver on CS%d\n", HSMC_CS3);
+          ferr("ERROR: Failed to create the NAND driver on CS%d\n", HSMC_CS3);
           return -ENODEV;
         }
 
@@ -196,7 +196,7 @@ int sam_nand_automount(int minor)
       ret = ftl_initialize(NAND_MINOR, mtd);
       if (ret < 0)
         {
-          fdbg("ERROR: Failed to initialize the FTL layer: %d\n", ret);
+          ferr("ERROR: Failed to initialize the FTL layer: %d\n", ret);
           return ret;
         }
 
@@ -206,7 +206,7 @@ int sam_nand_automount(int minor)
       ret = nxffs_initialize(mtd);
       if (ret < 0)
         {
-          fdbg("ERROR: NXFFS initialization failed: %d\n", ret);
+          ferr("ERROR: NXFFS initialization failed: %d\n", ret);
           return ret;
         }
 
@@ -215,7 +215,7 @@ int sam_nand_automount(int minor)
       ret = mount(NULL, "/mnt/nand", "nxffs", 0, NULL);
       if (ret < 0)
         {
-          fdbg("ERROR: Failed to mount the NXFFS volume: %d\n", errno);
+          ferr("ERROR: Failed to mount the NXFFS volume: %d\n", errno);
           return ret;
         }
 #endif
diff --git a/configs/sama5d3-xplained/src/sam_pwm.c b/configs/sama5d3-xplained/src/sam_pwm.c
index 59eca5189c..15be11b576 100644
--- a/configs/sama5d3-xplained/src/sam_pwm.c
+++ b/configs/sama5d3-xplained/src/sam_pwm.c
@@ -139,7 +139,7 @@ int board_pwm_setup(void)
       pwm = sam_pwminitialize(CONFIG_SAMA5D3XPLAINED_CHANNEL);
       if (!pwm)
         {
-          dbg("Failed to get the SAMA5 PWM lower half\n");
+          err("Failed to get the SAMA5 PWM lower half\n");
           return -ENODEV;
         }
 
@@ -148,7 +148,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          adbg("pwm_register failed: %d\n", ret);
+          aerr("pwm_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/sama5d3-xplained/src/sam_spi.c b/configs/sama5d3-xplained/src/sam_spi.c
index 4806c9c61c..41a57cd63f 100644
--- a/configs/sama5d3-xplained/src/sam_spi.c
+++ b/configs/sama5d3-xplained/src/sam_spi.c
@@ -65,7 +65,7 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -73,7 +73,7 @@
 #  endif
 #else
 #  undef SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
diff --git a/configs/sama5d3-xplained/src/sam_usb.c b/configs/sama5d3-xplained/src/sam_usb.c
index d071064d09..a12e09f31b 100644
--- a/configs/sama5d3-xplained/src/sam_usb.c
+++ b/configs/sama5d3-xplained/src/sam_usb.c
@@ -309,7 +309,7 @@ int sam_usbhost_initialize(void)
   ret = usbhost_hub_initialize();
   if (ret < 0)
     {
-      udbg("ERROR: usbhost_hub_initialize failed: %d\n", ret);
+      uerr("ERROR: usbhost_hub_initialize failed: %d\n", ret);
     }
 #endif
 
@@ -319,7 +319,7 @@ int sam_usbhost_initialize(void)
   ret = usbhost_msc_initialize();
   if (ret != OK)
     {
-      udbg("ERROR: Failed to register the mass storage class: %d\n", ret);
+      uerr("ERROR: Failed to register the mass storage class: %d\n", ret);
     }
 #endif
 
@@ -329,7 +329,7 @@ int sam_usbhost_initialize(void)
   ret = usbhost_cdcacm_initialize();
   if (ret != OK)
     {
-      udbg("ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
+      uerr("ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
     }
 #endif
 
@@ -339,7 +339,7 @@ int sam_usbhost_initialize(void)
   ret = usbhost_kbdinit();
   if (ret != OK)
     {
-      udbg("ERROR: Failed to register the KBD class\n");
+      uerr("ERROR: Failed to register the KBD class\n");
     }
 #endif
 
@@ -351,7 +351,7 @@ int sam_usbhost_initialize(void)
   g_ohciconn = sam_ohci_initialize(0);
   if (!g_ohciconn)
     {
-      udbg("ERROR: sam_ohci_initialize failed\n");
+      uerr("ERROR: sam_ohci_initialize failed\n");
       return -ENODEV;
     }
 
@@ -362,7 +362,7 @@ int sam_usbhost_initialize(void)
                     (main_t)ohci_waiter, (FAR char * const *)NULL);
   if (pid < 0)
     {
-      udbg("ERROR: Failed to create ohci_waiter task: %d\n", ret);
+      uerr("ERROR: Failed to create ohci_waiter task: %d\n", ret);
       return -ENODEV;
     }
 #endif
@@ -373,7 +373,7 @@ int sam_usbhost_initialize(void)
   g_ehciconn = sam_ehci_initialize(0);
   if (!g_ehciconn)
     {
-      udbg("ERROR: sam_ehci_initialize failed\n");
+      uerr("ERROR: sam_ehci_initialize failed\n");
       return -ENODEV;
     }
 
@@ -384,7 +384,7 @@ int sam_usbhost_initialize(void)
                     (main_t)ehci_waiter, (FAR char * const *)NULL);
   if (pid < 0)
     {
-      udbg("ERROR: Failed to create ehci_waiter task: %d\n", ret);
+      uerr("ERROR: Failed to create ehci_waiter task: %d\n", ret);
       return -ENODEV;
     }
 #endif
@@ -423,13 +423,13 @@ void sam_usbhost_vbusdrive(int rhport, bool enable)
     {
     case SAM_RHPORT1:
 #if !defined(CONFIG_SAMA5_UHPHS_RHPORT1)
-      udbg("ERROR: RHPort1 is not available in this configuration\n");
+      uerr("ERROR: RHPort1 is not available in this configuration\n");
       return;
 
 #elif !defined(PIO_USBA_VBUS_ENABLE)
       /* SAMA5D3-Xplained has no port A VBUS enable */
 
-      udbg("ERROR: RHPort1 has no VBUS enable\n");
+      uerr("ERROR: RHPort1 has no VBUS enable\n");
       return;
 #else
       pinset = PIO_USBA_VBUS_ENABLE;
@@ -438,7 +438,7 @@ void sam_usbhost_vbusdrive(int rhport, bool enable)
 
     case SAM_RHPORT2:
 #ifndef CONFIG_SAMA5_UHPHS_RHPORT2
-      udbg("ERROR: RHPort2 is not available in this configuration\n");
+      uerr("ERROR: RHPort2 is not available in this configuration\n");
       return;
 #else
       pinset = PIO_USBB_VBUS_ENABLE;
@@ -447,7 +447,7 @@ void sam_usbhost_vbusdrive(int rhport, bool enable)
 
     case SAM_RHPORT3:
 #ifndef CONFIG_SAMA5_UHPHS_RHPORT3
-      udbg("ERROR: RHPort3 is not available in this configuration\n");
+      uerr("ERROR: RHPort3 is not available in this configuration\n");
       return;
 #else
       pinset = PIO_USBC_VBUS_ENABLE;
@@ -455,7 +455,7 @@ void sam_usbhost_vbusdrive(int rhport, bool enable)
 #endif
 
     default:
-      udbg("ERROR: RHPort%d is not supported\n", rhport+1);
+      uerr("ERROR: RHPort%d is not supported\n", rhport+1);
       return;
     }
 
diff --git a/configs/sama5d3-xplained/src/sam_userleds.c b/configs/sama5d3-xplained/src/sam_userleds.c
index 2d85d2ef83..0a7ae94e57 100644
--- a/configs/sama5d3-xplained/src/sam_userleds.c
+++ b/configs/sama5d3-xplained/src/sam_userleds.c
@@ -72,10 +72,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/sama5d3x-ek/src/sam_adc.c b/configs/sama5d3x-ek/src/sam_adc.c
index f27ba7be0d..2c9c5e974f 100644
--- a/configs/sama5d3x-ek/src/sam_adc.c
+++ b/configs/sama5d3x-ek/src/sam_adc.c
@@ -92,7 +92,7 @@ int board_adc_setup(void)
       adc = sam_adc_initialize();
       if (adc == NULL)
         {
-          adbg("ERROR: Failed to get ADC interface\n");
+          aerr("ERROR: Failed to get ADC interface\n");
           return -ENODEV;
         }
 
@@ -101,7 +101,7 @@ int board_adc_setup(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          adbg("adc_register failed: %d\n", ret);
+          aerr("adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/sama5d3x-ek/src/sam_at24.c b/configs/sama5d3x-ek/src/sam_at24.c
index 39a57464a5..cd8b8cade7 100644
--- a/configs/sama5d3x-ek/src/sam_at24.c
+++ b/configs/sama5d3x-ek/src/sam_at24.c
@@ -106,7 +106,7 @@ int sam_at24_automount(int minor)
       i2c = sam_i2cbus_initialize(AT24_BUS);
       if (!i2c)
         {
-          fdbg("ERROR: Failed to initialize TWI%d\n", AT24_BUS);
+          ferr("ERROR: Failed to initialize TWI%d\n", AT24_BUS);
           return -ENODEV;
         }
 
@@ -116,7 +116,7 @@ int sam_at24_automount(int minor)
       mtd = at24c_initialize(i2c);
       if (!mtd)
         {
-          fdbg("ERROR: Failed to bind TWI%d to the AT24 EEPROM driver\n",
+          ferr("ERROR: Failed to bind TWI%d to the AT24 EEPROM driver\n",
                AT24_BUS);
           return -ENODEV;
         }
@@ -128,7 +128,7 @@ int sam_at24_automount(int minor)
       ret = ftl_initialize(AT24_MINOR, mtd);
       if (ret < 0)
         {
-          fdbg("ERROR: Failed to initialize the FTL layer: %d\n", ret);
+          ferr("ERROR: Failed to initialize the FTL layer: %d\n", ret);
           return ret;
         }
 
@@ -139,7 +139,7 @@ int sam_at24_automount(int minor)
       ret = nxffs_initialize(mtd);
       if (ret < 0)
         {
-          fdbg("ERROR: NXFFS initialization failed: %d\n", ret);
+          ferr("ERROR: NXFFS initialization failed: %d\n", ret);
           return ret;
         }
 
@@ -149,7 +149,7 @@ int sam_at24_automount(int minor)
       ret = mount(NULL, "/mnt/at24", "nxffs", 0, NULL);
       if (ret < 0)
         {
-          fdbg("ERROR: Failed to mount the NXFFS volume: %d\n", errno);
+          ferr("ERROR: Failed to mount the NXFFS volume: %d\n", errno);
           return ret;
         }
 #endif
diff --git a/configs/sama5d3x-ek/src/sam_at25.c b/configs/sama5d3x-ek/src/sam_at25.c
index 14a77b9493..8c86d3ccaa 100644
--- a/configs/sama5d3x-ek/src/sam_at25.c
+++ b/configs/sama5d3x-ek/src/sam_at25.c
@@ -87,7 +87,7 @@ int sam_at25_automount(int minor)
       spi = sam_spibus_initialize(AT25_PORT);
       if (!spi)
         {
-          fdbg("ERROR: Failed to initialize SPI port %d\n", AT25_PORT);
+          ferr("ERROR: Failed to initialize SPI port %d\n", AT25_PORT);
           return -ENODEV;
         }
 
@@ -96,7 +96,7 @@ int sam_at25_automount(int minor)
       mtd = at25_initialize(spi);
       if (!mtd)
         {
-          fdbg("ERROR: Failed to bind SPI port %d to the AT25 FLASH driver\n");
+          ferr("ERROR: Failed to bind SPI port %d to the AT25 FLASH driver\n");
           return -ENODEV;
         }
 
@@ -106,7 +106,7 @@ int sam_at25_automount(int minor)
       ret = ftl_initialize(AT25_MINOR, mtd);
       if (ret < 0)
         {
-          fdbg("ERROR: Failed to initialize the FTL layer: %d\n", ret);
+          ferr("ERROR: Failed to initialize the FTL layer: %d\n", ret);
           return ret;
         }
 
@@ -116,7 +116,7 @@ int sam_at25_automount(int minor)
       ret = nxffs_initialize(mtd);
       if (ret < 0)
         {
-          fdbg("ERROR: NXFFS initialization failed: %d\n", ret);
+          ferr("ERROR: NXFFS initialization failed: %d\n", ret);
           return ret;
         }
 
@@ -125,7 +125,7 @@ int sam_at25_automount(int minor)
       ret = mount(NULL, "/mnt/at25", "nxffs", 0, NULL);
       if (ret < 0)
         {
-          fdbg("ERROR: Failed to mount the NXFFS volume: %d\n", errno);
+          ferr("ERROR: Failed to mount the NXFFS volume: %d\n", errno);
           return ret;
         }
 #endif
diff --git a/configs/sama5d3x-ek/src/sam_autoleds.c b/configs/sama5d3x-ek/src/sam_autoleds.c
index 79188d84f7..12ef20cd8d 100644
--- a/configs/sama5d3x-ek/src/sam_autoleds.c
+++ b/configs/sama5d3x-ek/src/sam_autoleds.c
@@ -96,10 +96,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/sama5d3x-ek/src/sam_can.c b/configs/sama5d3x-ek/src/sam_can.c
index 176be69ce6..2cdc4a4816 100644
--- a/configs/sama5d3x-ek/src/sam_can.c
+++ b/configs/sama5d3x-ek/src/sam_can.c
@@ -73,12 +73,12 @@
 /* Non-standard debug that may be enabled just for testing CAN */
 
 #ifdef CONFIG_DEBUG_CAN
-#  define candbg    dbg
+#  define canerr    err
 #  define caninfo   info
 #  define canllerr  llerr
 #  define canllinfo llinfo
 #else
-#  define candbg(x...)
+#  define canerr(x...)
 #  define caninfo(x...)
 #  define canllerr(x...)
 #  define canllinfo(x...)
@@ -116,7 +116,7 @@ int board_can_initialize(void)
       can = sam_caninitialize(CAN_PORT);
       if (can == NULL)
         {
-          candbg("ERROR:  Failed to get CAN interface\n");
+          canerr("ERROR:  Failed to get CAN interface\n");
           return -ENODEV;
         }
 
@@ -125,7 +125,7 @@ int board_can_initialize(void)
       ret = can_register("/dev/can0", can);
       if (ret < 0)
         {
-          candbg("ERROR: can_register failed: %d\n", ret);
+          canerr("ERROR: can_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/sama5d3x-ek/src/sam_ethernet.c b/configs/sama5d3x-ek/src/sam_ethernet.c
index 7a70518fe9..4285577a03 100644
--- a/configs/sama5d3x-ek/src/sam_ethernet.c
+++ b/configs/sama5d3x-ek/src/sam_ethernet.c
@@ -84,10 +84,10 @@
  */
 
 #ifdef CONFIG_NETDEV_PHY_DEBUG
-#  define phydbg    dbg
+#  define phyerr    err
 #  define phyllerr  llerr
 #else
-#  define phydbg(x...)
+#  define phyerr(x...)
 #  define phyllerr(x...)
 #endif
 
@@ -116,7 +116,7 @@ static xcpt_t g_gmac_handler;
 #ifdef CONFIG_SAMA5_EMACA
 static void sam_emac_phy_enable(bool enable)
 {
-  phydbg("IRQ%d: enable=%d\n", IRQ_INT_ETH1, enable);
+  phyerr("IRQ%d: enable=%d\n", IRQ_INT_ETH1, enable);
   if (enable)
     {
       sam_pioirqenable(IRQ_INT_ETH1);
@@ -132,7 +132,7 @@ static void sam_emac_phy_enable(bool enable)
 #ifdef CONFIG_SAMA5_GMAC
 static void sam_gmac_phy_enable(bool enable)
 {
-  phydbg("IRQ%d: enable=%d\n", IRQ_INT_ETH0, enable);
+  phyerr("IRQ%d: enable=%d\n", IRQ_INT_ETH0, enable);
   if (enable)
     {
       sam_pioirqenable(IRQ_INT_ETH0);
@@ -179,7 +179,7 @@ void weak_function sam_netinitialize(void)
    * The KSZ8051 PHY interrupt is available on PE30 INT_ETH1
    */
 
-  phydbg("Configuring %08x\n", PIO_INT_ETH1);
+  phyerr("Configuring %08x\n", PIO_INT_ETH1);
   sam_configpio(PIO_INT_ETH1);
 #endif
 
@@ -196,7 +196,7 @@ void weak_function sam_netinitialize(void)
    * The KSZ9021/31 interrupt is available on PB35 INT_GETH0
    */
 
-  phydbg("Configuring %08x\n", PIO_INT_ETH0);
+  phyerr("Configuring %08x\n", PIO_INT_ETH0);
   sam_configpio(PIO_INT_ETH0);
 #endif
 }
@@ -278,16 +278,16 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
 
   ninfo("%s: handler=%p\n", intf, handler);
 #ifdef CONFIG_SAMA5_EMACA
-  phydbg("EMAC: devname=%s\n", SAMA5_EMAC_DEVNAME);
+  phyerr("EMAC: devname=%s\n", SAMA5_EMAC_DEVNAME);
 #endif
 #ifdef CONFIG_SAMA5_GMAC
-  phydbg("GMAC: devname=%s\n", SAMA5_GMAC_DEVNAME);
+  phyerr("GMAC: devname=%s\n", SAMA5_GMAC_DEVNAME);
 #endif
 
 #ifdef CONFIG_SAMA5_EMACA
   if (strcmp(intf, SAMA5_EMAC_DEVNAME) == 0)
     {
-      phydbg("Select EMAC\n");
+      phyerr("Select EMAC\n");
       phandler = &g_emac_handler;
       pinset   = PIO_INT_ETH1;
       irq      = IRQ_INT_ETH1;
@@ -298,7 +298,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
 #ifdef CONFIG_SAMA5_GMAC
   if (strcmp(intf, SAMA5_GMAC_DEVNAME) == 0)
     {
-      phydbg("Select GMAC\n");
+      phyerr("Select GMAC\n");
       phandler = &g_gmac_handler;
       pinset   = PIO_INT_ETH0;
       irq      = IRQ_INT_ETH0;
@@ -307,7 +307,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
   else
 #endif
     {
-      ndbg("Unsupported interface: %s\n", intf);
+      nerr("Unsupported interface: %s\n", intf);
       return NULL;
     }
 
@@ -326,15 +326,15 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
 
   if (handler)
     {
-      phydbg("Configure pin: %08x\n", pinset);
+      phyerr("Configure pin: %08x\n", pinset);
       sam_pioirq(pinset);
 
-      phydbg("Attach IRQ%d\n", irq);
+      phyerr("Attach IRQ%d\n", irq);
       (void)irq_attach(irq, handler);
     }
   else
     {
-      phydbg("Detach IRQ%d\n", irq);
+      phyerr("Detach IRQ%d\n", irq);
       (void)irq_detach(irq);
       enabler = NULL;
     }
diff --git a/configs/sama5d3x-ek/src/sam_hsmci.c b/configs/sama5d3x-ek/src/sam_hsmci.c
index 693563f5ca..5976b2ca3e 100644
--- a/configs/sama5d3x-ek/src/sam_hsmci.c
+++ b/configs/sama5d3x-ek/src/sam_hsmci.c
@@ -257,7 +257,7 @@ int sam_hsmci_initialize(int slotno, int minor)
   state = sam_hsmci_state(slotno);
   if (!state)
     {
-      fdbg("No state for slotno %d\n", slotno);
+      ferr("No state for slotno %d\n", slotno);
       return -EINVAL;
     }
 
@@ -271,7 +271,7 @@ int sam_hsmci_initialize(int slotno, int minor)
   state->hsmci = sdio_initialize(slotno);
   if (!state->hsmci)
     {
-      fdbg("Failed to initialize SDIO slot %d\n",  slotno);
+      ferr("Failed to initialize SDIO slot %d\n",  slotno);
       return -ENODEV;
     }
 
@@ -280,7 +280,7 @@ int sam_hsmci_initialize(int slotno, int minor)
   ret = mmcsd_slotinitialize(minor, state->hsmci);
   if (ret != OK)
     {
-      fdbg("Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
+      ferr("Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
       return ret;
     }
 
@@ -317,7 +317,7 @@ bool sam_cardinserted(int slotno)
   state = sam_hsmci_state(slotno);
   if (!state)
     {
-      fdbg("No state for slotno %d\n", slotno);
+      ferr("No state for slotno %d\n", slotno);
       return false;
     }
 
diff --git a/configs/sama5d3x-ek/src/sam_i2schar.c b/configs/sama5d3x-ek/src/sam_i2schar.c
index 5fa7c324db..21a88b3743 100644
--- a/configs/sama5d3x-ek/src/sam_i2schar.c
+++ b/configs/sama5d3x-ek/src/sam_i2schar.c
@@ -99,7 +99,7 @@ int i2schar_devinit(void)
       i2s = sam_ssc_initialize(CONFIG_SAMA5D3xEK_SSC_PORT);
       if (!i2s)
         {
-          dbg("ERROR: Failed to get the SAMA5 SSC/I2S driver for SSC%d\n",
+          err("ERROR: Failed to get the SAMA5 SSC/I2S driver for SSC%d\n",
               CONFIG_SAMA5D3xEK_SSC_PORT);
           return -ENODEV;
         }
@@ -109,7 +109,7 @@ int i2schar_devinit(void)
       ret = i2schar_register(i2s, CONFIG_SAMA5D3xEK_I2SCHAR_MINOR);
       if (ret < 0)
         {
-          adbg("ERROR: i2schar_register failed: %d\n", ret);
+          aerr("ERROR: i2schar_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/sama5d3x-ek/src/sam_nandflash.c b/configs/sama5d3x-ek/src/sam_nandflash.c
index 709d3c240c..50c327e9f3 100644
--- a/configs/sama5d3x-ek/src/sam_nandflash.c
+++ b/configs/sama5d3x-ek/src/sam_nandflash.c
@@ -186,7 +186,7 @@ int sam_nand_automount(int minor)
       mtd = sam_nand_initialize(HSMC_CS3);
       if (!mtd)
         {
-          fdbg("ERROR: Failed to create the NAND driver on CS%d\n", HSMC_CS3);
+          ferr("ERROR: Failed to create the NAND driver on CS%d\n", HSMC_CS3);
           return -ENODEV;
         }
 
@@ -196,7 +196,7 @@ int sam_nand_automount(int minor)
       ret = ftl_initialize(NAND_MINOR, mtd);
       if (ret < 0)
         {
-          fdbg("ERROR: Failed to initialize the FTL layer: %d\n", ret);
+          ferr("ERROR: Failed to initialize the FTL layer: %d\n", ret);
           return ret;
         }
 
@@ -206,7 +206,7 @@ int sam_nand_automount(int minor)
       ret = nxffs_initialize(mtd);
       if (ret < 0)
         {
-          fdbg("ERROR: NXFFS initialization failed: %d\n", ret);
+          ferr("ERROR: NXFFS initialization failed: %d\n", ret);
           return ret;
         }
 
@@ -215,7 +215,7 @@ int sam_nand_automount(int minor)
       ret = mount(NULL, "/mnt/nand", "nxffs", 0, NULL);
       if (ret < 0)
         {
-          fdbg("ERROR: Failed to mount the NXFFS volume: %d\n", errno);
+          ferr("ERROR: Failed to mount the NXFFS volume: %d\n", errno);
           return ret;
         }
 #endif
diff --git a/configs/sama5d3x-ek/src/sam_ov2640.c b/configs/sama5d3x-ek/src/sam_ov2640.c
index f7015f2a3b..dfaf2dbfc1 100644
--- a/configs/sama5d3x-ek/src/sam_ov2640.c
+++ b/configs/sama5d3x-ek/src/sam_ov2640.c
@@ -88,14 +88,14 @@ static inline FAR struct fb_vtable_s *ov2640_lcd_initialize(void)
   ret = up_fbinitialize(0);
   if (ret < 0)
     {
-      gdbg("ERROR: up_fbinitialize failed: %d\n", -ret);
+      gerr("ERROR: up_fbinitialize failed: %d\n", -ret);
       return NULL;
     }
 
   vplane = up_fbgetvplane(0, 0);
   if (!vplane)
     {
-      gdbg("ERROR: up_fbgetvplane failed\n");
+      gerr("ERROR: up_fbgetvplane failed\n");
     }
 
   return vplane;
@@ -161,7 +161,7 @@ static inline int ov2640_camera_initialize(void)
   i2c = sam_i2cbus_initialize(OV2640_BUS);
   if (!i2c)
     {
-      gdbg("ERROR: Failed to initialize TWI%d\n", OV2640_BUS);
+      gerr("ERROR: Failed to initialize TWI%d\n", OV2640_BUS);
       return EXIT_FAILURE;
     }
 
@@ -210,7 +210,7 @@ static inline int ov2640_camera_initialize(void)
   ret = ov2640_initialize(i2c);
   if (ret < 0)
     {
-      gdbg("ERROR: Failed to initialize the OV2640: %d\n", ret);
+      gerr("ERROR: Failed to initialize the OV2640: %d\n", ret);
       return EXIT_FAILURE;
     }
 
@@ -239,7 +239,7 @@ int ov2640_main(int argc, char *argv[])
   vplane = ov2640_lcd_initialize();
   if (!vplane)
     {
-      gdbg("ERROR: ov2640_lcd_initialize failed\n");
+      gerr("ERROR: ov2640_lcd_initialize failed\n");
       return  EXIT_FAILURE;
     }
 
@@ -248,7 +248,7 @@ int ov2640_main(int argc, char *argv[])
   ret = ov2640_camera_initialize();
   if (ret != EXIT_SUCCESS)
     {
-      gdbg("ERROR: ov2640_camera_initialize failed\n");
+      gerr("ERROR: ov2640_camera_initialize failed\n");
       return  EXIT_FAILURE;
     }
 
diff --git a/configs/sama5d3x-ek/src/sam_pwm.c b/configs/sama5d3x-ek/src/sam_pwm.c
index 79ff78e337..6bafa8c2db 100644
--- a/configs/sama5d3x-ek/src/sam_pwm.c
+++ b/configs/sama5d3x-ek/src/sam_pwm.c
@@ -139,7 +139,7 @@ int board_pwm_setup(void)
       pwm = sam_pwminitialize(CONFIG_SAMA5D3xEK_CHANNEL);
       if (!pwm)
         {
-          dbg("Failed to get the SAMA5 PWM lower half\n");
+          err("Failed to get the SAMA5 PWM lower half\n");
           return -ENODEV;
         }
 
@@ -148,7 +148,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          adbg("pwm_register failed: %d\n", ret);
+          aerr("pwm_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/sama5d3x-ek/src/sam_spi.c b/configs/sama5d3x-ek/src/sam_spi.c
index eb0287e72c..0dc1129553 100644
--- a/configs/sama5d3x-ek/src/sam_spi.c
+++ b/configs/sama5d3x-ek/src/sam_spi.c
@@ -65,7 +65,7 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -73,7 +73,7 @@
 #  endif
 #else
 #  undef SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
diff --git a/configs/sama5d3x-ek/src/sam_touchscreen.c b/configs/sama5d3x-ek/src/sam_touchscreen.c
index 4b69d561ac..2b03f01cb1 100644
--- a/configs/sama5d3x-ek/src/sam_touchscreen.c
+++ b/configs/sama5d3x-ek/src/sam_touchscreen.c
@@ -108,7 +108,7 @@ int board_tsc_setup(int minor)
   static bool initialized = false;
   int ret;
 
-  idbg("initialized:%d minor:%d\n", initialized, minor);
+  ierr("initialized:%d minor:%d\n", initialized, minor);
   DEBUGASSERT(minor == 0);
 
   /* Since there is no uninitialized logic, this initialization can be
@@ -122,7 +122,7 @@ int board_tsc_setup(int minor)
       adc = sam_adc_initialize();
       if (!adc)
         {
-          idbg("ERROR: Failed to initialize the ADC driver\n");
+          ierr("ERROR: Failed to initialize the ADC driver\n");
           return -ENODEV;
         }
 
@@ -131,7 +131,7 @@ int board_tsc_setup(int minor)
       ret = sam_tsd_register(adc, CONFIG_SAMA5D3xEK_TSD_DEVMINOR);
       if (ret < 0)
         {
-          idbg("ERROR: Failed to register touchscreen device /dev/input%d: %d\n",
+          ierr("ERROR: Failed to register touchscreen device /dev/input%d: %d\n",
                CONFIG_SAMA5D3xEK_TSD_DEVMINOR, ret);
           return -ENODEV;
         }
diff --git a/configs/sama5d3x-ek/src/sam_usb.c b/configs/sama5d3x-ek/src/sam_usb.c
index 73d6ab4766..91b5cfbf9c 100644
--- a/configs/sama5d3x-ek/src/sam_usb.c
+++ b/configs/sama5d3x-ek/src/sam_usb.c
@@ -307,7 +307,7 @@ int sam_usbhost_initialize(void)
   ret = usbhost_hub_initialize();
   if (ret < 0)
     {
-      udbg("ERROR: usbhost_hub_initialize failed: %d\n", ret);
+      uerr("ERROR: usbhost_hub_initialize failed: %d\n", ret);
     }
 #endif
 
@@ -317,7 +317,7 @@ int sam_usbhost_initialize(void)
   ret = usbhost_msc_initialize();
   if (ret != OK)
     {
-      udbg("ERROR: Failed to register the mass storage class: %d\n", ret);
+      uerr("ERROR: Failed to register the mass storage class: %d\n", ret);
     }
 #endif
 
@@ -327,7 +327,7 @@ int sam_usbhost_initialize(void)
   ret = usbhost_cdcacm_initialize();
   if (ret != OK)
     {
-      udbg("ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
+      uerr("ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
     }
 #endif
 
@@ -337,7 +337,7 @@ int sam_usbhost_initialize(void)
   ret = usbhost_kbdinit();
   if (ret != OK)
     {
-      udbg("ERROR: Failed to register the KBD class\n");
+      uerr("ERROR: Failed to register the KBD class\n");
     }
 #endif
 
@@ -349,7 +349,7 @@ int sam_usbhost_initialize(void)
   g_ohciconn = sam_ohci_initialize(0);
   if (!g_ohciconn)
     {
-      udbg("ERROR: sam_ohci_initialize failed\n");
+      uerr("ERROR: sam_ohci_initialize failed\n");
       return -ENODEV;
     }
 
@@ -360,7 +360,7 @@ int sam_usbhost_initialize(void)
                     (main_t)ohci_waiter, (FAR char * const *)NULL);
   if (pid < 0)
     {
-      udbg("ERROR: Failed to create ohci_waiter task: %d\n", ret);
+      uerr("ERROR: Failed to create ohci_waiter task: %d\n", ret);
       return -ENODEV;
     }
 #endif
@@ -371,7 +371,7 @@ int sam_usbhost_initialize(void)
   g_ehciconn = sam_ehci_initialize(0);
   if (!g_ehciconn)
     {
-      udbg("ERROR: sam_ehci_initialize failed\n");
+      uerr("ERROR: sam_ehci_initialize failed\n");
       return -ENODEV;
     }
 
@@ -382,7 +382,7 @@ int sam_usbhost_initialize(void)
                     (main_t)ehci_waiter, (FAR char * const *)NULL);
   if (pid < 0)
     {
-      udbg("ERROR: Failed to create ehci_waiter task: %d\n", ret);
+      uerr("ERROR: Failed to create ehci_waiter task: %d\n", ret);
       return -ENODEV;
     }
 #endif
@@ -421,7 +421,7 @@ void sam_usbhost_vbusdrive(int rhport, bool enable)
     {
     case SAM_RHPORT1:
 #ifndef CONFIG_SAMA5_UHPHS_RHPORT1
-      udbg("ERROR: RHPort1 is not available in this configuration\n");
+      uerr("ERROR: RHPort1 is not available in this configuration\n");
       return;
 #else
       pinset = PIO_USBA_VBUS_ENABLE;
@@ -430,7 +430,7 @@ void sam_usbhost_vbusdrive(int rhport, bool enable)
 
     case SAM_RHPORT2:
 #ifndef CONFIG_SAMA5_UHPHS_RHPORT2
-      udbg("ERROR: RHPort2 is not available in this configuration\n");
+      uerr("ERROR: RHPort2 is not available in this configuration\n");
       return;
 #else
       pinset = PIO_USBB_VBUS_ENABLE;
@@ -439,7 +439,7 @@ void sam_usbhost_vbusdrive(int rhport, bool enable)
 
     case SAM_RHPORT3:
 #ifndef CONFIG_SAMA5_UHPHS_RHPORT3
-      udbg("ERROR: RHPort3 is not available in this configuration\n");
+      uerr("ERROR: RHPort3 is not available in this configuration\n");
       return;
 #else
       pinset = PIO_USBC_VBUS_ENABLE;
@@ -447,7 +447,7 @@ void sam_usbhost_vbusdrive(int rhport, bool enable)
 #endif
 
     default:
-      udbg("ERROR: RHPort%d is not supported\n", rhport+1);
+      uerr("ERROR: RHPort%d is not supported\n", rhport+1);
       return;
     }
 
diff --git a/configs/sama5d3x-ek/src/sam_userleds.c b/configs/sama5d3x-ek/src/sam_userleds.c
index 381d1be064..410305f53e 100644
--- a/configs/sama5d3x-ek/src/sam_userleds.c
+++ b/configs/sama5d3x-ek/src/sam_userleds.c
@@ -72,10 +72,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/sama5d3x-ek/src/sam_wm8904.c b/configs/sama5d3x-ek/src/sam_wm8904.c
index 70707a3aee..4df81d2178 100644
--- a/configs/sama5d3x-ek/src/sam_wm8904.c
+++ b/configs/sama5d3x-ek/src/sam_wm8904.c
@@ -253,7 +253,7 @@ int sam_wm8904_initialize(int minor)
   char devname[12];
   int ret;
 
-  auddbg("minor %d\n", minor);
+  auderr("minor %d\n", minor);
   DEBUGASSERT(minor >= 0 && minor <= 25);
 
   /* Have we already initialized?  Since we never uninitialize we must prevent
@@ -273,7 +273,7 @@ int sam_wm8904_initialize(int minor)
       i2c = sam_i2cbus_initialize(WM8904_TWI_BUS);
       if (!i2c)
         {
-          auddbg("Failed to initialize TWI%d\n", WM8904_TWI_BUS);
+          auderr("Failed to initialize TWI%d\n", WM8904_TWI_BUS);
           ret = -ENODEV;
           goto errout;
         }
@@ -283,7 +283,7 @@ int sam_wm8904_initialize(int minor)
       i2s = sam_ssc_initialize(WM8904_SSC_BUS);
       if (!i2s)
         {
-          auddbg("Failed to initialize SSC%d\n", WM8904_SSC_BUS);
+          auderr("Failed to initialize SSC%d\n", WM8904_SSC_BUS);
           ret = -ENODEV;
           goto errout_with_i2c;
         }
@@ -314,7 +314,7 @@ int sam_wm8904_initialize(int minor)
       ret = irq_attach(IRQ_INT_WM8904, wm8904_interrupt);
       if (ret < 0)
         {
-          auddbg("ERROR: Failed to attach WM8904 interrupt: %d\n", ret);
+          auderr("ERROR: Failed to attach WM8904 interrupt: %d\n", ret);
           goto errout_with_i2s;
         }
 
@@ -325,7 +325,7 @@ int sam_wm8904_initialize(int minor)
       wm8904 = wm8904_initialize(i2c, i2s, &g_wm8904info.lower);
       if (!wm8904)
         {
-          auddbg("Failed to initialize the WM8904\n");
+          auderr("Failed to initialize the WM8904\n");
           ret = -ENODEV;
           goto errout_with_irq;
         }
@@ -338,7 +338,7 @@ int sam_wm8904_initialize(int minor)
       pcm = pcm_decode_initialize(wm8904);
       if (!pcm)
         {
-          auddbg("ERROR: Failed create the PCM decoder\n");
+          auderr("ERROR: Failed create the PCM decoder\n");
           ret = -ENODEV;
           goto errout_with_wm8904;
         }
@@ -355,7 +355,7 @@ int sam_wm8904_initialize(int minor)
       ret = audio_register(devname, pcm);
       if (ret < 0)
         {
-          auddbg("ERROR: Failed to register /dev/%s device: %d\n", devname, ret);
+          auderr("ERROR: Failed to register /dev/%s device: %d\n", devname, ret);
           goto errout_with_pcm;
         }
 
diff --git a/configs/sama5d4-ek/src/sam_adc.c b/configs/sama5d4-ek/src/sam_adc.c
index 13346a91b9..7615553455 100644
--- a/configs/sama5d4-ek/src/sam_adc.c
+++ b/configs/sama5d4-ek/src/sam_adc.c
@@ -91,7 +91,7 @@ int board_adc_setup(void)
       adc = sam_adc_initialize();
       if (adc == NULL)
         {
-          adbg("ERROR: Failed to get ADC interface\n");
+          aerr("ERROR: Failed to get ADC interface\n");
           return -ENODEV;
         }
 
@@ -100,7 +100,7 @@ int board_adc_setup(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          adbg("adc_register failed: %d\n", ret);
+          aerr("adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/sama5d4-ek/src/sam_at25.c b/configs/sama5d4-ek/src/sam_at25.c
index f2a4c4d1d8..4df4e631e5 100644
--- a/configs/sama5d4-ek/src/sam_at25.c
+++ b/configs/sama5d4-ek/src/sam_at25.c
@@ -92,7 +92,7 @@ int sam_at25_automount(int minor)
       spi = sam_spibus_initialize(AT25_PORT);
       if (!spi)
         {
-          fdbg("ERROR: Failed to initialize SPI port %d\n", AT25_PORT);
+          ferr("ERROR: Failed to initialize SPI port %d\n", AT25_PORT);
           return -ENODEV;
         }
 
@@ -101,7 +101,7 @@ int sam_at25_automount(int minor)
       mtd = at25_initialize(spi);
       if (!mtd)
         {
-          fdbg("ERROR: Failed to bind SPI port %d to the AT25 FLASH driver\n");
+          ferr("ERROR: Failed to bind SPI port %d to the AT25 FLASH driver\n");
           return -ENODEV;
         }
 
@@ -113,7 +113,7 @@ int sam_at25_automount(int minor)
       ret = ftl_initialize(minor, mtd);
       if (ret < 0)
         {
-          fdbg("ERROR: Failed to initialize the FTL layer: %d\n", ret);
+          ferr("ERROR: Failed to initialize the FTL layer: %d\n", ret);
           return ret;
         }
 
@@ -123,7 +123,7 @@ int sam_at25_automount(int minor)
       ret = ftl_initialize(minor, mtd);
       if (ret < 0)
         {
-          fdbg("ERROR: Failed to initialize the FTL layer: %d\n", ret);
+          ferr("ERROR: Failed to initialize the FTL layer: %d\n", ret);
           return ret;
         }
 
@@ -137,7 +137,7 @@ int sam_at25_automount(int minor)
       ret = bchdev_register(blockdev, chardev, false);
       if (ret < 0)
         {
-          fdbg("ERROR: bchdev_register %s failed: %d\n", chardev, ret);
+          ferr("ERROR: bchdev_register %s failed: %d\n", chardev, ret);
           return ret;
         }
 
@@ -147,7 +147,7 @@ int sam_at25_automount(int minor)
       ret = nxffs_initialize(mtd);
       if (ret < 0)
         {
-          fdbg("ERROR: NXFFS initialization failed: %d\n", ret);
+          ferr("ERROR: NXFFS initialization failed: %d\n", ret);
           return ret;
         }
 
@@ -156,7 +156,7 @@ int sam_at25_automount(int minor)
       ret = mount(NULL, "/mnt/at25", "nxffs", 0, NULL);
       if (ret < 0)
         {
-          fdbg("ERROR: Failed to mount the NXFFS volume: %d\n", errno);
+          ferr("ERROR: Failed to mount the NXFFS volume: %d\n", errno);
           return ret;
         }
 
diff --git a/configs/sama5d4-ek/src/sam_audio_null.c b/configs/sama5d4-ek/src/sam_audio_null.c
index 654fea6011..f5bf2c5980 100644
--- a/configs/sama5d4-ek/src/sam_audio_null.c
+++ b/configs/sama5d4-ek/src/sam_audio_null.c
@@ -100,7 +100,7 @@ int sam_audio_null_initialize(int minor)
   char devname[12];
   int ret;
 
-  auddbg("minor %d\n", minor);
+  auderr("minor %d\n", minor);
   DEBUGASSERT(minor >= 0 && minor <= 25);
 
   /* Have we already initialized?  Since we never uninitialize we must prevent
@@ -117,7 +117,7 @@ int sam_audio_null_initialize(int minor)
       nullaudio = audio_null_initialize();
       if (!nullaudio)
         {
-          auddbg("Failed to get the NULL audio interface\n");
+          auderr("Failed to get the NULL audio interface\n");
           ret = -ENODEV;
           goto errout;
         }
@@ -130,7 +130,7 @@ int sam_audio_null_initialize(int minor)
       pcm = pcm_decode_initialize(nullaudio);
       if (!pcm)
         {
-          auddbg("ERROR: Failed create the PCM decoder\n");
+          auderr("ERROR: Failed create the PCM decoder\n");
           ret = -ENODEV;
           goto errout_with_nullaudio;
         }
@@ -144,7 +144,7 @@ int sam_audio_null_initialize(int minor)
       ret = audio_register(devname, pcm);
       if (ret < 0)
         {
-          auddbg("ERROR: Failed to register /dev/%s device: %d\n", devname, ret);
+          auderr("ERROR: Failed to register /dev/%s device: %d\n", devname, ret);
           goto errout_with_pcm;
         }
 
diff --git a/configs/sama5d4-ek/src/sam_autoleds.c b/configs/sama5d4-ek/src/sam_autoleds.c
index 0d23aa40db..60b41878e6 100644
--- a/configs/sama5d4-ek/src/sam_autoleds.c
+++ b/configs/sama5d4-ek/src/sam_autoleds.c
@@ -101,10 +101,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/sama5d4-ek/src/sam_automount.c b/configs/sama5d4-ek/src/sam_automount.c
index 89b8b20fcc..b838e693d9 100644
--- a/configs/sama5d4-ek/src/sam_automount.c
+++ b/configs/sama5d4-ek/src/sam_automount.c
@@ -293,7 +293,7 @@ void sam_automount_initialize(void)
   handle = automount_initialize(&g_hsmci0config.lower);
   if (!handle)
     {
-      fdbg("ERROR: Failed to initialize auto-mounter for HSMCI0\n");
+      ferr("ERROR: Failed to initialize auto-mounter for HSMCI0\n");
     }
 #endif
 
@@ -303,7 +303,7 @@ void sam_automount_initialize(void)
   handle = automount_initialize(&g_hsmci1config.lower);
   if (!handle)
     {
-      fdbg("ERROR: Failed to initialize auto-mounter for HSMCI1\n");
+      ferr("ERROR: Failed to initialize auto-mounter for HSMCI1\n");
     }
 #endif
 }
@@ -363,7 +363,7 @@ void sam_automount_event(int slotno, bool inserted)
   else
 #endif
     {
-      fdbg("ERROR: Unsupported HSCMI%d\n", slotno);
+      ferr("ERROR: Unsupported HSCMI%d\n", slotno);
       return;
     }
 
diff --git a/configs/sama5d4-ek/src/sam_bringup.c b/configs/sama5d4-ek/src/sam_bringup.c
index 34b7e3dd43..489249b04a 100644
--- a/configs/sama5d4-ek/src/sam_bringup.c
+++ b/configs/sama5d4-ek/src/sam_bringup.c
@@ -74,7 +74,7 @@
 #ifdef CONFIG_BOARD_INITIALIZE
 #  define SYSLOG llerr
 #else
-#  define SYSLOG dbg
+#  define SYSLOG err
 #endif
 
 /****************************************************************************
@@ -98,14 +98,14 @@ static void sam_i2c_register(int bus)
   i2c = sam_i2cbus_initialize(bus);
   if (i2c == NULL)
     {
-      dbg("ERROR: Failed to get I2C%d interface\n", bus);
+      err("ERROR: Failed to get I2C%d interface\n", bus);
     }
   else
     {
       ret = i2c_register(i2c, bus);
       if (ret < 0)
         {
-          dbg("ERROR: Failed to register I2C%d driver: %d\n", bus, ret);
+          err("ERROR: Failed to register I2C%d driver: %d\n", bus, ret);
           sam_i2cbus_uninitialize(i2c);
         }
     }
diff --git a/configs/sama5d4-ek/src/sam_ethernet.c b/configs/sama5d4-ek/src/sam_ethernet.c
index 25a73b375c..25cf9813b2 100644
--- a/configs/sama5d4-ek/src/sam_ethernet.c
+++ b/configs/sama5d4-ek/src/sam_ethernet.c
@@ -84,10 +84,10 @@
  */
 
 #ifdef CONFIG_NETDEV_PHY_DEBUG
-#  define phydbg    dbg
+#  define phyerr    err
 #  define phyllerr  llerr
 #else
-#  define phydbg(x...)
+#  define phyerr(x...)
 #  define phyllerr(x...)
 #endif
 
@@ -116,7 +116,7 @@ static xcpt_t g_emac1_handler;
 #ifdef CONFIG_SAMA5_EMAC0
 static void sam_emac0_phy_enable(bool enable)
 {
-  phydbg("IRQ%d: enable=%d\n", IRQ_INT_ETH0, enable);
+  phyerr("IRQ%d: enable=%d\n", IRQ_INT_ETH0, enable);
   if (enable)
     {
       sam_pioirqenable(IRQ_INT_ETH0);
@@ -132,7 +132,7 @@ static void sam_emac0_phy_enable(bool enable)
 #ifdef CONFIG_SAMA5_EMAC1
 static void sam_emac1_phy_enable(bool enable)
 {
-  phydbg("IRQ%d: enable=%d\n", IRQ_INT_ETH1, enable);
+  phyerr("IRQ%d: enable=%d\n", IRQ_INT_ETH1, enable);
   if (enable)
     {
       sam_pioirqenable(IRQ_INT_ETH1);
@@ -160,12 +160,12 @@ static void sam_emac1_phy_enable(bool enable)
 void weak_function sam_netinitialize(void)
 {
 #ifdef CONFIG_SAMA5_EMAC0
-  phydbg("Configuring %08x\n", PIO_INT_ETH0);
+  phyerr("Configuring %08x\n", PIO_INT_ETH0);
   sam_configpio(PIO_INT_ETH0);
 #endif
 
 #ifdef CONFIG_SAMA5_EMAC1
-  phydbg("Configuring %08x\n", PIO_INT_ETH1);
+  phyerr("Configuring %08x\n", PIO_INT_ETH1);
   sam_configpio(PIO_INT_ETH1);
 #endif
 }
@@ -247,16 +247,16 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
 
   ninfo("%s: handler=%p\n", intf, handler);
 #ifdef CONFIG_SAMA5_EMAC0
-  phydbg("EMAC0: devname=%s\n", SAMA5_EMAC0_DEVNAME);
+  phyerr("EMAC0: devname=%s\n", SAMA5_EMAC0_DEVNAME);
 #endif
 #ifdef CONFIG_SAMA5_EMAC1
-  phydbg("EMAC1: devname=%s\n", SAMA5_EMAC1_DEVNAME);
+  phyerr("EMAC1: devname=%s\n", SAMA5_EMAC1_DEVNAME);
 #endif
 
 #ifdef CONFIG_SAMA5_EMAC0
   if (strcmp(intf, SAMA5_EMAC0_DEVNAME) == 0)
     {
-      phydbg("Select EMAC0\n");
+      phyerr("Select EMAC0\n");
       phandler = &g_emac0_handler;
       pinset   = PIO_INT_ETH0;
       irq      = IRQ_INT_ETH0;
@@ -267,7 +267,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
 #ifdef CONFIG_SAMA5_EMAC1
   if (strcmp(intf, SAMA5_EMAC1_DEVNAME) == 0)
     {
-      phydbg("Select EMAC1\n");
+      phyerr("Select EMAC1\n");
       phandler = &g_emac1_handler;
       pinset   = PIO_INT_ETH1;
       irq      = IRQ_INT_ETH1;
@@ -276,7 +276,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
   else
 #endif
     {
-      ndbg("Unsupported interface: %s\n", intf);
+      nerr("Unsupported interface: %s\n", intf);
       return NULL;
     }
 
@@ -295,15 +295,15 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
 
   if (handler)
     {
-      phydbg("Configure pin: %08x\n", pinset);
+      phyerr("Configure pin: %08x\n", pinset);
       sam_pioirq(pinset);
 
-      phydbg("Attach IRQ%d\n", irq);
+      phyerr("Attach IRQ%d\n", irq);
       (void)irq_attach(irq, handler);
     }
   else
     {
-      phydbg("Detach IRQ%d\n", irq);
+      phyerr("Detach IRQ%d\n", irq);
       (void)irq_detach(irq);
       enabler = NULL;
     }
diff --git a/configs/sama5d4-ek/src/sam_hsmci.c b/configs/sama5d4-ek/src/sam_hsmci.c
index c3fbf9671c..f719c5ae81 100644
--- a/configs/sama5d4-ek/src/sam_hsmci.c
+++ b/configs/sama5d4-ek/src/sam_hsmci.c
@@ -300,7 +300,7 @@ int sam_hsmci_initialize(int slotno, int minor)
   state = sam_hsmci_state(slotno);
   if (!state)
     {
-      fdbg("ERROR: No state for slotno %d\n", slotno);
+      ferr("ERROR: No state for slotno %d\n", slotno);
       return -EINVAL;
     }
 
@@ -321,7 +321,7 @@ int sam_hsmci_initialize(int slotno, int minor)
   state->hsmci = sdio_initialize(slotno);
   if (!state->hsmci)
     {
-      fdbg("ERROR: Failed to initialize SDIO slot %d\n",  slotno);
+      ferr("ERROR: Failed to initialize SDIO slot %d\n",  slotno);
       return -ENODEV;
     }
 
@@ -330,7 +330,7 @@ int sam_hsmci_initialize(int slotno, int minor)
   ret = mmcsd_slotinitialize(minor, state->hsmci);
   if (ret != OK)
     {
-      fdbg("ERROR: Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
+      ferr("ERROR: Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
       return ret;
     }
 
@@ -367,7 +367,7 @@ bool sam_cardinserted(int slotno)
   state = sam_hsmci_state(slotno);
   if (!state)
     {
-      fdbg("ERROR: No state for slotno %d\n", slotno);
+      ferr("ERROR: No state for slotno %d\n", slotno);
       return false;
     }
 
diff --git a/configs/sama5d4-ek/src/sam_maxtouch.c b/configs/sama5d4-ek/src/sam_maxtouch.c
index c725f1f17b..1129ba4c4b 100644
--- a/configs/sama5d4-ek/src/sam_maxtouch.c
+++ b/configs/sama5d4-ek/src/sam_maxtouch.c
@@ -242,7 +242,7 @@ int board_tsc_setup(int minor)
   static bool initialized = false;
   int ret;
 
-  idbg("minor %d\n", minor);
+  ierr("minor %d\n", minor);
   DEBUGASSERT(minor == 0);
 
   /* Have we already initialized?  Since we never uninitialize we must prevent
@@ -262,7 +262,7 @@ int board_tsc_setup(int minor)
       i2c = sam_i2cbus_initialize(MXT_TWI_BUS);
       if (!i2c)
         {
-          idbg("Failed to initialize I2C%d\n", MXT_TWI_BUS);
+          ierr("Failed to initialize I2C%d\n", MXT_TWI_BUS);
           return -ENODEV;
         }
 
@@ -276,7 +276,7 @@ int board_tsc_setup(int minor)
       ret = mxt_register(i2c, &g_mxtinfo.lower, CONFIG_SAMA5D4EK_MXT_DEVMINOR);
       if (ret < 0)
         {
-          idbg("ERROR: Failed to register touchscreen device\n");
+          ierr("ERROR: Failed to register touchscreen device\n");
           irq_detach(IRQ_CHG_MXT);
           /* sam_i2cbus_uninitialize(i2c); */
           return -ENODEV;
diff --git a/configs/sama5d4-ek/src/sam_nandflash.c b/configs/sama5d4-ek/src/sam_nandflash.c
index 9044526b3b..6a5c90db28 100644
--- a/configs/sama5d4-ek/src/sam_nandflash.c
+++ b/configs/sama5d4-ek/src/sam_nandflash.c
@@ -186,7 +186,7 @@ int sam_nand_automount(int minor)
       mtd = sam_nand_initialize(HSMC_CS3);
       if (!mtd)
         {
-          fdbg("ERROR: Failed to create the NAND driver on CS%d\n", HSMC_CS3);
+          ferr("ERROR: Failed to create the NAND driver on CS%d\n", HSMC_CS3);
           return -ENODEV;
         }
 
@@ -196,7 +196,7 @@ int sam_nand_automount(int minor)
       ret = ftl_initialize(NAND_MINOR, mtd);
       if (ret < 0)
         {
-          fdbg("ERROR: Failed to initialize the FTL layer: %d\n", ret);
+          ferr("ERROR: Failed to initialize the FTL layer: %d\n", ret);
           return ret;
         }
 
@@ -206,7 +206,7 @@ int sam_nand_automount(int minor)
       ret = nxffs_initialize(mtd);
       if (ret < 0)
         {
-          fdbg("ERROR: NXFFS initialization failed: %d\n", ret);
+          ferr("ERROR: NXFFS initialization failed: %d\n", ret);
           return ret;
         }
 
@@ -215,7 +215,7 @@ int sam_nand_automount(int minor)
       ret = mount(NULL, "/mnt/nand", "nxffs", 0, NULL);
       if (ret < 0)
         {
-          fdbg("ERROR: Failed to mount the NXFFS volume: %d\n", errno);
+          ferr("ERROR: Failed to mount the NXFFS volume: %d\n", errno);
           return ret;
         }
 #endif
diff --git a/configs/sama5d4-ek/src/sam_pmic.c b/configs/sama5d4-ek/src/sam_pmic.c
index 0b6344dbf7..ca4edf718e 100644
--- a/configs/sama5d4-ek/src/sam_pmic.c
+++ b/configs/sama5d4-ek/src/sam_pmic.c
@@ -80,7 +80,7 @@ void sam_pmic_initialize(void)
   i2c = sam_i2cbus_initialize(PMIC_TWI_BUS);
   if (!i2c)
     {
-      dbg("ERROR: Failed to initialize TWI%d\n", PMIC_TWI_BUS);
+      err("ERROR: Failed to initialize TWI%d\n", PMIC_TWI_BUS);
     }
   else
     {
diff --git a/configs/sama5d4-ek/src/sam_pwm.c b/configs/sama5d4-ek/src/sam_pwm.c
index e15e70c5a0..10496a6cd9 100644
--- a/configs/sama5d4-ek/src/sam_pwm.c
+++ b/configs/sama5d4-ek/src/sam_pwm.c
@@ -139,7 +139,7 @@ int board_pwm_setup(void)
       pwm = sam_pwminitialize(CONFIG_SAMA5D4EK_CHANNEL);
       if (!pwm)
         {
-          dbg("Failed to get the SAMA5 PWM lower half\n");
+          err("Failed to get the SAMA5 PWM lower half\n");
           return -ENODEV;
         }
 
@@ -148,7 +148,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          adbg("pwm_register failed: %d\n", ret);
+          aerr("pwm_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/sama5d4-ek/src/sam_spi.c b/configs/sama5d4-ek/src/sam_spi.c
index 1f60c27684..c93158cbdb 100644
--- a/configs/sama5d4-ek/src/sam_spi.c
+++ b/configs/sama5d4-ek/src/sam_spi.c
@@ -65,7 +65,7 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -73,7 +73,7 @@
 #  endif
 #else
 #  undef SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
diff --git a/configs/sama5d4-ek/src/sam_usb.c b/configs/sama5d4-ek/src/sam_usb.c
index 9540206bbb..f2009f6361 100644
--- a/configs/sama5d4-ek/src/sam_usb.c
+++ b/configs/sama5d4-ek/src/sam_usb.c
@@ -308,7 +308,7 @@ int sam_usbhost_initialize(void)
   ret = usbhost_hub_initialize();
   if (ret < 0)
     {
-      udbg("ERROR: usbhost_hub_initialize failed: %d\n", ret);
+      uerr("ERROR: usbhost_hub_initialize failed: %d\n", ret);
     }
 #endif
 
@@ -318,7 +318,7 @@ int sam_usbhost_initialize(void)
   ret = usbhost_msc_initialize();
   if (ret != OK)
     {
-      udbg("ERROR: Failed to register the mass storage class: %d\n", ret);
+      uerr("ERROR: Failed to register the mass storage class: %d\n", ret);
     }
 #endif
 
@@ -328,7 +328,7 @@ int sam_usbhost_initialize(void)
   ret = usbhost_cdcacm_initialize();
   if (ret != OK)
     {
-      udbg("ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
+      uerr("ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
     }
 #endif
 
@@ -338,7 +338,7 @@ int sam_usbhost_initialize(void)
   ret = usbhost_kbdinit();
   if (ret != OK)
     {
-      udbg("ERROR: Failed to register the KBD class\n");
+      uerr("ERROR: Failed to register the KBD class\n");
     }
 #endif
 
@@ -350,7 +350,7 @@ int sam_usbhost_initialize(void)
   g_ohciconn = sam_ohci_initialize(0);
   if (!g_ohciconn)
     {
-      udbg("ERROR: sam_ohci_initialize failed\n");
+      uerr("ERROR: sam_ohci_initialize failed\n");
       return -ENODEV;
     }
 
@@ -361,7 +361,7 @@ int sam_usbhost_initialize(void)
                     (main_t)ohci_waiter, (FAR char * const *)NULL);
   if (pid < 0)
     {
-      udbg("ERROR: Failed to create ohci_waiter task: %d\n", ret);
+      uerr("ERROR: Failed to create ohci_waiter task: %d\n", ret);
       return -ENODEV;
     }
 #endif
@@ -372,7 +372,7 @@ int sam_usbhost_initialize(void)
   g_ehciconn = sam_ehci_initialize(0);
   if (!g_ehciconn)
     {
-      udbg("ERROR: sam_ehci_initialize failed\n");
+      uerr("ERROR: sam_ehci_initialize failed\n");
       return -ENODEV;
     }
 
@@ -383,7 +383,7 @@ int sam_usbhost_initialize(void)
                     (main_t)ehci_waiter, (FAR char * const *)NULL);
   if (pid < 0)
     {
-      udbg("ERROR: Failed to create ehci_waiter task: %d\n", ret);
+      uerr("ERROR: Failed to create ehci_waiter task: %d\n", ret);
       return -ENODEV;
     }
 #endif
@@ -422,7 +422,7 @@ void sam_usbhost_vbusdrive(int rhport, bool enable)
     {
     case SAM_RHPORT1:
 #ifndef CONFIG_SAMA5_UHPHS_RHPORT1
-      udbg("ERROR: RHPort1 is not available in this configuration\n");
+      uerr("ERROR: RHPort1 is not available in this configuration\n");
       return;
 #else
       pinset = PIO_USBA_VBUS_ENABLE;
@@ -431,7 +431,7 @@ void sam_usbhost_vbusdrive(int rhport, bool enable)
 
     case SAM_RHPORT2:
 #ifndef CONFIG_SAMA5_UHPHS_RHPORT2
-      udbg("ERROR: RHPort2 is not available in this configuration\n");
+      uerr("ERROR: RHPort2 is not available in this configuration\n");
       return;
 #else
       pinset = PIO_USBB_VBUS_ENABLE;
@@ -440,7 +440,7 @@ void sam_usbhost_vbusdrive(int rhport, bool enable)
 
     case SAM_RHPORT3:
 #ifndef CONFIG_SAMA5_UHPHS_RHPORT3
-      udbg("ERROR: RHPort3 is not available in this configuration\n");
+      uerr("ERROR: RHPort3 is not available in this configuration\n");
       return;
 #else
       pinset = PIO_USBC_VBUS_ENABLE;
@@ -448,7 +448,7 @@ void sam_usbhost_vbusdrive(int rhport, bool enable)
 #endif
 
     default:
-      udbg("ERROR: RHPort%d is not supported\n", rhport+1);
+      uerr("ERROR: RHPort%d is not supported\n", rhport+1);
       return;
     }
 
diff --git a/configs/sama5d4-ek/src/sam_userleds.c b/configs/sama5d4-ek/src/sam_userleds.c
index 93ecf08241..7837bbafb3 100644
--- a/configs/sama5d4-ek/src/sam_userleds.c
+++ b/configs/sama5d4-ek/src/sam_userleds.c
@@ -76,10 +76,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/sama5d4-ek/src/sam_wm8904.c b/configs/sama5d4-ek/src/sam_wm8904.c
index 951adc9c86..17c50ffc4d 100644
--- a/configs/sama5d4-ek/src/sam_wm8904.c
+++ b/configs/sama5d4-ek/src/sam_wm8904.c
@@ -253,7 +253,7 @@ int sam_wm8904_initialize(int minor)
   char devname[12];
   int ret;
 
-  auddbg("minor %d\n", minor);
+  auderr("minor %d\n", minor);
   DEBUGASSERT(minor >= 0 && minor <= 25);
 
   /* Have we already initialized?  Since we never uninitialize we must prevent
@@ -273,7 +273,7 @@ int sam_wm8904_initialize(int minor)
       i2c = sam_i2cbus_initialize(WM8904_TWI_BUS);
       if (!i2c)
         {
-          auddbg("Failed to initialize TWI%d\n", WM8904_TWI_BUS);
+          auderr("Failed to initialize TWI%d\n", WM8904_TWI_BUS);
           ret = -ENODEV;
           goto errout;
         }
@@ -283,7 +283,7 @@ int sam_wm8904_initialize(int minor)
       i2s = sam_ssc_initialize(WM8904_SSC_BUS);
       if (!i2s)
         {
-          auddbg("Failed to initialize SSC%d\n", WM8904_SSC_BUS);
+          auderr("Failed to initialize SSC%d\n", WM8904_SSC_BUS);
           ret = -ENODEV;
           goto errout_with_i2c;
         }
@@ -314,7 +314,7 @@ int sam_wm8904_initialize(int minor)
       ret = irq_attach(IRQ_INT_WM8904, wm8904_interrupt);
       if (ret < 0)
         {
-          auddbg("ERROR: Failed to attach WM8904 interrupt: %d\n", ret);
+          auderr("ERROR: Failed to attach WM8904 interrupt: %d\n", ret);
           goto errout_with_i2s;
         }
 
@@ -325,7 +325,7 @@ int sam_wm8904_initialize(int minor)
       wm8904 = wm8904_initialize(i2c, i2s, &g_wm8904info.lower);
       if (!wm8904)
         {
-          auddbg("Failed to initialize the WM8904\n");
+          auderr("Failed to initialize the WM8904\n");
           ret = -ENODEV;
           goto errout_with_irq;
         }
@@ -338,7 +338,7 @@ int sam_wm8904_initialize(int minor)
       pcm = pcm_decode_initialize(wm8904);
       if (!pcm)
         {
-          auddbg("ERROR: Failed create the PCM decoder\n");
+          auderr("ERROR: Failed create the PCM decoder\n");
           ret = -ENODEV;
           goto errout_with_wm8904;
         }
@@ -355,7 +355,7 @@ int sam_wm8904_initialize(int minor)
       ret = audio_register(devname, pcm);
       if (ret < 0)
         {
-          auddbg("ERROR: Failed to register /dev/%s device: %d\n", devname, ret);
+          auderr("ERROR: Failed to register /dev/%s device: %d\n", devname, ret);
           goto errout_with_pcm;
         }
 
diff --git a/configs/samd20-xplained/src/sam_autoleds.c b/configs/samd20-xplained/src/sam_autoleds.c
index 8cfd2e49f7..0035691f77 100644
--- a/configs/samd20-xplained/src/sam_autoleds.c
+++ b/configs/samd20-xplained/src/sam_autoleds.c
@@ -86,10 +86,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/samd20-xplained/src/sam_mmcsd.c b/configs/samd20-xplained/src/sam_mmcsd.c
index ef37c260b8..1cfe12e2ec 100644
--- a/configs/samd20-xplained/src/sam_mmcsd.c
+++ b/configs/samd20-xplained/src/sam_mmcsd.c
@@ -100,7 +100,7 @@ int sam_sdinitialize(int port, int minor)
   spi = sam_spibus_initialize(port);
   if (!spi)
     {
-      fdbg("Failed to initialize SPI%d\n", port);
+      ferr("Failed to initialize SPI%d\n", port);
       return -ENODEV;
     }
 
@@ -113,7 +113,7 @@ int sam_sdinitialize(int port, int minor)
   ret = mmcsd_spislotinitialize(minor, SAMDL_MMCSDSLOTNO, spi);
   if (ret < 0)
     {
-      fdbg("Failed to bind SPI%d to MMC/SD slot %d: %d\n",
+      ferr("Failed to bind SPI%d to MMC/SD slot %d: %d\n",
             port, SAMDL_MMCSDSLOTNO, ret);
       return ret;
     }
diff --git a/configs/samd20-xplained/src/sam_spi.c b/configs/samd20-xplained/src/sam_spi.c
index c9d6b6aaea..9d13875acc 100644
--- a/configs/samd20-xplained/src/sam_spi.c
+++ b/configs/samd20-xplained/src/sam_spi.c
@@ -63,7 +63,7 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -71,7 +71,7 @@
 #  endif
 #else
 #  undef SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
diff --git a/configs/samd20-xplained/src/sam_ug2832hsweg04.c b/configs/samd20-xplained/src/sam_ug2832hsweg04.c
index 900c6aefbd..900f6fb0db 100644
--- a/configs/samd20-xplained/src/sam_ug2832hsweg04.c
+++ b/configs/samd20-xplained/src/sam_ug2832hsweg04.c
@@ -147,10 +147,10 @@
 /* Debug ********************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg(format, ...)   dbg(format, ##__VA_ARGS__)
+#  define lcderr(format, ...)   err(format, ##__VA_ARGS__)
 #  define lcdinfo(format, ...)  info(format, ##__VA_ARGS__)
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -187,7 +187,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
   spi = sam_spibus_initialize(OLED_CSNO);
   if (!spi)
     {
-      lcddbg("Failed to initialize SPI port 1\n");
+      lcderr("Failed to initialize SPI port 1\n");
     }
   else
     {
@@ -196,7 +196,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
       dev = ssd1306_initialize(spi, devno);
       if (!dev)
         {
-          lcddbg("Failed to bind SPI port 1 to OLED %d: %d\n", devno);
+          lcderr("Failed to bind SPI port 1 to OLED %d: %d\n", devno);
         }
      else
         {
diff --git a/configs/samd20-xplained/src/sam_userleds.c b/configs/samd20-xplained/src/sam_userleds.c
index 18978a2974..df71687374 100644
--- a/configs/samd20-xplained/src/sam_userleds.c
+++ b/configs/samd20-xplained/src/sam_userleds.c
@@ -71,10 +71,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/samd21-xplained/src/sam_autoleds.c b/configs/samd21-xplained/src/sam_autoleds.c
index 2c5f018024..0613cc6568 100644
--- a/configs/samd21-xplained/src/sam_autoleds.c
+++ b/configs/samd21-xplained/src/sam_autoleds.c
@@ -86,10 +86,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/samd21-xplained/src/sam_mmcsd.c b/configs/samd21-xplained/src/sam_mmcsd.c
index e6e3922b5e..1b828aea17 100644
--- a/configs/samd21-xplained/src/sam_mmcsd.c
+++ b/configs/samd21-xplained/src/sam_mmcsd.c
@@ -100,7 +100,7 @@ int sam_sdinitialize(int port, int minor)
   spi = sam_spibus_initialize(port);
   if (!spi)
     {
-      fdbg("Failed to initialize SPI%d\n", port);
+      ferr("Failed to initialize SPI%d\n", port);
       return -ENODEV;
     }
 
@@ -113,7 +113,7 @@ int sam_sdinitialize(int port, int minor)
   ret = mmcsd_spislotinitialize(minor, SAMDL_MMCSDSLOTNO, spi);
   if (ret < 0)
     {
-      fdbg("Failed to bind SPI%d to MMC/SD slot %d: %d\n",
+      ferr("Failed to bind SPI%d to MMC/SD slot %d: %d\n",
             port, SAMDL_MMCSDSLOTNO, ret);
       return ret;
     }
diff --git a/configs/samd21-xplained/src/sam_spi.c b/configs/samd21-xplained/src/sam_spi.c
index 4905e3d4e5..fcebdb5ea0 100644
--- a/configs/samd21-xplained/src/sam_spi.c
+++ b/configs/samd21-xplained/src/sam_spi.c
@@ -63,7 +63,7 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -71,7 +71,7 @@
 #  endif
 #else
 #  undef SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
diff --git a/configs/samd21-xplained/src/sam_ug2832hsweg04.c b/configs/samd21-xplained/src/sam_ug2832hsweg04.c
index 481c7ec50d..6ecd3320cf 100644
--- a/configs/samd21-xplained/src/sam_ug2832hsweg04.c
+++ b/configs/samd21-xplained/src/sam_ug2832hsweg04.c
@@ -147,10 +147,10 @@
 /* Debug ********************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg(format, ...)   dbg(format, ##__VA_ARGS__)
+#  define lcderr(format, ...)   err(format, ##__VA_ARGS__)
 #  define lcdinfo(format, ...)  info(format, ##__VA_ARGS__)
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -187,7 +187,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
   spi = sam_spibus_initialize(OLED_CSNO);
   if (!spi)
     {
-      lcddbg("Failed to initialize SPI port 1\n");
+      lcderr("Failed to initialize SPI port 1\n");
     }
   else
     {
@@ -196,7 +196,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
       dev = ssd1306_initialize(spi, devno);
       if (!dev)
         {
-          lcddbg("Failed to bind SPI port 1 to OLED %d: %d\n", devno);
+          lcderr("Failed to bind SPI port 1 to OLED %d: %d\n", devno);
         }
      else
         {
diff --git a/configs/samd21-xplained/src/sam_userleds.c b/configs/samd21-xplained/src/sam_userleds.c
index 037641bb5b..6bc4799016 100644
--- a/configs/samd21-xplained/src/sam_userleds.c
+++ b/configs/samd21-xplained/src/sam_userleds.c
@@ -71,10 +71,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/same70-xplained/src/sam_at24config.c b/configs/same70-xplained/src/sam_at24config.c
index aac1de3571..69d27a02ce 100644
--- a/configs/same70-xplained/src/sam_at24config.c
+++ b/configs/same70-xplained/src/sam_at24config.c
@@ -75,7 +75,7 @@ int sam_at24config(void)
   i2c = sam_i2cbus_initialize(0);
   if (!i2c)
     {
-      fdbg("ERROR: Failed to initialize TWI0\n");
+      ferr("ERROR: Failed to initialize TWI0\n");
       return -ENODEV;
     }
 
@@ -84,7 +84,7 @@ int sam_at24config(void)
   at24 = at24c_initialize(i2c);
   if (!at24)
     {
-      fdbg("ERROR: Failed to initialize the AT24 driver\n");
+      ferr("ERROR: Failed to initialize the AT24 driver\n");
       (void)sam_i2cbus_uninitialize(i2c);
       return -ENODEV;
     }
@@ -94,7 +94,7 @@ int sam_at24config(void)
   ret = at24->ioctl(at24, MTDIOC_EXTENDED, 0);
   if (ret < 0)
     {
-      fdbg("ERROR: AT24 ioctl(MTDIOC_EXTENDED) failed: %d\n", ret);
+      ferr("ERROR: AT24 ioctl(MTDIOC_EXTENDED) failed: %d\n", ret);
     }
 
   /* Bind the instance of an MTD device to the /dev/config device. */
@@ -102,7 +102,7 @@ int sam_at24config(void)
   ret = mtdconfig_register(at24);
   if (ret < 0)
     {
-      fdbg("ERROR: Failed to bind AT24 driver to the MTD config device\n");
+      ferr("ERROR: Failed to bind AT24 driver to the MTD config device\n");
       (void)sam_i2cbus_uninitialize(i2c);
     }
 
diff --git a/configs/same70-xplained/src/sam_autoleds.c b/configs/same70-xplained/src/sam_autoleds.c
index bb07aa6e2f..36e0aa41fe 100644
--- a/configs/same70-xplained/src/sam_autoleds.c
+++ b/configs/same70-xplained/src/sam_autoleds.c
@@ -86,10 +86,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/same70-xplained/src/sam_bringup.c b/configs/same70-xplained/src/sam_bringup.c
index 227899e750..23600e6f5d 100644
--- a/configs/same70-xplained/src/sam_bringup.c
+++ b/configs/same70-xplained/src/sam_bringup.c
@@ -81,7 +81,7 @@
 #ifdef CONFIG_BOARD_INITIALIZE
 #  define SYSLOG llerr
 #else
-#  define SYSLOG dbg
+#  define SYSLOG err
 #endif
 
 /****************************************************************************
@@ -105,14 +105,14 @@ static void sam_i2c_register(int bus)
   i2c = sam_i2cbus_initialize(bus);
   if (i2c == NULL)
     {
-      dbg("ERROR: Failed to get I2C%d interface\n", bus);
+      err("ERROR: Failed to get I2C%d interface\n", bus);
     }
   else
     {
       ret = i2c_register(i2c, bus);
       if (ret < 0)
         {
-          dbg("ERROR: Failed to register I2C%d driver: %d\n", bus, ret);
+          err("ERROR: Failed to register I2C%d driver: %d\n", bus, ret);
           sam_i2cbus_uninitialize(i2c);
         }
     }
diff --git a/configs/same70-xplained/src/sam_ethernet.c b/configs/same70-xplained/src/sam_ethernet.c
index aeb40bac36..4f4492692b 100644
--- a/configs/same70-xplained/src/sam_ethernet.c
+++ b/configs/same70-xplained/src/sam_ethernet.c
@@ -80,10 +80,10 @@
  */
 
 #ifdef CONFIG_NETDEV_PHY_DEBUG
-#  define phydbg    dbg
+#  define phyerr    err
 #  define phyllerr  llerr
 #else
-#  define phydbg(x...)
+#  define phyerr(x...)
 #  define phyllerr(x...)
 #endif
 
@@ -106,7 +106,7 @@ static xcpt_t g_emac0_handler;
 #ifdef CONFIG_SAMV7_GPIOA_IRQ
 static void sam_emac0_phy_enable(bool enable)
 {
-  phydbg("IRQ%d: enable=%d\n", IRQ_EMAC0_INT, enable);
+  phyerr("IRQ%d: enable=%d\n", IRQ_EMAC0_INT, enable);
   if (enable)
     {
       sam_gpioirqenable(IRQ_EMAC0_INT);
@@ -134,7 +134,7 @@ void weak_function sam_netinitialize(void)
 {
   /* Configure the PHY interrupt GPIO */
 
-  phydbg("Configuring %08x\n", GPIO_EMAC0_INT);
+  phyerr("Configuring %08x\n", GPIO_EMAC0_INT);
   sam_configgpio(GPIO_EMAC0_INT);
 
   /* Configure PHY /RESET output */
@@ -165,7 +165,7 @@ int sam_emac0_setmac(void)
   i2c = sam_i2cbus_initialize(0);
   if (!i2c)
     {
-      ndbg("ERROR: Failed to initialize TWI0\n");
+      nerr("ERROR: Failed to initialize TWI0\n");
       return -ENODEV;
     }
 
@@ -174,7 +174,7 @@ int sam_emac0_setmac(void)
   at24 = at24c_initialize(i2c);
   if (!at24)
     {
-      ndbg("ERROR: Failed to initialize the AT24 driver\n");
+      nerr("ERROR: Failed to initialize the AT24 driver\n");
       (void)sam_i2cbus_uninitialize(i2c);
       return -ENODEV;
     }
@@ -184,7 +184,7 @@ int sam_emac0_setmac(void)
   ret = at24->ioctl(at24, MTDIOC_EXTENDED, 1);
   if (ret < 0)
     {
-      ndbg("ERROR: AT24 ioctl(MTDIOC_EXTENDED) failed: %d\n", ret);
+      nerr("ERROR: AT24 ioctl(MTDIOC_EXTENDED) failed: %d\n", ret);
       (void)sam_i2cbus_uninitialize(i2c);
       return ret;
     }
@@ -194,7 +194,7 @@ int sam_emac0_setmac(void)
   nread = at24->read(at24, AT24XX_MACADDR_OFFSET, 6, mac);
   if (nread < 6)
     {
-      ndbg("ERROR: AT24 read(AT24XX_MACADDR_OFFSET) failed: ld\n", (long)nread);
+      nerr("ERROR: AT24 read(AT24XX_MACADDR_OFFSET) failed: ld\n", (long)nread);
       (void)sam_i2cbus_uninitialize(i2c);
       return (int)nread;
     }
@@ -204,7 +204,7 @@ int sam_emac0_setmac(void)
   ret = at24->ioctl(at24, MTDIOC_EXTENDED, 0);
   if (ret < 0)
     {
-      ndbg("ERROR: AT24 ioctl(MTDIOC_EXTENDED) failed: %d\n", ret);
+      nerr("ERROR: AT24 ioctl(MTDIOC_EXTENDED) failed: %d\n", ret);
     }
 
   /* Release the I2C instance.
@@ -214,7 +214,7 @@ int sam_emac0_setmac(void)
   ret = sam_i2cbus_uninitialize(i2c);
   if (ret < 0)
     {
-      ndbg("ERROR: Failed to release the I2C interface: %d\n", ret);
+      nerr("ERROR: Failed to release the I2C interface: %d\n", ret);
     }
 
   ninfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
@@ -225,7 +225,7 @@ int sam_emac0_setmac(void)
   ret = sam_emac_setmacaddr(EMAC0_INTF, mac);
   if (ret < 0)
     {
-      ndbg("ERROR: Failed to set MAC address: %d\n", ret);
+      nerr("ERROR: Failed to set MAC address: %d\n", ret);
     }
 
   return ret;
@@ -310,11 +310,11 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
   DEBUGASSERT(intf);
 
   ninfo("%s: handler=%p\n", intf, handler);
-  phydbg("EMAC0: devname=%s\n", SAMV7_EMAC0_DEVNAME);
+  phyerr("EMAC0: devname=%s\n", SAMV7_EMAC0_DEVNAME);
 
   if (strcmp(intf, SAMV7_EMAC0_DEVNAME) == 0)
     {
-      phydbg("Select EMAC0\n");
+      phyerr("Select EMAC0\n");
       phandler = &g_emac0_handler;
       pinset   = GPIO_EMAC0_INT;
       irq      = IRQ_EMAC0_INT;
@@ -322,7 +322,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
     }
   else
     {
-      ndbg("Unsupported interface: %s\n", intf);
+      nerr("Unsupported interface: %s\n", intf);
       return NULL;
     }
 
@@ -341,15 +341,15 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
 
   if (handler)
     {
-      phydbg("Configure pin: %08x\n", pinset);
+      phyerr("Configure pin: %08x\n", pinset);
       sam_gpioirq(pinset);
 
-      phydbg("Attach IRQ%d\n", irq);
+      phyerr("Attach IRQ%d\n", irq);
       (void)irq_attach(irq, handler);
     }
   else
     {
-      phydbg("Detach IRQ%d\n", irq);
+      phyerr("Detach IRQ%d\n", irq);
       (void)irq_detach(irq);
       enabler = NULL;
     }
diff --git a/configs/same70-xplained/src/sam_hsmci.c b/configs/same70-xplained/src/sam_hsmci.c
index 7d02dd8cc1..ba9e33871d 100644
--- a/configs/same70-xplained/src/sam_hsmci.c
+++ b/configs/same70-xplained/src/sam_hsmci.c
@@ -226,7 +226,7 @@ int sam_hsmci_initialize(int slotno, int minor)
   state = sam_hsmci_state(slotno);
   if (!state)
     {
-      fdbg("ERROR: No state for slotno %d\n", slotno);
+      ferr("ERROR: No state for slotno %d\n", slotno);
       return -EINVAL;
     }
 
@@ -247,7 +247,7 @@ int sam_hsmci_initialize(int slotno, int minor)
   state->hsmci = sdio_initialize(slotno);
   if (!state->hsmci)
     {
-      fdbg("ERROR: Failed to initialize SDIO slot %d\n",  slotno);
+      ferr("ERROR: Failed to initialize SDIO slot %d\n",  slotno);
       return -ENODEV;
     }
 
@@ -256,7 +256,7 @@ int sam_hsmci_initialize(int slotno, int minor)
   ret = mmcsd_slotinitialize(minor, state->hsmci);
   if (ret != OK)
     {
-      fdbg("ERROR: Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
+      ferr("ERROR: Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
       return ret;
     }
 
@@ -293,7 +293,7 @@ bool sam_cardinserted(int slotno)
   state = sam_hsmci_state(slotno);
   if (!state)
     {
-      fdbg("ERROR: No state for slotno %d\n", slotno);
+      ferr("ERROR: No state for slotno %d\n", slotno);
       return false;
     }
 
diff --git a/configs/same70-xplained/src/sam_mcan.c b/configs/same70-xplained/src/sam_mcan.c
index 2ee8c62b1d..9ef3afd4e5 100644
--- a/configs/same70-xplained/src/sam_mcan.c
+++ b/configs/same70-xplained/src/sam_mcan.c
@@ -71,12 +71,12 @@
 /* Non-standard debug that may be enabled just for testing CAN */
 
 #ifdef CONFIG_DEBUG_CAN
-#  define candbg    dbg
+#  define canerr    err
 #  define caninfo   info
 #  define canllerr  llerr
 #  define canllinfo llinfo
 #else
-#  define candbg(x...)
+#  define canerr(x...)
 #  define caninfo(x...)
 #  define canllerr(x...)
 #  define canllinfo(x...)
@@ -110,7 +110,7 @@ int board_can_initialize(void)
       can = sam_mcan_initialize(CAN_PORT);
       if (can == NULL)
         {
-          candbg("ERROR:  Failed to get CAN interface\n");
+          canerr("ERROR:  Failed to get CAN interface\n");
           return -ENODEV;
         }
 
@@ -119,7 +119,7 @@ int board_can_initialize(void)
       ret = can_register("/dev/can0", can);
       if (ret < 0)
         {
-          candbg("ERROR: can_register failed: %d\n", ret);
+          canerr("ERROR: can_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/same70-xplained/src/sam_spi.c b/configs/same70-xplained/src/sam_spi.c
index ffb8c06079..28ea3c2eac 100644
--- a/configs/same70-xplained/src/sam_spi.c
+++ b/configs/same70-xplained/src/sam_spi.c
@@ -65,7 +65,7 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -73,7 +73,7 @@
 #  endif
 #else
 #  undef SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
diff --git a/configs/saml21-xplained/src/sam_autoleds.c b/configs/saml21-xplained/src/sam_autoleds.c
index 2e60573f18..8ddc16f9ab 100644
--- a/configs/saml21-xplained/src/sam_autoleds.c
+++ b/configs/saml21-xplained/src/sam_autoleds.c
@@ -86,10 +86,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/saml21-xplained/src/sam_mmcsd.c b/configs/saml21-xplained/src/sam_mmcsd.c
index c86b61e440..5dbff63a89 100644
--- a/configs/saml21-xplained/src/sam_mmcsd.c
+++ b/configs/saml21-xplained/src/sam_mmcsd.c
@@ -100,7 +100,7 @@ int sam_sdinitialize(int port, int minor)
   spi = sam_spibus_initialize(port);
   if (!spi)
     {
-      fdbg("Failed to initialize SPI%d\n", port);
+      ferr("Failed to initialize SPI%d\n", port);
       return -ENODEV;
     }
 
@@ -113,7 +113,7 @@ int sam_sdinitialize(int port, int minor)
   ret = mmcsd_spislotinitialize(minor, SAMDL_MMCSDSLOTNO, spi);
   if (ret < 0)
     {
-      fdbg("Failed to bind SPI%d to MMC/SD slot %d: %d\n",
+      ferr("Failed to bind SPI%d to MMC/SD slot %d: %d\n",
             port, SAMDL_MMCSDSLOTNO, ret);
       return ret;
     }
diff --git a/configs/saml21-xplained/src/sam_spi.c b/configs/saml21-xplained/src/sam_spi.c
index 6092ef8405..64e94d3896 100644
--- a/configs/saml21-xplained/src/sam_spi.c
+++ b/configs/saml21-xplained/src/sam_spi.c
@@ -63,7 +63,7 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -71,7 +71,7 @@
 #  endif
 #else
 #  undef SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
diff --git a/configs/saml21-xplained/src/sam_ug2832hsweg04.c b/configs/saml21-xplained/src/sam_ug2832hsweg04.c
index 9ab22a7984..9cbbfab082 100644
--- a/configs/saml21-xplained/src/sam_ug2832hsweg04.c
+++ b/configs/saml21-xplained/src/sam_ug2832hsweg04.c
@@ -147,10 +147,10 @@
 /* Debug ********************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg(format, ...)   dbg(format, ##__VA_ARGS__)
+#  define lcderr(format, ...)   err(format, ##__VA_ARGS__)
 #  define lcdinfo(format, ...)  info(format, ##__VA_ARGS__)
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -187,7 +187,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
   spi = sam_spibus_initialize(OLED_CSNO);
   if (!spi)
     {
-      lcddbg("Failed to initialize SPI port 1\n");
+      lcderr("Failed to initialize SPI port 1\n");
     }
   else
     {
@@ -196,7 +196,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
       dev = ssd1306_initialize(spi, devno);
       if (!dev)
         {
-          lcddbg("Failed to bind SPI port 1 to OLED %d: %d\n", devno);
+          lcderr("Failed to bind SPI port 1 to OLED %d: %d\n", devno);
         }
      else
         {
diff --git a/configs/saml21-xplained/src/sam_userleds.c b/configs/saml21-xplained/src/sam_userleds.c
index 9710c1a7a1..842bd26eba 100644
--- a/configs/saml21-xplained/src/sam_userleds.c
+++ b/configs/saml21-xplained/src/sam_userleds.c
@@ -71,10 +71,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/samv71-xult/src/sam_at24config.c b/configs/samv71-xult/src/sam_at24config.c
index 7191454e47..4a324ac07b 100644
--- a/configs/samv71-xult/src/sam_at24config.c
+++ b/configs/samv71-xult/src/sam_at24config.c
@@ -75,7 +75,7 @@ int sam_at24config(void)
   i2c = sam_i2cbus_initialize(0);
   if (!i2c)
     {
-      fdbg("ERROR: Failed to initialize TWI0\n");
+      ferr("ERROR: Failed to initialize TWI0\n");
       return -ENODEV;
     }
 
@@ -84,7 +84,7 @@ int sam_at24config(void)
   at24 = at24c_initialize(i2c);
   if (!at24)
     {
-      fdbg("ERROR: Failed to initialize the AT24 driver\n");
+      ferr("ERROR: Failed to initialize the AT24 driver\n");
       (void)sam_i2cbus_uninitialize(i2c);
       return -ENODEV;
     }
@@ -94,7 +94,7 @@ int sam_at24config(void)
   ret = at24->ioctl(at24, MTDIOC_EXTENDED, 0);
   if (ret < 0)
     {
-      fdbg("ERROR: AT24 ioctl(MTDIOC_EXTENDED) failed: %d\n", ret);
+      ferr("ERROR: AT24 ioctl(MTDIOC_EXTENDED) failed: %d\n", ret);
     }
 
   /* Bind the instance of an MTD device to the /dev/config device. */
@@ -102,7 +102,7 @@ int sam_at24config(void)
   ret = mtdconfig_register(at24);
   if (ret < 0)
     {
-      fdbg("ERROR: Failed to bind AT24 driver to the MTD config device\n");
+      ferr("ERROR: Failed to bind AT24 driver to the MTD config device\n");
       (void)sam_i2cbus_uninitialize(i2c);
     }
 
diff --git a/configs/samv71-xult/src/sam_audio_null.c b/configs/samv71-xult/src/sam_audio_null.c
index 2dedb31eba..59a599eceb 100644
--- a/configs/samv71-xult/src/sam_audio_null.c
+++ b/configs/samv71-xult/src/sam_audio_null.c
@@ -100,7 +100,7 @@ int sam_audio_null_initialize(int minor)
   char devname[12];
   int ret;
 
-  auddbg("minor %d\n", minor);
+  auderr("minor %d\n", minor);
   DEBUGASSERT(minor >= 0 && minor <= 25);
 
   /* Have we already initialized?  Since we never uninitialize we must prevent
@@ -117,7 +117,7 @@ int sam_audio_null_initialize(int minor)
       nullaudio = audio_null_initialize();
       if (!nullaudio)
         {
-          auddbg("Failed to get the NULL audio interface\n");
+          auderr("Failed to get the NULL audio interface\n");
           ret = -ENODEV;
           goto errout;
         }
@@ -130,7 +130,7 @@ int sam_audio_null_initialize(int minor)
       pcm = pcm_decode_initialize(nullaudio);
       if (!pcm)
         {
-          auddbg("ERROR: Failed create the PCM decoder\n");
+          auderr("ERROR: Failed create the PCM decoder\n");
           ret = -ENODEV;
           goto errout_with_nullaudio;
         }
@@ -144,7 +144,7 @@ int sam_audio_null_initialize(int minor)
       ret = audio_register(devname, pcm);
       if (ret < 0)
         {
-          auddbg("ERROR: Failed to register /dev/%s device: %d\n", devname, ret);
+          auderr("ERROR: Failed to register /dev/%s device: %d\n", devname, ret);
           goto errout_with_pcm;
         }
 
diff --git a/configs/samv71-xult/src/sam_autoleds.c b/configs/samv71-xult/src/sam_autoleds.c
index a08b357467..f0cc48521e 100644
--- a/configs/samv71-xult/src/sam_autoleds.c
+++ b/configs/samv71-xult/src/sam_autoleds.c
@@ -102,10 +102,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/samv71-xult/src/sam_bringup.c b/configs/samv71-xult/src/sam_bringup.c
index 18565d424f..6e00088027 100644
--- a/configs/samv71-xult/src/sam_bringup.c
+++ b/configs/samv71-xult/src/sam_bringup.c
@@ -104,7 +104,7 @@
 #ifdef CONFIG_BOARD_INITIALIZE
 #  define SYSLOG llerr
 #else
-#  define SYSLOG dbg
+#  define SYSLOG err
 #endif
 
 /****************************************************************************
@@ -128,14 +128,14 @@ static void sam_i2c_register(int bus)
   i2c = sam_i2cbus_initialize(bus);
   if (i2c == NULL)
     {
-      dbg("ERROR: Failed to get I2C%d interface\n", bus);
+      err("ERROR: Failed to get I2C%d interface\n", bus);
     }
   else
     {
       ret = i2c_register(i2c, bus);
       if (ret < 0)
         {
-          dbg("ERROR: Failed to register I2C%d driver: %d\n", bus, ret);
+          err("ERROR: Failed to register I2C%d driver: %d\n", bus, ret);
           sam_i2cbus_uninitialize(i2c);
         }
     }
diff --git a/configs/samv71-xult/src/sam_ethernet.c b/configs/samv71-xult/src/sam_ethernet.c
index 88c486a428..4c3b3ad680 100644
--- a/configs/samv71-xult/src/sam_ethernet.c
+++ b/configs/samv71-xult/src/sam_ethernet.c
@@ -80,10 +80,10 @@
  */
 
 #ifdef CONFIG_NETDEV_PHY_DEBUG
-#  define phydbg    dbg
+#  define phyerr    err
 #  define phyllerr  llerr
 #else
-#  define phydbg(x...)
+#  define phyerr(x...)
 #  define phyllerr(x...)
 #endif
 
@@ -106,7 +106,7 @@ static xcpt_t g_emac0_handler;
 #ifdef CONFIG_SAMV7_GPIOA_IRQ
 static void sam_emac0_phy_enable(bool enable)
 {
-  phydbg("IRQ%d: enable=%d\n", IRQ_EMAC0_INT, enable);
+  phyerr("IRQ%d: enable=%d\n", IRQ_EMAC0_INT, enable);
   if (enable)
     {
       sam_gpioirqenable(IRQ_EMAC0_INT);
@@ -134,7 +134,7 @@ void weak_function sam_netinitialize(void)
 {
   /* Configure the PHY interrupt GPIO */
 
-  phydbg("Configuring %08x\n", GPIO_EMAC0_INT);
+  phyerr("Configuring %08x\n", GPIO_EMAC0_INT);
   sam_configgpio(GPIO_EMAC0_INT);
 
   /* Configure the PHY SIGDET input */
@@ -169,7 +169,7 @@ int sam_emac0_setmac(void)
   i2c = sam_i2cbus_initialize(0);
   if (!i2c)
     {
-      ndbg("ERROR: Failed to initialize TWI0\n");
+      nerr("ERROR: Failed to initialize TWI0\n");
       return -ENODEV;
     }
 
@@ -178,7 +178,7 @@ int sam_emac0_setmac(void)
   at24 = at24c_initialize(i2c);
   if (!at24)
     {
-      ndbg("ERROR: Failed to initialize the AT24 driver\n");
+      nerr("ERROR: Failed to initialize the AT24 driver\n");
       (void)sam_i2cbus_uninitialize(i2c);
       return -ENODEV;
     }
@@ -188,7 +188,7 @@ int sam_emac0_setmac(void)
   ret = at24->ioctl(at24, MTDIOC_EXTENDED, 1);
   if (ret < 0)
     {
-      ndbg("ERROR: AT24 ioctl(MTDIOC_EXTENDED) failed: %d\n", ret);
+      nerr("ERROR: AT24 ioctl(MTDIOC_EXTENDED) failed: %d\n", ret);
       (void)sam_i2cbus_uninitialize(i2c);
       return ret;
     }
@@ -198,7 +198,7 @@ int sam_emac0_setmac(void)
   nread = at24->read(at24, AT24XX_MACADDR_OFFSET, 6, mac);
   if (nread < 6)
     {
-      ndbg("ERROR: AT24 read(AT24XX_MACADDR_OFFSET) failed: ld\n", (long)nread);
+      nerr("ERROR: AT24 read(AT24XX_MACADDR_OFFSET) failed: ld\n", (long)nread);
       (void)sam_i2cbus_uninitialize(i2c);
       return (int)nread;
     }
@@ -208,7 +208,7 @@ int sam_emac0_setmac(void)
   ret = at24->ioctl(at24, MTDIOC_EXTENDED, 0);
   if (ret < 0)
     {
-      ndbg("ERROR: AT24 ioctl(MTDIOC_EXTENDED) failed: %d\n", ret);
+      nerr("ERROR: AT24 ioctl(MTDIOC_EXTENDED) failed: %d\n", ret);
     }
 
   /* Release the I2C instance.
@@ -218,7 +218,7 @@ int sam_emac0_setmac(void)
   ret = sam_i2cbus_uninitialize(i2c);
   if (ret < 0)
     {
-      ndbg("ERROR: Failed to release the I2C interface: %d\n", ret);
+      nerr("ERROR: Failed to release the I2C interface: %d\n", ret);
     }
 
   ninfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
@@ -229,7 +229,7 @@ int sam_emac0_setmac(void)
   ret = sam_emac_setmacaddr(EMAC0_INTF, mac);
   if (ret < 0)
     {
-      ndbg("ERROR: Failed to set MAC address: %d\n", ret);
+      nerr("ERROR: Failed to set MAC address: %d\n", ret);
     }
 
   return ret;
@@ -314,11 +314,11 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
   DEBUGASSERT(intf);
 
   ninfo("%s: handler=%p\n", intf, handler);
-  phydbg("EMAC0: devname=%s\n", SAMV7_EMAC0_DEVNAME);
+  phyerr("EMAC0: devname=%s\n", SAMV7_EMAC0_DEVNAME);
 
   if (strcmp(intf, SAMV7_EMAC0_DEVNAME) == 0)
     {
-      phydbg("Select EMAC0\n");
+      phyerr("Select EMAC0\n");
       phandler = &g_emac0_handler;
       pinset   = GPIO_EMAC0_INT;
       irq      = IRQ_EMAC0_INT;
@@ -326,7 +326,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
     }
   else
     {
-      ndbg("Unsupported interface: %s\n", intf);
+      nerr("Unsupported interface: %s\n", intf);
       return NULL;
     }
 
@@ -345,15 +345,15 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
 
   if (handler)
     {
-      phydbg("Configure pin: %08x\n", pinset);
+      phyerr("Configure pin: %08x\n", pinset);
       sam_gpioirq(pinset);
 
-      phydbg("Attach IRQ%d\n", irq);
+      phyerr("Attach IRQ%d\n", irq);
       (void)irq_attach(irq, handler);
     }
   else
     {
-      phydbg("Detach IRQ%d\n", irq);
+      phyerr("Detach IRQ%d\n", irq);
       (void)irq_detach(irq);
       enabler = NULL;
     }
diff --git a/configs/samv71-xult/src/sam_hsmci.c b/configs/samv71-xult/src/sam_hsmci.c
index 7389e166c6..1e0eb3670e 100644
--- a/configs/samv71-xult/src/sam_hsmci.c
+++ b/configs/samv71-xult/src/sam_hsmci.c
@@ -226,7 +226,7 @@ int sam_hsmci_initialize(int slotno, int minor)
   state = sam_hsmci_state(slotno);
   if (!state)
     {
-      fdbg("ERROR: No state for slotno %d\n", slotno);
+      ferr("ERROR: No state for slotno %d\n", slotno);
       return -EINVAL;
     }
 
@@ -247,7 +247,7 @@ int sam_hsmci_initialize(int slotno, int minor)
   state->hsmci = sdio_initialize(slotno);
   if (!state->hsmci)
     {
-      fdbg("ERROR: Failed to initialize SDIO slot %d\n",  slotno);
+      ferr("ERROR: Failed to initialize SDIO slot %d\n",  slotno);
       return -ENODEV;
     }
 
@@ -256,7 +256,7 @@ int sam_hsmci_initialize(int slotno, int minor)
   ret = mmcsd_slotinitialize(minor, state->hsmci);
   if (ret != OK)
     {
-      fdbg("ERROR: Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
+      ferr("ERROR: Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
       return ret;
     }
 
@@ -293,7 +293,7 @@ bool sam_cardinserted(int slotno)
   state = sam_hsmci_state(slotno);
   if (!state)
     {
-      fdbg("ERROR: No state for slotno %d\n", slotno);
+      ferr("ERROR: No state for slotno %d\n", slotno);
       return false;
     }
 
diff --git a/configs/samv71-xult/src/sam_ili9488.c b/configs/samv71-xult/src/sam_ili9488.c
index ed9dd1d5b7..aba728c7b5 100644
--- a/configs/samv71-xult/src/sam_ili9488.c
+++ b/configs/samv71-xult/src/sam_ili9488.c
@@ -301,10 +301,10 @@
 /* Debug *********************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg              dbg
+#  define lcderr              err
 #  define lcdinfo             info
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -548,7 +548,7 @@ static int sam_sendcmd(FAR struct sam_dev_s *priv, uint16_t cmd)
   ret = sam_lcd_txtransfer(priv, &cmd, sizeof(uint16_t));
   if (ret < 0)
     {
-      lcddbg("ERROR: Failed to send command %02x: %d\n", cmd, ret);
+      lcderr("ERROR: Failed to send command %02x: %d\n", cmd, ret);
     }
 
   /* Make sure that the CMD/DATA GPIO is reset for commands.  I don't understand
@@ -592,7 +592,7 @@ static int sam_lcd_put(FAR struct sam_dev_s *priv, uint16_t cmd,
       ret = sam_lcd_txtransfer(priv, buffer, buflen);
       if (ret < 0)
         {
-          lcddbg("ERROR: Failed to send command %02x data: %d\n", cmd, ret);
+          lcderr("ERROR: Failed to send command %02x data: %d\n", cmd, ret);
        }
     }
 
@@ -874,7 +874,7 @@ static void sam_lcd_dumpone(struct sam_dev_s *priv, int index,
     }
   else
     {
-      fdbg("%s: Not collected\n", msg);
+      ferr("%s: Not collected\n", msg);
     }
 }
 #endif
@@ -994,7 +994,7 @@ static int sam_lcd_dmawait(FAR struct sam_dev_s *priv, uint32_t timeout)
                  1, (uint32_t)priv);
   if (ret < 0)
     {
-      lcddbg("ERROR: wd_start failed: %d\n", errno);
+      lcderr("ERROR: wd_start failed: %d\n", errno);
     }
 
   /* Loop until the event (or the timeout occurs). */
@@ -1160,7 +1160,7 @@ static int sam_putrun(fb_coord_t row, fb_coord_t col,
   ret = sam_setwindow(priv, row, col, npixels, 1);
   if (ret < 0)
     {
-      lcddbg("ERROR: sam_setwindow failed: %d\n",  ret);
+      lcderr("ERROR: sam_setwindow failed: %d\n",  ret);
       return ret;
     }
 
@@ -1201,7 +1201,7 @@ static int sam_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
   ret = sam_setwindow(priv, row, col, npixels, 1);
   if (ret < 0)
     {
-      lcddbg("ERROR: sam_setwindow failed: %d\n",  ret);
+      lcderr("ERROR: sam_setwindow failed: %d\n",  ret);
       return ret;
     }
 
@@ -1484,7 +1484,7 @@ static inline int sam_lcd_initialize(void)
 
   if (id != ILI9488_DEVICE_CODE)
     {
-      lcddbg("ERROR: Unsupported LCD ID: %04x (vs. %04x)\n",
+      lcderr("ERROR: Unsupported LCD ID: %04x (vs. %04x)\n",
              id, ILI9488_DEVICE_CODE);
       return -ENODEV;
     }
@@ -1575,7 +1575,7 @@ int board_lcd_initialize(void)
   priv->dmach = sam_dmachannel(0, DMA_FLAGS);
   if (!priv->dmach)
     {
-      lcddbg("ERROR: Failed to allocate a DMA channel\n");
+      lcderr("ERROR: Failed to allocate a DMA channel\n");
       ret =  -EAGAIN;
       goto errout_with_waitsem;
     }
@@ -1585,7 +1585,7 @@ int board_lcd_initialize(void)
   priv->dmadog = wd_create();
   if (!priv->dmadog)
     {
-      lcddbg("ERROR: Failed to allocate a timer\n");
+      lcderr("ERROR: Failed to allocate a timer\n");
       ret = -EAGAIN;
       goto errout_with_dmach;
     }
@@ -1596,7 +1596,7 @@ int board_lcd_initialize(void)
   ret = sam_lcd_initialize();
   if (ret < 0)
     {
-      lcddbg("ERROR: sam_lcd_initialize failed: %d\n", ret);
+      lcderr("ERROR: sam_lcd_initialize failed: %d\n", ret);
       goto errout_with_dmadog;
     }
 
@@ -1609,7 +1609,7 @@ int board_lcd_initialize(void)
   ret = sam_poweroff(priv);
   if (ret < 0)
     {
-      lcddbg("ERROR: sam_poweroff failed: %d\n", ret);
+      lcderr("ERROR: sam_poweroff failed: %d\n", ret);
       goto errout_with_dmadog;
     }
 
@@ -1705,7 +1705,7 @@ void sam_lcdclear(uint16_t color)
   ret = sam_setwindow(priv, 0, 0, SAM_XRES, SAM_YRES);
   if (ret < 0)
     {
-      lcddbg("ERROR: sam_setwindow failed: %d\n",  ret);
+      lcderr("ERROR: sam_setwindow failed: %d\n",  ret);
       return;
     }
 
@@ -1714,7 +1714,7 @@ void sam_lcdclear(uint16_t color)
       ret = sam_putrun(row, 0, (FAR const uint8_t *)g_runbuffer, SAM_XRES);
       if (ret < 0)
         {
-          lcddbg("ERROR: sam_putrun failed on row %d: %d\n", row, ret);
+          lcderr("ERROR: sam_putrun failed on row %d: %d\n", row, ret);
           return;
         }
     }
diff --git a/configs/samv71-xult/src/sam_maxtouch.c b/configs/samv71-xult/src/sam_maxtouch.c
index d085ee6a33..2f44a0759b 100644
--- a/configs/samv71-xult/src/sam_maxtouch.c
+++ b/configs/samv71-xult/src/sam_maxtouch.c
@@ -241,7 +241,7 @@ int board_tsc_setup(int minor)
   static bool initialized = false;
   int ret;
 
-  idbg("minor %d\n", minor);
+  ierr("minor %d\n", minor);
   DEBUGASSERT(minor == 0);
 
   /* Have we already initialized?  Since we never uninitialize we must prevent
@@ -261,7 +261,7 @@ int board_tsc_setup(int minor)
       i2c = sam_i2cbus_initialize(MXT_TWI_BUS);
       if (!i2c)
         {
-          idbg("Failed to initialize I2C%d\n", MXT_TWI_BUS);
+          ierr("Failed to initialize I2C%d\n", MXT_TWI_BUS);
           return -ENODEV;
         }
 
@@ -275,7 +275,7 @@ int board_tsc_setup(int minor)
       ret = mxt_register(i2c, &g_mxtinfo.lower, CONFIG_SAMV71XULT_MXT_DEVMINOR);
       if (ret < 0)
         {
-          idbg("ERROR: Failed to register touchscreen device\n");
+          ierr("ERROR: Failed to register touchscreen device\n");
           irq_detach(IRQ_MXT_CHG);
           /* sam_i2cbus_uninitialize(i2c); */
           return -ENODEV;
diff --git a/configs/samv71-xult/src/sam_mcan.c b/configs/samv71-xult/src/sam_mcan.c
index c3d4f8bf8d..fa823a7b90 100644
--- a/configs/samv71-xult/src/sam_mcan.c
+++ b/configs/samv71-xult/src/sam_mcan.c
@@ -71,12 +71,12 @@
 /* Non-standard debug that may be enabled just for testing CAN */
 
 #ifdef CONFIG_DEBUG_CAN
-#  define candbg    dbg
+#  define canerr    err
 #  define caninfo   info
 #  define canllerr  llerr
 #  define canllinfo llinfo
 #else
-#  define candbg(x...)
+#  define canerr(x...)
 #  define caninfo(x...)
 #  define canllerr(x...)
 #  define canllinfo(x...)
@@ -110,7 +110,7 @@ int board_can_initialize(void)
       can = sam_mcan_initialize(CAN_PORT);
       if (can == NULL)
         {
-          candbg("ERROR:  Failed to get CAN interface\n");
+          canerr("ERROR:  Failed to get CAN interface\n");
           return -ENODEV;
         }
 
@@ -119,7 +119,7 @@ int board_can_initialize(void)
       ret = can_register("/dev/can0", can);
       if (ret < 0)
         {
-          candbg("ERROR: can_register failed: %d\n", ret);
+          canerr("ERROR: can_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/samv71-xult/src/sam_spi.c b/configs/samv71-xult/src/sam_spi.c
index 35877918bc..ddf7714ecc 100644
--- a/configs/samv71-xult/src/sam_spi.c
+++ b/configs/samv71-xult/src/sam_spi.c
@@ -65,7 +65,7 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -73,7 +73,7 @@
 #  endif
 #else
 #  undef SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
diff --git a/configs/samv71-xult/src/sam_wm8904.c b/configs/samv71-xult/src/sam_wm8904.c
index f7b3dfc847..352a89c560 100644
--- a/configs/samv71-xult/src/sam_wm8904.c
+++ b/configs/samv71-xult/src/sam_wm8904.c
@@ -253,7 +253,7 @@ int sam_wm8904_initialize(int minor)
   char devname[12];
   int ret;
 
-  auddbg("minor %d\n", minor);
+  auderr("minor %d\n", minor);
   DEBUGASSERT(minor >= 0 && minor <= 25);
 
   /* Have we already initialized?  Since we never uninitialize we must prevent
@@ -273,7 +273,7 @@ int sam_wm8904_initialize(int minor)
       i2c = sam_i2cbus_initialize(WM8904_TWI_BUS);
       if (!i2c)
         {
-          auddbg("Failed to initialize TWI%d\n", WM8904_TWI_BUS);
+          auderr("Failed to initialize TWI%d\n", WM8904_TWI_BUS);
           ret = -ENODEV;
           goto errout;
         }
@@ -283,7 +283,7 @@ int sam_wm8904_initialize(int minor)
       i2s = sam_ssc_initialize(WM8904_SSC_BUS);
       if (!i2s)
         {
-          auddbg("Failed to initialize SSC%d\n", WM8904_SSC_BUS);
+          auderr("Failed to initialize SSC%d\n", WM8904_SSC_BUS);
           ret = -ENODEV;
           goto errout_with_i2c;
         }
@@ -314,7 +314,7 @@ int sam_wm8904_initialize(int minor)
       ret = irq_attach(IRQ_INT_WM8904, wm8904_interrupt);
       if (ret < 0)
         {
-          auddbg("ERROR: Failed to attach WM8904 interrupt: %d\n", ret);
+          auderr("ERROR: Failed to attach WM8904 interrupt: %d\n", ret);
           goto errout_with_i2s;
         }
 
@@ -325,7 +325,7 @@ int sam_wm8904_initialize(int minor)
       wm8904 = wm8904_initialize(i2c, i2s, &g_wm8904info.lower);
       if (!wm8904)
         {
-          auddbg("Failed to initialize the WM8904\n");
+          auderr("Failed to initialize the WM8904\n");
           ret = -ENODEV;
           goto errout_with_irq;
         }
@@ -338,7 +338,7 @@ int sam_wm8904_initialize(int minor)
       pcm = pcm_decode_initialize(wm8904);
       if (!pcm)
         {
-          auddbg("ERROR: Failed create the PCM decoder\n");
+          auderr("ERROR: Failed create the PCM decoder\n");
           ret = -ENODEV;
           goto errout_with_wm8904;
         }
@@ -355,7 +355,7 @@ int sam_wm8904_initialize(int minor)
       ret = audio_register(devname, pcm);
       if (ret < 0)
         {
-          auddbg("ERROR: Failed to register /dev/%s device: %d\n", devname, ret);
+          auderr("ERROR: Failed to register /dev/%s device: %d\n", devname, ret);
           goto errout_with_pcm;
         }
 
diff --git a/configs/shenzhou/src/stm32_adc.c b/configs/shenzhou/src/stm32_adc.c
index bd54100a09..dbdc5a2963 100644
--- a/configs/shenzhou/src/stm32_adc.c
+++ b/configs/shenzhou/src/stm32_adc.c
@@ -145,7 +145,7 @@ int board_adc_setup(void)
       adc = stm32_adcinitialize(1, g_chanlist, ADC1_NCHANNELS);
       if (adc == NULL)
         {
-          adbg("ERROR: Failed to get ADC interface\n");
+          aerr("ERROR: Failed to get ADC interface\n");
           return -ENODEV;
         }
 
@@ -154,7 +154,7 @@ int board_adc_setup(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          adbg("adc_register failed: %d\n", ret);
+          aerr("adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/shenzhou/src/stm32_autoleds.c b/configs/shenzhou/src/stm32_autoleds.c
index 507caa71f7..e48e6c54f6 100644
--- a/configs/shenzhou/src/stm32_autoleds.c
+++ b/configs/shenzhou/src/stm32_autoleds.c
@@ -62,10 +62,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/shenzhou/src/stm32_can.c b/configs/shenzhou/src/stm32_can.c
index 0e70944eb7..51b6922345 100644
--- a/configs/shenzhou/src/stm32_can.c
+++ b/configs/shenzhou/src/stm32_can.c
@@ -66,12 +66,12 @@
 /* Non-standard debug that may be enabled just for testing CAN */
 
 #ifdef CONFIG_DEBUG_CAN
-#  define candbg    dbg
+#  define canerr    err
 #  define caninfo   info
 #  define canllerr  llerr
 #  define canllinfo llinfo
 #else
-#  define candbg(x...)
+#  define canerr(x...)
 #  define caninfo(x...)
 #  define canllerr(x...)
 #  define canllinfo(x...)
@@ -109,7 +109,7 @@ int board_can_initialize(void)
       can = stm32_caninitialize(CAN_PORT);
       if (can == NULL)
         {
-          candbg("ERROR:  Failed to get CAN interface\n");
+          canerr("ERROR:  Failed to get CAN interface\n");
           return -ENODEV;
         }
 
@@ -118,7 +118,7 @@ int board_can_initialize(void)
       ret = can_register("/dev/can0", can);
       if (ret < 0)
         {
-          candbg("ERROR: can_register failed: %d\n", ret);
+          canerr("ERROR: can_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/shenzhou/src/stm32_ili93xx.c b/configs/shenzhou/src/stm32_ili93xx.c
index 41fef5868b..dfe869e7f6 100644
--- a/configs/shenzhou/src/stm32_ili93xx.c
+++ b/configs/shenzhou/src/stm32_ili93xx.c
@@ -371,10 +371,10 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg              dbg
+#  define lcderr              err
 #  define lcdinfo             info
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -594,18 +594,18 @@ static struct stm32_dev_s g_lcddev =
 #ifdef CONFIG_LCD_REGDEBUG
 static void stm32_lcdshow(FAR struct stm32_lower_s *priv, FAR const char *msg)
 {
-  dbg("%s:\n", msg);
-  dbg("  CRTL   RS: %d CS: %d RD: %d WR: %d LE: %d\n",
+  err("%s:\n", msg);
+  err("  CRTL   RS: %d CS: %d RD: %d WR: %d LE: %d\n",
       getreg32(LCD_RS_READ), getreg32(LCD_CS_READ), getreg32(LCD_RD_READ),
       getreg32(LCD_WR_READ), getreg32(LCD_LE_READ));
-  dbg("  DATA   CR: %08x %08x\n", getreg32(LCD_CRL), getreg32(LCD_CRH));
+  err("  DATA   CR: %08x %08x\n", getreg32(LCD_CRL), getreg32(LCD_CRH));
   if (priv->output)
     {
-      dbg("  OUTPUT: %08x\n", getreg32(LCD_ODR));
+      err("  OUTPUT: %08x\n", getreg32(LCD_ODR));
     }
   else
     {
-      dbg("  INPUT:  %08x\n", getreg32(LCD_IDR));
+      err("  INPUT:  %08x\n", getreg32(LCD_IDR));
     }
 }
 #endif
@@ -1254,7 +1254,7 @@ static int stm32_setpower(struct lcd_dev_s *dev, int power)
       else
 #endif
         {
-          gdbg("Unsupported LCD: %d\n", priv->type);
+          gerr("Unsupported LCD: %d\n", priv->type);
         }
 
       up_mdelay(50);
@@ -1780,7 +1780,7 @@ static inline int stm32_lcdinitialize(FAR struct stm32_dev_s *priv)
   up_mdelay(50);
 
   id = stm32_readreg(priv, LCD_REG_0);     /* Read the ID register */
-  lcddbg("LCD ID: %04x\n", id);
+  lcderr("LCD ID: %04x\n", id);
 
   stm32_lcdoutput(priv);
   up_mdelay(10);
@@ -1852,11 +1852,11 @@ static inline int stm32_lcdinitialize(FAR struct stm32_dev_s *priv)
   else
 #endif
     {
-      lcddbg("Unsupported LCD type\n");
+      lcderr("Unsupported LCD type\n");
       ret = -ENODEV;
     }
 
-  lcddbg("LCD type: %d\n", priv->type);
+  lcderr("LCD type: %d\n", priv->type);
   return ret;
 }
 
diff --git a/configs/shenzhou/src/stm32_mmcsd.c b/configs/shenzhou/src/stm32_mmcsd.c
index 6307bf3391..b1ebe96400 100644
--- a/configs/shenzhou/src/stm32_mmcsd.c
+++ b/configs/shenzhou/src/stm32_mmcsd.c
@@ -100,7 +100,7 @@ int stm32_sdinitialize(int minor)
   spi = stm32_spibus_initialize(STM32_MMCSDSPIPORTNO);
   if (!spi)
     {
-      fdbg("Failed to initialize SPI port %d\n", STM32_MMCSDSPIPORTNO);
+      ferr("Failed to initialize SPI port %d\n", STM32_MMCSDSPIPORTNO);
       return -ENODEV;
     }
 
@@ -114,7 +114,7 @@ int stm32_sdinitialize(int minor)
   ret = mmcsd_spislotinitialize(minor, STM32_MMCSDSLOTNO, spi);
   if (ret < 0)
     {
-      fdbg("Failed to bind SPI port %d to MMC/SD slot %d: %d\n",
+      ferr("Failed to bind SPI port %d to MMC/SD slot %d: %d\n",
             STM32_MMCSDSPIPORTNO, STM32_MMCSDSLOTNO, ret);
       return ret;
     }
diff --git a/configs/shenzhou/src/stm32_spi.c b/configs/shenzhou/src/stm32_spi.c
index c0975d6b73..9f85fca6f3 100644
--- a/configs/shenzhou/src/stm32_spi.c
+++ b/configs/shenzhou/src/stm32_spi.c
@@ -64,14 +64,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -145,7 +145,7 @@ void weak_function stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
   /* SPI1 connects to the SD CARD and to the SPI FLASH */
 
@@ -181,7 +181,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
   /* SPI3 connects to TFT LCD (for touchscreen and SD) and the RF24L01 2.4G
    * wireless module.
diff --git a/configs/shenzhou/src/stm32_ssd1289.c b/configs/shenzhou/src/stm32_ssd1289.c
index 868449ee00..7a28c222ca 100644
--- a/configs/shenzhou/src/stm32_ssd1289.c
+++ b/configs/shenzhou/src/stm32_ssd1289.c
@@ -89,10 +89,10 @@
 /* Debug ****************************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg         dbg
+#  define lcderr         err
 #  define lcdinfo        info
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -277,18 +277,18 @@ static struct stm32_lower_s g_lcdlower =
 #ifdef CONFIG_LCD_REGDEBUG
 static void stm32_lcdshow(FAR struct stm32_lower_s *priv, FAR const char *msg)
 {
-  dbg("%s:\n", msg);
-  dbg("  CRTL   RS: %d CS: %d RD: %d WR: %d LE: %d\n",
+  err("%s:\n", msg);
+  err("  CRTL   RS: %d CS: %d RD: %d WR: %d LE: %d\n",
       getreg32(LCD_RS_READ), getreg32(LCD_CS_READ), getreg32(LCD_RD_READ),
       getreg32(LCD_WR_READ), getreg32(LCD_LE_READ));
-  dbg("  DATA   CR: %08x %08x\n", getreg32(LCD_CRL), getreg32(LCD_CRH));
+  err("  DATA   CR: %08x %08x\n", getreg32(LCD_CRL), getreg32(LCD_CRH));
   if (priv->output)
     {
-      dbg("  OUTPUT: %08x\n", getreg32(LCD_ODR));
+      err("  OUTPUT: %08x\n", getreg32(LCD_ODR));
     }
   else
     {
-      dbg("  INPUT:  %08x\n", getreg32(LCD_IDR));
+      err("  INPUT:  %08x\n", getreg32(LCD_IDR));
     }
 }
 #endif
@@ -563,7 +563,7 @@ int board_lcd_initialize(void)
       priv->drvr = ssd1289_lcdinitialize(&priv->dev);
       if (!priv->drvr)
         {
-          lcddbg("ERROR: ssd1289_lcdinitialize failed\n");
+          lcderr("ERROR: ssd1289_lcdinitialize failed\n");
           return -ENODEV;
         }
     }
diff --git a/configs/shenzhou/src/stm32_touchscreen.c b/configs/shenzhou/src/stm32_touchscreen.c
index df3943812e..b20789cd9e 100644
--- a/configs/shenzhou/src/stm32_touchscreen.c
+++ b/configs/shenzhou/src/stm32_touchscreen.c
@@ -251,7 +251,7 @@ int board_tsc_setup(int minor)
   FAR struct spi_dev_s *dev;
   int ret;
 
-  idbg("minor %d\n", minor);
+  ierr("minor %d\n", minor);
   DEBUGASSERT(minor == 0);
 
   /* Configure and enable the ADS7843E interrupt pin as an input. */
@@ -263,7 +263,7 @@ int board_tsc_setup(int minor)
   dev = stm32_spibus_initialize(CONFIG_ADS7843E_SPIDEV);
   if (!dev)
     {
-      idbg("Failed to initialize SPI bus %d\n", CONFIG_ADS7843E_SPIDEV);
+      ierr("Failed to initialize SPI bus %d\n", CONFIG_ADS7843E_SPIDEV);
       return -ENODEV;
     }
 
@@ -272,7 +272,7 @@ int board_tsc_setup(int minor)
   ret = ads7843e_register(dev, &g_tscinfo.dev, CONFIG_ADS7843E_DEVMINOR);
   if (ret < 0)
     {
-      idbg("Failed to initialize SPI bus %d\n", CONFIG_ADS7843E_SPIDEV);
+      ierr("Failed to initialize SPI bus %d\n", CONFIG_ADS7843E_SPIDEV);
       /* up_spiuninitialize(dev); */
       return -ENODEV;
     }
diff --git a/configs/shenzhou/src/stm32_usb.c b/configs/shenzhou/src/stm32_usb.c
index 631e87c94f..054270e04d 100644
--- a/configs/shenzhou/src/stm32_usb.c
+++ b/configs/shenzhou/src/stm32_usb.c
@@ -184,7 +184,7 @@ int stm32_usbhost_initialize(void)
   ret = usbhost_msc_initialize();
   if (ret != OK)
     {
-      udbg("ERROR: Failed to register the mass storage class: %d\n", ret);
+      uerr("ERROR: Failed to register the mass storage class: %d\n", ret);
     }
 #endif
 
@@ -194,7 +194,7 @@ int stm32_usbhost_initialize(void)
   ret = usbhost_cdcacm_initialize();
   if (ret != OK)
     {
-      udbg("ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
+      uerr("ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
     }
 #endif
 
diff --git a/configs/shenzhou/src/stm32_userleds.c b/configs/shenzhou/src/stm32_userleds.c
index 7fc3976970..842cebd332 100644
--- a/configs/shenzhou/src/stm32_userleds.c
+++ b/configs/shenzhou/src/stm32_userleds.c
@@ -62,10 +62,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/shenzhou/src/stm32_w25.c b/configs/shenzhou/src/stm32_w25.c
index fe27c8a1d7..68db581ce3 100644
--- a/configs/shenzhou/src/stm32_w25.c
+++ b/configs/shenzhou/src/stm32_w25.c
@@ -107,7 +107,7 @@ int stm32_w25initialize(int minor)
   spi = stm32_spibus_initialize(1);
   if (!spi)
     {
-      fdbg("ERROR: Failed to initialize SPI port 2\n");
+      ferr("ERROR: Failed to initialize SPI port 2\n");
       return -ENODEV;
     }
 
@@ -116,7 +116,7 @@ int stm32_w25initialize(int minor)
   mtd = w25_initialize(spi);
   if (!mtd)
     {
-      fdbg("ERROR: Failed to bind SPI port 2 to the SST 25 FLASH driver\n");
+      ferr("ERROR: Failed to bind SPI port 2 to the SST 25 FLASH driver\n");
       return -ENODEV;
     }
 
@@ -126,7 +126,7 @@ int stm32_w25initialize(int minor)
   ret = ftl_initialize(minor, mtd);
   if (ret < 0)
     {
-      fdbg("ERROR: Initialize the FTL layer\n");
+      ferr("ERROR: Initialize the FTL layer\n");
       return ret;
     }
 #else
@@ -135,7 +135,7 @@ int stm32_w25initialize(int minor)
   ret = nxffs_initialize(mtd);
   if (ret < 0)
     {
-      fdbg("ERROR: NXFFS initialization failed: %d\n", -ret);
+      ferr("ERROR: NXFFS initialization failed: %d\n", -ret);
       return ret;
     }
 
@@ -145,7 +145,7 @@ int stm32_w25initialize(int minor)
   ret = mount(NULL, devname, "nxffs", 0, NULL);
   if (ret < 0)
     {
-      fdbg("ERROR: Failed to mount the NXFFS volume: %d\n", errno);
+      ferr("ERROR: Failed to mount the NXFFS volume: %d\n", errno);
       return ret;
     }
 #endif
diff --git a/configs/sim/src/sim_bringup.c b/configs/sim/src/sim_bringup.c
index 11489bace7..08b7e9f6ce 100644
--- a/configs/sim/src/sim_bringup.c
+++ b/configs/sim/src/sim_bringup.c
@@ -62,7 +62,7 @@ int trv_mount_world(int minor, FAR const char *mountpoint);
 #ifdef CONFIG_BOARD_INITIALIZE
 #  define SYSLOG llerr
 #else
-#  define SYSLOG dbg
+#  define SYSLOG err
 #endif
 
 /****************************************************************************
diff --git a/configs/sim/src/sim_touchscreen.c b/configs/sim/src/sim_touchscreen.c
index d52b4133d9..622e631382 100644
--- a/configs/sim/src/sim_touchscreen.c
+++ b/configs/sim/src/sim_touchscreen.c
@@ -111,14 +111,14 @@ int board_tsc_setup(int minor)
   ret = up_fbinitialize(0);
   if (ret < 0)
     {
-      idbg("up_fbinitialize failed: %d\n", -ret);
+      ierr("up_fbinitialize failed: %d\n", -ret);
       goto errout;
     }
 
   dev = up_fbgetvplane(0, 0);
   if (!dev)
     {
-      idbg("up_fbgetvplane 0 failed\n");
+      ierr("up_fbgetvplane 0 failed\n");
       ret = -ENODEV;
       goto errout_with_fb;
     }
@@ -130,7 +130,7 @@ int board_tsc_setup(int minor)
   if (!g_simtc.hnx)
     {
       ret = -errno;
-      idbg("nx_open failed: %d\n", ret);
+      ierr("nx_open failed: %d\n", ret);
       goto errout_with_fb;
     }
 
@@ -140,7 +140,7 @@ int board_tsc_setup(int minor)
   ret = vnc_default_fbinitialize(0, g_simtc.hnx);
   if (ret < 0)
     {
-      idbg("vnc_default_fbinitialize failed: %d\n", ret);
+      ierr("vnc_default_fbinitialize failed: %d\n", ret);
       goto errout_with_fb;
     }
 #endif
@@ -153,7 +153,7 @@ int board_tsc_setup(int minor)
   ret = nx_setbgcolor(g_simtc.hnx, &color);
   if (ret < 0)
     {
-      idbg("nx_setbgcolor failed: %d\n", ret);
+      ierr("nx_setbgcolor failed: %d\n", ret);
       goto errout_with_nx;
     }
 
@@ -162,7 +162,7 @@ int board_tsc_setup(int minor)
   ret = board_tsc_setup(minor);
   if (ret < 0)
     {
-      idbg("board_tsc_setup failed: %d\n", ret);
+      ierr("board_tsc_setup failed: %d\n", ret);
       goto errout_with_nx;
     }
   return OK;
diff --git a/configs/spark/src/stm32_appinit.c b/configs/spark/src/stm32_appinit.c
index c91969cd59..ebb3518af7 100644
--- a/configs/spark/src/stm32_appinit.c
+++ b/configs/spark/src/stm32_appinit.c
@@ -206,7 +206,7 @@ int board_app_initialize(uintptr_t arg)
     ret = ftl_initialize(CONFIG_SPARK_FLASH_MINOR, mtd);
     if (ret < 0)
       {
-        fdbg("ERROR: Initialize the FTL layer\n");
+        ferr("ERROR: Initialize the FTL layer\n");
         return ret;
       }
 
@@ -227,7 +227,7 @@ int board_app_initialize(uintptr_t arg)
       ret = mount(partname, mntpoint, "vfat", 0, NULL);
       if (ret < 0)
         {
-          fdbg("ERROR: Failed to mount the FAT volume: %d\n", errno);
+          ferr("ERROR: Failed to mount the FAT volume: %d\n", errno);
           return ret;
         }
     }
@@ -261,7 +261,7 @@ int board_app_initialize(uintptr_t arg)
           ret = ftl_initialize(partno, mtd_part);
           if (ret < 0)
             {
-              fdbg("ERROR: Initialize the FTL layer\n");
+              ferr("ERROR: Initialize the FTL layer\n");
               return ret;
             }
 
@@ -274,7 +274,7 @@ int board_app_initialize(uintptr_t arg)
           ret = mount(partname, mntpoint, "vfat", 0, NULL);
           if (ret < 0)
             {
-              fdbg("ERROR: Failed to mount the FAT volume: %d\n", errno);
+              ferr("ERROR: Failed to mount the FAT volume: %d\n", errno);
               return ret;
             }
 
diff --git a/configs/spark/src/stm32_autoleds.c b/configs/spark/src/stm32_autoleds.c
index f085b71a7b..8e3d002c77 100644
--- a/configs/spark/src/stm32_autoleds.c
+++ b/configs/spark/src/stm32_autoleds.c
@@ -64,10 +64,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/spark/src/stm32_composite.c b/configs/spark/src/stm32_composite.c
index 8893c12c92..e38c769e64 100644
--- a/configs/spark/src/stm32_composite.c
+++ b/configs/spark/src/stm32_composite.c
@@ -145,7 +145,7 @@ static int stm32_composite_initialize(void)
   spi = stm32_spibus_initialize(CONFIG_SPARK_FLASH_SPI);
   if (!spi)
     {
-      fdbg("ERROR: Failed to initialize SPI port %d\n",
+      ferr("ERROR: Failed to initialize SPI port %d\n",
            CONFIG_SPARK_FLASH_SPI);
       return -ENODEV;
     }
@@ -158,7 +158,7 @@ static int stm32_composite_initialize(void)
   mtd = sst25_initialize(spi);
   if (!mtd)
     {
-      fdbg("ERROR: Failed to bind SPI port %d to the SPI FLASH driver\n",
+      ferr("ERROR: Failed to bind SPI port %d to the SPI FLASH driver\n",
            CONFIG_SPARK_FLASH_SPI);
     }
   else
@@ -174,7 +174,7 @@ static int stm32_composite_initialize(void)
   ret = ftl_initialize(CONFIG_SPARK_FLASH_MINOR, mtd);
   if (ret < 0)
     {
-      fdbg("ERROR: Initialize the FTL layer\n");
+      ferr("ERROR: Initialize the FTL layer\n");
       return ret;
     }
 
@@ -194,7 +194,7 @@ static int stm32_composite_initialize(void)
   ret = mount(partname, mntpoint, "vfat", 0, NULL);
   if (ret < 0)
     {
-      fdbg("ERROR: Failed to mount the FAT volume: %d\n", errno);
+      ferr("ERROR: Failed to mount the FAT volume: %d\n", errno);
       return ret;
     }
 
@@ -228,7 +228,7 @@ static int stm32_composite_initialize(void)
           ret = ftl_initialize(partno, mtd_part);
           if (ret < 0)
             {
-              fdbg("ERROR: Initialize the FTL layer\n");
+              ferr("ERROR: Initialize the FTL layer\n");
               return ret;
             }
 
@@ -241,7 +241,7 @@ static int stm32_composite_initialize(void)
           ret = mount(partname, mntpoint, "vfat", 0, NULL);
           if (ret < 0)
             {
-              fdbg("ERROR: Failed to mount the FAT volume: %d\n", errno);
+              ferr("ERROR: Failed to mount the FAT volume: %d\n", errno);
               return ret;
             }
 
@@ -272,7 +272,7 @@ static int stm32_composite_initialize(void)
   ret = usbmonitor_start(0, NULL);
   if (ret != OK)
     {
-      fdbg("ERROR: Failed to start USB monitor: %d\n", ret);
+      ferr("ERROR: Failed to start USB monitor: %d\n", ret);
     }
 #endif
 
diff --git a/configs/spark/src/stm32_spi.c b/configs/spark/src/stm32_spi.c
index 92015ce1ef..8c12859c49 100644
--- a/configs/spark/src/stm32_spi.c
+++ b/configs/spark/src/stm32_spi.c
@@ -69,7 +69,7 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -77,7 +77,7 @@
 #  endif
 #else
 #  undef SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -144,7 +144,7 @@ void weak_function stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -156,7 +156,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
 #if defined(CONFIG_MTD_SST25)
 
@@ -186,7 +186,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
 }
 
diff --git a/configs/spark/src/stm32_userleds.c b/configs/spark/src/stm32_userleds.c
index 63fb4df0e2..d8e6608429 100644
--- a/configs/spark/src/stm32_userleds.c
+++ b/configs/spark/src/stm32_userleds.c
@@ -63,10 +63,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/spark/src/stm32_wireless.c b/configs/spark/src/stm32_wireless.c
index 3feb345e5a..69a73be746 100644
--- a/configs/spark/src/stm32_wireless.c
+++ b/configs/spark/src/stm32_wireless.c
@@ -281,7 +281,7 @@ int wireless_archinitialize(size_t max_rx_size)
 
   /* Init SPI bus */
 
-  idbg("minor %d\n", minor);
+  ierr("minor %d\n", minor);
   DEBUGASSERT(CONFIG_CC3000_DEVMINOR == 0);
 
 #ifdef CONFIG_CC3000_PROBES
@@ -296,7 +296,7 @@ int wireless_archinitialize(size_t max_rx_size)
   spi = stm32_spibus_initialize(CONFIG_CC3000_SPIDEV);
   if (!spi)
     {
-      idbg("Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV);
+      ierr("Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV);
       return -ENODEV;
     }
 
@@ -305,7 +305,7 @@ int wireless_archinitialize(size_t max_rx_size)
   int ret = cc3000_register(spi, &g_cc3000_info.dev, CONFIG_CC3000_DEVMINOR);
   if (ret < 0)
     {
-      idbg("Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV);
+      ierr("Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV);
       return -ENODEV;
     }
 
diff --git a/configs/stm3210e-eval/src/stm32_adc.c b/configs/stm3210e-eval/src/stm32_adc.c
index a3beeab10f..38a55145cb 100644
--- a/configs/stm3210e-eval/src/stm32_adc.c
+++ b/configs/stm3210e-eval/src/stm32_adc.c
@@ -136,7 +136,7 @@ int board_adc_setup(void)
       adc = stm32_adcinitialize(1, g_chanlist, ADC1_NCHANNELS);
       if (adc == NULL)
         {
-          adbg("ERROR: Failed to get ADC interface\n");
+          aerr("ERROR: Failed to get ADC interface\n");
           return -ENODEV;
         }
 
@@ -145,7 +145,7 @@ int board_adc_setup(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          adbg("adc_register failed: %d\n", ret);
+          aerr("adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/stm3210e-eval/src/stm32_appinit.c b/configs/stm3210e-eval/src/stm32_appinit.c
index 4a5d55c9eb..831a4f341e 100644
--- a/configs/stm3210e-eval/src/stm32_appinit.c
+++ b/configs/stm3210e-eval/src/stm32_appinit.c
@@ -129,14 +129,14 @@ static void stm32_i2c_register(int bus)
   i2c = stm32_i2cbus_initialize(bus);
   if (i2c == NULL)
     {
-      dbg("ERROR: Failed to get I2C%d interface\n", bus);
+      err("ERROR: Failed to get I2C%d interface\n", bus);
     }
   else
     {
       ret = i2c_register(i2c, bus);
       if (ret < 0)
         {
-          dbg("ERROR: Failed to register I2C%d driver: %d\n", bus, ret);
+          err("ERROR: Failed to register I2C%d driver: %d\n", bus, ret);
           stm32_i2cbus_uninitialize(i2c);
         }
     }
diff --git a/configs/stm3210e-eval/src/stm32_can.c b/configs/stm3210e-eval/src/stm32_can.c
index 4b2f506538..9ff5ebec86 100644
--- a/configs/stm3210e-eval/src/stm32_can.c
+++ b/configs/stm3210e-eval/src/stm32_can.c
@@ -66,12 +66,12 @@
 /* Non-standard debug that may be enabled just for testing CAN */
 
 #ifdef CONFIG_DEBUG_CAN
-#  define candbg    dbg
+#  define canerr    err
 #  define caninfo   info
 #  define canllerr  llerr
 #  define canllinfo llinfo
 #else
-#  define candbg(x...)
+#  define canerr(x...)
 #  define caninfo(x...)
 #  define canllerr(x...)
 #  define canllinfo(x...)
@@ -109,7 +109,7 @@ int board_can_initialize(void)
       can = stm32_caninitialize(CAN_PORT);
       if (can == NULL)
         {
-          candbg("ERROR:  Failed to get CAN interface\n");
+          canerr("ERROR:  Failed to get CAN interface\n");
           return -ENODEV;
         }
 
@@ -118,7 +118,7 @@ int board_can_initialize(void)
       ret = can_register("/dev/can0", can);
       if (ret < 0)
         {
-          candbg("ERROR: can_register failed: %d\n", ret);
+          canerr("ERROR: can_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/stm3210e-eval/src/stm32_lcd.c b/configs/stm3210e-eval/src/stm32_lcd.c
index a0b4062d3b..302a8c25a4 100644
--- a/configs/stm3210e-eval/src/stm32_lcd.c
+++ b/configs/stm3210e-eval/src/stm32_lcd.c
@@ -312,9 +312,9 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-# define lcddbg(format, ...)  info(format, ##__VA_ARGS__)
+# define lcderr(format, ...)  info(format, ##__VA_ARGS__)
 #else
-# define lcddbg(x...)
+# define lcderr(x...)
 #endif
 
 /**************************************************************************************
@@ -742,7 +742,7 @@ static int stm3210e_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *bu
 
   /* Buffer must be provided and aligned to a 16-bit address boundary */
 
-  lcddbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  lcderr("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0);
 
   /* Write the run to GRAM. */
@@ -835,7 +835,7 @@ static int stm3210e_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
 
   /* Buffer must be provided and aligned to a 16-bit address boundary */
 
-  lcddbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  lcderr("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0);
 
   /* Configure according to the LCD type */
@@ -1321,7 +1321,7 @@ static inline void stm3210e_lcdinitialize(void)
    */
 
   id = stm3210e_readreg(LCD_REG_0);
-  lcddbg("LCD ID: %04x\n", id);
+  lcderr("LCD ID: %04x\n", id);
 
   /* Check if the ID is for the SPFD5408B */
 
@@ -1331,7 +1331,7 @@ static inline void stm3210e_lcdinitialize(void)
       /* Set the LCD type for the SPFD5408B */
 
       g_lcddev.type = LCD_TYPE_SPFD5408B;
-      lcddbg("LCD type: %d\n", g_lcddev.type);
+      lcderr("LCD type: %d\n", g_lcddev.type);
 
       /* Start Initial Sequence */
 
@@ -1436,7 +1436,7 @@ static inline void stm3210e_lcdinitialize(void)
       /* Set the LCD type for the R61580 */
 
       g_lcddev.type = LCD_TYPE_R61580;
-      lcddbg("LCD type: %d\n", g_lcddev.type);
+      lcderr("LCD type: %d\n", g_lcddev.type);
 
       /* Start Initial Sequence */
 
@@ -1506,7 +1506,7 @@ static inline void stm3210e_lcdinitialize(void)
       /* Set the LCD type for the AM240320 */
 
       g_lcddev.type = LCD_TYPE_AM240320;
-      lcddbg("LCD type: %d\n", g_lcddev.type);
+      lcderr("LCD type: %d\n", g_lcddev.type);
 
       /* Start Initial Sequence */
 
@@ -1595,7 +1595,7 @@ static inline void stm3210e_lcdinitialize(void)
       stm3210e_writereg(LCD_REG_3, 0x1018);
       stm3210e_writereg(LCD_REG_7, 0);       /* Display off */
 #else
-      lcddbg("Unsupported LCD type\n");
+      lcderr("Unsupported LCD type\n");
 #endif
   }
 }
@@ -1743,25 +1743,25 @@ static void stm3210e_backlight(void)
 
   /* Dump timer1 registers */
 
-  lcddbg("APB2ENR: %08x\n", getreg32(STM32_RCC_APB2ENR));
-  lcddbg("CR1:     %04x\n", getreg32(STM32_TIM1_CR1));
-  lcddbg("CR2:     %04x\n", getreg32(STM32_TIM1_CR2));
-  lcddbg("SMCR:    %04x\n", getreg32(STM32_TIM1_SMCR));
-  lcddbg("DIER:    %04x\n", getreg32(STM32_TIM1_DIER));
-  lcddbg("SR:      %04x\n", getreg32(STM32_TIM1_SR));
-  lcddbg("BDTR:    %04x\n", getreg32(STM32_TIM1_BDTR));
-  lcddbg("CCMR1:   %04x\n", getreg32(STM32_TIM1_CCMR1));
-  lcddbg("CCMR2:   %04x\n", getreg32(STM32_TIM1_CCMR2));
-  lcddbg("CCER:    %04x\n", getreg32(STM32_TIM1_CCER));
-  lcddbg("CNT:     %04x\n", getreg32(STM32_TIM1_CNT));
-  lcddbg("PSC:     %04x\n", getreg32(STM32_TIM1_PSC));
-  lcddbg("ARR:     %04x\n", getreg32(STM32_TIM1_ARR));
-  lcddbg("RCR:     %04x\n", getreg32(STM32_TIM1_RCR));
-  lcddbg("CCR1:    %04x\n", getreg32(STM32_TIM1_CCR1));
-  lcddbg("CCR2:    %04x\n", getreg32(STM32_TIM1_CCR2));
-  lcddbg("CCR3:    %04x\n", getreg32(STM32_TIM1_CCR3));
-  lcddbg("CCR4:    %04x\n", getreg32(STM32_TIM1_CCR4));
-  lcddbg("DMAR:    %04x\n", getreg32(STM32_TIM1_DMAR));
+  lcderr("APB2ENR: %08x\n", getreg32(STM32_RCC_APB2ENR));
+  lcderr("CR1:     %04x\n", getreg32(STM32_TIM1_CR1));
+  lcderr("CR2:     %04x\n", getreg32(STM32_TIM1_CR2));
+  lcderr("SMCR:    %04x\n", getreg32(STM32_TIM1_SMCR));
+  lcderr("DIER:    %04x\n", getreg32(STM32_TIM1_DIER));
+  lcderr("SR:      %04x\n", getreg32(STM32_TIM1_SR));
+  lcderr("BDTR:    %04x\n", getreg32(STM32_TIM1_BDTR));
+  lcderr("CCMR1:   %04x\n", getreg32(STM32_TIM1_CCMR1));
+  lcderr("CCMR2:   %04x\n", getreg32(STM32_TIM1_CCMR2));
+  lcderr("CCER:    %04x\n", getreg32(STM32_TIM1_CCER));
+  lcderr("CNT:     %04x\n", getreg32(STM32_TIM1_CNT));
+  lcderr("PSC:     %04x\n", getreg32(STM32_TIM1_PSC));
+  lcderr("ARR:     %04x\n", getreg32(STM32_TIM1_ARR));
+  lcderr("RCR:     %04x\n", getreg32(STM32_TIM1_RCR));
+  lcderr("CCR1:    %04x\n", getreg32(STM32_TIM1_CCR1));
+  lcderr("CCR2:    %04x\n", getreg32(STM32_TIM1_CCR2));
+  lcderr("CCR3:    %04x\n", getreg32(STM32_TIM1_CCR3));
+  lcderr("CCR4:    %04x\n", getreg32(STM32_TIM1_CCR4));
+  lcderr("DMAR:    %04x\n", getreg32(STM32_TIM1_DMAR));
 #endif
 }
 #endif
@@ -1794,7 +1794,7 @@ int board_lcd_initialize(void)
   ret = pm_register(&g_lcdcb);
   if (ret != OK)
   {
-    lcddbg("ERROR: pm_register failed: %d\n", ret);
+    lcderr("ERROR: pm_register failed: %d\n", ret);
   }
 #endif
 
diff --git a/configs/stm3210e-eval/src/stm32_leds.c b/configs/stm3210e-eval/src/stm32_leds.c
index ba5876f4ff..b54282ab3c 100644
--- a/configs/stm3210e-eval/src/stm32_leds.c
+++ b/configs/stm3210e-eval/src/stm32_leds.c
@@ -62,10 +62,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/stm3210e-eval/src/stm32_spi.c b/configs/stm3210e-eval/src/stm32_spi.c
index 833bce97fe..623363ca7c 100644
--- a/configs/stm3210e-eval/src/stm32_spi.c
+++ b/configs/stm3210e-eval/src/stm32_spi.c
@@ -63,7 +63,7 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -71,7 +71,7 @@
 #  endif
 #else
 #  undef SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -134,7 +134,7 @@ void weak_function stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
   if (devid == SPIDEV_FLASH)
     {
@@ -153,7 +153,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -165,7 +165,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
diff --git a/configs/stm3220g-eval/src/stm32_adc.c b/configs/stm3220g-eval/src/stm32_adc.c
index f79ca23c53..2d9041c6ec 100644
--- a/configs/stm3220g-eval/src/stm32_adc.c
+++ b/configs/stm3220g-eval/src/stm32_adc.c
@@ -140,7 +140,7 @@ int board_adc_setup(void)
       adc = stm32_adcinitialize(3, g_chanlist, ADC3_NCHANNELS);
       if (adc == NULL)
         {
-          adbg("ERROR: Failed to get ADC interface\n");
+          aerr("ERROR: Failed to get ADC interface\n");
           return -ENODEV;
         }
 
@@ -149,7 +149,7 @@ int board_adc_setup(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          adbg("adc_register failed: %d\n", ret);
+          aerr("adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/stm3220g-eval/src/stm32_appinit.c b/configs/stm3220g-eval/src/stm32_appinit.c
index 89795b54d5..e763f2fbe4 100644
--- a/configs/stm3220g-eval/src/stm32_appinit.c
+++ b/configs/stm3220g-eval/src/stm32_appinit.c
@@ -142,14 +142,14 @@ static void stm32_i2c_register(int bus)
   i2c = stm32_i2cbus_initialize(bus);
   if (i2c == NULL)
     {
-      dbg("ERROR: Failed to get I2C%d interface\n", bus);
+      err("ERROR: Failed to get I2C%d interface\n", bus);
     }
   else
     {
       ret = i2c_register(i2c, bus);
       if (ret < 0)
         {
-          dbg("ERROR: Failed to register I2C%d driver: %d\n", bus, ret);
+          err("ERROR: Failed to register I2C%d driver: %d\n", bus, ret);
           stm32_i2cbus_uninitialize(i2c);
         }
     }
diff --git a/configs/stm3220g-eval/src/stm32_autoleds.c b/configs/stm3220g-eval/src/stm32_autoleds.c
index 688e1aa1ee..ee9e22af14 100644
--- a/configs/stm3220g-eval/src/stm32_autoleds.c
+++ b/configs/stm3220g-eval/src/stm32_autoleds.c
@@ -63,10 +63,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/stm3220g-eval/src/stm32_can.c b/configs/stm3220g-eval/src/stm32_can.c
index 9e32e3c27b..c01a0d6df9 100644
--- a/configs/stm3220g-eval/src/stm32_can.c
+++ b/configs/stm3220g-eval/src/stm32_can.c
@@ -74,12 +74,12 @@
 /* Non-standard debug that may be enabled just for testing CAN */
 
 #ifdef CONFIG_DEBUG_CAN
-#  define candbg    dbg
+#  define canerr    err
 #  define caninfo   info
 #  define canllerr  llerr
 #  define canllinfo llinfo
 #else
-#  define candbg(x...)
+#  define canerr(x...)
 #  define caninfo(x...)
 #  define canllerr(x...)
 #  define canllinfo(x...)
@@ -117,7 +117,7 @@ int board_can_initialize(void)
       can = stm32_caninitialize(CAN_PORT);
       if (can == NULL)
         {
-          candbg("ERROR:  Failed to get CAN interface\n");
+          canerr("ERROR:  Failed to get CAN interface\n");
           return -ENODEV;
         }
 
@@ -126,7 +126,7 @@ int board_can_initialize(void)
       ret = can_register("/dev/can0", can);
       if (ret < 0)
         {
-          candbg("ERROR: can_register failed: %d\n", ret);
+          canerr("ERROR: can_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/stm3220g-eval/src/stm32_lcd.c b/configs/stm3220g-eval/src/stm32_lcd.c
index 392c4f3990..b7f4b1ec4d 100644
--- a/configs/stm3220g-eval/src/stm32_lcd.c
+++ b/configs/stm3220g-eval/src/stm32_lcd.c
@@ -265,10 +265,10 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg              dbg
+#  define lcderr              err
 #  define lcdinfo             info
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -967,7 +967,7 @@ static inline void stm3220g_lcdinitialize(void)
   /* Check LCD ID */
 
   id = stm3220g_readreg(LCD_REG_0);
-  lcddbg("LCD ID: %04x\n", id);
+  lcderr("LCD ID: %04x\n", id);
 
   /* Check if the ID is for the STM32_ILI9320 (or ILI9321) or STM32_ILI9325 */
 
@@ -996,7 +996,7 @@ static inline void stm3220g_lcdinitialize(void)
 #else /* if !defined(CONFIG_STM32_ILI9325_DISABLE) */
       g_lcddev.type = LCD_TYPE_ILI9325;
 #endif
-      lcddbg("LCD type: %d\n", g_lcddev.type);
+      lcderr("LCD type: %d\n", g_lcddev.type);
 
       /* Start Initial Sequence */
 
@@ -1114,7 +1114,7 @@ static inline void stm3220g_lcdinitialize(void)
     }
   else
     {
-      lcddbg("Unsupported LCD type\n");
+      lcderr("Unsupported LCD type\n");
     }
 }
 
diff --git a/configs/stm3220g-eval/src/stm32_pwm.c b/configs/stm3220g-eval/src/stm32_pwm.c
index 9c0467138a..c5c26352e0 100644
--- a/configs/stm3220g-eval/src/stm32_pwm.c
+++ b/configs/stm3220g-eval/src/stm32_pwm.c
@@ -97,7 +97,7 @@ int board_pwm_setup(void)
       pwm = stm32_pwminitialize(STM3220G_EVAL_PWMTIMER);
       if (!pwm)
         {
-          dbg("Failed to get the STM32 PWM lower half\n");
+          err("Failed to get the STM32 PWM lower half\n");
           return -ENODEV;
         }
 
@@ -106,7 +106,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          adbg("pwm_register failed: %d\n", ret);
+          aerr("pwm_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/stm3220g-eval/src/stm32_spi.c b/configs/stm3220g-eval/src/stm32_spi.c
index 3980b6e7d5..8cb939c519 100644
--- a/configs/stm3220g-eval/src/stm32_spi.c
+++ b/configs/stm3220g-eval/src/stm32_spi.c
@@ -63,7 +63,7 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -71,7 +71,7 @@
 #  endif
 #else
 #  undef SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -124,7 +124,7 @@ void weak_function stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -136,7 +136,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -148,7 +148,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
diff --git a/configs/stm3220g-eval/src/stm32_stmpe811.c b/configs/stm3220g-eval/src/stm32_stmpe811.c
index b8832734c8..03d5cff876 100644
--- a/configs/stm3220g-eval/src/stm32_stmpe811.c
+++ b/configs/stm3220g-eval/src/stm32_stmpe811.c
@@ -279,7 +279,7 @@ int board_tsc_setup(int minor)
   FAR struct i2c_master_s *dev;
   int ret;
 
-  idbg("minor %d\n", minor);
+  ierr("minor %d\n", minor);
   DEBUGASSERT(minor == 0);
 
   /* Check if we are already initialized */
@@ -297,7 +297,7 @@ int board_tsc_setup(int minor)
       dev = stm32_i2cbus_initialize(CONFIG_STMPE811_I2CDEV);
       if (!dev)
         {
-          idbg("Failed to initialize I2C bus %d\n", CONFIG_STMPE811_I2CDEV);
+          ierr("Failed to initialize I2C bus %d\n", CONFIG_STMPE811_I2CDEV);
           return -ENODEV;
         }
 
@@ -307,7 +307,7 @@ int board_tsc_setup(int minor)
         stmpe811_instantiate(dev, (FAR struct stmpe811_config_s *)&g_stmpe811config);
       if (!g_stmpe811config.handle)
         {
-          idbg("Failed to instantiate the STMPE811 driver\n");
+          ierr("Failed to instantiate the STMPE811 driver\n");
           return -ENODEV;
         }
 
@@ -316,7 +316,7 @@ int board_tsc_setup(int minor)
       ret = stmpe811_register(g_stmpe811config.handle, CONFIG_STMPE811_DEVMINOR);
       if (ret < 0)
         {
-          idbg("Failed to register STMPE driver: %d\n", ret);
+          ierr("Failed to register STMPE driver: %d\n", ret);
           /* stm32_i2cbus_uninitialize(dev); */
           return -ENODEV;
         }
diff --git a/configs/stm3220g-eval/src/stm32_usb.c b/configs/stm3220g-eval/src/stm32_usb.c
index db13541bb6..1fc1fdf74a 100644
--- a/configs/stm3220g-eval/src/stm32_usb.c
+++ b/configs/stm3220g-eval/src/stm32_usb.c
@@ -184,7 +184,7 @@ int stm32_usbhost_initialize(void)
   ret = usbhost_msc_initialize();
   if (ret != OK)
     {
-      udbg("ERROR: Failed to register the mass storage class: %d\n", ret);
+      uerr("ERROR: Failed to register the mass storage class: %d\n", ret);
     }
 #endif
 
@@ -194,7 +194,7 @@ int stm32_usbhost_initialize(void)
   ret = usbhost_cdcacm_initialize();
   if (ret != OK)
     {
-      udbg("ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
+      uerr("ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
     }
 #endif
 
diff --git a/configs/stm3220g-eval/src/stm32_userleds.c b/configs/stm3220g-eval/src/stm32_userleds.c
index 0fc42a3da1..09299ae8ca 100644
--- a/configs/stm3220g-eval/src/stm32_userleds.c
+++ b/configs/stm3220g-eval/src/stm32_userleds.c
@@ -62,10 +62,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/stm3240g-eval/src/stm32_adc.c b/configs/stm3240g-eval/src/stm32_adc.c
index da37355e50..8ca5ae99b0 100644
--- a/configs/stm3240g-eval/src/stm32_adc.c
+++ b/configs/stm3240g-eval/src/stm32_adc.c
@@ -140,7 +140,7 @@ int board_adc_setup(void)
       adc = stm32_adcinitialize(3, g_chanlist, ADC3_NCHANNELS);
       if (adc == NULL)
         {
-          adbg("ERROR: Failed to get ADC interface\n");
+          aerr("ERROR: Failed to get ADC interface\n");
           return -ENODEV;
         }
 
@@ -149,7 +149,7 @@ int board_adc_setup(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          adbg("adc_register failed: %d\n", ret);
+          aerr("adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/stm3240g-eval/src/stm32_appinit.c b/configs/stm3240g-eval/src/stm32_appinit.c
index 469180c390..144f237c1a 100644
--- a/configs/stm3240g-eval/src/stm32_appinit.c
+++ b/configs/stm3240g-eval/src/stm32_appinit.c
@@ -160,14 +160,14 @@ static void stm32_i2c_register(int bus)
   i2c = stm32_i2cbus_initialize(bus);
   if (i2c == NULL)
     {
-      dbg("ERROR: Failed to get I2C%d interface\n", bus);
+      err("ERROR: Failed to get I2C%d interface\n", bus);
     }
   else
     {
       ret = i2c_register(i2c, bus);
       if (ret < 0)
         {
-          dbg("ERROR: Failed to register I2C%d driver: %d\n", bus, ret);
+          err("ERROR: Failed to register I2C%d driver: %d\n", bus, ret);
           stm32_i2cbus_uninitialize(i2c);
         }
     }
@@ -254,7 +254,7 @@ int board_app_initialize(uintptr_t arg)
   lower = stm32_rtc_lowerhalf();
   if (!lower)
     {
-      sdbg("ERROR: Failed to instantiate the RTC lower-half driver\n");
+      serr("ERROR: Failed to instantiate the RTC lower-half driver\n");
       return -ENOMEM;
     }
   else
@@ -266,7 +266,7 @@ int board_app_initialize(uintptr_t arg)
       ret = rtc_initialize(0, lower);
       if (ret < 0)
         {
-          sdbg("ERROR: Failed to bind/register the RTC driver: %d\n", ret);
+          serr("ERROR: Failed to bind/register the RTC driver: %d\n", ret);
           return ret;
         }
     }
diff --git a/configs/stm3240g-eval/src/stm32_autoleds.c b/configs/stm3240g-eval/src/stm32_autoleds.c
index 500b834af8..d2c68f0280 100644
--- a/configs/stm3240g-eval/src/stm32_autoleds.c
+++ b/configs/stm3240g-eval/src/stm32_autoleds.c
@@ -63,10 +63,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/stm3240g-eval/src/stm32_boot.c b/configs/stm3240g-eval/src/stm32_boot.c
index 09b3b82eed..bfab437e4a 100644
--- a/configs/stm3240g-eval/src/stm32_boot.c
+++ b/configs/stm3240g-eval/src/stm32_boot.c
@@ -164,7 +164,7 @@ static int board_initthread(int argc, char *argv[])
   ret = board_app_initialize(0);
   if (ret < 0)
     {
-      gdbg("ERROR: board_app_initialize failed: %d\n", ret);
+      gerr("ERROR: board_app_initialize failed: %d\n", ret);
     }
 #endif
 
@@ -174,7 +174,7 @@ static int board_initthread(int argc, char *argv[])
   ret = nx_start();
   if (ret < 0)
     {
-      gdbg("ERROR: nx_start failed: %d\n", ret);
+      gerr("ERROR: nx_start failed: %d\n", ret);
     }
 #endif
 
@@ -184,7 +184,7 @@ static int board_initthread(int argc, char *argv[])
   ret = board_tsc_setup(CONFIG_NXWM_TOUCHSCREEN_DEVNO);
   if (ret < 0)
     {
-      gdbg("ERROR: board_tsc_setup failed: %d\n", ret);
+      gerr("ERROR: board_tsc_setup failed: %d\n", ret);
     }
 #endif
 
diff --git a/configs/stm3240g-eval/src/stm32_can.c b/configs/stm3240g-eval/src/stm32_can.c
index 2af6a8add7..265ee1b9ec 100644
--- a/configs/stm3240g-eval/src/stm32_can.c
+++ b/configs/stm3240g-eval/src/stm32_can.c
@@ -74,12 +74,12 @@
 /* Non-standard debug that may be enabled just for testing CAN */
 
 #ifdef CONFIG_DEBUG_CAN
-#  define candbg    dbg
+#  define canerr    err
 #  define caninfo   info
 #  define canllerr  llerr
 #  define canllinfo llinfo
 #else
-#  define candbg(x...)
+#  define canerr(x...)
 #  define caninfo(x...)
 #  define canllerr(x...)
 #  define canllinfo(x...)
@@ -117,7 +117,7 @@ int board_can_initialize(void)
       can = stm32_caninitialize(CAN_PORT);
       if (can == NULL)
         {
-          candbg("ERROR:  Failed to get CAN interface\n");
+          canerr("ERROR:  Failed to get CAN interface\n");
           return -ENODEV;
         }
 
@@ -126,7 +126,7 @@ int board_can_initialize(void)
       ret = can_register("/dev/can0", can);
       if (ret < 0)
         {
-          candbg("ERROR: can_register failed: %d\n", ret);
+          canerr("ERROR: can_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/stm3240g-eval/src/stm32_lcd.c b/configs/stm3240g-eval/src/stm32_lcd.c
index 9ac96ce3b5..676bb777e8 100644
--- a/configs/stm3240g-eval/src/stm32_lcd.c
+++ b/configs/stm3240g-eval/src/stm32_lcd.c
@@ -265,10 +265,10 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg              dbg
+#  define lcderr              err
 #  define lcdinfo             info
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -966,7 +966,7 @@ static inline void stm3240g_lcdinitialize(void)
   /* Check LCD ID */
 
   id = stm3240g_readreg(LCD_REG_0);
-  lcddbg("LCD ID: %04x\n", id);
+  lcderr("LCD ID: %04x\n", id);
 
   /* Check if the ID is for the STM32_ILI9320 (or ILI9321) or STM32_ILI9325 */
 
@@ -995,7 +995,7 @@ static inline void stm3240g_lcdinitialize(void)
 #else /* if !defined(CONFIG_STM3240G_ILI9325_DISABLE) */
       g_lcddev.type = LCD_TYPE_ILI9325;
 #endif
-      lcddbg("LCD type: %d\n", g_lcddev.type);
+      lcderr("LCD type: %d\n", g_lcddev.type);
 
       /* Start Initial Sequence */
 
@@ -1113,7 +1113,7 @@ static inline void stm3240g_lcdinitialize(void)
     }
   else
     {
-      lcddbg("Unsupported LCD type\n");
+      lcderr("Unsupported LCD type\n");
     }
 }
 
diff --git a/configs/stm3240g-eval/src/stm32_pwm.c b/configs/stm3240g-eval/src/stm32_pwm.c
index c10853a1b9..bc3054e477 100644
--- a/configs/stm3240g-eval/src/stm32_pwm.c
+++ b/configs/stm3240g-eval/src/stm32_pwm.c
@@ -97,7 +97,7 @@ int board_pwm_setup(void)
       pwm = stm32_pwminitialize(STM3240G_EVAL_PWMTIMER);
       if (!pwm)
         {
-          dbg("Failed to get the STM32 PWM lower half\n");
+          err("Failed to get the STM32 PWM lower half\n");
           return -ENODEV;
         }
 
@@ -106,7 +106,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          adbg("pwm_register failed: %d\n", ret);
+          aerr("pwm_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/stm3240g-eval/src/stm32_spi.c b/configs/stm3240g-eval/src/stm32_spi.c
index 6a88d07937..a89daa6521 100644
--- a/configs/stm3240g-eval/src/stm32_spi.c
+++ b/configs/stm3240g-eval/src/stm32_spi.c
@@ -63,7 +63,7 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -71,7 +71,7 @@
 #  endif
 #else
 #  undef SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -124,7 +124,7 @@ void weak_function stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -136,7 +136,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -148,7 +148,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
diff --git a/configs/stm3240g-eval/src/stm32_stmpe811.c b/configs/stm3240g-eval/src/stm32_stmpe811.c
index 87a4a3e4b9..77b9ffadf3 100644
--- a/configs/stm3240g-eval/src/stm32_stmpe811.c
+++ b/configs/stm3240g-eval/src/stm32_stmpe811.c
@@ -279,7 +279,7 @@ int board_tsc_setup(int minor)
   FAR struct i2c_master_s *dev;
   int ret;
 
-  idbg("minor %d\n", minor);
+  ierr("minor %d\n", minor);
   DEBUGASSERT(minor == 0);
 
   /* Check if we are already initialized */
@@ -297,7 +297,7 @@ int board_tsc_setup(int minor)
       dev = stm32_i2cbus_initialize(CONFIG_STMPE811_I2CDEV);
       if (!dev)
         {
-          idbg("Failed to initialize I2C bus %d\n", CONFIG_STMPE811_I2CDEV);
+          ierr("Failed to initialize I2C bus %d\n", CONFIG_STMPE811_I2CDEV);
           return -ENODEV;
         }
 
@@ -307,7 +307,7 @@ int board_tsc_setup(int minor)
         stmpe811_instantiate(dev, (FAR struct stmpe811_config_s *)&g_stmpe811config);
       if (!g_stmpe811config.handle)
         {
-          idbg("Failed to instantiate the STMPE811 driver\n");
+          ierr("Failed to instantiate the STMPE811 driver\n");
           return -ENODEV;
         }
 
@@ -316,7 +316,7 @@ int board_tsc_setup(int minor)
       ret = stmpe811_register(g_stmpe811config.handle, CONFIG_STMPE811_DEVMINOR);
       if (ret < 0)
         {
-          idbg("Failed to register STMPE driver: %d\n", ret);
+          ierr("Failed to register STMPE driver: %d\n", ret);
           /* stm32_i2cbus_uninitialize(dev); */
           return -ENODEV;
         }
diff --git a/configs/stm3240g-eval/src/stm32_usb.c b/configs/stm3240g-eval/src/stm32_usb.c
index 6d65e66750..48f2f392b9 100644
--- a/configs/stm3240g-eval/src/stm32_usb.c
+++ b/configs/stm3240g-eval/src/stm32_usb.c
@@ -184,7 +184,7 @@ int stm32_usbhost_initialize(void)
   ret = usbhost_msc_initialize();
   if (ret != OK)
     {
-      udbg("ERROR: Failed to register the mass storage class: %d\n", ret);
+      uerr("ERROR: Failed to register the mass storage class: %d\n", ret);
     }
 #endif
 
@@ -194,7 +194,7 @@ int stm32_usbhost_initialize(void)
   ret = usbhost_cdcacm_initialize();
   if (ret != OK)
     {
-      udbg("ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
+      uerr("ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
     }
 #endif
 
diff --git a/configs/stm3240g-eval/src/stm32_userleds.c b/configs/stm3240g-eval/src/stm32_userleds.c
index 781c36d6fc..14bed2ac69 100644
--- a/configs/stm3240g-eval/src/stm32_userleds.c
+++ b/configs/stm3240g-eval/src/stm32_userleds.c
@@ -62,10 +62,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/stm32_tiny/src/stm32_leds.c b/configs/stm32_tiny/src/stm32_leds.c
index a57f77513a..1c136fdc09 100644
--- a/configs/stm32_tiny/src/stm32_leds.c
+++ b/configs/stm32_tiny/src/stm32_leds.c
@@ -61,10 +61,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/stm32_tiny/src/stm32_pwm.c b/configs/stm32_tiny/src/stm32_pwm.c
index 715d8d3a70..46bddca185 100644
--- a/configs/stm32_tiny/src/stm32_pwm.c
+++ b/configs/stm32_tiny/src/stm32_pwm.c
@@ -95,7 +95,7 @@ int board_pwm_setup(void)
       pwm = stm32_pwminitialize(STM32TINY_PWMTIMER);
       if (!pwm)
         {
-          adbg("Failed to get the STM32 PWM lower half\n");
+          aerr("Failed to get the STM32 PWM lower half\n");
           return -ENODEV;
         }
 
@@ -104,7 +104,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          adbg("pwm_register failed: %d\n", ret);
+          aerr("pwm_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/stm32_tiny/src/stm32_spi.c b/configs/stm32_tiny/src/stm32_spi.c
index 41c30adfbe..a723fd689e 100644
--- a/configs/stm32_tiny/src/stm32_spi.c
+++ b/configs/stm32_tiny/src/stm32_spi.c
@@ -66,14 +66,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg llerr
+#  define spierr llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
diff --git a/configs/stm32_tiny/src/stm32_wireless.c b/configs/stm32_tiny/src/stm32_wireless.c
index 81e51afc85..842cb51c59 100644
--- a/configs/stm32_tiny/src/stm32_wireless.c
+++ b/configs/stm32_tiny/src/stm32_wireless.c
@@ -114,14 +114,14 @@ void stm32_wlinitialize(void)
   spidev = stm32_spibus_initialize(2);
   if (!spidev)
     {
-      dbg("Failed to initialize SPI bus\n");
+      err("Failed to initialize SPI bus\n");
       return;
     }
 
   result = nrf24l01_register(spidev, &nrf_cfg);
   if (result != OK)
     {
-      dbg("Failed to register initialize SPI bus\n");
+      err("Failed to register initialize SPI bus\n");
       return;
     }
 }
diff --git a/configs/stm32f103-minimum/src/stm32_autoleds.c b/configs/stm32f103-minimum/src/stm32_autoleds.c
index 4c4c6e9707..ca3215bba5 100644
--- a/configs/stm32f103-minimum/src/stm32_autoleds.c
+++ b/configs/stm32f103-minimum/src/stm32_autoleds.c
@@ -61,10 +61,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/stm32f103-minimum/src/stm32_spi.c b/configs/stm32f103-minimum/src/stm32_spi.c
index 0463578cc7..3d1577346c 100644
--- a/configs/stm32f103-minimum/src/stm32_spi.c
+++ b/configs/stm32f103-minimum/src/stm32_spi.c
@@ -66,14 +66,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg llerr
+#  define spierr llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
diff --git a/configs/stm32f3discovery/src/stm32_autoleds.c b/configs/stm32f3discovery/src/stm32_autoleds.c
index de7c528095..f6046e4b21 100644
--- a/configs/stm32f3discovery/src/stm32_autoleds.c
+++ b/configs/stm32f3discovery/src/stm32_autoleds.c
@@ -61,10 +61,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/stm32f3discovery/src/stm32_pwm.c b/configs/stm32f3discovery/src/stm32_pwm.c
index 7b1dd6830a..bb419cb6b8 100644
--- a/configs/stm32f3discovery/src/stm32_pwm.c
+++ b/configs/stm32f3discovery/src/stm32_pwm.c
@@ -119,7 +119,7 @@ int board_pwm_setup(void)
       pwm = stm32_pwminitialize(STM32F3DISCOVERY_PWMTIMER);
       if (!pwm)
         {
-          dbg("Failed to get the STM32 PWM lower half\n");
+          err("Failed to get the STM32 PWM lower half\n");
           return -ENODEV;
         }
 
@@ -128,7 +128,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          adbg("pwm_register failed: %d\n", ret);
+          aerr("pwm_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/stm32f3discovery/src/stm32_qencoder.c b/configs/stm32f3discovery/src/stm32_qencoder.c
index c3773e552c..45d7f274c4 100644
--- a/configs/stm32f3discovery/src/stm32_qencoder.c
+++ b/configs/stm32f3discovery/src/stm32_qencoder.c
@@ -149,7 +149,7 @@ int qe_devinit(void)
       ret = stm32_qeinitialize("/dev/qe0", TIMID);
       if (ret < 0)
         {
-          sndbg("stm32_qeinitialize failed: %d\n", ret);
+          snerr("stm32_qeinitialize failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/stm32f3discovery/src/stm32_spi.c b/configs/stm32f3discovery/src/stm32_spi.c
index 29cdb076a4..cd082fc996 100644
--- a/configs/stm32f3discovery/src/stm32_spi.c
+++ b/configs/stm32f3discovery/src/stm32_spi.c
@@ -64,7 +64,7 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -72,7 +72,7 @@
 #  endif
 #else
 #  undef SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -129,7 +129,7 @@ void weak_function stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
   stm32_gpiowrite(GPIO_MEMS_CS, !selected);
 }
@@ -143,7 +143,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -155,7 +155,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
diff --git a/configs/stm32f3discovery/src/stm32_userleds.c b/configs/stm32f3discovery/src/stm32_userleds.c
index ed7e2dacdd..adacc7cdaf 100644
--- a/configs/stm32f3discovery/src/stm32_userleds.c
+++ b/configs/stm32f3discovery/src/stm32_userleds.c
@@ -60,10 +60,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/stm32f429i-disco/src/stm32_appinit.c b/configs/stm32f429i-disco/src/stm32_appinit.c
index 29bbb24320..4f2eca3b31 100644
--- a/configs/stm32f429i-disco/src/stm32_appinit.c
+++ b/configs/stm32f429i-disco/src/stm32_appinit.c
@@ -205,7 +205,7 @@ int board_app_initialize(uintptr_t arg)
       ret = mtd->ioctl(mtd, MTDIOC_GEOMETRY, (unsigned long)((uintptr_t)&geo));
       if (ret < 0)
         {
-          fdbg("ERROR: mtd->ioctl failed: %d\n", ret);
+          ferr("ERROR: mtd->ioctl failed: %d\n", ret);
           return ret;
         }
 
@@ -242,7 +242,7 @@ int board_app_initialize(uintptr_t arg)
 
             if (partszbytes < erasesize)
               {
-                fdbg("ERROR: Partition size is lesser than erasesize!\n");
+                ferr("ERROR: Partition size is lesser than erasesize!\n");
                 return -1;
               }
 
@@ -250,7 +250,7 @@ int board_app_initialize(uintptr_t arg)
 
             if ((partszbytes % erasesize) != 0)
               {
-                fdbg("ERROR: Partition size is not multiple of erasesize!\n");
+                ferr("ERROR: Partition size is not multiple of erasesize!\n");
                 return -1;
               }
 
@@ -284,7 +284,7 @@ int board_app_initialize(uintptr_t arg)
 
             if (mtd_part == NULL)
               {
-                dbg("Error: failed to create partition %s\n", partname);
+                err("Error: failed to create partition %s\n", partname);
                 return -1;
               }
 
diff --git a/configs/stm32f429i-disco/src/stm32_autoleds.c b/configs/stm32f429i-disco/src/stm32_autoleds.c
index 4bec7993f2..b362bbb4b2 100644
--- a/configs/stm32f429i-disco/src/stm32_autoleds.c
+++ b/configs/stm32f429i-disco/src/stm32_autoleds.c
@@ -63,10 +63,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/stm32f429i-disco/src/stm32_ili93414ws.c b/configs/stm32f429i-disco/src/stm32_ili93414ws.c
index b83d16b061..c2cfffd44a 100644
--- a/configs/stm32f429i-disco/src/stm32_ili93414ws.c
+++ b/configs/stm32f429i-disco/src/stm32_ili93414ws.c
@@ -135,10 +135,10 @@
 /* Debug option */
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg       dbg
+#  define lcderr       err
 #  define lcdinfo      info
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -587,7 +587,7 @@ static uint16_t stm32_ili93414ws_recvword(void)
         }
     }
 
-  dbg("Timeout during receiving pixel word\n");
+  err("Timeout during receiving pixel word\n");
 
   return 0;
 }
@@ -1174,7 +1174,7 @@ FAR struct ili9341_lcd_s *stm32_ili93414ws_initialize(void)
   FAR struct spi_dev_s *spi;
   FAR struct ili93414ws_lcd_s *priv = &g_lcddev;
 
-  lcddbg("initialize ili9341 4-wire serial subdriver\n");
+  lcderr("initialize ili9341 4-wire serial subdriver\n");
 
   lcdinfo("initialize spi device: %d\n", ILI93414WS_SPI_DEVICE);
   spi = stm32_spi5initialize();
@@ -1206,7 +1206,7 @@ FAR struct ili9341_lcd_s *stm32_ili93414ws_initialize(void)
   uint32_t    regval;
   FAR struct ili93414ws_lcd_s *priv = &g_lcddev;
 
-  lcddbg("initialize ili9341 4-wire serial subdriver\n");
+  lcderr("initialize ili9341 4-wire serial subdriver\n");
 
   /* Enable spi bus */
 
diff --git a/configs/stm32f429i-disco/src/stm32_lcd.c b/configs/stm32f429i-disco/src/stm32_lcd.c
index 40edd632c4..0624b68809 100644
--- a/configs/stm32f429i-disco/src/stm32_lcd.c
+++ b/configs/stm32f429i-disco/src/stm32_lcd.c
@@ -317,7 +317,7 @@ static int stm32_ili9341_initialize(void)
 
   /* Select spi device */
 
-  dbg("Initialize ili9341 lcd driver\n");
+  err("Initialize ili9341 lcd driver\n");
   lcd->select(lcd);
 
 #ifdef CONFIG_DEBUG_LCD
@@ -325,13 +325,13 @@ static int stm32_ili9341_initialize(void)
 
   lcd->sendcmd(lcd, ILI9341_READ_ID1);
   lcd->recvparam(lcd, ¶m);
-  dbg("ili9341 LCD driver: LCD modules manufacturer ID: %d\n", param);
+  err("ili9341 LCD driver: LCD modules manufacturer ID: %d\n", param);
   lcd->sendcmd(lcd, ILI9341_READ_ID2);
   lcd->recvparam(lcd, ¶m);
-  dbg("ili9341 LCD driver: LCD modules driver version ID: %d\n", param);
+  err("ili9341 LCD driver: LCD modules driver version ID: %d\n", param);
   lcd->sendcmd(lcd, ILI9341_READ_ID3);
   lcd->recvparam(lcd, ¶m);
-  dbg("ili9341 LCD driver: LCD modules driver ID: %d\n", param);
+  err("ili9341 LCD driver: LCD modules driver ID: %d\n", param);
 #endif
 
   /* Reset the lcd display to the default state */
diff --git a/configs/stm32f429i-disco/src/stm32_spi.c b/configs/stm32f429i-disco/src/stm32_spi.c
index 0b6fd21307..90cd6cab82 100644
--- a/configs/stm32f429i-disco/src/stm32_spi.c
+++ b/configs/stm32f429i-disco/src/stm32_spi.c
@@ -66,7 +66,7 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -74,7 +74,7 @@
 #  endif
 #else
 #  undef SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -143,7 +143,7 @@ void weak_function stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -155,7 +155,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -167,7 +167,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -196,7 +196,7 @@ uint8_t stm32_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI5
 void stm32_spi5select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
 #if defined(CONFIG_STM32F429I_DISCO_ILI9341)
   if (devid == SPIDEV_DISPLAY)
diff --git a/configs/stm32f429i-disco/src/stm32_usb.c b/configs/stm32f429i-disco/src/stm32_usb.c
index d9fb2412b6..428dffa81c 100644
--- a/configs/stm32f429i-disco/src/stm32_usb.c
+++ b/configs/stm32f429i-disco/src/stm32_usb.c
@@ -180,7 +180,7 @@ int stm32_usbhost_initialize(void)
   ret = usbhost_hub_initialize();
   if (ret < 0)
     {
-      udbg("ERROR: usbhost_hub_initialize failed: %d\n", ret);
+      uerr("ERROR: usbhost_hub_initialize failed: %d\n", ret);
     }
 #endif
 
@@ -190,7 +190,7 @@ int stm32_usbhost_initialize(void)
   ret = usbhost_msc_initialize();
   if (ret != OK)
     {
-      udbg("ERROR: Failed to register the mass storage class: %d\n", ret);
+      uerr("ERROR: Failed to register the mass storage class: %d\n", ret);
     }
 #endif
 
@@ -200,7 +200,7 @@ int stm32_usbhost_initialize(void)
   ret = usbhost_cdcacm_initialize();
   if (ret != OK)
     {
-      udbg("ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
+      uerr("ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
     }
 #endif
 
diff --git a/configs/stm32f429i-disco/src/stm32_userleds.c b/configs/stm32f429i-disco/src/stm32_userleds.c
index 25856d939f..4cae147baa 100644
--- a/configs/stm32f429i-disco/src/stm32_userleds.c
+++ b/configs/stm32f429i-disco/src/stm32_userleds.c
@@ -63,10 +63,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/stm32f4discovery/src/stm32_autoleds.c b/configs/stm32f4discovery/src/stm32_autoleds.c
index e500fd9a89..ca588bdf40 100644
--- a/configs/stm32f4discovery/src/stm32_autoleds.c
+++ b/configs/stm32f4discovery/src/stm32_autoleds.c
@@ -63,10 +63,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/stm32f4discovery/src/stm32_bh1750fvi.c b/configs/stm32f4discovery/src/stm32_bh1750fvi.c
index 5455c05ea3..a1ea035402 100644
--- a/configs/stm32f4discovery/src/stm32_bh1750fvi.c
+++ b/configs/stm32f4discovery/src/stm32_bh1750fvi.c
@@ -80,7 +80,7 @@ int stm32_bh1750initialize(FAR const char *devpath)
   FAR struct i2c_master_s *i2c;
   int ret;
 
-  sndbg("Initializing BH1750FVI!\n");
+  snerr("Initializing BH1750FVI!\n");
 
   /* Initialize I2C */
 
@@ -96,7 +96,7 @@ int stm32_bh1750initialize(FAR const char *devpath)
   ret = bh1750fvi_register(devpath, i2c, BH1750FVI_I2C_ADDR);
   if (ret < 0)
     {
-      sndbg("Error registering BM180\n");
+      snerr("Error registering BM180\n");
     }
 
   return ret;
diff --git a/configs/stm32f4discovery/src/stm32_bmp180.c b/configs/stm32f4discovery/src/stm32_bmp180.c
index 5f6aa85ac4..75f0a31275 100644
--- a/configs/stm32f4discovery/src/stm32_bmp180.c
+++ b/configs/stm32f4discovery/src/stm32_bmp180.c
@@ -80,7 +80,7 @@ int stm32_bmp180initialize(FAR const char *devpath)
   FAR struct i2c_master_s *i2c;
   int ret;
 
-  sndbg("Initializing BMP180!\n");
+  snerr("Initializing BMP180!\n");
 
   /* Initialize I2C */
 
@@ -96,7 +96,7 @@ int stm32_bmp180initialize(FAR const char *devpath)
   ret = bmp180_register(devpath, i2c);
   if (ret < 0)
     {
-      sndbg("Error registering BM180\n");
+      snerr("Error registering BM180\n");
     }
 
   return ret;
diff --git a/configs/stm32f4discovery/src/stm32_bringup.c b/configs/stm32f4discovery/src/stm32_bringup.c
index fd4e793751..d958042ebd 100644
--- a/configs/stm32f4discovery/src/stm32_bringup.c
+++ b/configs/stm32f4discovery/src/stm32_bringup.c
@@ -120,7 +120,7 @@ int stm32_bringup(void)
   ret = stm32_pca9635_initialize();
   if (ret < 0)
     {
-      sdbg("ERROR: stm32_pca9635_initialize failed: %d\n", ret);
+      serr("ERROR: stm32_pca9635_initialize failed: %d\n", ret);
     }
 #endif
 
@@ -130,7 +130,7 @@ int stm32_bringup(void)
   ret = stm32_sdio_initialize();
   if (ret != OK)
     {
-      fdbg("ERROR: Failed to initialize MMC/SD driver: %d\n", ret);
+      ferr("ERROR: Failed to initialize MMC/SD driver: %d\n", ret);
       return ret;
     }
 #endif
@@ -143,7 +143,7 @@ int stm32_bringup(void)
   ret = stm32_usbhost_initialize();
   if (ret != OK)
     {
-      udbg("ERROR: Failed to initialize USB host: %d\n", ret);
+      uerr("ERROR: Failed to initialize USB host: %d\n", ret);
       return ret;
     }
 #endif
@@ -154,7 +154,7 @@ int stm32_bringup(void)
   ret = usbmonitor_start(0, NULL);
   if (ret != OK)
     {
-      udbg("ERROR: Failed to start USB monitor: %d\n", ret);
+      uerr("ERROR: Failed to start USB monitor: %d\n", ret);
       return ret;
     }
 #endif
@@ -165,7 +165,7 @@ int stm32_bringup(void)
   lower = stm32_rtc_lowerhalf();
   if (!lower)
     {
-      sdbg("ERROR: Failed to instantiate the RTC lower-half driver\n");
+      serr("ERROR: Failed to instantiate the RTC lower-half driver\n");
       return -ENOMEM;
     }
   else
@@ -177,7 +177,7 @@ int stm32_bringup(void)
       ret = rtc_initialize(0, lower);
       if (ret < 0)
         {
-          sdbg("ERROR: Failed to bind/register the RTC driver: %d\n", ret);
+          serr("ERROR: Failed to bind/register the RTC driver: %d\n", ret);
           return ret;
         }
     }
@@ -189,7 +189,7 @@ int stm32_bringup(void)
   ret = elf_initialize();
   if (ret < 0)
     {
-      sdbg("ERROR: Initialization of the ELF loader failed: %d\n", ret);
+      serr("ERROR: Initialization of the ELF loader failed: %d\n", ret);
     }
 #endif
 
@@ -207,7 +207,7 @@ int stm32_bringup(void)
   ret = mount(NULL, STM32_PROCFS_MOUNTPOINT, "procfs", 0, NULL);
   if (ret < 0)
     {
-      sdbg("ERROR: Failed to mount procfs at %s: %d\n",
+      serr("ERROR: Failed to mount procfs at %s: %d\n",
            STM32_PROCFS_MOUNTPOINT, ret);
     }
 #endif
diff --git a/configs/stm32f4discovery/src/stm32_ethernet.c b/configs/stm32f4discovery/src/stm32_ethernet.c
index 9c3928e182..a29d538af2 100644
--- a/configs/stm32f4discovery/src/stm32_ethernet.c
+++ b/configs/stm32f4discovery/src/stm32_ethernet.c
@@ -79,10 +79,10 @@
  */
 
 #ifdef CONFIG_NETDEV_PHY_DEBUG
-#  define phydbg    dbg
+#  define phyerr    err
 #  define phyllerr  llerr
 #else
-#  define phydbg(x...)
+#  define phyerr(x...)
 #  define phyllerr(x...)
 #endif
 
@@ -105,7 +105,7 @@ static xcpt_t g_ethmac_handler;
 #ifdef HAVE_NETMONITOR
 static void stm32_emac0_phy_enable(bool enable)
 {
-  phydbg("enable=%d\n", enable);
+  phyerr("enable=%d\n", enable);
   if (enable && g_ethmac_handler != NULL)
     {
       /* Attach and enable GPIO interrupt (and event) on the falling edge */
@@ -138,7 +138,7 @@ void weak_function stm32_netinitialize(void)
 #ifdef HAVE_NETMONITOR
   /* Configure the PHY interrupt GPIO */
 
-  phydbg("Configuring %08x\n", GPIO_EMAC_NINT);
+  phyerr("Configuring %08x\n", GPIO_EMAC_NINT);
   stm32_configgpio(GPIO_EMAC_NINT);
 #endif
 
@@ -218,7 +218,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
   irqstate_t flags;
 
   ninfo("%s: handler=%p\n", intf, handler);
-  phydbg("ETHMAC: devname=%s\n", STM32_ETHMAC_DEVNAME);
+  phyerr("ETHMAC: devname=%s\n", STM32_ETHMAC_DEVNAME);
 
   DEBUGASSERT(intf);
 
@@ -227,13 +227,13 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
 
   if (strcmp(intf, STM32_ETHMAC_DEVNAME) == 0)
     {
-      phydbg("Select ETHMAC\n");
+      phyerr("Select ETHMAC\n");
       g_ethmac_handler = handler;
       enabler          = stm32_emac0_phy_enable;
     }
   else
     {
-      ndbg("Unsupported interface: %s\n", intf);
+      nerr("Unsupported interface: %s\n", intf);
       enabler          = NULL;
     }
 
diff --git a/configs/stm32f4discovery/src/stm32_max31855.c b/configs/stm32f4discovery/src/stm32_max31855.c
index 4422b5e7b3..378b91fe09 100644
--- a/configs/stm32f4discovery/src/stm32_max31855.c
+++ b/configs/stm32f4discovery/src/stm32_max31855.c
@@ -92,7 +92,7 @@ int stm32_max31855initialize(FAR const char *devpath)
   ret = max31855_register(devpath, spi);
   if (ret < 0)
     {
-      sndbg("Error registering MAX31855\n");
+      snerr("Error registering MAX31855\n");
     }
 
   return ret;
diff --git a/configs/stm32f4discovery/src/stm32_max6675.c b/configs/stm32f4discovery/src/stm32_max6675.c
index 6f356aaaf8..852abd5490 100644
--- a/configs/stm32f4discovery/src/stm32_max6675.c
+++ b/configs/stm32f4discovery/src/stm32_max6675.c
@@ -92,7 +92,7 @@ int stm32_max6675initialize(FAR const char *devpath)
   ret = max6675_register(devpath, spi);
   if (ret < 0)
     {
-      sndbg("Error registering MAX6675\n");
+      snerr("Error registering MAX6675\n");
     }
 
   return ret;
diff --git a/configs/stm32f4discovery/src/stm32_pca9635.c b/configs/stm32f4discovery/src/stm32_pca9635.c
index 7fcae301d1..71df097945 100644
--- a/configs/stm32f4discovery/src/stm32_pca9635.c
+++ b/configs/stm32f4discovery/src/stm32_pca9635.c
@@ -86,14 +86,14 @@ int stm32_pca9635_initialize(void)
   i2c = stm32_i2cbus_initialize(PCA9635_I2CBUS);
   if (!i2c)
     {
-      dbg("ERROR: Failed to initialize I2C%d\n", PCA9635_I2CBUS);
+      err("ERROR: Failed to initialize I2C%d\n", PCA9635_I2CBUS);
       return -1;
     }
 
   ret = pca9635pw_register("/dev/leddrv0", i2c, PCA9635_I2CADDR);
   if (ret < 0)
     {
-      sndbg("Failed to register PCA9635 driver: %d\n", ret);
+      snerr("Failed to register PCA9635 driver: %d\n", ret);
      return ret;
     }
 
diff --git a/configs/stm32f4discovery/src/stm32_pwm.c b/configs/stm32f4discovery/src/stm32_pwm.c
index b4a7eeba08..16f4bfdbba 100644
--- a/configs/stm32f4discovery/src/stm32_pwm.c
+++ b/configs/stm32f4discovery/src/stm32_pwm.c
@@ -117,7 +117,7 @@ int board_pwm_setup(void)
       pwm = stm32_pwminitialize(STM32F4DISCOVERY_PWMTIMER);
       if (!pwm)
         {
-          adbg("Failed to get the STM32 PWM lower half\n");
+          aerr("Failed to get the STM32 PWM lower half\n");
           return -ENODEV;
         }
 
@@ -126,7 +126,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          adbg("pwm_register failed: %d\n", ret);
+          aerr("pwm_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/stm32f4discovery/src/stm32_qencoder.c b/configs/stm32f4discovery/src/stm32_qencoder.c
index 3ff1a64656..a5b2b23c65 100644
--- a/configs/stm32f4discovery/src/stm32_qencoder.c
+++ b/configs/stm32f4discovery/src/stm32_qencoder.c
@@ -149,7 +149,7 @@ int qe_devinit(void)
       ret = stm32_qeinitialize("/dev/qe0", TIMID);
       if (ret < 0)
         {
-          sndbg("stm32_qeinitialize failed: %d\n", ret);
+          snerr("stm32_qeinitialize failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/stm32f4discovery/src/stm32_rgbled.c b/configs/stm32f4discovery/src/stm32_rgbled.c
index 8391f44558..714844e8f4 100644
--- a/configs/stm32f4discovery/src/stm32_rgbled.c
+++ b/configs/stm32f4discovery/src/stm32_rgbled.c
@@ -119,7 +119,7 @@ int stm32_rgbled_setup(void)
       ledr = stm32_pwminitialize(1);
       if (!ledr)
         {
-          dbg("Failed to get the STM32 PWM lower half to LEDR\n");
+          err("Failed to get the STM32 PWM lower half to LEDR\n");
           return -ENODEV;
         }
 
@@ -138,7 +138,7 @@ int stm32_rgbled_setup(void)
       ledg = stm32_pwminitialize(2);
       if (!ledg)
         {
-          dbg("Failed to get the STM32 PWM lower half to LEDG\n");
+          err("Failed to get the STM32 PWM lower half to LEDG\n");
           return -ENODEV;
         }
 
@@ -152,7 +152,7 @@ int stm32_rgbled_setup(void)
       ledb = stm32_pwminitialize(3);
       if (!ledb)
         {
-          dbg("Failed to get the STM32 PWM lower half to LEDB\n");
+          err("Failed to get the STM32 PWM lower half to LEDB\n");
           return -ENODEV;
         }
 
@@ -166,7 +166,7 @@ int stm32_rgbled_setup(void)
       ret = rgbled_register("/dev/rgbled0", ledr, ledg, ledb);
       if (ret < 0)
         {
-          dbg("rgbled_register failed: %d\n", ret);
+          err("rgbled_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/stm32f4discovery/src/stm32_sdio.c b/configs/stm32f4discovery/src/stm32_sdio.c
index 9ba6931767..79b7412c88 100644
--- a/configs/stm32f4discovery/src/stm32_sdio.c
+++ b/configs/stm32f4discovery/src/stm32_sdio.c
@@ -139,7 +139,7 @@ int stm32_sdio_initialize(void)
   g_sdio_dev = sdio_initialize(SDIO_SLOTNO);
   if (!g_sdio_dev)
     {
-      fdbg("Failed to initialize SDIO slot %d\n", SDIO_SLOTNO);
+      ferr("Failed to initialize SDIO slot %d\n", SDIO_SLOTNO);
       return -ENODEV;
     }
 
@@ -150,7 +150,7 @@ int stm32_sdio_initialize(void)
   ret = mmcsd_slotinitialize(SDIO_MINOR, g_sdio_dev);
   if (ret != OK)
     {
-      fdbg("Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
+      ferr("Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
       return ret;
     }
 
diff --git a/configs/stm32f4discovery/src/stm32_spi.c b/configs/stm32f4discovery/src/stm32_spi.c
index 809da6a947..45441059bd 100644
--- a/configs/stm32f4discovery/src/stm32_spi.c
+++ b/configs/stm32f4discovery/src/stm32_spi.c
@@ -65,7 +65,7 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -73,7 +73,7 @@
 #  endif
 #else
 #  undef SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -144,7 +144,7 @@ void weak_function stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
 #if defined(CONFIG_LCD_UG2864AMBAG01) || defined(CONFIG_LCD_UG2864HSWEG01) || \
     defined(CONFIG_LCD_SSD1351)
@@ -168,7 +168,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
 #if defined(CONFIG_MAX31855)
   if (devid == SPIDEV_TEMPERATURE)
@@ -193,7 +193,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
diff --git a/configs/stm32f4discovery/src/stm32_ssd1289.c b/configs/stm32f4discovery/src/stm32_ssd1289.c
index 90a27bd91e..7f0b1dd5ad 100644
--- a/configs/stm32f4discovery/src/stm32_ssd1289.c
+++ b/configs/stm32f4discovery/src/stm32_ssd1289.c
@@ -110,10 +110,10 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg         dbg
+#  define lcderr         err
 #  define lcdinfo        info
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -373,7 +373,7 @@ int board_lcd_initialize(void)
       g_ssd1289drvr = ssd1289_lcdinitialize(&g_ssd1289);
       if (!g_ssd1289drvr)
         {
-          lcddbg("ERROR: ssd1289_lcdinitialize failed\n");
+          lcderr("ERROR: ssd1289_lcdinitialize failed\n");
           return -ENODEV;
         }
     }
diff --git a/configs/stm32f4discovery/src/stm32_ssd1351.c b/configs/stm32f4discovery/src/stm32_ssd1351.c
index a40f72bebc..261ee51c73 100644
--- a/configs/stm32f4discovery/src/stm32_ssd1351.c
+++ b/configs/stm32f4discovery/src/stm32_ssd1351.c
@@ -74,10 +74,10 @@
 /* Debug ********************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg(format, ...)  dbg(format, ##__VA_ARGS__)
+#  define lcderr(format, ...)  err(format, ##__VA_ARGS__)
 #  define lcdinfo(format, ...) info(format, ##__VA_ARGS__)
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -114,7 +114,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
   spi = stm32_spibus_initialize(1);
   if (spi == NULL)
     {
-      lcddbg("Failed to initialize SPI port 1\n");
+      lcderr("Failed to initialize SPI port 1\n");
     }
   else
     {
@@ -123,7 +123,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
       dev = ssd1351_initialize(spi, devno);
       if (dev == NULL)
         {
-          lcddbg("Failed to bind SPI port 1 to OLED %d: %d\n", devno);
+          lcderr("Failed to bind SPI port 1 to OLED %d: %d\n", devno);
         }
      else
         {
diff --git a/configs/stm32f4discovery/src/stm32_ug2864ambag01.c b/configs/stm32f4discovery/src/stm32_ug2864ambag01.c
index b3a82051f4..73f8f9920d 100644
--- a/configs/stm32f4discovery/src/stm32_ug2864ambag01.c
+++ b/configs/stm32f4discovery/src/stm32_ug2864ambag01.c
@@ -96,10 +96,10 @@
 /* Debug ********************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg(format, ...)   dbg(format, ##__VA_ARGS__)
+#  define lcderr(format, ...)   err(format, ##__VA_ARGS__)
 #  define lcdinfo(format, ...)  info(format, ##__VA_ARGS__)
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -136,7 +136,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
   spi = stm32_spibus_initialize(1);
   if (!spi)
     {
-      lcddbg("Failed to initialize SPI port 1\n");
+      lcderr("Failed to initialize SPI port 1\n");
     }
   else
     {
@@ -145,7 +145,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
       dev = ug2864ambag01_initialize(spi, devno);
       if (!dev)
         {
-          lcddbg("Failed to bind SPI port 1 to OLED %d: %d\n", devno);
+          lcderr("Failed to bind SPI port 1 to OLED %d: %d\n", devno);
         }
      else
         {
diff --git a/configs/stm32f4discovery/src/stm32_ug2864hsweg01.c b/configs/stm32f4discovery/src/stm32_ug2864hsweg01.c
index 1366879530..42b04ce7e6 100644
--- a/configs/stm32f4discovery/src/stm32_ug2864hsweg01.c
+++ b/configs/stm32f4discovery/src/stm32_ug2864hsweg01.c
@@ -96,10 +96,10 @@
 /* Debug ********************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg(format, ...)   dbg(format, ##__VA_ARGS__)
+#  define lcderr(format, ...)   err(format, ##__VA_ARGS__)
 #  define lcdinfo(format, ...)  info(format, ##__VA_ARGS__)
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -136,7 +136,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
   spi = stm32_spibus_initialize(1);
   if (!spi)
     {
-      lcddbg("Failed to initialize SPI port 1\n");
+      lcderr("Failed to initialize SPI port 1\n");
     }
   else
     {
@@ -145,7 +145,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
       dev = ssd1306_initialize(spi, devno);
       if (!dev)
         {
-          lcddbg("Failed to bind SPI port 1 to OLED %d: %d\n", devno);
+          lcderr("Failed to bind SPI port 1 to OLED %d: %d\n", devno);
         }
      else
         {
diff --git a/configs/stm32f4discovery/src/stm32_usb.c b/configs/stm32f4discovery/src/stm32_usb.c
index 16028715b2..457f9d9bf1 100644
--- a/configs/stm32f4discovery/src/stm32_usb.c
+++ b/configs/stm32f4discovery/src/stm32_usb.c
@@ -183,7 +183,7 @@ int stm32_usbhost_initialize(void)
   ret = usbhost_hub_initialize();
   if (ret < 0)
     {
-      udbg("ERROR: usbhost_hub_initialize failed: %d\n", ret);
+      uerr("ERROR: usbhost_hub_initialize failed: %d\n", ret);
     }
 #endif
 
@@ -193,7 +193,7 @@ int stm32_usbhost_initialize(void)
   ret = usbhost_msc_initialize();
   if (ret != OK)
     {
-      udbg("ERROR: Failed to register the mass storage class: %d\n", ret);
+      uerr("ERROR: Failed to register the mass storage class: %d\n", ret);
     }
 #endif
 
@@ -203,7 +203,7 @@ int stm32_usbhost_initialize(void)
   ret = usbhost_cdcacm_initialize();
   if (ret != OK)
     {
-      udbg("ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
+      uerr("ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
     }
 #endif
 
@@ -213,7 +213,7 @@ int stm32_usbhost_initialize(void)
   ret = usbhost_kbdinit();
   if (ret != OK)
     {
-      udbg("Failed to register the HID keyboard class\n");
+      uerr("Failed to register the HID keyboard class\n");
     }
 #endif
 
@@ -223,7 +223,7 @@ int stm32_usbhost_initialize(void)
   ret = usbhost_mouse_init();
   if (ret != OK)
     {
-      udbg("Failed to register the HID mouse class\n");
+      uerr("Failed to register the HID mouse class\n");
     }
 #endif
 
diff --git a/configs/stm32f4discovery/src/stm32_userleds.c b/configs/stm32f4discovery/src/stm32_userleds.c
index 2b5007e2d5..7bc9d1d6b4 100644
--- a/configs/stm32f4discovery/src/stm32_userleds.c
+++ b/configs/stm32f4discovery/src/stm32_userleds.c
@@ -64,10 +64,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/stm32f746g-disco/src/stm32_autoleds.c b/configs/stm32f746g-disco/src/stm32_autoleds.c
index 6873f3ad42..8f9b4c956b 100644
--- a/configs/stm32f746g-disco/src/stm32_autoleds.c
+++ b/configs/stm32f746g-disco/src/stm32_autoleds.c
@@ -58,10 +58,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/stm32f746g-disco/src/stm32_spi.c b/configs/stm32f746g-disco/src/stm32_spi.c
index e7ba37dfcb..f52f454ae3 100644
--- a/configs/stm32f746g-disco/src/stm32_spi.c
+++ b/configs/stm32f746g-disco/src/stm32_spi.c
@@ -62,7 +62,7 @@
  ************************************************************************************/
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -70,7 +70,7 @@
 #  endif
 #else
 #  undef SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -126,7 +126,7 @@ void weak_function stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32F7_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -138,7 +138,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32F7_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -150,7 +150,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32F7_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -162,7 +162,7 @@ uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32F7_SPI4
 void stm32_spi4select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -174,7 +174,7 @@ uint8_t stm32_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32F7_SPI5
 void stm32_spi5select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi5status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
diff --git a/configs/stm32f746g-disco/src/stm32_userleds.c b/configs/stm32f746g-disco/src/stm32_userleds.c
index 90eae2c78a..3115c95d3a 100644
--- a/configs/stm32f746g-disco/src/stm32_userleds.c
+++ b/configs/stm32f746g-disco/src/stm32_userleds.c
@@ -56,10 +56,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/stm32l476vg-disco/src/stm32_appinit.c b/configs/stm32l476vg-disco/src/stm32_appinit.c
index f3ead2d0a9..fee33a2b3e 100644
--- a/configs/stm32l476vg-disco/src/stm32_appinit.c
+++ b/configs/stm32l476vg-disco/src/stm32_appinit.c
@@ -95,7 +95,7 @@
 #ifdef CONFIG_BOARD_INITIALIZE
 #  define SYSLOG llerr
 #else
-#  define SYSLOG dbg
+#  define SYSLOG err
 #endif
 
 /****************************************************************************
@@ -188,7 +188,7 @@ FAR struct mtd_dev_s *mtd_temp;
   rtclower = stm32l4_rtc_lowerhalf();
   if (!rtclower)
     {
-      sdbg("ERROR: Failed to instantiate the RTC lower-half driver\n");
+      serr("ERROR: Failed to instantiate the RTC lower-half driver\n");
       return -ENOMEM;
     }
   else
@@ -200,7 +200,7 @@ FAR struct mtd_dev_s *mtd_temp;
       ret = rtc_initialize(0, rtclower);
       if (ret < 0)
         {
-          sdbg("ERROR: Failed to bind/register the RTC driver: %d\n", ret);
+          serr("ERROR: Failed to bind/register the RTC driver: %d\n", ret);
           return ret;
         }
     }
diff --git a/configs/stm32l476vg-disco/src/stm32_autoleds.c b/configs/stm32l476vg-disco/src/stm32_autoleds.c
index 8e1c7fe79a..bb9201149b 100644
--- a/configs/stm32l476vg-disco/src/stm32_autoleds.c
+++ b/configs/stm32l476vg-disco/src/stm32_autoleds.c
@@ -63,10 +63,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/stm32l476vg-disco/src/stm32_spi.c b/configs/stm32l476vg-disco/src/stm32_spi.c
index b27086cac3..506bd9f1e4 100644
--- a/configs/stm32l476vg-disco/src/stm32_spi.c
+++ b/configs/stm32l476vg-disco/src/stm32_spi.c
@@ -67,14 +67,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -113,7 +113,7 @@ void weak_function stm32_spiinitialize(void)
   g_spi1 = up_spiinitialize(1);
   if (!g_spi1)
     {
-      spidbg("[boot] FAILED to initialize SPI port 1\n");
+      spierr("[boot] FAILED to initialize SPI port 1\n");
     }
 
 #ifdef CONFIG_WL_CC3000
@@ -168,7 +168,7 @@ void weak_function stm32_spiinitialize(void)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
 #ifdef CONFIG_WL_CC3000
   if (devid == SPIDEV_WIRELESS)
@@ -194,7 +194,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
 #ifdef CONFIG_WL_CC3000
   if (devid == SPIDEV_WIRELESS)
@@ -213,7 +213,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
diff --git a/configs/stm32l476vg-disco/src/stm32_userleds.c b/configs/stm32l476vg-disco/src/stm32_userleds.c
index 6bccba72e6..d284a836c8 100644
--- a/configs/stm32l476vg-disco/src/stm32_userleds.c
+++ b/configs/stm32l476vg-disco/src/stm32_userleds.c
@@ -63,10 +63,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/stm32ldiscovery/src/stm32_autoleds.c b/configs/stm32ldiscovery/src/stm32_autoleds.c
index 384bb91fef..59f6920c26 100644
--- a/configs/stm32ldiscovery/src/stm32_autoleds.c
+++ b/configs/stm32ldiscovery/src/stm32_autoleds.c
@@ -78,10 +78,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/stm32ldiscovery/src/stm32_lcd.c b/configs/stm32ldiscovery/src/stm32_lcd.c
index cdab603a5f..24cee12b23 100644
--- a/configs/stm32ldiscovery/src/stm32_lcd.c
+++ b/configs/stm32ldiscovery/src/stm32_lcd.c
@@ -262,10 +262,10 @@
 /* Debug ********************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg              dbg
+#  define lcderr              err
 #  define lcdinfo             info
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
diff --git a/configs/stm32ldiscovery/src/stm32_pwm.c b/configs/stm32ldiscovery/src/stm32_pwm.c
index 60eeb9bfcb..8bf395e297 100644
--- a/configs/stm32ldiscovery/src/stm32_pwm.c
+++ b/configs/stm32ldiscovery/src/stm32_pwm.c
@@ -120,7 +120,7 @@ int board_pwm_setup(void)
       pwm = stm32_pwminitialize(STM32F3DISCOVERY_PWMTIMER);
       if (!pwm)
         {
-          dbg("Failed to get the STM32 PWM lower half\n");
+          err("Failed to get the STM32 PWM lower half\n");
           return -ENODEV;
         }
 
@@ -129,7 +129,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          adbg("pwm_register failed: %d\n", ret);
+          aerr("pwm_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/stm32ldiscovery/src/stm32_qencoder.c b/configs/stm32ldiscovery/src/stm32_qencoder.c
index c1336ac6fc..ca38ecb56d 100644
--- a/configs/stm32ldiscovery/src/stm32_qencoder.c
+++ b/configs/stm32ldiscovery/src/stm32_qencoder.c
@@ -150,7 +150,7 @@ int qe_devinit(void)
       ret = stm32_qeinitialize("/dev/qe0", TIMID);
       if (ret < 0)
         {
-          sndbg("stm32_qeinitialize failed: %d\n", ret);
+          snerr("stm32_qeinitialize failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/stm32ldiscovery/src/stm32_spi.c b/configs/stm32ldiscovery/src/stm32_spi.c
index d07d769133..3d86fcea1f 100644
--- a/configs/stm32ldiscovery/src/stm32_spi.c
+++ b/configs/stm32ldiscovery/src/stm32_spi.c
@@ -65,7 +65,7 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -73,7 +73,7 @@
 #  endif
 #else
 #  undef SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -130,7 +130,7 @@ void weak_function stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
   stm32_gpiowrite(GPIO_MEMS_CS, !selected);
 }
@@ -144,7 +144,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -156,7 +156,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
diff --git a/configs/stm32ldiscovery/src/stm32_userleds.c b/configs/stm32ldiscovery/src/stm32_userleds.c
index 7cef39eba0..57cf3c0dd0 100644
--- a/configs/stm32ldiscovery/src/stm32_userleds.c
+++ b/configs/stm32ldiscovery/src/stm32_userleds.c
@@ -60,10 +60,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/stm32vldiscovery/src/stm32_leds.c b/configs/stm32vldiscovery/src/stm32_leds.c
index a8ce8ec1b3..17ff81449a 100644
--- a/configs/stm32vldiscovery/src/stm32_leds.c
+++ b/configs/stm32vldiscovery/src/stm32_leds.c
@@ -63,10 +63,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/sure-pic32mx/src/pic32mx_autoleds.c b/configs/sure-pic32mx/src/pic32mx_autoleds.c
index 0a8f1b940b..4f814b371a 100644
--- a/configs/sure-pic32mx/src/pic32mx_autoleds.c
+++ b/configs/sure-pic32mx/src/pic32mx_autoleds.c
@@ -89,7 +89,7 @@
 /* Debug ********************************************************************/
 
 #if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS)
-#  define leddbg  llerr
+#  define lederr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define ledinfo llerr
 #  else
@@ -98,7 +98,7 @@
 #else
 #  undef CONFIG_DEBUG_LEDS
 #  undef CONFIG_DEBUG_INFO
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/sure-pic32mx/src/pic32mx_lcd1602.c b/configs/sure-pic32mx/src/pic32mx_lcd1602.c
index ad6eefc52a..39488c66f7 100644
--- a/configs/sure-pic32mx/src/pic32mx_lcd1602.c
+++ b/configs/sure-pic32mx/src/pic32mx_lcd1602.c
@@ -144,10 +144,10 @@
 /* Debug ********************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg         dbg
+#  define lcderr         err
 #  define lcdinfo        info
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
diff --git a/configs/sure-pic32mx/src/pic32mx_spi.c b/configs/sure-pic32mx/src/pic32mx_spi.c
index 5104cbe4ec..367d46bd10 100644
--- a/configs/sure-pic32mx/src/pic32mx_spi.c
+++ b/configs/sure-pic32mx/src/pic32mx_spi.c
@@ -130,14 +130,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
diff --git a/configs/teensy-2.0/src/at90usb_leds.c b/configs/teensy-2.0/src/at90usb_leds.c
index d3e194c401..30c62d110b 100644
--- a/configs/teensy-2.0/src/at90usb_leds.c
+++ b/configs/teensy-2.0/src/at90usb_leds.c
@@ -62,14 +62,14 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/teensy-2.0/src/at90usb_spi.c b/configs/teensy-2.0/src/at90usb_spi.c
index 2d14517ab8..6a130d8bbb 100644
--- a/configs/teensy-2.0/src/at90usb_spi.c
+++ b/configs/teensy-2.0/src/at90usb_spi.c
@@ -87,7 +87,7 @@
  */
 
 #ifdef CONFIG_SPI_DEBUG
-#  define sspdbg  llerr
+#  define ssperr  llerr
 #  ifdef CONFIG_SPI_VERBOSE
 #    define sspinfo llerr
 #  else
@@ -95,7 +95,7 @@
 #  endif
 #else
 #  undef CONFIG_SPI_VERBOSE
-#  define sspdbg(x...)
+#  define ssperr(x...)
 #  define sspinfo(x...)
 #endif
 
@@ -161,7 +161,7 @@ void weak_function at90usb_spidev_initialize(void)
 
 void  avr_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  sspdbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
   /* Assert/de-assert the CS pin to the card */
 
@@ -194,7 +194,7 @@ uint8_t avr_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
       ret |= SPI_STATUS_WRPROTECTED;
     }
 
-  sspdbg("Returning %02x\n", ret);
+  ssperr("Returning %02x\n", ret);
   return ret;
 }
 
diff --git a/configs/teensy-3.x/src/k20_pwm.c b/configs/teensy-3.x/src/k20_pwm.c
index 73ec5c5414..281cea3af9 100644
--- a/configs/teensy-3.x/src/k20_pwm.c
+++ b/configs/teensy-3.x/src/k20_pwm.c
@@ -99,7 +99,7 @@ int board_pwm_setup(void)
       pwm = kinetis_pwminitialize(0);
       if (!pwm)
         {
-          adbg("Failed to get the KL20 PWM lower half\n");
+          aerr("Failed to get the KL20 PWM lower half\n");
           return -ENODEV;
         }
 
@@ -108,7 +108,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          adbg("pwm_register failed: %d\n", ret);
+          aerr("pwm_register failed: %d\n", ret);
           return ret;
         }
 
@@ -119,7 +119,7 @@ int board_pwm_setup(void)
       pwm = kinetis_pwminitialize(1);
       if (!pwm)
         {
-          adbg("Failed to get the KL20 PWM lower half\n");
+          aerr("Failed to get the KL20 PWM lower half\n");
           return -ENODEV;
         }
 
@@ -128,7 +128,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm1", pwm);
       if (ret < 0)
         {
-          adbg("pwm_register failed: %d\n", ret);
+          aerr("pwm_register failed: %d\n", ret);
           return ret;
         }
 
@@ -139,7 +139,7 @@ int board_pwm_setup(void)
       pwm = kinetis_pwminitialize(2);
       if (!pwm)
         {
-          adbg("Failed to get the KL20 PWM lower half\n");
+          aerr("Failed to get the KL20 PWM lower half\n");
           return -ENODEV;
         }
 
@@ -148,7 +148,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm2", pwm);
       if (ret < 0)
         {
-          adbg("pwm_register failed: %d\n", ret);
+          aerr("pwm_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/teensy-3.x/src/k20_spi.c b/configs/teensy-3.x/src/k20_spi.c
index 64e9072116..73cf617965 100644
--- a/configs/teensy-3.x/src/k20_spi.c
+++ b/configs/teensy-3.x/src/k20_spi.c
@@ -60,7 +60,7 @@
 /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef CONFIG_DEBUG_SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -68,7 +68,7 @@
 #  endif
 #else
 #  undef CONFIG_DEBUG_SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -121,7 +121,7 @@ void weak_function kinetis_spidev_initialize(void)
 #ifdef CONFIG_KINETIS_SPI1
 void kinetis_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 # warning "Missing logic"
 }
 
@@ -135,7 +135,7 @@ uint8_t kinetis_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_KINETIS_SPI2
 void kinetis_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 # warning "Missing logic"
 }
 
@@ -149,7 +149,7 @@ uint8_t kinetis_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_KINETIS_SPI3
 void kinetis_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 # warning "Missing logic"
 }
 
diff --git a/configs/teensy-lc/src/kl_led.c b/configs/teensy-lc/src/kl_led.c
index 611174f222..ac72ed4eb3 100644
--- a/configs/teensy-lc/src/kl_led.c
+++ b/configs/teensy-lc/src/kl_led.c
@@ -61,14 +61,14 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/teensy-lc/src/kl_pwm.c b/configs/teensy-lc/src/kl_pwm.c
index 94c84397be..40d5e87e6d 100644
--- a/configs/teensy-lc/src/kl_pwm.c
+++ b/configs/teensy-lc/src/kl_pwm.c
@@ -98,7 +98,7 @@ int board_pwm_setup(void)
       pwm = kl_pwminitialize(0);
       if (!pwm)
         {
-          adbg("Failed to get the KL25 PWM lower half\n");
+          aerr("Failed to get the KL25 PWM lower half\n");
           return -ENODEV;
         }
 
@@ -107,7 +107,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          adbg("pwm_register failed: %d\n", ret);
+          aerr("pwm_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/teensy-lc/src/kl_spi.c b/configs/teensy-lc/src/kl_spi.c
index 073764252a..b8eeb57aa6 100644
--- a/configs/teensy-lc/src/kl_spi.c
+++ b/configs/teensy-lc/src/kl_spi.c
@@ -58,14 +58,14 @@
 /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
diff --git a/configs/tm4c123g-launchpad/src/tm4c_autoleds.c b/configs/tm4c123g-launchpad/src/tm4c_autoleds.c
index b78c5fbcf2..367569b67f 100644
--- a/configs/tm4c123g-launchpad/src/tm4c_autoleds.c
+++ b/configs/tm4c123g-launchpad/src/tm4c_autoleds.c
@@ -102,10 +102,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
@@ -140,7 +140,7 @@
 #ifdef CONFIG_ARCH_LEDS
 void tm4c_led_initialize(void)
 {
-  leddbg("Initializing\n");
+  lederr("Initializing\n");
 
   /* Configure Port E, Bit 1 as an output, initial value=OFF */
 
diff --git a/configs/tm4c123g-launchpad/src/tm4c_ssi.c b/configs/tm4c123g-launchpad/src/tm4c_ssi.c
index ee306c0624..a884c89534 100644
--- a/configs/tm4c123g-launchpad/src/tm4c_ssi.c
+++ b/configs/tm4c123g-launchpad/src/tm4c_ssi.c
@@ -62,9 +62,9 @@
 /* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define ssidbg llerr
+#  define ssierr llerr
 #else
-#  define ssidbg(x...)
+#  define ssierr(x...)
 #endif
 
 /* Dump GPIO registers */
@@ -118,14 +118,14 @@ void weak_function tm4c_ssidev_initialize(void)
 
 void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  ssidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  ssierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   ssi_dumpgpio("tiva_ssiselect() Entry");
   ssi_dumpgpio("tiva_ssiselect() Exit");
 }
 
 uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  ssidbg("Returning SPI_STATUS_PRESENT\n");
+  ssierr("Returning SPI_STATUS_PRESENT\n");
   return SPI_STATUS_PRESENT;
 }
 
diff --git a/configs/tm4c1294-launchpad/src/tm4c_bringup.c b/configs/tm4c1294-launchpad/src/tm4c_bringup.c
index a6608ff431..53bd6a965b 100644
--- a/configs/tm4c1294-launchpad/src/tm4c_bringup.c
+++ b/configs/tm4c1294-launchpad/src/tm4c_bringup.c
@@ -76,14 +76,14 @@ static void tm4c_i2c_register(int bus)
   i2c = tiva_i2cbus_initialize(bus);
   if (i2c == NULL)
     {
-      dbg("ERROR: Failed to get I2C%d interface\n", bus);
+      err("ERROR: Failed to get I2C%d interface\n", bus);
     }
   else
     {
       ret = i2c_register(i2c, bus);
       if (ret < 0)
         {
-          dbg("ERROR: Failed to register I2C%d driver: %d\n", bus, ret);
+          err("ERROR: Failed to register I2C%d driver: %d\n", bus, ret);
           tiva_i2cbus_uninitialize(i2c);
         }
     }
@@ -164,7 +164,7 @@ int tm4c_bringup(void)
   ret = tiva_timer_configure();
   if (ret < 0)
     {
-      dbg("ERROR: Failed to initialize timer driver: %d\n", ret);
+      err("ERROR: Failed to initialize timer driver: %d\n", ret);
     }
 #endif
 
diff --git a/configs/tm4c1294-launchpad/src/tm4c_timer.c b/configs/tm4c1294-launchpad/src/tm4c_timer.c
index 39b20919cb..d3957309be 100644
--- a/configs/tm4c1294-launchpad/src/tm4c_timer.c
+++ b/configs/tm4c1294-launchpad/src/tm4c_timer.c
@@ -108,7 +108,7 @@ int tiva_timer_configure(void)
                             GPTM, ALTCLK);
   if (ret < 0)
     {
-      timdbg("ERROR: Failed to register timer driver: %d\n", ret);
+      timerr("ERROR: Failed to register timer driver: %d\n", ret);
     }
 
   return ret;
diff --git a/configs/tm4c1294-launchpad/src/tm4c_userleds.c b/configs/tm4c1294-launchpad/src/tm4c_userleds.c
index 443ee91bfd..89b70ee516 100644
--- a/configs/tm4c1294-launchpad/src/tm4c_userleds.c
+++ b/configs/tm4c1294-launchpad/src/tm4c_userleds.c
@@ -72,10 +72,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/twr-k60n512/src/k60_leds.c b/configs/twr-k60n512/src/k60_leds.c
index d7b13fa413..55e3b19b84 100644
--- a/configs/twr-k60n512/src/k60_leds.c
+++ b/configs/twr-k60n512/src/k60_leds.c
@@ -124,10 +124,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/twr-k60n512/src/k60_spi.c b/configs/twr-k60n512/src/k60_spi.c
index 42aad3c58b..4afe34fe97 100644
--- a/configs/twr-k60n512/src/k60_spi.c
+++ b/configs/twr-k60n512/src/k60_spi.c
@@ -60,7 +60,7 @@
 /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef CONFIG_DEBUG_SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -68,7 +68,7 @@
 #  endif
 #else
 #  undef CONFIG_DEBUG_SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -121,7 +121,7 @@ void weak_function kinetis_spidev_initialize(void)
 #ifdef CONFIG_KINETIS_SPI1
 void kinetis_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 # warning "Missing logic"
 }
 
@@ -135,7 +135,7 @@ uint8_t kinetis_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_KINETIS_SPI2
 void kinetis_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 # warning "Missing logic"
 }
 
@@ -149,7 +149,7 @@ uint8_t kinetis_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_KINETIS_SPI3
 void kinetis_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 # warning "Missing logic"
 }
 
diff --git a/configs/u-blox-c027/src/lpc17_adc.c b/configs/u-blox-c027/src/lpc17_adc.c
index 9d620f84c6..e9244045d3 100644
--- a/configs/u-blox-c027/src/lpc17_adc.c
+++ b/configs/u-blox-c027/src/lpc17_adc.c
@@ -89,7 +89,7 @@ int board_adc_setup(void)
       adc = lpc17_adcinitialize();
       if (adc == NULL)
         {
-          adbg("ERROR: Failed to get ADC interface\n");
+          aerr("ERROR: Failed to get ADC interface\n");
           return -ENODEV;
         }
 
@@ -98,7 +98,7 @@ int board_adc_setup(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          adbg("adc_register failed: %d\n", ret);
+          aerr("adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/u-blox-c027/src/lpc17_dac.c b/configs/u-blox-c027/src/lpc17_dac.c
index 91c1585f05..f1dd0887ac 100644
--- a/configs/u-blox-c027/src/lpc17_dac.c
+++ b/configs/u-blox-c027/src/lpc17_dac.c
@@ -85,14 +85,14 @@ int dac_devinit(void)
       dac = lpc17_dacinitialize();
       if (dac == NULL)
         {
-          adbg("ERROR: Failed to get dac interface\n");
+          aerr("ERROR: Failed to get dac interface\n");
           return -ENODEV;
         }
 
       ret = dac_register("/dev/dac0", dac);
       if (ret < 0)
         {
-          adbg("dac_register failed: %d\n", ret);
+          aerr("dac_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/u-blox-c027/src/lpc17_leds.c b/configs/u-blox-c027/src/lpc17_leds.c
index ba72d2cc81..cf6d8655bf 100644
--- a/configs/u-blox-c027/src/lpc17_leds.c
+++ b/configs/u-blox-c027/src/lpc17_leds.c
@@ -61,14 +61,14 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/u-blox-c027/src/lpc17_pwm.c b/configs/u-blox-c027/src/lpc17_pwm.c
index d5d4bb506c..93c22a8ceb 100644
--- a/configs/u-blox-c027/src/lpc17_pwm.c
+++ b/configs/u-blox-c027/src/lpc17_pwm.c
@@ -98,7 +98,7 @@ int board_pwm_setup(void)
       pwm = lpc17_pwminitialize(0);
       if (!pwm)
         {
-          adbg("Failed to get the LPC17XX PWM lower half\n");
+          aerr("Failed to get the LPC17XX PWM lower half\n");
           return -ENODEV;
         }
 
@@ -107,14 +107,14 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          adbg("pwm_register failed: %d\n", ret);
+          aerr("pwm_register failed: %d\n", ret);
           return ret;
         }
 
       mcpwm = lpc17_mcpwminitialize(0);
       if (!mcpwm)
         {
-          adbg("Failed to get the LPC17XX MOTOR PWM lower half\n");
+          aerr("Failed to get the LPC17XX MOTOR PWM lower half\n");
           return -ENODEV;
         }
 
@@ -123,14 +123,14 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/mcpwm0", mcpwm);
       if (ret < 0)
         {
-          adbg("mcpwm_register failed: %d\n", ret);
+          aerr("mcpwm_register failed: %d\n", ret);
           return ret;
         }
 
       timer = lpc17_timerinitialize(0);
       if (!timer)
         {
-          adbg("Failed to get the LPC17XX TIMER lower half\n");
+          aerr("Failed to get the LPC17XX TIMER lower half\n");
           return -ENODEV;
         }
 
@@ -139,7 +139,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/timer0", timer);
       if (ret < 0)
         {
-          adbg("timer_register failed: %d\n", ret);
+          aerr("timer_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/u-blox-c027/src/lpc17_ssp.c b/configs/u-blox-c027/src/lpc17_ssp.c
index cbec4fc42e..722ec61f4a 100644
--- a/configs/u-blox-c027/src/lpc17_ssp.c
+++ b/configs/u-blox-c027/src/lpc17_ssp.c
@@ -64,7 +64,7 @@
 #undef SSP_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SSP_DEBUG
-#  define sspdbg  llerr
+#  define ssperr  llerr
 #  ifdef SSP_VERBOSE
 #    define sspinfo llerr
 #  else
@@ -72,7 +72,7 @@
 #  endif
 #else
 #  undef SSP_VERBOSE
-#  define sspdbg(x...)
+#  define ssperr(x...)
 #  define sspinfo(x...)
 #endif
 
@@ -140,7 +140,7 @@ void weak_function c027_sspdev_initialize(void)
 #ifdef CONFIG_LPC17_SSP0
 void  lpc17_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  sspdbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   ssp_dumpgpio("lpc17_ssp0select() Entry");
 
 #warning "Assert CS here (false)"
@@ -150,7 +150,7 @@ void  lpc17_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel
 
 uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  sspdbg("Returning SPI_STATUS_PRESENT\n");
+  ssperr("Returning SPI_STATUS_PRESENT\n");
   return SPI_STATUS_PRESENT;
 }
 #endif
@@ -158,7 +158,7 @@ uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_LPC17_SSP1
 void  lpc17_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  sspdbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   ssp_dumpgpio("lpc17_ssp1select() Entry");
 
   if (devid == SPIDEV_MMCSD)
@@ -186,12 +186,12 @@ uint8_t lpc17_ssp1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 
       if (lpc17_gpioread(C027_SD_CD) == 0)
         {
-          sspdbg("Returning SPI_STATUS_PRESENT\n");
+          ssperr("Returning SPI_STATUS_PRESENT\n");
           return SPI_STATUS_PRESENT;
         }
     }
 
-  sspdbg("Returning zero\n");
+  ssperr("Returning zero\n");
   return 0;
 }
 #endif
diff --git a/configs/u-blox-c027/src/lpc17_ubxmdm.c b/configs/u-blox-c027/src/lpc17_ubxmdm.c
index 294593ffde..8f8e113297 100644
--- a/configs/u-blox-c027/src/lpc17_ubxmdm.c
+++ b/configs/u-blox-c027/src/lpc17_ubxmdm.c
@@ -62,12 +62,12 @@
 /* Non-standard debug that may be enabled just for testing the modem driver */
 
 #ifdef CONFIG_MODEM_U_BLOX_DEBUG
-#  define m_dbg    dbg
+#  define m_err    err
 #  define m_info   info
 #  define m_vllerr  llerr
 #  define m_vllinfo llinfo
 #else
-#  define m_dbg(x...)
+#  define m_err(x...)
 #  define m_info(x...)
 #  define m_llerr(x...)
 #  define m_llinfo(x...)
diff --git a/configs/ubw32/src/pic32_leds.c b/configs/ubw32/src/pic32_leds.c
index a99f633e53..a26fa1ceb2 100644
--- a/configs/ubw32/src/pic32_leds.c
+++ b/configs/ubw32/src/pic32_leds.c
@@ -98,7 +98,7 @@
 /* Debug ********************************************************************/
 
 #if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_LEDS)
-#  define leddbg  llerr
+#  define lederr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define ledinfo llerr
 #  else
@@ -107,7 +107,7 @@
 #else
 #  undef CONFIG_DEBUG_LEDS
 #  undef CONFIG_DEBUG_INFO
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/us7032evb1/shterm/shterm.c b/configs/us7032evb1/shterm/shterm.c
index 0913f61dcf..b9a1ff5b14 100644
--- a/configs/us7032evb1/shterm/shterm.c
+++ b/configs/us7032evb1/shterm/shterm.c
@@ -62,7 +62,7 @@
 
 #define DEFAULT_BAUD 9600
 
-#define dbg(format, ...)  if (debug > 0) printconsole(format, ##__VA_ARGS__)
+#define err(format, ...)  if (debug > 0) printconsole(format, ##__VA_ARGS__)
 #define info(format, ...) if (debug > 1) printconsole(format, ##__VA_ARGS__)
 
 /****************************************************************************
diff --git a/configs/viewtool-stm32f107/src/stm32_appinit.c b/configs/viewtool-stm32f107/src/stm32_appinit.c
index 8bc77a200c..e43fcef6bf 100644
--- a/configs/viewtool-stm32f107/src/stm32_appinit.c
+++ b/configs/viewtool-stm32f107/src/stm32_appinit.c
@@ -95,7 +95,7 @@ static int rtc_driver_initialize(void)
   lower = stm32_rtc_lowerhalf();
   if (lower == NULL)
     {
-      sdbg("ERROR: Failed to instantiate the RTC lower-half driver\n");
+      serr("ERROR: Failed to instantiate the RTC lower-half driver\n");
       ret = -ENOMEM;
     }
   else
@@ -107,7 +107,7 @@ static int rtc_driver_initialize(void)
       ret = rtc_initialize(0, lower);
       if (ret < 0)
         {
-          sdbg("ERROR: Failed to bind/register the RTC driver: %d\n", ret);
+          serr("ERROR: Failed to bind/register the RTC driver: %d\n", ret);
         }
     }
 
diff --git a/configs/viewtool-stm32f107/src/stm32_can.c b/configs/viewtool-stm32f107/src/stm32_can.c
index c667032a9f..a4e4fd5f9f 100644
--- a/configs/viewtool-stm32f107/src/stm32_can.c
+++ b/configs/viewtool-stm32f107/src/stm32_can.c
@@ -65,12 +65,12 @@
 /* Non-standard debug that may be enabled just for testing CAN */
 
 #ifdef CONFIG_DEBUG_CAN
-#  define candbg    dbg
+#  define canerr    err
 #  define caninfo   info
 #  define canllerr  llerr
 #  define canllinfo llinfo
 #else
-#  define candbg(x...)
+#  define canerr(x...)
 #  define caninfo(x...)
 #  define canllerr(x...)
 #  define canllinfo(x...)
@@ -108,7 +108,7 @@ int board_can_initialize(void)
       can = stm32_caninitialize(CAN_PORT);
       if (can == NULL)
         {
-          candbg("ERROR:  Failed to get CAN interface\n");
+          canerr("ERROR:  Failed to get CAN interface\n");
           return -ENODEV;
         }
 
@@ -117,7 +117,7 @@ int board_can_initialize(void)
       ret = can_register("/dev/can0", can);
       if (ret < 0)
         {
-          candbg("ERROR: can_register failed: %d\n", ret);
+          canerr("ERROR: can_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/viewtool-stm32f107/src/stm32_leds.c b/configs/viewtool-stm32f107/src/stm32_leds.c
index 5a7308d0e3..42db57f553 100644
--- a/configs/viewtool-stm32f107/src/stm32_leds.c
+++ b/configs/viewtool-stm32f107/src/stm32_leds.c
@@ -58,10 +58,10 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  define ledinfo llinfo
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/viewtool-stm32f107/src/stm32_mmcsd.c b/configs/viewtool-stm32f107/src/stm32_mmcsd.c
index bc10a38cee..9b9aa9030f 100644
--- a/configs/viewtool-stm32f107/src/stm32_mmcsd.c
+++ b/configs/viewtool-stm32f107/src/stm32_mmcsd.c
@@ -100,7 +100,7 @@ int stm32_sdinitialize(int minor)
   sdio = sdio_initialize(STM32_MMCSDSLOTNO);
   if (!sdio)
     {
-      fdbg("Failed to initialize SDIO slot %d\n", STM32_MMCSDSLOTNO);
+      ferr("Failed to initialize SDIO slot %d\n", STM32_MMCSDSLOTNO);
       return -ENODEV;
     }
 
@@ -111,7 +111,7 @@ int stm32_sdinitialize(int minor)
   ret = mmcsd_slotinitialize(minor, sdio);
   if (ret != OK)
     {
-      fdbg("Failed to bind SDIO slot %d to the MMC/SD driver, minor=%d\n",
+      ferr("Failed to bind SDIO slot %d to the MMC/SD driver, minor=%d\n",
               STM32_MMCSDSLOTNO, minor);
     }
 
diff --git a/configs/viewtool-stm32f107/src/stm32_mpl115a.c b/configs/viewtool-stm32f107/src/stm32_mpl115a.c
index 45cce7e9c5..abd27ca3d2 100644
--- a/configs/viewtool-stm32f107/src/stm32_mpl115a.c
+++ b/configs/viewtool-stm32f107/src/stm32_mpl115a.c
@@ -92,7 +92,7 @@ int stm32_mpl115ainitialize(FAR const char *devpath)
   ret = mpl115a_register(devpath, spi);
   if (ret < 0)
     {
-      sndbg("Error registering MPL115A\n");
+      snerr("Error registering MPL115A\n");
     }
 
   return ret;
diff --git a/configs/viewtool-stm32f107/src/stm32_spi.c b/configs/viewtool-stm32f107/src/stm32_spi.c
index 645564fda4..5acc91c134 100644
--- a/configs/viewtool-stm32f107/src/stm32_spi.c
+++ b/configs/viewtool-stm32f107/src/stm32_spi.c
@@ -63,7 +63,7 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -71,7 +71,7 @@
 #  endif
 #else
 #  undef SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -141,7 +141,7 @@ void weak_function stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -153,7 +153,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
 #ifdef CONFIG_INPUT_ADS7843E
   /* Select/de-select the touchscreen */
@@ -174,7 +174,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
diff --git a/configs/viewtool-stm32f107/src/stm32_ssd1289.c b/configs/viewtool-stm32f107/src/stm32_ssd1289.c
index b3e135191d..421ed2abd9 100644
--- a/configs/viewtool-stm32f107/src/stm32_ssd1289.c
+++ b/configs/viewtool-stm32f107/src/stm32_ssd1289.c
@@ -104,10 +104,10 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg         dbg
+#  define lcderr         err
 #  define lcdinfo        info
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -425,26 +425,26 @@ static void init_lcd_backlight(void)
 
   /* Dump timer3 registers */
 
-  lcddbg("APB1ENR: %08x\n", getreg32(STM32_RCC_APB1ENR));
-  lcddbg("CR1:     %04x\n", getreg32(STM32_TIM3_CR1));
-  lcddbg("CR2:     %04x\n", getreg32(STM32_TIM3_CR2));
-  lcddbg("SMCR:    %04x\n", getreg32(STM32_TIM3_SMCR));
-  lcddbg("DIER:    %04x\n", getreg32(STM32_TIM3_DIER));
-  lcddbg("SR:      %04x\n", getreg32(STM32_TIM3_SR));
-  lcddbg("EGR:     %04x\n", getreg32(STM32_TIM3_EGR));
-  lcddbg("CCMR1:   %04x\n", getreg32(STM32_TIM3_CCMR1));
-  lcddbg("CCMR2:   %04x\n", getreg32(STM32_TIM3_CCMR2));
-  lcddbg("CCER:    %04x\n", getreg32(STM32_TIM3_CCER));
-  lcddbg("CNT:     %04x\n", getreg32(STM32_TIM3_CNT));
-  lcddbg("PSC:     %04x\n", getreg32(STM32_TIM3_PSC));
-  lcddbg("ARR:     %04x\n", getreg32(STM32_TIM3_ARR));
-  lcddbg("CCR1:    %04x\n", getreg32(STM32_TIM3_CCR1));
-  lcddbg("CCR2:    %04x\n", getreg32(STM32_TIM3_CCR2));
-  lcddbg("CCR3:    %04x\n", getreg32(STM32_TIM3_CCR3));
-  lcddbg("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
-  lcddbg("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
-  lcddbg("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
-  lcddbg("DMAR:    %04x\n", getreg32(STM32_TIM3_DMAR));
+  lcderr("APB1ENR: %08x\n", getreg32(STM32_RCC_APB1ENR));
+  lcderr("CR1:     %04x\n", getreg32(STM32_TIM3_CR1));
+  lcderr("CR2:     %04x\n", getreg32(STM32_TIM3_CR2));
+  lcderr("SMCR:    %04x\n", getreg32(STM32_TIM3_SMCR));
+  lcderr("DIER:    %04x\n", getreg32(STM32_TIM3_DIER));
+  lcderr("SR:      %04x\n", getreg32(STM32_TIM3_SR));
+  lcderr("EGR:     %04x\n", getreg32(STM32_TIM3_EGR));
+  lcderr("CCMR1:   %04x\n", getreg32(STM32_TIM3_CCMR1));
+  lcderr("CCMR2:   %04x\n", getreg32(STM32_TIM3_CCMR2));
+  lcderr("CCER:    %04x\n", getreg32(STM32_TIM3_CCER));
+  lcderr("CNT:     %04x\n", getreg32(STM32_TIM3_CNT));
+  lcderr("PSC:     %04x\n", getreg32(STM32_TIM3_PSC));
+  lcderr("ARR:     %04x\n", getreg32(STM32_TIM3_ARR));
+  lcderr("CCR1:    %04x\n", getreg32(STM32_TIM3_CCR1));
+  lcderr("CCR2:    %04x\n", getreg32(STM32_TIM3_CCR2));
+  lcderr("CCR3:    %04x\n", getreg32(STM32_TIM3_CCR3));
+  lcderr("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
+  lcderr("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
+  lcderr("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
+  lcderr("DMAR:    %04x\n", getreg32(STM32_TIM3_DMAR));
 }
 
 /************************************************************************************
@@ -564,7 +564,7 @@ int board_lcd_initialize(void)
       g_ssd1289drvr = ssd1289_lcdinitialize(&g_ssd1289);
       if (!g_ssd1289drvr)
         {
-          lcddbg("ERROR: ssd1289_lcdinitialize failed\n");
+          lcderr("ERROR: ssd1289_lcdinitialize failed\n");
           return -ENODEV;
         }
     }
diff --git a/configs/viewtool-stm32f107/src/stm32_touchscreen.c b/configs/viewtool-stm32f107/src/stm32_touchscreen.c
index 85b7295427..08399b2903 100644
--- a/configs/viewtool-stm32f107/src/stm32_touchscreen.c
+++ b/configs/viewtool-stm32f107/src/stm32_touchscreen.c
@@ -260,7 +260,7 @@ int board_tsc_setup(int minor)
   static bool initialized = false;
   int ret;
 
-  idbg("minor %d\n", minor);
+  ierr("minor %d\n", minor);
   DEBUGASSERT(minor == 0);
 
   /* Have we already initialized?  Since we never uninitialize we must prevent
@@ -280,7 +280,7 @@ int board_tsc_setup(int minor)
       dev = stm32_spibus_initialize(TSC_DEVNUM);
       if (!dev)
         {
-          idbg("Failed to initialize SPI%d\n", TSC_DEVNUM);
+          ierr("Failed to initialize SPI%d\n", TSC_DEVNUM);
           return -ENODEV;
         }
 
@@ -289,7 +289,7 @@ int board_tsc_setup(int minor)
       ret = ads7843e_register(dev, &g_tscinfo.config, CONFIG_ADS7843E_DEVMINOR);
       if (ret < 0)
         {
-          idbg("Failed to register touchscreen device\n");
+          ierr("Failed to register touchscreen device\n");
           /* up_spiuninitialize(dev); */
           return -ENODEV;
         }
diff --git a/configs/zkit-arm-1769/src/lpc17_adc.c b/configs/zkit-arm-1769/src/lpc17_adc.c
index 091d859bd6..0d2bcee96f 100644
--- a/configs/zkit-arm-1769/src/lpc17_adc.c
+++ b/configs/zkit-arm-1769/src/lpc17_adc.c
@@ -99,7 +99,7 @@ int board_adc_setup(void)
       adc = lpc17_adcinitialize();
       if (adc == NULL)
         {
-          adbg("ERROR: Failed to get ADC interface\n");
+          aerr("ERROR: Failed to get ADC interface\n");
           return -ENODEV;
         }
 
@@ -108,7 +108,7 @@ int board_adc_setup(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          adbg("adc_register failed: %d\n", ret);
+          aerr("adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/zkit-arm-1769/src/lpc17_can.c b/configs/zkit-arm-1769/src/lpc17_can.c
index dc866bd640..846dcdf009 100644
--- a/configs/zkit-arm-1769/src/lpc17_can.c
+++ b/configs/zkit-arm-1769/src/lpc17_can.c
@@ -70,12 +70,12 @@
 /* Non-standard debug that may be enabled just for testing CAN */
 
 #ifdef CONFIG_DEBUG_CAN
-#  define candbg    dbg
+#  define canerr    err
 #  define caninfo   info
 #  define canllerr  llerr
 #  define canllinfo llinfo
 #else
-#  define candbg(x...)
+#  define canerr(x...)
 #  define caninfo(x...)
 #  define canllerr(x...)
 #  define canllinfo(x...)
@@ -114,7 +114,7 @@ int board_can_initialize(void)
       can = lpc17_caninitialize(CAN_PORT1);
       if (can == NULL)
         {
-          candbg("ERROR:  Failed to get CAN1 interface\n");
+          canerr("ERROR:  Failed to get CAN1 interface\n");
           return -ENODEV;
         }
 
@@ -123,7 +123,7 @@ int board_can_initialize(void)
       ret = can_register("/dev/can0", can);
       if (ret < 0)
         {
-          candbg("ERROR: CAN1 register failed: %d\n", ret);
+          canerr("ERROR: CAN1 register failed: %d\n", ret);
           return ret;
         }
 #endif
@@ -134,7 +134,7 @@ int board_can_initialize(void)
       can = lpc17_caninitialize(CAN_PORT2);
       if (can == NULL)
         {
-          candbg("ERROR:  Failed to get CAN2 interface\n");
+          canerr("ERROR:  Failed to get CAN2 interface\n");
           return -ENODEV;
         }
 
@@ -143,7 +143,7 @@ int board_can_initialize(void)
       ret = can_register("/dev/can1", can);
       if (ret < 0)
         {
-          candbg("ERROR: CAN2 register failed: %d\n", ret);
+          canerr("ERROR: CAN2 register failed: %d\n", ret);
           return ret;
         }
 #endif
diff --git a/configs/zkit-arm-1769/src/lpc17_dac.c b/configs/zkit-arm-1769/src/lpc17_dac.c
index 3f3362cd47..71816af9a4 100644
--- a/configs/zkit-arm-1769/src/lpc17_dac.c
+++ b/configs/zkit-arm-1769/src/lpc17_dac.c
@@ -80,14 +80,14 @@ int dac_devinit(void)
     dac = lpc17_dacinitialize();
     if (dac == NULL)
       {
-        adbg("ERROR: Failed to get dac interface\n");
+        aerr("ERROR: Failed to get dac interface\n");
         return -ENODEV;
       }
 
     ret = dac_register("/dev/dac0", dac);
     if (ret < 0)
       {
-        adbg("dac_register failed: %d\n", ret);
+        aerr("dac_register failed: %d\n", ret);
         return ret;
       }
 
diff --git a/configs/zkit-arm-1769/src/lpc17_lcd.c b/configs/zkit-arm-1769/src/lpc17_lcd.c
index 43e8778a6a..e020846736 100644
--- a/configs/zkit-arm-1769/src/lpc17_lcd.c
+++ b/configs/zkit-arm-1769/src/lpc17_lcd.c
@@ -76,7 +76,7 @@
 #undef LCD_VERBOSE /* Define to enable verbose debug */
 
 #ifdef LCD_DEBUG
-#  define leddbg  llerr
+#  define lederr  llerr
 #  ifdef LCD_VERBOSE
 #    define ledinfo llerr
 #  else
@@ -84,7 +84,7 @@
 #  endif
 #else
 #  undef LCD_VERBOSE
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/zkit-arm-1769/src/lpc17_leds.c b/configs/zkit-arm-1769/src/lpc17_leds.c
index a62b58f4d4..52683c7777 100644
--- a/configs/zkit-arm-1769/src/lpc17_leds.c
+++ b/configs/zkit-arm-1769/src/lpc17_leds.c
@@ -67,14 +67,14 @@
  */
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define leddbg  llerr
+#  define lederr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define ledinfo llerr
 #  else
 #    define ledinfo(x...)
 #  endif
 #else
-#  define leddbg(x...)
+#  define lederr(x...)
 #  define ledinfo(x...)
 #endif
 
diff --git a/configs/zkit-arm-1769/src/lpc17_spi.c b/configs/zkit-arm-1769/src/lpc17_spi.c
index 45c04fb456..f7bef7c2cc 100644
--- a/configs/zkit-arm-1769/src/lpc17_spi.c
+++ b/configs/zkit-arm-1769/src/lpc17_spi.c
@@ -66,14 +66,14 @@
 /* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -143,7 +143,7 @@ void weak_function zkit_spidev_initialize(void)
 
 void  lpc17_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   spi_dumpgpio("lpc17_spiselect() Entry");
 
   if (devid == SPIDEV_MMCSD)
@@ -164,12 +164,12 @@ uint8_t lpc17_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 
       if (lpc17_gpioread(ZKITARM_SD_CD) == 0)
         {
-          spidbg("Returning SPI_STATUS_PRESENT\n");
+          spierr("Returning SPI_STATUS_PRESENT\n");
           return SPI_STATUS_PRESENT;
         }
     }
 
-  spidbg("Returning zero\n");
+  spierr("Returning zero\n");
   return 0;
 }
 
diff --git a/configs/zkit-arm-1769/src/lpc17_ssp.c b/configs/zkit-arm-1769/src/lpc17_ssp.c
index 633e9107e5..16288dcce3 100644
--- a/configs/zkit-arm-1769/src/lpc17_ssp.c
+++ b/configs/zkit-arm-1769/src/lpc17_ssp.c
@@ -66,14 +66,14 @@
 /* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define sspdbg  llerr
+#  define ssperr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define sspinfo llerr
 #  else
 #    define sspinfo(x...)
 #  endif
 #else
-#  define sspdbg(x...)
+#  define ssperr(x...)
 #  define sspinfo(x...)
 #endif
 
@@ -146,7 +146,7 @@ void weak_function zkit_sspdev_initialize(void)
 #ifdef CONFIG_LPC17_SSP1
 void  lpc17_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  sspdbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   ssp_dumpgpio("lpc17_ssp1select() Entry");
 
 #warning "Assert CS here (false)"
@@ -156,7 +156,7 @@ void  lpc17_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel
 
 uint8_t lpc17_ssp1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  sspdbg("Returning SPI_STATUS_PRESENT\n");
+  ssperr("Returning SPI_STATUS_PRESENT\n");
   return SPI_STATUS_PRESENT;
 }
 
@@ -180,7 +180,7 @@ int weak_function lpc17_ssp1cmddata(FAR struct spi_dev_s *dev,
 #ifdef CONFIG_LPC17_SSP0
 void  lpc17_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  sspdbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   ssp_dumpgpio("lpc17_ssp0select() Entry");
 
 #ifdef CONFIG_NX_LCDDRIVER
@@ -199,11 +199,11 @@ uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
   if (devid == SPIDEV_DISPLAY)
     {
-      sspdbg("Returning SPI_STATUS_PRESENT\n");
+      ssperr("Returning SPI_STATUS_PRESENT\n");
       return SPI_STATUS_PRESENT;
     }
 
-  sspdbg("Returning zero\n");
+  ssperr("Returning zero\n");
   return 0;
 }
 
diff --git a/configs/zp214xpa/src/lpc2148_spi1.c b/configs/zp214xpa/src/lpc2148_spi1.c
index b07db4d85f..2a7fdd67bb 100644
--- a/configs/zp214xpa/src/lpc2148_spi1.c
+++ b/configs/zp214xpa/src/lpc2148_spi1.c
@@ -90,14 +90,14 @@
 /* Enables debug output from this file */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -247,14 +247,14 @@ static void spi_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel
       /* Enable slave select (low enables) */
 
       putreg32(bit, CS_CLR_REGISTER);
-      spidbg("CS asserted: %08x->%08x\n", regval, getreg32(CS_PIN_REGISTER));
+      spierr("CS asserted: %08x->%08x\n", regval, getreg32(CS_PIN_REGISTER));
     }
   else
     {
       /* Disable slave select (low enables) */
 
       putreg32(bit, CS_SET_REGISTER);
-      spidbg("CS de-asserted: %08x->%08x\n", regval, getreg32(CS_PIN_REGISTER));
+      spierr("CS de-asserted: %08x->%08x\n", regval, getreg32(CS_PIN_REGISTER));
 
       /* Wait for the TX FIFO not full indication */
 
@@ -310,7 +310,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
   divisor = (divisor + 1) & ~1;
   putreg8(divisor, LPC214X_SPI1_CPSR);
 
-  spidbg("Frequency %d->%d\n", frequency, LPC214X_PCLKFREQ / divisor);
+  spierr("Frequency %d->%d\n", frequency, LPC214X_PCLKFREQ / divisor);
   return LPC214X_PCLKFREQ / divisor;
 }
 
@@ -331,7 +331,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
 
 static uint8_t spi_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  spidbg("Return 0\n");
+  spierr("Return 0\n");
   return 0;
 }
 
@@ -387,14 +387,14 @@ static int spi_cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd
       /* L: the inputs at D0 to D7 are transferred to the command registers */
 
       putreg32(bit, CS_CLR_REGISTER);
-      spidbg("Command: %08x->%08x\n", regval, getreg32(CS_PIN_REGISTER));
+      spierr("Command: %08x->%08x\n", regval, getreg32(CS_PIN_REGISTER));
     }
   else
     {
       /* H: the inputs at D0 to D7 are treated as display data. */
 
       putreg32(bit, CS_SET_REGISTER);
-      spidbg("Data: %08x->%08x\n", regval, getreg32(CS_PIN_REGISTER));
+      spierr("Data: %08x->%08x\n", regval, getreg32(CS_PIN_REGISTER));
     }
 
   return OK;
@@ -436,7 +436,7 @@ static uint16_t spi_send(FAR struct spi_dev_s *dev, uint16_t wd)
   /* Get the value from the RX FIFO and return it */
 
   regval = getreg16(LPC214X_SPI1_DR);
-  spidbg("%04x->%04x\n", wd, regval);
+  spierr("%04x->%04x\n", wd, regval);
   return regval;
 }
 
@@ -466,7 +466,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size
 
   /* Loop while thre are bytes remaining to be sent */
 
-  spidbg("nwords: %d\n", nwords);
+  spierr("nwords: %d\n", nwords);
   while (nwords > 0)
     {
       /* While the TX FIFO is not full and there are bytes left to send */
@@ -483,7 +483,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size
 
   /* Then discard all card responses until the RX & TX FIFOs are emptied. */
 
-  spidbg("discarding\n");
+  spierr("discarding\n");
   do
     {
       /* Is there anything in the RX fifo? */
@@ -537,7 +537,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw
 
   /* While there is remaining to be sent (and no synchronization error has occurred) */
 
-  spidbg("nwords: %d\n", nwords);
+  spierr("nwords: %d\n", nwords);
   while (nwords || rxpending)
     {
       /* Fill the transmit FIFO with 0xff...
@@ -635,7 +635,7 @@ FAR struct spi_dev_s *lpc214x_spibus_initialize(int port)
   regval32 |= getreg32(CS_DIR_REGISTER);
   putreg32(regval32, CS_DIR_REGISTER);
 
-  spidbg("CS Pin Config: PINSEL1: %08x PIN: %08x DIR: %08x\n",
+  spierr("CS Pin Config: PINSEL1: %08x PIN: %08x DIR: %08x\n",
          getreg32(LPC214X_PINSEL1), getreg32(CS_PIN_REGISTER),
          getreg32(CS_DIR_REGISTER));
 
diff --git a/configs/zp214xpa/src/lpc2148_ug2864ambag01.c b/configs/zp214xpa/src/lpc2148_ug2864ambag01.c
index ed20003a58..24a6be8a0e 100644
--- a/configs/zp214xpa/src/lpc2148_ug2864ambag01.c
+++ b/configs/zp214xpa/src/lpc2148_ug2864ambag01.c
@@ -100,10 +100,10 @@
 /* Debug ********************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg(format, ...)   dbg(format, ##__VA_ARGS__)
+#  define lcderr(format, ...)   err(format, ##__VA_ARGS__)
 #  define lcdinfo(format, ...)  info(format, ##__VA_ARGS__)
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -160,7 +160,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
   spi = lpc214x_spibus_initialize(1);
   if (!spi)
     {
-      lcddbg("Failed to initialize SPI port 1\n");
+      lcderr("Failed to initialize SPI port 1\n");
     }
   else
     {
@@ -169,7 +169,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
       dev = ug2864ambag01_initialize(spi, devno);
       if (!dev)
         {
-          lcddbg("Failed to bind SPI port 1 to OLED %d: %d\n", devno);
+          lcderr("Failed to bind SPI port 1 to OLED %d: %d\n", devno);
         }
      else
         {
diff --git a/drivers/analog/ad5410.c b/drivers/analog/ad5410.c
index 58db6a7cea..217a2c8a44 100644
--- a/drivers/analog/ad5410.c
+++ b/drivers/analog/ad5410.c
@@ -256,7 +256,7 @@ static int dac_send(FAR struct dac_dev_s *dev, FAR struct dac_msg_s *msg)
 
 static int dac_ioctl(FAR struct dac_dev_s *dev, int cmd, unsigned long arg)
 {
-  dbg("Fix me:Not Implemented\n");
+  err("Fix me:Not Implemented\n");
   return 0;
 }
 
diff --git a/drivers/analog/adc.c b/drivers/analog/adc.c
index d11c962384..0dac979d60 100644
--- a/drivers/analog/adc.c
+++ b/drivers/analog/adc.c
@@ -433,7 +433,7 @@ int adc_register(FAR const char *path, FAR struct adc_dev_s *dev)
   ret = dev->ad_ops->ao_bind(dev, &g_adc_callback);
   if (ret < 0)
     {
-      adbg("ERROR: Failed to bind callbacks: %d\n", ret);
+      aerr("ERROR: Failed to bind callbacks: %d\n", ret);
       return ret;
     }
 
diff --git a/drivers/analog/ads1242.c b/drivers/analog/ads1242.c
index dc942bbace..b3c72852f1 100644
--- a/drivers/analog/ads1242.c
+++ b/drivers/analog/ads1242.c
@@ -403,15 +403,15 @@ static void ads1242_print_regs(FAR struct ads1242_dev_s *dev, char const *msg)
  uint8_t mux_reg_value   = 0;
  uint8_t acr_reg_value   = 0;
 
- dbg("%s\n", msg);
+ err("%s\n", msg);
 
  ads1242_read_reg(dev, ADS1242_REG_SETUP, &setup_reg_value);
  ads1242_read_reg(dev, ADS1242_REG_MUX, &mux_reg_value);
  ads1242_read_reg(dev, ADS1242_REG_ACR, &acr_reg_value);
 
- dbg("SETUP  %02X\n", setup_reg_value);
- dbg("MUX    %02X\n", mux_reg_value);
- dbg("ACR    %02X\n", acr_reg_value);
+ err("SETUP  %02X\n", setup_reg_value);
+ err("MUX    %02X\n", mux_reg_value);
+ err("ACR    %02X\n", acr_reg_value);
 }
 #endif /* CONFIG_DEBUG_FEATURES && CONFIG_DEBUG_INFO */
 
@@ -552,7 +552,7 @@ static int ads1242_ioctl (FAR struct file *filep, int cmd, unsigned long arg)
       /* Command was not recognized */
 
     default:
-      dbg ("Unrecognized cmd: %d\n", cmd);
+      err ("Unrecognized cmd: %d\n", cmd);
       ret = -ENOTTY;
       break;
     }
@@ -596,7 +596,7 @@ int ads1242_register(FAR const char *devpath, FAR struct spi_dev_s *spi,
   priv = (FAR struct ads1242_dev_s *)kmm_malloc(sizeof(struct ads1242_dev_s));
   if (priv == NULL)
     {
-      dbg ("Failed to allocate instance\n");
+      err ("Failed to allocate instance\n");
       return -ENOMEM;
     }
 
@@ -610,7 +610,7 @@ int ads1242_register(FAR const char *devpath, FAR struct spi_dev_s *spi,
   ret = register_driver(devpath, &g_ads1242_fops, 0666, priv);
   if (ret < 0)
     {
-      dbg ("Failed to register driver: %d\n", ret);
+      err ("Failed to register driver: %d\n", ret);
       kmm_free(priv);
     }
 
diff --git a/drivers/analog/ads1255.c b/drivers/analog/ads1255.c
index adb8933b38..a70ce9795b 100644
--- a/drivers/analog/ads1255.c
+++ b/drivers/analog/ads1255.c
@@ -396,7 +396,7 @@ static void adc_rxint(FAR struct adc_dev_s *dev, bool enable)
 
 static int adc_ioctl(FAR struct adc_dev_s *dev, int cmd, unsigned long arg)
 {
-  dbg("Fix me:Not Implemented\n");
+  err("Fix me:Not Implemented\n");
   return 0;
 }
 
diff --git a/drivers/analog/pga11x.c b/drivers/analog/pga11x.c
index 0169459cdd..62b8d1b338 100644
--- a/drivers/analog/pga11x.c
+++ b/drivers/analog/pga11x.c
@@ -110,14 +110,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg dbg
+#  define spierr err
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo dbg
+#    define spiinfo err
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
diff --git a/drivers/audio/audio_null.c b/drivers/audio/audio_null.c
index 393eaa1399..6545d7df39 100644
--- a/drivers/audio/audio_null.c
+++ b/drivers/audio/audio_null.c
@@ -375,7 +375,7 @@ static int null_configure(FAR struct audio_lowerhalf_s *dev,
 #endif  /* CONFIG_AUDIO_EXCLUDE_TONE */
 
         default:
-          auddbg("    Unrecognized feature unit\n");
+          auderr("    Unrecognized feature unit\n");
           break;
         }
       break;
@@ -443,7 +443,7 @@ static void *null_workerthread(pthread_addr_t pvarg)
 
       if (msglen < sizeof(struct audio_msg_s))
         {
-          auddbg("ERROR: Message too small: %d\n", msglen);
+          auderr("ERROR: Message too small: %d\n", msglen);
           continue;
         }
 
@@ -467,7 +467,7 @@ static void *null_workerthread(pthread_addr_t pvarg)
             break;
 
           default:
-            auddbg("ERROR: Ignoring message ID %d\n", msg.msgId);
+            auderr("ERROR: Ignoring message ID %d\n", msg.msgId);
             break;
         }
     }
@@ -527,7 +527,7 @@ static int null_start(FAR struct audio_lowerhalf_s *dev)
     {
       /* Error creating message queue! */
 
-      auddbg("ERROR: Couldn't allocate message queue\n");
+      auderr("ERROR: Couldn't allocate message queue\n");
       return -ENOMEM;
     }
 
@@ -551,7 +551,7 @@ static int null_start(FAR struct audio_lowerhalf_s *dev)
                        (pthread_addr_t)priv);
   if (ret != OK)
     {
-      auddbg("ERROR: pthread_create failed: %d\n", ret);
+      auderr("ERROR: pthread_create failed: %d\n", ret);
     }
   else
     {
@@ -843,6 +843,6 @@ FAR struct audio_lowerhalf_s *audio_null_initialize(void)
       return &priv->dev;
     }
 
-  auddbg("ERROR: Failed to allocate null audio device\n");
+  auderr("ERROR: Failed to allocate null audio device\n");
   return NULL;
 }
diff --git a/drivers/audio/i2schar.c b/drivers/audio/i2schar.c
index 95ebbb73ae..acecda9f83 100644
--- a/drivers/audio/i2schar.c
+++ b/drivers/audio/i2schar.c
@@ -86,16 +86,16 @@
 #endif
 
 #ifdef CONFIG_DEBUG_I2S
-#  define i2sdbg         dbg
+#  define i2serr         err
 #  define i2sllerr       llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define i2sinfo      dbg
+#    define i2sinfo      err
 #    define i2sllinfo    llerr
 #  else
 #    define i2sinfo(x...)
 #  endif
 #else
-#  define i2sdbg(x...)
+#  define i2serr(x...)
 #  define i2sllerr(x...)
 #  define i2sinfo(x...)
 #  define i2sllinfo(x...)
@@ -272,7 +272,7 @@ static ssize_t i2schar_read(FAR struct file *filep, FAR char *buffer,
     {
       ret = -errno;
       DEBUGASSERT(ret < 0);
-      i2sdbg("ERROR: sem_wait returned: %d\n", ret);
+      i2serr("ERROR: sem_wait returned: %d\n", ret);
       goto errout_with_reference;
     }
 
@@ -282,7 +282,7 @@ static ssize_t i2schar_read(FAR struct file *filep, FAR char *buffer,
                     CONFIG_AUDIO_I2SCHAR_RXTIMEOUT);
   if (ret < 0)
     {
-      i2sdbg("ERROR: I2S_RECEIVE returned: %d\n", ret);
+      i2serr("ERROR: I2S_RECEIVE returned: %d\n", ret);
       goto errout_with_reference;
     }
 
@@ -347,7 +347,7 @@ static ssize_t i2schar_write(FAR struct file *filep, FAR const char *buffer,
     {
       ret = -errno;
       DEBUGASSERT(ret < 0);
-      i2sdbg("ERROR: sem_wait returned: %d\n", ret);
+      i2serr("ERROR: sem_wait returned: %d\n", ret);
       goto errout_with_reference;
     }
 
@@ -357,7 +357,7 @@ static ssize_t i2schar_write(FAR struct file *filep, FAR const char *buffer,
                  CONFIG_AUDIO_I2SCHAR_TXTIMEOUT);
   if (ret < 0)
     {
-      i2sdbg("ERROR: I2S_SEND returned: %d\n", ret);
+      i2serr("ERROR: I2S_SEND returned: %d\n", ret);
       goto errout_with_reference;
     }
 
diff --git a/drivers/audio/vs1053.c b/drivers/audio/vs1053.c
index 3af6418b79..e52b0c388a 100644
--- a/drivers/audio/vs1053.c
+++ b/drivers/audio/vs1053.c
@@ -967,7 +967,7 @@ static void vs1053_feeddata(FAR struct vs1053_struct_s *dev)
   /* Local stack copy of our active buffer */
 
   apb = dev->apb;
-  //auddbg("Entry apb=%p, Bytes left=%d\n", apb, apb->nbytes - apb->curbyte);
+  //auderr("Entry apb=%p, Bytes left=%d\n", apb, apb->nbytes - apb->curbyte);
 
   /* Setup pointer to the next sample in the buffer */
 
@@ -1039,12 +1039,12 @@ static void vs1053_feeddata(FAR struct vs1053_struct_s *dev)
                 {
                   (void)SPI_SETFREQUENCY(dev->spi, dev->spi_freq);
                   dev->hw_lower->disable(dev->hw_lower);   /* Disable the DREQ interrupt */
-                  auddbg("HDAT1: 0x%0X   HDAT0: 0x%0X\n",
+                  auderr("HDAT1: 0x%0X   HDAT0: 0x%0X\n",
                       vs1053_readreg(dev, VS1053_SCI_HDAT1),
                       vs1053_readreg(dev, VS1053_SCI_HDAT0));
                   vs1053_writereg(dev, VS1053_SCI_WRAMADDR, VS1053_END_FILL_BYTE);
                   dev->endfillchar = vs1053_readreg(dev, VS1053_SCI_WRAM) >> 8;
-                  auddbg("EndFillChar: 0x%0X\n", dev->endfillchar);
+                  auderr("EndFillChar: 0x%0X\n", dev->endfillchar);
                   reg = vs1053_readreg(dev, VS1053_SCI_MODE);
                   vs1053_writereg(dev, VS1053_SCI_MODE, reg | VS1053_SM_RESET);
 
@@ -1171,7 +1171,7 @@ static void vs1053_feeddata(FAR struct vs1053_struct_s *dev)
                   dev->lower.upper(dev->lower.priv,
                       AUDIO_CALLBACK_IOERR, NULL, ret);
 #endif
-                  auddbg("I/O error!\n");
+                  auderr("I/O error!\n");
 
                   goto err_out;
                 }
@@ -1181,7 +1181,7 @@ static void vs1053_feeddata(FAR struct vs1053_struct_s *dev)
               apb = (struct ap_buffer_s *) dq_remfirst(&dev->apbq);
               dev->apb = apb;
 
-              //auddbg("Next Buffer = %p, bytes = %d\n", apb, apb ? apb->nbytes : 0);
+              //auderr("Next Buffer = %p, bytes = %d\n", apb, apb ? apb->nbytes : 0);
               if (apb == NULL)
                 {
                   sem_post(&dev->apbq_sem);
@@ -1274,7 +1274,7 @@ static void *vs1053_workerthread(pthread_addr_t pvarg)
 #endif
   uint8_t                 timeout;
 
-  auddbg("Entry\n");
+  auderr("Entry\n");
 
 #ifndef CONFIG_AUDIO_EXCLUDE_STOP
   dev->cancelmode   = false;
@@ -1404,7 +1404,7 @@ static void *vs1053_workerthread(pthread_addr_t pvarg)
   dev->lower.upper(dev->lower.priv, AUDIO_CALLBACK_COMPLETE, NULL, OK);
 #endif
 
-  auddbg("Exit\n");
+  auderr("Exit\n");
 
   return NULL;
 }
@@ -1430,10 +1430,10 @@ static int vs1053_start(FAR struct audio_lowerhalf_s *lower)
   int                 ret;
   void                *value;
 
-  auddbg("Entry\n");
+  auderr("Entry\n");
 
   vs1053_spi_lock(dev->spi, dev->spi_freq);     /* Lock the device */
-  auddbg("Entry HDAT1=0x%0X  HDAT0=0x%0X\n",
+  auderr("Entry HDAT1=0x%0X  HDAT0=0x%0X\n",
       vs1053_readreg(dev, VS1053_SCI_HDAT1),
       vs1053_readreg(dev, VS1053_SCI_HDAT0));
   vs1053_spi_unlock(dev->spi);
@@ -1446,7 +1446,7 @@ static int vs1053_start(FAR struct audio_lowerhalf_s *lower)
 
   vs1053_spi_lock(dev->spi, dev->spi_freq);     /* Lock the device */
   vs1053_setfrequency(dev, CONFIG_VS1053_MP3_DECODE_FREQ);
-  auddbg("Reset HDAT1=0x%0X  HDAT0=0x%0X\n",
+  auderr("Reset HDAT1=0x%0X  HDAT0=0x%0X\n",
       vs1053_readreg(dev, VS1053_SCI_HDAT1),
       vs1053_readreg(dev, VS1053_SCI_HDAT0));
   vs1053_spi_unlock(dev->spi);
@@ -1463,7 +1463,7 @@ static int vs1053_start(FAR struct audio_lowerhalf_s *lower)
     {
       /* Error creating message queue! */
 
-      auddbg("Couldn't allocate message queue\n");
+      auderr("Couldn't allocate message queue\n");
       return -ENOMEM;
     }
 
@@ -1477,7 +1477,7 @@ static int vs1053_start(FAR struct audio_lowerhalf_s *lower)
     }
   else
     {
-      auddbg("Error getting APB Queue sem\n");
+      auderr("Error getting APB Queue sem\n");
       return ret;
     }
 
@@ -1485,7 +1485,7 @@ static int vs1053_start(FAR struct audio_lowerhalf_s *lower)
 
   if (dev->threadid != 0)
     {
-      auddbg("Joining old thread\n");
+      auderr("Joining old thread\n");
       pthread_join(dev->threadid, &value);
     }
 
@@ -1496,17 +1496,17 @@ static int vs1053_start(FAR struct audio_lowerhalf_s *lower)
   (void)pthread_attr_setschedparam(&tattr, &sparam);
   (void)pthread_attr_setstacksize(&tattr, CONFIG_VS1053_WORKER_STACKSIZE);
 
-  auddbg("Starting workerthread\n");
+  auderr("Starting workerthread\n");
   ret = pthread_create(&dev->threadid, &tattr, vs1053_workerthread,
       (pthread_addr_t) dev);
   if (ret != OK)
     {
-      auddbg("Can't create worker thread, errno=%d\n", errno);
+      auderr("Can't create worker thread, errno=%d\n", errno);
     }
   else
     {
       pthread_setname_np(dev->threadid, "vs1053");
-      auddbg("Created worker thread\n");
+      auderr("Created worker thread\n");
     }
 
   return ret;
@@ -1896,13 +1896,13 @@ struct audio_lowerhalf_s *vs1053_initialize(FAR struct spi_dev_s *spi,
       id = (status & VS1053_SS_VER) >> VS1053_VER_SHIFT;
       if (id != VS1053_VER_VS1053)
         {
-          auddbg("Unexpected VER bits: 0x%0X\n", id);
+          auderr("Unexpected VER bits: 0x%0X\n", id);
           kmm_free(dev);
           return NULL;
         }
       else
         {
-          auddbg("VS1053 Detected!\n");
+          auderr("VS1053 Detected!\n");
         }
 
       /* Attach our ISR to this device */
diff --git a/drivers/audio/wm8904.c b/drivers/audio/wm8904.c
index dcbce3c506..33779d5eb7 100644
--- a/drivers/audio/wm8904.c
+++ b/drivers/audio/wm8904.c
@@ -283,16 +283,16 @@ uint16_t wm8904_readreg(FAR struct wm8904_dev_s *priv, uint8_t regaddr)
 #ifdef CONFIG_I2C_RESET
           /* Perhaps the I2C bus is locked up?  Try to shake the bus free */
 
-          auddbg("WARNING: I2C_TRANSFER failed: %d ... Resetting\n", ret);
+          auderr("WARNING: I2C_TRANSFER failed: %d ... Resetting\n", ret);
 
           ret = I2C_RESET(priv->i2c);
           if (ret < 0)
             {
-              auddbg("ERROR: I2C_RESET failed: %d\n", ret);
+              auderr("ERROR: I2C_RESET failed: %d\n", ret);
               break;
             }
 #else
-          auddbg("ERROR: I2C_TRANSFER failed: %d\n", ret);
+          auderr("ERROR: I2C_TRANSFER failed: %d\n", ret);
 #endif
         }
       else
@@ -359,16 +359,16 @@ static void wm8904_writereg(FAR struct wm8904_dev_s *priv, uint8_t regaddr,
 #ifdef CONFIG_I2C_RESET
           /* Perhaps the I2C bus is locked up?  Try to shake the bus free */
 
-          auddbg("WARNING: i2c_write failed: %d ... Resetting\n", ret);
+          auderr("WARNING: i2c_write failed: %d ... Resetting\n", ret);
 
           ret = I2C_RESET(priv->i2c);
           if (ret < 0)
             {
-              auddbg("ERROR: I2C_RESET failed: %d\n", ret);
+              auderr("ERROR: I2C_RESET failed: %d\n", ret);
               break;
             }
 #else
-          auddbg("ERROR: I2C_TRANSFER failed: %d\n", ret);
+          auderr("ERROR: I2C_TRANSFER failed: %d\n", ret);
 #endif
         }
       else
@@ -1207,7 +1207,7 @@ static int wm8904_configure(FAR struct audio_lowerhalf_s *dev,
 #endif  /* CONFIG_AUDIO_EXCLUDE_TONE */
 
         default:
-          auddbg("    Unrecognized feature unit\n");
+          auderr("    Unrecognized feature unit\n");
           ret = -ENOTTY;
           break;
         }
@@ -1225,14 +1225,14 @@ static int wm8904_configure(FAR struct audio_lowerhalf_s *dev,
         ret = -ERANGE;
         if (caps->ac_channels != 1 && caps->ac_channels != 2)
           {
-            auddbg("ERROR: Unsupported number of channels: %d\n",
+            auderr("ERROR: Unsupported number of channels: %d\n",
                    caps->ac_channels);
             break;
           }
 
         if (caps->ac_controls.b[2] != 8 && caps->ac_controls.b[2] != 16)
           {
-            auddbg("ERROR: Unsupported bits per sample: %d\n",
+            auderr("ERROR: Unsupported bits per sample: %d\n",
                    caps->ac_controls.b[2]);
             break;
           }
@@ -1496,7 +1496,7 @@ static int wm8904_sendbuffer(FAR struct wm8904_dev_s *priv)
       ret = I2S_SEND(priv->i2s, apb, wm8904_senddone, priv, timeout);
       if (ret < 0)
         {
-          auddbg("ERROR: I2S_SEND failed: %d\n", ret);
+          auderr("ERROR: I2S_SEND failed: %d\n", ret);
           break;
         }
     }
@@ -1545,7 +1545,7 @@ static int wm8904_start(FAR struct audio_lowerhalf_s *dev)
     {
       /* Error creating message queue! */
 
-      auddbg("ERROR: Couldn't allocate message queue\n");
+      auderr("ERROR: Couldn't allocate message queue\n");
       return -ENOMEM;
     }
 
@@ -1569,7 +1569,7 @@ static int wm8904_start(FAR struct audio_lowerhalf_s *dev)
                        (pthread_addr_t)priv);
   if (ret != OK)
     {
-      auddbg("ERROR: pthread_create failed: %d\n", ret);
+      auderr("ERROR: pthread_create failed: %d\n", ret);
     }
   else
     {
@@ -1726,7 +1726,7 @@ static int wm8904_enqueuebuffer(FAR struct audio_lowerhalf_s *dev,
           int errcode = errno;
           DEBUGASSERT(errcode > 0);
 
-          auddbg("ERROR: mq_send failed: %d\n", errcode);
+          auderr("ERROR: mq_send failed: %d\n", errcode);
           UNUSED(errcode);
         }
     }
@@ -2042,7 +2042,7 @@ static void *wm8904_workerthread(pthread_addr_t pvarg)
 
       if (msglen < sizeof(struct audio_msg_s))
         {
-          auddbg("ERROR: Message too small: %d\n", msglen);
+          auderr("ERROR: Message too small: %d\n", msglen);
           continue;
         }
 
@@ -2085,7 +2085,7 @@ static void *wm8904_workerthread(pthread_addr_t pvarg)
             break;
 
           default:
-            auddbg("ERROR: Ignoring message ID %d\n", msg.msgId);
+            auderr("ERROR: Ignoring message ID %d\n", msg.msgId);
             break;
         }
     }
@@ -2506,7 +2506,7 @@ FAR struct audio_lowerhalf_s *
       regval = wm8904_readreg(priv, WM8904_ID);
       if (regval != WM8904_SW_RST_DEV_ID1)
         {
-          auddbg("ERROR: WM8904 not found: ID=%04x\n", regval);
+          auderr("ERROR: WM8904 not found: ID=%04x\n", regval);
           goto errout_with_dev;
         }
 
diff --git a/drivers/bch/bchdev_register.c b/drivers/bch/bchdev_register.c
index 139c292576..c92d744e84 100644
--- a/drivers/bch/bchdev_register.c
+++ b/drivers/bch/bchdev_register.c
@@ -86,7 +86,7 @@ int bchdev_register(FAR const char *blkdev, FAR const char *chardev,
   ret = bchlib_setup(blkdev, readonly, &handle);
   if (ret < 0)
     {
-      fdbg("bchlib_setup failed: %d\n", -ret);
+      ferr("bchlib_setup failed: %d\n", -ret);
       return ret;
     }
 
@@ -95,7 +95,7 @@ int bchdev_register(FAR const char *blkdev, FAR const char *chardev,
   ret = register_driver(chardev, &bch_fops, 0666, handle);
   if (ret < 0)
     {
-      fdbg("register_driver failed: %d\n", -ret);
+      ferr("register_driver failed: %d\n", -ret);
       bchlib_teardown(handle);
       handle = NULL;
     }
diff --git a/drivers/bch/bchdev_unregister.c b/drivers/bch/bchdev_unregister.c
index ae6ecb1dd0..3867a62974 100644
--- a/drivers/bch/bchdev_unregister.c
+++ b/drivers/bch/bchdev_unregister.c
@@ -103,7 +103,7 @@ int bchdev_unregister(FAR const char *chardev)
   fd = open(chardev, O_RDONLY);
   if (fd < 0)
     {
-      dbg("Failed to open %s: %d\n", chardev, errno);
+      err("Failed to open %s: %d\n", chardev, errno);
       return -errno;
     }
 
@@ -116,7 +116,7 @@ int bchdev_unregister(FAR const char *chardev)
 
   if (ret < 0)
     {
-      dbg("ioctl failed: %d\n", errno);
+      err("ioctl failed: %d\n", errno);
       return -errno;
     }
 
diff --git a/drivers/bch/bchlib_cache.c b/drivers/bch/bchlib_cache.c
index 8ad543b4b0..aa54fb3213 100644
--- a/drivers/bch/bchlib_cache.c
+++ b/drivers/bch/bchlib_cache.c
@@ -156,7 +156,7 @@ int bchlib_flushsector(FAR struct bchlib_s *bch)
       ret = inode->u.i_bops->write(inode, bch->buffer, bch->sector, 1);
       if (ret < 0)
         {
-          fdbg("Write failed: %d\n");
+          ferr("Write failed: %d\n");
         }
 
 #if defined(CONFIG_BCH_ENCRYPTION)
@@ -201,7 +201,7 @@ int bchlib_readsector(FAR struct bchlib_s *bch, size_t sector)
       ret = inode->u.i_bops->read(inode, bch->buffer, sector, 1);
       if (ret < 0)
         {
-          fdbg("Read failed: %d\n");
+          ferr("Read failed: %d\n");
         }
       bch->sector = sector;
 #if defined(CONFIG_BCH_ENCRYPTION)
diff --git a/drivers/bch/bchlib_read.c b/drivers/bch/bchlib_read.c
index d534d84919..0978af9963 100644
--- a/drivers/bch/bchlib_read.c
+++ b/drivers/bch/bchlib_read.c
@@ -160,7 +160,7 @@ ssize_t bchlib_read(FAR void *handle, FAR char *buffer, size_t offset, size_t le
                                        sector, nsectors);
       if (ret < 0)
         {
-          fdbg("Read failed: %d\n");
+          ferr("Read failed: %d\n");
           return ret;
         }
 
diff --git a/drivers/bch/bchlib_setup.c b/drivers/bch/bchlib_setup.c
index 6ec7a878a6..e2924c1743 100644
--- a/drivers/bch/bchlib_setup.c
+++ b/drivers/bch/bchlib_setup.c
@@ -96,7 +96,7 @@ int bchlib_setup(const char *blkdev, bool readonly, FAR void **handle)
   bch = (FAR struct bchlib_s *)kmm_zalloc(sizeof(struct bchlib_s));
   if (!bch)
     {
-      fdbg("Failed to allocate BCH structure\n");
+      ferr("Failed to allocate BCH structure\n");
       return -ENOMEM;
     }
 
@@ -105,7 +105,7 @@ int bchlib_setup(const char *blkdev, bool readonly, FAR void **handle)
   ret = open_blockdriver(blkdev, readonly ? MS_RDONLY : 0, &bch->inode);
   if (ret < 0)
     {
-      fdbg("Failed to open driver %s: %d\n", blkdev, -ret);
+      ferr("Failed to open driver %s: %d\n", blkdev, -ret);
       goto errout_with_bch;
     }
 
@@ -114,20 +114,20 @@ int bchlib_setup(const char *blkdev, bool readonly, FAR void **handle)
   ret = bch->inode->u.i_bops->geometry(bch->inode, &geo);
   if (ret < 0)
     {
-      fdbg("geometry failed: %d\n", -ret);
+      ferr("geometry failed: %d\n", -ret);
       goto errout_with_bch;
     }
 
   if (!geo.geo_available)
     {
-      fdbg("geometry failed: %d\n", -ret);
+      ferr("geometry failed: %d\n", -ret);
       ret = -ENODEV;
       goto errout_with_bch;
     }
 
   if (!readonly && (!bch->inode->u.i_bops->write || !geo.geo_writeenabled))
     {
-      fdbg("write access not supported\n");
+      ferr("write access not supported\n");
       ret = -EACCES;
       goto errout_with_bch;
     }
@@ -145,7 +145,7 @@ int bchlib_setup(const char *blkdev, bool readonly, FAR void **handle)
   bch->buffer = (FAR uint8_t *)kmm_malloc(bch->sectsize);
   if (!bch->buffer)
     {
-      fdbg("Failed to allocate sector buffer\n");
+      ferr("Failed to allocate sector buffer\n");
       ret = -ENOMEM;
       goto errout_with_bch;
     }
diff --git a/drivers/bch/bchlib_write.c b/drivers/bch/bchlib_write.c
index b1636c6d45..06d3f39dc7 100644
--- a/drivers/bch/bchlib_write.c
+++ b/drivers/bch/bchlib_write.c
@@ -162,7 +162,7 @@ ssize_t bchlib_write(FAR void *handle, FAR const char *buffer, size_t offset, si
                                         sector, nsectors);
       if (ret < 0)
         {
-          fdbg("Write failed: %d\n", ret);
+          ferr("Write failed: %d\n", ret);
           return ret;
         }
 
@@ -204,7 +204,7 @@ ssize_t bchlib_write(FAR void *handle, FAR const char *buffer, size_t offset, si
   ret = bchlib_flushsector(bch);
   if (ret < 0)
     {
-      fdbg("Flush failed: %d\n", ret);
+      ferr("Flush failed: %d\n", ret);
       return ret;
     }
 
diff --git a/drivers/can.c b/drivers/can.c
index fcdd4e2425..17fb75a401 100644
--- a/drivers/can.c
+++ b/drivers/can.c
@@ -100,12 +100,12 @@
 /* Non-standard debug that may be enabled just for testing CAN */
 
 #ifdef CONFIG_DEBUG_CAN
-#  define candbg    dbg
+#  define canerr    err
 #  define caninfo   info
 #  define canllerr  llerr
 #  define canllinfo llinfo
 #else
-#  define candbg(x...)
+#  define canerr(x...)
 #  define caninfo(x...)
 #  define canllerr(x...)
 #  define canllinfo(x...)
@@ -702,7 +702,7 @@ static int can_xmit(FAR struct can_dev_s *dev)
       ret = dev_send(dev, &dev->cd_xmit.tx_buffer[tmpndx]);
       if (ret != OK)
         {
-          candbg("dev_send failed: %d\n", ret);
+          canerr("dev_send failed: %d\n", ret);
           break;
         }
     }
diff --git a/drivers/i2c/i2c_driver.c b/drivers/i2c/i2c_driver.c
index 817e6058e9..83b8aa37e3 100644
--- a/drivers/i2c/i2c_driver.c
+++ b/drivers/i2c/i2c_driver.c
@@ -66,10 +66,10 @@
 /* CONFIG_DEBUG_I2C + CONFIG_DEBUG_FEATURES enables general I2C debug output. */
 
 #ifdef CONFIG_DEBUG_I2C
-#  define i2cdbg dbg
+#  define i2cerr err
 #  define i2cinfo info
 #else
-#  define i2cdbg(x...)
+#  define i2cerr(x...)
 #  define i2cinfo(x...)
 #endif
 
diff --git a/drivers/input/ads7843e.c b/drivers/input/ads7843e.c
index 4626217afb..df0e24e584 100644
--- a/drivers/input/ads7843e.c
+++ b/drivers/input/ads7843e.c
@@ -427,7 +427,7 @@ static int ads7843e_waitsample(FAR struct ads7843e_dev_s *priv,
            * the failure now.
            */
 
-          idbg("sem_wait: %d\n", errno);
+          ierr("sem_wait: %d\n", errno);
           DEBUGASSERT(errno == EINTR);
           ret = -EINTR;
           goto errout;
@@ -870,7 +870,7 @@ static ssize_t ads7843e_read(FAR struct file *filep, FAR char *buffer, size_t le
        * handle smaller reads... but why?
        */
 
-      idbg("Unsupported read size: %d\n", len);
+      ierr("Unsupported read size: %d\n", len);
       return -ENOSYS;
     }
 
@@ -881,7 +881,7 @@ static ssize_t ads7843e_read(FAR struct file *filep, FAR char *buffer, size_t le
     {
       /* This should only happen if the wait was cancelled by an signal */
 
-      idbg("sem_wait: %d\n", errno);
+      ierr("sem_wait: %d\n", errno);
       DEBUGASSERT(errno == EINTR);
       return -EINTR;
     }
@@ -910,7 +910,7 @@ static ssize_t ads7843e_read(FAR struct file *filep, FAR char *buffer, size_t le
         {
           /* We might have been awakened by a signal */
 
-          idbg("ads7843e_waitsample: %d\n", ret);
+          ierr("ads7843e_waitsample: %d\n", ret);
           goto errout;
         }
     }
@@ -1170,7 +1170,7 @@ int ads7843e_register(FAR struct spi_dev_s *spi,
   priv = (FAR struct ads7843e_dev_s *)kmm_malloc(sizeof(struct ads7843e_dev_s));
   if (!priv)
     {
-      idbg("kmm_malloc(%d) failed\n", sizeof(struct ads7843e_dev_s));
+      ierr("kmm_malloc(%d) failed\n", sizeof(struct ads7843e_dev_s));
       return -ENOMEM;
     }
 #endif
@@ -1197,11 +1197,11 @@ int ads7843e_register(FAR struct spi_dev_s *spi,
   ret = config->attach(config, ads7843e_interrupt);
   if (ret < 0)
     {
-      idbg("Failed to attach interrupt\n");
+      ierr("Failed to attach interrupt\n");
       goto errout_with_priv;
     }
 
-  idbg("Mode: %d Bits: 8 Frequency: %d\n",
+  ierr("Mode: %d Bits: 8 Frequency: %d\n",
        CONFIG_ADS7843E_SPIMODE, CONFIG_ADS7843E_FREQUENCY);
 
   /* Lock the SPI bus so that we have exclusive access */
@@ -1224,7 +1224,7 @@ int ads7843e_register(FAR struct spi_dev_s *spi,
   ret = register_driver(devname, &ads7843e_fops, 0666, priv);
   if (ret < 0)
     {
-      idbg("register_driver() failed: %d\n", ret);
+      ierr("register_driver() failed: %d\n", ret);
       goto errout_with_priv;
     }
 
@@ -1246,7 +1246,7 @@ int ads7843e_register(FAR struct spi_dev_s *spi,
   ret = work_queue(HPWORK, &priv->work, ads7843e_worker, priv, 0);
   if (ret != 0)
     {
-      idbg("Failed to queue work: %d\n", ret);
+      ierr("Failed to queue work: %d\n", ret);
       goto errout_with_priv;
     }
 
diff --git a/drivers/input/max11802.c b/drivers/input/max11802.c
index 97c9a6cc3f..2d579cefed 100644
--- a/drivers/input/max11802.c
+++ b/drivers/input/max11802.c
@@ -392,7 +392,7 @@ static int max11802_waitsample(FAR struct max11802_dev_s *priv,
            * the failure now.
            */
 
-          idbg("sem_wait: %d\n", errno);
+          ierr("sem_wait: %d\n", errno);
           DEBUGASSERT(errno == EINTR);
           ret = -EINTR;
           goto errout;
@@ -877,7 +877,7 @@ static ssize_t max11802_read(FAR struct file *filep, FAR char *buffer,
        * handle smaller reads... but why?
        */
 
-      idbg("Unsupported read size: %d\n", len);
+      ierr("Unsupported read size: %d\n", len);
       return -ENOSYS;
     }
 
@@ -888,7 +888,7 @@ static ssize_t max11802_read(FAR struct file *filep, FAR char *buffer,
     {
       /* This should only happen if the wait was cancelled by an signal */
 
-      idbg("sem_wait: %d\n", errno);
+      ierr("sem_wait: %d\n", errno);
       DEBUGASSERT(errno == EINTR);
       return -EINTR;
     }
@@ -917,7 +917,7 @@ static ssize_t max11802_read(FAR struct file *filep, FAR char *buffer,
         {
           /* We might have been awakened by a signal */
 
-          idbg("max11802_waitsample: %d\n", ret);
+          ierr("max11802_waitsample: %d\n", ret);
           goto errout;
         }
     }
@@ -1173,7 +1173,7 @@ int max11802_register(FAR struct spi_dev_s *spi,
   priv = (FAR struct max11802_dev_s *)kmm_malloc(sizeof(struct max11802_dev_s));
   if (!priv)
     {
-      idbg("kmm_malloc(%d) failed\n", sizeof(struct max11802_dev_s));
+      ierr("kmm_malloc(%d) failed\n", sizeof(struct max11802_dev_s));
       return -ENOMEM;
     }
 #endif
@@ -1200,11 +1200,11 @@ int max11802_register(FAR struct spi_dev_s *spi,
   ret = config->attach(config, max11802_interrupt);
   if (ret < 0)
     {
-      idbg("Failed to attach interrupt\n");
+      ierr("Failed to attach interrupt\n");
       goto errout_with_priv;
     }
 
-  idbg("Mode: %d Bits: 8 Frequency: %d\n",
+  ierr("Mode: %d Bits: 8 Frequency: %d\n",
        CONFIG_MAX11802_SPIMODE, CONFIG_MAX11802_FREQUENCY);
 
   /* Lock the SPI bus so that we have exclusive access */
@@ -1246,7 +1246,7 @@ int max11802_register(FAR struct spi_dev_s *spi,
 
   if (ret != MAX11802_MODE)
   {
-    idbg("max11802 mode readback failed: %02x\n", ret);
+    ierr("max11802 mode readback failed: %02x\n", ret);
     goto errout_with_priv;
   }
 
@@ -1258,7 +1258,7 @@ int max11802_register(FAR struct spi_dev_s *spi,
   ret = register_driver(devname, &max11802_fops, 0666, priv);
   if (ret < 0)
     {
-      idbg("register_driver() failed: %d\n", ret);
+      ierr("register_driver() failed: %d\n", ret);
       goto errout_with_priv;
     }
 
@@ -1281,7 +1281,7 @@ int max11802_register(FAR struct spi_dev_s *spi,
   ret = work_queue(HPWORK, &priv->work, max11802_worker, priv, 0);
   if (ret != 0)
     {
-      idbg("Failed to queue work: %d\n", ret);
+      ierr("Failed to queue work: %d\n", ret);
       goto errout_with_priv;
     }
 
diff --git a/drivers/input/mxt.c b/drivers/input/mxt.c
index 6f09edade1..7801b72b5b 100644
--- a/drivers/input/mxt.c
+++ b/drivers/input/mxt.c
@@ -343,16 +343,16 @@ static int mxt_getreg(FAR struct mxt_dev_s *priv, uint16_t regaddr,
 #ifdef CONFIG_I2C_RESET
           /* Perhaps the I2C bus is locked up?  Try to shake the bus free */
 
-          idbg("WARNING: I2C_TRANSFER failed: %d ... Resetting\n", ret);
+          ierr("WARNING: I2C_TRANSFER failed: %d ... Resetting\n", ret);
 
           ret = I2C_RESET(priv->i2c);
           if (ret < 0)
             {
-              idbg("ERROR: I2C_RESET failed: %d\n", ret);
+              ierr("ERROR: I2C_RESET failed: %d\n", ret);
               break;
             }
 #else
-          idbg("ERROR: I2C_TRANSFER failed: %d\n", ret);
+          ierr("ERROR: I2C_TRANSFER failed: %d\n", ret);
 #endif
         }
       else
@@ -417,15 +417,15 @@ static int mxt_putreg(FAR struct mxt_dev_s *priv, uint16_t regaddr,
 #ifdef CONFIG_I2C_RESET
           /* Perhaps the I2C bus is locked up?  Try to shake the bus free */
 
-          idbg("WARNING: I2C_TRANSFER failed: %d ... Resetting\n", ret);
+          ierr("WARNING: I2C_TRANSFER failed: %d ... Resetting\n", ret);
 
           ret = I2C_RESET(priv->i2c);
           if (ret < 0)
             {
-              idbg("ERROR: I2C_RESET failed: %d\n", ret);
+              ierr("ERROR: I2C_RESET failed: %d\n", ret);
             }
 #else
-          idbg("ERROR: I2C_TRANSFER failed: %d\n", ret);
+          ierr("ERROR: I2C_TRANSFER failed: %d\n", ret);
 #endif
         }
       else
@@ -466,7 +466,7 @@ static FAR struct mxt_object_s *mxt_object(FAR struct mxt_dev_s *priv,
         }
     }
 
-  idbg("ERROR: Invalid object type: %d\n", type);
+  ierr("ERROR: Invalid object type: %d\n", type);
   return NULL;
 }
 
@@ -483,7 +483,7 @@ static int mxt_getmessage(FAR struct mxt_dev_s *priv,
   object = mxt_object(priv, MXT_GEN_MESSAGE_T5);
   if (object == NULL)
     {
-      idbg("ERROR: mxt_object failed\n");
+      ierr("ERROR: mxt_object failed\n");
       return -EINVAL;
     }
 
@@ -558,7 +558,7 @@ static int mxt_flushmsgs(FAR struct mxt_dev_s *priv)
       ret = mxt_getmessage(priv, &msg);
       if (ret < 0)
         {
-          idbg("ERROR: mxt_getmessage failed: %d\n", ret);
+          ierr("ERROR: mxt_getmessage failed: %d\n", ret);
           return ret;
         }
     }
@@ -568,7 +568,7 @@ static int mxt_flushmsgs(FAR struct mxt_dev_s *priv)
 
   if (retries <= 0)
     {
-      idbg("ERROR: Failed to clear messages: ID=%02x\n", msg.id);
+      ierr("ERROR: Failed to clear messages: ID=%02x\n", msg.id);
       return -EBUSY;
     }
 
@@ -998,7 +998,7 @@ static void mxt_worker(FAR void *arg)
       ret = mxt_getmessage(priv, &msg);
       if (ret < 0)
         {
-          idbg("ERROR: mxt_getmessage failed: %d\n", ret);
+          ierr("ERROR: mxt_getmessage failed: %d\n", ret);
           goto errout_with_semaphore;
         }
 
@@ -1141,7 +1141,7 @@ static int mxt_open(FAR struct file *filep)
     {
       /* More than 255 opens; uint8_t overflows to zero */
 
-      idbg("ERROR: Too many opens: %d\n", priv->crefs);
+      ierr("ERROR: Too many opens: %d\n", priv->crefs);
       ret = -EMFILE;
       goto errout_with_sem;
     }
@@ -1157,7 +1157,7 @@ static int mxt_open(FAR struct file *filep)
       ret = mxt_putobject(priv, MXT_TOUCH_MULTI_T9, MXT_TOUCH_CTRL, 0x83);
       if (ret < 0)
         {
-          idbg("ERROR: Failed to enable touch: %d\n", ret);
+          ierr("ERROR: Failed to enable touch: %d\n", ret);
           goto errout_with_sem;
         }
 
@@ -1169,7 +1169,7 @@ static int mxt_open(FAR struct file *filep)
       ret = mxt_flushmsgs(priv);
       if (ret < 0)
         {
-          idbg("ERROR: mxt_flushmsgs failed: %d\n", ret);
+          ierr("ERROR: mxt_flushmsgs failed: %d\n", ret);
           mxt_putobject(priv, MXT_TOUCH_MULTI_T9, MXT_TOUCH_CTRL, 0);
           goto errout_with_sem;
         }
@@ -1233,7 +1233,7 @@ static int mxt_close(FAR struct file *filep)
           ret = mxt_putobject(priv, MXT_TOUCH_MULTI_T9, MXT_TOUCH_CTRL, 0);
           if (ret < 0)
             {
-              idbg("ERROR: Failed to disable touch: %d\n", ret);
+              ierr("ERROR: Failed to disable touch: %d\n", ret);
             }
         }
     }
@@ -1575,7 +1575,7 @@ static int mxt_poll(FAR struct file *filep, FAR struct pollfd *fds,
 
       if ((fds->events & POLLIN) == 0)
         {
-          idbg("Missing POLLIN: revents: %08x\n", fds->revents);
+          ierr("Missing POLLIN: revents: %08x\n", fds->revents);
           ret = -EDEADLK;
           goto errout;
         }
@@ -1600,7 +1600,7 @@ static int mxt_poll(FAR struct file *filep, FAR struct pollfd *fds,
 
       if (i >= CONFIG_MXT_NPOLLWAITERS)
         {
-          idbg("No availabled slot found: %d\n", i);
+          ierr("No availabled slot found: %d\n", i);
           fds->priv    = NULL;
           ret          = -EBUSY;
           goto errout;
@@ -1646,7 +1646,7 @@ static int mxt_getinfo(struct mxt_dev_s *priv)
                    sizeof(struct mxt_info_s));
   if (ret < 0)
     {
-      idbg("ERROR: mxt_getreg failed: %d\n", ret);
+      ierr("ERROR: mxt_getreg failed: %d\n", ret);
       return ret;
     }
 
@@ -1674,7 +1674,7 @@ static int mxt_getobjtab(FAR struct mxt_dev_s *priv)
                    tabsize);
   if (ret < 0)
     {
-      idbg("ERROR: Failed to object table size: %d\n", ret);
+      ierr("ERROR: Failed to object table size: %d\n", ret);
       return ret;
     }
 
@@ -1747,7 +1747,7 @@ static int mxt_hwinitialize(FAR struct mxt_dev_s *priv)
   ret = mxt_getinfo(priv);
   if (ret < 0)
     {
-      idbg("ERROR: Failed to read info registers: %d\n", ret);
+      ierr("ERROR: Failed to read info registers: %d\n", ret);
       return ret;
     }
 
@@ -1756,7 +1756,7 @@ static int mxt_hwinitialize(FAR struct mxt_dev_s *priv)
   priv->objtab = kmm_zalloc(info->nobjects * sizeof(struct mxt_object_s));
   if (priv->objtab == NULL)
     {
-      idbg("ERROR: Failed to allocate object table\n");
+      ierr("ERROR: Failed to allocate object table\n");
       return -ENOMEM;
     }
 
@@ -1773,7 +1773,7 @@ static int mxt_hwinitialize(FAR struct mxt_dev_s *priv)
   ret = mxt_putobject(priv, MXT_GEN_COMMAND_T6, MXT_COMMAND_RESET, 1);
   if (ret < 0)
     {
-      idbg("ERROR: Soft reset failed: %d\n", ret);
+      ierr("ERROR: Soft reset failed: %d\n", ret);
       goto errout_with_objtab;
     }
 
@@ -1784,7 +1784,7 @@ static int mxt_hwinitialize(FAR struct mxt_dev_s *priv)
   ret = mxt_getreg(priv, MXT_MATRIX_X_SIZE, (FAR uint8_t *)®val, 1);
   if (ret < 0)
     {
-      idbg("ERROR: Failed to get X size: %d\n", ret);
+      ierr("ERROR: Failed to get X size: %d\n", ret);
       goto errout_with_objtab;
     }
 
@@ -1793,7 +1793,7 @@ static int mxt_hwinitialize(FAR struct mxt_dev_s *priv)
   ret = mxt_getreg(priv, MXT_MATRIX_Y_SIZE, (FAR uint8_t *)®val, 1);
   if (ret < 0)
     {
-      idbg("ERROR: Failed to get Y size: %d\n", ret);
+      ierr("ERROR: Failed to get Y size: %d\n", ret);
       goto errout_with_objtab;
     }
 
@@ -1818,7 +1818,7 @@ static int mxt_hwinitialize(FAR struct mxt_dev_s *priv)
     kmm_zalloc(nslots * sizeof(struct mxt_sample_s));
   if (priv->sample == NULL)
     {
-      idbg("ERROR: Failed to allocate object table\n");
+      ierr("ERROR: Failed to allocate object table\n");
       goto errout_with_objtab;
     }
 
@@ -1874,7 +1874,7 @@ int mxt_register(FAR struct i2c_master_s *i2c,
   priv = (FAR struct mxt_dev_s *)kmm_zalloc(sizeof(struct mxt_dev_s));
   if (priv == NULL)
     {
-      idbg("ERROR: Failed allocate device structure\n");
+      ierr("ERROR: Failed allocate device structure\n");
       return -ENOMEM;
     }
 
@@ -1897,7 +1897,7 @@ int mxt_register(FAR struct i2c_master_s *i2c,
   ret = MXT_ATTACH(lower, mxt_interrupt, priv);
   if (ret < 0)
     {
-      idbg("Failed to attach interrupt\n");
+      ierr("Failed to attach interrupt\n");
       goto errout_with_priv;
     }
 
@@ -1906,7 +1906,7 @@ int mxt_register(FAR struct i2c_master_s *i2c,
   ret = mxt_hwinitialize(priv);
   if (ret < 0)
     {
-      idbg("ERROR: mxt_hwinitialize failed: %d\n", ret);
+      ierr("ERROR: mxt_hwinitialize failed: %d\n", ret);
       goto errout_with_irq;
     }
 
@@ -1918,7 +1918,7 @@ int mxt_register(FAR struct i2c_master_s *i2c,
   ret = register_driver(devname, &mxt_fops, 0666, priv);
   if (ret < 0)
     {
-      idbg("register_driver() failed: %d\n", ret);
+      ierr("register_driver() failed: %d\n", ret);
       goto errout_with_hwinit;
     }
 
diff --git a/drivers/input/stmpe811_adc.c b/drivers/input/stmpe811_adc.c
index d0fde02e1f..cdd2aaac2c 100644
--- a/drivers/input/stmpe811_adc.c
+++ b/drivers/input/stmpe811_adc.c
@@ -101,7 +101,7 @@ int stmpe811_adcinitialize(STMPE811_HANDLE handle)
   if (ret < 0)
     {
       int errval = errno;
-      idbg("sem_wait failed: %d\n", errval);
+      ierr("sem_wait failed: %d\n", errval);
       return -errval;
     }
 
@@ -161,7 +161,7 @@ int stmpe811_adcconfig(STMPE811_HANDLE handle, int pin)
   if (ret < 0)
     {
       int errval = errno;
-      idbg("sem_wait failed: %d\n", errval);
+      ierr("sem_wait failed: %d\n", errval);
       return -errval;
     }
 
@@ -169,7 +169,7 @@ int stmpe811_adcconfig(STMPE811_HANDLE handle, int pin)
 
   if ((priv->inuse & pinmask) != 0)
     {
-      idbg("PIN%d is already in-use\n", pin);
+      ierr("PIN%d is already in-use\n", pin);
       sem_post(&priv->exclsem);
       return -EBUSY;
     }
@@ -221,7 +221,7 @@ uint16_t stmpe811_adcread(STMPE811_HANDLE handle, int pin)
   if (ret < 0)
     {
       int errval = errno;
-      idbg("sem_wait failed: %d\n", errval);
+      ierr("sem_wait failed: %d\n", errval);
       return -errval;
     }
 
diff --git a/drivers/input/stmpe811_base.c b/drivers/input/stmpe811_base.c
index 863daf61f5..d4b6d50f23 100644
--- a/drivers/input/stmpe811_base.c
+++ b/drivers/input/stmpe811_base.c
@@ -422,12 +422,12 @@ uint8_t stmpe811_getreg8(FAR struct stmpe811_dev_s *priv, uint8_t regaddr)
   ret = I2C_TRANSFER(priv->i2c, msg, 2);
   if (ret < 0)
     {
-      idbg("I2C_TRANSFER failed: %d\n", ret);
+      ierr("I2C_TRANSFER failed: %d\n", ret);
       return 0;
     }
 
 #ifdef CONFIG_STMPE811_REGDEBUG
-  dbg("%02x->%02x\n", regaddr, regval);
+  err("%02x->%02x\n", regaddr, regval);
 #endif
   return regval;
 }
@@ -455,7 +455,7 @@ void stmpe811_putreg8(FAR struct stmpe811_dev_s *priv,
   int ret;
 
 #ifdef CONFIG_STMPE811_REGDEBUG
-  dbg("%02x<-%02x\n", regaddr, regval);
+  err("%02x<-%02x\n", regaddr, regval);
 #endif
 
   /* Setup to the data to be transferred.  Two bytes:  The STMPE811 register
@@ -479,7 +479,7 @@ void stmpe811_putreg8(FAR struct stmpe811_dev_s *priv,
   ret = I2C_TRANSFER(priv->i2c, &msg, 1);
   if (ret < 0)
     {
-      idbg("I2C_TRANSFER failed: %d\n", ret);
+      ierr("I2C_TRANSFER failed: %d\n", ret);
     }
 }
 #endif
@@ -530,12 +530,12 @@ uint16_t stmpe811_getreg16(FAR struct stmpe811_dev_s *priv, uint8_t regaddr)
   ret = I2C_TRANSFER(priv->i2c, msg, 2);
   if (ret < 0)
     {
-      idbg("I2C_TRANSFER failed: %d\n", ret);
+      ierr("I2C_TRANSFER failed: %d\n", ret);
       return 0;
     }
 
 #ifdef CONFIG_STMPE811_REGDEBUG
-  dbg("%02x->%02x%02x\n", regaddr, rxbuffer[0], rxbuffer[1]);
+  err("%02x->%02x%02x\n", regaddr, rxbuffer[0], rxbuffer[1]);
 #endif
   return (uint16_t)rxbuffer[0] << 8 | (uint16_t)rxbuffer[1];
 }
diff --git a/drivers/input/stmpe811_gpio.c b/drivers/input/stmpe811_gpio.c
index 7d4fc5edb8..e794f732ba 100644
--- a/drivers/input/stmpe811_gpio.c
+++ b/drivers/input/stmpe811_gpio.c
@@ -144,7 +144,7 @@ int stmpe811_gpioconfig(STMPE811_HANDLE handle, uint8_t pinconfig)
   if (ret < 0)
     {
       int errval = errno;
-      idbg("sem_wait failed: %d\n", errval);
+      ierr("sem_wait failed: %d\n", errval);
       return -errval;
     }
 
@@ -152,7 +152,7 @@ int stmpe811_gpioconfig(STMPE811_HANDLE handle, uint8_t pinconfig)
 
   if ((priv->inuse & pinmask) != 0)
     {
-      idbg("PIN%d is already in-use\n", pin);
+      ierr("PIN%d is already in-use\n", pin);
       sem_post(&priv->exclsem);
       return -EBUSY;
     }
@@ -259,7 +259,7 @@ void stmpe811_gpiowrite(STMPE811_HANDLE handle, uint8_t pinconfig, bool value)
   ret = sem_wait(&priv->exclsem);
   if (ret < 0)
     {
-      idbg("sem_wait failed: %d\n", errno);
+      ierr("sem_wait failed: %d\n", errno);
       return;
     }
 
@@ -313,7 +313,7 @@ int stmpe811_gpioread(STMPE811_HANDLE handle, uint8_t pinconfig, bool *value)
   if (ret < 0)
     {
       int errval = errno;
-      idbg("sem_wait failed: %d\n", errval);
+      ierr("sem_wait failed: %d\n", errval);
       return -errval;
     }
 
@@ -362,7 +362,7 @@ int stmpe811_gpioattach(STMPE811_HANDLE handle, uint8_t pinconfig,
   if (ret < 0)
     {
       int errval = errno;
-      idbg("sem_wait failed: %d\n", errval);
+      ierr("sem_wait failed: %d\n", errval);
       return -errval;
     }
 
diff --git a/drivers/input/stmpe811_tsc.c b/drivers/input/stmpe811_tsc.c
index d1cfa04bdc..b41f325685 100644
--- a/drivers/input/stmpe811_tsc.c
+++ b/drivers/input/stmpe811_tsc.c
@@ -315,7 +315,7 @@ static inline int stmpe811_waitsample(FAR struct stmpe811_dev_s *priv,
            * the failure now.
            */
 
-          idbg("ERROR: sem_wait failed: %d\n", errval);
+          ierr("ERROR: sem_wait failed: %d\n", errval);
           DEBUGASSERT(errval == EINTR);
 #endif
           ret = -EINTR;
@@ -677,7 +677,7 @@ static int stmpe811_poll(FAR struct file *filep, FAR struct pollfd *fds,
 
       if ((fds->events & POLLIN) == 0)
         {
-          idbg("ERROR: Missing POLLIN: revents: %08x\n", fds->revents);
+          ierr("ERROR: Missing POLLIN: revents: %08x\n", fds->revents);
           ret = -EDEADLK;
           goto errout;
         }
@@ -702,7 +702,7 @@ static int stmpe811_poll(FAR struct file *filep, FAR struct pollfd *fds,
 
       if (i >= CONFIG_STMPE811_NPOLLWAITERS)
         {
-          idbg("ERROR: No available slot found: %d\n", i);
+          ierr("ERROR: No available slot found: %d\n", i);
           fds->priv    = NULL;
           ret          = -EBUSY;
           goto errout;
@@ -907,7 +907,7 @@ int stmpe811_register(STMPE811_HANDLE handle, int minor)
   if (ret < 0)
     {
       int errval = errno;
-      idbg("ERROR: sem_wait failed: %d\n", errval);
+      ierr("ERROR: sem_wait failed: %d\n", errval);
       return -errval;
     }
 
@@ -915,7 +915,7 @@ int stmpe811_register(STMPE811_HANDLE handle, int minor)
 
   if ((priv->inuse & TSC_PIN_SET) != 0)
     {
-      idbg("ERROR: TSC pins is already in-use: %02x\n", priv->inuse);
+      ierr("ERROR: TSC pins is already in-use: %02x\n", priv->inuse);
       sem_post(&priv->exclsem);
       return -EBUSY;
     }
@@ -932,7 +932,7 @@ int stmpe811_register(STMPE811_HANDLE handle, int minor)
   priv->wdog      = wd_create();
   if (!priv->wdog)
     {
-      idbg("ERROR: Failed to create a watchdog\n", errno);
+      ierr("ERROR: Failed to create a watchdog\n", errno);
       sem_post(&priv->exclsem);
       return -ENOSPC;
     }
@@ -943,7 +943,7 @@ int stmpe811_register(STMPE811_HANDLE handle, int minor)
   ret = register_driver(devname, &g_stmpe811fops, 0666, priv);
   if (ret < 0)
     {
-      idbg("ERROR: Failed to register driver %s: %d\n", devname, ret);
+      ierr("ERROR: Failed to register driver %s: %d\n", devname, ret);
       sem_post(&priv->exclsem);
       return ret;
     }
diff --git a/drivers/input/tsc2007.c b/drivers/input/tsc2007.c
index 5d478551c7..1361617621 100644
--- a/drivers/input/tsc2007.c
+++ b/drivers/input/tsc2007.c
@@ -456,7 +456,7 @@ static int tsc2007_activate(FAR struct tsc2007_dev_s *priv, uint8_t cmd)
    ret = I2C_TRANSFER(priv->i2c, &msg, 1);
    if (ret < 0)
      {
-       idbg("I2C_TRANSFER failed: %d\n", ret);
+       ierr("I2C_TRANSFER failed: %d\n", ret);
      }
    return ret;
 }
@@ -495,7 +495,7 @@ static int tsc2007_transfer(FAR struct tsc2007_dev_s *priv, uint8_t cmd)
    ret = I2C_TRANSFER(priv->i2c, &msg, 1);
    if (ret < 0)
      {
-       idbg("I2C_TRANSFER failed: %d\n", ret);
+       ierr("I2C_TRANSFER failed: %d\n", ret);
        return ret;
      }
 
@@ -540,7 +540,7 @@ static int tsc2007_transfer(FAR struct tsc2007_dev_s *priv, uint8_t cmd)
    ret = I2C_TRANSFER(priv->i2c, &msg, 1);
    if (ret < 0)
      {
-       idbg("I2C_TRANSFER failed: %d\n", ret);
+       ierr("I2C_TRANSFER failed: %d\n", ret);
        return ret;
      }
 
@@ -672,7 +672,7 @@ static void tsc2007_worker(FAR void *arg)
 
       if (z1 == 0)
         {
-          idbg("Z1 zero\n");
+          ierr("Z1 zero\n");
           pressure = 0;
         }
       else
@@ -687,7 +687,7 @@ static void tsc2007_worker(FAR void *arg)
 
           if (pressure > 0x0fff)
             {
-              idbg("Dropped out-of-range pressure: %d\n", pressure);
+              ierr("Dropped out-of-range pressure: %d\n", pressure);
               pressure = 0;
             }
         }
@@ -1131,7 +1131,7 @@ static int tsc2007_poll(FAR struct file *filep, FAR struct pollfd *fds,
 
       if ((fds->events & POLLIN) == 0)
         {
-          idbg("Missing POLLIN: revents: %08x\n", fds->revents);
+          ierr("Missing POLLIN: revents: %08x\n", fds->revents);
           ret = -EDEADLK;
           goto errout;
         }
@@ -1156,7 +1156,7 @@ static int tsc2007_poll(FAR struct file *filep, FAR struct pollfd *fds,
 
       if (i >= CONFIG_TSC2007_NPOLLWAITERS)
         {
-          idbg("No availabled slot found: %d\n", i);
+          ierr("No availabled slot found: %d\n", i);
           fds->priv    = NULL;
           ret          = -EBUSY;
           goto errout;
@@ -1242,7 +1242,7 @@ int tsc2007_register(FAR struct i2c_master_s *dev,
   priv = (FAR struct tsc2007_dev_s *)kmm_malloc(sizeof(struct tsc2007_dev_s));
   if (!priv)
     {
-      idbg("kmm_malloc(%d) failed\n", sizeof(struct tsc2007_dev_s));
+      ierr("kmm_malloc(%d) failed\n", sizeof(struct tsc2007_dev_s));
       return -ENOMEM;
     }
 #endif
@@ -1265,7 +1265,7 @@ int tsc2007_register(FAR struct i2c_master_s *dev,
   ret = config->attach(config, tsc2007_interrupt);
   if (ret < 0)
     {
-      idbg("Failed to attach interrupt\n");
+      ierr("Failed to attach interrupt\n");
       goto errout_with_priv;
     }
 
@@ -1276,7 +1276,7 @@ int tsc2007_register(FAR struct i2c_master_s *dev,
   ret = tsc2007_transfer(priv, TSC2007_ENABLE_PENIRQ);
   if (ret < 0)
     {
-      idbg("tsc2007_transfer failed: %d\n", ret);
+      ierr("tsc2007_transfer failed: %d\n", ret);
       goto errout_with_priv;
     }
 
@@ -1288,7 +1288,7 @@ int tsc2007_register(FAR struct i2c_master_s *dev,
   ret = register_driver(devname, &tsc2007_fops, 0666, priv);
   if (ret < 0)
     {
-      idbg("register_driver() failed: %d\n", ret);
+      ierr("register_driver() failed: %d\n", ret);
       goto errout_with_priv;
     }
 
@@ -1311,7 +1311,7 @@ int tsc2007_register(FAR struct i2c_master_s *dev,
   ret = work_queue(HPWORK, &priv->work, tsc2007_worker, priv, 0);
   if (ret != 0)
     {
-      idbg("Failed to queue work: %d\n", ret);
+      ierr("Failed to queue work: %d\n", ret);
       goto errout_with_priv;
     }
 
diff --git a/drivers/lcd/ili9341.c b/drivers/lcd/ili9341.c
index e802057f46..af6ffaef16 100644
--- a/drivers/lcd/ili9341.c
+++ b/drivers/lcd/ili9341.c
@@ -370,10 +370,10 @@
 /* Debug option */
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg       dbg
+#  define lcderr       err
 #  define lcdinfo      info
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -772,7 +772,7 @@ static int ili9341_hwinitialize(FAR struct ili9341_dev_s *dev)
 
   /* Select spi device */
 
-  lcddbg("Initialize lcd driver\n");
+  lcderr("Initialize lcd driver\n");
   lcd->select(lcd);
 
 #ifdef CONFIG_DEBUG_LCD
@@ -780,13 +780,13 @@ static int ili9341_hwinitialize(FAR struct ili9341_dev_s *dev)
 
   lcd->sendcmd(lcd, ILI9341_READ_ID1);
   lcd->recvparam(lcd, ¶m);
-  lcddbg("ili9341 LCD driver: LCD modules manufacturer ID: %d\n", param);
+  lcderr("ili9341 LCD driver: LCD modules manufacturer ID: %d\n", param);
   lcd->sendcmd(lcd, ILI9341_READ_ID2);
   lcd->recvparam(lcd, ¶m);
-  lcddbg("ili9341 LCD driver: LCD modules driver version ID: %d\n", param);
+  lcderr("ili9341 LCD driver: LCD modules driver version ID: %d\n", param);
   lcd->sendcmd(lcd, ILI9341_READ_ID3);
   lcd->recvparam(lcd, ¶m);
-  lcddbg("ili9341 LCD driver: LCD modules driver ID: %d\n", param);
+  lcderr("ili9341 LCD driver: LCD modules driver ID: %d\n", param);
 #endif
 
   /* Reset the lcd display to the default state */
@@ -1020,7 +1020,7 @@ static int ili9341_getpower(FAR struct lcd_dev_s *dev)
 
   if (priv)
     {
-      lcddbg("%d\n", priv->power);
+      lcderr("%d\n", priv->power);
 
       return priv->power;
     }
@@ -1053,7 +1053,7 @@ static int ili9341_setpower(FAR struct lcd_dev_s *dev, int power)
 
   if (dev)
     {
-      lcddbg("%d\n", power);
+      lcderr("%d\n", power);
 
       lcd->select(lcd);
 
diff --git a/drivers/lcd/memlcd.c b/drivers/lcd/memlcd.c
index 32bdd216a1..37d76345fb 100644
--- a/drivers/lcd/memlcd.c
+++ b/drivers/lcd/memlcd.c
@@ -112,10 +112,10 @@
 /* Debug */
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg(format, ...)  dbg(format, ##__VA_ARGS__)
+#  define lcderr(format, ...)  err(format, ##__VA_ARGS__)
 #  define lcdinfo(format, ...) info(format, ##__VA_ARGS__)
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -339,7 +339,7 @@ static void memlcd_deselect(FAR struct spi_dev_s *spi)
 static inline void memlcd_clear(FAR struct memlcd_dev_s *mlcd)
 {
   uint16_t cmd = MEMLCD_CMD_ALL_CLEAR;
-  lcddbg("Clear display\n");
+  lcderr("Clear display\n");
   memlcd_select(mlcd->spi);
   /* XXX Ensure 2us here */
   SPI_SNDBLOCK(mlcd->spi, &cmd, 2);
@@ -594,7 +594,7 @@ static int memlcd_getpower(FAR struct lcd_dev_s *dev)
 {
   FAR struct memlcd_dev_s *mlcd = (FAR struct memlcd_dev_s *)dev;
   DEBUGASSERT(mlcd);
-  lcddbg("%d\n", mlcd->power);
+  lcderr("%d\n", mlcd->power);
   return mlcd->power;
 }
 
@@ -611,7 +611,7 @@ static int memlcd_setpower(FAR struct lcd_dev_s *dev, int power)
 {
   struct memlcd_dev_s *mlcd = (struct memlcd_dev_s *)dev;
   DEBUGASSERT(mlcd && (unsigned)power <= CONFIG_LCD_MAXPOWER && mlcd->spi);
-  lcddbg("%d\n", power);
+  lcderr("%d\n", power);
   mlcd->power = power;
 
   if (power > 0)
@@ -639,7 +639,7 @@ static int memlcd_getcontrast(struct lcd_dev_s *dev)
 {
   struct memlcd_dev_s *mlcd = (struct memlcd_dev_s *)dev;
   DEBUGASSERT(mlcd);
-  lcddbg("contrast: %d\n", mlcd->contrast);
+  lcderr("contrast: %d\n", mlcd->contrast);
   return mlcd->contrast;
 }
 
@@ -655,7 +655,7 @@ static int memlcd_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
 {
   struct memlcd_dev_s *mlcd = (struct memlcd_dev_s *)dev;
   DEBUGASSERT(mlcd);
-  lcddbg("contrast: %d\n", contrast);
+  lcderr("contrast: %d\n", contrast);
   if (contrast > MEMLCD_MAXCONTRAST)
     {
       contrast = MEMLCD_MAXCONTRAST;
@@ -710,6 +710,6 @@ FAR struct lcd_dev_s *memlcd_initialize(FAR struct spi_dev_s *spi,
 
   mlcd->priv->attachirq(memlcd_extcominisr);
 
-  lcddbg("done\n");
+  lcderr("done\n");
   return &mlcd->dev;
 }
diff --git a/drivers/lcd/mio283qt2.c b/drivers/lcd/mio283qt2.c
index c6f6eabb06..531f83e6d0 100644
--- a/drivers/lcd/mio283qt2.c
+++ b/drivers/lcd/mio283qt2.c
@@ -240,10 +240,10 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg              dbg
+#  define lcderr              err
 #  define lcdinfo             info
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -820,7 +820,7 @@ static inline int mio283qt2_hwinitialize(FAR struct mio283qt2_dev_s *priv)
 
 #ifndef CONFIG_LCD_NOGETRUN
   id = mio283qt2_readreg(lcd, 0x00);
-  lcddbg("LCD ID: %04x\n", id);
+  lcderr("LCD ID: %04x\n", id);
 
   /* Check if the ID is for the MIO283QT2 */
 
@@ -926,7 +926,7 @@ static inline int mio283qt2_hwinitialize(FAR struct mio283qt2_dev_s *priv)
 #ifndef CONFIG_LCD_NOGETRUN
   else
     {
-      lcddbg("Unsupported LCD type\n");
+      lcderr("Unsupported LCD type\n");
       ret = -ENODEV;
     }
 #endif
diff --git a/drivers/lcd/mio283qt9a.c b/drivers/lcd/mio283qt9a.c
index 9bd4938333..e4eb342a69 100644
--- a/drivers/lcd/mio283qt9a.c
+++ b/drivers/lcd/mio283qt9a.c
@@ -139,10 +139,10 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg              dbg
+#  define lcderr              err
 #  define lcdinfo             info
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -819,7 +819,7 @@ static inline int mio283qt9a_hwinitialize(FAR struct mio283qt9a_dev_s *priv)
 #ifndef CONFIG_LCD_NOGETRUN
   else
     {
-      lcddbg("Unsupported LCD type\n");
+      lcderr("Unsupported LCD type\n");
       ret = -ENODEV;
     }
 #endif
diff --git a/drivers/lcd/nokia6100.c b/drivers/lcd/nokia6100.c
index 72e8dc7870..227220d6f3 100644
--- a/drivers/lcd/nokia6100.c
+++ b/drivers/lcd/nokia6100.c
@@ -308,9 +308,9 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_LCD_REGDEBUG
-# define lcddbg(format, ...) llinfo(format, ##__VA_ARGS__)
+# define lcderr(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
-# define lcddbg(x...)
+# define lcderr(x...)
 #endif
 
 /**************************************************************************************
@@ -666,7 +666,7 @@ static void nokia_select(FAR struct spi_dev_s *spi)
    * devices competing for the SPI bus
    */
 
-  lcddbg("SELECTED\n");
+  lcderr("SELECTED\n");
   SPI_LOCK(spi, true);
   SPI_SELECT(spi, SPIDEV_DISPLAY, true);
 
@@ -700,7 +700,7 @@ static void nokia_deselect(FAR struct spi_dev_s *spi)
 {
   /* De-select Nokia 6100 chip and relinquish the SPI bus. */
 
-  lcddbg("DE-SELECTED\n");
+  lcderr("DE-SELECTED\n");
   SPI_SELECT(spi, SPIDEV_DISPLAY, false);
   SPI_LOCK(spi, false);
 }
@@ -717,7 +717,7 @@ static void nokia_sndcmd(FAR struct spi_dev_s *spi, const uint8_t cmd)
 {
   /* Select the LCD */
 
-  lcddbg("cmd: %02x\n", cmd);
+  lcderr("cmd: %02x\n", cmd);
   nokia_select(spi);
 
   /* Send the command. Bit 8 == 0 denotes a command */
@@ -743,7 +743,7 @@ static void nokia_cmddata(FAR struct spi_dev_s *spi, uint8_t cmd, int datlen,
   uint16_t *rowbuf = g_rowbuf;
   int i;
 
-  lcddbg("cmd: %02x datlen: %d\n", cmd, datlen);
+  lcderr("cmd: %02x datlen: %d\n", cmd, datlen);
   DEBUGASSERT(datlen <= NOKIA_STRIDE);
 
   /* Copy the command into the line buffer. Bit 8 == 0 denotes a command. */
@@ -800,7 +800,7 @@ static void nokia_cmdarray(FAR struct spi_dev_s *spi, int len, const uint8_t *cm
 
   for (i = 0; i < len; i++)
     {
-      lcddbg("cmddata[%d]: %02x\n", i, cmddata[i]);
+      lcderr("cmddata[%d]: %02x\n", i, cmddata[i]);
     }
 #endif
   nokia_cmddata(spi, cmddata[0], len-1, &cmddata[1]);
diff --git a/drivers/lcd/p14201.c b/drivers/lcd/p14201.c
index 5a5164cfe3..ad1513e05d 100644
--- a/drivers/lcd/p14201.c
+++ b/drivers/lcd/p14201.c
@@ -180,9 +180,9 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_LCD_RITDEBUG
-#  define ritdbg(format, ...)  info(format, ##__VA_ARGS__)
+#  define riterr(format, ...)  info(format, ##__VA_ARGS__)
 #else
-#  define ritdbg(x...)
+#  define riterr(x...)
 #endif
 
 /**************************************************************************************
@@ -508,7 +508,7 @@ static void rit_sndbytes(FAR struct rit_dev_s *priv, FAR const uint8_t *buffer,
   FAR struct spi_dev_s *spi = priv->spi;
   uint8_t tmp;
 
-  ritdbg("buflen: %d cmd: %s [%02x %02x %02x]\n",
+  riterr("buflen: %d cmd: %s [%02x %02x %02x]\n",
          buflen, cmd ? "YES" : "NO", buffer[0], buffer[1], buffer[2]);
   DEBUGASSERT(spi);
 
@@ -552,7 +552,7 @@ static void rit_sndcmds(FAR struct rit_dev_s *priv, FAR const uint8_t *table)
 
   while ((cmdlen = *table++) != 0)
     {
-      ritdbg("command: %02x cmdlen: %d\n", *table, cmdlen);
+      riterr("command: %02x cmdlen: %d\n", *table, cmdlen);
       rit_sndcmd(priv, table, cmdlen);
       table += cmdlen;
     }
@@ -578,7 +578,7 @@ static inline void rit_clear(FAR struct rit_dev_s *priv)
   FAR uint8_t *ptr = g_framebuffer;
   unsigned int row;
 
-  ritdbg("Clear display\n");
+  riterr("Clear display\n");
 
   /* Initialize the framebuffer */
 
@@ -605,7 +605,7 @@ static inline void rit_clear(FAR struct rit_dev_s *priv)
 {
   unsigned int row;
 
-  ritdbg("Clear display\n");
+  riterr("Clear display\n");
 
   /* Create a black row */
 
@@ -655,7 +655,7 @@ static int rit_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer,
   int aend;
   int i;
 
-  ritdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  riterr("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer);
 
   /* Toss out the special case of the empty run now */
@@ -678,7 +678,7 @@ static int rit_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer,
   start = col >> 1;
   aend  = (col + npixels) >> 1;
   end   = (col + npixels + 1) >> 1;
-  ritdbg("start: %d aend: %d end: %d\n", start, aend, end);
+  riterr("start: %d aend: %d end: %d\n", start, aend, end);
 
   /* Copy the run into the framebuffer, handling nibble alignment.
    *
@@ -814,7 +814,7 @@ static int rit_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer,
   FAR struct rit_dev_s *priv = (FAR struct rit_dev_s *)&g_oleddev;
   uint8_t cmd[3];
 
-  ritdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  riterr("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer);
 
   if (npixels > 0)
@@ -885,7 +885,7 @@ static int rit_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
   int aend;
   int i;
 
-  ritdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
+  riterr("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer);
 
   /* Can't read from OLED GDDRAM in SPI mode, but we can read from the framebuffer */
diff --git a/drivers/lcd/pcf8574_lcd_backpack.c b/drivers/lcd/pcf8574_lcd_backpack.c
index 8cda5412ec..e0fa2315fa 100644
--- a/drivers/lcd/pcf8574_lcd_backpack.c
+++ b/drivers/lcd/pcf8574_lcd_backpack.c
@@ -79,10 +79,10 @@
 #define CMD_SET_DDADDR      0x80
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg            dbg
+#  define lcderr            err
 #  define lcdinfo           info
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
diff --git a/drivers/lcd/ra8875.c b/drivers/lcd/ra8875.c
index 11aad5b137..96c7a637ff 100644
--- a/drivers/lcd/ra8875.c
+++ b/drivers/lcd/ra8875.c
@@ -175,10 +175,10 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg  dbg
+#  define lcderr  err
 #  define lcdinfo info
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -574,8 +574,8 @@ static void ra8875_showrun(FAR struct ra8875_dev_s *priv, fb_coord_t row,
 
       if (priv->firstrow != priv->lastrow)
         {
-          lcddbg("...\n");
-          lcddbg("%s row: %d col: %d npixels: %d\n",
+          lcderr("...\n");
+          lcderr("%s row: %d col: %d npixels: %d\n",
                  priv->put ? "PUT" : "GET",
                  priv->lastrow, priv->col, priv->npixels);
         }
@@ -584,7 +584,7 @@ static void ra8875_showrun(FAR struct ra8875_dev_s *priv, fb_coord_t row,
        * new sequence
        */
 
-      lcddbg("%s row: %d col: %d npixels: %d\n",
+      lcderr("%s row: %d col: %d npixels: %d\n",
              put ? "PUT" : "GET", row, col, npixels);
 
       /* And save information about the run so that we can detect continuations
diff --git a/drivers/lcd/skeleton.c b/drivers/lcd/skeleton.c
index 7b4d7a6034..53b343b3a6 100644
--- a/drivers/lcd/skeleton.c
+++ b/drivers/lcd/skeleton.c
@@ -90,9 +90,9 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_LCD_SKELDEBUG
-# define skeldbg(format, ...)  info(format, ##__VA_ARGS__)
+# define skelerr(format, ...)  info(format, ##__VA_ARGS__)
 #else
-# define skeldbg(x...)
+# define skelerr(x...)
 #endif
 
 /**************************************************************************************
diff --git a/drivers/lcd/ssd1289.c b/drivers/lcd/ssd1289.c
index 98e994d17f..fcd124f6dc 100644
--- a/drivers/lcd/ssd1289.c
+++ b/drivers/lcd/ssd1289.c
@@ -229,10 +229,10 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg  dbg
+#  define lcderr  err
 #  define lcdinfo info
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -543,8 +543,8 @@ static void ssd1289_showrun(FAR struct ssd1289_dev_s *priv, fb_coord_t row,
 
       if (priv->firstrow != priv->lastrow)
         {
-          lcddbg("...\n");
-          lcddbg("%s row: %d col: %d npixels: %d\n",
+          lcderr("...\n");
+          lcderr("%s row: %d col: %d npixels: %d\n",
                  priv->put ? "PUT" : "GET",
                  priv->lastrow, priv->col, priv->npixels);
         }
@@ -553,7 +553,7 @@ static void ssd1289_showrun(FAR struct ssd1289_dev_s *priv, fb_coord_t row,
        * new sequence
        */
 
-      lcddbg("%s row: %d col: %d npixels: %d\n",
+      lcderr("%s row: %d col: %d npixels: %d\n",
              put ? "PUT" : "GET", row, col, npixels);
 
       /* And save information about the run so that we can detect continuations
@@ -1020,7 +1020,7 @@ static inline int ssd1289_hwinitialize(FAR struct ssd1289_dev_s *priv)
   id = ssd1289_readreg(lcd, SSD1289_DEVCODE);
   if (id != 0)
     {
-      lcddbg("LCD ID: %04x\n", id);
+      lcderr("LCD ID: %04x\n", id);
     }
 
   /* If we could not get the ID, then let's just assume that this is an SSD1289.
@@ -1030,7 +1030,7 @@ static inline int ssd1289_hwinitialize(FAR struct ssd1289_dev_s *priv)
 
   else
     {
-      lcddbg("No LCD ID, assuming SSD1289\n");
+      lcderr("No LCD ID, assuming SSD1289\n");
       id = SSD1289_DEVCODE_VALUE;
     }
 
@@ -1273,7 +1273,7 @@ static inline int ssd1289_hwinitialize(FAR struct ssd1289_dev_s *priv)
 #ifndef CONFIG_LCD_NOGETRUN
   else
     {
-      lcddbg("Unsupported LCD type\n");
+      lcderr("Unsupported LCD type\n");
       ret = -ENODEV;
     }
 #endif
diff --git a/drivers/lcd/ssd1306.h b/drivers/lcd/ssd1306.h
index fb71377279..11fce32c73 100644
--- a/drivers/lcd/ssd1306.h
+++ b/drivers/lcd/ssd1306.h
@@ -212,10 +212,10 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg(format, ...)     dbg(format, ##__VA_ARGS__)
+#  define lcderr(format, ...)     err(format, ##__VA_ARGS__)
 #  define lcdinfo(format, ...)    info(format, ##__VA_ARGS__)
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
diff --git a/drivers/lcd/ssd1306_i2c.c b/drivers/lcd/ssd1306_i2c.c
index 30ca9a664f..a3c30fd702 100644
--- a/drivers/lcd/ssd1306_i2c.c
+++ b/drivers/lcd/ssd1306_i2c.c
@@ -94,7 +94,7 @@ void ssd1306_sendbyte(FAR struct ssd1306_dev_s *priv, uint8_t regval)
   ret = I2C_TRANSFER(priv->i2c, &msg, 1);
   if (ret < 0)
     {
-      sndbg("I2C_TRANSFER failed: %d\n", ret);
+      snerr("I2C_TRANSFER failed: %d\n", ret);
     }
 }
 
@@ -130,7 +130,7 @@ void ssd1306_sendblk(FAR struct ssd1306_dev_s *priv, uint8_t *data, uint8_t len)
   ret = I2C_TRANSFER(priv->i2c, &msg, 1);
   if (ret < 0)
     {
-      sndbg("I2C_TRANSFER failed: %d\n", ret);
+      snerr("I2C_TRANSFER failed: %d\n", ret);
     }
 }
 
diff --git a/drivers/lcd/ssd1351.c b/drivers/lcd/ssd1351.c
index 00908cee66..a9e799e7ca 100644
--- a/drivers/lcd/ssd1351.c
+++ b/drivers/lcd/ssd1351.c
@@ -499,7 +499,7 @@ static void ssd1351_select(FAR struct ssd1351_dev_s *priv)
    * competing for the SPI bus
    */
 
-  gdbg("SELECTED\n");
+  gerr("SELECTED\n");
   SPI_LOCK(spi, true);
   SPI_SELECT(spi, SPIDEV_DISPLAY, true);
 
@@ -529,7 +529,7 @@ static void ssd1351_deselect(FAR struct ssd1351_dev_s *priv)
 
   /* De-select the chip and relinquish the SPI bus */
 
-  gdbg("DE-SELECTED\n");
+  gerr("DE-SELECTED\n");
   SPI_SELECT(spi, SPIDEV_DISPLAY, false);
   SPI_LOCK(spi, false);
 }
diff --git a/drivers/lcd/st7565.c b/drivers/lcd/st7565.c
index 8bcaea643c..b50b873647 100644
--- a/drivers/lcd/st7565.c
+++ b/drivers/lcd/st7565.c
@@ -179,9 +179,9 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_LCD_ST7565DEBUG
-#  define st7565dbg(format, ...)  info(format, ##__VA_ARGS__)
+#  define st7565err(format, ...)  info(format, ##__VA_ARGS__)
 #else
-#  define st7565dbg(x...)
+#  define st7565err(x...)
 #endif
 
 /**************************************************************************************
diff --git a/drivers/lcd/st7567.c b/drivers/lcd/st7567.c
index ce5b06a92d..05bce776f9 100644
--- a/drivers/lcd/st7567.c
+++ b/drivers/lcd/st7567.c
@@ -209,9 +209,9 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_LCD_ST7567DEBUG
-# define st7567dbg(format, ...)  info(format, ##__VA_ARGS__)
+# define st7567err(format, ...)  info(format, ##__VA_ARGS__)
 #else
-# define st7567dbg(x...)
+# define st7567err(x...)
 #endif
 
 /**************************************************************************************
diff --git a/drivers/lcd/ug-2864ambag01.c b/drivers/lcd/ug-2864ambag01.c
index 21c4215631..54d003f6f5 100644
--- a/drivers/lcd/ug-2864ambag01.c
+++ b/drivers/lcd/ug-2864ambag01.c
@@ -263,10 +263,10 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg(format, ...)      dbg(format, ##__VA_ARGS__)
+#  define lcderr(format, ...)      err(format, ##__VA_ARGS__)
 #  define lcdinfo(format, ...)     info(format, ##__VA_ARGS__)
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
diff --git a/drivers/lcd/ug-9664hswag01.c b/drivers/lcd/ug-9664hswag01.c
index 4f427d69a9..b93b5e60f3 100644
--- a/drivers/lcd/ug-9664hswag01.c
+++ b/drivers/lcd/ug-9664hswag01.c
@@ -224,9 +224,9 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-# define lcddbg(format, ...)  info(format, ##__VA_ARGS__)
+# define lcderr(format, ...)  info(format, ##__VA_ARGS__)
 #else
-# define lcddbg(x...)
+# define lcderr(x...)
 #endif
 
 /**************************************************************************************
diff --git a/drivers/leds/pca9635pw.c b/drivers/leds/pca9635pw.c
index 452891555a..7bb8f95d8b 100644
--- a/drivers/leds/pca9635pw.c
+++ b/drivers/leds/pca9635pw.c
@@ -105,7 +105,7 @@ static int pca9635pw_i2c_write_byte(FAR struct pca9635pw_dev_s *priv,
 {
   struct i2c_config_s config;
 
-  dbg("pca9635pw_i2c_write_byte\n");
+  err("pca9635pw_i2c_write_byte\n");
 
   /* assemble the 2 byte message comprised of reg_addr and reg_val */
 
@@ -123,14 +123,14 @@ static int pca9635pw_i2c_write_byte(FAR struct pca9635pw_dev_s *priv,
 
   /* Write the register address followed by the data (no RESTART) */
 
-  dbg("i2c addr: 0x%02X reg addr: 0x%02X value: 0x%02X\n", priv->i2c_addr,
+  err("i2c addr: 0x%02X reg addr: 0x%02X value: 0x%02X\n", priv->i2c_addr,
       buffer[0], buffer[1]);
 
 
   ret = i2c_write(priv->i2c, &config, buffer, BUFFER_SIZE);
   if (ret != OK)
     {
-      dbg("i2c_write returned error code %d\n", ret);
+      err("i2c_write returned error code %d\n", ret);
       return ret;
     }
 
@@ -173,7 +173,7 @@ static int pca9635pw_set_led_mode(FAR struct pca9635pw_dev_s *priv,
 
 static int pca9635pw_open(FAR struct file *filep)
 {
-  dbg("pca9635pw_open\n");
+  err("pca9635pw_open\n");
 
   FAR struct inode *inode = filep->f_inode;
   FAR struct pca9635pw_dev_s *priv = inode->i_private;
@@ -192,7 +192,7 @@ static int pca9635pw_open(FAR struct file *filep)
                                  PCA9635PW_MODE_1_INITIAL_VALUE);
   if (ret != OK)
     {
-      dbg("Could not set initial config for PCA9635PW_MODE_1\n");
+      err("Could not set initial config for PCA9635PW_MODE_1\n");
       return ret;
     }
 
@@ -209,7 +209,7 @@ static int pca9635pw_open(FAR struct file *filep)
                                  PCA9635PW_MODE_2_INITIAL_VALUE);
   if (ret != OK)
     {
-      dbg("Could not set initial config for PCA9635PW_MODE_2\n");
+      err("Could not set initial config for PCA9635PW_MODE_2\n");
       return ret;
     }
 
@@ -227,7 +227,7 @@ static int pca9635pw_open(FAR struct file *filep)
   ret = pca9635pw_set_led_mode(priv, PCA9635PW_LED_OUT_x_MODE_2);
   if (ret != OK)
     {
-      dbg("Could not set led driver outputs to MODE2 (LED's brightness are "
+      err("Could not set led driver outputs to MODE2 (LED's brightness are "
           "controlled by pwm registers)\n");
       return ret;
     }
@@ -245,7 +245,7 @@ static int pca9635pw_open(FAR struct file *filep)
 
 static int pca9635pw_close(FAR struct file *filep)
 {
-  dbg("pca9635pw_close\n");
+  err("pca9635pw_close\n");
 
   FAR struct inode *inode = filep->f_inode;
   FAR struct pca9635pw_dev_s *priv = inode->i_private;
@@ -257,7 +257,7 @@ static int pca9635pw_close(FAR struct file *filep)
   ret = pca9635pw_set_led_mode(priv, PCA9635PW_LED_OUT_x_MODE_0);
   if (ret != OK)
     {
-      dbg("Could not set led driver outputs to MODE0 (LED's are off)\n");
+      err("Could not set led driver outputs to MODE0 (LED's are off)\n");
       return ret;
     }
 
@@ -285,14 +285,14 @@ static int pca9635pw_close(FAR struct file *filep)
 
 static int pca9635pw_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 {
-  dbg("pca9635pw_ioctl\n");
+  err("pca9635pw_ioctl\n");
 
   FAR struct inode *inode = filep->f_inode;
   FAR struct pca9635pw_dev_s *priv = inode->i_private;
 
   int ret = OK;
 
-  dbg("cmd: %d arg: %ld\n", cmd, arg);
+  err("cmd: %d arg: %ld\n", cmd, arg);
 
   switch (cmd)
     {
@@ -319,7 +319,7 @@ static int pca9635pw_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
     default:
       {
-        dbg("Unrecognized cmd: %d\n", cmd);
+        err("Unrecognized cmd: %d\n", cmd);
         ret = -ENOTTY;
       }
       break;
@@ -364,7 +364,7 @@ int pca9635pw_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
 
   if (priv == NULL)
     {
-      dbg("Failed to allocate instance of pca9635pw_dev_s\n");
+      err("Failed to allocate instance of pca9635pw_dev_s\n");
       return -ENOMEM;
     }
 
@@ -376,7 +376,7 @@ int pca9635pw_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
   int const ret = register_driver(devpath, &g_pca9635pw_fileops, 666, priv);
   if (ret != OK)
     {
-      dbg("Failed to register driver: %d\n", ret);
+      err("Failed to register driver: %d\n", ret);
       kmm_free(priv);
       return ret;
     }
diff --git a/drivers/leds/rgbled.c b/drivers/leds/rgbled.c
index 8a457a391c..7cd2117a3e 100644
--- a/drivers/leds/rgbled.c
+++ b/drivers/leds/rgbled.c
@@ -73,12 +73,12 @@
 /* Non-standard debug that may be enabled just for testing PWM */
 
 #ifdef CONFIG_DEBUG_RGBLED
-#  define pwmdbg    dbg
+#  define pwmerr    err
 #  define pwminfo   info
 #  define pwmllerr  llerr
 #  define pwmllinfo llinfo
 #else
-#  define pwmdbg(x...)
+#  define pwmerr(x...)
 #  define pwminfo(x...)
 #  define pwmllerr(x...)
 #  define pwmllinfo(x...)
@@ -395,7 +395,7 @@ int rgbled_register(FAR const char *path, FAR struct pwm_lowerhalf_s *ledr,
 
   if (!upper)
     {
-      pwmdbg("Allocation failed\n");
+      pwmerr("Allocation failed\n");
       return -ENOMEM;
     }
 
diff --git a/drivers/leds/userled_upper.c b/drivers/leds/userled_upper.c
index 397f9aab8b..00a6860e1b 100644
--- a/drivers/leds/userled_upper.c
+++ b/drivers/leds/userled_upper.c
@@ -67,14 +67,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define ddbg llerr
+#  define derr llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define dinfo llerr
 #  else
 #    define dinfo(x...)
 #  endif
 #else
-#  define ddbg(x...)
+#  define derr(x...)
 #  define dinfo(x...)
 #endif
 
diff --git a/drivers/loop/losetup.c b/drivers/loop/losetup.c
index 5ff237058b..61817cd19f 100644
--- a/drivers/loop/losetup.c
+++ b/drivers/loop/losetup.c
@@ -246,7 +246,7 @@ static ssize_t loop_read(FAR struct inode *inode, FAR unsigned char *buffer,
 
   if (start_sector + nsectors > dev->nsectors)
     {
-      dbg("Read past end of file\n");
+      err("Read past end of file\n");
       return -EIO;
     }
 
@@ -256,7 +256,7 @@ static ssize_t loop_read(FAR struct inode *inode, FAR unsigned char *buffer,
   ret = lseek(dev->fd, offset, SEEK_SET);
   if (ret == (off_t)-1)
     {
-      dbg("Seek failed for offset=%d: %d\n", (int)offset, get_errno());
+      err("Seek failed for offset=%d: %d\n", (int)offset, get_errno());
       return -EIO;
     }
 
@@ -267,7 +267,7 @@ static ssize_t loop_read(FAR struct inode *inode, FAR unsigned char *buffer,
       nbytesread = read(dev->fd, buffer, nsectors * dev->sectsize);
       if (nbytesread < 0 && get_errno() != EINTR)
         {
-          dbg("Read failed: %d\n", get_errno());
+          err("Read failed: %d\n", get_errno());
           return -get_errno();
         }
     }
@@ -304,7 +304,7 @@ static ssize_t loop_write(FAR struct inode *inode,
   ret = lseek(dev->fd, offset, SEEK_SET);
   if (ret == (off_t)-1)
     {
-      dbg("Seek failed for offset=%d: %d\n", (int)offset, get_errno());
+      err("Seek failed for offset=%d: %d\n", (int)offset, get_errno());
     }
 
   /* Then write the requested number of sectors to that position */
@@ -314,7 +314,7 @@ static ssize_t loop_write(FAR struct inode *inode,
       nbyteswritten = write(dev->fd, buffer, nsectors * dev->sectsize);
       if (nbyteswritten < 0 && get_errno() != EINTR)
         {
-          dbg("Write failed: %d\n", get_errno());
+          err("Write failed: %d\n", get_errno());
           return -get_errno();
         }
     }
@@ -391,7 +391,7 @@ int losetup(FAR const char *devname, FAR const char *filename,
   ret = stat(filename, &sb);
   if (ret < 0)
     {
-      dbg("Failed to stat %s: %d\n", filename, get_errno());
+      err("Failed to stat %s: %d\n", filename, get_errno());
       return -get_errno();
     }
 
@@ -399,7 +399,7 @@ int losetup(FAR const char *devname, FAR const char *filename,
 
   if (sb.st_size - offset < sectsize)
     {
-      dbg("File is too small for blocksize\n");
+      err("File is too small for blocksize\n");
       return -ERANGE;
     }
 
@@ -445,7 +445,7 @@ int losetup(FAR const char *devname, FAR const char *filename,
       dev->fd = open(filename, O_RDWR);
       if (dev->fd < 0)
         {
-          dbg("Failed to open %s: %d\n", filename, get_errno());
+          err("Failed to open %s: %d\n", filename, get_errno());
           ret = -get_errno();
           goto errout_with_dev;
         }
@@ -456,7 +456,7 @@ int losetup(FAR const char *devname, FAR const char *filename,
   ret = register_blockdriver(devname, &g_bops, 0, dev);
   if (ret < 0)
     {
-      fdbg("register_blockdriver failed: %d\n", -ret);
+      ferr("register_blockdriver failed: %d\n", -ret);
       goto errout_with_fd;
     }
 
@@ -499,7 +499,7 @@ int loteardown(FAR const char *devname)
   ret = open_blockdriver(devname, MS_RDONLY, &inode);
   if (ret < 0)
     {
-      dbg("Failed to open %s: %d\n", devname, -ret);
+      err("Failed to open %s: %d\n", devname, -ret);
       return ret;
     }
 
diff --git a/drivers/mmcsd/mmcsd_sdio.c b/drivers/mmcsd/mmcsd_sdio.c
index 2b52f72142..e93f326afb 100644
--- a/drivers/mmcsd/mmcsd_sdio.c
+++ b/drivers/mmcsd/mmcsd_sdio.c
@@ -340,7 +340,7 @@ static int mmcsd_sendcmdpoll(FAR struct mmcsd_state_s *priv, uint32_t cmd,
       ret = SDIO_WAITRESPONSE(priv->dev, cmd);
       if (ret != OK)
         {
-          fdbg("ERROR: Wait for response to cmd: %08x failed: %d\n", cmd, ret);
+          ferr("ERROR: Wait for response to cmd: %08x failed: %d\n", cmd, ret);
         }
     }
 
@@ -467,7 +467,7 @@ static int mmcsd_recvR6(FAR struct mmcsd_state_s *priv, uint32_t cmd)
       ret = -EIO;
     }
 
-  fdbg("ERROR: Failed to get RCA. R6=%08x: %d\n", r6, ret);
+  ferr("ERROR: Failed to get RCA. R6=%08x: %d\n", r6, ret);
   return ret;
 }
 
@@ -491,7 +491,7 @@ static int mmcsd_getSCR(FAR struct mmcsd_state_s *priv, uint32_t scr[2])
   ret = mmcsd_setblocklen(priv, 8);
   if (ret != OK)
     {
-      fdbg("ERROR: mmcsd_setblocklen failed: %d\n", ret);
+      ferr("ERROR: mmcsd_setblocklen failed: %d\n", ret);
       return ret;
     }
 
@@ -510,7 +510,7 @@ static int mmcsd_getSCR(FAR struct mmcsd_state_s *priv, uint32_t scr[2])
   ret = mmcsd_recvR1(priv, SD_CMD55);
   if (ret != OK)
     {
-      fdbg("ERROR: RECVR1 for CMD55 failed: %d\n", ret);
+      ferr("ERROR: RECVR1 for CMD55 failed: %d\n", ret);
       return ret;
     }
 
@@ -520,7 +520,7 @@ static int mmcsd_getSCR(FAR struct mmcsd_state_s *priv, uint32_t scr[2])
   ret = mmcsd_recvR1(priv, SD_ACMD51);
   if (ret != OK)
     {
-      fdbg("ERROR: RECVR1 for ACMD51 failed: %d\n", ret);
+      ferr("ERROR: RECVR1 for ACMD51 failed: %d\n", ret);
       SDIO_CANCEL(priv->dev);
       return ret;
     }
@@ -531,7 +531,7 @@ static int mmcsd_getSCR(FAR struct mmcsd_state_s *priv, uint32_t scr[2])
                         MMCSD_SCR_DATADELAY);
   if (ret != OK)
     {
-      fdbg("ERROR: mmcsd_eventwait for READ DATA failed: %d\n", ret);
+      ferr("ERROR: mmcsd_eventwait for READ DATA failed: %d\n", ret);
     }
 
   return ret;
@@ -1028,7 +1028,7 @@ static int mmcsd_verifystate(FAR struct mmcsd_state_s *priv, uint32_t state)
   ret = mmcsd_getR1(priv, &r1);
   if (ret != OK)
     {
-      fdbg("ERROR: mmcsd_getR1 failed: %d\n", ret);
+      ferr("ERROR: mmcsd_getR1 failed: %d\n", ret);
       return ret;
     }
 
@@ -1097,7 +1097,7 @@ static int mmcsd_eventwait(FAR struct mmcsd_state_s *priv,
     {
       /* Yes.. the failure event is probably SDIOWAIT_TIMEOUT */
 
-      fdbg("ERROR: Awakened with %02x\n", wkupevent);
+      ferr("ERROR: Awakened with %02x\n", wkupevent);
       return wkupevent & SDIOWAIT_TIMEOUT ? -ETIMEDOUT : -EIO;
     }
 
@@ -1129,7 +1129,7 @@ static int mmcsd_transferready(FAR struct mmcsd_state_s *priv)
 
   if (!SDIO_PRESENT(priv->dev))
     {
-      fdbg("ERROR: Card has been removed\n");
+      ferr("ERROR: Card has been removed\n");
       return -ENODEV;
     }
 
@@ -1158,7 +1158,7 @@ static int mmcsd_transferready(FAR struct mmcsd_state_s *priv)
                         MMCSD_BLOCK_WDATADELAY);
   if (ret != OK)
     {
-      fdbg("ERROR: mmcsd_eventwait for transfer ready failed: %d\n", ret);
+      ferr("ERROR: mmcsd_eventwait for transfer ready failed: %d\n", ret);
     }
 #endif
 
@@ -1170,7 +1170,7 @@ static int mmcsd_transferready(FAR struct mmcsd_state_s *priv)
       ret = mmcsd_getR1(priv, &r1);
       if (ret != OK)
         {
-          fdbg("ERROR: mmcsd_getR1 failed: %d\n", ret);
+          ferr("ERROR: mmcsd_getR1 failed: %d\n", ret);
           return ret;
         }
 
@@ -1197,7 +1197,7 @@ static int mmcsd_transferready(FAR struct mmcsd_state_s *priv)
            * if this error occurs.
            */
 
-          fdbg("ERROR: Unexpected R1 state: %08x\n", r1);
+          ferr("ERROR: Unexpected R1 state: %08x\n", r1);
           return -EINVAL;
         }
 
@@ -1231,7 +1231,7 @@ static int mmcsd_stoptransmission(FAR struct mmcsd_state_s *priv)
   ret = mmcsd_recvR1(priv, MMCSD_CMD12);
   if (ret != OK)
     {
-      fdbg("ERROR: mmcsd_recvR1 for CMD12 failed: %d\n", ret);
+      ferr("ERROR: mmcsd_recvR1 for CMD12 failed: %d\n", ret);
     }
 
   return ret;
@@ -1267,7 +1267,7 @@ static int mmcsd_setblocklen(FAR struct mmcsd_state_s *priv, uint32_t blocklen)
         }
       else
         {
-          fdbg("ERROR: mmcsd_recvR1 for CMD16 failed: %d\n", ret);
+          ferr("ERROR: mmcsd_recvR1 for CMD16 failed: %d\n", ret);
         }
     }
 
@@ -1295,7 +1295,7 @@ static ssize_t mmcsd_readsingle(FAR struct mmcsd_state_s *priv,
 
   if (priv->locked)
     {
-      fdbg("ERROR: Card is locked\n");
+      ferr("ERROR: Card is locked\n");
       return -EPERM;
     }
 
@@ -1325,7 +1325,7 @@ static ssize_t mmcsd_readsingle(FAR struct mmcsd_state_s *priv,
   ret = mmcsd_transferready(priv);
   if (ret != OK)
     {
-      fdbg("ERROR: Card not ready: %d\n", ret);
+      ferr("ERROR: Card not ready: %d\n", ret);
       return ret;
     }
 
@@ -1349,7 +1349,7 @@ static ssize_t mmcsd_readsingle(FAR struct mmcsd_state_s *priv,
   ret = mmcsd_setblocklen(priv, priv->blocksize);
   if (ret != OK)
     {
-      fdbg("ERROR: mmcsd_setblocklen failed: %d\n", ret);
+      ferr("ERROR: mmcsd_setblocklen failed: %d\n", ret);
       return ret;
     }
 
@@ -1385,7 +1385,7 @@ static ssize_t mmcsd_readsingle(FAR struct mmcsd_state_s *priv,
   ret = mmcsd_recvR1(priv, MMCSD_CMD17);
   if (ret != OK)
     {
-      fdbg("ERROR: mmcsd_recvR1 for CMD17 failed: %d\n", ret);
+      ferr("ERROR: mmcsd_recvR1 for CMD17 failed: %d\n", ret);
       SDIO_CANCEL(priv->dev);
       return ret;
     }
@@ -1396,7 +1396,7 @@ static ssize_t mmcsd_readsingle(FAR struct mmcsd_state_s *priv,
                         MMCSD_BLOCK_RDATADELAY);
   if (ret != OK)
     {
-      fdbg("ERROR: CMD17 transfer failed: %d\n", ret);
+      ferr("ERROR: CMD17 transfer failed: %d\n", ret);
       return ret;
     }
 
@@ -1429,7 +1429,7 @@ static ssize_t mmcsd_readmultiple(FAR struct mmcsd_state_s *priv,
 
   if (priv->locked)
     {
-      fdbg("ERROR: Card is locked\n");
+      ferr("ERROR: Card is locked\n");
       return -EPERM;
     }
 
@@ -1459,7 +1459,7 @@ static ssize_t mmcsd_readmultiple(FAR struct mmcsd_state_s *priv,
   ret = mmcsd_transferready(priv);
   if (ret != OK)
     {
-      fdbg("ERROR: Card not ready: %d\n", ret);
+      ferr("ERROR: Card not ready: %d\n", ret);
       return ret;
     }
 
@@ -1483,7 +1483,7 @@ static ssize_t mmcsd_readmultiple(FAR struct mmcsd_state_s *priv,
   ret = mmcsd_setblocklen(priv, priv->blocksize);
   if (ret != OK)
   {
-    fdbg("ERROR: mmcsd_setblocklen failed: %d\n", ret);
+    ferr("ERROR: mmcsd_setblocklen failed: %d\n", ret);
     return ret;
   }
 
@@ -1517,7 +1517,7 @@ static ssize_t mmcsd_readmultiple(FAR struct mmcsd_state_s *priv,
   ret = mmcsd_recvR1(priv, MMCSD_CMD18);
   if (ret != OK)
     {
-      fdbg("ERROR: mmcsd_recvR1 for CMD18 failed: %d\n", ret);
+      ferr("ERROR: mmcsd_recvR1 for CMD18 failed: %d\n", ret);
       SDIO_CANCEL(priv->dev);
       return ret;
     }
@@ -1528,7 +1528,7 @@ static ssize_t mmcsd_readmultiple(FAR struct mmcsd_state_s *priv,
                         nblocks * MMCSD_BLOCK_RDATADELAY);
   if (ret != OK)
     {
-      fdbg("ERROR: CMD18 transfer failed: %d\n", ret);
+      ferr("ERROR: CMD18 transfer failed: %d\n", ret);
       return ret;
     }
 
@@ -1537,7 +1537,7 @@ static ssize_t mmcsd_readmultiple(FAR struct mmcsd_state_s *priv,
   ret = mmcsd_stoptransmission(priv);
   if (ret != OK)
     {
-      fdbg("ERROR: mmcsd_stoptransmission failed: %d\n", ret);
+      ferr("ERROR: mmcsd_stoptransmission failed: %d\n", ret);
     }
 
   /* On success, return the number of blocks read */
@@ -1634,7 +1634,7 @@ static ssize_t mmcsd_writesingle(FAR struct mmcsd_state_s *priv,
 
   if (mmcsd_wrprotected(priv))
     {
-      fdbg("ERROR: Card is locked or write protected\n");
+      ferr("ERROR: Card is locked or write protected\n");
       return -EPERM;
     }
 
@@ -1664,7 +1664,7 @@ static ssize_t mmcsd_writesingle(FAR struct mmcsd_state_s *priv,
   ret = mmcsd_transferready(priv);
   if (ret != OK)
     {
-      fdbg("ERROR: Card not ready: %d\n", ret);
+      ferr("ERROR: Card not ready: %d\n", ret);
       return ret;
     }
 
@@ -1688,7 +1688,7 @@ static ssize_t mmcsd_writesingle(FAR struct mmcsd_state_s *priv,
   ret = mmcsd_setblocklen(priv, priv->blocksize);
   if (ret != OK)
     {
-      fdbg("ERROR: mmcsd_setblocklen failed: %d\n", ret);
+      ferr("ERROR: mmcsd_setblocklen failed: %d\n", ret);
       return ret;
     }
 
@@ -1698,7 +1698,7 @@ static ssize_t mmcsd_writesingle(FAR struct mmcsd_state_s *priv,
   ret = mmcsd_recvR1(priv, MMCSD_CMD24);
   if (ret != OK)
     {
-      fdbg("ERROR: mmcsd_recvR1 for CMD24 failed: %d\n", ret);
+      ferr("ERROR: mmcsd_recvR1 for CMD24 failed: %d\n", ret);
       return ret;
     }
 
@@ -1735,7 +1735,7 @@ static ssize_t mmcsd_writesingle(FAR struct mmcsd_state_s *priv,
                         SDIOWAIT_TIMEOUT | SDIOWAIT_ERROR, MMCSD_BLOCK_WDATADELAY);
   if (ret != OK)
     {
-      fdbg("ERROR: CMD24 transfer failed: %d\n", ret);
+      ferr("ERROR: CMD24 transfer failed: %d\n", ret);
       return ret;
     }
 
@@ -1777,7 +1777,7 @@ static ssize_t mmcsd_writemultiple(FAR struct mmcsd_state_s *priv,
 
   if (mmcsd_wrprotected(priv))
     {
-      fdbg("ERROR: Card is locked or write protected\n");
+      ferr("ERROR: Card is locked or write protected\n");
       return -EPERM;
     }
 
@@ -1807,7 +1807,7 @@ static ssize_t mmcsd_writemultiple(FAR struct mmcsd_state_s *priv,
   ret = mmcsd_transferready(priv);
   if (ret != OK)
     {
-      fdbg("ERROR: Card not ready: %d\n", ret);
+      ferr("ERROR: Card not ready: %d\n", ret);
       return ret;
     }
 
@@ -1832,7 +1832,7 @@ static ssize_t mmcsd_writemultiple(FAR struct mmcsd_state_s *priv,
   ret = mmcsd_setblocklen(priv, priv->blocksize);
   if (ret != OK)
     {
-      fdbg("ERROR: mmcsd_setblocklen failed: %d\n", ret);
+      ferr("ERROR: mmcsd_setblocklen failed: %d\n", ret);
       return ret;
     }
 
@@ -1850,7 +1850,7 @@ static ssize_t mmcsd_writemultiple(FAR struct mmcsd_state_s *priv,
       ret = mmcsd_recvR1(priv, SD_CMD55);
       if (ret != OK)
         {
-          fdbg("ERROR: mmcsd_recvR1 for CMD55 (ACMD23) failed: %d\n", ret);
+          ferr("ERROR: mmcsd_recvR1 for CMD55 (ACMD23) failed: %d\n", ret);
           return ret;
         }
 
@@ -1860,7 +1860,7 @@ static ssize_t mmcsd_writemultiple(FAR struct mmcsd_state_s *priv,
       ret = mmcsd_recvR1(priv, SD_ACMD23);
       if (ret != OK)
         {
-          fdbg("ERROR: mmcsd_recvR1 for ACMD23 failed: %d\n", ret);
+          ferr("ERROR: mmcsd_recvR1 for ACMD23 failed: %d\n", ret);
           return ret;
         }
     }
@@ -1900,7 +1900,7 @@ static ssize_t mmcsd_writemultiple(FAR struct mmcsd_state_s *priv,
   ret = mmcsd_recvR1(priv, MMCSD_CMD25);
   if (ret != OK)
     {
-      fdbg("ERROR: mmcsd_recvR1 for CMD25 failed: %d\n", ret);
+      ferr("ERROR: mmcsd_recvR1 for CMD25 failed: %d\n", ret);
       return ret;
     }
 
@@ -1909,7 +1909,7 @@ static ssize_t mmcsd_writemultiple(FAR struct mmcsd_state_s *priv,
   ret = mmcsd_eventwait(priv, SDIOWAIT_TIMEOUT | SDIOWAIT_ERROR, nblocks * MMCSD_BLOCK_WDATADELAY);
   if (ret != OK)
     {
-      fdbg("ERROR: CMD18 transfer failed: %d\n", ret);
+      ferr("ERROR: CMD18 transfer failed: %d\n", ret);
       return ret;
     }
 
@@ -1918,7 +1918,7 @@ static ssize_t mmcsd_writemultiple(FAR struct mmcsd_state_s *priv,
   ret = mmcsd_stoptransmission(priv);
   if (ret != OK)
     {
-      fdbg("ERROR: mmcsd_stoptransmission failed: %d\n", ret);
+      ferr("ERROR: mmcsd_stoptransmission failed: %d\n", ret);
       return ret;
     }
 
@@ -2276,7 +2276,7 @@ static int mmcsd_ioctl(FAR struct inode *inode, int cmd, unsigned long arg)
         ret = mmcsd_probe(priv);
         if (ret != OK)
           {
-            fdbg("ERROR: mmcsd_probe failed: %d\n", ret);
+            ferr("ERROR: mmcsd_probe failed: %d\n", ret);
           }
       }
       break;
@@ -2290,7 +2290,7 @@ static int mmcsd_ioctl(FAR struct inode *inode, int cmd, unsigned long arg)
         ret = mmcsd_removed(priv);
         if (ret != OK)
           {
-            fdbg("ERROR: mmcsd_removed failed: %d\n", ret);
+            ferr("ERROR: mmcsd_removed failed: %d\n", ret);
           }
 
         /* Enable logic to detect if a card is re-inserted */
@@ -2396,7 +2396,7 @@ static int mmcsd_widebus(FAR struct mmcsd_state_s *priv)
       ret = mmcsd_recvR1(priv, SD_CMD55);
       if (ret != OK)
         {
-          fdbg("ERROR: RECVR1 for CMD55 of ACMD42: %d\n", ret);
+          ferr("ERROR: RECVR1 for CMD55 of ACMD42: %d\n", ret);
           return ret;
         }
 
@@ -2423,7 +2423,7 @@ static int mmcsd_widebus(FAR struct mmcsd_state_s *priv)
       ret = mmcsd_recvR1(priv, SD_CMD55);
       if (ret != OK)
         {
-          fdbg("ERROR: RECVR1 for CMD55 of ACMD6: %d\n", ret);
+          ferr("ERROR: RECVR1 for CMD55 of ACMD6: %d\n", ret);
           return ret;
         }
 
@@ -2449,7 +2449,7 @@ static int mmcsd_widebus(FAR struct mmcsd_state_s *priv)
 
   /* Wide bus operation not supported */
 
-  fdbg("WARNING: Card does not support wide-bus operation\n");
+  ferr("WARNING: Card does not support wide-bus operation\n");
   return -ENOSYS;
 
 #else /* CONFIG_SDIO_WIDTH_D1_ONLY */
@@ -2492,7 +2492,7 @@ static int mmcsd_mmcinitialize(FAR struct mmcsd_state_s *priv)
   ret = SDIO_RECVR2(priv->dev, MMCSD_CMD2, cid);
   if (ret != OK)
     {
-      fdbg("ERROR: SDIO_RECVR2 for MMC CID failed: %d\n", ret);
+      ferr("ERROR: SDIO_RECVR2 for MMC CID failed: %d\n", ret);
       return ret;
     }
 
@@ -2508,7 +2508,7 @@ static int mmcsd_mmcinitialize(FAR struct mmcsd_state_s *priv)
   ret = mmcsd_recvR1(priv, MMC_CMD3);
   if (ret != OK)
     {
-      fdbg("ERROR: mmcsd_recvR1(CMD3) failed: %d\n", ret);
+      ferr("ERROR: mmcsd_recvR1(CMD3) failed: %d\n", ret);
       return ret;
     }
 
@@ -2522,7 +2522,7 @@ static int mmcsd_mmcinitialize(FAR struct mmcsd_state_s *priv)
   ret = mmcsd_verifystate(priv, MMCSD_R1_STATE_STBY);
   if (ret != OK)
     {
-      fdbg("ERROR: Failed to enter standby state\n");
+      ferr("ERROR: Failed to enter standby state\n");
       return ret;
     }
 
@@ -2535,7 +2535,7 @@ static int mmcsd_mmcinitialize(FAR struct mmcsd_state_s *priv)
   ret = SDIO_RECVR2(priv->dev, MMCSD_CMD9, csd);
   if (ret != OK)
     {
-      fdbg("ERROR: Could not get SD CSD register: %d\n", ret);
+      ferr("ERROR: Could not get SD CSD register: %d\n", ret);
       return ret;
     }
 
@@ -2593,7 +2593,7 @@ static int mmcsd_sdinitialize(FAR struct mmcsd_state_s *priv)
   ret = SDIO_RECVR2(priv->dev, MMCSD_CMD2, cid);
   if (ret != OK)
     {
-      fdbg("ERROR: SDIO_RECVR2 for SD CID failed: %d\n", ret);
+      ferr("ERROR: SDIO_RECVR2 for SD CID failed: %d\n", ret);
       return ret;
     }
 
@@ -2611,7 +2611,7 @@ static int mmcsd_sdinitialize(FAR struct mmcsd_state_s *priv)
   ret = mmcsd_recvR6(priv, SD_CMD3);
   if (ret != OK)
     {
-      fdbg("ERROR: mmcsd_recvR2 for SD RCA failed: %d\n", ret);
+      ferr("ERROR: mmcsd_recvR2 for SD RCA failed: %d\n", ret);
       return ret;
     }
 
@@ -2627,7 +2627,7 @@ static int mmcsd_sdinitialize(FAR struct mmcsd_state_s *priv)
   ret = mmcsd_verifystate(priv, MMCSD_R1_STATE_STBY);
   if (ret != OK)
     {
-      fdbg("ERROR: Failed to enter standby state\n");
+      ferr("ERROR: Failed to enter standby state\n");
       return ret;
     }
 
@@ -2641,7 +2641,7 @@ static int mmcsd_sdinitialize(FAR struct mmcsd_state_s *priv)
   ret = SDIO_RECVR2(priv->dev, MMCSD_CMD9, csd);
   if (ret != OK)
     {
-      fdbg("ERROR: Could not get SD CSD register(%d)\n", ret);
+      ferr("ERROR: Could not get SD CSD register(%d)\n", ret);
       return ret;
     }
 
@@ -2656,7 +2656,7 @@ static int mmcsd_sdinitialize(FAR struct mmcsd_state_s *priv)
   ret = mmcsd_recvR1(priv, MMCSD_CMD7S);
   if (ret != OK)
     {
-      fdbg("ERROR: mmcsd_recvR1 for CMD7 failed: %d\n", ret);
+      ferr("ERROR: mmcsd_recvR1 for CMD7 failed: %d\n", ret);
       return ret;
     }
 
@@ -2680,7 +2680,7 @@ static int mmcsd_sdinitialize(FAR struct mmcsd_state_s *priv)
   ret = mmcsd_getSCR(priv, scr);
   if (ret != OK)
     {
-      fdbg("ERROR: Could not get SD SCR register(%d)\n", ret);
+      ferr("ERROR: Could not get SD SCR register(%d)\n", ret);
       return ret;
     }
 
@@ -2691,7 +2691,7 @@ static int mmcsd_sdinitialize(FAR struct mmcsd_state_s *priv)
   ret = mmcsd_widebus(priv);
   if (ret != OK)
     {
-      fdbg("WARN: Failed to set wide bus operation: %d\n", ret);
+      ferr("WARN: Failed to set wide bus operation: %d\n", ret);
     }
 
   /* TODO: If wide-bus selected, then send CMD6 to see if the card supports
@@ -2785,7 +2785,7 @@ static int mmcsd_cardidentify(FAR struct mmcsd_state_s *priv)
         }
       else
         {
-          fdbg("ERROR: R7: %08x\n", response);
+          ferr("ERROR: R7: %08x\n", response);
           return -EIO;
         }
     }
@@ -2820,7 +2820,7 @@ static int mmcsd_cardidentify(FAR struct mmcsd_state_s *priv)
                * the MMC vs. SD decision based on CMD1 and ACMD41.
                */
 
-              fdbg("ERROR: mmcsd_recvR1(CMD55) failed: %d\n", ret);
+              ferr("ERROR: mmcsd_recvR1(CMD55) failed: %d\n", ret);
             }
           else
             {
@@ -2835,7 +2835,7 @@ static int mmcsd_cardidentify(FAR struct mmcsd_state_s *priv)
                    * but we will make the decision based on CMD1 below
                    */
 
-                  fdbg("ERROR: ACMD41 RECVR3: %d\n", ret);
+                  ferr("ERROR: ACMD41 RECVR3: %d\n", ret);
                 }
               else
                 {
@@ -2912,13 +2912,13 @@ static int mmcsd_cardidentify(FAR struct mmcsd_state_s *priv)
 
           if (ret != OK)
             {
-              fdbg("ERROR: CMD1 RECVR3: %d\n", ret);
+              ferr("ERROR: CMD1 RECVR3: %d\n", ret);
             }
           else
             {
               /* CMD1 succeeded... this must be an MMC card */
 
-              fdbg("CMD1 succeeded, assuming MMC card\n");
+              ferr("CMD1 succeeded, assuming MMC card\n");
               priv->type = MMCSD_CARDTYPE_MMC;
 
               /* Check if the card is busy.  Very confusing, BUSY is set LOW
@@ -2955,7 +2955,7 @@ static int mmcsd_cardidentify(FAR struct mmcsd_state_s *priv)
 
   if (elapsed >= TICK_PER_SEC || priv->type == MMCSD_CARDTYPE_UNKNOWN)
     {
-      fdbg("ERROR: Failed to identify card\n");
+      ferr("ERROR: Failed to identify card\n");
       return -EIO;
     }
 
@@ -3010,7 +3010,7 @@ static int mmcsd_probe(FAR struct mmcsd_state_s *priv)
       ret = mmcsd_cardidentify(priv);
       if (ret != OK)
         {
-          fdbg("ERROR: Failed to initialize card: %d\n", ret);
+          ferr("ERROR: Failed to initialize card: %d\n", ret);
 #ifdef CONFIG_MMCSD_HAVECARDDETECT
           SDIO_CALLBACKENABLE(priv->dev, SDIOMEDIA_INSERTED);
 #endif
@@ -3034,7 +3034,7 @@ static int mmcsd_probe(FAR struct mmcsd_state_s *priv)
 #endif
             case MMCSD_CARDTYPE_UNKNOWN:                     /* Unknown card type */
             default:
-              fdbg("ERROR: Internal confusion: %d\n", priv->type);
+              ferr("ERROR: Internal confusion: %d\n", priv->type);
               ret = -EPERM;
               break;
             }
@@ -3138,7 +3138,7 @@ static int mmcsd_hwinitialize(FAR struct mmcsd_state_s *priv)
 
   if (SDIO_ATTACH(priv->dev))
     {
-      fdbg("ERROR: Unable to attach MMC/SD interrupts\n");
+      ferr("ERROR: Unable to attach MMC/SD interrupts\n");
       mmcsd_givesem(priv);
       return -EBUSY;
     }
@@ -3299,7 +3299,7 @@ int mmcsd_slotinitialize(int minor, FAR struct sdio_dev_s *dev)
             {
               /* Some other non-recoverable bad thing happened */
 
-              fdbg("ERROR: Failed to initialize MMC/SD slot: %d\n", ret);
+              ferr("ERROR: Failed to initialize MMC/SD slot: %d\n", ret);
               goto errout_with_alloc;
             }
         }
@@ -3311,7 +3311,7 @@ int mmcsd_slotinitialize(int minor, FAR struct sdio_dev_s *dev)
       ret = rwb_initialize(&priv->rwbuffer);
       if (ret < 0)
         {
-          fdbg("ERROR: Buffer setup failed: %d\n", ret);
+          ferr("ERROR: Buffer setup failed: %d\n", ret);
           goto errout_with_hwinit;
         }
 #endif
@@ -3325,7 +3325,7 @@ int mmcsd_slotinitialize(int minor, FAR struct sdio_dev_s *dev)
       ret = register_blockdriver(devname, &g_bops, 0, priv);
       if (ret < 0)
         {
-          fdbg("ERROR: register_blockdriver failed: %d\n", ret);
+          ferr("ERROR: register_blockdriver failed: %d\n", ret);
           goto errout_with_buffers;
         }
     }
diff --git a/drivers/mmcsd/mmcsd_spi.c b/drivers/mmcsd/mmcsd_spi.c
index 082ff094b0..80ec787063 100644
--- a/drivers/mmcsd/mmcsd_spi.c
+++ b/drivers/mmcsd/mmcsd_spi.c
@@ -431,7 +431,7 @@ static int mmcsd_waitready(FAR struct mmcsd_slot_s *slot)
     }
   while (elapsed < MMCSD_DELAY_500MS);
 
-  fdbg("Card still busy, last response: %02x\n", response);
+  ferr("Card still busy, last response: %02x\n", response);
   return -EBUSY;
 }
 
@@ -504,7 +504,7 @@ static uint32_t mmcsd_sendcmd(FAR struct mmcsd_slot_s *slot,
 
   if ((response & 0x80) != 0)
     {
-      fdbg("Failed: i=%d response=%02x\n", i, response);
+      ferr("Failed: i=%d response=%02x\n", i, response);
       return (uint32_t)-1;
     }
 
@@ -531,7 +531,7 @@ static uint32_t mmcsd_sendcmd(FAR struct mmcsd_slot_s *slot,
 
         if (busy != 0xff)
           {
-            fdbg("Failed: card still busy (%02x)\n", busy);
+            ferr("Failed: card still busy (%02x)\n", busy);
             return (uint32_t)-1;
           }
 
@@ -613,7 +613,7 @@ static void mmcsd_setblklen(FAR struct mmcsd_slot_s *slot, uint32_t length)
   response = mmcsd_sendcmd(slot, &g_cmd16, length);
   if (response != MMCSD_SPIR1_OK)
     {
-      fdbg("Failed to set block length: %02x\n", response);
+      ferr("Failed to set block length: %02x\n", response);
     }
 }
 
@@ -813,7 +813,7 @@ static void mmcsd_decodecsd(FAR struct mmcsd_slot_s *slot, uint8_t *csd)
     {
       if (readbllen > 9)
         {
-          fdbg("Forcing 512 byte sector size\n");
+          ferr("Forcing 512 byte sector size\n");
           csizemult += (readbllen - 9);
           readbllen  = 9;
         }
@@ -880,7 +880,7 @@ static int mmcsd_getcardinfo(FAR struct mmcsd_slot_s *slot, uint8_t *buffer,
   result = mmcsd_sendcmd(slot, cmd, 0);
   if (result != MMCSD_SPIR1_OK)
     {
-      fdbg("CMD9/10 failed: R1=%02x\n", result);
+      ferr("CMD9/10 failed: R1=%02x\n", result);
       return -EIO;
     }
 
@@ -898,7 +898,7 @@ static int mmcsd_getcardinfo(FAR struct mmcsd_slot_s *slot, uint8_t *buffer,
 
       if (response != 0 && (response & MMCSD_SPIDET_UPPER) == 0)
         {
-          fdbg("%d. Data transfer error: %02x\n", i, response);
+          ferr("%d. Data transfer error: %02x\n", i, response);
           return -EIO;
         }
       else if (response == MMCSD_SPIDT_STARTBLKSNGL)
@@ -916,7 +916,7 @@ static int mmcsd_getcardinfo(FAR struct mmcsd_slot_s *slot, uint8_t *buffer,
         }
     }
 
-  fdbg("%d. Did not find start of block\n");
+  ferr("%d. Did not find start of block\n");
   return -EIO;
 }
 
@@ -960,7 +960,7 @@ static int mmcsd_recvblock(FAR struct mmcsd_slot_s *slot, uint8_t *buffer,
       return OK;
     }
 
-  fdbg("Did not receive data token (%02x)\n", token);
+  ferr("Did not receive data token (%02x)\n", token);
   return ERROR;
 }
 
@@ -1004,7 +1004,7 @@ static int mmcsd_xmitblock(FAR struct mmcsd_slot_s *slot,
   response = SPI_SEND(spi, 0xff);
   if ((response & MMCSD_SPIDR_MASK) != MMCSD_SPIDR_ACCEPTED)
     {
-      fdbg("Bad data response: %02x\n", response);
+      ferr("Bad data response: %02x\n", response);
       return -EIO;
     }
 
@@ -1034,7 +1034,7 @@ static int mmcsd_open(FAR struct inode *inode)
 #ifdef CONFIG_DEBUG_FEATURES
   if (!inode || !inode->i_private)
     {
-      fdbg("Internal confusion\n");
+      ferr("Internal confusion\n");
       return -EIO;
     }
 #endif
@@ -1047,7 +1047,7 @@ static int mmcsd_open(FAR struct inode *inode)
 #ifdef CONFIG_DEBUG_FEATURES
   if (!spi)
     {
-      fdbg("Internal confusion\n");
+      ferr("Internal confusion\n");
       return -EIO;
     }
 #endif
@@ -1119,13 +1119,13 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
 #ifdef CONFIG_DEBUG_FEATURES
   if (!buffer)
     {
-      fdbg("Invalid parameters\n");
+      ferr("Invalid parameters\n");
       return -EINVAL;
     }
 
   if (!inode || !inode->i_private)
     {
-      fdbg("Internal confusion\n");
+      ferr("Internal confusion\n");
       return -EIO;
     }
 #endif
@@ -1138,7 +1138,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
 #ifdef CONFIG_DEBUG_FEATURES
   if (!spi)
     {
-      fdbg("Internal confusion\n");
+      ferr("Internal confusion\n");
       return -EIO;
     }
 #endif
@@ -1147,7 +1147,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
 
   if (slot->state & MMCSD_SLOTSTATUS_NOTREADY)
     {
-      fdbg("Slot not ready\n");
+      ferr("Slot not ready\n");
       return -ENODEV;
     }
 
@@ -1190,7 +1190,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
       response = mmcsd_sendcmd(slot, &g_cmd17, offset);
       if (response != MMCSD_SPIR1_OK)
         {
-          fdbg("CMD17 failed: R1=%02x\n", response);
+          ferr("CMD17 failed: R1=%02x\n", response);
           goto errout_with_eio;
         }
 
@@ -1198,7 +1198,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
 
       if (mmcsd_recvblock(slot, buffer, SECTORSIZE(slot)) != 0)
         {
-          fdbg("Failed: to receive the block\n");
+          ferr("Failed: to receive the block\n");
           goto errout_with_eio;
         }
     }
@@ -1211,7 +1211,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
       response = mmcsd_sendcmd(slot, &g_cmd18, offset);
       if (response != MMCSD_SPIR1_OK)
         {
-          fdbg("CMD18 failed: R1=%02x\n", response);
+          ferr("CMD18 failed: R1=%02x\n", response);
           goto errout_with_eio;
         }
 
@@ -1221,7 +1221,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
         {
           if (mmcsd_recvblock(slot, buffer, SECTORSIZE(slot)) != 0)
             {
-              fdbg("Failed: to receive the block\n");
+              ferr("Failed: to receive the block\n");
               goto errout_with_eio;
             }
 
@@ -1273,13 +1273,13 @@ static ssize_t mmcsd_write(FAR struct inode *inode, const unsigned char *buffer,
 #ifdef CONFIG_DEBUG_FEATURES
   if (!buffer)
     {
-      fdbg("Invalid parameters\n");
+      ferr("Invalid parameters\n");
       return -EINVAL;
     }
 
   if (!inode || !inode->i_private)
     {
-      fdbg("Internal confusion\n");
+      ferr("Internal confusion\n");
       return -EIO;
     }
 #endif
@@ -1292,7 +1292,7 @@ static ssize_t mmcsd_write(FAR struct inode *inode, const unsigned char *buffer,
 #ifdef CONFIG_DEBUG_FEATURES
   if (!spi)
     {
-      fdbg("Internal confusion\n");
+      ferr("Internal confusion\n");
       return -EIO;
     }
 #endif
@@ -1301,7 +1301,7 @@ static ssize_t mmcsd_write(FAR struct inode *inode, const unsigned char *buffer,
 
   if (slot->state & MMCSD_SLOTSTATUS_NOTREADY)
     {
-      fdbg("Slot not ready\n");
+      ferr("Slot not ready\n");
       return -ENODEV;
     }
 
@@ -1309,7 +1309,7 @@ static ssize_t mmcsd_write(FAR struct inode *inode, const unsigned char *buffer,
 
   if (slot->state & MMCSD_SLOTSTATUS_WRPROTECT)
     {
-      fdbg("Not write enabled\n");
+      ferr("Not write enabled\n");
       return -EACCES;
     }
 
@@ -1352,7 +1352,7 @@ static ssize_t mmcsd_write(FAR struct inode *inode, const unsigned char *buffer,
       response = mmcsd_sendcmd(slot, &g_cmd24, offset);
       if (response != MMCSD_SPIR1_OK)
         {
-          fdbg("CMD24 failed: R1=%02x\n", response);
+          ferr("CMD24 failed: R1=%02x\n", response);
           goto errout_with_sem;
         }
 
@@ -1360,7 +1360,7 @@ static ssize_t mmcsd_write(FAR struct inode *inode, const unsigned char *buffer,
 
       if (mmcsd_xmitblock(slot, buffer, SECTORSIZE(slot), 0xfe) != 0)
         {
-          fdbg("Block transfer failed\n");
+          ferr("Block transfer failed\n");
           goto errout_with_sem;
         }
     }
@@ -1373,14 +1373,14 @@ static ssize_t mmcsd_write(FAR struct inode *inode, const unsigned char *buffer,
           response = mmcsd_sendcmd(slot, &g_cmd55, 0);
           if (response != MMCSD_SPIR1_OK)
             {
-              fdbg("CMD55 failed: R1=%02x\n", response);
+              ferr("CMD55 failed: R1=%02x\n", response);
               goto errout_with_sem;
             }
 
           response = mmcsd_sendcmd(slot, &g_acmd23, nsectors);
           if (response != MMCSD_SPIR1_OK)
             {
-              fdbg("ACMD23 failed: R1=%02x\n", response);
+              ferr("ACMD23 failed: R1=%02x\n", response);
               goto errout_with_sem;
             }
        }
@@ -1392,7 +1392,7 @@ static ssize_t mmcsd_write(FAR struct inode *inode, const unsigned char *buffer,
       response = mmcsd_sendcmd(slot, &g_cmd25, offset);
       if (response != MMCSD_SPIR1_OK)
         {
-          fdbg("CMD25 failed: R1=%02x\n", response);
+          ferr("CMD25 failed: R1=%02x\n", response);
           goto errout_with_sem;
         }
 
@@ -1402,14 +1402,14 @@ static ssize_t mmcsd_write(FAR struct inode *inode, const unsigned char *buffer,
         {
           if (mmcsd_xmitblock(slot, buffer, SECTORSIZE(slot), 0xfc) != 0)
             {
-              fdbg("Failed: to receive the block\n");
+              ferr("Failed: to receive the block\n");
               goto errout_with_sem;
             }
           buffer += SECTORSIZE(slot);
 
           if (mmcsd_waitready(slot) != OK)
             {
-              fdbg("Failed: card is busy\n");
+              ferr("Failed: card is busy\n");
               goto errout_with_sem;
             }
         }
@@ -1455,13 +1455,13 @@ static int mmcsd_geometry(FAR struct inode *inode, struct geometry *geometry)
 #ifdef CONFIG_DEBUG_FEATURES
   if (!geometry)
     {
-      fdbg("Invalid parameters\n");
+      ferr("Invalid parameters\n");
       return -EINVAL;
     }
 
   if (!inode || !inode->i_private)
     {
-      fdbg("Internal confusion\n");
+      ferr("Internal confusion\n");
       return -EIO;
     }
 #endif
@@ -1474,7 +1474,7 @@ static int mmcsd_geometry(FAR struct inode *inode, struct geometry *geometry)
 #ifdef CONFIG_DEBUG_FEATURES
   if (!spi)
     {
-      fdbg("Internal confusion\n");
+      ferr("Internal confusion\n");
       return -EIO;
     }
 #endif
@@ -1489,7 +1489,7 @@ static int mmcsd_geometry(FAR struct inode *inode, struct geometry *geometry)
   if (ret < 0)
     {
       mmcsd_semgive(slot);
-      fdbg("mmcsd_getcsd returned %d\n", ret);
+      ferr("mmcsd_getcsd returned %d\n", ret);
       return ret;
     }
 
@@ -1566,7 +1566,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
 
   if ((SPI_STATUS(spi, SPIDEV_MMCSD) & SPI_STATUS_PRESENT) == 0)
     {
-      fdbg("No card present\n");
+      ferr("No card present\n");
       slot->state |= MMCSD_SLOTSTATUS_NODISK;
       return -ENODEV;
     }
@@ -1621,7 +1621,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
 
   if (result != MMCSD_SPIR1_IDLESTATE)
     {
-      fdbg("Send CMD0 failed: R1=%02x\n", result);
+      ferr("Send CMD0 failed: R1=%02x\n", result);
       SPI_SELECT(spi, SPIDEV_MMCSD, false);
       mmcsd_semgive(slot);
       return -EIO;
@@ -1678,12 +1678,12 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
                   finfo("OCR: %08x\n", slot->ocr);
                   if ((slot->ocr & MMCSD_OCR_CCS) != 0)
                     {
-                      fdbg("Identified SD ver2 card/with block access\n");
+                      ferr("Identified SD ver2 card/with block access\n");
                       slot->type = MMCSD_CARDTYPE_SDV2 | MMCSD_CARDTYPE_BLOCK;
                     }
                   else
                     {
-                      fdbg("Identified SD ver2 card\n");
+                      ferr("Identified SD ver2 card\n");
                       slot->type = MMCSD_CARDTYPE_SDV2;
                     }
                }
@@ -1706,7 +1706,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
           result = mmcsd_sendcmd(slot, &g_acmd41, 0);
           if (result == MMCSD_SPIR1_IDLESTATE || result == MMCSD_SPIR1_OK)
             {
-              fdbg("Identified SD ver1 card\n");
+              ferr("Identified SD ver1 card\n");
               slot->type = MMCSD_CARDTYPE_SDV1;
             }
         }
@@ -1736,7 +1736,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
               result = mmcsd_sendcmd(slot, &g_cmd1, 0);
               if (result == MMCSD_SPIR1_OK)
                 {
-                   fdbg("%d. Identified MMC card\n", i);
+                   ferr("%d. Identified MMC card\n", i);
                    slot->type = MMCSD_CARDTYPE_MMC;
                    break;
                 }
@@ -1748,7 +1748,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
 
       if (elapsed >= MMCSD_DELAY_1SEC)
         {
-          fdbg("Failed to exit IDLE state\n");
+          ferr("Failed to exit IDLE state\n");
           SPI_SELECT(spi, SPIDEV_MMCSD, false);
           mmcsd_semgive(slot);
           return -EIO;
@@ -1757,7 +1757,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
 
   if (slot->type == MMCSD_CARDTYPE_UNKNOWN)
     {
-      fdbg("Failed to identify card\n");
+      ferr("Failed to identify card\n");
       SPI_SELECT(spi, SPIDEV_MMCSD, false);
       mmcsd_semgive(slot);
       return -EIO;
@@ -1769,7 +1769,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
   result = mmcsd_getcsd(slot, csd);
   if (result != OK)
     {
-      fdbg("mmcsd_getcsd(CMD9) failed: %d\n", result);
+      ferr("mmcsd_getcsd(CMD9) failed: %d\n", result);
       SPI_SELECT(spi, SPIDEV_MMCSD, false);
       mmcsd_semgive(slot);
       return -EIO;
@@ -1836,7 +1836,7 @@ static void mmcsd_mediachanged(void *arg)
 #ifdef CONFIG_DEBUG_FEATURES
   if (!slot || !slot->spi)
     {
-      fdbg("Internal confusion\n");
+      ferr("Internal confusion\n");
       return;
     }
 #endif
@@ -1857,7 +1857,7 @@ static void mmcsd_mediachanged(void *arg)
     {
       /* Media is not present */
 
-      fdbg("No card present\n");
+      ferr("No card present\n");
       slot->state |= (MMCSD_SLOTSTATUS_NODISK | MMCSD_SLOTSTATUS_NOTREADY);
 
       /* Was media removed? */
@@ -1918,7 +1918,7 @@ int mmcsd_spislotinitialize(int minor, int slotno, FAR struct spi_dev_s *spi)
 #ifdef CONFIG_DEBUG_FEATURES
   if ((unsigned)slotno >= CONFIG_MMCSD_NSLOTS || (unsigned)minor > 255 || !spi)
     {
-      fdbg("Invalid arguments\n");
+      ferr("Invalid arguments\n");
       return -EINVAL;
     }
 #endif
@@ -1932,7 +1932,7 @@ int mmcsd_spislotinitialize(int minor, int slotno, FAR struct spi_dev_s *spi)
 #ifdef CONFIG_DEBUG_FEATURES
   if (slot->spi)
     {
-      fdbg("Already registered\n");
+      ferr("Already registered\n");
       return -EBUSY;
     }
 #endif
@@ -1969,7 +1969,7 @@ int mmcsd_spislotinitialize(int minor, int slotno, FAR struct spi_dev_s *spi)
   ret = register_blockdriver(devname, &g_bops, MMCSD_MODE, slot);
   if (ret < 0)
     {
-      fdbg("register_blockdriver failed: %d\n", -ret);
+      ferr("register_blockdriver failed: %d\n", -ret);
       slot->spi = NULL;
       return ret;
     }
diff --git a/drivers/modem/u-blox.c b/drivers/modem/u-blox.c
index fac7ec1ce2..cfdfdc733f 100644
--- a/drivers/modem/u-blox.c
+++ b/drivers/modem/u-blox.c
@@ -58,12 +58,12 @@
 /* Non-standard debug that may be enabled just for testing the modem driver */
 
 #ifdef CONFIG_MODEM_U_BLOX_DEBUG
-#  define m_dbg    dbg
+#  define m_err    err
 #  define m_info   info
 #  define m_vllerr  llerr
 #  define m_vllinfo llinfo
 #else
-#  define m_dbg(x...)
+#  define m_err(x...)
 #  define m_info(x...)
 #  define m_llerr(x...)
 #  define m_llinfo(x...)
@@ -286,7 +286,7 @@ FAR void* ubxmdm_register(FAR const char *path,
     kmm_zalloc(sizeof(struct ubxmdm_upper));
   if (!upper)
     {
-      m_dbg("Upper half allocation failed\n");
+      m_err("Upper half allocation failed\n");
       goto errout;
     }
 
@@ -294,14 +294,14 @@ FAR void* ubxmdm_register(FAR const char *path,
   upper->path = strdup(path);
   if (!upper->path)
     {
-      m_dbg("Path allocation failed\n");
+      m_err("Path allocation failed\n");
       goto errout_with_upper;
     }
 
   ret = register_driver(path, &ubxmdm_fops, 0666, upper);
   if (ret < 0)
     {
-      m_dbg("register_driver failed: %d\n", ret);
+      m_err("register_driver failed: %d\n", ret);
       goto errout_with_path;
     }
 
diff --git a/drivers/mtd/at24xx.c b/drivers/mtd/at24xx.c
index a7b38883e5..91c8951193 100644
--- a/drivers/mtd/at24xx.c
+++ b/drivers/mtd/at24xx.c
@@ -622,7 +622,7 @@ FAR struct mtd_dev_s *at24c_initialize(FAR struct i2c_master_s *dev)
   priv = (FAR struct at24c_dev_s *)kmm_zalloc(sizeof(struct at24c_dev_s));
   if (priv == NULL)
     {
-      fdbg("ERROR: Failed to allocate device structure\n");
+      ferr("ERROR: Failed to allocate device structure\n");
       return NULL;
     }
 
diff --git a/drivers/mtd/at25.c b/drivers/mtd/at25.c
index 9b1efde666..efc2e355a7 100644
--- a/drivers/mtd/at25.c
+++ b/drivers/mtd/at25.c
@@ -292,7 +292,7 @@ static void at25_waitwritecomplete(struct at25_dev_s *priv)
 
   if (status & AT25_SR_EPE)
     {
-      fdbg("ERROR: Write error, status: 0x%02x\n", status);
+      ferr("ERROR: Write error, status: 0x%02x\n", status);
     }
 
   finfo("Complete, status: 0x%02x\n", status);
@@ -671,7 +671,7 @@ FAR struct mtd_dev_s *at25_initialize(FAR struct spi_dev_s *dev)
         {
           /* Unrecognized! Discard all of that work we just did and return NULL */
 
-          fdbg("ERROR: Unrecognized\n");
+          ferr("ERROR: Unrecognized\n");
           kmm_free(priv);
           priv = NULL;
         }
diff --git a/drivers/mtd/at45db.c b/drivers/mtd/at45db.c
index 4fac5863b3..fd928bacff 100644
--- a/drivers/mtd/at45db.c
+++ b/drivers/mtd/at45db.c
@@ -869,7 +869,7 @@ FAR struct mtd_dev_s *at45db_initialize(FAR struct spi_dev_s *spi)
         {
           /* Unrecognized! Discard all of that work we just did and return NULL */
 
-          fdbg("Unrecognized\n");
+          ferr("Unrecognized\n");
           goto errout;
         }
 
@@ -887,7 +887,7 @@ FAR struct mtd_dev_s *at45db_initialize(FAR struct spi_dev_s *spi)
            * is required after the device has be re-programmed.
            */
 
-          fdbg("Reprogramming page size\n");
+          ferr("Reprogramming page size\n");
           SPI_SELECT(priv->spi, SPIDEV_FLASH, true);
           SPI_SNDBLOCK(priv->spi, g_binpgsize, BINPGSIZE_SIZE);
           SPI_SELECT(priv->spi, SPIDEV_FLASH, false);
diff --git a/drivers/mtd/filemtd.c b/drivers/mtd/filemtd.c
index 89f6fb7b87..c1cd14fc6b 100644
--- a/drivers/mtd/filemtd.c
+++ b/drivers/mtd/filemtd.c
@@ -187,7 +187,7 @@ static ssize_t filemtd_write(FAR struct file_dev_s *priv, size_t offset,
 #ifdef CONFIG_DEBUG_FEATURES
       if (newvalue != srcvalue)
         {
-          dbg("ERROR: Bad write: source=%02x dest=%02x result=%02x\n",
+          err("ERROR: Bad write: source=%02x dest=%02x result=%02x\n",
               srcvalue, oldvalue, newvalue);
         }
 #endif
@@ -498,7 +498,7 @@ FAR struct mtd_dev_s *filemtd_initialize(FAR const char *path, size_t offset,
   priv = (FAR struct file_dev_s *)kmm_zalloc(sizeof(struct file_dev_s));
   if (!priv)
     {
-      fdbg("Failed to allocate the FILE MTD state structure\n");
+      ferr("Failed to allocate the FILE MTD state structure\n");
       return NULL;
     }
 
@@ -514,7 +514,7 @@ FAR struct mtd_dev_s *filemtd_initialize(FAR const char *path, size_t offset,
   ret = stat(path, &sb);
   if (ret < 0)
     {
-      dbg("Failed to stat %s: %d\n", path, get_errno());
+      err("Failed to stat %s: %d\n", path, get_errno());
       return NULL;
     }
 
@@ -525,7 +525,7 @@ FAR struct mtd_dev_s *filemtd_initialize(FAR const char *path, size_t offset,
   priv->fd = open(path, mode);
   if (priv->fd == -1)
     {
-      fdbg("Failed to open the FILE MTD file %s\n", path);
+      ferr("Failed to open the FILE MTD file %s\n", path);
       kmm_free(priv);
       return NULL;
     }
@@ -557,7 +557,7 @@ FAR struct mtd_dev_s *filemtd_initialize(FAR const char *path, size_t offset,
   nblocks = (filelen - offset) / priv->erasesize;
   if (nblocks < 3)
     {
-      fdbg("Need to provide at least three full erase block\n");
+      ferr("Need to provide at least three full erase block\n");
       kmm_free(priv);
       return NULL;
     }
diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c
index 98e61cb578..fc11d3cc65 100644
--- a/drivers/mtd/ftl.c
+++ b/drivers/mtd/ftl.c
@@ -168,7 +168,7 @@ static ssize_t ftl_reload(FAR void *priv, FAR uint8_t *buffer,
   nread   = MTD_BREAD(dev->mtd, startblock, nblocks, buffer);
   if (nread != nblocks)
     {
-      fdbg("Read %d blocks starting at block %d failed: %d\n",
+      ferr("Read %d blocks starting at block %d failed: %d\n",
             nblocks, startblock, nread);
     }
 
@@ -244,7 +244,7 @@ static ssize_t ftl_flush(FAR void *priv, FAR const uint8_t *buffer,
       nxfrd   = MTD_BREAD(dev->mtd, rwblock, dev->blkper, dev->eblock);
       if (nxfrd != dev->blkper)
         {
-          fdbg("Read erase block %d failed: %d\n", rwblock, nxfrd);
+          ferr("Read erase block %d failed: %d\n", rwblock, nxfrd);
           return -EIO;
         }
 
@@ -254,7 +254,7 @@ static ssize_t ftl_flush(FAR void *priv, FAR const uint8_t *buffer,
       ret        = MTD_ERASE(dev->mtd, eraseblock, 1);
       if (ret < 0)
         {
-          fdbg("Erase block=%d failed: %d\n", eraseblock, ret);
+          ferr("Erase block=%d failed: %d\n", eraseblock, ret);
           return ret;
         }
 
@@ -281,7 +281,7 @@ static ssize_t ftl_flush(FAR void *priv, FAR const uint8_t *buffer,
       nxfrd = MTD_BWRITE(dev->mtd, rwblock, dev->blkper, dev->eblock);
       if (nxfrd != dev->blkper)
         {
-          fdbg("Write erase block %d failed: %d\n", rwblock, nxfrd);
+          ferr("Write erase block %d failed: %d\n", rwblock, nxfrd);
           return -EIO;
         }
 
@@ -309,7 +309,7 @@ static ssize_t ftl_flush(FAR void *priv, FAR const uint8_t *buffer,
       ret        = MTD_ERASE(dev->mtd, eraseblock, 1);
       if (ret < 0)
         {
-          fdbg("Erase block=%d failed: %d\n", eraseblock, ret);
+          ferr("Erase block=%d failed: %d\n", eraseblock, ret);
           return ret;
         }
 
@@ -321,7 +321,7 @@ static ssize_t ftl_flush(FAR void *priv, FAR const uint8_t *buffer,
       nxfrd = MTD_BWRITE(dev->mtd, alignedblock, dev->blkper, buffer);
       if (nxfrd != dev->blkper)
         {
-          fdbg("Write erase block %d failed: %d\n", alignedblock, nxfrd);
+          ferr("Write erase block %d failed: %d\n", alignedblock, nxfrd);
           return -EIO;
         }
 
@@ -341,7 +341,7 @@ static ssize_t ftl_flush(FAR void *priv, FAR const uint8_t *buffer,
      nxfrd = MTD_BREAD(dev->mtd, alignedblock, dev->blkper, dev->eblock);
       if (nxfrd != dev->blkper)
         {
-          fdbg("Read erase block %d failed: %d\n", alignedblock, nxfrd);
+          ferr("Read erase block %d failed: %d\n", alignedblock, nxfrd);
           return -EIO;
         }
 
@@ -351,7 +351,7 @@ static ssize_t ftl_flush(FAR void *priv, FAR const uint8_t *buffer,
       ret        = MTD_ERASE(dev->mtd, eraseblock, 1);
       if (ret < 0)
         {
-          fdbg("Erase block=%d failed: %d\n", eraseblock, ret);
+          ferr("Erase block=%d failed: %d\n", eraseblock, ret);
           return ret;
         }
 
@@ -367,7 +367,7 @@ static ssize_t ftl_flush(FAR void *priv, FAR const uint8_t *buffer,
       nxfrd = MTD_BWRITE(dev->mtd, alignedblock, dev->blkper, dev->eblock);
       if (nxfrd != dev->blkper)
         {
-          fdbg("Write erase block %d failed: %d\n", alignedblock, nxfrd);
+          ferr("Write erase block %d failed: %d\n", alignedblock, nxfrd);
           return -EIO;
         }
     }
@@ -469,7 +469,7 @@ static int ftl_ioctl(FAR struct inode *inode, int cmd, unsigned long arg)
 #ifdef CONFIG_DEBUG_FEATURES
       if (arg == 0)
         {
-          fdbg("ERROR: BIOC_XIPBASE argument is NULL\n");
+          ferr("ERROR: BIOC_XIPBASE argument is NULL\n");
           return -EINVAL;
         }
 #endif
@@ -488,7 +488,7 @@ static int ftl_ioctl(FAR struct inode *inode, int cmd, unsigned long arg)
   ret = MTD_IOCTL(dev->mtd, cmd, arg);
   if (ret < 0)
     {
-      fdbg("ERROR: MTD ioctl(%04x) failed: %d\n", cmd, ret);
+      ferr("ERROR: MTD ioctl(%04x) failed: %d\n", cmd, ret);
     }
 
   return ret;
@@ -543,7 +543,7 @@ int ftl_initialize(int minor, FAR struct mtd_dev_s *mtd)
       ret = MTD_IOCTL(mtd, MTDIOC_GEOMETRY, (unsigned long)((uintptr_t)&dev->geo));
       if (ret < 0)
         {
-          fdbg("MTD ioctl(MTDIOC_GEOMETRY) failed: %d\n", ret);
+          ferr("MTD ioctl(MTDIOC_GEOMETRY) failed: %d\n", ret);
           kmm_free(dev);
           return ret;
         }
@@ -554,7 +554,7 @@ int ftl_initialize(int minor, FAR struct mtd_dev_s *mtd)
       dev->eblock  = (FAR uint8_t *)kmm_malloc(dev->geo.erasesize);
       if (!dev->eblock)
         {
-          fdbg("Failed to allocate an erase block buffer\n");
+          ferr("Failed to allocate an erase block buffer\n");
           kmm_free(dev);
           return -ENOMEM;
         }
@@ -585,7 +585,7 @@ int ftl_initialize(int minor, FAR struct mtd_dev_s *mtd)
       ret = rwb_initialize(&dev->rwb);
       if (ret < 0)
         {
-          fdbg("rwb_initialize failed: %d\n", ret);
+          ferr("rwb_initialize failed: %d\n", ret);
           kmm_free(dev);
           return ret;
         }
@@ -600,7 +600,7 @@ int ftl_initialize(int minor, FAR struct mtd_dev_s *mtd)
       ret = register_blockdriver(devname, &g_bops, 0, dev);
       if (ret < 0)
         {
-          fdbg("register_blockdriver failed: %d\n", -ret);
+          ferr("register_blockdriver failed: %d\n", -ret);
           kmm_free(dev);
         }
     }
diff --git a/drivers/mtd/hamming.c b/drivers/mtd/hamming.c
index 087bd472be..4ea0c81bfa 100644
--- a/drivers/mtd/hamming.c
+++ b/drivers/mtd/hamming.c
@@ -333,7 +333,7 @@ static int hamming_verify256(FAR uint8_t *data, FAR const uint8_t *original)
 
       /* Correct bit */
 
-      fdbg("Correcting byte %d at bit %d\n", byte, bit);
+      ferr("Correcting byte %d at bit %d\n", byte, bit);
       data[byte] ^= (1 << bit);
 
       return HAMMING_ERROR_SINGLEBIT;
@@ -343,7 +343,7 @@ static int hamming_verify256(FAR uint8_t *data, FAR const uint8_t *original)
 
   if (hamming_bitsincode256(correction) == 1)
     {
-      fdbg("ERROR: ECC has been correupted\n");
+      ferr("ERROR: ECC has been correupted\n");
       return HAMMING_ERROR_ECC;
     }
 
@@ -351,7 +351,7 @@ static int hamming_verify256(FAR uint8_t *data, FAR const uint8_t *original)
 
   else
     {
-      fdbg("ERROR: Multiple bit errors\n");
+      ferr("ERROR: Multiple bit errors\n");
       return HAMMING_ERROR_MULTIPLEBITS;
     }
 }
diff --git a/drivers/mtd/is25xp.c b/drivers/mtd/is25xp.c
index e26f859b49..1c4279ba86 100644
--- a/drivers/mtd/is25xp.c
+++ b/drivers/mtd/is25xp.c
@@ -976,7 +976,7 @@ FAR struct mtd_dev_s *is25xp_initialize(FAR struct spi_dev_s *dev)
         {
           /* Unrecognized! Discard all of that work we just did and return NULL */
 
-          fdbg("Unrecognized\n");
+          ferr("Unrecognized\n");
           kmm_free(priv);
           priv = NULL;
         }
diff --git a/drivers/mtd/m25px.c b/drivers/mtd/m25px.c
index c1b523541b..addfd85f49 100644
--- a/drivers/mtd/m25px.c
+++ b/drivers/mtd/m25px.c
@@ -1031,7 +1031,7 @@ FAR struct mtd_dev_s *m25p_initialize(FAR struct spi_dev_s *dev)
         {
           /* Unrecognized! Discard all of that work we just did and return NULL */
 
-          fdbg("Unrecognized\n");
+          ferr("Unrecognized\n");
           kmm_free(priv);
           priv = NULL;
         }
diff --git a/drivers/mtd/mtd_config.c b/drivers/mtd/mtd_config.c
index d3cde69564..5c021c54dc 100644
--- a/drivers/mtd/mtd_config.c
+++ b/drivers/mtd/mtd_config.c
@@ -1353,7 +1353,7 @@ int mtdconfig_register(FAR struct mtd_dev_s *mtd)
       ret = MTD_IOCTL(mtd, MTDIOC_GEOMETRY, (unsigned long)((uintptr_t)&geo));
       if (ret < 0)
         {
-          fdbg("MTD ioctl(MTDIOC_GEOMETRY) failed: %d\n", ret);
+          ferr("MTD ioctl(MTDIOC_GEOMETRY) failed: %d\n", ret);
           kmm_free(dev);
           goto errout;
         }
diff --git a/drivers/mtd/mtd_nand.c b/drivers/mtd/mtd_nand.c
index 206cf97e54..826513939b 100644
--- a/drivers/mtd/mtd_nand.c
+++ b/drivers/mtd/mtd_nand.c
@@ -153,7 +153,7 @@ static int nand_lock(FAR struct nand_dev_s *nand)
       errcode = errno;
       DEBUGASSERT(errcode != OK);
 
-      fdbg("sem_wait failed: %d\n", errcode);
+      ferr("sem_wait failed: %d\n", errcode);
       return -errcode;
     }
 
@@ -200,7 +200,7 @@ static int nand_checkblock(FAR struct nand_dev_s *nand, off_t block)
   ret = NAND_RAWREAD(raw, block, 0, 0, spare);
   if (ret < 0)
     {
-      fdbg("ERROR: Failed to read page 0 of block %d\n", block);
+      ferr("ERROR: Failed to read page 0 of block %d\n", block);
       return ret;
     }
 
@@ -216,7 +216,7 @@ static int nand_checkblock(FAR struct nand_dev_s *nand, off_t block)
   ret = NAND_RAWREAD(raw, block, 1, 0, spare);
   if (ret < 0)
     {
-      fdbg("ERROR: Failed to read page 1 of block %d\n", block);
+      ferr("ERROR: Failed to read page 1 of block %d\n", block);
       return ret;
     }
 
@@ -303,7 +303,7 @@ static int nand_devscan(FAR struct nand_dev_s *nand)
             }
           else
             {
-              fdbg("ERROR: Cannot retrieve info from block %u: %d\n",
+              ferr("ERROR: Cannot retrieve info from block %u: %d\n",
                    (unsigned int)block, ret);
             }
         }
@@ -417,7 +417,7 @@ static int nand_eraseblock(FAR struct nand_dev_s *nand, off_t block,
     {
       int tmp;
 
-      fdbg("ERROR: Cannot erase block %ld\n", (long)block);
+      ferr("ERROR: Cannot erase block %ld\n", (long)block);
 
       /* Retrieve the model and scheme */
 
@@ -432,7 +432,7 @@ static int nand_eraseblock(FAR struct nand_dev_s *nand, off_t block,
       tmp = NAND_WRITEPAGE(nand->raw, block, 0, 0, spare);
       if (tmp < 0)
         {
-          fdbg("ERROR: Failed bo marke block %ld as BAD\n", (long)block);
+          ferr("ERROR: Failed bo marke block %ld as BAD\n", (long)block);
         }
     }
 
@@ -467,7 +467,7 @@ static int nand_readpage(FAR struct nand_dev_s *nand, off_t block,
 
   if (nand_checkblock(nand, block) != GOODBLOCK)
     {
-      fdbg("ERROR: Block is BAD\n");
+      ferr("ERROR: Block is BAD\n");
       return -EAGAIN;
    }
 #endif
@@ -520,7 +520,7 @@ static int nand_writepage(FAR struct nand_dev_s *nand, off_t block,
 
   if (nand_checkblock(nand, block) != GOODBLOCK)
     {
-      fdbg("ERROR: Block is BAD\n");
+      ferr("ERROR: Block is BAD\n");
       return -EAGAIN;
     }
 #endif
@@ -574,7 +574,7 @@ static int nand_erase(struct mtd_dev_s *dev, off_t startblock,
       ret = nand_eraseblock(nand, startblock, false);
       if (ret < 0)
         {
-          fdbg("nand_eraseblock failed on block %ld: %d\n",
+          ferr("nand_eraseblock failed on block %ld: %d\n",
                (long)startblock, ret);
           nand_unlock(nand);
           return ret;
@@ -642,7 +642,7 @@ static ssize_t nand_bread(struct mtd_dev_s *dev, off_t startpage,
 
       if (block > maxblock)
         {
-          fdbg("ERROR: Read beyond the end of FLASH, block=%ld\n",
+          ferr("ERROR: Read beyond the end of FLASH, block=%ld\n",
                (long)block);
 
           ret = -ESPIPE;
@@ -654,7 +654,7 @@ static ssize_t nand_bread(struct mtd_dev_s *dev, off_t startpage,
       ret = nand_readpage(nand, block, page, buffer);
       if (ret < 0)
         {
-          fdbg("ERROR: nand_readpage failed block=%ld page=%d: %d\n",
+          ferr("ERROR: nand_readpage failed block=%ld page=%d: %d\n",
                (long)block, page, ret);
           goto errout_with_lock;
         }
@@ -738,7 +738,7 @@ static ssize_t nand_bwrite(struct mtd_dev_s *dev, off_t startpage,
 
       if (block > maxblock)
         {
-          fdbg("ERROR: Write beyond the end of FLASH, block=%ld\n",
+          ferr("ERROR: Write beyond the end of FLASH, block=%ld\n",
                (long)block);
 
           ret = -ESPIPE;
@@ -750,7 +750,7 @@ static ssize_t nand_bwrite(struct mtd_dev_s *dev, off_t startpage,
       ret = nand_writepage(nand, block, page, buffer);
       if (ret < 0)
         {
-          fdbg("ERROR: nand_writepage failed block=%ld page=%d: %d\n",
+          ferr("ERROR: nand_writepage failed block=%ld page=%d: %d\n",
                (long)block, page, ret);
           goto errout_with_lock;
         }
@@ -872,7 +872,7 @@ FAR struct mtd_dev_s *nand_initialize(FAR struct nand_raw_s *raw)
 
   if (!onfi_ebidetect(raw->cmdaddr, raw->addraddr, raw->dataaddr))
     {
-      fdbg("ERROR: No NAND device detected at: %p %p %p\n",
+      ferr("ERROR: No NAND device detected at: %p %p %p\n",
            (FAR void *)raw->cmdaddr, (FAR void *)raw->addraddr,
            (FAR void *)raw->dataaddr);
       return NULL;
@@ -895,7 +895,7 @@ FAR struct mtd_dev_s *nand_initialize(FAR struct nand_raw_s *raw)
       if (nandmodel_find(g_nandmodels, NAND_NMODELS, chipid,
                          &raw->model))
        {
-          fdbg("ERROR: Could not determine NAND model\n");
+          ferr("ERROR: Could not determine NAND model\n");
           return NULL;
         }
     }
@@ -955,7 +955,7 @@ FAR struct mtd_dev_s *nand_initialize(FAR struct nand_raw_s *raw)
   nand = (FAR struct nand_dev_s *)kmm_zalloc(sizeof(struct nand_dev_s));
   if (!nand)
     {
-      fdbg("ERROR: Failed to allocate the NAND MTD device structure\n");
+      ferr("ERROR: Failed to allocate the NAND MTD device structure\n");
       return NULL;
     }
 
diff --git a/drivers/mtd/mtd_nandecc.c b/drivers/mtd/mtd_nandecc.c
index 7820feb481..e22bc23175 100644
--- a/drivers/mtd/mtd_nandecc.c
+++ b/drivers/mtd/mtd_nandecc.c
@@ -125,7 +125,7 @@ int nandecc_readpage(FAR struct nand_dev_s *nand, off_t block,
   ret = NAND_RAWREAD(raw, block, page, 0, spare);
   if (ret < 0)
     {
-      fdbg("ERROR: Failed to read page:d\n", ret);
+      ferr("ERROR: Failed to read page:d\n", ret);
       return ret;
     }
 
@@ -134,7 +134,7 @@ int nandecc_readpage(FAR struct nand_dev_s *nand, off_t block,
   ret = NAND_RAWREAD(nand->raw, block, page, data, 0);
   if (ret < 0)
     {
-      fdbg("ERROR: Failed to read page:d\n", ret);
+      ferr("ERROR: Failed to read page:d\n", ret);
       return ret;
     }
 
@@ -148,7 +148,7 @@ int nandecc_readpage(FAR struct nand_dev_s *nand, off_t block,
   ret = hamming_verify256x(data, pagesize, raw->ecc);
   if (ret && (ret != HAMMING_ERROR_SINGLEBIT))
     {
-      fdbg("ERROR: Block=%d page=%d Unrecoverable error: %d\n",
+      ferr("ERROR: Block=%d page=%d Unrecoverable error: %d\n",
            block, page, ret);
       return -EIO;
     }
@@ -235,7 +235,7 @@ int nandecc_writepage(FAR struct nand_dev_s *nand, off_t block,
   ret = NAND_RAWWRITE(nand->raw, block, page, data, spare);
   if (ret < 0)
     {
-      fdbg("ERROR: Failed to write page:d\n", ret);
+      ferr("ERROR: Failed to write page:d\n", ret);
     }
 
   return ret;
diff --git a/drivers/mtd/mtd_onfi.c b/drivers/mtd/mtd_onfi.c
index 3f1b9f43a6..4a2a150f0f 100644
--- a/drivers/mtd/mtd_onfi.c
+++ b/drivers/mtd/mtd_onfi.c
@@ -278,7 +278,7 @@ int onfi_read(uintptr_t cmdaddr, uintptr_t addraddr, uintptr_t dataaddr,
 
   if (!onfi_compatible(cmdaddr, addraddr, dataaddr))
     {
-      fdbg("ERROR: No ONFI compatible device detected\n");
+      ferr("ERROR: No ONFI compatible device detected\n");
       return -ENODEV;
     }
 
@@ -316,7 +316,7 @@ int onfi_read(uintptr_t cmdaddr, uintptr_t addraddr, uintptr_t dataaddr,
 
   if (i == ONFI_PARAM_TABLE_SIZE)
     {
-      fdbg("ERROR: Failed to read ONFI parameter table\n");
+      ferr("ERROR: Failed to read ONFI parameter table\n");
       return -EIO;
    }
 
diff --git a/drivers/mtd/mtd_partition.c b/drivers/mtd/mtd_partition.c
index 60e29870fe..8b2f2586fd 100644
--- a/drivers/mtd/mtd_partition.c
+++ b/drivers/mtd/mtd_partition.c
@@ -235,7 +235,7 @@ static int part_erase(FAR struct mtd_dev_s *dev, off_t startblock,
 
   if (!part_blockcheck(priv, (startblock + nblocks - 1) * priv->blkpererase))
     {
-      fdbg("ERROR: Erase beyond the end of the partition\n");
+      ferr("ERROR: Erase beyond the end of the partition\n");
       return -ENXIO;
     }
 
@@ -270,7 +270,7 @@ static ssize_t part_bread(FAR struct mtd_dev_s *dev, off_t startblock,
 
   if (!part_blockcheck(priv, startblock + nblocks - 1))
     {
-      fdbg("ERROR: Read beyond the end of the partition\n");
+      ferr("ERROR: Read beyond the end of the partition\n");
       return -ENXIO;
     }
 
@@ -301,7 +301,7 @@ static ssize_t part_bwrite(FAR struct mtd_dev_s *dev, off_t startblock,
 
   if (!part_blockcheck(priv, startblock + nblocks - 1))
     {
-      fdbg("ERROR: Write beyond the end of the partition\n");
+      ferr("ERROR: Write beyond the end of the partition\n");
       return -ENXIO;
     }
 
@@ -337,7 +337,7 @@ static ssize_t part_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes,
 
       if (!part_bytecheck(priv, offset + nbytes - 1))
         {
-          fdbg("ERROR: Read beyond the end of the partition\n");
+          ferr("ERROR: Read beyond the end of the partition\n");
           return -ENXIO;
         }
 
@@ -375,7 +375,7 @@ static ssize_t part_write(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes
 
       if (!part_bytecheck(priv, offset + nbytes - 1))
         {
-          fdbg("ERROR: Write beyond the end of the partition\n");
+          ferr("ERROR: Write beyond the end of the partition\n");
           return -ENXIO;
         }
 
@@ -489,7 +489,7 @@ static int part_procfs_open(FAR struct file *filep, FAR const char *relpath,
 
   if ((oflags & O_WRONLY) != 0 || (oflags & O_RDONLY) == 0)
     {
-      fdbg("ERROR: Only O_RDONLY supported\n");
+      ferr("ERROR: Only O_RDONLY supported\n");
       return -EACCES;
     }
 
@@ -498,7 +498,7 @@ static int part_procfs_open(FAR struct file *filep, FAR const char *relpath,
   attr = (FAR struct part_procfs_file_s *)kmm_zalloc(sizeof(struct part_procfs_file_s));
   if (!attr)
     {
-      fdbg("ERROR: Failed to allocate file attributes\n");
+      ferr("ERROR: Failed to allocate file attributes\n");
       return -ENOMEM;
     }
 
@@ -591,7 +591,7 @@ static ssize_t part_procfs_read(FAR struct file *filep, FAR char *buffer,
                   MTDIOC_GEOMETRY, (unsigned long)((uintptr_t)&geo));
           if (ret < 0)
             {
-              fdbg("ERROR: mtd->ioctl failed: %d\n", ret);
+              ferr("ERROR: mtd->ioctl failed: %d\n", ret);
               return 0;
             }
 
@@ -714,7 +714,7 @@ static int part_procfs_dup(FAR const struct file *oldp, FAR struct file *newp)
   newattr = (FAR struct part_procfs_file_s *)kmm_zalloc(sizeof(struct part_procfs_file_s));
   if (!newattr)
     {
-      fdbg("ERROR: Failed to allocate file attributes\n");
+      ferr("ERROR: Failed to allocate file attributes\n");
       return -ENOMEM;
     }
 
@@ -796,7 +796,7 @@ FAR struct mtd_dev_s *mtd_partition(FAR struct mtd_dev_s *mtd, off_t firstblock,
   ret = mtd->ioctl(mtd, MTDIOC_GEOMETRY, (unsigned long)((uintptr_t)&geo));
   if (ret < 0)
     {
-      fdbg("ERROR: mtd->ioctl failed: %d\n", ret);
+      ferr("ERROR: mtd->ioctl failed: %d\n", ret);
       return NULL;
     }
 
@@ -818,7 +818,7 @@ FAR struct mtd_dev_s *mtd_partition(FAR struct mtd_dev_s *mtd, off_t firstblock,
 
   if (erasestart >= eraseend)
     {
-      fdbg("ERROR: sub-region too small\n");
+      ferr("ERROR: sub-region too small\n");
       return NULL;
     }
 
@@ -827,7 +827,7 @@ FAR struct mtd_dev_s *mtd_partition(FAR struct mtd_dev_s *mtd, off_t firstblock,
   devblocks = blkpererase * geo.neraseblocks;
   if (eraseend > devblocks)
     {
-      fdbg("ERROR: sub-region too big\n");
+      ferr("ERROR: sub-region too big\n");
       return NULL;
     }
 
@@ -836,7 +836,7 @@ FAR struct mtd_dev_s *mtd_partition(FAR struct mtd_dev_s *mtd, off_t firstblock,
   part = (FAR struct mtd_partition_s *)kmm_zalloc(sizeof(struct mtd_partition_s));
   if (!part)
     {
-      fdbg("ERROR: Failed to allocate memory for the partition device\n");
+      ferr("ERROR: Failed to allocate memory for the partition device\n");
       return NULL;
     }
 
diff --git a/drivers/mtd/mtd_procfs.c b/drivers/mtd/mtd_procfs.c
index e604a19b97..4ba355110c 100644
--- a/drivers/mtd/mtd_procfs.c
+++ b/drivers/mtd/mtd_procfs.c
@@ -149,7 +149,7 @@ static int mtd_open(FAR struct file *filep, FAR const char *relpath,
 
   if ((oflags & O_WRONLY) != 0 || (oflags & O_RDONLY) == 0)
     {
-      fdbg("ERROR: Only O_RDONLY supported\n");
+      ferr("ERROR: Only O_RDONLY supported\n");
       return -EACCES;
     }
 
@@ -158,7 +158,7 @@ static int mtd_open(FAR struct file *filep, FAR const char *relpath,
   attr = (FAR struct mtd_file_s *)kmm_zalloc(sizeof(struct mtd_file_s));
   if (!attr)
     {
-      fdbg("ERROR: Failed to allocate file attributes\n");
+      ferr("ERROR: Failed to allocate file attributes\n");
       return -ENOMEM;
     }
 
@@ -278,7 +278,7 @@ static int mtd_dup(FAR const struct file *oldp, FAR struct file *newp)
   newattr = (FAR struct mtd_file_s *)kmm_zalloc(sizeof(struct mtd_file_s));
   if (!newattr)
     {
-      fdbg("ERROR: Failed to allocate file attributes\n");
+      ferr("ERROR: Failed to allocate file attributes\n");
       return -ENOMEM;
     }
 
diff --git a/drivers/mtd/mtd_rwbuffer.c b/drivers/mtd/mtd_rwbuffer.c
index 28d05c619d..c152bc5f75 100644
--- a/drivers/mtd/mtd_rwbuffer.c
+++ b/drivers/mtd/mtd_rwbuffer.c
@@ -187,7 +187,7 @@ static int mtd_erase(FAR struct mtd_dev_s *dev, off_t block, size_t nblocks)
   ret = rwb_invalidate(&priv->rwb, sector, nsectors);
   if (ret < 0)
     {
-      fdbg("ERROR: rwb_invalidate failed: %d\n", ret);
+      ferr("ERROR: rwb_invalidate failed: %d\n", ret);
       return ret;
     }
 
@@ -289,7 +289,7 @@ static int mtd_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
           ret = priv->dev->ioctl(priv->dev, MTDIOC_BULKERASE, 0);
           if (ret >= 0)
             {
-              fdbg("ERROR: Device ioctl failed: %d\n", ret);
+              ferr("ERROR: Device ioctl failed: %d\n", ret);
               break;
             }
 
@@ -298,7 +298,7 @@ static int mtd_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
          ret = rwb_invalidate(&priv->rwb, 0, priv->rwb.nblocks);
          if (ret < 0)
            {
-              fdbg("ERROR: rwb_invalidate failed: %d\n", ret);
+              ferr("ERROR: rwb_invalidate failed: %d\n", ret);
            }
         }
         break;
@@ -345,7 +345,7 @@ FAR struct mtd_dev_s *mtd_rwb_initialize(FAR struct mtd_dev_s *mtd)
   ret = mtd->ioctl(mtd, MTDIOC_GEOMETRY, (unsigned long)((uintptr_t)&geo));
   if (ret < 0)
     {
-      fdbg("ERROR: MTDIOC_GEOMETRY ioctl failed: %d\n", ret);
+      ferr("ERROR: MTDIOC_GEOMETRY ioctl failed: %d\n", ret);
       return NULL;
     }
 
@@ -404,7 +404,7 @@ FAR struct mtd_dev_s *mtd_rwb_initialize(FAR struct mtd_dev_s *mtd)
       ret = rwb_initialize(&priv->rwb);
       if (ret < 0)
         {
-          fdbg("ERROR: rwb_initialize failed: %d\n", ret);
+          ferr("ERROR: rwb_initialize failed: %d\n", ret);
           kmm_free(priv);
           return NULL;
         }
diff --git a/drivers/mtd/n25qxxx.c b/drivers/mtd/n25qxxx.c
index f0db0481a6..191cc1cd22 100644
--- a/drivers/mtd/n25qxxx.c
+++ b/drivers/mtd/n25qxxx.c
@@ -575,7 +575,7 @@ static inline int n25qxxx_readid(struct n25qxxx_dev_s *priv)
   if (priv->cmdbuf[1] != N25QXXX3V_JEDEC_DEVICE_TYPE &&
       priv->cmdbuf[1] != N25QXXX2V_JEDEC_DEVICE_TYPE)
     {
-      fdbg("ERROR: Unrecognized device type: 0x%02x\n", priv->cmdbuf[1]);
+      ferr("ERROR: Unrecognized device type: 0x%02x\n", priv->cmdbuf[1]);
       return -ENODEV;
     }
 
@@ -628,7 +628,7 @@ static inline int n25qxxx_readid(struct n25qxxx_dev_s *priv)
       /* Support for this part is not implemented yet */
 
       default:
-        fdbg("ERROR: Unsupported memory capacity: %02x\n", priv->cmdbuf[2]);
+        ferr("ERROR: Unsupported memory capacity: %02x\n", priv->cmdbuf[2]);
         return -ENODEV;
     }
 
@@ -802,7 +802,7 @@ static int n25qxxx_erase_sector(struct n25qxxx_dev_s *priv, off_t sector)
   status = n25qxxx_read_status(priv);
   if ((status & STATUS_BUSY_MASK) != STATUS_READY)
     {
-      fdbg("ERROR: Flash busy: %02x", status);
+      ferr("ERROR: Flash busy: %02x", status);
       return -EBUSY;
     }
 
@@ -813,7 +813,7 @@ static int n25qxxx_erase_sector(struct n25qxxx_dev_s *priv, off_t sector)
   if ((status & (STATUS_BP3_MASK|STATUS_BP_MASK)) != 0 &&
       n25qxxx_isprotected(priv, status, address))
     {
-      fdbg("ERROR: Flash protected: %02x", status);
+      ferr("ERROR: Flash protected: %02x", status);
       return -EACCES;
     }
 
@@ -842,7 +842,7 @@ static int n25qxxx_erase_chip(struct n25qxxx_dev_s *priv)
   status = n25qxxx_read_status(priv);
   if ((status & (STATUS_BP3_MASK|STATUS_BP_MASK)) != 0)
     {
-      fdbg("ERROR: FLASH is Protected: %02x", status);
+      ferr("ERROR: FLASH is Protected: %02x", status);
       return -EACCES;
     }
 
@@ -928,7 +928,7 @@ static int n25qxxx_write_page(struct n25qxxx_dev_s *priv, FAR const uint8_t *buf
 
       if (ret < 0)
         {
-          fdbg("ERROR: QSPI_MEMORY failed writing address=%06x\n",
+          ferr("ERROR: QSPI_MEMORY failed writing address=%06x\n",
                address);
           return ret;
         }
@@ -976,7 +976,7 @@ static int n25qxxx_flush_cache(struct n25qxxx_dev_s *priv)
       ret = n25qxxx_write_page(priv, priv->sector, address, 1 << priv->sectorshift);
       if (ret < 0)
         {
-          fdbg("ERROR: n25qxxx_write_page failed: %d\n", ret);
+          ferr("ERROR: n25qxxx_write_page failed: %d\n", ret);
         }
 
       /* The case is no long dirty and the FLASH is no longer erased */
@@ -1019,7 +1019,7 @@ static FAR uint8_t *n25qxxx_read_cache(struct n25qxxx_dev_s *priv, off_t sector)
       ret = n25qxxx_flush_cache(priv);
       if (ret < 0)
         {
-          fdbg("ERROR: n25qxxx_flush_cache failed: %d\n", ret);
+          ferr("ERROR: n25qxxx_flush_cache failed: %d\n", ret);
           return NULL;
         }
 
@@ -1030,7 +1030,7 @@ static FAR uint8_t *n25qxxx_read_cache(struct n25qxxx_dev_s *priv, off_t sector)
                              (1 << priv->sectorshift));
       if (ret < 0)
         {
-          fdbg("ERROR: n25qxxx_read_byte failed: %d\n", ret);
+          ferr("ERROR: n25qxxx_read_byte failed: %d\n", ret);
           return NULL;
         }
 
@@ -1125,7 +1125,7 @@ static int n25qxxx_write_cache(FAR struct n25qxxx_dev_s *priv,
           ret = n25qxxx_erase_sector(priv, esectno);
           if (ret < 0)
             {
-              fdbg("ERROR: n25qxxx_erase_sector failed: %d\n", ret);
+              ferr("ERROR: n25qxxx_erase_sector failed: %d\n", ret);
               return ret;
             }
 
@@ -1249,7 +1249,7 @@ static ssize_t n25qxxx_bwrite(FAR struct mtd_dev_s *dev, off_t startblock,
   ret = n25qxxx_write_cache(priv, buffer, startblock, nblocks);
   if (ret < 0)
     {
-      fdbg("ERROR: n25qxxx_write_cache failed: %d\n", ret);
+      ferr("ERROR: n25qxxx_write_cache failed: %d\n", ret);
     }
 
 #else
@@ -1257,7 +1257,7 @@ static ssize_t n25qxxx_bwrite(FAR struct mtd_dev_s *dev, off_t startblock,
                           nblocks << priv->sectorshift);
   if (ret < 0)
     {
-      fdbg("ERROR: n25qxxx_write_page failed: %d\n", ret);
+      ferr("ERROR: n25qxxx_write_page failed: %d\n", ret);
     }
 #endif
 
@@ -1286,7 +1286,7 @@ static ssize_t n25qxxx_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbyt
 
   if (ret < 0)
     {
-      fdbg("ERROR: n25qxxx_read_byte returned: %d\n", ret);
+      ferr("ERROR: n25qxxx_read_byte returned: %d\n", ret);
       return (ssize_t)ret;
     }
 
@@ -1430,7 +1430,7 @@ FAR struct mtd_dev_s *n25qxxx_initialize(FAR struct qspi_dev_s *qspi, bool unpro
       priv->cmdbuf = (FAR uint8_t *)QSPI_ALLOC(qspi, 4);
       if (priv->cmdbuf == NULL)
         {
-          fdbg("ERROR Failed to allocate command buffer\n");
+          ferr("ERROR Failed to allocate command buffer\n");
           goto errout_with_priv;
         }
 
@@ -1439,7 +1439,7 @@ FAR struct mtd_dev_s *n25qxxx_initialize(FAR struct qspi_dev_s *qspi, bool unpro
       priv->readbuf = (FAR uint8_t *)QSPI_ALLOC(qspi, 1);
       if (priv->readbuf == NULL)
         {
-          fdbg("ERROR Failed to allocate read buffer\n");
+          ferr("ERROR Failed to allocate read buffer\n");
           goto errout_with_cmdbuf;
         }
 
@@ -1450,7 +1450,7 @@ FAR struct mtd_dev_s *n25qxxx_initialize(FAR struct qspi_dev_s *qspi, bool unpro
         {
           /* Unrecognized! Discard all of that work we just did and return NULL */
 
-          fdbg("ERROR Unrecognized QSPI device\n");
+          ferr("ERROR Unrecognized QSPI device\n");
           goto errout_with_readbuf;
         }
 
@@ -1470,7 +1470,7 @@ FAR struct mtd_dev_s *n25qxxx_initialize(FAR struct qspi_dev_s *qspi, bool unpro
           ret = n25qxxx_unprotect(priv, 0, priv->nsectors - 1);
           if (ret < 0)
             {
-              fdbg("ERROR: Sector unprotect failed\n");
+              ferr("ERROR: Sector unprotect failed\n");
             }
         }
 
@@ -1482,7 +1482,7 @@ FAR struct mtd_dev_s *n25qxxx_initialize(FAR struct qspi_dev_s *qspi, bool unpro
         {
           /* Allocation failed! Discard all of that work we just did and return NULL */
 
-          fdbg("ERROR: Sector allocation failed\n");
+          ferr("ERROR: Sector allocation failed\n");
           goto errout_with_readbuf;
         }
 #endif
diff --git a/drivers/mtd/rammtd.c b/drivers/mtd/rammtd.c
index 8bc9ac8b82..1e6c7c0fc7 100644
--- a/drivers/mtd/rammtd.c
+++ b/drivers/mtd/rammtd.c
@@ -172,7 +172,7 @@ static void *ram_write(FAR void *dest, FAR const void *src, size_t len)
 #ifdef CONFIG_DEBUG_FEATURES
       if (newvalue != srcvalue)
         {
-          dbg("ERROR: Bad write: source=%02x dest=%02x result=%02x\n",
+          err("ERROR: Bad write: source=%02x dest=%02x result=%02x\n",
               srcvalue, oldvalue, newvalue);
         }
 #endif
@@ -446,7 +446,7 @@ FAR struct mtd_dev_s *rammtd_initialize(FAR uint8_t *start, size_t size)
   priv = (FAR struct ram_dev_s *)kmm_zalloc(sizeof(struct ram_dev_s));
   if (!priv)
     {
-      fdbg("Failed to allocate the RAM MTD state structure\n");
+      ferr("Failed to allocate the RAM MTD state structure\n");
       return NULL;
     }
 
@@ -455,7 +455,7 @@ FAR struct mtd_dev_s *rammtd_initialize(FAR uint8_t *start, size_t size)
   nblocks = size / CONFIG_RAMMTD_ERASESIZE;
   if (nblocks < 1)
     {
-      fdbg("Need to provide at least one full erase block\n");
+      ferr("Need to provide at least one full erase block\n");
       return NULL;
     }
 
diff --git a/drivers/mtd/ramtron.c b/drivers/mtd/ramtron.c
index 84f8828276..5784dc1622 100644
--- a/drivers/mtd/ramtron.c
+++ b/drivers/mtd/ramtron.c
@@ -476,7 +476,7 @@ static int ramtron_waitwritecomplete(struct ramtron_dev_s *priv)
     }
   else
     {
-      fdbg("timeout waiting for write completion\n");
+      ferr("timeout waiting for write completion\n");
       retries = -EAGAIN;
     }
 
@@ -694,7 +694,7 @@ static ssize_t ramtron_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbyt
   status = SPI_SEND(priv->dev, RAMTRON_DUMMY);
   if ((status & ~RAMTRON_SR_SRWD) == 0)
     {
-      fdbg("read status failed - got 0x%02x\n", (unsigned)status);
+      ferr("read status failed - got 0x%02x\n", (unsigned)status);
       nbytes = -EIO;
     }
 #endif
diff --git a/drivers/mtd/s25fl1.c b/drivers/mtd/s25fl1.c
index ae9a47cbe4..f3181dd475 100644
--- a/drivers/mtd/s25fl1.c
+++ b/drivers/mtd/s25fl1.c
@@ -620,7 +620,7 @@ static inline int s25fl1_readid(struct s25fl1_dev_s *priv)
 
   if (priv->cmdbuf[1] != S25FL1_JEDEC_DEVICE_TYPE)
     {
-      fdbg("ERROR: Unrecognized device type: %02x\n", priv->cmdbuf[1]);
+      ferr("ERROR: Unrecognized device type: %02x\n", priv->cmdbuf[1]);
       return -ENODEV;
     }
 
@@ -649,7 +649,7 @@ static inline int s25fl1_readid(struct s25fl1_dev_s *priv)
       /* Support for this part is not implemented yet */
 
       default:
-        fdbg("ERROR: Unsupported memory capacity: %02x\n", priv->cmdbuf[2]);
+        ferr("ERROR: Unsupported memory capacity: %02x\n", priv->cmdbuf[2]);
         return -ENODEV;
     }
 
@@ -837,7 +837,7 @@ static int s25fl1_erase_sector(struct s25fl1_dev_s *priv, off_t sector)
   status = sf25fl1_read_status1(priv);
   if ((status & STATUS1_BUSY_MASK) != STATUS1_READY)
     {
-      fdbg("ERROR: Flash busy: %02x", status);
+      ferr("ERROR: Flash busy: %02x", status);
       return -EBUSY;
     }
 
@@ -848,7 +848,7 @@ static int s25fl1_erase_sector(struct s25fl1_dev_s *priv, off_t sector)
   if ((status & STATUS1_BP_MASK) != 0 &&
       s25fl1_isprotected(priv, status, address))
     {
-      fdbg("ERROR: Flash protected: %02x", status);
+      ferr("ERROR: Flash protected: %02x", status);
       return -EACCES;
     }
 
@@ -876,7 +876,7 @@ static int s25fl1_erase_chip(struct s25fl1_dev_s *priv)
   status = sf25fl1_read_status1(priv);
   if ((status & STATUS1_BP_MASK) != 0)
     {
-      fdbg("ERROR: FLASH is Protected: %02x", status);
+      ferr("ERROR: FLASH is Protected: %02x", status);
       return -EACCES;
     }
 
@@ -976,7 +976,7 @@ static int s25fl1_write_page(struct s25fl1_dev_s *priv, FAR const uint8_t *buffe
 
       if (ret < 0)
         {
-          fdbg("ERROR: QSPI_MEMORY failed writing address=%06x\n",
+          ferr("ERROR: QSPI_MEMORY failed writing address=%06x\n",
                address);
           return ret;
         }
@@ -1023,7 +1023,7 @@ static int s25fl1_flush_cache(struct s25fl1_dev_s *priv)
       ret = s25fl1_write_page(priv, priv->sector, address, 1 << priv->sectorshift);
       if (ret < 0)
         {
-          fdbg("ERROR: s25fl1_write_page failed: %d\n", ret);
+          ferr("ERROR: s25fl1_write_page failed: %d\n", ret);
         }
 
       /* The case is no long dirty and the FLASH is no longer erased */
@@ -1066,7 +1066,7 @@ static FAR uint8_t *s25fl1_read_cache(struct s25fl1_dev_s *priv, off_t sector)
       ret = s25fl1_flush_cache(priv);
       if (ret < 0)
         {
-          fdbg("ERROR: s25fl1_flush_cache failed: %d\n", ret);
+          ferr("ERROR: s25fl1_flush_cache failed: %d\n", ret);
           return NULL;
         }
 
@@ -1077,7 +1077,7 @@ static FAR uint8_t *s25fl1_read_cache(struct s25fl1_dev_s *priv, off_t sector)
                              (1 << priv->sectorshift));
       if (ret < 0)
         {
-          fdbg("ERROR: s25fl1_read_byte failed: %d\n", ret);
+          ferr("ERROR: s25fl1_read_byte failed: %d\n", ret);
           return NULL;
         }
 
@@ -1172,7 +1172,7 @@ static int s25fl1_write_cache(FAR struct s25fl1_dev_s *priv,
           ret = s25fl1_erase_sector(priv, esectno);
           if (ret < 0)
             {
-              fdbg("ERROR: s25fl1_erase_sector failed: %d\n", ret);
+              ferr("ERROR: s25fl1_erase_sector failed: %d\n", ret);
               return ret;
             }
 
@@ -1295,7 +1295,7 @@ static ssize_t s25fl1_bwrite(FAR struct mtd_dev_s *dev, off_t startblock,
   ret = s25fl1_write_cache(priv, buffer, startblock, nblocks);
   if (ret < 0)
     {
-      fdbg("ERROR: s25fl1_write_cache failed: %d\n", ret);
+      ferr("ERROR: s25fl1_write_cache failed: %d\n", ret);
     }
 
 #else
@@ -1303,7 +1303,7 @@ static ssize_t s25fl1_bwrite(FAR struct mtd_dev_s *dev, off_t startblock,
                           nblocks << priv->sectorshift);
   if (ret < 0)
     {
-      fdbg("ERROR: s25fl1_write_page failed: %d\n", ret);
+      ferr("ERROR: s25fl1_write_page failed: %d\n", ret);
     }
 #endif
 
@@ -1332,7 +1332,7 @@ static ssize_t s25fl1_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbyte
 
   if (ret < 0)
     {
-      fdbg("ERROR: s25fl1_read_byte returned: %d\n", ret);
+      ferr("ERROR: s25fl1_read_byte returned: %d\n", ret);
       return (ssize_t)ret;
     }
 
@@ -1476,7 +1476,7 @@ FAR struct mtd_dev_s *s25fl1_initialize(FAR struct qspi_dev_s *qspi, bool unprot
       priv->cmdbuf = (FAR uint8_t *)QSPI_ALLOC(qspi, 4);
       if (priv->cmdbuf == NULL)
         {
-          fdbg("ERROR Failed to allocate command buffer\n");
+          ferr("ERROR Failed to allocate command buffer\n");
           goto errout_with_priv;
         }
 
@@ -1485,7 +1485,7 @@ FAR struct mtd_dev_s *s25fl1_initialize(FAR struct qspi_dev_s *qspi, bool unprot
       priv->readbuf = (FAR uint8_t *)QSPI_ALLOC(qspi, 1);
       if (priv->readbuf == NULL)
         {
-          fdbg("ERROR Failed to allocate read buffer\n");
+          ferr("ERROR Failed to allocate read buffer\n");
           goto errout_with_cmdbuf;
         }
 
@@ -1496,7 +1496,7 @@ FAR struct mtd_dev_s *s25fl1_initialize(FAR struct qspi_dev_s *qspi, bool unprot
         {
           /* Unrecognized! Discard all of that work we just did and return NULL */
 
-          fdbg("ERROR Unrecognized QSPI device\n");
+          ferr("ERROR Unrecognized QSPI device\n");
           goto errout_with_readbuf;
         }
 
@@ -1521,7 +1521,7 @@ FAR struct mtd_dev_s *s25fl1_initialize(FAR struct qspi_dev_s *qspi, bool unprot
           ret = s25fl1_unprotect(priv, 0, priv->nsectors - 1);
           if (ret < 0)
             {
-              fdbg("ERROR: Sector unprotect failed\n");
+              ferr("ERROR: Sector unprotect failed\n");
             }
         }
 
@@ -1533,7 +1533,7 @@ FAR struct mtd_dev_s *s25fl1_initialize(FAR struct qspi_dev_s *qspi, bool unprot
         {
           /* Allocation failed! Discard all of that work we just did and return NULL */
 
-          fdbg("ERROR: Sector allocation failed\n");
+          ferr("ERROR: Sector allocation failed\n");
           goto errout_with_readbuf;
         }
 #endif
diff --git a/drivers/mtd/sector512.c b/drivers/mtd/sector512.c
index 11f317c256..57cceabd0b 100644
--- a/drivers/mtd/sector512.c
+++ b/drivers/mtd/sector512.c
@@ -173,7 +173,7 @@ static FAR uint8_t *s512_cacheread(struct s512_dev_s *priv, off_t sector512)
                                 priv->eblock);
       if (result < 0)
         {
-          fdbg("ERROR: bread(%lu, %lu) returned %ld\n",
+          ferr("ERROR: bread(%lu, %lu) returned %ld\n",
                (unsigned long)sector, (unsigned long)priv->eblocksize,
                (long)result);
 
@@ -221,7 +221,7 @@ static void s512_cacheflush(struct s512_dev_s *priv)
       result = priv->dev->bwrite(priv->dev, sector, priv->sectperblock, priv->eblock);
       if (result < 0)
         {
-          fdbg("ERROR: bwrite(%lu, %lu) returned %ld\n",
+          ferr("ERROR: bwrite(%lu, %lu) returned %ld\n",
                (unsigned long)sector, (unsigned long)priv->eblocksize,
                (long)result);
 
@@ -263,7 +263,7 @@ static int s512_erase(FAR struct mtd_dev_s *dev, off_t sector512, size_t nsector
       dest = s512_cacheread(priv, sector512);
       if (!dest)
         {
-          fdbg("ERROR: s512_cacheread(%ul) failed\n", (unsigned long)sector512);
+          ferr("ERROR: s512_cacheread(%ul) failed\n", (unsigned long)sector512);
           DEBUGPANIC();
           return -EIO;
         }
@@ -282,7 +282,7 @@ static int s512_erase(FAR struct mtd_dev_s *dev, off_t sector512, size_t nsector
           ret = priv->dev->erase(priv->dev, eblockno, 1);
           if (ret < 0)
             {
-              fdbg("ERROR: Failed to erase block %lu: %d\n",
+              ferr("ERROR: Failed to erase block %lu: %d\n",
                    (unsigned long)eblockno, ret);
               return ret;
             }
@@ -331,7 +331,7 @@ static ssize_t s512_bread(FAR struct mtd_dev_s *dev, off_t sector512,
       src = s512_cacheread(priv, sector512);
       if (!src)
         {
-          fdbg("ERROR: s512_cacheread(%ul) failed\n", (unsigned long)sector512);
+          ferr("ERROR: s512_cacheread(%ul) failed\n", (unsigned long)sector512);
           DEBUGPANIC();
 
           result = (ssize_t)nsectors - remaining;
@@ -405,7 +405,7 @@ static ssize_t s512_bwrite(FAR struct mtd_dev_s *dev, off_t sector512, size_t ns
           result = priv->dev->erase(priv->dev, eblockno, 1);
           if (result < 0)
             {
-              fdbg("ERROR: Failed to erase block %lu: %ld\n",
+              ferr("ERROR: Failed to erase block %lu: %ld\n",
                    (unsigned long)eblockno, (long)result);
               return result;
             }
@@ -464,7 +464,7 @@ static ssize_t s512_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes,
         {
           int result;
 
-          fdbg("ERROR: s512_cacheread(%ul) failed\n", (unsigned long)sector);
+          ferr("ERROR: s512_cacheread(%ul) failed\n", (unsigned long)sector);
           DEBUGPANIC();
 
           result = (ssize_t)nbytes - remaining;
@@ -590,7 +590,7 @@ FAR struct mtd_dev_s *s512_initialize(FAR struct mtd_dev_s *mtd)
   if (ret < 0 || geo.erasesize <= SECTOR_512 ||
      (geo.erasesize & ~MASK_512) != geo.erasesize)
     {
-      fdbg("ERROR: MTDIOC_GEOMETRY ioctl returned %d, eraseize=%d\n",
+      ferr("ERROR: MTDIOC_GEOMETRY ioctl returned %d, eraseize=%d\n",
            ret, geo.erasesize);
       DEBUGPANIC();
       return NULL;
@@ -629,7 +629,7 @@ FAR struct mtd_dev_s *s512_initialize(FAR struct mtd_dev_s *mtd)
         {
           /* Allocation failed! Discard all of that work we just did and return NULL */
 
-          fdbg("Allocation failed\n");
+          ferr("Allocation failed\n");
           kmm_free(priv);
           priv = NULL;
         }
diff --git a/drivers/mtd/smart.c b/drivers/mtd/smart.c
index 56629e2689..9ad4a342b7 100644
--- a/drivers/mtd/smart.c
+++ b/drivers/mtd/smart.c
@@ -493,7 +493,7 @@ FAR static void *smart_malloc(FAR struct smart_struct_s *dev,
         }
     }
 
-  fdbg("SMART alloc: %ld\n", dev->bytesalloc);
+  ferr("SMART alloc: %ld\n", dev->bytesalloc);
   return ret;
 }
 #endif
@@ -672,12 +672,12 @@ int smart_checkfree(FAR struct smart_struct_s *dev, int lineno)
 #ifdef CONFIG_DEBUG_FS
   if (freecount != dev->freesectors)
     {
-      fdbg("Free count incorrect in line %d!  Calculated=%d, dev->freesectors=%d\n",
+      ferr("Free count incorrect in line %d!  Calculated=%d, dev->freesectors=%d\n",
            lineno, freecount, dev->freesectors);
 
       /* Determine what changed from the last time which caused this error */
 
-      fdbg("   ... Prev freesectors=%d, prev releasesectors=%d\n",
+      ferr("   ... Prev freesectors=%d, prev releasesectors=%d\n",
            prev_freesectors, prev_releasesectors);
 
       if (prev_freecount)
@@ -695,7 +695,7 @@ int smart_checkfree(FAR struct smart_struct_s *dev, int lineno)
                 {
                   /* This block's values are different from the last time ... report it */
 
-                  fdbg("   ... Block %d:  Old Free=%d, old release=%d,    New free=%d, new release = %d\n",
+                  ferr("   ... Block %d:  Old Free=%d, old release=%d,    New free=%d, new release = %d\n",
                       x, prev_freecount[x], prev_releasecount[x], blockfree, blockrelease);
                 }
             }
@@ -771,7 +771,7 @@ static ssize_t smart_reload(struct smart_struct_s *dev, FAR uint8_t *buffer,
   nread = MTD_BREAD(dev->mtd, mtdStartBlock, mtdBlocks, buffer);
   if (nread != mtdBlocks)
     {
-      fdbg("Read %d blocks starting at block %d failed: %d\n",
+      ferr("Read %d blocks starting at block %d failed: %d\n",
            nblocks, startblock, nread);
     }
 
@@ -873,7 +873,7 @@ static ssize_t smart_write(FAR struct inode *inode,
           ret = MTD_ERASE(dev->mtd, eraseblock, 1);
           if (ret < 0)
             {
-              fdbg("Erase block=%d failed: %d\n", eraseblock, ret);
+              ferr("Erase block=%d failed: %d\n", eraseblock, ret);
 
               /* Unlock the mutex if we add one */
 
@@ -896,13 +896,13 @@ static ssize_t smart_write(FAR struct inode *inode,
 
       /* Try to write to the sector. */
 
-      fdbg("Write MTD block %d from offset %d\n", nextblock, offset);
+      ferr("Write MTD block %d from offset %d\n", nextblock, offset);
       nxfrd = MTD_BWRITE(dev->mtd, nextblock, blkstowrite, &buffer[offset]);
       if (nxfrd != blkstowrite)
         {
           /* The block is not empty!!  What to do? */
 
-          fdbg("Write block %d failed: %d.\n", nextblock, nxfrd);
+          ferr("Write block %d failed: %d.\n", nextblock, nxfrd);
 
           /* Unlock the mutex if we add one */
 
@@ -1001,7 +1001,7 @@ static int smart_setsectorsize(FAR struct smart_struct_s *dev, uint16_t size)
 
   if (erasesize / dev->sectorsize > 256)
     {
-      /* We can't throw a dbg message here becasue it is too early.
+      /* We can't throw a err message here becasue it is too early.
        * set the erasesize to zero and exit, then we will detect
        * it during mksmartfs or mount.
        */
@@ -1079,7 +1079,7 @@ static int smart_setsectorsize(FAR struct smart_struct_s *dev, uint16_t size)
 
   if (totalsectors > 65536)
     {
-      dbg("Invalid SMART sector count %ld\n", totalsectors);
+      err("Invalid SMART sector count %ld\n", totalsectors);
       return -EINVAL;
     }
   else if (totalsectors == 65536)
@@ -1099,7 +1099,7 @@ static int smart_setsectorsize(FAR struct smart_struct_s *dev, uint16_t size)
               allocsize, "Sector map");
   if (!dev->sMap)
     {
-      fdbg("Error allocating SMART virtual map buffer\n");
+      ferr("Error allocating SMART virtual map buffer\n");
       goto errexit;
     }
 
@@ -1109,7 +1109,7 @@ static int smart_setsectorsize(FAR struct smart_struct_s *dev, uint16_t size)
   dev->sBitMap = (FAR uint8_t *) smart_malloc(dev, (totalsectors+7) >> 3, "Sector Bitmap");
   if (dev->sBitMap == NULL)
     {
-      fdbg("Error allocating SMART sector cache\n");
+      ferr("Error allocating SMART sector cache\n");
       goto errexit;
     }
 
@@ -1144,7 +1144,7 @@ static int smart_setsectorsize(FAR struct smart_struct_s *dev, uint16_t size)
 
   if (!dev->sCache)
     {
-      fdbg("Error allocating SMART sector cache\n");
+      ferr("Error allocating SMART sector cache\n");
       goto errexit;
     }
 
@@ -1181,7 +1181,7 @@ static int smart_setsectorsize(FAR struct smart_struct_s *dev, uint16_t size)
 
   if (!dev->erasecounts)
     {
-      fdbg("Error allocating erase count array\n");
+      ferr("Error allocating erase count array\n");
       goto errexit;
     }
 
@@ -1195,7 +1195,7 @@ static int smart_setsectorsize(FAR struct smart_struct_s *dev, uint16_t size)
       SMART_WEAR_BIT_DIVIDE, "Wear status");
   if (!dev->wearstatus)
     {
-      fdbg("Error allocating wear level status array\n");
+      ferr("Error allocating wear level status array\n");
       goto errexit;
     }
 
@@ -1210,7 +1210,7 @@ static int smart_setsectorsize(FAR struct smart_struct_s *dev, uint16_t size)
   dev->rwbuffer = (FAR char *) smart_malloc(dev, size, "RW Buffer");
   if (!dev->rwbuffer)
     {
-      fdbg("Error allocating SMART read/write buffer\n");
+      ferr("Error allocating SMART read/write buffer\n");
       goto errexit;
     }
 
@@ -1304,7 +1304,7 @@ static ssize_t smart_bytewrite(FAR struct smart_struct_s *dev, size_t offset,
       ret = MTD_BREAD(dev->mtd, startblock, nblocks, (FAR uint8_t *) dev->rwbuffer);
       if (ret < 0)
         {
-          fdbg("Error %d reading from device\n", -ret);
+          ferr("Error %d reading from device\n", -ret);
           goto errout;
         }
 
@@ -1317,7 +1317,7 @@ static ssize_t smart_bytewrite(FAR struct smart_struct_s *dev, size_t offset,
       ret = MTD_BWRITE(dev->mtd, startblock, nblocks, (FAR uint8_t *) dev->rwbuffer);
       if (ret < 0)
         {
-          fdbg("Error %d writing to device\n", -ret);
+          ferr("Error %d writing to device\n", -ret);
           goto errout;
         }
     }
@@ -1387,7 +1387,7 @@ static int smart_add_sector_to_cache(FAR struct smart_struct_s *dev,
 
   if (dev->debuglevel > 1)
     {
-      dbg("Add Cache sector:  Log=%d, Phys=%d at index %d from line %d\n",
+      err("Add Cache sector:  Log=%d, Phys=%d at index %d from line %d\n",
           logical, physical, index, line);
     }
 
@@ -1575,7 +1575,7 @@ static void smart_update_cache(FAR struct smart_struct_s *dev, uint16_t
 
           if (dev->debuglevel > 1)
             {
-              dbg("Update Cache:  Log=%d, Phys=%d at index %d\n", logical, physical, x);
+              err("Update Cache:  Log=%d, Phys=%d at index %d\n", logical, physical, x);
             }
 
           break;
@@ -1712,7 +1712,7 @@ static int smart_set_wear_level(FAR struct smart_struct_s *dev, uint16_t block,
 
   if (level > 15)
     {
-      dbg("Fatal Design Error!  Wear level > 15, block=%d\n", block);
+      err("Fatal Design Error!  Wear level > 15, block=%d\n", block);
 
       /* This is a design flaw, but we still allow processing, otherwise we
        * will corrupt the volume.  It's better to have a few blocks that are
@@ -1984,7 +1984,7 @@ static int smart_scan(FAR struct smart_struct_s *dev)
         {
           /* Error in logical sector read from the MTD device */
 
-          fdbg("Invalid logical sector %d at physical %d.\n",
+          ferr("Invalid logical sector %d at physical %d.\n",
                logicalsector, sector);
           continue;
         }
@@ -2001,7 +2001,7 @@ static int smart_scan(FAR struct smart_struct_s *dev)
                          (FAR uint8_t *)dev->rwbuffer);
           if (ret != 32)
             {
-              fdbg("Error reading physical sector %d.\n", sector);
+              ferr("Error reading physical sector %d.\n", sector);
               goto err_out;
             }
 
@@ -2053,7 +2053,7 @@ static int smart_scan(FAR struct smart_struct_s *dev)
                 smart_malloc(dev, sizeof(*rootdirdev), "Root Dir");
               if (rootdirdev == NULL)
                 {
-                  fdbg("Memory alloc failed\n");
+                  ferr("Memory alloc failed\n");
                   ret = -ENOMEM;
                   goto err_out;
                 }
@@ -2221,7 +2221,7 @@ static int smart_scan(FAR struct smart_struct_s *dev)
           ret = smart_bytewrite(dev, offset, 1, &header.status);
           if (ret < 0)
             {
-              fdbg("Error %d releasing duplicate sector\n", -ret);
+              ferr("Error %d releasing duplicate sector\n", -ret);
               goto err_out;
             }
         }
@@ -2267,7 +2267,7 @@ static int smart_scan(FAR struct smart_struct_s *dev)
               dev->mtdBlksPerSector, (uint8_t *) dev->rwbuffer);
       if (ret != dev->mtdBlksPerSector)
         {
-          fdbg("Error reading physical sector %d.\n", sector);
+          ferr("Error reading physical sector %d.\n", sector);
           goto err_out;
         }
 
@@ -2284,7 +2284,7 @@ static int smart_scan(FAR struct smart_struct_s *dev)
             {
               /* Unable to find a free sector!!! */
 
-              fdbg("Can't find a free sector for relocation\n");
+              ferr("Can't find a free sector for relocation\n");
               ret = -ENOSPC;
               goto err_out;
             }
@@ -2321,29 +2321,29 @@ static int smart_scan(FAR struct smart_struct_s *dev)
   smart_read_wearstatus(dev);
 #endif
 
-  fdbg("SMART Scan\n");
-  fdbg("   Erase size:   %10d\n", dev->sectorsPerBlk * dev->sectorsize);
-  fdbg("   Erase count:  %10d\n", dev->neraseblocks);
-  fdbg("   Sect/block:   %10d\n", dev->sectorsPerBlk);
-  fdbg("   MTD Blk/Sect: %10d\n", dev->mtdBlksPerSector);
+  ferr("SMART Scan\n");
+  ferr("   Erase size:   %10d\n", dev->sectorsPerBlk * dev->sectorsize);
+  ferr("   Erase count:  %10d\n", dev->neraseblocks);
+  ferr("   Sect/block:   %10d\n", dev->sectorsPerBlk);
+  ferr("   MTD Blk/Sect: %10d\n", dev->mtdBlksPerSector);
 
   /* Validate the geometry */
 
   if (dev->mtdBlksPerSector == 0 || dev->sectorsPerBlk == 0 ||
       dev->sectorsPerBlk == 0 || dev->sectorsize == 0)
     {
-      fdbg("Invalid Geometry!\n");
+      ferr("Invalid Geometry!\n");
       ret = -EINVAL;
       goto err_out;
     }
 
 #ifdef CONFIG_MTD_SMART_ALLOC_DEBUG
-  fdbg("   Allocations:\n");
+  ferr("   Allocations:\n");
   for (sector = 0; sector < SMART_MAX_ALLOCS; sector++)
     {
       if (dev->alloc[sector].ptr != NULL)
         {
-          fdbg("       %s: %d\n", dev->alloc[sector].name, dev->alloc[sector].size);
+          ferr("       %s: %d\n", dev->alloc[sector].name, dev->alloc[sector].size);
         }
     }
 #endif
@@ -2515,7 +2515,7 @@ static void smart_erase_block_if_empty(FAR struct smart_struct_s *dev,
 #ifdef CONFIG_SMART_LOCAL_CHECKFREE
       if (smart_checkfree(dev, __LINE__) != OK)
         {
-          fdbg("   ...while eraseing block %d\n", block);
+          ferr("   ...while eraseing block %d\n", block);
         }
 #endif
     }
@@ -2554,7 +2554,7 @@ static int smart_relocate_static_data(FAR struct smart_struct_s *dev, uint16_t b
 #ifdef CONFIG_SMART_LOCAL_CHECKFREE
   if (smart_checkfree(dev, __LINE__) != OK)
     {
-      fdbg("   ...about to relocate static data %d\n", block);
+      ferr("   ...about to relocate static data %d\n", block);
     }
 #endif
 
@@ -2645,7 +2645,7 @@ static int smart_relocate_static_data(FAR struct smart_struct_s *dev, uint16_t b
               dev->mtdBlksPerSector, (FAR uint8_t *) dev->rwbuffer);
           if (ret != dev->mtdBlksPerSector)
             {
-              fdbg("Error reading sector %d\n", sector);
+              ferr("Error reading sector %d\n", sector);
               ret = -EIO;
               goto errout;
             }
@@ -2681,7 +2681,7 @@ static int smart_relocate_static_data(FAR struct smart_struct_s *dev, uint16_t b
                 {
                   /* Unable to find a free sector!!! */
 
-                  fdbg("Can't find a free sector for relocation\n");
+                  ferr("Can't find a free sector for relocation\n");
                   ret = -ENOSPC;
                   goto errout;
                 }
@@ -2736,7 +2736,7 @@ static int smart_relocate_static_data(FAR struct smart_struct_s *dev, uint16_t b
 #ifdef CONFIG_SMART_LOCAL_CHECKFREE
       if (smart_checkfree(dev, __LINE__) != OK)
         {
-          fdbg("   ...about to erase static block %d\n", block);
+          ferr("   ...about to erase static block %d\n", block);
         }
 #endif
 
@@ -2748,7 +2748,7 @@ static int smart_relocate_static_data(FAR struct smart_struct_s *dev, uint16_t b
 #ifdef CONFIG_SMART_LOCAL_CHECKFREE
   if (smart_checkfree(dev, __LINE__) != OK)
     {
-      fdbg("   ...done erasing static block %d\n", block);
+      ferr("   ...done erasing static block %d\n", block);
     }
 #endif
 
@@ -2862,10 +2862,10 @@ static inline int smart_llformat(FAR struct smart_struct_s *dev, unsigned long a
     {
       dev->erasesize = dev->geo.erasesize;
 
-      dbg("ERROR:  Invalid geometery ... Sectors per erase block must be 1-256\n");
-      dbg("        Erase block size    = %d\n", dev->erasesize);
-      dbg("        Sector size         = %d\n", dev->sectorsize);
-      dbg("        Sectors/erase block = %d\n", dev->erasesize / dev->sectorsize);
+      err("ERROR:  Invalid geometery ... Sectors per erase block must be 1-256\n");
+      err("        Erase block size    = %d\n", dev->erasesize);
+      err("        Sector size         = %d\n", dev->sectorsize);
+      err("        Sectors/erase block = %d\n", dev->erasesize / dev->sectorsize);
 
       return -EINVAL;
     }
@@ -2951,7 +2951,7 @@ static inline int smart_llformat(FAR struct smart_struct_s *dev, unsigned long a
     {
       /* The block is not empty!!  What to do? */
 
-      fdbg("Write block 0 failed: %d.\n", wrcount);
+      ferr("Write block 0 failed: %d.\n", wrcount);
 
       /* Unlock the mutex if we add one */
 
@@ -3132,7 +3132,7 @@ static int smart_relocate_sector(FAR struct smart_struct_s *dev,
   ret = smart_bytewrite(dev, offset, 1, &newstatus);
   if (ret < 0)
     {
-      fdbg("Error %d committing new sector %d\n" -ret, newsector);
+      ferr("Error %d committing new sector %d\n" -ret, newsector);
       goto errout;
     }
 #endif  /* CONFIG_MTD_SMART_ENABLE_CRC */
@@ -3149,7 +3149,7 @@ static int smart_relocate_sector(FAR struct smart_struct_s *dev,
   ret = smart_bytewrite(dev, offset, 1, &newstatus);
   if (ret < 0)
     {
-      fdbg("Error %d releasing old sector %d\n" -ret, oldsector);
+      ferr("Error %d releasing old sector %d\n" -ret, oldsector);
     }
 
 #ifndef CONFIG_MTD_SMART_ENABLE_CRC
@@ -3193,7 +3193,7 @@ static int smart_relocate_block(FAR struct smart_struct_s *dev, uint16_t block)
 #ifdef CONFIG_SMART_LOCAL_CHECKFREE
   if (smart_checkfree(dev, __LINE__) != OK)
     {
-      fdbg("   ...while relocating block %d, free=%d\n", block, dev->freesectors);
+      ferr("   ...while relocating block %d, free=%d\n", block, dev->freesectors);
     }
 #endif
 
@@ -3210,7 +3210,7 @@ static int smart_relocate_block(FAR struct smart_struct_s *dev, uint16_t block)
 
   if (freecount >= dev->freesectors)
     {
-      fdbg("Program bug!  Relocating the only block (%d) with free sectors!\n",
+      ferr("Program bug!  Relocating the only block (%d) with free sectors!\n",
            block);
       ret = -EIO;
       goto errout;
@@ -3240,7 +3240,7 @@ static int smart_relocate_block(FAR struct smart_struct_s *dev, uint16_t block)
           dev->mtdBlksPerSector, (FAR uint8_t *) dev->rwbuffer);
       if (ret != dev->mtdBlksPerSector)
         {
-          fdbg("Error reading sector %d\n", x);
+          ferr("Error reading sector %d\n", x);
           ret = -EIO;
           goto errout;
         }
@@ -3271,7 +3271,7 @@ static int smart_relocate_block(FAR struct smart_struct_s *dev, uint16_t block)
             {
               /* Unable to find a free sector!!! */
 
-              fdbg("Can't find a free sector for relocation\n");
+              ferr("Can't find a free sector for relocation\n");
               ret = -ENOSPC;
               goto errout;
             }
@@ -3303,7 +3303,7 @@ static int smart_relocate_block(FAR struct smart_struct_s *dev, uint16_t block)
             {
               /* Unable to find a free sector!!! */
 
-              fdbg("Can't find a free sector for relocation\n");
+              ferr("Can't find a free sector for relocation\n");
               ret = -ENOSPC;
               goto errout;
             }
@@ -3383,7 +3383,7 @@ static int smart_relocate_block(FAR struct smart_struct_s *dev, uint16_t block)
 #ifdef CONFIG_SMART_LOCAL_CHECKFREE
   if (smart_checkfree(dev, __LINE__) != OK)
     {
-      fdbg("   ...while relocating block %d, free=%d, release=%d, oldrelease=%d\n",
+      ferr("   ...while relocating block %d, free=%d, release=%d, oldrelease=%d\n",
            block, freecount, releasecount, oldrelease);
     }
 #endif
@@ -3533,7 +3533,7 @@ retry:
                 {
                   if (smart_relocate_block(dev, block) < 0)
                     {
-                      fdbg("Error relocating block while finding free phys sector\n");
+                      ferr("Error relocating block while finding free phys sector\n");
                       return -1;
                     }
 
@@ -3566,7 +3566,7 @@ retry:
 #endif
 
       {
-        dbg("Program bug!  Expected a free sector, free=%d\n", dev->freesectors);
+        err("Program bug!  Expected a free sector, free=%d\n", dev->freesectors);
         for (x = 0; x < dev->neraseblocks; x++)
           {
             printf("%d ", dev->freecount[x]);
@@ -3620,7 +3620,7 @@ retry:
               (FAR uint8_t *) &header);
       if (ret != sizeof(struct smart_sect_header_s))
         {
-          fdbg("Error reading phys sector %d\n", physicalsector);
+          ferr("Error reading phys sector %d\n", physicalsector);
           return -1;
         }
 
@@ -3641,12 +3641,12 @@ retry:
 
   if (physicalsector == 0xFFFF)
     {
-      dbg("Program bug!  Expected a free sector\n");
+      err("Program bug!  Expected a free sector\n");
     }
 
   if (physicalsector >= dev->totalsectors)
     {
-      dbg("Program bug!  Selected sector too big!!!\n");
+      err("Program bug!  Selected sector too big!!!\n");
     }
 
   return physicalsector;
@@ -3742,7 +3742,7 @@ static int smart_garbagecollect(FAR struct smart_struct_s *dev)
 #ifdef CONFIG_SMART_LOCAL_CHECKFREE
           if (smart_checkfree(dev, __LINE__) != OK)
             {
-              fdbg("   ...before collecting block %d\n", collectblock);
+              ferr("   ...before collecting block %d\n", collectblock);
             }
 #endif
 
@@ -3763,7 +3763,7 @@ static int smart_garbagecollect(FAR struct smart_struct_s *dev)
 #ifdef CONFIG_SMART_LOCAL_CHECKFREE
           if (smart_checkfree(dev, __LINE__) != OK)
             {
-              fdbg("   ...while collecting block %d\n", collectblock);
+              ferr("   ...while collecting block %d\n", collectblock);
             }
 #endif
 
@@ -3876,7 +3876,7 @@ static int smart_write_wearstatus(struct smart_struct_s *dev)
           if (sector >= SMART_FIRST_DIR_SECTOR)
             {
               /* Error, wear status bit too large! */
-              fdbg("Invalid geometry - wear level status too large\n");
+              ferr("Invalid geometry - wear level status too large\n");
               ret = -EINVAL;
               goto errout;
             }
@@ -3987,7 +3987,7 @@ static inline int smart_read_wearstatus(FAR struct smart_struct_s *dev)
           ret = smart_allocsector(dev, sector);
           if (ret != sector)
             {
-              fdbg("Unable to allocate wear level status sector %d\n", sector);
+              ferr("Unable to allocate wear level status sector %d\n", sector);
               ret = -EINVAL;
               goto errout;
             }
@@ -4014,7 +4014,7 @@ static inline int smart_read_wearstatus(FAR struct smart_struct_s *dev)
             {
               /* Error, wear status bit too large! */
 
-              fdbg("Invalid geometry - wear level status too large\n");
+              ferr("Invalid geometry - wear level status too large\n");
               ret = -EINVAL;
               goto errout;
             }
@@ -4095,7 +4095,7 @@ static int smart_write_alloc_sector(FAR struct smart_struct_s *dev,
     {
       /* The block is not empty!!  What to do? */
 
-      fdbg("Write block %d failed: %d.\n", physical *
+      ferr("Write block %d failed: %d.\n", physical *
            dev->mtdBlksPerSector, ret);
 
       /* Unlock the mutex if we add one */
@@ -4200,7 +4200,7 @@ static int smart_writesector(FAR struct smart_struct_s *dev,
 
   if (req->logsector >= dev->totalsectors)
     {
-      fdbg("Logical sector %d too large\n", req->logsector);
+      ferr("Logical sector %d too large\n", req->logsector);
 
       ret = -EINVAL;
       goto errout;
@@ -4239,7 +4239,7 @@ static int smart_writesector(FAR struct smart_struct_s *dev,
 #endif
   if (physsector == 0xFFFF)
     {
-      fdbg("Logical sector %d not allocated\n", req->logsector);
+      ferr("Logical sector %d not allocated\n", req->logsector);
       ret = -EINVAL;
       goto errout;
     }
@@ -4251,7 +4251,7 @@ static int smart_writesector(FAR struct smart_struct_s *dev,
           dev->rwbuffer);
   if (ret != dev->mtdBlksPerSector)
     {
-      fdbg("Error reading phys sector %d\n", physsector);
+      ferr("Error reading phys sector %d\n", physsector);
       ret = -EIO;
       goto errout;
     }
@@ -4323,7 +4323,7 @@ static int smart_writesector(FAR struct smart_struct_s *dev,
       physsector = smart_findfreephyssector(dev, FALSE);
       if (physsector == 0xFFFF)
         {
-          fdbg("Error relocating sector %d\n", req->logsector);
+          ferr("Error relocating sector %d\n", req->logsector);
           ret = -EIO;
           goto errout;
         }
@@ -4443,7 +4443,7 @@ static int smart_writesector(FAR struct smart_struct_s *dev,
               dev->mtdBlksPerSector, (FAR uint8_t *) dev->rwbuffer);
       if (ret != dev->mtdBlksPerSector)
         {
-          fdbg("Error writing to physical sector %d\n", physsector);
+          ferr("Error writing to physical sector %d\n", physsector);
           ret = -EIO;
           goto errout;
         }
@@ -4527,7 +4527,7 @@ static int smart_writesector(FAR struct smart_struct_s *dev,
               dev->mtdBlksPerSector, (FAR uint8_t *) dev->rwbuffer);
       if (ret != dev->mtdBlksPerSector)
         {
-          fdbg("Error writing to physical sector %d\n", physsector);
+          ferr("Error writing to physical sector %d\n", physsector);
           ret = -EIO;
           goto errout;
         }
@@ -4547,7 +4547,7 @@ static int smart_writesector(FAR struct smart_struct_s *dev,
         {
           /* TODO: Mark this as a bad block! */
 
-          fdbg("Error validating physical sector %d\n", physsector);
+          ferr("Error validating physical sector %d\n", physsector);
           ret = -EIO;
           goto errout;
         }
@@ -4602,7 +4602,7 @@ static int smart_readsector(FAR struct smart_struct_s *dev,
 
   if (req->logsector >= dev->totalsectors)
     {
-      fdbg("Logical sector %d too large\n", req->logsector);
+      ferr("Logical sector %d too large\n", req->logsector);
 
       ret = -EINVAL;
       goto errout;
@@ -4615,7 +4615,7 @@ static int smart_readsector(FAR struct smart_struct_s *dev,
 #endif
   if (physsector == 0xFFFF)
     {
-      fdbg("Logical sector %d not allocated\n", req->logsector);
+      ferr("Logical sector %d not allocated\n", req->logsector);
       ret = -EINVAL;
       goto errout;
     }
@@ -4632,7 +4632,7 @@ static int smart_readsector(FAR struct smart_struct_s *dev,
     {
       /* TODO:  Mark the block bad */
 
-      fdbg("Error reading phys sector %d\n", physsector);
+      ferr("Error reading phys sector %d\n", physsector);
       ret = -EIO;
       goto errout;
     }
@@ -4657,7 +4657,7 @@ static int smart_readsector(FAR struct smart_struct_s *dev,
         {
           /* TODO: Mark the block bad */
 
-          fdbg("Error validating sector %d CRC during read\n", physsector);
+          ferr("Error validating sector %d CRC during read\n", physsector);
           ret = -EIO;
           goto errout;
         }
@@ -4690,7 +4690,7 @@ static int smart_readsector(FAR struct smart_struct_s *dev,
     {
       /* Error in sector header! How do we handle this? */
 
-      fdbg("Error in logical sector %d header, phys=%d\n",
+      ferr("Error in logical sector %d header, phys=%d\n",
           req->logsector, physsector);
       ret = -EIO;
       goto errout;
@@ -4705,7 +4705,7 @@ static int smart_readsector(FAR struct smart_struct_s *dev,
           req->buffer);
   if (ret != req->count)
     {
-      fdbg("Error reading phys sector %d\n", physsector);
+      ferr("Error reading phys sector %d\n", physsector);
       ret = -EIO;
       goto errout;
     }
@@ -4873,7 +4873,7 @@ static inline int smart_allocsector(FAR struct smart_struct_s *dev,
        * bug in our code?
        */
 
-      fdbg("No free logical sector numbers!  Free sectors = %d\n",
+      ferr("No free logical sector numbers!  Free sectors = %d\n",
               dev->freesectors);
 
       return -EIO;
@@ -4907,7 +4907,7 @@ static inline int smart_allocsector(FAR struct smart_struct_s *dev,
       kmm_malloc(sizeof(struct smart_allocsector_s));
     if (allocsect == NULL)
       {
-        fdbg("Out of memory allocting sector\n");
+        ferr("Out of memory allocting sector\n");
         return -ENOMEM;
       }
 
@@ -4988,7 +4988,7 @@ static inline int smart_freesector(FAR struct smart_struct_s *dev,
       if (!(dev->sBitMap[logicalsector >> 3] & (1 << (logicalsector & 0x07))))
 #endif
         {
-          fdbg("Invalid release - sector %d not allocated\n", logicalsector);
+          ferr("Invalid release - sector %d not allocated\n", logicalsector);
           ret = -EINVAL;
           goto errout;
         }
@@ -5015,7 +5015,7 @@ static inline int smart_freesector(FAR struct smart_struct_s *dev,
     {
       /* Hmmm... something is wrong.  This should always match!  Bug in our code? */
 
-      fdbg("Sector %d logical sector in header doesn't match\n", logicalsector);
+      ferr("Sector %d logical sector in header doesn't match\n", logicalsector);
       ret = -EINVAL;
       goto errout;
     }
@@ -5034,7 +5034,7 @@ static inline int smart_freesector(FAR struct smart_struct_s *dev,
   ret = smart_bytewrite(dev, offset, 1, &header.status);
   if (ret != 1)
     {
-      fdbg("Error updating physical sector %d status\n", physsector);
+      ferr("Error updating physical sector %d status\n", physsector);
       goto errout;
     }
 
@@ -5107,7 +5107,7 @@ static int smart_ioctl(FAR struct inode *inode, int cmd, unsigned long arg)
 #ifdef CONFIG_DEBUG_FEATURES
       if (arg == 0)
         {
-          fdbg("ERROR: BIOC_XIPBASE argument is NULL\n");
+          ferr("ERROR: BIOC_XIPBASE argument is NULL\n");
           return -EINVAL;
         }
 #endif
@@ -5228,7 +5228,7 @@ static int smart_ioctl(FAR struct inode *inode, int cmd, unsigned long arg)
         {
         case SMART_DEBUG_CMD_SET_DEBUG_LEVEL:
           dev->debuglevel = debug_data->debugdata;
-          dbg("Debug level set to %d\n", dev->debuglevel);
+          err("Debug level set to %d\n", dev->debuglevel);
 
           ret = OK;
           goto ok_out;
@@ -5246,7 +5246,7 @@ static int smart_ioctl(FAR struct inode *inode, int cmd, unsigned long arg)
   ret = MTD_IOCTL(dev->mtd, cmd, arg);
   if (ret < 0)
     {
-      fdbg("ERROR: MTD ioctl(%04x) failed: %d\n", cmd, ret);
+      ferr("ERROR: MTD ioctl(%04x) failed: %d\n", cmd, ret);
     }
 
 ok_out:
@@ -5314,7 +5314,7 @@ int smart_initialize(int minor, FAR struct mtd_dev_s *mtd, FAR const char *partn
       ret = MTD_IOCTL(mtd, MTDIOC_GEOMETRY, (unsigned long)((uintptr_t)&dev->geo));
       if (ret < 0)
         {
-          fdbg("MTD ioctl(MTDIOC_GEOMETRY) failed: %d\n", ret);
+          ferr("MTD ioctl(MTDIOC_GEOMETRY) failed: %d\n", ret);
           goto errout;
         }
 
@@ -5348,7 +5348,7 @@ int smart_initialize(int minor, FAR struct mtd_dev_s *mtd, FAR const char *partn
       totalsectors = dev->neraseblocks * dev->sectorsPerBlk;
       if (totalsectors > 65536)
         {
-          fdbg("SMART Sector size too small for device\n");
+          ferr("SMART Sector size too small for device\n");
           ret = -EINVAL;
           goto errout;
         }
@@ -5399,7 +5399,7 @@ int smart_initialize(int minor, FAR struct mtd_dev_s *mtd, FAR const char *partn
         smart_malloc(dev, sizeof(*rootdirdev), "Root Dir");
       if (rootdirdev == NULL)
         {
-          fdbg("register_blockdriver failed: %d\n", -ret);
+          ferr("register_blockdriver failed: %d\n", -ret);
           ret = -ENOMEM;
           goto errout;
         }
@@ -5427,7 +5427,7 @@ int smart_initialize(int minor, FAR struct mtd_dev_s *mtd, FAR const char *partn
 
       if (ret < 0)
         {
-          fdbg("register_blockdriver failed: %d\n", -ret);
+          ferr("register_blockdriver failed: %d\n", -ret);
           goto errout;
         }
 
@@ -5436,7 +5436,7 @@ int smart_initialize(int minor, FAR struct mtd_dev_s *mtd, FAR const char *partn
       ret = smart_scan(dev);
       if (ret < 0)
         {
-          fdbg("smart_scan failed: %d\n", -ret);
+          ferr("smart_scan failed: %d\n", -ret);
           goto errout;
         }
     }
@@ -5564,7 +5564,7 @@ static int smart_loteardown(FAR const char *devname)
   ret = open_blockdriver(devname, MS_RDONLY, &inode);
   if (ret < 0)
     {
-      dbg("Failed to open %s: %d\n", devname, -ret);
+      err("Failed to open %s: %d\n", devname, -ret);
       return ret;
     }
 
@@ -5576,7 +5576,7 @@ static int smart_loteardown(FAR const char *devname)
 
   if (!filemtd_isfilemtd(dev->mtd))
     {
-      fdbg("Device is not a SMART loop: %s\n", devname);
+      ferr("Device is not a SMART loop: %s\n", devname);
       return -EINVAL;
     }
 
diff --git a/drivers/mtd/sst25.c b/drivers/mtd/sst25.c
index 24105a01b7..e079de8b93 100644
--- a/drivers/mtd/sst25.c
+++ b/drivers/mtd/sst25.c
@@ -1206,7 +1206,7 @@ FAR struct mtd_dev_s *sst25_initialize(FAR struct spi_dev_s *dev)
         {
           /* Unrecognized! Discard all of that work we just did and return NULL */
 
-          fdbg("Unrecognized\n");
+          ferr("Unrecognized\n");
           kmm_free(priv);
           priv = NULL;
         }
@@ -1226,7 +1226,7 @@ FAR struct mtd_dev_s *sst25_initialize(FAR struct spi_dev_s *dev)
             {
               /* Allocation failed! Discard all of that work we just did and return NULL */
 
-              fdbg("Allocation failed\n");
+              ferr("Allocation failed\n");
               kmm_free(priv);
               priv = NULL;
             }
diff --git a/drivers/mtd/sst25xx.c b/drivers/mtd/sst25xx.c
index ee6f6a55fa..202019fda3 100644
--- a/drivers/mtd/sst25xx.c
+++ b/drivers/mtd/sst25xx.c
@@ -954,7 +954,7 @@ FAR struct mtd_dev_s *sst25xx_initialize(FAR struct spi_dev_s *dev)
         {
           /* Unrecognized! Discard all of that work we just did and return NULL */
 
-          fdbg("Unrecognized\n");
+          ferr("Unrecognized\n");
           kmm_free(priv);
           priv = NULL;
         }
diff --git a/drivers/mtd/sst26.c b/drivers/mtd/sst26.c
index c92b90bd17..4e31a592a0 100644
--- a/drivers/mtd/sst26.c
+++ b/drivers/mtd/sst26.c
@@ -208,12 +208,12 @@
 /* Debug ****************************************************************************/
 
 #ifdef CONFIG_SST26_DEBUG
-# define sstdbg(format, ...)    dbg(format, ##__VA_ARGS__)
+# define ssterr(format, ...)    err(format, ##__VA_ARGS__)
 # define sstllerr(format, ...)  llerr(format, ##__VA_ARGS__)
 # define sstinfo(format, ...)   info(format, ##__VA_ARGS__)
 # define sstllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
-# define sstdbg(x...)
+# define ssterr(x...)
 # define sstllerr(x...)
 # define sstinfo(x...)
 # define sstllinfo(x...)
@@ -936,7 +936,7 @@ FAR struct mtd_dev_s *sst26_initialize_spi(FAR struct spi_dev_s *dev)
         {
           /* Unrecognized! Discard all of that work we just did and return NULL */
 
-          sstdbg("Unrecognized\n");
+          ssterr("Unrecognized\n");
           kmm_free(priv);
           priv = NULL;
         }
diff --git a/drivers/mtd/sst39vf.c b/drivers/mtd/sst39vf.c
index 0c7e2cac61..2b5cbe9c6a 100644
--- a/drivers/mtd/sst39vf.c
+++ b/drivers/mtd/sst39vf.c
@@ -819,7 +819,7 @@ FAR struct mtd_dev_s *sst39vf_initialize(void)
 
   if (manufacturer != SST_MANUFACTURER_ID)
     {
-      fdbg("Unrecognized manufacturer: %02x\n", manufacturer);
+      ferr("Unrecognized manufacturer: %02x\n", manufacturer);
       return NULL;
     }
   else if (chipid == g_sst39vf1601.chipid)
@@ -840,7 +840,7 @@ FAR struct mtd_dev_s *sst39vf_initialize(void)
     }
   else
     {
-      fdbg("Unrecognized chip ID: %04x\n", chipid);
+      ferr("Unrecognized chip ID: %04x\n", chipid);
       return NULL;
     }
 
diff --git a/drivers/mtd/w25.c b/drivers/mtd/w25.c
index 0f3696ffd8..8dce926494 100644
--- a/drivers/mtd/w25.c
+++ b/drivers/mtd/w25.c
@@ -1256,7 +1256,7 @@ FAR struct mtd_dev_s *w25_initialize(FAR struct spi_dev_s *spi)
         {
           /* Unrecognized! Discard all of that work we just did and return NULL */
 
-          fdbg("Unrecognized\n");
+          ferr("Unrecognized\n");
           kmm_free(priv);
           priv = NULL;
         }
@@ -1276,7 +1276,7 @@ FAR struct mtd_dev_s *w25_initialize(FAR struct spi_dev_s *spi)
             {
               /* Allocation failed! Discard all of that work we just did and return NULL */
 
-              fdbg("Allocation failed\n");
+              ferr("Allocation failed\n");
               kmm_free(priv);
               priv = NULL;
             }
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index a9e26152ed..274c247ebb 100644
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -704,7 +704,7 @@ static int cs89x0_interrupt(int irq, FAR void *context)
         case ISQ_BUFEVENT:
             if ((isq & ISQ_BUFEVENT_TXUNDERRUN) != 0)
               {
-                ndbg("Transmit underrun\n");
+                nerr("Transmit underrun\n");
 #ifdef CONFIG_CS89x0_XMITEARLY
                 cd89x0->cs_txunderrun++;
                 if (cd89x0->cs_txunderrun == 3)
@@ -819,7 +819,7 @@ static int cs89x0_ifup(struct net_driver_s *dev)
 {
   struct cs89x0_driver_s *cs89x0 = (struct cs89x0_driver_s *)dev->d_private;
 
-  ndbg("Bringing up: %d.%d.%d.%d\n",
+  nerr("Bringing up: %d.%d.%d.%d\n",
        dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
        (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 
diff --git a/drivers/net/dm90x0.c b/drivers/net/dm90x0.c
index 26b29c2904..1b59a49485 100644
--- a/drivers/net/dm90x0.c
+++ b/drivers/net/dm90x0.c
@@ -865,7 +865,7 @@ static void dm9x_receive(FAR struct dm9x_driver_s *dm9x)
         {
           /* Bad RX packet... update statistics */
 
-          ndbg("Received packet with errors: %02x\n", rx.desc.rx_status);
+          nerr("Received packet with errors: %02x\n", rx.desc.rx_status);
           NETDEV_RXERRORS(&dm9x->dm_dev);
 
           /* Drop this packet and continue to check the next packet */
@@ -877,7 +877,7 @@ static void dm9x_receive(FAR struct dm9x_driver_s *dm9x)
 
       else if (rx.desc.rx_len < ETH_HDRLEN || rx.desc.rx_len > (CONFIG_NET_ETH_MTU + 2))
         {
-          ndbg("RX length error\n");
+          nerr("RX length error\n");
           NETDEV_RXERRORS(&dm9x->dm_dev);
 
           /* Drop this packet and continue to check the next packet */
@@ -1042,7 +1042,7 @@ static void dm9x_txdone(struct dm9x_driver_s *dm9x)
         }
       else
         {
-          ndbg("Bad TX count (TX1END)\n");
+          nerr("Bad TX count (TX1END)\n");
         }
     }
 
@@ -1054,7 +1054,7 @@ static void dm9x_txdone(struct dm9x_driver_s *dm9x)
         }
       else
         {
-          ndbg("Bad TX count (TX2END)\n");
+          nerr("Bad TX count (TX2END)\n");
         }
     }
 
@@ -1144,7 +1144,7 @@ static int dm9x_interrupt(int irq, FAR void *context)
             }
           up_mdelay(1);
         }
-      ndbg("delay: %dmS speed: %s\n", i, dm9x->dm_b100M ? "100M" : "10M");
+      nerr("delay: %dmS speed: %s\n", i, dm9x->dm_b100M ? "100M" : "10M");
     }
 
   /* Check if we received an incoming packet */
@@ -1206,16 +1206,16 @@ static void dm9x_txtimeout(int argc, uint32_t arg, ...)
 {
   struct dm9x_driver_s *dm9x = (struct dm9x_driver_s *)arg;
 
-  ndbg("TX timeout\n");
+  nerr("TX timeout\n");
 
   /* Increment statistics and dump debug info */
 
   NETDEV_TXTIMEOUTS(dm9x->dm_dev);
 
-  ndbg("  TX packet count:           %d\n", dm9x->dm_ntxpending);
-  ndbg("  TX read pointer address:   0x%02x:%02x\n",
+  nerr("  TX packet count:           %d\n", dm9x->dm_ntxpending);
+  nerr("  TX read pointer address:   0x%02x:%02x\n",
        getreg(DM9X_TRPAH), getreg(DM9X_TRPAL));
-  ndbg("  Memory data write address: 0x%02x:%02x (DM9010)\n",
+  nerr("  Memory data write address: 0x%02x:%02x (DM9010)\n",
        getreg(DM9X_MDWAH), getreg(DM9X_MDWAL));
 
   /* Then reset the DM90x0 */
@@ -1342,7 +1342,7 @@ static int dm9x_ifup(struct net_driver_s *dev)
   uint8_t netstatus;
   int i;
 
-  ndbg("Bringing up: %d.%d.%d.%d\n",
+  nerr("Bringing up: %d.%d.%d.%d\n",
        dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
        (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 
@@ -1372,7 +1372,7 @@ static int dm9x_ifup(struct net_driver_s *dev)
       up_mdelay(1);
     }
 
-  ndbg("delay: %dmS speed: %s\n", i, dm9x->dm_b100M ? "100M" : "10M");
+  nerr("delay: %dmS speed: %s\n", i, dm9x->dm_b100M ? "100M" : "10M");
 
   /* Set and activate a timer process */
 
@@ -1407,7 +1407,7 @@ static int dm9x_ifdown(struct net_driver_s *dev)
   struct dm9x_driver_s *dm9x = (struct dm9x_driver_s *)dev->d_private;
   irqstate_t flags;
 
-  ndbg("Stopping\n");
+  nerr("Stopping\n");
 
   /* Disable the DM9X interrupt */
 
@@ -1456,7 +1456,7 @@ static int dm9x_txavail(struct net_driver_s *dev)
   struct dm9x_driver_s *dm9x = (struct dm9x_driver_s *)dev->d_private;
   irqstate_t flags;
 
-  ndbg("Polling\n");
+  nerr("Polling\n");
   flags = enter_critical_section();
 
   /* Ignore the notification if the interface is not yet up */
@@ -1557,7 +1557,7 @@ static int dm9x_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac)
 
 static void dm9x_bringup(struct dm9x_driver_s *dm9x)
 {
-  ndbg("Initializing\n");
+  nerr("Initializing\n");
 
   /* Set the internal PHY power-on, GPIOs normal, and wait 2ms */
 
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index c176abc732..ae65ce3532 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -799,7 +799,7 @@ static int e1000_ifup(struct net_driver_s *dev)
 {
   struct e1000_dev *e1000 = (struct e1000_dev *)dev->d_private;
 
-  ndbg("Bringing up: %d.%d.%d.%d\n",
+  nerr("Bringing up: %d.%d.%d.%d\n",
        dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
        (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 
diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c
index f6ad670b2c..cf6bda2dbc 100644
--- a/drivers/net/ftmac100.c
+++ b/drivers/net/ftmac100.c
@@ -455,7 +455,7 @@ static void ftmac100_init(FAR struct ftmac100_driver_s *priv)
   FAR unsigned char *kmem;
   int i;
 
-  ndbg ("%s()\n", __func__);
+  nerr ("%s()\n", __func__);
 
   /* Disable all interrupts */
 
@@ -1311,12 +1311,12 @@ static int ftmac100_ifup(struct net_driver_s *dev)
   FAR struct ftmac100_driver_s *priv = (FAR struct ftmac100_driver_s *)dev->d_private;
 
 #ifdef CONFIG_NET_IPv4
-  ndbg("Bringing up: %d.%d.%d.%d\n",
+  nerr("Bringing up: %d.%d.%d.%d\n",
        dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
        (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 #endif
 #ifdef CONFIG_NET_IPv6
-  ndbg("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
+  nerr("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
        dev->d_ipv6addr[0], dev->d_ipv6addr[1], dev->d_ipv6addr[2],
        dev->d_ipv6addr[3], dev->d_ipv6addr[4], dev->d_ipv6addr[5],
        dev->d_ipv6addr[6], dev->d_ipv6addr[7]);
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index c963f9e7b8..759e11d9b0 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -203,7 +203,7 @@ static int lo_txpoll(FAR struct net_driver_s *dev)
       else
 #endif
         {
-          ndbg("WARNING: Unrecognized packet type dropped: %02x\n", IPv4BUF->vhl);
+          nerr("WARNING: Unrecognized packet type dropped: %02x\n", IPv4BUF->vhl);
           NETDEV_RXDROPPED(&priv->lo_dev);
           priv->lo_dev.d_len = 0;
         }
@@ -323,12 +323,12 @@ static int lo_ifup(FAR struct net_driver_s *dev)
   FAR struct lo_driver_s *priv = (FAR struct lo_driver_s *)dev->d_private;
 
 #ifdef CONFIG_NET_IPv4
-  ndbg("Bringing up: %d.%d.%d.%d\n",
+  nerr("Bringing up: %d.%d.%d.%d\n",
        dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
        (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 #endif
 #ifdef CONFIG_NET_IPv6
-  ndbg("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
+  nerr("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
        dev->d_ipv6addr[0], dev->d_ipv6addr[1], dev->d_ipv6addr[2],
        dev->d_ipv6addr[3], dev->d_ipv6addr[4], dev->d_ipv6addr[5],
        dev->d_ipv6addr[6], dev->d_ipv6addr[7]);
diff --git a/drivers/net/phy_notify.c b/drivers/net/phy_notify.c
index b78cc65810..6c8e6c8a1e 100644
--- a/drivers/net/phy_notify.c
+++ b/drivers/net/phy_notify.c
@@ -82,10 +82,10 @@
  */
 
 #ifdef CONFIG_NETDEV_PHY_DEBUG
-#  define phydbg    dbg
+#  define phyerr    err
 #  define phyllerr  llerr
 #else
-#  define phydbg(x...)
+#  define phyerr(x...)
 #  define phyllerr(x...)
 #endif
 
@@ -208,14 +208,14 @@ static FAR struct phy_notify_s *phy_find_unassigned(void)
           /* Return the client entry assigned to the caller */
 
           phy_semgive();
-          phydbg("Returning client %d\n", i);
+          phyerr("Returning client %d\n", i);
           return client;
         }
     }
 
   /* Ooops... too many */
 
-  ndbg("ERROR: No free client entries\n");
+  nerr("ERROR: No free client entries\n");
   phy_semgive();
   return NULL;
 }
@@ -243,7 +243,7 @@ static FAR struct phy_notify_s *phy_find_assigned(FAR const char *intf,
           /* Return the matching client entry to the caller */
 
           phy_semgive();
-          phydbg("Returning client %d\n", i);
+          phyerr("Returning client %d\n", i);
           return client;
         }
     }
@@ -367,7 +367,7 @@ int phy_notify_subscribe(FAR const char *intf, pid_t pid, int signo,
   if (pid == 0)
     {
       pid = getpid();
-      phydbg("Actual PID=%d\n", pid);
+      phyerr("Actual PID=%d\n", pid);
     }
 
   /* Check if this client already exists */
@@ -387,7 +387,7 @@ int phy_notify_subscribe(FAR const char *intf, pid_t pid, int signo,
       client = phy_find_unassigned();
       if (!client)
         {
-          ndbg("ERROR: Failed to allocate a client entry\n");
+          nerr("ERROR: Failed to allocate a client entry\n");
           return -ENOMEM;
         }
 
@@ -446,7 +446,7 @@ int phy_notify_unsubscribe(FAR const char *intf, pid_t pid)
   client = phy_find_assigned(intf, pid);
   if (!client)
     {
-      ndbg("ERROR: No such client\n");
+      nerr("ERROR: No such client\n");
       return -ENOENT;
     }
 
diff --git a/drivers/net/skeleton.c b/drivers/net/skeleton.c
index 4b49514da3..59b2e56c77 100644
--- a/drivers/net/skeleton.c
+++ b/drivers/net/skeleton.c
@@ -855,12 +855,12 @@ static int skel_ifup(FAR struct net_driver_s *dev)
   FAR struct skel_driver_s *priv = (FAR struct skel_driver_s *)dev->d_private;
 
 #ifdef CONFIG_NET_IPv4
-  ndbg("Bringing up: %d.%d.%d.%d\n",
+  nerr("Bringing up: %d.%d.%d.%d\n",
        dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
        (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 #endif
 #ifdef CONFIG_NET_IPv6
-  ndbg("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
+  nerr("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
        dev->d_ipv6addr[0], dev->d_ipv6addr[1], dev->d_ipv6addr[2],
        dev->d_ipv6addr[3], dev->d_ipv6addr[4], dev->d_ipv6addr[5],
        dev->d_ipv6addr[6], dev->d_ipv6addr[7]);
diff --git a/drivers/net/slip.c b/drivers/net/slip.c
index 98cd0117e4..4105314c78 100644
--- a/drivers/net/slip.c
+++ b/drivers/net/slip.c
@@ -438,7 +438,7 @@ static void slip_txtask(int argc, FAR char *argv[])
   systime_t msec_now;
   unsigned int hsec;
 
-  ndbg("index: %d\n", index);
+  nerr("index: %d\n", index);
   DEBUGASSERT(index < CONFIG_NET_SLIP_NINTERFACES);
 
   /* Get our private data structure instance and wake up the waiting
@@ -616,7 +616,7 @@ static inline void slip_receive(FAR struct slip_driver_s *priv)
                 break;
 
               default:
-                ndbg("ERROR: Protocol violation: %02x\n", ch);
+                nerr("ERROR: Protocol violation: %02x\n", ch);
                 break;
               }
 
@@ -661,7 +661,7 @@ static int slip_rxtask(int argc, FAR char *argv[])
   net_lock_t flags;
   int ch;
 
-  ndbg("index: %d\n", index);
+  nerr("index: %d\n", index);
   DEBUGASSERT(index < CONFIG_NET_SLIP_NINTERFACES);
 
   /* Get our private data structure instance and wake up the waiting
@@ -779,7 +779,7 @@ static int slip_ifup(FAR struct net_driver_s *dev)
 {
   FAR struct slip_driver_s *priv = (FAR struct slip_driver_s *)dev->d_private;
 
-  ndbg("Bringing up: %d.%d.%d.%d\n",
+  nerr("Bringing up: %d.%d.%d.%d\n",
        dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
        (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 
@@ -958,7 +958,7 @@ int slip_initialize(int intf, FAR const char *devname)
   priv->fd            = open(devname, O_RDWR, 0666);
   if (priv->fd < 0)
     {
-      ndbg("ERROR: Failed to open %s: %d\n", devname, errno);
+      nerr("ERROR: Failed to open %s: %d\n", devname, errno);
       return -errno;
     }
 
@@ -983,7 +983,7 @@ int slip_initialize(int intf, FAR const char *devname)
                             (FAR char * const *)argv);
   if (priv->rxpid < 0)
     {
-      ndbg("ERROR: Failed to start receiver task\n");
+      nerr("ERROR: Failed to start receiver task\n");
       return -errno;
     }
 
@@ -998,7 +998,7 @@ int slip_initialize(int intf, FAR const char *devname)
                             (FAR char * const *)argv);
   if (priv->txpid < 0)
     {
-      ndbg("ERROR: Failed to start receiver task\n");
+      nerr("ERROR: Failed to start receiver task\n");
       return -errno;
     }
 
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 96de54844c..bffd391b36 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -646,12 +646,12 @@ static int tun_ifup(struct net_driver_s *dev)
   FAR struct tun_device_s *priv = (FAR struct tun_device_s *)dev->d_private;
 
 #ifdef CONFIG_NET_IPv4
-  ndbg("Bringing up: %d.%d.%d.%d\n",
+  nerr("Bringing up: %d.%d.%d.%d\n",
        dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
        (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 #endif
 #ifdef CONFIG_NET_IPv6
-  ndbg("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
+  nerr("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
        dev->d_ipv6addr[0], dev->d_ipv6addr[1], dev->d_ipv6addr[2],
        dev->d_ipv6addr[3], dev->d_ipv6addr[4], dev->d_ipv6addr[5],
        dev->d_ipv6addr[6], dev->d_ipv6addr[7]);
diff --git a/drivers/net/vnet.c b/drivers/net/vnet.c
index c96845c1b9..86a5070813 100644
--- a/drivers/net/vnet.c
+++ b/drivers/net/vnet.c
@@ -546,7 +546,7 @@ static int vnet_ifup(struct net_driver_s *dev)
 {
   FAR struct vnet_driver_s *vnet = (FAR struct vnet_driver_s *)dev->d_private;
 
-  ndbg("Bringing up: %d.%d.%d.%d\n",
+  nerr("Bringing up: %d.%d.%d.%d\n",
      dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
      (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 
diff --git a/drivers/pipes/pipe_common.c b/drivers/pipes/pipe_common.c
index fe728c2f35..3f5e72ae5a 100644
--- a/drivers/pipes/pipe_common.c
+++ b/drivers/pipes/pipe_common.c
@@ -205,7 +205,7 @@ int pipecommon_open(FAR struct file *filep)
   ret = sem_wait(&dev->d_bfsem);
   if (ret != OK)
     {
-      fdbg("sem_wait failed: %d\n", get_errno());
+      ferr("sem_wait failed: %d\n", get_errno());
       DEBUGASSERT(get_errno() > 0);
       return -get_errno();
     }
@@ -283,7 +283,7 @@ int pipecommon_open(FAR struct file *filep)
            * a signal.
            */
 
-          fdbg("sem_wait failed: %d\n", get_errno());
+          ferr("sem_wait failed: %d\n", get_errno());
           DEBUGASSERT(get_errno() > 0);
           ret = -get_errno();
 
@@ -519,7 +519,7 @@ ssize_t pipecommon_write(FAR struct file *filep, FAR const char *buffer,
   /* At present, this method cannot be called from interrupt handlers.  That is
    * because it calls sem_wait (via pipecommon_semtake below) and sem_wait cannot
    * be called from interrupt level.  This actually happens fairly commonly
-   * IF dbg() is called from interrupt handlers and stdout is being redirected
+   * IF err() is called from interrupt handlers and stdout is being redirected
    * via a pipe.  In that case, the debug output will try to go out the pipe
    * (interrupt handlers should use the llerr() APIs).
    *
diff --git a/drivers/power/battery_charger.c b/drivers/power/battery_charger.c
index 056e16e98c..2fff5afc2c 100644
--- a/drivers/power/battery_charger.c
+++ b/drivers/power/battery_charger.c
@@ -228,7 +228,7 @@ static int bat_charger_ioctl(FAR struct file *filep, int cmd,
         break;
 
       default:
-        dbg("Unrecognized cmd: %d\n", cmd);
+        err("Unrecognized cmd: %d\n", cmd);
         ret = -ENOTTY;
         break;
     }
@@ -268,7 +268,7 @@ int battery_charger_register(FAR const char *devpath,
   ret = register_driver(devpath, &g_batteryops, 0555, dev);
   if (ret < 0)
     {
-      dbg("Failed to register driver: %d\n", ret);
+      err("Failed to register driver: %d\n", ret);
     }
 
   return ret;
diff --git a/drivers/power/battery_gauge.c b/drivers/power/battery_gauge.c
index cf6a962e2b..e913c733c8 100644
--- a/drivers/power/battery_gauge.c
+++ b/drivers/power/battery_gauge.c
@@ -213,7 +213,7 @@ static int bat_gauge_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
         break;
 
       default:
-        dbg("Unrecognized cmd: %d\n", cmd);
+        err("Unrecognized cmd: %d\n", cmd);
         ret = -ENOTTY;
         break;
     }
@@ -253,7 +253,7 @@ int battery_gauge_register(FAR const char *devpath,
   ret = register_driver(devpath, &g_batteryops, 0555, dev);
   if (ret < 0)
     {
-      dbg("Failed to register driver: %d\n", ret);
+      err("Failed to register driver: %d\n", ret);
     }
 
   return ret;
diff --git a/drivers/power/bq2425x.c b/drivers/power/bq2425x.c
index 073c3ce379..8f2198f213 100644
--- a/drivers/power/bq2425x.c
+++ b/drivers/power/bq2425x.c
@@ -78,12 +78,12 @@
 /* Debug ********************************************************************/
 
 #ifdef CONFIG_DEBUG_BQ2425X
-#  define batdbg dbg
+#  define baterr err
 #else
 #  ifdef CONFIG_CPP_HAVE_VARARGS
-#    define batdbg(x...)
+#    define baterr(x...)
 #  else
-#    define batdbg (void)
+#    define baterr (void)
 #  endif
 #endif
 
@@ -176,7 +176,7 @@ static int bq2425x_getreg8(FAR struct bq2425x_dev_s *priv, uint8_t regaddr,
   ret = i2c_write(priv->i2c, &config, ®addr, 1);
   if (ret < 0)
     {
-      batdbg("i2c_write failed: %d\n", ret);
+      baterr("i2c_write failed: %d\n", ret);
       return ret;
     }
 
@@ -185,7 +185,7 @@ static int bq2425x_getreg8(FAR struct bq2425x_dev_s *priv, uint8_t regaddr,
   ret = i2c_read(priv->i2c, &config, &val, 1);
   if (ret < 0)
     {
-      batdbg("i2c_read failed: %d\n", ret);
+      baterr("i2c_read failed: %d\n", ret);
       return ret;
     }
 
@@ -217,7 +217,7 @@ static int bq2425x_putreg8(FAR struct bq2425x_dev_s *priv, uint8_t regaddr,
   config.address   = priv->addr;
   config.addrlen   = 7;
 
-  batdbg("addr: %02x regval: %08x\n", regaddr, regval);
+  baterr("addr: %02x regval: %08x\n", regaddr, regval);
 
   /* Set up a 3 byte message to send */
 
@@ -270,7 +270,7 @@ static inline int bq2425x_reset(FAR struct bq2425x_dev_s *priv)
   ret = bq2425x_getreg8(priv, BQ2425X_REG_2, ®val);
   if (ret < 0)
     {
-      batdbg("Error reading from BQ2425X! Error =  %d\n", ret);
+      baterr("Error reading from BQ2425X! Error =  %d\n", ret);
       return ret;
     }
 
@@ -280,7 +280,7 @@ static inline int bq2425x_reset(FAR struct bq2425x_dev_s *priv)
   ret = bq2425x_putreg8(priv, BQ2425X_REG_2, regval);
   if (ret < 0)
     {
-      batdbg("Error writing to BQ2425X! Error =  %d\n", ret);
+      baterr("Error writing to BQ2425X! Error =  %d\n", ret);
       return ret;
     }
 
@@ -294,7 +294,7 @@ static inline int bq2425x_reset(FAR struct bq2425x_dev_s *priv)
   ret = bq2425x_putreg8(priv, BQ2425X_REG_2, regval);
   if (ret < 0)
     {
-      batdbg("Error writing to BQ2425X! Error =  %d\n", ret);
+      baterr("Error writing to BQ2425X! Error =  %d\n", ret);
       return ret;
     }
 
@@ -317,7 +317,7 @@ static inline int bq2425x_watchdog(FAR struct bq2425x_dev_s *priv, bool enable)
   ret = bq2425x_getreg8(priv, BQ2425X_REG_1, ®val);
   if (ret < 0)
     {
-      batdbg("Error reading from BQ2425X! Error =  %d\n", ret);
+      baterr("Error reading from BQ2425X! Error =  %d\n", ret);
       return ret;
     }
 
@@ -333,7 +333,7 @@ static inline int bq2425x_watchdog(FAR struct bq2425x_dev_s *priv, bool enable)
   ret = bq2425x_putreg8(priv, BQ2425X_REG_1, regval);
   if (ret < 0)
     {
-      batdbg("Error writing to BQ2425X! Error =  %d\n", ret);
+      baterr("Error writing to BQ2425X! Error =  %d\n", ret);
       return ret;
     }
 
@@ -515,7 +515,7 @@ static inline int bq2425x_powersupply(FAR struct bq2425x_dev_s *priv, int curren
     break;
 
   default:
-    batdbg("Current not supported, setting default to 100mA.!\n");
+    baterr("Current not supported, setting default to 100mA.!\n");
     idx = BQ2425X_INP_CURR_LIM_100MA;
     break;
   }
@@ -525,7 +525,7 @@ static inline int bq2425x_powersupply(FAR struct bq2425x_dev_s *priv, int curren
   ret = bq2425x_getreg8(priv, BQ2425X_REG_2, ®val);
   if (ret < 0)
     {
-      batdbg("Error reading from BQ2425X! Error =  %d\n", ret);
+      baterr("Error reading from BQ2425X! Error =  %d\n", ret);
       return ret;
     }
 
@@ -541,7 +541,7 @@ static inline int bq2425x_powersupply(FAR struct bq2425x_dev_s *priv, int curren
   ret = bq2425x_putreg8(priv, BQ2425X_REG_2, regval);
   if (ret < 0)
     {
-      batdbg("Error writing to BQ2425X! Error =  %d\n", ret);
+      baterr("Error writing to BQ2425X! Error =  %d\n", ret);
       return ret;
     }
 
@@ -565,14 +565,14 @@ static inline int bq2425x_setvolt(FAR struct bq2425x_dev_s *priv, int volts)
 
   if (volts < BQ2425X_VOLT_MIN || volts > BQ2425X_VOLT_MAX)
     {
-      batdbg("Voltage %d mV is out of range.\n", volts);
+      baterr("Voltage %d mV is out of range.\n", volts);
       return -EINVAL;
     }
 
   ret = bq2425x_getreg8(priv, BQ2425X_REG_3, ®val);
   if (ret < 0)
     {
-      batdbg("Error reading from BQ2425X! Error =  %d\n", ret);
+      baterr("Error reading from BQ2425X! Error =  %d\n", ret);
       return ret;
     }
 
@@ -589,7 +589,7 @@ static inline int bq2425x_setvolt(FAR struct bq2425x_dev_s *priv, int volts)
   ret = bq2425x_putreg8(priv, BQ2425X_REG_3, regval);
   if (ret < 0)
     {
-      batdbg("Error writing to BQ2425X! Error =  %d\n", ret);
+      baterr("Error writing to BQ2425X! Error =  %d\n", ret);
       return ret;
     }
 
@@ -613,14 +613,14 @@ static inline int bq2425x_setcurr(FAR struct bq2425x_dev_s *priv, int current)
 
   if (current < BQ2425X_CURR_MIN || current > BQ2425X_CURR_MAX)
     {
-      batdbg("Current %d mA is out of range.\n", volts);
+      baterr("Current %d mA is out of range.\n", volts);
       return -EINVAL;
     }
 
   ret = bq2425x_getreg8(priv, BQ2425X_REG_4, ®val);
   if (ret < 0)
     {
-      batdbg("Error reading from BQ2425X! Error =  %d\n", ret);
+      baterr("Error reading from BQ2425X! Error =  %d\n", ret);
       return ret;
     }
 
@@ -637,7 +637,7 @@ static inline int bq2425x_setcurr(FAR struct bq2425x_dev_s *priv, int current)
   ret = bq2425x_putreg8(priv, BQ2425X_REG_4, regval);
   if (ret < 0)
     {
-      batdbg("Error writing to BQ2425X! Error =  %d\n", ret);
+      baterr("Error writing to BQ2425X! Error =  %d\n", ret);
       return ret;
     }
 
@@ -663,7 +663,7 @@ static int bq2425x_voltage(struct battery_charger_dev_s *dev, int value)
   ret = bq2425x_setvolt(priv, value);
   if (ret < 0)
     {
-      batdbg("Error setting voltage to BQ2425X! Error =  %d\n", ret);
+      baterr("Error setting voltage to BQ2425X! Error =  %d\n", ret);
       return ret;
     }
 
@@ -688,7 +688,7 @@ static int bq2425x_current(struct battery_charger_dev_s *dev, int value)
   ret = bq2425x_setcurr(priv, value);
   if (ret < 0)
     {
-      batdbg("Error setting current to BQ2425X! Error =  %d\n", ret);
+      baterr("Error setting current to BQ2425X! Error =  %d\n", ret);
       return ret;
     }
 
@@ -749,7 +749,7 @@ FAR struct battery_charger_dev_s *
       ret = bq2425x_reset(priv);
       if (ret < 0)
         {
-          batdbg("Failed to reset the BQ2425x: %d\n", ret);
+          baterr("Failed to reset the BQ2425x: %d\n", ret);
           kmm_free(priv);
           return NULL;
         }
@@ -759,7 +759,7 @@ FAR struct battery_charger_dev_s *
       ret = bq2425x_watchdog(priv, false);
       if (ret < 0)
         {
-          batdbg("Failed to disable BQ2425x watchdog: %d\n", ret);
+          baterr("Failed to disable BQ2425x watchdog: %d\n", ret);
           kmm_free(priv);
           return NULL;
         }
@@ -769,7 +769,7 @@ FAR struct battery_charger_dev_s *
       ret = bq2425x_powersupply(priv, 2000);
       if (ret < 0)
         {
-          batdbg("Failed to set BQ2425x power supply current: %d\n", ret);
+          baterr("Failed to set BQ2425x power supply current: %d\n", ret);
           kmm_free(priv);
           return NULL;
         }
diff --git a/drivers/power/max1704x.c b/drivers/power/max1704x.c
index 7fa3f85060..ac1d7ef80f 100644
--- a/drivers/power/max1704x.c
+++ b/drivers/power/max1704x.c
@@ -160,12 +160,12 @@
 /* Debug ********************************************************************/
 
 #ifdef CONFIG_DEBUG_MAX1704X
-#  define batdbg dbg
+#  define baterr err
 #else
 #  ifdef CONFIG_CPP_HAVE_VARARGS
-#    define batdbg(x...)
+#    define baterr(x...)
 #  else
-#    define batdbg (void)
+#    define baterr (void)
 #  endif
 #endif
 
@@ -258,7 +258,7 @@ static int max1704x_getreg16(FAR struct max1704x_dev_s *priv, uint8_t regaddr,
   ret = i2c_write(priv->i2c, &config, ®addr, 1);
   if (ret < 0)
     {
-      batdbg("i2c_write failed: %d\n", ret);
+      baterr("i2c_write failed: %d\n", ret);
       return ret;
     }
 
@@ -267,7 +267,7 @@ static int max1704x_getreg16(FAR struct max1704x_dev_s *priv, uint8_t regaddr,
   ret = i2c_read(priv->i2c, &config, buffer, 2);
   if (ret < 0)
     {
-      batdbg("i2c_read failed: %d\n", ret);
+      baterr("i2c_read failed: %d\n", ret);
       return ret;
     }
 
@@ -292,7 +292,7 @@ static int max1704x_putreg16(FAR struct max1704x_dev_s *priv, uint8_t regaddr,
   struct i2c_config_s config;
   uint8_t buffer[3];
 
-  batdbg("addr: %02x regval: %08x\n", regaddr, regval);
+  baterr("addr: %02x regval: %08x\n", regaddr, regval);
 
   /* Set up a 3 byte message to send */
 
@@ -554,7 +554,7 @@ FAR struct battery_gauge_dev_s *max1704x_initialize(FAR struct i2c_master_s *i2c
       ret = max1704x_reset(priv);
       if (ret < 0)
         {
-          batdbg("Failed to reset the MAX1704x: %d\n", ret);
+          baterr("Failed to reset the MAX1704x: %d\n", ret);
           kmm_free(priv);
           return NULL;
         }
diff --git a/drivers/pwm.c b/drivers/pwm.c
index 0b0e173d4e..d8b023042b 100644
--- a/drivers/pwm.c
+++ b/drivers/pwm.c
@@ -71,12 +71,12 @@
 /* Non-standard debug that may be enabled just for testing PWM */
 
 #ifdef CONFIG_DEBUG_PWM
-#  define pwmdbg    dbg
+#  define pwmerr    err
 #  define pwminfo   info
 #  define pwmllerr  llerr
 #  define pwmllinfo llinfo
 #else
-#  define pwmdbg(x...)
+#  define pwmerr(x...)
 #  define pwminfo(x...)
 #  define pwmllerr(x...)
 #  define pwmllinfo(x...)
@@ -610,7 +610,7 @@ int pwm_register(FAR const char *path, FAR struct pwm_lowerhalf_s *dev)
   upper = (FAR struct pwm_upperhalf_s *)kmm_zalloc(sizeof(struct pwm_upperhalf_s));
   if (!upper)
     {
-      pwmdbg("Allocation failed\n");
+      pwmerr("Allocation failed\n");
       return -ENOMEM;
     }
 
diff --git a/drivers/ramdisk.c b/drivers/ramdisk.c
index ef35b11656..4ce4057103 100644
--- a/drivers/ramdisk.c
+++ b/drivers/ramdisk.c
@@ -487,7 +487,7 @@ int romdisk_register(int minor, FAR const uint8_t *buffer, uint32_t nsectors,
       ret = register_blockdriver(devname, &g_bops, 0, dev);
       if (ret < 0)
         {
-          fdbg("register_blockdriver failed: %d\n", -ret);
+          ferr("register_blockdriver failed: %d\n", -ret);
           kmm_free(dev);
         }
     }
diff --git a/drivers/rwbuffer.c b/drivers/rwbuffer.c
index 3eb4b8338b..fd5b6e53ee 100644
--- a/drivers/rwbuffer.c
+++ b/drivers/rwbuffer.c
@@ -176,7 +176,7 @@ static void rwb_wrflush(struct rwbuffer_s *rwb)
       ret = rwb->wrflush(rwb->dev, rwb->wrbuffer, rwb->wrblockstart, rwb->wrnblocks);
       if (ret != rwb->wrnblocks)
         {
-          fdbg("ERROR: Error flushing write buffer: %d\n", ret);
+          ferr("ERROR: Error flushing write buffer: %d\n", ret);
         }
 
       rwb_resetwrbuffer(rwb);
@@ -260,7 +260,7 @@ static ssize_t rwb_writebuffer(FAR struct rwbuffer_s *rwb,
       ret = rwb->wrflush(rwb->dev, rwb->wrbuffer, rwb->wrblockstart, rwb->wrnblocks);
       if (ret < 0)
         {
-          fdbg("ERROR: Error writing multiple from cache: %d\n", -ret);
+          ferr("ERROR: Error writing multiple from cache: %d\n", -ret);
           return ret;
         }
 
@@ -461,7 +461,7 @@ int rwb_invalidate_writebuffer(FAR struct rwbuffer_s *rwb,
           ret = rwb->wrflush(rwb->dev, src, block, nblocks);
           if (ret < 0)
             {
-              fdbg("ERROR: wrflush failed: %d\n", ret);
+              ferr("ERROR: wrflush failed: %d\n", ret);
             }
 
           /* Keep the blocks at the beginning of the buffer up the
@@ -670,7 +670,7 @@ int rwb_initialize(FAR struct rwbuffer_s *rwb)
           rwb->wrbuffer = kmm_malloc(allocsize);
           if (!rwb->wrbuffer)
             {
-              fdbg("Write buffer kmm_malloc(%d) failed\n", allocsize);
+              ferr("Write buffer kmm_malloc(%d) failed\n", allocsize);
               return -ENOMEM;
             }
         }
@@ -701,7 +701,7 @@ int rwb_initialize(FAR struct rwbuffer_s *rwb)
           rwb->rhbuffer = kmm_malloc(allocsize);
           if (!rwb->rhbuffer)
             {
-              fdbg("Read-ahead buffer kmm_malloc(%d) failed\n", allocsize);
+              ferr("Read-ahead buffer kmm_malloc(%d) failed\n", allocsize);
               return -ENOMEM;
             }
         }
@@ -821,7 +821,7 @@ ssize_t rwb_read(FAR struct rwbuffer_s *rwb, off_t startblock,
               ret = rwb_rhreload(rwb, startblock);
               if (ret < 0)
                 {
-                  fdbg("ERROR: Failed to fill the read-ahead buffer: %d\n", ret);
+                  ferr("ERROR: Failed to fill the read-ahead buffer: %d\n", ret);
                   return (ssize_t)ret;
                 }
             }
@@ -999,7 +999,7 @@ int rwb_invalidate(FAR struct rwbuffer_s *rwb,
   ret = rwb_invalidate_writebuffer(rwb, startblock, blockcount);
   if (ret < 0)
     {
-      fdbg("ERROR: rwb_invalidate_writebuffer failed: %d\n", ret);
+      ferr("ERROR: rwb_invalidate_writebuffer failed: %d\n", ret);
       return ret;
     }
 #endif
@@ -1008,7 +1008,7 @@ int rwb_invalidate(FAR struct rwbuffer_s *rwb,
   ret = rwb_invalidate_readahead(rwb, startblock, blockcount);
   if (ret < 0)
     {
-      fdbg("ERROR: rwb_invalidate_readahead failed: %d\n", ret);
+      ferr("ERROR: rwb_invalidate_readahead failed: %d\n", ret);
       return ret;
     }
 #endif
diff --git a/drivers/sensors/adxl345_base.c b/drivers/sensors/adxl345_base.c
index e96aff0838..2b30508207 100644
--- a/drivers/sensors/adxl345_base.c
+++ b/drivers/sensors/adxl345_base.c
@@ -205,7 +205,7 @@ int adxl345_register(ADXL345_HANDLE handle, int minor)
   if (ret < 0)
     {
       int errval = errno;
-      sndbg("ERROR: sem_wait failed: %d\n", errval);
+      snerr("ERROR: sem_wait failed: %d\n", errval);
       return -errval;
     }
 
@@ -221,7 +221,7 @@ int adxl345_register(ADXL345_HANDLE handle, int minor)
   ret = register_driver(devname, &g_adxl345fops, 0666, priv);
   if (ret < 0)
     {
-      sndbg("ERROR: Failed to register driver %s: %d\n", devname, ret);
+      snerr("ERROR: Failed to register driver %s: %d\n", devname, ret);
       sem_post(&priv->exclsem);
       return ret;
     }
@@ -397,7 +397,7 @@ ADXL345_HANDLE adxl345_instantiate(FAR struct i2c_master_s *dev,
   priv = (FAR struct adxl345_dev_s *)kmm_zalloc(sizeof(struct adxl345_dev_s));
   if (!priv)
     {
-      sndbg("Failed to allocate the device structure!\n");
+      snerr("Failed to allocate the device structure!\n");
       return NULL;
     }
 
@@ -418,7 +418,7 @@ ADXL345_HANDLE adxl345_instantiate(FAR struct i2c_master_s *dev,
   ret = adxl345_checkid(priv);
   if (ret < 0)
     {
-      sndbg("Wrong Device ID!\n");
+      snerr("Wrong Device ID!\n");
       kmm_free(priv);
       return NULL;
     }
diff --git a/drivers/sensors/adxl345_i2c.c b/drivers/sensors/adxl345_i2c.c
index a2dfd81961..54c0aef44b 100644
--- a/drivers/sensors/adxl345_i2c.c
+++ b/drivers/sensors/adxl345_i2c.c
@@ -97,12 +97,12 @@ uint8_t adxl345_getreg8(FAR struct adxl345_dev_s *priv, uint8_t regaddr)
   ret = I2C_TRANSFER(priv->i2c, msg, 2);
   if (ret < 0)
     {
-      sndbg("I2C_TRANSFER failed: %d\n", ret);
+      snerr("I2C_TRANSFER failed: %d\n", ret);
       return 0;
     }
 
 #ifdef CONFIG_ADXL345_REGDEBUG
-  dbg("%02x->%02x\n", regaddr, regval);
+  err("%02x->%02x\n", regaddr, regval);
 #endif
   return regval;
 }
@@ -130,7 +130,7 @@ void adxl345_putreg8(FAR struct adxl345_dev_s *priv,
   int ret;
 
 #ifdef CONFIG_ADXL345_REGDEBUG
-  dbg("%02x<-%02x\n", regaddr, regval);
+  err("%02x<-%02x\n", regaddr, regval);
 #endif
 
   /* Setup to the data to be transferred.  Two bytes:  The ADXL345 register
@@ -154,7 +154,7 @@ void adxl345_putreg8(FAR struct adxl345_dev_s *priv,
   ret = I2C_TRANSFER(priv->i2c, &msg, 1);
   if (ret < 0)
     {
-      sndbg("I2C_TRANSFER failed: %d\n", ret);
+      snerr("I2C_TRANSFER failed: %d\n", ret);
     }
 }
 #endif
@@ -204,12 +204,12 @@ uint16_t adxl345_getreg16(FAR struct adxl345_dev_s *priv, uint8_t regaddr)
   ret = I2C_TRANSFER(priv->i2c, msg, 2);
   if (ret < 0)
     {
-      sndbg("I2C_TRANSFER failed: %d\n", ret);
+      snerr("I2C_TRANSFER failed: %d\n", ret);
       return 0;
     }
 
 #ifdef CONFIG_ADXL345_REGDEBUG
-  dbg("%02x->%02x%02x\n", regaddr, rxbuffer[0], rxbuffer[1]);
+  err("%02x->%02x%02x\n", regaddr, rxbuffer[0], rxbuffer[1]);
 #endif
   return (uint16_t)rxbuffer[0] << 8 | (uint16_t)rxbuffer[1];
 }
diff --git a/drivers/sensors/adxl345_spi.c b/drivers/sensors/adxl345_spi.c
index 1e837132af..38dd9179c2 100644
--- a/drivers/sensors/adxl345_spi.c
+++ b/drivers/sensors/adxl345_spi.c
@@ -113,7 +113,7 @@ uint8_t adxl345_getreg8(FAR struct adxl345_dev_s *priv, uint8_t regaddr)
   (void)SPI_LOCK(priv->spi, false);
 
 #ifdef CONFIG_ADXL345_REGDEBUG
-  dbg("%02x->%02x\n", regaddr, regval);
+  err("%02x->%02x\n", regaddr, regval);
 #endif
   return regval;
 }
@@ -130,7 +130,7 @@ void adxl345_putreg8(FAR struct adxl345_dev_s *priv, uint8_t regaddr,
                      uint8_t regval)
 {
 #ifdef CONFIG_ADXL345_REGDEBUG
-  dbg("%02x<-%02x\n", regaddr, regval);
+  err("%02x<-%02x\n", regaddr, regval);
 #endif
 
   /* If SPI bus is shared then lock and configure it */
@@ -191,7 +191,7 @@ uint16_t adxl345_getreg16(FAR struct adxl345_dev_s *priv, uint8_t regaddr)
   (void)SPI_LOCK(priv->spi, false);
 
 #ifdef CONFIG_ADXL345_REGDEBUG
-  dbg("%02x->%04x\n", regaddr, regval);
+  err("%02x->%04x\n", regaddr, regval);
 #endif
 
   return regval;
diff --git a/drivers/sensors/as5048b.c b/drivers/sensors/as5048b.c
index 96b3d4d19f..4e29a1f929 100644
--- a/drivers/sensors/as5048b.c
+++ b/drivers/sensors/as5048b.c
@@ -139,7 +139,7 @@ static int as5048b_readu8(FAR struct as5048b_dev_s *priv, uint8_t regaddr,
   ret = i2c_write(priv->i2c, &config, ®addr, sizeof(regaddr));
   if (ret < 0)
     {
-      sndbg("i2c_write failed: %d\n", ret);
+      snerr("i2c_write failed: %d\n", ret);
       return ret;
     }
 
@@ -148,11 +148,11 @@ static int as5048b_readu8(FAR struct as5048b_dev_s *priv, uint8_t regaddr,
   ret = i2c_read(priv->i2c, &config, regval, sizeof(*regval));
   if (ret < 0)
     {
-      sndbg("i2c_read failed: %d\n", ret);
+      snerr("i2c_read failed: %d\n", ret);
       return ret;
     }
 
-  sndbg("addr: %02x value: %02x ret: %d\n", regaddr, *regval, ret);
+  snerr("addr: %02x value: %02x ret: %d\n", regaddr, *regval, ret);
   return ret;
 }
 
@@ -175,7 +175,7 @@ static int as5048b_readu16(FAR struct as5048b_dev_s *priv, uint8_t regaddrhi,
   ret = as5048b_readu8(priv, regaddrhi, &hi);
   if (ret < 0)
     {
-      sndbg("as5048b_readu8 failed: %d\n", ret);
+      snerr("as5048b_readu8 failed: %d\n", ret);
       return ret;
     }
 
@@ -184,12 +184,12 @@ static int as5048b_readu16(FAR struct as5048b_dev_s *priv, uint8_t regaddrhi,
   ret = as5048b_readu8(priv, regaddrlo, &lo);
   if (ret < 0)
     {
-      sndbg("as5048b_readu8 failed: %d\n", ret);
+      snerr("as5048b_readu8 failed: %d\n", ret);
       return ret;
     }
 
   *regval = (uint16_t)hi << 6 | (uint16_t)lo;
-  sndbg("addrhi: %02x addrlo: %02x value: %04x ret: %d\n",
+  snerr("addrhi: %02x addrlo: %02x value: %04x ret: %d\n",
         regaddrhi, regaddrlo, *regval, ret);
   return ret;
 }
@@ -209,7 +209,7 @@ static int as5048b_writeu8(FAR struct as5048b_dev_s *priv, uint8_t regaddr,
   uint8_t buffer[2];
   int ret;
 
-  sndbg("addr: %02x value: %02x\n", regaddr, regval);
+  snerr("addr: %02x value: %02x\n", regaddr, regval);
 
   /* Set up the I2C configuration */
 
@@ -227,7 +227,7 @@ static int as5048b_writeu8(FAR struct as5048b_dev_s *priv, uint8_t regaddr,
   ret = i2c_write(priv->i2c, &config, buffer, sizeof(buffer));
   if (ret < 0)
     {
-      sndbg("i2c_write failed: %d\n", ret);
+      snerr("i2c_write failed: %d\n", ret);
     }
 
   return ret;
@@ -246,7 +246,7 @@ static int as5048b_writeu16(FAR struct as5048b_dev_s *priv, uint8_t regaddrhi,
 {
   int ret;
 
-  sndbg("addrhi: %02x addrlo: %02x value: %04x\n",
+  snerr("addrhi: %02x addrlo: %02x value: %04x\n",
         regaddrhi, regaddrlo, regval);
 
   /* Write the high 8 bits of the 13-bit value */
@@ -254,7 +254,7 @@ static int as5048b_writeu16(FAR struct as5048b_dev_s *priv, uint8_t regaddrhi,
   ret = as5048b_writeu8(priv, regaddrhi, (uint8_t)(regval >> 6));
   if (ret < 0)
     {
-      sndbg("as5048b_writeu8 failed: %d\n", ret);
+      snerr("as5048b_writeu8 failed: %d\n", ret);
       return ret;
     }
 
@@ -263,7 +263,7 @@ static int as5048b_writeu16(FAR struct as5048b_dev_s *priv, uint8_t regaddrhi,
   ret = as5048b_writeu8(priv, regaddrhi, (uint8_t)regval);
   if (ret < 0)
     {
-      sndbg("as5048b_writeu8 failed: %d\n", ret);
+      snerr("as5048b_writeu8 failed: %d\n", ret);
     }
 
   return ret;
@@ -285,11 +285,11 @@ static int as5048b_readzero(FAR struct as5048b_dev_s *priv,
   ret = as5048b_readu16(priv, AS5048B_ZEROHI_REG, AS5048B_ZEROLO_REG, zero);
   if (ret < 0)
     {
-      sndbg("as5048b_readu16 failed: %d\n", ret);
+      snerr("as5048b_readu16 failed: %d\n", ret);
       return ret;
     }
 
-  sndbg("zero: %04x ret: %d\n", *zero, ret);
+  snerr("zero: %04x ret: %d\n", *zero, ret);
   return ret;
 }
 
@@ -305,12 +305,12 @@ static int as5048b_writezero(FAR struct as5048b_dev_s *priv, uint16_t zero)
 {
   int ret;
 
-  sndbg("zero: %04x\n", zero);
+  snerr("zero: %04x\n", zero);
 
   ret = as5048b_writeu16(priv, AS5048B_ZEROHI_REG, AS5048B_ZEROLO_REG, zero);
   if (ret < 0)
     {
-      sndbg("as5048b_writeu16 failed: %d\n", ret);
+      snerr("as5048b_writeu16 failed: %d\n", ret);
     }
 
   return ret;
@@ -331,11 +331,11 @@ static int as5048b_readagc(FAR struct as5048b_dev_s *priv, FAR uint8_t *agc)
   ret = as5048b_readu8(priv, AS5048B_AGC_REG, agc);
   if (ret < 0)
     {
-      sndbg("as5048b_readu8 failed: %d\n", ret);
+      snerr("as5048b_readu8 failed: %d\n", ret);
       return ret;
     }
 
-  sndbg("agc: %02x ret: %d\n", *agc, ret);
+  snerr("agc: %02x ret: %d\n", *agc, ret);
   return ret;
 }
 
@@ -354,11 +354,11 @@ static int as5048b_readdiag(FAR struct as5048b_dev_s *priv, FAR uint8_t *diag)
   ret = as5048b_readu8(priv, AS5048B_DIAG_REG, diag);
   if (ret < 0)
     {
-      sndbg("as5048b_readu8 failed: %d\n", ret);
+      snerr("as5048b_readu8 failed: %d\n", ret);
       return ret;
     }
 
-  sndbg("diag: %02x ret: %d\n", *diag, ret);
+  snerr("diag: %02x ret: %d\n", *diag, ret);
   return ret;
 }
 
@@ -377,11 +377,11 @@ static int as5048b_readmag(FAR struct as5048b_dev_s *priv, FAR uint16_t *mag)
   ret = as5048b_readu16(priv, AS5048B_MAGHI_REG, AS5048B_MAGLO_REG, mag);
   if (ret < 0)
     {
-      sndbg("as5048b_readu16 failed: %d\n", ret);
+      snerr("as5048b_readu16 failed: %d\n", ret);
       return ret;
     }
 
-  sndbg("mag: %04x ret: %d\n", *mag, ret);
+  snerr("mag: %04x ret: %d\n", *mag, ret);
   return ret;
 }
 
@@ -400,11 +400,11 @@ static int as5048b_readang(FAR struct as5048b_dev_s *priv, FAR uint16_t *ang)
   ret = as5048b_readu16(priv, AS5048B_ANGHI_REG, AS5048B_ANGLO_REG, ang);
   if (ret < 0)
     {
-      sndbg("as5048b_readu16 failed: %d\n", ret);
+      snerr("as5048b_readu16 failed: %d\n", ret);
       return ret;
     }
 
-  sndbg("ang: %04x ret: %d\n", *ang, ret);
+  snerr("ang: %04x ret: %d\n", *ang, ret);
   return ret;
 }
 
@@ -452,7 +452,7 @@ static int as5048b_position(FAR struct qe_lowerhalf_s *lower,
   ret = as5048b_readang(priv, &ang);
   if (ret < 0)
     {
-      sndbg("as5048b_readang failed: %d\n", ret);
+      snerr("as5048b_readang failed: %d\n", ret);
       return ret;
     }
 
@@ -477,21 +477,21 @@ static int as5048b_reset(FAR struct qe_lowerhalf_s *lower)
   ret = as5048b_writezero(priv, 0);
   if (ret < 0)
     {
-      sndbg("as5048b_writezero failed: %d\n", ret);
+      snerr("as5048b_writezero failed: %d\n", ret);
       return ret;
     }
 
   ret = as5048b_readang(priv, &ang);
   if (ret < 0)
     {
-      sndbg("as5048b_readang failed: %d\n", ret);
+      snerr("as5048b_readang failed: %d\n", ret);
       return ret;
     }
 
   ret = as5048b_writezero(priv, ang);
   if (ret < 0)
     {
-      sndbg("as5048b_writezero failed: %d\n", ret);
+      snerr("as5048b_writezero failed: %d\n", ret);
     }
 
   return ret;
@@ -521,7 +521,7 @@ static int as5048b_ioctl(FAR struct qe_lowerhalf_s *lower, int cmd,
             {
               *ptr = (int32_t)zero;
             }
-          sndbg("zero: %04x ret: %d\n", *ptr, ret);
+          snerr("zero: %04x ret: %d\n", *ptr, ret);
         }
         break;
 
@@ -532,7 +532,7 @@ static int as5048b_ioctl(FAR struct qe_lowerhalf_s *lower, int cmd,
           FAR uint8_t *ptr = (FAR uint8_t *)((uintptr_t)arg);
           DEBUGASSERT(ptr != NULL);
           ret = as5048b_readagc(priv, ptr);
-          sndbg("agc: %02x ret: %d\n", *ptr, ret);
+          snerr("agc: %02x ret: %d\n", *ptr, ret);
         }
         break;
 
@@ -543,7 +543,7 @@ static int as5048b_ioctl(FAR struct qe_lowerhalf_s *lower, int cmd,
           FAR uint8_t *ptr = (FAR uint8_t *)((uintptr_t)arg);
           DEBUGASSERT(ptr != NULL);
           ret = as5048b_readdiag(priv, ptr);
-          sndbg("diag: %02x ret: %d\n", *ptr, ret);
+          snerr("diag: %02x ret: %d\n", *ptr, ret);
         }
         break;
 
@@ -559,12 +559,12 @@ static int as5048b_ioctl(FAR struct qe_lowerhalf_s *lower, int cmd,
             {
               *ptr = (int32_t)mag;
             }
-          sndbg("mag: %04x ret: %d\n", *ptr, ret);
+          snerr("mag: %04x ret: %d\n", *ptr, ret);
         }
         break;
 
       default:
-        sndbg("Unrecognized cmd: %d arg: %ld\n", cmd, arg);
+        snerr("Unrecognized cmd: %d arg: %ld\n", cmd, arg);
         ret = -ENOTTY;
         break;
     }
@@ -604,7 +604,7 @@ FAR struct qe_lowerhalf_s *as5048b_initialize(FAR struct i2c_master_s *i2c,
   priv = (FAR struct as5048b_dev_s *)kmm_malloc(sizeof(*priv));
   if (priv == NULL)
     {
-      sndbg("Failed to allocate instance\n");
+      snerr("Failed to allocate instance\n");
       return NULL;
     }
 
diff --git a/drivers/sensors/bh1750fvi.c b/drivers/sensors/bh1750fvi.c
index 9823e12997..aa22de6b53 100644
--- a/drivers/sensors/bh1750fvi.c
+++ b/drivers/sensors/bh1750fvi.c
@@ -144,7 +144,7 @@ static int bh1750fvi_read16(FAR struct bh1750fvi_dev_s *priv,
   ret = i2c_read(priv->i2c, &config, buffer, 2);
   if (ret < 0)
     {
-      sndbg ("i2c_read failed: %d\n", ret);
+      snerr ("i2c_read failed: %d\n", ret);
       return ret;
     }
 
@@ -152,7 +152,7 @@ static int bh1750fvi_read16(FAR struct bh1750fvi_dev_s *priv,
 
   *regval = (uint16_t)((buffer[0]<<8) | (buffer[1]));
 
-  sndbg("value: %08x ret: %d\n", *regval, ret);
+  snerr("value: %08x ret: %d\n", *regval, ret);
   return OK;
 }
 
@@ -169,7 +169,7 @@ static int bh1750fvi_write8(FAR struct bh1750fvi_dev_s *priv, uint8_t regval)
   struct i2c_config_s config;
   int ret;
 
-  sndbg("value: %02x\n", regval);
+  snerr("value: %02x\n", regval);
 
   /* Set up the I2C configuration */
 
@@ -182,7 +182,7 @@ static int bh1750fvi_write8(FAR struct bh1750fvi_dev_s *priv, uint8_t regval)
   ret = i2c_write(priv->i2c, &config, ®val, 1);
   if (ret < 0)
     {
-      sndbg("i2c_write failed: %d\n", ret);
+      snerr("i2c_write failed: %d\n", ret);
     }
 
   return ret;
@@ -236,14 +236,14 @@ static ssize_t bh1750fvi_read(FAR struct file *filep, FAR char *buffer,
 
   if (buflen != 2)
     {
-      sndbg("You need to read 2 bytes from this sensor!\n");
+      snerr("You need to read 2 bytes from this sensor!\n");
       return -EINVAL;
     }
 
   ret = bh1750fvi_read16(priv, &lux);
   if (ret < 0)
     {
-      sndbg("Error reading light sensor!\n");
+      snerr("Error reading light sensor!\n");
       return ret;
     }
 
@@ -283,7 +283,7 @@ static int bh1750fvi_ioctl(FAR struct file *filep, int cmd,
           ret = bh1750fvi_write8(priv, BH1750FVI_CONTINUOUS_HRM);
           if (ret < 0)
             {
-              sndbg("Cannot change to Continuously H-Resolution Mode!\n");
+              snerr("Cannot change to Continuously H-Resolution Mode!\n");
             }
         }
         break;
@@ -295,7 +295,7 @@ static int bh1750fvi_ioctl(FAR struct file *filep, int cmd,
           ret = bh1750fvi_write8(priv, BH1750FVI_CONTINUOUS_HRM2);
           if (ret < 0)
             {
-              sndbg("Cannot change to Continuously H-Resolution Mode2!\n");
+              snerr("Cannot change to Continuously H-Resolution Mode2!\n");
             }
         }
         break;
@@ -307,7 +307,7 @@ static int bh1750fvi_ioctl(FAR struct file *filep, int cmd,
           ret = bh1750fvi_write8(priv, BH1750FVI_CONTINUOUS_LRM);
           if (ret < 0)
             {
-              sndbg("Cannot change to Continuously L-Resolution Mode!\n");
+              snerr("Cannot change to Continuously L-Resolution Mode!\n");
             }
         }
         break;
@@ -319,7 +319,7 @@ static int bh1750fvi_ioctl(FAR struct file *filep, int cmd,
           ret = bh1750fvi_write8(priv, BH1750FVI_ONETIME_HRM);
           if (ret < 0)
             {
-              sndbg("Cannot change to One Time H-Resolution Mode!\n");
+              snerr("Cannot change to One Time H-Resolution Mode!\n");
             }
         }
         break;
@@ -331,7 +331,7 @@ static int bh1750fvi_ioctl(FAR struct file *filep, int cmd,
           ret = bh1750fvi_write8(priv, BH1750FVI_ONETIME_HRM2);
           if (ret < 0)
             {
-              sndbg("Cannot change to One Time H-Resolution Mode2!\n");
+              snerr("Cannot change to One Time H-Resolution Mode2!\n");
             }
         }
         break;
@@ -343,7 +343,7 @@ static int bh1750fvi_ioctl(FAR struct file *filep, int cmd,
           ret = bh1750fvi_write8(priv, BH1750FVI_ONETIME_LRM);
           if (ret < 0)
             {
-              sndbg("Cannot change to One Time L-Resolution Mode!\n");
+              snerr("Cannot change to One Time L-Resolution Mode!\n");
             }
         }
         break;
@@ -361,7 +361,7 @@ static int bh1750fvi_ioctl(FAR struct file *filep, int cmd,
           ret = bh1750fvi_write8(priv, reg);
           if (ret < 0)
             {
-              sndbg("Cannot Change Measure Time at MEASURE_TIMEH!\n");
+              snerr("Cannot Change Measure Time at MEASURE_TIMEH!\n");
             }
 
           reg = BH1750FVI_MEASURE_TIMEL | (*ptr & 0x1F);
@@ -369,13 +369,13 @@ static int bh1750fvi_ioctl(FAR struct file *filep, int cmd,
           ret = bh1750fvi_write8(priv, reg);
           if (ret < 0)
             {
-              sndbg("Cannot Change Measure Time at MEASURE_TIMEL!\n");
+              snerr("Cannot Change Measure Time at MEASURE_TIMEL!\n");
             }
         }
         break;
 
       default:
-        sndbg("Unrecognized cmd: %d\n", cmd);
+        snerr("Unrecognized cmd: %d\n", cmd);
         ret = -ENOTTY;
         break;
     }
@@ -419,7 +419,7 @@ int bh1750fvi_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
 
   if (priv == NULL)
     {
-      sndbg("Failed to allocate instance\n");
+      snerr("Failed to allocate instance\n");
       return -ENOMEM;
     }
 
@@ -431,7 +431,7 @@ int bh1750fvi_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
   ret = bh1750fvi_write8(priv, BH1750FVI_POWERON);
   if (ret < 0)
     {
-      sndbg("Failed to power-on the BH1750FVI!\n");
+      snerr("Failed to power-on the BH1750FVI!\n");
       return ret;
     }
 
@@ -440,7 +440,7 @@ int bh1750fvi_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
   ret = bh1750fvi_write8(priv, BH1750FVI_CONTINUOUS_HRM);
   if (ret < 0)
     {
-      sndbg("Failed to enable the Continuosly H-Resolution Mode!\n");
+      snerr("Failed to enable the Continuosly H-Resolution Mode!\n");
       return ret;
     }
 
@@ -449,7 +449,7 @@ int bh1750fvi_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
   ret = register_driver(devpath, &g_bh1750fvi_fops, 0666, priv);
   if (ret < 0)
     {
-      sndbg("Failed to register driver: %d\n", ret);
+      snerr("Failed to register driver: %d\n", ret);
       kmm_free(priv);
     }
 
diff --git a/drivers/sensors/bmp180.c b/drivers/sensors/bmp180.c
index 113ad049cc..b0df89d2c8 100644
--- a/drivers/sensors/bmp180.c
+++ b/drivers/sensors/bmp180.c
@@ -198,7 +198,7 @@ static uint8_t bmp180_getreg8(FAR struct bmp180_dev_s *priv, uint8_t regaddr)
   ret = i2c_write(priv->i2c, &config, ®addr, 1);
   if (ret < 0)
     {
-      sndbg("i2c_write failed: %d\n", ret);
+      snerr("i2c_write failed: %d\n", ret);
       return ret;
     }
 
@@ -207,7 +207,7 @@ static uint8_t bmp180_getreg8(FAR struct bmp180_dev_s *priv, uint8_t regaddr)
   ret = i2c_read(priv->i2c, &config, ®val, 1);
   if (ret < 0)
     {
-      sndbg("i2c_read failed: %d\n", ret);
+      snerr("i2c_read failed: %d\n", ret);
       return ret;
     }
 
@@ -240,7 +240,7 @@ static uint16_t bmp180_getreg16(FAR struct bmp180_dev_s *priv, uint8_t regaddr)
   ret = i2c_write(priv->i2c, &config, ®addr, 1);
   if (ret < 0)
     {
-      sndbg("i2c_write failed: %d\n", ret);
+      snerr("i2c_write failed: %d\n", ret);
       return ret;
     }
 
@@ -249,7 +249,7 @@ static uint16_t bmp180_getreg16(FAR struct bmp180_dev_s *priv, uint8_t regaddr)
   ret = i2c_read(priv->i2c, &config, (uint8_t *)®val, 2);
   if (ret < 0)
     {
-      sndbg("i2c_read failed: %d\n", ret);
+      snerr("i2c_read failed: %d\n", ret);
       return ret;
     }
 
@@ -292,7 +292,7 @@ static void bmp180_putreg8(FAR struct bmp180_dev_s *priv, uint8_t regaddr,
   ret = i2c_write(priv->i2c, &config, (uint8_t *) &data, 2);
   if (ret < 0)
     {
-      sndbg("i2c_write failed: %d\n", ret);
+      snerr("i2c_write failed: %d\n", ret);
       return;
     }
 
@@ -320,7 +320,7 @@ static int bmp180_checkid(FAR struct bmp180_dev_s *priv)
     {
       /* ID is not Correct */
 
-      sndbg("Wrong Device ID!\n");
+      snerr("Wrong Device ID!\n");
       return -ENODEV;
     }
 
@@ -543,13 +543,13 @@ static ssize_t bmp180_read(FAR struct file *filep, FAR char *buffer,
 
   if (!buffer)
     {
-      sndbg("Buffer is null\n");
+      snerr("Buffer is null\n");
       return -1;
     }
 
   if (buflen != 4)
     {
-      sndbg("You can't read something other than 32 bits (4 bytes)\n");
+      snerr("You can't read something other than 32 bits (4 bytes)\n");
       return -1;
     }
 
@@ -602,7 +602,7 @@ int bmp180_register(FAR const char *devpath, FAR struct i2c_master_s *i2c)
   priv = (FAR struct bmp180_dev_s *)kmm_malloc(sizeof(struct bmp180_dev_s));
   if (!priv)
     {
-      sndbg("Failed to allocate instance\n");
+      snerr("Failed to allocate instance\n");
       return -ENOMEM;
     }
 
@@ -615,7 +615,7 @@ int bmp180_register(FAR const char *devpath, FAR struct i2c_master_s *i2c)
   ret = bmp180_checkid(priv);
   if (ret < 0)
     {
-      sndbg("Failed to register driver: %d\n", ret);
+      snerr("Failed to register driver: %d\n", ret);
       kmm_free(priv);
       return ret;
     }
@@ -629,7 +629,7 @@ int bmp180_register(FAR const char *devpath, FAR struct i2c_master_s *i2c)
   ret = register_driver(devpath, &g_bmp180fops, 0666, priv);
   if (ret < 0)
     {
-      sndbg("Failed to register driver: %d\n", ret);
+      snerr("Failed to register driver: %d\n", ret);
       kmm_free(priv);
     }
 
diff --git a/drivers/sensors/lm75.c b/drivers/sensors/lm75.c
index f3fad73972..e8f84e2933 100644
--- a/drivers/sensors/lm75.c
+++ b/drivers/sensors/lm75.c
@@ -195,7 +195,7 @@ static int lm75_readb16(FAR struct lm75_dev_s *priv, uint8_t regaddr,
   ret = lm75_i2c_write(priv, ®addr, 1);
   if (ret < 0)
     {
-      sndbg("i2c_write failed: %d\n", ret);
+      snerr("i2c_write failed: %d\n", ret);
       return ret;
     }
 
@@ -204,7 +204,7 @@ static int lm75_readb16(FAR struct lm75_dev_s *priv, uint8_t regaddr,
   ret = lm75_i2c_read(priv, buffer, 2);
   if (ret < 0)
     {
-      sndbg("i2c_read failed: %d\n", ret);
+      snerr("i2c_read failed: %d\n", ret);
       return ret;
     }
 
@@ -214,7 +214,7 @@ static int lm75_readb16(FAR struct lm75_dev_s *priv, uint8_t regaddr,
    */
 
   *regvalue = b8tob16((b8_t)buffer[0] << 8 | (b8_t)buffer[1]);
-  sndbg("addr: %02x value: %08x ret: %d\n", regaddr, *regvalue, ret);
+  snerr("addr: %02x value: %08x ret: %d\n", regaddr, *regvalue, ret);
   return OK;
 }
 
@@ -232,7 +232,7 @@ static int lm75_writeb16(FAR struct lm75_dev_s *priv, uint8_t regaddr,
   uint8_t buffer[3];
   b8_t regb8;
 
-  sndbg("addr: %02x value: %08x\n", regaddr, regval);
+  snerr("addr: %02x value: %08x\n", regaddr, regval);
 
   /* Set up a 3 byte message to send */
 
@@ -265,11 +265,11 @@ static int lm75_readtemp(FAR struct lm75_dev_s *priv, FAR b16_t *temp)
   ret = lm75_readb16(priv, LM75_TEMP_REG, &temp16);
   if (ret < 0)
     {
-      sndbg("lm75_readb16 failed: %d\n", ret);
+      snerr("lm75_readb16 failed: %d\n", ret);
       return ret;
     }
 
-  sndbg("Centigrade: %08x\n", temp16);
+  snerr("Centigrade: %08x\n", temp16);
 
   /* Was fahrenheit requested? */
 
@@ -278,7 +278,7 @@ static int lm75_readtemp(FAR struct lm75_dev_s *priv, FAR b16_t *temp)
       /* Centigrade to Fahrenheit conversion:  F = 9*C/5 + 32 */
 
       temp16 =  b16mulb16(temp16, B16_9DIV5) + B16_32;
-      sndbg("Fahrenheit: %08x\n", temp16);
+      snerr("Fahrenheit: %08x\n", temp16);
     }
 
   *temp = temp16;
@@ -305,14 +305,14 @@ static int lm75_readconf(FAR struct lm75_dev_s *priv, FAR uint8_t *conf)
   ret = lm75_i2c_write(priv, &buffer, 1);
   if (ret < 0)
     {
-      sndbg("i2c_write failed: %d\n", ret);
+      snerr("i2c_write failed: %d\n", ret);
       return ret;
     }
 
   /* Restart and read 8-bits from the register */
 
   ret = lm75_i2c_read(priv, conf, 1);
-  sndbg("conf: %02x ret: %d\n", *conf, ret);
+  snerr("conf: %02x ret: %d\n", *conf, ret);
   return ret;
 }
 
@@ -328,7 +328,7 @@ static int lm75_writeconf(FAR struct lm75_dev_s *priv, uint8_t conf)
 {
   uint8_t buffer[2];
 
-  sndbg("conf: %02x\n", conf);
+  snerr("conf: %02x\n", conf);
 
   /* Set up a 2 byte message to send */
 
@@ -384,7 +384,7 @@ static ssize_t lm75_read(FAR struct file *filep, FAR char *buffer, size_t buflen
   nsamples = buflen / sizeof(b16_t);
   ptr      = (FAR b16_t *)buffer;
 
-  sndbg("buflen: %d nsamples: %d\n", buflen, nsamples);
+  snerr("buflen: %d nsamples: %d\n", buflen, nsamples);
 
   /* Get the requested number of samples */
 
@@ -397,7 +397,7 @@ static ssize_t lm75_read(FAR struct file *filep, FAR char *buffer, size_t buflen
       ret = lm75_readtemp(priv, &temp);
       if (ret < 0)
         {
-          sndbg("lm75_readtemp failed: %d\n", ret);
+          snerr("lm75_readtemp failed: %d\n", ret);
           return (ssize_t)ret;
         }
 
@@ -438,7 +438,7 @@ static int lm75_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
           FAR uint8_t *ptr = (FAR uint8_t *)((uintptr_t)arg);
           DEBUGASSERT(ptr != NULL);
           ret = lm75_readconf(priv, ptr);
-          sndbg("conf: %02x ret: %d\n", *ptr, ret);
+          snerr("conf: %02x ret: %d\n", *ptr, ret);
         }
         break;
 
@@ -446,7 +446,7 @@ static int lm75_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case SNIOC_WRITECONF:
         ret = lm75_writeconf(priv, (uint8_t)arg);
-        sndbg("conf: %02x ret: %d\n", *(FAR uint8_t *)arg, ret);
+        snerr("conf: %02x ret: %d\n", *(FAR uint8_t *)arg, ret);
         break;
 
       /* Shutdown the LM75, Arg: None */
@@ -460,7 +460,7 @@ static int lm75_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
               ret = lm75_writeconf(priv, conf | LM75_CONF_SHUTDOWN);
             }
 
-          sndbg("conf: %02x ret: %d\n", conf | LM75_CONF_SHUTDOWN, ret);
+          snerr("conf: %02x ret: %d\n", conf | LM75_CONF_SHUTDOWN, ret);
         }
         break;
 
@@ -475,7 +475,7 @@ static int lm75_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
               ret = lm75_writeconf(priv, conf & ~LM75_CONF_SHUTDOWN);
             }
 
-          sndbg("conf: %02x ret: %d\n", conf & ~LM75_CONF_SHUTDOWN, ret);
+          snerr("conf: %02x ret: %d\n", conf & ~LM75_CONF_SHUTDOWN, ret);
         }
         break;
 
@@ -483,14 +483,14 @@ static int lm75_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case SNIOC_FAHRENHEIT:
         priv->fahrenheit = true;
-        sndbg("Fahrenheit\n");
+        snerr("Fahrenheit\n");
         break;
 
       /* Report Samples in Centigrade */
 
       case SNIOC_CENTIGRADE:
         priv->fahrenheit = false;
-        sndbg("Centigrade\n");
+        snerr("Centigrade\n");
         break;
 
       /* Read THYS temperature register.  Arg: b16_t* pointer */
@@ -500,7 +500,7 @@ static int lm75_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
           FAR b16_t *ptr = (FAR b16_t *)((uintptr_t)arg);
           DEBUGASSERT(ptr != NULL);
           ret = lm75_readb16(priv, LM75_THYS_REG, ptr);
-          sndbg("THYS: %08x ret: %d\n", *ptr, ret);
+          snerr("THYS: %08x ret: %d\n", *ptr, ret);
         }
         break;
 
@@ -508,7 +508,7 @@ static int lm75_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case SNIOC_WRITETHYS:
         ret = lm75_writeb16(priv, LM75_THYS_REG, (b16_t)arg);
-        sndbg("THYS: %08x ret: %d\n", (b16_t)arg, ret);
+        snerr("THYS: %08x ret: %d\n", (b16_t)arg, ret);
         break;
 
       /* Read TOS (Over-temp Shutdown Threshold) Register. Arg: b16_t* pointer */
@@ -518,7 +518,7 @@ static int lm75_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
           FAR b16_t *ptr = (FAR b16_t *)((uintptr_t)arg);
           DEBUGASSERT(ptr != NULL);
           ret = lm75_readb16(priv, LM75_TOS_REG, ptr);
-          sndbg("TOS: %08x ret: %d\n", *ptr, ret);
+          snerr("TOS: %08x ret: %d\n", *ptr, ret);
         }
         break;
 
@@ -526,11 +526,11 @@ static int lm75_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case SNIOC_WRITETOS:
         ret = lm75_writeb16(priv, LM75_TOS_REG, (b16_t)arg);
-        sndbg("TOS: %08x ret: %d\n", (b16_t)arg, ret);
+        snerr("TOS: %08x ret: %d\n", (b16_t)arg, ret);
         break;
 
       default:
-        sndbg("Unrecognized cmd: %d\n", cmd);
+        snerr("Unrecognized cmd: %d\n", cmd);
         ret = -ENOTTY;
         break;
     }
@@ -578,7 +578,7 @@ int lm75_register(FAR const char *devpath, FAR struct i2c_master_s *i2c, uint8_t
   priv = (FAR struct lm75_dev_s *)kmm_malloc(sizeof(struct lm75_dev_s));
   if (priv == NULL)
     {
-      sndbg("Failed to allocate instance\n");
+      snerr("Failed to allocate instance\n");
       return -ENOMEM;
     }
 
@@ -591,7 +591,7 @@ int lm75_register(FAR const char *devpath, FAR struct i2c_master_s *i2c, uint8_t
   ret = register_driver(devpath, &g_lm75fops, 0666, priv);
   if (ret < 0)
     {
-      sndbg("Failed to register driver: %d\n", ret);
+      snerr("Failed to register driver: %d\n", ret);
       kmm_free(priv);
     }
 
diff --git a/drivers/sensors/lm92.c b/drivers/sensors/lm92.c
index 73f4d54634..b1d96f2040 100644
--- a/drivers/sensors/lm92.c
+++ b/drivers/sensors/lm92.c
@@ -198,7 +198,7 @@ static int lm92_readb16(FAR struct lm92_dev_s *priv, uint8_t regaddr,
   ret = lm92_i2c_write(priv, ®addr, 1);
   if (ret < 0)
     {
-      sndbg("i2c_write failed: %d\n", ret);
+      snerr("i2c_write failed: %d\n", ret);
       return ret;
     }
 
@@ -207,7 +207,7 @@ static int lm92_readb16(FAR struct lm92_dev_s *priv, uint8_t regaddr,
   ret = lm92_i2c_read(priv, buffer, 2);
   if (ret < 0)
     {
-      sndbg("i2c_read failed: %d\n", ret);
+      snerr("i2c_read failed: %d\n", ret);
       return ret;
     }
 
@@ -218,7 +218,7 @@ static int lm92_readb16(FAR struct lm92_dev_s *priv, uint8_t regaddr,
   *regvalue = (b16_t)((uint32_t)(buffer[0] & (1 << 7)) << 24 |
                       (uint32_t)(buffer[0] & ~(1 << 7)) << 17 |
                       (uint32_t)(buffer[1] & ~7) << 9);
-  sndbg("addr: %02x value: %08x ret: %d\n", regaddr, *regvalue, ret);
+  snerr("addr: %02x value: %08x ret: %d\n", regaddr, *regvalue, ret);
   return OK;
 }
 
@@ -236,7 +236,7 @@ static int lm92_writeb16(FAR struct lm92_dev_s *priv, uint8_t regaddr,
 {
   uint8_t buffer[3];
 
-  sndbg("addr: %02x value: %08x\n", regaddr, regval);
+  snerr("addr: %02x value: %08x\n", regaddr, regval);
 
   /* Set up a 3-byte message to send */
 
@@ -268,11 +268,11 @@ static int lm92_readtemp(FAR struct lm92_dev_s *priv, FAR b16_t *temp)
   ret = lm92_readb16(priv, LM92_TEMP_REG, &temp16);
   if (ret < 0)
     {
-      sndbg("lm92_readb16 failed: %d\n", ret);
+      snerr("lm92_readb16 failed: %d\n", ret);
       return ret;
     }
 
-  sndbg("Centigrade: %08x\n", temp16);
+  snerr("Centigrade: %08x\n", temp16);
 
   /* Was Fahrenheit requested? */
 
@@ -281,7 +281,7 @@ static int lm92_readtemp(FAR struct lm92_dev_s *priv, FAR b16_t *temp)
       /* Centigrade to Fahrenheit conversion:  F = 9*C/5 + 32 */
 
       temp16 = b16mulb16(temp16, B16_9DIV5) + B16_32;
-      sndbg("Fahrenheit: %08x\n", temp16);
+      snerr("Fahrenheit: %08x\n", temp16);
     }
 
   *temp = temp16;
@@ -308,14 +308,14 @@ static int lm92_readconf(FAR struct lm92_dev_s *priv, FAR uint8_t *conf)
   ret = lm92_i2c_write(priv, &buffer, 1);
   if (ret < 0)
     {
-      sndbg("i2c_write failed: %d\n", ret);
+      snerr("i2c_write failed: %d\n", ret);
       return ret;
     }
 
   /* Restart and read 8 bits from the register */
 
   ret = lm92_i2c_read(priv, conf, 1);
-  sndbg("conf: %02x ret: %d\n", *conf, ret);
+  snerr("conf: %02x ret: %d\n", *conf, ret);
   return ret;
 }
 
@@ -331,7 +331,7 @@ static int lm92_writeconf(FAR struct lm92_dev_s *priv, uint8_t conf)
 {
   uint8_t buffer[2];
 
-  sndbg("conf: %02x\n", conf);
+  snerr("conf: %02x\n", conf);
 
   /* Set up a 2-byte message to send */
 
@@ -364,7 +364,7 @@ static int lm92_readid(FAR struct lm92_dev_s *priv, FAR uint16_t *id)
   ret = lm92_i2c_write(priv, ®addr, 1);
   if (ret < 0)
     {
-      sndbg("i2c_write failed: %d\n", ret);
+      snerr("i2c_write failed: %d\n", ret);
       return ret;
     }
 
@@ -373,12 +373,12 @@ static int lm92_readid(FAR struct lm92_dev_s *priv, FAR uint16_t *id)
   ret = lm92_i2c_read(priv, buffer, 2);
   if (ret < 0)
     {
-      sndbg("i2c_read failed: %d\n", ret);
+      snerr("i2c_read failed: %d\n", ret);
       return ret;
     }
 
   *id = (uint16_t)buffer[0] << 8 | (uint16_t)buffer[1];
-  sndbg("id: %04x ret: %d\n", *id, ret);
+  snerr("id: %04x ret: %d\n", *id, ret);
   return OK;
 }
 
@@ -427,7 +427,7 @@ static ssize_t lm92_read(FAR struct file *filep, FAR char *buffer,
   nsamples = buflen / sizeof(b16_t);
   ptr      = (FAR b16_t *)buffer;
 
-  sndbg("buflen: %d nsamples: %d\n", buflen, nsamples);
+  snerr("buflen: %d nsamples: %d\n", buflen, nsamples);
 
   /* Get the requested number of samples */
 
@@ -440,7 +440,7 @@ static ssize_t lm92_read(FAR struct file *filep, FAR char *buffer,
       ret = lm92_readtemp(priv, &temp);
       if (ret < 0)
         {
-          sndbg("lm92_readtemp failed: %d\n", ret);
+          snerr("lm92_readtemp failed: %d\n", ret);
           return (ssize_t)ret;
         }
 
@@ -481,7 +481,7 @@ static int lm92_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
           FAR uint8_t *ptr = (FAR uint8_t *)((uintptr_t)arg);
           DEBUGASSERT(ptr != NULL);
           ret = lm92_readconf(priv, ptr);
-          sndbg("conf: %02x ret: %d\n", *ptr, ret);
+          snerr("conf: %02x ret: %d\n", *ptr, ret);
         }
         break;
 
@@ -489,7 +489,7 @@ static int lm92_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case SNIOC_WRITECONF:
         ret = lm92_writeconf(priv, (uint8_t)arg);
-        sndbg("conf: %02x ret: %d\n", *(uint8_t *)arg, ret);
+        snerr("conf: %02x ret: %d\n", *(uint8_t *)arg, ret);
         break;
 
       /* Shutdown the LM92.  Arg:  None */
@@ -503,7 +503,7 @@ static int lm92_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
               ret = lm92_writeconf(priv, conf | LM92_CONF_SHUTDOWN);
             }
 
-          sndbg("conf: %02x ret: %d\n", conf | LM92_CONF_SHUTDOWN, ret);
+          snerr("conf: %02x ret: %d\n", conf | LM92_CONF_SHUTDOWN, ret);
         }
         break;
 
@@ -518,7 +518,7 @@ static int lm92_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
               ret = lm92_writeconf(priv, conf & ~LM92_CONF_SHUTDOWN);
             }
 
-          sndbg("conf: %02x ret: %d\n", conf & ~LM92_CONF_SHUTDOWN, ret);
+          snerr("conf: %02x ret: %d\n", conf & ~LM92_CONF_SHUTDOWN, ret);
         }
         break;
 
@@ -526,14 +526,14 @@ static int lm92_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case SNIOC_FAHRENHEIT:
         priv->fahrenheit = true;
-        sndbg("Fahrenheit\n");
+        snerr("Fahrenheit\n");
         break;
 
       /* Report samples in Centigrade.  Arg: None */
 
       case SNIOC_CENTIGRADE:
         priv->fahrenheit = false;
-        sndbg("Centigrade\n");
+        snerr("Centigrade\n");
         break;
 
       /* Read THYS temperature register.  Arg: b16_t* pointer */
@@ -543,7 +543,7 @@ static int lm92_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
           FAR b16_t *ptr = (FAR b16_t *)((uintptr_t)arg);
           DEBUGASSERT(ptr != NULL);
           ret = lm92_readb16(priv, LM92_THYS_REG, ptr);
-          sndbg("THYS: %08x ret: %d\n", *ptr, ret);
+          snerr("THYS: %08x ret: %d\n", *ptr, ret);
         }
         break;
 
@@ -551,7 +551,7 @@ static int lm92_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case SNIOC_WRITETHYS:
         ret = lm92_writeb16(priv, LM92_THYS_REG, (b16_t)arg);
-        sndbg("THYS: %08x ret: %d\n", (b16_t)arg, ret);
+        snerr("THYS: %08x ret: %d\n", (b16_t)arg, ret);
         break;
 
       /* Read TCRIT temperature register.  Arg: b16_t* pointer */
@@ -561,7 +561,7 @@ static int lm92_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
           FAR b16_t *ptr = (FAR b16_t *)((uintptr_t)arg);
           DEBUGASSERT(ptr != NULL);
           ret = lm92_readb16(priv, LM92_TCRIT_REG, ptr);
-          sndbg("TCRIT: %08x ret: %d\n", *ptr, ret);
+          snerr("TCRIT: %08x ret: %d\n", *ptr, ret);
         }
         break;
 
@@ -569,7 +569,7 @@ static int lm92_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case SNIOC_WRITETCRIT:
         ret = lm92_writeb16(priv, LM92_TCRIT_REG, (b16_t)arg);
-        sndbg("TCRIT: %08x ret: %d\n", (b16_t)arg, ret);
+        snerr("TCRIT: %08x ret: %d\n", (b16_t)arg, ret);
         break;
 
       /* Read TLOW temperature register.  Arg: b16_t* pointer */
@@ -579,7 +579,7 @@ static int lm92_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
           FAR b16_t *ptr = (FAR b16_t *)((uintptr_t)arg);
           DEBUGASSERT(ptr != NULL);
           ret = lm92_readb16(priv, LM92_TLOW_REG, ptr);
-          sndbg("TLOW: %08x ret: %d\n", *ptr, ret);
+          snerr("TLOW: %08x ret: %d\n", *ptr, ret);
         }
         break;
 
@@ -587,7 +587,7 @@ static int lm92_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case SNIOC_WRITETLOW:
         ret = lm92_writeb16(priv, LM92_TLOW_REG, (b16_t)arg);
-        sndbg("TLOW: %08x ret: %d\n", (b16_t)arg, ret);
+        snerr("TLOW: %08x ret: %d\n", (b16_t)arg, ret);
         break;
 
       /* Read THIGH temperature register.  Arg: b16_t* pointer */
@@ -597,7 +597,7 @@ static int lm92_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
           FAR b16_t *ptr = (FAR b16_t *)((uintptr_t)arg);
           DEBUGASSERT(ptr != NULL);
           ret = lm92_readb16(priv, LM92_THIGH_REG, ptr);
-          sndbg("THIGH: %08x ret: %d\n", *ptr, ret);
+          snerr("THIGH: %08x ret: %d\n", *ptr, ret);
         }
         break;
 
@@ -605,7 +605,7 @@ static int lm92_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case SNIOC_WRITETHIGH:
         ret = lm92_writeb16(priv, LM92_THIGH_REG, (b16_t)arg);
-        sndbg("THIGH: %08x ret: %d\n", (b16_t)arg, ret);
+        snerr("THIGH: %08x ret: %d\n", (b16_t)arg, ret);
         break;
 
       /* Read from the identification register.  Arg: uint16_t* pointer */
@@ -615,12 +615,12 @@ static int lm92_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
           FAR uint16_t *ptr = (FAR uint16_t *)((uintptr_t)arg);
           DEBUGASSERT(ptr != NULL);
           ret = lm92_readid(priv, ptr);
-          sndbg("id: %04x ret: %d\n", *ptr, ret);
+          snerr("id: %04x ret: %d\n", *ptr, ret);
         }
         break;
 
       default:
-        sndbg("Unrecognized cmd: %d\n", cmd);
+        snerr("Unrecognized cmd: %d\n", cmd);
         ret = -ENOTTY;
         break;
     }
@@ -668,7 +668,7 @@ int lm92_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
   priv = (FAR struct lm92_dev_s *)kmm_malloc(sizeof(struct lm92_dev_s));
   if (priv == NULL)
     {
-      sndbg("Failed to allocate instance\n");
+      snerr("Failed to allocate instance\n");
       return -ENOMEM;
     }
 
@@ -681,7 +681,7 @@ int lm92_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
   ret = register_driver(devpath, &g_lm92fops, 0666, priv);
   if (ret < 0)
     {
-      sndbg("Failed to register driver: %d\n", ret);
+      snerr("Failed to register driver: %d\n", ret);
       kmm_free(priv);
     }
 
diff --git a/drivers/sensors/lsm9ds1.c b/drivers/sensors/lsm9ds1.c
index e6ea884414..be5d79b88c 100644
--- a/drivers/sensors/lsm9ds1.c
+++ b/drivers/sensors/lsm9ds1.c
@@ -660,7 +660,7 @@ static int lsm9ds1_readreg8(FAR struct lsm9ds1_dev_s *priv, uint8_t regaddr,
   ret = i2c_write(priv->i2c, &config, ®addr, sizeof(regaddr));
   if (ret < 0)
     {
-      sndbg("i2c_write failed: %d\n", ret);
+      snerr("i2c_write failed: %d\n", ret);
       return ret;
     }
 
@@ -669,7 +669,7 @@ static int lsm9ds1_readreg8(FAR struct lsm9ds1_dev_s *priv, uint8_t regaddr,
   ret = i2c_read(priv->i2c, &config, regval, sizeof(*regval));
   if (ret < 0)
     {
-      sndbg("i2c_read failed: %d\n", ret);
+      snerr("i2c_read failed: %d\n", ret);
       return ret;
     }
 
@@ -712,7 +712,7 @@ static int lsm9ds1_writereg8(FAR struct lsm9ds1_dev_s *priv, uint8_t regaddr,
   ret = i2c_write(priv->i2c, &config, buffer, sizeof(buffer));
   if (ret < 0)
     {
-      sndbg("i2c_write failed: %d\n", ret);
+      snerr("i2c_write failed: %d\n", ret);
       return ret;
     }
 
@@ -741,7 +741,7 @@ static int lsm9ds1_modifyreg8(FAR struct lsm9ds1_dev_s *priv, uint8_t regaddr,
   ret = lsm9ds1_readreg8(priv, regaddr, ®val);
   if (ret < 0)
     {
-      sndbg("lsm9ds1_readreg8 failed: %d\n", ret);
+      snerr("lsm9ds1_readreg8 failed: %d\n", ret);
       return ret;
     }
 
@@ -751,7 +751,7 @@ static int lsm9ds1_modifyreg8(FAR struct lsm9ds1_dev_s *priv, uint8_t regaddr,
   ret = lsm9ds1_writereg8(priv, regaddr, regval);
   if (ret < 0)
     {
-      sndbg("lsm9ds1_writereg8 failed: %d\n", ret);
+      snerr("lsm9ds1_writereg8 failed: %d\n", ret);
       return ret;
     }
 
@@ -793,13 +793,13 @@ static int lsm9ds1accelgyro_config(FAR struct lsm9ds1_dev_s *priv)
   ret = lsm9ds1_readreg8(priv, LSM9DS1_WHO_AM_I, ®val);
   if (ret < 0)
     {
-      sndbg("lsm9ds1_readreg8 failed: %d\n", ret);
+      snerr("lsm9ds1_readreg8 failed: %d\n", ret);
       return ret;
     }
 
   if (regval != LSM9DS1_WHO_AM_I_VALUE)
     {
-      sndbg("Invalid device identification %02x\n", regval);
+      snerr("Invalid device identification %02x\n", regval);
       return -ENODEV;
     }
 
@@ -1047,13 +1047,13 @@ static int lsm9ds1mag_config(FAR struct lsm9ds1_dev_s *priv)
   ret = lsm9ds1_readreg8(priv, LSM9DS1_WHO_AM_I_M, ®val);
   if (ret < 0)
     {
-      sndbg("lsm9ds1_readreg8 failed: %d\n", ret);
+      snerr("lsm9ds1_readreg8 failed: %d\n", ret);
       return ret;
     }
 
   if (regval != LSM9DS1_WHO_AM_I_M_VALUE)
     {
-      sndbg("Invalid device identification %02x\n", regval);
+      snerr("Invalid device identification %02x\n", regval);
       return -ENODEV;
     }
 
@@ -1280,7 +1280,7 @@ static ssize_t lsm9ds1_read(FAR struct file *filep, FAR char *buffer,
           ret = lsm9ds1_readreg8(priv, regaddr, &lo);
           if (ret < 0)
             {
-              sndbg("lsm9ds1_readreg8 failed: %d\n", ret);
+              snerr("lsm9ds1_readreg8 failed: %d\n", ret);
               return (ssize_t)ret;
             }
 
@@ -1291,7 +1291,7 @@ static ssize_t lsm9ds1_read(FAR struct file *filep, FAR char *buffer,
           ret = lsm9ds1_readreg8(priv, regaddr, &hi);
           if (ret < 0)
             {
-              sndbg("lsm9ds1_readreg8 failed: %d\n", ret);
+              snerr("lsm9ds1_readreg8 failed: %d\n", ret);
               return (ssize_t)ret;
             }
 
@@ -1390,20 +1390,20 @@ static int lsm9ds1_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case SNIOC_SETSAMPLERATE:
         ret = priv->ops->setsamplerate(priv, (uint32_t)arg);
-        sndbg("sample rate: %08x ret: %d\n", (uint32_t)arg, ret);
+        snerr("sample rate: %08x ret: %d\n", (uint32_t)arg, ret);
         break;
 
       /* Set the full-scale range. Arg: uint32_t value. */
 
       case SNIOC_SETFULLSCALE:
         ret = priv->ops->setfullscale(priv, (uint32_t)arg);
-        sndbg("full-scale range: %08x ret: %d\n", (uint32_t)arg, ret);
+        snerr("full-scale range: %08x ret: %d\n", (uint32_t)arg, ret);
         break;
 
       /* Unrecognized commands */
 
       default:
-        sndbg("Unrecognized cmd: %d arg: %lu\n", cmd, arg);
+        snerr("Unrecognized cmd: %d arg: %lu\n", cmd, arg);
         ret = -ENOTTY;
         break;
     }
@@ -1453,7 +1453,7 @@ static int lsm9ds1_register(FAR const char *devpath,
   priv = (FAR struct lsm9ds1_dev_s *)kmm_malloc(sizeof(*priv));
   if (priv == NULL)
     {
-      sndbg("Failed to allocate instance\n");
+      snerr("Failed to allocate instance\n");
       return -ENOMEM;
     }
 
@@ -1468,7 +1468,7 @@ static int lsm9ds1_register(FAR const char *devpath,
   ret = priv->ops->config(priv);
   if (ret < 0)
     {
-      sndbg("Failed to configure device: %d\n", ret);
+      snerr("Failed to configure device: %d\n", ret);
       kmm_free(priv);
       return ret;
     }
@@ -1478,7 +1478,7 @@ static int lsm9ds1_register(FAR const char *devpath,
   ret = register_driver(devpath, &g_fops, 0666, priv);
   if (ret < 0)
     {
-      sndbg("Failed to register driver: %d\n", ret);
+      snerr("Failed to register driver: %d\n", ret);
       kmm_free(priv);
       return ret;
     }
diff --git a/drivers/sensors/max31855.c b/drivers/sensors/max31855.c
index d3e5b8e8f6..73e45c191c 100644
--- a/drivers/sensors/max31855.c
+++ b/drivers/sensors/max31855.c
@@ -189,13 +189,13 @@ static ssize_t max31855_read(FAR struct file *filep, FAR char *buffer, size_t bu
 
   if (!buffer)
     {
-      sndbg("Buffer is null\n");
+      snerr("Buffer is null\n");
       return -EINVAL;
     }
 
   if (buflen != 2)
     {
-      sndbg("You can't read something other than 16 bits (2 bytes)\n");
+      snerr("You can't read something other than 16 bits (2 bytes)\n");
       return -EINVAL;
     }
 
@@ -218,7 +218,7 @@ static ssize_t max31855_read(FAR struct file *filep, FAR char *buffer, size_t bu
   regval |= (regmsb & 0xFF00) << 8;
   regval |= (regmsb & 0xFF) << 24;
 
-  sndbg("Read from MAX31855 = 0x%08X\n", regval);
+  snerr("Read from MAX31855 = 0x%08X\n", regval);
 
   /* If negative, fix signal bits */
 
@@ -235,21 +235,21 @@ static ssize_t max31855_read(FAR struct file *filep, FAR char *buffer, size_t bu
 
   if (regval & MAX31855_FAULT)
     {
-      sndbg("Error: A fault was detected by MAX31855:\n");
+      snerr("Error: A fault was detected by MAX31855:\n");
 
       if (regval & MAX31855_SHORT_VCC)
         {
-          sndbg("The thermocouple input is shorted to VCC!\n");
+          snerr("The thermocouple input is shorted to VCC!\n");
         }
 
       if (regval & MAX31855_SHORT_GND)
         {
-          sndbg("The thermocouple input is shorted to GND!\n");
+          snerr("The thermocouple input is shorted to GND!\n");
         }
 
       if (regval & MAX31855_OPEN_CIRCUIT)
         {
-          sndbg("The thermocouple input is not connected!\n");
+          snerr("The thermocouple input is not connected!\n");
         }
 
       ret = -EINVAL;
@@ -308,7 +308,7 @@ int max31855_register(FAR const char *devpath, FAR struct spi_dev_s *spi)
   priv = (FAR struct max31855_dev_s *)kmm_malloc(sizeof(struct max31855_dev_s));
   if (priv == NULL)
     {
-      sndbg("Failed to allocate instance\n");
+      snerr("Failed to allocate instance\n");
       return -ENOMEM;
     }
 
@@ -320,7 +320,7 @@ int max31855_register(FAR const char *devpath, FAR struct spi_dev_s *spi)
   ret = register_driver(devpath, &g_max31855fops, 0666, priv);
   if (ret < 0)
     {
-      sndbg("Failed to register driver: %d\n", ret);
+      snerr("Failed to register driver: %d\n", ret);
       kmm_free(priv);
     }
 
diff --git a/drivers/sensors/max6675.c b/drivers/sensors/max6675.c
index 329f5185c5..55c2ad47dd 100644
--- a/drivers/sensors/max6675.c
+++ b/drivers/sensors/max6675.c
@@ -185,13 +185,13 @@ static ssize_t max6675_read(FAR struct file *filep, FAR char *buffer, size_t buf
 
   if (!buffer)
     {
-      sndbg("Buffer is null\n");
+      snerr("Buffer is null\n");
       return -EINVAL;
     }
 
   if (buflen != 2)
     {
-      sndbg("You can't read something other than 16 bits (2 bytes)\n");
+      snerr("You can't read something other than 16 bits (2 bytes)\n");
       return -EINVAL;
     }
 
@@ -212,13 +212,13 @@ static ssize_t max6675_read(FAR struct file *filep, FAR char *buffer, size_t buf
   regval  = (regmsb & 0xFF00) >> 8;
   regval |= (regmsb & 0xFF) << 8;
 
-  sndbg("Read from MAX6675 = 0x%04X\n", regval);
+  snerr("Read from MAX6675 = 0x%04X\n", regval);
 
   /* Verify if the device ID bit is really zero */
 
   if (regval & MAX6675_DEV_ID)
     {
-      sndbg("ERROR: The Device ID bit needs to be 0 !\n");
+      snerr("ERROR: The Device ID bit needs to be 0 !\n");
       ret = -EINVAL;
     }
 
@@ -226,7 +226,7 @@ static ssize_t max6675_read(FAR struct file *filep, FAR char *buffer, size_t buf
 
   if (regval & MAX6675_OPEN_CIRCUIT)
     {
-      sndbg("The thermocouple input is not connected!\n");
+      snerr("The thermocouple input is not connected!\n");
       ret = -EINVAL;
     }
 
@@ -285,7 +285,7 @@ int max6675_register(FAR const char *devpath, FAR struct spi_dev_s *spi)
   priv = (FAR struct max6675_dev_s *)kmm_malloc(sizeof(struct max6675_dev_s));
   if (priv == NULL)
     {
-      sndbg("Failed to allocate instance\n");
+      snerr("Failed to allocate instance\n");
       return -ENOMEM;
     }
 
@@ -297,7 +297,7 @@ int max6675_register(FAR const char *devpath, FAR struct spi_dev_s *spi)
   ret = register_driver(devpath, &g_max6675fops, 0666, priv);
   if (ret < 0)
     {
-      sndbg("Failed to register driver: %d\n", ret);
+      snerr("Failed to register driver: %d\n", ret);
       kmm_free(priv);
     }
 
diff --git a/drivers/sensors/mb7040.c b/drivers/sensors/mb7040.c
index 4308b2f73e..57250c4c77 100644
--- a/drivers/sensors/mb7040.c
+++ b/drivers/sensors/mb7040.c
@@ -131,7 +131,7 @@ static int mb7040_measurerange(FAR struct mb7040_dev_s *priv)
   uint8_t regaddr;
   int ret;
 
-  sndbg("addr: %02x\n", regaddr);
+  snerr("addr: %02x\n", regaddr);
 
   /* Set up the I2C configuration */
 
@@ -146,7 +146,7 @@ static int mb7040_measurerange(FAR struct mb7040_dev_s *priv)
   ret = i2c_write(priv->i2c, &config, ®addr, sizeof(regaddr));
   if (ret < 0)
     {
-      sndbg("i2c_write failed: %d\n", ret);
+      snerr("i2c_write failed: %d\n", ret);
     }
 
   return ret;
@@ -178,12 +178,12 @@ static int mb7040_readrange(FAR struct mb7040_dev_s *priv,
   ret = i2c_read(priv->i2c, &config, buffer, sizeof(buffer));
   if (ret < 0)
     {
-      sndbg("i2c_read failed: %d\n", ret);
+      snerr("i2c_read failed: %d\n", ret);
       return ret;
     }
 
   *range = (uint16_t)buffer[0] << 8 | (uint16_t)buffer[1];
-  sndbg("range: %04x ret: %d\n", *range, ret);
+  snerr("range: %04x ret: %d\n", *range, ret);
   return ret;
 }
 
@@ -201,7 +201,7 @@ static int mb7040_changeaddr(FAR struct mb7040_dev_s *priv, uint8_t addr)
   uint8_t buffer[3];
   int ret;
 
-  sndbg("new addr: %02x\n", addr);
+  snerr("new addr: %02x\n", addr);
 
   /* Sanity check */
 
@@ -225,7 +225,7 @@ static int mb7040_changeaddr(FAR struct mb7040_dev_s *priv, uint8_t addr)
   ret = i2c_write(priv->i2c, &config, buffer, sizeof(buffer));
   if (ret < 0)
     {
-      sndbg("i2c_write failed: %d\n", ret);
+      snerr("i2c_write failed: %d\n", ret);
       return ret;
     }
 
@@ -324,7 +324,7 @@ static int mb7040_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
             {
               *ptr = (int32_t)range;
             }
-          sndbg("range: %04x ret: %d\n", *ptr, ret);
+          snerr("range: %04x ret: %d\n", *ptr, ret);
         }
         break;
 
@@ -332,13 +332,13 @@ static int mb7040_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case SNIOC_CHANGEADDR:
         ret = mb7040_changeaddr(priv, (uint8_t)arg);
-        sndbg("new addr: %02x ret: %d\n", *(uint8_t *)arg, ret);
+        snerr("new addr: %02x ret: %d\n", *(uint8_t *)arg, ret);
         break;
 
       /* Unrecognized commands */
 
       default:
-        sndbg("Unrecognized cmd: %d arg: %ld\n", cmd, arg);
+        snerr("Unrecognized cmd: %d arg: %ld\n", cmd, arg);
         ret = -ENOTTY;
         break;
     }
@@ -381,7 +381,7 @@ int mb7040_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
   priv = (FAR struct mb7040_dev_s *)kmm_malloc(sizeof(*priv));
   if (priv == NULL)
     {
-      sndbg("Failed to allocate instance\n");
+      snerr("Failed to allocate instance\n");
       return -ENOMEM;
     }
 
@@ -393,7 +393,7 @@ int mb7040_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
   ret = register_driver(devpath, &g_fops, 0666, priv);
   if (ret < 0)
     {
-      sndbg("Failed to register driver: %d\n", ret);
+      snerr("Failed to register driver: %d\n", ret);
       kmm_free(priv);
     }
 
diff --git a/drivers/sensors/mcp9844.c b/drivers/sensors/mcp9844.c
index c21e415560..47cab8fa9c 100644
--- a/drivers/sensors/mcp9844.c
+++ b/drivers/sensors/mcp9844.c
@@ -140,7 +140,7 @@ static int mcp9844_read_u16(FAR struct mcp9844_dev_s *priv,
   ret = i2c_write(priv->i2c, &config, ®addr, 1);
   if (ret < 0)
     {
-      sndbg ("i2c_write failed: %d\n", ret);
+      snerr ("i2c_write failed: %d\n", ret);
       return ret;
     }
 
@@ -149,7 +149,7 @@ static int mcp9844_read_u16(FAR struct mcp9844_dev_s *priv,
   ret = i2c_read(priv->i2c, &config, buffer, 2);
   if (ret < 0)
     {
-      sndbg ("i2c_read failed: %d\n", ret);
+      snerr ("i2c_read failed: %d\n", ret);
       return ret;
     }
 
@@ -157,7 +157,7 @@ static int mcp9844_read_u16(FAR struct mcp9844_dev_s *priv,
 
   *value = (((uint16_t)(buffer[0]))<<8) + ((uint16_t)(buffer[1]));
 
-  sndbg("addr: %02x value: %08x ret: %d\n", regaddr, *value, ret);
+  snerr("addr: %02x value: %08x ret: %d\n", regaddr, *value, ret);
   return OK;
 }
 
@@ -174,7 +174,7 @@ static int mcp9844_write_u16(FAR struct mcp9844_dev_s *priv,
 {
   struct i2c_config_s config;
 
-  sndbg("addr: %02x value: %08x\n", regaddr, regval);
+  snerr("addr: %02x value: %08x\n", regaddr, regval);
 
   /* Set up a 3 byte message to send */
 
@@ -293,7 +293,7 @@ static int mcp9844_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
             }
           else
             {
-              sndbg("ioctl::SNIOC_READTEMP - mcp9844_read_u16 failed - no temperature retrieved\n");
+              snerr("ioctl::SNIOC_READTEMP - mcp9844_read_u16 failed - no temperature retrieved\n");
             }
         }
         break;
@@ -303,13 +303,13 @@ static int mcp9844_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
           ret = mcp9844_write_u16(priv, MCP9844_RESO_REG, (uint16_t)(arg));
           if (ret != OK)
             {
-              sndbg("ioctl::SNIOC_SETRESOLUTION - mcp9844_write_u16 failed - no resolution set\n");
+              snerr("ioctl::SNIOC_SETRESOLUTION - mcp9844_write_u16 failed - no resolution set\n");
             }
         }
         break;
 
       default:
-        sndbg("Unrecognized cmd: %d\n", cmd);
+        snerr("Unrecognized cmd: %d\n", cmd);
         ret = -ENOTTY;
         break;
     }
@@ -351,7 +351,7 @@ int mcp9844_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
 
   if (priv == NULL)
     {
-      sndbg("Failed to allocate instance\n");
+      snerr("Failed to allocate instance\n");
       return -ENOMEM;
     }
 
@@ -363,7 +363,7 @@ int mcp9844_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
   int ret = register_driver(devpath, &g_mcp9844_fops, 0666, priv);
   if (ret < 0)
     {
-      sndbg("Failed to register driver: %d\n", ret);
+      snerr("Failed to register driver: %d\n", ret);
       kmm_free(priv);
     }
 
diff --git a/drivers/sensors/mpl115a.c b/drivers/sensors/mpl115a.c
index 0c4e87414c..71a137d5b7 100644
--- a/drivers/sensors/mpl115a.c
+++ b/drivers/sensors/mpl115a.c
@@ -157,7 +157,7 @@ static uint8_t mpl115a_getreg8(FAR struct mpl115a_dev_s *priv, uint8_t regaddr)
   (void)SPI_LOCK(priv->spi, false);
 
 #ifdef CONFIG_MPL115A_REGDEBUG
-  dbg("%02x->%02x\n", regaddr, regval);
+  err("%02x->%02x\n", regaddr, regval);
 #endif
   return regval;
 }
@@ -176,25 +176,25 @@ static void mpl115a_updatecaldata(FAR struct mpl115a_dev_s *priv)
 
   priv->mpl115a_cal_a0 = mpl115a_getreg8(priv, MPL115A_BASE_CMD | (MPL115A_A0_MSB << 1)) << 8;
   priv->mpl115a_cal_a0 |= mpl115a_getreg8(priv, MPL115A_BASE_CMD | (MPL115A_A0_LSB << 1));
-  sndbg("a0 = %d\n", priv->mpl115a_cal_a0);
+  snerr("a0 = %d\n", priv->mpl115a_cal_a0);
 
   /* Get b1 coefficient */
 
   priv->mpl115a_cal_b1 = mpl115a_getreg8(priv, MPL115A_BASE_CMD | (MPL115A_B1_MSB << 1)) << 8;
   priv->mpl115a_cal_b1 |= mpl115a_getreg8(priv, MPL115A_BASE_CMD | (MPL115A_B1_LSB << 1));
-  sndbg("b1 = %d\n", priv->mpl115a_cal_b1);
+  snerr("b1 = %d\n", priv->mpl115a_cal_b1);
 
   /* Get b2 coefficient */
 
   priv->mpl115a_cal_b2 = mpl115a_getreg8(priv, MPL115A_BASE_CMD | (MPL115A_B2_MSB << 1)) << 8;
   priv->mpl115a_cal_b2 |= mpl115a_getreg8(priv, MPL115A_BASE_CMD | (MPL115A_B2_LSB << 1));
-  sndbg("b2 = %d\n", priv->mpl115a_cal_b2);
+  snerr("b2 = %d\n", priv->mpl115a_cal_b2);
 
   /* Get c12 coefficient */
 
   priv->mpl115a_cal_c12 = mpl115a_getreg8(priv, MPL115A_BASE_CMD | (MPL115A_C12_MSB << 1)) << 8;
   priv->mpl115a_cal_c12 |= mpl115a_getreg8(priv, MPL115A_BASE_CMD | (MPL115A_C12_LSB << 1));
-  sndbg("c12 = %d\n", priv->mpl115a_cal_c12);
+  snerr("c12 = %d\n", priv->mpl115a_cal_c12);
 }
 
 /****************************************************************************
@@ -220,13 +220,13 @@ static void mpl115a_read_press_temp(FAR struct mpl115a_dev_s *priv)
   priv->mpl115a_pressure |= mpl115a_getreg8(priv, MPL115A_BASE_CMD | (MPL115A_PADC_LSB << 1));
   priv->mpl115a_pressure >>= 6; /* Padc is 10bit unsigned */
 
-  sndbg("Pressure = %d\n", priv->mpl115a_pressure);
+  snerr("Pressure = %d\n", priv->mpl115a_pressure);
 
   priv->mpl115a_temperature = mpl115a_getreg8(priv, MPL115A_BASE_CMD | (MPL115A_TADC_MSB << 1)) << 8;
   priv->mpl115a_temperature |= mpl115a_getreg8(priv, MPL115A_BASE_CMD | (MPL115A_TADC_LSB << 1));
   priv->mpl115a_temperature >>= 6; /* Tadc is 10bit unsigned */
 
-  sndbg("Temperature = %d\n", priv->mpl115a_temperature);
+  snerr("Temperature = %d\n", priv->mpl115a_temperature);
 }
 
 /****************************************************************************
@@ -274,7 +274,7 @@ static int mpl115a_getpressure(FAR struct mpl115a_dev_s *priv)
    * This may be eliminated by right shifting the result 4 bits.
    */
 
-  sndbg("Final Pressure = %d\n", pressure >> 4);
+  snerr("Final Pressure = %d\n", pressure >> 4);
   return pressure;
 }
 
@@ -316,13 +316,13 @@ static ssize_t mpl115a_read(FAR struct file *filep, FAR char *buffer, size_t buf
 
   if (!buffer)
     {
-      sndbg("Buffer is null\n");
+      snerr("Buffer is null\n");
       return -1;
     }
 
   if (buflen != 2)
     {
-      sndbg("You can't read something other than 16 bits (2 bytes)\n");
+      snerr("You can't read something other than 16 bits (2 bytes)\n");
       return -1;
     }
 
@@ -378,7 +378,7 @@ int mpl115a_register(FAR const char *devpath, FAR struct spi_dev_s *spi)
   priv = (FAR struct mpl115a_dev_s *)kmm_malloc(sizeof(struct mpl115a_dev_s));
   if (!priv)
     {
-      sndbg("Failed to allocate instance\n");
+      snerr("Failed to allocate instance\n");
       return -ENOMEM;
     }
 
@@ -397,7 +397,7 @@ int mpl115a_register(FAR const char *devpath, FAR struct spi_dev_s *spi)
   ret = register_driver(devpath, &g_mpl115afops, 0666, priv);
   if (ret < 0)
     {
-      sndbg("Failed to register driver: %d\n", ret);
+      snerr("Failed to register driver: %d\n", ret);
       kmm_free(priv);
     }
 
diff --git a/drivers/sensors/ms58xx.c b/drivers/sensors/ms58xx.c
index 1cbcdc37e9..cbdd05cb36 100644
--- a/drivers/sensors/ms58xx.c
+++ b/drivers/sensors/ms58xx.c
@@ -306,14 +306,14 @@ static int ms58xx_readu16(FAR struct ms58xx_dev_s *priv, uint8_t regaddr,
   uint8_t buffer[2];
   int ret;
 
-  sndbg("addr: %02x\n", regaddr);
+  snerr("addr: %02x\n", regaddr);
 
   /* Write the register address */
 
   ret = ms58xx_i2c_write(priv, ®addr, sizeof(regaddr));
   if (ret < 0)
     {
-      sndbg("i2c_write failed: %d\n", ret);
+      snerr("i2c_write failed: %d\n", ret);
       return ret;
     }
 
@@ -322,12 +322,12 @@ static int ms58xx_readu16(FAR struct ms58xx_dev_s *priv, uint8_t regaddr,
   ret = ms58xx_i2c_read(priv, buffer, sizeof(buffer));
   if (ret < 0)
     {
-      sndbg("i2c_read failed: %d\n", ret);
+      snerr("i2c_read failed: %d\n", ret);
       return ret;
     }
 
   *regval = (uint16_t)buffer[0] << 8 | (uint16_t)buffer[1];
-  sndbg("value: %04x ret: %d\n", *regval, ret);
+  snerr("value: %04x ret: %d\n", *regval, ret);
   return ret;
 }
 
@@ -346,14 +346,14 @@ static int ms58xx_readadc(FAR struct ms58xx_dev_s *priv, FAR uint32_t *adc)
   int ret;
 
   regaddr = MS58XX_ADC_REG;
-  sndbg("addr: %02x\n", regaddr);
+  snerr("addr: %02x\n", regaddr);
 
   /* Write the register address */
 
   ret = ms58xx_i2c_write(priv, ®addr, sizeof(regaddr));
   if (ret < 0)
     {
-      sndbg("i2c_write failed: %d\n", ret);
+      snerr("i2c_write failed: %d\n", ret);
       return ret;
     }
 
@@ -362,7 +362,7 @@ static int ms58xx_readadc(FAR struct ms58xx_dev_s *priv, FAR uint32_t *adc)
   ret = ms58xx_i2c_read(priv, buffer, sizeof(buffer));
   if (ret < 0)
     {
-      sndbg("i2c_read failed: %d\n", ret);
+      snerr("i2c_read failed: %d\n", ret);
       return ret;
     }
 
@@ -370,7 +370,7 @@ static int ms58xx_readadc(FAR struct ms58xx_dev_s *priv, FAR uint32_t *adc)
          (uint32_t)buffer[1] << 8 |
          (uint32_t)buffer[2];
 
-  sndbg("adc: %06x ret: %d\n", *adc, ret);
+  snerr("adc: %06x ret: %d\n", *adc, ret);
   return ret;
 }
 
@@ -483,7 +483,7 @@ static int ms58xx_setosr(FAR struct ms58xx_dev_s *priv, uint16_t osr)
 {
   int ret = OK;
 
-  sndbg("osr: %04x\n", osr);
+  snerr("osr: %04x\n", osr);
 
   switch (priv->model)
     {
@@ -558,7 +558,7 @@ static int ms58xx_readprom(FAR struct ms58xx_dev_s *priv)
       ret = ms58xx_readu16(priv, MS58XX_PROM_REG + i * 2, prom + i);
       if (ret < 0)
         {
-          sndbg("ms58xx_readu16 failed: %d\n", ret);
+          snerr("ms58xx_readu16 failed: %d\n", ret);
           return ret;
         }
     }
@@ -568,7 +568,7 @@ static int ms58xx_readprom(FAR struct ms58xx_dev_s *priv)
 
   if (crc != ms58xx_crc(prom, crcindex, crcmask))
     {
-      sndbg("crc mismatch\n");
+      snerr("crc mismatch\n");
       return -ENODEV;
     }
 
@@ -620,14 +620,14 @@ static int ms58xx_reset(FAR struct ms58xx_dev_s *priv)
   int ret;
 
   regaddr = MS58XX_RESET_REG;
-  sndbg("addr: %02x\n", regaddr);
+  snerr("addr: %02x\n", regaddr);
 
   /* Write the register address */
 
   ret = ms58xx_i2c_write(priv, ®addr, sizeof(regaddr));
   if (ret < 0)
     {
-      sndbg("i2c_write failed: %d\n", ret);
+      snerr("i2c_write failed: %d\n", ret);
       return ret;
     }
 
@@ -636,7 +636,7 @@ static int ms58xx_reset(FAR struct ms58xx_dev_s *priv)
   ret = ms58xx_readprom(priv);
   if (ret < 0)
     {
-      sndbg("ms58xx_readprom failed: %d\n", ret);
+      snerr("ms58xx_readprom failed: %d\n", ret);
     }
 
   return ret;
@@ -656,14 +656,14 @@ static int ms58xx_convert(FAR struct ms58xx_dev_s *priv, uint8_t regaddr,
   int ret;
 
   regaddr |= priv->osr;
-  sndbg("addr: %02x\n", regaddr);
+  snerr("addr: %02x\n", regaddr);
 
   /* Write the register address */
 
   ret = ms58xx_i2c_write(priv, ®addr, sizeof(regaddr));
   if (ret < 0)
     {
-      sndbg("i2c_write failed: %d\n", ret);
+      snerr("i2c_write failed: %d\n", ret);
     }
 
   /* Wait for the conversion to end */
@@ -675,7 +675,7 @@ static int ms58xx_convert(FAR struct ms58xx_dev_s *priv, uint8_t regaddr,
   ret = ms58xx_readadc(priv, regval);
   if (ret < 0)
     {
-      sndbg("ms58xx_readadc failed: %d\n", ret);
+      snerr("ms58xx_readadc failed: %d\n", ret);
       return ret;
     }
 
@@ -714,14 +714,14 @@ static int ms58xx_measure(FAR struct ms58xx_dev_s *priv)
   ret = ms58xx_convert(priv, MS58XX_PRESS_REG, &rawpress);
   if (ret < 0)
     {
-      sndbg("ms58xx_convert failed: %d\n", ret);
+      snerr("ms58xx_convert failed: %d\n", ret);
       return ret;
     }
 
   ret = ms58xx_convert(priv, MS58XX_TEMP_REG, &rawtemp);
   if (ret < 0)
     {
-      sndbg("ms58xx_convert failed: %d\n", ret);
+      snerr("ms58xx_convert failed: %d\n", ret);
       return ret;
     }
 
@@ -923,7 +923,7 @@ static int ms58xx_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
           FAR int32_t *ptr = (FAR int32_t *)((uintptr_t)arg);
           DEBUGASSERT(ptr != NULL);
           *ptr = priv->temp;
-          sndbg("temp: %08x\n", *ptr);
+          snerr("temp: %08x\n", *ptr);
         }
         break;
 
@@ -934,7 +934,7 @@ static int ms58xx_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
           FAR int32_t *ptr = (FAR int32_t *)((uintptr_t)arg);
           DEBUGASSERT(ptr != NULL);
           *ptr = priv->press;
-          sndbg("press: %08x\n", *ptr);
+          snerr("press: %08x\n", *ptr);
         }
         break;
 
@@ -949,13 +949,13 @@ static int ms58xx_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case SNIOC_OVERSAMPLING:
         ret = ms58xx_setosr(priv, (uint16_t)arg);
-        sndbg("osr: %04x ret: %d\n", *(uint16_t *)arg, ret);
+        snerr("osr: %04x ret: %d\n", *(uint16_t *)arg, ret);
         break;
 
       /* Unrecognized commands */
 
       default:
-        sndbg("Unrecognized cmd: %d arg: %ld\n", cmd, arg);
+        snerr("Unrecognized cmd: %d arg: %ld\n", cmd, arg);
         ret = -ENOTTY;
         break;
     }
@@ -1010,7 +1010,7 @@ int ms58xx_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
   priv = (FAR struct ms58xx_dev_s *)kmm_malloc(sizeof(*priv));
   if (priv == NULL)
     {
-      sndbg("Failed to allocate instance\n");
+      snerr("Failed to allocate instance\n");
       return -ENOMEM;
     }
 
@@ -1177,14 +1177,14 @@ int ms58xx_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
   ret = ms58xx_setosr(priv, osr);
   if (ret < 0)
     {
-      sndbg("ms58xx_setosr failed: %d\n", ret);
+      snerr("ms58xx_setosr failed: %d\n", ret);
       goto err;
     }
 
   ret = ms58xx_reset(priv);
   if (ret < 0)
     {
-      sndbg("ms58xx_reset failed: %d\n", ret);
+      snerr("ms58xx_reset failed: %d\n", ret);
       goto err;
     }
 
@@ -1193,7 +1193,7 @@ int ms58xx_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
   ret = register_driver(devpath, &g_fops, 0666, priv);
   if (ret < 0)
     {
-      sndbg("Failed to register driver: %d\n", ret);
+      snerr("Failed to register driver: %d\n", ret);
       goto err;
     }
 
diff --git a/drivers/sensors/qencoder.c b/drivers/sensors/qencoder.c
index 69053bd357..1171ed472d 100644
--- a/drivers/sensors/qencoder.c
+++ b/drivers/sensors/qencoder.c
@@ -371,7 +371,7 @@ int qe_register(FAR const char *devpath, FAR struct qe_lowerhalf_s *lower)
   upper = (FAR struct qe_upperhalf_s *)kmm_zalloc(sizeof(struct qe_upperhalf_s));
   if (!upper)
     {
-      sndbg("Allocation failed\n");
+      snerr("Allocation failed\n");
       return -ENOMEM;
     }
 
diff --git a/drivers/sercomm/console.c b/drivers/sercomm/console.c
index 53b321964f..5936d2d5b3 100644
--- a/drivers/sercomm/console.c
+++ b/drivers/sercomm/console.c
@@ -187,7 +187,7 @@ int sercomm_register(FAR const char *path, FAR uart_dev_t *dev)
   sem_init(&dev->pollsem,  0, 1);
 #endif
 
-  dbg("Registering %s\n", path);
+  err("Registering %s\n", path);
   return register_driver(path, &g_sercom_console_ops, 0666, NULL);
 }
 
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index 2d8056e126..b643b2b604 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -1369,7 +1369,7 @@ int uart_register(FAR const char *path, FAR uart_dev_t *dev)
   sem_init(&dev->pollsem,  0, 1);
 #endif
 
-  dbg("Registering %s\n", path);
+  err("Registering %s\n", path);
   return register_driver(path, &g_serialops, 0666, dev);
 }
 
diff --git a/drivers/serial/uart_16550.c b/drivers/serial/uart_16550.c
index af730d6d27..2bbae910ad 100644
--- a/drivers/serial/uart_16550.c
+++ b/drivers/serial/uart_16550.c
@@ -848,7 +848,7 @@ static int u16550_interrupt(int irq, void *context)
 
           default:
             {
-              dbg("Unexpected IIR: %02x\n", status);
+              err("Unexpected IIR: %02x\n", status);
               break;
             }
         }
diff --git a/drivers/spi/spi_bitbang.c b/drivers/spi/spi_bitbang.c
index 75667fd135..e2bc8bcc42 100644
--- a/drivers/spi/spi_bitbang.c
+++ b/drivers/spi/spi_bitbang.c
@@ -89,14 +89,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg llerr
+#  define spierr llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -564,7 +564,7 @@ FAR struct spi_dev_s *spi_create_bitbang(FAR const struct spi_bitbang_ops_s *low
   priv = (FAR struct spi_bitbang_s *)zalloc(sizeof(struct spi_bitbang_s));
   if (!priv)
     {
-      spidbg("Failed to allocate the device structure\n");
+      spierr("Failed to allocate the device structure\n");
       return NULL;
     }
 
diff --git a/drivers/timers/cs2100-cp.c b/drivers/timers/cs2100-cp.c
index 11ed144cb4..40f5191cc5 100644
--- a/drivers/timers/cs2100-cp.c
+++ b/drivers/timers/cs2100-cp.c
@@ -66,33 +66,33 @@
 
 /* Debug ********************************************************************/
 
-#undef csdbg
+#undef cserr
 #ifdef CONFIG_CS2100CP_DEBUG
 #  ifdef CONFIG_CPP_HAVE_VARARGS
-#    define csdbg(format, ...)  dbg(format, ##__VA_ARGS__)
+#    define cserr(format, ...)  err(format, ##__VA_ARGS__)
 #  else
-#    define csdbg               dbg
+#    define cserr               err
 #  endif
 #else
 #  ifdef CONFIG_CPP_HAVE_VARARGS
-#    define csdbg(x...)
+#    define cserr(x...)
 #  else
-#    define csdbg               (void)
+#    define cserr               (void)
 #  endif
 #endif
 
-#undef regdbg
+#undef regerr
 #ifdef CONFIG_CS2100CP_REGDEBUG
 #  ifdef CONFIG_CPP_HAVE_VARARGS
-#    define regdbg(format, ...) dbg(format, ##__VA_ARGS__)
+#    define regerr(format, ...) err(format, ##__VA_ARGS__)
 #  else
-#    define regdbg              dbg
+#    define regerr              err
 #  endif
 #else
 #  ifdef CONFIG_CPP_HAVE_VARARGS
-#    define regdbg(x...)
+#    define regerr(x...)
 #  else
-#    define regdbg              (void)
+#    define regerr              (void)
 #  endif
 #endif
 
@@ -129,7 +129,7 @@ static int cs2100_write_reg(FAR const struct cs2100_config_s *config,
 {
   struct i2c_msg_s msgs[2];
 
-  regdbg("%02x<-%02x\n", regaddr, regval);
+  regerr("%02x<-%02x\n", regaddr, regval);
   DEBUGASSERT(config->i2c->ops && config->i2c->ops->transfer);
 
   /* Construct the I2C message (write N+1 bytes with no restart) */
@@ -200,7 +200,7 @@ static int cs2100_read_reg(FAR const struct cs2100_config_s *config,
       ret = I2C_TRANSFER(config->i2c, &msg, 1);
       if (ret == OK)
         {
-          regdbg("%02x->%02x\n", regaddr, *regval);
+          regerr("%02x->%02x\n", regaddr, *regval);
         }
     }
 
@@ -229,7 +229,7 @@ static int cs2100_write_ratio(FAR const struct cs2100_config_s *config,
   struct i2c_msg_s msg;
   uint8_t buffer[5];
 
-  regdbg("%02x<-%04l\n", CS2100_RATIO0, (unsigned long)ratio);
+  regerr("%02x<-%04l\n", CS2100_RATIO0, (unsigned long)ratio);
   DEBUGASSERT(config->i2c->ops && config->i2c->ops->transfer);
 
   /* Construct the I2C message (write N+1 bytes with no restart) */
@@ -310,7 +310,7 @@ static int cs2100_read_ratio(FAR const struct cs2100_config_s *config,
                     ((uint32_t)buffer[2] << 8) |
                      (uint32_t)buffer[0];
 
-           regdbg("%02x->%04l\n", CS2100_RATIO0, (unsigned long)*ratio);
+           regerr("%02x->%04l\n", CS2100_RATIO0, (unsigned long)*ratio);
         }
     }
 
@@ -356,7 +356,7 @@ static int cs2100_refclk(FAR const struct cs2100_config_s *config)
     }
   else
     {
-      csdbg("ERROR: reflck too large: %ul\n", (unsigned long)config->refclk);
+      cserr("ERROR: reflck too large: %ul\n", (unsigned long)config->refclk);
       return -EINVAL;
     }
 
@@ -370,7 +370,7 @@ static int cs2100_refclk(FAR const struct cs2100_config_s *config)
   ret = cs2100_write_reg(config, CS2100_FNCCFG1, regval);
   if (ret < 0)
     {
-      csdbg("ERROR: Failed to set CS2100_FNCCFG1: %d\n", ret);
+      cserr("ERROR: Failed to set CS2100_FNCCFG1: %d\n", ret);
       return ret;
     }
 
@@ -414,7 +414,7 @@ static int cs2100_refclk(FAR const struct cs2100_config_s *config)
   ret = cs2100_write_reg(config, CS2100_FNCCFG3, regval);
   if (ret < 0)
     {
-      csdbg("ERROR: Failed to set CS2100_FNCCFG3: %d\n", ret);
+      cserr("ERROR: Failed to set CS2100_FNCCFG3: %d\n", ret);
       return ret;
     }
 
@@ -426,7 +426,7 @@ static int cs2100_refclk(FAR const struct cs2100_config_s *config)
   ret = cs2100_write_reg(config, CS2100_FNCCFG2, CS2100_FNCCFG2_CLKOUTUNL);
   if (ret < 0)
     {
-      csdbg("ERROR: Failed to set CS2100_FNCCFG2: %d\n", ret);
+      cserr("ERROR: Failed to set CS2100_FNCCFG2: %d\n", ret);
     }
 
   return ret;
@@ -554,7 +554,7 @@ static int cs2100_ratio(FAR const struct cs2100_config_s *config)
     }
   else
     {
-      csdbg("ERROR: Ratio too large: %08llx\n", rudb24);
+      cserr("ERROR: Ratio too large: %08llx\n", rudb24);
       return -E2BIG;
     }
 
@@ -563,7 +563,7 @@ static int cs2100_ratio(FAR const struct cs2100_config_s *config)
   ret = cs2100_write_ratio(config, rud);
   if (ret < 0)
     {
-      csdbg("ERROR: Failed to set ratio: %d\n", ret);
+      cserr("ERROR: Failed to set ratio: %d\n", ret);
       return ret;
     }
 
@@ -576,7 +576,7 @@ static int cs2100_ratio(FAR const struct cs2100_config_s *config)
   ret    = cs2100_write_reg(config, CS2100_DEVCFG1, regval);
   if (ret < 0)
     {
-      csdbg("ERROR: Failed to set CS2100_DEVCFG1: %d\n", ret);
+      cserr("ERROR: Failed to set CS2100_DEVCFG1: %d\n", ret);
       return ret;
     }
 
@@ -628,7 +628,7 @@ int cs2100_enable(FAR const struct cs2100_config_s *config)
   ret = cs2100_write_reg(config, CS2100_DEVCTL, regval);
   if (ret < 0)
     {
-      csdbg("ERROR: Failed to set CS2100_DEVCTL: %d\n", ret);
+      cserr("ERROR: Failed to set CS2100_DEVCTL: %d\n", ret);
       return ret;
     }
 
@@ -637,7 +637,7 @@ int cs2100_enable(FAR const struct cs2100_config_s *config)
   ret = cs2100_refclk(config);
   if (ret < 0)
     {
-      csdbg("ERROR: cs2100_refclk failed: %d\n", ret);
+      cserr("ERROR: cs2100_refclk failed: %d\n", ret);
       return ret;
     }
 
@@ -649,7 +649,7 @@ int cs2100_enable(FAR const struct cs2100_config_s *config)
   ret = cs2100_write_reg(config, CS2100_GBLCFG, CS2100_GBLCFG_FREEZE);
   if (ret < 0)
     {
-      csdbg("ERROR: Failed to set CS2100_GBLCFG: %d\n", ret);
+      cserr("ERROR: Failed to set CS2100_GBLCFG: %d\n", ret);
       return ret;
     }
 
@@ -658,7 +658,7 @@ int cs2100_enable(FAR const struct cs2100_config_s *config)
   ret = cs2100_ratio(config);
   if (ret < 0)
     {
-      csdbg("ERROR: cs2100_ratio failed: %d\n", ret);
+      cserr("ERROR: cs2100_ratio failed: %d\n", ret);
       return ret;
     }
 
@@ -667,7 +667,7 @@ int cs2100_enable(FAR const struct cs2100_config_s *config)
   ret = cs2100_write_reg(config, CS2100_GBLCFG, CS2100_GBLCFG_ENDEVCFG2);
   if (ret < 0)
     {
-      csdbg("ERROR: Failed to set CS2100_GBLCFG: %d\n", ret);
+      cserr("ERROR: Failed to set CS2100_GBLCFG: %d\n", ret);
       return ret;
     }
 
@@ -677,7 +677,7 @@ int cs2100_enable(FAR const struct cs2100_config_s *config)
   ret = cs2100_write_reg(config, CS2100_DEVCTL, regval);
   if (ret < 0)
     {
-      csdbg("ERROR: Failed to set CS2100_DEVCTL: %d\n", ret);
+      cserr("ERROR: Failed to set CS2100_DEVCTL: %d\n", ret);
     }
 
   return ret;
@@ -709,7 +709,7 @@ int cs2100_disable(FAR const struct cs2100_config_s *config)
   ret = cs2100_write_reg(config, CS2100_DEVCTL, regval);
   if (ret < 0)
     {
-      csdbg("ERROR: Failed to set CS2100_DEVCTL: %d\n", ret);
+      cserr("ERROR: Failed to set CS2100_DEVCTL: %d\n", ret);
       return ret;
     }
 
@@ -718,7 +718,7 @@ int cs2100_disable(FAR const struct cs2100_config_s *config)
   ret = cs2100_write_reg(config, CS2100_GBLCFG, 0);
   if (ret < 0)
     {
-      csdbg("ERROR: Failed to set CS2100_GBLCFG: %d\n", ret);
+      cserr("ERROR: Failed to set CS2100_GBLCFG: %d\n", ret);
       return ret;
     }
 
@@ -727,7 +727,7 @@ int cs2100_disable(FAR const struct cs2100_config_s *config)
   ret = cs2100_write_reg(config, CS2100_DEVCFG1, 0);
   if (ret < 0)
     {
-      csdbg("ERROR: Failed to set CS2100_DEVCFG1: %d\n", ret);
+      cserr("ERROR: Failed to set CS2100_DEVCFG1: %d\n", ret);
       return ret;
     }
 
@@ -737,7 +737,7 @@ int cs2100_disable(FAR const struct cs2100_config_s *config)
   ret = cs2100_write_reg(config, CS2100_DEVCTL, regval);
   if (ret < 0)
     {
-      csdbg("ERROR: Failed to set CS2100_DEVCTL: %d\n", ret);
+      cserr("ERROR: Failed to set CS2100_DEVCTL: %d\n", ret);
     }
 
   return ret;
@@ -764,79 +764,79 @@ int cs2100_dump(FAR const struct cs2100_config_s *config)
   uint8_t regval;
   int ret;
 
-  dbg("CS200-CP Registers:\n");
+  err("CS200-CP Registers:\n");
 
   ret = cs2100_read_reg(config, CS2100_DEVID, ®val);
   if (ret < 0)
     {
-      csdbg("ERROR: Failed to read CS2100_DEVID: %d\n", ret);
+      cserr("ERROR: Failed to read CS2100_DEVID: %d\n", ret);
       return ret;
     }
 
-  dbg("     Devid: %02x\n", regval);
+  err("     Devid: %02x\n", regval);
 
   ret = cs2100_read_reg(config, CS2100_DEVCTL, ®val);
   if (ret < 0)
     {
-      csdbg("ERROR: Failed to read CS2100_DEVCTL: %d\n", ret);
+      cserr("ERROR: Failed to read CS2100_DEVCTL: %d\n", ret);
       return ret;
     }
 
-  dbg("    DevCtl: %02x\n", regval);
+  err("    DevCtl: %02x\n", regval);
 
   ret = cs2100_read_reg(config, CS2100_DEVCFG1, ®val);
   if (ret < 0)
     {
-      csdbg("ERROR: Failed to read CS2100_DEVCFG1: %d\n", ret);
+      cserr("ERROR: Failed to read CS2100_DEVCFG1: %d\n", ret);
       return ret;
     }
 
-  dbg("   DevCfg1: %02x\n", regval);
+  err("   DevCfg1: %02x\n", regval);
 
   ret = cs2100_read_reg(config, CS2100_GBLCFG, ®val);
   if (ret < 0)
     {
-      csdbg("ERROR: Failed to read CS2100_GBLCFG: %d\n", ret);
+      cserr("ERROR: Failed to read CS2100_GBLCFG: %d\n", ret);
       return ret;
     }
 
-  dbg("    GblCfg: %02x\n", regval);
+  err("    GblCfg: %02x\n", regval);
 
   ret = cs2100_read_ratio(config, &ratio);
   if (ret < 0)
     {
-      csdbg("ERROR: cs2100_read_ratio failed: %d\n", ret);
+      cserr("ERROR: cs2100_read_ratio failed: %d\n", ret);
       return ret;
     }
 
-  dbg("     Ratio: %04lx\n", (unsigned long)ratio);
+  err("     Ratio: %04lx\n", (unsigned long)ratio);
 
   ret = cs2100_read_reg(config, CS2100_FNCCFG1, ®val);
   if (ret < 0)
     {
-      csdbg("ERROR: Failed to read CS2100_FNCCFG1: %d\n", ret);
+      cserr("ERROR: Failed to read CS2100_FNCCFG1: %d\n", ret);
       return ret;
     }
 
-  dbg("  FuncCfg1: %02x\n", regval);
+  err("  FuncCfg1: %02x\n", regval);
 
   ret = cs2100_read_reg(config, CS2100_FNCCFG2, ®val);
   if (ret < 0)
     {
-      csdbg("ERROR: Failed to read CS2100_FNCCFG2: %d\n", ret);
+      cserr("ERROR: Failed to read CS2100_FNCCFG2: %d\n", ret);
       return ret;
     }
 
-  dbg("  FuncCfg2: %02x\n", regval);
+  err("  FuncCfg2: %02x\n", regval);
 
   ret = cs2100_read_reg(config, CS2100_FNCCFG3, ®val);
   if (ret < 0)
     {
-      csdbg("ERROR: Failed to read CS2100_FNCCFG3: %d\n", ret);
+      cserr("ERROR: Failed to read CS2100_FNCCFG3: %d\n", ret);
       return ret;
     }
 
-  dbg("  FuncCfg3: %02x\n", regval);
+  err("  FuncCfg3: %02x\n", regval);
   return OK;
 }
 
diff --git a/drivers/timers/ds3231.c b/drivers/timers/ds3231.c
index 8dbed20dec..f8cd2c6189 100644
--- a/drivers/timers/ds3231.c
+++ b/drivers/timers/ds3231.c
@@ -84,12 +84,12 @@
 /* Debug ****************************************************************************/
 
 #ifdef CONFIG_DEBUG_RTC
-#  define rtcdbg    dbg
+#  define rtcerr    err
 #  define rtcinfo   info
 #  define rtcllerr  llerr
 #  define rtcllinfo llinfo
 #else
-#  define rtcdbg(x...)
+#  define rtcerr(x...)
 #  define rtcinfo(x...)
 #  define rtcllerr(x...)
 #  define rtcllinfo(x...)
@@ -339,7 +339,7 @@ int up_rtc_getdatetime(FAR struct tm *tp)
       ret = I2C_TRANSFER(g_ds3231.i2c, msg, 4);
       if (ret < 0)
         {
-          rtcdbg("ERROR: I2C_TRANSFER failed: %d\n", ret)
+          rtcerr("ERROR: I2C_TRANSFER failed: %d\n", ret)
           return ret;
         }
     }
@@ -448,13 +448,13 @@ int up_rtc_settime(FAR const struct timespec *tp)
  #ifdef CONFIG_LIBC_LOCALTIME
    if (localtime_r(&newtime, &newtm) == NULL)
      {
-       rtcdbg("ERROR: localtime_r failed\n")
+       rtcerr("ERROR: localtime_r failed\n")
        return -EINVAL;
      }
 #else
    if (gmtime_r(&newtime, &newtm) == NULL)
      {
-       rtcdbg("ERROR: gmtime_r failed\n")
+       rtcerr("ERROR: gmtime_r failed\n")
        return -EINVAL;
      }
 #endif
@@ -554,7 +554,7 @@ int up_rtc_settime(FAR const struct timespec *tp)
       ret = I2C_TRANSFER(g_ds3231.i2c, msg, 3);
       if (ret < 0)
         {
-          rtcdbg("ERROR: I2C_TRANSFER failed: %d\n", ret)
+          rtcerr("ERROR: I2C_TRANSFER failed: %d\n", ret)
           return ret;
         }
     }
diff --git a/drivers/timers/pcf85263.c b/drivers/timers/pcf85263.c
index 7a9f22145f..a72b534e8c 100644
--- a/drivers/timers/pcf85263.c
+++ b/drivers/timers/pcf85263.c
@@ -84,12 +84,12 @@
 /* Debug ****************************************************************************/
 
 #ifdef CONFIG_DEBUG_RTC
-#  define rtcdbg    dbg
+#  define rtcerr    err
 #  define rtcinfo   info
 #  define rtcllerr  llerr
 #  define rtcllinfo llinfo
 #else
-#  define rtcdbg(x...)
+#  define rtcerr(x...)
 #  define rtcinfo(x...)
 #  define rtcllerr(x...)
 #  define rtcllinfo(x...)
@@ -338,7 +338,7 @@ int up_rtc_getdatetime(FAR struct tm *tp)
       ret = I2C_TRANSFER(g_pcf85263.i2c, msg, 4);
       if (ret < 0)
         {
-          rtcdbg("ERROR: I2C_TRANSFER failed: %d\n", ret)
+          rtcerr("ERROR: I2C_TRANSFER failed: %d\n", ret)
           return ret;
         }
     }
@@ -431,13 +431,13 @@ int up_rtc_settime(FAR const struct timespec *tp)
  #ifdef CONFIG_LIBC_LOCALTIME
    if (localtime_r(&newtime, &newtm) == NULL)
      {
-       rtcdbg("ERROR: localtime_r failed\n")
+       rtcerr("ERROR: localtime_r failed\n")
        return -EINVAL;
      }
 #else
    if (gmtime_r(&newtime, &newtm) == NULL)
      {
-       rtcdbg("ERROR: gmtime_r failed\n")
+       rtcerr("ERROR: gmtime_r failed\n")
        return -EINVAL;
      }
 #endif
@@ -518,7 +518,7 @@ int up_rtc_settime(FAR const struct timespec *tp)
       ret = I2C_TRANSFER(g_pcf85263.i2c, msg, 3);
       if (ret < 0)
         {
-          rtcdbg("ERROR: I2C_TRANSFER failed: %d\n", ret)
+          rtcerr("ERROR: I2C_TRANSFER failed: %d\n", ret)
           return ret;
         }
     }
diff --git a/drivers/timers/timer.c b/drivers/timers/timer.c
index ead1d4d905..6db72e795f 100644
--- a/drivers/timers/timer.c
+++ b/drivers/timers/timer.c
@@ -64,12 +64,12 @@
 /* Non-standard debug that may be enabled just for testing the timer driver */
 
 #ifdef CONFIG_DEBUG_TIMER
-#  define tmrdbg    dbg
+#  define tmrerr    err
 #  define tmrinfo   info
 #  define tmrllerr  llerr
 #  define tmrllinfo llinfo
 #else
-#  define tmrdbg(x...)
+#  define tmrerr(x...)
 #  define tmrinfo(x...)
 #  define tmrllerr(x...)
 #  define tmrllinfo(x...)
@@ -451,7 +451,7 @@ FAR void *timer_register(FAR const char *path,
     kmm_zalloc(sizeof(struct timer_upperhalf_s));
   if (!upper)
     {
-      tmrdbg("Upper half allocation failed\n");
+      tmrerr("Upper half allocation failed\n");
       goto errout;
     }
 
@@ -466,7 +466,7 @@ FAR void *timer_register(FAR const char *path,
   upper->path = strdup(path);
   if (!upper->path)
     {
-      tmrdbg("Path allocation failed\n");
+      tmrerr("Path allocation failed\n");
       goto errout_with_upper;
     }
 
@@ -475,7 +475,7 @@ FAR void *timer_register(FAR const char *path,
   ret = register_driver(path, &g_timerops, 0666, upper);
   if (ret < 0)
     {
-      tmrdbg("register_driver failed: %d\n", ret);
+      tmrerr("register_driver failed: %d\n", ret);
       goto errout_with_path;
     }
 
diff --git a/drivers/timers/watchdog.c b/drivers/timers/watchdog.c
index 3f73efd2fe..13b23efd51 100644
--- a/drivers/timers/watchdog.c
+++ b/drivers/timers/watchdog.c
@@ -63,12 +63,12 @@
 /* Non-standard debug that may be enabled just for testing the watchdog driver */
 
 #ifdef CONFIG_DEBUG_WATCHDOG
-#  define wddbg    dbg
+#  define wderr    err
 #  define wdinfo   info
 #  define wdllerr  llerr
 #  define wdllinfo llinfo
 #else
-#  define wddbg(x...)
+#  define wderr(x...)
 #  define wdinfo(x...)
 #  define wdllerr(x...)
 #  define wdllinfo(x...)
@@ -486,7 +486,7 @@ FAR void *watchdog_register(FAR const char *path,
     kmm_zalloc(sizeof(struct watchdog_upperhalf_s));
   if (!upper)
     {
-      wddbg("Upper half allocation failed\n");
+      wderr("Upper half allocation failed\n");
       goto errout;
     }
 
@@ -502,7 +502,7 @@ FAR void *watchdog_register(FAR const char *path,
   upper->path = strdup(path);
   if (!upper->path)
     {
-      wddbg("Path allocation failed\n");
+      wderr("Path allocation failed\n");
       goto errout_with_upper;
     }
 
@@ -511,7 +511,7 @@ FAR void *watchdog_register(FAR const char *path,
   ret = register_driver(path, &g_wdogops, 0666, upper);
   if (ret < 0)
     {
-      wddbg("register_driver failed: %d\n", ret);
+      wderr("register_driver failed: %d\n", ret);
       goto errout_with_path;
     }
 
diff --git a/drivers/usbhost/usbhost_cdcacm.c b/drivers/usbhost/usbhost_cdcacm.c
index 6b7ef9d020..336d9e639b 100644
--- a/drivers/usbhost/usbhost_cdcacm.c
+++ b/drivers/usbhost/usbhost_cdcacm.c
@@ -687,7 +687,7 @@ static int usbhost_linecoding_send(FAR struct usbhost_cdcacm_s *priv)
   ret = DRVR_CTRLOUT(hport->drvr, hport->ep0, ctrlreq, priv->linecode);
   if (ret < 0)
     {
-      udbg("ERROR: DRVR_CTRLOUT failed: %d\n", ret);
+      uerr("ERROR: DRVR_CTRLOUT failed: %d\n", ret);
     }
 
   return ret;
@@ -777,7 +777,7 @@ static void usbhost_notification_work(FAR void *arg)
                         priv);
       if (ret < 0)
         {
-          udbg("ERROR: DRVR_ASYNCH failed: %d\n", ret);
+          uerr("ERROR: DRVR_ASYNCH failed: %d\n", ret);
         }
     }
 }
@@ -837,7 +837,7 @@ static void usbhost_notification_callback(FAR void *arg, ssize_t nbytes)
           if (nbytes != -EAGAIN)
 #endif
             {
-              udbg("ERROR: Transfer failed: %d\n", nbytes);
+              uerr("ERROR: Transfer failed: %d\n", nbytes);
             }
 
           /* We don't know the nature of the failure, but we need to do all
@@ -961,7 +961,7 @@ static void usbhost_txdata_work(FAR void *arg)
            * the device is disconnected).
            */
 
-          udbg("ERROR: DRVR_TRANSFER for packet failed: %d\n", (int)nwritten);
+          uerr("ERROR: DRVR_TRANSFER for packet failed: %d\n", (int)nwritten);
           break;
         }
     }
@@ -986,7 +986,7 @@ static void usbhost_txdata_work(FAR void *arg)
            * NAK'ed our packet.
            */
 
-          udbg("ERROR: DRVR_TRANSFER for ZLP failed: %d\n", (int)nwritten);
+          uerr("ERROR: DRVR_TRANSFER for ZLP failed: %d\n", (int)nwritten);
         }
     }
 
@@ -1099,7 +1099,7 @@ static void usbhost_rxdata_work(FAR void *arg)
                * device was not disconnected.
                */
 
-              udbg("ERROR: DRVR_TRANSFER for packet failed: %d\n", (int)nread);
+              uerr("ERROR: DRVR_TRANSFER for packet failed: %d\n", (int)nread);
               break;
             }
 
@@ -1559,7 +1559,7 @@ static int usbhost_cfgdesc(FAR struct usbhost_cdcacm_s *priv,
 
   if ((found & USBHOST_MINFOUND) != USBHOST_MINFOUND)
     {
-      udbg("ERROR: Found DATA IF:%s BULK IN:%s BULK OUT:%s\n",
+      uerr("ERROR: Found DATA IF:%s BULK IN:%s BULK OUT:%s\n",
            (found & USBHOST_DATAIF_FOUND)  != 0  ? "YES" : "NO",
            (found & USBHOST_BULKIN_FOUND)  != 0 ? "YES" : "NO",
            (found & USBHOST_BULKOUT_FOUND) != 0 ? "YES" : "NO");
@@ -1571,14 +1571,14 @@ static int usbhost_cfgdesc(FAR struct usbhost_cdcacm_s *priv,
   ret = DRVR_EPALLOC(hport->drvr, &boutdesc, &priv->bulkout);
   if (ret < 0)
     {
-      udbg("ERROR: Failed to allocate Bulk OUT endpoint\n");
+      uerr("ERROR: Failed to allocate Bulk OUT endpoint\n");
       return ret;
     }
 
   ret = DRVR_EPALLOC(hport->drvr, &bindesc, &priv->bulkin);
   if (ret < 0)
     {
-      udbg("ERROR: Failed to allocate Bulk IN endpoint\n");
+      uerr("ERROR: Failed to allocate Bulk IN endpoint\n");
       (void)DRVR_EPFREE(hport->drvr, priv->bulkout);
       return ret;
     }
@@ -1591,7 +1591,7 @@ static int usbhost_cfgdesc(FAR struct usbhost_cdcacm_s *priv,
       ret = DRVR_EPALLOC(hport->drvr, &iindesc, &priv->intin);
       if (ret < 0)
         {
-          udbg("ERROR: Failed to allocate Interrupt IN endpoint\n");
+          uerr("ERROR: Failed to allocate Interrupt IN endpoint\n");
           priv->intin = NULL;
         }
     }
@@ -1715,7 +1715,7 @@ static int usbhost_alloc_buffers(FAR struct usbhost_cdcacm_s *priv)
   ret = DRVR_ALLOC(hport->drvr, (FAR uint8_t **)&priv->ctrlreq, &maxlen);
   if (ret < 0)
     {
-      udbg("ERROR: DRVR_ALLOC of ctrlreq failed: %d\n", ret);
+      uerr("ERROR: DRVR_ALLOC of ctrlreq failed: %d\n", ret);
       goto errout;
     }
 
@@ -1727,7 +1727,7 @@ static int usbhost_alloc_buffers(FAR struct usbhost_cdcacm_s *priv)
                      sizeof(struct cdc_linecoding_s));
   if (ret < 0)
     {
-      udbg("ERROR: DRVR_IOALLOC of line coding failed: %d (%d bytes)\n",
+      uerr("ERROR: DRVR_IOALLOC of line coding failed: %d (%d bytes)\n",
            ret, sizeof(struct cdc_linecoding_s));
       goto errout;
     }
@@ -1740,7 +1740,7 @@ static int usbhost_alloc_buffers(FAR struct usbhost_cdcacm_s *priv)
       ret = DRVR_IOALLOC(hport->drvr, &priv->notification, MAX_NOTIFICATION);
       if (ret < 0)
         {
-          udbg("ERROR: DRVR_IOALLOC of line status failed: %d (%d bytes)\n",
+          uerr("ERROR: DRVR_IOALLOC of line status failed: %d (%d bytes)\n",
                ret, MAX_NOTIFICATION);
           goto errout;
         }
@@ -1756,7 +1756,7 @@ static int usbhost_alloc_buffers(FAR struct usbhost_cdcacm_s *priv)
   ret = DRVR_IOALLOC(hport->drvr, &priv->inbuf, priv->pktsize);
   if (ret < 0)
     {
-      udbg("ERROR: DRVR_IOALLOC of Bulk IN buffer failed: %d (%d bytes)\n",
+      uerr("ERROR: DRVR_IOALLOC of Bulk IN buffer failed: %d (%d bytes)\n",
            ret, priv->pktsize);
       goto errout;
     }
@@ -1766,7 +1766,7 @@ static int usbhost_alloc_buffers(FAR struct usbhost_cdcacm_s *priv)
   ret = DRVR_IOALLOC(hport->drvr, &priv->outbuf, priv->pktsize);
   if (ret < 0)
     {
-      udbg("ERROR: DRVR_IOALLOC of Bulk OUT buffer failed: %d (%d bytes)\n",
+      uerr("ERROR: DRVR_IOALLOC of Bulk OUT buffer failed: %d (%d bytes)\n",
            ret, priv->pktsize);
       goto errout;
     }
@@ -2002,7 +2002,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass,
   ret = usbhost_cfgdesc(priv, configdesc, desclen);
   if (ret < 0)
     {
-      udbg("usbhost_cfgdesc() failed: %d\n", ret);
+      uerr("usbhost_cfgdesc() failed: %d\n", ret);
       goto errout;
     }
 
@@ -2011,7 +2011,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass,
   ret = usbhost_alloc_buffers(priv);
   if (ret < 0)
     {
-      udbg("ERROR: Failed to allocate transfer buffer\n");
+      uerr("ERROR: Failed to allocate transfer buffer\n");
       goto errout;
     }
 
@@ -2021,7 +2021,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass,
   ret = usbhost_linecoding_send(priv);
   if (ret < 0)
     {
-      udbg("usbhost_linecoding_send() failed: %d\n", ret);
+      uerr("usbhost_linecoding_send() failed: %d\n", ret);
     }
 #endif
 
@@ -2034,7 +2034,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass,
   ret = uart_register(devname, &priv->uartdev);
   if (ret < 0)
     {
-      udbg("uart_register() failed: %d\n", ret);
+      uerr("uart_register() failed: %d\n", ret);
       goto errout;
     }
 
@@ -2052,7 +2052,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass,
                         priv);
       if (ret < 0)
         {
-          udbg("ERROR: DRVR_ASYNCH failed: %d\n", ret);
+          uerr("ERROR: DRVR_ASYNCH failed: %d\n", ret);
         }
     }
 #endif
@@ -2128,13 +2128,13 @@ static int usbhost_disconnected(struct usbhost_class_s *usbclass)
   ret = DRVR_CANCEL(hport->drvr, priv->bulkin);
   if (ret < 0)
     {
-     udbg("ERROR: Bulk IN DRVR_CANCEL failed: %d\n", ret);
+     uerr("ERROR: Bulk IN DRVR_CANCEL failed: %d\n", ret);
     }
 
   ret = DRVR_CANCEL(hport->drvr, priv->bulkout);
   if (ret < 0)
     {
-     udbg("ERROR: Bulk OUT DRVR_CANCEL failed: %d\n", ret);
+     uerr("ERROR: Bulk OUT DRVR_CANCEL failed: %d\n", ret);
     }
 
 #ifdef HAVE_INTIN_ENDPOINT
@@ -2145,7 +2145,7 @@ static int usbhost_disconnected(struct usbhost_class_s *usbclass)
       int ret = DRVR_CANCEL(hport->drvr, priv->intin);
       if (ret < 0)
         {
-         udbg("ERROR: Interrupt IN DRVR_CANCEL failed: %d\n", ret);
+         uerr("ERROR: Interrupt IN DRVR_CANCEL failed: %d\n", ret);
         }
     }
 #endif
diff --git a/drivers/usbhost/usbhost_devaddr.c b/drivers/usbhost/usbhost_devaddr.c
index e26513c540..58fbe04297 100644
--- a/drivers/usbhost/usbhost_devaddr.c
+++ b/drivers/usbhost/usbhost_devaddr.c
@@ -296,7 +296,7 @@ int usbhost_devaddr_create(FAR struct usbhost_hubport_s *hport)
 
   if (devaddr < 0)
     {
-      udbg("ERROR: Failed to allocate a device address\n");
+      uerr("ERROR: Failed to allocate a device address\n");
     }
 
   return devaddr;
diff --git a/drivers/usbhost/usbhost_enumerate.c b/drivers/usbhost/usbhost_enumerate.c
index 0bb30d961b..f3f3579e90 100644
--- a/drivers/usbhost/usbhost_enumerate.c
+++ b/drivers/usbhost/usbhost_enumerate.c
@@ -256,7 +256,7 @@ static inline int usbhost_classbind(FAR struct usbhost_hubport_s *hport,
                * should then free the allocated devclass instance.
                */
 
-              udbg("CLASS_CONNECT failed: %d\n", ret);
+              uerr("CLASS_CONNECT failed: %d\n", ret);
               CLASS_DISCONNECTED(devclass);
             }
           else
@@ -326,14 +326,14 @@ int usbhost_enumerate(FAR struct usbhost_hubport_s *hport,
   ret = DRVR_ALLOC(hport->drvr, (FAR uint8_t **)&ctrlreq, &maxlen);
   if (ret < 0)
     {
-      udbg("DRVR_ALLOC failed: %d\n", ret);
+      uerr("DRVR_ALLOC failed: %d\n", ret);
       return ret;
     }
 
   ret = DRVR_ALLOC(hport->drvr, &buffer, &maxlen);
   if (ret < 0)
     {
-      udbg("DRVR_ALLOC failed: %d\n", ret);
+      uerr("DRVR_ALLOC failed: %d\n", ret);
       goto errout;
     }
 
@@ -381,7 +381,7 @@ int usbhost_enumerate(FAR struct usbhost_hubport_s *hport,
   ret = DRVR_CTRLIN(hport->drvr, hport->ep0, ctrlreq, buffer);
   if (ret < 0)
     {
-      udbg("ERROR: Failed to get device descriptor, length=%d: %d\n",
+      uerr("ERROR: Failed to get device descriptor, length=%d: %d\n",
            descsize, ret);
       goto errout;
     }
@@ -409,7 +409,7 @@ int usbhost_enumerate(FAR struct usbhost_hubport_s *hport,
       ret = DRVR_CTRLIN(hport->drvr, hport->ep0, ctrlreq, buffer);
       if (ret < 0)
         {
-          udbg("ERROR: Failed to get device descriptor, length=%d: %d\n",
+          uerr("ERROR: Failed to get device descriptor, length=%d: %d\n",
                USB_SIZEOF_DEVDESC, ret);
           goto errout;
         }
@@ -428,7 +428,7 @@ int usbhost_enumerate(FAR struct usbhost_hubport_s *hport,
   funcaddr = usbhost_devaddr_create(hport);
   if (funcaddr < 0)
     {
-      udbg("ERROR: usbhost_devaddr_create failed: %d\n", ret);
+      uerr("ERROR: usbhost_devaddr_create failed: %d\n", ret);
       goto errout;
     }
 
@@ -443,7 +443,7 @@ int usbhost_enumerate(FAR struct usbhost_hubport_s *hport,
   ret = DRVR_CTRLOUT(hport->drvr, hport->ep0, ctrlreq, NULL);
   if (ret < 0)
     {
-      udbg("ERROR: Failed to set address: %d\n");
+      uerr("ERROR: Failed to set address: %d\n");
       goto errout;
     }
 
@@ -473,7 +473,7 @@ int usbhost_enumerate(FAR struct usbhost_hubport_s *hport,
   ret = DRVR_CTRLIN(hport->drvr, hport->ep0, ctrlreq, buffer);
   if (ret < 0)
    {
-      udbg("ERROR: Failed to get configuration descriptor, length=%d: %d\n",
+      uerr("ERROR: Failed to get configuration descriptor, length=%d: %d\n",
            USB_SIZEOF_CFGDESC, ret);
       goto errout;
     }
@@ -496,7 +496,7 @@ int usbhost_enumerate(FAR struct usbhost_hubport_s *hport,
   ret = DRVR_CTRLIN(hport->drvr, hport->ep0, ctrlreq, buffer);
   if (ret < 0)
     {
-      udbg("ERROR: Failed to get configuration descriptor, length=%d: %d\n",
+      uerr("ERROR: Failed to get configuration descriptor, length=%d: %d\n",
            cfglen, ret);
       goto errout;
     }
@@ -512,7 +512,7 @@ int usbhost_enumerate(FAR struct usbhost_hubport_s *hport,
   ret = DRVR_CTRLOUT(hport->drvr, hport->ep0, ctrlreq, NULL);
   if (ret < 0)
     {
-      udbg("ERROR: Failed to set configuration: %d\n", ret);
+      uerr("ERROR: Failed to set configuration: %d\n", ret);
       goto errout;
     }
 
@@ -530,7 +530,7 @@ int usbhost_enumerate(FAR struct usbhost_hubport_s *hport,
       ret = usbhost_configdesc(buffer, cfglen, &id);
       if (ret < 0)
         {
-          udbg("ERROR: usbhost_configdesc failed: %d\n", ret);
+          uerr("ERROR: usbhost_configdesc failed: %d\n", ret);
           goto errout;
         }
     }
@@ -547,7 +547,7 @@ int usbhost_enumerate(FAR struct usbhost_hubport_s *hport,
   ret = usbhost_classbind(hport, buffer, cfglen, &id, devclass);
   if (ret < 0)
     {
-      udbg("ERROR: usbhost_classbind failed %d\n", ret);
+      uerr("ERROR: usbhost_classbind failed %d\n", ret);
     }
 
 errout:
diff --git a/drivers/usbhost/usbhost_hidkbd.c b/drivers/usbhost/usbhost_hidkbd.c
index 5d2a54e48a..910438680c 100644
--- a/drivers/usbhost/usbhost_hidkbd.c
+++ b/drivers/usbhost/usbhost_hidkbd.c
@@ -176,8 +176,8 @@
  */
 
 #ifndef CONFIG_DEBUG_INPUT
-#  undef  idbg
-#  define idbg    udbg
+#  undef  ierr
+#  define ierr    uerr
 #  undef  illerr
 #  define illerr  ullerr
 #  undef  iinfo
@@ -1082,12 +1082,12 @@ static int usbhost_kbdpoll(int argc, char *argv[])
       if (ret < 0)
         {
           nerrors++;
-          udbg("ERROR: GETREPORT/INPUT, DRVR_CTRLIN returned: %d/%d\n",
+          uerr("ERROR: GETREPORT/INPUT, DRVR_CTRLIN returned: %d/%d\n",
                ret, nerrors);
 
           if (nerrors > 200)
             {
-              udbg("Too many errors... aborting: %d\n", nerrors);
+              uerr("Too many errors... aborting: %d\n", nerrors);
               break;
             }
         }
@@ -1227,7 +1227,7 @@ static int usbhost_kbdpoll(int argc, char *argv[])
       npolls++;
       if ((npolls & 31) == 0)
         {
-          udbg("Still polling: %d\n", npolls);
+          uerr("Still polling: %d\n", npolls);
         }
 #endif
       /* Wait for the required amount (or until a signal is received).  We
@@ -1267,7 +1267,7 @@ static int usbhost_kbdpoll(int argc, char *argv[])
    * of the file descriptors are closed.
    */
 
-  udbg("Keyboard removed, polling halted\n");
+  uerr("Keyboard removed, polling halted\n");
 
   flags = enter_critical_section();
   priv->polling = false;
@@ -1537,7 +1537,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
   ret = DRVR_EPALLOC(hport->drvr, &epindesc, &priv->epin);
   if (ret < 0)
     {
-      udbg("ERROR: Failed to allocate interrupt IN endpoint\n");
+      uerr("ERROR: Failed to allocate interrupt IN endpoint\n");
       return ret;
     }
 
@@ -1551,7 +1551,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
       ret = DRVR_EPALLOC(hport->drvr, &epoutdesc, &priv->epout);
       if (ret < 0)
         {
-          udbg("ERROR: Failed to allocate interrupt OUT endpoint\n");
+          uerr("ERROR: Failed to allocate interrupt OUT endpoint\n");
           (void)DRVR_EPFREE(hport->drvr, priv->epin);
           return ret;
         }
@@ -1590,7 +1590,7 @@ static inline int usbhost_devinit(FAR struct usbhost_state_s *priv)
   ret = usbhost_tdalloc(priv);
   if (ret < 0)
     {
-      udbg("ERROR: Failed to allocate transfer buffer\n");
+      uerr("ERROR: Failed to allocate transfer buffer\n");
       return ret;
     }
 
@@ -1932,7 +1932,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass,
   ret = usbhost_cfgdesc(priv, configdesc, desclen);
   if (ret < 0)
     {
-      udbg("usbhost_cfgdesc() failed: %d\n", ret);
+      uerr("usbhost_cfgdesc() failed: %d\n", ret);
     }
   else
     {
@@ -1941,7 +1941,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass,
       ret = usbhost_devinit(priv);
       if (ret < 0)
         {
-          udbg("usbhost_devinit() failed: %d\n", ret);
+          uerr("usbhost_devinit() failed: %d\n", ret);
         }
     }
 
diff --git a/drivers/usbhost/usbhost_hidmouse.c b/drivers/usbhost/usbhost_hidmouse.c
index 86536dba22..50decb0e85 100644
--- a/drivers/usbhost/usbhost_hidmouse.c
+++ b/drivers/usbhost/usbhost_hidmouse.c
@@ -197,8 +197,8 @@
  */
 
 #ifndef CONFIG_DEBUG_INPUT
-#  undef  idbg
-#  define idbg    udbg
+#  undef  ierr
+#  define ierr    uerr
 #  undef  illerr
 #  define illerr  ullerr
 #  undef  iinfo
@@ -1101,14 +1101,14 @@ static int usbhost_mouse_poll(int argc, char *argv[])
            * long time).
            */
 
-          udbg("ERROR: DRVR_TRANSFER returned: %d/%u\n",
+          uerr("ERROR: DRVR_TRANSFER returned: %d/%u\n",
                (int)nbytes, nerrors);
 
           if (nbytes != -EAGAIN)
             {
               if (++nerrors > 200)
                 {
-                  udbg("Too many errors... aborting: %d\n", nerrors);
+                  uerr("Too many errors... aborting: %d\n", nerrors);
                   ret = (int)nbytes;
                   break;
                 }
@@ -1212,7 +1212,7 @@ static int usbhost_mouse_poll(int argc, char *argv[])
       npolls++;
       if ((npolls & 31) == 0)
         {
-          udbg("Still polling: %d\n", npolls);
+          uerr("Still polling: %d\n", npolls);
         }
 #endif
     }
@@ -1233,7 +1233,7 @@ static int usbhost_mouse_poll(int argc, char *argv[])
    * of the file descriptors are closed.
    */
 
-  udbg("Mouse removed, polling halted\n");
+  uerr("Mouse removed, polling halted\n");
 
   flags = enter_critical_section();
   priv->polling = false;
@@ -1389,7 +1389,7 @@ static int usbhost_waitsample(FAR struct usbhost_state_s *priv,
            * the failure now.
            */
 
-          idbg("sem_wait: %d\n", errno);
+          ierr("sem_wait: %d\n", errno);
           DEBUGASSERT(errno == EINTR);
           ret = -EINTR;
           goto errout;
@@ -1624,7 +1624,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
   ret = DRVR_EPALLOC(hport->drvr, &epindesc, &priv->epin);
   if (ret < 0)
     {
-      udbg("ERROR: Failed to allocate interrupt IN endpoint\n");
+      uerr("ERROR: Failed to allocate interrupt IN endpoint\n");
       return ret;
     }
 
@@ -1661,7 +1661,7 @@ static inline int usbhost_devinit(FAR struct usbhost_state_s *priv)
   ret = usbhost_tdalloc(priv);
   if (ret < 0)
     {
-      udbg("ERROR: Failed to allocate transfer buffer\n");
+      uerr("ERROR: Failed to allocate transfer buffer\n");
       return ret;
     }
 
@@ -2002,7 +2002,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass,
   ret = usbhost_cfgdesc(priv, configdesc, desclen);
   if (ret < 0)
     {
-      udbg("usbhost_cfgdesc() failed: %d\n", ret);
+      uerr("usbhost_cfgdesc() failed: %d\n", ret);
     }
   else
     {
@@ -2011,7 +2011,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass,
       ret = usbhost_devinit(priv);
       if (ret < 0)
         {
-          udbg("usbhost_devinit() failed: %d\n", ret);
+          uerr("usbhost_devinit() failed: %d\n", ret);
         }
     }
 
@@ -2345,7 +2345,7 @@ static ssize_t usbhost_read(FAR struct file *filep, FAR char *buffer, size_t len
         {
           /* We might have been awakened by a signal */
 
-          idbg("usbhost_waitsample: %d\n", ret);
+          ierr("usbhost_waitsample: %d\n", ret);
           goto errout;
         }
     }
diff --git a/drivers/usbhost/usbhost_hub.c b/drivers/usbhost/usbhost_hub.c
index 4bec1b4973..516b123094 100644
--- a/drivers/usbhost/usbhost_hub.c
+++ b/drivers/usbhost/usbhost_hub.c
@@ -286,7 +286,7 @@ static int usbhost_hport_activate(FAR struct usbhost_hubport_s *hport)
   ret = DRVR_EPALLOC(hport->drvr, &epdesc, &hport->ep0);
   if (ret < 0)
     {
-      udbg("ERROR: Failed to allocate ep0: %d\n", ret);
+      uerr("ERROR: Failed to allocate ep0: %d\n", ret);
     }
 
   return ret;
@@ -474,7 +474,7 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_class_s *hubclass,
   ret = DRVR_EPALLOC(hport->drvr, &intindesc, &priv->intin);
   if (ret < 0)
     {
-      udbg("ERROR: Failed to allocate Interrupt IN endpoint: %d\n", ret);
+      uerr("ERROR: Failed to allocate Interrupt IN endpoint: %d\n", ret);
       (void)DRVR_EPFREE(hport->drvr, priv->intin);
       return ret;
     }
@@ -535,7 +535,7 @@ static inline int usbhost_hubdesc(FAR struct usbhost_class_s *hubclass)
   ret = DRVR_CTRLIN(hport->drvr, hport->ep0, ctrlreq, (FAR uint8_t *)&hubdesc);
   if (ret < 0)
     {
-      udbg("ERROR: Failed to read hub descriptor: %d\n", ret);
+      uerr("ERROR: Failed to read hub descriptor: %d\n", ret);
       return ret;
     }
 
@@ -642,7 +642,7 @@ static int usbhost_hubpwr(FAR struct usbhost_hubpriv_s *priv,
        ret = DRVR_CTRLOUT(hport->drvr, hport->ep0, ctrlreq, NULL);
        if (ret < 0)
          {
-           udbg("ERROR: Failed to power %s port %d: %d\n",
+           uerr("ERROR: Failed to power %s port %d: %d\n",
                 on ? "UP" : "DOWN", port, ret);
            return ret;
         }
@@ -738,7 +738,7 @@ static void usbhost_hub_event(FAR void *arg)
                         (FAR uint8_t *)&portstatus);
       if (ret < 0)
         {
-          udbg("ERROR: Failed to read port %d status: %d\n", port, ret);
+          uerr("ERROR: Failed to read port %d status: %d\n", port, ret);
           continue;
         }
 
@@ -762,7 +762,7 @@ static void usbhost_hub_event(FAR void *arg)
               ret = DRVR_CTRLOUT(hport->drvr, hport->ep0, ctrlreq, NULL);
               if (ret < 0)
                 {
-                  udbg("ERROR: Failed to clear port %d change mask %04x: %d\n",
+                  uerr("ERROR: Failed to clear port %d change mask %04x: %d\n",
                        port, mask, ret);
                 }
 
@@ -799,7 +799,7 @@ static void usbhost_hub_event(FAR void *arg)
                                 (FAR uint8_t *)&portstatus);
               if (ret < 0)
                 {
-                  udbg("ERROR: Failed to get port %d status: %d\n", port, ret);
+                  uerr("ERROR: Failed to get port %d status: %d\n", port, ret);
                   break;
                 }
 
@@ -839,7 +839,7 @@ static void usbhost_hub_event(FAR void *arg)
 
           if (ret < 0 || debouncetime >= 1500)
             {
-              udbg("ERROR: Failed to debounce port %d: %d\n", port, ret);
+              uerr("ERROR: Failed to debounce port %d: %d\n", port, ret);
               continue;
             }
 
@@ -858,7 +858,7 @@ static void usbhost_hub_event(FAR void *arg)
               ret = DRVR_CTRLOUT(hport->drvr, hport->ep0, ctrlreq, NULL);
               if (ret < 0)
                 {
-                  udbg("ERROR: Failed to reset port %d: %d\n", port, ret);
+                  uerr("ERROR: Failed to reset port %d: %d\n", port, ret);
                   continue;
                 }
 
@@ -874,7 +874,7 @@ static void usbhost_hub_event(FAR void *arg)
                                 (FAR uint8_t *)&portstatus);
               if (ret < 0)
                 {
-                  udbg("ERROR: Failed to get port %d status: %d\n", port, ret);
+                  uerr("ERROR: Failed to get port %d status: %d\n", port, ret);
                   continue;
                 }
 
@@ -917,7 +917,7 @@ static void usbhost_hub_event(FAR void *arg)
                   ret = usbhost_hport_activate(connport);
                   if (ret < 0)
                     {
-                      udbg("ERROR: usbhost_hport_activate failed: %d\n", ret);
+                      uerr("ERROR: usbhost_hport_activate failed: %d\n", ret);
                     }
                   else
                     {
@@ -926,14 +926,14 @@ static void usbhost_hub_event(FAR void *arg)
                       ret = DRVR_CONNECT(connport->drvr, connport, true);
                       if (ret < 0)
                         {
-                          udbg("ERROR: DRVR_CONNECT failed: %d\n", ret);
+                          uerr("ERROR: DRVR_CONNECT failed: %d\n", ret);
                           usbhost_hport_deactivate(connport);
                         }
                     }
                 }
               else
                 {
-                  udbg("ERROR: Failed to enable port %d\n", port);
+                  uerr("ERROR: Failed to enable port %d\n", port);
                   continue;
                 }
             }
@@ -961,7 +961,7 @@ static void usbhost_hub_event(FAR void *arg)
         }
       else if (change)
         {
-          udbg("WARNING: status %04x change %04x not handled\n", status, change);
+          uerr("WARNING: status %04x change %04x not handled\n", status, change);
         }
     }
 
@@ -971,7 +971,7 @@ static void usbhost_hub_event(FAR void *arg)
     {
       /* Hub status changed */
 
-      udbg("WARNING: Hub status changed, not handled\n");
+      uerr("WARNING: Hub status changed, not handled\n");
     }
 
   /* The preceding sequence of events may take a significant amount of
@@ -990,7 +990,7 @@ static void usbhost_hub_event(FAR void *arg)
                         INTIN_BUFSIZE, usbhost_callback, hubclass);
       if (ret < 0)
         {
-          udbg("ERROR: Failed to queue interrupt endpoint: %d\n", ret);
+          uerr("ERROR: Failed to queue interrupt endpoint: %d\n", ret);
         }
     }
 
@@ -1287,7 +1287,7 @@ static FAR struct usbhost_class_s *
   ret = DRVR_ALLOC(hport->drvr, (FAR uint8_t **)&priv->ctrlreq, &maxlen);
   if (ret < 0)
     {
-      udbg("ERROR: DRVR_ALLOC failed: %d\n", ret);
+      uerr("ERROR: DRVR_ALLOC failed: %d\n", ret);
       goto errout_with_hub;
     }
 
@@ -1296,7 +1296,7 @@ static FAR struct usbhost_class_s *
   ret = DRVR_IOALLOC(hport->drvr, &priv->buffer, INTIN_BUFSIZE);
   if (ret < 0)
     {
-      udbg("ERROR: DRVR_IOALLOC failed: %d\n", ret);
+      uerr("ERROR: DRVR_IOALLOC failed: %d\n", ret);
       goto errout_with_ctrlreq;
     }
 
@@ -1385,7 +1385,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *hubclass,
   ret = usbhost_cfgdesc(hubclass, configdesc, desclen);
   if (ret < 0)
     {
-      udbg("ERROR: Failed to parse config descriptor: %d\n", ret);
+      uerr("ERROR: Failed to parse config descriptor: %d\n", ret);
       return ret;
     }
 
@@ -1399,7 +1399,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *hubclass,
 
   if (priv->nports > USBHUB_MAX_PORTS)
     {
-      udbg("ERROR: too many downstream ports: %d\n", priv->nports);
+      uerr("ERROR: too many downstream ports: %d\n", priv->nports);
       return -ENOSYS;
     }
 
@@ -1408,7 +1408,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *hubclass,
   ret = usbhost_hubpwr(priv, hport, true);
   if (ret < 0)
     {
-      udbg("ERROR: usbhost_hubpwr failed: %d\n", ret);
+      uerr("ERROR: usbhost_hubpwr failed: %d\n", ret);
       return ret;
     }
 
@@ -1418,7 +1418,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *hubclass,
                     INTIN_BUFSIZE, usbhost_callback, hubclass);
   if (ret < 0)
     {
-      udbg("ERROR: DRVR_ASYNCH failed: %d\n", ret);
+      uerr("ERROR: DRVR_ASYNCH failed: %d\n", ret);
       (void)usbhost_hubpwr(priv, hport, false);
     }
 
diff --git a/drivers/usbhost/usbhost_skeleton.c b/drivers/usbhost/usbhost_skeleton.c
index ae03f341af..29fe5172a8 100644
--- a/drivers/usbhost/usbhost_skeleton.c
+++ b/drivers/usbhost/usbhost_skeleton.c
@@ -588,14 +588,14 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
   ret = DRVR_EPALLOC(hport->drvr, &boutdesc, &priv->epout);
   if (ret < 0)
     {
-      udbg("ERROR: Failed to allocate Bulk OUT endpoint\n");
+      uerr("ERROR: Failed to allocate Bulk OUT endpoint\n");
       return ret;
     }
 
   ret = DRVR_EPALLOC(hport->drvr, &bindesc, &priv->epin);
   if (ret < 0)
     {
-      udbg("ERROR: Failed to allocate Bulk IN endpoint\n");
+      uerr("ERROR: Failed to allocate Bulk IN endpoint\n");
       (void)DRVR_EPFREE(hport->drvr, priv->epout);
       return ret;
     }
@@ -955,7 +955,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass,
   ret = usbhost_cfgdesc(priv, configdesc, desclen);
   if (ret < 0)
     {
-      udbg("usbhost_cfgdesc() failed: %d\n", ret);
+      uerr("usbhost_cfgdesc() failed: %d\n", ret);
     }
   else
     {
@@ -964,7 +964,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass,
       ret = usbhost_devinit(priv);
       if (ret < 0)
         {
-          udbg("usbhost_devinit() failed: %d\n", ret);
+          uerr("usbhost_devinit() failed: %d\n", ret);
         }
     }
 
diff --git a/drivers/usbhost/usbhost_storage.c b/drivers/usbhost/usbhost_storage.c
index e8075c77a6..668daa5595 100644
--- a/drivers/usbhost/usbhost_storage.c
+++ b/drivers/usbhost/usbhost_storage.c
@@ -722,7 +722,7 @@ static inline int usbhost_testunitready(FAR struct usbhost_state_s *priv)
   cbw = usbhost_cbwalloc(priv);
   if (!cbw)
     {
-      udbg("ERROR: Failed to create CBW\n");
+      uerr("ERROR: Failed to create CBW\n");
       return -ENOMEM;
     }
 
@@ -760,7 +760,7 @@ static inline int usbhost_requestsense(FAR struct usbhost_state_s *priv)
   cbw = usbhost_cbwalloc(priv);
   if (!cbw)
     {
-      udbg("ERROR: Failed to create CBW\n");
+      uerr("ERROR: Failed to create CBW\n");
       return -ENOMEM;
     }
 
@@ -806,7 +806,7 @@ static inline int usbhost_readcapacity(FAR struct usbhost_state_s *priv)
   cbw = usbhost_cbwalloc(priv);
   if (!cbw)
     {
-      udbg("ERROR: Failed to create CBW\n");
+      uerr("ERROR: Failed to create CBW\n");
       return -ENOMEM;
     }
 
@@ -857,7 +857,7 @@ static inline int usbhost_inquiry(FAR struct usbhost_state_s *priv)
   cbw = usbhost_cbwalloc(priv);
   if (!cbw)
     {
-      udbg("ERROR: Failed to create CBW\n");
+      uerr("ERROR: Failed to create CBW\n");
       return -ENOMEM;
     }
 
@@ -1173,14 +1173,14 @@ static inline int usbhost_cfgdesc(FAR struct usbhost_state_s *priv,
   ret = DRVR_EPALLOC(hport->drvr, &boutdesc, &priv->bulkout);
   if (ret < 0)
     {
-      udbg("ERROR: Failed to allocate Bulk OUT endpoint\n");
+      uerr("ERROR: Failed to allocate Bulk OUT endpoint\n");
       return ret;
     }
 
   ret = DRVR_EPALLOC(hport->drvr, &bindesc, &priv->bulkin);
   if (ret < 0)
     {
-      udbg("ERROR: Failed to allocate Bulk IN endpoint\n");
+      uerr("ERROR: Failed to allocate Bulk IN endpoint\n");
       (void)DRVR_EPFREE(hport->drvr, priv->bulkout);
       return ret;
     }
@@ -1221,7 +1221,7 @@ static inline int usbhost_initvolume(FAR struct usbhost_state_s *priv)
   ret = usbhost_talloc(priv);
   if (ret < 0)
     {
-      udbg("ERROR: Failed to allocate transfer buffer\n");
+      uerr("ERROR: Failed to allocate transfer buffer\n");
       return ret;
     }
 
@@ -1281,7 +1281,7 @@ static inline int usbhost_initvolume(FAR struct usbhost_state_s *priv)
 
       if (ret < 0 && ret != -EPERM)
         {
-          udbg("ERROR: DRVR_TRANSFER returned: %d\n", ret);
+          uerr("ERROR: DRVR_TRANSFER returned: %d\n", ret);
           break;
         }
     }
@@ -1290,7 +1290,7 @@ static inline int usbhost_initvolume(FAR struct usbhost_state_s *priv)
 
   if (retries >= USBHOST_MAX_RETRIES)
     {
-      udbg("ERROR: Timeout!\n");
+      uerr("ERROR: Timeout!\n");
       ret = -ETIMEDOUT;
     }
 
@@ -1307,7 +1307,7 @@ static inline int usbhost_initvolume(FAR struct usbhost_state_s *priv)
           csw = (FAR struct usbmsc_csw_s *)priv->tbuffer;
           if (csw->status != 0)
             {
-              udbg("ERROR: CSW status error: %d\n", csw->status);
+              uerr("ERROR: CSW status error: %d\n", csw->status);
               ret = -ENODEV;
             }
         }
@@ -1328,7 +1328,7 @@ static inline int usbhost_initvolume(FAR struct usbhost_state_s *priv)
           csw = (FAR struct usbmsc_csw_s *)priv->tbuffer;
           if (csw->status != 0)
             {
-              udbg("ERROR: CSW status error: %d\n", csw->status);
+              uerr("ERROR: CSW status error: %d\n", csw->status);
               ret = -ENODEV;
             }
         }
@@ -1772,7 +1772,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass,
   ret = usbhost_cfgdesc(priv, configdesc, desclen);
   if (ret < 0)
     {
-      udbg("usbhost_cfgdesc() failed: %d\n", ret);
+      uerr("usbhost_cfgdesc() failed: %d\n", ret);
     }
   else
     {
@@ -1781,7 +1781,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass,
       ret = usbhost_initvolume(priv);
       if (ret < 0)
         {
-          udbg("usbhost_initvolume() failed: %d\n", ret);
+          uerr("usbhost_initvolume() failed: %d\n", ret);
         }
     }
 
@@ -2051,7 +2051,7 @@ static ssize_t usbhost_read(FAR struct inode *inode, unsigned char *buffer,
                           csw = (FAR struct usbmsc_csw_s *)priv->tbuffer;
                           if (csw->status != 0)
                             {
-                              udbg("ERROR: CSW status error: %d\n", csw->status);
+                              uerr("ERROR: CSW status error: %d\n", csw->status);
                               nbytes = -ENODEV;
                             }
                         }
@@ -2150,7 +2150,7 @@ static ssize_t usbhost_write(FAR struct inode *inode, const unsigned char *buffe
                       csw = (FAR struct usbmsc_csw_s *)priv->tbuffer;
                       if (csw->status != 0)
                         {
-                          udbg("ERROR: CSW status error: %d\n", csw->status);
+                          uerr("ERROR: CSW status error: %d\n", csw->status);
                           nbytes = -ENODEV;
                         }
                     }
diff --git a/drivers/video/ov2640.c b/drivers/video/ov2640.c
index 112d3201e3..28b3c4ebc7 100644
--- a/drivers/video/ov2640.c
+++ b/drivers/video/ov2640.c
@@ -696,7 +696,7 @@ static int ov2640_putreg(FAR struct i2c_master_s *i2c, uint8_t regaddr,
   int ret;
 
 #ifdef CONFIG_OV2640_REGDEBUG
-   dbg("%02x <- %02x\n", regaddr, regval);
+   err("%02x <- %02x\n", regaddr, regval);
 #endif
 
   /* Set up for the transfer */
@@ -715,7 +715,7 @@ static int ov2640_putreg(FAR struct i2c_master_s *i2c, uint8_t regaddr,
   ret = i2c_write(i2c, &config, buffer, 2);
   if (ret < 0)
     {
-      gdbg("ERROR: i2c_write failed: %d\n", ret);
+      gerr("ERROR: i2c_write failed: %d\n", ret);
       return ret;
     }
 
@@ -756,7 +756,7 @@ static uint8_t ov2640_getreg(FAR struct i2c_master_s *i2c, uint8_t regaddr)
   ret = i2c_write(i2c, &config, ®addr, 1);
   if (ret < 0)
     {
-      gdbg("ERROR: i2c_write failed: %d\n", ret);
+      gerr("ERROR: i2c_write failed: %d\n", ret);
       return 0;
     }
 
@@ -765,13 +765,13 @@ static uint8_t ov2640_getreg(FAR struct i2c_master_s *i2c, uint8_t regaddr)
   ret = i2c_read(i2c, &config, ®val, 1);
   if (ret < 0)
     {
-      gdbg("ERROR: i2c_read failed: %d\n", ret);
+      gerr("ERROR: i2c_read failed: %d\n", ret);
       return 0;
     }
 #ifdef CONFIG_OV2640_REGDEBUG
   else
     {
-      dbg("%02x -> %02x\n", regaddr, regval);
+      err("%02x -> %02x\n", regaddr, regval);
     }
 #endif
 
@@ -807,7 +807,7 @@ static int ov2640_putreglist(FAR struct i2c_master_s *i2c,
       ret = ov2640_putreg(i2c, entry->regaddr, entry->regval);
       if (ret < 0)
         {
-          gdbg("ERROR: ov2640_putreg failed: %d\n", ret);
+          gerr("ERROR: ov2640_putreg failed: %d\n", ret);
           return ret;
         }
     }
@@ -845,7 +845,7 @@ static int ovr2640_chipid(FAR struct i2c_master_s *i2c)
   ret = ov2640_putreg(i2c, 0xff, 0x01); /* Select the sensor address bank */
   if (ret < 0)
     {
-      gdbg("ERROR: ov2640_putreg failed: %d\n", ret);
+      gerr("ERROR: ov2640_putreg failed: %d\n", ret);
       return ret;
     }
 
@@ -859,7 +859,7 @@ static int ovr2640_chipid(FAR struct i2c_master_s *i2c)
 
   if (pidl != OVR2640_PRODUCT_IDL || pidh != OVR2640_PRODUCT_IDH)
     {
-      gdbg("ERROR: Unsupported PID=%02x$02x MID=%02x%02x\n",
+      gerr("ERROR: Unsupported PID=%02x$02x MID=%02x%02x\n",
             pidh, pidl, midh, midl);
       return -ENOSYS;
     }
@@ -892,7 +892,7 @@ static int ov2640_reset(FAR struct i2c_master_s *i2c)
   ret = ov2640_putreglist(i2c, g_ov2640_reset, OV2640_RESET_NENTRIES);
   if (ret < 0)
     {
-      gdbg("ERROR: ov2640_putreglist failed: %d\n", ret);
+      gerr("ERROR: ov2640_putreglist failed: %d\n", ret);
       return ret;
     }
 
@@ -927,7 +927,7 @@ int ov2640_initialize(FAR struct i2c_master_s *i2c)
   ret = ov2640_reset(i2c);
   if (ret < 0)
     {
-      gdbg("ERROR: ov2640_reset failed: %d\n", ret);
+      gerr("ERROR: ov2640_reset failed: %d\n", ret);
       goto errout;
     }
 
@@ -936,7 +936,7 @@ int ov2640_initialize(FAR struct i2c_master_s *i2c)
   ret = ovr2640_chipid(i2c);
   if (ret < 0)
     {
-      gdbg("ERROR: ovr2640_chipid failed: %d\n", ret);
+      gerr("ERROR: ovr2640_chipid failed: %d\n", ret);
       goto errout;
     }
 
@@ -948,35 +948,35 @@ int ov2640_initialize(FAR struct i2c_master_s *i2c)
   ret = ov2640_putreglist(i2c, g_ov2640_jpeg_init, OV2640_JPEG_INIT_NENTRIES);
   if (ret < 0)
     {
-      gdbg("ERROR: ov2640_putreglist failed: %d\n", ret);
+      gerr("ERROR: ov2640_putreglist failed: %d\n", ret);
       goto errout;
     }
 
   ret = ov2640_putreglist(i2c, g_ov2640_yuv422, OV2640_YUV422_NENTRIES);
   if (ret < 0)
     {
-      gdbg("ERROR: ov2640_putreglist failed: %d\n", ret);
+      gerr("ERROR: ov2640_putreglist failed: %d\n", ret);
       goto errout;
     }
 
   ret = ov2640_putreglist(i2c, g_ov2640_jpeg, OV2640_JPEG_NENTRIES);
   if (ret < 0)
     {
-      gdbg("ERROR: ov2640_putreglist failed: %d\n", ret);
+      gerr("ERROR: ov2640_putreglist failed: %d\n", ret);
       goto errout;
     }
 
   ret = ov2640_putreg(i2c, 0xff, 0x01);
   if (ret < 0)
     {
-      gdbg("ERROR: ov2640_putreg failed: %d\n", ret);
+      gerr("ERROR: ov2640_putreg failed: %d\n", ret);
       goto errout;
     }
 
   ret = ov2640_putreg(i2c, 0x15, 0x00);
   if (ret < 0)
     {
-      gdbg("ERROR: ov2640_putreg failed: %d\n", ret);
+      gerr("ERROR: ov2640_putreg failed: %d\n", ret);
       goto errout;
     }
 
@@ -1018,7 +1018,7 @@ int ov2640_initialize(FAR struct i2c_master_s *i2c)
 
   if (ret < 0)
     {
-      gdbg("ERROR: ov2640_putreglist failed: %d\n", ret);
+      gerr("ERROR: ov2640_putreglist failed: %d\n", ret);
       goto errout;
     }
 
@@ -1030,7 +1030,7 @@ int ov2640_initialize(FAR struct i2c_master_s *i2c)
                           OV2640_INITIALREGS_NENTRIES);
   if (ret < 0)
     {
-      gdbg("ERROR: ov2640_putreglist failed: %d\n", ret);
+      gerr("ERROR: ov2640_putreglist failed: %d\n", ret);
       goto errout;
     }
 
@@ -1040,7 +1040,7 @@ int ov2640_initialize(FAR struct i2c_master_s *i2c)
                           OV2640_RESOLUTION_COMMON_NENTRIES);
   if (ret < 0)
     {
-      gdbg("ERROR: ov2640_putreglist failed: %d\n", ret);
+      gerr("ERROR: ov2640_putreglist failed: %d\n", ret);
       goto errout;
     }
 
@@ -1082,7 +1082,7 @@ int ov2640_initialize(FAR struct i2c_master_s *i2c)
 
   if (ret < 0)
     {
-      gdbg("ERROR: ov2640_putreglist failed: %d\n", ret);
+      gerr("ERROR: ov2640_putreglist failed: %d\n", ret);
       goto errout;
     }
 
@@ -1092,7 +1092,7 @@ int ov2640_initialize(FAR struct i2c_master_s *i2c)
                     OV2640_COLORFMT_COMMON_NENTRIES);
   if (ret < 0)
     {
-      gdbg("ERROR: ov2640_putreglist failed: %d\n", ret);
+      gerr("ERROR: ov2640_putreglist failed: %d\n", ret);
       goto errout;
     }
 
@@ -1110,7 +1110,7 @@ int ov2640_initialize(FAR struct i2c_master_s *i2c)
 
   if (ret < 0)
     {
-      gdbg("ERROR: ov2640_putreglist failed: %d\n", ret);
+      gerr("ERROR: ov2640_putreglist failed: %d\n", ret);
       goto errout;
     }
 
@@ -1119,7 +1119,7 @@ int ov2640_initialize(FAR struct i2c_master_s *i2c)
   return OK;
 
 errout:
-  gdbg("ERROR: Failed to initialize the OV2640: %d\n", ret);
+  gerr("ERROR: Failed to initialize the OV2640: %d\n", ret);
   (void)ov2640_reset(i2c);
   return ret;
 }
diff --git a/drivers/wireless/cc3000/cc3000.c b/drivers/wireless/cc3000/cc3000.c
index dd7cc44bd0..d73680f320 100644
--- a/drivers/wireless/cc3000/cc3000.c
+++ b/drivers/wireless/cc3000/cc3000.c
@@ -251,7 +251,7 @@ static inline void cc3000_devgive(FAR struct cc3000_dev_s *priv)
 
 static inline void cc3000_configspi(FAR struct spi_dev_s *spi)
 {
-  ndbg("Mode: %d Bits: 8 Frequency: %d\n",
+  nerr("Mode: %d Bits: 8 Frequency: %d\n",
        CONFIG_CC3000_SPI_MODE, CONFIG_CC3000_SPI_FREQUENCY);
 
   SPI_SETMODE(spi, CONFIG_CC3000_SPI_MODE);
@@ -1071,7 +1071,7 @@ static ssize_t cc3000_read(FAR struct file *filep, FAR char *buffer, size_t len)
 
   if (len < priv->rx_buffer_max_len)
     {
-      ndbg("Unsupported read size: %d\n", len);
+      nerr("Unsupported read size: %d\n", len);
       nread = -ENOSYS;
       goto errout_with_sem;
     }
@@ -1531,7 +1531,7 @@ int cc3000_register(FAR struct spi_dev_s *spi,
   priv = (FAR struct cc3000_dev_s *)kmm_malloc(sizeof(struct cc3000_dev_s));
   if (!priv)
     {
-      ndbg("kmm_malloc(%d) failed\n", sizeof(struct cc3000_dev_s));
+      nerr("kmm_malloc(%d) failed\n", sizeof(struct cc3000_dev_s));
       return -ENOMEM;
     }
 #endif
@@ -1565,7 +1565,7 @@ int cc3000_register(FAR struct spi_dev_s *spi,
   ret = config->irq_attach(config, cc3000_interrupt);
   if (ret < 0)
     {
-      ndbg("Failed to attach interrupt\n");
+      nerr("Failed to attach interrupt\n");
       goto errout_with_priv;
     }
 
@@ -1577,7 +1577,7 @@ int cc3000_register(FAR struct spi_dev_s *spi,
   ret = register_driver(drvname, &cc3000_fops, 0666, priv);
   if (ret < 0)
     {
-      ndbg("register_driver() failed: %d\n", ret);
+      nerr("register_driver() failed: %d\n", ret);
       goto errout_with_priv;
     }
 
diff --git a/drivers/wireless/cc3000/cc3000drv.c b/drivers/wireless/cc3000/cc3000drv.c
index 3b5cac58d5..44547d4889 100644
--- a/drivers/wireless/cc3000/cc3000drv.c
+++ b/drivers/wireless/cc3000/cc3000drv.c
@@ -65,7 +65,7 @@
 #undef SPI_VERBOSE /* Define to enable verbose debug */
 
 #ifdef SPI_DEBUG
-#  define spidbg  llerr
+#  define spierr  llerr
 #  ifdef SPI_VERBOSE
 #    define spiinfo llerr
 #  else
@@ -73,7 +73,7 @@
 #  endif
 #else
 #  undef SPI_VERBOSE
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
diff --git a/drivers/wireless/cc3000/socket.c b/drivers/wireless/cc3000/socket.c
index a44b9b0bdb..9ca0c2105f 100644
--- a/drivers/wireless/cc3000/socket.c
+++ b/drivers/wireless/cc3000/socket.c
@@ -267,7 +267,7 @@ int cc3000_accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen)
   if (setsockopt(sockfd, CC3000_SOL_SOCKET, CC3000_SOCKOPT_ACCEPT_NONBLOCK,
                  &non_blocking, sizeof(non_blocking)) < 0)
    {
-     ndbg("setsockopt failure %d\n", errno);
+     nerr("setsockopt failure %d\n", errno);
      return -errno;
    }
 
@@ -282,7 +282,7 @@ int cc3000_accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen)
   if (setsockopt(sockfd, CC3000_SOL_SOCKET, CC3000_SOCKOPT_ACCEPT_NONBLOCK,
                  &nonBlocking, sizeof(nonBlocking)) < 0)
    {
-     ndbg("setsockopt failure %d\n", errno);
+     nerr("setsockopt failure %d\n", errno);
      return -errno;
    }
 
diff --git a/drivers/wireless/ieee802154/mrf24j40.c b/drivers/wireless/ieee802154/mrf24j40.c
index 35a7ecbbe8..8658ad9a37 100644
--- a/drivers/wireless/ieee802154/mrf24j40.c
+++ b/drivers/wireless/ieee802154/mrf24j40.c
@@ -303,7 +303,7 @@ static uint8_t mrf24j40_getreg(FAR struct spi_dev_s *spi, uint32_t addr)
   SPI_SELECT     (spi, SPIDEV_IEEE802154, false);
   mrf24j40_unlock(spi);
 
-  /*dbg("r[%04X]=%02X\n",addr,rx[len-1]);*/
+  /*err("r[%04X]=%02X\n",addr,rx[len-1]);*/
   return rx[len-1];
 }
 
@@ -443,7 +443,7 @@ static int mrf24j40_setrxmode(FAR struct mrf24j40_dev_s *dev, int mode)
   mrf24j40_setreg(dev->spi, MRF24J40_RXMCR, reg);
 
   dev->rxmode = mode;
-  dbg("%u\n",(unsigned)mode);
+  err("%u\n",(unsigned)mode);
   return OK;
 }
 
@@ -470,7 +470,7 @@ static int mrf24j40_setchannel(FAR struct ieee802154_dev_s *ieee,
   
   if (chan<11 || chan>26)
     {
-      dbg("Invalid chan: %d\n",chan);
+      err("Invalid chan: %d\n",chan);
       return -EINVAL;
     }
 
@@ -485,7 +485,7 @@ static int mrf24j40_setchannel(FAR struct ieee802154_dev_s *ieee,
   mrf24j40_resetrfsm(dev);
 
   dev->channel = chan;
-  //dbg("%u\n",(unsigned)chan);
+  //err("%u\n",(unsigned)chan);
 
   return OK;
 }
@@ -525,7 +525,7 @@ static int mrf24j40_setpanid(FAR struct ieee802154_dev_s *ieee,
   mrf24j40_setreg(dev->spi, MRF24J40_PANIDL, (uint8_t)(panid&0xFF));
 
   dev->panid = panid;
-  dbg("%04X\n",(unsigned)panid);
+  err("%04X\n",(unsigned)panid);
 
   return OK;
 }
@@ -567,7 +567,7 @@ static int mrf24j40_setsaddr(FAR struct ieee802154_dev_s *ieee,
   mrf24j40_setreg(dev->spi, MRF24J40_SADRL, (uint8_t)(saddr&0xFF));
 
   dev->saddr = saddr;
-  dbg("%04X\n",(unsigned)saddr);  
+  err("%04X\n",(unsigned)saddr);  
   return OK;
 }
 
@@ -897,7 +897,7 @@ static int mrf24j40_regdump(FAR struct mrf24j40_dev_s *dev)
   char buf[4+16*3+2+1];
   int len=0;
 
-  dbg("Short regs:\n");
+  err("Short regs:\n");
 
   for (i = 0; i < 0x40; i++)
     {
@@ -910,11 +910,11 @@ static int mrf24j40_regdump(FAR struct mrf24j40_dev_s *dev)
       if ((i & 15) == 15)
         {
           sprintf(buf+len, "\n");
-          dbg("%s",buf);
+          err("%s",buf);
         }
     }
 
-  dbg("Long regs:\n");
+  err("Long regs:\n");
   for (i=0x80000200;i<0x80000250;i++)
     {
       if ((i&15)==0)
@@ -926,7 +926,7 @@ static int mrf24j40_regdump(FAR struct mrf24j40_dev_s *dev)
       if ((i & 15) == 15)
         {
           sprintf(buf+len, "\n");
-          dbg("%s",buf);
+          err("%s",buf);
         }
     }
 
@@ -952,7 +952,7 @@ static int mrf24j40_ioctl(FAR struct ieee802154_dev_s *ieee, int cmd,
         return mrf24j40_regdump(dev);
 
       case 1001: dev->paenabled = (uint8_t)arg;
-        dbg("PA %sabled\n",arg?"en":"dis");
+        err("PA %sabled\n",arg?"en":"dis");
         return OK;
 
       default:
@@ -1043,7 +1043,7 @@ static int mrf24j40_transmit(FAR struct ieee802154_dev_s *ieee, FAR struct ieee8
   fc1 = packet->data[0];
   fc2 = packet->data[1];
 
- // dbg("fc1 %02X fc2 %02X\n", fc1,fc2);
+ // err("fc1 %02X fc2 %02X\n", fc1,fc2);
 
   if ((fc2 & IEEE802154_FC2_DADDR) == IEEE802154_DADDR_SHORT)
     {
@@ -1073,7 +1073,7 @@ static int mrf24j40_transmit(FAR struct ieee802154_dev_s *ieee, FAR struct ieee8
       hlen += 8; /* Ext saddr */
     }
 
-//  dbg("hlen %d\n",hlen);
+//  err("hlen %d\n",hlen);
 
   /* Header len, 0, TODO for security modes */
 
@@ -1131,7 +1131,7 @@ static void mrf24j40_irqwork_tx(FAR struct mrf24j40_dev_s *dev)
    * channel_busy = (tmp & (1 << CCAFAIL));
    */
 
-  //dbg("TXSTAT%02X!\n", txstat);
+  //err("TXSTAT%02X!\n", txstat);
 #warning TODO report errors
   UNUSED(txstat);
 
@@ -1193,7 +1193,7 @@ static void mrf24j40_irqwork_rx(FAR struct mrf24j40_dev_s *dev)
   uint32_t index;
   uint8_t  reg;
 
-  /*dbg("!\n");*/
+  /*err("!\n");*/
 
   /* Disable rx int */
 
@@ -1209,7 +1209,7 @@ static void mrf24j40_irqwork_rx(FAR struct mrf24j40_dev_s *dev)
 
   addr = 0x80000300;
   dev->ieee.rxbuf->len = mrf24j40_getreg(dev->spi, addr++);
-  /*dbg("len %3d\n", dev->ieee.rxbuf->len);*/
+  /*err("len %3d\n", dev->ieee.rxbuf->len);*/
 
   for (index = 0; index < dev->ieee.rxbuf->len; index++)
     {
@@ -1264,7 +1264,7 @@ static void mrf24j40_irqworker(FAR void *arg)
   /* Read and store INTSTAT - this clears the register. */
 
   intstat = mrf24j40_getreg(dev->spi, MRF24J40_INTSTAT);
-//  dbg("INT%02X\n", intstat);
+//  err("INT%02X\n", intstat);
 
   /* Do work according to the pending interrupts */
 
diff --git a/drivers/wireless/nrf24l01.c b/drivers/wireless/nrf24l01.c
index 90f9cd3bae..582ac47ebf 100644
--- a/drivers/wireless/nrf24l01.c
+++ b/drivers/wireless/nrf24l01.c
@@ -551,7 +551,7 @@ static void nrf24l01_worker(FAR void *arg)
 
       bool ce = nrf24l01_chipenable(dev, false);
 
-      wdbg("RX_DR is set!\n");
+      werr("RX_DR is set!\n");
 
       /* Read and store all received payloads */
 
@@ -586,8 +586,8 @@ static void nrf24l01_worker(FAR void *arg)
 
           status = nrf24l01_readreg(dev, NRF24L01_FIFO_STATUS, &fifo_status, 1);
 
-          wdbg("FIFO_STATUS=%02x\n", fifo_status);
-          wdbg("STATUS=%02x\n", status);
+          werr("FIFO_STATUS=%02x\n", fifo_status);
+          werr("STATUS=%02x\n", status);
         }
       while (!(fifo_status | NRF24L01_RX_EMPTY));
 
@@ -736,7 +736,7 @@ static int dosend(FAR struct nrf24l01_dev_s *dev, FAR const uint8_t *data, size_
     {
       /* Unexpected... */
 
-      wdbg("No TX_DS nor MAX_RT bit set in STATUS reg!\n");
+      werr("No TX_DS nor MAX_RT bit set in STATUS reg!\n");
       result = -EIO;
     }
 
@@ -1257,7 +1257,7 @@ int nrf24l01_register(FAR struct spi_dev_s *spi, FAR struct nrf24l01_config_s *c
   result = register_driver(DEV_NAME, &nrf24l01_fops, 0666, dev);
   if (result < 0)
     {
-      wdbg("register_driver() failed: %d\n", result);
+      werr("register_driver() failed: %d\n", result);
       nrf24l01_unregister(dev);
     }
 
@@ -1658,7 +1658,7 @@ int nrf24l01_sendto(FAR struct nrf24l01_dev_s *dev, FAR const uint8_t *data,
 
   if ((dev->en_aa & 1) && (memcmp(destaddr, dev->pipe0addr, dev->addrlen)))
     {
-      wdbg("Change pipe #0 addr to dest addr\n");
+      werr("Change pipe #0 addr to dest addr\n");
       nrf24l01_writereg(dev, NRF24L01_RX_ADDR_P0, destaddr, NRF24L01_MAX_ADDR_LEN);
       pipeaddrchg = true;
     }
@@ -1670,7 +1670,7 @@ int nrf24l01_sendto(FAR struct nrf24l01_dev_s *dev, FAR const uint8_t *data,
       /* Restore pipe #0 addr */
 
       nrf24l01_writereg(dev, NRF24L01_RX_ADDR_P0, dev->pipe0addr, NRF24L01_MAX_ADDR_LEN);
-      wdbg("Pipe #0 default addr restored\n");
+      werr("Pipe #0 default addr restored\n");
     }
 
   nrf24l01_unlock(dev->spi);
diff --git a/drivers/wireless/pn532.c b/drivers/wireless/pn532.c
index 0f171950de..877c80fb9d 100644
--- a/drivers/wireless/pn532.c
+++ b/drivers/wireless/pn532.c
@@ -57,23 +57,23 @@
  ****************************************************************************/
 
 #ifdef CONFIG_WL_PN532_DEBUG
-#  define pn532dbg dbg
+#  define pn532err err
 #else
 #  ifdef CONFIG_CPP_HAVE_VARARGS
-#    define pn532dbg(x...)
+#    define pn532err(x...)
 #  else
-#    define pn532dbg (void)
+#    define pn532err (void)
 #    endif
 #endif
 
 #ifdef CONFIG_WL_PN532_DEBUG_TX
-#  define tracetx dbgdumpbuffer
+#  define tracetx errdumpbuffer
 #else
 #    define tracetx(x...)
 #endif
 
 #ifdef CONFIG_WL_PN532_DEBUG_RX
-#  define tracerx dbgdumpbuffer
+#  define tracerx errdumpbuffer
 #else
 #    define tracerx(x...)
 #endif
@@ -226,7 +226,7 @@ bool pn532_rx_frame_is_valid(struct pn532_frame *f, bool check_data)
 
   if (f->start_code != PN532_SOF)
     {
-      pn532dbg("Frame startcode 0x%X != 0x%X\n", PN532_SOF, f->start_code);
+      pn532err("Frame startcode 0x%X != 0x%X\n", PN532_SOF, f->start_code);
       return false;
     }
 
@@ -238,7 +238,7 @@ bool pn532_rx_frame_is_valid(struct pn532_frame *f, bool check_data)
   chk = pn532_checksum(f->len);
   if (chk != f->lcs)
     {
-      pn532dbg("Frame data len checksum failed");
+      pn532err("Frame data len checksum failed");
       return false;
     }
 
@@ -247,7 +247,7 @@ bool pn532_rx_frame_is_valid(struct pn532_frame *f, bool check_data)
       chk = pn532_data_checksum(&f->tfi, f->len);
       if (chk != f->data[f->len-1])
         {
-          pn532dbg("Frame data checksum failed: calc=0x%X != 0x%X", chk, f->data[f->len-1]);
+          pn532err("Frame data checksum failed: calc=0x%X != 0x%X", chk, f->data[f->len-1]);
           return false;
         }
     }
@@ -303,7 +303,7 @@ static int pn532_wait_rx_ready(struct pn532_dev_s *dev, int timeout)
     {
       if (--timeout == 0x00)
         {
-          pn532dbg("wait RX timeout!\n");
+          pn532err("wait RX timeout!\n");
           return -ETIMEDOUT;
         }
 
@@ -414,7 +414,7 @@ int pn532_read_ack(struct pn532_dev_s *dev)
     }
   else
     {
-      pn532dbg("ACK NOK");
+      pn532err("ACK NOK");
       res = 0;
     }
 
@@ -460,7 +460,7 @@ int pn532_write_frame(struct pn532_dev_s *dev, struct pn532_frame *f)
     {
       if (!pn532_read_ack(dev))
         {
-          pn532dbg("command FAILED\n");
+          pn532err("command FAILED\n");
           res = -EIO;
         }
     }
@@ -490,7 +490,7 @@ int pn532_read_frame(struct pn532_dev_s *dev, struct pn532_frame *f, int max_siz
 
           /* TODO: optimize frame integrity check...
            * pn532_data_checksum(&f.tfi, f->len);
-           * dbgdumpbuffer("RX Frame:", f, f->len+6);
+           * errdumpbuffer("RX Frame:", f, f->len+6);
            */
 
           if (pn532_rx_frame_is_valid(f, true))
@@ -580,7 +580,7 @@ int pn532_get_fw_version(struct pn532_dev_s *dev,
           if (f->data[0] == PN532_COMMAND_GETFIRMWAREVERSION + 1)
             {
               fw = (struct pn_firmware_version*) &f->data[1];
-              pn532dbg("FW: %d.%d on IC:0x%X (Features: 0x%X)\n",
+              pn532err("FW: %d.%d on IC:0x%X (Features: 0x%X)\n",
                        fw->ver, fw->rev, fw->ic, fw->support);
               if (fv)
                 {
@@ -611,7 +611,7 @@ int pn532_write_gpio(struct pn532_dev_s *dev, uint8_t p3, uint8_t p7)
     {
       pn532_read(dev, cmd_buffer, 10);
       tracetx("Resp:", cmd_buffer, 10);
-      pn532dbg("TFI=%x, data0=%X", f->tfi, f->data[0]);
+      pn532err("TFI=%x, data0=%X", f->tfi, f->data[0]);
       if ((f->tfi == PN532_PN532TOHOST) && (f->data[0] == PN532_COMMAND_WRITEGPIO+1))
         {
           res = OK;
@@ -723,15 +723,15 @@ uint32_t pn532_read_passive_target_id(struct pn532_dev_s *dev, uint8_t baudrate)
 
               if (r->nbtg == 1)
                 {
-                  pn532dbg("Found %d card(s)\n", r->nbtg);
+                  pn532err("Found %d card(s)\n", r->nbtg);
 
                   /* now supports only type_a cards
                    * if (poll_mode == PN532_POLL_MOD_106KBPS_A)
                    */
 
                   struct pn_target_type_a *t = (struct pn_target_type_a *) &r->target_data;
-                  pn532dbg("sens:0x%x  sel:0x%x", t->sens_res, t->sel_res);
-                  pn532dbg("idlen:0x%x ", t->nfcid_len);
+                  pn532err("sens:0x%x  sel:0x%x", t->sens_res, t->sel_res);
+                  pn532err("idlen:0x%x ", t->nfcid_len);
 
                   /* generate 32bit cid from id (could be longer)
                    * HACK: Using only top 4 bytes.
@@ -817,7 +817,7 @@ static int irq_handler(int irq, FAR void *context)
   (void) irq;
   (void) context;
 
-  /* pn532dbg("*IRQ*\n"); */
+  /* pn532err("*IRQ*\n"); */
   /* work_queue(HPWORK, &g_dev->irq_work, pn532_worker, dev, 0); */
 
   return OK;
@@ -1064,7 +1064,7 @@ static int _ioctl(FAR struct file *filep, int cmd, unsigned long arg)
       break;
 
     default:
-      pn532dbg("Unrecognized cmd: %d\n", cmd);
+      pn532err("Unrecognized cmd: %d\n", cmd);
       ret = -EINVAL;
       break;
     }
@@ -1105,7 +1105,7 @@ int pn532_register(FAR const char *devpath, FAR struct spi_dev_s *spi,
   dev = (FAR struct pn532_dev_s *)kmm_malloc(sizeof(struct pn532_dev_s));
   if (!dev)
     {
-      pn532dbg("Failed to allocate instance\n");
+      pn532err("Failed to allocate instance\n");
       return -ENOMEM;
     }
 
@@ -1123,7 +1123,7 @@ int pn532_register(FAR const char *devpath, FAR struct spi_dev_s *spi,
   ret = register_driver(devpath, &g_pn532fops, 0666, dev);
   if (ret < 0)
     {
-      pn532dbg("Failed to register driver: %d\n", ret);
+      pn532err("Failed to register driver: %d\n", ret);
       kmm_free(dev);
     }
 
diff --git a/fs/aio/aio_fsync.c b/fs/aio/aio_fsync.c
index 8070817595..fd08328db4 100644
--- a/fs/aio/aio_fsync.c
+++ b/fs/aio/aio_fsync.c
@@ -100,7 +100,7 @@ static void aio_fsync_worker(FAR void *arg)
   if (ret < 0)
     {
       int errcode = get_errno();
-      fdbg("ERROR: fsync failed: %d\n", errcode);
+      ferr("ERROR: fsync failed: %d\n", errcode);
       DEBUGASSERT(errcode > 0);
       aiocbp->aio_result = -errcode;
     }
diff --git a/fs/aio/aio_read.c b/fs/aio/aio_read.c
index b3e717b58b..6d261ec7d8 100644
--- a/fs/aio/aio_read.c
+++ b/fs/aio/aio_read.c
@@ -133,7 +133,7 @@ static void aio_read_worker(FAR void *arg)
   if (nread < 0)
     {
       int errcode = get_errno();
-      fdbg("ERROR: pread failed: %d\n", errcode);
+      ferr("ERROR: pread failed: %d\n", errcode);
       DEBUGASSERT(errcode > 0);
       aiocbp->aio_result = -errcode;
     }
diff --git a/fs/aio/aio_signal.c b/fs/aio/aio_signal.c
index 5a279044c8..702d7f5b84 100644
--- a/fs/aio/aio_signal.c
+++ b/fs/aio/aio_signal.c
@@ -102,7 +102,7 @@ int aio_signal(pid_t pid, FAR struct aiocb *aiocbp)
       if (status < 0)
         {
           errcode = get_errno();
-          fdbg("ERROR: sigqueue #1 failed: %d\n", errcode);
+          ferr("ERROR: sigqueue #1 failed: %d\n", errcode);
           ret = ERROR;
         }
     }
@@ -115,7 +115,7 @@ int aio_signal(pid_t pid, FAR struct aiocb *aiocbp)
       ret = sig_notification(pid, &aiocbp->aio_sigevent);
       if (ret < 0)
         {
-          fdbg("ERROR: sig_notification failed: %d\n", ret);
+          ferr("ERROR: sig_notification failed: %d\n", ret);
         }
     }
 #endif
@@ -133,7 +133,7 @@ int aio_signal(pid_t pid, FAR struct aiocb *aiocbp)
   if (status && ret == OK)
     {
       errcode = get_errno();
-      fdbg("ERROR: sigqueue #2 failed: %d\n", errcode);
+      ferr("ERROR: sigqueue #2 failed: %d\n", errcode);
       ret = ERROR;
     }
 
diff --git a/fs/aio/aio_write.c b/fs/aio/aio_write.c
index e9ed46d815..3d20b2dd93 100644
--- a/fs/aio/aio_write.c
+++ b/fs/aio/aio_write.c
@@ -125,7 +125,7 @@ static void aio_write_worker(FAR void *arg)
       if (oflags < 0)
         {
           int errcode = get_errno();
-          fdbg("ERROR: fcntl failed: %d\n", errcode);
+          ferr("ERROR: fcntl failed: %d\n", errcode);
           aiocbp->aio_result = -errcode;
           goto errout;
         }
@@ -180,7 +180,7 @@ static void aio_write_worker(FAR void *arg)
   if (nwritten < 0)
     {
       int errcode = get_errno();
-      fdbg("ERROR: write/pwrite failed: %d\n", errcode);
+      ferr("ERROR: write/pwrite failed: %d\n", errcode);
       DEBUGASSERT(errcode > 0);
       aiocbp->aio_result = -errcode;
     }
diff --git a/fs/binfs/fs_binfs.c b/fs/binfs/fs_binfs.c
index 1fed2e6c2a..dd5b1a976f 100644
--- a/fs/binfs/fs_binfs.c
+++ b/fs/binfs/fs_binfs.c
@@ -146,7 +146,7 @@ static int binfs_open(FAR struct file *filep, FAR const char *relpath,
 
   if ((oflags & O_WRONLY) != 0 || (oflags & O_RDONLY) == 0)
     {
-      fdbg("ERROR: Only O_RDONLY supported\n");
+      ferr("ERROR: Only O_RDONLY supported\n");
       return -EACCES;
     }
 
@@ -157,7 +157,7 @@ static int binfs_open(FAR struct file *filep, FAR const char *relpath,
   index = builtin_isavail(relpath);
   if (index < 0)
     {
-      fdbg("ERROR: Builting %s does not exist\n", relpath);
+      ferr("ERROR: Builting %s does not exist\n", relpath);
       return -ENOENT;
     }
 
diff --git a/fs/driver/fs_blockproxy.c b/fs/driver/fs_blockproxy.c
index 197b5534a5..045110ac40 100644
--- a/fs/driver/fs_blockproxy.c
+++ b/fs/driver/fs_blockproxy.c
@@ -174,7 +174,7 @@ int block_proxy(FAR const char *blkdev, int oflags)
   chardev = unique_chardev();
   if (chardev == NULL)
     {
-      fdbg("ERROR: Failed to create temporary device name\n");
+      ferr("ERROR: Failed to create temporary device name\n");
       return -ENOMEM;
     }
 
@@ -187,7 +187,7 @@ int block_proxy(FAR const char *blkdev, int oflags)
   ret = bchdev_register(blkdev, chardev, readonly);
   if (ret < 0)
     {
-      fdbg("ERROR: bchdev_register(%s, %s) failed: %d\n",
+      ferr("ERROR: bchdev_register(%s, %s) failed: %d\n",
            blkdev, chardev, ret);
 
       goto errout_with_chardev;
@@ -200,7 +200,7 @@ int block_proxy(FAR const char *blkdev, int oflags)
   if (fd < 0)
     {
       ret = -errno;
-      fdbg("ERROR: Failed to open %s: %d\n", chardev, ret);
+      ferr("ERROR: Failed to open %s: %d\n", chardev, ret);
       goto errout_with_bchdev;
     }
 
@@ -213,7 +213,7 @@ int block_proxy(FAR const char *blkdev, int oflags)
   if (ret < 0)
     {
       ret = -errno;
-      fdbg("ERROR: Failed to unlink %s: %d\n", chardev, ret);
+      ferr("ERROR: Failed to unlink %s: %d\n", chardev, ret);
     }
 
   /* Free the allocate character driver name and return the open file
diff --git a/fs/driver/fs_closeblockdriver.c b/fs/driver/fs_closeblockdriver.c
index ea39e99e53..defd3dcb5c 100644
--- a/fs/driver/fs_closeblockdriver.c
+++ b/fs/driver/fs_closeblockdriver.c
@@ -84,7 +84,7 @@ int close_blockdriver(FAR struct inode *inode)
 
   if (!INODE_IS_BLOCK(inode))
     {
-      fdbg("inode is not a block driver\n");
+      ferr("inode is not a block driver\n");
       ret = -ENOTBLK;
       goto errout;
    }
diff --git a/fs/driver/fs_findblockdriver.c b/fs/driver/fs_findblockdriver.c
index bfbb0ac59e..b2b47e4ecb 100644
--- a/fs/driver/fs_findblockdriver.c
+++ b/fs/driver/fs_findblockdriver.c
@@ -96,7 +96,7 @@ int find_blockdriver(FAR const char *pathname, int mountflags, FAR struct inode
   inode = inode_find(pathname, NULL);
   if (!inode)
     {
-      fdbg("Failed to find %s\n", pathname);
+      ferr("Failed to find %s\n", pathname);
       ret = -ENOENT;
       goto errout;
     }
@@ -105,7 +105,7 @@ int find_blockdriver(FAR const char *pathname, int mountflags, FAR struct inode
 
   if (!INODE_IS_BLOCK(inode))
     {
-      fdbg("%s is not a block driver\n", pathname);
+      ferr("%s is not a block driver\n", pathname);
       ret = -ENOTBLK;
       goto errout_with_inode;
     }
@@ -115,7 +115,7 @@ int find_blockdriver(FAR const char *pathname, int mountflags, FAR struct inode
   if (!inode->u.i_bops || !inode->u.i_bops->read ||
       (!inode->u.i_bops->write && (mountflags & MS_RDONLY) == 0))
     {
-      fdbg("%s does not support requested access\n", pathname);
+      ferr("%s does not support requested access\n", pathname);
       ret = -EACCES;
       goto errout_with_inode;
     }
diff --git a/fs/driver/fs_openblockdriver.c b/fs/driver/fs_openblockdriver.c
index bfdf3caadc..67a955cf57 100644
--- a/fs/driver/fs_openblockdriver.c
+++ b/fs/driver/fs_openblockdriver.c
@@ -96,7 +96,7 @@ int open_blockdriver(FAR const char *pathname, int mountflags,
   ret = find_blockdriver(pathname, mountflags, &inode);
   if (ret < 0)
     {
-      fdbg("Failed to file %s block driver\n", pathname);
+      ferr("Failed to file %s block driver\n", pathname);
       goto errout;
     }
 
@@ -110,7 +110,7 @@ int open_blockdriver(FAR const char *pathname, int mountflags,
       ret = inode->u.i_bops->open(inode);
       if (ret < 0)
         {
-          fdbg("%s driver open failed\n", pathname);
+          ferr("%s driver open failed\n", pathname);
           goto errout_with_inode;
         }
     }
diff --git a/fs/fat/fs_configfat.c b/fs/fat/fs_configfat.c
index f152e45dd1..3064a82f92 100644
--- a/fs/fat/fs_configfat.c
+++ b/fs/fat/fs_configfat.c
@@ -473,7 +473,7 @@ mkfatfs_tryfat12(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var,
 
       if (config->fc_nclusters + 2 > maxnclusters)
         {
-          fdbg("Too many clusters for FAT12: %d > %d\n",
+          ferr("Too many clusters for FAT12: %d > %d\n",
                config->fc_nclusters, maxnclusters - 2);
 
           return -ENFILE;
@@ -550,7 +550,7 @@ mkfatfs_tryfat16(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var,
       if ((config->fc_nclusters + 2 > maxnclusters) ||
           (config->fc_nclusters < FAT_MINCLUST16))
         {
-          fdbg("Too few or too many clusters for FAT16: %d < %d < %d\n",
+          ferr("Too few or too many clusters for FAT16: %d < %d < %d\n",
                FAT_MINCLUST16, config->fc_nclusters, maxnclusters - 2);
 
           return -ENFILE;
@@ -622,7 +622,7 @@ mkfatfs_tryfat32(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var,
       if ((config->fc_nclusters + 3 > maxnclusters) ||
           (config->fc_nclusters < FAT_MINCLUST32))
         {
-          fdbg("Too few or too many clusters for FAT32: %d < %d < %d\n",
+          ferr("Too few or too many clusters for FAT32: %d < %d < %d\n",
                FAT_MINCLUST32, config->fc_nclusters, maxnclusters - 3);
 
           return -ENFILE;
@@ -696,7 +696,7 @@ mkfatfs_clustersearch(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var)
 
       if (fmt->ff_rsvdseccount < 2)
         {
-          fdbg("At least 2 reserved sectors needed by FAT32\n");
+          ferr("At least 2 reserved sectors needed by FAT32\n");
           fatconfig32.fc_rsvdseccount = 2;
         }
       else
@@ -756,7 +756,7 @@ mkfatfs_clustersearch(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var)
 
           if (mkfatfs_tryfat12(fmt, var, &fatconfig12) != 0)
             {
-              fdbg("Cannot format FAT12 at %u sectors/cluster\n",
+              ferr("Cannot format FAT12 at %u sectors/cluster\n",
                    1 << fmt->ff_clustshift);
 
               fatconfig12.fc_nfatsects = 0;
@@ -772,7 +772,7 @@ mkfatfs_clustersearch(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var)
 
           if (mkfatfs_tryfat16(fmt, var, &fatconfig16) != 0)
             {
-              fdbg("Cannot format FAT16 at %u sectors/cluster\n",
+              ferr("Cannot format FAT16 at %u sectors/cluster\n",
                    1 << fmt->ff_clustshift);
 
               fatconfig16.fc_nfatsects = 0;
@@ -828,7 +828,7 @@ mkfatfs_clustersearch(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var)
 
           if (mkfatfs_tryfat32(fmt, var, &fatconfig32) != 0)
             {
-              fdbg("Cannot format FAT32 at %u sectors/cluster\n",
+              ferr("Cannot format FAT32 at %u sectors/cluster\n",
                    1 << fmt->ff_clustshift);
 
               fatconfig32.fc_nfatsects = 0;
@@ -897,7 +897,7 @@ int mkfatfs_configfatfs(FAR struct fat_format_s *fmt,
   ret = mkfatfs_clustersearch(fmt, var);
   if (ret < 0)
     {
-       fdbg("ERROR: Failed to set cluster size\n");
+       ferr("ERROR: Failed to set cluster size\n");
        return ret;
     }
 
@@ -940,7 +940,7 @@ int mkfatfs_configfatfs(FAR struct fat_format_s *fmt,
 
       if (fmt->ff_backupboot <= 1 || fmt->ff_backupboot >= fmt->ff_rsvdseccount)
         {
-          fdbg("Invalid backup boot sector: %d\n", fmt->ff_backupboot);
+          ferr("Invalid backup boot sector: %d\n", fmt->ff_backupboot);
           fmt->ff_backupboot = 0;
         }
 
@@ -974,21 +974,21 @@ int mkfatfs_configfatfs(FAR struct fat_format_s *fmt,
   /* Describe the configured filesystem */
 
 #ifdef CONFIG_DEBUG_FEATURES
-  fdbg("Sector size:          %d bytes\n",    var->fv_sectorsize);
-  fdbg("Number of sectors:    %d sectors\n",  fmt->ff_nsectors);
-  fdbg("FAT size:             %d bits\n",     var->fv_fattype);
-  fdbg("Number FATs:          %d\n",          fmt->ff_nfats);
-  fdbg("Sectors per cluster:  %d sectors\n",  1 << fmt->ff_clustshift);
-  fdbg("FS size:              %d sectors\n",  var->fv_nfatsects);
-  fdbg("                      %d clusters\n", var->fv_nclusters);
+  ferr("Sector size:          %d bytes\n",    var->fv_sectorsize);
+  ferr("Number of sectors:    %d sectors\n",  fmt->ff_nsectors);
+  ferr("FAT size:             %d bits\n",     var->fv_fattype);
+  ferr("Number FATs:          %d\n",          fmt->ff_nfats);
+  ferr("Sectors per cluster:  %d sectors\n",  1 << fmt->ff_clustshift);
+  ferr("FS size:              %d sectors\n",  var->fv_nfatsects);
+  ferr("                      %d clusters\n", var->fv_nclusters);
 
   if (var->fv_fattype != 32)
     {
-       fdbg("Root directory slots: %d\n", fmt->ff_rootdirentries);
+       ferr("Root directory slots: %d\n", fmt->ff_rootdirentries);
     }
 
-  fdbg("Volume ID:            %08x\n", fmt->ff_volumeid);
-  fdbg("Volume Label:         \"%c%c%c%c%c%c%c%c%c%c%c\"\n",
+  ferr("Volume ID:            %08x\n", fmt->ff_volumeid);
+  ferr("Volume Label:         \"%c%c%c%c%c%c%c%c%c%c%c\"\n",
     fmt->ff_volumelabel[0], fmt->ff_volumelabel[1], fmt->ff_volumelabel[2],
     fmt->ff_volumelabel[3], fmt->ff_volumelabel[4], fmt->ff_volumelabel[5],
     fmt->ff_volumelabel[6], fmt->ff_volumelabel[7], fmt->ff_volumelabel[8],
diff --git a/fs/fat/fs_fat32.c b/fs/fat/fs_fat32.c
index b35a600eec..46ace6fd89 100644
--- a/fs/fat/fs_fat32.c
+++ b/fs/fat/fs_fat32.c
@@ -624,7 +624,7 @@ fat_read_restart:
 
               if (ret == -EFAULT && !force_indirect)
                 {
-                  fdbg("DMA: read alignment error, restarting indirect\n");
+                  ferr("DMA: read alignment error, restarting indirect\n");
                   force_indirect = true;
                   goto fat_read_restart;
                 }
@@ -884,7 +884,7 @@ fat_write_restart:
 
               if (ret == -EFAULT && !force_indirect)
                 {
-                  fdbg("DMA: write alignment error, restarting indirect\n");
+                  ferr("DMA: write alignment error, restarting indirect\n");
                   force_indirect = true;
                   goto fat_write_restart;
                 }
diff --git a/fs/fat/fs_fat32util.c b/fs/fat/fs_fat32util.c
index 8e2bcac59e..1ed62cb1e7 100644
--- a/fs/fat/fs_fat32util.c
+++ b/fs/fat/fs_fat32util.c
@@ -121,7 +121,7 @@ static int fat_checkbootrecord(struct fat_mountpt_s *fs)
   if (MBR_GETSIGNATURE(fs->fs_buffer) != BOOT_SIGNATURE16 ||
       MBR_GETBYTESPERSEC(fs->fs_buffer) != fs->fs_hwsectorsize)
     {
-      fdbg("ERROR: Signature: %04x FS sectorsize: %d HW sectorsize: %d\n",
+      ferr("ERROR: Signature: %04x FS sectorsize: %d HW sectorsize: %d\n",
             MBR_GETSIGNATURE(fs->fs_buffer), MBR_GETBYTESPERSEC(fs->fs_buffer),
             fs->fs_hwsectorsize);
 
@@ -159,7 +159,7 @@ static int fat_checkbootrecord(struct fat_mountpt_s *fs)
 
   if (!fs->fs_nfatsects || fs->fs_nfatsects >= fs->fs_hwnsectors)
     {
-      fdbg("ERROR: fs_nfatsects %d fs_hwnsectors: %d\n",
+      ferr("ERROR: fs_nfatsects %d fs_hwnsectors: %d\n",
            fs->fs_nfatsects, fs->fs_hwnsectors);
 
       return -EINVAL;
@@ -179,7 +179,7 @@ static int fat_checkbootrecord(struct fat_mountpt_s *fs)
 
   if (!fs->fs_fattotsec || fs->fs_fattotsec > fs->fs_hwnsectors)
     {
-      fdbg("ERROR: fs_fattotsec %d fs_hwnsectors: %d\n",
+      ferr("ERROR: fs_fattotsec %d fs_hwnsectors: %d\n",
            fs->fs_fattotsec, fs->fs_hwnsectors);
 
       return -EINVAL;
@@ -190,7 +190,7 @@ static int fat_checkbootrecord(struct fat_mountpt_s *fs)
   fs->fs_fatresvdseccount = MBR_GETRESVDSECCOUNT(fs->fs_buffer);
   if (fs->fs_fatresvdseccount > fs->fs_hwnsectors)
     {
-      fdbg("ERROR: fs_fatresvdseccount %d fs_hwnsectors: %d\n",
+      ferr("ERROR: fs_fatresvdseccount %d fs_hwnsectors: %d\n",
            fs->fs_fatresvdseccount, fs->fs_hwnsectors);
 
       return -EINVAL;
@@ -206,7 +206,7 @@ static int fat_checkbootrecord(struct fat_mountpt_s *fs)
   ndatasectors = fs->fs_fattotsec - fs->fs_fatresvdseccount - ntotalfatsects - rootdirsectors;
   if (ndatasectors > fs->fs_hwnsectors)
     {
-      fdbg("ERROR: ndatasectors %d fs_hwnsectors: %d\n",
+      ferr("ERROR: ndatasectors %d fs_hwnsectors: %d\n",
            ndatasectors, fs->fs_hwnsectors);
 
       return -EINVAL;
@@ -239,7 +239,7 @@ static int fat_checkbootrecord(struct fat_mountpt_s *fs)
     }
   else
     {
-      fdbg("ERROR: notfat32: %d fs_nclusters: %d\n",
+      ferr("ERROR: notfat32: %d fs_nclusters: %d\n",
            notfat32, fs->fs_nclusters);
 
       return -EINVAL;
@@ -594,7 +594,7 @@ int fat_mount(struct fat_mountpt_s *fs, bool writeable)
             {
               /* Failed to read the sector */
 
-              fdbg("ERROR: Failed to read sector %ld: %d\n",
+              ferr("ERROR: Failed to read sector %ld: %d\n",
                    (long)fs->fs_fatbase, ret);
               continue;
             }
@@ -616,14 +616,14 @@ int fat_mount(struct fat_mountpt_s *fs, bool writeable)
           ret = fat_hwread(fs, fs->fs_buffer, 0, 1);
           if (ret < 0)
             {
-              fdbg("ERROR: Failed to re-read sector 0: %d\n", ret);
+              ferr("ERROR: Failed to re-read sector 0: %d\n", ret);
               goto errout_with_buffer;
             }
         }
 
       if (i > 3)
         {
-          fdbg("No valid MBR\n");
+          ferr("No valid MBR\n");
           ret = -EINVAL;
           goto errout_with_buffer;
         }
@@ -644,22 +644,22 @@ int fat_mount(struct fat_mountpt_s *fs, bool writeable)
 
   /* We did it! */
 
-  fdbg("FAT%d:\n", fs->fs_type == 0 ? 12 : fs->fs_type == 1  ? 16 : 32);
-  fdbg("\tHW  sector size:     %d\n", fs->fs_hwsectorsize);
-  fdbg("\t    sectors:         %d\n", fs->fs_hwnsectors);
-  fdbg("\tFAT reserved:        %d\n", fs->fs_fatresvdseccount);
-  fdbg("\t    sectors:         %d\n", fs->fs_fattotsec);
-  fdbg("\t    start sector:    %d\n", fs->fs_fatbase);
-  fdbg("\t    root sector:     %d\n", fs->fs_rootbase);
-  fdbg("\t    root entries:    %d\n", fs->fs_rootentcnt);
-  fdbg("\t    data sector:     %d\n", fs->fs_database);
-  fdbg("\t    FSINFO sector:   %d\n", fs->fs_fsinfo);
-  fdbg("\t    Num FATs:        %d\n", fs->fs_fatnumfats);
-  fdbg("\t    FAT sectors:     %d\n", fs->fs_nfatsects);
-  fdbg("\t    sectors/cluster: %d\n", fs->fs_fatsecperclus);
-  fdbg("\t    max clusters:    %d\n", fs->fs_nclusters);
-  fdbg("\tFSI free count       %d\n", fs->fs_fsifreecount);
-  fdbg("\t    next free        %d\n", fs->fs_fsinextfree);
+  ferr("FAT%d:\n", fs->fs_type == 0 ? 12 : fs->fs_type == 1  ? 16 : 32);
+  ferr("\tHW  sector size:     %d\n", fs->fs_hwsectorsize);
+  ferr("\t    sectors:         %d\n", fs->fs_hwnsectors);
+  ferr("\tFAT reserved:        %d\n", fs->fs_fatresvdseccount);
+  ferr("\t    sectors:         %d\n", fs->fs_fattotsec);
+  ferr("\t    start sector:    %d\n", fs->fs_fatbase);
+  ferr("\t    root sector:     %d\n", fs->fs_rootbase);
+  ferr("\t    root entries:    %d\n", fs->fs_rootentcnt);
+  ferr("\t    data sector:     %d\n", fs->fs_database);
+  ferr("\t    FSINFO sector:   %d\n", fs->fs_fsinfo);
+  ferr("\t    Num FATs:        %d\n", fs->fs_fatnumfats);
+  ferr("\t    FAT sectors:     %d\n", fs->fs_nfatsects);
+  ferr("\t    sectors/cluster: %d\n", fs->fs_fatsecperclus);
+  ferr("\t    max clusters:    %d\n", fs->fs_nclusters);
+  ferr("\tFSI free count       %d\n", fs->fs_fsifreecount);
+  ferr("\t    next free        %d\n", fs->fs_fsinextfree);
 
   return OK;
 
diff --git a/fs/fat/fs_mkfatfs.c b/fs/fat/fs_mkfatfs.c
index 6e083703c6..75269a602b 100644
--- a/fs/fat/fs_mkfatfs.c
+++ b/fs/fat/fs_mkfatfs.c
@@ -86,13 +86,13 @@ static inline int mkfatfs_getgeometry(FAR struct fat_format_s *fmt,
   ret = DEV_GEOMETRY(geometry);
   if (ret < 0)
     {
-      fdbg("ERROR: geometry() returned %d\n", ret);
+      ferr("ERROR: geometry() returned %d\n", ret);
       return ret;
     }
 
   if (!geometry.geo_available || !geometry.geo_writeenabled)
     {
-      fdbg("ERROR: Media is not available\n", ret);
+      ferr("ERROR: Media is not available\n", ret);
       return -ENODEV;
     }
 
@@ -104,7 +104,7 @@ static inline int mkfatfs_getgeometry(FAR struct fat_format_s *fmt,
     {
       if (fmt->ff_nsectors > geometry.geo_nsectors)
         {
-          fdbg("ERROR: User maxblocks (%d) exceeds blocks on device (%d)\n",
+          ferr("ERROR: User maxblocks (%d) exceeds blocks on device (%d)\n",
                fmt->ff_nsectors, geometry.geo_nsectors);
 
           return -EINVAL;
@@ -139,7 +139,7 @@ static inline int mkfatfs_getgeometry(FAR struct fat_format_s *fmt,
         break;
 
       default:
-        fdbg("ERROR: Unsupported sector size: %d\n", var->fv_sectorsize);
+        ferr("ERROR: Unsupported sector size: %d\n", var->fv_sectorsize);
         return -EPERM;
     }
 
@@ -196,14 +196,14 @@ int mkfatfs(FAR const char *pathname, FAR struct fat_format_s *fmt)
 #ifdef CONFIG_DEBUG_FEATURES
   if (!pathname)
     {
-      fdbg("ERROR: No block driver path\n");
+      ferr("ERROR: No block driver path\n");
       ret = -EINVAL;
       goto errout;
     }
 
   if (fmt->ff_nfats < 1 || fmt->ff_nfats > 4)
     {
-      fdbg("ERROR: Invalid number of fats: %d\n", fmt->ff_nfats);
+      ferr("ERROR: Invalid number of fats: %d\n", fmt->ff_nfats);
       ret = -EINVAL;
       goto errout;
     }
@@ -211,7 +211,7 @@ int mkfatfs(FAR const char *pathname, FAR struct fat_format_s *fmt)
   if (fmt->ff_fattype != 0  && fmt->ff_fattype != 12 &&
       fmt->ff_fattype != 16 && fmt->ff_fattype != 32)
     {
-      fdbg("ERROR: Invalid FAT size: %d\n", fmt->ff_fattype);
+      ferr("ERROR: Invalid FAT size: %d\n", fmt->ff_fattype);
       ret = -EINVAL;
       goto errout;
     }
@@ -231,7 +231,7 @@ int mkfatfs(FAR const char *pathname, FAR struct fat_format_s *fmt)
 #ifdef CONFIG_DEBUG_FEATURES
   if (fmt->ff_clustshift > 7 && fmt->ff_clustshift != 0xff)
     {
-      fdbg("ERROR: Invalid cluster shift value: %d\n", fmt->ff_clustshift);
+      ferr("ERROR: Invalid cluster shift value: %d\n", fmt->ff_clustshift);
 
       ret = -EINVAL;
       goto errout;
@@ -240,7 +240,7 @@ int mkfatfs(FAR const char *pathname, FAR struct fat_format_s *fmt)
    if (fmt->ff_rootdirentries != 0 &&
        (fmt->ff_rootdirentries < 16 || fmt->ff_rootdirentries > 32767))
     {
-      fdbg("ERROR: Invalid number of root dir entries: %d\n",
+      ferr("ERROR: Invalid number of root dir entries: %d\n",
            fmt->ff_rootdirentries);
 
       ret = -EINVAL;
@@ -250,7 +250,7 @@ int mkfatfs(FAR const char *pathname, FAR struct fat_format_s *fmt)
    if (fmt->ff_rsvdseccount != 0 && (fmt->ff_rsvdseccount < 1 ||
        fmt->ff_rsvdseccount > 32767))
     {
-      fdbg("ERROR: Invalid number of reserved sectors: %d\n",
+      ferr("ERROR: Invalid number of reserved sectors: %d\n",
            fmt->ff_rsvdseccount);
 
       ret = -EINVAL;
@@ -263,7 +263,7 @@ int mkfatfs(FAR const char *pathname, FAR struct fat_format_s *fmt)
   ret = open_blockdriver(pathname, 0, &var.fv_inode);
   if (ret < 0)
     {
-      fdbg("ERROR: Failed to open %s\n", pathname);
+      ferr("ERROR: Failed to open %s\n", pathname);
       goto errout;
     }
 
@@ -271,7 +271,7 @@ int mkfatfs(FAR const char *pathname, FAR struct fat_format_s *fmt)
 
   if (!var.fv_inode->u.i_bops->write || !var.fv_inode->u.i_bops->geometry)
     {
-      fdbg("ERROR: %s does not support write or geometry methods\n",
+      ferr("ERROR: %s does not support write or geometry methods\n",
             pathname);
 
       ret = -EACCES;
@@ -306,7 +306,7 @@ int mkfatfs(FAR const char *pathname, FAR struct fat_format_s *fmt)
 
   if (!var.fv_sect)
     {
-      fdbg("ERROR: Failed to allocate working buffers\n");
+      ferr("ERROR: Failed to allocate working buffers\n");
       goto errout_with_driver;
     }
 
diff --git a/fs/mmap/fs_mmap.c b/fs/mmap/fs_mmap.c
index fd23f7647b..222a2591b2 100644
--- a/fs/mmap/fs_mmap.c
+++ b/fs/mmap/fs_mmap.c
@@ -135,14 +135,14 @@ FAR void *mmap(FAR void *start, size_t length, int prot, int flags,
   if (prot == PROT_NONE ||
       (flags & (MAP_PRIVATE | MAP_FIXED | MAP_ANONYMOUS | MAP_DENYWRITE)) != 0)
     {
-      fdbg("Unsupported options, prot=%x flags=%04x\n", prot, flags);
+      ferr("Unsupported options, prot=%x flags=%04x\n", prot, flags);
       set_errno(ENOSYS);
       return MAP_FAILED;
     }
 
   if (length == 0 || (flags & MAP_SHARED) == 0)
     {
-      fdbg("Invalid options, lengt=%d flags=%04x\n", length, flags);
+      ferr("Invalid options, lengt=%d flags=%04x\n", length, flags);
       set_errno(EINVAL);
       return MAP_FAILED;
     }
@@ -163,7 +163,7 @@ FAR void *mmap(FAR void *start, size_t length, int prot, int flags,
 #ifdef CONFIG_FS_RAMMAP
       return rammap(fd, length, offset);
 #else
-      fdbg("ioctl(FIOC_MMAP) failed: %d\n", get_errno());
+      ferr("ioctl(FIOC_MMAP) failed: %d\n", get_errno());
       return MAP_FAILED;
 #endif
     }
diff --git a/fs/mmap/fs_munmap.c b/fs/mmap/fs_munmap.c
index f15f34847a..cf53957085 100644
--- a/fs/mmap/fs_munmap.c
+++ b/fs/mmap/fs_munmap.c
@@ -143,7 +143,7 @@ int munmap(FAR void *start, size_t length)
 
   if (!curr)
     {
-      fdbg("Region not found\n");
+      ferr("Region not found\n");
       errcode = EINVAL;
       goto errout_with_semaphore;
     }
@@ -158,7 +158,7 @@ int munmap(FAR void *start, size_t length)
   offset = start - curr->addr;
   if (offset + length < curr->length)
     {
-      fdbg("Cannot umap without unmapping to the end\n");
+      ferr("Cannot umap without unmapping to the end\n");
       errcode = ENOSYS;
       goto errout_with_semaphore;
     }
diff --git a/fs/mmap/fs_rammap.c b/fs/mmap/fs_rammap.c
index 39ff5a24b1..22ccd7aeea 100644
--- a/fs/mmap/fs_rammap.c
+++ b/fs/mmap/fs_rammap.c
@@ -142,7 +142,7 @@ FAR void *rammap(int fd, size_t length, off_t offset)
   alloc = (FAR uint8_t *)kumm_malloc(sizeof(struct fs_rammap_s) + length);
   if (!alloc)
     {
-      fdbg("Region allocation failed, length: %d\n", (int)length);
+      ferr("Region allocation failed, length: %d\n", (int)length);
       errcode = ENOMEM;
       goto errout;
     }
@@ -164,7 +164,7 @@ FAR void *rammap(int fd, size_t length, off_t offset)
        * the correct response.
        */
 
-      fdbg("Seek to position %d failed\n", (int)offset);
+      ferr("Seek to position %d failed\n", (int)offset);
       errcode = EINVAL;
       goto errout_with_region;
     }
@@ -186,11 +186,11 @@ FAR void *rammap(int fd, size_t length, off_t offset)
             {
               /* All other read errors are bad.  errno is already set.
                * (but maybe should be forced to EINVAL?).  NOTE that if
-               * FS DEBUG is enabled, then the following fdbg() macro will
+               * FS DEBUG is enabled, then the following ferr() macro will
                * destroy the errno value.
                */
 
-              fdbg("Read failed: offset=%d errno=%d\n", (int)offset, errcode);
+              ferr("Read failed: offset=%d errno=%d\n", (int)offset, errcode);
 #ifdef CONFIG_DEBUG_FS
               goto errout_with_region;
 #else
diff --git a/fs/mount/fs_automount.c b/fs/mount/fs_automount.c
index 8f2c337c3d..689e58051a 100644
--- a/fs/mount/fs_automount.c
+++ b/fs/mount/fs_automount.c
@@ -204,13 +204,13 @@ static void automount_mount(FAR struct automounter_state_s *priv)
        * try to unmount again because the mount might be stale.
        */
 
-      fdbg("WARNING: Mountpoint %s already exists\n", lower->mountpoint);
+      ferr("WARNING: Mountpoint %s already exists\n", lower->mountpoint);
       ret = automount_unmount(priv);
       if (ret < 0)
         {
           /* We failed to unmount (again?).  Complain and abort. */
 
-          fdbg("ERROR: automount_unmount failed: %d\n", ret);
+          ferr("ERROR: automount_unmount failed: %d\n", ret);
           return;
         }
 
@@ -232,7 +232,7 @@ static void automount_mount(FAR struct automounter_state_s *priv)
           int errcode = get_errno();
           DEBUGASSERT(errcode > 0);
 
-          fdbg("ERROR: Mount failed: %d\n", errcode);
+          ferr("ERROR: Mount failed: %d\n", errcode);
           UNUSED(errcode);
           return;
         }
@@ -243,7 +243,7 @@ static void automount_mount(FAR struct automounter_state_s *priv)
       break;
 
     default:
-      fdbg("ERROR: automount_findinode failed: %d\n", ret);
+      ferr("ERROR: automount_findinode failed: %d\n", ret);
       break;
     }
 }
@@ -306,7 +306,7 @@ static int automount_unmount(FAR struct automounter_state_s *priv)
                   errcode = get_errno();
                   DEBUGASSERT(errcode > 0);
 
-                  fdbg("ERROR: wd_start failed: %d\n", errcode);
+                  ferr("ERROR: wd_start failed: %d\n", errcode);
                   return -ret;
                 }
             }
@@ -332,7 +332,7 @@ static int automount_unmount(FAR struct automounter_state_s *priv)
       return OK;
 
     default:
-      fdbg("ERROR: automount_findinode failed: %d\n", ret);
+      ferr("ERROR: automount_findinode failed: %d\n", ret);
       return ret;
     }
 }
@@ -382,7 +382,7 @@ static void automount_timeout(int argc, uint32_t arg1, ...)
     {
       /* NOTE: Currently, work_queue only returns success */
 
-      fdbg("ERROR: Failed to schedule work: %d\n", ret);
+      ferr("ERROR: Failed to schedule work: %d\n", ret);
     }
 }
 
@@ -475,7 +475,7 @@ static int automount_interrupt(FAR const struct automount_lower_s *lower,
     {
       /* NOTE: Currently, work_cancel only returns success */
 
-      fdbg("ERROR: Failed to cancel work: %d\n", ret);
+      ferr("ERROR: Failed to cancel work: %d\n", ret);
     }
 
   /* Set the media insertion/removal state */
@@ -496,7 +496,7 @@ static int automount_interrupt(FAR const struct automount_lower_s *lower,
     {
       /* NOTE: Currently, work_queue only returns success */
 
-      fdbg("ERROR: Failed to schedule work: %d\n", ret);
+      ferr("ERROR: Failed to schedule work: %d\n", ret);
     }
   else
     {
@@ -542,7 +542,7 @@ FAR void *automount_initialize(FAR const struct automount_lower_s *lower)
 
   if (!priv)
     {
-      fdbg("ERROR: Failed to allocate state structure\n");
+      ferr("ERROR: Failed to allocate state structure\n");
       return NULL;
     }
 
@@ -555,7 +555,7 @@ FAR void *automount_initialize(FAR const struct automount_lower_s *lower)
   priv->wdog  = wd_create();
   if (!priv->wdog)
     {
-      fdbg("ERROR: Failed to create a timer\n");
+      ferr("ERROR: Failed to create a timer\n");
       automount_uninitialize(priv);
       return NULL;
     }
@@ -574,7 +574,7 @@ FAR void *automount_initialize(FAR const struct automount_lower_s *lower)
     {
       /* NOTE: Currently, work_queue only returns success */
 
-      fdbg("ERROR: Failed to schedule work: %d\n", ret);
+      ferr("ERROR: Failed to schedule work: %d\n", ret);
     }
 
   /* Attach and enable automounter interrupts */
@@ -582,7 +582,7 @@ FAR void *automount_initialize(FAR const struct automount_lower_s *lower)
   ret = AUTOMOUNT_ATTACH(lower, automount_interrupt, priv);
   if (ret < 0)
     {
-      fdbg("ERROR: Failed to attach automount interrupt: %d\n", ret);
+      ferr("ERROR: Failed to attach automount interrupt: %d\n", ret);
       automount_uninitialize(priv);
       return NULL;
     }
diff --git a/fs/mount/fs_mount.c b/fs/mount/fs_mount.c
index f3ab72bc93..04e7bc3a9e 100644
--- a/fs/mount/fs_mount.c
+++ b/fs/mount/fs_mount.c
@@ -256,7 +256,7 @@ int mount(FAR const char *source, FAR const char *target,
       ret = find_blockdriver(source, mountflags, &blkdrvr_inode);
       if (ret < 0)
         {
-          fdbg("ERROR: Failed to find block driver %s\n", source);
+          ferr("ERROR: Failed to find block driver %s\n", source);
           errcode = -ret;
           goto errout;
         }
@@ -270,7 +270,7 @@ int mount(FAR const char *source, FAR const char *target,
   else
 #endif /* NONBDFS_SUPPORT */
     {
-      fdbg("ERROR: Failed to find file system %s\n", filesystemtype);
+      ferr("ERROR: Failed to find file system %s\n", filesystemtype);
       errcode = ENODEV;
       goto errout;
     }
@@ -289,7 +289,7 @@ int mount(FAR const char *source, FAR const char *target,
 
       if (INODE_IS_SPECIAL(mountpt_inode))
         {
-          fdbg("ERROR: target %s exists and is a special nodes\n", target);
+          ferr("ERROR: target %s exists and is a special nodes\n", target);
           errcode = -ENOTDIR;
           goto errout_with_semaphore;
         }
@@ -321,7 +321,7 @@ int mount(FAR const char *source, FAR const char *target,
            *  -ENOMEM - Failed to allocate in-memory resources for the operation
            */
 
-          fdbg("ERROR: Failed to reserve inode for target %s\n", target);
+          ferr("ERROR: Failed to reserve inode for target %s\n", target);
           errcode = -ret;
           goto errout_with_semaphore;
         }
@@ -336,7 +336,7 @@ int mount(FAR const char *source, FAR const char *target,
     {
       /* The filesystem does not support the bind operation ??? */
 
-      fdbg("ERROR: Filesystem does not support bind\n");
+      ferr("ERROR: Filesystem does not support bind\n");
       errcode = EINVAL;
       goto errout_with_mountpt;
     }
@@ -366,7 +366,7 @@ int mount(FAR const char *source, FAR const char *target,
        * error.
        */
 
-      fdbg("ERROR: Bind method failed: %d\n", ret);
+      ferr("ERROR: Bind method failed: %d\n", ret);
 #ifdef BDFS_SUPPORT
 #ifdef NONBDFS_SUPPORT
       if (blkdrvr_inode)
@@ -441,7 +441,7 @@ errout:
   return ERROR;
 
 #else
-  fdbg("ERROR: No filesystems enabled\n");
+  ferr("ERROR: No filesystems enabled\n");
   set_errno(ENOSYS);
   return ERROR;
 #endif /* BDFS_SUPPORT || NONBDFS_SUPPORT */
diff --git a/fs/nfs/nfs_util.c b/fs/nfs/nfs_util.c
index f811e01480..7fa0944026 100644
--- a/fs/nfs/nfs_util.c
+++ b/fs/nfs/nfs_util.c
@@ -103,7 +103,7 @@ static inline int nfs_pathsegment(FAR const char **path, FAR char *buffer,
         }
       else if (nbytes >= NAME_MAX)
         {
-          fdbg("File name segment is too long: %d\n", *path);
+          ferr("File name segment is too long: %d\n", *path);
           return EFBIG;
         }
       else
@@ -205,7 +205,7 @@ tryagain:
                           request, reqlen, response, resplen);
   if (error != 0)
     {
-      fdbg("ERROR: rpcclnt_request failed: %d\n", error);
+      ferr("ERROR: rpcclnt_request failed: %d\n", error);
       return error;
     }
 
@@ -237,7 +237,7 @@ tryagain:
           goto tryagain;
         }
 
-      fdbg("ERROR: NFS error %d from server\n", error);
+      ferr("ERROR: NFS error %d from server\n", error);
       return error;
     }
 
@@ -277,7 +277,7 @@ int nfs_lookup(struct nfsmount *nmp, FAR const char *filename,
   namelen = strlen(filename);
   if (namelen > NAME_MAX)
     {
-      fdbg("Length of the string is too big: %d\n", namelen);
+      ferr("Length of the string is too big: %d\n", namelen);
       return E2BIG;
     }
 
@@ -312,7 +312,7 @@ int nfs_lookup(struct nfsmount *nmp, FAR const char *filename,
 
   if (error)
     {
-      fdbg("ERROR: nfs_request failed: %d\n", error);
+      ferr("ERROR: nfs_request failed: %d\n", error);
       return error;
     }
 
@@ -329,7 +329,7 @@ int nfs_lookup(struct nfsmount *nmp, FAR const char *filename,
   value = fxdr_unsigned(uint32_t, value);
   if (value > NFSX_V3FHMAX)
     {
-      fdbg("ERROR: Bad file handle length: %d\n", value);
+      ferr("ERROR: Bad file handle length: %d\n", value);
       return EIO;
     }
 
@@ -427,7 +427,7 @@ int nfs_findnode(struct nfsmount *nmp, FAR const char *relpath,
         {
           /* The filename segment contains is too long. */
 
-          fdbg("nfs_pathsegment of \"%s\" failed after \"%s\": %d\n",
+          ferr("nfs_pathsegment of \"%s\" failed after \"%s\": %d\n",
                relpath, buffer, error);
           return error;
         }
@@ -437,7 +437,7 @@ int nfs_findnode(struct nfsmount *nmp, FAR const char *relpath,
       error = nfs_lookup(nmp, buffer, fhandle, obj_attributes, dir_attributes);
       if (error != OK)
         {
-          fdbg("nfs_lookup of \"%s\" failed at \"%s\": %d\n",
+          ferr("nfs_lookup of \"%s\" failed at \"%s\": %d\n",
                 relpath, buffer, error);
           return error;
         }
@@ -466,7 +466,7 @@ int nfs_findnode(struct nfsmount *nmp, FAR const char *relpath,
         {
           /* Ooops.. we found something else */
 
-          fdbg("ERROR: Intermediate segment \"%s\" of \'%s\" is not a directory\n",
+          ferr("ERROR: Intermediate segment \"%s\" of \'%s\" is not a directory\n",
                buffer, path);
           return ENOTDIR;
         }
@@ -521,7 +521,7 @@ int nfs_finddir(struct nfsmount *nmp, FAR const char *relpath,
         {
           /* The filename segment contains is too long. */
 
-          fdbg("nfs_pathsegment of \"%s\" failed after \"%s\": %d\n",
+          ferr("nfs_pathsegment of \"%s\" failed after \"%s\": %d\n",
                relpath, filename, error);
           return error;
         }
@@ -545,7 +545,7 @@ int nfs_finddir(struct nfsmount *nmp, FAR const char *relpath,
       error = nfs_lookup(nmp, filename, fhandle, attributes, NULL);
       if (error != OK)
         {
-          fdbg("nfs_lookup of \"%s\" failed at \"%s\": %d\n",
+          ferr("nfs_lookup of \"%s\" failed at \"%s\": %d\n",
                 relpath, filename, error);
           return error;
         }
@@ -557,7 +557,7 @@ int nfs_finddir(struct nfsmount *nmp, FAR const char *relpath,
         {
           /* Ooops.. we found something else */
 
-          fdbg("ERROR: Intermediate segment \"%s\" of \'%s\" is not a directory\n",
+          ferr("ERROR: Intermediate segment \"%s\" of \'%s\" is not a directory\n",
                filename, path);
           return ENOTDIR;
         }
diff --git a/fs/nfs/nfs_vfsops.c b/fs/nfs/nfs_vfsops.c
index fb23c5a2fa..aacc003c50 100644
--- a/fs/nfs/nfs_vfsops.c
+++ b/fs/nfs/nfs_vfsops.c
@@ -218,7 +218,7 @@ static int nfs_filecreate(FAR struct nfsmount *nmp, struct nfsnode *np,
   error = nfs_finddir(nmp, relpath, &fhandle, &fattr, filename);
   if (error != OK)
     {
-      fdbg("ERROR: nfs_finddir returned: %d\n", error);
+      ferr("ERROR: nfs_finddir returned: %d\n", error);
       return error;
     }
 
@@ -340,7 +340,7 @@ static int nfs_filecreate(FAR struct nfsmount *nmp, struct nfsnode *np,
       tmp = *ptr++;  /* handle_follows */
       if (!tmp)
         {
-          fdbg("ERROR: no file handle follows\n");
+          ferr("ERROR: no file handle follows\n");
           return EINVAL;
         }
 
@@ -357,7 +357,7 @@ static int nfs_filecreate(FAR struct nfsmount *nmp, struct nfsnode *np,
       tmp = *ptr;  /* handle_follows */
       if (!tmp)
         {
-          fdbg("WARNING: no file attributes\n");
+          ferr("WARNING: no file attributes\n");
         }
       else
         {
@@ -427,7 +427,7 @@ static int nfs_filetruncate(FAR struct nfsmount *nmp, struct nfsnode *np)
                       (FAR void *)nmp->nm_iobuffer, nmp->nm_buflen);
   if (error != OK)
     {
-      fdbg("ERROR: nfs_request failed: %d\n", error);
+      ferr("ERROR: nfs_request failed: %d\n", error);
       return error;
     }
 
@@ -462,7 +462,7 @@ static int nfs_fileopen(FAR struct nfsmount *nmp, struct nfsnode *np,
   error = nfs_findnode(nmp, relpath, &fhandle, &fattr, NULL);
   if (error != OK)
     {
-      fdbg("ERROR: nfs_findnode returned: %d\n", error);
+      ferr("ERROR: nfs_findnode returned: %d\n", error);
       return error;
     }
 
@@ -473,7 +473,7 @@ static int nfs_fileopen(FAR struct nfsmount *nmp, struct nfsnode *np,
     {
       /* Exit with EISDIR if we attempt to open a directory */
 
-      fdbg("ERROR: Path is a directory\n");
+      ferr("ERROR: Path is a directory\n");
       return EISDIR;
     }
 
@@ -489,7 +489,7 @@ static int nfs_fileopen(FAR struct nfsmount *nmp, struct nfsnode *np,
       tmp = fxdr_unsigned(uint32_t, fattr.fa_mode);
       if ((tmp & (NFSMODE_IWOTH | NFSMODE_IWGRP | NFSMODE_IWUSR)) == 0)
         {
-          fdbg("ERROR: File is read-only: %08x\n", tmp);
+          ferr("ERROR: File is read-only: %08x\n", tmp);
           return EACCES;
         }
     }
@@ -500,7 +500,7 @@ static int nfs_fileopen(FAR struct nfsmount *nmp, struct nfsnode *np,
     {
       /* Already exists -- can't create it exclusively */
 
-      fdbg("ERROR: File exists\n");
+      ferr("ERROR: File exists\n");
       return EEXIST;
     }
 
@@ -567,7 +567,7 @@ static int nfs_open(FAR struct file *filep, FAR const char *relpath,
   np = (struct nfsnode *)kmm_zalloc(sizeof(struct nfsnode));
   if (!np)
     {
-      fdbg("ERROR: Failed to allocate private data\n");
+      ferr("ERROR: Failed to allocate private data\n");
       return -ENOMEM;
     }
 
@@ -577,7 +577,7 @@ static int nfs_open(FAR struct file *filep, FAR const char *relpath,
   error = nfs_checkmount(nmp);
   if (error != OK)
     {
-      fdbg("ERROR: nfs_checkmount failed: %d\n", error);
+      ferr("ERROR: nfs_checkmount failed: %d\n", error);
       goto errout_with_semaphore;
     }
 
@@ -594,7 +594,7 @@ static int nfs_open(FAR struct file *filep, FAR const char *relpath,
 
       if (error != ENOENT)
         {
-          fdbg("ERROR: nfs_findnode failed: %d\n", error);
+          ferr("ERROR: nfs_findnode failed: %d\n", error);
           goto errout_with_semaphore;
         }
 
@@ -609,7 +609,7 @@ static int nfs_open(FAR struct file *filep, FAR const char *relpath,
            * to create it.
            */
 
-          fdbg("ERROR: File does not exist\n");
+          ferr("ERROR: File does not exist\n");
            error = ENOENT;
           goto errout_with_semaphore;
         }
@@ -619,7 +619,7 @@ static int nfs_open(FAR struct file *filep, FAR const char *relpath,
       error = nfs_filecreate(nmp, np, relpath, mode);
       if (error != OK)
         {
-          fdbg("ERROR: nfs_filecreate failed: %d\n", error);
+          ferr("ERROR: nfs_filecreate failed: %d\n", error);
           goto errout_with_semaphore;
         }
     }
@@ -790,7 +790,7 @@ static ssize_t nfs_read(FAR struct file *filep, char *buffer, size_t buflen)
   error = nfs_checkmount(nmp);
   if (error != OK)
     {
-      fdbg("nfs_checkmount failed: %d\n", error);
+      ferr("nfs_checkmount failed: %d\n", error);
       goto errout_with_semaphore;
     }
 
@@ -859,7 +859,7 @@ static ssize_t nfs_read(FAR struct file *filep, char *buffer, size_t buflen)
                           (FAR void *)nmp->nm_iobuffer, nmp->nm_buflen);
       if (error)
         {
-          fdbg("ERROR: nfs_request failed: %d\n", error);
+          ferr("ERROR: nfs_request failed: %d\n", error);
           goto errout_with_semaphore;
         }
 
@@ -966,7 +966,7 @@ static ssize_t nfs_write(FAR struct file *filep, const char *buffer,
   error = nfs_checkmount(nmp);
   if (error != OK)
     {
-      fdbg("nfs_checkmount failed: %d\n", error);
+      ferr("nfs_checkmount failed: %d\n", error);
       goto errout_with_semaphore;
     }
 
@@ -1043,7 +1043,7 @@ static ssize_t nfs_write(FAR struct file *filep, const char *buffer,
                           (FAR void *)&nmp->nm_msgbuffer.write, sizeof(struct rpc_reply_write));
       if (error)
         {
-          fdbg("ERROR: nfs_request failed: %d\n", error);
+          ferr("ERROR: nfs_request failed: %d\n", error);
           goto errout_with_semaphore;
         }
 
@@ -1146,7 +1146,7 @@ static int nfs_dup(FAR const struct file *oldp, FAR struct file *newp)
   error = nfs_checkmount(nmp);
   if (error != OK)
     {
-      fdbg("ERROR: nfs_checkmount failed: %d\n", error);
+      ferr("ERROR: nfs_checkmount failed: %d\n", error);
       nfs_semgive(nmp);
       return -error;
     }
@@ -1213,7 +1213,7 @@ static int nfs_opendir(struct inode *mountpt, const char *relpath,
   error = nfs_checkmount(nmp);
   if (error != OK)
     {
-      fdbg("ERROR: nfs_checkmount failed: %d\n", error);
+      ferr("ERROR: nfs_checkmount failed: %d\n", error);
       goto errout_with_semaphore;
     }
 
@@ -1222,7 +1222,7 @@ static int nfs_opendir(struct inode *mountpt, const char *relpath,
   error = nfs_findnode(nmp, relpath, &fhandle, &obj_attributes, NULL);
   if (error != OK)
     {
-      fdbg("ERROR: nfs_findnode failed: %d\n", error);
+      ferr("ERROR: nfs_findnode failed: %d\n", error);
       goto errout_with_semaphore;
     }
 
@@ -1231,7 +1231,7 @@ static int nfs_opendir(struct inode *mountpt, const char *relpath,
   objtype = fxdr_unsigned(uint32_t, obj_attributes.fa_type);
   if (objtype != NFDIR)
     {
-      fdbg("ERROR:  Not a directory, type=%d\n", objtype);
+      ferr("ERROR:  Not a directory, type=%d\n", objtype);
       error = ENOTDIR;
       goto errout_with_semaphore;
     }
@@ -1289,7 +1289,7 @@ static int nfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir)
   error = nfs_checkmount(nmp);
   if (error != OK)
     {
-      fdbg("ERROR: nfs_checkmount failed: %d\n", error);
+      ferr("ERROR: nfs_checkmount failed: %d\n", error);
       goto errout_with_semaphore;
     }
 
@@ -1333,7 +1333,7 @@ static int nfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir)
                       (FAR void *)nmp->nm_iobuffer, nmp->nm_buflen);
   if (error != OK)
     {
-      fdbg("ERROR: nfs_request failed: %d\n", error);
+      ferr("ERROR: nfs_request failed: %d\n", error);
       goto errout_with_semaphore;
     }
 
@@ -1449,7 +1449,7 @@ static int nfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir)
   error = nfs_lookup(nmp, dir->fd_dir.d_name, &fhandle, &obj_attributes, NULL);
   if (error != OK)
     {
-      fdbg("nfs_lookup failed: %d\n", error);
+      ferr("nfs_lookup failed: %d\n", error);
       goto errout_with_semaphore;
     }
 
@@ -1574,7 +1574,7 @@ static void nfs_decode_args(FAR struct nfs_mount_parameters *nprmt,
     }
   else
     {
-      fdbg("ERROR: Only SOCK_DRAM is supported\n");
+      ferr("ERROR: Only SOCK_DRAM is supported\n");
       maxio = NFS_MAXDATA;
     }
 
@@ -1726,7 +1726,7 @@ static int nfs_bind(FAR struct inode *blkdriver, FAR const void *data,
   nmp = (FAR struct nfsmount *)kmm_zalloc(SIZEOF_nfsmount(buflen));
   if (!nmp)
     {
-      fdbg("ERROR: Failed to allocate mountpoint structure\n");
+      ferr("ERROR: Failed to allocate mountpoint structure\n");
       return ENOMEM;
     }
 
@@ -1776,7 +1776,7 @@ static int nfs_bind(FAR struct inode *blkdriver, FAR const void *data,
       rpc = (struct rpcclnt *)kmm_zalloc(sizeof(struct rpcclnt));
       if (!rpc)
         {
-          fdbg("ERROR: Failed to allocate rpc structure\n");
+          ferr("ERROR: Failed to allocate rpc structure\n");
           return ENOMEM;
         }
 
@@ -1794,7 +1794,7 @@ static int nfs_bind(FAR struct inode *blkdriver, FAR const void *data,
       error = rpcclnt_connect(nmp->nm_rpcclnt);
       if (error != OK)
         {
-          fdbg("ERROR: nfs_connect failed: %d\n", error);
+          ferr("ERROR: nfs_connect failed: %d\n", error);
           goto bad;
         }
     }
@@ -1813,7 +1813,7 @@ static int nfs_bind(FAR struct inode *blkdriver, FAR const void *data,
                       (FAR void *)&resok, sizeof(struct rpc_reply_getattr));
   if (error)
     {
-      fdbg("ERROR: nfs_request failed: %d\n", error);
+      ferr("ERROR: nfs_request failed: %d\n", error);
       goto bad;
     }
 
@@ -1887,7 +1887,7 @@ static int nfs_unbind(FAR void *handle, FAR struct inode **blkdriver,
 
   if (nmp->nm_head != NULL)
     {
-      fdbg("ERROR;  There are open files: %p\n", nmp->nm_head);
+      ferr("ERROR;  There are open files: %p\n", nmp->nm_head);
 
       /* This implementation currently only supports unmounting if there are
        * no open file references.
@@ -1902,7 +1902,7 @@ static int nfs_unbind(FAR void *handle, FAR struct inode **blkdriver,
   error = rpcclnt_umount(nmp->nm_rpcclnt);
   if (error)
     {
-      fdbg("ERROR: rpcclnt_umount failed: %d\n", error);
+      ferr("ERROR: rpcclnt_umount failed: %d\n", error);
     }
 
   /* Disconnect from the server */
@@ -2046,7 +2046,7 @@ static int nfs_statfs(FAR struct inode *mountpt, FAR struct statfs *sbp)
   error = nfs_checkmount(nmp);
   if (error != OK)
     {
-      fdbg("ERROR: nfs_checkmount failed: %d\n", error);
+      ferr("ERROR: nfs_checkmount failed: %d\n", error);
       goto errout_with_semaphore;
     }
 
@@ -2124,7 +2124,7 @@ static int nfs_remove(struct inode *mountpt, const char *relpath)
   error = nfs_checkmount(nmp);
   if (error != OK)
     {
-      fdbg("ERROR: nfs_checkmount failed: %d\n", error);
+      ferr("ERROR: nfs_checkmount failed: %d\n", error);
       goto errout_with_semaphore;
     }
 
@@ -2133,7 +2133,7 @@ static int nfs_remove(struct inode *mountpt, const char *relpath)
   error = nfs_finddir(nmp, relpath, &fhandle, &fattr, filename);
   if (error != OK)
     {
-      fdbg("ERROR: nfs_finddir returned: %d\n", error);
+      ferr("ERROR: nfs_finddir returned: %d\n", error);
       goto errout_with_semaphore;
     }
 
@@ -2210,7 +2210,7 @@ static int nfs_mkdir(struct inode *mountpt, const char *relpath, mode_t mode)
   error = nfs_checkmount(nmp);
   if (error != OK)
     {
-      fdbg("ERROR: nfs_checkmount: %d\n", error);
+      ferr("ERROR: nfs_checkmount: %d\n", error);
       goto errout_with_semaphore;
     }
 
@@ -2219,7 +2219,7 @@ static int nfs_mkdir(struct inode *mountpt, const char *relpath, mode_t mode)
   error = nfs_finddir(nmp, relpath, &fhandle, &fattr, dirname);
   if (error != OK)
     {
-      fdbg("ERROR: nfs_finddir returned: %d\n", error);
+      ferr("ERROR: nfs_finddir returned: %d\n", error);
       return error;
     }
 
@@ -2292,7 +2292,7 @@ static int nfs_mkdir(struct inode *mountpt, const char *relpath, mode_t mode)
                       (FAR void *)&nmp->nm_iobuffer, nmp->nm_buflen);
   if (error)
     {
-      fdbg("ERROR: nfs_request failed: %d\n", error);
+      ferr("ERROR: nfs_request failed: %d\n", error);
     }
 
 errout_with_semaphore:
@@ -2336,7 +2336,7 @@ static int nfs_rmdir(struct inode *mountpt, const char *relpath)
   error = nfs_checkmount(nmp);
   if (error != OK)
     {
-      fdbg("ERROR: nfs_checkmount failed: %d\n", error);
+      ferr("ERROR: nfs_checkmount failed: %d\n", error);
       goto errout_with_semaphore;
     }
 
@@ -2345,7 +2345,7 @@ static int nfs_rmdir(struct inode *mountpt, const char *relpath)
   error = nfs_finddir(nmp, relpath, &fhandle, &fattr, dirname);
   if (error != OK)
     {
-      fdbg("ERROR: nfs_finddir returned: %d\n", error);
+      ferr("ERROR: nfs_finddir returned: %d\n", error);
       return error;
     }
 
@@ -2424,7 +2424,7 @@ static int nfs_rename(struct inode *mountpt, const char *oldrelpath,
   error = nfs_checkmount(nmp);
   if (error != OK)
     {
-      fdbg("ERROR: nfs_checkmount returned: %d\n", error);
+      ferr("ERROR: nfs_checkmount returned: %d\n", error);
       goto errout_with_semaphore;
     }
 
@@ -2433,7 +2433,7 @@ static int nfs_rename(struct inode *mountpt, const char *oldrelpath,
   error = nfs_finddir(nmp, oldrelpath, &from_handle, &fattr, from_name);
   if (error != OK)
     {
-      fdbg("ERROR: nfs_finddir returned: %d\n", error);
+      ferr("ERROR: nfs_finddir returned: %d\n", error);
       return error;
     }
 
@@ -2442,7 +2442,7 @@ static int nfs_rename(struct inode *mountpt, const char *oldrelpath,
   error = nfs_finddir(nmp, newrelpath, &to_handle, &fattr, to_name);
   if (error != OK)
     {
-      fdbg("ERROR: nfs_finddir returned: %d\n", error);
+      ferr("ERROR: nfs_finddir returned: %d\n", error);
       return error;
     }
 
@@ -2538,7 +2538,7 @@ static int nfs_stat(struct inode *mountpt, const char *relpath,
   error = nfs_checkmount(nmp);
   if (error != OK)
     {
-      fdbg("ERROR: nfs_checkmount failed: %d\n", error);
+      ferr("ERROR: nfs_checkmount failed: %d\n", error);
       goto errout_with_semaphore;
     }
 
@@ -2547,7 +2547,7 @@ static int nfs_stat(struct inode *mountpt, const char *relpath,
   error = nfs_findnode(nmp, relpath, &fhandle, &obj_attributes, NULL);
   if (error != OK)
     {
-      fdbg("ERROR: nfs_findnode failed: %d\n", error);
+      ferr("ERROR: nfs_findnode failed: %d\n", error);
       goto errout_with_semaphore;
     }
 
diff --git a/fs/nfs/rpc_clnt.c b/fs/nfs/rpc_clnt.c
index 302f468fbc..af163f034b 100644
--- a/fs/nfs/rpc_clnt.c
+++ b/fs/nfs/rpc_clnt.c
@@ -177,7 +177,7 @@ static int rpcclnt_send(FAR struct rpcclnt *rpc, int procid, int prog,
       /* psock_sendto failed */
 
       error = get_errno();
-      fdbg("ERROR: psock_sendto failed: %d\n", error);
+      ferr("ERROR: psock_sendto failed: %d\n", error);
     }
 
   return error;
@@ -204,7 +204,7 @@ static int rpcclnt_receive(FAR struct rpcclnt *rpc, FAR struct sockaddr *aname,
   if (nbytes < 0)
     {
       error = get_errno();
-      fdbg("ERROR: psock_recvfrom failed: %d\n", error);
+      ferr("ERROR: psock_recvfrom failed: %d\n", error);
     }
 
   return error;
@@ -228,7 +228,7 @@ static int rpcclnt_reply(FAR struct rpcclnt *rpc, int procid, int prog,
   error = rpcclnt_receive(rpc, rpc->rc_name, procid, prog, reply, resplen);
   if (error != 0)
     {
-      fdbg("ERROR: rpcclnt_receive returned: %d\n", error);
+      ferr("ERROR: rpcclnt_receive returned: %d\n", error);
 
       /* If we failed because of a timeout, then try sending the CALL
        * message again.
@@ -249,7 +249,7 @@ static int rpcclnt_reply(FAR struct rpcclnt *rpc, int procid, int prog,
 
       if (replyheader->rp_direction != rpc_reply)
         {
-          fdbg("ERROR: Different RPC REPLY returned\n");
+          ferr("ERROR: Different RPC REPLY returned\n");
           rpc_statistics(rpcinvalid);
           error = EPROTO;
         }
@@ -396,7 +396,7 @@ int rpcclnt_connect(struct rpcclnt *rpc)
   so = (struct socket *)kmm_zalloc(sizeof(struct socket));
   if (!so)
     {
-      fdbg("ERROR: Failed to allocate socket structure\n");
+      ferr("ERROR: Failed to allocate socket structure\n");
       return ENOMEM;
     }
 
@@ -404,7 +404,7 @@ int rpcclnt_connect(struct rpcclnt *rpc)
   if (error < 0)
     {
       errval = get_errno();
-      fdbg("ERROR: psock_socket failed: %d", errval);
+      ferr("ERROR: psock_socket failed: %d", errval);
       return error;
     }
 
@@ -423,7 +423,7 @@ int rpcclnt_connect(struct rpcclnt *rpc)
   if (error < 0)
     {
       errval = get_errno();
-      fdbg("ERROR: psock_setsockopt failed: %d\n", errval);
+      ferr("ERROR: psock_setsockopt failed: %d\n", errval);
       goto bad;
     }
 
@@ -445,14 +445,14 @@ int rpcclnt_connect(struct rpcclnt *rpc)
       if (error < 0)
         {
           errval = get_errno();
-          fdbg("ERROR: psock_bind failed: %d\n", errval);
+          ferr("ERROR: psock_bind failed: %d\n", errval);
         }
     }
   while (errval == EADDRINUSE && tport > 1024 / 2);
 
   if (error)
     {
-      fdbg("ERROR: psock_bind failed: %d\n", errval);
+      ferr("ERROR: psock_bind failed: %d\n", errval);
       goto bad;
     }
 
@@ -465,7 +465,7 @@ int rpcclnt_connect(struct rpcclnt *rpc)
   if (error < 0)
     {
       errval = get_errno();
-      fdbg("ERROR: psock_connect to PMAP port failed: %d", errval);
+      ferr("ERROR: psock_connect to PMAP port failed: %d", errval);
       goto bad;
     }
 
@@ -483,7 +483,7 @@ int rpcclnt_connect(struct rpcclnt *rpc)
                           (FAR void *)&response.rdata, sizeof(struct rpc_reply_pmap));
   if (error != 0)
     {
-      fdbg("ERROR: rpcclnt_request failed: %d\n", error);
+      ferr("ERROR: rpcclnt_request failed: %d\n", error);
       goto bad;
     }
 
@@ -494,7 +494,7 @@ int rpcclnt_connect(struct rpcclnt *rpc)
   if (error < 0)
     {
       errval = get_errno();
-      fdbg("ERROR: psock_connect MOUNTD port failed: %d\n", errval);
+      ferr("ERROR: psock_connect MOUNTD port failed: %d\n", errval);
       goto bad;
     }
 
@@ -508,14 +508,14 @@ int rpcclnt_connect(struct rpcclnt *rpc)
                           (FAR void *)&response.mdata, sizeof(struct rpc_reply_mount));
   if (error != 0)
     {
-      fdbg("ERROR: rpcclnt_request failed: %d\n", error);
+      ferr("ERROR: rpcclnt_request failed: %d\n", error);
       goto bad;
     }
 
   error = fxdr_unsigned(uint32_t, response.mdata.mount.status);
   if (error != 0)
     {
-      fdbg("ERROR: Bad mount status: %d\n", error);
+      ferr("ERROR: Bad mount status: %d\n", error);
       goto bad;
     }
 
@@ -531,7 +531,7 @@ int rpcclnt_connect(struct rpcclnt *rpc)
   if (error < 0)
     {
       errval = get_errno();
-      fdbg("ERROR: psock_connect PMAP port failed: %d\n", errval);
+      ferr("ERROR: psock_connect PMAP port failed: %d\n", errval);
       goto bad;
     }
 
@@ -545,7 +545,7 @@ int rpcclnt_connect(struct rpcclnt *rpc)
                           (FAR void *)&response.rdata, sizeof(struct rpc_reply_pmap));
   if (error != 0)
     {
-      fdbg("ERROR: rpcclnt_request failed: %d\n", error);
+      ferr("ERROR: rpcclnt_request failed: %d\n", error);
       goto bad;
     }
 
@@ -554,7 +554,7 @@ int rpcclnt_connect(struct rpcclnt *rpc)
   error = psock_connect(rpc->rc_so, saddr, sizeof(*saddr));
   if (error)
     {
-      fdbg("psock_connect NFS port returns %d\n", error);
+      ferr("psock_connect NFS port returns %d\n", error);
       goto bad;
     }
 
@@ -622,7 +622,7 @@ int rpcclnt_umount(struct rpcclnt *rpc)
   if (ret < 0)
     {
       error = get_errno();
-      fdbg("ERROR: psock_connect failed [port=%d]: %d\n",
+      ferr("ERROR: psock_connect failed [port=%d]: %d\n",
             ntohs(sa->sin_port), error);
       goto bad;
     }
@@ -637,7 +637,7 @@ int rpcclnt_umount(struct rpcclnt *rpc)
                           (FAR void *)&response.rdata, sizeof(struct rpc_reply_pmap));
   if (error != 0)
     {
-      fdbg("ERROR: rpcclnt_request failed: %d\n", error);
+      ferr("ERROR: rpcclnt_request failed: %d\n", error);
       goto bad;
     }
 
@@ -647,7 +647,7 @@ int rpcclnt_umount(struct rpcclnt *rpc)
   if (ret < 0)
     {
       error = get_errno();
-      fdbg("ERROR: psock_connect failed [port=%d]: %d\n",
+      ferr("ERROR: psock_connect failed [port=%d]: %d\n",
             ntohs(sa->sin_port), error);
       goto bad;
     }
@@ -662,7 +662,7 @@ int rpcclnt_umount(struct rpcclnt *rpc)
                           (FAR void *)&response.mdata, sizeof(struct rpc_reply_umount));
   if (error != 0)
     {
-      fdbg("ERROR: rpcclnt_request failed: %d\n", error);
+      ferr("ERROR: rpcclnt_request failed: %d\n", error);
       goto bad;
     }
 
@@ -751,7 +751,7 @@ int rpcclnt_request(FAR struct rpcclnt *rpc, int procnum, int prog,
 
   if (error != OK)
     {
-      fdbg("ERROR: RPC failed: %d\n", error);
+      ferr("ERROR: RPC failed: %d\n", error);
       return error;
     }
 
@@ -766,11 +766,11 @@ int rpcclnt_request(FAR struct rpcclnt *rpc, int procnum, int prog,
       switch (tmp)
         {
         case RPC_MISMATCH:
-          fdbg("RPC_MSGDENIED: RPC_MISMATCH error\n");
+          ferr("RPC_MSGDENIED: RPC_MISMATCH error\n");
           return EOPNOTSUPP;
 
         case RPC_AUTHERR:
-          fdbg("RPC_MSGDENIED: RPC_AUTHERR error\n");
+          ferr("RPC_MSGDENIED: RPC_AUTHERR error\n");
           return EACCES;
 
         default:
@@ -789,12 +789,12 @@ int rpcclnt_request(FAR struct rpcclnt *rpc, int procnum, int prog,
     }
   else if (tmp == RPC_PROGMISMATCH)
     {
-      fdbg("RPC_MSGACCEPTED: RPC_PROGMISMATCH error\n");
+      ferr("RPC_MSGACCEPTED: RPC_PROGMISMATCH error\n");
       return EOPNOTSUPP;
     }
   else if (tmp > 5)
     {
-      fdbg("ERROR:  Other RPC type: %d\n", tmp);
+      ferr("ERROR:  Other RPC type: %d\n", tmp);
       return EOPNOTSUPP;
     }
 
diff --git a/fs/nxffs/nxffs_block.c b/fs/nxffs/nxffs_block.c
index 490f302537..c1cad2afe4 100644
--- a/fs/nxffs/nxffs_block.c
+++ b/fs/nxffs/nxffs_block.c
@@ -89,7 +89,7 @@ int nxffs_verifyblock(FAR struct nxffs_volume_s *volume, off_t block)
     {
       /* Perhaps we are at the end of the media */
 
-      fdbg("ERROR: Failed to read data into cache: %d\n", ret);
+      ferr("ERROR: Failed to read data into cache: %d\n", ret);
       return -EIO;
     }
 
@@ -169,6 +169,6 @@ int nxffs_validblock(struct nxffs_volume_s *volume, off_t *block)
    * valid blocks left in the volume.
    */
 
-  fdbg("ERROR: No valid block found\n");
+  ferr("ERROR: No valid block found\n");
   return -ENOSPC;
 }
diff --git a/fs/nxffs/nxffs_blockstats.c b/fs/nxffs/nxffs_blockstats.c
index 797cae2d4c..8ba53dec12 100644
--- a/fs/nxffs/nxffs_blockstats.c
+++ b/fs/nxffs/nxffs_blockstats.c
@@ -94,7 +94,7 @@ int nxffs_blockstats(FAR struct nxffs_volume_s *volume,
       ret = MTD_BREAD(volume->mtd, ioblock, volume->blkper, volume->pack);
       if (ret < volume->blkper)
         {
-          fdbg("ERROR: Failed to read erase block %d: %d\n",
+          ferr("ERROR: Failed to read erase block %d: %d\n",
                ioblock / volume->blkper, ret);
           return ret;
         }
@@ -147,11 +147,11 @@ int nxffs_blockstats(FAR struct nxffs_volume_s *volume,
         }
     }
 
-  fdbg("Number blocks:        %d\n", stats->nblocks);
-  fdbg("  Good blocks:        %d\n", stats->ngood);
-  fdbg("  Bad blocks:         %d\n", stats->nbad);
-  fdbg("  Unformatted blocks: %d\n", stats->nunformat);
-  fdbg("  Corrupt blocks:     %d\n", stats->ncorrupt);
+  ferr("Number blocks:        %d\n", stats->nblocks);
+  ferr("  Good blocks:        %d\n", stats->ngood);
+  ferr("  Bad blocks:         %d\n", stats->nbad);
+  ferr("  Unformatted blocks: %d\n", stats->nunformat);
+  ferr("  Corrupt blocks:     %d\n", stats->ncorrupt);
 
 #else
   for (ioblock = 0; ioblock < volume->nblocks; ioblock++)
@@ -175,7 +175,7 @@ int nxffs_blockstats(FAR struct nxffs_volume_s *volume,
            * of unreadable blocks.
            */
 
-          fdbg("ERROR: Failed to read block %d: %d\n", ioblock, ret);
+          ferr("ERROR: Failed to read block %d: %d\n", ioblock, ret);
 
           /* Increment the count of un-readable blocks */
 
@@ -221,12 +221,12 @@ int nxffs_blockstats(FAR struct nxffs_volume_s *volume,
         }
     }
 
-  fdbg("Number blocks:        %d\n", stats->nblocks);
-  fdbg("  Good blocks:        %d\n", stats->ngood);
-  fdbg("  Bad blocks:         %d\n", stats->nbad);
-  fdbg("  Unformatted blocks: %d\n", stats->nunformat);
-  fdbg("  Corrupt blocks:     %d\n", stats->ncorrupt);
-  fdbg("  Unreadable blocks:  %d\n", stats->nbadread);
+  ferr("Number blocks:        %d\n", stats->nblocks);
+  ferr("  Good blocks:        %d\n", stats->ngood);
+  ferr("  Bad blocks:         %d\n", stats->nbad);
+  ferr("  Unformatted blocks: %d\n", stats->nunformat);
+  ferr("  Corrupt blocks:     %d\n", stats->ncorrupt);
+  ferr("  Unreadable blocks:  %d\n", stats->nbadread);
 
 #endif
   return OK;
diff --git a/fs/nxffs/nxffs_cache.c b/fs/nxffs/nxffs_cache.c
index 32c9756a05..6a5c4c028f 100644
--- a/fs/nxffs/nxffs_cache.c
+++ b/fs/nxffs/nxffs_cache.c
@@ -98,7 +98,7 @@ int nxffs_rdcache(FAR struct nxffs_volume_s *volume, off_t block)
       nxfrd = MTD_BREAD(volume->mtd, block, 1, volume->cache);
       if (nxfrd != 1)
         {
-          fdbg("ERROR: Read block %d failed: %d\n", block, nxfrd);
+          ferr("ERROR: Read block %d failed: %d\n", block, nxfrd);
           return -EIO;
         }
 
@@ -133,7 +133,7 @@ int nxffs_wrcache(FAR struct nxffs_volume_s *volume)
   nxfrd = MTD_BWRITE(volume->mtd, volume->cblock, 1, volume->cache);
   if (nxfrd != 1)
     {
-      fdbg("ERROR: Write block %d failed: %d\n", volume->cblock, nxfrd);
+      ferr("ERROR: Write block %d failed: %d\n", volume->cblock, nxfrd);
       return -EIO;
     }
 
@@ -249,7 +249,7 @@ int nxffs_getc(FAR struct nxffs_volume_s *volume, uint16_t reserve)
 #ifndef CONFIG_NXFFS_NAND
           /* Read errors are fatal */
 
-          fdbg("ERROR: Failed to read valid data into cache: %d\n", ret);
+          ferr("ERROR: Failed to read valid data into cache: %d\n", ret);
           return ret;
 #else
           /* A read error occurred.  This probably means that we are
@@ -258,7 +258,7 @@ int nxffs_getc(FAR struct nxffs_volume_s *volume, uint16_t reserve)
            * block.
            */
 
-          fdbg("ERROR: Failed to read valid data into cache: %d\n", ret);
+          ferr("ERROR: Failed to read valid data into cache: %d\n", ret);
 #endif
         }
     }
diff --git a/fs/nxffs/nxffs_dump.c b/fs/nxffs/nxffs_dump.c
index 1bfba3177e..a76c503e27 100644
--- a/fs/nxffs/nxffs_dump.c
+++ b/fs/nxffs/nxffs_dump.c
@@ -432,7 +432,7 @@ int nxffs_dump(FAR struct mtd_dev_s *mtd, bool verbose)
   ret = MTD_IOCTL(mtd, MTDIOC_GEOMETRY, (unsigned long)((uintptr_t)&blkinfo.geo));
   if (ret < 0)
     {
-      fdbg("ERROR: MTD ioctl(MTDIOC_GEOMETRY) failed: %d\n", -ret);
+      ferr("ERROR: MTD ioctl(MTDIOC_GEOMETRY) failed: %d\n", -ret);
       return ret;
     }
 
@@ -445,7 +445,7 @@ int nxffs_dump(FAR struct mtd_dev_s *mtd, bool verbose)
   blkinfo.buffer = (FAR uint8_t *)kmm_malloc(blkinfo.geo.blocksize);
   if (!blkinfo.buffer)
     {
-      fdbg("ERROR: Failed to allocate block cache\n");
+      ferr("ERROR: Failed to allocate block cache\n");
       return -ENOMEM;
     }
 
@@ -467,7 +467,7 @@ int nxffs_dump(FAR struct mtd_dev_s *mtd, bool verbose)
 #ifndef CONFIG_NXFFS_NAND
           /* Read errors are fatal */
 
-          fdbg("ERROR: Failed to read block %d\n", blkinfo.block);
+          ferr("ERROR: Failed to read block %d\n", blkinfo.block);
           kmm_free(blkinfo.buffer);
           return ret;
 #else
diff --git a/fs/nxffs/nxffs_initialize.c b/fs/nxffs/nxffs_initialize.c
index 6a5aa49e91..217f0963f9 100644
--- a/fs/nxffs/nxffs_initialize.c
+++ b/fs/nxffs/nxffs_initialize.c
@@ -190,7 +190,7 @@ int nxffs_initialize(FAR struct mtd_dev_s *mtd)
   ret = MTD_IOCTL(mtd, MTDIOC_GEOMETRY, (unsigned long)((uintptr_t)&volume->geo));
   if (ret < 0)
     {
-      fdbg("ERROR: MTD ioctl(MTDIOC_GEOMETRY) failed: %d\n", -ret);
+      ferr("ERROR: MTD ioctl(MTDIOC_GEOMETRY) failed: %d\n", -ret);
       goto errout_with_volume;
     }
 
@@ -199,7 +199,7 @@ int nxffs_initialize(FAR struct mtd_dev_s *mtd)
   volume->cache = (FAR uint8_t *)kmm_malloc(volume->geo.blocksize);
   if (!volume->cache)
     {
-      fdbg("ERROR: Failed to allocate an erase block buffer\n");
+      ferr("ERROR: Failed to allocate an erase block buffer\n");
       ret = -ENOMEM;
       goto errout_with_volume;
     }
@@ -212,7 +212,7 @@ int nxffs_initialize(FAR struct mtd_dev_s *mtd)
   volume->pack = (FAR uint8_t *)kmm_malloc(volume->geo.erasesize);
   if (!volume->pack)
     {
-      fdbg("ERROR: Failed to allocate an I/O block buffer\n");
+      ferr("ERROR: Failed to allocate an I/O block buffer\n");
       ret = -ENOMEM;
       goto errout_with_cache;
     }
@@ -231,7 +231,7 @@ int nxffs_initialize(FAR struct mtd_dev_s *mtd)
   ret = nxffs_blockstats(volume, &stats);
   if (ret < 0)
     {
-      fdbg("ERROR: Failed to collect block statistics: %d\n", -ret);
+      ferr("ERROR: Failed to collect block statistics: %d\n", -ret);
       goto errout_with_buffer;
     }
 
@@ -247,7 +247,7 @@ int nxffs_initialize(FAR struct mtd_dev_s *mtd)
       ret = nxffs_reformat(volume);
       if (ret < 0)
         {
-          fdbg("ERROR: Failed to reformat the volume: %d\n", -ret);
+          ferr("ERROR: Failed to reformat the volume: %d\n", -ret);
           goto errout_with_buffer;
         }
 
@@ -257,7 +257,7 @@ int nxffs_initialize(FAR struct mtd_dev_s *mtd)
       ret = nxffs_blockstats(volume, &stats);
       if (ret < 0)
         {
-          fdbg("ERROR: Failed to collect block statistics: %d\n", -ret);
+          ferr("ERROR: Failed to collect block statistics: %d\n", -ret);
           goto errout_with_buffer;
         }
 #endif
@@ -274,11 +274,11 @@ int nxffs_initialize(FAR struct mtd_dev_s *mtd)
 
   /* We may need to format the volume.  Try that before giving up. */
 
-  fdbg("WARNING: Failed to calculate file system limits: %d\n", -ret);
+  ferr("WARNING: Failed to calculate file system limits: %d\n", -ret);
   ret = nxffs_reformat(volume);
   if (ret < 0)
     {
-      fdbg("ERROR: Failed to reformat the volume: %d\n", -ret);
+      ferr("ERROR: Failed to reformat the volume: %d\n", -ret);
       goto errout_with_buffer;
     }
 
@@ -288,7 +288,7 @@ int nxffs_initialize(FAR struct mtd_dev_s *mtd)
   ret = nxffs_blockstats(volume, &stats);
   if (ret < 0)
     {
-      fdbg("ERROR: Failed to collect block statistics: %d\n", -ret);
+      ferr("ERROR: Failed to collect block statistics: %d\n", -ret);
       goto errout_with_buffer;
     }
 #endif
@@ -303,7 +303,7 @@ int nxffs_initialize(FAR struct mtd_dev_s *mtd)
 
   /* Now give up */
 
-  fdbg("ERROR: Failed to calculate file system limits: %d\n", -ret);
+  ferr("ERROR: Failed to calculate file system limits: %d\n", -ret);
 
 errout_with_buffer:
   kmm_free(volume->pack);
@@ -356,7 +356,7 @@ int nxffs_limits(FAR struct nxffs_volume_s *volume)
   ret = nxffs_validblock(volume, &block);
   if (ret < 0)
     {
-      fdbg("ERROR: Failed to find a valid block: %d\n", -ret);
+      ferr("ERROR: Failed to find a valid block: %d\n", -ret);
       return ret;
     }
 
@@ -374,7 +374,7 @@ int nxffs_limits(FAR struct nxffs_volume_s *volume)
 
       if (ret != -ENOENT)
         {
-          fdbg("ERROR: nxffs_nextentry failed: %d\n", -ret);
+          ferr("ERROR: nxffs_nextentry failed: %d\n", -ret);
           return ret;
         }
 
@@ -447,7 +447,7 @@ int nxffs_limits(FAR struct nxffs_volume_s *volume)
 
           /* No?  Then it is some other failure that we do not know how to handle */
 
-          fdbg("ERROR: nxffs_getc failed: %d\n", -ch);
+          ferr("ERROR: nxffs_getc failed: %d\n", -ch);
           return ch;
         }
 
diff --git a/fs/nxffs/nxffs_inode.c b/fs/nxffs/nxffs_inode.c
index 02d609832d..2240c18313 100644
--- a/fs/nxffs/nxffs_inode.c
+++ b/fs/nxffs/nxffs_inode.c
@@ -125,7 +125,7 @@ static int nxffs_rdentry(FAR struct nxffs_volume_s *volume, off_t offset,
   entry->name = (FAR char *)kmm_malloc(namlen + 1);
   if (!entry->name)
     {
-      fdbg("ERROR: Failed to allocate name, namlen: %d\n", namlen);
+      ferr("ERROR: Failed to allocate name, namlen: %d\n", namlen);
       ret = -ENOMEM;
       goto errout_no_offset;
     }
@@ -141,7 +141,7 @@ static int nxffs_rdentry(FAR struct nxffs_volume_s *volume, off_t offset,
   ret = nxffs_rdcache(volume, volume->ioblock);
   if (ret < 0)
     {
-      fdbg("ERROR: nxffsx_rdcache failed: %d\n", -ret);
+      ferr("ERROR: nxffsx_rdcache failed: %d\n", -ret);
       goto errout_with_name;
     }
 
@@ -155,7 +155,7 @@ static int nxffs_rdentry(FAR struct nxffs_volume_s *volume, off_t offset,
   crc = crc32part((FAR const uint8_t *)entry->name, namlen, crc);
   if (crc != ecrc)
     {
-      fdbg("ERROR: CRC entry: %08x CRC calculated: %08x\n", ecrc, crc);
+      ferr("ERROR: CRC entry: %08x CRC calculated: %08x\n", ecrc, crc);
       ret = -EIO;
       goto errout_with_name;
     }
@@ -271,7 +271,7 @@ int nxffs_nextentry(FAR struct nxffs_volume_s *volume, off_t offset,
       ch = nxffs_getc(volume, SIZEOF_NXFFS_INODE_HDR - nmagic);
       if (ch < 0)
         {
-          fdbg("ERROR: nxffs_getc failed: %d\n", -ch);
+          ferr("ERROR: nxffs_getc failed: %d\n", -ch);
           return ch;
         }
 
diff --git a/fs/nxffs/nxffs_ioctl.c b/fs/nxffs/nxffs_ioctl.c
index 7d6219eaab..bbe6bbd745 100644
--- a/fs/nxffs/nxffs_ioctl.c
+++ b/fs/nxffs/nxffs_ioctl.c
@@ -88,7 +88,7 @@ int nxffs_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
   if (ret != OK)
     {
       ret = -get_errno();
-      fdbg("ERROR: sem_wait failed: %d\n", ret);
+      ferr("ERROR: sem_wait failed: %d\n", ret);
       goto errout;
     }
 
@@ -102,7 +102,7 @@ int nxffs_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       if (volume->ofiles)
         {
-          fdbg("ERROR: Open files\n");
+          ferr("ERROR: Open files\n");
           ret = -EBUSY;
           goto errout_with_semaphore;
         }
diff --git a/fs/nxffs/nxffs_open.c b/fs/nxffs/nxffs_open.c
index 64db270426..8807e53bc5 100644
--- a/fs/nxffs/nxffs_open.c
+++ b/fs/nxffs/nxffs_open.c
@@ -345,7 +345,7 @@ static inline int nxffs_wrname(FAR struct nxffs_volume_s *volume,
   ret = nxffs_rdcache(volume, volume->ioblock);
   if (ret < 0)
     {
-      fdbg("ERROR: Failed to read inode name block %d: %d\n",
+      ferr("ERROR: Failed to read inode name block %d: %d\n",
            volume->ioblock, -ret);
       return ret;
     }
@@ -356,7 +356,7 @@ static inline int nxffs_wrname(FAR struct nxffs_volume_s *volume,
   ret = nxffs_wrcache(volume);
   if (ret < 0)
     {
-      fdbg("ERROR: Failed to write inode header block %d: %d\n",
+      ferr("ERROR: Failed to write inode header block %d: %d\n",
            volume->ioblock, -ret);
     }
 
@@ -391,7 +391,7 @@ static inline int nxffs_wropen(FAR struct nxffs_volume_s *volume,
   ret = sem_wait(&volume->wrsem);
   if (ret != OK)
     {
-      fdbg("ERROR: sem_wait failed: %d\n", ret);
+      ferr("ERROR: sem_wait failed: %d\n", ret);
       ret = -get_errno();
       goto errout;
     }
@@ -404,7 +404,7 @@ static inline int nxffs_wropen(FAR struct nxffs_volume_s *volume,
   ret = sem_wait(&volume->exclsem);
   if (ret != OK)
     {
-      fdbg("ERROR: sem_wait failed: %d\n", ret);
+      ferr("ERROR: sem_wait failed: %d\n", ret);
       ret = -get_errno();
       goto errout_with_wrsem;
     }
@@ -429,7 +429,7 @@ static inline int nxffs_wropen(FAR struct nxffs_volume_s *volume,
            * Limitation:  Files cannot be open both for reading and writing.
            */
 
-          fdbg("ERROR: File is open for reading\n");
+          ferr("ERROR: File is open for reading\n");
           ret = -ENOSYS;
           goto errout_with_exclsem;
         }
@@ -440,7 +440,7 @@ static inline int nxffs_wropen(FAR struct nxffs_volume_s *volume,
 
       else if ((oflags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL))
         {
-          fdbg("ERROR: File exists, can't create O_EXCL\n");
+          ferr("ERROR: File exists, can't create O_EXCL\n");
           ret = -EEXIST;
           goto errout_with_exclsem;
         }
@@ -466,7 +466,7 @@ static inline int nxffs_wropen(FAR struct nxffs_volume_s *volume,
 
       else
         {
-          fdbg("ERROR: File %s exists and we were not asked to truncate it\n");
+          ferr("ERROR: File %s exists and we were not asked to truncate it\n");
           ret = -ENOSYS;
           goto errout_with_exclsem;
         }
@@ -478,7 +478,7 @@ static inline int nxffs_wropen(FAR struct nxffs_volume_s *volume,
 
   if ((oflags & O_CREAT) == 0)
     {
-      fdbg("ERROR: Not asked to create the file\n");
+      ferr("ERROR: Not asked to create the file\n");
       ret = -ENOENT;
       goto errout_with_exclsem;
     }
@@ -488,7 +488,7 @@ static inline int nxffs_wropen(FAR struct nxffs_volume_s *volume,
   namlen = strlen(name);
   if (namlen > CONFIG_NXFFS_MAXNAMLEN)
     {
-      fdbg("ERROR: Name is too long: %d\n", namlen);
+      ferr("ERROR: Name is too long: %d\n", namlen);
       ret = -EINVAL;
       goto errout_with_exclsem;
     }
@@ -562,7 +562,7 @@ static inline int nxffs_wropen(FAR struct nxffs_volume_s *volume,
 
       if (ret != -ENOSPC || packed)
         {
-          fdbg("ERROR: Failed to find inode header memory: %d\n", -ret);
+          ferr("ERROR: Failed to find inode header memory: %d\n", -ret);
           goto errout_with_name;
         }
 
@@ -573,7 +573,7 @@ static inline int nxffs_wropen(FAR struct nxffs_volume_s *volume,
       ret = nxffs_pack(volume);
       if (ret < 0)
         {
-          fdbg("ERROR: Failed to pack the volume: %d\n", -ret);
+          ferr("ERROR: Failed to pack the volume: %d\n", -ret);
           goto errout_with_name;
         }
 
@@ -609,7 +609,7 @@ static inline int nxffs_wropen(FAR struct nxffs_volume_s *volume,
               ret = nxffs_wrname(volume, &wrfile->ofile.entry, namlen);
               if (ret < 0)
                 {
-                  fdbg("ERROR: Failed to write the inode name: %d\n", -ret);
+                  ferr("ERROR: Failed to write the inode name: %d\n", -ret);
                   goto errout_with_name;
                 }
 
@@ -628,7 +628,7 @@ static inline int nxffs_wropen(FAR struct nxffs_volume_s *volume,
 
       if (ret != -ENOSPC || packed)
         {
-          fdbg("ERROR: Failed to find inode name memory: %d\n", -ret);
+          ferr("ERROR: Failed to find inode name memory: %d\n", -ret);
           goto errout_with_name;
         }
 
@@ -639,7 +639,7 @@ static inline int nxffs_wropen(FAR struct nxffs_volume_s *volume,
       ret = nxffs_pack(volume);
       if (ret < 0)
         {
-          fdbg("ERROR: Failed to pack the volume: %d\n", -ret);
+          ferr("ERROR: Failed to pack the volume: %d\n", -ret);
           goto errout_with_name;
         }
 
@@ -702,7 +702,7 @@ static inline int nxffs_rdopen(FAR struct nxffs_volume_s *volume,
   ret = sem_wait(&volume->exclsem);
   if (ret != OK)
     {
-      fdbg("ERROR: sem_wait failed: %d\n", ret);
+      ferr("ERROR: sem_wait failed: %d\n", ret);
       ret = -get_errno();
       goto errout;
     }
@@ -718,7 +718,7 @@ static inline int nxffs_rdopen(FAR struct nxffs_volume_s *volume,
 
       if ((ofile->oflags & O_WROK) != 0)
         {
-          fdbg("ERROR: File is open for writing\n");
+          ferr("ERROR: File is open for writing\n");
           ret = -ENOSYS;
           goto errout_with_exclsem;
         }
@@ -741,7 +741,7 @@ static inline int nxffs_rdopen(FAR struct nxffs_volume_s *volume,
       ofile = (FAR struct nxffs_ofile_s *)kmm_zalloc(sizeof(struct nxffs_ofile_s));
       if (!ofile)
         {
-          fdbg("ERROR: ofile allocation failed\n");
+          ferr("ERROR: ofile allocation failed\n");
           ret = -ENOMEM;
           goto errout_with_exclsem;
         }
@@ -817,7 +817,7 @@ static inline void nxffs_remofile(FAR struct nxffs_volume_s *volume,
     }
   else
     {
-      fdbg("ERROR: Open inode %p not found\n", ofile);
+      ferr("ERROR: Open inode %p not found\n", ofile);
     }
 }
 
@@ -878,7 +878,7 @@ static inline int nxffs_wrclose(FAR struct nxffs_volume_s *volume,
       ret = nxffs_wrblkhdr(volume, wrfile);
       if (ret < 0)
         {
-          fdbg("ERROR: Failed to write the final block of the file: %d\n", -ret);
+          ferr("ERROR: Failed to write the final block of the file: %d\n", -ret);
           goto errout;
         }
     }
@@ -897,7 +897,7 @@ static inline int nxffs_wrclose(FAR struct nxffs_volume_s *volume,
       ret = nxffs_rminode(volume, wrfile->ofile.entry.name);
       if (ret < 0)
         {
-          fdbg("ERROR: nxffs_rminode failed: %d\n", -ret);
+          ferr("ERROR: nxffs_rminode failed: %d\n", -ret);
           goto errout;
         }
     }
@@ -1028,7 +1028,7 @@ int nxffs_open(FAR struct file *filep, FAR const char *relpath,
      {
        case 0:
        default:
-         fdbg("ERROR: One of O_WRONLY/O_RDONLY must be provided\n");
+         ferr("ERROR: One of O_WRONLY/O_RDONLY must be provided\n");
          return -EINVAL;
 
        case O_WROK:
@@ -1040,7 +1040,7 @@ int nxffs_open(FAR struct file *filep, FAR const char *relpath,
          break;
 
        case O_WROK | O_RDOK:
-         fdbg("ERROR: O_RDWR is not supported\n");
+         ferr("ERROR: O_RDWR is not supported\n");
          return -ENOSYS;
      }
 
@@ -1149,7 +1149,7 @@ int nxffs_close(FAR struct file *filep)
   if (ret != OK)
     {
       ret = -get_errno();
-      fdbg("ERROR: sem_wait failed: %d\n", ret);
+      ferr("ERROR: sem_wait failed: %d\n", ret);
       goto errout;
     }
 
@@ -1230,7 +1230,7 @@ int nxffs_wrinode(FAR struct nxffs_volume_s *volume,
   ret = nxffs_rdcache(volume, volume->ioblock);
   if (ret < 0)
     {
-      fdbg("ERROR: Failed to read inode header block %d: %d\n",
+      ferr("ERROR: Failed to read inode header block %d: %d\n",
            volume->ioblock, -ret);
       goto errout;
     }
@@ -1269,7 +1269,7 @@ int nxffs_wrinode(FAR struct nxffs_volume_s *volume,
   ret = nxffs_wrcache(volume);
   if (ret < 0)
     {
-      fdbg("ERROR: Failed to write inode header block %d: %d\n",
+      ferr("ERROR: Failed to write inode header block %d: %d\n",
            volume->ioblock, -ret);
     }
 
diff --git a/fs/nxffs/nxffs_pack.c b/fs/nxffs/nxffs_pack.c
index 0e816b359d..134ee430a6 100644
--- a/fs/nxffs/nxffs_pack.c
+++ b/fs/nxffs/nxffs_pack.c
@@ -331,7 +331,7 @@ static inline int nxffs_startpos(FAR struct nxffs_volume_s *volume,
           ret = nxffs_nextblock(volume, offset, &blkentry);
           if (ret < 0)
             {
-              fdbg("ERROR: Failed to find next data block: %d\n", -ret);
+              ferr("ERROR: Failed to find next data block: %d\n", -ret);
               return ret;
             }
 
@@ -421,7 +421,7 @@ static int nxffs_srcsetup(FAR struct nxffs_volume_s *volume,
       int ret = nxffs_rdblkhdr(volume, offset, &pack->src.blklen);
       if (ret < 0)
         {
-          fdbg("ERROR: Failed to verify the data block header: %d\n", -ret);
+          ferr("ERROR: Failed to verify the data block header: %d\n", -ret);
         }
 
       return ret;
@@ -706,7 +706,7 @@ static int nxffs_wrinodehdr(FAR struct nxffs_volume_s *volume,
       ret = nxffs_updateinode(volume, &pack->dest.entry);
       if (ret < 0)
         {
-          fdbg("ERROR: Failed to update inode info: %s\n", -ret);
+          ferr("ERROR: Failed to update inode info: %s\n", -ret);
         }
     }
 
@@ -849,7 +849,7 @@ static int nxffs_endsrcblock(FAR struct nxffs_volume_s *volume,
   ret    = nxffs_nextblock(volume, offset, &blkentry);
   if (ret < 0)
     {
-      fdbg("ERROR: Failed to find next data block: %d\n", -ret);
+      ferr("ERROR: Failed to find next data block: %d\n", -ret);
       return ret;
     }
 
@@ -893,7 +893,7 @@ static inline int nxffs_packblock(FAR struct nxffs_volume_s *volume,
       ret = nxffs_srcsetup(volume, pack, pack->src.entry.doffset);
       if (ret < 0)
         {
-          fdbg("ERROR: Failed to configure the src stream: %d\n", -ret);
+          ferr("ERROR: Failed to configure the src stream: %d\n", -ret);
           return ret;
         }
     }
@@ -919,7 +919,7 @@ static inline int nxffs_packblock(FAR struct nxffs_volume_s *volume,
         }
       else
         {
-          fdbg("ERROR: Failed to configure the dest stream: %d\n", -ret);
+          ferr("ERROR: Failed to configure the dest stream: %d\n", -ret);
           return ret;
         }
     }
@@ -1011,7 +1011,7 @@ static inline int nxffs_packblock(FAR struct nxffs_volume_s *volume,
                 }
               else
                 {
-                  fdbg("ERROR: Failed to configure the dest stream: %d\n", -ret);
+                  ferr("ERROR: Failed to configure the dest stream: %d\n", -ret);
                   return ret;
                 }
             }
@@ -1146,7 +1146,7 @@ static inline int nxffs_packwriter(FAR struct nxffs_volume_s *volume,
       ret = nxffs_srcsetup(volume, pack, pack->src.entry.doffset);
       if (ret < 0)
         {
-          fdbg("ERROR: Failed to configure the src stream: %d\n", -ret);
+          ferr("ERROR: Failed to configure the src stream: %d\n", -ret);
           return ret;
         }
     }
@@ -1172,7 +1172,7 @@ static inline int nxffs_packwriter(FAR struct nxffs_volume_s *volume,
         }
       else
         {
-          fdbg("ERROR: Failed to configure the dest stream: %d\n", -ret);
+          ferr("ERROR: Failed to configure the dest stream: %d\n", -ret);
           return ret;
         }
     }
@@ -1380,7 +1380,7 @@ int nxffs_pack(FAR struct nxffs_volume_s *volume)
         }
       else
         {
-          fdbg("ERROR: Failed to find a packing position: %d\n", -ret);
+          ferr("ERROR: Failed to find a packing position: %d\n", -ret);
           return ret;
         }
     }
@@ -1418,7 +1418,7 @@ start_pack:
       ret = MTD_BREAD(volume->mtd, pack.block0, volume->blkper, volume->pack);
       if (ret < 0)
         {
-          fdbg("ERROR: Failed to read erase block %d: %d\n", eblock, -ret);
+          ferr("ERROR: Failed to read erase block %d: %d\n", eblock, -ret);
           goto errout_with_pack;
         }
 
@@ -1446,7 +1446,7 @@ start_pack:
             {
               /* Force a the block to be an NXFFS bad block */
 
-              fdbg("ERROR: Failed to read block %d: %d\n", block, ret);
+              ferr("ERROR: Failed to read block %d: %d\n", block, ret);
               nxffs_blkinit(volume, pack.iobuffer, BLOCK_STATE_BAD);
             }
         }
@@ -1514,7 +1514,7 @@ start_pack:
                             {
                               /* Otherwise, something really bad happened */
 
-                              fdbg("ERROR: Failed to pack into block %d: %d\n",
+                              ferr("ERROR: Failed to pack into block %d: %d\n",
                                    block, ret);
                               goto errout_with_pack;
                             }
@@ -1546,7 +1546,7 @@ start_pack:
                             {
                               /* Otherwise, something really bad happened */
 
-                              fdbg("ERROR: Failed to pack into block %d: %d\n",
+                              ferr("ERROR: Failed to pack into block %d: %d\n",
                                    block, ret);
                               goto errout_with_pack;
                             }
@@ -1580,7 +1580,7 @@ start_pack:
       ret = MTD_ERASE(volume->mtd, eblock, 1);
       if (ret < 0)
         {
-          fdbg("ERROR: Failed to erase block %d [%d]: %d\n",
+          ferr("ERROR: Failed to erase block %d [%d]: %d\n",
                eblock, pack.block0, -ret);
           goto errout_with_pack;
         }
@@ -1590,7 +1590,7 @@ start_pack:
       ret = MTD_BWRITE(volume->mtd, pack.block0, volume->blkper, volume->pack);
       if (ret < 0)
         {
-          fdbg("ERROR: Failed to write erase block %d [%d]: %d\n",
+          ferr("ERROR: Failed to write erase block %d [%d]: %d\n",
                eblock, pack.block0, -ret);
           goto errout_with_pack;
         }
diff --git a/fs/nxffs/nxffs_read.c b/fs/nxffs/nxffs_read.c
index 36ba8bd055..4a08a7998b 100644
--- a/fs/nxffs/nxffs_read.c
+++ b/fs/nxffs/nxffs_read.c
@@ -106,7 +106,7 @@ static ssize_t nxffs_rdseek(FAR struct nxffs_volume_s *volume,
       ret = nxffs_nextblock(volume, offset, blkentry);
       if (ret < 0)
         {
-          fdbg("ERROR: nxffs_nextblock failed: %d\n", -ret);
+          ferr("ERROR: nxffs_nextblock failed: %d\n", -ret);
           return ret;
         }
 
@@ -173,7 +173,7 @@ ssize_t nxffs_read(FAR struct file *filep, FAR char *buffer, size_t buflen)
   if (ret != OK)
     {
       ret = -get_errno();
-      fdbg("ERROR: sem_wait failed: %d\n", ret);
+      ferr("ERROR: sem_wait failed: %d\n", ret);
       goto errout;
     }
 
@@ -181,7 +181,7 @@ ssize_t nxffs_read(FAR struct file *filep, FAR char *buffer, size_t buflen)
 
   if ((ofile->oflags & O_RDOK) == 0)
     {
-      fdbg("ERROR: File not open for read access\n");
+      ferr("ERROR: File not open for read access\n");
       ret = -EACCES;
       goto errout_with_semaphore;
     }
@@ -205,7 +205,7 @@ ssize_t nxffs_read(FAR struct file *filep, FAR char *buffer, size_t buflen)
       ret = nxffs_rdseek(volume, &ofile->entry, filep->f_pos, &blkentry);
       if (ret < 0)
         {
-          fdbg("ERROR: nxffs_rdseek failed: %d\n", -ret);
+          ferr("ERROR: nxffs_rdseek failed: %d\n", -ret);
           ret = -EACCES;
           goto errout_with_semaphore;
         }
@@ -289,7 +289,7 @@ int nxffs_nextblock(FAR struct nxffs_volume_s *volume, off_t offset,
       ch = nxffs_getc(volume, SIZEOF_NXFFS_DATA_HDR - nmagic);
       if (ch < 0)
         {
-          fdbg("ERROR: nxffs_getc failed: %d\n", -ch);
+          ferr("ERROR: nxffs_getc failed: %d\n", -ch);
           return ch;
         }
 
@@ -412,7 +412,7 @@ int nxffs_rdblkhdr(FAR struct nxffs_volume_s *volume, off_t offset,
   ret = nxffs_rdcache(volume, volume->ioblock);
   if (ret < 0)
     {
-      fdbg("ERROR: Failed to read data into cache: %d\n", ret);
+      ferr("ERROR: Failed to read data into cache: %d\n", ret);
       return ret;
     }
 
@@ -433,7 +433,7 @@ int nxffs_rdblkhdr(FAR struct nxffs_volume_s *volume, off_t offset,
 
   if ((uint32_t)doffset + (uint32_t)dlen > (uint32_t)volume->geo.blocksize)
     {
-      fdbg("ERROR: Data length=%d is unreasonable at offset=%d\n", dlen, doffset);
+      ferr("ERROR: Data length=%d is unreasonable at offset=%d\n", dlen, doffset);
       return -EIO;
     }
 
@@ -447,7 +447,7 @@ int nxffs_rdblkhdr(FAR struct nxffs_volume_s *volume, off_t offset,
 
   if (crc != ecrc)
     {
-      fdbg("ERROR: CRC failure\n");
+      ferr("ERROR: CRC failure\n");
       return -EIO;
     }
 
diff --git a/fs/nxffs/nxffs_reformat.c b/fs/nxffs/nxffs_reformat.c
index cf2639a047..8c3f73222c 100644
--- a/fs/nxffs/nxffs_reformat.c
+++ b/fs/nxffs/nxffs_reformat.c
@@ -96,7 +96,7 @@ static int nxffs_format(FAR struct nxffs_volume_s *volume)
       ret = MTD_ERASE(volume->mtd, eblock, 1);
       if (ret < 0)
         {
-          fdbg("ERROR: Erase block %d failed: %d\n", eblock, ret);
+          ferr("ERROR: Erase block %d failed: %d\n", eblock, ret);
           return ret;
         }
 
@@ -106,7 +106,7 @@ static int nxffs_format(FAR struct nxffs_volume_s *volume)
       nxfrd = MTD_BWRITE(volume->mtd, lblock, volume->blkper, volume->pack);
       if (nxfrd != volume->blkper)
         {
-          fdbg("ERROR: Write erase block %d failed: %d\n", lblock, nxfrd);
+          ferr("ERROR: Write erase block %d failed: %d\n", lblock, nxfrd);
           return -EIO;
         }
     }
@@ -157,7 +157,7 @@ static int nxffs_badblocks(FAR struct nxffs_volume_s *volume)
       nxfrd  = MTD_BREAD(volume->mtd, lblock, volume->blkper, volume->pack);
       if (nxfrd != volume->blkper)
         {
-          fdbg("ERROR: Read erase block %d failed: %d\n", lblock, nxfrd);
+          ferr("ERROR: Read erase block %d failed: %d\n", lblock, nxfrd);
           return -EIO;
         }
 #endif
@@ -195,7 +195,7 @@ static int nxffs_badblocks(FAR struct nxffs_volume_s *volume)
                * read a block with uncorrectable bit errors.
                */
 
-              fdbg("ERROR: Failed to read block %d: %d\n",
+              ferr("ERROR: Failed to read block %d: %d\n",
                    block, (int)nxfrd);
 
               good = false;
@@ -244,7 +244,7 @@ static int nxffs_badblocks(FAR struct nxffs_volume_s *volume)
           nxfrd = MTD_BWRITE(volume->mtd, lblock, volume->blkper, volume->pack);
           if (nxfrd != volume->blkper)
             {
-              fdbg("ERROR: Write erase block %d failed: %d\n", lblock, nxfrd);
+              ferr("ERROR: Write erase block %d failed: %d\n", lblock, nxfrd);
               return -EIO;
             }
         }
@@ -283,7 +283,7 @@ int nxffs_reformat(FAR struct nxffs_volume_s *volume)
   ret = nxffs_format(volume);
   if (ret < 0)
     {
-      fdbg("ERROR: Failed to reformat the volume: %d\n", -ret);
+      ferr("ERROR: Failed to reformat the volume: %d\n", -ret);
       return ret;
     }
 
@@ -292,7 +292,7 @@ int nxffs_reformat(FAR struct nxffs_volume_s *volume)
   ret = nxffs_badblocks(volume);
   if (ret < 0)
     {
-      fdbg("ERROR: Bad block check failed: %d\n", -ret);
+      ferr("ERROR: Bad block check failed: %d\n", -ret);
     }
 
   return ret;
diff --git a/fs/nxffs/nxffs_stat.c b/fs/nxffs/nxffs_stat.c
index f47c55dbb8..bbbd2a82a7 100644
--- a/fs/nxffs/nxffs_stat.c
+++ b/fs/nxffs/nxffs_stat.c
@@ -145,7 +145,7 @@ int nxffs_stat(FAR struct inode *mountpt, FAR const char *relpath,
       ret = nxffs_findinode(volume, relpath, &entry);
       if (ret < 0)
         {
-          fdbg("ERROR: Inode '%s' not found: %d\n", -ret);
+          ferr("ERROR: Inode '%s' not found: %d\n", -ret);
           goto errout_with_semaphore;
         }
 
diff --git a/fs/nxffs/nxffs_unlink.c b/fs/nxffs/nxffs_unlink.c
index 9c9dbd4bdc..2ca09dc970 100644
--- a/fs/nxffs/nxffs_unlink.c
+++ b/fs/nxffs/nxffs_unlink.c
@@ -86,7 +86,7 @@ int nxffs_rminode(FAR struct nxffs_volume_s *volume, FAR const char *name)
     {
       /* We can't remove the inode if it is open */
 
-      fdbg("ERROR: Inode '%s' is open\n", name);
+      ferr("ERROR: Inode '%s' is open\n", name);
       ret = -EBUSY;
       goto errout;
     }
@@ -96,7 +96,7 @@ int nxffs_rminode(FAR struct nxffs_volume_s *volume, FAR const char *name)
   ret = nxffs_findinode(volume, name, &entry);
   if (ret < 0)
     {
-      fdbg("ERROR: Inode '%s' not found\n", name);
+      ferr("ERROR: Inode '%s' not found\n", name);
       goto errout;
     }
 
@@ -111,7 +111,7 @@ int nxffs_rminode(FAR struct nxffs_volume_s *volume, FAR const char *name)
   ret = nxffs_rdcache(volume, volume->ioblock);
   if (ret < 0)
     {
-      fdbg("ERROR: Failed to read block %d into cache: %d\n",
+      ferr("ERROR: Failed to read block %d into cache: %d\n",
            volume->ioblock, ret);
       goto errout_with_entry;
     }
@@ -126,7 +126,7 @@ int nxffs_rminode(FAR struct nxffs_volume_s *volume, FAR const char *name)
   ret = nxffs_wrcache(volume);
   if (ret < 0)
     {
-      fdbg("ERROR: Failed to write block %d: %d\n",
+      ferr("ERROR: Failed to write block %d: %d\n",
            volume->ioblock, ret);
     }
 
diff --git a/fs/nxffs/nxffs_write.c b/fs/nxffs/nxffs_write.c
index f07f43da14..1ce11f4286 100644
--- a/fs/nxffs/nxffs_write.c
+++ b/fs/nxffs/nxffs_write.c
@@ -239,7 +239,7 @@ static inline int nxffs_wralloc(FAR struct nxffs_volume_s *volume,
 
       if (ret != -ENOSPC || packed)
         {
-          fdbg("ERROR: Failed to find inode header memory: %d\n", -ret);
+          ferr("ERROR: Failed to find inode header memory: %d\n", -ret);
           return -ENOSPC;
         }
 
@@ -250,7 +250,7 @@ static inline int nxffs_wralloc(FAR struct nxffs_volume_s *volume,
       ret = nxffs_pack(volume);
       if (ret < 0)
         {
-          fdbg("ERROR: Failed to pack the volume: %d\n", -ret);
+          ferr("ERROR: Failed to pack the volume: %d\n", -ret);
           return ret;
         }
 
@@ -309,7 +309,7 @@ static inline int nxffs_reverify(FAR struct nxffs_volume_s *volume,
 
       if (crc != wrfile->crc)
         {
-          fdbg("ERROR: CRC failure\n");
+          ferr("ERROR: CRC failure\n");
           return -EIO;
         }
     }
@@ -389,7 +389,7 @@ static inline ssize_t nxffs_wrappend(FAR struct nxffs_volume_s *volume,
           ret = nxffs_wrcache(volume);
           if (ret < 0)
             {
-              fdbg("ERROR: nxffs_wrcache failed: %d\n", -ret);
+              ferr("ERROR: nxffs_wrcache failed: %d\n", -ret);
               return ret;
             }
         }
@@ -404,7 +404,7 @@ static inline ssize_t nxffs_wrappend(FAR struct nxffs_volume_s *volume,
       ret = nxffs_wrblkhdr(volume, wrfile);
       if (ret < 0)
         {
-          fdbg("ERROR: nxffs_wrblkdhr failed: %d\n", -ret);
+          ferr("ERROR: nxffs_wrblkdhr failed: %d\n", -ret);
           return ret;
         }
     }
@@ -459,7 +459,7 @@ ssize_t nxffs_write(FAR struct file *filep, FAR const char *buffer, size_t bufle
   if (ret != OK)
     {
       ret = -get_errno();
-      fdbg("ERROR: sem_wait failed: %d\n", ret);
+      ferr("ERROR: sem_wait failed: %d\n", ret);
       goto errout;
     }
 
@@ -467,7 +467,7 @@ ssize_t nxffs_write(FAR struct file *filep, FAR const char *buffer, size_t bufle
 
   if ((wrfile->ofile.oflags & O_WROK) == 0)
     {
-      fdbg("ERROR: File not open for write access\n");
+      ferr("ERROR: File not open for write access\n");
       ret = -EACCES;
       goto errout_with_semaphore;
     }
@@ -490,7 +490,7 @@ ssize_t nxffs_write(FAR struct file *filep, FAR const char *buffer, size_t bufle
           ret = nxffs_wralloc(volume, wrfile, remaining);
           if (ret < 0)
             {
-              fdbg("ERROR: Failed to allocate a data block: %d\n", -ret);
+              ferr("ERROR: Failed to allocate a data block: %d\n", -ret);
               goto errout_with_semaphore;
             }
         }
@@ -504,7 +504,7 @@ ssize_t nxffs_write(FAR struct file *filep, FAR const char *buffer, size_t bufle
       ret = nxffs_reverify(volume, wrfile);
       if (ret < 0)
         {
-          fdbg("ERROR: Failed to verify FLASH data block: %d\n", -ret);
+          ferr("ERROR: Failed to verify FLASH data block: %d\n", -ret);
           goto errout_with_semaphore;
         }
 
@@ -515,7 +515,7 @@ ssize_t nxffs_write(FAR struct file *filep, FAR const char *buffer, size_t bufle
       nwritten = nxffs_wrappend(volume, wrfile, &buffer[total], remaining);
       if (nwritten < 0)
         {
-          fdbg("ERROR: Failed to append to FLASH to a data block: %d\n", -ret);
+          ferr("ERROR: Failed to append to FLASH to a data block: %d\n", -ret);
           goto errout_with_semaphore;
         }
 
@@ -607,7 +607,7 @@ int nxffs_wrreserve(FAR struct nxffs_volume_s *volume, size_t size)
         {
           /* Return -ENOSPC to indicate that the volume is full */
 
-          fdbg("ERROR: No space in last block\n");
+          ferr("ERROR: No space in last block\n");
           return -ENOSPC;
         }
 
@@ -619,7 +619,7 @@ int nxffs_wrreserve(FAR struct nxffs_volume_s *volume, size_t size)
       ret = nxffs_validblock(volume, &volume->ioblock);
       if (ret < 0)
         {
-          fdbg("ERROR: No more valid blocks\n");
+          ferr("ERROR: No more valid blocks\n");
           return ret;
         }
 
@@ -695,7 +695,7 @@ int nxffs_wrverify(FAR struct nxffs_volume_s *volume, size_t size)
            * the block has uncorrectable bit errors.
            */
 
-          fdbg("ERROR: Failed to read block %d: %d\n",
+          ferr("ERROR: Failed to read block %d: %d\n",
                volume->ioblock, -ret);
         }
 
@@ -754,7 +754,7 @@ int nxffs_wrverify(FAR struct nxffs_volume_s *volume, size_t size)
       ret = nxffs_validblock(volume, &volume->ioblock);
       if (ret < 0)
         {
-          fdbg("ERROR: No more valid blocks\n");
+          ferr("ERROR: No more valid blocks\n");
           return ret;
         }
 
@@ -766,7 +766,7 @@ int nxffs_wrverify(FAR struct nxffs_volume_s *volume, size_t size)
    * the object.
    */
 
-  fdbg("ERROR: Not enough memory left to hold the file header\n");
+  ferr("ERROR: Not enough memory left to hold the file header\n");
   return -ENOSPC;
 }
 
@@ -812,7 +812,7 @@ int nxffs_wrblkhdr(FAR struct nxffs_volume_s *volume,
   ret = nxffs_wrcache(volume);
   if (ret < 0)
     {
-      fdbg("ERROR: nxffs_wrcache failed: %d\n", -ret);
+      ferr("ERROR: nxffs_wrcache failed: %d\n", -ret);
       goto errout;
     }
 
diff --git a/fs/procfs/fs_procfs.c b/fs/procfs/fs_procfs.c
index 6b0ee4e3c0..b350809c97 100644
--- a/fs/procfs/fs_procfs.c
+++ b/fs/procfs/fs_procfs.c
@@ -496,7 +496,7 @@ static int procfs_opendir(FAR struct inode *mountpt, FAR const char *relpath,
 
       if (!level0)
         {
-          fdbg("ERROR: Failed to allocate the level0 directory structure\n");
+          ferr("ERROR: Failed to allocate the level0 directory structure\n");
           return -ENOMEM;
         }
 
@@ -575,7 +575,7 @@ static int procfs_opendir(FAR struct inode *mountpt, FAR const char *relpath,
 
               if (!level1)
                 {
-                  fdbg("ERROR: Failed to allocate the level0 directory structure\n");
+                  ferr("ERROR: Failed to allocate the level0 directory structure\n");
                   return -ENOMEM;
                 }
 
@@ -757,7 +757,7 @@ static int procfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir)
 
           if (!tcb)
             {
-              fdbg("ERROR: PID %d is no longer valid\n", (int)pid);
+              ferr("ERROR: PID %d is no longer valid\n", (int)pid);
               return -ENOENT;
             }
 
diff --git a/fs/procfs/fs_procfscpuload.c b/fs/procfs/fs_procfscpuload.c
index 02d216e409..593c0c5281 100644
--- a/fs/procfs/fs_procfscpuload.c
+++ b/fs/procfs/fs_procfscpuload.c
@@ -148,7 +148,7 @@ static int cpuload_open(FAR struct file *filep, FAR const char *relpath,
 
   if ((oflags & O_WRONLY) != 0 || (oflags & O_RDONLY) == 0)
     {
-      fdbg("ERROR: Only O_RDONLY supported\n");
+      ferr("ERROR: Only O_RDONLY supported\n");
       return -EACCES;
     }
 
@@ -156,7 +156,7 @@ static int cpuload_open(FAR struct file *filep, FAR const char *relpath,
 
   if (strcmp(relpath, "cpuload") != 0)
     {
-      fdbg("ERROR: relpath is '%s'\n", relpath);
+      ferr("ERROR: relpath is '%s'\n", relpath);
       return -ENOENT;
     }
 
@@ -165,7 +165,7 @@ static int cpuload_open(FAR struct file *filep, FAR const char *relpath,
   attr = (FAR struct cpuload_file_s *)kmm_zalloc(sizeof(struct cpuload_file_s));
   if (!attr)
     {
-      fdbg("ERROR: Failed to allocate file attributes\n");
+      ferr("ERROR: Failed to allocate file attributes\n");
       return -ENOMEM;
     }
 
@@ -300,7 +300,7 @@ static int cpuload_dup(FAR const struct file *oldp, FAR struct file *newp)
   newattr = (FAR struct cpuload_file_s *)kmm_malloc(sizeof(struct cpuload_file_s));
   if (!newattr)
     {
-      fdbg("ERROR: Failed to allocate file attributes\n");
+      ferr("ERROR: Failed to allocate file attributes\n");
       return -ENOMEM;
     }
 
@@ -327,7 +327,7 @@ static int cpuload_stat(const char *relpath, struct stat *buf)
 
   if (strcmp(relpath, "cpuload") != 0)
     {
-      fdbg("ERROR: relpath is '%s'\n", relpath);
+      ferr("ERROR: relpath is '%s'\n", relpath);
       return -ENOENT;
     }
 
diff --git a/fs/procfs/fs_procfskmm.c b/fs/procfs/fs_procfskmm.c
index 4589de4a88..ab0c6779ec 100644
--- a/fs/procfs/fs_procfskmm.c
+++ b/fs/procfs/fs_procfskmm.c
@@ -147,7 +147,7 @@ static int kmm_open(FAR struct file *filep, FAR const char *relpath,
 
   if ((oflags & O_WRONLY) != 0 || (oflags & O_RDONLY) == 0)
     {
-      fdbg("ERROR: Only O_RDONLY supported\n");
+      ferr("ERROR: Only O_RDONLY supported\n");
       return -EACCES;
     }
 
@@ -155,7 +155,7 @@ static int kmm_open(FAR struct file *filep, FAR const char *relpath,
 
   if (strcmp(relpath, "kmm") != 0)
     {
-      fdbg("ERROR: relpath is '%s'\n", relpath);
+      ferr("ERROR: relpath is '%s'\n", relpath);
       return -ENOENT;
     }
 
@@ -164,7 +164,7 @@ static int kmm_open(FAR struct file *filep, FAR const char *relpath,
   procfile = (FAR struct kmm_file_s *)kmm_zalloc(sizeof(struct kmm_file_s));
   if (!procfile)
     {
-      fdbg("ERROR: Failed to allocate file attributes\n");
+      ferr("ERROR: Failed to allocate file attributes\n");
       return -ENOMEM;
     }
 
@@ -279,7 +279,7 @@ static int kmm_dup(FAR const struct file *oldp, FAR struct file *newp)
   newattr = (FAR struct kmm_file_s *)kmm_malloc(sizeof(struct kmm_file_s));
   if (!newattr)
     {
-      fdbg("ERROR: Failed to allocate file attributes\n");
+      ferr("ERROR: Failed to allocate file attributes\n");
       return -ENOMEM;
     }
 
@@ -306,7 +306,7 @@ static int kmm_stat(FAR const char *relpath, FAR struct stat *buf)
 
   if (strcmp(relpath, "kmm") != 0)
     {
-      fdbg("ERROR: relpath is '%s'\n", relpath);
+      ferr("ERROR: relpath is '%s'\n", relpath);
       return -ENOENT;
     }
 
diff --git a/fs/procfs/fs_procfsproc.c b/fs/procfs/fs_procfsproc.c
index d7cb3f8813..79abd759ef 100644
--- a/fs/procfs/fs_procfsproc.c
+++ b/fs/procfs/fs_procfsproc.c
@@ -1023,7 +1023,7 @@ static int proc_open(FAR struct file *filep, FAR const char *relpath,
 
   if ((oflags & O_WRONLY) != 0 || (oflags & O_RDONLY) == 0)
     {
-      fdbg("ERROR: Only O_RDONLY supported\n");
+      ferr("ERROR: Only O_RDONLY supported\n");
       return -EACCES;
     }
 
@@ -1034,7 +1034,7 @@ static int proc_open(FAR struct file *filep, FAR const char *relpath,
 
   if (!ptr || *ptr != '/')
     {
-      fdbg("ERROR: Invalid path \"%s\"\n", relpath);
+      ferr("ERROR: Invalid path \"%s\"\n", relpath);
       return -ENOENT;
     }
 
@@ -1048,7 +1048,7 @@ static int proc_open(FAR struct file *filep, FAR const char *relpath,
 
   if (tmp >= 32768)
     {
-      fdbg("ERROR: Invalid PID %ld\n", tmp);
+      ferr("ERROR: Invalid PID %ld\n", tmp);
       return -ENOENT;
     }
 
@@ -1062,7 +1062,7 @@ static int proc_open(FAR struct file *filep, FAR const char *relpath,
 
   if (!tcb)
     {
-      fdbg("ERROR: PID %d is no longer valid\n", (int)pid);
+      ferr("ERROR: PID %d is no longer valid\n", (int)pid);
       return -ENOENT;
     }
 
@@ -1073,7 +1073,7 @@ static int proc_open(FAR struct file *filep, FAR const char *relpath,
   node = proc_findnode(ptr);
   if (!node)
     {
-      fdbg("ERROR: Invalid path \"%s\"\n", relpath);
+      ferr("ERROR: Invalid path \"%s\"\n", relpath);
       return -ENOENT;
     }
 
@@ -1081,7 +1081,7 @@ static int proc_open(FAR struct file *filep, FAR const char *relpath,
 
   if (!DIRENT_ISFILE(node->dtype))
     {
-      fdbg("ERROR: Path \"%s\" is not a regular file\n", relpath);
+      ferr("ERROR: Path \"%s\" is not a regular file\n", relpath);
       return -EISDIR;
     }
 
@@ -1090,7 +1090,7 @@ static int proc_open(FAR struct file *filep, FAR const char *relpath,
   procfile = (FAR struct proc_file_s *)kmm_zalloc(sizeof(struct proc_file_s));
   if (!procfile)
     {
-      fdbg("ERROR: Failed to allocate file container\n");
+      ferr("ERROR: Failed to allocate file container\n");
       return -ENOMEM;
     }
 
@@ -1151,7 +1151,7 @@ static ssize_t proc_read(FAR struct file *filep, FAR char *buffer,
 
   if (!tcb)
     {
-      fdbg("ERROR: PID %d is not valid\n", (int)procfile->pid);
+      ferr("ERROR: PID %d is not valid\n", (int)procfile->pid);
       leave_critical_section(flags);
       return -ENODEV;
     }
@@ -1227,7 +1227,7 @@ static int proc_dup(FAR const struct file *oldp, FAR struct file *newp)
   newfile = (FAR struct proc_file_s *)kmm_malloc(sizeof(struct proc_file_s));
   if (!newfile)
     {
-      fdbg("ERROR: Failed to allocate file container\n");
+      ferr("ERROR: Failed to allocate file container\n");
       return -ENOMEM;
     }
 
@@ -1277,7 +1277,7 @@ static int proc_opendir(FAR const char *relpath, FAR struct fs_dirent_s *dir)
     {
       /* strtoul failed or there is something in the path after the pid */
 
-      fdbg("ERROR: Invalid path \"%s\"\n", relpath);
+      ferr("ERROR: Invalid path \"%s\"\n", relpath);
       return -ENOENT;
    }
 
@@ -1287,7 +1287,7 @@ static int proc_opendir(FAR const char *relpath, FAR struct fs_dirent_s *dir)
 
   if (tmp >= 32768)
     {
-      fdbg("ERROR: Invalid PID %ld\n", tmp);
+      ferr("ERROR: Invalid PID %ld\n", tmp);
       return -ENOENT;
     }
 
@@ -1301,7 +1301,7 @@ static int proc_opendir(FAR const char *relpath, FAR struct fs_dirent_s *dir)
 
   if (!tcb)
     {
-      fdbg("ERROR: PID %d is not valid\n", (int)pid);
+      ferr("ERROR: PID %d is not valid\n", (int)pid);
       return -ENOENT;
     }
 
@@ -1313,7 +1313,7 @@ static int proc_opendir(FAR const char *relpath, FAR struct fs_dirent_s *dir)
   procdir = (FAR struct proc_dir_s *)kmm_zalloc(sizeof(struct proc_dir_s));
   if (!procdir)
     {
-      fdbg("ERROR: Failed to allocate the directory structure\n");
+      ferr("ERROR: Failed to allocate the directory structure\n");
       return -ENOMEM;
     }
 
@@ -1329,7 +1329,7 @@ static int proc_opendir(FAR const char *relpath, FAR struct fs_dirent_s *dir)
       node = proc_findnode(ptr);
       if (!node)
         {
-          fdbg("ERROR: Invalid path \"%s\"\n", relpath);
+          ferr("ERROR: Invalid path \"%s\"\n", relpath);
           kmm_free(procdir);
           return -ENOENT;
         }
@@ -1338,7 +1338,7 @@ static int proc_opendir(FAR const char *relpath, FAR struct fs_dirent_s *dir)
 
       if (!DIRENT_ISDIRECTORY(node->dtype))
         {
-          fdbg("ERROR: Path \"%s\" is not a directory\n", relpath);
+          ferr("ERROR: Path \"%s\" is not a directory\n", relpath);
           kmm_free(procdir);
           return -ENOTDIR;
         }
@@ -1433,7 +1433,7 @@ static int proc_readdir(struct fs_dirent_s *dir)
 
       if (!tcb)
         {
-          fdbg("ERROR: PID %d is no longer valid\n", (int)pid);
+          ferr("ERROR: PID %d is no longer valid\n", (int)pid);
           return -ENOENT;
         }
 
@@ -1519,7 +1519,7 @@ static int proc_stat(const char *relpath, struct stat *buf)
 
   if (!ptr)
     {
-      fdbg("ERROR: Invalid path \"%s\"\n", relpath);
+      ferr("ERROR: Invalid path \"%s\"\n", relpath);
       return -ENOENT;
    }
 
@@ -1529,7 +1529,7 @@ static int proc_stat(const char *relpath, struct stat *buf)
 
   if (tmp >= 32768)
     {
-      fdbg("ERROR: Invalid PID %ld\n", tmp);
+      ferr("ERROR: Invalid PID %ld\n", tmp);
       return -ENOENT;
     }
 
@@ -1543,7 +1543,7 @@ static int proc_stat(const char *relpath, struct stat *buf)
 
   if (!tcb)
     {
-      fdbg("ERROR: PID %d is no longer valid\n", (int)pid);
+      ferr("ERROR: PID %d is no longer valid\n", (int)pid);
       return -ENOENT;
     }
 
@@ -1562,7 +1562,7 @@ static int proc_stat(const char *relpath, struct stat *buf)
     {
       /* We are required to return -ENOENT all all invalid paths */
 
-      fdbg("ERROR: Bad delimiter '%c' in relpath '%s'\n", *ptr, relpath);
+      ferr("ERROR: Bad delimiter '%c' in relpath '%s'\n", *ptr, relpath);
       return -ENOENT;
     }
   else
@@ -1580,7 +1580,7 @@ static int proc_stat(const char *relpath, struct stat *buf)
       node = proc_findnode(ptr);
       if (!node)
         {
-          fdbg("ERROR: Invalid path \"%s\"\n", relpath);
+          ferr("ERROR: Invalid path \"%s\"\n", relpath);
           return -ENOENT;
         }
 
diff --git a/fs/procfs/fs_procfsuptime.c b/fs/procfs/fs_procfsuptime.c
index 75d7510ed1..9a9f8de8ba 100644
--- a/fs/procfs/fs_procfsuptime.c
+++ b/fs/procfs/fs_procfsuptime.c
@@ -150,7 +150,7 @@ static int uptime_open(FAR struct file *filep, FAR const char *relpath,
 
   if ((oflags & O_WRONLY) != 0 || (oflags & O_RDONLY) == 0)
     {
-      fdbg("ERROR: Only O_RDONLY supported\n");
+      ferr("ERROR: Only O_RDONLY supported\n");
       return -EACCES;
     }
 
@@ -158,7 +158,7 @@ static int uptime_open(FAR struct file *filep, FAR const char *relpath,
 
   if (strcmp(relpath, "uptime") != 0)
     {
-      fdbg("ERROR: relpath is '%s'\n", relpath);
+      ferr("ERROR: relpath is '%s'\n", relpath);
       return -ENOENT;
     }
 
@@ -167,7 +167,7 @@ static int uptime_open(FAR struct file *filep, FAR const char *relpath,
   attr = (FAR struct uptime_file_s *)kmm_zalloc(sizeof(struct uptime_file_s));
   if (!attr)
     {
-      fdbg("ERROR: Failed to allocate file attributes\n");
+      ferr("ERROR: Failed to allocate file attributes\n");
       return -ENOMEM;
     }
 
@@ -313,7 +313,7 @@ static int uptime_dup(FAR const struct file *oldp, FAR struct file *newp)
   newattr = (FAR struct uptime_file_s *)kmm_malloc(sizeof(struct uptime_file_s));
   if (!newattr)
     {
-      fdbg("ERROR: Failed to allocate file attributes\n");
+      ferr("ERROR: Failed to allocate file attributes\n");
       return -ENOMEM;
     }
 
@@ -340,7 +340,7 @@ static int uptime_stat(FAR const char *relpath, FAR struct stat *buf)
 
   if (strcmp(relpath, "uptime") != 0)
     {
-      fdbg("ERROR: relpath is '%s'\n", relpath);
+      ferr("ERROR: relpath is '%s'\n", relpath);
       return -ENOENT;
     }
 
diff --git a/fs/procfs/fs_skeleton.c b/fs/procfs/fs_skeleton.c
index 55216e8cef..0a884e03be 100644
--- a/fs/procfs/fs_skeleton.c
+++ b/fs/procfs/fs_skeleton.c
@@ -174,7 +174,7 @@ static int skel_open(FAR struct file *filep, FAR const char *relpath,
   if (((oflags & O_WRONLY) != 0 || (oflags & O_RDONLY) == 0) &&
       (skel_procfsoperations.write == NULL))
     {
-      fdbg("ERROR: Only O_RDONLY supported\n");
+      ferr("ERROR: Only O_RDONLY supported\n");
       return -EACCES;
     }
 
@@ -183,7 +183,7 @@ static int skel_open(FAR struct file *filep, FAR const char *relpath,
   priv = (FAR struct skel_file_s *)kmm_zalloc(sizeof(struct skel_file_s));
   if (!priv)
     {
-      fdbg("ERROR: Failed to allocate file attributes\n");
+      ferr("ERROR: Failed to allocate file attributes\n");
       return -ENOMEM;
     }
 
@@ -274,7 +274,7 @@ static int skel_dup(FAR const struct file *oldp, FAR struct file *newp)
   newpriv = (FAR struct skel_file_s *)kmm_zalloc(sizeof(struct skel_file_s));
   if (!newpriv)
     {
-      fdbg("ERROR: Failed to allocate file attributes\n");
+      ferr("ERROR: Failed to allocate file attributes\n");
       return -ENOMEM;
     }
 
@@ -312,7 +312,7 @@ static int skel_opendir(FAR const char *relpath, FAR struct fs_dirent_s *dir)
 
   if (!level1)
     {
-      fdbg("ERROR: Failed to allocate the level1 directory structure\n");
+      ferr("ERROR: Failed to allocate the level1 directory structure\n");
       return -ENOMEM;
     }
 
diff --git a/fs/romfs/fs_romfs.c b/fs/romfs/fs_romfs.c
index e48c6e71e2..b90b87101b 100644
--- a/fs/romfs/fs_romfs.c
+++ b/fs/romfs/fs_romfs.c
@@ -169,7 +169,7 @@ static int romfs_open(FAR struct file *filep, FAR const char *relpath,
   ret = romfs_checkmount(rm);
   if (ret != OK)
     {
-      fdbg("romfs_checkmount failed: %d\n", ret);
+      ferr("romfs_checkmount failed: %d\n", ret);
       goto errout_with_semaphore;
     }
 
@@ -179,7 +179,7 @@ static int romfs_open(FAR struct file *filep, FAR const char *relpath,
 
   if ((oflags & O_WRONLY) != 0 || (oflags & O_RDONLY) == 0)
     {
-      fdbg("Only O_RDONLY supported\n");
+      ferr("Only O_RDONLY supported\n");
       ret = -EACCES;
       goto errout_with_semaphore;
     }
@@ -193,7 +193,7 @@ static int romfs_open(FAR struct file *filep, FAR const char *relpath,
   ret = romfs_finddirentry(rm, &dirinfo, relpath);
   if (ret < 0)
     {
-      fdbg("Failed to find directory directory entry for '%s': %d\n",
+      ferr("Failed to find directory directory entry for '%s': %d\n",
            relpath, ret);
       goto errout_with_semaphore;
     }
@@ -207,7 +207,7 @@ static int romfs_open(FAR struct file *filep, FAR const char *relpath,
       /* It is a directory */
 
       ret = -EISDIR;
-      fdbg("'%s' is a directory\n", relpath);
+      ferr("'%s' is a directory\n", relpath);
       goto errout_with_semaphore;
     }
 
@@ -222,7 +222,7 @@ static int romfs_open(FAR struct file *filep, FAR const char *relpath,
   rf = (FAR struct romfs_file_s *)kmm_zalloc(sizeof(struct romfs_file_s));
   if (!rf)
     {
-      fdbg("Failed to allocate private data\n", ret);
+      ferr("Failed to allocate private data\n", ret);
       ret = -ENOMEM;
       goto errout_with_semaphore;
     }
@@ -239,7 +239,7 @@ static int romfs_open(FAR struct file *filep, FAR const char *relpath,
                         &rf->rf_startoffset);
   if (ret < 0)
     {
-      fdbg("Failed to locate start of file data: %d\n", ret);
+      ferr("Failed to locate start of file data: %d\n", ret);
       goto errout_with_semaphore;
     }
 
@@ -248,7 +248,7 @@ static int romfs_open(FAR struct file *filep, FAR const char *relpath,
   ret = romfs_fileconfigure(rm, rf);
   if (ret < 0)
     {
-      fdbg("Failed configure buffering: %d\n", ret);
+      ferr("Failed configure buffering: %d\n", ret);
       goto errout_with_semaphore;
     }
 
@@ -359,7 +359,7 @@ static ssize_t romfs_read(FAR struct file *filep, FAR char *buffer,
   ret = romfs_checkmount(rm);
   if (ret != OK)
     {
-      fdbg("romfs_checkmount failed: %d\n", ret);
+      ferr("romfs_checkmount failed: %d\n", ret);
       goto errout_with_semaphore;
     }
 
@@ -408,7 +408,7 @@ static ssize_t romfs_read(FAR struct file *filep, FAR char *buffer,
           ret = romfs_hwread(rm, userbuffer, sector, nsectors);
           if (ret < 0)
             {
-              fdbg("romfs_hwread failed: %d\n", ret);
+              ferr("romfs_hwread failed: %d\n", ret);
               goto errout_with_semaphore;
             }
 
@@ -426,7 +426,7 @@ static ssize_t romfs_read(FAR struct file *filep, FAR char *buffer,
           ret = romfs_filecacheread(rm, rf, sector);
           if (ret < 0)
             {
-              fdbg("romfs_filecacheread failed: %d\n", ret);
+              ferr("romfs_filecacheread failed: %d\n", ret);
               goto errout_with_semaphore;
             }
 
@@ -511,7 +511,7 @@ static off_t romfs_seek(FAR struct file *filep, off_t offset, int whence)
         break;
 
     default:
-        fdbg("Whence is invalid: %d\n", whence);
+        ferr("Whence is invalid: %d\n", whence);
         return -EINVAL;
     }
 
@@ -521,7 +521,7 @@ static off_t romfs_seek(FAR struct file *filep, off_t offset, int whence)
   ret = romfs_checkmount(rm);
   if (ret != OK)
     {
-       fdbg("romfs_checkmount failed: %d\n", ret);
+       ferr("romfs_checkmount failed: %d\n", ret);
        goto errout_with_semaphore;
     }
 
@@ -582,7 +582,7 @@ static int romfs_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
       return OK;
     }
 
-  fdbg("Invalid cmd: %d \n", cmd);
+  ferr("Invalid cmd: %d \n", cmd);
   return -ENOTTY;
 }
 
@@ -618,7 +618,7 @@ static int romfs_dup(FAR const struct file *oldp, FAR struct file *newp)
   ret = romfs_checkmount(rm);
   if (ret != OK)
     {
-      fdbg("romfs_checkmount failed: %d\n", ret);
+      ferr("romfs_checkmount failed: %d\n", ret);
       goto errout_with_semaphore;
     }
 
@@ -633,7 +633,7 @@ static int romfs_dup(FAR const struct file *oldp, FAR struct file *newp)
   newrf = (FAR struct romfs_file_s *)kmm_malloc(sizeof(struct romfs_file_s));
   if (!newrf)
     {
-      fdbg("Failed to allocate private data\n", ret);
+      ferr("Failed to allocate private data\n", ret);
       ret = -ENOMEM;
       goto errout_with_semaphore;
     }
@@ -649,7 +649,7 @@ static int romfs_dup(FAR const struct file *oldp, FAR struct file *newp)
   if (ret < 0)
     {
       kmm_free(newrf);
-      fdbg("Failed configure buffering: %d\n", ret);
+      ferr("Failed configure buffering: %d\n", ret);
       goto errout_with_semaphore;
     }
 
@@ -707,7 +707,7 @@ static int romfs_opendir(FAR struct inode *mountpt, FAR const char *relpath,
   ret = romfs_checkmount(rm);
   if (ret != OK)
     {
-      fdbg("romfs_checkmount failed: %d\n", ret);
+      ferr("romfs_checkmount failed: %d\n", ret);
       goto errout_with_semaphore;
     }
 
@@ -716,7 +716,7 @@ static int romfs_opendir(FAR struct inode *mountpt, FAR const char *relpath,
   ret = romfs_finddirentry(rm, &dirinfo, relpath);
   if (ret < 0)
     {
-      fdbg("Failed to find directory '%s': %d\n", relpath, ret);
+      ferr("Failed to find directory '%s': %d\n", relpath, ret);
       goto errout_with_semaphore;
     }
 
@@ -726,7 +726,7 @@ static int romfs_opendir(FAR struct inode *mountpt, FAR const char *relpath,
     {
       /* The entry is not a directory */
 
-      fdbg("'%s' is not a directory: %d\n", relpath);
+      ferr("'%s' is not a directory: %d\n", relpath);
       ret = -ENOTDIR;
       goto errout_with_semaphore;
     }
@@ -775,7 +775,7 @@ static int romfs_readdir(FAR struct inode *mountpt,
   ret = romfs_checkmount(rm);
   if (ret != OK)
     {
-      fdbg("romfs_checkmount failed: %d\n", ret);
+      ferr("romfs_checkmount failed: %d\n", ret);
       goto errout_with_semaphore;
     }
 
@@ -791,7 +791,7 @@ static int romfs_readdir(FAR struct inode *mountpt,
            * special error -ENOENT
            */
 
-          fdbg("End of directory\n");
+          ferr("End of directory\n");
           ret = -ENOENT;
           goto errout_with_semaphore;
         }
@@ -802,7 +802,7 @@ static int romfs_readdir(FAR struct inode *mountpt,
                                 &next, &info, &size);
       if (ret < 0)
         {
-          fdbg("romfs_parsedirentry failed: %d\n", ret);
+          ferr("romfs_parsedirentry failed: %d\n", ret);
           goto errout_with_semaphore;
         }
 
@@ -811,7 +811,7 @@ static int romfs_readdir(FAR struct inode *mountpt,
       ret = romfs_parsefilename(rm, dir->u.romfs.fr_curroffset, dir->fd_dir.d_name);
       if (ret < 0)
         {
-          fdbg("romfs_parsefilename failed: %d\n", ret);
+          ferr("romfs_parsefilename failed: %d\n", ret);
           goto errout_with_semaphore;
         }
 
@@ -897,14 +897,14 @@ static int romfs_bind(FAR struct inode *blkdriver, FAR const void *data,
 
   if (!blkdriver || !blkdriver->u.i_bops)
     {
-      fdbg("No block driver/ops\n");
+      ferr("No block driver/ops\n");
       return -ENODEV;
     }
 
   if (blkdriver->u.i_bops->open &&
       blkdriver->u.i_bops->open(blkdriver) != OK)
     {
-      fdbg("No open method\n");
+      ferr("No open method\n");
       return -ENODEV;
     }
 
@@ -913,7 +913,7 @@ static int romfs_bind(FAR struct inode *blkdriver, FAR const void *data,
   rm = (FAR struct romfs_mountpt_s *)kmm_zalloc(sizeof(struct romfs_mountpt_s));
   if (!rm)
     {
-      fdbg("Failed to allocate mountpoint structure\n");
+      ferr("Failed to allocate mountpoint structure\n");
       return -ENOMEM;
     }
 
@@ -930,7 +930,7 @@ static int romfs_bind(FAR struct inode *blkdriver, FAR const void *data,
   ret = romfs_hwconfigure(rm);
   if (ret < 0)
     {
-      fdbg("romfs_hwconfigure failed: %d\n", ret);
+      ferr("romfs_hwconfigure failed: %d\n", ret);
       goto errout_with_sem;
     }
 
@@ -941,7 +941,7 @@ static int romfs_bind(FAR struct inode *blkdriver, FAR const void *data,
   ret = romfs_fsconfigure(rm);
   if (ret < 0)
     {
-      fdbg("romfs_fsconfigure failed: %d\n", ret);
+      ferr("romfs_fsconfigure failed: %d\n", ret);
       goto errout_with_buffer;
     }
 
@@ -993,7 +993,7 @@ static int romfs_unbind(FAR void *handle, FAR struct inode **blkdriver,
     {
       /* We cannot unmount now.. there are open files */
 
-      fdbg("There are open files\n");
+      ferr("There are open files\n");
 
       /* This implementation currently only supports unmounting if there are
        * no open file references.
@@ -1072,7 +1072,7 @@ static int romfs_statfs(FAR struct inode *mountpt, FAR struct statfs *buf)
   ret = romfs_checkmount(rm);
   if (ret < 0)
     {
-      fdbg("romfs_checkmount failed: %d\n", ret);
+      ferr("romfs_checkmount failed: %d\n", ret);
       goto errout_with_semaphore;
     }
 
@@ -1130,7 +1130,7 @@ static int romfs_stat(FAR struct inode *mountpt, FAR const char *relpath,
   ret = romfs_checkmount(rm);
   if (ret != OK)
     {
-      fdbg("romfs_checkmount failed: %d\n", ret);
+      ferr("romfs_checkmount failed: %d\n", ret);
       goto errout_with_semaphore;
     }
 
diff --git a/fs/romfs/fs_romfsutil.c b/fs/romfs/fs_romfsutil.c
index 045bed977f..b39f3e866f 100644
--- a/fs/romfs/fs_romfsutil.c
+++ b/fs/romfs/fs_romfsutil.c
@@ -467,7 +467,7 @@ int romfs_filecacheread(struct romfs_mountpt_s *rm, struct romfs_file_s *rf,
           ret = romfs_hwread(rm, rf->rf_buffer, sector, 1);
           if (ret < 0)
             {
-              fdbg("romfs_hwread failed: %d\n", ret);
+              ferr("romfs_hwread failed: %d\n", ret);
               return ret;
             }
         }
diff --git a/fs/smartfs/smartfs_procfs.c b/fs/smartfs/smartfs_procfs.c
index d8fe9995c3..915ebfd559 100644
--- a/fs/smartfs/smartfs_procfs.c
+++ b/fs/smartfs/smartfs_procfs.c
@@ -359,7 +359,7 @@ static int smartfs_open(FAR struct file *filep, FAR const char *relpath,
   if (((oflags & O_WRONLY) != 0 || (oflags & O_RDONLY) == 0) &&
       (smartfs_procfsoperations.write == NULL))
     {
-      fdbg("ERROR: Only O_RDONLY supported\n");
+      ferr("ERROR: Only O_RDONLY supported\n");
       return -EACCES;
     }
 
@@ -368,7 +368,7 @@ static int smartfs_open(FAR struct file *filep, FAR const char *relpath,
   priv = (FAR struct smartfs_file_s *)kmm_malloc(sizeof(struct smartfs_file_s));
   if (!priv)
     {
-      fdbg("ERROR: Failed to allocate file attributes\n");
+      ferr("ERROR: Failed to allocate file attributes\n");
       return -ENOMEM;
     }
 
@@ -518,7 +518,7 @@ static int smartfs_dup(FAR const struct file *oldp, FAR struct file *newp)
   newpriv = (FAR struct smartfs_file_s *)kmm_malloc(sizeof(struct smartfs_file_s));
   if (!newpriv)
     {
-      fdbg("ERROR: Failed to allocate file attributes\n");
+      ferr("ERROR: Failed to allocate file attributes\n");
       return -ENOMEM;
     }
 
@@ -557,7 +557,7 @@ static int smartfs_opendir(FAR const char *relpath, FAR struct fs_dirent_s *dir)
 
   if (!level1)
     {
-      fdbg("ERROR: Failed to allocate the level1 directory structure\n");
+      ferr("ERROR: Failed to allocate the level1 directory structure\n");
       return -ENOMEM;
     }
 
diff --git a/fs/smartfs/smartfs_smart.c b/fs/smartfs/smartfs_smart.c
index d7c7694be5..eeae9d6ccf 100644
--- a/fs/smartfs/smartfs_smart.c
+++ b/fs/smartfs/smartfs_smart.c
@@ -505,7 +505,7 @@ static ssize_t smartfs_read(FAR struct file *filep, char *buffer, size_t buflen)
       ret = FS_IOCTL(fs, BIOC_READSECT, (unsigned long) &readwrite);
       if (ret < 0)
         {
-          fdbg("Error %d reading sector %d data\n", ret, sf->currsector);
+          ferr("Error %d reading sector %d data\n", ret, sf->currsector);
           goto errout_with_semaphore;
         }
 
@@ -614,7 +614,7 @@ static int smartfs_sync_internal(struct smartfs_mountpt_s *fs,
       ret = FS_IOCTL(fs, BIOC_WRITESECT, (unsigned long) &readwrite);
       if (ret < 0)
         {
-          fdbg("Error %d writing used bytes for sector %d\n", ret, sf->currsector);
+          ferr("Error %d writing used bytes for sector %d\n", ret, sf->currsector);
           goto errout;
         }
 
@@ -639,7 +639,7 @@ static int smartfs_sync_internal(struct smartfs_mountpt_s *fs,
       ret = FS_IOCTL(fs, BIOC_READSECT, (unsigned long) &readwrite);
       if (ret < 0)
         {
-          fdbg("Error %d reading sector %d data\n", ret, sf->currsector);
+          ferr("Error %d reading sector %d data\n", ret, sf->currsector);
           goto errout;
         }
 
@@ -661,7 +661,7 @@ static int smartfs_sync_internal(struct smartfs_mountpt_s *fs,
       ret = FS_IOCTL(fs, BIOC_WRITESECT, (unsigned long) &readwrite);
       if (ret < 0)
         {
-          fdbg("Error %d writing used bytes for sector %d\n", ret, sf->currsector);
+          ferr("Error %d writing used bytes for sector %d\n", ret, sf->currsector);
           goto errout;
         }
 
@@ -766,7 +766,7 @@ static ssize_t smartfs_write(FAR struct file *filep, const char *buffer,
           ret = FS_IOCTL(fs, BIOC_WRITESECT, (unsigned long) &readwrite);
           if (ret < 0)
             {
-              fdbg("Error %d writing sector %d data\n", ret, sf->currsector);
+              ferr("Error %d writing sector %d data\n", ret, sf->currsector);
               goto errout_with_semaphore;
             }
 
@@ -793,7 +793,7 @@ static ssize_t smartfs_write(FAR struct file *filep, const char *buffer,
           ret = FS_IOCTL(fs, BIOC_READSECT, (unsigned long) &readwrite);
           if (ret < 0)
             {
-              fdbg("Error %d reading sector %d header\n", ret, sf->currsector);
+              ferr("Error %d reading sector %d header\n", ret, sf->currsector);
               goto errout_with_semaphore;
             }
 
@@ -841,7 +841,7 @@ static ssize_t smartfs_write(FAR struct file *filep, const char *buffer,
           ret = FS_IOCTL(fs, BIOC_WRITESECT, (unsigned long) &readwrite);
           if (ret < 0)
             {
-              fdbg("Error %d writing sector %d data\n", ret, sf->currsector);
+              ferr("Error %d writing sector %d data\n", ret, sf->currsector);
               goto errout_with_semaphore;
             }
         }
@@ -867,7 +867,7 @@ static ssize_t smartfs_write(FAR struct file *filep, const char *buffer,
           ret = FS_IOCTL(fs, BIOC_ALLOCSECT, 0xFFFF);
           if (ret < 0)
             {
-              fdbg("Error %d allocating new sector\n", ret);
+              ferr("Error %d allocating new sector\n", ret);
               goto errout_with_semaphore;
             }
 
@@ -892,7 +892,7 @@ static ssize_t smartfs_write(FAR struct file *filep, const char *buffer,
             {
               /* Error allocating logical sector! */
 
-              fdbg("Error - duplicate logical sector %d\n", sf->currsector);
+              ferr("Error - duplicate logical sector %d\n", sf->currsector);
             }
 
           sf->bflags = SMARTFS_BFLAG_DIRTY;
@@ -922,7 +922,7 @@ static ssize_t smartfs_write(FAR struct file *filep, const char *buffer,
               ret = FS_IOCTL(fs, BIOC_ALLOCSECT, 0xFFFF);
               if (ret < 0)
                 {
-                  fdbg("Error %d allocating new sector\n", ret);
+                  ferr("Error %d allocating new sector\n", ret);
                   goto errout_with_semaphore;
                 }
 
@@ -937,7 +937,7 @@ static ssize_t smartfs_write(FAR struct file *filep, const char *buffer,
               ret = FS_IOCTL(fs, BIOC_WRITESECT, (unsigned long) &readwrite);
               if (ret < 0)
                 {
-                  fdbg("Error %d writing next sector\n", ret);
+                  ferr("Error %d writing next sector\n", ret);
                   goto errout_with_semaphore;
                 }
 
@@ -949,7 +949,7 @@ static ssize_t smartfs_write(FAR struct file *filep, const char *buffer,
                 {
                   /* Error allocating logical sector! */
 
-                  fdbg("Error - duplicate logical sector %d\n", sf->currsector);
+                  ferr("Error - duplicate logical sector %d\n", sf->currsector);
                 }
 
               sf->currsector = SMARTFS_NEXTSECTOR(header);
@@ -1078,7 +1078,7 @@ static off_t smartfs_seek_internal(struct smartfs_mountpt_s *fs,
       ret = FS_IOCTL(fs, BIOC_READSECT, (unsigned long) &readwrite);
       if (ret < 0)
         {
-          fdbg("Error %d reading sector %d header\n", ret, sf->currsector);
+          ferr("Error %d reading sector %d header\n", ret, sf->currsector);
           goto errout;
         }
 
@@ -1103,7 +1103,7 @@ static off_t smartfs_seek_internal(struct smartfs_mountpt_s *fs,
       ret = FS_IOCTL(fs, BIOC_READSECT, (unsigned long) &readwrite);
       if (ret < 0)
         {
-          fdbg("Error %d reading sector %d header\n", ret, sf->currsector);
+          ferr("Error %d reading sector %d header\n", ret, sf->currsector);
           goto errout;
         }
     }
@@ -1933,7 +1933,7 @@ int smartfs_rename(struct inode *mountpt, const char *oldrelpath,
           ret = FS_IOCTL(fs, BIOC_READSECT, (unsigned long) &readwrite);
           if (ret < 0)
             {
-              fdbg("Error %d reading sector %d data\n", ret, oldentry.dsector);
+              ferr("Error %d reading sector %d data\n", ret, oldentry.dsector);
               goto errout_with_semaphore;
             }
 
@@ -2005,7 +2005,7 @@ int smartfs_rename(struct inode *mountpt, const char *oldrelpath,
       ret = FS_IOCTL(fs, BIOC_READSECT, (unsigned long) &readwrite);
       if (ret < 0)
         {
-          fdbg("Error %d reading sector %d data\n", ret, oldentry.dsector);
+          ferr("Error %d reading sector %d data\n", ret, oldentry.dsector);
           goto errout_with_semaphore;
         }
 
@@ -2024,7 +2024,7 @@ int smartfs_rename(struct inode *mountpt, const char *oldrelpath,
       ret = FS_IOCTL(fs, BIOC_WRITESECT, (unsigned long) &readwrite);
       if (ret < 0)
         {
-          fdbg("Error %d writing flag bytes for sector %d\n", ret, readwrite.logsector);
+          ferr("Error %d writing flag bytes for sector %d\n", ret, readwrite.logsector);
           goto errout_with_semaphore;
         }
     }
diff --git a/fs/smartfs/smartfs_utils.c b/fs/smartfs/smartfs_utils.c
index 4970c51d8f..6c8373e79f 100644
--- a/fs/smartfs/smartfs_utils.c
+++ b/fs/smartfs/smartfs_utils.c
@@ -231,7 +231,7 @@ int smartfs_mount(struct smartfs_mountpt_s *fs, bool writeable)
   ret = FS_IOCTL(fs, BIOC_GETFORMAT, (unsigned long) &fs->fs_llformat);
   if (ret != OK)
     {
-      fdbg("Error getting device low level format: %d\n", ret);
+      ferr("Error getting device low level format: %d\n", ret);
       goto errout;
     }
 
@@ -239,7 +239,7 @@ int smartfs_mount(struct smartfs_mountpt_s *fs, bool writeable)
 
   if (!(fs->fs_llformat.flags & SMART_FMT_ISFORMATTED))
     {
-      fdbg("No low-level format found\n");
+      ferr("No low-level format found\n");
       ret = -ENODEV;
       goto errout;
     }
@@ -311,16 +311,16 @@ int smartfs_mount(struct smartfs_mountpt_s *fs, bool writeable)
 
   fs->fs_mounted = TRUE;
 
-  fdbg("SMARTFS:\n");
-  fdbg("\t    Sector size:     %d\n", fs->fs_llformat.sectorsize);
-  fdbg("\t    Bytes/sector     %d\n", fs->fs_llformat.availbytes);
-  fdbg("\t    Num sectors:     %d\n", fs->fs_llformat.nsectors);
-  fdbg("\t    Free sectors:    %d\n", fs->fs_llformat.nfreesectors);
-  fdbg("\t    Max filename:    %d\n", CONFIG_SMARTFS_MAXNAMLEN);
+  ferr("SMARTFS:\n");
+  ferr("\t    Sector size:     %d\n", fs->fs_llformat.sectorsize);
+  ferr("\t    Bytes/sector     %d\n", fs->fs_llformat.availbytes);
+  ferr("\t    Num sectors:     %d\n", fs->fs_llformat.nsectors);
+  ferr("\t    Free sectors:    %d\n", fs->fs_llformat.nfreesectors);
+  ferr("\t    Max filename:    %d\n", CONFIG_SMARTFS_MAXNAMLEN);
 #ifdef CONFIG_SMARTFS_MULTI_ROOT_DIRS
-  fdbg("\t    RootDirEntries:  %d\n", fs->fs_llformat.nrootdirentries);
+  ferr("\t    RootDirEntries:  %d\n", fs->fs_llformat.nrootdirentries);
 #endif
-  fdbg("\t    RootDirSector:   %d\n", fs->fs_rootsector);
+  ferr("\t    RootDirSector:   %d\n", fs->fs_rootsector);
 
 errout:
   return ret;
@@ -698,7 +698,7 @@ int smartfs_finddirentry(struct smartfs_mountpt_s *fs,
                                   ret = FS_IOCTL(fs, BIOC_READSECT, (unsigned long) &readwrite);
                                   if (ret < 0)
                                     {
-                                      fdbg("Error in sector chain at %d!\n", dirsector);
+                                      ferr("Error in sector chain at %d!\n", dirsector);
                                       break;
                                     }
 
@@ -937,7 +937,7 @@ int smartfs_createentry(FAR struct smartfs_mountpt_s *fs,
           ret = FS_IOCTL(fs, BIOC_WRITESECT, (unsigned long) &readwrite);
           if (ret < 0)
             {
-              fdbg("Error chaining sector %d\n", nextsector);
+              ferr("Error chaining sector %d\n", nextsector);
               goto errout;
             }
         }
@@ -1014,7 +1014,7 @@ int smartfs_createentry(FAR struct smartfs_mountpt_s *fs,
           ret = FS_IOCTL(fs, BIOC_WRITESECT, (unsigned long) &readwrite);
           if (ret < 0)
             {
-              fdbg("Error %d setting new sector type for sector %d\n",
+              ferr("Error %d setting new sector type for sector %d\n",
                    ret, nextsector);
               goto errout;
             }
@@ -1129,7 +1129,7 @@ int smartfs_deleteentry(struct smartfs_mountpt_s *fs,
       ret = FS_IOCTL(fs, BIOC_READSECT, (unsigned long) &readwrite);
       if (ret < 0)
         {
-          fdbg("Error reading sector %d\n", nextsector);
+          ferr("Error reading sector %d\n", nextsector);
           break;
         }
 
@@ -1148,7 +1148,7 @@ int smartfs_deleteentry(struct smartfs_mountpt_s *fs,
   ret = FS_IOCTL(fs, BIOC_READSECT, (unsigned long) &readwrite);
   if (ret < 0)
     {
-      fdbg("Error reading directory info at sector %d\n", entry->dsector);
+      ferr("Error reading directory info at sector %d\n", entry->dsector);
       goto errout;
     }
 
@@ -1177,7 +1177,7 @@ int smartfs_deleteentry(struct smartfs_mountpt_s *fs,
   ret = FS_IOCTL(fs, BIOC_WRITESECT, (unsigned long) &readwrite);
   if (ret < 0)
     {
-      fdbg("Error marking entry inactive at sector %d\n", entry->dsector);
+      ferr("Error marking entry inactive at sector %d\n", entry->dsector);
       goto errout;
     }
 
@@ -1242,7 +1242,7 @@ int smartfs_deleteentry(struct smartfs_mountpt_s *fs,
               ret = FS_IOCTL(fs, BIOC_READSECT, (unsigned long) &readwrite);
               if (ret < 0)
                 {
-                  fdbg("Error reading sector %d\n", nextsector);
+                  ferr("Error reading sector %d\n", nextsector);
                   break;
                 }
 
@@ -1259,7 +1259,7 @@ int smartfs_deleteentry(struct smartfs_mountpt_s *fs,
                   ret = FS_IOCTL(fs, BIOC_WRITESECT, (unsigned long) &readwrite);
                   if (ret < 0)
                     {
-                      fdbg("Error unchaining sector (%d)\n", nextsector);
+                      ferr("Error unchaining sector (%d)\n", nextsector);
                       goto errout;
                     }
 
@@ -1268,7 +1268,7 @@ int smartfs_deleteentry(struct smartfs_mountpt_s *fs,
                   ret = FS_IOCTL(fs, BIOC_FREESECT, (unsigned long) entry->dsector);
                   if (ret < 0)
                     {
-                      fdbg("Error freeing sector %d\n", entry->dsector);
+                      ferr("Error freeing sector %d\n", entry->dsector);
                       goto errout;
                     }
 
@@ -1327,7 +1327,7 @@ int smartfs_countdirentries(struct smartfs_mountpt_s *fs,
       ret = FS_IOCTL(fs, BIOC_READSECT, (unsigned long) &readwrite);
       if (ret < 0)
         {
-          fdbg("Error reading sector %d\n", nextsector);
+          ferr("Error reading sector %d\n", nextsector);
           break;
         }
 
@@ -1336,7 +1336,7 @@ int smartfs_countdirentries(struct smartfs_mountpt_s *fs,
       header = (struct smartfs_chain_header_s *) fs->fs_rwbuffer;
       if (header->type != SMARTFS_SECTOR_TYPE_DIR)
         {
-          fdbg("Sector %d is not a DIR sector!\n", nextsector);
+          ferr("Sector %d is not a DIR sector!\n", nextsector);
           goto errout;
         }
 
@@ -1411,7 +1411,7 @@ int smartfs_truncatefile(struct smartfs_mountpt_s *fs,
       ret = FS_IOCTL(fs, BIOC_READSECT, (unsigned long) &readwrite);
       if (ret < 0)
         {
-          fdbg("Error reading sector %d header\n", nextsector);
+          ferr("Error reading sector %d header\n", nextsector);
           goto errout;
         }
 
@@ -1447,7 +1447,7 @@ int smartfs_truncatefile(struct smartfs_mountpt_s *fs,
           ret = FS_IOCTL(fs, BIOC_WRITESECT, (unsigned long) &readwrite);
           if (ret < 0)
             {
-              fdbg("Error blanking 1st sector (%d) of file\n", nextsector);
+              ferr("Error blanking 1st sector (%d) of file\n", nextsector);
               goto errout;
             }
 
@@ -1463,7 +1463,7 @@ int smartfs_truncatefile(struct smartfs_mountpt_s *fs,
           ret = FS_IOCTL(fs, BIOC_FREESECT, (unsigned long) nextsector);
           if (ret < 0)
             {
-              fdbg("Error freeing sector %d\n", nextsector);
+              ferr("Error freeing sector %d\n", nextsector);
               goto errout;
             }
         }
diff --git a/fs/tmpfs/fs_tmpfs.c b/fs/tmpfs/fs_tmpfs.c
index 8bcaffec64..a44ddb11ff 100644
--- a/fs/tmpfs/fs_tmpfs.c
+++ b/fs/tmpfs/fs_tmpfs.c
@@ -1727,7 +1727,7 @@ static int tmpfs_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
       return OK;
     }
 
-  fdbg("Invalid cmd: %d\n", cmd);
+  ferr("Invalid cmd: %d\n", cmd);
   return -ENOTTY;
 }
 
diff --git a/fs/unionfs/fs_unionfs.c b/fs/unionfs/fs_unionfs.c
index a61e94acb0..30d70c806d 100644
--- a/fs/unionfs/fs_unionfs.c
+++ b/fs/unionfs/fs_unionfs.c
@@ -2512,7 +2512,7 @@ int unionfs_mount(FAR const char *fspath1, FAR const char *prefix1,
   ui = (FAR struct unionfs_inode_s *)kmm_zalloc(sizeof(struct unionfs_inode_s));
   if (!ui)
     {
-      fdbg("ERROR: Failed to allocated union FS state structure\n");
+      ferr("ERROR: Failed to allocated union FS state structure\n");
       return -ENOMEM;
     }
 
@@ -2523,14 +2523,14 @@ int unionfs_mount(FAR const char *fspath1, FAR const char *prefix1,
   ret = unionfs_getmount(fspath1, &ui->ui_fs[0].um_node);
   if (ret < 0)
     {
-      fdbg("ERROR: unionfs_getmount(fspath1) failed: %d\n", ret);
+      ferr("ERROR: unionfs_getmount(fspath1) failed: %d\n", ret);
       goto errout_with_uinode;
     }
 
   ret = unionfs_getmount(fspath2, &ui->ui_fs[1].um_node);
   if (ret < 0)
     {
-      fdbg("ERROR: unionfs_getmount(fspath2) failed: %d\n", ret);
+      ferr("ERROR: unionfs_getmount(fspath2) failed: %d\n", ret);
       goto errout_with_fs1;
     }
 
@@ -2541,7 +2541,7 @@ int unionfs_mount(FAR const char *fspath1, FAR const char *prefix1,
       ui->ui_fs[0].um_prefix = strdup(prefix1);
       if (ui->ui_fs[0].um_prefix == NULL)
         {
-          fdbg("ERROR: strdup(prefix1) failed\n");
+          ferr("ERROR: strdup(prefix1) failed\n");
           ret = -ENOMEM;
           goto errout_with_fs2;
         }
@@ -2552,7 +2552,7 @@ int unionfs_mount(FAR const char *fspath1, FAR const char *prefix1,
       ui->ui_fs[1].um_prefix = strdup(prefix2);
       if (ui->ui_fs[1].um_prefix == NULL)
         {
-          fdbg("ERROR: strdup(prefix2) failed\n");
+          ferr("ERROR: strdup(prefix2) failed\n");
           ret = -ENOMEM;
           goto errout_with_prefix1;
         }
@@ -2580,7 +2580,7 @@ int unionfs_mount(FAR const char *fspath1, FAR const char *prefix1,
        *  -ENOMEM - Failed to allocate in-memory resources for the operation
        */
 
-      fdbg("ERROR: Failed to reserve inode\n");
+      ferr("ERROR: Failed to reserve inode\n");
       goto errout_with_semaphore;
     }
 
diff --git a/fs/vfs/fs_epoll.c b/fs/vfs/fs_epoll.c
index 590959b2b7..bc0502e111 100644
--- a/fs/vfs/fs_epoll.c
+++ b/fs/vfs/fs_epoll.c
@@ -190,12 +190,12 @@ int epoll_wait(int epfd, FAR struct epoll_event *evs, int maxevents,
     {
       if (rc < 0)
         {
-          fdbg("%08x poll fail: %d for %d, %d msecs\n",
+          ferr("%08x poll fail: %d for %d, %d msecs\n",
                epfd, rc, eph->occupied, timeout);
 
           for (i = 0; i < eph->occupied; i++)
             {
-              fdbg("%02d: fd=%d\n", i, eph->evs[i].data.fd);
+              ferr("%02d: fd=%d\n", i, eph->evs[i].data.fd);
             }
         }
 
diff --git a/graphics/nxbe/nxbe_bitmap.c b/graphics/nxbe/nxbe_bitmap.c
index 5c94d0b04d..94069fa124 100644
--- a/graphics/nxbe/nxbe_bitmap.c
+++ b/graphics/nxbe/nxbe_bitmap.c
@@ -138,7 +138,7 @@ void nxbe_bitmap(FAR struct nxbe_window_s *wnd, FAR const struct nxgl_rect_s *de
 
   if (dest->pt1.x < origin->x || dest->pt1.y < origin->y)
     {
-      gdbg("Bad dest start position\n");
+      gerr("Bad dest start position\n");
       return;
     }
 
@@ -149,7 +149,7 @@ void nxbe_bitmap(FAR struct nxbe_window_s *wnd, FAR const struct nxgl_rect_s *de
   deststride = (((dest->pt2.x - origin->x + 1) * wnd->be->plane[0].pinfo.bpp + 7) >> 3);
   if (deststride > stride)
     {
-      gdbg("Bad dest width\n");
+      gerr("Bad dest width\n");
       return;
     }
 
diff --git a/graphics/nxbe/nxbe_clipper.c b/graphics/nxbe/nxbe_clipper.c
index 0ded5b5c70..652b6e61c0 100644
--- a/graphics/nxbe/nxbe_clipper.c
+++ b/graphics/nxbe/nxbe_clipper.c
@@ -115,7 +115,7 @@ static inline void nxbe_pushrectangle(FAR struct nxbe_clipstack_s *stack,
                              sizeof(struct nxbe_cliprect_s) * mxrects);
       if (!newstack)
         {
-          gdbg("Failed to reallocate stack\n");
+          gerr("Failed to reallocate stack\n");
           return;
         }
 
diff --git a/graphics/nxbe/nxbe_configure.c b/graphics/nxbe/nxbe_configure.c
index f3aae2433d..4fd38552f3 100644
--- a/graphics/nxbe/nxbe_configure.c
+++ b/graphics/nxbe/nxbe_configure.c
@@ -89,7 +89,7 @@ int nxbe_configure(FAR NX_DRIVERTYPE *dev, FAR struct nxbe_state_s *be)
   ret = dev->getvideoinfo(dev, &be->vinfo);
   if (ret < 0)
     {
-      gdbg("Failed to get vinfo\n");
+      gerr("Failed to get vinfo\n");
       return ret;
     }
 
@@ -102,13 +102,13 @@ int nxbe_configure(FAR NX_DRIVERTYPE *dev, FAR struct nxbe_state_s *be)
 #ifdef CONFIG_DEBUG_FEATURES
   if (be->vinfo.nplanes > CONFIG_NX_NPLANES)
     {
-      gdbg("NX configured for only %d planes, controller wants %d\n",
+      gerr("NX configured for only %d planes, controller wants %d\n",
            CONFIG_NX_NPLANES, be->vinfo.nplanes);
       return -E2BIG;
     }
   else if (be->vinfo.nplanes < CONFIG_NX_NPLANES)
     {
-      gdbg("NX configured for %d planes, controller only needs %d\n",
+      gerr("NX configured for %d planes, controller only needs %d\n",
            CONFIG_NX_NPLANES, be->vinfo.nplanes);
     }
 #endif
@@ -120,7 +120,7 @@ int nxbe_configure(FAR NX_DRIVERTYPE *dev, FAR struct nxbe_state_s *be)
       ret = dev->getplaneinfo(dev, i, &be->plane[i].pinfo);
       if (ret < 0)
         {
-          gdbg("Failed to get pinfo[%d]\n", i);
+          gerr("Failed to get pinfo[%d]\n", i);
           return ret;
         }
 
@@ -216,7 +216,7 @@ int nxbe_configure(FAR NX_DRIVERTYPE *dev, FAR struct nxbe_state_s *be)
       else
 #endif
         {
-          gdbg("Unsupported pinfo[%d] BPP: %d\n", i, be->plane[i].pinfo.bpp);
+          gerr("Unsupported pinfo[%d] BPP: %d\n", i, be->plane[i].pinfo.bpp);
           return -ENOSYS;
         }
     }
diff --git a/graphics/nxmu/nx_start.c b/graphics/nxmu/nx_start.c
index 18e1aeae3f..3c3e6446d9 100644
--- a/graphics/nxmu/nx_start.c
+++ b/graphics/nxmu/nx_start.c
@@ -84,7 +84,7 @@ int nx_server(int argc, char *argv[])
   dev = board_graphics_setup(CONFIG_NXSTART_DEVNO);
   if (!dev)
     {
-      gdbg("ERROR: board_graphics_setup failed, devno=%d\n", CONFIG_NXSTART_DEVNO);
+      gerr("ERROR: board_graphics_setup failed, devno=%d\n", CONFIG_NXSTART_DEVNO);
       return EXIT_FAILURE;
     }
 
@@ -94,7 +94,7 @@ int nx_server(int argc, char *argv[])
   ret = board_lcd_initialize();
   if (ret < 0)
     {
-      gdbg("ERROR: board_lcd_initialize failed: %d\n", ret);
+      gerr("ERROR: board_lcd_initialize failed: %d\n", ret);
       return EXIT_FAILURE;
     }
 
@@ -103,7 +103,7 @@ int nx_server(int argc, char *argv[])
   dev = board_lcd_getdev(CONFIG_NXSTART_DEVNO);
   if (!dev)
     {
-      gdbg("ERROR: board_lcd_getdev failed, devno=%d\n", CONFIG_NXSTART_DEVNO);
+      gerr("ERROR: board_lcd_getdev failed, devno=%d\n", CONFIG_NXSTART_DEVNO);
       return EXIT_FAILURE;
     }
 
@@ -119,14 +119,14 @@ int nx_server(int argc, char *argv[])
   ret = up_fbinitialize(0);
   if (ret < 0)
     {
-      gdbg("ERROR: up_fbinitialize failed: %d\n", ret);
+      gerr("ERROR: up_fbinitialize failed: %d\n", ret);
       return EXIT_FAILURE;
     }
 
   dev = up_fbgetvplane(0, CONFIG_NXSTART_VPLANE);
   if (!dev)
     {
-      gdbg("ERROR: up_fbgetvplane failed, vplane=%d\n", CONFIG_NXSTART_VPLANE);
+      gerr("ERROR: up_fbgetvplane failed, vplane=%d\n", CONFIG_NXSTART_VPLANE);
       return EXIT_FAILURE;
     }
 
@@ -182,7 +182,7 @@ int nx_start(void)
       int errcode = errno;
       DEBUGASSERT(errcode > 0);
 
-      gdbg("ERROR: Failed to create nx_server kernel thread: %d\n", errcode);
+      gerr("ERROR: Failed to create nx_server kernel thread: %d\n", errcode);
       return -errcode;
     }
 
diff --git a/graphics/nxmu/nxmu_reportposition.c b/graphics/nxmu/nxmu_reportposition.c
index cbc5651f9f..5e7584464c 100644
--- a/graphics/nxmu/nxmu_reportposition.c
+++ b/graphics/nxmu/nxmu_reportposition.c
@@ -103,6 +103,6 @@ void nxfe_reportposition(FAR struct nxbe_window_s *wnd)
   ret = nxmu_sendclientwindow(wnd, &outmsg, sizeof(struct nxclimsg_newposition_s));
   if (ret < 0)
     {
-      gdbg("nxmu_sendclient failed: %d\n", errno);
+      gerr("nxmu_sendclient failed: %d\n", errno);
     }
 }
diff --git a/graphics/nxmu/nxmu_sendclient.c b/graphics/nxmu/nxmu_sendclient.c
index 66a992e526..511b5814a1 100644
--- a/graphics/nxmu/nxmu_sendclient.c
+++ b/graphics/nxmu/nxmu_sendclient.c
@@ -105,7 +105,7 @@ int nxmu_sendclient(FAR struct nxfe_conn_s *conn, FAR const void *msg,
   ret = mq_send(conn->swrmq, msg, msglen, NX_CLIMSG_PRIO);
   if (ret < 0)
     {
-      gdbg("mq_send failed: %d\n", errno);
+      gerr("mq_send failed: %d\n", errno);
     }
 
   return ret;
diff --git a/graphics/nxmu/nxmu_server.c b/graphics/nxmu/nxmu_server.c
index 680e4cde16..28b37518b9 100644
--- a/graphics/nxmu/nxmu_server.c
+++ b/graphics/nxmu/nxmu_server.c
@@ -87,7 +87,7 @@ static inline void nxmu_disconnect(FAR struct nxfe_conn_s *conn)
   ret = nxmu_sendclient(conn, &outmsg, sizeof(struct nxclimsg_disconnected_s));
   if (ret < 0)
     {
-      gdbg("nxmu_sendclient failed: %d\n", errno);
+      gerr("nxmu_sendclient failed: %d\n", errno);
     }
 
   /* Close the outgoing client message queue */
@@ -114,7 +114,7 @@ static inline void nxmu_connect(FAR struct nxfe_conn_s *conn)
   conn->swrmq  = mq_open(mqname, O_WRONLY);
   if (conn->swrmq == (mqd_t)-1)
     {
-      gdbg("mq_open(%s) failed: %d\n", mqname, errno);
+      gerr("mq_open(%s) failed: %d\n", mqname, errno);
       outmsg.msgid = NX_CLIMSG_DISCONNECTED;
     }
 
@@ -124,7 +124,7 @@ static inline void nxmu_connect(FAR struct nxfe_conn_s *conn)
   ret = nxmu_sendclient(conn, &outmsg, sizeof(struct nxclimsg_connected_s));
   if (ret < 0)
     {
-      gdbg("nxmu_sendclient failed: %d\n", errno);
+      gerr("nxmu_sendclient failed: %d\n", errno);
     }
 }
 
@@ -166,7 +166,7 @@ static inline void nxmu_blocked(FAR struct nxbe_window_s *wnd, FAR void *arg)
   ret = nxmu_sendclient(wnd->conn, &outmsg, sizeof(struct nxclimsg_blocked_s));
   if (ret < 0)
     {
-      gdbg("nxmu_sendclient failed: %d\n", errno);
+      gerr("nxmu_sendclient failed: %d\n", errno);
     }
 }
 
@@ -187,7 +187,7 @@ static inline int nxmu_setup(FAR const char *mqname, FAR NX_DRIVERTYPE *dev,
   ret = nxbe_configure(dev, &fe->be);
   if (ret < 0)
     {
-      gdbg("nxbe_configure failed: %d\n", -ret);
+      gerr("nxbe_configure failed: %d\n", -ret);
       errno = -ret;
       return ERROR;
     }
@@ -196,7 +196,7 @@ static inline int nxmu_setup(FAR const char *mqname, FAR NX_DRIVERTYPE *dev,
   ret = nxbe_colormap(dev);
   if (ret < 0)
     {
-      gdbg("nxbe_colormap failed: %d\n", -ret);
+      gerr("nxbe_colormap failed: %d\n", -ret);
       errno = -ret;
       return ERROR;
     }
@@ -217,7 +217,7 @@ static inline int nxmu_setup(FAR const char *mqname, FAR NX_DRIVERTYPE *dev,
   fe->conn.crdmq = mq_open(mqname, O_RDONLY | O_CREAT, 0666, &attr);
   if (fe->conn.crdmq == (mqd_t)-1)
     {
-      gdbg("mq_open(%s) failed: %d\n", mqname, errno);
+      gerr("mq_open(%s) failed: %d\n", mqname, errno);
       return ERROR; /* mq_open sets errno */
     }
 
@@ -233,7 +233,7 @@ static inline int nxmu_setup(FAR const char *mqname, FAR NX_DRIVERTYPE *dev,
   fe->conn.swrmq = mq_open(mqname, O_WRONLY);
   if (fe->conn.swrmq == (mqd_t)-1)
     {
-      gdbg("mq_open(%s) failed: %d\n", mqname, errno);
+      gerr("mq_open(%s) failed: %d\n", mqname, errno);
       mq_close(fe->conn.crdmq);
       return ERROR; /* mq_open sets errno */
     }
@@ -334,7 +334,7 @@ int nx_runinstance(FAR const char *mqname, FAR NX_DRIVERTYPE *dev)
          {
            if (errno != EINTR)
              {
-               gdbg("mq_receive failed: %d\n", errno);
+               gerr("mq_receive failed: %d\n", errno);
                goto errout; /* mq_receive sets errno */
              }
            continue;
@@ -545,7 +545,7 @@ int nx_runinstance(FAR const char *mqname, FAR NX_DRIVERTYPE *dev)
          case NX_CLIMSG_CONNECTED:    /* Shouldn't happen */
          case NX_CLIMSG_DISCONNECTED:
          default:
-           gdbg("Unrecognized command: %d\n", msg->msgid);
+           gerr("Unrecognized command: %d\n", msg->msgid);
            break;
          }
     }
diff --git a/graphics/nxsu/nx_open.c b/graphics/nxsu/nx_open.c
index a89340d37e..202e011ee8 100644
--- a/graphics/nxsu/nx_open.c
+++ b/graphics/nxsu/nx_open.c
@@ -120,7 +120,7 @@ static inline int nxsu_setup(FAR NX_DRIVERTYPE *dev,
   ret = nxbe_configure(dev, &fe->be);
   if (ret < 0)
     {
-      gdbg("nxbe_configure failed: %d\n", -ret);
+      gerr("nxbe_configure failed: %d\n", -ret);
       errno = -ret;
       return ERROR;
     }
@@ -129,7 +129,7 @@ static inline int nxsu_setup(FAR NX_DRIVERTYPE *dev,
   ret = nxbe_colormap(dev);
   if (ret < 0)
     {
-      gdbg("nxbe_colormap failed: %d\n", -ret);
+      gerr("nxbe_colormap failed: %d\n", -ret);
       errno = -ret;
       return ERROR;
     }
diff --git a/graphics/nxterm/nxterm_driver.c b/graphics/nxterm/nxterm_driver.c
index 77cb7b0377..975fae2763 100644
--- a/graphics/nxterm/nxterm_driver.c
+++ b/graphics/nxterm/nxterm_driver.c
@@ -128,7 +128,7 @@ static int nxterm_open(FAR struct file *filep)
 #ifndef CONFIG_NXTERM_NXKBDIN
   if ((filep->f_oflags & O_RDOK) != 0)
     {
-      gdbg("ERROR: Attempted open with read access\n");
+      gerr("ERROR: Attempted open with read access\n");
       return -EACCES;
     }
 #endif
diff --git a/graphics/nxterm/nxterm_font.c b/graphics/nxterm/nxterm_font.c
index fec6d5a443..7c8035aebb 100644
--- a/graphics/nxterm/nxterm_font.c
+++ b/graphics/nxterm/nxterm_font.c
@@ -318,7 +318,7 @@ nxterm_renderglyph(FAR struct nxterm_state_s *priv,
         {
           /* Actually, the RENDERER never returns a failure */
 
-          gdbg("nxterm_renderglyph: RENDERER failed\n");
+          gerr("nxterm_renderglyph: RENDERER failed\n");
           nxterm_freeglyph(glyph);
           glyph = NULL;
         }
diff --git a/graphics/nxterm/nxterm_kbdin.c b/graphics/nxterm/nxterm_kbdin.c
index f23b5ac16f..b81763e6ab 100644
--- a/graphics/nxterm/nxterm_kbdin.c
+++ b/graphics/nxterm/nxterm_kbdin.c
@@ -118,7 +118,7 @@ ssize_t nxterm_read(FAR struct file *filep, FAR char *buffer, size_t len)
   ret = nxterm_semwait(priv);
   if (ret < 0)
     {
-      gdbg("ERROR: nxterm_semwait failed\n");
+      gerr("ERROR: nxterm_semwait failed\n");
       return ret;
     }
 
@@ -191,7 +191,7 @@ ssize_t nxterm_read(FAR struct file *filep, FAR char *buffer, size_t len)
 
               int errval = errno;
 
-              gdbg("ERROR: nxterm_semwait failed\n");
+              gerr("ERROR: nxterm_semwait failed\n");
 
               /* Were we awakened by a signal?  Did we read anything before
                * we received the signal?
@@ -277,7 +277,7 @@ int nxterm_poll(FAR struct file *filep, FAR struct pollfd *fds, bool setup)
   ret = nxterm_semwait(priv);
   if (ret < 0)
     {
-      gdbg("ERROR: nxterm_semwait failed\n");
+      gerr("ERROR: nxterm_semwait failed\n");
       return ret;
     }
 
@@ -305,7 +305,7 @@ int nxterm_poll(FAR struct file *filep, FAR struct pollfd *fds, bool setup)
 
       if (i >= CONFIG_NXTERM_NPOLLWAITERS)
         {
-          gdbg("ERROR: Too many poll waiters\n");
+          gerr("ERROR: Too many poll waiters\n");
 
           fds->priv    = NULL;
           ret          = -EBUSY;
@@ -340,7 +340,7 @@ int nxterm_poll(FAR struct file *filep, FAR struct pollfd *fds, bool setup)
 #ifdef CONFIG_DEBUG_FEATURES
       if (!slot)
         {
-          gdbg("ERROR: No slot\n");
+          gerr("ERROR: No slot\n");
 
           ret = -EIO;
           goto errout;
@@ -405,7 +405,7 @@ void nxterm_kbdin(NXTERM handle, FAR const uint8_t *buffer, uint8_t buflen)
   ret = nxterm_semwait(priv);
   if (ret < 0)
     {
-      gdbg("ERROR: nxterm_semwait failed\n");
+      gerr("ERROR: nxterm_semwait failed\n");
       return;
     }
 
@@ -440,7 +440,7 @@ void nxterm_kbdin(NXTERM handle, FAR const uint8_t *buffer, uint8_t buflen)
         {
           /* Yes... Return an indication that nothing was saved in the buffer. */
 
-          gdbg("ERROR: Keyboard data overrun\n");
+          gerr("ERROR: Keyboard data overrun\n");
           break;
         }
 
diff --git a/graphics/nxterm/nxterm_redraw.c b/graphics/nxterm/nxterm_redraw.c
index b1af8b95cb..8130dfae68 100644
--- a/graphics/nxterm/nxterm_redraw.c
+++ b/graphics/nxterm/nxterm_redraw.c
@@ -137,7 +137,7 @@ void nxterm_redraw(NXTERM handle, FAR const struct nxgl_rect_s *rect, bool more)
   ret = priv->ops->fill(priv, rect, priv->wndo.wcolor);
   if (ret < 0)
     {
-      gdbg("fill failed: %d\n", errno);
+      gerr("fill failed: %d\n", errno);
     }
 
   /* Then redraw each character on the display (Only the characters within
diff --git a/graphics/nxterm/nxterm_register.c b/graphics/nxterm/nxterm_register.c
index a88d038055..797e60f49a 100644
--- a/graphics/nxterm/nxterm_register.c
+++ b/graphics/nxterm/nxterm_register.c
@@ -87,7 +87,7 @@ FAR struct nxterm_state_s *
   priv = (FAR struct nxterm_state_s *)kmm_zalloc(sizeof(struct nxterm_state_s));
   if (!priv)
     {
-      gdbg("Failed to allocate the NX driver structure\n");
+      gerr("Failed to allocate the NX driver structure\n");
       return NULL;
     }
 
@@ -112,7 +112,7 @@ FAR struct nxterm_state_s *
   priv->font = nxf_getfonthandle(wndo->fontid);
   if (!priv->font)
     {
-      gdbg("Failed to get font ID %d: %d\n", wndo->fontid, errno);
+      gerr("Failed to get font ID %d: %d\n", wndo->fontid, errno);
       goto errout;
     }
 
@@ -150,7 +150,7 @@ FAR struct nxterm_state_s *
   ret = register_driver(devname, &g_nxterm_drvrops, 0666, priv);
   if (ret < 0)
     {
-      gdbg("Failed to register %s\n", devname);
+      gerr("Failed to register %s\n", devname);
     }
   return (NXTERM)priv;
 
diff --git a/graphics/nxterm/nxterm_scroll.c b/graphics/nxterm/nxterm_scroll.c
index 38e9f5cb6b..ff648c7421 100644
--- a/graphics/nxterm/nxterm_scroll.c
+++ b/graphics/nxterm/nxterm_scroll.c
@@ -118,7 +118,7 @@ static inline void nxterm_movedisplay(FAR struct nxterm_state_s *priv,
       ret = priv->ops->fill(priv, &rect, priv->wndo.wcolor);
       if (ret < 0)
         {
-          gdbg("Fill failed: %d\n", errno);
+          gerr("Fill failed: %d\n", errno);
         }
 
       /* Fill each character that might lie within in the bounding box */
@@ -141,7 +141,7 @@ static inline void nxterm_movedisplay(FAR struct nxterm_state_s *priv,
   ret = priv->ops->fill(priv, &rect, priv->wndo.wcolor);
   if (ret < 0)
     {
-      gdbg("Fill failed: %d\n", errno);
+      gerr("Fill failed: %d\n", errno);
     }
 }
 #else
@@ -177,7 +177,7 @@ static inline void nxterm_movedisplay(FAR struct nxterm_state_s *priv,
   ret = priv->ops->move(priv, &rect, &offset);
   if (ret < 0)
     {
-      gdbg("Move failed: %d\n", errno);
+      gerr("Move failed: %d\n", errno);
     }
 
   /* Finally, clear the vacated bottom part of the display */
@@ -187,7 +187,7 @@ static inline void nxterm_movedisplay(FAR struct nxterm_state_s *priv,
   ret = priv->ops->fill(priv, &rect, priv->wndo.wcolor);
   if (ret < 0)
     {
-      gdbg("Fill failed: %d\n", errno);
+      gerr("Fill failed: %d\n", errno);
     }
 }
 #endif
diff --git a/graphics/vnc/server/vnc_fbdev.c b/graphics/vnc/server/vnc_fbdev.c
index 3c4fe08133..13e81330c9 100644
--- a/graphics/vnc/server/vnc_fbdev.c
+++ b/graphics/vnc/server/vnc_fbdev.c
@@ -176,7 +176,7 @@ static int up_getvideoinfo(FAR struct fb_vtable_s *vtable,
 
       if (session == NULL || session->state != VNCSERVER_RUNNING)
         {
-          gdbg("ERROR: session is not connected\n");
+          gerr("ERROR: session is not connected\n");
           return -ENOTCONN;
         }
 
@@ -193,7 +193,7 @@ static int up_getvideoinfo(FAR struct fb_vtable_s *vtable,
       return OK;
     }
 
-  gdbg("ERROR: Invalid arguments\n");
+  gerr("ERROR: Invalid arguments\n");
   return -EINVAL;
 }
 
@@ -217,7 +217,7 @@ static int up_getplaneinfo(FAR struct fb_vtable_s *vtable, int planeno,
 
       if (session == NULL || session->state != VNCSERVER_RUNNING)
         {
-          gdbg("ERROR: session is not connected\n");
+          gerr("ERROR: session is not connected\n");
           return -ENOTCONN;
         }
 
@@ -237,7 +237,7 @@ static int up_getplaneinfo(FAR struct fb_vtable_s *vtable, int planeno,
       return OK;
     }
 
-  gdbg("Returning EINVAL\n");
+  gerr("Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -264,7 +264,7 @@ static int up_getcmap(FAR struct fb_vtable_s *vtable,
 
       if (session == NULL || session->state != VNCSERVER_RUNNING)
         {
-          gdbg("ERROR: session is not connected\n");
+          gerr("ERROR: session is not connected\n");
           return -ENOTCONN;
         }
 
@@ -274,7 +274,7 @@ static int up_getcmap(FAR struct fb_vtable_s *vtable,
       return OK;
     }
 
-  gdbg("Returning EINVAL\n");
+  gerr("Returning EINVAL\n");
   return -EINVAL;
 }
 #endif
@@ -301,7 +301,7 @@ static int up_putcmap(FAR struct fb_vtable_s *vtable, FAR const struct fb_cmap_s
 
       if (session == NULL || session->state != VNCSERVER_RUNNING)
         {
-          gdbg("ERROR: session is not connected\n");
+          gerr("ERROR: session is not connected\n");
           return -ENOTCONN;
         }
 
@@ -311,7 +311,7 @@ static int up_putcmap(FAR struct fb_vtable_s *vtable, FAR const struct fb_cmap_s
       return OK;
     }
 
-  gdbg("Returning EINVAL\n");
+  gerr("Returning EINVAL\n");
   return -EINVAL;
 }
 #endif
@@ -339,7 +339,7 @@ static int up_getcursor(FAR struct fb_vtable_s *vtable,
 
       if (session == NULL || session->state != VNCSERVER_RUNNING)
         {
-          gdbg("ERROR: session is not connected\n");
+          gerr("ERROR: session is not connected\n");
           return -ENOTCONN;
         }
 
@@ -347,7 +347,7 @@ static int up_getcursor(FAR struct fb_vtable_s *vtable,
 
       return OK;
     }
-  gdbg("Returning EINVAL\n");
+  gerr("Returning EINVAL\n");
   return -EINVAL;
 }
 #endif
@@ -375,7 +375,7 @@ static int up_setcursor(FAR struct fb_vtable_s *vtable,
 
       if (session == NULL || session->state != VNCSERVER_RUNNING)
         {
-          gdbg("ERROR: session is not connected\n");
+          gerr("ERROR: session is not connected\n");
           return -ENOTCONN;
         }
 
@@ -400,7 +400,7 @@ static int up_setcursor(FAR struct fb_vtable_s *vtable,
       return OK;
     }
 
-  gdbg("Returning EINVAL\n");
+  gerr("Returning EINVAL\n");
   return -EINVAL;
 }
 #endif
@@ -456,7 +456,7 @@ static int vnc_start_server(int display)
                        (main_t)vnc_server, argv);
   if (pid < 0)
     {
-      gdbg("ERROR: Failed to start the VNC server: %d\n", (int)pid);
+      gerr("ERROR: Failed to start the VNC server: %d\n", (int)pid);
       return (int)pid;
     }
 
@@ -588,7 +588,7 @@ static inline int vnc_wait_connect(int display)
           if (result < 0)
             {
               DEBUGASSERT(g_vnc_sessions[display] == NULL);
-              gdbg("ERROR: VNC server startup failed: %d\n", result);
+              gerr("ERROR: VNC server startup failed: %d\n", result);
             }
           else
             {
@@ -884,7 +884,7 @@ void nx_notify_rectangle(FAR NX_PLANEINFOTYPE *pinfo,
       ret = vnc_update_rectangle(session, rect, true);
       if (ret < 0)
         {
-          gdbg("ERROR: vnc_update_rectangle failed: %d\n", ret);
+          gerr("ERROR: vnc_update_rectangle failed: %d\n", ret);
         }
     }
 }
diff --git a/graphics/vnc/server/vnc_negotiate.c b/graphics/vnc/server/vnc_negotiate.c
index 3e6eae0f58..3a28cb3350 100644
--- a/graphics/vnc/server/vnc_negotiate.c
+++ b/graphics/vnc/server/vnc_negotiate.c
@@ -132,7 +132,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
   if (ret < 0)
     {
       errcode = get_errno();
-      gdbg("ERROR: Failed to set receive timeout: %d\n", errcode);
+      gerr("ERROR: Failed to set receive timeout: %d\n", errcode);
       DEBUGASSERT(errcode > 0);
       return -errcode;
     }
@@ -147,7 +147,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
   if (nsent < 0)
     {
       errcode = get_errno();
-      gdbg("ERROR: Send ProtocolVersion failed: %d\n", errcode);
+      gerr("ERROR: Send ProtocolVersion failed: %d\n", errcode);
       DEBUGASSERT(errcode > 0);
       return -errcode;
     }
@@ -162,13 +162,13 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
   if (nrecvd < 0)
     {
       errcode = get_errno();
-      gdbg("ERROR: Receive protocol confirmation failed: %d\n", errcode);
+      gerr("ERROR: Receive protocol confirmation failed: %d\n", errcode);
       DEBUGASSERT(errcode > 0);
       return -errcode;
     }
   else if (nrecvd == 0)
     {
-      gdbg("Connection closed\n");
+      gerr("Connection closed\n");
       return -ECONNABORTED;
     }
 
@@ -190,7 +190,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
   if (nsent < 0)
     {
       errcode = get_errno();
-      gdbg("ERROR: Send Security failed: %d\n", errcode);
+      gerr("ERROR: Send Security failed: %d\n", errcode);
       DEBUGASSERT(errcode > 0);
       return -errcode;
     }
@@ -213,7 +213,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
   if (nsent < 0)
     {
       errcode = get_errno();
-      gdbg("ERROR: Send SupportedSecurityTypes failed: %d\n", errcode);
+      gerr("ERROR: Send SupportedSecurityTypes failed: %d\n", errcode);
       DEBUGASSERT(errcode > 0);
       return -errcode;
     }
@@ -234,13 +234,13 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
   if (nrecvd < 0)
     {
       errcode = get_errno();
-      gdbg("ERROR: Receive SecurityType failed: %d\n", errcode);
+      gerr("ERROR: Receive SecurityType failed: %d\n", errcode);
       DEBUGASSERT(errcode > 0);
       return -errcode;
     }
   else if (nrecvd == 0)
     {
-      gdbg("Connection closed\n");
+      gerr("Connection closed\n");
       return -ECONNABORTED;
     }
 
@@ -252,7 +252,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
 
   if (sectype->type != RFB_SECTYPE_NONE)
     {
-      gdbg("ERROR: Received unsupported SecurityType: %d\n", sectype->type);
+      gerr("ERROR: Received unsupported SecurityType: %d\n", sectype->type);
 
       /* REVISIT: Should send the reason string here */
 
@@ -263,7 +263,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
       if (nsent < 0)
         {
           errcode = get_errno();
-          gdbg("ERROR: Send SecurityResult failed: %d\n", errcode);
+          gerr("ERROR: Send SecurityResult failed: %d\n", errcode);
           DEBUGASSERT(errcode > 0);
           return -errcode;
         }
@@ -282,7 +282,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
       if (nsent < 0)
         {
           errcode = get_errno();
-          gdbg("ERROR: Send failure reason failed: %d\n", errcode);
+          gerr("ERROR: Send failure reason failed: %d\n", errcode);
           DEBUGASSERT(errcode > 0);
           return -errcode;
         }
@@ -298,7 +298,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
   if (nsent < 0)
     {
       errcode = get_errno();
-      gdbg("ERROR: Send SecurityResult failed: %d\n", errcode);
+      gerr("ERROR: Send SecurityResult failed: %d\n", errcode);
       DEBUGASSERT(errcode > 0);
       return -errcode;
     }
@@ -323,13 +323,13 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
   if (nrecvd < 0)
     {
       errcode = get_errno();
-      gdbg("ERROR: Receive ClientInit failed: %d\n", errcode);
+      gerr("ERROR: Receive ClientInit failed: %d\n", errcode);
       DEBUGASSERT(errcode > 0);
       return -errcode;
     }
   else if (nrecvd == 0)
     {
-      gdbg("Connection closed\n");
+      gerr("Connection closed\n");
       return -ECONNABORTED;
     }
 
@@ -379,7 +379,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
   if (nsent < 0)
     {
       errcode = get_errno();
-      gdbg("ERROR: Send ServerInit failed: %d\n", errcode);
+      gerr("ERROR: Send ServerInit failed: %d\n", errcode);
       return -errcode;
     }
 
@@ -398,25 +398,25 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
   if (nrecvd < 0)
     {
       errcode = get_errno();
-      gdbg("ERROR: Receive SetPixelFormat failed: %d\n", errcode);
+      gerr("ERROR: Receive SetPixelFormat failed: %d\n", errcode);
       DEBUGASSERT(errcode > 0);
       return -errcode;
     }
   else if (nrecvd == 0)
     {
-      gdbg("Connection closed\n");
+      gerr("Connection closed\n");
       return -ECONNABORTED;
     }
   else if (nrecvd != sizeof(struct rfb_setpixelformat_s))
     {
       /* Must not be a SetPixelFormat message? */
 
-      gdbg("ERROR: SetFormat wrong size: %d\n", (int)nrecvd);
+      gerr("ERROR: SetFormat wrong size: %d\n", (int)nrecvd);
       return -EPROTO;
     }
   else if (setformat->msgtype != RFB_SETPIXELFMT_MSG)
     {
-      gdbg("ERROR: Not a SetPixelFormat message: %d\n",
+      gerr("ERROR: Not a SetPixelFormat message: %d\n",
            (int)setformat->msgtype);
       return -EPROTO;
     }
@@ -430,7 +430,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
     {
       /* We do not support this pixel format */
 
-      gdbg("ERROR: PixelFormat not supported\n");
+      gerr("ERROR: PixelFormat not supported\n");
       return ret;
     }
 
@@ -445,13 +445,13 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
   if (nrecvd < 0)
     {
       errcode = get_errno();
-      gdbg("ERROR: Receive SetEncodings failed: %d\n", errcode);
+      gerr("ERROR: Receive SetEncodings failed: %d\n", errcode);
       DEBUGASSERT(errcode > 0);
       return -errcode;
     }
   else if (nrecvd == 0)
     {
-      gdbg("Connection closed\n");
+      gerr("Connection closed\n");
       return -ECONNABORTED;
     }
 
@@ -464,7 +464,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
       ret = vnc_client_encodings(session, encodings);
       if (ret < 0)
         {
-          gdbg("ERROR: vnc_set_encodings failed: %d\n", ret);
+          gerr("ERROR: vnc_set_encodings failed: %d\n", ret);
           return ret;
         }
     }
@@ -496,7 +496,7 @@ int vnc_client_pixelformat(FAR struct vnc_session_s *session,
     {
       /* At present, we support only TrueColor formats */
 
-      gdbg("ERROR: No support for palette colors\n");
+      gerr("ERROR: No support for palette colors\n");
       return -ENOSYS;
     }
 
@@ -545,7 +545,7 @@ int vnc_client_pixelformat(FAR struct vnc_session_s *session,
     {
       /* We do not support any other conversions */
 
-      gdbg("ERROR: No support for this BPP=%d and depth=%d\n",
+      gerr("ERROR: No support for this BPP=%d and depth=%d\n",
             pixelfmt->bpp, pixelfmt->depth);
       return -ENOSYS;
     }
diff --git a/graphics/vnc/server/vnc_raw.c b/graphics/vnc/server/vnc_raw.c
index b3decfd8a3..8e58cfc1d3 100644
--- a/graphics/vnc/server/vnc_raw.c
+++ b/graphics/vnc/server/vnc_raw.c
@@ -345,7 +345,7 @@ int vnc_raw(FAR struct vnc_session_s *session, FAR struct nxgl_rect_s *rect)
         break;
 
       default:
-        gdbg("ERROR: Unrecognized color format: %d\n", session->colorfmt);
+        gerr("ERROR: Unrecognized color format: %d\n", session->colorfmt);
         return -EINVAL;
     }
 
@@ -483,7 +483,7 @@ int vnc_raw(FAR struct vnc_session_s *session, FAR struct nxgl_rect_s *rect)
                   if (nsent < 0)
                     {
                       int errcode = get_errno();
-                      gdbg("ERROR: Send FrameBufferUpdate failed: %d\n",
+                      gerr("ERROR: Send FrameBufferUpdate failed: %d\n",
                            errcode);
                       DEBUGASSERT(errcode > 0);
                       return -errcode;
diff --git a/graphics/vnc/server/vnc_receiver.c b/graphics/vnc/server/vnc_receiver.c
index a3cc473ba9..530f5c0ab3 100644
--- a/graphics/vnc/server/vnc_receiver.c
+++ b/graphics/vnc/server/vnc_receiver.c
@@ -105,7 +105,7 @@ int vnc_read_remainder(FAR struct vnc_session_s *session, size_t msglen,
       if (nrecvd < 0)
         {
           errcode = get_errno();
-          gdbg("ERROR: Receive message failed: %d\n", errcode);
+          gerr("ERROR: Receive message failed: %d\n", errcode);
           DEBUGASSERT(errcode > 0);
           return -errcode;
         }
@@ -156,7 +156,7 @@ int vnc_receiver(FAR struct vnc_session_s *session)
   if (ret < 0)
     {
       errcode = get_errno();
-      gdbg("ERROR: Failed to disable receive timeout: %d\n", errcode);
+      gerr("ERROR: Failed to disable receive timeout: %d\n", errcode);
       DEBUGASSERT(errcode > 0);
       return -errcode;
     }
@@ -175,7 +175,7 @@ int vnc_receiver(FAR struct vnc_session_s *session)
       if (nrecvd < 0)
         {
           errcode = get_errno();
-          gdbg("ERROR: Receive byte failed: %d\n", errcode);
+          gerr("ERROR: Receive byte failed: %d\n", errcode);
           DEBUGASSERT(errcode > 0);
           return -errcode;
         }
@@ -186,7 +186,7 @@ int vnc_receiver(FAR struct vnc_session_s *session)
 
       else if (nrecvd == 0)
         {
-          gdbg("Connection closed\n", errcode);
+          gerr("Connection closed\n", errcode);
           return OK;
         }
 
@@ -209,7 +209,7 @@ int vnc_receiver(FAR struct vnc_session_s *session)
                                        1);
               if (ret < 0)
                 {
-                  gdbg("ERROR: Failed to read SetPixelFormat message: %d\n",
+                  gerr("ERROR: Failed to read SetPixelFormat message: %d\n",
                        ret);
                 }
               else
@@ -223,7 +223,7 @@ int vnc_receiver(FAR struct vnc_session_s *session)
                       /* We do not support this pixel format */
                       /* REVISIT:  We are going to be putting garbage on the RFB */
 
-                      gdbg("ERROR: PixelFormat not supported\n");
+                      gerr("ERROR: PixelFormat not supported\n");
                     }
                 }
             }
@@ -245,7 +245,7 @@ int vnc_receiver(FAR struct vnc_session_s *session)
                                        1);
               if (ret < 0)
                 {
-                  gdbg("ERROR: Failed to read SetEncodings message: %d\n",
+                  gerr("ERROR: Failed to read SetEncodings message: %d\n",
                        ret);
                 }
               else
@@ -260,7 +260,7 @@ int vnc_receiver(FAR struct vnc_session_s *session)
                                            SIZEOF_RFB_SERVERINIT_S(0));
                   if (ret < 0)
                     {
-                      gdbg("ERROR: Failed to read encodings: %d\n",
+                      gerr("ERROR: Failed to read encodings: %d\n",
                            ret);
                     }
                   else
@@ -270,7 +270,7 @@ int vnc_receiver(FAR struct vnc_session_s *session)
                       ret = vnc_client_encodings(session, encodings);
                       if (ret < 0)
                         {
-                          gdbg("ERROR: vnc_set_encodings failed: %d\n", ret);
+                          gerr("ERROR: vnc_set_encodings failed: %d\n", ret);
                         }
                     }
                 }
@@ -291,7 +291,7 @@ int vnc_receiver(FAR struct vnc_session_s *session)
                                        1);
               if (ret < 0)
                 {
-                  gdbg("ERROR: Failed to read FramebufferUpdateRequest message: %d\n",
+                  gerr("ERROR: Failed to read FramebufferUpdateRequest message: %d\n",
                        ret);
                 }
               else
@@ -308,7 +308,7 @@ int vnc_receiver(FAR struct vnc_session_s *session)
                   ret = vnc_update_rectangle(session, &rect, false);
                   if (ret < 0)
                     {
-                      gdbg("ERROR: Failed to queue update: %d\n", ret);
+                      gerr("ERROR: Failed to queue update: %d\n", ret);
                     }
                 }
             }
@@ -327,7 +327,7 @@ int vnc_receiver(FAR struct vnc_session_s *session)
                                        1);
               if (ret < 0)
                 {
-                  gdbg("ERROR: Failed to read KeyEvent message: %d\n",
+                  gerr("ERROR: Failed to read KeyEvent message: %d\n",
                        ret);
                 }
               else
@@ -356,7 +356,7 @@ int vnc_receiver(FAR struct vnc_session_s *session)
                                        1);
               if (ret < 0)
                 {
-                  gdbg("ERROR: Failed to read PointerEvent message: %d\n",
+                  gerr("ERROR: Failed to read PointerEvent message: %d\n",
                        ret);
                 }
 #ifdef CONFIG_NX_XYINPUT
@@ -412,7 +412,7 @@ int vnc_receiver(FAR struct vnc_session_s *session)
                                        1);
               if (ret < 0)
                 {
-                  gdbg("ERROR: Failed to read ClientCutText message: %d\n",
+                  gerr("ERROR: Failed to read ClientCutText message: %d\n",
                        ret);
                 }
               else
@@ -426,7 +426,7 @@ int vnc_receiver(FAR struct vnc_session_s *session)
                                            SIZEOF_RFB_CLIENTCUTTEXT_S(0));
                   if (ret < 0)
                     {
-                      gdbg("ERROR: Failed to read text: %d\n",
+                      gerr("ERROR: Failed to read text: %d\n",
                            ret);
                     }
                   else
@@ -438,7 +438,7 @@ int vnc_receiver(FAR struct vnc_session_s *session)
             break;
 
           default:
-            gdbg("ERROR: Unsynchronized, msgtype=%d\n", session->inbuf[0]);
+            gerr("ERROR: Unsynchronized, msgtype=%d\n", session->inbuf[0]);
             return -EPROTO;
         }
     }
diff --git a/graphics/vnc/server/vnc_rre.c b/graphics/vnc/server/vnc_rre.c
index 0be90029c6..cc0d3c9317 100644
--- a/graphics/vnc/server/vnc_rre.c
+++ b/graphics/vnc/server/vnc_rre.c
@@ -276,7 +276,7 @@ int vnc_rre(FAR struct vnc_session_s *session, FAR struct nxgl_rect_s *rect)
                 break;
 
               default:
-                gdbg("ERROR: Unrecognized color format: %d\n",
+                gerr("ERROR: Unrecognized color format: %d\n",
                      session->colorfmt);
                 return -EINVAL;
             }
@@ -296,7 +296,7 @@ int vnc_rre(FAR struct vnc_session_s *session, FAR struct nxgl_rect_s *rect)
               if (nsent < 0)
                 {
                   int errcode = get_errno();
-                  gdbg("ERROR: Send RRE FrameBufferUpdate failed: %d\n",
+                  gerr("ERROR: Send RRE FrameBufferUpdate failed: %d\n",
                        errcode);
                   DEBUGASSERT(errcode > 0);
                   return -errcode;
diff --git a/graphics/vnc/server/vnc_server.c b/graphics/vnc/server/vnc_server.c
index fd795398c3..7c4aa84ad3 100644
--- a/graphics/vnc/server/vnc_server.c
+++ b/graphics/vnc/server/vnc_server.c
@@ -248,7 +248,7 @@ int vnc_server(int argc, FAR char *argv[])
 
   if (argc != 2)
     {
-      gdbg("ERROR: Unexpected number of arguments: %d\n", argc);
+      gerr("ERROR: Unexpected number of arguments: %d\n", argc);
       ret = -EINVAL;
       goto errout_with_post;
     }
@@ -256,7 +256,7 @@ int vnc_server(int argc, FAR char *argv[])
   display = atoi(argv[1]);
   if (display < 0 || display >= RFB_MAX_DISPLAYS)
     {
-      gdbg("ERROR: Invalid display number: %d\n", display);
+      gerr("ERROR: Invalid display number: %d\n", display);
       ret = -EINVAL;
       goto errout_with_post;
     }
@@ -270,7 +270,7 @@ int vnc_server(int argc, FAR char *argv[])
   fb = (FAR uint8_t *)kmm_zalloc(RFB_SIZE);
   if (fb == NULL)
     {
-      gdbg("ERROR: Failed to allocate framebuffer memory: %lu KB\n",
+      gerr("ERROR: Failed to allocate framebuffer memory: %lu KB\n",
            (unsigned long)(RFB_SIZE / 1024));
       ret = -ENOMEM;
       goto errout_with_post;
@@ -281,7 +281,7 @@ int vnc_server(int argc, FAR char *argv[])
   session = kmm_zalloc(sizeof(struct vnc_session_s));
   if (session == NULL)
     {
-      gdbg("ERROR: Failed to allocate session\n");
+      gerr("ERROR: Failed to allocate session\n");
       ret = -ENOMEM;
       goto errout_with_fb;
     }
@@ -324,7 +324,7 @@ int vnc_server(int argc, FAR char *argv[])
           ret = vnc_negotiate(session);
           if (ret < 0)
             {
-              gdbg("ERROR: Failed to negotiate security/framebuffer: %d\n",
+              gerr("ERROR: Failed to negotiate security/framebuffer: %d\n",
                    ret);
               continue;
             }
@@ -336,7 +336,7 @@ int vnc_server(int argc, FAR char *argv[])
           ret = vnc_start_updater(session);
           if (ret < 0)
             {
-              gdbg("ERROR: Failed to start updater thread: %d\n", ret);
+              gerr("ERROR: Failed to start updater thread: %d\n", ret);
               continue;
             }
 
@@ -362,7 +362,7 @@ int vnc_server(int argc, FAR char *argv[])
           ret = vnc_stop_updater(session);
           if (ret < 0)
             {
-              gdbg("ERROR: Failed to stop updater thread: %d\n", ret);
+              gerr("ERROR: Failed to stop updater thread: %d\n", ret);
             }
         }
     }
diff --git a/graphics/vnc/server/vnc_server.h b/graphics/vnc/server/vnc_server.h
index 182e7d038b..a625b1ed1c 100644
--- a/graphics/vnc/server/vnc_server.h
+++ b/graphics/vnc/server/vnc_server.h
@@ -186,24 +186,24 @@
 
 #ifdef CONFIG_VNCSERVER_UPDATE_DEBUG
 #  ifdef CONFIG_CPP_HAVE_VARARGS
-#    define upddbg(format, ...)    dbg(format, ##__VA_ARGS__)
+#    define upderr(format, ...)    err(format, ##__VA_ARGS__)
 #    define updllerr(format, ...)  llerr(format, ##__VA_ARGS__)
 #    define updinfo(format, ...)   info(format, ##__VA_ARGS__)
 #    define updllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #  else
-#   define upddbg                  dbg
+#   define upderr                  err
 #   define updllerr                llerr
 #   define updinfo                 info
 #   define updllinfo               llinfo
 #  endif
 #else
 #  ifdef CONFIG_CPP_HAVE_VARARGS
-#    define upddbg(x...)
+#    define upderr(x...)
 #    define updllerr(x...)
 #    define updinfo(x...)
 #    define updllinfo(x...)
 #  else
-#    define upddbg                 (void)
+#    define upderr                 (void)
 #    define updllerr               (void)
 #    define updinfo                (void)
 #    define updllinfo              (void)
diff --git a/graphics/vnc/server/vnc_updater.c b/graphics/vnc/server/vnc_updater.c
index 675d36fd4a..a0c23a0c02 100644
--- a/graphics/vnc/server/vnc_updater.c
+++ b/graphics/vnc/server/vnc_updater.c
@@ -76,7 +76,7 @@
  ****************************************************************************/
 
 #ifdef VNCSERVER_SEM_DEBUG
-static sem_t g_dbgsem = SEM_INITIALIZER(1);
+static sem_t g_errsem = SEM_INITIALIZER(1);
 #endif
 
 /* A rectangle represent the entire local framebuffer */
@@ -126,7 +126,7 @@ static void vnc_sem_debug(FAR struct vnc_session_s *session,
   int freewaiting;
   int queuewaiting;
 
-  while (sem_wait(&g_dbgsem) < 0)
+  while (sem_wait(&g_errsem) < 0)
     {
       DEBUGASSERT(get_errno() == EINTR);
     }
@@ -168,7 +168,7 @@ static void vnc_sem_debug(FAR struct vnc_session_s *session,
       syslog(LOG_INFO, "  Unqueued:       %u\n", unattached);
     }
 
-  sem_post(&g_dbgsem);
+  sem_post(&g_errsem);
 }
 #else
 #  define vnc_sem_debug(s,m,u)
@@ -412,7 +412,7 @@ static FAR void *vnc_updater(FAR void *arg)
 
       if (ret < 0)
         {
-          gdbg("ERROR: Encoding failed: %d\n", ret);
+          gerr("ERROR: Encoding failed: %d\n", ret);
           break;
         }
     }
diff --git a/include/debug.h b/include/debug.h
index bc825b35af..5fe9af5f88 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -69,10 +69,10 @@
  *    additional configuration setting to enable it (e.g., CONFIG_DEBUG_NET
  *    for the network, CONFIG_DEBUG_FS for the file system, etc).
  *
- *    In general, error messages and output of importance use [a-z]dbg().
- *    [a-z]dbg() is implementation dependent but usually uses file descriptors.
+ *    In general, error messages and output of importance use [a-z]err().
+ *    [a-z]err() is implementation dependent but usually uses file descriptors.
  *    (that is a problem only because the interrupt task may have re-
- *    directed stdout).  Therefore [a-z]dbg() should not be used in interrupt
+ *    directed stdout).  Therefore [a-z]err() should not be used in interrupt
  *    handlers.
  *
  * [a-z]warn() -- Identical to [a-z]info() except that it also requires that
@@ -80,12 +80,12 @@
  *    conditions that are potential errors (or perhaps real errors with non-
  *    fatal consequences).
  *
- * [a-z]dbg() -- Identical to [a-z]info() except that it also requires that
- *    CONFIG_DEBUG_FEATURES be defined.  This is intended for important error-related
+ * [a-z]err() -- Identical to [a-z]info() except that it also requires that
+ *    CONFIG_DEBUG_ERROR be defined.  This is intended for important error-related
  *    information that you probably not want to suppress during normal debug
  *    general debugging.
  *
- * [a-z]llinfo() -- Identical to [a-z]dbg() except this is uses special
+ * [a-z]llinfo() -- Identical to [a-z]err() except this is uses special
  *    interfaces provided by architecture-specific logic to talk directly
  *    to the underlying console hardware.  If the architecture provides such
  *    logic, it should define CONFIG_ARCH_LOWPUTC.
@@ -102,7 +102,7 @@
  *    fatal consequences).
  *
  * [a-z]llerr() -- Identical to [a-z]llinfo() except that it also requires that
- *    CONFIG_DEBUG_FEATURES be defined. This is intended for important error-related
+ *    CONFIG_DEBUG_ERROR be defined. This is intended for important error-related
  *    information that you probably not want to suppress during normal debug
  *    general debugging.
  */
@@ -132,8 +132,8 @@
 
 /* C-99 style variadic macros are supported */
 
-#ifdef CONFIG_DEBUG_FEATURES
-#  define dbg(format, ...) \
+#ifdef CONFIG_DEBUG_ERROR
+#  define err(format, ...) \
    __arch_syslog(LOG_ERR, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
 
 # ifdef CONFIG_ARCH_LOWPUTC
@@ -142,9 +142,8 @@
 # else
 #  define llerr(x...)
 # endif
-#else /* CONFIG_DEBUG_FEATURES */
-
-#  define dbg(x...)
+#else /* CONFIG_DEBUG_ERROR */
+#  define err(x...)
 #  define llerr(x...)
 #endif
 
@@ -181,14 +180,14 @@
 /* Subsystem specific debug */
 
 #ifdef CONFIG_DEBUG_MM
-#  define mdbg(format, ...)    dbg(format, ##__VA_ARGS__)
+#  define merr(format, ...)    err(format, ##__VA_ARGS__)
 #  define mllerr(format, ...)  llerr(format, ##__VA_ARGS__)
 #  define mwarn(format, ...)   warn(format, ##__VA_ARGS__)
 #  define mllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
 #  define minfo(format, ...)   info(format, ##__VA_ARGS__)
 #  define mllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
-#  define mdbg(x...)
+#  define merr(x...)
 #  define mllerr(x...)
 #  define mwarn(x...)
 #  define mllwarn(x...)
@@ -197,14 +196,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SCHED
-#  define sdbg(format, ...)    dbg(format, ##__VA_ARGS__)
+#  define serr(format, ...)    err(format, ##__VA_ARGS__)
 #  define sllerr(format, ...)  llerr(format, ##__VA_ARGS__)
 #  define swarn(format, ...)   warn(format, ##__VA_ARGS__)
 #  define sllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
 #  define sinfo(format, ...)   info(format, ##__VA_ARGS__)
 #  define sllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
-#  define sdbg(x...)
+#  define serr(x...)
 #  define sllerr(x...)
 #  define swarn(x...)
 #  define sllwarn(x...)
@@ -213,14 +212,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_PAGING
-#  define pgdbg(format, ...)    dbg(format, ##__VA_ARGS__)
+#  define pgerr(format, ...)    err(format, ##__VA_ARGS__)
 #  define pgllerr(format, ...)  llerr(format, ##__VA_ARGS__)
 #  define pgwarn(format, ...)   warn(format, ##__VA_ARGS__)
 #  define pgllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
 #  define pginfo(format, ...)   info(format, ##__VA_ARGS__)
 #  define pgllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
-#  define pgdbg(x...)
+#  define pgerr(x...)
 #  define pgllerr(x...)
 #  define pgwarn(x...)
 #  define pgllwarn(x...)
@@ -229,14 +228,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_DMA
-#  define dmadbg(format, ...)    dbg(format, ##__VA_ARGS__)
+#  define dmaerr(format, ...)    err(format, ##__VA_ARGS__)
 #  define dmallerr(format, ...)  llerr(format, ##__VA_ARGS__)
 #  define dmawarn(format, ...)   warn(format, ##__VA_ARGS__)
 #  define dmallwarn(format, ...) llwarn(format, ##__VA_ARGS__)
 #  define dmainfo(format, ...)   info(format, ##__VA_ARGS__)
 #  define dmallinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
-#  define dmadbg(x...)
+#  define dmaerr(x...)
 #  define dmallerr(x...)
 #  define dmawarn(x...)
 #  define dmallwarn(x...)
@@ -245,14 +244,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_NET
-#  define ndbg(format, ...)    dbg(format, ##__VA_ARGS__)
+#  define nerr(format, ...)    err(format, ##__VA_ARGS__)
 #  define nllerr(format, ...)  llerr(format, ##__VA_ARGS__)
 #  define nwarn(format, ...)   warn(format, ##__VA_ARGS__)
 #  define nllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
 #  define ninfo(format, ...)   info(format, ##__VA_ARGS__)
 #  define nllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
-#  define ndbg(x...)
+#  define nerr(x...)
 #  define nllerr(x...)
 #  define nwarn(x...)
 #  define nllwarn(x...)
@@ -261,14 +260,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_USB
-#  define udbg(format, ...)    dbg(format, ##__VA_ARGS__)
+#  define uerr(format, ...)    err(format, ##__VA_ARGS__)
 #  define ullerr(format, ...)  llerr(format, ##__VA_ARGS__)
 #  define uwarn(format, ...)   warn(format, ##__VA_ARGS__)
 #  define ullwarn(format, ...) llwarn(format, ##__VA_ARGS__)
 #  define uinfo(format, ...)   info(format, ##__VA_ARGS__)
 #  define ullinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
-#  define udbg(x...)
+#  define uerr(x...)
 #  define ullerr(x...)
 #  define uwarn(x...)
 #  define ullwarn(x...)
@@ -277,14 +276,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_FS
-#  define fdbg(format, ...)    dbg(format, ##__VA_ARGS__)
+#  define ferr(format, ...)    err(format, ##__VA_ARGS__)
 #  define fllerr(format, ...)  llerr(format, ##__VA_ARGS__)
 #  define fwarn(format, ...)   warn(format, ##__VA_ARGS__)
 #  define fllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
 #  define finfo(format, ...)   info(format, ##__VA_ARGS__)
 #  define fllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
-#  define fdbg(x...)
+#  define ferr(x...)
 #  define fllerr(x...)
 #  define fwarn(x...)
 #  define fllwarn(x...)
@@ -293,14 +292,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_CRYPTO
-#  define cryptdbg(format, ...)    dbg(format, ##__VA_ARGS__)
+#  define crypterr(format, ...)    err(format, ##__VA_ARGS__)
 #  define cryptllerr(format, ...)  llerr(format, ##__VA_ARGS__)
 #  define cryptwarn(format, ...)   warn(format, ##__VA_ARGS__)
 #  define cryptllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
 #  define cryptinfo(format, ...)   info(format, ##__VA_ARGS__)
 #  define cryptllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
-#  define cryptdbg(x...)
+#  define crypterr(x...)
 #  define cryptllerr(x...)
 #  define cryptwarn(x...)
 #  define cryptllwarn(x...)
@@ -309,14 +308,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_INPUT
-#  define idbg(format, ...)    dbg(format, ##__VA_ARGS__)
+#  define ierr(format, ...)    err(format, ##__VA_ARGS__)
 #  define illerr(format, ...)  llerr(format, ##__VA_ARGS__)
 #  define iwarn(format, ...)   warn(format, ##__VA_ARGS__)
 #  define illwarn(format, ...) llwarn(format, ##__VA_ARGS__)
 #  define iinfo(format, ...)   info(format, ##__VA_ARGS__)
 #  define illinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
-#  define idbg(x...)
+#  define ierr(x...)
 #  define illerr(x...)
 #  define iwarn(x...)
 #  define illwarn(x...)
@@ -325,14 +324,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SENSORS
-#  define sndbg(format, ...)    dbg(format, ##__VA_ARGS__)
+#  define snerr(format, ...)    err(format, ##__VA_ARGS__)
 #  define snllerr(format, ...)  llerr(format, ##__VA_ARGS__)
 #  define snwarn(format, ...)   warn(format, ##__VA_ARGS__)
 #  define snllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
 #  define sninfo(format, ...)   info(format, ##__VA_ARGS__)
 #  define snllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
-#  define sndbg(x...)
+#  define snerr(x...)
 #  define snllerr(x...)
 #  define snwarn(x...)
 #  define snllwarn(x...)
@@ -341,14 +340,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_ANALOG
-#  define adbg(format, ...)    dbg(format, ##__VA_ARGS__)
+#  define aerr(format, ...)    err(format, ##__VA_ARGS__)
 #  define allerr(format, ...)  llerr(format, ##__VA_ARGS__)
 #  define awarn(format, ...)   warn(format, ##__VA_ARGS__)
 #  define allwarn(format, ...) llwarn(format, ##__VA_ARGS__)
 #  define ainfo(format, ...)   info(format, ##__VA_ARGS__)
 #  define allinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
-#  define adbg(x...)
+#  define aerr(x...)
 #  define allerr(x...)
 #  define awarn(x...)
 #  define allwarn(x...)
@@ -357,14 +356,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_GRAPHICS
-#  define gdbg(format, ...)    dbg(format, ##__VA_ARGS__)
+#  define gerr(format, ...)    err(format, ##__VA_ARGS__)
 #  define gllerr(format, ...)  llerr(format, ##__VA_ARGS__)
 #  define gwarn(format, ...)   warn(format, ##__VA_ARGS__)
 #  define gllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
 #  define ginfo(format, ...)   info(format, ##__VA_ARGS__)
 #  define gllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
-#  define gdbg(x...)
+#  define gerr(x...)
 #  define gllerr(x...)
 #  define gwarn(x...)
 #  define gllwarn(x...)
@@ -373,14 +372,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_BINFMT
-#  define bdbg(format, ...)    dbg(format, ##__VA_ARGS__)
+#  define berr(format, ...)    err(format, ##__VA_ARGS__)
 #  define bllerr(format, ...)  llerr(format, ##__VA_ARGS__)
 #  define bwarn(format, ...)   warn(format, ##__VA_ARGS__)
 #  define bllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
 #  define binfo(format, ...)   info(format, ##__VA_ARGS__)
 #  define bllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
-#  define bdbg(x...)
+#  define berr(x...)
 #  define bllerr(x...)
 #  define bwarn(x...)
 #  define bllwarn(x...)
@@ -389,14 +388,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_LIB
-#  define ldbg(format, ...)    dbg(format, ##__VA_ARGS__)
+#  define lerr(format, ...)    err(format, ##__VA_ARGS__)
 #  define lllerr(format, ...)  llerr(format, ##__VA_ARGS__)
 #  define lwarn(format, ...)   warn(format, ##__VA_ARGS__)
 #  define lllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
 #  define linfo(format, ...)   info(format, ##__VA_ARGS__)
 #  define lllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
-#  define ldbg(x...)
+#  define lerr(x...)
 #  define lllerr(x...)
 #  define lwarn(x...)
 #  define lllwarn(x...)
@@ -405,14 +404,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_AUDIO
-#  define auddbg(format, ...)    dbg(format, ##__VA_ARGS__)
+#  define auderr(format, ...)    err(format, ##__VA_ARGS__)
 #  define audllerr(format, ...)  llerr(format, ##__VA_ARGS__)
 #  define audwarn(format, ...)   warn(format, ##__VA_ARGS__)
 #  define audllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
 #  define audinfo(format, ...)   info(format, ##__VA_ARGS__)
 #  define audllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
-#  define auddbg(x...)
+#  define auderr(x...)
 #  define audllerr(x...)
 #  define audwarn(x...)
 #  define audllwarn(x...)
@@ -424,12 +423,12 @@
 
 /* Variadic macros NOT supported */
 
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_ERROR
 #  ifndef CONFIG_ARCH_LOWPUTC
 #    define llerr     (void)
 #  endif
 #else
-#  define dbg         (void)
+#  define err         (void)
 #  define llerr       (void)
 #endif
 
@@ -454,14 +453,14 @@
 /* Subsystem specific debug */
 
 #ifdef CONFIG_DEBUG_MM
-#  define mdbg        dbg
+#  define merr        err
 #  define mllerr      llerr
 #  define mwarn       warn
 #  define mllwarn     llwarn
 #  define minfo       info
 #  define mllinfo     llinfo
 #else
-#  define mdbg        (void)
+#  define merr        (void)
 #  define mllerr      (void)
 #  define mwarn       (void)
 #  define mllwarn     (void)
@@ -470,14 +469,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SCHED
-#  define sdbg        dbg
+#  define serr        err
 #  define sllerr      llerr
 #  define swarn       warn
 #  define sllwarn     llwarn
 #  define sinfo       info
 #  define sllinfo     llinfo
 #else
-#  define sdbg        (void)
+#  define serr        (void)
 #  define sllerr      (void)
 #  define swarn       (void)
 #  define sllwarn     (void)
@@ -486,14 +485,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_PAGING
-#  define pgdbg       dbg
+#  define pgerr       err
 #  define pgllerr     llerr
 #  define pgwarn      warn
 #  define pgllwarn    llwarn
 #  define pginfo      info
 #  define pgllinfo    llinfo
 #else
-#  define pgdbg       (void)
+#  define pgerr       (void)
 #  define pgllerr     (void)
 #  define pgwarn      (void)
 #  define pgllwarn    (void)
@@ -502,14 +501,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_DMA
-#  define dmadbg      dbg
+#  define dmaerr      err
 #  define dmallerr    llerr
 #  define dmawarn     warn
 #  define dmallwarn   llwarn
 #  define dmainfo     info
 #  define dmallinfo   llinfo
 #else
-#  define dmadbg      (void)
+#  define dmaerr      (void)
 #  define dmallerr    (void)
 #  define dmawarn     (void)
 #  define dmallwarn   (void)
@@ -518,14 +517,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_NET
-#  define ndbg        dbg
+#  define nerr        err
 #  define nllerr      llerr
 #  define nwarn       warn
 #  define nllwarn     llwarn
 #  define ninfo       info
 #  define nllinfo     llinfo
 #else
-#  define ndbg        (void)
+#  define nerr        (void)
 #  define nllerr      (void)
 #  define nwarn       (void)
 #  define nllwarn     (void)
@@ -534,14 +533,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_USB
-#  define udbg        dbg
+#  define uerr        err
 #  define ullerr      llerr
 #  define uwarn       warn
 #  define ullwarn     llwarn
 #  define uinfo       info
 #  define ullinfo     llinfo
 #else
-#  define udbg        (void)
+#  define uerr        (void)
 #  define ullerr      (void)
 #  define uwarn       (void)
 #  define ullwarn     (void)
@@ -550,14 +549,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_FS
-#  define fdbg        dbg
+#  define ferr        err
 #  define fllerr      llerr
 #  define fwarn       warn
 #  define fllwarn     llwarn
 #  define finfo       info
 #  define fllinfo     llinfo
 #else
-#  define fdbg        (void)
+#  define ferr        (void)
 #  define fllerr      (void)
 #  define fwarn       (void)
 #  define fllwarn     (void)
@@ -566,14 +565,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_CRYPTO
-#  define cryptdbg    dbg
+#  define crypterr    err
 #  define cryptllerr  llerr
 #  define cryptwarn   warn
 #  define cryptllwarn llwarn
 #  define cryptinfo   info
 #  define cryptllinfo llinfo
 #else
-#  define cryptdbg    (void)
+#  define crypterr    (void)
 #  define cryptllerr  (void)
 #  define cryptwarn   (void)
 #  define cryptllwarn (void)
@@ -582,14 +581,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_INPUT
-#  define idbg        dbg
+#  define ierr        err
 #  define illerr      llerr
 #  define iwarn       warn
 #  define illwarn     llwarn
 #  define iinfo       info
 #  define illinfo     llinfo
 #else
-#  define idbg        (void)
+#  define ierr        (void)
 #  define illerr      (void)
 #  define iwarn       (void)
 #  define illwarn     (void)
@@ -598,14 +597,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SENSORS
-#  define sndbg       dbg
+#  define snerr       err
 #  define snllerr     llerr
 #  define snwarn      warn
 #  define snllwarn    llwarn
 #  define sninfo      info
 #  define snllinfo    llinfo
 #else
-#  define sndbg       (void)
+#  define snerr       (void)
 #  define snllerr     (void)
 #  define snwarn      (void)
 #  define snllwarn    (void)
@@ -614,14 +613,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_ANALOG
-#  define adbg        dbg
+#  define aerr        err
 #  define allerr      llerr
 #  define awarn       warn
 #  define allwarn     llwarn
 #  define ainfo       info
 #  define allinfo     llinfo
 #else
-#  define adbg        (void)
+#  define aerr        (void)
 #  define allerr      (void)
 #  define awarn       (void)
 #  define allwarn     (void)
@@ -630,14 +629,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_GRAPHICS
-#  define gdbg        dbg
+#  define gerr        err
 #  define gllerr      llerr
 #  define gwarn       warn
 #  define gllwarn     llwarn
 #  define ginfo       info
 #  define gllinfo     llinfo
 #else
-#  define gdbg        (void)
+#  define gerr        (void)
 #  define gllerr      (void)
 #  define gwarn       (void)
 #  define gllwarn     (void)
@@ -646,14 +645,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_BINFMT
-#  define bdbg        dbg
+#  define berr        err
 #  define bllerr      llerr
 #  define bwarn       warn
 #  define bllwarn     llwarn
 #  define binfo       info
 #  define bllinfo     llinfo
 #else
-#  define bdbg        (void)
+#  define berr        (void)
 #  define bllerr      (void)
 #  define bwarn       (void)
 #  define bllwarn     (void)
@@ -662,14 +661,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_LIB
-#  define ldbg        dbg
+#  define lerr        err
 #  define lllerr      llerr
 #  define lwarn       warn
 #  define lllwarn     llwarn
 #  define linfo       info
 #  define lllinfo     llinfo
 #else
-#  define ldbg        (void)
+#  define lerr        (void)
 #  define lllerr      (void)
 #  define lwarn       (void)
 #  define lllwarn     (void)
@@ -678,14 +677,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_AUDIO
-#  define auddbg      dbg
+#  define auderr      err
 #  define audllerr    llerr
 #  define audwarn     warn
 #  define audllwarn   llwarn
 #  define audinfo     info
 #  define audllinfo   llinfo
 #else
-#  define auddbg      (void)
+#  define auderr      (void)
 #  define audllerr    (void)
 #  define audwarn     (void)
 #  define audllwarn   (void)
@@ -697,113 +696,113 @@
 
 /* Buffer dumping macros do not depend on varargs */
 
-#ifdef CONFIG_DEBUG_FEATURES
-#  define dbgdumpbuffer(m,b,n) lib_dumpbuffer(m,b,n)
+#ifdef CONFIG_DEBUG_ERROR
+#  define errdumpbuffer(m,b,n) lib_dumpbuffer(m,b,n)
 #  ifdef CONFIG_DEBUG_INFO
 #    define infodumpbuffer(m,b,n) lib_dumpbuffer(m,b,n)
 #  else
 #   define infodumpbuffer(m,b,n)
 #  endif
 #else
-#  define dbgdumpbuffer(m,b,n)
+#  define errdumpbuffer(m,b,n)
 #  define infodumpbuffer(m,b,n)
 # endif
 
 /* Subsystem specific debug */
 
 #ifdef CONFIG_DEBUG_MM
-#  define mdbgdumpbuffer(m,b,n)  dbgdumpbuffer(m,b,n)
+#  define merrdumpbuffer(m,b,n)  errdumpbuffer(m,b,n)
 #  define minfodumpbuffer(m,b,n) infodumpbuffer(m,b,n)
 #else
-#  define mdbgdumpbuffer(m,b,n)
+#  define merrdumpbuffer(m,b,n)
 #  define minfodumpbuffer(m,b,n)
 #endif
 
 #ifdef CONFIG_DEBUG_SCHED
-#  define sdbgdumpbuffer(m,b,n)  dbgdumpbuffer(m,b,n)
+#  define serrdumpbuffer(m,b,n)  errdumpbuffer(m,b,n)
 #  define sinfodumpbuffer(m,b,n) infodumpbuffer(m,b,n)
 #else
-#  define sdbgdumpbuffer(m,b,n)
+#  define serrdumpbuffer(m,b,n)
 #  define sinfodumpbuffer(m,b,n)
 #endif
 
 #ifdef CONFIG_DEBUG_PAGING
-#  define pgdbgdumpbuffer(m,b,n)  dbgdumpbuffer(m,b,n)
+#  define pgerrdumpbuffer(m,b,n)  errdumpbuffer(m,b,n)
 #  define pginfodumpbuffer(m,b,n) infodumpbuffer(m,b,n)
 #else
-#  define pgdbgdumpbuffer(m,b,n)
+#  define pgerrdumpbuffer(m,b,n)
 #  define pginfodumpbuffer(m,b,n)
 #endif
 
 #ifdef CONFIG_DEBUG_DMA
-#  define dmadbgdumpbuffer(m,b,n)  dbgdumpbuffer(m,b,n)
+#  define dmaerrdumpbuffer(m,b,n)  errdumpbuffer(m,b,n)
 #  define dmainfodumpbuffer(m,b,n) infodumpbuffer(m,b,n)
 #else
-#  define dmadbgdumpbuffer(m,b,n)
+#  define dmaerrdumpbuffer(m,b,n)
 #  define dmainfodumpbuffer(m,b,n)
 #endif
 
 #ifdef CONFIG_DEBUG_NET
-#  define ndbgdumpbuffer(m,b,n)  dbgdumpbuffer(m,b,n)
+#  define nerrdumpbuffer(m,b,n)  errdumpbuffer(m,b,n)
 #  define ninfodumpbuffer(m,b,n) infodumpbuffer(m,b,n)
 #else
-#  define ndbgdumpbuffer(m,b,n)
+#  define nerrdumpbuffer(m,b,n)
 #  define ninfodumpbuffer(m,b,n)
 #endif
 
 #ifdef CONFIG_DEBUG_USB
-#  define udbgdumpbuffer(m,b,n)  dbgdumpbuffer(m,b,n)
+#  define uerrdumpbuffer(m,b,n)  errdumpbuffer(m,b,n)
 #  define uinfodumpbuffer(m,b,n) infodumpbuffer(m,b,n)
 #else
-#  define udbgdumpbuffer(m,b,n)
+#  define uerrdumpbuffer(m,b,n)
 #  define uinfodumpbuffer(m,b,n)
 #endif
 
 #ifdef CONFIG_DEBUG_FS
-#  define fdbgdumpbuffer(m,b,n)  dbgdumpbuffer(m,b,n)
+#  define ferrdumpbuffer(m,b,n)  errdumpbuffer(m,b,n)
 #  define finfodumpbuffer(m,b,n) infodumpbuffer(m,b,n)
 #else
-#  define fdbgdumpbuffer(m,b,n)
+#  define ferrdumpbuffer(m,b,n)
 #  define finfodumpbuffer(m,b,n)
 #endif
 
 #ifdef CONFIG_DEBUG_INPUT
-#  define idbgdumpbuffer(m,b,n)  dbgdumpbuffer(m,b,n)
+#  define ierrdumpbuffer(m,b,n)  errdumpbuffer(m,b,n)
 #  define iinfodumpbuffer(m,b,n) infodumpbuffer(m,b,n)
 #else
-#  define idbgdumpbuffer(m,b,n)
+#  define ierrdumpbuffer(m,b,n)
 #  define iinfodumpbuffer(m,b,n)
 #endif
 
 #ifdef CONFIG_DEBUG_GRAPHICS
-#  define gdbgdumpbuffer(m,b,n)  dbgdumpbuffer(m,b,n)
+#  define gerrdumpbuffer(m,b,n)  errdumpbuffer(m,b,n)
 #  define ginfodumpbuffer(m,b,n) infodumpbuffer(m,b,n)
 #else
-#  define gdbgdumpbuffer(m,b,n)
+#  define gerrdumpbuffer(m,b,n)
 #  define ginfodumpbuffer(m,b,n)
 #endif
 
 #ifdef CONFIG_DEBUG_BINFMT
-#  define bdbgdumpbuffer(m,b,n)  dbgdumpbuffer(m,b,n)
+#  define berrdumpbuffer(m,b,n)  errdumpbuffer(m,b,n)
 #  define binfodumpbuffer(m,b,n) infodumpbuffer(m,b,n)
 #else
-#  define bdbgdumpbuffer(m,b,n)
+#  define berrdumpbuffer(m,b,n)
 #  define binfodumpbuffer(m,b,n)
 #endif
 
 #ifdef CONFIG_DEBUG_LIB
-#  define ldbgdumpbuffer(m,b,n)  dbgdumpbuffer(m,b,n)
+#  define lerrdumpbuffer(m,b,n)  errdumpbuffer(m,b,n)
 #  define linfodumpbuffer(m,b,n) infodumpbuffer(m,b,n)
 #else
-#  define ldbgdumpbuffer(m,b,n)
+#  define lerrdumpbuffer(m,b,n)
 #  define linfodumpbuffer(m,b,n)
 #endif
 
 #ifdef CONFIG_DEBUG_AUDIO
-#  define auddbgdumpbuffer(m,b,n)  dbgdumpbuffer(m,b,n)
+#  define auderrdumpbuffer(m,b,n)  errdumpbuffer(m,b,n)
 #  define audinfodumpbuffer(m,b,n) infodumpbuffer(m,b,n)
 #else
-#  define auddbgdumpbuffer(m,b,n)
+#  define auderrdumpbuffer(m,b,n)
 #  define audinfodumpbuffer(m,b,n)
 #endif
 
@@ -839,13 +838,13 @@ void lib_dumpbuffer(FAR const char *msg, FAR const uint8_t *buffer,
  */
 
 #ifndef CONFIG_CPP_HAVE_VARARGS
-#ifdef CONFIG_DEBUG_FEATURES
-int dbg(const char *format, ...);
+#ifdef CONFIG_DEBUG_ERROR
+int err(const char *format, ...);
 
 # ifdef CONFIG_ARCH_LOWPUTC
 int llerr(const char *format, ...);
 # endif
-#endif /* CONFIG_DEBUG_FEATURES */
+#endif /* CONFIG_DEBUG_ERROR */
 
 #ifdef CONFIG_DEBUG_WARN
 int warn(const char *format, ...);
diff --git a/include/nuttx/mm/shm.h b/include/nuttx/mm/shm.h
index 8c6f90cfaa..80d36f2f94 100644
--- a/include/nuttx/mm/shm.h
+++ b/include/nuttx/mm/shm.h
@@ -77,18 +77,18 @@
 
 #ifdef CONFIG_CPP_HAVE_VARARGS
 #  ifdef CONFIG_DEBUG_SHM
-#    define shmdbg(format, ...)       dbg(format, ##__VA_ARGS__)
+#    define shmerr(format, ...)       err(format, ##__VA_ARGS__)
 #    define shminfo(format, ...)      info(format, ##__VA_ARGS__)
 #  else
-#    define shmdbg(format, ...)       mdbg(format, ##__VA_ARGS__)
+#    define shmerr(format, ...)       merr(format, ##__VA_ARGS__)
 #    define shminfo(format, ...)      minfo(format, ##__VA_ARGS__)
 #  endif
 #else
 #  ifdef CONFIG_DEBUG_SHM
-#    define shmdbg                    dbg
+#    define shmerr                    err
 #    define shminfo                   info
 #  else
-#    define shmdbg                    (void)
+#    define shmerr                    (void)
 #    define shminfo                   (void)
 #  endif
 #endif
diff --git a/include/nuttx/spi/spi_bitbang.c b/include/nuttx/spi/spi_bitbang.c
index 5876d3d8ce..2ab152de3c 100644
--- a/include/nuttx/spi/spi_bitbang.c
+++ b/include/nuttx/spi/spi_bitbang.c
@@ -75,14 +75,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg llerr
+#  define spierr llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
diff --git a/include/nuttx/spi/spi_bitbang.h b/include/nuttx/spi/spi_bitbang.h
index 33571b1bf2..5da7374370 100644
--- a/include/nuttx/spi/spi_bitbang.h
+++ b/include/nuttx/spi/spi_bitbang.h
@@ -62,14 +62,14 @@
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spidbg llerr
+#  define spierr llerr
 #  ifdef CONFIG_DEBUG_INFO
 #    define spiinfo llerr
 #  else
 #    define spiinfo(x...)
 #  endif
 #else
-#  define spidbg(x...)
+#  define spierr(x...)
 #  define spiinfo(x...)
 #endif
 
diff --git a/include/nuttx/wireless/nrf24l01.h b/include/nuttx/wireless/nrf24l01.h
index 94f7f8383b..a166ebf034 100644
--- a/include/nuttx/wireless/nrf24l01.h
+++ b/include/nuttx/wireless/nrf24l01.h
@@ -91,12 +91,12 @@
 /* NRF24L01 debug */
 
 #ifdef NRF24L01_DEBUG
-# define wdbg(format, ...)           dbg(format, ##__VA_ARGS__)
+# define werr(format, ...)           err(format, ##__VA_ARGS__)
 # define wllerr(format, ...)         llerr(format, ##__VA_ARGS__)
 # define winfo(format, ...)          info(format, ##__VA_ARGS__)
 # define wllinfo(format, ...)        llinfo(format, ##__VA_ARGS__)
 #else
-# define wdbg(x...)
+# define werr(x...)
 # define wllerr(x...)
 # define winfo(x...)
 # define wllinfo(x...)
diff --git a/libc/aio/lio_listio.c b/libc/aio/lio_listio.c
index b123a4e735..fa03c38f62 100644
--- a/libc/aio/lio_listio.c
+++ b/libc/aio/lio_listio.c
@@ -255,7 +255,7 @@ static int lio_sigsetup(FAR struct aiocb * const *list, int nent,
   sighand = (FAR struct lio_sighand_s *)lib_zalloc(sizeof(struct lio_sighand_s));
   if (!sighand)
     {
-      fdbg("ERROR: lib_zalloc failed\n");
+      ferr("ERROR: lib_zalloc failed\n");
       return -ENOMEM;
     }
 
@@ -296,7 +296,7 @@ static int lio_sigsetup(FAR struct aiocb * const *list, int nent,
   if (status != OK)
     {
       int errcode = get_errno();
-      fdbg("ERROR sigprocmask failed: %d\n", errcode);
+      ferr("ERROR sigprocmask failed: %d\n", errcode);
       DEBUGASSERT(errcode > 0);
       return -errcode;
     }
@@ -314,7 +314,7 @@ static int lio_sigsetup(FAR struct aiocb * const *list, int nent,
   if (status != OK)
     {
       int errcode = get_errno();
-      fdbg("ERROR sigaction failed: %d\n", errcode);
+      ferr("ERROR sigaction failed: %d\n", errcode);
       DEBUGASSERT(errcode > 0);
       return -errcode;
     }
@@ -379,7 +379,7 @@ static int lio_waitall(FAR struct aiocb * const *list, int nent)
            */
 
           int errcode = get_errno();
-          fdbg("ERROR: sigwaitinfo failed: %d\n", errcode);
+          ferr("ERROR: sigwaitinfo failed: %d\n", errcode);
           DEBUGASSERT(errcode > 0);
           return -errcode;
         }
@@ -600,7 +600,7 @@ int lio_listio(int mode, FAR struct aiocb *const list[], int nent,
                     /* Failed to queue the I/O.  Set up the error return. */
 
                     errcode = get_errno();
-                    fdbg("ERROR: aio_read/write failed: %d\n", errcode);
+                    ferr("ERROR: aio_read/write failed: %d\n", errcode);
                     DEBUGASSERT(errcode > 0);
                     aiocbp->aio_result = -errcode;
                     ret = ERROR;
@@ -618,7 +618,7 @@ int lio_listio(int mode, FAR struct aiocb *const list[], int nent,
               {
                 /* Make the invalid operation complete with an error */
 
-                fdbg("ERROR: Unrecognized opcode: %d\n", aiocbp->aio_lio_opcode);
+                ferr("ERROR: Unrecognized opcode: %d\n", aiocbp->aio_lio_opcode);
                 aiocbp->aio_result = -EINVAL;
                 ret = ERROR;
               }
diff --git a/libc/misc/lib_dbg.c b/libc/misc/lib_dbg.c
index d04c719b1a..1687ddfc8b 100644
--- a/libc/misc/lib_dbg.c
+++ b/libc/misc/lib_dbg.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libc/misc/lib_dbg.c
+ * libc/misc/lib_err.c
  *
  *   Copyright (C) 2007-2009, 2011-2012, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
@@ -51,7 +51,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: dbg, llerr, info
+ * Name: err, llerr, info
  *
  * Description:
  *  If the cross-compiler's pre-processor does not support variable
@@ -60,7 +60,7 @@
  ****************************************************************************/
 
 #ifdef CONFIG_DEBUG_FEATURES
-int dbg(const char *format, ...)
+int err(const char *format, ...)
 {
   va_list ap;
   int     ret;
diff --git a/libc/misc/lib_slcddecode.c b/libc/misc/lib_slcddecode.c
index 2f8cdaa73e..40ff576683 100644
--- a/libc/misc/lib_slcddecode.c
+++ b/libc/misc/lib_slcddecode.c
@@ -92,10 +92,10 @@
 /* Debug ********************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-#  define lcddbg         dbg
+#  define lcderr         err
 #  define lcdinfo        info
 #else
-#  define lcddbg(x...)
+#  define lcderr(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -264,7 +264,7 @@ enum slcdret_e slcd_decode(FAR struct lib_instream_s *stream,
        * return the following characters later.
        */
 
-      lcddbg("Parsing failed: ESC followed by %02x\n", ch);
+      lcderr("Parsing failed: ESC followed by %02x\n", ch);
       return slcd_reget(state, pch, parg);
     }
 
@@ -295,7 +295,7 @@ enum slcdret_e slcd_decode(FAR struct lib_instream_s *stream,
 
       if (code < (int)FIRST_SLCDCODE || code > (int)LAST_SLCDCODE)
         {
-          lcddbg("Parsing failed: ESC-L followed by %02x\n", ch);
+          lcderr("Parsing failed: ESC-L followed by %02x\n", ch);
 
           /* Not a special command code.. put the character in the reget
            * buffer.
@@ -338,7 +338,7 @@ enum slcdret_e slcd_decode(FAR struct lib_instream_s *stream,
            * following characters later.
            */
 
-          lcddbg("Parsing failed: ESC-L-%c followed by %02x\n",
+          lcderr("Parsing failed: ESC-L-%c followed by %02x\n",
                  state->buf[NDX_COUNTH], ch);
 
           return slcd_reget(state, pch, parg);
@@ -384,7 +384,7 @@ enum slcdret_e slcd_decode(FAR struct lib_instream_s *stream,
            * of the characters later.
            */
 
-          lcddbg("Parsing failed: ESC-L-%c-%c followed by %02x\n",
+          lcderr("Parsing failed: ESC-L-%c-%c followed by %02x\n",
                  state->buf[NDX_COUNTH], state->buf[NDX_COUNTL], ch);
 
           return slcd_reget(state, pch, parg);
diff --git a/libc/netdb/lib_dnsaddserver.c b/libc/netdb/lib_dnsaddserver.c
index cc689b34c3..d0b7c42323 100644
--- a/libc/netdb/lib_dnsaddserver.c
+++ b/libc/netdb/lib_dnsaddserver.c
@@ -91,7 +91,7 @@ int dns_add_nameserver(FAR const struct sockaddr *addr, socklen_t addrlen)
   if (stream == NULL)
     {
       int errcode = errno;
-      ndbg("ERROR: Failed to open %s: %d\n",
+      nerr("ERROR: Failed to open %s: %d\n",
            CONFIG_NETDB_RESOLVCONF_PATH, errcode);
       DEBUGASSERT(errcode > 0);
       return -errcode;
@@ -114,7 +114,7 @@ int dns_add_nameserver(FAR const struct sockaddr *addr, socklen_t addrlen)
           if (inet_ntop(AF_INET, &in4->sin_addr, addrstr, DNS_MAX_ADDRSTR) == NULL)
             {
               ret = -errno;
-              ndbg("ERROR: inet_ntop failed: %d\n", errcode);
+              nerr("ERROR: inet_ntop failed: %d\n", errcode);
               DEBUGASSERT(errcode < 0);
               goto errout;
             }
@@ -146,7 +146,7 @@ int dns_add_nameserver(FAR const struct sockaddr *addr, socklen_t addrlen)
           if (inet_ntop(AF_INET6, &in6->sin6_addr, addrstr, DNS_MAX_ADDRSTR) == NULL)
             {
               ret = -errno;
-              ndbg("ERROR: inet_ntop failed: %d\n", errcode);
+              nerr("ERROR: inet_ntop failed: %d\n", errcode);
               DEBUGASSERT(errcode < 0);
               goto errout;
             }
@@ -193,7 +193,7 @@ int dns_add_nameserver(FAR const struct sockaddr *addr, socklen_t addrlen)
   if (status < 0)
     {
       ret = -errno;
-      ndbg("ERROR: fprintf failed: %d\n", errcode);
+      nerr("ERROR: fprintf failed: %d\n", errcode);
       DEBUGASSERT(errcode < 0);
       goto errout;
     }
diff --git a/libc/netdb/lib_dnsbind.c b/libc/netdb/lib_dnsbind.c
index c7eae42953..3feec95912 100644
--- a/libc/netdb/lib_dnsbind.c
+++ b/libc/netdb/lib_dnsbind.c
@@ -91,7 +91,7 @@ int dns_bind(void)
 
   if (!dns_initialize())
     {
-      ndbg("ERROR: DNS client has not been initialized\n");
+      nerr("ERROR: DNS client has not been initialized\n");
       return -EDESTADDRREQ;
     }
 
@@ -101,7 +101,7 @@ int dns_bind(void)
   if (sd < 0)
     {
       errcode = get_errno();
-      ndbg("ERROR: socket() failed: %d\n", errcode);
+      nerr("ERROR: socket() failed: %d\n", errcode);
       return -errcode;
     }
 
@@ -114,7 +114,7 @@ int dns_bind(void)
   if (ret < 0)
     {
       errcode = get_errno();
-      ndbg("ERROR: setsockopt() failed: %d\n", errcode);
+      nerr("ERROR: setsockopt() failed: %d\n", errcode);
       close(sd);
       return -errcode;
     }
diff --git a/libc/netdb/lib_dnscache.c b/libc/netdb/lib_dnscache.c
index 72979e4066..5a95dc9b1b 100644
--- a/libc/netdb/lib_dnscache.c
+++ b/libc/netdb/lib_dnscache.c
@@ -207,7 +207,7 @@ int dns_find_answer(FAR const char *hostname, FAR struct sockaddr *addr,
 
   if (!dns_initialize())
     {
-      ndbg("ERROR: DNS failed to initialize\n");
+      nerr("ERROR: DNS failed to initialize\n");
       return -EAGAIN;
     }
 
diff --git a/libc/netdb/lib_dnsforeach.c b/libc/netdb/lib_dnsforeach.c
index 3d13dc5a63..a6693e3c57 100644
--- a/libc/netdb/lib_dnsforeach.c
+++ b/libc/netdb/lib_dnsforeach.c
@@ -105,7 +105,7 @@ int dns_foreach_nameserver(dns_callback_t callback, FAR void *arg)
   if (stream == NULL)
     {
       int errcode = errno;
-      ndbg("ERROR: Failed to open %s: %d\n",
+      nerr("ERROR: Failed to open %s: %d\n",
         CONFIG_NETDB_RESOLVCONF_PATH, errcode);
       DEBUGASSERT(errcode > 0);
       return -errcode;
@@ -123,7 +123,7 @@ int dns_foreach_nameserver(dns_callback_t callback, FAR void *arg)
           addrstr = skip_spaces(ptr);
           if (*addrstr == '\0')
             {
-              ndbg("ERROR: Missing address in %s record\n",
+              nerr("ERROR: Missing address in %s record\n",
                    CONFIG_NETDB_RESOLVCONF_PATH);
               continue;
             }
@@ -155,7 +155,7 @@ int dns_foreach_nameserver(dns_callback_t callback, FAR void *arg)
               ptr = strchr(addrstr, ']');
               if (ptr == NULL)
                 {
-                  ndbg("ERROR: Missing right bracket after %s\n", line);
+                  nerr("ERROR: Missing right bracket after %s\n", line);
                   continue;
                 }
 
@@ -224,7 +224,7 @@ int dns_foreach_nameserver(dns_callback_t callback, FAR void *arg)
               else
 #endif
                 {
-                  ndbg("ERROR: Unrecognized address: %s\n", addrstr)
+                  nerr("ERROR: Unrecognized address: %s\n", addrstr)
                   ret = OK;
                 }
 #ifdef CONFIG_NET_IPv6
diff --git a/libc/netdb/lib_dnsquery.c b/libc/netdb/lib_dnsquery.c
index 1510691438..636bad4fe4 100644
--- a/libc/netdb/lib_dnsquery.c
+++ b/libc/netdb/lib_dnsquery.c
@@ -213,7 +213,7 @@ static int dns_send_query(int sd, FAR const char *name,
   if (ret < 0)
     {
       errcode = get_errno();
-      ndbg("ERROR: sendto failed: %d\n", errcode);
+      nerr("ERROR: sendto failed: %d\n", errcode);
       return -errcode;
     }
 
@@ -248,7 +248,7 @@ static int dns_recv_response(int sd, FAR struct sockaddr *addr,
   if (ret < 0)
     {
       errcode = get_errno();
-      ndbg("ERROR: recv failed: %d\n", errcode);
+      nerr("ERROR: recv failed: %d\n", errcode);
       return -errcode;
     }
 
@@ -265,7 +265,7 @@ static int dns_recv_response(int sd, FAR struct sockaddr *addr,
 
   if ((hdr->flags2 & DNS_FLAG2_ERR_MASK) != 0)
     {
-      ndbg("ERROR: DNS reported error: flags2=%02x\n", hdr->flags2);
+      nerr("ERROR: DNS reported error: flags2=%02x\n", hdr->flags2);
       return -EPROTO;
     }
 
@@ -290,7 +290,7 @@ static int dns_recv_response(int sd, FAR struct sockaddr *addr,
 
     for (; ; )
       {
-        ndbg("%02X %02X %02X %02X %02X %02X %02X %02X \n",
+        nerr("%02X %02X %02X %02X %02X %02X %02X %02X \n",
              nameptr[0], nameptr[1], nameptr[2], nameptr[3],
              nameptr[4], nameptr[5], nameptr[6], nameptr[7]);
 
@@ -450,7 +450,7 @@ static int dns_query_callback(FAR void *arg, FAR struct sockaddr *addr,
                * namserver address in resolv.conf.
                */
 
-              ndbg("ERROR: Invalid IPv4 address size: %d\n", addrlen);
+              nerr("ERROR: Invalid IPv4 address size: %d\n", addrlen);
               query->result = -EINVAL;
               return 0;
             }
@@ -466,7 +466,7 @@ static int dns_query_callback(FAR void *arg, FAR struct sockaddr *addr,
                * namserver address in resolv.conf.
                */
 
-              ndbg("ERROR: IPv4 dns_send_query failed: %d\n", ret);
+              nerr("ERROR: IPv4 dns_send_query failed: %d\n", ret);
               query->result = ret;
               return 0;
             }
@@ -492,7 +492,7 @@ static int dns_query_callback(FAR void *arg, FAR struct sockaddr *addr,
 
           /* Handle errors */
 
-          ndbg("ERROR: IPv4 dns_recv_response failed: %d\n", ret);
+          nerr("ERROR: IPv4 dns_recv_response failed: %d\n", ret);
 
           if (ret != -EADDRNOTAVAIL)
             {
@@ -531,7 +531,7 @@ static int dns_query_callback(FAR void *arg, FAR struct sockaddr *addr,
                * namserver address in resolv.conf.
                */
 
-              ndbg("ERROR: Invalid IPv6 address size: %d\n", addrlen);
+              nerr("ERROR: Invalid IPv6 address size: %d\n", addrlen);
               query->result = -EINVAL;
               return 0;
             }
@@ -547,7 +547,7 @@ static int dns_query_callback(FAR void *arg, FAR struct sockaddr *addr,
                * namserver address in resolv.conf.
                */
 
-              ndbg("ERROR: IPv6 dns_send_query failed: %d\n", ret);
+              nerr("ERROR: IPv6 dns_send_query failed: %d\n", ret);
               query->result = ret;
               return 0;
             }
@@ -573,7 +573,7 @@ static int dns_query_callback(FAR void *arg, FAR struct sockaddr *addr,
 
           /* Handle errors */
 
-          ndbg("ERROR: IPv6 dns_recv_response failed: %d\n", ret);
+          nerr("ERROR: IPv6 dns_recv_response failed: %d\n", ret);
 
           if (ret != -EADDRNOTAVAIL)
             {
diff --git a/libc/netdb/lib_gethostbyaddrr.c b/libc/netdb/lib_gethostbyaddrr.c
index 78439b1911..53e91fda34 100644
--- a/libc/netdb/lib_gethostbyaddrr.c
+++ b/libc/netdb/lib_gethostbyaddrr.c
@@ -265,7 +265,7 @@ int lib_hostfile_lookup(FAR const void *addr, socklen_t len, int type,
     {
       int errcode = errno;
 
-      ndbg("ERROR:  Failed to open the hosts file %s: %d\n",
+      nerr("ERROR:  Failed to open the hosts file %s: %d\n",
            CONFIG_NETDB_HOSTCONF_PATH, errcode);
       UNUSED(errcode);
 
diff --git a/libc/netdb/lib_gethostbynamer.c b/libc/netdb/lib_gethostbynamer.c
index f6cf659596..b655211651 100644
--- a/libc/netdb/lib_gethostbynamer.c
+++ b/libc/netdb/lib_gethostbynamer.c
@@ -583,7 +583,7 @@ static int lib_hostfile_lookup(FAR const char *name, FAR struct hostent *host,
     {
       int errcode = errno;
 
-      ndbg("ERROR:  Failed to open the hosts file %s: %d\n",
+      nerr("ERROR:  Failed to open the hosts file %s: %d\n",
            CONFIG_NETDB_HOSTCONF_PATH, errcode);
       UNUSED(errcode);
 
diff --git a/libc/pthread/pthread_attrdestroy.c b/libc/pthread/pthread_attrdestroy.c
index 04223f0e04..beb505242c 100644
--- a/libc/pthread/pthread_attrdestroy.c
+++ b/libc/pthread/pthread_attrdestroy.c
@@ -69,7 +69,7 @@ int pthread_attr_destroy(FAR pthread_attr_t *attr)
 {
   int ret;
 
-  sdbg("attr=0x%p\n", attr);
+  serr("attr=0x%p\n", attr);
 
   if (!attr)
     {
@@ -81,7 +81,7 @@ int pthread_attr_destroy(FAR pthread_attr_t *attr)
       ret = OK;
     }
 
-  sdbg("Returning %d\n", ret);
+  serr("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/libc/pthread/pthread_attrgetaffinity.c b/libc/pthread/pthread_attrgetaffinity.c
index c13ee71d0b..5588c51342 100644
--- a/libc/pthread/pthread_attrgetaffinity.c
+++ b/libc/pthread/pthread_attrgetaffinity.c
@@ -66,7 +66,7 @@
 int pthread_attr_getaffinity_np(FAR const pthread_attr_t *attr,
                                 size_t cpusetsize, cpu_set_t *cpuset)
 {
-  sdbg("attr=0x%p cpusetsize=%d cpuset=0x%p\n", attr, (int)cpusetsize, cpuset);
+  serr("attr=0x%p cpusetsize=%d cpuset=0x%p\n", attr, (int)cpusetsize, cpuset);
 
   DEBUGASSERT(attr != NULL && cpusetsize == sizeof(cpu_set_t) && cpuset != NULL);
 
diff --git a/libc/pthread/pthread_attrgetinheritsched.c b/libc/pthread/pthread_attrgetinheritsched.c
index c4c2838dae..3a52eaee1f 100644
--- a/libc/pthread/pthread_attrgetinheritsched.c
+++ b/libc/pthread/pthread_attrgetinheritsched.c
@@ -72,7 +72,7 @@ int pthread_attr_getinheritsched(FAR const pthread_attr_t *attr,
 {
   int ret;
 
-  sdbg("attr=0x%p inheritsched=0x%p\n", attr, inheritsched);
+  serr("attr=0x%p inheritsched=0x%p\n", attr, inheritsched);
 
   if (!attr || !inheritsched)
     {
@@ -84,7 +84,7 @@ int pthread_attr_getinheritsched(FAR const pthread_attr_t *attr,
       ret = OK;
     }
 
-  sdbg("Returning %d\n", ret);
+  serr("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/libc/pthread/pthread_attrgetschedparam.c b/libc/pthread/pthread_attrgetschedparam.c
index ddf67a1d66..fb84828f1a 100644
--- a/libc/pthread/pthread_attrgetschedparam.c
+++ b/libc/pthread/pthread_attrgetschedparam.c
@@ -70,7 +70,7 @@ int pthread_attr_getschedparam(FAR const pthread_attr_t *attr,
 {
   int ret;
 
-  sdbg("attr=0x%p param=0x%p\n", attr, param);
+  serr("attr=0x%p param=0x%p\n", attr, param);
 
   if (!attr || !param)
     {
@@ -90,6 +90,6 @@ int pthread_attr_getschedparam(FAR const pthread_attr_t *attr,
       ret = OK;
     }
 
-  sdbg("Returning %d\n", ret);
+  serr("Returning %d\n", ret);
   return ret;
 }
diff --git a/libc/pthread/pthread_attrgetschedpolicy.c b/libc/pthread/pthread_attrgetschedpolicy.c
index 52a48a9504..821c0bffc8 100644
--- a/libc/pthread/pthread_attrgetschedpolicy.c
+++ b/libc/pthread/pthread_attrgetschedpolicy.c
@@ -68,7 +68,7 @@ int pthread_attr_getschedpolicy(FAR const pthread_attr_t *attr, int *policy)
 {
   int ret;
 
-  sdbg("attr=0x%p policy=0x%p\n", attr, policy);
+  serr("attr=0x%p policy=0x%p\n", attr, policy);
 
   if (!attr || !policy)
     {
@@ -80,6 +80,6 @@ int pthread_attr_getschedpolicy(FAR const pthread_attr_t *attr, int *policy)
       ret = OK;
     }
 
-  sdbg("Returning %d\n", ret);
+  serr("Returning %d\n", ret);
   return ret;
 }
diff --git a/libc/pthread/pthread_attrgetstacksize.c b/libc/pthread/pthread_attrgetstacksize.c
index ea95ec7328..3a8df45b89 100644
--- a/libc/pthread/pthread_attrgetstacksize.c
+++ b/libc/pthread/pthread_attrgetstacksize.c
@@ -67,7 +67,7 @@ int pthread_attr_getstacksize(FAR const pthread_attr_t *attr, FAR long *stacksiz
 {
   int ret;
 
-  sdbg("attr=0x%p stacksize=0x%p\n", attr, stacksize);
+  serr("attr=0x%p stacksize=0x%p\n", attr, stacksize);
 
   if (!stacksize)
     {
@@ -79,7 +79,7 @@ int pthread_attr_getstacksize(FAR const pthread_attr_t *attr, FAR long *stacksiz
       ret = OK;
     }
 
-  sdbg("Returning %d\n", ret);
+  serr("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/libc/pthread/pthread_attrinit.c b/libc/pthread/pthread_attrinit.c
index e073fcd89f..18d3fa09b0 100644
--- a/libc/pthread/pthread_attrinit.c
+++ b/libc/pthread/pthread_attrinit.c
@@ -87,7 +87,7 @@ int pthread_attr_init(FAR pthread_attr_t *attr)
 {
   int ret = OK;
 
-  sdbg("attr=0x%p\n", attr);
+  serr("attr=0x%p\n", attr);
   if (!attr)
     {
       ret = ENOMEM;
@@ -102,7 +102,7 @@ int pthread_attr_init(FAR pthread_attr_t *attr)
       memcpy(attr, &g_default_pthread_attr, sizeof(pthread_attr_t));
     }
 
-  sdbg("Returning %d\n", ret);
+  serr("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/libc/pthread/pthread_attrsetaffinity.c b/libc/pthread/pthread_attrsetaffinity.c
index 0222dfdd7d..6a526cd46e 100644
--- a/libc/pthread/pthread_attrsetaffinity.c
+++ b/libc/pthread/pthread_attrsetaffinity.c
@@ -68,7 +68,7 @@ int pthread_attr_setaffinity_np(FAR pthread_attr_t *attr,
                                 size_t cpusetsize,
                                 FAR const cpu_set_t *cpuset)
 {
-  sdbg("attr=0x%p cpusetsize=%d cpuset=0x%p\n", attr, (int)cpusetsize, cpuset);
+  serr("attr=0x%p cpusetsize=%d cpuset=0x%p\n", attr, (int)cpusetsize, cpuset);
 
   DEBUGASSERT(attr != NULL && cpusetsize == sizeof(cpu_set_t) &&
               cpuset != NULL && *cpuset != 0);
diff --git a/libc/pthread/pthread_attrsetinheritsched.c b/libc/pthread/pthread_attrsetinheritsched.c
index 07506773ad..a3ee237410 100644
--- a/libc/pthread/pthread_attrsetinheritsched.c
+++ b/libc/pthread/pthread_attrsetinheritsched.c
@@ -73,7 +73,7 @@ int pthread_attr_setinheritsched(FAR pthread_attr_t *attr,
 {
   int ret;
 
-  sdbg("inheritsched=%d\n", inheritsched);
+  serr("inheritsched=%d\n", inheritsched);
 
   if (!attr ||
       (inheritsched != PTHREAD_INHERIT_SCHED &&
@@ -87,7 +87,7 @@ int pthread_attr_setinheritsched(FAR pthread_attr_t *attr,
       ret = OK;
     }
 
-  sdbg("Returning %d\n", ret);
+  serr("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/libc/pthread/pthread_attrsetschedparam.c b/libc/pthread/pthread_attrsetschedparam.c
index 70fcd11272..12af4c8ca8 100644
--- a/libc/pthread/pthread_attrsetschedparam.c
+++ b/libc/pthread/pthread_attrsetschedparam.c
@@ -70,7 +70,7 @@ int pthread_attr_setschedparam(FAR pthread_attr_t *attr,
 {
   int ret;
 
-  sdbg("attr=0x%p param=0x%p\n", attr, param);
+  serr("attr=0x%p param=0x%p\n", attr, param);
 
   if (!attr || !param)
     {
@@ -90,6 +90,6 @@ int pthread_attr_setschedparam(FAR pthread_attr_t *attr,
       ret = OK;
     }
 
-  sdbg("Returning %d\n", ret);
+  serr("Returning %d\n", ret);
   return ret;
 }
diff --git a/libc/pthread/pthread_attrsetschedpolicy.c b/libc/pthread/pthread_attrsetschedpolicy.c
index 76e774e250..932954edfb 100644
--- a/libc/pthread/pthread_attrsetschedpolicy.c
+++ b/libc/pthread/pthread_attrsetschedpolicy.c
@@ -70,7 +70,7 @@ int pthread_attr_setschedpolicy(FAR pthread_attr_t *attr, int policy)
 {
   int ret;
 
-  sdbg("attr=0x%p policy=%d\n", attr, policy);
+  serr("attr=0x%p policy=%d\n", attr, policy);
 
   if (!attr ||
       (policy != SCHED_FIFO
@@ -90,6 +90,6 @@ int pthread_attr_setschedpolicy(FAR pthread_attr_t *attr, int policy)
       ret = OK;
     }
 
-  sdbg("Returning %d\n", ret);
+  serr("Returning %d\n", ret);
   return ret;
 }
diff --git a/libc/pthread/pthread_attrsetstacksize.c b/libc/pthread/pthread_attrsetstacksize.c
index 97769acd25..41bec38f19 100644
--- a/libc/pthread/pthread_attrsetstacksize.c
+++ b/libc/pthread/pthread_attrsetstacksize.c
@@ -68,7 +68,7 @@ int pthread_attr_setstacksize(FAR pthread_attr_t *attr, long stacksize)
 {
   int ret;
 
-  sdbg("attr=0x%p stacksize=%ld\n", attr, stacksize);
+  serr("attr=0x%p stacksize=%ld\n", attr, stacksize);
 
   if (!attr || stacksize < PTHREAD_STACK_MIN)
     {
@@ -80,7 +80,7 @@ int pthread_attr_setstacksize(FAR pthread_attr_t *attr, long stacksize)
       ret = OK;
     }
 
-  sdbg("Returning %d\n", ret);
+  serr("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/libc/pthread/pthread_condattrdestroy.c b/libc/pthread/pthread_condattrdestroy.c
index 5e25a7d421..92af75db74 100644
--- a/libc/pthread/pthread_condattrdestroy.c
+++ b/libc/pthread/pthread_condattrdestroy.c
@@ -67,14 +67,14 @@ int pthread_condattr_destroy(FAR pthread_condattr_t *attr)
 {
   int ret = OK;
 
-  sdbg("attr=0x%p\n", attr);
+  serr("attr=0x%p\n", attr);
 
   if (!attr)
     {
       ret = EINVAL;
     }
 
-  sdbg("Returning %d\n", ret);
+  serr("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/libc/pthread/pthread_condattrinit.c b/libc/pthread/pthread_condattrinit.c
index 220d972e10..ac6889dc01 100644
--- a/libc/pthread/pthread_condattrinit.c
+++ b/libc/pthread/pthread_condattrinit.c
@@ -67,7 +67,7 @@ int pthread_condattr_init(FAR pthread_condattr_t *attr)
 {
   int ret = OK;
 
-  sdbg("attr=0x%p\n", attr);
+  serr("attr=0x%p\n", attr);
 
   if (!attr)
     {
@@ -78,7 +78,7 @@ int pthread_condattr_init(FAR pthread_condattr_t *attr)
       *attr = 0;
     }
 
-  sdbg("Returning %d\n", ret);
+  serr("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/libc/pthread/pthread_mutexattrdestroy.c b/libc/pthread/pthread_mutexattrdestroy.c
index 60b50718c1..3b0aaba28a 100644
--- a/libc/pthread/pthread_mutexattrdestroy.c
+++ b/libc/pthread/pthread_mutexattrdestroy.c
@@ -68,7 +68,7 @@ int pthread_mutexattr_destroy(FAR pthread_mutexattr_t *attr)
 {
   int ret = OK;
 
-  sdbg("attr=0x%p\n", attr);
+  serr("attr=0x%p\n", attr);
 
   if (!attr)
     {
@@ -79,6 +79,6 @@ int pthread_mutexattr_destroy(FAR pthread_mutexattr_t *attr)
       attr->pshared = 0;
     }
 
-  sdbg("Returning %d\n", ret);
+  serr("Returning %d\n", ret);
   return ret;
 }
diff --git a/libc/pthread/pthread_mutexattrgetpshared.c b/libc/pthread/pthread_mutexattrgetpshared.c
index 586a1b203e..a7f8ce6d8f 100644
--- a/libc/pthread/pthread_mutexattrgetpshared.c
+++ b/libc/pthread/pthread_mutexattrgetpshared.c
@@ -68,7 +68,7 @@ int pthread_mutexattr_getpshared(FAR const pthread_mutexattr_t *attr, FAR int *p
 {
   int ret = OK;
 
-  sdbg("attr=0x%p pshared=0x%p\n", attr, pshared);
+  serr("attr=0x%p pshared=0x%p\n", attr, pshared);
 
   if (!attr || !pshared)
     {
@@ -79,6 +79,6 @@ int pthread_mutexattr_getpshared(FAR const pthread_mutexattr_t *attr, FAR int *p
       *pshared = attr->pshared;
     }
 
-  sdbg("Returning %d\n", ret);
+  serr("Returning %d\n", ret);
   return ret;
 }
diff --git a/libc/pthread/pthread_mutexattrinit.c b/libc/pthread/pthread_mutexattrinit.c
index b12b8a2994..620736e2c6 100644
--- a/libc/pthread/pthread_mutexattrinit.c
+++ b/libc/pthread/pthread_mutexattrinit.c
@@ -67,7 +67,7 @@ int pthread_mutexattr_init(FAR pthread_mutexattr_t *attr)
 {
   int ret = OK;
 
-  sdbg("attr=0x%p\n", attr);
+  serr("attr=0x%p\n", attr);
 
   if (!attr)
     {
@@ -81,6 +81,6 @@ int pthread_mutexattr_init(FAR pthread_mutexattr_t *attr)
 #endif
     }
 
-  sdbg("Returning %d\n", ret);
+  serr("Returning %d\n", ret);
   return ret;
 }
diff --git a/libc/pthread/pthread_mutexattrsetpshared.c b/libc/pthread/pthread_mutexattrsetpshared.c
index 82f20092bd..ebcc3c7e3c 100644
--- a/libc/pthread/pthread_mutexattrsetpshared.c
+++ b/libc/pthread/pthread_mutexattrsetpshared.c
@@ -68,7 +68,7 @@ int pthread_mutexattr_setpshared(FAR pthread_mutexattr_t *attr, int pshared)
 {
   int ret = OK;
 
-  sdbg("attr=0x%p pshared=%d\n", attr, pshared);
+  serr("attr=0x%p pshared=%d\n", attr, pshared);
 
   if (!attr || (pshared != 0 && pshared != 1))
     {
@@ -79,6 +79,6 @@ int pthread_mutexattr_setpshared(FAR pthread_mutexattr_t *attr, int pshared)
       attr->pshared = pshared;
     }
 
-  sdbg("Returning %d\n", ret);
+  serr("Returning %d\n", ret);
   return ret;
 }
diff --git a/libc/spawn/lib_psa_dump.c b/libc/spawn/lib_psa_dump.c
index 0afd087dee..f7af91e35b 100644
--- a/libc/spawn/lib_psa_dump.c
+++ b/libc/spawn/lib_psa_dump.c
@@ -64,63 +64,63 @@
 
 void posix_spawnattr_dump(posix_spawnattr_t *attr)
 {
-  dbg("attr[%p]:\n", attr);
-  dbg("  flags:    %04x\n", attr->flags);
+  err("attr[%p]:\n", attr);
+  err("  flags:    %04x\n", attr->flags);
   if (attr->flags == 0)
     {
-      dbg("            None\n");
+      err("            None\n");
     }
   else
     {
       if ((attr->flags & POSIX_SPAWN_RESETIDS) != 0)
         {
-          dbg("            POSIX_SPAWN_RESETIDS\n");
+          err("            POSIX_SPAWN_RESETIDS\n");
         }
 
       if ((attr->flags & POSIX_SPAWN_SETPGROUP) != 0)
         {
-          dbg("            POSIX_SPAWN_SETPGROUP\n");
+          err("            POSIX_SPAWN_SETPGROUP\n");
         }
 
       if ((attr->flags & POSIX_SPAWN_SETSCHEDPARAM) != 0)
         {
-          dbg("            POSIX_SPAWN_SETSCHEDPARAM\n");
+          err("            POSIX_SPAWN_SETSCHEDPARAM\n");
         }
 
       if ((attr->flags & POSIX_SPAWN_SETSCHEDULER) != 0)
         {
-          dbg("            POSIX_SPAWN_SETSCHEDULER\n");
+          err("            POSIX_SPAWN_SETSCHEDULER\n");
         }
 
       if ((attr->flags & POSIX_SPAWN_SETSIGDEF) != 0)
         {
-          dbg("            POSIX_SPAWN_SETSIGDEF\n");
+          err("            POSIX_SPAWN_SETSIGDEF\n");
         }
 
       if ((attr->flags & POSIX_SPAWN_SETSIGMASK) != 0)
         {
-          dbg("            POSIX_SPAWN_SETSIGMASK\n");
+          err("            POSIX_SPAWN_SETSIGMASK\n");
         }
     }
 
-  dbg("  priority: %d\n", attr->priority);
+  err("  priority: %d\n", attr->priority);
 
-  dbg("  policy:   %d\n", attr->policy);
+  err("  policy:   %d\n", attr->policy);
   if (attr->policy == SCHED_FIFO)
     {
-      dbg("            SCHED_FIFO\n");
+      err("            SCHED_FIFO\n");
     }
   else if (attr->policy == SCHED_RR)
     {
-      dbg("            SCHED_RR\n");
+      err("            SCHED_RR\n");
     }
   else
     {
-      dbg("            Unrecognized\n");
+      err("            Unrecognized\n");
     }
 
 #ifndef CONFIG_DISABLE_SIGNALS
-  dbg("  sigmask:  %08x\n", attr->sigmask);
+  err("  sigmask:  %08x\n", attr->sigmask);
 #endif
 }
 
diff --git a/libc/spawn/lib_psfa_dump.c b/libc/spawn/lib_psfa_dump.c
index fe6fd0c276..a335fe6b4c 100644
--- a/libc/spawn/lib_psfa_dump.c
+++ b/libc/spawn/lib_psfa_dump.c
@@ -75,10 +75,10 @@ void posix_spawn_file_actions_dump(FAR posix_spawn_file_actions_t *file_actions)
 
   DEBUGASSERT(file_actions);
 
-  dbg("File Actions[%p->%p]:\n", file_actions, *file_actions);
+  err("File Actions[%p->%p]:\n", file_actions, *file_actions);
   if (!*file_actions)
     {
-      dbg("  NONE\n");
+      err("  NONE\n");
       return;
     }
 
@@ -95,7 +95,7 @@ void posix_spawn_file_actions_dump(FAR posix_spawn_file_actions_t *file_actions)
             FAR struct spawn_close_file_action_s *action =
               (FAR struct spawn_close_file_action_s *)entry;
 
-            dbg("  CLOSE: fd=%d\n", action->fd);
+            err("  CLOSE: fd=%d\n", action->fd);
           }
           break;
 
@@ -104,7 +104,7 @@ void posix_spawn_file_actions_dump(FAR posix_spawn_file_actions_t *file_actions)
             FAR struct spawn_dup2_file_action_s *action =
               (FAR struct spawn_dup2_file_action_s *)entry;
 
-            dbg("  DUP2: %d->%d\n", action->fd1, action->fd2);
+            err("  DUP2: %d->%d\n", action->fd1, action->fd2);
           }
           break;
 
@@ -113,14 +113,14 @@ void posix_spawn_file_actions_dump(FAR posix_spawn_file_actions_t *file_actions)
             FAR struct spawn_open_file_action_s *action =
               (FAR struct spawn_open_file_action_s *)entry;
 
-            dbg("  OPEN: path=%s oflags=%04x mode=%04x fd=%d\n",
+            err("  OPEN: path=%s oflags=%04x mode=%04x fd=%d\n",
                 action->path, action->oflags, action->mode, action->fd);
           }
           break;
 
         case SPAWN_FILE_ACTION_NONE:
         default:
-          dbg("  ERROR: Unknown action: %d\n", entry->action);
+          err("  ERROR: Unknown action: %d\n", entry->action);
           break;
         }
     }
diff --git a/libc/stdio/lib_dtoa.c b/libc/stdio/lib_dtoa.c
index e3452126d8..480165ed06 100644
--- a/libc/stdio/lib_dtoa.c
+++ b/libc/stdio/lib_dtoa.c
@@ -559,12 +559,12 @@ static int cmp(Bigint * a, Bigint * b)
 #ifdef CONFIG_DEBUG_LIB
   if (i > 1 && !a->x[i - 1])
    {
-    ldbg("cmp called with a->x[a->wds-1] == 0\n");
+    lerr("cmp called with a->x[a->wds-1] == 0\n");
    }
 
   if (j > 1 && !b->x[j - 1])
    {
-    ldbg("cmp called with b->x[b->wds-1] == 0\n");
+    lerr("cmp called with b->x[b->wds-1] == 0\n");
    }
 #endif
 
@@ -722,7 +722,7 @@ static Bigint *d2b(double d, int *e, int *bits)
 #ifdef CONFIG_DEBUG_LIB
       if (!z)
         {
-          ldbg("Zero passed to d2b\n");
+          lerr("Zero passed to d2b\n");
         }
 #endif
       k = lo0bits(&z);
@@ -763,7 +763,7 @@ static Bigint *d2b(double d, int *e, int *bits)
 #ifdef CONFIG_DEBUG_LIB
       if (!z)
         {
-          ldbg("Zero passed to d2b\n");
+          lerr("Zero passed to d2b\n");
         }
 #endif
       k = lo0bits(&z);
@@ -851,7 +851,7 @@ static int quorem(Bigint * b, Bigint * S)
 #ifdef CONFIG_DEBUG_LIB
   if (b->wds > n)
     {
-      ldbg("oversize b in quorem\n");
+      lerr("oversize b in quorem\n");
     }
 #endif
   if (b->wds < n)
@@ -867,7 +867,7 @@ static int quorem(Bigint * b, Bigint * S)
 #ifdef CONFIG_DEBUG_LIB
   if (q > 9)
    {
-     ldbg("oversized quotient in quorem\n");
+     lerr("oversized quotient in quorem\n");
    }
 #endif
 
diff --git a/libc/time/lib_gmtimer.c b/libc/time/lib_gmtimer.c
index d6b224cfcc..a3439e3c03 100644
--- a/libc/time/lib_gmtimer.c
+++ b/libc/time/lib_gmtimer.c
@@ -317,7 +317,7 @@ FAR struct tm *gmtime_r(FAR const time_t *timer, FAR struct tm *result)
   /* Get the seconds since the EPOCH */
 
   epoch = *timer;
-  sdbg("timer=%d\n", (int)epoch);
+  serr("timer=%d\n", (int)epoch);
 
   /* Convert to days, hours, minutes, and seconds since the EPOCH */
 
@@ -332,14 +332,14 @@ FAR struct tm *gmtime_r(FAR const time_t *timer, FAR struct tm *result)
 
   sec    = epoch;
 
-  sdbg("hour=%d min=%d sec=%d\n",
+  serr("hour=%d min=%d sec=%d\n",
        (int)hour, (int)min, (int)sec);
 
   /* Convert the days since the EPOCH to calendar day */
 
   clock_utc2calendar(jdn, &year, &month, &day);
 
-  sdbg("jdn=%d year=%d month=%d day=%d\n",
+  serr("jdn=%d year=%d month=%d day=%d\n",
        (int)jdn, (int)year, (int)month, (int)day);
 
   /* Then return the struct tm contents */
diff --git a/libc/time/lib_mktime.c b/libc/time/lib_mktime.c
index 5798ce5309..327e86f4c7 100644
--- a/libc/time/lib_mktime.c
+++ b/libc/time/lib_mktime.c
@@ -94,13 +94,13 @@ time_t mktime(FAR struct tm *tp)
    */
 
   jdn = clock_calendar2utc(tp->tm_year + 1900, tp->tm_mon, tp->tm_mday);
-  sdbg("jdn=%d tm_year=%d tm_mon=%d tm_mday=%d\n",
+  serr("jdn=%d tm_year=%d tm_mon=%d tm_mday=%d\n",
        (int)jdn, tp->tm_year, tp->tm_mon, tp->tm_mday);
 
   /* Return the seconds into the julian day. */
 
   ret = ((jdn * 24 + tp->tm_hour) * 60 + tp->tm_min) * 60 + tp->tm_sec;
-  sdbg("ret=%d tm_hour=%d tm_min=%d tm_sec=%d\n",
+  serr("ret=%d tm_hour=%d tm_min=%d tm_sec=%d\n",
        (int)ret, tp->tm_hour, tp->tm_min, tp->tm_sec);
 
   return ret;
diff --git a/libnx/nxfonts/nxfonts_getfont.c b/libnx/nxfonts/nxfonts_getfont.c
index c52c082281..86cdc98bfb 100644
--- a/libnx/nxfonts/nxfonts_getfont.c
+++ b/libnx/nxfonts/nxfonts_getfont.c
@@ -475,7 +475,7 @@ static inline FAR const struct nx_fontset_s *
 
       fontset = &package->font8;
 #else
-      gdbg("8-bit font support disabled: %d\n", ch);
+      gerr("8-bit font support disabled: %d\n", ch);
       return NULL;
 #endif
     }
@@ -483,7 +483,7 @@ static inline FAR const struct nx_fontset_s *
     {
       /* Someday, perhaps 16-bit fonts will go here */
 
-      gdbg("16-bit font not currently supported\n");
+      gerr("16-bit font not currently supported\n");
       return NULL;
     }
 
@@ -494,7 +494,7 @@ static inline FAR const struct nx_fontset_s *
       return fontset;
     }
 
-  gdbg("No bitmap for code %02x\n", ch);
+  gerr("No bitmap for code %02x\n", ch);
   return NULL;
 }
 
diff --git a/libnx/nxmu/nx_bitmap.c b/libnx/nxmu/nx_bitmap.c
index 8526e92f29..d59e237ef6 100644
--- a/libnx/nxmu/nx_bitmap.c
+++ b/libnx/nxmu/nx_bitmap.c
@@ -133,7 +133,7 @@ int nx_bitmap(NXWINDOW hwnd, FAR const struct nxgl_rect_s *dest,
 
   if (ret != OK)
     {
-      gdbg("sem_init failed: %d\n", errno);
+      gerr("sem_init failed: %d\n", errno);
       return ret;
     }
 
diff --git a/libnx/nxmu/nx_connect.c b/libnx/nxmu/nx_connect.c
index 540bf698f7..b5a5ab83ed 100644
--- a/libnx/nxmu/nx_connect.c
+++ b/libnx/nxmu/nx_connect.c
@@ -160,7 +160,7 @@ NXHANDLE nx_connectinstance(FAR const char *svrmqname)
 #endif
   if (conn->crdmq == (mqd_t)-1)
     {
-      gdbg("mq_open(%s) failed: %d\n", climqname, errno);
+      gerr("mq_open(%s) failed: %d\n", climqname, errno);
       goto errout_with_conn;
     }
 
@@ -173,7 +173,7 @@ NXHANDLE nx_connectinstance(FAR const char *svrmqname)
   conn->cwrmq = mq_open(svrmqname, O_WRONLY|O_CREAT, 0666, &attr);
   if (conn->cwrmq == (mqd_t)-1)
     {
-      gdbg("mq_open(%s) failed: %d\n", svrmqname, errno);
+      gerr("mq_open(%s) failed: %d\n", svrmqname, errno);
       goto errout_with_rmq;
     }
 
@@ -185,7 +185,7 @@ NXHANDLE nx_connectinstance(FAR const char *svrmqname)
   ret = nxmu_sendserver(conn, &outmsg, sizeof(struct nxsvrmsg_s));
   if (ret < 0)
     {
-      gdbg("nxmu_sendserver failed: %d\n", errno);
+      gerr("nxmu_sendserver failed: %d\n", errno);
       goto errout_with_wmq;
     }
 
@@ -201,7 +201,7 @@ NXHANDLE nx_connectinstance(FAR const char *svrmqname)
       ret = nx_eventhandler((NXHANDLE)conn);
       if (ret < 0)
         {
-          gdbg("nx_message failed: %d\n", errno);
+          gerr("nx_message failed: %d\n", errno);
           goto errout_with_wmq;
         }
       usleep(300000);
diff --git a/libnx/nxmu/nx_disconnect.c b/libnx/nxmu/nx_disconnect.c
index 323e414af7..50571f38ac 100644
--- a/libnx/nxmu/nx_disconnect.c
+++ b/libnx/nxmu/nx_disconnect.c
@@ -102,6 +102,6 @@ void nx_disconnect(NXHANDLE handle)
   ret = nxmu_sendserver(conn, &outmsg, sizeof(struct nxsvrmsg_s));
   if (ret < 0)
     {
-      gdbg("ERROR: nxmu_sendserver() returned %d\n", ret);
+      gerr("ERROR: nxmu_sendserver() returned %d\n", ret);
     }
 }
diff --git a/libnx/nxmu/nx_eventhandler.c b/libnx/nxmu/nx_eventhandler.c
index d67860b2fa..da32903e25 100644
--- a/libnx/nxmu/nx_eventhandler.c
+++ b/libnx/nxmu/nx_eventhandler.c
@@ -164,7 +164,7 @@ int nx_eventhandler(NXHANDLE handle)
                 }
               else
                 {
-                  gdbg("mq_receive failed: %d\n", errno);
+                  gerr("mq_receive failed: %d\n", errno);
                   return ERROR;
                 }
             }
@@ -254,7 +254,7 @@ int nx_eventhandler(NXHANDLE handle)
       break;
 
     default:
-      gdbg("Unrecognized message opcode: %d\n", ((FAR struct nxsvrmsg_s *)buffer)->msgid);
+      gerr("Unrecognized message opcode: %d\n", ((FAR struct nxsvrmsg_s *)buffer)->msgid);
       break;
     }
 
diff --git a/libnx/nxmu/nx_getrectangle.c b/libnx/nxmu/nx_getrectangle.c
index 737831e9a4..9fd53d9fcf 100644
--- a/libnx/nxmu/nx_getrectangle.c
+++ b/libnx/nxmu/nx_getrectangle.c
@@ -127,7 +127,7 @@ int nx_getrectangle(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
 
   if (ret != OK)
     {
-      gdbg("sem_init failed: %d\n", errno);
+      gerr("sem_init failed: %d\n", errno);
       return ret;
     }
 
diff --git a/libnx/nxmu/nx_redrawreq.c b/libnx/nxmu/nx_redrawreq.c
index ed0e639096..cc771119f9 100644
--- a/libnx/nxmu/nx_redrawreq.c
+++ b/libnx/nxmu/nx_redrawreq.c
@@ -106,6 +106,6 @@ void nx_redrawreq(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect)
   ret = nxmu_sendwindow(wnd, &outmsg, sizeof(struct nxsvrmsg_redrawreq_s));
   if (ret < 0)
     {
-      gdbg("ERROR: nxmu_sendwindow failed: %d\n", errno);
+      gerr("ERROR: nxmu_sendwindow failed: %d\n", errno);
     }
 }
diff --git a/libnx/nxmu/nxmu_sendserver.c b/libnx/nxmu/nxmu_sendserver.c
index 0b93809a66..6400cf07bb 100644
--- a/libnx/nxmu/nxmu_sendserver.c
+++ b/libnx/nxmu/nxmu_sendserver.c
@@ -105,7 +105,7 @@ int nxmu_sendserver(FAR struct nxfe_conn_s *conn, FAR const void *msg,
   ret = mq_send(conn->cwrmq, msg, msglen, NX_SVRMSG_PRIO);
   if (ret < 0)
     {
-      gdbg("mq_send failed: %d\n", errno);
+      gerr("mq_send failed: %d\n", errno);
     }
 
   return ret;
diff --git a/libxx/libxx_new.cxx b/libxx/libxx_new.cxx
index 290933883c..953da41fd0 100644
--- a/libxx/libxx_new.cxx
+++ b/libxx/libxx_new.cxx
@@ -93,7 +93,7 @@ void *operator new(unsigned int nbytes)
       // Oh my.. we are required to return a valid pointer and
       // we cannot throw an exception!  We are bad.
 
-      dbg("Failed to allocate\n");
+      err("Failed to allocate\n");
     }
 #endif
 
diff --git a/libxx/libxx_newa.cxx b/libxx/libxx_newa.cxx
index 7b909dad42..cc8d9a1869 100644
--- a/libxx/libxx_newa.cxx
+++ b/libxx/libxx_newa.cxx
@@ -93,7 +93,7 @@ void *operator new[](unsigned int nbytes)
       // Oh my.. we are required to return a valid pointer and
       // we cannot throw an exception!  We are bad.
 
-      dbg("Failed to allocate\n");
+      err("Failed to allocate\n");
     }
 #endif
 
diff --git a/libxx/libxx_stdthrow.cxx b/libxx/libxx_stdthrow.cxx
index 79f20093a4..12eae86485 100644
--- a/libxx/libxx_stdthrow.cxx
+++ b/libxx/libxx_stdthrow.cxx
@@ -56,25 +56,25 @@ namespace std
 {
   void __throw_out_of_range(const char*)
   {
-    dbg("C++: Vector .at() with argument out of range\n");
+    err("C++: Vector .at() with argument out of range\n");
     abort();
    }
 
   void __throw_length_error(const char*)
   {
-    dbg("C++: Vector resize to excessive length\n");
+    err("C++: Vector resize to excessive length\n");
     abort();
   }
 
   void __throw_bad_alloc()
   {
-    dbg("C++: Bad allocation\n");
+    err("C++: Bad allocation\n");
     abort();
   }
 
   void __throw_bad_function_call()
   {
-    dbg("C++: Bad function call\n");
+    err("C++: Bad function call\n");
     abort();
   }
 }
diff --git a/mm/mm_gran/mm_gran.h b/mm/mm_gran/mm_gran.h
index 2d1e8a4159..4685788611 100644
--- a/mm/mm_gran/mm_gran.h
+++ b/mm/mm_gran/mm_gran.h
@@ -63,18 +63,18 @@
 
 #ifdef CONFIG_CPP_HAVE_VARARGS
 #  ifdef CONFIG_DEBUG_GRAM
-#    define grandbg(format, ...)       dbg(format, ##__VA_ARGS__)
+#    define granerr(format, ...)       err(format, ##__VA_ARGS__)
 #    define graninfo(format, ...)      info(format, ##__VA_ARGS__)
 #  else
-#    define grandbg(format, ...)       mdbg(format, ##__VA_ARGS__)
+#    define granerr(format, ...)       merr(format, ##__VA_ARGS__)
 #    define graninfo(format, ...)      minfo(format, ##__VA_ARGS__)
 #  endif
 #else
 #  ifdef CONFIG_DEBUG_GRAM
-#    define grandbg                    dbg
+#    define granerr                    err
 #    define graninfo                   info
 #  else
-#    define grandbg                    (void)
+#    define granerr                    (void)
 #    define graninfo                   (void)
 #  endif
 #endif
diff --git a/mm/mm_gran/mm_pgalloc.c b/mm/mm_gran/mm_pgalloc.c
index 72d0531199..64e1a0ede8 100644
--- a/mm/mm_gran/mm_pgalloc.c
+++ b/mm/mm_gran/mm_pgalloc.c
@@ -66,18 +66,18 @@
 
 #ifdef CONFIG_CPP_HAVE_VARARGS
 #  ifdef CONFIG_DEBUG_PGALLOC
-#    define pgadbg(format, ...)       dbg(format, ##__VA_ARGS__)
+#    define pgaerr(format, ...)       err(format, ##__VA_ARGS__)
 #    define pgainfo(format, ...)      info(format, ##__VA_ARGS__)
 #  else
-#    define pgadbg(format, ...)       mdbg(format, ##__VA_ARGS__)
+#    define pgaerr(format, ...)       merr(format, ##__VA_ARGS__)
 #    define pgainfo(format, ...)      minfo(format, ##__VA_ARGS__)
 #  endif
 #else
 #  ifdef CONFIG_DEBUG_PGALLOC
-#    define pgadbg                    dbg
+#    define pgaerr                    err
 #    define pgainfo                   info
 #  else
-#    define pgadbg                    (void)
+#    define pgaerr                    (void)
 #    define pgainfo                   (void)
 #  endif
 #endif
diff --git a/mm/mm_heap/mm_malloc.c b/mm/mm_heap/mm_malloc.c
index 2594ebcda2..84457eef77 100644
--- a/mm/mm_heap/mm_malloc.c
+++ b/mm/mm_heap/mm_malloc.c
@@ -186,7 +186,7 @@ FAR void *mm_malloc(FAR struct mm_heap_s *heap, size_t size)
 #ifdef CONFIG_DEBUG_MM
   if (!ret)
     {
-      mdbg("Allocation failed, size %d\n", size);
+      merr("Allocation failed, size %d\n", size);
     }
   else
     {
diff --git a/mm/mm_heap/mm_sem.c b/mm/mm_heap/mm_sem.c
index 0cbe1b4e61..d0b6775854 100644
--- a/mm/mm_heap/mm_sem.c
+++ b/mm/mm_heap/mm_sem.c
@@ -53,17 +53,17 @@
 //#define MONITOR_MM_SEMAPHORE 1
 
 #ifdef MONITOR_MM_SEMAPHORE
-#  ifdef CONFIG_DEBUG_FEATURES
+#  ifdef CONFIG_DEBUG_ERRORS
 #    include 
-#    define msemdbg dbg
+#    define msemerr err
 #  else
-#    define msemdbg printf
+#    define msemerr printf
 #  endif
 #else
 #  ifdef CONFIG_CPP_HAVE_VARARGS
-#    define msemdbg(x...)
+#    define msemerr(x...)
 #  else
-#    define msemdbg (void)
+#    define msemerr (void)
 #  endif
 #endif
 
@@ -157,7 +157,7 @@ void mm_takesemaphore(FAR struct mm_heap_s *heap)
     {
       /* Take the semaphore (perhaps waiting) */
 
-      msemdbg("PID=%d taking\n", my_pid);
+      msemerr("PID=%d taking\n", my_pid);
       while (sem_wait(&heap->mm_semaphore) != 0)
         {
           /* The only case that an error should occur here is if
@@ -173,7 +173,7 @@ void mm_takesemaphore(FAR struct mm_heap_s *heap)
       heap->mm_counts_held = 1;
     }
 
-  msemdbg("Holder=%d count=%d\n", heap->mm_holder, heap->mm_counts_held);
+  msemerr("Holder=%d count=%d\n", heap->mm_holder, heap->mm_counts_held);
 }
 
 /****************************************************************************
@@ -186,7 +186,7 @@ void mm_takesemaphore(FAR struct mm_heap_s *heap)
 
 void mm_givesemaphore(FAR struct mm_heap_s *heap)
 {
-#ifdef CONFIG_DEBUG_FEATURES
+#if defined(CONFIG_DEBUG_ASSERTIONS) || defined(CONFIG_DEBUG_ERRORS)
   pid_t my_pid = getpid();
 #endif
 
@@ -201,15 +201,13 @@ void mm_givesemaphore(FAR struct mm_heap_s *heap)
       /* Yes, just release one count and return */
 
       heap->mm_counts_held--;
-      msemdbg("Holder=%d count=%d\n", heap->mm_holder, heap->mm_counts_held);
+      msemerr("Holder=%d count=%d\n", heap->mm_holder, heap->mm_counts_held);
     }
   else
     {
       /* Nope, this is the last reference I have */
 
-#ifdef CONFIG_DEBUG_FEATURES
-      msemdbg("PID=%d giving\n", my_pid);
-#endif
+      msemerr("PID=%d giving\n", my_pid);
 
       heap->mm_holder      = -1;
       heap->mm_counts_held = 0;
diff --git a/mm/shm/shm_initialize.c b/mm/shm/shm_initialize.c
index a25bc8fd19..38c82f2b93 100644
--- a/mm/shm/shm_initialize.c
+++ b/mm/shm/shm_initialize.c
@@ -127,7 +127,7 @@ int shm_group_initialize(FAR struct task_group_s *group)
 
   if (!group->tg_shm.gs_handle)
     {
-      shmdbg("gran_initialize() failed\n");
+      shmerr("gran_initialize() failed\n");
       return -ENOMEM;
     }
 
diff --git a/mm/shm/shmat.c b/mm/shm/shmat.c
index b3658a38fa..bec7c5e87a 100644
--- a/mm/shm/shmat.c
+++ b/mm/shm/shmat.c
@@ -136,7 +136,7 @@ FAR void *shmat(int shmid, FAR const void *shmaddr, int shmflg)
   ret = sem_wait(®ion->sr_sem);
   if (ret < 0)
     {
-      shmdbg("sem_wait failed: %d\n", ret);
+      shmerr("sem_wait failed: %d\n", ret);
       goto errout;
     }
 
@@ -146,7 +146,7 @@ FAR void *shmat(int shmid, FAR const void *shmaddr, int shmflg)
                                 region->sr_ds.shm_segsz);
   if (vaddr == 0)
     {
-      shmdbg("gran_alloc() failed\n");
+      shmerr("gran_alloc() failed\n");
       ret = -ENOMEM;
       goto errout_with_semaphore;
     }
@@ -160,7 +160,7 @@ FAR void *shmat(int shmid, FAR const void *shmaddr, int shmflg)
   ret = up_shmat(region->sr_pages, npages, vaddr);
   if (ret < 0)
     {
-      shmdbg("up_shmat() failed\n");
+      shmerr("up_shmat() failed\n");
       goto errout_with_vaddr;
     }
 
diff --git a/mm/shm/shmctl.c b/mm/shm/shmctl.c
index 6ba3a33f1a..e5eea7abcc 100644
--- a/mm/shm/shmctl.c
+++ b/mm/shm/shmctl.c
@@ -134,7 +134,7 @@ int shmctl(int shmid, int cmd, struct shmid_ds *buf)
   ret = sem_wait(®ion->sr_sem);
   if (ret < 0)
     {
-      shmdbg("sem_wait failed: %d\n", ret);
+      shmerr("sem_wait failed: %d\n", ret);
       return ret;
     }
 
@@ -190,7 +190,7 @@ int shmctl(int shmid, int cmd, struct shmid_ds *buf)
         break;
 
       default:
-        shmdbg("Unrecognized command: %d\n", cmd);
+        shmerr("Unrecognized command: %d\n", cmd);
         ret = -EINVAL;
         goto errout_with_semaphore;
     }
diff --git a/mm/shm/shmdt.c b/mm/shm/shmdt.c
index 201e944b65..2014674ed2 100644
--- a/mm/shm/shmdt.c
+++ b/mm/shm/shmdt.c
@@ -106,7 +106,7 @@ int shmdt(FAR const void *shmaddr)
 
   if (shmid >= CONFIG_ARCH_SHM_MAXREGIONS)
     {
-      shmdbg("No region matching this virtual address: %p\n", shmaddr);
+      shmerr("No region matching this virtual address: %p\n", shmaddr);
       ret = -EINVAL;
       goto errout_with_errno;
     }
@@ -121,7 +121,7 @@ int shmdt(FAR const void *shmaddr)
   ret = sem_wait(®ion->sr_sem);
   if (ret < 0)
     {
-      shmdbg("sem_wait failed: %d\n", ret);
+      shmerr("sem_wait failed: %d\n", ret);
       goto errout;
     }
 
@@ -141,7 +141,7 @@ int shmdt(FAR const void *shmaddr)
   ret = up_shmdt((uintptr_t)shmaddr, npages);
   if (ret < 0)
     {
-      shmdbg("up_shmdt() failed\n");
+      shmerr("up_shmdt() failed\n");
     }
 
   /* Indicate that there is no longer any mapping for this region. */
diff --git a/mm/shm/shmget.c b/mm/shm/shmget.c
index e3f0208460..10d5e3ed2b 100644
--- a/mm/shm/shmget.c
+++ b/mm/shm/shmget.c
@@ -188,7 +188,7 @@ static int shm_extend(int shmid, size_t size)
       region->sr_pages[pgalloc] = mm_pgalloc(1);
       if (region->sr_pages[pgalloc] == 0)
         {
-          shmdbg("mm_pgalloc(1) failed\n");
+          shmerr("mm_pgalloc(1) failed\n");
           break;
         }
 
@@ -249,7 +249,7 @@ static int shm_create(key_t key, size_t size, int shmflg)
   ret = shm_reserve(key, shmflg);
   if (ret < 0)
     {
-      shmdbg("shm_reserve failed: %d\n", ret);
+      shmerr("shm_reserve failed: %d\n", ret);
       return ret;
     }
 
@@ -400,7 +400,7 @@ int shmget(key_t key, size_t size, int shmflg)
               ret = shm_create(key, size, shmflg);
               if (ret < 0)
                 {
-                  shmdbg("shm_create failed: %d\n", ret);
+                  shmerr("shm_create failed: %d\n", ret);
                   goto errout_with_semaphore;
                 }
 
@@ -443,7 +443,7 @@ int shmget(key_t key, size_t size, int shmflg)
                   ret = shm_extend(shmid, size);
                   if (ret < 0)
                     {
-                      shmdbg("shm_create failed: %d\n", ret);
+                      shmerr("shm_create failed: %d\n", ret);
                       goto errout_with_semaphore;
                     }
                 }
diff --git a/net/arp/arp_send.c b/net/arp/arp_send.c
index 1807ed1ee0..7fd6e78f09 100644
--- a/net/arp/arp_send.c
+++ b/net/arp/arp_send.c
@@ -230,7 +230,7 @@ int arp_send(in_addr_t ipaddr)
 #endif
   if (!dev)
     {
-      ndbg("ERROR: Unreachable: %08lx\n", (unsigned long)ipaddr);
+      nerr("ERROR: Unreachable: %08lx\n", (unsigned long)ipaddr);
       ret = -EHOSTUNREACH;
       goto errout;
     }
@@ -285,7 +285,7 @@ int arp_send(in_addr_t ipaddr)
   state.snd_cb = arp_callback_alloc(dev);
   if (!state.snd_cb)
     {
-      ndbg("ERROR: Failed to allocate a callback\n");
+      nerr("ERROR: Failed to allocate a callback\n");
       ret = -ENOMEM;
       goto errout_with_lock;
     }
@@ -368,7 +368,7 @@ int arp_send(in_addr_t ipaddr)
         {
           /* Break out on a send failure */
 
-          ndbg("ERROR: Send failed: %d\n", ret);
+          nerr("ERROR: Send failed: %d\n", ret);
           break;
         }
 
@@ -396,7 +396,7 @@ int arp_send(in_addr_t ipaddr)
       /* Increment the retry count */
 
       state.snd_retries++;
-      ndbg("ERROR: arp_wait failed: %d\n", ret);
+      nerr("ERROR: arp_wait failed: %d\n", ret);
     }
 
   sem_destroy(&state.snd_sem);
diff --git a/net/icmp/icmp_ping.c b/net/icmp/icmp_ping.c
index b674ce440d..075e6aae0d 100644
--- a/net/icmp/icmp_ping.c
+++ b/net/icmp/icmp_ping.c
@@ -347,7 +347,7 @@ int icmp_ping(in_addr_t addr, uint16_t id, uint16_t seqno, uint16_t datalen,
 #endif
   if (dev == 0)
     {
-      ndbg("ERROR: Not reachable\n");
+      nerr("ERROR: Not reachable\n");
       return -ENETUNREACH;
     }
 
@@ -357,7 +357,7 @@ int icmp_ping(in_addr_t addr, uint16_t id, uint16_t seqno, uint16_t datalen,
   ret = arp_send(addr);
   if (ret < 0)
     {
-      ndbg("ERROR: Not reachable\n");
+      nerr("ERROR: Not reachable\n");
       return -ENETUNREACH;
     }
 #endif
diff --git a/net/icmpv6/icmpv6_autoconfig.c b/net/icmpv6/icmpv6_autoconfig.c
index 3465931658..26650bbae4 100644
--- a/net/icmpv6/icmpv6_autoconfig.c
+++ b/net/icmpv6/icmpv6_autoconfig.c
@@ -225,7 +225,7 @@ static int icmpv6_send_message(FAR struct net_driver_s *dev, bool advertise)
   state.snd_cb = icmpv6_callback_alloc(dev);
   if (!state.snd_cb)
     {
-      ndbg("ERROR: Failed to allocate a cllback\n");
+      nerr("ERROR: Failed to allocate a cllback\n");
       ret = -ENOMEM;
       goto errout_with_semaphore;
     }
@@ -341,7 +341,7 @@ int icmpv6_autoconfig(FAR struct net_driver_s *dev)
 #ifndef CONFIG_NET_ETHERNET
   /* Only Ethernet supported for now */
 
-  ndbg("ERROR: Only Ethernet is supported\n");
+  nerr("ERROR: Only Ethernet is supported\n");
   return -ENOSYS;
 
 #else /* CONFIG_NET_ETHERNET */
@@ -361,7 +361,7 @@ int icmpv6_autoconfig(FAR struct net_driver_s *dev)
 
   if (dev->d_lltype != NET_LL_ETHERNET)
     {
-      ndbg("ERROR: Only Ethernet is supported\n");
+      nerr("ERROR: Only Ethernet is supported\n");
       return -ENOSYS;
     }
 #endif
@@ -439,7 +439,7 @@ int icmpv6_autoconfig(FAR struct net_driver_s *dev)
        * have not back-up plan in place.  Just bail.
        */
 
-      ndbg("ERROR: IP conflict\n");
+      nerr("ERROR: IP conflict\n");
       return -EEXIST;
     }
 #endif
@@ -477,7 +477,7 @@ int icmpv6_autoconfig(FAR struct net_driver_s *dev)
       ret = icmpv6_send_message(dev, false);
       if (ret < 0)
         {
-          ndbg("ERROR: Failed send router solicitation: %d\n", ret);
+          nerr("ERROR: Failed send router solicitation: %d\n", ret);
           break;
         }
 
@@ -502,7 +502,7 @@ int icmpv6_autoconfig(FAR struct net_driver_s *dev)
 
   if (ret < 0)
     {
-      ndbg("ERROR: Failed to get the router advertisement: %d (retries=%d)\n",
+      nerr("ERROR: Failed to get the router advertisement: %d (retries=%d)\n",
            ret, retries);
 
       /* Claim the link local address as ours by sending the ICMPv6 Neighbor
@@ -512,7 +512,7 @@ int icmpv6_autoconfig(FAR struct net_driver_s *dev)
       ret = icmpv6_send_message(dev, true);
       if (ret < 0)
         {
-          ndbg("ERROR: Failed send neighbor advertisement: %d\n", ret);
+          nerr("ERROR: Failed send neighbor advertisement: %d\n", ret);
           netdev_ifdown(dev);
         }
 
diff --git a/net/icmpv6/icmpv6_neighbor.c b/net/icmpv6/icmpv6_neighbor.c
index 95723eb858..0f0dd9076a 100644
--- a/net/icmpv6/icmpv6_neighbor.c
+++ b/net/icmpv6/icmpv6_neighbor.c
@@ -232,7 +232,7 @@ int icmpv6_neighbor(const net_ipv6addr_t ipaddr)
 #endif
   if (!dev)
     {
-      ndbg("ERROR: Unreachable: %08lx\n", (unsigned long)ipaddr);
+      nerr("ERROR: Unreachable: %08lx\n", (unsigned long)ipaddr);
       ret = -EHOSTUNREACH;
       goto errout;
     }
@@ -298,7 +298,7 @@ int icmpv6_neighbor(const net_ipv6addr_t ipaddr)
   state.snd_cb = icmpv6_callback_alloc(dev);
   if (!state.snd_cb)
     {
-      ndbg("ERROR: Failed to allocate a cllback\n");
+      nerr("ERROR: Failed to allocate a cllback\n");
       ret = -ENOMEM;
       goto errout_with_lock;
     }
diff --git a/net/icmpv6/icmpv6_ping.c b/net/icmpv6/icmpv6_ping.c
index 9a959a0177..da5b1701b9 100644
--- a/net/icmpv6/icmpv6_ping.c
+++ b/net/icmpv6/icmpv6_ping.c
@@ -417,7 +417,7 @@ int icmpv6_ping(net_ipv6addr_t addr, uint16_t id, uint16_t seqno,
   ret = icmpv6_neighbor(addr);
   if (ret < 0)
     {
-      ndbg("ERROR: Not reachable\n");
+      nerr("ERROR: Not reachable\n");
       return -ENETUNREACH;
     }
 #endif /* CONFIG_NET_ICMPv6_NEIGHBOR */
@@ -431,7 +431,7 @@ int icmpv6_ping(net_ipv6addr_t addr, uint16_t id, uint16_t seqno,
 #endif
   if (dev == 0)
     {
-      ndbg("ERROR: Not reachable\n");
+      nerr("ERROR: Not reachable\n");
       return -ENETUNREACH;
     }
 
diff --git a/net/igmp/igmp_group.c b/net/igmp/igmp_group.c
index 9a1af28807..b8e673ccea 100644
--- a/net/igmp/igmp_group.c
+++ b/net/igmp/igmp_group.c
@@ -88,24 +88,24 @@
 
 #ifdef CONFIG_CPP_HAVE_VARARGS
 #  ifdef IGMP_GRPDEBUG
-#    define grpdbg(format, ...)    ndbg(format, ##__VA_ARGS__)
+#    define grperr(format, ...)    nerr(format, ##__VA_ARGS__)
 #    define grpllerr(format, ...)  nllerr(format, ##__VA_ARGS__)
 #    define grpinfo(format, ...)   ninfo(format, ##__VA_ARGS__)
 #    define grpllinfo(format, ...) nllinfo(format, ##__VA_ARGS__)
 #  else
-#    define grpdbg(x...)
+#    define grperr(x...)
 #    define grpllerr(x...)
 #    define grpinfo(x...)
 #    define grpllinfo(x...)
 #  endif
 #else
 #  ifdef IGMP_GRPDEBUG
-#    define grpdbg    ndbg
+#    define grperr    nerr
 #    define grpllerr  nllerr
 #    define grpinfo   ninfo
 #    define grpllinfo nllinfo
 #  else
-#    define grpdbg    (void)
+#    define grperr    (void)
 #    define grpllerr  (void)
 #    define grpinfo   (void)
 #    define grpllinfo (void)
diff --git a/net/igmp/igmp_leave.c b/net/igmp/igmp_leave.c
index 5e0019b3a2..eb970ae127 100644
--- a/net/igmp/igmp_leave.c
+++ b/net/igmp/igmp_leave.c
@@ -134,7 +134,7 @@ int igmp_leavegroup(struct net_driver_s *dev, FAR const struct in_addr *grpaddr)
   /* Find the entry corresponding to the address leaving the group */
 
   group = igmp_grpfind(dev, &grpaddr->s_addr);
-  ndbg("Leaving group: %p\n", group);
+  nerr("Leaving group: %p\n", group);
   if (group)
     {
       /* Cancel the timer and discard any queued Membership Reports.  Canceling
@@ -155,7 +155,7 @@ int igmp_leavegroup(struct net_driver_s *dev, FAR const struct in_addr *grpaddr)
 
       if (IS_LASTREPORT(group->flags))
         {
-          ndbg("Schedule Leave Group message\n");
+          nerr("Schedule Leave Group message\n");
           IGMP_STATINCR(g_netstats.igmp.leave_sched);
           igmp_waitmsg(group, IGMP_LEAVE_GROUP);
         }
diff --git a/net/igmp/igmp_timer.c b/net/igmp/igmp_timer.c
index 78dd618601..bd26598991 100644
--- a/net/igmp/igmp_timer.c
+++ b/net/igmp/igmp_timer.c
@@ -73,24 +73,24 @@
 
 #ifdef CONFIG_CPP_HAVE_VARARGS
 #  ifdef IGMP_GTMRDEBUG
-#    define gtmrdbg(format, ...)    ndbg(format, ##__VA_ARGS__)
+#    define gtmrerr(format, ...)    nerr(format, ##__VA_ARGS__)
 #    define gtmrllerr(format, ...)  nllerr(format, ##__VA_ARGS__)
 #    define gtmrinfo(format, ...)   ninfo(format, ##__VA_ARGS__)
 #    define gtmrllinfo(format, ...) nllinfo(format, ##__VA_ARGS__)
 #  else
-#    define gtmrdbg(x...)
+#    define gtmrerr(x...)
 #    define gtmrllerr(x...)
 #    define gtmrinfo(x...)
 #    define gtmrllinfo(x...)
 #  endif
 #else
 #  ifdef IGMP_GTMRDEBUG
-#    define gtmrdbg    ndbg
+#    define gtmrerr    nerr
 #    define gtmrllerr  nllerr
 #    define gtmrinfo   ninfo
 #    define gtmrllinfo nllinfo
 #  else
-#    define gtmrdbg    (void)
+#    define gtmrerr    (void)
 #    define gtmrllerr  (void)
 #    define gtmrinfo   (void)
 #    define gtmrllinfo (void)
@@ -184,7 +184,7 @@ void igmp_starttimer(FAR struct igmp_group_s *group, uint8_t decisecs)
    * Important!! this should be a random timer from 0 to decisecs
    */
 
-  gtmrdbg("decisecs: %d\n", decisecs);
+  gtmrerr("decisecs: %d\n", decisecs);
   igmp_startticks(group, net_dsec2tick(decisecs));
 }
 
@@ -224,7 +224,7 @@ bool igmp_cmptimer(FAR struct igmp_group_s *group, int maxticks)
    * test as well.
    */
 
-  gtmrdbg("maxticks: %d remaining: %d\n", maxticks, remaining);
+  gtmrerr("maxticks: %d remaining: %d\n", maxticks, remaining);
   if (maxticks > remaining)
     {
       /* Cancel the watchdog timer and return true */
diff --git a/net/iob/iob_add_queue.c b/net/iob/iob_add_queue.c
index c6df88ef0a..16c615d0e8 100644
--- a/net/iob/iob_add_queue.c
+++ b/net/iob/iob_add_queue.c
@@ -125,7 +125,7 @@ int iob_add_queue(FAR struct iob_s *iob, FAR struct iob_queue_s *iobq)
   qentry = iob_alloc_qentry();
   if (!qentry)
     {
-      ndbg("ERROR: Failed to allocate a container\n");
+      nerr("ERROR: Failed to allocate a container\n");
       return -ENOMEM;
     }
 
diff --git a/net/iob/iob_clone.c b/net/iob/iob_clone.c
index 73ccd81893..a0a5bd5c50 100644
--- a/net/iob/iob_clone.c
+++ b/net/iob/iob_clone.c
@@ -168,7 +168,7 @@ int iob_clone(FAR struct iob_s *iob1, FAR struct iob_s *iob2, bool throttled)
           next = iob_alloc(throttled);
           if (!next)
             {
-              ndbg("Failed to allocate an I/O buffer/n");
+              nerr("Failed to allocate an I/O buffer/n");
               return -ENOMEM;
             }
 
diff --git a/net/iob/iob_contig.c b/net/iob/iob_contig.c
index 8817d7de61..c7b948f25e 100644
--- a/net/iob/iob_contig.c
+++ b/net/iob/iob_contig.c
@@ -161,7 +161,7 @@ int iob_contig(FAR struct iob_s *iob, unsigned int len)
 
   else
     {
-      ndbg("ERROR: pktlen=%u < requested len=%u\n", iob->io_pktlen, len);
+      nerr("ERROR: pktlen=%u < requested len=%u\n", iob->io_pktlen, len);
       return -ENOSPC;
     }
 }
diff --git a/net/iob/iob_copyin.c b/net/iob/iob_copyin.c
index 4c2205cd7e..53c9379e3b 100644
--- a/net/iob/iob_copyin.c
+++ b/net/iob/iob_copyin.c
@@ -104,7 +104,7 @@ static int iob_copyin_internal(FAR struct iob_s *iob, FAR const uint8_t *src,
 
   if (offset > iob->io_pktlen)
     {
-      ndbg("ERROR: offset is past the end of data: %u > %u\n",
+      nerr("ERROR: offset is past the end of data: %u > %u\n",
            offset, iob->io_pktlen);
       return -ESPIPE;
     }
@@ -220,7 +220,7 @@ static int iob_copyin_internal(FAR struct iob_s *iob, FAR const uint8_t *src,
 
           if (next == NULL)
             {
-              ndbg("ERROR: Failed to allocate I/O buffer\n");
+              nerr("ERROR: Failed to allocate I/O buffer\n");
               return len;
             }
 
diff --git a/net/iob/iob_dump.c b/net/iob/iob_dump.c
index 78fd87a72c..d8dab7b684 100644
--- a/net/iob/iob_dump.c
+++ b/net/iob/iob_dump.c
@@ -83,7 +83,7 @@ void iob_dump(FAR const char *msg, FAR struct iob_s *iob, unsigned int len,
 
   if (offset > head->io_pktlen)
     {
-      ndbg("ERROR: offset is past the end of data: %u > %u\n",
+      nerr("ERROR: offset is past the end of data: %u > %u\n",
            offset, head->io_pktlen);
       return;
     }
diff --git a/net/local/local_accept.c b/net/local/local_accept.c
index d26fc74813..e148e3e60f 100644
--- a/net/local/local_accept.c
+++ b/net/local/local_accept.c
@@ -156,7 +156,7 @@ int psock_local_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
           conn = local_alloc();
           if (!conn)
             {
-              ndbg("ERROR:  Failed to allocate new connection structure\n");
+              nerr("ERROR:  Failed to allocate new connection structure\n");
               ret = -ENOMEM;
             }
           else
@@ -180,7 +180,7 @@ int psock_local_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
                                          _SS_ISNONBLOCK(psock->s_flags));
               if (ret < 0)
                 {
-                   ndbg("ERROR: Failed to open write-only FIFOs for %s: %d\n",
+                   nerr("ERROR: Failed to open write-only FIFOs for %s: %d\n",
                         conn->lc_path, ret);
                 }
             }
@@ -200,7 +200,7 @@ int psock_local_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
                                          _SS_ISNONBLOCK(psock->s_flags));
               if (ret < 0)
                 {
-                   ndbg("ERROR: Failed to open read-only FIFOs for %s: %d\n",
+                   nerr("ERROR: Failed to open read-only FIFOs for %s: %d\n",
                         conn->lc_path, ret);
                 }
             }
diff --git a/net/local/local_connect.c b/net/local/local_connect.c
index 1eab722083..b336b370b3 100644
--- a/net/local/local_connect.c
+++ b/net/local/local_connect.c
@@ -136,9 +136,9 @@ int inline local_stream_connect(FAR struct local_conn_s *client,
       server->u.server.lc_pending >= server->u.server.lc_backlog)
     {
       net_unlock(state);
-      ndbg("ERROR: Server is not listening: lc_state=%d\n",
+      nerr("ERROR: Server is not listening: lc_state=%d\n",
            server->lc_state);
-      ndbg("   OR: The backlog limit was reached: %d or %d\n",
+      nerr("   OR: The backlog limit was reached: %d or %d\n",
            server->u.server.lc_pending, server->u.server.lc_backlog);
       return -ECONNREFUSED;
     }
@@ -153,7 +153,7 @@ int inline local_stream_connect(FAR struct local_conn_s *client,
   ret = local_create_fifos(client);
   if (ret < 0)
     {
-      ndbg("ERROR: Failed to create FIFOs for %s: %d\n",
+      nerr("ERROR: Failed to create FIFOs for %s: %d\n",
            client->lc_path, ret);
 
       net_unlock(state);
@@ -167,7 +167,7 @@ int inline local_stream_connect(FAR struct local_conn_s *client,
   ret = local_open_client_tx(client, nonblock);
   if (ret < 0)
     {
-      ndbg("ERROR: Failed to open write-only FIFOs for %s: %d\n",
+      nerr("ERROR: Failed to open write-only FIFOs for %s: %d\n",
            client->lc_path, ret);
 
       net_unlock(state);
@@ -198,7 +198,7 @@ int inline local_stream_connect(FAR struct local_conn_s *client,
 
   if (ret < 0)
     {
-      ndbg("ERROR: Failed to connect: %d\n", ret);
+      nerr("ERROR: Failed to connect: %d\n", ret);
       goto errout_with_outfd;
     }
 
@@ -207,7 +207,7 @@ int inline local_stream_connect(FAR struct local_conn_s *client,
   ret = local_open_client_rx(client, nonblock);
   if (ret < 0)
     {
-      ndbg("ERROR: Failed to open write-only FIFOs for %s: %d\n",
+      nerr("ERROR: Failed to open write-only FIFOs for %s: %d\n",
            client->lc_path, ret);
       goto errout_with_outfd;
     }
diff --git a/net/local/local_fifo.c b/net/local/local_fifo.c
index 569aa92a01..ff53d40024 100644
--- a/net/local/local_fifo.c
+++ b/net/local/local_fifo.c
@@ -189,7 +189,7 @@ static int local_create_fifo(FAR const char *path)
           int errcode = get_errno();
           DEBUGASSERT(errcode > 0);
 
-          ndbg("ERROR: Failed to create FIFO %s: %d\n", path, errcode);
+          nerr("ERROR: Failed to create FIFO %s: %d\n", path, errcode);
           return -errcode;
         }
     }
@@ -230,7 +230,7 @@ static int local_release_fifo(FAR const char *path)
           int errcode = get_errno();
           DEBUGASSERT(errcode > 0);
 
-          ndbg("ERROR: Failed to unlink FIFO %s: %d\n", path, errcode);
+          nerr("ERROR: Failed to unlink FIFO %s: %d\n", path, errcode);
           return -errcode;
         }
     }
@@ -260,7 +260,7 @@ static int local_rx_open(FAR struct local_conn_s *conn, FAR const char *path,
       int errcode = get_errno();
       DEBUGASSERT(errcode > 0);
 
-      ndbg("ERROR: Failed on open %s for reading: %d\n",
+      nerr("ERROR: Failed on open %s for reading: %d\n",
            path, errcode);
 
       /* Map the errcode to something consistent with the return
@@ -296,7 +296,7 @@ static int local_tx_open(FAR struct local_conn_s *conn, FAR const char *path,
       int errcode = get_errno();
       DEBUGASSERT(errcode > 0);
 
-      ndbg("ERROR: Failed on open %s for writing: %d\n",
+      nerr("ERROR: Failed on open %s for writing: %d\n",
            path, errcode);
 
       /* Map the errcode to something consistent with the return
@@ -336,7 +336,7 @@ static int local_set_policy(int fd, unsigned long policy)
       int errcode = get_errno();
       DEBUGASSERT(errcode > 0);
 
-      ndbg("ERROR: Failed to set FIFO buffer policty: %d\n", errcode);
+      nerr("ERROR: Failed to set FIFO buffer policty: %d\n", errcode);
       return -errcode;
     }
 
diff --git a/net/local/local_netpoll.c b/net/local/local_netpoll.c
index 01ebe0884a..03ef0bc6d6 100644
--- a/net/local/local_netpoll.c
+++ b/net/local/local_netpoll.c
@@ -152,7 +152,7 @@ void local_accept_pollnotify(FAR struct local_conn_s *conn,
           fds->revents |= (fds->events & eventset);
           if (fds->revents != 0)
             {
-              ndbg("Report events: %02x\n", fds->revents);
+              nerr("Report events: %02x\n", fds->revents);
               sem_post(fds->sem);
             }
         }
diff --git a/net/local/local_recvfrom.c b/net/local/local_recvfrom.c
index bf5dc45c16..8585468f61 100644
--- a/net/local/local_recvfrom.c
+++ b/net/local/local_recvfrom.c
@@ -88,7 +88,7 @@ static int psock_fifo_read(FAR struct socket *psock, FAR void *buf,
 
       if (ret == -ECONNRESET)
         {
-          ndbg("ERROR: Lost connection: %d\n", ret);
+          nerr("ERROR: Lost connection: %d\n", ret);
 
           /* Report an ungraceful loss of connection.  This should
            * eventually be reported as ENOTCONN.
@@ -111,7 +111,7 @@ static int psock_fifo_read(FAR struct socket *psock, FAR void *buf,
         }
       else
         {
-          ndbg("ERROR: Failed to read packet: %d\n", ret);
+          nerr("ERROR: Failed to read packet: %d\n", ret);
           return ret;
         }
     }
@@ -155,7 +155,7 @@ psock_stream_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len,
 
   if (conn->lc_state != LOCAL_STATE_CONNECTED)
     {
-      ndbg("ERROR: not connected\n");
+      nerr("ERROR: not connected\n");
       return -ENOTCONN;
     }
 
@@ -174,12 +174,12 @@ psock_stream_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len,
       ret = local_sync(conn->lc_infd);
       if (ret < 0)
         {
-          ndbg("ERROR: Failed to get packet length: %d\n", ret);
+          nerr("ERROR: Failed to get packet length: %d\n", ret);
           return ret;
         }
       else if (ret > UINT16_MAX)
         {
-          ndbg("ERROR: Packet is too big: %d\n", ret);
+          nerr("ERROR: Packet is too big: %d\n", ret);
           return -E2BIG;
         }
 
@@ -259,7 +259,7 @@ psock_dgram_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len,
     {
       /* Either not bound to address or it is connected */
 
-      ndbg("ERROR: Connected or not bound\n");
+      nerr("ERROR: Connected or not bound\n");
       return -EISCONN;
     }
 
@@ -272,7 +272,7 @@ psock_dgram_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len,
   ret = local_create_halfduplex(conn, conn->lc_path);
   if (ret < 0)
     {
-      ndbg("ERROR: Failed to create FIFO for %s: %d\n",
+      nerr("ERROR: Failed to create FIFO for %s: %d\n",
            conn->lc_path, ret);
       return ret;
     }
@@ -282,7 +282,7 @@ psock_dgram_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len,
   ret = local_open_receiver(conn, _SS_ISNONBLOCK(psock->s_flags));
   if (ret < 0)
     {
-      ndbg("ERROR: Failed to open FIFO for %s: %d\n",
+      nerr("ERROR: Failed to open FIFO for %s: %d\n",
            conn->lc_path, ret);
       goto errout_with_halfduplex;
       return ret;
@@ -295,12 +295,12 @@ psock_dgram_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len,
   ret = local_sync(conn->lc_infd);
   if (ret < 0)
     {
-      ndbg("ERROR: Failed to get packet length: %d\n", ret);
+      nerr("ERROR: Failed to get packet length: %d\n", ret);
       goto errout_with_infd;
     }
   else if (ret > UINT16_MAX)
     {
-      ndbg("ERROR: Packet is too big: %d\n", ret);
+      nerr("ERROR: Packet is too big: %d\n", ret);
       goto errout_with_infd;
     }
 
@@ -439,7 +439,7 @@ ssize_t psock_local_recvfrom(FAR struct socket *psock, FAR void *buf,
 #endif
     {
       DEBUGPANIC();
-      ndbg("ERROR: Unrecognized socket type: %s\n", psock->s_type);
+      nerr("ERROR: Unrecognized socket type: %s\n", psock->s_type);
       return -EINVAL;
     }
 }
diff --git a/net/local/local_recvutils.c b/net/local/local_recvutils.c
index 95845fe0b7..ea19aa65a6 100644
--- a/net/local/local_recvutils.c
+++ b/net/local/local_recvutils.c
@@ -93,7 +93,7 @@ int local_fifo_read(int fd, FAR uint8_t *buf, size_t *len)
 
           if (errcode != EINTR)
             {
-              ndbg("ERROR: Read failed: %d\n", errcode);
+              nerr("ERROR: Read failed: %d\n", errcode);
               ret = -errcode;
               goto errout;
             }
@@ -160,7 +160,7 @@ int local_sync(int fd)
           ret     = local_fifo_read(fd, &sync, &readlen);
           if (ret < 0)
             {
-              ndbg("ERROR: Failed to read sync bytes: %d\n", ret);
+              nerr("ERROR: Failed to read sync bytes: %d\n", ret);
               return ret;
             }
         }
@@ -174,7 +174,7 @@ int local_sync(int fd)
           ret     = local_fifo_read(fd, &sync, &readlen);
           if (ret < 0)
             {
-              ndbg("ERROR: Failed to read sync bytes: %d\n", ret);
+              nerr("ERROR: Failed to read sync bytes: %d\n", ret);
               return ret;
             }
         }
diff --git a/net/local/local_send.c b/net/local/local_send.c
index 272120138d..c8f1cd92a0 100644
--- a/net/local/local_send.c
+++ b/net/local/local_send.c
@@ -88,7 +88,7 @@ ssize_t psock_local_send(FAR struct socket *psock, FAR const void *buf,
   if (peer->lc_state != LOCAL_STATE_CONNECTED ||
       peer->lc_outfd < 0)
     {
-      ndbg("ERROR: not connected\n");
+      nerr("ERROR: not connected\n");
       return -ENOTCONN;
     }
 
diff --git a/net/local/local_sendpacket.c b/net/local/local_sendpacket.c
index 0f6942802b..fce8b4fe68 100644
--- a/net/local/local_sendpacket.c
+++ b/net/local/local_sendpacket.c
@@ -100,7 +100,7 @@ static int local_fifo_write(int fd, FAR const uint8_t *buf, size_t len)
 
           if (errcode != EINTR)
             {
-              ndbg("ERROR: Write failed: %d\n", errcode);
+              nerr("ERROR: Write failed: %d\n", errcode);
               return -errcode;
             }
 
diff --git a/net/local/local_sendto.c b/net/local/local_sendto.c
index 8142110c08..1351c67a28 100644
--- a/net/local/local_sendto.c
+++ b/net/local/local_sendto.c
@@ -106,7 +106,7 @@ ssize_t psock_local_sendto(FAR struct socket *psock, FAR const void *buf,
     {
       /* Either not bound to address or it is connected */
 
-      ndbg("ERROR: Connected state\n");
+      nerr("ERROR: Connected state\n");
       return -EISCONN;
     }
 
@@ -130,7 +130,7 @@ ssize_t psock_local_sendto(FAR struct socket *psock, FAR const void *buf,
   ret = local_create_halfduplex(conn, unaddr->sun_path);
   if (ret < 0)
     {
-      ndbg("ERROR: Failed to create FIFO for %s: %d\n",
+      nerr("ERROR: Failed to create FIFO for %s: %d\n",
            conn->lc_path, ret);
       return ret;
     }
@@ -141,7 +141,7 @@ ssize_t psock_local_sendto(FAR struct socket *psock, FAR const void *buf,
                           _SS_ISNONBLOCK(psock->s_flags));
   if (ret < 0)
     {
-      ndbg("ERROR: Failed to open FIFO for %s: %d\n",
+      nerr("ERROR: Failed to open FIFO for %s: %d\n",
            unaddr->sun_path, ret);
 
       nsent = ret;
@@ -153,7 +153,7 @@ ssize_t psock_local_sendto(FAR struct socket *psock, FAR const void *buf,
   nsent = local_send_packet(conn->lc_outfd, buf, len);
   if (nsent < 0)
     {
-      ndbg("ERROR: Failed to send the packet: %d\n", ret);
+      nerr("ERROR: Failed to send the packet: %d\n", ret);
     }
   else
     {
diff --git a/net/procfs/net_procfs.c b/net/procfs/net_procfs.c
index 3beb1a72ee..80e30a9a0d 100644
--- a/net/procfs/net_procfs.c
+++ b/net/procfs/net_procfs.c
@@ -137,7 +137,7 @@ static int netprocfs_open(FAR struct file *filep, FAR const char *relpath,
   if (((oflags & O_WRONLY) != 0 || (oflags & O_RDONLY) == 0) &&
       (net_procfsoperations.write == NULL))
     {
-      fdbg("ERROR: Only O_RDONLY supported\n");
+      ferr("ERROR: Only O_RDONLY supported\n");
       return -EACCES;
     }
 
@@ -167,7 +167,7 @@ static int netprocfs_open(FAR struct file *filep, FAR const char *relpath,
       copy = strdup(relpath);
       if (copy == NULL)
         {
-          fdbg("ERROR: strdup failed\n");
+          ferr("ERROR: strdup failed\n");
           return -ENOMEM;
         }
 
@@ -177,7 +177,7 @@ static int netprocfs_open(FAR struct file *filep, FAR const char *relpath,
 
       if (dev == NULL)
         {
-          fdbg("ERROR: relpath is '%s'\n", relpath);
+          ferr("ERROR: relpath is '%s'\n", relpath);
           return -ENOENT;
         }
     }
@@ -187,7 +187,7 @@ static int netprocfs_open(FAR struct file *filep, FAR const char *relpath,
   priv = (FAR struct netprocfs_file_s *)kmm_zalloc(sizeof(struct netprocfs_file_s));
   if (!priv)
     {
-      fdbg("ERROR: Failed to allocate file attributes\n");
+      ferr("ERROR: Failed to allocate file attributes\n");
       return -ENOMEM;
     }
 
@@ -294,7 +294,7 @@ static int netprocfs_dup(FAR const struct file *oldp, FAR struct file *newp)
   newpriv = (FAR struct netprocfs_file_s *)kmm_zalloc(sizeof(struct netprocfs_file_s));
   if (!newpriv)
     {
-      fdbg("ERROR: Failed to allocate file attributes\n");
+      ferr("ERROR: Failed to allocate file attributes\n");
       return -ENOMEM;
     }
 
@@ -334,7 +334,7 @@ static int netprocfs_opendir(FAR const char *relpath,
        * should return -ENOENT.
        */
 
-      fdbg("ERROR: Bad relpath: %s\n", relpath);
+      ferr("ERROR: Bad relpath: %s\n", relpath);
       return -ENOTDIR;
     }
 
@@ -347,7 +347,7 @@ static int netprocfs_opendir(FAR const char *relpath,
 
   if (!level1)
     {
-      fdbg("ERROR: Failed to allocate the level1 directory structure\n");
+      ferr("ERROR: Failed to allocate the level1 directory structure\n");
       return -ENOMEM;
     }
 
@@ -518,7 +518,7 @@ static int netprocfs_stat(FAR const char *relpath, FAR struct stat *buf)
       copy = strdup(relpath);
       if (copy == NULL)
         {
-          fdbg("ERROR: strdup failed\n");
+          ferr("ERROR: strdup failed\n");
           return -ENOMEM;
         }
 
@@ -528,7 +528,7 @@ static int netprocfs_stat(FAR const char *relpath, FAR struct stat *buf)
 
       if (dev == NULL)
         {
-          fdbg("ERROR: relpath is '%s'\n", relpath);
+          ferr("ERROR: relpath is '%s'\n", relpath);
           return -ENOENT;
         }
 
diff --git a/net/route/net_addroute.c b/net/route/net_addroute.c
index bf9ea3f3df..3451a1691e 100644
--- a/net/route/net_addroute.c
+++ b/net/route/net_addroute.c
@@ -81,7 +81,7 @@ int net_addroute(in_addr_t target, in_addr_t netmask, in_addr_t router)
   route = net_allocroute();
   if (!route)
     {
-      ndbg("ERROR:  Failed to allocate a route\n");
+      nerr("ERROR:  Failed to allocate a route\n");
       return -ENOMEM;
     }
 
@@ -114,7 +114,7 @@ int net_addroute_ipv6(net_ipv6addr_t target, net_ipv6addr_t netmask, net_ipv6add
   route = net_allocroute_ipv6();
   if (!route)
     {
-      ndbg("ERROR:  Failed to allocate a route\n");
+      nerr("ERROR:  Failed to allocate a route\n");
       return -ENOMEM;
     }
 
diff --git a/net/socket/bind.c b/net/socket/bind.c
index 4580b4943b..1197460ce7 100644
--- a/net/socket/bind.c
+++ b/net/socket/bind.c
@@ -196,14 +196,14 @@ int psock_bind(FAR struct socket *psock, const struct sockaddr *addr,
 #endif
 
     default:
-      ndbg("ERROR: Unrecognized address family: %d\n", addr->sa_family);
+      nerr("ERROR: Unrecognized address family: %d\n", addr->sa_family);
       errcode = EAFNOSUPPORT;
       goto errout;
     }
 
   if (addrlen < minlen)
     {
-      ndbg("ERROR: Invalid address length: %d < %d\n", addrlen, minlen);
+      nerr("ERROR: Invalid address length: %d < %d\n", addrlen, minlen);
       errcode = EBADF;
       goto errout;
     }
diff --git a/net/socket/net_clone.c b/net/socket/net_clone.c
index 5d46f45ead..c819b6ebe4 100644
--- a/net/socket/net_clone.c
+++ b/net/socket/net_clone.c
@@ -116,7 +116,7 @@ int net_clone(FAR struct socket *psock1, FAR struct socket *psock2)
   else
 #endif
     {
-      ndbg("Unsupported type: %d\n", psock2->s_type);
+      nerr("Unsupported type: %d\n", psock2->s_type);
       ret = -EBADF;
     }
 
diff --git a/net/socket/net_sendfile.c b/net/socket/net_sendfile.c
index b310943ea1..b380258c2b 100644
--- a/net/socket/net_sendfile.c
+++ b/net/socket/net_sendfile.c
@@ -610,7 +610,7 @@ ssize_t net_sendfile(int outfd, struct file *infile, off_t *offset,
 
   if (!psock || psock->s_crefs <= 0)
     {
-      ndbg("ERROR: Invalid socket\n");
+      nerr("ERROR: Invalid socket\n");
       errcode = EBADF;
       goto errout;
     }
@@ -619,7 +619,7 @@ ssize_t net_sendfile(int outfd, struct file *infile, off_t *offset,
 
   if (psock->s_type != SOCK_STREAM || !_SS_ISCONNECTED(psock->s_flags))
     {
-      ndbg("ERROR: Not connected\n");
+      nerr("ERROR: Not connected\n");
       errcode = ENOTCONN;
       goto errout;
     }
@@ -657,7 +657,7 @@ ssize_t net_sendfile(int outfd, struct file *infile, off_t *offset,
 
   if (ret < 0)
     {
-      ndbg("ERROR: Not reachable\n");
+      nerr("ERROR: Not reachable\n");
       errcode = ENETUNREACH;
       goto errout;
     }
diff --git a/net/socket/net_vfcntl.c b/net/socket/net_vfcntl.c
index a1cb386e76..977db7833a 100644
--- a/net/socket/net_vfcntl.c
+++ b/net/socket/net_vfcntl.c
@@ -216,7 +216,7 @@ int net_vfcntl(int sockfd, int cmd, va_list ap)
 #endif
 #endif /* CONFIG_NET_LOCAL || CONFIG_NET_TCP_READAHEAD || CONFIG_NET_UDP_READAHEAD */
             {
-              ndbg("ERROR: Non-blocking not supported for this socket\n");
+              nerr("ERROR: Non-blocking not supported for this socket\n");
             }
         }
         break;
diff --git a/net/socket/recvfrom.c b/net/socket/recvfrom.c
index 470296475c..7ee8c8820f 100644
--- a/net/socket/recvfrom.c
+++ b/net/socket/recvfrom.c
@@ -293,11 +293,11 @@ static inline void recvfrom_newtcpdata(FAR struct net_driver_s *dev,
 #ifdef CONFIG_DEBUG_NET
       if (nsaved < buflen)
         {
-          ndbg("ERROR: packet data not saved (%d bytes)\n", buflen - nsaved);
+          nerr("ERROR: packet data not saved (%d bytes)\n", buflen - nsaved);
         }
 #endif
 #else
-      ndbg("ERROR: packet data lost (%d bytes)\n", dev->d_len - recvlen);
+      nerr("ERROR: packet data lost (%d bytes)\n", dev->d_len - recvlen);
 #endif
    }
 
@@ -1988,7 +1988,7 @@ ssize_t psock_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len,
 
     default:
       {
-        ndbg("ERROR: Unsupported socket type: %d\n", psock->s_type);
+        nerr("ERROR: Unsupported socket type: %d\n", psock->s_type);
         ret = -ENOSYS;
       }
       break;
diff --git a/net/socket/sendto.c b/net/socket/sendto.c
index 31a33f4142..79eb93e68f 100644
--- a/net/socket/sendto.c
+++ b/net/socket/sendto.c
@@ -139,7 +139,7 @@ ssize_t psock_sendto(FAR struct socket *psock, FAR const void *buf,
 #if defined(CONFIG_NET_TCP) || defined(CONFIG_NET_LOCAL_STREAM)
       return psock_send(psock, buf, len, flags);
 #else
-      ndbg("ERROR: No 'to' address\n");
+      nerr("ERROR: No 'to' address\n");
       errcode = EINVAL;
       goto errout;
 #endif
@@ -168,14 +168,14 @@ ssize_t psock_sendto(FAR struct socket *psock, FAR const void *buf,
 #endif
 
     default:
-      ndbg("ERROR: Unrecognized address family: %d\n", to->sa_family);
+      nerr("ERROR: Unrecognized address family: %d\n", to->sa_family);
       errcode = EAFNOSUPPORT;
       goto errout;
     }
 
   if (tolen < minlen)
     {
-      ndbg("ERROR: Invalid address length: %d < %d\n", tolen, minlen);
+      nerr("ERROR: Invalid address length: %d < %d\n", tolen, minlen);
       errcode = EBADF;
       goto errout;
     }
@@ -184,7 +184,7 @@ ssize_t psock_sendto(FAR struct socket *psock, FAR const void *buf,
 
   if (!psock || psock->s_crefs <= 0)
     {
-      ndbg("ERROR: Invalid socket\n");
+      nerr("ERROR: Invalid socket\n");
       errcode = EBADF;
       goto errout;
     }
@@ -193,7 +193,7 @@ ssize_t psock_sendto(FAR struct socket *psock, FAR const void *buf,
 
   if (psock->s_type != SOCK_DGRAM)
     {
-      ndbg("ERROR: Connected socket\n");
+      nerr("ERROR: Connected socket\n");
       errcode = EISCONN;
       goto errout;
     }
@@ -225,7 +225,7 @@ ssize_t psock_sendto(FAR struct socket *psock, FAR const void *buf,
 
   if (nsent < 0)
     {
-      ndbg("ERROR: UDP or Unix domain sendto() failed: %ld\n", (long)nsent);
+      nerr("ERROR: UDP or Unix domain sendto() failed: %ld\n", (long)nsent);
       errcode = -nsent;
       goto errout;
     }
diff --git a/net/tcp/tcp_conn.c b/net/tcp/tcp_conn.c
index 57b477af90..6501a80ecf 100644
--- a/net/tcp/tcp_conn.c
+++ b/net/tcp/tcp_conn.c
@@ -532,7 +532,7 @@ static inline int tcp_ipv4_bind(FAR struct tcp_conn_s *conn,
 
   if (port < 0)
     {
-      ndbg("tcp_selectport failed: %d\n", port);
+      nerr("tcp_selectport failed: %d\n", port);
       return port;
     }
 
@@ -552,7 +552,7 @@ static inline int tcp_ipv4_bind(FAR struct tcp_conn_s *conn,
     {
       /* If no device is found, then the address is not reachable */
 
-      ndbg("tcp_local_ipv4_device failed: %d\n", ret);
+      nerr("tcp_local_ipv4_device failed: %d\n", ret);
 
       /* Back out the local address setting */
 
@@ -613,7 +613,7 @@ static inline int tcp_ipv6_bind(FAR struct tcp_conn_s *conn,
 
   if (port < 0)
     {
-      ndbg("tcp_selectport failed: %d\n", port);
+      nerr("tcp_selectport failed: %d\n", port);
       return port;
     }
 
@@ -633,7 +633,7 @@ static inline int tcp_ipv6_bind(FAR struct tcp_conn_s *conn,
     {
       /* If no device is found, then the address is not reachable */
 
-      ndbg("tcp_local_ipv6_device failed: %d\n", ret);
+      nerr("tcp_local_ipv6_device failed: %d\n", ret);
 
       /* Back out the local address setting */
 
@@ -1066,7 +1066,7 @@ FAR struct tcp_conn_s *tcp_alloc_accept(FAR struct net_driver_s *dev,
            * probably really just assert here.
            */
 
-          ndbg("Failed to find network device: %d\n", ret);
+          nerr("Failed to find network device: %d\n", ret);
           tcp_free(conn);
           return NULL;
         }
@@ -1320,7 +1320,7 @@ int tcp_connect(FAR struct tcp_conn_s *conn, FAR const struct sockaddr *addr)
        * just assert here.
        */
 
-      ndbg("Failed to find network device: %d\n", ret);
+      nerr("Failed to find network device: %d\n", ret);
       goto errout_with_lock;
     }
 
diff --git a/net/tcp/tcp_send_buffered.c b/net/tcp/tcp_send_buffered.c
index 5d1b163b8b..2ae4d36daa 100644
--- a/net/tcp/tcp_send_buffered.c
+++ b/net/tcp/tcp_send_buffered.c
@@ -941,14 +941,14 @@ ssize_t psock_tcp_send(FAR struct socket *psock, FAR const void *buf,
 
   if (!psock || psock->s_crefs <= 0)
     {
-      ndbg("ERROR: Invalid socket\n");
+      nerr("ERROR: Invalid socket\n");
       errcode = EBADF;
       goto errout;
     }
 
   if (psock->s_type != SOCK_STREAM || !_SS_ISCONNECTED(psock->s_flags))
     {
-      ndbg("ERROR: Not connected\n");
+      nerr("ERROR: Not connected\n");
       errcode = ENOTCONN;
       goto errout;
     }
@@ -985,7 +985,7 @@ ssize_t psock_tcp_send(FAR struct socket *psock, FAR const void *buf,
 
   if (ret < 0)
     {
-      ndbg("ERROR: Not reachable\n");
+      nerr("ERROR: Not reachable\n");
       errcode = ENETUNREACH;
       goto errout;
     }
@@ -1011,7 +1011,7 @@ ssize_t psock_tcp_send(FAR struct socket *psock, FAR const void *buf,
         {
           /* A buffer allocation error occurred */
 
-          ndbg("ERROR: Failed to allocate write buffer\n");
+          nerr("ERROR: Failed to allocate write buffer\n");
           errcode = ENOMEM;
           goto errout_with_lock;
         }
@@ -1029,7 +1029,7 @@ ssize_t psock_tcp_send(FAR struct socket *psock, FAR const void *buf,
         {
           /* A buffer allocation error occurred */
 
-          ndbg("ERROR: Failed to allocate callback\n");
+          nerr("ERROR: Failed to allocate callback\n");
           errcode = ENOMEM;
           goto errout_with_wrb;
         }
@@ -1136,13 +1136,13 @@ int psock_tcp_cansend(FAR struct socket *psock)
 {
   if (!psock || psock->s_crefs <= 0)
     {
-      ndbg("ERROR: Invalid socket\n");
+      nerr("ERROR: Invalid socket\n");
       return -EBADF;
     }
 
   if (psock->s_type != SOCK_STREAM || !_SS_ISCONNECTED(psock->s_flags))
     {
-      ndbg("ERROR: Not connected\n");
+      nerr("ERROR: Not connected\n");
       return -ENOTCONN;
     }
 
diff --git a/net/tcp/tcp_send_unbuffered.c b/net/tcp/tcp_send_unbuffered.c
index ea3c5c42cb..73dbd0691d 100644
--- a/net/tcp/tcp_send_unbuffered.c
+++ b/net/tcp/tcp_send_unbuffered.c
@@ -726,7 +726,7 @@ ssize_t psock_tcp_send(FAR struct socket *psock,
 
   if (!psock || psock->s_crefs <= 0)
     {
-      ndbg("ERROR: Invalid socket\n");
+      nerr("ERROR: Invalid socket\n");
       errcode = EBADF;
       goto errout;
     }
@@ -735,7 +735,7 @@ ssize_t psock_tcp_send(FAR struct socket *psock,
 
   if (psock->s_type != SOCK_STREAM || !_SS_ISCONNECTED(psock->s_flags))
     {
-      ndbg("ERROR: Not connected\n");
+      nerr("ERROR: Not connected\n");
       errcode = ENOTCONN;
       goto errout;
     }
@@ -773,7 +773,7 @@ ssize_t psock_tcp_send(FAR struct socket *psock,
 
   if (ret < 0)
     {
-      ndbg("ERROR: Not reachable\n");
+      nerr("ERROR: Not reachable\n");
       errcode = ENETUNREACH;
       goto errout;
     }
diff --git a/net/tcp/tcp_wrbuffer.c b/net/tcp/tcp_wrbuffer.c
index 1c4dd824fb..149c83143d 100644
--- a/net/tcp/tcp_wrbuffer.c
+++ b/net/tcp/tcp_wrbuffer.c
@@ -160,7 +160,7 @@ FAR struct tcp_wrbuffer_s *tcp_wrbuffer_alloc(void)
   wrb->wb_iob = iob_alloc(false);
   if (!wrb->wb_iob)
     {
-      ndbg("ERROR: Failed to allocate I/O buffer\n");
+      nerr("ERROR: Failed to allocate I/O buffer\n");
       tcp_wrbuffer_release(wrb);
       return NULL;
     }
diff --git a/net/udp/udp_psock_sendto.c b/net/udp/udp_psock_sendto.c
index 40136453e1..9486851822 100644
--- a/net/udp/udp_psock_sendto.c
+++ b/net/udp/udp_psock_sendto.c
@@ -375,7 +375,7 @@ ssize_t psock_udp_sendto(FAR struct socket *psock, FAR const void *buf,
 
   if (ret < 0)
     {
-      ndbg("ERROR: Peer not reachable\n");
+      nerr("ERROR: Peer not reachable\n");
       return -ENETUNREACH;
     }
 #endif /* CONFIG_NET_ARP_SEND || CONFIG_NET_ICMPv6_NEIGHBOR */
@@ -419,7 +419,7 @@ ssize_t psock_udp_sendto(FAR struct socket *psock, FAR const void *buf,
   ret = udp_connect(conn, to);
   if (ret < 0)
     {
-      ndbg("ERROR: udp_connect failed: %d\n", ret);
+      nerr("ERROR: udp_connect failed: %d\n", ret);
       goto errout_with_lock;
     }
 
@@ -430,7 +430,7 @@ ssize_t psock_udp_sendto(FAR struct socket *psock, FAR const void *buf,
   dev = udp_find_raddr_device(conn);
   if (dev == NULL)
     {
-      ndbg("ERROR: udp_find_raddr_device failed\n");
+      nerr("ERROR: udp_find_raddr_device failed\n");
       ret = -ENETUNREACH;
       goto errout_with_lock;
    }
diff --git a/sched/clock/clock_getres.c b/sched/clock/clock_getres.c
index aad5dec9c3..f02ea4f846 100644
--- a/sched/clock/clock_getres.c
+++ b/sched/clock/clock_getres.c
@@ -62,13 +62,13 @@ int clock_getres(clockid_t clock_id, struct timespec *res)
 {
   int      ret = OK;
 
-  sdbg("clock_id=%d\n", clock_id);
+  serr("clock_id=%d\n", clock_id);
 
   /* Only CLOCK_REALTIME is supported */
 
   if (clock_id != CLOCK_REALTIME)
     {
-      sdbg("Returning ERROR\n");
+      serr("Returning ERROR\n");
       set_errno(EINVAL);
       ret = ERROR;
     }
@@ -79,7 +79,7 @@ int clock_getres(clockid_t clock_id, struct timespec *res)
       res->tv_sec  = 0;
       res->tv_nsec = NSEC_PER_TICK;
 
-      sdbg("Returning res=(%d,%d)\n", (int)res->tv_sec, (int)res->tv_nsec);
+      serr("Returning res=(%d,%d)\n", (int)res->tv_sec, (int)res->tv_nsec);
     }
 
   return ret;
diff --git a/sched/clock/clock_gettime.c b/sched/clock/clock_gettime.c
index 50e3c6e7c1..5e90568607 100644
--- a/sched/clock/clock_gettime.c
+++ b/sched/clock/clock_gettime.c
@@ -68,7 +68,7 @@ int clock_gettime(clockid_t clock_id, struct timespec *tp)
   uint32_t carry;
   int ret = OK;
 
-  sdbg("clock_id=%d\n", clock_id);
+  serr("clock_id=%d\n", clock_id);
   DEBUGASSERT(tp != NULL);
 
 #ifdef CONFIG_CLOCK_MONOTONIC
@@ -148,14 +148,14 @@ int clock_gettime(clockid_t clock_id, struct timespec *tp)
 
   if (ret < 0)
     {
-      sdbg("Returning ERROR\n");
+      serr("Returning ERROR\n");
 
       set_errno(-ret);
       ret = ERROR;
     }
   else
     {
-      sdbg("Returning tp=(%d,%d)\n", (int)tp->tv_sec, (int)tp->tv_nsec);
+      serr("Returning tp=(%d,%d)\n", (int)tp->tv_sec, (int)tp->tv_nsec);
     }
 
   return ret;
diff --git a/sched/clock/clock_settime.c b/sched/clock/clock_settime.c
index 640e375a63..0ca5f8ef52 100644
--- a/sched/clock/clock_settime.c
+++ b/sched/clock/clock_settime.c
@@ -67,7 +67,7 @@ int clock_settime(clockid_t clock_id, FAR const struct timespec *tp)
   irqstate_t flags;
   int ret = OK;
 
-  sdbg("clock_id=%d\n", clock_id);
+  serr("clock_id=%d\n", clock_id);
   DEBUGASSERT(tp != NULL);
 
   /* CLOCK_REALTIME - POSIX demands this to be present. This is the wall
@@ -120,13 +120,13 @@ int clock_settime(clockid_t clock_id, FAR const struct timespec *tp)
 #endif
       leave_critical_section(flags);
 
-      sdbg("basetime=(%ld,%lu) bias=(%ld,%lu)\n",
+      serr("basetime=(%ld,%lu) bias=(%ld,%lu)\n",
           (long)g_basetime.tv_sec, (unsigned long)g_basetime.tv_nsec,
           (long)bias.tv_sec, (unsigned long)bias.tv_nsec);
     }
   else
     {
-      sdbg("Returning ERROR\n");
+      serr("Returning ERROR\n");
       set_errno(EINVAL);
       ret = ERROR;
     }
diff --git a/sched/group/group_addrenv.c b/sched/group/group_addrenv.c
index ddc27a4153..596de965a6 100644
--- a/sched/group/group_addrenv.c
+++ b/sched/group/group_addrenv.c
@@ -163,7 +163,7 @@ int group_addrenv(FAR struct tcb_s *tcb)
       ret = up_addrenv_select(&group->tg_addrenv, NULL);
       if (ret < 0)
         {
-          bdbg("ERROR: up_addrenv_select failed: %d\n", ret);
+          berr("ERROR: up_addrenv_select failed: %d\n", ret);
         }
 
       /* Save the new, current group */
diff --git a/sched/group/group_childstatus.c b/sched/group/group_childstatus.c
index 065697b482..1b6b5a77a6 100644
--- a/sched/group/group_childstatus.c
+++ b/sched/group/group_childstatus.c
@@ -115,10 +115,10 @@ static void group_dumpchildren(FAR struct task_group_s *group,
   FAR struct child_status_s *child;
   int i;
 
-  dbg("Task group=%p: %s\n", group, msg);
+  err("Task group=%p: %s\n", group, msg);
   for (i = 0, child = group->tg_children; child; i++, child = child->flink)
     {
-      dbg("  %d. ch_flags=%02x ch_pid=%d ch_status=%d\n",
+      err("  %d. ch_flags=%02x ch_pid=%d ch_status=%d\n",
           i, child->ch_flags, child->ch_pid, child->ch_status);
     }
 }
diff --git a/sched/group/group_join.c b/sched/group/group_join.c
index bdf2fc546d..5aecedebe7 100644
--- a/sched/group/group_join.c
+++ b/sched/group/group_join.c
@@ -110,7 +110,7 @@ static inline int group_addmember(FAR struct task_group_s *group, pid_t pid)
 
       if (!newmembers)
         {
-          sdbg("ERROR: Failed to reallocate tg_members\n");
+          serr("ERROR: Failed to reallocate tg_members\n");
           return -ENOMEM;
         }
 
diff --git a/sched/init/os_smpstart.c b/sched/init/os_smpstart.c
index da7852317c..e9cd3c11a8 100644
--- a/sched/init/os_smpstart.c
+++ b/sched/init/os_smpstart.c
@@ -133,7 +133,7 @@ int os_idle_task(int argc, FAR char *argv[])
 {
   /* Enter the IDLE loop */
 
-  sdbg("CPU%d: Beginning Idle Loop\n", this_cpu());
+  serr("CPU%d: Beginning Idle Loop\n", this_cpu());
 
   for (; ; )
     {
@@ -207,7 +207,7 @@ int os_smp_start(void)
       ret = up_cpu_idlestack(cpu, tcb, CONFIG_SMP_IDLETHREAD_STACKSIZE);
       if (ret < 0)
         {
-          sdbg("ERROR: Failed to allocate stack for CPU%d\n", cpu);
+          serr("ERROR: Failed to allocate stack for CPU%d\n", cpu);
           return ret;
         }
 
@@ -231,7 +231,7 @@ int os_smp_start(void)
       ret = up_cpu_start(cpu);
       if (ret < 0)
         {
-          sdbg("ERROR: Failed to start CPU%d: %d\n", cpu, ret);
+          serr("ERROR: Failed to start CPU%d: %d\n", cpu, ret);
           return ret;
         }
     }
diff --git a/sched/init/os_start.c b/sched/init/os_start.c
index be4a26f265..9fecc43755 100644
--- a/sched/init/os_start.c
+++ b/sched/init/os_start.c
@@ -797,7 +797,7 @@ void os_start(void)
   /* The IDLE Loop **********************************************************/
   /* When control is return to this point, the system is idle. */
 
-  sdbg("CPU0: Beginning Idle Loop\n");
+  serr("CPU0: Beginning Idle Loop\n");
   for (; ; )
     {
       /* Perform garbage collection (if it is not being done by the worker
diff --git a/sched/module/mod_bind.c b/sched/module/mod_bind.c
index 75d8e1b56a..f7fe4f4f4b 100644
--- a/sched/module/mod_bind.c
+++ b/sched/module/mod_bind.c
@@ -73,7 +73,7 @@ static inline int mod_readrel(FAR struct mod_loadinfo_s *loadinfo,
 
   if (index < 0 || index > (relsec->sh_size / sizeof(Elf32_Rel)))
     {
-      sdbg("Bad relocation symbol index: %d\n", index);
+      serr("Bad relocation symbol index: %d\n", index);
       return -EINVAL;
     }
 
@@ -125,7 +125,7 @@ static int mod_relocate(FAR struct mod_loadinfo_s *loadinfo, int relidx)
       ret = mod_readrel(loadinfo, relsec, i, &rel);
       if (ret < 0)
         {
-          sdbg("Section %d reloc %d: Failed to read relocation entry: %d\n",
+          serr("Section %d reloc %d: Failed to read relocation entry: %d\n",
                relidx, i, ret);
           return ret;
         }
@@ -141,7 +141,7 @@ static int mod_relocate(FAR struct mod_loadinfo_s *loadinfo, int relidx)
       ret = mod_readsym(loadinfo, symidx, &sym);
       if (ret < 0)
         {
-          sdbg("Section %d reloc %d: Failed to read symbol[%d]: %d\n",
+          serr("Section %d reloc %d: Failed to read symbol[%d]: %d\n",
                relidx, i, symidx, ret);
           return ret;
         }
@@ -163,13 +163,13 @@ static int mod_relocate(FAR struct mod_loadinfo_s *loadinfo, int relidx)
 
           if (ret == -ESRCH)
             {
-              sdbg("Section %d reloc %d: Undefined symbol[%d] has no name: %d\n",
+              serr("Section %d reloc %d: Undefined symbol[%d] has no name: %d\n",
                   relidx, i, symidx, ret);
               psym = NULL;
             }
           else
             {
-              sdbg("Section %d reloc %d: Failed to get value of symbol[%d]: %d\n",
+              serr("Section %d reloc %d: Failed to get value of symbol[%d]: %d\n",
                   relidx, i, symidx, ret);
               return ret;
             }
@@ -179,7 +179,7 @@ static int mod_relocate(FAR struct mod_loadinfo_s *loadinfo, int relidx)
 
       if (rel.r_offset < 0 || rel.r_offset > dstsec->sh_size - sizeof(uint32_t))
         {
-          sdbg("Section %d reloc %d: Relocation address out of range, offset %d size %d\n",
+          serr("Section %d reloc %d: Relocation address out of range, offset %d size %d\n",
                relidx, i, rel.r_offset, dstsec->sh_size);
           return -EINVAL;
         }
@@ -191,7 +191,7 @@ static int mod_relocate(FAR struct mod_loadinfo_s *loadinfo, int relidx)
       ret = up_relocate(&rel, psym, addr);
       if (ret < 0)
         {
-          sdbg("ERROR: Section %d reloc %d: Relocation failed: %d\n", relidx, i, ret);
+          serr("ERROR: Section %d reloc %d: Relocation failed: %d\n", relidx, i, ret);
           return ret;
         }
     }
@@ -201,7 +201,7 @@ static int mod_relocate(FAR struct mod_loadinfo_s *loadinfo, int relidx)
 
 static int mod_relocateadd(FAR struct mod_loadinfo_s *loadinfo, int relidx)
 {
-  sdbg("Not implemented\n");
+  serr("Not implemented\n");
   return -ENOSYS;
 }
 
@@ -242,7 +242,7 @@ int mod_bind(FAR struct mod_loadinfo_s *loadinfo)
   ret = mod_allocbuffer(loadinfo);
   if (ret < 0)
     {
-      sdbg("mod_allocbuffer failed: %d\n", ret);
+      serr("mod_allocbuffer failed: %d\n", ret);
       return -ENOMEM;
     }
 
diff --git a/sched/module/mod_init.c b/sched/module/mod_init.c
index 67a63e65dd..3d2f659b6a 100644
--- a/sched/module/mod_init.c
+++ b/sched/module/mod_init.c
@@ -102,7 +102,7 @@ static inline int mod_filelen(FAR struct mod_loadinfo_s *loadinfo,
   if (ret < 0)
     {
       int errval = errno;
-      sdbg("Failed to stat file: %d\n", errval);
+      serr("Failed to stat file: %d\n", errval);
       return -errval;
     }
 
@@ -110,7 +110,7 @@ static inline int mod_filelen(FAR struct mod_loadinfo_s *loadinfo,
 
   if (!S_ISREG(buf.st_mode))
     {
-      sdbg("Not a regular file.  mode: %d\n", buf.st_mode);
+      serr("Not a regular file.  mode: %d\n", buf.st_mode);
       return -ENOENT;
     }
 
@@ -157,7 +157,7 @@ int mod_initialize(FAR const char *filename,
   ret = mod_filelen(loadinfo, filename);
   if (ret < 0)
     {
-      sdbg("mod_filelen failed: %d\n", ret);
+      serr("mod_filelen failed: %d\n", ret);
       return ret;
     }
 
@@ -167,7 +167,7 @@ int mod_initialize(FAR const char *filename,
   if (loadinfo->filfd < 0)
     {
       int errval = errno;
-      sdbg("Failed to open ELF binary %s: %d\n", filename, errval);
+      serr("Failed to open ELF binary %s: %d\n", filename, errval);
       return -errval;
     }
 
@@ -177,7 +177,7 @@ int mod_initialize(FAR const char *filename,
                     sizeof(Elf32_Ehdr), 0);
   if (ret < 0)
     {
-      sdbg("Failed to read ELF header: %d\n", ret);
+      serr("Failed to read ELF header: %d\n", ret);
       return ret;
     }
 
@@ -196,7 +196,7 @@ int mod_initialize(FAR const char *filename,
        * is not correctly formed.
        */
 
-      sdbg("Bad ELF header: %d\n", ret);
+      serr("Bad ELF header: %d\n", ret);
       return ret;
     }
 
diff --git a/sched/module/mod_insmod.c b/sched/module/mod_insmod.c
index 9b4add646a..0b5c681da7 100644
--- a/sched/module/mod_insmod.c
+++ b/sched/module/mod_insmod.c
@@ -89,50 +89,50 @@ static void mod_dumploadinfo(FAR struct mod_loadinfo_s *loadinfo)
 {
   int i;
 
-  sdbg("LOAD_INFO:\n");
-  sdbg("  textalloc:    %08lx\n", (long)loadinfo->textalloc);
-  sdbg("  datastart:    %08lx\n", (long)loadinfo->datastart);
-  sdbg("  textsize:     %ld\n",   (long)loadinfo->textsize);
-  sdbg("  datasize:     %ld\n",   (long)loadinfo->datasize);
-  sdbg("  filelen:      %ld\n",   (long)loadinfo->filelen);
-  sdbg("  filfd:        %d\n",    loadinfo->filfd);
-  sdbg("  symtabidx:    %d\n",    loadinfo->symtabidx);
-  sdbg("  strtabidx:    %d\n",    loadinfo->strtabidx);
-
-  sdbg("ELF Header:\n");
-  sdbg("  e_ident:      %02x %02x %02x %02x\n",
+  serr("LOAD_INFO:\n");
+  serr("  textalloc:    %08lx\n", (long)loadinfo->textalloc);
+  serr("  datastart:    %08lx\n", (long)loadinfo->datastart);
+  serr("  textsize:     %ld\n",   (long)loadinfo->textsize);
+  serr("  datasize:     %ld\n",   (long)loadinfo->datasize);
+  serr("  filelen:      %ld\n",   (long)loadinfo->filelen);
+  serr("  filfd:        %d\n",    loadinfo->filfd);
+  serr("  symtabidx:    %d\n",    loadinfo->symtabidx);
+  serr("  strtabidx:    %d\n",    loadinfo->strtabidx);
+
+  serr("ELF Header:\n");
+  serr("  e_ident:      %02x %02x %02x %02x\n",
     loadinfo->ehdr.e_ident[0], loadinfo->ehdr.e_ident[1],
     loadinfo->ehdr.e_ident[2], loadinfo->ehdr.e_ident[3]);
-  sdbg("  e_type:       %04x\n",  loadinfo->ehdr.e_type);
-  sdbg("  e_machine:    %04x\n",  loadinfo->ehdr.e_machine);
-  sdbg("  e_version:    %08x\n",  loadinfo->ehdr.e_version);
-  sdbg("  e_entry:      %08lx\n", (long)loadinfo->ehdr.e_entry);
-  sdbg("  e_phoff:      %d\n",    loadinfo->ehdr.e_phoff);
-  sdbg("  e_shoff:      %d\n",    loadinfo->ehdr.e_shoff);
-  sdbg("  e_flags:      %08x\n" , loadinfo->ehdr.e_flags);
-  sdbg("  e_ehsize:     %d\n",    loadinfo->ehdr.e_ehsize);
-  sdbg("  e_phentsize:  %d\n",    loadinfo->ehdr.e_phentsize);
-  sdbg("  e_phnum:      %d\n",    loadinfo->ehdr.e_phnum);
-  sdbg("  e_shentsize:  %d\n",    loadinfo->ehdr.e_shentsize);
-  sdbg("  e_shnum:      %d\n",    loadinfo->ehdr.e_shnum);
-  sdbg("  e_shstrndx:   %d\n",    loadinfo->ehdr.e_shstrndx);
+  serr("  e_type:       %04x\n",  loadinfo->ehdr.e_type);
+  serr("  e_machine:    %04x\n",  loadinfo->ehdr.e_machine);
+  serr("  e_version:    %08x\n",  loadinfo->ehdr.e_version);
+  serr("  e_entry:      %08lx\n", (long)loadinfo->ehdr.e_entry);
+  serr("  e_phoff:      %d\n",    loadinfo->ehdr.e_phoff);
+  serr("  e_shoff:      %d\n",    loadinfo->ehdr.e_shoff);
+  serr("  e_flags:      %08x\n" , loadinfo->ehdr.e_flags);
+  serr("  e_ehsize:     %d\n",    loadinfo->ehdr.e_ehsize);
+  serr("  e_phentsize:  %d\n",    loadinfo->ehdr.e_phentsize);
+  serr("  e_phnum:      %d\n",    loadinfo->ehdr.e_phnum);
+  serr("  e_shentsize:  %d\n",    loadinfo->ehdr.e_shentsize);
+  serr("  e_shnum:      %d\n",    loadinfo->ehdr.e_shnum);
+  serr("  e_shstrndx:   %d\n",    loadinfo->ehdr.e_shstrndx);
 
   if (loadinfo->shdr && loadinfo->ehdr.e_shnum > 0)
     {
       for (i = 0; i < loadinfo->ehdr.e_shnum; i++)
         {
           FAR Elf32_Shdr *shdr = &loadinfo->shdr[i];
-          sdbg("Sections %d:\n", i);
-          sdbg("  sh_name:      %08x\n", shdr->sh_name);
-          sdbg("  sh_type:      %08x\n", shdr->sh_type);
-          sdbg("  sh_flags:     %08x\n", shdr->sh_flags);
-          sdbg("  sh_addr:      %08x\n", shdr->sh_addr);
-          sdbg("  sh_offset:    %d\n",   shdr->sh_offset);
-          sdbg("  sh_size:      %d\n",   shdr->sh_size);
-          sdbg("  sh_link:      %d\n",   shdr->sh_link);
-          sdbg("  sh_info:      %d\n",   shdr->sh_info);
-          sdbg("  sh_addralign: %d\n",   shdr->sh_addralign);
-          sdbg("  sh_entsize:   %d\n",   shdr->sh_entsize);
+          serr("Sections %d:\n", i);
+          serr("  sh_name:      %08x\n", shdr->sh_name);
+          serr("  sh_type:      %08x\n", shdr->sh_type);
+          serr("  sh_flags:     %08x\n", shdr->sh_flags);
+          serr("  sh_addr:      %08x\n", shdr->sh_addr);
+          serr("  sh_offset:    %d\n",   shdr->sh_offset);
+          serr("  sh_size:      %d\n",   shdr->sh_size);
+          serr("  sh_link:      %d\n",   shdr->sh_link);
+          serr("  sh_info:      %d\n",   shdr->sh_info);
+          serr("  sh_addralign: %d\n",   shdr->sh_addralign);
+          serr("  sh_entsize:   %d\n",   shdr->sh_entsize);
         }
     }
 }
@@ -212,7 +212,7 @@ int insmod(FAR const char *filename, FAR const char *modulename)
   mod_dumploadinfo(&loadinfo);
   if (ret != 0)
     {
-      sdbg("ERROR: Failed to initialize to load module: %d\n", ret);
+      serr("ERROR: Failed to initialize to load module: %d\n", ret);
       goto errout_with_lock;
     }
 
@@ -221,7 +221,7 @@ int insmod(FAR const char *filename, FAR const char *modulename)
   modp = (FAR struct module_s *)kmm_zalloc(sizeof(struct module_s));
   if (ret != 0)
     {
-      sdbg("Failed to initialize for load of ELF program: %d\n", ret);
+      serr("Failed to initialize for load of ELF program: %d\n", ret);
       goto errout_with_loadinfo;
     }
 
@@ -235,7 +235,7 @@ int insmod(FAR const char *filename, FAR const char *modulename)
   mod_dumploadinfo(&loadinfo);
   if (ret != 0)
     {
-      sdbg("Failed to load ELF program binary: %d\n", ret);
+      serr("Failed to load ELF program binary: %d\n", ret);
       goto errout_with_registry_entry;
     }
 
@@ -244,7 +244,7 @@ int insmod(FAR const char *filename, FAR const char *modulename)
   ret = mod_bind(&loadinfo);
   if (ret != 0)
     {
-      sdbg("Failed to bind symbols program binary: %d\n", ret);
+      serr("Failed to bind symbols program binary: %d\n", ret);
       goto errout_with_load;
     }
 
@@ -269,7 +269,7 @@ int insmod(FAR const char *filename, FAR const char *modulename)
   ret = initializer(&modp->uninitializer, &modp->arg);
   if (ret < 0)
     {
-      sdbg("Failed to initialize the module: %d\n", ret);
+      serr("Failed to initialize the module: %d\n", ret);
       goto errout_with_load;
     }
 
diff --git a/sched/module/mod_iobuffer.c b/sched/module/mod_iobuffer.c
index 0a8c4bc4ef..82640606e8 100644
--- a/sched/module/mod_iobuffer.c
+++ b/sched/module/mod_iobuffer.c
@@ -75,7 +75,7 @@ int mod_allocbuffer(FAR struct mod_loadinfo_s *loadinfo)
       loadinfo->iobuffer = (FAR uint8_t *)kmm_malloc(CONFIG_MODULE_BUFFERSIZE);
       if (!loadinfo->iobuffer)
         {
-          sdbg("Failed to allocate an I/O buffer\n");
+          serr("Failed to allocate an I/O buffer\n");
           return -ENOMEM;
         }
 
@@ -111,7 +111,7 @@ int mod_reallocbuffer(FAR struct mod_loadinfo_s *loadinfo, size_t increment)
    buffer = kmm_realloc((FAR void *)loadinfo->iobuffer, newsize);
    if (!buffer)
     {
-      sdbg("Failed to reallocate the I/O buffer\n");
+      serr("Failed to reallocate the I/O buffer\n");
       return -ENOMEM;
     }
 
diff --git a/sched/module/mod_load.c b/sched/module/mod_load.c
index de693e575e..2ce413bd6f 100644
--- a/sched/module/mod_load.c
+++ b/sched/module/mod_load.c
@@ -192,7 +192,7 @@ static inline int mod_loadfile(FAR struct mod_loadinfo_s *loadinfo)
           ret = mod_read(loadinfo, *pptr, shdr->sh_size, shdr->sh_offset);
           if (ret < 0)
             {
-              sdbg("ERROR: Failed to read section %d: %d\n", i, ret);
+              serr("ERROR: Failed to read section %d: %d\n", i, ret);
               return ret;
             }
         }
@@ -250,7 +250,7 @@ int mod_load(FAR struct mod_loadinfo_s *loadinfo)
   ret = mod_loadshdrs(loadinfo);
   if (ret < 0)
     {
-      sdbg("ERROR: mod_loadshdrs failed: %d\n", ret);
+      serr("ERROR: mod_loadshdrs failed: %d\n", ret);
       goto errout_with_buffers;
     }
 
@@ -265,7 +265,7 @@ int mod_load(FAR struct mod_loadinfo_s *loadinfo)
   loadinfo->textalloc = (uintptr_t)kmm_zalloc(loadinfo->textsize + loadinfo->datasize);
   if (!loadinfo->textalloc)
     {
-      sdbg("ERROR: Failed to allocate memory for the module\n");
+      serr("ERROR: Failed to allocate memory for the module\n");
       ret = -ENOMEM;
       goto errout_with_buffers;
     }
@@ -277,7 +277,7 @@ int mod_load(FAR struct mod_loadinfo_s *loadinfo)
   ret = mod_loadfile(loadinfo);
   if (ret < 0)
     {
-      sdbg("ERROR: mod_loadfile failed: %d\n", ret);
+      serr("ERROR: mod_loadfile failed: %d\n", ret);
       goto errout_with_buffers;
     }
 
diff --git a/sched/module/mod_procfs.c b/sched/module/mod_procfs.c
index cb0ec00613..50388d0d72 100644
--- a/sched/module/mod_procfs.c
+++ b/sched/module/mod_procfs.c
@@ -181,7 +181,7 @@ static int modprocfs_open(FAR struct file *filep, FAR const char *relpath,
 
   if (((oflags & O_WRONLY) != 0 || (oflags & O_RDONLY) == 0))
     {
-      fdbg("ERROR: Only O_RDONLY supported\n");
+      ferr("ERROR: Only O_RDONLY supported\n");
       return -EACCES;
     }
 
@@ -190,7 +190,7 @@ static int modprocfs_open(FAR struct file *filep, FAR const char *relpath,
   priv = (FAR struct modprocfs_file_s *)kmm_zalloc(sizeof(struct modprocfs_file_s));
   if (!priv)
     {
-      fdbg("ERROR: Failed to allocate file attributes\n");
+      ferr("ERROR: Failed to allocate file attributes\n");
       return -ENOMEM;
     }
 
@@ -282,7 +282,7 @@ static int modprocfs_dup(FAR const struct file *oldp, FAR struct file *newp)
   newpriv = (FAR struct modprocfs_file_s *)kmm_zalloc(sizeof(struct modprocfs_file_s));
   if (!newpriv)
     {
-      fdbg("ERROR: Failed to allocate file attributes\n");
+      ferr("ERROR: Failed to allocate file attributes\n");
       return -ENOMEM;
     }
 
diff --git a/sched/module/mod_read.c b/sched/module/mod_read.c
index 1440f5f5ea..38c2f8697e 100644
--- a/sched/module/mod_read.c
+++ b/sched/module/mod_read.c
@@ -126,7 +126,7 @@ int mod_read(FAR struct mod_loadinfo_s *loadinfo, FAR uint8_t *buffer,
       if (rpos != offset)
         {
           int errval = errno;
-          sdbg("Failed to seek to position %lu: %d\n",
+          serr("Failed to seek to position %lu: %d\n",
                (unsigned long)offset, errval);
           return -errval;
         }
@@ -142,14 +142,14 @@ int mod_read(FAR struct mod_loadinfo_s *loadinfo, FAR uint8_t *buffer,
 
            if (errval != EINTR)
              {
-               sdbg("Read from offset %lu failed: %d\n",
+               serr("Read from offset %lu failed: %d\n",
                     (unsigned long)offset, errval);
                return -errval;
              }
          }
        else if (nbytes == 0)
          {
-           sdbg("Unexpected end of file\n");
+           serr("Unexpected end of file\n");
            return -ENODATA;
          }
        else
diff --git a/sched/module/mod_registry.c b/sched/module/mod_registry.c
index 7df1168b35..93a022e8bd 100644
--- a/sched/module/mod_registry.c
+++ b/sched/module/mod_registry.c
@@ -153,7 +153,7 @@ int mod_registry_del(FAR struct module_s *modp)
 
   if (curr == NULL)
     {
-      sdbg("ERROR: Could not find module entry\n");
+      serr("ERROR: Could not find module entry\n");
       return -ENOENT;
     }
 
diff --git a/sched/module/mod_rmmod.c b/sched/module/mod_rmmod.c
index 76fff1c7aa..59f7d2f15d 100644
--- a/sched/module/mod_rmmod.c
+++ b/sched/module/mod_rmmod.c
@@ -88,7 +88,7 @@ int rmmod(FAR const char *modulename)
   modp = mod_registry_find(modulename);
   if (modp == NULL)
     {
-      sdbg("ERROR: Failed to find module %s: %d\n", modulename, ret);
+      serr("ERROR: Failed to find module %s: %d\n", modulename, ret);
       ret = -ENOENT;
       goto errout_with_lock;
     }
@@ -105,7 +105,7 @@ int rmmod(FAR const char *modulename)
 
       if (ret < 0)
         {
-          sdbg("ERROR: Failed to uninitialize the module: %d\n", ret);
+          serr("ERROR: Failed to uninitialize the module: %d\n", ret);
           goto errout_with_lock;
         }
 
@@ -140,7 +140,7 @@ int rmmod(FAR const char *modulename)
   ret = mod_registry_del(modp);
   if (ret < 0)
     {
-      sdbg("ERROR: Failed to remove the module from the registry: %d\n", ret);
+      serr("ERROR: Failed to remove the module from the registry: %d\n", ret);
       goto errout_with_lock;
     }
 
diff --git a/sched/module/mod_sections.c b/sched/module/mod_sections.c
index dcfaaf9ae6..6eeeb398ff 100644
--- a/sched/module/mod_sections.c
+++ b/sched/module/mod_sections.c
@@ -85,7 +85,7 @@ static inline int mod_sectname(FAR struct mod_loadinfo_s *loadinfo,
   shstrndx = loadinfo->ehdr.e_shstrndx;
   if (shstrndx == SHN_UNDEF)
     {
-      sdbg("No section header string table\n");
+      serr("No section header string table\n");
       return -EINVAL;
     }
 
@@ -118,7 +118,7 @@ static inline int mod_sectname(FAR struct mod_loadinfo_s *loadinfo,
         {
           if (loadinfo->filelen <= offset)
             {
-              sdbg("At end of file\n");
+              serr("At end of file\n");
               return -EINVAL;
             }
 
@@ -131,7 +131,7 @@ static inline int mod_sectname(FAR struct mod_loadinfo_s *loadinfo,
       ret = mod_read(loadinfo, buffer, readlen, offset);
       if (ret < 0)
         {
-          sdbg("Failed to read section name\n");
+          serr("Failed to read section name\n");
           return ret;
         }
 
@@ -151,7 +151,7 @@ static inline int mod_sectname(FAR struct mod_loadinfo_s *loadinfo,
       ret = mod_reallocbuffer(loadinfo, CONFIG_MODULE_BUFFERINCR);
       if (ret < 0)
         {
-          sdbg("mod_reallocbuffer failed: %d\n", ret);
+          serr("mod_reallocbuffer failed: %d\n", ret);
           return ret;
         }
     }
@@ -188,7 +188,7 @@ int mod_loadshdrs(FAR struct mod_loadinfo_s *loadinfo)
 
   if (loadinfo->ehdr.e_shnum < 1)
     {
-      sdbg("No sections(?)\n");
+      serr("No sections(?)\n");
       return -EINVAL;
     }
 
@@ -197,7 +197,7 @@ int mod_loadshdrs(FAR struct mod_loadinfo_s *loadinfo)
   shdrsize = (size_t)loadinfo->ehdr.e_shentsize * (size_t)loadinfo->ehdr.e_shnum;
   if (loadinfo->ehdr.e_shoff + shdrsize > loadinfo->filelen)
     {
-      sdbg("Insufficent space in file for section header table\n");
+      serr("Insufficent space in file for section header table\n");
       return -ESPIPE;
     }
 
@@ -206,7 +206,7 @@ int mod_loadshdrs(FAR struct mod_loadinfo_s *loadinfo)
   loadinfo->shdr = (FAR FAR Elf32_Shdr *)kmm_malloc(shdrsize);
   if (!loadinfo->shdr)
     {
-      sdbg("Failed to allocate the section header table. Size: %ld\n",
+      serr("Failed to allocate the section header table. Size: %ld\n",
            (long)shdrsize);
       return -ENOMEM;
     }
@@ -217,7 +217,7 @@ int mod_loadshdrs(FAR struct mod_loadinfo_s *loadinfo)
                     loadinfo->ehdr.e_shoff);
   if (ret < 0)
     {
-      sdbg("Failed to read section header table: %d\n", ret);
+      serr("Failed to read section header table: %d\n", ret);
     }
 
   return ret;
@@ -256,7 +256,7 @@ int mod_findsection(FAR struct mod_loadinfo_s *loadinfo,
       ret  = mod_sectname(loadinfo, shdr);
       if (ret < 0)
         {
-          sdbg("mod_sectname failed: %d\n", ret);
+          serr("mod_sectname failed: %d\n", ret);
           return ret;
         }
 
diff --git a/sched/module/mod_symbols.c b/sched/module/mod_symbols.c
index 632b978866..d0e7c3ddf6 100644
--- a/sched/module/mod_symbols.c
+++ b/sched/module/mod_symbols.c
@@ -93,7 +93,7 @@ static int mod_symname(FAR struct mod_loadinfo_s *loadinfo,
 
   if (sym->st_name == 0)
     {
-      sdbg("Symbol has no name\n");
+      serr("Symbol has no name\n");
       return -ESRCH;
     }
 
@@ -112,7 +112,7 @@ static int mod_symname(FAR struct mod_loadinfo_s *loadinfo,
         {
           if (loadinfo->filelen <= offset)
             {
-              sdbg("At end of file\n");
+              serr("At end of file\n");
               return -EINVAL;
             }
 
@@ -125,7 +125,7 @@ static int mod_symname(FAR struct mod_loadinfo_s *loadinfo,
       ret = mod_read(loadinfo, buffer, readlen, offset);
       if (ret < 0)
         {
-          sdbg("mod_read failed: %d\n", ret);
+          serr("mod_read failed: %d\n", ret);
           return ret;
         }
 
@@ -145,7 +145,7 @@ static int mod_symname(FAR struct mod_loadinfo_s *loadinfo,
       ret = mod_reallocbuffer(loadinfo, CONFIG_MODULE_BUFFERINCR);
       if (ret < 0)
         {
-          sdbg("mod_reallocbuffer failed: %d\n", ret);
+          serr("mod_reallocbuffer failed: %d\n", ret);
           return ret;
         }
     }
@@ -191,7 +191,7 @@ int mod_findsymtab(FAR struct mod_loadinfo_s *loadinfo)
 
   if (loadinfo->symtabidx == 0)
     {
-      sdbg("No symbols in ELF file\n");
+      serr("No symbols in ELF file\n");
       return -EINVAL;
     }
 
@@ -225,7 +225,7 @@ int mod_readsym(FAR struct mod_loadinfo_s *loadinfo, int index,
 
   if (index < 0 || index > (symtab->sh_size / sizeof(Elf32_Sym)))
     {
-      sdbg("Bad relocation symbol index: %d\n", index);
+      serr("Bad relocation symbol index: %d\n", index);
       return -EINVAL;
     }
 
@@ -273,7 +273,7 @@ int mod_symvalue(FAR struct mod_loadinfo_s *loadinfo, FAR Elf32_Sym *sym)
       {
         /* NuttX ELF modules should be compiled with -fno-common. */
 
-        sdbg("SHN_COMMON: Re-compile with -fno-common\n");
+        serr("SHN_COMMON: Re-compile with -fno-common\n");
         return -ENOSYS;
       }
 
@@ -298,7 +298,7 @@ int mod_symvalue(FAR struct mod_loadinfo_s *loadinfo, FAR Elf32_Sym *sym)
              * indicate the nameless symbol.
              */
 
-            sdbg("SHN_UNDEF: Failed to get symbol name: %d\n", ret);
+            serr("SHN_UNDEF: Failed to get symbol name: %d\n", ret);
             return ret;
           }
 
@@ -315,7 +315,7 @@ int mod_symvalue(FAR struct mod_loadinfo_s *loadinfo, FAR Elf32_Sym *sym)
 #endif
         if (!symbol)
           {
-            sdbg("SHN_UNDEF: Exported symbol \"%s\" not found\n", loadinfo->iobuffer);
+            serr("SHN_UNDEF: Exported symbol \"%s\" not found\n", loadinfo->iobuffer);
             return -ENOENT;
           }
 
diff --git a/sched/module/mod_verify.c b/sched/module/mod_verify.c
index 5469edaed0..401d1283f2 100644
--- a/sched/module/mod_verify.c
+++ b/sched/module/mod_verify.c
@@ -79,7 +79,7 @@ int mod_verifyheader(FAR const Elf32_Ehdr *ehdr)
 {
   if (!ehdr)
     {
-      sdbg("NULL ELF header!");
+      serr("NULL ELF header!");
       return -ENOEXEC;
     }
 
@@ -96,7 +96,7 @@ int mod_verifyheader(FAR const Elf32_Ehdr *ehdr)
 
   if (ehdr->e_type != ET_REL)
     {
-      sdbg("Not a relocatable file: e_type=%d\n", ehdr->e_type);
+      serr("Not a relocatable file: e_type=%d\n", ehdr->e_type);
       return -EINVAL;
     }
 
@@ -104,7 +104,7 @@ int mod_verifyheader(FAR const Elf32_Ehdr *ehdr)
 
   if (up_checkarch(ehdr))
     {
-      sdbg("Not a supported architecture\n");
+      serr("Not a supported architecture\n");
       return -ENOEXEC;
     }
 
diff --git a/sched/pthread/pthread_completejoin.c b/sched/pthread/pthread_completejoin.c
index 24343cdb3b..3f39f59e74 100644
--- a/sched/pthread/pthread_completejoin.c
+++ b/sched/pthread/pthread_completejoin.c
@@ -214,7 +214,7 @@ int pthread_completejoin(pid_t pid, FAR void *exit_value)
   pjoin = pthread_findjoininfo(group, pid);
   if (!pjoin)
     {
-      sdbg("Could not find join info, pid=%d\n", pid);
+      serr("Could not find join info, pid=%d\n", pid);
       (void)pthread_givesemaphore(&group->tg_joinsem);
       return ERROR;
     }
@@ -271,7 +271,7 @@ int pthread_completejoin(pid_t pid, FAR void *exit_value)
 void pthread_destroyjoin(FAR struct task_group_s *group,
                          FAR struct join_s *pjoin)
 {
-  sdbg("pjoin=0x%p\n", pjoin);
+  serr("pjoin=0x%p\n", pjoin);
 
   /* Remove the join info from the set of joins */
 
diff --git a/sched/pthread/pthread_condbroadcast.c b/sched/pthread/pthread_condbroadcast.c
index a86c3a8a14..623698c459 100644
--- a/sched/pthread/pthread_condbroadcast.c
+++ b/sched/pthread/pthread_condbroadcast.c
@@ -71,7 +71,7 @@ int pthread_cond_broadcast(FAR pthread_cond_t *cond)
   int ret = OK;
   int sval;
 
-  sdbg("cond=0x%p\n", cond);
+  serr("cond=0x%p\n", cond);
 
   if (!cond)
     {
@@ -118,7 +118,7 @@ int pthread_cond_broadcast(FAR pthread_cond_t *cond)
       sched_unlock();
     }
 
-  sdbg("Returning %d\n", ret);
+  serr("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/sched/pthread/pthread_conddestroy.c b/sched/pthread/pthread_conddestroy.c
index 2584e8dbae..904cd08b4c 100644
--- a/sched/pthread/pthread_conddestroy.c
+++ b/sched/pthread/pthread_conddestroy.c
@@ -68,7 +68,7 @@ int pthread_cond_destroy(FAR pthread_cond_t *cond)
 {
   int ret = OK;
 
-  sdbg("cond=0x%p\n", cond);
+  serr("cond=0x%p\n", cond);
 
   if (!cond)
     {
@@ -82,7 +82,7 @@ int pthread_cond_destroy(FAR pthread_cond_t *cond)
       ret = EINVAL;
     }
 
-  sdbg("Returning %d\n", ret);
+  serr("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/sched/pthread/pthread_condinit.c b/sched/pthread/pthread_condinit.c
index a73811e078..768ed19399 100644
--- a/sched/pthread/pthread_condinit.c
+++ b/sched/pthread/pthread_condinit.c
@@ -69,7 +69,7 @@ int pthread_cond_init(FAR pthread_cond_t *cond, FAR const pthread_condattr_t *at
 {
   int ret = OK;
 
-  sdbg("cond=0x%p attr=0x%p\n", cond, attr);
+  serr("cond=0x%p attr=0x%p\n", cond, attr);
 
   if (!cond)
     {
@@ -85,7 +85,7 @@ int pthread_cond_init(FAR pthread_cond_t *cond, FAR const pthread_condattr_t *at
       ret = EINVAL;
     }
 
-  sdbg("Returning %d\n", ret);
+  serr("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/sched/pthread/pthread_condsignal.c b/sched/pthread/pthread_condsignal.c
index b84ef5d55c..f9f19973f5 100644
--- a/sched/pthread/pthread_condsignal.c
+++ b/sched/pthread/pthread_condsignal.c
@@ -70,7 +70,7 @@ int pthread_cond_signal(FAR pthread_cond_t *cond)
   int ret = OK;
   int sval;
 
-  sdbg("cond=0x%p\n", cond);
+  serr("cond=0x%p\n", cond);
 
   if (!cond)
     {
@@ -101,16 +101,16 @@ int pthread_cond_signal(FAR pthread_cond_t *cond)
            * operation that will guarantee this to be so.
            */
 
-          sdbg("sval=%d\n", sval);
+          serr("sval=%d\n", sval);
           if (sval < 0)
             {
-              sdbg("Signalling...\n");
+              serr("Signalling...\n");
               ret = pthread_givesemaphore((FAR sem_t *)&cond->sem);
             }
         }
     }
 
-  sdbg("Returning %d\n", ret);
+  serr("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/sched/pthread/pthread_condtimedwait.c b/sched/pthread/pthread_condtimedwait.c
index 0e8443b2fb..2b7606893f 100644
--- a/sched/pthread/pthread_condtimedwait.c
+++ b/sched/pthread/pthread_condtimedwait.c
@@ -174,7 +174,7 @@ int pthread_cond_timedwait(FAR pthread_cond_t *cond, FAR pthread_mutex_t *mutex,
   int ret = OK;
   int status;
 
-  sdbg("cond=0x%p mutex=0x%p abstime=0x%p\n", cond, mutex, abstime);
+  serr("cond=0x%p mutex=0x%p abstime=0x%p\n", cond, mutex, abstime);
 
   DEBUGASSERT(rtcb->waitdog == NULL);
 
@@ -212,7 +212,7 @@ int pthread_cond_timedwait(FAR pthread_cond_t *cond, FAR pthread_mutex_t *mutex,
         }
       else
         {
-          sdbg("Give up mutex...\n");
+          serr("Give up mutex...\n");
 
           /* We must disable pre-emption and interrupts here so that
            * the time stays valid until the wait begins.   This adds
@@ -292,7 +292,7 @@ int pthread_cond_timedwait(FAR pthread_cond_t *cond, FAR pthread_mutex_t *mutex,
 
                           if (get_errno() == EINTR)
                             {
-                              sdbg("Timedout!\n");
+                              serr("Timedout!\n");
                               ret = ETIMEDOUT;
                             }
                           else
@@ -312,7 +312,7 @@ int pthread_cond_timedwait(FAR pthread_cond_t *cond, FAR pthread_mutex_t *mutex,
 
                   /* Reacquire the mutex (retaining the ret). */
 
-                  sdbg("Re-locking...\n");
+                  serr("Re-locking...\n");
                   status = pthread_takesemaphore((FAR sem_t *)&mutex->sem);
                   if (!status)
                     {
@@ -338,7 +338,7 @@ int pthread_cond_timedwait(FAR pthread_cond_t *cond, FAR pthread_mutex_t *mutex,
         }
     }
 
-  sdbg("Returning %d\n", ret);
+  serr("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/sched/pthread/pthread_condwait.c b/sched/pthread/pthread_condwait.c
index d60aece8ef..b388d4d810 100644
--- a/sched/pthread/pthread_condwait.c
+++ b/sched/pthread/pthread_condwait.c
@@ -71,7 +71,7 @@ int pthread_cond_wait(FAR pthread_cond_t *cond, FAR pthread_mutex_t *mutex)
 {
   int ret;
 
-  sdbg("cond=0x%p mutex=0x%p\n", cond, mutex);
+  serr("cond=0x%p mutex=0x%p\n", cond, mutex);
 
   /* Make sure that non-NULL references were provided. */
 
@@ -90,7 +90,7 @@ int pthread_cond_wait(FAR pthread_cond_t *cond, FAR pthread_mutex_t *mutex)
     {
       /* Give up the mutex */
 
-      sdbg("Give up mutex / take cond\n");
+      serr("Give up mutex / take cond\n");
 
       sched_lock();
       mutex->pid = -1;
@@ -103,7 +103,7 @@ int pthread_cond_wait(FAR pthread_cond_t *cond, FAR pthread_mutex_t *mutex)
 
       /* Reacquire the mutex */
 
-      sdbg("Reacquire mutex...\n");
+      serr("Reacquire mutex...\n");
       ret |= pthread_takesemaphore((FAR sem_t *)&mutex->sem);
       if (!ret)
         {
@@ -111,7 +111,7 @@ int pthread_cond_wait(FAR pthread_cond_t *cond, FAR pthread_mutex_t *mutex)
         }
     }
 
-  sdbg("Returning %d\n", ret);
+  serr("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/sched/pthread/pthread_create.c b/sched/pthread/pthread_create.c
index 0869c56ed8..487827fbcb 100644
--- a/sched/pthread/pthread_create.c
+++ b/sched/pthread/pthread_create.c
@@ -249,7 +249,7 @@ int pthread_create(FAR pthread_t *thread, FAR const pthread_attr_t *attr,
   ptcb = (FAR struct pthread_tcb_s *)kmm_zalloc(sizeof(struct pthread_tcb_s));
   if (!ptcb)
     {
-      sdbg("ERROR: Failed to allocate TCB\n");
+      serr("ERROR: Failed to allocate TCB\n");
       return ENOMEM;
     }
 
@@ -282,7 +282,7 @@ int pthread_create(FAR pthread_t *thread, FAR const pthread_attr_t *attr,
   pjoin = (FAR struct join_s *)kmm_zalloc(sizeof(struct join_s));
   if (!pjoin)
     {
-      sdbg("ERROR: Failed to allocate join\n");
+      serr("ERROR: Failed to allocate join\n");
       errcode = ENOMEM;
       goto errout_with_tcb;
     }
diff --git a/sched/pthread/pthread_detach.c b/sched/pthread/pthread_detach.c
index 6bc3585b48..3da518fd30 100644
--- a/sched/pthread/pthread_detach.c
+++ b/sched/pthread/pthread_detach.c
@@ -82,7 +82,7 @@ int pthread_detach(pthread_t thread)
   FAR struct join_s *pjoin;
   int ret;
 
-  sdbg("Thread=%d group=%p\n", thread, group);
+  serr("Thread=%d group=%p\n", thread, group);
   DEBUGASSERT(group);
 
   /* Find the entry associated with this pthread. */
@@ -91,7 +91,7 @@ int pthread_detach(pthread_t thread)
   pjoin = pthread_findjoininfo(group, (pid_t)thread);
   if (!pjoin)
     {
-      sdbg("Could not find thread entry\n");
+      serr("Could not find thread entry\n");
       ret = EINVAL;
     }
   else
@@ -121,6 +121,6 @@ int pthread_detach(pthread_t thread)
 
   (void)pthread_givesemaphore(&group->tg_joinsem);
 
-  sdbg("Returning %d\n", ret);
+  serr("Returning %d\n", ret);
   return ret;
 }
diff --git a/sched/pthread/pthread_exit.c b/sched/pthread/pthread_exit.c
index d742ef8fdd..ed61e24b88 100644
--- a/sched/pthread/pthread_exit.c
+++ b/sched/pthread/pthread_exit.c
@@ -78,7 +78,7 @@ void pthread_exit(FAR void *exit_value)
   FAR struct tcb_s *tcb = this_task();
   int status;
 
-  sdbg("exit_value=%p\n", exit_value);
+  serr("exit_value=%p\n", exit_value);
 
   /* Block any signal actions that would awaken us while were
    * are performing the JOIN handshake.
diff --git a/sched/pthread/pthread_getaffinity.c b/sched/pthread/pthread_getaffinity.c
index 04d1921910..bcf284ba43 100644
--- a/sched/pthread/pthread_getaffinity.c
+++ b/sched/pthread/pthread_getaffinity.c
@@ -80,7 +80,7 @@ int pthread_getaffinity_np(pthread_t thread, size_t cpusetsize,
 {
   int ret;
 
-  sdbg("thread ID=%d cpusetsize=%d cpuset=%p\n",
+  serr("thread ID=%d cpusetsize=%d cpuset=%p\n",
        (int)thread, (int)cpusetsize, cpusetsize);
 
   DEBUGASSERT(thread > 0 && cpusetsize == sizeof(cpu_set_t) &&
diff --git a/sched/pthread/pthread_getschedparam.c b/sched/pthread/pthread_getschedparam.c
index fbb1be26b0..5e5bbb16b5 100644
--- a/sched/pthread/pthread_getschedparam.c
+++ b/sched/pthread/pthread_getschedparam.c
@@ -88,7 +88,7 @@ int pthread_getschedparam(pthread_t thread, FAR int *policy,
 {
   int ret;
 
-  sdbg("Thread ID=%d policy=0x%p param=0x%p\n", thread, policy, param);
+  serr("Thread ID=%d policy=0x%p param=0x%p\n", thread, policy, param);
 
   if (!policy || !param)
     {
@@ -113,7 +113,7 @@ int pthread_getschedparam(pthread_t thread, FAR int *policy,
         }
     }
 
-  sdbg("Returning %d\n", ret);
+  serr("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/sched/pthread/pthread_join.c b/sched/pthread/pthread_join.c
index 9bb9fa3fa0..933f40cddf 100644
--- a/sched/pthread/pthread_join.c
+++ b/sched/pthread/pthread_join.c
@@ -87,7 +87,7 @@ int pthread_join(pthread_t thread, FAR pthread_addr_t *pexit_value)
   FAR struct join_s *pjoin;
   int ret;
 
-  sdbg("thread=%d group=%p\n", thread, group);
+  serr("thread=%d group=%p\n", thread, group);
   DEBUGASSERT(group);
 
   /* First make sure that this is not an attempt to join to
@@ -121,7 +121,7 @@ int pthread_join(pthread_t thread, FAR pthread_addr_t *pexit_value)
 
       FAR struct tcb_s *tcb = sched_gettcb((pthread_t)thread);
 
-      sdbg("Could not find thread data\n");
+      serr("Could not find thread data\n");
 
       /* Case (1) or (3) -- we can't tell which.  Assume (3) */
 
@@ -159,19 +159,19 @@ int pthread_join(pthread_t thread, FAR pthread_addr_t *pexit_value)
 
       if (pjoin->terminated)
         {
-          sdbg("Thread has terminated\n");
+          serr("Thread has terminated\n");
 
           /* Get the thread exit value from the terminated thread. */
 
           if (pexit_value)
             {
-              sdbg("exit_value=0x%p\n", pjoin->exit_value);
+              serr("exit_value=0x%p\n", pjoin->exit_value);
               *pexit_value = pjoin->exit_value;
             }
         }
       else
         {
-          sdbg("Thread is still running\n");
+          serr("Thread is still running\n");
 
           /* Relinquish the data set semaphore.  Since pre-emption is
            * disabled, we can be certain that no task has the
@@ -195,7 +195,7 @@ int pthread_join(pthread_t thread, FAR pthread_addr_t *pexit_value)
           if (pexit_value)
             {
              *pexit_value = pjoin->exit_value;
-              sdbg("exit_value=0x%p\n", pjoin->exit_value);
+              serr("exit_value=0x%p\n", pjoin->exit_value);
             }
 
           /* Post the thread's data semaphore so that the exiting thread
@@ -230,6 +230,6 @@ int pthread_join(pthread_t thread, FAR pthread_addr_t *pexit_value)
       ret = OK;
     }
 
-  sdbg("Returning %d\n", ret);
+  serr("Returning %d\n", ret);
   return ret;
 }
diff --git a/sched/pthread/pthread_mutexdestroy.c b/sched/pthread/pthread_mutexdestroy.c
index d7d5e7c898..ece500f642 100644
--- a/sched/pthread/pthread_mutexdestroy.c
+++ b/sched/pthread/pthread_mutexdestroy.c
@@ -72,7 +72,7 @@ int pthread_mutex_destroy(FAR pthread_mutex_t *mutex)
   int ret = OK;
   int status;
 
-  sdbg("mutex=0x%p\n", mutex);
+  serr("mutex=0x%p\n", mutex);
 
   if (!mutex)
     {
@@ -106,6 +106,6 @@ int pthread_mutex_destroy(FAR pthread_mutex_t *mutex)
       sched_unlock();
     }
 
-  sdbg("Returning %d\n", ret);
+  serr("Returning %d\n", ret);
   return ret;
 }
diff --git a/sched/pthread/pthread_mutexinit.c b/sched/pthread/pthread_mutexinit.c
index c4355d41bd..74065d9530 100644
--- a/sched/pthread/pthread_mutexinit.c
+++ b/sched/pthread/pthread_mutexinit.c
@@ -75,7 +75,7 @@ int pthread_mutex_init(FAR pthread_mutex_t *mutex, FAR const pthread_mutexattr_t
   int ret       = OK;
   int status;
 
-  sdbg("mutex=0x%p attr=0x%p\n", mutex, attr);
+  serr("mutex=0x%p attr=0x%p\n", mutex, attr);
 
   if (!mutex)
     {
@@ -113,6 +113,6 @@ int pthread_mutex_init(FAR pthread_mutex_t *mutex, FAR const pthread_mutexattr_t
 #endif
     }
 
-  sdbg("Returning %d\n", ret);
+  serr("Returning %d\n", ret);
   return ret;
 }
diff --git a/sched/pthread/pthread_mutexlock.c b/sched/pthread/pthread_mutexlock.c
index 85e16adc47..9a9d56ed37 100644
--- a/sched/pthread/pthread_mutexlock.c
+++ b/sched/pthread/pthread_mutexlock.c
@@ -106,7 +106,7 @@ int pthread_mutex_lock(FAR pthread_mutex_t *mutex)
   int mypid = (int)getpid();
   int ret = OK;
 
-  sdbg("mutex=0x%p\n", mutex);
+  serr("mutex=0x%p\n", mutex);
 
   if (!mutex)
     {
@@ -140,7 +140,7 @@ int pthread_mutex_lock(FAR pthread_mutex_t *mutex)
                * is like PTHREAD_MUTEX_ERRORCHECK)
                */
 
-              sdbg("Returning EDEADLK\n");
+              serr("Returning EDEADLK\n");
               ret = EDEADLK;
             }
         }
@@ -166,7 +166,7 @@ int pthread_mutex_lock(FAR pthread_mutex_t *mutex)
       sched_unlock();
     }
 
-  sdbg("Returning %d\n", ret);
+  serr("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/sched/pthread/pthread_mutextrylock.c b/sched/pthread/pthread_mutextrylock.c
index 249dd28d8c..4249b17a74 100644
--- a/sched/pthread/pthread_mutextrylock.c
+++ b/sched/pthread/pthread_mutextrylock.c
@@ -85,7 +85,7 @@ int pthread_mutex_trylock(FAR pthread_mutex_t *mutex)
 {
   int ret = OK;
 
-  sdbg("mutex=0x%p\n", mutex);
+  serr("mutex=0x%p\n", mutex);
 
   if (!mutex)
     {
@@ -149,7 +149,7 @@ int pthread_mutex_trylock(FAR pthread_mutex_t *mutex)
       sched_unlock();
     }
 
-  sdbg("Returning %d\n", ret);
+  serr("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/sched/pthread/pthread_mutexunlock.c b/sched/pthread/pthread_mutexunlock.c
index 3b50894050..385329a4e4 100644
--- a/sched/pthread/pthread_mutexunlock.c
+++ b/sched/pthread/pthread_mutexunlock.c
@@ -82,7 +82,7 @@ int pthread_mutex_unlock(FAR pthread_mutex_t *mutex)
 {
   int ret = OK;
 
-  sdbg("mutex=0x%p\n", mutex);
+  serr("mutex=0x%p\n", mutex);
 
   if (!mutex)
     {
@@ -102,7 +102,7 @@ int pthread_mutex_unlock(FAR pthread_mutex_t *mutex)
         {
           /* No... return an error (default behavior is like PTHREAD_MUTEX_ERRORCHECK) */
 
-          sdbg("Holder=%d returning EPERM\n", mutex->pid);
+          serr("Holder=%d returning EPERM\n", mutex->pid);
           ret = EPERM;
         }
 
@@ -137,7 +137,7 @@ int pthread_mutex_unlock(FAR pthread_mutex_t *mutex)
       sched_unlock();
     }
 
-  sdbg("Returning %d\n", ret);
+  serr("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/sched/pthread/pthread_setaffinity.c b/sched/pthread/pthread_setaffinity.c
index 3948bf9025..c67d36f7d4 100644
--- a/sched/pthread/pthread_setaffinity.c
+++ b/sched/pthread/pthread_setaffinity.c
@@ -82,7 +82,7 @@ int pthread_setaffinity_np(pthread_t thread, size_t cpusetsize,
 {
   int ret;
 
-  sdbg("thread ID=%d cpusetsize=%d cpuset=%p\n",
+  serr("thread ID=%d cpusetsize=%d cpuset=%p\n",
        (int)thread, (int)cpusetsize, cpusetsize);
 
   DEBUGASSERT(thread > 0 && cpusetsize == sizeof(cpu_set_t) &&
diff --git a/sched/pthread/pthread_setschedparam.c b/sched/pthread/pthread_setschedparam.c
index fe7ee0cdb1..5db0bde3da 100644
--- a/sched/pthread/pthread_setschedparam.c
+++ b/sched/pthread/pthread_setschedparam.c
@@ -103,7 +103,7 @@ int pthread_setschedparam(pthread_t thread, int policy,
 {
   int ret;
 
-  sdbg("thread ID=%d policy=%d param=0x%p\n", thread, policy, param);
+  serr("thread ID=%d policy=%d param=0x%p\n", thread, policy, param);
 
   /* Set the errno to some non-zero value (failsafe) */
 
diff --git a/sched/semaphore/sem_holder.c b/sched/semaphore/sem_holder.c
index 873dff5be1..ea07b995fb 100644
--- a/sched/semaphore/sem_holder.c
+++ b/sched/semaphore/sem_holder.c
@@ -116,7 +116,7 @@ static inline FAR struct semholder_s *sem_allocholder(sem_t *sem)
 #endif
   else
     {
-      sdbg("Insufficient pre-allocated holders\n");
+      serr("Insufficient pre-allocated holders\n");
       pholder = NULL;
     }
 
@@ -283,7 +283,7 @@ static int sem_boostholderprio(FAR struct semholder_s *pholder,
 
   if (!sched_verifytcb(htcb))
     {
-      sdbg("TCB 0x%08x is a stale handle, counts lost\n", htcb);
+      serr("TCB 0x%08x is a stale handle, counts lost\n", htcb);
       sem_freeholder(sem, pholder);
     }
 
@@ -321,7 +321,7 @@ static int sem_boostholderprio(FAR struct semholder_s *pholder,
                 }
               else
                 {
-                  sdbg("CONFIG_SEM_NNESTPRIO exceeded\n");
+                  serr("CONFIG_SEM_NNESTPRIO exceeded\n");
                 }
             }
 
@@ -402,10 +402,10 @@ static int sem_dumpholder(FAR struct semholder_s *pholder, FAR sem_t *sem,
                           FAR void *arg)
 {
 #if CONFIG_SEM_PREALLOCHOLDERS > 0
-  dbg("  %08x: %08x %08x %04x\n",
+  err("  %08x: %08x %08x %04x\n",
       pholder, pholder->flink, pholder->htcb, pholder->counts);
 #else
-  dbg("  %08x: %08x %04x\n", pholder, pholder->htcb, pholder->counts);
+  err("  %08x: %08x %04x\n", pholder, pholder->htcb, pholder->counts);
 #endif
   return 0;
 }
@@ -434,7 +434,7 @@ static int sem_restoreholderprio(FAR struct semholder_s *pholder,
 
   if (!sched_verifytcb(htcb))
     {
-      sdbg("TCB 0x%08x is a stale handle, counts lost\n", htcb);
+      serr("TCB 0x%08x is a stale handle, counts lost\n", htcb);
       sem_freeholder(sem, pholder);
     }
 
@@ -819,13 +819,13 @@ void sem_destroyholder(FAR sem_t *sem)
 #if CONFIG_SEM_PREALLOCHOLDERS > 0
   if (sem->hhead)
     {
-      sdbg("Semaphore destroyed with holders\n");
+      serr("Semaphore destroyed with holders\n");
       (void)sem_foreachholder(sem, sem_recoverholders, NULL);
     }
 #else
   if (sem->holder.htcb)
     {
-      sdbg("Semaphore destroyed with holder\n");
+      serr("Semaphore destroyed with holder\n");
     }
 
   sem->holder.htcb = NULL;
diff --git a/sched/signal/sig_deliver.c b/sched/signal/sig_deliver.c
index 1f9c378b8a..5d715c5ce0 100644
--- a/sched/signal/sig_deliver.c
+++ b/sched/signal/sig_deliver.c
@@ -86,7 +86,7 @@ void sig_deliver(FAR struct tcb_s *stcb)
   for (sigq = (FAR sigq_t *)stcb->sigpendactionq.head; (sigq); sigq = next)
     {
       next = sigq->flink;
-      sdbg("Sending signal sigq=0x%x\n", sigq);
+      serr("Sending signal sigq=0x%x\n", sigq);
 
       /* Remove the signal structure from the sigpendactionq and place it
        * in the sigpostedq.  NOTE:  Since signals are processed one at a
diff --git a/sched/signal/sig_dispatch.c b/sched/signal/sig_dispatch.c
index 107982c59b..7bf297a1be 100644
--- a/sched/signal/sig_dispatch.c
+++ b/sched/signal/sig_dispatch.c
@@ -301,7 +301,7 @@ int sig_tcbdispatch(FAR struct tcb_s *stcb, siginfo_t *info)
   irqstate_t flags;
   int ret = OK;
 
-  sdbg("TCB=0x%08x signo=%d code=%d value=%d mask=%08x\n",
+  serr("TCB=0x%08x signo=%d code=%d value=%d mask=%08x\n",
        stcb, info->si_signo, info->si_code,
        info->si_value.sival_int, stcb->sigprocmask);
 
diff --git a/sched/signal/sig_mqnotempty.c b/sched/signal/sig_mqnotempty.c
index 44b05b7aff..b10832722e 100644
--- a/sched/signal/sig_mqnotempty.c
+++ b/sched/signal/sig_mqnotempty.c
@@ -76,9 +76,9 @@ int sig_mqnotempty(int pid, int signo, void *sival_ptr)
   int ret;
 
 #ifdef CONFIG_CAN_PASS_STRUCTS
-  sdbg("pid=%p signo=%d value=%d\n", pid, signo, value.sival_int);
+  serr("pid=%p signo=%d value=%d\n", pid, signo, value.sival_int);
 #else
-  sdbg("pid=%p signo=%d sival_ptr=%p\n", pid, signo, sival_ptr);
+  serr("pid=%p signo=%d sival_ptr=%p\n", pid, signo, sival_ptr);
 #endif
 
   /* Verify that we can perform the signalling operation */
diff --git a/sched/signal/sig_nanosleep.c b/sched/signal/sig_nanosleep.c
index 382715c798..0ac8e7fadb 100644
--- a/sched/signal/sig_nanosleep.c
+++ b/sched/signal/sig_nanosleep.c
@@ -108,7 +108,7 @@ int nanosleep(FAR const struct timespec *rqtp, FAR struct timespec *rmtp)
   sigset_t set;
   struct siginfo value;
   int errval;
-#ifdef CONFIG_DEBUG_FEATURES /* Warning avoidance */
+#ifdef CONFIG_DEBUG_ASSERTIONS /* Warning avoidance */
   int ret;
 #endif
 
@@ -135,7 +135,7 @@ int nanosleep(FAR const struct timespec *rqtp, FAR struct timespec *rmtp)
 
   /* nanosleep is a simple application of sigtimedwait. */
 
-#ifdef CONFIG_DEBUG_FEATURES /* Warning avoidance */
+#ifdef CONFIG_DEBUG_ASSERTIONS /* Warning avoidance */
   ret = sigtimedwait(&set, &value, rqtp);
 #else
   (void)sigtimedwait(&set, &value, rqtp);
diff --git a/sched/signal/sig_queue.c b/sched/signal/sig_queue.c
index 3daa59c155..c931c9a664 100644
--- a/sched/signal/sig_queue.c
+++ b/sched/signal/sig_queue.c
@@ -98,9 +98,9 @@ int sigqueue(int pid, int signo, void *sival_ptr)
   int ret;
 
 #ifdef CONFIG_CAN_PASS_STRUCTS
-  sdbg("pid=0x%08x signo=%d value=%d\n", pid, signo, value.sival_int);
+  serr("pid=0x%08x signo=%d value=%d\n", pid, signo, value.sival_int);
 #else
-  sdbg("pid=0x%08x signo=%d value=%p\n", pid, signo, sival_ptr);
+  serr("pid=0x%08x signo=%d value=%p\n", pid, signo, sival_ptr);
 #endif
 
   /* Sanity checks */
diff --git a/sched/task/task_create.c b/sched/task/task_create.c
index c8dc768d5a..520dd921fb 100644
--- a/sched/task/task_create.c
+++ b/sched/task/task_create.c
@@ -98,7 +98,7 @@ static int thread_create(FAR const char *name, uint8_t ttype, int priority,
   tcb = (FAR struct task_tcb_s *)kmm_zalloc(sizeof(struct task_tcb_s));
   if (!tcb)
     {
-      sdbg("ERROR: Failed to allocate TCB\n");
+      serr("ERROR: Failed to allocate TCB\n");
       errcode = ENOMEM;
       goto errout;
     }
diff --git a/sched/task/task_execv.c b/sched/task/task_execv.c
index c4457df537..b2e6323600 100644
--- a/sched/task/task_execv.c
+++ b/sched/task/task_execv.c
@@ -134,7 +134,7 @@ int execv(FAR const char *path, FAR char * const argv[])
   ret = exec(path, (FAR char * const *)argv, symtab, nsymbols);
   if (ret < 0)
     {
-      sdbg("exec failed: %d\n", errno);
+      serr("exec failed: %d\n", errno);
       return ERROR;
     }
 
diff --git a/sched/task/task_posixspawn.c b/sched/task/task_posixspawn.c
index fe13c80ac3..a185dd8ae1 100644
--- a/sched/task/task_posixspawn.c
+++ b/sched/task/task_posixspawn.c
@@ -135,7 +135,7 @@ static int posix_spawn_exec(FAR pid_t *pidp, FAR const char *path,
   if (pid < 0)
     {
       ret = get_errno();
-      sdbg("ERROR: exec failed: %d\n", ret);
+      serr("ERROR: exec failed: %d\n", ret);
       goto errout;
     }
 
@@ -224,7 +224,7 @@ static int posix_spawn_proxy(int argc, FAR char *argv[])
           int tmp = task_reparent(0, *g_spawn_parms.pid);
           if (tmp < 0)
             {
-              sdbg("ERROR: task_reparent() failed: %d\n", tmp);
+              serr("ERROR: task_reparent() failed: %d\n", tmp);
             }
         }
 #endif
@@ -407,7 +407,7 @@ int posix_spawn(FAR pid_t *pid, FAR const char *path,
     {
       int errcode = get_errno();
 
-      sdbg("ERROR: sched_getparam failed: %d\n", errcode);
+      serr("ERROR: sched_getparam failed: %d\n", errcode);
       spawn_semgive(&g_spawn_parmsem);
       return errcode;
     }
@@ -433,7 +433,7 @@ int posix_spawn(FAR pid_t *pid, FAR const char *path,
   if (proxy < 0)
     {
       ret = get_errno();
-      sdbg("ERROR: Failed to start posix_spawn_proxy: %d\n", ret);
+      serr("ERROR: Failed to start posix_spawn_proxy: %d\n", ret);
 
       goto errout_with_lock;
     }
@@ -444,7 +444,7 @@ int posix_spawn(FAR pid_t *pid, FAR const char *path,
   ret = waitpid(proxy, &status, 0);
   if (ret < 0)
     {
-      sdbg("ERROR: waitpid() failed: %d\n", errno);
+      serr("ERROR: waitpid() failed: %d\n", errno);
       goto errout_with_lock;
     }
 #else
diff --git a/sched/task/task_prctl.c b/sched/task/task_prctl.c
index 654ecba481..9a4d814939 100644
--- a/sched/task/task_prctl.c
+++ b/sched/task/task_prctl.c
@@ -111,7 +111,7 @@ int prctl(int option, ...)
 
         if (!tcb)
           {
-            sdbg("Pid does not correspond to a task: %d\n", pid);
+            serr("Pid does not correspond to a task: %d\n", pid);
             errcode = ESRCH;
             goto errout;
           }
@@ -120,7 +120,7 @@ int prctl(int option, ...)
 
         if (!name)
           {
-            sdbg("No name provide\n");
+            serr("No name provide\n");
             errcode = EFAULT;
             goto errout;
           }
@@ -144,13 +144,13 @@ int prctl(int option, ...)
       }
       break;
 #else
-      sdbg("Option not enabled: %d\n", option);
+      serr("Option not enabled: %d\n", option);
       errcode = ENOSYS;
       goto errout;
 #endif
 
     default:
-      sdbg("Unrecognized option: %d\n", option);
+      serr("Unrecognized option: %d\n", option);
       errcode = EINVAL;
       goto errout;
     }
diff --git a/sched/task/task_spawn.c b/sched/task/task_spawn.c
index 9d4019bf26..b2ae31c1f3 100644
--- a/sched/task/task_spawn.c
+++ b/sched/task/task_spawn.c
@@ -155,7 +155,7 @@ static int task_spawn_exec(FAR pid_t *pidp, FAR const char *name,
   if (pid < 0)
     {
       ret = get_errno();
-      sdbg("ERROR: task_create failed: %d\n", ret);
+      serr("ERROR: task_create failed: %d\n", ret);
       goto errout;
     }
 
@@ -252,7 +252,7 @@ static int task_spawn_proxy(int argc, FAR char *argv[])
           int tmp = task_reparent(0, *g_spawn_parms.pid);
           if (tmp < 0)
             {
-              sdbg("ERROR: task_reparent() failed: %d\n", tmp);
+              serr("ERROR: task_reparent() failed: %d\n", tmp);
             }
         }
 #endif
@@ -399,7 +399,7 @@ int task_spawn(FAR pid_t *pid, FAR const char *name, main_t entry,
     {
       int errcode = get_errno();
 
-      sdbg("ERROR: sched_getparam failed: %d\n", errcode);
+      serr("ERROR: sched_getparam failed: %d\n", errcode);
       spawn_semgive(&g_spawn_parmsem);
       return errcode;
     }
@@ -425,7 +425,7 @@ int task_spawn(FAR pid_t *pid, FAR const char *name, main_t entry,
   if (proxy < 0)
     {
       ret = get_errno();
-      sdbg("ERROR: Failed to start task_spawn_proxy: %d\n", ret);
+      serr("ERROR: Failed to start task_spawn_proxy: %d\n", ret);
 
       goto errout_with_lock;
     }
@@ -436,7 +436,7 @@ int task_spawn(FAR pid_t *pid, FAR const char *name, main_t entry,
   ret = waitpid(proxy, &status, 0);
   if (ret < 0)
     {
-      sdbg("ERROR: waitpid() failed: %d\n", errno);
+      serr("ERROR: waitpid() failed: %d\n", errno);
       goto errout_with_lock;
     }
 #else
diff --git a/sched/task/task_spawnparms.c b/sched/task/task_spawnparms.c
index e6d377c473..bb249e584a 100644
--- a/sched/task/task_spawnparms.c
+++ b/sched/task/task_spawnparms.c
@@ -102,7 +102,7 @@ static inline int spawn_dup2(FAR struct spawn_dup2_file_action_s *action)
     {
       int errcode = get_errno();
 
-      sdbg("ERROR: dup2 failed: %d\n", errcode);
+      serr("ERROR: dup2 failed: %d\n", errcode);
       return -errcode;
     }
 
@@ -123,7 +123,7 @@ static inline int spawn_open(FAR struct spawn_open_file_action_s *action)
   if (fd < 0)
     {
       ret = get_errno();
-      sdbg("ERROR: open failed: %d\n", ret);
+      serr("ERROR: open failed: %d\n", ret);
     }
 
   /* Does the return file descriptor happen to match the required file
@@ -140,7 +140,7 @@ static inline int spawn_open(FAR struct spawn_open_file_action_s *action)
       if (ret < 0)
         {
           ret = get_errno();
-          sdbg("ERROR: dup2 failed: %d\n", ret);
+          serr("ERROR: dup2 failed: %d\n", ret);
         }
 
       sinfo("Closing fd=%d\n", fd);
@@ -347,7 +347,7 @@ int spawn_proxyattrs(FAR const posix_spawnattr_t *attr,
 
             case SPAWN_FILE_ACTION_NONE:
             default:
-              sdbg("ERROR: Unknown action: %d\n", entry->action);
+              serr("ERROR: Unknown action: %d\n", entry->action);
               ret = EINVAL;
               break;
             }
diff --git a/sched/task/task_vfork.c b/sched/task/task_vfork.c
index 476e8c06d7..a427d7c000 100644
--- a/sched/task/task_vfork.c
+++ b/sched/task/task_vfork.c
@@ -268,7 +268,7 @@ FAR struct task_tcb_s *task_vforksetup(start_t retaddr)
   child = (FAR struct task_tcb_s *)kmm_zalloc(sizeof(struct task_tcb_s));
   if (!child)
     {
-      sdbg("ERROR: Failed to allocate TCB\n");
+      serr("ERROR: Failed to allocate TCB\n");
       set_errno(ENOMEM);
       return NULL;
     }
@@ -434,7 +434,7 @@ pid_t task_vforkstart(FAR struct task_tcb_s *child)
   ret = waitpid(pid, &rc, 0);
   if (ret < 0)
     {
-      sdbg("ERROR: waitpid failed: %d\n", errno);
+      serr("ERROR: waitpid failed: %d\n", errno);
     }
 #else
   (void)waitpid(pid, &rc, 0);
-- 
GitLab


From 13cac3b592155643b698184fbfd554eac7054c00 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sat, 11 Jun 2016 16:42:42 -0600
Subject: [PATCH 25/91] sched/:  Change some *err() message to *info() messages
 if what was a *dbg() message does not indicate and error condition.

---
 sched/clock/clock_getres.c            |  4 +-
 sched/clock/clock_gettime.c           |  4 +-
 sched/clock/clock_settime.c           |  8 +--
 sched/group/group_childstatus.c       |  8 +--
 sched/group/group_setupidlefiles.c    |  5 +-
 sched/init/os_smpstart.c              |  2 +-
 sched/init/os_start.c                 |  4 +-
 sched/irq/irq_unexpectedisr.c         |  2 +-
 sched/module/mod_bind.c               | 16 ++---
 sched/module/mod_init.c               | 12 ++--
 sched/module/mod_insmod.c             | 88 +++++++++++++--------------
 sched/module/mod_iobuffer.c           |  4 +-
 sched/module/mod_read.c               |  6 +-
 sched/module/mod_sections.c           | 18 +++---
 sched/module/mod_symbols.c            | 19 +++---
 sched/module/mod_verify.c             |  6 +-
 sched/paging/pg_miss.c                |  4 +-
 sched/paging/pg_worker.c              | 14 ++---
 sched/pthread/pthread_completejoin.c  |  4 +-
 sched/pthread/pthread_condbroadcast.c |  4 +-
 sched/pthread/pthread_conddestroy.c   |  4 +-
 sched/pthread/pthread_condinit.c      |  4 +-
 sched/pthread/pthread_condsignal.c    |  8 +--
 sched/pthread/pthread_condtimedwait.c | 10 +--
 sched/pthread/pthread_condwait.c      |  8 +--
 sched/pthread/pthread_detach.c        |  6 +-
 sched/pthread/pthread_exit.c          |  2 +-
 sched/pthread/pthread_getaffinity.c   |  4 +-
 sched/pthread/pthread_getschedparam.c |  4 +-
 sched/pthread/pthread_join.c          | 14 ++---
 sched/pthread/pthread_mutexdestroy.c  |  4 +-
 sched/pthread/pthread_mutexinit.c     |  4 +-
 sched/pthread/pthread_mutexlock.c     |  6 +-
 sched/pthread/pthread_mutextrylock.c  |  4 +-
 sched/pthread/pthread_mutexunlock.c   |  6 +-
 sched/pthread/pthread_setaffinity.c   |  4 +-
 sched/pthread/pthread_setschedparam.c |  2 +-
 sched/sched/sched_sporadic.c          |  2 +-
 sched/semaphore/sem_holder.c          | 26 ++++----
 sched/signal/sig_deliver.c            |  2 +-
 sched/signal/sig_dispatch.c           |  6 +-
 sched/signal/sig_mqnotempty.c         |  4 +-
 sched/signal/sig_queue.c              |  4 +-
 sched/task/task_execv.c               |  2 +-
 sched/task/task_prctl.c               |  8 +--
 sched/wqueue/kwork_hpthread.c         |  2 +-
 sched/wqueue/kwork_lpthread.c         |  2 +-
 47 files changed, 194 insertions(+), 190 deletions(-)

diff --git a/sched/clock/clock_getres.c b/sched/clock/clock_getres.c
index f02ea4f846..54d666ae53 100644
--- a/sched/clock/clock_getres.c
+++ b/sched/clock/clock_getres.c
@@ -62,7 +62,7 @@ int clock_getres(clockid_t clock_id, struct timespec *res)
 {
   int      ret = OK;
 
-  serr("clock_id=%d\n", clock_id);
+  sinfo("clock_id=%d\n", clock_id);
 
   /* Only CLOCK_REALTIME is supported */
 
@@ -79,7 +79,7 @@ int clock_getres(clockid_t clock_id, struct timespec *res)
       res->tv_sec  = 0;
       res->tv_nsec = NSEC_PER_TICK;
 
-      serr("Returning res=(%d,%d)\n", (int)res->tv_sec, (int)res->tv_nsec);
+      sinfo("Returning res=(%d,%d)\n", (int)res->tv_sec, (int)res->tv_nsec);
     }
 
   return ret;
diff --git a/sched/clock/clock_gettime.c b/sched/clock/clock_gettime.c
index 5e90568607..e014984f49 100644
--- a/sched/clock/clock_gettime.c
+++ b/sched/clock/clock_gettime.c
@@ -68,7 +68,7 @@ int clock_gettime(clockid_t clock_id, struct timespec *tp)
   uint32_t carry;
   int ret = OK;
 
-  serr("clock_id=%d\n", clock_id);
+  sinfo("clock_id=%d\n", clock_id);
   DEBUGASSERT(tp != NULL);
 
 #ifdef CONFIG_CLOCK_MONOTONIC
@@ -155,7 +155,7 @@ int clock_gettime(clockid_t clock_id, struct timespec *tp)
     }
   else
     {
-      serr("Returning tp=(%d,%d)\n", (int)tp->tv_sec, (int)tp->tv_nsec);
+      sinfo("Returning tp=(%d,%d)\n", (int)tp->tv_sec, (int)tp->tv_nsec);
     }
 
   return ret;
diff --git a/sched/clock/clock_settime.c b/sched/clock/clock_settime.c
index 0ca5f8ef52..8f269079d8 100644
--- a/sched/clock/clock_settime.c
+++ b/sched/clock/clock_settime.c
@@ -67,7 +67,7 @@ int clock_settime(clockid_t clock_id, FAR const struct timespec *tp)
   irqstate_t flags;
   int ret = OK;
 
-  serr("clock_id=%d\n", clock_id);
+  sinfo("clock_id=%d\n", clock_id);
   DEBUGASSERT(tp != NULL);
 
   /* CLOCK_REALTIME - POSIX demands this to be present. This is the wall
@@ -120,9 +120,9 @@ int clock_settime(clockid_t clock_id, FAR const struct timespec *tp)
 #endif
       leave_critical_section(flags);
 
-      serr("basetime=(%ld,%lu) bias=(%ld,%lu)\n",
-          (long)g_basetime.tv_sec, (unsigned long)g_basetime.tv_nsec,
-          (long)bias.tv_sec, (unsigned long)bias.tv_nsec);
+      sinfo("basetime=(%ld,%lu) bias=(%ld,%lu)\n",
+            (long)g_basetime.tv_sec, (unsigned long)g_basetime.tv_nsec,
+            (long)bias.tv_sec, (unsigned long)bias.tv_nsec);
     }
   else
     {
diff --git a/sched/group/group_childstatus.c b/sched/group/group_childstatus.c
index 1b6b5a77a6..54d74bfee0 100644
--- a/sched/group/group_childstatus.c
+++ b/sched/group/group_childstatus.c
@@ -66,7 +66,7 @@
 #  define CONFIG_PREALLOC_CHILDSTATUS (2*CONFIG_MAX_TASKS)
 #endif
 
-#ifndef CONFIG_DEBUG_FEATURES
+#ifndef CONFIG_DEBUG_INFO
 #  undef CONFIG_DEBUG_CHILDSTATUS
 #endif
 
@@ -115,11 +115,11 @@ static void group_dumpchildren(FAR struct task_group_s *group,
   FAR struct child_status_s *child;
   int i;
 
-  err("Task group=%p: %s\n", group, msg);
+  info("Task group=%p: %s\n", group, msg);
   for (i = 0, child = group->tg_children; child; i++, child = child->flink)
     {
-      err("  %d. ch_flags=%02x ch_pid=%d ch_status=%d\n",
-          i, child->ch_flags, child->ch_pid, child->ch_status);
+      info("  %d. ch_flags=%02x ch_pid=%d ch_status=%d\n",
+           i, child->ch_flags, child->ch_pid, child->ch_status);
     }
 }
 #else
diff --git a/sched/group/group_setupidlefiles.c b/sched/group/group_setupidlefiles.c
index 622244859d..b40cfe5d80 100644
--- a/sched/group/group_setupidlefiles.c
+++ b/sched/group/group_setupidlefiles.c
@@ -120,13 +120,14 @@ int group_setupidlefiles(FAR struct task_tcb_s *tcb)
 
       if (fd > 0)
         {
-          sllerr("Open /dev/console fd: %d\n", fd);
+          sllinfo("Open /dev/console fd: %d\n", fd);
           (void)close(fd);
         }
       else
         {
-          sllerr("Failed to open /dev/console: %d\n", errno);
+          sllerr("ERROR: Failed to open /dev/console: %d\n", errno);
         }
+
       return -ENFILE;
     }
 #endif
diff --git a/sched/init/os_smpstart.c b/sched/init/os_smpstart.c
index e9cd3c11a8..ba8afac2de 100644
--- a/sched/init/os_smpstart.c
+++ b/sched/init/os_smpstart.c
@@ -133,7 +133,7 @@ int os_idle_task(int argc, FAR char *argv[])
 {
   /* Enter the IDLE loop */
 
-  serr("CPU%d: Beginning Idle Loop\n", this_cpu());
+  sinfo("CPU%d: Beginning Idle Loop\n", this_cpu());
 
   for (; ; )
     {
diff --git a/sched/init/os_start.c b/sched/init/os_start.c
index 9fecc43755..cd13a1fa2e 100644
--- a/sched/init/os_start.c
+++ b/sched/init/os_start.c
@@ -372,7 +372,7 @@ void os_start(void)
 #endif
   int i;
 
-  sllerr("Entry\n");
+  sllinfo("Entry\n");
 
   /* Boot up is complete */
 
@@ -797,7 +797,7 @@ void os_start(void)
   /* The IDLE Loop **********************************************************/
   /* When control is return to this point, the system is idle. */
 
-  serr("CPU0: Beginning Idle Loop\n");
+  sinfo("CPU0: Beginning Idle Loop\n");
   for (; ; )
     {
       /* Perform garbage collection (if it is not being done by the worker
diff --git a/sched/irq/irq_unexpectedisr.c b/sched/irq/irq_unexpectedisr.c
index 2b3249a8f9..c320b18563 100644
--- a/sched/irq/irq_unexpectedisr.c
+++ b/sched/irq/irq_unexpectedisr.c
@@ -61,7 +61,7 @@
 int irq_unexpected_isr(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  llerr("irq: %d\n", irq);
+  llerr("ERROR irq: %d\n", irq);
   PANIC();
   return OK; /* Won't get here */
 }
diff --git a/sched/module/mod_bind.c b/sched/module/mod_bind.c
index f7fe4f4f4b..da905444e9 100644
--- a/sched/module/mod_bind.c
+++ b/sched/module/mod_bind.c
@@ -73,7 +73,7 @@ static inline int mod_readrel(FAR struct mod_loadinfo_s *loadinfo,
 
   if (index < 0 || index > (relsec->sh_size / sizeof(Elf32_Rel)))
     {
-      serr("Bad relocation symbol index: %d\n", index);
+      serr("ERROR: Bad relocation symbol index: %d\n", index);
       return -EINVAL;
     }
 
@@ -125,7 +125,7 @@ static int mod_relocate(FAR struct mod_loadinfo_s *loadinfo, int relidx)
       ret = mod_readrel(loadinfo, relsec, i, &rel);
       if (ret < 0)
         {
-          serr("Section %d reloc %d: Failed to read relocation entry: %d\n",
+          serr("ERROR: Section %d reloc %d: Failed to read relocation entry: %d\n",
                relidx, i, ret);
           return ret;
         }
@@ -141,7 +141,7 @@ static int mod_relocate(FAR struct mod_loadinfo_s *loadinfo, int relidx)
       ret = mod_readsym(loadinfo, symidx, &sym);
       if (ret < 0)
         {
-          serr("Section %d reloc %d: Failed to read symbol[%d]: %d\n",
+          serr("ERROR: Section %d reloc %d: Failed to read symbol[%d]: %d\n",
                relidx, i, symidx, ret);
           return ret;
         }
@@ -163,13 +163,13 @@ static int mod_relocate(FAR struct mod_loadinfo_s *loadinfo, int relidx)
 
           if (ret == -ESRCH)
             {
-              serr("Section %d reloc %d: Undefined symbol[%d] has no name: %d\n",
+              serr("ERROR: Section %d reloc %d: Undefined symbol[%d] has no name: %d\n",
                   relidx, i, symidx, ret);
               psym = NULL;
             }
           else
             {
-              serr("Section %d reloc %d: Failed to get value of symbol[%d]: %d\n",
+              serr("ERROR: Section %d reloc %d: Failed to get value of symbol[%d]: %d\n",
                   relidx, i, symidx, ret);
               return ret;
             }
@@ -179,7 +179,7 @@ static int mod_relocate(FAR struct mod_loadinfo_s *loadinfo, int relidx)
 
       if (rel.r_offset < 0 || rel.r_offset > dstsec->sh_size - sizeof(uint32_t))
         {
-          serr("Section %d reloc %d: Relocation address out of range, offset %d size %d\n",
+          serr("ERROR: Section %d reloc %d: Relocation address out of range, offset %d size %d\n",
                relidx, i, rel.r_offset, dstsec->sh_size);
           return -EINVAL;
         }
@@ -201,7 +201,7 @@ static int mod_relocate(FAR struct mod_loadinfo_s *loadinfo, int relidx)
 
 static int mod_relocateadd(FAR struct mod_loadinfo_s *loadinfo, int relidx)
 {
-  serr("Not implemented\n");
+  serr("ERROR: Not implemented\n");
   return -ENOSYS;
 }
 
@@ -242,7 +242,7 @@ int mod_bind(FAR struct mod_loadinfo_s *loadinfo)
   ret = mod_allocbuffer(loadinfo);
   if (ret < 0)
     {
-      serr("mod_allocbuffer failed: %d\n", ret);
+      serr("ERROR: mod_allocbuffer failed: %d\n", ret);
       return -ENOMEM;
     }
 
diff --git a/sched/module/mod_init.c b/sched/module/mod_init.c
index 3d2f659b6a..b46d38912c 100644
--- a/sched/module/mod_init.c
+++ b/sched/module/mod_init.c
@@ -102,7 +102,7 @@ static inline int mod_filelen(FAR struct mod_loadinfo_s *loadinfo,
   if (ret < 0)
     {
       int errval = errno;
-      serr("Failed to stat file: %d\n", errval);
+      serr("ERROR: Failed to stat file: %d\n", errval);
       return -errval;
     }
 
@@ -110,7 +110,7 @@ static inline int mod_filelen(FAR struct mod_loadinfo_s *loadinfo,
 
   if (!S_ISREG(buf.st_mode))
     {
-      serr("Not a regular file.  mode: %d\n", buf.st_mode);
+      serr("ERROR: Not a regular file.  mode: %d\n", buf.st_mode);
       return -ENOENT;
     }
 
@@ -157,7 +157,7 @@ int mod_initialize(FAR const char *filename,
   ret = mod_filelen(loadinfo, filename);
   if (ret < 0)
     {
-      serr("mod_filelen failed: %d\n", ret);
+      serr("ERROR: mod_filelen failed: %d\n", ret);
       return ret;
     }
 
@@ -167,7 +167,7 @@ int mod_initialize(FAR const char *filename,
   if (loadinfo->filfd < 0)
     {
       int errval = errno;
-      serr("Failed to open ELF binary %s: %d\n", filename, errval);
+      serr("ERROR: Failed to open ELF binary %s: %d\n", filename, errval);
       return -errval;
     }
 
@@ -177,7 +177,7 @@ int mod_initialize(FAR const char *filename,
                     sizeof(Elf32_Ehdr), 0);
   if (ret < 0)
     {
-      serr("Failed to read ELF header: %d\n", ret);
+      serr("ERROR: Failed to read ELF header: %d\n", ret);
       return ret;
     }
 
@@ -196,7 +196,7 @@ int mod_initialize(FAR const char *filename,
        * is not correctly formed.
        */
 
-      serr("Bad ELF header: %d\n", ret);
+      serr("ERROR: Bad ELF header: %d\n", ret);
       return ret;
     }
 
diff --git a/sched/module/mod_insmod.c b/sched/module/mod_insmod.c
index 0b5c681da7..7ade292e6a 100644
--- a/sched/module/mod_insmod.c
+++ b/sched/module/mod_insmod.c
@@ -58,8 +58,8 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_FEATURES, CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be
- * defined or CONFIG_MODULE_DUMPBUFFER does nothing.
+/* CONFIG_DEBUG_INFO, and CONFIG_DEBUG_BINFMT have to be defined or
+ * CONFIG_MODULE_DUMPBUFFER does nothing.
  */
 
 #if !defined(CONFIG_DEBUG_INFO) || !defined (CONFIG_DEBUG_BINFMT)
@@ -84,55 +84,55 @@
  * Name: mod_dumploadinfo
  ****************************************************************************/
 
-#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_BINFMT)
+#if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_BINFMT)
 static void mod_dumploadinfo(FAR struct mod_loadinfo_s *loadinfo)
 {
   int i;
 
-  serr("LOAD_INFO:\n");
-  serr("  textalloc:    %08lx\n", (long)loadinfo->textalloc);
-  serr("  datastart:    %08lx\n", (long)loadinfo->datastart);
-  serr("  textsize:     %ld\n",   (long)loadinfo->textsize);
-  serr("  datasize:     %ld\n",   (long)loadinfo->datasize);
-  serr("  filelen:      %ld\n",   (long)loadinfo->filelen);
-  serr("  filfd:        %d\n",    loadinfo->filfd);
-  serr("  symtabidx:    %d\n",    loadinfo->symtabidx);
-  serr("  strtabidx:    %d\n",    loadinfo->strtabidx);
-
-  serr("ELF Header:\n");
-  serr("  e_ident:      %02x %02x %02x %02x\n",
+  sinfo("LOAD_INFO:\n");
+  sinfo("  textalloc:    %08lx\n", (long)loadinfo->textalloc);
+  sinfo("  datastart:    %08lx\n", (long)loadinfo->datastart);
+  sinfo("  textsize:     %ld\n",   (long)loadinfo->textsize);
+  sinfo("  datasize:     %ld\n",   (long)loadinfo->datasize);
+  sinfo("  filelen:      %ld\n",   (long)loadinfo->filelen);
+  sinfo("  filfd:        %d\n",    loadinfo->filfd);
+  sinfo("  symtabidx:    %d\n",    loadinfo->symtabidx);
+  sinfo("  strtabidx:    %d\n",    loadinfo->strtabidx);
+
+  sinfo("ELF Header:\n");
+  sinfo("  e_ident:      %02x %02x %02x %02x\n",
     loadinfo->ehdr.e_ident[0], loadinfo->ehdr.e_ident[1],
     loadinfo->ehdr.e_ident[2], loadinfo->ehdr.e_ident[3]);
-  serr("  e_type:       %04x\n",  loadinfo->ehdr.e_type);
-  serr("  e_machine:    %04x\n",  loadinfo->ehdr.e_machine);
-  serr("  e_version:    %08x\n",  loadinfo->ehdr.e_version);
-  serr("  e_entry:      %08lx\n", (long)loadinfo->ehdr.e_entry);
-  serr("  e_phoff:      %d\n",    loadinfo->ehdr.e_phoff);
-  serr("  e_shoff:      %d\n",    loadinfo->ehdr.e_shoff);
-  serr("  e_flags:      %08x\n" , loadinfo->ehdr.e_flags);
-  serr("  e_ehsize:     %d\n",    loadinfo->ehdr.e_ehsize);
-  serr("  e_phentsize:  %d\n",    loadinfo->ehdr.e_phentsize);
-  serr("  e_phnum:      %d\n",    loadinfo->ehdr.e_phnum);
-  serr("  e_shentsize:  %d\n",    loadinfo->ehdr.e_shentsize);
-  serr("  e_shnum:      %d\n",    loadinfo->ehdr.e_shnum);
-  serr("  e_shstrndx:   %d\n",    loadinfo->ehdr.e_shstrndx);
+  sinfo("  e_type:       %04x\n",  loadinfo->ehdr.e_type);
+  sinfo("  e_machine:    %04x\n",  loadinfo->ehdr.e_machine);
+  sinfo("  e_version:    %08x\n",  loadinfo->ehdr.e_version);
+  sinfo("  e_entry:      %08lx\n", (long)loadinfo->ehdr.e_entry);
+  sinfo("  e_phoff:      %d\n",    loadinfo->ehdr.e_phoff);
+  sinfo("  e_shoff:      %d\n",    loadinfo->ehdr.e_shoff);
+  sinfo("  e_flags:      %08x\n" , loadinfo->ehdr.e_flags);
+  sinfo("  e_ehsize:     %d\n",    loadinfo->ehdr.e_ehsize);
+  sinfo("  e_phentsize:  %d\n",    loadinfo->ehdr.e_phentsize);
+  sinfo("  e_phnum:      %d\n",    loadinfo->ehdr.e_phnum);
+  sinfo("  e_shentsize:  %d\n",    loadinfo->ehdr.e_shentsize);
+  sinfo("  e_shnum:      %d\n",    loadinfo->ehdr.e_shnum);
+  sinfo("  e_shstrndx:   %d\n",    loadinfo->ehdr.e_shstrndx);
 
   if (loadinfo->shdr && loadinfo->ehdr.e_shnum > 0)
     {
       for (i = 0; i < loadinfo->ehdr.e_shnum; i++)
         {
           FAR Elf32_Shdr *shdr = &loadinfo->shdr[i];
-          serr("Sections %d:\n", i);
-          serr("  sh_name:      %08x\n", shdr->sh_name);
-          serr("  sh_type:      %08x\n", shdr->sh_type);
-          serr("  sh_flags:     %08x\n", shdr->sh_flags);
-          serr("  sh_addr:      %08x\n", shdr->sh_addr);
-          serr("  sh_offset:    %d\n",   shdr->sh_offset);
-          serr("  sh_size:      %d\n",   shdr->sh_size);
-          serr("  sh_link:      %d\n",   shdr->sh_link);
-          serr("  sh_info:      %d\n",   shdr->sh_info);
-          serr("  sh_addralign: %d\n",   shdr->sh_addralign);
-          serr("  sh_entsize:   %d\n",   shdr->sh_entsize);
+          sinfo("Sections %d:\n", i);
+          sinfo("  sh_name:      %08x\n", shdr->sh_name);
+          sinfo("  sh_type:      %08x\n", shdr->sh_type);
+          sinfo("  sh_flags:     %08x\n", shdr->sh_flags);
+          sinfo("  sh_addr:      %08x\n", shdr->sh_addr);
+          sinfo("  sh_offset:    %d\n",   shdr->sh_offset);
+          sinfo("  sh_size:      %d\n",   shdr->sh_size);
+          sinfo("  sh_link:      %d\n",   shdr->sh_link);
+          sinfo("  sh_info:      %d\n",   shdr->sh_info);
+          sinfo("  sh_addralign: %d\n",   shdr->sh_addralign);
+          sinfo("  sh_entsize:   %d\n",   shdr->sh_entsize);
         }
     }
 }
@@ -212,7 +212,7 @@ int insmod(FAR const char *filename, FAR const char *modulename)
   mod_dumploadinfo(&loadinfo);
   if (ret != 0)
     {
-      serr("ERROR: Failed to initialize to load module: %d\n", ret);
+      sinfo("ERROR: Failed to initialize to load module: %d\n", ret);
       goto errout_with_lock;
     }
 
@@ -221,7 +221,7 @@ int insmod(FAR const char *filename, FAR const char *modulename)
   modp = (FAR struct module_s *)kmm_zalloc(sizeof(struct module_s));
   if (ret != 0)
     {
-      serr("Failed to initialize for load of ELF program: %d\n", ret);
+      sinfo("Failed to initialize for load of ELF program: %d\n", ret);
       goto errout_with_loadinfo;
     }
 
@@ -235,7 +235,7 @@ int insmod(FAR const char *filename, FAR const char *modulename)
   mod_dumploadinfo(&loadinfo);
   if (ret != 0)
     {
-      serr("Failed to load ELF program binary: %d\n", ret);
+      sinfo("Failed to load ELF program binary: %d\n", ret);
       goto errout_with_registry_entry;
     }
 
@@ -244,7 +244,7 @@ int insmod(FAR const char *filename, FAR const char *modulename)
   ret = mod_bind(&loadinfo);
   if (ret != 0)
     {
-      serr("Failed to bind symbols program binary: %d\n", ret);
+      sinfo("Failed to bind symbols program binary: %d\n", ret);
       goto errout_with_load;
     }
 
@@ -269,7 +269,7 @@ int insmod(FAR const char *filename, FAR const char *modulename)
   ret = initializer(&modp->uninitializer, &modp->arg);
   if (ret < 0)
     {
-      serr("Failed to initialize the module: %d\n", ret);
+      sinfo("Failed to initialize the module: %d\n", ret);
       goto errout_with_load;
     }
 
diff --git a/sched/module/mod_iobuffer.c b/sched/module/mod_iobuffer.c
index 82640606e8..f2d86c69ce 100644
--- a/sched/module/mod_iobuffer.c
+++ b/sched/module/mod_iobuffer.c
@@ -75,7 +75,7 @@ int mod_allocbuffer(FAR struct mod_loadinfo_s *loadinfo)
       loadinfo->iobuffer = (FAR uint8_t *)kmm_malloc(CONFIG_MODULE_BUFFERSIZE);
       if (!loadinfo->iobuffer)
         {
-          serr("Failed to allocate an I/O buffer\n");
+          serr("ERROR: Failed to allocate an I/O buffer\n");
           return -ENOMEM;
         }
 
@@ -111,7 +111,7 @@ int mod_reallocbuffer(FAR struct mod_loadinfo_s *loadinfo, size_t increment)
    buffer = kmm_realloc((FAR void *)loadinfo->iobuffer, newsize);
    if (!buffer)
     {
-      serr("Failed to reallocate the I/O buffer\n");
+      serr("ERROR: Failed to reallocate the I/O buffer\n");
       return -ENOMEM;
     }
 
diff --git a/sched/module/mod_read.c b/sched/module/mod_read.c
index 38c2f8697e..910f48d539 100644
--- a/sched/module/mod_read.c
+++ b/sched/module/mod_read.c
@@ -126,7 +126,7 @@ int mod_read(FAR struct mod_loadinfo_s *loadinfo, FAR uint8_t *buffer,
       if (rpos != offset)
         {
           int errval = errno;
-          serr("Failed to seek to position %lu: %d\n",
+          serr("ERROR: Failed to seek to position %lu: %d\n",
                (unsigned long)offset, errval);
           return -errval;
         }
@@ -142,14 +142,14 @@ int mod_read(FAR struct mod_loadinfo_s *loadinfo, FAR uint8_t *buffer,
 
            if (errval != EINTR)
              {
-               serr("Read from offset %lu failed: %d\n",
+               serr("ERROR: Read from offset %lu failed: %d\n",
                     (unsigned long)offset, errval);
                return -errval;
              }
          }
        else if (nbytes == 0)
          {
-           serr("Unexpected end of file\n");
+           serr("ERROR: Unexpected end of file\n");
            return -ENODATA;
          }
        else
diff --git a/sched/module/mod_sections.c b/sched/module/mod_sections.c
index 6eeeb398ff..9aa8cb43fd 100644
--- a/sched/module/mod_sections.c
+++ b/sched/module/mod_sections.c
@@ -85,7 +85,7 @@ static inline int mod_sectname(FAR struct mod_loadinfo_s *loadinfo,
   shstrndx = loadinfo->ehdr.e_shstrndx;
   if (shstrndx == SHN_UNDEF)
     {
-      serr("No section header string table\n");
+      serr("ERROR: No section header string table\n");
       return -EINVAL;
     }
 
@@ -118,7 +118,7 @@ static inline int mod_sectname(FAR struct mod_loadinfo_s *loadinfo,
         {
           if (loadinfo->filelen <= offset)
             {
-              serr("At end of file\n");
+              serr("ERROR: At end of file\n");
               return -EINVAL;
             }
 
@@ -131,7 +131,7 @@ static inline int mod_sectname(FAR struct mod_loadinfo_s *loadinfo,
       ret = mod_read(loadinfo, buffer, readlen, offset);
       if (ret < 0)
         {
-          serr("Failed to read section name\n");
+          serr("ERROR: Failed to read section name: %d\n", ret);
           return ret;
         }
 
@@ -151,7 +151,7 @@ static inline int mod_sectname(FAR struct mod_loadinfo_s *loadinfo,
       ret = mod_reallocbuffer(loadinfo, CONFIG_MODULE_BUFFERINCR);
       if (ret < 0)
         {
-          serr("mod_reallocbuffer failed: %d\n", ret);
+          serr("ERROR: mod_reallocbuffer failed: %d\n", ret);
           return ret;
         }
     }
@@ -188,7 +188,7 @@ int mod_loadshdrs(FAR struct mod_loadinfo_s *loadinfo)
 
   if (loadinfo->ehdr.e_shnum < 1)
     {
-      serr("No sections(?)\n");
+      serr("ERROR: No sections(?)\n");
       return -EINVAL;
     }
 
@@ -197,7 +197,7 @@ int mod_loadshdrs(FAR struct mod_loadinfo_s *loadinfo)
   shdrsize = (size_t)loadinfo->ehdr.e_shentsize * (size_t)loadinfo->ehdr.e_shnum;
   if (loadinfo->ehdr.e_shoff + shdrsize > loadinfo->filelen)
     {
-      serr("Insufficent space in file for section header table\n");
+      serr("ERROR: Insufficent space in file for section header table\n");
       return -ESPIPE;
     }
 
@@ -206,7 +206,7 @@ int mod_loadshdrs(FAR struct mod_loadinfo_s *loadinfo)
   loadinfo->shdr = (FAR FAR Elf32_Shdr *)kmm_malloc(shdrsize);
   if (!loadinfo->shdr)
     {
-      serr("Failed to allocate the section header table. Size: %ld\n",
+      serr("ERROR: Failed to allocate the section header table. Size: %ld\n",
            (long)shdrsize);
       return -ENOMEM;
     }
@@ -217,7 +217,7 @@ int mod_loadshdrs(FAR struct mod_loadinfo_s *loadinfo)
                     loadinfo->ehdr.e_shoff);
   if (ret < 0)
     {
-      serr("Failed to read section header table: %d\n", ret);
+      serr("ERROR: Failed to read section header table: %d\n", ret);
     }
 
   return ret;
@@ -256,7 +256,7 @@ int mod_findsection(FAR struct mod_loadinfo_s *loadinfo,
       ret  = mod_sectname(loadinfo, shdr);
       if (ret < 0)
         {
-          serr("mod_sectname failed: %d\n", ret);
+          serr("ERROR: mod_sectname failed: %d\n", ret);
           return ret;
         }
 
diff --git a/sched/module/mod_symbols.c b/sched/module/mod_symbols.c
index d0e7c3ddf6..3a42f314f3 100644
--- a/sched/module/mod_symbols.c
+++ b/sched/module/mod_symbols.c
@@ -93,7 +93,7 @@ static int mod_symname(FAR struct mod_loadinfo_s *loadinfo,
 
   if (sym->st_name == 0)
     {
-      serr("Symbol has no name\n");
+      serr("ERROR: Symbol has no name\n");
       return -ESRCH;
     }
 
@@ -112,7 +112,7 @@ static int mod_symname(FAR struct mod_loadinfo_s *loadinfo,
         {
           if (loadinfo->filelen <= offset)
             {
-              serr("At end of file\n");
+              serr("ERROR: At end of file\n");
               return -EINVAL;
             }
 
@@ -125,7 +125,7 @@ static int mod_symname(FAR struct mod_loadinfo_s *loadinfo,
       ret = mod_read(loadinfo, buffer, readlen, offset);
       if (ret < 0)
         {
-          serr("mod_read failed: %d\n", ret);
+          serr("ERROR: mod_read failed: %d\n", ret);
           return ret;
         }
 
@@ -145,7 +145,7 @@ static int mod_symname(FAR struct mod_loadinfo_s *loadinfo,
       ret = mod_reallocbuffer(loadinfo, CONFIG_MODULE_BUFFERINCR);
       if (ret < 0)
         {
-          serr("mod_reallocbuffer failed: %d\n", ret);
+          serr("ERROR: mod_reallocbuffer failed: %d\n", ret);
           return ret;
         }
     }
@@ -191,7 +191,7 @@ int mod_findsymtab(FAR struct mod_loadinfo_s *loadinfo)
 
   if (loadinfo->symtabidx == 0)
     {
-      serr("No symbols in ELF file\n");
+      serr("ERROR: No symbols in ELF file\n");
       return -EINVAL;
     }
 
@@ -225,7 +225,7 @@ int mod_readsym(FAR struct mod_loadinfo_s *loadinfo, int index,
 
   if (index < 0 || index > (symtab->sh_size / sizeof(Elf32_Sym)))
     {
-      serr("Bad relocation symbol index: %d\n", index);
+      serr("ERROR: Bad relocation symbol index: %d\n", index);
       return -EINVAL;
     }
 
@@ -273,7 +273,7 @@ int mod_symvalue(FAR struct mod_loadinfo_s *loadinfo, FAR Elf32_Sym *sym)
       {
         /* NuttX ELF modules should be compiled with -fno-common. */
 
-        serr("SHN_COMMON: Re-compile with -fno-common\n");
+        serr("ERROR: SHN_COMMON: Re-compile with -fno-common\n");
         return -ENOSYS;
       }
 
@@ -298,7 +298,7 @@ int mod_symvalue(FAR struct mod_loadinfo_s *loadinfo, FAR Elf32_Sym *sym)
              * indicate the nameless symbol.
              */
 
-            serr("SHN_UNDEF: Failed to get symbol name: %d\n", ret);
+            serr("ERROR: SHN_UNDEF: Failed to get symbol name: %d\n", ret);
             return ret;
           }
 
@@ -315,7 +315,8 @@ int mod_symvalue(FAR struct mod_loadinfo_s *loadinfo, FAR Elf32_Sym *sym)
 #endif
         if (!symbol)
           {
-            serr("SHN_UNDEF: Exported symbol \"%s\" not found\n", loadinfo->iobuffer);
+            serr("ERROR: SHN_UNDEF: Exported symbol \"%s\" not found\n",
+                 loadinfo->iobuffer);
             return -ENOENT;
           }
 
diff --git a/sched/module/mod_verify.c b/sched/module/mod_verify.c
index 401d1283f2..5ad4d74596 100644
--- a/sched/module/mod_verify.c
+++ b/sched/module/mod_verify.c
@@ -79,7 +79,7 @@ int mod_verifyheader(FAR const Elf32_Ehdr *ehdr)
 {
   if (!ehdr)
     {
-      serr("NULL ELF header!");
+      serr("ERROR: NULL ELF header!");
       return -ENOEXEC;
     }
 
@@ -96,7 +96,7 @@ int mod_verifyheader(FAR const Elf32_Ehdr *ehdr)
 
   if (ehdr->e_type != ET_REL)
     {
-      serr("Not a relocatable file: e_type=%d\n", ehdr->e_type);
+      serr("ERROR: Not a relocatable file: e_type=%d\n", ehdr->e_type);
       return -EINVAL;
     }
 
@@ -104,7 +104,7 @@ int mod_verifyheader(FAR const Elf32_Ehdr *ehdr)
 
   if (up_checkarch(ehdr))
     {
-      serr("Not a supported architecture\n");
+      serr("ERROR: Not a supported architecture\n");
       return -ENOEXEC;
     }
 
diff --git a/sched/paging/pg_miss.c b/sched/paging/pg_miss.c
index cdc709dc17..2b6b44cb0d 100644
--- a/sched/paging/pg_miss.c
+++ b/sched/paging/pg_miss.c
@@ -132,7 +132,7 @@ void pg_miss(void)
    * always present in memory.
    */
 
-  pgllerr("Blocking TCB: %p PID: %d\n", ftcb, ftcb->pid);
+  pgllinfo("Blocking TCB: %p PID: %d\n", ftcb, ftcb->pid);
   DEBUGASSERT(g_pgworker != ftcb->pid);
 
   /* Block the currently executing task
@@ -171,7 +171,7 @@ void pg_miss(void)
 
   if (!g_pftcb)
     {
-      pgllerr("Signaling worker. PID: %d\n", g_pgworker);
+      pgllinfo("Signaling worker. PID: %d\n", g_pgworker);
       kill(g_pgworker, SIGWORK);
     }
 }
diff --git a/sched/paging/pg_worker.c b/sched/paging/pg_worker.c
index cfefb9f233..b7385dcb62 100644
--- a/sched/paging/pg_worker.c
+++ b/sched/paging/pg_worker.c
@@ -198,7 +198,7 @@ static void pg_callback(FAR struct tcb_s *tcb, int result)
 
   /* Signal the page fill worker thread (in any event) */
 
-  pgllerr("Signaling worker. PID: %d\n", g_pgworker);
+  pgllinfo("Signaling worker. PID: %d\n", g_pgworker);
   kill(g_pgworker, SIGWORK);
 }
 #endif
@@ -308,7 +308,7 @@ static inline bool pg_dequeue(void)
            * virtual address space -- just restart it.
            */
 
-          pgllerr("Restarting TCB: %p\n", g_pftcb);
+          pgllinfo("Restarting TCB: %p\n", g_pftcb);
           up_unblock_task(g_pftcb);
         }
     }
@@ -422,7 +422,7 @@ static inline bool pg_startfill(void)
       return true;
     }
 
-  pgllerr("Queue empty\n");
+  pgllinfo("Queue empty\n");
   return false;
 }
 
@@ -490,7 +490,7 @@ static inline void pg_fillcomplete(void)
    * received the fill ready-to-run.
    */
 
-  pgllerr("Restarting TCB: %p\n", g_pftcb);
+  pgllinfo("Restarting TCB: %p\n", g_pftcb);
   up_unblock_task(g_pftcb);
 }
 
@@ -532,7 +532,7 @@ int pg_worker(int argc, char *argv[])
    * fill completions should occur while this thread sleeps.
    */
 
-  pgllerr("Started\n");
+  pgllinfo("Started\n");
   (void)up_irq_save();
   for (; ; )
     {
@@ -580,7 +580,7 @@ int pg_worker(int argc, char *argv[])
                * task that was blocked waiting for this page fill.
                */
 
-              pgllerr("Restarting TCB: %p\n", g_pftcb);
+              pgllinfo("Restarting TCB: %p\n", g_pftcb);
               up_unblock_task(g_pftcb);
 
               /* Yes .. Start the next asynchronous fill.  Check the return
@@ -608,7 +608,7 @@ int pg_worker(int argc, char *argv[])
 #ifdef CONFIG_PAGING_TIMEOUT_TICKS
           else
             {
-              llerr("Timeout!\n");
+              pgllerr("ERROR: Timeout!\n");
               ASSERT(clock_systimer() - g_starttime < CONFIG_PAGING_TIMEOUT_TICKS);
             }
 #endif
diff --git a/sched/pthread/pthread_completejoin.c b/sched/pthread/pthread_completejoin.c
index 3f39f59e74..b516c9defd 100644
--- a/sched/pthread/pthread_completejoin.c
+++ b/sched/pthread/pthread_completejoin.c
@@ -214,7 +214,7 @@ int pthread_completejoin(pid_t pid, FAR void *exit_value)
   pjoin = pthread_findjoininfo(group, pid);
   if (!pjoin)
     {
-      serr("Could not find join info, pid=%d\n", pid);
+      serr("ERROR: Could not find join info, pid=%d\n", pid);
       (void)pthread_givesemaphore(&group->tg_joinsem);
       return ERROR;
     }
@@ -271,7 +271,7 @@ int pthread_completejoin(pid_t pid, FAR void *exit_value)
 void pthread_destroyjoin(FAR struct task_group_s *group,
                          FAR struct join_s *pjoin)
 {
-  serr("pjoin=0x%p\n", pjoin);
+  sinfo("pjoin=0x%p\n", pjoin);
 
   /* Remove the join info from the set of joins */
 
diff --git a/sched/pthread/pthread_condbroadcast.c b/sched/pthread/pthread_condbroadcast.c
index 623698c459..35427ad48a 100644
--- a/sched/pthread/pthread_condbroadcast.c
+++ b/sched/pthread/pthread_condbroadcast.c
@@ -71,7 +71,7 @@ int pthread_cond_broadcast(FAR pthread_cond_t *cond)
   int ret = OK;
   int sval;
 
-  serr("cond=0x%p\n", cond);
+  sinfo("cond=0x%p\n", cond);
 
   if (!cond)
     {
@@ -118,7 +118,7 @@ int pthread_cond_broadcast(FAR pthread_cond_t *cond)
       sched_unlock();
     }
 
-  serr("Returning %d\n", ret);
+  sinfo("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/sched/pthread/pthread_conddestroy.c b/sched/pthread/pthread_conddestroy.c
index 904cd08b4c..bff0c3c28b 100644
--- a/sched/pthread/pthread_conddestroy.c
+++ b/sched/pthread/pthread_conddestroy.c
@@ -68,7 +68,7 @@ int pthread_cond_destroy(FAR pthread_cond_t *cond)
 {
   int ret = OK;
 
-  serr("cond=0x%p\n", cond);
+  sinfo("cond=0x%p\n", cond);
 
   if (!cond)
     {
@@ -82,7 +82,7 @@ int pthread_cond_destroy(FAR pthread_cond_t *cond)
       ret = EINVAL;
     }
 
-  serr("Returning %d\n", ret);
+  sinfo("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/sched/pthread/pthread_condinit.c b/sched/pthread/pthread_condinit.c
index 768ed19399..73a6423c69 100644
--- a/sched/pthread/pthread_condinit.c
+++ b/sched/pthread/pthread_condinit.c
@@ -69,7 +69,7 @@ int pthread_cond_init(FAR pthread_cond_t *cond, FAR const pthread_condattr_t *at
 {
   int ret = OK;
 
-  serr("cond=0x%p attr=0x%p\n", cond, attr);
+  sinfo("cond=0x%p attr=0x%p\n", cond, attr);
 
   if (!cond)
     {
@@ -85,7 +85,7 @@ int pthread_cond_init(FAR pthread_cond_t *cond, FAR const pthread_condattr_t *at
       ret = EINVAL;
     }
 
-  serr("Returning %d\n", ret);
+  sinfo("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/sched/pthread/pthread_condsignal.c b/sched/pthread/pthread_condsignal.c
index f9f19973f5..8936572ac5 100644
--- a/sched/pthread/pthread_condsignal.c
+++ b/sched/pthread/pthread_condsignal.c
@@ -70,7 +70,7 @@ int pthread_cond_signal(FAR pthread_cond_t *cond)
   int ret = OK;
   int sval;
 
-  serr("cond=0x%p\n", cond);
+  sinfo("cond=0x%p\n", cond);
 
   if (!cond)
     {
@@ -101,16 +101,16 @@ int pthread_cond_signal(FAR pthread_cond_t *cond)
            * operation that will guarantee this to be so.
            */
 
-          serr("sval=%d\n", sval);
+          sinfo("sval=%d\n", sval);
           if (sval < 0)
             {
-              serr("Signalling...\n");
+              sinfo("Signalling...\n");
               ret = pthread_givesemaphore((FAR sem_t *)&cond->sem);
             }
         }
     }
 
-  serr("Returning %d\n", ret);
+  sinfo("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/sched/pthread/pthread_condtimedwait.c b/sched/pthread/pthread_condtimedwait.c
index 2b7606893f..7950c5b5fc 100644
--- a/sched/pthread/pthread_condtimedwait.c
+++ b/sched/pthread/pthread_condtimedwait.c
@@ -174,7 +174,7 @@ int pthread_cond_timedwait(FAR pthread_cond_t *cond, FAR pthread_mutex_t *mutex,
   int ret = OK;
   int status;
 
-  serr("cond=0x%p mutex=0x%p abstime=0x%p\n", cond, mutex, abstime);
+  sinfo("cond=0x%p mutex=0x%p abstime=0x%p\n", cond, mutex, abstime);
 
   DEBUGASSERT(rtcb->waitdog == NULL);
 
@@ -212,7 +212,7 @@ int pthread_cond_timedwait(FAR pthread_cond_t *cond, FAR pthread_mutex_t *mutex,
         }
       else
         {
-          serr("Give up mutex...\n");
+          sinfo("Give up mutex...\n");
 
           /* We must disable pre-emption and interrupts here so that
            * the time stays valid until the wait begins.   This adds
@@ -292,7 +292,7 @@ int pthread_cond_timedwait(FAR pthread_cond_t *cond, FAR pthread_mutex_t *mutex,
 
                           if (get_errno() == EINTR)
                             {
-                              serr("Timedout!\n");
+                              serr("ERROR: Timedout!\n");
                               ret = ETIMEDOUT;
                             }
                           else
@@ -312,7 +312,7 @@ int pthread_cond_timedwait(FAR pthread_cond_t *cond, FAR pthread_mutex_t *mutex,
 
                   /* Reacquire the mutex (retaining the ret). */
 
-                  serr("Re-locking...\n");
+                  sinfo("Re-locking...\n");
                   status = pthread_takesemaphore((FAR sem_t *)&mutex->sem);
                   if (!status)
                     {
@@ -338,7 +338,7 @@ int pthread_cond_timedwait(FAR pthread_cond_t *cond, FAR pthread_mutex_t *mutex,
         }
     }
 
-  serr("Returning %d\n", ret);
+  sinfo("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/sched/pthread/pthread_condwait.c b/sched/pthread/pthread_condwait.c
index b388d4d810..a9ad2ba91c 100644
--- a/sched/pthread/pthread_condwait.c
+++ b/sched/pthread/pthread_condwait.c
@@ -71,7 +71,7 @@ int pthread_cond_wait(FAR pthread_cond_t *cond, FAR pthread_mutex_t *mutex)
 {
   int ret;
 
-  serr("cond=0x%p mutex=0x%p\n", cond, mutex);
+  sinfo("cond=0x%p mutex=0x%p\n", cond, mutex);
 
   /* Make sure that non-NULL references were provided. */
 
@@ -90,7 +90,7 @@ int pthread_cond_wait(FAR pthread_cond_t *cond, FAR pthread_mutex_t *mutex)
     {
       /* Give up the mutex */
 
-      serr("Give up mutex / take cond\n");
+      sinfo("Give up mutex / take cond\n");
 
       sched_lock();
       mutex->pid = -1;
@@ -103,7 +103,7 @@ int pthread_cond_wait(FAR pthread_cond_t *cond, FAR pthread_mutex_t *mutex)
 
       /* Reacquire the mutex */
 
-      serr("Reacquire mutex...\n");
+      sinfo("Reacquire mutex...\n");
       ret |= pthread_takesemaphore((FAR sem_t *)&mutex->sem);
       if (!ret)
         {
@@ -111,7 +111,7 @@ int pthread_cond_wait(FAR pthread_cond_t *cond, FAR pthread_mutex_t *mutex)
         }
     }
 
-  serr("Returning %d\n", ret);
+  sinfo("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/sched/pthread/pthread_detach.c b/sched/pthread/pthread_detach.c
index 3da518fd30..0d165e2d23 100644
--- a/sched/pthread/pthread_detach.c
+++ b/sched/pthread/pthread_detach.c
@@ -82,7 +82,7 @@ int pthread_detach(pthread_t thread)
   FAR struct join_s *pjoin;
   int ret;
 
-  serr("Thread=%d group=%p\n", thread, group);
+  sinfo("Thread=%d group=%p\n", thread, group);
   DEBUGASSERT(group);
 
   /* Find the entry associated with this pthread. */
@@ -91,7 +91,7 @@ int pthread_detach(pthread_t thread)
   pjoin = pthread_findjoininfo(group, (pid_t)thread);
   if (!pjoin)
     {
-      serr("Could not find thread entry\n");
+      serr("ERROR: Could not find thread entry\n");
       ret = EINVAL;
     }
   else
@@ -121,6 +121,6 @@ int pthread_detach(pthread_t thread)
 
   (void)pthread_givesemaphore(&group->tg_joinsem);
 
-  serr("Returning %d\n", ret);
+  sinfo("Returning %d\n", ret);
   return ret;
 }
diff --git a/sched/pthread/pthread_exit.c b/sched/pthread/pthread_exit.c
index ed61e24b88..15b6240ee7 100644
--- a/sched/pthread/pthread_exit.c
+++ b/sched/pthread/pthread_exit.c
@@ -78,7 +78,7 @@ void pthread_exit(FAR void *exit_value)
   FAR struct tcb_s *tcb = this_task();
   int status;
 
-  serr("exit_value=%p\n", exit_value);
+  sinfo("exit_value=%p\n", exit_value);
 
   /* Block any signal actions that would awaken us while were
    * are performing the JOIN handshake.
diff --git a/sched/pthread/pthread_getaffinity.c b/sched/pthread/pthread_getaffinity.c
index bcf284ba43..817aa11a20 100644
--- a/sched/pthread/pthread_getaffinity.c
+++ b/sched/pthread/pthread_getaffinity.c
@@ -80,8 +80,8 @@ int pthread_getaffinity_np(pthread_t thread, size_t cpusetsize,
 {
   int ret;
 
-  serr("thread ID=%d cpusetsize=%d cpuset=%p\n",
-       (int)thread, (int)cpusetsize, cpusetsize);
+  sinfo("thread ID=%d cpusetsize=%d cpuset=%p\n",
+        (int)thread, (int)cpusetsize, cpusetsize);
 
   DEBUGASSERT(thread > 0 && cpusetsize == sizeof(cpu_set_t) &&
               cpuset != NULL);
diff --git a/sched/pthread/pthread_getschedparam.c b/sched/pthread/pthread_getschedparam.c
index 5e5bbb16b5..a3fe352c0c 100644
--- a/sched/pthread/pthread_getschedparam.c
+++ b/sched/pthread/pthread_getschedparam.c
@@ -88,7 +88,7 @@ int pthread_getschedparam(pthread_t thread, FAR int *policy,
 {
   int ret;
 
-  serr("Thread ID=%d policy=0x%p param=0x%p\n", thread, policy, param);
+  sinfo("Thread ID=%d policy=0x%p param=0x%p\n", thread, policy, param);
 
   if (!policy || !param)
     {
@@ -113,7 +113,7 @@ int pthread_getschedparam(pthread_t thread, FAR int *policy,
         }
     }
 
-  serr("Returning %d\n", ret);
+  sinfo("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/sched/pthread/pthread_join.c b/sched/pthread/pthread_join.c
index 933f40cddf..90628bb444 100644
--- a/sched/pthread/pthread_join.c
+++ b/sched/pthread/pthread_join.c
@@ -87,7 +87,7 @@ int pthread_join(pthread_t thread, FAR pthread_addr_t *pexit_value)
   FAR struct join_s *pjoin;
   int ret;
 
-  serr("thread=%d group=%p\n", thread, group);
+  sinfo("thread=%d group=%p\n", thread, group);
   DEBUGASSERT(group);
 
   /* First make sure that this is not an attempt to join to
@@ -121,7 +121,7 @@ int pthread_join(pthread_t thread, FAR pthread_addr_t *pexit_value)
 
       FAR struct tcb_s *tcb = sched_gettcb((pthread_t)thread);
 
-      serr("Could not find thread data\n");
+      serr("ERROR: Could not find thread data\n");
 
       /* Case (1) or (3) -- we can't tell which.  Assume (3) */
 
@@ -159,19 +159,19 @@ int pthread_join(pthread_t thread, FAR pthread_addr_t *pexit_value)
 
       if (pjoin->terminated)
         {
-          serr("Thread has terminated\n");
+          sinfo("Thread has terminated\n");
 
           /* Get the thread exit value from the terminated thread. */
 
           if (pexit_value)
             {
-              serr("exit_value=0x%p\n", pjoin->exit_value);
+              sinfo("exit_value=0x%p\n", pjoin->exit_value);
               *pexit_value = pjoin->exit_value;
             }
         }
       else
         {
-          serr("Thread is still running\n");
+          sinfo("Thread is still running\n");
 
           /* Relinquish the data set semaphore.  Since pre-emption is
            * disabled, we can be certain that no task has the
@@ -195,7 +195,7 @@ int pthread_join(pthread_t thread, FAR pthread_addr_t *pexit_value)
           if (pexit_value)
             {
              *pexit_value = pjoin->exit_value;
-              serr("exit_value=0x%p\n", pjoin->exit_value);
+              sinfo("exit_value=0x%p\n", pjoin->exit_value);
             }
 
           /* Post the thread's data semaphore so that the exiting thread
@@ -230,6 +230,6 @@ int pthread_join(pthread_t thread, FAR pthread_addr_t *pexit_value)
       ret = OK;
     }
 
-  serr("Returning %d\n", ret);
+  sinfo("Returning %d\n", ret);
   return ret;
 }
diff --git a/sched/pthread/pthread_mutexdestroy.c b/sched/pthread/pthread_mutexdestroy.c
index ece500f642..a6b945f670 100644
--- a/sched/pthread/pthread_mutexdestroy.c
+++ b/sched/pthread/pthread_mutexdestroy.c
@@ -72,7 +72,7 @@ int pthread_mutex_destroy(FAR pthread_mutex_t *mutex)
   int ret = OK;
   int status;
 
-  serr("mutex=0x%p\n", mutex);
+  sinfo("mutex=0x%p\n", mutex);
 
   if (!mutex)
     {
@@ -106,6 +106,6 @@ int pthread_mutex_destroy(FAR pthread_mutex_t *mutex)
       sched_unlock();
     }
 
-  serr("Returning %d\n", ret);
+  sinfo("Returning %d\n", ret);
   return ret;
 }
diff --git a/sched/pthread/pthread_mutexinit.c b/sched/pthread/pthread_mutexinit.c
index 74065d9530..31d18e2f46 100644
--- a/sched/pthread/pthread_mutexinit.c
+++ b/sched/pthread/pthread_mutexinit.c
@@ -75,7 +75,7 @@ int pthread_mutex_init(FAR pthread_mutex_t *mutex, FAR const pthread_mutexattr_t
   int ret       = OK;
   int status;
 
-  serr("mutex=0x%p attr=0x%p\n", mutex, attr);
+  sinfo("mutex=0x%p attr=0x%p\n", mutex, attr);
 
   if (!mutex)
     {
@@ -113,6 +113,6 @@ int pthread_mutex_init(FAR pthread_mutex_t *mutex, FAR const pthread_mutexattr_t
 #endif
     }
 
-  serr("Returning %d\n", ret);
+  sinfo("Returning %d\n", ret);
   return ret;
 }
diff --git a/sched/pthread/pthread_mutexlock.c b/sched/pthread/pthread_mutexlock.c
index 9a9d56ed37..ebd650df6f 100644
--- a/sched/pthread/pthread_mutexlock.c
+++ b/sched/pthread/pthread_mutexlock.c
@@ -106,7 +106,7 @@ int pthread_mutex_lock(FAR pthread_mutex_t *mutex)
   int mypid = (int)getpid();
   int ret = OK;
 
-  serr("mutex=0x%p\n", mutex);
+  sinfo("mutex=0x%p\n", mutex);
 
   if (!mutex)
     {
@@ -140,7 +140,7 @@ int pthread_mutex_lock(FAR pthread_mutex_t *mutex)
                * is like PTHREAD_MUTEX_ERRORCHECK)
                */
 
-              serr("Returning EDEADLK\n");
+              serr("ERROR: Returning EDEADLK\n");
               ret = EDEADLK;
             }
         }
@@ -166,7 +166,7 @@ int pthread_mutex_lock(FAR pthread_mutex_t *mutex)
       sched_unlock();
     }
 
-  serr("Returning %d\n", ret);
+  sinfo("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/sched/pthread/pthread_mutextrylock.c b/sched/pthread/pthread_mutextrylock.c
index 4249b17a74..825cb992a1 100644
--- a/sched/pthread/pthread_mutextrylock.c
+++ b/sched/pthread/pthread_mutextrylock.c
@@ -85,7 +85,7 @@ int pthread_mutex_trylock(FAR pthread_mutex_t *mutex)
 {
   int ret = OK;
 
-  serr("mutex=0x%p\n", mutex);
+  sinfo("mutex=0x%p\n", mutex);
 
   if (!mutex)
     {
@@ -149,7 +149,7 @@ int pthread_mutex_trylock(FAR pthread_mutex_t *mutex)
       sched_unlock();
     }
 
-  serr("Returning %d\n", ret);
+  sinfo("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/sched/pthread/pthread_mutexunlock.c b/sched/pthread/pthread_mutexunlock.c
index 385329a4e4..77b1c8f36e 100644
--- a/sched/pthread/pthread_mutexunlock.c
+++ b/sched/pthread/pthread_mutexunlock.c
@@ -82,7 +82,7 @@ int pthread_mutex_unlock(FAR pthread_mutex_t *mutex)
 {
   int ret = OK;
 
-  serr("mutex=0x%p\n", mutex);
+  sinfo("mutex=0x%p\n", mutex);
 
   if (!mutex)
     {
@@ -102,7 +102,7 @@ int pthread_mutex_unlock(FAR pthread_mutex_t *mutex)
         {
           /* No... return an error (default behavior is like PTHREAD_MUTEX_ERRORCHECK) */
 
-          serr("Holder=%d returning EPERM\n", mutex->pid);
+          serr(ERROR: "Holder=%d returning EPERM\n", mutex->pid);
           ret = EPERM;
         }
 
@@ -137,7 +137,7 @@ int pthread_mutex_unlock(FAR pthread_mutex_t *mutex)
       sched_unlock();
     }
 
-  serr("Returning %d\n", ret);
+  sinfo("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/sched/pthread/pthread_setaffinity.c b/sched/pthread/pthread_setaffinity.c
index c67d36f7d4..cf8ccf639f 100644
--- a/sched/pthread/pthread_setaffinity.c
+++ b/sched/pthread/pthread_setaffinity.c
@@ -82,8 +82,8 @@ int pthread_setaffinity_np(pthread_t thread, size_t cpusetsize,
 {
   int ret;
 
-  serr("thread ID=%d cpusetsize=%d cpuset=%p\n",
-       (int)thread, (int)cpusetsize, cpusetsize);
+  sinfo("thread ID=%d cpusetsize=%d cpuset=%p\n",
+        (int)thread, (int)cpusetsize, cpusetsize);
 
   DEBUGASSERT(thread > 0 && cpusetsize == sizeof(cpu_set_t) &&
               cpuset != NULL);
diff --git a/sched/pthread/pthread_setschedparam.c b/sched/pthread/pthread_setschedparam.c
index 5db0bde3da..3c04cfb023 100644
--- a/sched/pthread/pthread_setschedparam.c
+++ b/sched/pthread/pthread_setschedparam.c
@@ -103,7 +103,7 @@ int pthread_setschedparam(pthread_t thread, int policy,
 {
   int ret;
 
-  serr("thread ID=%d policy=%d param=0x%p\n", thread, policy, param);
+  sinfo("thread ID=%d policy=%d param=0x%p\n", thread, policy, param);
 
   /* Set the errno to some non-zero value (failsafe) */
 
diff --git a/sched/sched/sched_sporadic.c b/sched/sched/sched_sporadic.c
index 8969df7875..be16b6f473 100644
--- a/sched/sched/sched_sporadic.c
+++ b/sched/sched/sched_sporadic.c
@@ -1078,7 +1078,7 @@ int sched_sporadic_resume(FAR struct tcb_s *tcb)
                * failure from the standpoint of higher level logic.
                */
 
-              sllerr("Failed to allocate timer, nrepls=%d\n",
+              sllerr("ERROR: Failed to allocate timer, nrepls=%d\n",
                      sporadic->nrepls);
             }
         }
diff --git a/sched/semaphore/sem_holder.c b/sched/semaphore/sem_holder.c
index ea07b995fb..bb7a850511 100644
--- a/sched/semaphore/sem_holder.c
+++ b/sched/semaphore/sem_holder.c
@@ -116,7 +116,7 @@ static inline FAR struct semholder_s *sem_allocholder(sem_t *sem)
 #endif
   else
     {
-      serr("Insufficient pre-allocated holders\n");
+      serr("ERROR: Insufficient pre-allocated holders\n");
       pholder = NULL;
     }
 
@@ -283,7 +283,7 @@ static int sem_boostholderprio(FAR struct semholder_s *pholder,
 
   if (!sched_verifytcb(htcb))
     {
-      serr("TCB 0x%08x is a stale handle, counts lost\n", htcb);
+      serr("ERROR: TCB 0x%08x is a stale handle, counts lost\n", htcb);
       sem_freeholder(sem, pholder);
     }
 
@@ -321,7 +321,7 @@ static int sem_boostholderprio(FAR struct semholder_s *pholder,
                 }
               else
                 {
-                  serr("CONFIG_SEM_NNESTPRIO exceeded\n");
+                  serr("ERROR: CONFIG_SEM_NNESTPRIO exceeded\n");
                 }
             }
 
@@ -372,7 +372,7 @@ static int sem_boostholderprio(FAR struct semholder_s *pholder,
  * Name: sem_verifyholder
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_ASSERTIONS
 static int sem_verifyholder(FAR struct semholder_s *pholder, FAR sem_t *sem,
                             FAR void *arg)
 {
@@ -397,15 +397,15 @@ static int sem_verifyholder(FAR struct semholder_s *pholder, FAR sem_t *sem,
  * Name: sem_dumpholder
  ****************************************************************************/
 
-#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_SEM_PHDEBUG)
+#if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_SEM_PHDEBUG)
 static int sem_dumpholder(FAR struct semholder_s *pholder, FAR sem_t *sem,
                           FAR void *arg)
 {
 #if CONFIG_SEM_PREALLOCHOLDERS > 0
-  err("  %08x: %08x %08x %04x\n",
+  info("  %08x: %08x %08x %04x\n",
       pholder, pholder->flink, pholder->htcb, pholder->counts);
 #else
-  err("  %08x: %08x %04x\n", pholder, pholder->htcb, pholder->counts);
+  info("  %08x: %08x %04x\n", pholder, pholder->htcb, pholder->counts);
 #endif
   return 0;
 }
@@ -434,7 +434,7 @@ static int sem_restoreholderprio(FAR struct semholder_s *pholder,
 
   if (!sched_verifytcb(htcb))
     {
-      serr("TCB 0x%08x is a stale handle, counts lost\n", htcb);
+      serr("ERROR: TCB 0x%08x is a stale handle, counts lost\n", htcb);
       sem_freeholder(sem, pholder);
     }
 
@@ -648,7 +648,7 @@ static inline void sem_restorebaseprio_irq(FAR struct tcb_s *stcb,
    * should be at their base priority.
    */
 
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_ASSERTIONS
   else
     {
       (void)sem_foreachholder(sem, sem_verifyholder, NULL);
@@ -723,7 +723,7 @@ static inline void sem_restorebaseprio_task(FAR struct tcb_s *stcb,
    * should be at their base priority.
    */
 
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_ASSERTIONS
   else
     {
       (void)sem_foreachholder(sem, sem_verifyholder, NULL);
@@ -819,13 +819,13 @@ void sem_destroyholder(FAR sem_t *sem)
 #if CONFIG_SEM_PREALLOCHOLDERS > 0
   if (sem->hhead)
     {
-      serr("Semaphore destroyed with holders\n");
+      serr("ERROR: Semaphore destroyed with holders\n");
       (void)sem_foreachholder(sem, sem_recoverholders, NULL);
     }
 #else
   if (sem->holder.htcb)
     {
-      serr("Semaphore destroyed with holder\n");
+      serr("ERROR: Semaphore destroyed with holder\n");
     }
 
   sem->holder.htcb = NULL;
@@ -1039,7 +1039,9 @@ void sem_canceled(FAR struct tcb_s *stcb, FAR sem_t *sem)
 #if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_SEM_PHDEBUG)
 void sem_enumholders(FAR sem_t *sem)
 {
+#ifdef CONFIG_DEBUG_INFO
   (void)sem_foreachholder(sem, sem_dumpholder, NULL);
+#endif
 }
 #endif
 
diff --git a/sched/signal/sig_deliver.c b/sched/signal/sig_deliver.c
index 5d715c5ce0..7f676a14a1 100644
--- a/sched/signal/sig_deliver.c
+++ b/sched/signal/sig_deliver.c
@@ -86,7 +86,7 @@ void sig_deliver(FAR struct tcb_s *stcb)
   for (sigq = (FAR sigq_t *)stcb->sigpendactionq.head; (sigq); sigq = next)
     {
       next = sigq->flink;
-      serr("Sending signal sigq=0x%x\n", sigq);
+      sinfo("Sending signal sigq=0x%x\n", sigq);
 
       /* Remove the signal structure from the sigpendactionq and place it
        * in the sigpostedq.  NOTE:  Since signals are processed one at a
diff --git a/sched/signal/sig_dispatch.c b/sched/signal/sig_dispatch.c
index 7bf297a1be..31ce56d9eb 100644
--- a/sched/signal/sig_dispatch.c
+++ b/sched/signal/sig_dispatch.c
@@ -301,9 +301,9 @@ int sig_tcbdispatch(FAR struct tcb_s *stcb, siginfo_t *info)
   irqstate_t flags;
   int ret = OK;
 
-  serr("TCB=0x%08x signo=%d code=%d value=%d mask=%08x\n",
-       stcb, info->si_signo, info->si_code,
-       info->si_value.sival_int, stcb->sigprocmask);
+  sinfo("TCB=0x%08x signo=%d code=%d value=%d mask=%08x\n",
+        stcb, info->si_signo, info->si_code,
+        info->si_value.sival_int, stcb->sigprocmask);
 
   DEBUGASSERT(stcb != NULL && info != NULL);
 
diff --git a/sched/signal/sig_mqnotempty.c b/sched/signal/sig_mqnotempty.c
index b10832722e..b183514c1a 100644
--- a/sched/signal/sig_mqnotempty.c
+++ b/sched/signal/sig_mqnotempty.c
@@ -76,9 +76,9 @@ int sig_mqnotempty(int pid, int signo, void *sival_ptr)
   int ret;
 
 #ifdef CONFIG_CAN_PASS_STRUCTS
-  serr("pid=%p signo=%d value=%d\n", pid, signo, value.sival_int);
+  sinfo("pid=%p signo=%d value=%d\n", pid, signo, value.sival_int);
 #else
-  serr("pid=%p signo=%d sival_ptr=%p\n", pid, signo, sival_ptr);
+  sinfo("pid=%p signo=%d sival_ptr=%p\n", pid, signo, sival_ptr);
 #endif
 
   /* Verify that we can perform the signalling operation */
diff --git a/sched/signal/sig_queue.c b/sched/signal/sig_queue.c
index c931c9a664..6662030b34 100644
--- a/sched/signal/sig_queue.c
+++ b/sched/signal/sig_queue.c
@@ -98,9 +98,9 @@ int sigqueue(int pid, int signo, void *sival_ptr)
   int ret;
 
 #ifdef CONFIG_CAN_PASS_STRUCTS
-  serr("pid=0x%08x signo=%d value=%d\n", pid, signo, value.sival_int);
+  sinfo("pid=0x%08x signo=%d value=%d\n", pid, signo, value.sival_int);
 #else
-  serr("pid=0x%08x signo=%d value=%p\n", pid, signo, sival_ptr);
+  sinfo("pid=0x%08x signo=%d value=%p\n", pid, signo, sival_ptr);
 #endif
 
   /* Sanity checks */
diff --git a/sched/task/task_execv.c b/sched/task/task_execv.c
index b2e6323600..b6fa85c3e3 100644
--- a/sched/task/task_execv.c
+++ b/sched/task/task_execv.c
@@ -134,7 +134,7 @@ int execv(FAR const char *path, FAR char * const argv[])
   ret = exec(path, (FAR char * const *)argv, symtab, nsymbols);
   if (ret < 0)
     {
-      serr("exec failed: %d\n", errno);
+      serr("ERROR: exec failed: %d\n", errno);
       return ERROR;
     }
 
diff --git a/sched/task/task_prctl.c b/sched/task/task_prctl.c
index 9a4d814939..5c74ea09f0 100644
--- a/sched/task/task_prctl.c
+++ b/sched/task/task_prctl.c
@@ -111,7 +111,7 @@ int prctl(int option, ...)
 
         if (!tcb)
           {
-            serr("Pid does not correspond to a task: %d\n", pid);
+            serr("ERROR: Pid does not correspond to a task: %d\n", pid);
             errcode = ESRCH;
             goto errout;
           }
@@ -120,7 +120,7 @@ int prctl(int option, ...)
 
         if (!name)
           {
-            serr("No name provide\n");
+            serr("ERROR: No name provide\n");
             errcode = EFAULT;
             goto errout;
           }
@@ -144,13 +144,13 @@ int prctl(int option, ...)
       }
       break;
 #else
-      serr("Option not enabled: %d\n", option);
+      serr("ERROR: Option not enabled: %d\n", option);
       errcode = ENOSYS;
       goto errout;
 #endif
 
     default:
-      serr("Unrecognized option: %d\n", option);
+      serr("ERROR: Unrecognized option: %d\n", option);
       errcode = EINVAL;
       goto errout;
     }
diff --git a/sched/wqueue/kwork_hpthread.c b/sched/wqueue/kwork_hpthread.c
index 22217b66fa..62725ec75e 100644
--- a/sched/wqueue/kwork_hpthread.c
+++ b/sched/wqueue/kwork_hpthread.c
@@ -165,7 +165,7 @@ int work_hpstart(void)
       int errcode = errno;
       DEBUGASSERT(errcode > 0);
 
-      sllerr("kernel_thread failed: %d\n", errcode);
+      sllerr("ERROR: kernel_thread failed: %d\n", errcode);
       return -errcode;
     }
 
diff --git a/sched/wqueue/kwork_lpthread.c b/sched/wqueue/kwork_lpthread.c
index 8c8958cbf8..64266f9c70 100644
--- a/sched/wqueue/kwork_lpthread.c
+++ b/sched/wqueue/kwork_lpthread.c
@@ -212,7 +212,7 @@ int work_lpstart(void)
           int errcode = errno;
           DEBUGASSERT(errcode > 0);
 
-          sllerr("kernel_thread %d failed: %d\n", wndx, errcode);
+          sllerr("ERROR: kernel_thread %d failed: %d\n", wndx, errcode);
           sched_unlock();
           return -errcode;
         }
-- 
GitLab


From be80a0b99cf95daf960b6f117fd402cdee630852 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sat, 11 Jun 2016 16:40:53 -0600
Subject: [PATCH 26/91] Eliminate some warnings

---
 arch/arm/src/arm/up_assert.c      |  4 ++++
 arch/arm/src/armv6-m/up_assert.c  | 12 ++++++++----
 arch/arm/src/armv7-a/arm_assert.c | 12 ++++++++----
 arch/arm/src/armv7-m/up_assert.c  | 12 ++++++++----
 4 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/arch/arm/src/arm/up_assert.c b/arch/arm/src/arm/up_assert.c
index f5e34f941f..b17ea04700 100644
--- a/arch/arm/src/arm/up_assert.c
+++ b/arch/arm/src/arm/up_assert.c
@@ -45,8 +45,12 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 #  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
 #  undef  CONFIG_DEBUG_INFO
 #  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 1
 #  define CONFIG_DEBUG_INFO 1
 #endif
 
diff --git a/arch/arm/src/armv6-m/up_assert.c b/arch/arm/src/armv6-m/up_assert.c
index c32628a302..4e38270d0f 100644
--- a/arch/arm/src/armv6-m/up_assert.c
+++ b/arch/arm/src/armv6-m/up_assert.c
@@ -44,10 +44,14 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG_FEATURES
-# undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG_FEATURES 1
-# define CONFIG_DEBUG_INFO 1
+#  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
+#  undef  CONFIG_DEBUG_INFO
+#  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 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 7132bf3ca5..1d8e1c8fec 100644
--- a/arch/arm/src/armv7-a/arm_assert.c
+++ b/arch/arm/src/armv7-a/arm_assert.c
@@ -44,10 +44,14 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG_FEATURES
-# undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG_FEATURES 1
-# define CONFIG_DEBUG_INFO 1
+#  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
+#  undef  CONFIG_DEBUG_INFO
+#  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 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 e94b64afb7..c7e770fb88 100644
--- a/arch/arm/src/armv7-m/up_assert.c
+++ b/arch/arm/src/armv7-m/up_assert.c
@@ -44,10 +44,14 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG_FEATURES
-# undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG_FEATURES 1
-# define CONFIG_DEBUG_INFO 1
+#  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
+#  undef  CONFIG_DEBUG_INFO
+#  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 1
+#  define CONFIG_DEBUG_INFO 1
 #endif
 
 #include 
-- 
GitLab


From ad2f7b011939220ff700257c7272f5d8b6df7495 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sat, 11 Jun 2016 17:14:02 -0600
Subject: [PATCH 27/91] fs/:  Change some *err() message to *info() messages if
 what was a *dbg() message does not indicate and error condition.

---
 fs/driver/fs_closeblockdriver.c |  2 +-
 fs/driver/fs_findblockdriver.c  |  6 ++--
 fs/driver/fs_openblockdriver.c  |  4 +--
 fs/fat/fs_configfat.c           | 36 +++++++++----------
 fs/fat/fs_fat32.c               |  4 +--
 fs/fat/fs_fat32util.c           | 34 +++++++++---------
 fs/mmap/fs_mmap.c               |  6 ++--
 fs/mmap/fs_munmap.c             |  4 +--
 fs/mmap/fs_rammap.c             |  7 ++--
 fs/mount/fs_automount.c         |  2 +-
 fs/nfs/nfs_util.c               | 12 +++----
 fs/nfs/nfs_vfsops.c             |  8 ++---
 fs/nfs/rpc_clnt.c               | 10 +++---
 fs/nxffs/nxffs_blockstats.c     | 22 ++++++------
 fs/nxffs/nxffs_initialize.c     |  2 +-
 fs/romfs/fs_romfs.c             | 62 ++++++++++++++++-----------------
 fs/romfs/fs_romfsutil.c         |  2 +-
 fs/smartfs/smartfs_smart.c      | 46 +++++++++++++++---------
 fs/smartfs/smartfs_utils.c      | 54 +++++++++++++++-------------
 fs/tmpfs/fs_tmpfs.c             |  2 +-
 fs/vfs/fs_epoll.c               |  4 +--
 21 files changed, 173 insertions(+), 156 deletions(-)

diff --git a/fs/driver/fs_closeblockdriver.c b/fs/driver/fs_closeblockdriver.c
index defd3dcb5c..7c9c60244d 100644
--- a/fs/driver/fs_closeblockdriver.c
+++ b/fs/driver/fs_closeblockdriver.c
@@ -84,7 +84,7 @@ int close_blockdriver(FAR struct inode *inode)
 
   if (!INODE_IS_BLOCK(inode))
     {
-      ferr("inode is not a block driver\n");
+      ferr("ERROR: inode is not a block driver\n");
       ret = -ENOTBLK;
       goto errout;
    }
diff --git a/fs/driver/fs_findblockdriver.c b/fs/driver/fs_findblockdriver.c
index b2b47e4ecb..8667beaef2 100644
--- a/fs/driver/fs_findblockdriver.c
+++ b/fs/driver/fs_findblockdriver.c
@@ -96,7 +96,7 @@ int find_blockdriver(FAR const char *pathname, int mountflags, FAR struct inode
   inode = inode_find(pathname, NULL);
   if (!inode)
     {
-      ferr("Failed to find %s\n", pathname);
+      ferr("ERROR: Failed to find %s\n", pathname);
       ret = -ENOENT;
       goto errout;
     }
@@ -105,7 +105,7 @@ int find_blockdriver(FAR const char *pathname, int mountflags, FAR struct inode
 
   if (!INODE_IS_BLOCK(inode))
     {
-      ferr("%s is not a block driver\n", pathname);
+      ferr("ERROR: %s is not a block driver\n", pathname);
       ret = -ENOTBLK;
       goto errout_with_inode;
     }
@@ -115,7 +115,7 @@ int find_blockdriver(FAR const char *pathname, int mountflags, FAR struct inode
   if (!inode->u.i_bops || !inode->u.i_bops->read ||
       (!inode->u.i_bops->write && (mountflags & MS_RDONLY) == 0))
     {
-      ferr("%s does not support requested access\n", pathname);
+      ferr("ERROR: %s does not support requested access\n", pathname);
       ret = -EACCES;
       goto errout_with_inode;
     }
diff --git a/fs/driver/fs_openblockdriver.c b/fs/driver/fs_openblockdriver.c
index 67a955cf57..9a42020bf7 100644
--- a/fs/driver/fs_openblockdriver.c
+++ b/fs/driver/fs_openblockdriver.c
@@ -96,7 +96,7 @@ int open_blockdriver(FAR const char *pathname, int mountflags,
   ret = find_blockdriver(pathname, mountflags, &inode);
   if (ret < 0)
     {
-      ferr("Failed to file %s block driver\n", pathname);
+      ferr("ERROR: Failed to file %s block driver\n", pathname);
       goto errout;
     }
 
@@ -110,7 +110,7 @@ int open_blockdriver(FAR const char *pathname, int mountflags,
       ret = inode->u.i_bops->open(inode);
       if (ret < 0)
         {
-          ferr("%s driver open failed\n", pathname);
+          ferr("ERROR: %s driver open failed\n", pathname);
           goto errout_with_inode;
         }
     }
diff --git a/fs/fat/fs_configfat.c b/fs/fat/fs_configfat.c
index 3064a82f92..11fc358e2e 100644
--- a/fs/fat/fs_configfat.c
+++ b/fs/fat/fs_configfat.c
@@ -473,7 +473,7 @@ mkfatfs_tryfat12(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var,
 
       if (config->fc_nclusters + 2 > maxnclusters)
         {
-          ferr("Too many clusters for FAT12: %d > %d\n",
+          ferr("ERROR: Too many clusters for FAT12: %d > %d\n",
                config->fc_nclusters, maxnclusters - 2);
 
           return -ENFILE;
@@ -550,7 +550,7 @@ mkfatfs_tryfat16(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var,
       if ((config->fc_nclusters + 2 > maxnclusters) ||
           (config->fc_nclusters < FAT_MINCLUST16))
         {
-          ferr("Too few or too many clusters for FAT16: %d < %d < %d\n",
+          ferr("ERROR: Too few or too many clusters for FAT16: %d < %d < %d\n",
                FAT_MINCLUST16, config->fc_nclusters, maxnclusters - 2);
 
           return -ENFILE;
@@ -622,7 +622,7 @@ mkfatfs_tryfat32(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var,
       if ((config->fc_nclusters + 3 > maxnclusters) ||
           (config->fc_nclusters < FAT_MINCLUST32))
         {
-          ferr("Too few or too many clusters for FAT32: %d < %d < %d\n",
+          ferr("ERROR: Too few or too many clusters for FAT32: %d < %d < %d\n",
                FAT_MINCLUST32, config->fc_nclusters, maxnclusters - 3);
 
           return -ENFILE;
@@ -696,7 +696,7 @@ mkfatfs_clustersearch(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var)
 
       if (fmt->ff_rsvdseccount < 2)
         {
-          ferr("At least 2 reserved sectors needed by FAT32\n");
+          ferr("ERROR: At least 2 reserved sectors needed by FAT32\n");
           fatconfig32.fc_rsvdseccount = 2;
         }
       else
@@ -756,7 +756,7 @@ mkfatfs_clustersearch(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var)
 
           if (mkfatfs_tryfat12(fmt, var, &fatconfig12) != 0)
             {
-              ferr("Cannot format FAT12 at %u sectors/cluster\n",
+              ferr("ERROR: Cannot format FAT12 at %u sectors/cluster\n",
                    1 << fmt->ff_clustshift);
 
               fatconfig12.fc_nfatsects = 0;
@@ -772,7 +772,7 @@ mkfatfs_clustersearch(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var)
 
           if (mkfatfs_tryfat16(fmt, var, &fatconfig16) != 0)
             {
-              ferr("Cannot format FAT16 at %u sectors/cluster\n",
+              ferr("ERROR: Cannot format FAT16 at %u sectors/cluster\n",
                    1 << fmt->ff_clustshift);
 
               fatconfig16.fc_nfatsects = 0;
@@ -828,7 +828,7 @@ mkfatfs_clustersearch(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var)
 
           if (mkfatfs_tryfat32(fmt, var, &fatconfig32) != 0)
             {
-              ferr("Cannot format FAT32 at %u sectors/cluster\n",
+              ferr("ERROR: Cannot format FAT32 at %u sectors/cluster\n",
                    1 << fmt->ff_clustshift);
 
               fatconfig32.fc_nfatsects = 0;
@@ -940,7 +940,7 @@ int mkfatfs_configfatfs(FAR struct fat_format_s *fmt,
 
       if (fmt->ff_backupboot <= 1 || fmt->ff_backupboot >= fmt->ff_rsvdseccount)
         {
-          ferr("Invalid backup boot sector: %d\n", fmt->ff_backupboot);
+          ferr("ERROR: Invalid backup boot sector: %d\n", fmt->ff_backupboot);
           fmt->ff_backupboot = 0;
         }
 
@@ -974,21 +974,21 @@ int mkfatfs_configfatfs(FAR struct fat_format_s *fmt,
   /* Describe the configured filesystem */
 
 #ifdef CONFIG_DEBUG_FEATURES
-  ferr("Sector size:          %d bytes\n",    var->fv_sectorsize);
-  ferr("Number of sectors:    %d sectors\n",  fmt->ff_nsectors);
-  ferr("FAT size:             %d bits\n",     var->fv_fattype);
-  ferr("Number FATs:          %d\n",          fmt->ff_nfats);
-  ferr("Sectors per cluster:  %d sectors\n",  1 << fmt->ff_clustshift);
-  ferr("FS size:              %d sectors\n",  var->fv_nfatsects);
-  ferr("                      %d clusters\n", var->fv_nclusters);
+  finfo("Sector size:          %d bytes\n",    var->fv_sectorsize);
+  finfo("Number of sectors:    %d sectors\n",  fmt->ff_nsectors);
+  finfo("FAT size:             %d bits\n",     var->fv_fattype);
+  finfo("Number FATs:          %d\n",          fmt->ff_nfats);
+  finfo("Sectors per cluster:  %d sectors\n",  1 << fmt->ff_clustshift);
+  finfo("FS size:              %d sectors\n",  var->fv_nfatsects);
+  finfo("                      %d clusters\n", var->fv_nclusters);
 
   if (var->fv_fattype != 32)
     {
-       ferr("Root directory slots: %d\n", fmt->ff_rootdirentries);
+       finfo("Root directory slots: %d\n", fmt->ff_rootdirentries);
     }
 
-  ferr("Volume ID:            %08x\n", fmt->ff_volumeid);
-  ferr("Volume Label:         \"%c%c%c%c%c%c%c%c%c%c%c\"\n",
+  finfo("Volume ID:            %08x\n", fmt->ff_volumeid);
+  finfo("Volume Label:         \"%c%c%c%c%c%c%c%c%c%c%c\"\n",
     fmt->ff_volumelabel[0], fmt->ff_volumelabel[1], fmt->ff_volumelabel[2],
     fmt->ff_volumelabel[3], fmt->ff_volumelabel[4], fmt->ff_volumelabel[5],
     fmt->ff_volumelabel[6], fmt->ff_volumelabel[7], fmt->ff_volumelabel[8],
diff --git a/fs/fat/fs_fat32.c b/fs/fat/fs_fat32.c
index 46ace6fd89..618aa22e2f 100644
--- a/fs/fat/fs_fat32.c
+++ b/fs/fat/fs_fat32.c
@@ -624,7 +624,7 @@ fat_read_restart:
 
               if (ret == -EFAULT && !force_indirect)
                 {
-                  ferr("DMA: read alignment error, restarting indirect\n");
+                  ferr("ERROR: DMA read alignment error, restarting indirect\n");
                   force_indirect = true;
                   goto fat_read_restart;
                 }
@@ -884,7 +884,7 @@ fat_write_restart:
 
               if (ret == -EFAULT && !force_indirect)
                 {
-                  ferr("DMA: write alignment error, restarting indirect\n");
+                  ferr("ERROR: DMA write alignment error, restarting indirect\n");
                   force_indirect = true;
                   goto fat_write_restart;
                 }
diff --git a/fs/fat/fs_fat32util.c b/fs/fat/fs_fat32util.c
index 1ed62cb1e7..a4ec2732cb 100644
--- a/fs/fat/fs_fat32util.c
+++ b/fs/fat/fs_fat32util.c
@@ -623,7 +623,7 @@ int fat_mount(struct fat_mountpt_s *fs, bool writeable)
 
       if (i > 3)
         {
-          ferr("No valid MBR\n");
+          ferr("ERROR: No valid MBR\n");
           ret = -EINVAL;
           goto errout_with_buffer;
         }
@@ -644,22 +644,22 @@ int fat_mount(struct fat_mountpt_s *fs, bool writeable)
 
   /* We did it! */
 
-  ferr("FAT%d:\n", fs->fs_type == 0 ? 12 : fs->fs_type == 1  ? 16 : 32);
-  ferr("\tHW  sector size:     %d\n", fs->fs_hwsectorsize);
-  ferr("\t    sectors:         %d\n", fs->fs_hwnsectors);
-  ferr("\tFAT reserved:        %d\n", fs->fs_fatresvdseccount);
-  ferr("\t    sectors:         %d\n", fs->fs_fattotsec);
-  ferr("\t    start sector:    %d\n", fs->fs_fatbase);
-  ferr("\t    root sector:     %d\n", fs->fs_rootbase);
-  ferr("\t    root entries:    %d\n", fs->fs_rootentcnt);
-  ferr("\t    data sector:     %d\n", fs->fs_database);
-  ferr("\t    FSINFO sector:   %d\n", fs->fs_fsinfo);
-  ferr("\t    Num FATs:        %d\n", fs->fs_fatnumfats);
-  ferr("\t    FAT sectors:     %d\n", fs->fs_nfatsects);
-  ferr("\t    sectors/cluster: %d\n", fs->fs_fatsecperclus);
-  ferr("\t    max clusters:    %d\n", fs->fs_nclusters);
-  ferr("\tFSI free count       %d\n", fs->fs_fsifreecount);
-  ferr("\t    next free        %d\n", fs->fs_fsinextfree);
+  finfo("FAT%d:\n", fs->fs_type == 0 ? 12 : fs->fs_type == 1  ? 16 : 32);
+  finfo("\tHW  sector size:     %d\n", fs->fs_hwsectorsize);
+  finfo("\t    sectors:         %d\n", fs->fs_hwnsectors);
+  finfo("\tFAT reserved:        %d\n", fs->fs_fatresvdseccount);
+  finfo("\t    sectors:         %d\n", fs->fs_fattotsec);
+  finfo("\t    start sector:    %d\n", fs->fs_fatbase);
+  finfo("\t    root sector:     %d\n", fs->fs_rootbase);
+  finfo("\t    root entries:    %d\n", fs->fs_rootentcnt);
+  finfo("\t    data sector:     %d\n", fs->fs_database);
+  finfo("\t    FSINFO sector:   %d\n", fs->fs_fsinfo);
+  finfo("\t    Num FATs:        %d\n", fs->fs_fatnumfats);
+  finfo("\t    FAT sectors:     %d\n", fs->fs_nfatsects);
+  finfo("\t    sectors/cluster: %d\n", fs->fs_fatsecperclus);
+  finfo("\t    max clusters:    %d\n", fs->fs_nclusters);
+  finfo("\tFSI free count       %d\n", fs->fs_fsifreecount);
+  finfo("\t    next free        %d\n", fs->fs_fsinextfree);
 
   return OK;
 
diff --git a/fs/mmap/fs_mmap.c b/fs/mmap/fs_mmap.c
index 222a2591b2..1d8f88e705 100644
--- a/fs/mmap/fs_mmap.c
+++ b/fs/mmap/fs_mmap.c
@@ -135,14 +135,14 @@ FAR void *mmap(FAR void *start, size_t length, int prot, int flags,
   if (prot == PROT_NONE ||
       (flags & (MAP_PRIVATE | MAP_FIXED | MAP_ANONYMOUS | MAP_DENYWRITE)) != 0)
     {
-      ferr("Unsupported options, prot=%x flags=%04x\n", prot, flags);
+      ferr("ERROR: Unsupported options, prot=%x flags=%04x\n", prot, flags);
       set_errno(ENOSYS);
       return MAP_FAILED;
     }
 
   if (length == 0 || (flags & MAP_SHARED) == 0)
     {
-      ferr("Invalid options, lengt=%d flags=%04x\n", length, flags);
+      ferr("ERROR: Invalid options, lengt=%d flags=%04x\n", length, flags);
       set_errno(EINVAL);
       return MAP_FAILED;
     }
@@ -163,7 +163,7 @@ FAR void *mmap(FAR void *start, size_t length, int prot, int flags,
 #ifdef CONFIG_FS_RAMMAP
       return rammap(fd, length, offset);
 #else
-      ferr("ioctl(FIOC_MMAP) failed: %d\n", get_errno());
+      ferr("ERROR: ioctl(FIOC_MMAP) failed: %d\n", get_errno());
       return MAP_FAILED;
 #endif
     }
diff --git a/fs/mmap/fs_munmap.c b/fs/mmap/fs_munmap.c
index cf53957085..5673797136 100644
--- a/fs/mmap/fs_munmap.c
+++ b/fs/mmap/fs_munmap.c
@@ -143,7 +143,7 @@ int munmap(FAR void *start, size_t length)
 
   if (!curr)
     {
-      ferr("Region not found\n");
+      ferr("ERROR: Region not found\n");
       errcode = EINVAL;
       goto errout_with_semaphore;
     }
@@ -158,7 +158,7 @@ int munmap(FAR void *start, size_t length)
   offset = start - curr->addr;
   if (offset + length < curr->length)
     {
-      ferr("Cannot umap without unmapping to the end\n");
+      ferr("ERROR: Cannot umap without unmapping to the end\n");
       errcode = ENOSYS;
       goto errout_with_semaphore;
     }
diff --git a/fs/mmap/fs_rammap.c b/fs/mmap/fs_rammap.c
index 22ccd7aeea..5fe71478f5 100644
--- a/fs/mmap/fs_rammap.c
+++ b/fs/mmap/fs_rammap.c
@@ -142,7 +142,7 @@ FAR void *rammap(int fd, size_t length, off_t offset)
   alloc = (FAR uint8_t *)kumm_malloc(sizeof(struct fs_rammap_s) + length);
   if (!alloc)
     {
-      ferr("Region allocation failed, length: %d\n", (int)length);
+      ferr("ERROR: Region allocation failed, length: %d\n", (int)length);
       errcode = ENOMEM;
       goto errout;
     }
@@ -164,7 +164,7 @@ FAR void *rammap(int fd, size_t length, off_t offset)
        * the correct response.
        */
 
-      ferr("Seek to position %d failed\n", (int)offset);
+      ferr("ERROR: Seek to position %d failed\n", (int)offset);
       errcode = EINVAL;
       goto errout_with_region;
     }
@@ -190,7 +190,8 @@ FAR void *rammap(int fd, size_t length, off_t offset)
                * destroy the errno value.
                */
 
-              ferr("Read failed: offset=%d errno=%d\n", (int)offset, errcode);
+              ferr("ERROR: Read failed: offset=%d errno=%d\n",
+                   (int)offset, errcode);
 #ifdef CONFIG_DEBUG_FS
               goto errout_with_region;
 #else
diff --git a/fs/mount/fs_automount.c b/fs/mount/fs_automount.c
index 689e58051a..f67f43573c 100644
--- a/fs/mount/fs_automount.c
+++ b/fs/mount/fs_automount.c
@@ -204,7 +204,7 @@ static void automount_mount(FAR struct automounter_state_s *priv)
        * try to unmount again because the mount might be stale.
        */
 
-      ferr("WARNING: Mountpoint %s already exists\n", lower->mountpoint);
+      fwarn("WARNING: Mountpoint %s already exists\n", lower->mountpoint);
       ret = automount_unmount(priv);
       if (ret < 0)
         {
diff --git a/fs/nfs/nfs_util.c b/fs/nfs/nfs_util.c
index 7fa0944026..e2dd949dcd 100644
--- a/fs/nfs/nfs_util.c
+++ b/fs/nfs/nfs_util.c
@@ -103,7 +103,7 @@ static inline int nfs_pathsegment(FAR const char **path, FAR char *buffer,
         }
       else if (nbytes >= NAME_MAX)
         {
-          ferr("File name segment is too long: %d\n", *path);
+          ferr("ERROR: File name segment is too long: %d\n", *path);
           return EFBIG;
         }
       else
@@ -277,7 +277,7 @@ int nfs_lookup(struct nfsmount *nmp, FAR const char *filename,
   namelen = strlen(filename);
   if (namelen > NAME_MAX)
     {
-      ferr("Length of the string is too big: %d\n", namelen);
+      ferr("ERROR: Length of the string is too long: %d\n", namelen);
       return E2BIG;
     }
 
@@ -427,7 +427,7 @@ int nfs_findnode(struct nfsmount *nmp, FAR const char *relpath,
         {
           /* The filename segment contains is too long. */
 
-          ferr("nfs_pathsegment of \"%s\" failed after \"%s\": %d\n",
+          ferr("ERROR: nfs_pathsegment of \"%s\" failed after \"%s\": %d\n",
                relpath, buffer, error);
           return error;
         }
@@ -437,7 +437,7 @@ int nfs_findnode(struct nfsmount *nmp, FAR const char *relpath,
       error = nfs_lookup(nmp, buffer, fhandle, obj_attributes, dir_attributes);
       if (error != OK)
         {
-          ferr("nfs_lookup of \"%s\" failed at \"%s\": %d\n",
+          ferr("ERROR: nfs_lookup of \"%s\" failed at \"%s\": %d\n",
                 relpath, buffer, error);
           return error;
         }
@@ -521,7 +521,7 @@ int nfs_finddir(struct nfsmount *nmp, FAR const char *relpath,
         {
           /* The filename segment contains is too long. */
 
-          ferr("nfs_pathsegment of \"%s\" failed after \"%s\": %d\n",
+          ferr("ERROR: nfs_pathsegment of \"%s\" failed after \"%s\": %d\n",
                relpath, filename, error);
           return error;
         }
@@ -545,7 +545,7 @@ int nfs_finddir(struct nfsmount *nmp, FAR const char *relpath,
       error = nfs_lookup(nmp, filename, fhandle, attributes, NULL);
       if (error != OK)
         {
-          ferr("nfs_lookup of \"%s\" failed at \"%s\": %d\n",
+          ferr("ERROR: fs_lookup of \"%s\" failed at \"%s\": %d\n",
                 relpath, filename, error);
           return error;
         }
diff --git a/fs/nfs/nfs_vfsops.c b/fs/nfs/nfs_vfsops.c
index aacc003c50..ecdf3ea265 100644
--- a/fs/nfs/nfs_vfsops.c
+++ b/fs/nfs/nfs_vfsops.c
@@ -357,7 +357,7 @@ static int nfs_filecreate(FAR struct nfsmount *nmp, struct nfsnode *np,
       tmp = *ptr;  /* handle_follows */
       if (!tmp)
         {
-          ferr("WARNING: no file attributes\n");
+          fwarn"WARNING: no file attributes\n");
         }
       else
         {
@@ -790,7 +790,7 @@ static ssize_t nfs_read(FAR struct file *filep, char *buffer, size_t buflen)
   error = nfs_checkmount(nmp);
   if (error != OK)
     {
-      ferr("nfs_checkmount failed: %d\n", error);
+      ferr("ERROR: nfs_checkmount failed: %d\n", error);
       goto errout_with_semaphore;
     }
 
@@ -966,7 +966,7 @@ static ssize_t nfs_write(FAR struct file *filep, const char *buffer,
   error = nfs_checkmount(nmp);
   if (error != OK)
     {
-      ferr("nfs_checkmount failed: %d\n", error);
+      ferr("ERROR: nfs_checkmount failed: %d\n", error);
       goto errout_with_semaphore;
     }
 
@@ -1449,7 +1449,7 @@ static int nfs_readdir(struct inode *mountpt, struct fs_dirent_s *dir)
   error = nfs_lookup(nmp, dir->fd_dir.d_name, &fhandle, &obj_attributes, NULL);
   if (error != OK)
     {
-      ferr("nfs_lookup failed: %d\n", error);
+      ferr("ERROR: nfs_lookup failed: %d\n", error);
       goto errout_with_semaphore;
     }
 
diff --git a/fs/nfs/rpc_clnt.c b/fs/nfs/rpc_clnt.c
index af163f034b..fe3a660574 100644
--- a/fs/nfs/rpc_clnt.c
+++ b/fs/nfs/rpc_clnt.c
@@ -554,7 +554,7 @@ int rpcclnt_connect(struct rpcclnt *rpc)
   error = psock_connect(rpc->rc_so, saddr, sizeof(*saddr));
   if (error)
     {
-      ferr("psock_connect NFS port returns %d\n", error);
+      ferr("ERROR: psock_connect NFS port returns %d\n", error);
       goto bad;
     }
 
@@ -766,11 +766,11 @@ int rpcclnt_request(FAR struct rpcclnt *rpc, int procnum, int prog,
       switch (tmp)
         {
         case RPC_MISMATCH:
-          ferr("RPC_MSGDENIED: RPC_MISMATCH error\n");
+          ferr(ERROR: RPC_MSGDENIED: RPC_MISMATCH error\n");
           return EOPNOTSUPP;
 
         case RPC_AUTHERR:
-          ferr("RPC_MSGDENIED: RPC_AUTHERR error\n");
+          ferr("ERROR: RPC_MSGDENIED: RPC_AUTHERR error\n");
           return EACCES;
 
         default:
@@ -789,12 +789,12 @@ int rpcclnt_request(FAR struct rpcclnt *rpc, int procnum, int prog,
     }
   else if (tmp == RPC_PROGMISMATCH)
     {
-      ferr("RPC_MSGACCEPTED: RPC_PROGMISMATCH error\n");
+      ferr("ERROR: RPC_MSGACCEPTED: RPC_PROGMISMATCH error\n");
       return EOPNOTSUPP;
     }
   else if (tmp > 5)
     {
-      ferr("ERROR:  Other RPC type: %d\n", tmp);
+      ferr("ERROR: Unsupported RPC type: %d\n", tmp);
       return EOPNOTSUPP;
     }
 
diff --git a/fs/nxffs/nxffs_blockstats.c b/fs/nxffs/nxffs_blockstats.c
index 8ba53dec12..d1c3b8fb8d 100644
--- a/fs/nxffs/nxffs_blockstats.c
+++ b/fs/nxffs/nxffs_blockstats.c
@@ -147,11 +147,11 @@ int nxffs_blockstats(FAR struct nxffs_volume_s *volume,
         }
     }
 
-  ferr("Number blocks:        %d\n", stats->nblocks);
-  ferr("  Good blocks:        %d\n", stats->ngood);
-  ferr("  Bad blocks:         %d\n", stats->nbad);
-  ferr("  Unformatted blocks: %d\n", stats->nunformat);
-  ferr("  Corrupt blocks:     %d\n", stats->ncorrupt);
+  finfo("Number blocks:        %d\n", stats->nblocks);
+  finfo("  Good blocks:        %d\n", stats->ngood);
+  finfo("  Bad blocks:         %d\n", stats->nbad);
+  finfo("  Unformatted blocks: %d\n", stats->nunformat);
+  finfo("  Corrupt blocks:     %d\n", stats->ncorrupt);
 
 #else
   for (ioblock = 0; ioblock < volume->nblocks; ioblock++)
@@ -221,12 +221,12 @@ int nxffs_blockstats(FAR struct nxffs_volume_s *volume,
         }
     }
 
-  ferr("Number blocks:        %d\n", stats->nblocks);
-  ferr("  Good blocks:        %d\n", stats->ngood);
-  ferr("  Bad blocks:         %d\n", stats->nbad);
-  ferr("  Unformatted blocks: %d\n", stats->nunformat);
-  ferr("  Corrupt blocks:     %d\n", stats->ncorrupt);
-  ferr("  Unreadable blocks:  %d\n", stats->nbadread);
+  finfo("Number blocks:        %d\n", stats->nblocks);
+  finfo("  Good blocks:        %d\n", stats->ngood);
+  finfo("  Bad blocks:         %d\n", stats->nbad);
+  finfo("  Unformatted blocks: %d\n", stats->nunformat);
+  finfo("  Corrupt blocks:     %d\n", stats->ncorrupt);
+  finfo("  Unreadable blocks:  %d\n", stats->nbadread);
 
 #endif
   return OK;
diff --git a/fs/nxffs/nxffs_initialize.c b/fs/nxffs/nxffs_initialize.c
index 217f0963f9..8b99252bba 100644
--- a/fs/nxffs/nxffs_initialize.c
+++ b/fs/nxffs/nxffs_initialize.c
@@ -274,7 +274,7 @@ int nxffs_initialize(FAR struct mtd_dev_s *mtd)
 
   /* We may need to format the volume.  Try that before giving up. */
 
-  ferr("WARNING: Failed to calculate file system limits: %d\n", -ret);
+  fwarn("WARNING: Failed to calculate file system limits: %d\n", -ret);
   ret = nxffs_reformat(volume);
   if (ret < 0)
     {
diff --git a/fs/romfs/fs_romfs.c b/fs/romfs/fs_romfs.c
index b90b87101b..92584422e9 100644
--- a/fs/romfs/fs_romfs.c
+++ b/fs/romfs/fs_romfs.c
@@ -169,7 +169,7 @@ static int romfs_open(FAR struct file *filep, FAR const char *relpath,
   ret = romfs_checkmount(rm);
   if (ret != OK)
     {
-      ferr("romfs_checkmount failed: %d\n", ret);
+      ferr("ERROR: romfs_checkmount failed: %d\n", ret);
       goto errout_with_semaphore;
     }
 
@@ -179,7 +179,7 @@ static int romfs_open(FAR struct file *filep, FAR const char *relpath,
 
   if ((oflags & O_WRONLY) != 0 || (oflags & O_RDONLY) == 0)
     {
-      ferr("Only O_RDONLY supported\n");
+      ferr("ERROR: Only O_RDONLY supported\n");
       ret = -EACCES;
       goto errout_with_semaphore;
     }
@@ -193,7 +193,7 @@ static int romfs_open(FAR struct file *filep, FAR const char *relpath,
   ret = romfs_finddirentry(rm, &dirinfo, relpath);
   if (ret < 0)
     {
-      ferr("Failed to find directory directory entry for '%s': %d\n",
+      ferr("ERROR: Failed to find directory directory entry for '%s': %d\n",
            relpath, ret);
       goto errout_with_semaphore;
     }
@@ -207,7 +207,7 @@ static int romfs_open(FAR struct file *filep, FAR const char *relpath,
       /* It is a directory */
 
       ret = -EISDIR;
-      ferr("'%s' is a directory\n", relpath);
+      ferr("ERROR: '%s' is a directory\n", relpath);
       goto errout_with_semaphore;
     }
 
@@ -222,7 +222,7 @@ static int romfs_open(FAR struct file *filep, FAR const char *relpath,
   rf = (FAR struct romfs_file_s *)kmm_zalloc(sizeof(struct romfs_file_s));
   if (!rf)
     {
-      ferr("Failed to allocate private data\n", ret);
+      ferr("ERROR: Failed to allocate private data\n", ret);
       ret = -ENOMEM;
       goto errout_with_semaphore;
     }
@@ -239,7 +239,7 @@ static int romfs_open(FAR struct file *filep, FAR const char *relpath,
                         &rf->rf_startoffset);
   if (ret < 0)
     {
-      ferr("Failed to locate start of file data: %d\n", ret);
+      ferr("ERROR: Failed to locate start of file data: %d\n", ret);
       goto errout_with_semaphore;
     }
 
@@ -248,7 +248,7 @@ static int romfs_open(FAR struct file *filep, FAR const char *relpath,
   ret = romfs_fileconfigure(rm, rf);
   if (ret < 0)
     {
-      ferr("Failed configure buffering: %d\n", ret);
+      ferr("ERROR: Failed configure buffering: %d\n", ret);
       goto errout_with_semaphore;
     }
 
@@ -359,7 +359,7 @@ static ssize_t romfs_read(FAR struct file *filep, FAR char *buffer,
   ret = romfs_checkmount(rm);
   if (ret != OK)
     {
-      ferr("romfs_checkmount failed: %d\n", ret);
+      ferr("ERROR: romfs_checkmount failed: %d\n", ret);
       goto errout_with_semaphore;
     }
 
@@ -408,7 +408,7 @@ static ssize_t romfs_read(FAR struct file *filep, FAR char *buffer,
           ret = romfs_hwread(rm, userbuffer, sector, nsectors);
           if (ret < 0)
             {
-              ferr("romfs_hwread failed: %d\n", ret);
+              ferr("ERROR: romfs_hwread failed: %d\n", ret);
               goto errout_with_semaphore;
             }
 
@@ -426,7 +426,7 @@ static ssize_t romfs_read(FAR struct file *filep, FAR char *buffer,
           ret = romfs_filecacheread(rm, rf, sector);
           if (ret < 0)
             {
-              ferr("romfs_filecacheread failed: %d\n", ret);
+              ferr("ERROR: romfs_filecacheread failed: %d\n", ret);
               goto errout_with_semaphore;
             }
 
@@ -511,7 +511,7 @@ static off_t romfs_seek(FAR struct file *filep, off_t offset, int whence)
         break;
 
     default:
-        ferr("Whence is invalid: %d\n", whence);
+        ferr("ERROR: Whence is invalid: %d\n", whence);
         return -EINVAL;
     }
 
@@ -521,7 +521,7 @@ static off_t romfs_seek(FAR struct file *filep, off_t offset, int whence)
   ret = romfs_checkmount(rm);
   if (ret != OK)
     {
-       ferr("romfs_checkmount failed: %d\n", ret);
+       ferr("ERROR: romfs_checkmount failed: %d\n", ret);
        goto errout_with_semaphore;
     }
 
@@ -582,7 +582,7 @@ static int romfs_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
       return OK;
     }
 
-  ferr("Invalid cmd: %d \n", cmd);
+  ferr("ERROR: Invalid cmd: %d \n", cmd);
   return -ENOTTY;
 }
 
@@ -618,7 +618,7 @@ static int romfs_dup(FAR const struct file *oldp, FAR struct file *newp)
   ret = romfs_checkmount(rm);
   if (ret != OK)
     {
-      ferr("romfs_checkmount failed: %d\n", ret);
+      ferr("ERROR: romfs_checkmount failed: %d\n", ret);
       goto errout_with_semaphore;
     }
 
@@ -633,7 +633,7 @@ static int romfs_dup(FAR const struct file *oldp, FAR struct file *newp)
   newrf = (FAR struct romfs_file_s *)kmm_malloc(sizeof(struct romfs_file_s));
   if (!newrf)
     {
-      ferr("Failed to allocate private data\n", ret);
+      ferr("ERROR: Failed to allocate private data\n", ret);
       ret = -ENOMEM;
       goto errout_with_semaphore;
     }
@@ -649,7 +649,7 @@ static int romfs_dup(FAR const struct file *oldp, FAR struct file *newp)
   if (ret < 0)
     {
       kmm_free(newrf);
-      ferr("Failed configure buffering: %d\n", ret);
+      ferr("ERROR: Failed configure buffering: %d\n", ret);
       goto errout_with_semaphore;
     }
 
@@ -707,7 +707,7 @@ static int romfs_opendir(FAR struct inode *mountpt, FAR const char *relpath,
   ret = romfs_checkmount(rm);
   if (ret != OK)
     {
-      ferr("romfs_checkmount failed: %d\n", ret);
+      ferr("ERROR: romfs_checkmount failed: %d\n", ret);
       goto errout_with_semaphore;
     }
 
@@ -716,7 +716,7 @@ static int romfs_opendir(FAR struct inode *mountpt, FAR const char *relpath,
   ret = romfs_finddirentry(rm, &dirinfo, relpath);
   if (ret < 0)
     {
-      ferr("Failed to find directory '%s': %d\n", relpath, ret);
+      ferr("ERROR: Failed to find directory '%s': %d\n", relpath, ret);
       goto errout_with_semaphore;
     }
 
@@ -726,7 +726,7 @@ static int romfs_opendir(FAR struct inode *mountpt, FAR const char *relpath,
     {
       /* The entry is not a directory */
 
-      ferr("'%s' is not a directory: %d\n", relpath);
+      ferr("ERROR: '%s' is not a directory: %d\n", relpath);
       ret = -ENOTDIR;
       goto errout_with_semaphore;
     }
@@ -775,7 +775,7 @@ static int romfs_readdir(FAR struct inode *mountpt,
   ret = romfs_checkmount(rm);
   if (ret != OK)
     {
-      ferr("romfs_checkmount failed: %d\n", ret);
+      ferr("ERROR: omfs_checkmount failed: %d\n", ret);
       goto errout_with_semaphore;
     }
 
@@ -791,7 +791,7 @@ static int romfs_readdir(FAR struct inode *mountpt,
            * special error -ENOENT
            */
 
-          ferr("End of directory\n");
+          finfo("End of directory\n");
           ret = -ENOENT;
           goto errout_with_semaphore;
         }
@@ -802,7 +802,7 @@ static int romfs_readdir(FAR struct inode *mountpt,
                                 &next, &info, &size);
       if (ret < 0)
         {
-          ferr("romfs_parsedirentry failed: %d\n", ret);
+          ferr("ERROR: romfs_parsedirentry failed: %d\n", ret);
           goto errout_with_semaphore;
         }
 
@@ -811,7 +811,7 @@ static int romfs_readdir(FAR struct inode *mountpt,
       ret = romfs_parsefilename(rm, dir->u.romfs.fr_curroffset, dir->fd_dir.d_name);
       if (ret < 0)
         {
-          ferr("romfs_parsefilename failed: %d\n", ret);
+          ferr("ERROR: romfs_parsefilename failed: %d\n", ret);
           goto errout_with_semaphore;
         }
 
@@ -897,14 +897,14 @@ static int romfs_bind(FAR struct inode *blkdriver, FAR const void *data,
 
   if (!blkdriver || !blkdriver->u.i_bops)
     {
-      ferr("No block driver/ops\n");
+      ferr("ERROR: No block driver/ops\n");
       return -ENODEV;
     }
 
   if (blkdriver->u.i_bops->open &&
       blkdriver->u.i_bops->open(blkdriver) != OK)
     {
-      ferr("No open method\n");
+      ferr("ERROR: No open method\n");
       return -ENODEV;
     }
 
@@ -913,7 +913,7 @@ static int romfs_bind(FAR struct inode *blkdriver, FAR const void *data,
   rm = (FAR struct romfs_mountpt_s *)kmm_zalloc(sizeof(struct romfs_mountpt_s));
   if (!rm)
     {
-      ferr("Failed to allocate mountpoint structure\n");
+      ferr("ERROR: Failed to allocate mountpoint structure\n");
       return -ENOMEM;
     }
 
@@ -930,7 +930,7 @@ static int romfs_bind(FAR struct inode *blkdriver, FAR const void *data,
   ret = romfs_hwconfigure(rm);
   if (ret < 0)
     {
-      ferr("romfs_hwconfigure failed: %d\n", ret);
+      ferr("ERROR: romfs_hwconfigure failed: %d\n", ret);
       goto errout_with_sem;
     }
 
@@ -941,7 +941,7 @@ static int romfs_bind(FAR struct inode *blkdriver, FAR const void *data,
   ret = romfs_fsconfigure(rm);
   if (ret < 0)
     {
-      ferr("romfs_fsconfigure failed: %d\n", ret);
+      ferr("ERROR: romfs_fsconfigure failed: %d\n", ret);
       goto errout_with_buffer;
     }
 
@@ -993,7 +993,7 @@ static int romfs_unbind(FAR void *handle, FAR struct inode **blkdriver,
     {
       /* We cannot unmount now.. there are open files */
 
-      ferr("There are open files\n");
+      fwarn("WARNING: There are open files\n");
 
       /* This implementation currently only supports unmounting if there are
        * no open file references.
@@ -1072,7 +1072,7 @@ static int romfs_statfs(FAR struct inode *mountpt, FAR struct statfs *buf)
   ret = romfs_checkmount(rm);
   if (ret < 0)
     {
-      ferr("romfs_checkmount failed: %d\n", ret);
+      ferr("ERROR: romfs_checkmount failed: %d\n", ret);
       goto errout_with_semaphore;
     }
 
@@ -1130,7 +1130,7 @@ static int romfs_stat(FAR struct inode *mountpt, FAR const char *relpath,
   ret = romfs_checkmount(rm);
   if (ret != OK)
     {
-      ferr("romfs_checkmount failed: %d\n", ret);
+      ferr("ERROR: romfs_checkmount failed: %d\n", ret);
       goto errout_with_semaphore;
     }
 
diff --git a/fs/romfs/fs_romfsutil.c b/fs/romfs/fs_romfsutil.c
index b39f3e866f..50bf56ddc2 100644
--- a/fs/romfs/fs_romfsutil.c
+++ b/fs/romfs/fs_romfsutil.c
@@ -467,7 +467,7 @@ int romfs_filecacheread(struct romfs_mountpt_s *rm, struct romfs_file_s *rf,
           ret = romfs_hwread(rm, rf->rf_buffer, sector, 1);
           if (ret < 0)
             {
-              ferr("romfs_hwread failed: %d\n", ret);
+              ferr("ERROR: romfs_hwread failed: %d\n", ret);
               return ret;
             }
         }
diff --git a/fs/smartfs/smartfs_smart.c b/fs/smartfs/smartfs_smart.c
index eeae9d6ccf..c276eeff30 100644
--- a/fs/smartfs/smartfs_smart.c
+++ b/fs/smartfs/smartfs_smart.c
@@ -505,7 +505,8 @@ static ssize_t smartfs_read(FAR struct file *filep, char *buffer, size_t buflen)
       ret = FS_IOCTL(fs, BIOC_READSECT, (unsigned long) &readwrite);
       if (ret < 0)
         {
-          ferr("Error %d reading sector %d data\n", ret, sf->currsector);
+          ferr("ERROR: Error %d reading sector %d data\n",
+               ret, sf->currsector);
           goto errout_with_semaphore;
         }
 
@@ -614,7 +615,8 @@ static int smartfs_sync_internal(struct smartfs_mountpt_s *fs,
       ret = FS_IOCTL(fs, BIOC_WRITESECT, (unsigned long) &readwrite);
       if (ret < 0)
         {
-          ferr("Error %d writing used bytes for sector %d\n", ret, sf->currsector);
+          ferr("ERROR: Error %d writing used bytes for sector %d\n",
+               ret, sf->currsector);
           goto errout;
         }
 
@@ -639,7 +641,8 @@ static int smartfs_sync_internal(struct smartfs_mountpt_s *fs,
       ret = FS_IOCTL(fs, BIOC_READSECT, (unsigned long) &readwrite);
       if (ret < 0)
         {
-          ferr("Error %d reading sector %d data\n", ret, sf->currsector);
+          ferr("ERROR: Error %d reading sector %d data\n",
+               ret, sf->currsector);
           goto errout;
         }
 
@@ -661,7 +664,8 @@ static int smartfs_sync_internal(struct smartfs_mountpt_s *fs,
       ret = FS_IOCTL(fs, BIOC_WRITESECT, (unsigned long) &readwrite);
       if (ret < 0)
         {
-          ferr("Error %d writing used bytes for sector %d\n", ret, sf->currsector);
+          ferr("ERROR: Error %d writing used bytes for sector %d\n",
+               ret, sf->currsector);
           goto errout;
         }
 
@@ -766,7 +770,8 @@ static ssize_t smartfs_write(FAR struct file *filep, const char *buffer,
           ret = FS_IOCTL(fs, BIOC_WRITESECT, (unsigned long) &readwrite);
           if (ret < 0)
             {
-              ferr("Error %d writing sector %d data\n", ret, sf->currsector);
+              ferr("ERROR: Error %d writing sector %d data\n", 
+                   et, sf->currsector);
               goto errout_with_semaphore;
             }
 
@@ -793,7 +798,8 @@ static ssize_t smartfs_write(FAR struct file *filep, const char *buffer,
           ret = FS_IOCTL(fs, BIOC_READSECT, (unsigned long) &readwrite);
           if (ret < 0)
             {
-              ferr("Error %d reading sector %d header\n", ret, sf->currsector);
+              ferr("ERROR: Error %d reading sector %d header\n",
+                   ret, sf->currsector);
               goto errout_with_semaphore;
             }
 
@@ -841,7 +847,8 @@ static ssize_t smartfs_write(FAR struct file *filep, const char *buffer,
           ret = FS_IOCTL(fs, BIOC_WRITESECT, (unsigned long) &readwrite);
           if (ret < 0)
             {
-              ferr("Error %d writing sector %d data\n", ret, sf->currsector);
+              ferr("ERROR: Error %d writing sector %d data\n",
+                   ret, sf->currsector);
               goto errout_with_semaphore;
             }
         }
@@ -867,7 +874,7 @@ static ssize_t smartfs_write(FAR struct file *filep, const char *buffer,
           ret = FS_IOCTL(fs, BIOC_ALLOCSECT, 0xFFFF);
           if (ret < 0)
             {
-              ferr("Error %d allocating new sector\n", ret);
+              ferr("ERROR: Error %d allocating new sector\n", ret);
               goto errout_with_semaphore;
             }
 
@@ -892,7 +899,7 @@ static ssize_t smartfs_write(FAR struct file *filep, const char *buffer,
             {
               /* Error allocating logical sector! */
 
-              ferr("Error - duplicate logical sector %d\n", sf->currsector);
+              ferr("ERROR: Duplicate logical sector %d\n", sf->currsector);
             }
 
           sf->bflags = SMARTFS_BFLAG_DIRTY;
@@ -922,7 +929,7 @@ static ssize_t smartfs_write(FAR struct file *filep, const char *buffer,
               ret = FS_IOCTL(fs, BIOC_ALLOCSECT, 0xFFFF);
               if (ret < 0)
                 {
-                  ferr("Error %d allocating new sector\n", ret);
+                  ferr("ERROR: Error %d allocating new sector\n", ret);
                   goto errout_with_semaphore;
                 }
 
@@ -937,7 +944,7 @@ static ssize_t smartfs_write(FAR struct file *filep, const char *buffer,
               ret = FS_IOCTL(fs, BIOC_WRITESECT, (unsigned long) &readwrite);
               if (ret < 0)
                 {
-                  ferr("Error %d writing next sector\n", ret);
+                  ferr("ERROR: Error %d writing next sector\n", ret);
                   goto errout_with_semaphore;
                 }
 
@@ -949,7 +956,7 @@ static ssize_t smartfs_write(FAR struct file *filep, const char *buffer,
                 {
                   /* Error allocating logical sector! */
 
-                  ferr("Error - duplicate logical sector %d\n", sf->currsector);
+                  ferr("ERROR: Duplicate logical sector %d\n", sf->currsector);
                 }
 
               sf->currsector = SMARTFS_NEXTSECTOR(header);
@@ -1078,7 +1085,8 @@ static off_t smartfs_seek_internal(struct smartfs_mountpt_s *fs,
       ret = FS_IOCTL(fs, BIOC_READSECT, (unsigned long) &readwrite);
       if (ret < 0)
         {
-          ferr("Error %d reading sector %d header\n", ret, sf->currsector);
+          ferr("ERROR: Error %d reading sector %d header\n",
+               ret, sf->currsector);
           goto errout;
         }
 
@@ -1103,7 +1111,8 @@ static off_t smartfs_seek_internal(struct smartfs_mountpt_s *fs,
       ret = FS_IOCTL(fs, BIOC_READSECT, (unsigned long) &readwrite);
       if (ret < 0)
         {
-          ferr("Error %d reading sector %d header\n", ret, sf->currsector);
+          ferr("ERROR: Error %d reading sector %d header\n",
+               ret, sf->currsector);
           goto errout;
         }
     }
@@ -1933,7 +1942,8 @@ int smartfs_rename(struct inode *mountpt, const char *oldrelpath,
           ret = FS_IOCTL(fs, BIOC_READSECT, (unsigned long) &readwrite);
           if (ret < 0)
             {
-              ferr("Error %d reading sector %d data\n", ret, oldentry.dsector);
+              ferr("ERROR: Error %d reading sector %d data\n",
+                   ret, oldentry.dsector);
               goto errout_with_semaphore;
             }
 
@@ -2005,7 +2015,8 @@ int smartfs_rename(struct inode *mountpt, const char *oldrelpath,
       ret = FS_IOCTL(fs, BIOC_READSECT, (unsigned long) &readwrite);
       if (ret < 0)
         {
-          ferr("Error %d reading sector %d data\n", ret, oldentry.dsector);
+          ferr("ERROR: Error %d reading sector %d data\n",
+               ret, oldentry.dsector);
           goto errout_with_semaphore;
         }
 
@@ -2024,7 +2035,8 @@ int smartfs_rename(struct inode *mountpt, const char *oldrelpath,
       ret = FS_IOCTL(fs, BIOC_WRITESECT, (unsigned long) &readwrite);
       if (ret < 0)
         {
-          ferr("Error %d writing flag bytes for sector %d\n", ret, readwrite.logsector);
+          ferr("ERROR: Error %d writing flag bytes for sector %d\n",
+               ret, readwrite.logsector);
           goto errout_with_semaphore;
         }
     }
diff --git a/fs/smartfs/smartfs_utils.c b/fs/smartfs/smartfs_utils.c
index 6c8373e79f..44efc60c26 100644
--- a/fs/smartfs/smartfs_utils.c
+++ b/fs/smartfs/smartfs_utils.c
@@ -231,7 +231,7 @@ int smartfs_mount(struct smartfs_mountpt_s *fs, bool writeable)
   ret = FS_IOCTL(fs, BIOC_GETFORMAT, (unsigned long) &fs->fs_llformat);
   if (ret != OK)
     {
-      ferr("Error getting device low level format: %d\n", ret);
+      ferr("ERROR: Error getting device low level format: %d\n", ret);
       goto errout;
     }
 
@@ -239,7 +239,7 @@ int smartfs_mount(struct smartfs_mountpt_s *fs, bool writeable)
 
   if (!(fs->fs_llformat.flags & SMART_FMT_ISFORMATTED))
     {
-      ferr("No low-level format found\n");
+      ferr("ERROR: No low-level format found\n");
       ret = -ENODEV;
       goto errout;
     }
@@ -311,16 +311,16 @@ int smartfs_mount(struct smartfs_mountpt_s *fs, bool writeable)
 
   fs->fs_mounted = TRUE;
 
-  ferr("SMARTFS:\n");
-  ferr("\t    Sector size:     %d\n", fs->fs_llformat.sectorsize);
-  ferr("\t    Bytes/sector     %d\n", fs->fs_llformat.availbytes);
-  ferr("\t    Num sectors:     %d\n", fs->fs_llformat.nsectors);
-  ferr("\t    Free sectors:    %d\n", fs->fs_llformat.nfreesectors);
-  ferr("\t    Max filename:    %d\n", CONFIG_SMARTFS_MAXNAMLEN);
+  finfo("SMARTFS:\n");
+  finfo("\t    Sector size:     %d\n", fs->fs_llformat.sectorsize);
+  finfo("\t    Bytes/sector     %d\n", fs->fs_llformat.availbytes);
+  finfo("\t    Num sectors:     %d\n", fs->fs_llformat.nsectors);
+  finfo("\t    Free sectors:    %d\n", fs->fs_llformat.nfreesectors);
+  finfo("\t    Max filename:    %d\n", CONFIG_SMARTFS_MAXNAMLEN);
 #ifdef CONFIG_SMARTFS_MULTI_ROOT_DIRS
-  ferr("\t    RootDirEntries:  %d\n", fs->fs_llformat.nrootdirentries);
+  finfo("\t    RootDirEntries:  %d\n", fs->fs_llformat.nrootdirentries);
 #endif
-  ferr("\t    RootDirSector:   %d\n", fs->fs_rootsector);
+  finfo("\t    RootDirSector:   %d\n", fs->fs_rootsector);
 
 errout:
   return ret;
@@ -695,10 +695,12 @@ int smartfs_finddirentry(struct smartfs_mountpt_s *fs,
                                   /* Read the next sector of the file */
 
                                   readwrite.logsector = dirsector;
-                                  ret = FS_IOCTL(fs, BIOC_READSECT, (unsigned long) &readwrite);
+                                  ret = FS_IOCTL(fs, BIOC_READSECT,
+                                                 (unsigned long) &readwrite);
                                   if (ret < 0)
                                     {
-                                      ferr("Error in sector chain at %d!\n", dirsector);
+                                      ferr("ERROR: Error in sector chain at %d!\n",
+                                           dirsector);
                                       break;
                                     }
 
@@ -937,7 +939,7 @@ int smartfs_createentry(FAR struct smartfs_mountpt_s *fs,
           ret = FS_IOCTL(fs, BIOC_WRITESECT, (unsigned long) &readwrite);
           if (ret < 0)
             {
-              ferr("Error chaining sector %d\n", nextsector);
+              ferr("ERROR: Error chaining sector %d\n", nextsector);
               goto errout;
             }
         }
@@ -1014,7 +1016,7 @@ int smartfs_createentry(FAR struct smartfs_mountpt_s *fs,
           ret = FS_IOCTL(fs, BIOC_WRITESECT, (unsigned long) &readwrite);
           if (ret < 0)
             {
-              ferr("Error %d setting new sector type for sector %d\n",
+              ferr("ERROR: Error %d setting new sector type for sector %d\n",
                    ret, nextsector);
               goto errout;
             }
@@ -1129,7 +1131,7 @@ int smartfs_deleteentry(struct smartfs_mountpt_s *fs,
       ret = FS_IOCTL(fs, BIOC_READSECT, (unsigned long) &readwrite);
       if (ret < 0)
         {
-          ferr("Error reading sector %d\n", nextsector);
+          ferr("ERROR: Error reading sector %d\n", nextsector);
           break;
         }
 
@@ -1148,7 +1150,8 @@ int smartfs_deleteentry(struct smartfs_mountpt_s *fs,
   ret = FS_IOCTL(fs, BIOC_READSECT, (unsigned long) &readwrite);
   if (ret < 0)
     {
-      ferr("Error reading directory info at sector %d\n", entry->dsector);
+      ferr("ERROR: Error reading directory info at sector %d\n",
+           entry->dsector);
       goto errout;
     }
 
@@ -1177,7 +1180,8 @@ int smartfs_deleteentry(struct smartfs_mountpt_s *fs,
   ret = FS_IOCTL(fs, BIOC_WRITESECT, (unsigned long) &readwrite);
   if (ret < 0)
     {
-      ferr("Error marking entry inactive at sector %d\n", entry->dsector);
+      ferr("ERROR: Error marking entry inactive at sector %d\n",
+           entry->dsector);
       goto errout;
     }
 
@@ -1242,7 +1246,7 @@ int smartfs_deleteentry(struct smartfs_mountpt_s *fs,
               ret = FS_IOCTL(fs, BIOC_READSECT, (unsigned long) &readwrite);
               if (ret < 0)
                 {
-                  ferr("Error reading sector %d\n", nextsector);
+                  ferr("ERROR: Error reading sector %d\n", nextsector);
                   break;
                 }
 
@@ -1259,7 +1263,7 @@ int smartfs_deleteentry(struct smartfs_mountpt_s *fs,
                   ret = FS_IOCTL(fs, BIOC_WRITESECT, (unsigned long) &readwrite);
                   if (ret < 0)
                     {
-                      ferr("Error unchaining sector (%d)\n", nextsector);
+                      ferr("ERROR: Error unchaining sector (%d)\n", nextsector);
                       goto errout;
                     }
 
@@ -1268,7 +1272,7 @@ int smartfs_deleteentry(struct smartfs_mountpt_s *fs,
                   ret = FS_IOCTL(fs, BIOC_FREESECT, (unsigned long) entry->dsector);
                   if (ret < 0)
                     {
-                      ferr("Error freeing sector %d\n", entry->dsector);
+                      ferr("ERROR: Error freeing sector %d\n", entry->dsector);
                       goto errout;
                     }
 
@@ -1327,7 +1331,7 @@ int smartfs_countdirentries(struct smartfs_mountpt_s *fs,
       ret = FS_IOCTL(fs, BIOC_READSECT, (unsigned long) &readwrite);
       if (ret < 0)
         {
-          ferr("Error reading sector %d\n", nextsector);
+          ferr("ERROR: Error reading sector %d\n", nextsector);
           break;
         }
 
@@ -1336,7 +1340,7 @@ int smartfs_countdirentries(struct smartfs_mountpt_s *fs,
       header = (struct smartfs_chain_header_s *) fs->fs_rwbuffer;
       if (header->type != SMARTFS_SECTOR_TYPE_DIR)
         {
-          ferr("Sector %d is not a DIR sector!\n", nextsector);
+          ferr("ERROR: Sector %d is not a DIR sector!\n", nextsector);
           goto errout;
         }
 
@@ -1411,7 +1415,7 @@ int smartfs_truncatefile(struct smartfs_mountpt_s *fs,
       ret = FS_IOCTL(fs, BIOC_READSECT, (unsigned long) &readwrite);
       if (ret < 0)
         {
-          ferr("Error reading sector %d header\n", nextsector);
+          ferr("ERROR: Error reading sector %d header\n", nextsector);
           goto errout;
         }
 
@@ -1447,7 +1451,7 @@ int smartfs_truncatefile(struct smartfs_mountpt_s *fs,
           ret = FS_IOCTL(fs, BIOC_WRITESECT, (unsigned long) &readwrite);
           if (ret < 0)
             {
-              ferr("Error blanking 1st sector (%d) of file\n", nextsector);
+              ferr("ERROR: Error blanking 1st sector (%d) of file\n", nextsector);
               goto errout;
             }
 
@@ -1463,7 +1467,7 @@ int smartfs_truncatefile(struct smartfs_mountpt_s *fs,
           ret = FS_IOCTL(fs, BIOC_FREESECT, (unsigned long) nextsector);
           if (ret < 0)
             {
-              ferr("Error freeing sector %d\n", nextsector);
+              ferr("ERROR: Error freeing sector %d\n", nextsector);
               goto errout;
             }
         }
diff --git a/fs/tmpfs/fs_tmpfs.c b/fs/tmpfs/fs_tmpfs.c
index a44ddb11ff..ee56d7189b 100644
--- a/fs/tmpfs/fs_tmpfs.c
+++ b/fs/tmpfs/fs_tmpfs.c
@@ -1727,7 +1727,7 @@ static int tmpfs_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
       return OK;
     }
 
-  ferr("Invalid cmd: %d\n", cmd);
+  ferr("ERROR: Invalid cmd: %d\n", cmd);
   return -ENOTTY;
 }
 
diff --git a/fs/vfs/fs_epoll.c b/fs/vfs/fs_epoll.c
index bc0502e111..47500d01f3 100644
--- a/fs/vfs/fs_epoll.c
+++ b/fs/vfs/fs_epoll.c
@@ -190,12 +190,12 @@ int epoll_wait(int epfd, FAR struct epoll_event *evs, int maxevents,
     {
       if (rc < 0)
         {
-          ferr("%08x poll fail: %d for %d, %d msecs\n",
+          ferr("ERROR: %08x poll fail: %d for %d, %d msecs\n",
                epfd, rc, eph->occupied, timeout);
 
           for (i = 0; i < eph->occupied; i++)
             {
-              ferr("%02d: fd=%d\n", i, eph->evs[i].data.fd);
+              ferr("  %02d: fd=%d\n", i, eph->evs[i].data.fd);
             }
         }
 
-- 
GitLab


From f4fcdcdb4d87054c207998fc71e9a799b4c16b1d Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sat, 11 Jun 2016 17:37:21 -0600
Subject: [PATCH 28/91] net/:  Change some *err() message to *info() messages
 if what was a *dbg() message does not indicate and error condition.

---
 net/arp/arp_arpin.c            |  2 +-
 net/devif/devif_callback.c     |  2 +-
 net/devif/ipv4_input.c         | 15 ++++++++-------
 net/devif/ipv6_input.c         |  2 +-
 net/icmp/icmp_input.c          |  2 +-
 net/icmp/icmp_ping.c           |  6 +++---
 net/icmpv6/icmpv6_input.c      |  2 +-
 net/icmpv6/icmpv6_ping.c       |  6 +++---
 net/igmp/igmp_group.c          | 26 +++++++++++++-------------
 net/igmp/igmp_input.c          | 12 ++++++------
 net/igmp/igmp_leave.c          |  4 ++--
 net/igmp/igmp_timer.c          |  6 +++---
 net/iob/iob_clone.c            |  2 +-
 net/iob/iob_trimtail.c         |  2 +-
 net/local/local_netpoll.c      |  2 +-
 net/netdev/netdev_register.c   | 12 ++++++------
 net/netdev/netdev_unregister.c | 12 ++++++------
 net/pkt/pkt_input.c            |  2 +-
 net/pkt/pkt_poll.c             |  2 +-
 net/socket/net_clone.c         |  2 +-
 net/socket/net_close.c         |  2 +-
 net/socket/net_sendfile.c      | 18 +++++++++---------
 net/tcp/tcp_backlog.c          |  6 +++---
 net/tcp/tcp_conn.c             | 14 +++++++-------
 net/tcp/tcp_input.c            |  6 +++---
 net/tcp/tcp_send_buffered.c    |  6 ++++--
 net/tcp/tcp_send_unbuffered.c  |  2 +-
 net/udp/udp_input.c            |  4 ++--
 28 files changed, 91 insertions(+), 88 deletions(-)

diff --git a/net/arp/arp_arpin.c b/net/arp/arp_arpin.c
index 438125f7bd..fcd84b4b85 100644
--- a/net/arp/arp_arpin.c
+++ b/net/arp/arp_arpin.c
@@ -96,7 +96,7 @@ void arp_arpin(FAR struct net_driver_s *dev)
 
   if (dev->d_len < (sizeof(struct arp_hdr_s) + ETH_HDRLEN))
     {
-      nllerr("Too small\n");
+      nllerr("ERROR: Packet Too small\n");
       dev->d_len = 0;
       return;
     }
diff --git a/net/devif/devif_callback.c b/net/devif/devif_callback.c
index 2508f2d0f0..f5d794ad0b 100644
--- a/net/devif/devif_callback.c
+++ b/net/devif/devif_callback.c
@@ -260,7 +260,7 @@ FAR struct devif_callback_s *
 #ifdef CONFIG_DEBUG_FEATURES
   else
     {
-      nllerr("Failed to allocate callback\n");
+      nllerr("ERROR: Failed to allocate callback\n");
     }
 #endif
 
diff --git a/net/devif/ipv4_input.c b/net/devif/ipv4_input.c
index 9b02f2ac3f..778ff18b74 100644
--- a/net/devif/ipv4_input.c
+++ b/net/devif/ipv4_input.c
@@ -339,7 +339,8 @@ int ipv4_input(FAR struct net_driver_s *dev)
       g_netstats.ipv4.drop++;
       g_netstats.ipv4.vhlerr++;
 #endif
-      nllerr("Invalid IP version or header length: %02x\n", pbuf->vhl);
+      nllerr("ERROR: Invalid IP version or header length: %02x\n",
+             pbuf->vhl);
       goto drop;
     }
 
@@ -348,7 +349,7 @@ int ipv4_input(FAR struct net_driver_s *dev)
   hdrlen = NET_LL_HDRLEN(dev);
   if ((hdrlen + IPv4_HDRLEN) > dev->d_len)
     {
-      nllerr("Packet shorter than IPv4 header\n");
+      nllerr("ERROR: Packet shorter than IPv4 header\n");
       goto drop;
     }
 
@@ -368,7 +369,7 @@ int ipv4_input(FAR struct net_driver_s *dev)
     }
   else
     {
-      nllerr("IP packet shorter than length in IP header\n");
+      nllerr("ERROR: IP packet shorter than length in IP header\n");
       goto drop;
     }
 
@@ -387,7 +388,7 @@ int ipv4_input(FAR struct net_driver_s *dev)
       g_netstats.ipv4.drop++;
       g_netstats.ipv4.fragerr++;
 #endif
-      nllerr("IP fragment dropped\n");
+      nllerr("ERROR: IP fragment dropped\n");
       goto drop;
 #endif /* CONFIG_NET_TCP_REASSEMBLY */
     }
@@ -413,7 +414,7 @@ int ipv4_input(FAR struct net_driver_s *dev)
 #ifdef CONFIG_NET_ICMP
   if (net_ipv4addr_cmp(dev->d_ipaddr, INADDR_ANY))
     {
-      nllerr("No IP address assigned\n");
+      nllerr("ERROR: No IP address assigned\n");
       goto drop;
     }
 
@@ -446,7 +447,7 @@ int ipv4_input(FAR struct net_driver_s *dev)
       g_netstats.ipv4.drop++;
       g_netstats.ipv4.chkerr++;
 #endif
-      nllerr("Bad IP checksum\n");
+      nllerr("ERROR: Bad IP checksum\n");
       goto drop;
     }
 
@@ -494,7 +495,7 @@ int ipv4_input(FAR struct net_driver_s *dev)
         g_netstats.ipv4.protoerr++;
 #endif
 
-        nllerr("Unrecognized IP protocol\n");
+        nllerr("ERROR: Unrecognized IP protocol\n");
         goto drop;
     }
 
diff --git a/net/devif/ipv6_input.c b/net/devif/ipv6_input.c
index 0378b2c270..547193825d 100644
--- a/net/devif/ipv6_input.c
+++ b/net/devif/ipv6_input.c
@@ -160,7 +160,7 @@ int ipv6_input(FAR struct net_driver_s *dev)
   hdrlen = NET_LL_HDRLEN(dev);
   if ((hdrlen + IPv6_HDRLEN) > dev->d_len)
     {
-      nllerr("Packet shorter than IPv6 header\n");
+      nllerr("ERROR: Packet shorter than IPv6 header\n");
       goto drop;
     }
 
diff --git a/net/icmp/icmp_input.c b/net/icmp/icmp_input.c
index befda6bf04..368795e1ef 100644
--- a/net/icmp/icmp_input.c
+++ b/net/icmp/icmp_input.c
@@ -164,7 +164,7 @@ void icmp_input(FAR struct net_driver_s *dev)
 
   else
     {
-      nllerr("Unknown ICMP cmd: %d\n", picmp->type);
+      nllerr("ERROR: Unknown ICMP cmd: %d\n", picmp->type);
       goto typeerr;
     }
 
diff --git a/net/icmp/icmp_ping.c b/net/icmp/icmp_ping.c
index 075e6aae0d..73f29ff0da 100644
--- a/net/icmp/icmp_ping.c
+++ b/net/icmp/icmp_ping.c
@@ -262,12 +262,12 @@ static uint16_t ping_interrupt(FAR struct net_driver_s *dev, FAR void *conn,
                * that the destination address is not reachable.
                */
 
-              nllerr("Not reachable\n");
+              nllerr("ERROR:Not reachable\n");
               failcode = -ENETUNREACH;
             }
           else
             {
-              nllerr("Ping timeout\n");
+              nllerr("ERROR:Ping timeout\n");
               failcode = -ETIMEDOUT;
             }
 
@@ -416,7 +416,7 @@ int icmp_ping(in_addr_t addr, uint16_t id, uint16_t seqno, uint16_t datalen,
     }
   else
     {
-      nllerr("Return error=%d\n", -state.png_result);
+      nllerr("ERROR: Return error=%d\n", -state.png_result);
       return state.png_result;
     }
 }
diff --git a/net/icmpv6/icmpv6_input.c b/net/icmpv6/icmpv6_input.c
index a0ef963589..cf65480a12 100644
--- a/net/icmpv6/icmpv6_input.c
+++ b/net/icmpv6/icmpv6_input.c
@@ -307,7 +307,7 @@ void icmpv6_input(FAR struct net_driver_s *dev)
 
     default:
       {
-        nllerr("Unknown ICMPv6 type: %d\n", icmp->type);
+        nllerr("ERROR: Unknown ICMPv6 type: %d\n", icmp->type);
         goto icmpv6_type_error;
       }
     }
diff --git a/net/icmpv6/icmpv6_ping.c b/net/icmpv6/icmpv6_ping.c
index da5b1701b9..7f3e7c8e4e 100644
--- a/net/icmpv6/icmpv6_ping.c
+++ b/net/icmpv6/icmpv6_ping.c
@@ -336,12 +336,12 @@ static uint16_t ping_interrupt(FAR struct net_driver_s *dev, FAR void *conn,
                * reason is that the destination address is not reachable.
                */
 
-              nllerr("Not reachable\n");
+              nllerr("ERROR: Not reachable\n");
               failcode = -ENETUNREACH;
             }
           else
             {
-              nllerr("Ping timeout\n");
+              nllerr("ERROR: Ping timeout\n");
               failcode = -ETIMEDOUT;
             }
 
@@ -490,7 +490,7 @@ int icmpv6_ping(net_ipv6addr_t addr, uint16_t id, uint16_t seqno,
     }
   else
     {
-      nllerr("Return error=%d\n", -state.png_result);
+      nllerr("ERROR: Return error=%d\n", -state.png_result);
       return state.png_result;
     }
 }
diff --git a/net/igmp/igmp_group.c b/net/igmp/igmp_group.c
index b8e673ccea..dc1a3e3612 100644
--- a/net/igmp/igmp_group.c
+++ b/net/igmp/igmp_group.c
@@ -194,7 +194,7 @@ void igmp_grpinit(void)
   FAR struct igmp_group_s *group;
   int i;
 
-  grpllerr("Initializing\n");
+  grpllinfo("Initializing\n");
 
 #if CONFIG_PREALLOC_IGMPGROUPS > 0
   for (i = 0; i < CONFIG_PREALLOC_IGMPGROUPS; i++)
@@ -226,20 +226,20 @@ FAR struct igmp_group_s *igmp_grpalloc(FAR struct net_driver_s *dev,
   if (up_interrupt_context())
     {
 #if CONFIG_PREALLOC_IGMPGROUPS > 0
-      grpllerr("Use a pre-allocated group entry\n");
+      grpllinfo("Use a pre-allocated group entry\n");
       group = igmp_grpprealloc();
 #else
-      grpllerr("Cannot allocate from interrupt handler\n");
+      grpllerr("ERROR: Cannot allocate from interrupt handler\n");
       group = NULL;
 #endif
     }
   else
     {
-      grpllerr("Allocate from the heap\n");
+      grpllinfo("Allocate from the heap\n");
       group = igmp_grpheapalloc();
     }
 
-  grpllerr("group: %p\n", group);
+  grpllinfo("group: %p\n", group);
 
   /* Check if we successfully allocated a group structure */
 
@@ -285,7 +285,7 @@ FAR struct igmp_group_s *igmp_grpfind(FAR struct net_driver_s *dev,
   FAR struct igmp_group_s *group;
   net_lock_t flags;
 
-  grpllerr("Searching for addr %08x\n", (int)*addr);
+  grpllinfo("Searching for addr %08x\n", (int)*addr);
 
   /* We must disable interrupts because we don't which context we were
    * called from.
@@ -296,10 +296,10 @@ FAR struct igmp_group_s *igmp_grpfind(FAR struct net_driver_s *dev,
        group;
        group = group->next)
     {
-      grpllerr("Compare: %08x vs. %08x\n", group->grpaddr, *addr);
+      grpllinfo("Compare: %08x vs. %08x\n", group->grpaddr, *addr);
       if (net_ipv4addr_cmp(group->grpaddr, *addr))
         {
-          grpllerr("Match!\n");
+          grpllinfo("Match!\n");
           break;
         }
     }
@@ -325,13 +325,13 @@ FAR struct igmp_group_s *igmp_grpallocfind(FAR struct net_driver_s *dev,
 {
   FAR struct igmp_group_s *group = igmp_grpfind(dev, addr);
 
-  grpllerr("group: %p addr: %08x\n", group, (int)*addr);
+  grpllinfo("group: %p addr: %08x\n", group, (int)*addr);
   if (!group)
     {
       group = igmp_grpalloc(dev, addr);
     }
 
-  grpllerr("group: %p\n", group);
+  grpllinfo("group: %p\n", group);
   return group;
 }
 
@@ -350,7 +350,7 @@ void igmp_grpfree(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group)
 {
   net_lock_t flags;
 
-  grpllerr("Free: %p flags: %02x\n", group, group->flags);
+  grpllinfo("Free: %p flags: %02x\n", group, group->flags);
 
   /* Cancel the wdog */
 
@@ -376,7 +376,7 @@ void igmp_grpfree(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group)
 #if CONFIG_PREALLOC_IGMPGROUPS > 0
   if (IS_PREALLOCATED(group->flags))
     {
-      grpllerr("Put back on free list\n");
+      grpllinfo("Put back on free list\n");
       sq_addlast((FAR sq_entry_t *)group, &g_freelist);
       net_unlock(flags);
     }
@@ -388,7 +388,7 @@ void igmp_grpfree(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group)
        */
 
       net_unlock(flags);
-      grpllerr("Call sched_kfree()\n");
+      grpllinfo("Call sched_kfree()\n");
       sched_kfree(group);
     }
 }
diff --git a/net/igmp/igmp_input.c b/net/igmp/igmp_input.c
index d8bba1d153..7d3daa14f4 100644
--- a/net/igmp/igmp_input.c
+++ b/net/igmp/igmp_input.c
@@ -124,7 +124,7 @@ void igmp_input(struct net_driver_s *dev)
   if (dev->d_len < NET_LL_HDRLEN(dev) + IPIGMP_HDRLEN)
     {
       IGMP_STATINCR(g_netstats.igmp.length_errors);
-      nllerr("Length error\n");
+      nllerr("ERROR: Length error\n");
       return;
     }
 
@@ -133,7 +133,7 @@ void igmp_input(struct net_driver_s *dev)
   if (net_chksum((FAR uint16_t *)&IGMPBUF->type, IGMP_HDRLEN) != 0)
     {
       IGMP_STATINCR(g_netstats.igmp.chksum_errors);
-      nllerr("Checksum error\n");
+      nllerr("ERROR: Checksum error\n");
       return;
     }
 
@@ -143,7 +143,7 @@ void igmp_input(struct net_driver_s *dev)
   group = igmp_grpallocfind(dev, &destipaddr);
   if (!group)
     {
-      nllerr("Failed to allocate/find group: %08x\n", destipaddr);
+      nllerr("ERROR: Failed to allocate/find group: %08x\n", destipaddr);
       return;
     }
 
@@ -192,7 +192,7 @@ void igmp_input(struct net_driver_s *dev)
                     IGMP_STATINCR(g_netstats.igmp.v1_received);
                     IGMPBUF->maxresp = 10;
 
-                    nllerr("V1 not implemented\n");
+                    nllerr("ERROR: V1 not implemented\n");
                   }
 
                 IGMP_STATINCR(g_netstats.igmp.query_received);
@@ -241,7 +241,7 @@ void igmp_input(struct net_driver_s *dev)
             nllinfo("Unicast query\n");
             IGMP_STATINCR(g_netstats.igmp.ucast_query);
 
-            nllerr("Query to a specific group with the group address as destination\n");
+            nllinfo("Query to a specific group with the group address as destination\n");
 
             ticks = net_dsec2tick((int)IGMPBUF->maxresp);
             if (IS_IDLEMEMBER(group->flags) || igmp_cmptimer(group, ticks))
@@ -270,7 +270,7 @@ void igmp_input(struct net_driver_s *dev)
 
       default:
         {
-          nllerr("Unexpected msg %02x\n", IGMPBUF->type);
+          nllerr("ERROR: Unexpected msg %02x\n", IGMPBUF->type);
         }
       break;
     }
diff --git a/net/igmp/igmp_leave.c b/net/igmp/igmp_leave.c
index eb970ae127..8e40451101 100644
--- a/net/igmp/igmp_leave.c
+++ b/net/igmp/igmp_leave.c
@@ -134,7 +134,7 @@ int igmp_leavegroup(struct net_driver_s *dev, FAR const struct in_addr *grpaddr)
   /* Find the entry corresponding to the address leaving the group */
 
   group = igmp_grpfind(dev, &grpaddr->s_addr);
-  nerr("Leaving group: %p\n", group);
+  ninfo("Leaving group: %p\n", group);
   if (group)
     {
       /* Cancel the timer and discard any queued Membership Reports.  Canceling
@@ -155,7 +155,7 @@ int igmp_leavegroup(struct net_driver_s *dev, FAR const struct in_addr *grpaddr)
 
       if (IS_LASTREPORT(group->flags))
         {
-          nerr("Schedule Leave Group message\n");
+          ninfo("Schedule Leave Group message\n");
           IGMP_STATINCR(g_netstats.igmp.leave_sched);
           igmp_waitmsg(group, IGMP_LEAVE_GROUP);
         }
diff --git a/net/igmp/igmp_timer.c b/net/igmp/igmp_timer.c
index bd26598991..0725d1805e 100644
--- a/net/igmp/igmp_timer.c
+++ b/net/igmp/igmp_timer.c
@@ -170,7 +170,7 @@ void igmp_startticks(FAR struct igmp_group_s *group, unsigned int ticks)
 
   /* Start the timer */
 
-  gtmrllerr("ticks: %d\n", ticks);
+  gtmrllinfo("ticks: %d\n", ticks);
 
   ret = wd_start(group->wdog, ticks, igmp_timeout, 1, (uint32_t)group);
 
@@ -184,7 +184,7 @@ void igmp_starttimer(FAR struct igmp_group_s *group, uint8_t decisecs)
    * Important!! this should be a random timer from 0 to decisecs
    */
 
-  gtmrerr("decisecs: %d\n", decisecs);
+  gtmrinfo("decisecs: %d\n", decisecs);
   igmp_startticks(group, net_dsec2tick(decisecs));
 }
 
@@ -224,7 +224,7 @@ bool igmp_cmptimer(FAR struct igmp_group_s *group, int maxticks)
    * test as well.
    */
 
-  gtmrerr("maxticks: %d remaining: %d\n", maxticks, remaining);
+  gtmrinfo("maxticks: %d remaining: %d\n", maxticks, remaining);
   if (maxticks > remaining)
     {
       /* Cancel the watchdog timer and return true */
diff --git a/net/iob/iob_clone.c b/net/iob/iob_clone.c
index a0a5bd5c50..eb55a496bc 100644
--- a/net/iob/iob_clone.c
+++ b/net/iob/iob_clone.c
@@ -168,7 +168,7 @@ int iob_clone(FAR struct iob_s *iob1, FAR struct iob_s *iob2, bool throttled)
           next = iob_alloc(throttled);
           if (!next)
             {
-              nerr("Failed to allocate an I/O buffer/n");
+              nerr("ERROR: Failed to allocate an I/O buffer/n");
               return -ENOMEM;
             }
 
diff --git a/net/iob/iob_trimtail.c b/net/iob/iob_trimtail.c
index 6ab2add71e..cfcfd68b26 100644
--- a/net/iob/iob_trimtail.c
+++ b/net/iob/iob_trimtail.c
@@ -72,7 +72,7 @@ FAR struct iob_s *iob_trimtail(FAR struct iob_s *iob, unsigned int trimlen)
   FAR struct iob_s *last;
   int len;
 
-  nllerr("iob=%p pktlen=%d trimlen=%d\n", iob, iob->io_pktlen, trimlen);
+  nllinfo("iob=%p pktlen=%d trimlen=%d\n", iob, iob->io_pktlen, trimlen);
 
   if (iob && trimlen > 0)
     {
diff --git a/net/local/local_netpoll.c b/net/local/local_netpoll.c
index 03ef0bc6d6..4b100d67d0 100644
--- a/net/local/local_netpoll.c
+++ b/net/local/local_netpoll.c
@@ -152,7 +152,7 @@ void local_accept_pollnotify(FAR struct local_conn_s *conn,
           fds->revents |= (fds->events & eventset);
           if (fds->revents != 0)
             {
-              nerr("Report events: %02x\n", fds->revents);
+              ninfo("Report events: %02x\n", fds->revents);
               sem_post(fds->sem);
             }
         }
diff --git a/net/netdev/netdev_register.c b/net/netdev/netdev_register.c
index dfa0b6710d..bdd9a812fb 100644
--- a/net/netdev/netdev_register.c
+++ b/net/netdev/netdev_register.c
@@ -319,13 +319,13 @@ int netdev_register(FAR struct net_driver_s *dev, enum net_lltype_e lltype)
       net_unlock(save);
 
 #ifdef CONFIG_NET_ETHERNET
-      nllerr("Registered MAC: %02x:%02x:%02x:%02x:%02x:%02x as dev: %s\n",
-             dev->d_mac.ether_addr_octet[0], dev->d_mac.ether_addr_octet[1],
-             dev->d_mac.ether_addr_octet[2], dev->d_mac.ether_addr_octet[3],
-             dev->d_mac.ether_addr_octet[4], dev->d_mac.ether_addr_octet[5],
-             dev->d_ifname);
+      nllinfo("Registered MAC: %02x:%02x:%02x:%02x:%02x:%02x as dev: %s\n",
+              dev->d_mac.ether_addr_octet[0], dev->d_mac.ether_addr_octet[1],
+              dev->d_mac.ether_addr_octet[2], dev->d_mac.ether_addr_octet[3],
+              dev->d_mac.ether_addr_octet[4], dev->d_mac.ether_addr_octet[5],
+              dev->d_ifname);
 #else
-      nllerr("Registered dev: %s\n", dev->d_ifname);
+      nllinfo("Registered dev: %s\n", dev->d_ifname);
 #endif
       return OK;
     }
diff --git a/net/netdev/netdev_unregister.c b/net/netdev/netdev_unregister.c
index f8861c7fad..8509a5733c 100644
--- a/net/netdev/netdev_unregister.c
+++ b/net/netdev/netdev_unregister.c
@@ -128,13 +128,13 @@ int netdev_unregister(FAR struct net_driver_s *dev)
       net_unlock(save);
 
 #ifdef CONFIG_NET_ETHERNET
-      nllerr("Unregistered MAC: %02x:%02x:%02x:%02x:%02x:%02x as dev: %s\n",
-             dev->d_mac.ether_addr_octet[0], dev->d_mac.ether_addr_octet[1],
-             dev->d_mac.ether_addr_octet[2], dev->d_mac.ether_addr_octet[3],
-             dev->d_mac.ether_addr_octet[4], dev->d_mac.ether_addr_octet[5],
-             dev->d_ifname);
+      nllinfo("Unregistered MAC: %02x:%02x:%02x:%02x:%02x:%02x as dev: %s\n",
+              dev->d_mac.ether_addr_octet[0], dev->d_mac.ether_addr_octet[1],
+              dev->d_mac.ether_addr_octet[2], dev->d_mac.ether_addr_octet[3],
+              dev->d_mac.ether_addr_octet[4], dev->d_mac.ether_addr_octet[5],
+              dev->d_ifname);
 #else
-      nllerr("Registered dev: %s\n", dev->d_ifname);
+      nllinfo("Registered dev: %s\n", dev->d_ifname);
 #endif
       return OK;
     }
diff --git a/net/pkt/pkt_input.c b/net/pkt/pkt_input.c
index 102ef81ae3..e7969cd8f0 100644
--- a/net/pkt/pkt_input.c
+++ b/net/pkt/pkt_input.c
@@ -118,7 +118,7 @@ int pkt_input(struct net_driver_s *dev)
     }
   else
     {
-      nllerr("No listener\n");
+      nllerr("ERROR: No listener\n");
     }
 
   return ret;
diff --git a/net/pkt/pkt_poll.c b/net/pkt/pkt_poll.c
index 697377d401..0b1f12f873 100644
--- a/net/pkt/pkt_poll.c
+++ b/net/pkt/pkt_poll.c
@@ -78,7 +78,7 @@
 
 void pkt_poll(FAR struct net_driver_s *dev, FAR struct pkt_conn_s *conn)
 {
-  nllerr("IN\n");
+  nllinfo("IN\n");
 
   /* Verify that the packet connection is valid */
 
diff --git a/net/socket/net_clone.c b/net/socket/net_clone.c
index c819b6ebe4..e76f4ed2ce 100644
--- a/net/socket/net_clone.c
+++ b/net/socket/net_clone.c
@@ -116,7 +116,7 @@ int net_clone(FAR struct socket *psock1, FAR struct socket *psock2)
   else
 #endif
     {
-      nerr("Unsupported type: %d\n", psock2->s_type);
+      nerr("ERROR: Unsupported type: %d\n", psock2->s_type);
       ret = -EBADF;
     }
 
diff --git a/net/socket/net_close.c b/net/socket/net_close.c
index f994cf6609..c4f2e5ca3a 100644
--- a/net/socket/net_close.c
+++ b/net/socket/net_close.c
@@ -209,7 +209,7 @@ static uint16_t netclose_interrupt(FAR struct net_driver_s *dev,
     {
       /* Yes.. Wake up the waiting thread and report the timeout */
 
-      nllerr("CLOSE timeout\n");
+      nllerr("ERROR: CLOSE timeout\n");
       pstate->cl_result = -ETIMEDOUT;
       goto end_wait;
     }
diff --git a/net/socket/net_sendfile.c b/net/socket/net_sendfile.c
index b380258c2b..c1c42b4b31 100644
--- a/net/socket/net_sendfile.c
+++ b/net/socket/net_sendfile.c
@@ -206,7 +206,7 @@ static uint16_t ack_interrupt(FAR struct net_driver_s *dev, FAR void *pvconn,
     }
   else if ((flags & TCP_REXMIT) != 0)
     {
-      nllerr("REXMIT\n");
+      nllwarn("WARNING: TCP_REXMIT\n");
 
       /* Yes.. in this case, reset the number of bytes that have been sent
        * to the number of bytes that have been ACKed.
@@ -221,7 +221,7 @@ static uint16_t ack_interrupt(FAR struct net_driver_s *dev, FAR void *pvconn,
     {
       /* Report not connected */
 
-      nllerr("Lost connection\n");
+      nllwarn("WARNING: Lost connection\n");
 
       net_lostconnection(pstate->snd_sock, flags);
       pstate->snd_sent = -ENOTCONN;
@@ -345,7 +345,7 @@ static uint16_t sendfile_interrupt(FAR struct net_driver_s *dev, FAR void *pvcon
     {
       /* Report not connected */
 
-      nllerr("Lost connection\n");
+      nllwarn("WARNING: Lost connection\n");
 
       net_lostconnection(pstate->snd_sock, flags);
       pstate->snd_sent = -ENOTCONN;
@@ -386,7 +386,7 @@ static uint16_t sendfile_interrupt(FAR struct net_driver_s *dev, FAR void *pvcon
           if (ret < 0)
             {
               int errcode = get_errno();
-              nllerr("failed to lseek: %d\n", errcode);
+              nllerr("ERROR: Failed to lseek: %d\n", errcode);
               pstate->snd_sent = -errcode;
               goto end_wait;
             }
@@ -395,7 +395,7 @@ static uint16_t sendfile_interrupt(FAR struct net_driver_s *dev, FAR void *pvcon
           if (ret < 0)
             {
               int errcode = get_errno();
-              nllerr("failed to read from input file: %d\n", errcode);
+              nllerr("ERROR: Failed to read from input file: %d\n", errcode);
               pstate->snd_sent = -errcode;
               goto end_wait;
             }
@@ -430,7 +430,7 @@ static uint16_t sendfile_interrupt(FAR struct net_driver_s *dev, FAR void *pvcon
         }
       else
         {
-          nllerr("Window full, wait for ack\n");
+          nllwarn("WARNING: Window full, wait for ack\n");
           goto wait;
         }
     }
@@ -444,7 +444,7 @@ static uint16_t sendfile_interrupt(FAR struct net_driver_s *dev, FAR void *pvcon
     {
       /* Yes.. report the timeout */
 
-      nllerr("SEND timeout\n");
+      nllwarn("WARNING: SEND timeout\n");
       pstate->snd_sent = -ETIMEDOUT;
       goto end_wait;
     }
@@ -687,7 +687,7 @@ ssize_t net_sendfile(int outfd, struct file *infile, off_t *offset,
 
   if (state.snd_datacb == NULL)
     {
-      nllerr("Failed to allocate data callback\n");
+      nllerr("ERROR: Failed to allocate data callback\n");
       errcode = ENOMEM;
       goto errout_locked;
     }
@@ -696,7 +696,7 @@ ssize_t net_sendfile(int outfd, struct file *infile, off_t *offset,
 
   if (state.snd_ackcb == NULL)
     {
-      nllerr("Failed to allocate ack callback\n");
+      nllerr("ERROR: Failed to allocate ack callback\n");
       errcode = ENOMEM;
       goto errout_datacb;
     }
diff --git a/net/tcp/tcp_backlog.c b/net/tcp/tcp_backlog.c
index 0e85141c58..ad5e689323 100644
--- a/net/tcp/tcp_backlog.c
+++ b/net/tcp/tcp_backlog.c
@@ -109,7 +109,7 @@ int tcp_backlogcreate(FAR struct tcp_conn_s *conn, int nblg)
       bls = (FAR struct tcp_backlog_s *)kmm_zalloc(size);
       if (!bls)
         {
-          nllerr("Failed to allocate backlog\n");
+          nllerr("ERROR: Failed to allocate backlog\n");
           return -ENOMEM;
         }
 
@@ -239,7 +239,7 @@ int tcp_backlogadd(FAR struct tcp_conn_s *conn, FAR struct tcp_conn_s *blconn)
       blc = (FAR struct tcp_blcontainer_s *)sq_remfirst(&bls->bl_free);
       if (!blc)
         {
-          nllerr("Failed to allocate container\n");
+          nllerr("ERROR: Failed to allocate container\n");
           ret = -ENOMEM;
         }
       else
@@ -390,7 +390,7 @@ int tcp_backlogdelete(FAR struct tcp_conn_s *conn,
             }
         }
 
-      nllerr("Failed to find pending connection\n");
+      nllerr("ERROR: Failed to find pending connection\n");
       return -EINVAL;
     }
 
diff --git a/net/tcp/tcp_conn.c b/net/tcp/tcp_conn.c
index 6501a80ecf..fa11c42c4a 100644
--- a/net/tcp/tcp_conn.c
+++ b/net/tcp/tcp_conn.c
@@ -532,7 +532,7 @@ static inline int tcp_ipv4_bind(FAR struct tcp_conn_s *conn,
 
   if (port < 0)
     {
-      nerr("tcp_selectport failed: %d\n", port);
+      nerr("ERROR: tcp_selectport failed: %d\n", port);
       return port;
     }
 
@@ -552,7 +552,7 @@ static inline int tcp_ipv4_bind(FAR struct tcp_conn_s *conn,
     {
       /* If no device is found, then the address is not reachable */
 
-      nerr("tcp_local_ipv4_device failed: %d\n", ret);
+      nerr("ERROR: tcp_local_ipv4_device failed: %d\n", ret);
 
       /* Back out the local address setting */
 
@@ -613,7 +613,7 @@ static inline int tcp_ipv6_bind(FAR struct tcp_conn_s *conn,
 
   if (port < 0)
     {
-      nerr("tcp_selectport failed: %d\n", port);
+      nerr("ERROR: tcp_selectport failed: %d\n", port);
       return port;
     }
 
@@ -633,7 +633,7 @@ static inline int tcp_ipv6_bind(FAR struct tcp_conn_s *conn,
     {
       /* If no device is found, then the address is not reachable */
 
-      nerr("tcp_local_ipv6_device failed: %d\n", ret);
+      nerr("ERROR: tcp_local_ipv6_device failed: %d\n", ret);
 
       /* Back out the local address setting */
 
@@ -760,7 +760,7 @@ FAR struct tcp_conn_s *tcp_alloc(uint8_t domain)
 
       if (conn != NULL)
         {
-          nllerr("Closing unestablished connection: %p\n", conn);
+          nllwarn("WARNING: Closing unestablished connection: %p\n", conn);
 
           /* Yes... free it.  This will remove the connection from the list
            * of active connections and release all resources held by the
@@ -1066,7 +1066,7 @@ FAR struct tcp_conn_s *tcp_alloc_accept(FAR struct net_driver_s *dev,
            * probably really just assert here.
            */
 
-          nerr("Failed to find network device: %d\n", ret);
+          nerr("ERROR: Failed to find network device: %d\n", ret);
           tcp_free(conn);
           return NULL;
         }
@@ -1320,7 +1320,7 @@ int tcp_connect(FAR struct tcp_conn_s *conn, FAR const struct sockaddr *addr)
        * just assert here.
        */
 
-      nerr("Failed to find network device: %d\n", ret);
+      nerr("ERROR: Failed to find network device: %d\n", ret);
       goto errout_with_lock;
     }
 
diff --git a/net/tcp/tcp_input.c b/net/tcp/tcp_input.c
index 3a4cc55674..757efe9cfc 100644
--- a/net/tcp/tcp_input.c
+++ b/net/tcp/tcp_input.c
@@ -126,7 +126,7 @@ static void tcp_input(FAR struct net_driver_s *dev, unsigned int iplen)
       g_netstats.tcp.drop++;
       g_netstats.tcp.chkerr++;
 #endif
-      nllerr("Bad TCP checksum\n");
+      nllerr("ERROR: Bad TCP checksum\n");
       goto drop;
     }
 
@@ -206,7 +206,7 @@ static void tcp_input(FAR struct net_driver_s *dev, unsigned int iplen)
 #ifdef CONFIG_NET_STATISTICS
               g_netstats.tcp.syndrop++;
 #endif
-              nllerr("No free TCP connections\n");
+              nllerr("ERROR: No free TCP connections\n");
               goto drop;
             }
 
@@ -308,7 +308,7 @@ found:
   if ((tcp->flags & TCP_RST) != 0)
     {
       conn->tcpstateflags = TCP_CLOSED;
-      nllerr("RESET - TCP state: TCP_CLOSED\n");
+      nllwarn("WARNING: RESET - TCP state: TCP_CLOSED\n");
 
       (void)tcp_callback(dev, conn, TCP_ABORT);
       goto drop;
diff --git a/net/tcp/tcp_send_buffered.c b/net/tcp/tcp_send_buffered.c
index 2ae4d36daa..fb67556ae6 100644
--- a/net/tcp/tcp_send_buffered.c
+++ b/net/tcp/tcp_send_buffered.c
@@ -566,7 +566,8 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev,
 
           if (++WRB_NRTX(wrb) >= TCP_MAXRTX)
             {
-              nllerr("Expiring wrb=%p nrtx=%u\n", wrb, WRB_NRTX(wrb));
+              nllerr("ERROR: Expiring wrb=%p nrtx=%u\n",
+                     wrb, WRB_NRTX(wrb));
 
               /* The maximum retry count as been exhausted. Remove the write
                * buffer at the head of the queue.
@@ -631,7 +632,8 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev,
 
           if (++WRB_NRTX(wrb) >= TCP_MAXRTX)
             {
-              nllerr("Expiring wrb=%p nrtx=%u\n", wrb, WRB_NRTX(wrb));
+              nllerr("ERROR: Expiring wrb=%p nrtx=%u\n",
+                     wrb, WRB_NRTX(wrb));
 
               /* Return the write buffer to the free list */
 
diff --git a/net/tcp/tcp_send_unbuffered.c b/net/tcp/tcp_send_unbuffered.c
index 73dbd0691d..5e6ebec474 100644
--- a/net/tcp/tcp_send_unbuffered.c
+++ b/net/tcp/tcp_send_unbuffered.c
@@ -570,7 +570,7 @@ static uint16_t tcpsend_interrupt(FAR struct net_driver_s *dev,
     {
       /* Yes.. report the timeout */
 
-      nllerr("SEND timeout\n");
+      nllerr("ERROR: SEND timeout\n");
       pstate->snd_sent = -ETIMEDOUT;
       goto end_wait;
     }
diff --git a/net/udp/udp_input.c b/net/udp/udp_input.c
index e1f1b19c5c..2c380a4028 100644
--- a/net/udp/udp_input.c
+++ b/net/udp/udp_input.c
@@ -149,7 +149,7 @@ static int udp_input(FAR struct net_driver_s *dev, unsigned int iplen)
       g_netstats.udp.drop++;
       g_netstats.udp.chkerr++;
 #endif
-      nllerr("Bad UDP checksum\n");
+      nllerr("ERROR: Bad UDP checksum\n");
       dev->d_len = 0;
     }
   else
@@ -207,7 +207,7 @@ static int udp_input(FAR struct net_driver_s *dev, unsigned int iplen)
         }
       else
         {
-          nllerr("No listener on UDP port\n");
+          nllerr("ERROR: No listener on UDP port\n");
           dev->d_len = 0;
         }
     }
-- 
GitLab


From 1acafa813bd053fa18a529c86ea54c13f3c02b01 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sat, 11 Jun 2016 17:29:32 -0600
Subject: [PATCH 29/91] Missing open quotation mark on one of the modified
 debug statements.

---
 fs/nfs/rpc_clnt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/nfs/rpc_clnt.c b/fs/nfs/rpc_clnt.c
index fe3a660574..2432a94c03 100644
--- a/fs/nfs/rpc_clnt.c
+++ b/fs/nfs/rpc_clnt.c
@@ -766,7 +766,7 @@ int rpcclnt_request(FAR struct rpcclnt *rpc, int procnum, int prog,
       switch (tmp)
         {
         case RPC_MISMATCH:
-          ferr(ERROR: RPC_MSGDENIED: RPC_MISMATCH error\n");
+          ferr("ERROR: RPC_MSGDENIED: RPC_MISMATCH error\n");
           return EOPNOTSUPP;
 
         case RPC_AUTHERR:
-- 
GitLab


From c0142b618dac4498be45a9c42f7689de71733d73 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sat, 11 Jun 2016 17:31:11 -0600
Subject: [PATCH 30/91] Missing left parenthesis on one of the modified debug
 statements.

---
 fs/nfs/nfs_vfsops.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/nfs/nfs_vfsops.c b/fs/nfs/nfs_vfsops.c
index ecdf3ea265..0a7d93a720 100644
--- a/fs/nfs/nfs_vfsops.c
+++ b/fs/nfs/nfs_vfsops.c
@@ -357,7 +357,7 @@ static int nfs_filecreate(FAR struct nfsmount *nmp, struct nfsnode *np,
       tmp = *ptr;  /* handle_follows */
       if (!tmp)
         {
-          fwarn"WARNING: no file attributes\n");
+          fwarn("WARNING: no file attributes\n");
         }
       else
         {
-- 
GitLab


From cffef356448acc852c8ed8c6b7b07820a0a3b794 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sat, 11 Jun 2016 18:09:39 -0600
Subject: [PATCH 31/91] Eliminate some warnings introduced with DEBUG changes

---
 arch/arm/src/kl/kl_dumpgpio.c | 14 ++++----------
 libc/spawn/lib_psa_dump.c     |  2 ++
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/arch/arm/src/kl/kl_dumpgpio.c b/arch/arm/src/kl/kl_dumpgpio.c
index 218b9ae0df..3ae1708a25 100644
--- a/arch/arm/src/kl/kl_dumpgpio.c
+++ b/arch/arm/src/kl/kl_dumpgpio.c
@@ -55,7 +55,7 @@
  ****************************************************************************/
 /* Port letters for prettier debug output */
 
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_ERROR
 static const char g_portchar[KL_GPIO_NPORTS] =
 {
 #if KL_GPIO_NPORTS > 9
@@ -82,15 +82,7 @@ static const char g_portchar[KL_GPIO_NPORTS] =
 #  error "Bad number of GPIOs"
 #endif
 };
-#endif
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
+#endif /* CONFIG_DEBUG_ERROR */
 
 /****************************************************************************
  * Public Functions
@@ -107,6 +99,7 @@ static const char g_portchar[KL_GPIO_NPORTS] =
 
 void kl_dumpgpio(gpio_cfgset_t pinset, const char *msg)
 {
+#ifdef CONFIG_DEBUG_ERROR
   irqstate_t flags;
   uintptr_t base;
   int port;
@@ -131,6 +124,7 @@ void kl_dumpgpio(gpio_cfgset_t pinset, const char *msg)
         getreg32(base + KL_GPIO_PDDR_OFFSET));
 
   leave_critical_section(flags);
+#endif /* CONFIG_DEBUG_ERROR */
 }
 
 #endif /* CONFIG_DEBUG_FEATURES */
diff --git a/libc/spawn/lib_psa_dump.c b/libc/spawn/lib_psa_dump.c
index f7af91e35b..b4be80293a 100644
--- a/libc/spawn/lib_psa_dump.c
+++ b/libc/spawn/lib_psa_dump.c
@@ -64,6 +64,7 @@
 
 void posix_spawnattr_dump(posix_spawnattr_t *attr)
 {
+#ifdef CONFIG_DEBUG_ERROR
   err("attr[%p]:\n", attr);
   err("  flags:    %04x\n", attr->flags);
   if (attr->flags == 0)
@@ -122,6 +123,7 @@ void posix_spawnattr_dump(posix_spawnattr_t *attr)
 #ifndef CONFIG_DISABLE_SIGNALS
   err("  sigmask:  %08x\n", attr->sigmask);
 #endif
+#endif /* CONFIG_DEBUG_ERROR */
 }
 
 #endif /* CONFIG_DEBUG_FEATURES */
-- 
GitLab


From 27bc1a2221c830c835a19017bc590510fc655e31 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sat, 11 Jun 2016 18:05:29 -0600
Subject: [PATCH 32/91] drivers/sensors:  Change some *err() message to *info()
 messages if what was a *dbg() message does not indicate and error condition.

---
 drivers/sensors/adxl345_base.c |  6 +--
 drivers/sensors/adxl345_i2c.c  |  6 +--
 drivers/sensors/as5048b.c      | 70 +++++++++++++++++-----------------
 drivers/sensors/bh1750fvi.c    | 36 ++++++++---------
 drivers/sensors/bmp180.c       | 22 +++++------
 drivers/sensors/lm75.c         | 50 ++++++++++++------------
 drivers/sensors/lm92.c         | 66 ++++++++++++++++----------------
 drivers/sensors/lsm9ds1.c      | 34 ++++++++---------
 drivers/sensors/max31855.c     | 18 ++++-----
 drivers/sensors/max6675.c      | 12 +++---
 drivers/sensors/mb7040.c       | 23 +++++------
 drivers/sensors/mcp9844.c      | 14 +++----
 drivers/sensors/mpl115a.c      | 22 +++++------
 drivers/sensors/ms58xx.c       | 54 +++++++++++++-------------
 drivers/sensors/qencoder.c     |  2 +-
 15 files changed, 219 insertions(+), 216 deletions(-)

diff --git a/drivers/sensors/adxl345_base.c b/drivers/sensors/adxl345_base.c
index 2b30508207..56375b466b 100644
--- a/drivers/sensors/adxl345_base.c
+++ b/drivers/sensors/adxl345_base.c
@@ -305,7 +305,7 @@ static void adxl345_interrupt(FAR struct adxl345_config_s *config, FAR void *arg
       ret = work_queue(HPWORK, &priv->work, adxl345_worker, priv, 0);
       if (ret != 0)
         {
-          snllerr("Failed to queue work: %d\n", ret);
+          snllerr("ERROR: Failed to queue work: %d\n", ret);
         }
     }
 
@@ -397,7 +397,7 @@ ADXL345_HANDLE adxl345_instantiate(FAR struct i2c_master_s *dev,
   priv = (FAR struct adxl345_dev_s *)kmm_zalloc(sizeof(struct adxl345_dev_s));
   if (!priv)
     {
-      snerr("Failed to allocate the device structure!\n");
+      snerr("ERROR: Failed to allocate the device structure!\n");
       return NULL;
     }
 
@@ -418,7 +418,7 @@ ADXL345_HANDLE adxl345_instantiate(FAR struct i2c_master_s *dev,
   ret = adxl345_checkid(priv);
   if (ret < 0)
     {
-      snerr("Wrong Device ID!\n");
+      snerr("ERROR: Wrong Device ID!\n");
       kmm_free(priv);
       return NULL;
     }
diff --git a/drivers/sensors/adxl345_i2c.c b/drivers/sensors/adxl345_i2c.c
index 54c0aef44b..a522c36fdf 100644
--- a/drivers/sensors/adxl345_i2c.c
+++ b/drivers/sensors/adxl345_i2c.c
@@ -97,7 +97,7 @@ uint8_t adxl345_getreg8(FAR struct adxl345_dev_s *priv, uint8_t regaddr)
   ret = I2C_TRANSFER(priv->i2c, msg, 2);
   if (ret < 0)
     {
-      snerr("I2C_TRANSFER failed: %d\n", ret);
+      snerr("ERROR: I2C_TRANSFER failed: %d\n", ret);
       return 0;
     }
 
@@ -154,7 +154,7 @@ void adxl345_putreg8(FAR struct adxl345_dev_s *priv,
   ret = I2C_TRANSFER(priv->i2c, &msg, 1);
   if (ret < 0)
     {
-      snerr("I2C_TRANSFER failed: %d\n", ret);
+      snerr("ERROR: I2C_TRANSFER failed: %d\n", ret);
     }
 }
 #endif
@@ -204,7 +204,7 @@ uint16_t adxl345_getreg16(FAR struct adxl345_dev_s *priv, uint8_t regaddr)
   ret = I2C_TRANSFER(priv->i2c, msg, 2);
   if (ret < 0)
     {
-      snerr("I2C_TRANSFER failed: %d\n", ret);
+      snerr("ERROR: I2C_TRANSFER failed: %d\n", ret);
       return 0;
     }
 
diff --git a/drivers/sensors/as5048b.c b/drivers/sensors/as5048b.c
index 4e29a1f929..9a213655d2 100644
--- a/drivers/sensors/as5048b.c
+++ b/drivers/sensors/as5048b.c
@@ -139,7 +139,7 @@ static int as5048b_readu8(FAR struct as5048b_dev_s *priv, uint8_t regaddr,
   ret = i2c_write(priv->i2c, &config, ®addr, sizeof(regaddr));
   if (ret < 0)
     {
-      snerr("i2c_write failed: %d\n", ret);
+      snerr("ERROR: i2c_write failed: %d\n", ret);
       return ret;
     }
 
@@ -148,11 +148,11 @@ static int as5048b_readu8(FAR struct as5048b_dev_s *priv, uint8_t regaddr,
   ret = i2c_read(priv->i2c, &config, regval, sizeof(*regval));
   if (ret < 0)
     {
-      snerr("i2c_read failed: %d\n", ret);
+      snerr("ERROR: i2c_read failed: %d\n", ret);
       return ret;
     }
 
-  snerr("addr: %02x value: %02x ret: %d\n", regaddr, *regval, ret);
+  sninfo("addr: %02x value: %02x ret: %d\n", regaddr, *regval, ret);
   return ret;
 }
 
@@ -175,7 +175,7 @@ static int as5048b_readu16(FAR struct as5048b_dev_s *priv, uint8_t regaddrhi,
   ret = as5048b_readu8(priv, regaddrhi, &hi);
   if (ret < 0)
     {
-      snerr("as5048b_readu8 failed: %d\n", ret);
+      snerr("ERROR: as5048b_readu8 failed: %d\n", ret);
       return ret;
     }
 
@@ -184,13 +184,13 @@ static int as5048b_readu16(FAR struct as5048b_dev_s *priv, uint8_t regaddrhi,
   ret = as5048b_readu8(priv, regaddrlo, &lo);
   if (ret < 0)
     {
-      snerr("as5048b_readu8 failed: %d\n", ret);
+      snerr("ERROR: as5048b_readu8 failed: %d\n", ret);
       return ret;
     }
 
   *regval = (uint16_t)hi << 6 | (uint16_t)lo;
-  snerr("addrhi: %02x addrlo: %02x value: %04x ret: %d\n",
-        regaddrhi, regaddrlo, *regval, ret);
+  sninfo("addrhi: %02x addrlo: %02x value: %04x ret: %d\n",
+         regaddrhi, regaddrlo, *regval, ret);
   return ret;
 }
 
@@ -209,7 +209,7 @@ static int as5048b_writeu8(FAR struct as5048b_dev_s *priv, uint8_t regaddr,
   uint8_t buffer[2];
   int ret;
 
-  snerr("addr: %02x value: %02x\n", regaddr, regval);
+  sninfo("addr: %02x value: %02x\n", regaddr, regval);
 
   /* Set up the I2C configuration */
 
@@ -227,7 +227,7 @@ static int as5048b_writeu8(FAR struct as5048b_dev_s *priv, uint8_t regaddr,
   ret = i2c_write(priv->i2c, &config, buffer, sizeof(buffer));
   if (ret < 0)
     {
-      snerr("i2c_write failed: %d\n", ret);
+      snerr("ERROR: i2c_write failed: %d\n", ret);
     }
 
   return ret;
@@ -246,7 +246,7 @@ static int as5048b_writeu16(FAR struct as5048b_dev_s *priv, uint8_t regaddrhi,
 {
   int ret;
 
-  snerr("addrhi: %02x addrlo: %02x value: %04x\n",
+  sninfo("addrhi: %02x addrlo: %02x value: %04x\n",
         regaddrhi, regaddrlo, regval);
 
   /* Write the high 8 bits of the 13-bit value */
@@ -254,7 +254,7 @@ static int as5048b_writeu16(FAR struct as5048b_dev_s *priv, uint8_t regaddrhi,
   ret = as5048b_writeu8(priv, regaddrhi, (uint8_t)(regval >> 6));
   if (ret < 0)
     {
-      snerr("as5048b_writeu8 failed: %d\n", ret);
+      snerr("ERROR: as5048b_writeu8 failed: %d\n", ret);
       return ret;
     }
 
@@ -263,7 +263,7 @@ static int as5048b_writeu16(FAR struct as5048b_dev_s *priv, uint8_t regaddrhi,
   ret = as5048b_writeu8(priv, regaddrhi, (uint8_t)regval);
   if (ret < 0)
     {
-      snerr("as5048b_writeu8 failed: %d\n", ret);
+      snerr("ERROR: as5048b_writeu8 failed: %d\n", ret);
     }
 
   return ret;
@@ -285,11 +285,11 @@ static int as5048b_readzero(FAR struct as5048b_dev_s *priv,
   ret = as5048b_readu16(priv, AS5048B_ZEROHI_REG, AS5048B_ZEROLO_REG, zero);
   if (ret < 0)
     {
-      snerr("as5048b_readu16 failed: %d\n", ret);
+      snerr("ERROR: as5048b_readu16 failed: %d\n", ret);
       return ret;
     }
 
-  snerr("zero: %04x ret: %d\n", *zero, ret);
+  sninfo("zero: %04x ret: %d\n", *zero, ret);
   return ret;
 }
 
@@ -305,12 +305,12 @@ static int as5048b_writezero(FAR struct as5048b_dev_s *priv, uint16_t zero)
 {
   int ret;
 
-  snerr("zero: %04x\n", zero);
+  sninfo("zero: %04x\n", zero);
 
   ret = as5048b_writeu16(priv, AS5048B_ZEROHI_REG, AS5048B_ZEROLO_REG, zero);
   if (ret < 0)
     {
-      snerr("as5048b_writeu16 failed: %d\n", ret);
+      snerr("ERROR: as5048b_writeu16 failed: %d\n", ret);
     }
 
   return ret;
@@ -331,11 +331,11 @@ static int as5048b_readagc(FAR struct as5048b_dev_s *priv, FAR uint8_t *agc)
   ret = as5048b_readu8(priv, AS5048B_AGC_REG, agc);
   if (ret < 0)
     {
-      snerr("as5048b_readu8 failed: %d\n", ret);
+      snerr("ERROR: as5048b_readu8 failed: %d\n", ret);
       return ret;
     }
 
-  snerr("agc: %02x ret: %d\n", *agc, ret);
+  sninfo("agc: %02x ret: %d\n", *agc, ret);
   return ret;
 }
 
@@ -354,11 +354,11 @@ static int as5048b_readdiag(FAR struct as5048b_dev_s *priv, FAR uint8_t *diag)
   ret = as5048b_readu8(priv, AS5048B_DIAG_REG, diag);
   if (ret < 0)
     {
-      snerr("as5048b_readu8 failed: %d\n", ret);
+      snerr("ERROR: as5048b_readu8 failed: %d\n", ret);
       return ret;
     }
 
-  snerr("diag: %02x ret: %d\n", *diag, ret);
+  sninfo("diag: %02x ret: %d\n", *diag, ret);
   return ret;
 }
 
@@ -377,11 +377,11 @@ static int as5048b_readmag(FAR struct as5048b_dev_s *priv, FAR uint16_t *mag)
   ret = as5048b_readu16(priv, AS5048B_MAGHI_REG, AS5048B_MAGLO_REG, mag);
   if (ret < 0)
     {
-      snerr("as5048b_readu16 failed: %d\n", ret);
+      snerr("ERROR: as5048b_readu16 failed: %d\n", ret);
       return ret;
     }
 
-  snerr("mag: %04x ret: %d\n", *mag, ret);
+  sninfo("mag: %04x ret: %d\n", *mag, ret);
   return ret;
 }
 
@@ -400,11 +400,11 @@ static int as5048b_readang(FAR struct as5048b_dev_s *priv, FAR uint16_t *ang)
   ret = as5048b_readu16(priv, AS5048B_ANGHI_REG, AS5048B_ANGLO_REG, ang);
   if (ret < 0)
     {
-      snerr("as5048b_readu16 failed: %d\n", ret);
+      snerr("ERROR: as5048b_readu16 failed: %d\n", ret);
       return ret;
     }
 
-  snerr("ang: %04x ret: %d\n", *ang, ret);
+  sninfo("ang: %04x ret: %d\n", *ang, ret);
   return ret;
 }
 
@@ -452,7 +452,7 @@ static int as5048b_position(FAR struct qe_lowerhalf_s *lower,
   ret = as5048b_readang(priv, &ang);
   if (ret < 0)
     {
-      snerr("as5048b_readang failed: %d\n", ret);
+      snerr("ERROR: as5048b_readang failed: %d\n", ret);
       return ret;
     }
 
@@ -477,21 +477,21 @@ static int as5048b_reset(FAR struct qe_lowerhalf_s *lower)
   ret = as5048b_writezero(priv, 0);
   if (ret < 0)
     {
-      snerr("as5048b_writezero failed: %d\n", ret);
+      snerr("ERROR: as5048b_writezero failed: %d\n", ret);
       return ret;
     }
 
   ret = as5048b_readang(priv, &ang);
   if (ret < 0)
     {
-      snerr("as5048b_readang failed: %d\n", ret);
+      snerr("ERROR: as5048b_readang failed: %d\n", ret);
       return ret;
     }
 
   ret = as5048b_writezero(priv, ang);
   if (ret < 0)
     {
-      snerr("as5048b_writezero failed: %d\n", ret);
+      snerr("ERROR: as5048b_writezero failed: %d\n", ret);
     }
 
   return ret;
@@ -521,7 +521,8 @@ static int as5048b_ioctl(FAR struct qe_lowerhalf_s *lower, int cmd,
             {
               *ptr = (int32_t)zero;
             }
-          snerr("zero: %04x ret: %d\n", *ptr, ret);
+
+          sninfo("zero: %04x ret: %d\n", *ptr, ret);
         }
         break;
 
@@ -532,7 +533,7 @@ static int as5048b_ioctl(FAR struct qe_lowerhalf_s *lower, int cmd,
           FAR uint8_t *ptr = (FAR uint8_t *)((uintptr_t)arg);
           DEBUGASSERT(ptr != NULL);
           ret = as5048b_readagc(priv, ptr);
-          snerr("agc: %02x ret: %d\n", *ptr, ret);
+          sninfo("agc: %02x ret: %d\n", *ptr, ret);
         }
         break;
 
@@ -543,7 +544,7 @@ static int as5048b_ioctl(FAR struct qe_lowerhalf_s *lower, int cmd,
           FAR uint8_t *ptr = (FAR uint8_t *)((uintptr_t)arg);
           DEBUGASSERT(ptr != NULL);
           ret = as5048b_readdiag(priv, ptr);
-          snerr("diag: %02x ret: %d\n", *ptr, ret);
+          sninfo("diag: %02x ret: %d\n", *ptr, ret);
         }
         break;
 
@@ -559,12 +560,13 @@ static int as5048b_ioctl(FAR struct qe_lowerhalf_s *lower, int cmd,
             {
               *ptr = (int32_t)mag;
             }
-          snerr("mag: %04x ret: %d\n", *ptr, ret);
+
+          sninfo("mag: %04x ret: %d\n", *ptr, ret);
         }
         break;
 
       default:
-        snerr("Unrecognized cmd: %d arg: %ld\n", cmd, arg);
+        snerr("ERROR: Unrecognized cmd: %d arg: %ld\n", cmd, arg);
         ret = -ENOTTY;
         break;
     }
@@ -604,7 +606,7 @@ FAR struct qe_lowerhalf_s *as5048b_initialize(FAR struct i2c_master_s *i2c,
   priv = (FAR struct as5048b_dev_s *)kmm_malloc(sizeof(*priv));
   if (priv == NULL)
     {
-      snerr("Failed to allocate instance\n");
+      snerr("ERROR: Failed to allocate instance\n");
       return NULL;
     }
 
diff --git a/drivers/sensors/bh1750fvi.c b/drivers/sensors/bh1750fvi.c
index aa22de6b53..88ba994a38 100644
--- a/drivers/sensors/bh1750fvi.c
+++ b/drivers/sensors/bh1750fvi.c
@@ -152,7 +152,7 @@ static int bh1750fvi_read16(FAR struct bh1750fvi_dev_s *priv,
 
   *regval = (uint16_t)((buffer[0]<<8) | (buffer[1]));
 
-  snerr("value: %08x ret: %d\n", *regval, ret);
+  sninfo("value: %08x ret: %d\n", *regval, ret);
   return OK;
 }
 
@@ -169,7 +169,7 @@ static int bh1750fvi_write8(FAR struct bh1750fvi_dev_s *priv, uint8_t regval)
   struct i2c_config_s config;
   int ret;
 
-  snerr("value: %02x\n", regval);
+  sninfo("value: %02x\n", regval);
 
   /* Set up the I2C configuration */
 
@@ -182,7 +182,7 @@ static int bh1750fvi_write8(FAR struct bh1750fvi_dev_s *priv, uint8_t regval)
   ret = i2c_write(priv->i2c, &config, ®val, 1);
   if (ret < 0)
     {
-      snerr("i2c_write failed: %d\n", ret);
+      snerr("ERROR: i2c_write failed: %d\n", ret);
     }
 
   return ret;
@@ -236,14 +236,14 @@ static ssize_t bh1750fvi_read(FAR struct file *filep, FAR char *buffer,
 
   if (buflen != 2)
     {
-      snerr("You need to read 2 bytes from this sensor!\n");
+      snerr("ERROR: You need to read 2 bytes from this sensor!\n");
       return -EINVAL;
     }
 
   ret = bh1750fvi_read16(priv, &lux);
   if (ret < 0)
     {
-      snerr("Error reading light sensor!\n");
+      snerr("ERROR: Error reading light sensor!\n");
       return ret;
     }
 
@@ -283,7 +283,7 @@ static int bh1750fvi_ioctl(FAR struct file *filep, int cmd,
           ret = bh1750fvi_write8(priv, BH1750FVI_CONTINUOUS_HRM);
           if (ret < 0)
             {
-              snerr("Cannot change to Continuously H-Resolution Mode!\n");
+              snerr("ERROR: Cannot change to Continuously H-Resolution Mode!\n");
             }
         }
         break;
@@ -295,7 +295,7 @@ static int bh1750fvi_ioctl(FAR struct file *filep, int cmd,
           ret = bh1750fvi_write8(priv, BH1750FVI_CONTINUOUS_HRM2);
           if (ret < 0)
             {
-              snerr("Cannot change to Continuously H-Resolution Mode2!\n");
+              snerr("ERROR: Cannot change to Continuously H-Resolution Mode2!\n");
             }
         }
         break;
@@ -307,7 +307,7 @@ static int bh1750fvi_ioctl(FAR struct file *filep, int cmd,
           ret = bh1750fvi_write8(priv, BH1750FVI_CONTINUOUS_LRM);
           if (ret < 0)
             {
-              snerr("Cannot change to Continuously L-Resolution Mode!\n");
+              snerr("ERROR: Cannot change to Continuously L-Resolution Mode!\n");
             }
         }
         break;
@@ -319,7 +319,7 @@ static int bh1750fvi_ioctl(FAR struct file *filep, int cmd,
           ret = bh1750fvi_write8(priv, BH1750FVI_ONETIME_HRM);
           if (ret < 0)
             {
-              snerr("Cannot change to One Time H-Resolution Mode!\n");
+              snerr("ERROR: Cannot change to One Time H-Resolution Mode!\n");
             }
         }
         break;
@@ -331,7 +331,7 @@ static int bh1750fvi_ioctl(FAR struct file *filep, int cmd,
           ret = bh1750fvi_write8(priv, BH1750FVI_ONETIME_HRM2);
           if (ret < 0)
             {
-              snerr("Cannot change to One Time H-Resolution Mode2!\n");
+              snerr("ERROR: Cannot change to One Time H-Resolution Mode2!\n");
             }
         }
         break;
@@ -343,7 +343,7 @@ static int bh1750fvi_ioctl(FAR struct file *filep, int cmd,
           ret = bh1750fvi_write8(priv, BH1750FVI_ONETIME_LRM);
           if (ret < 0)
             {
-              snerr("Cannot change to One Time L-Resolution Mode!\n");
+              snerr("ERROR: Cannot change to One Time L-Resolution Mode!\n");
             }
         }
         break;
@@ -361,7 +361,7 @@ static int bh1750fvi_ioctl(FAR struct file *filep, int cmd,
           ret = bh1750fvi_write8(priv, reg);
           if (ret < 0)
             {
-              snerr("Cannot Change Measure Time at MEASURE_TIMEH!\n");
+              snerr("ERROR: Cannot Change Measure Time at MEASURE_TIMEH!\n");
             }
 
           reg = BH1750FVI_MEASURE_TIMEL | (*ptr & 0x1F);
@@ -369,13 +369,13 @@ static int bh1750fvi_ioctl(FAR struct file *filep, int cmd,
           ret = bh1750fvi_write8(priv, reg);
           if (ret < 0)
             {
-              snerr("Cannot Change Measure Time at MEASURE_TIMEL!\n");
+              snerr("ERROR: Cannot Change Measure Time at MEASURE_TIMEL!\n");
             }
         }
         break;
 
       default:
-        snerr("Unrecognized cmd: %d\n", cmd);
+        snerr("ERROR: Unrecognized cmd: %d\n", cmd);
         ret = -ENOTTY;
         break;
     }
@@ -419,7 +419,7 @@ int bh1750fvi_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
 
   if (priv == NULL)
     {
-      snerr("Failed to allocate instance\n");
+      snerr("ERROR: Failed to allocate instance\n");
       return -ENOMEM;
     }
 
@@ -431,7 +431,7 @@ int bh1750fvi_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
   ret = bh1750fvi_write8(priv, BH1750FVI_POWERON);
   if (ret < 0)
     {
-      snerr("Failed to power-on the BH1750FVI!\n");
+      snerr("ERROR: Failed to power-on the BH1750FVI!\n");
       return ret;
     }
 
@@ -440,7 +440,7 @@ int bh1750fvi_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
   ret = bh1750fvi_write8(priv, BH1750FVI_CONTINUOUS_HRM);
   if (ret < 0)
     {
-      snerr("Failed to enable the Continuosly H-Resolution Mode!\n");
+      snerr("ERROR: Failed to enable the Continuosly H-Resolution Mode!\n");
       return ret;
     }
 
@@ -449,7 +449,7 @@ int bh1750fvi_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
   ret = register_driver(devpath, &g_bh1750fvi_fops, 0666, priv);
   if (ret < 0)
     {
-      snerr("Failed to register driver: %d\n", ret);
+      snerr("ERROR: Failed to register driver: %d\n", ret);
       kmm_free(priv);
     }
 
diff --git a/drivers/sensors/bmp180.c b/drivers/sensors/bmp180.c
index b0df89d2c8..1a7d538c33 100644
--- a/drivers/sensors/bmp180.c
+++ b/drivers/sensors/bmp180.c
@@ -198,7 +198,7 @@ static uint8_t bmp180_getreg8(FAR struct bmp180_dev_s *priv, uint8_t regaddr)
   ret = i2c_write(priv->i2c, &config, ®addr, 1);
   if (ret < 0)
     {
-      snerr("i2c_write failed: %d\n", ret);
+      snerr("ERROR: i2c_write failed: %d\n", ret);
       return ret;
     }
 
@@ -207,7 +207,7 @@ static uint8_t bmp180_getreg8(FAR struct bmp180_dev_s *priv, uint8_t regaddr)
   ret = i2c_read(priv->i2c, &config, ®val, 1);
   if (ret < 0)
     {
-      snerr("i2c_read failed: %d\n", ret);
+      snerr("ERROR: i2c_read failed: %d\n", ret);
       return ret;
     }
 
@@ -240,7 +240,7 @@ static uint16_t bmp180_getreg16(FAR struct bmp180_dev_s *priv, uint8_t regaddr)
   ret = i2c_write(priv->i2c, &config, ®addr, 1);
   if (ret < 0)
     {
-      snerr("i2c_write failed: %d\n", ret);
+      snerr("ERROR: i2c_write failed: %d\n", ret);
       return ret;
     }
 
@@ -249,7 +249,7 @@ static uint16_t bmp180_getreg16(FAR struct bmp180_dev_s *priv, uint8_t regaddr)
   ret = i2c_read(priv->i2c, &config, (uint8_t *)®val, 2);
   if (ret < 0)
     {
-      snerr("i2c_read failed: %d\n", ret);
+      snerr("ERROR: i2c_read failed: %d\n", ret);
       return ret;
     }
 
@@ -292,7 +292,7 @@ static void bmp180_putreg8(FAR struct bmp180_dev_s *priv, uint8_t regaddr,
   ret = i2c_write(priv->i2c, &config, (uint8_t *) &data, 2);
   if (ret < 0)
     {
-      snerr("i2c_write failed: %d\n", ret);
+      snerr("ERROR: i2c_write failed: %d\n", ret);
       return;
     }
 
@@ -320,7 +320,7 @@ static int bmp180_checkid(FAR struct bmp180_dev_s *priv)
     {
       /* ID is not Correct */
 
-      snerr("Wrong Device ID!\n");
+      snerr("ERROR: Wrong Device ID!\n");
       return -ENODEV;
     }
 
@@ -543,13 +543,13 @@ static ssize_t bmp180_read(FAR struct file *filep, FAR char *buffer,
 
   if (!buffer)
     {
-      snerr("Buffer is null\n");
+      snerr("ERROR: Buffer is null\n");
       return -1;
     }
 
   if (buflen != 4)
     {
-      snerr("You can't read something other than 32 bits (4 bytes)\n");
+      snerr("ERROR: You can't read something other than 32 bits (4 bytes)\n");
       return -1;
     }
 
@@ -602,7 +602,7 @@ int bmp180_register(FAR const char *devpath, FAR struct i2c_master_s *i2c)
   priv = (FAR struct bmp180_dev_s *)kmm_malloc(sizeof(struct bmp180_dev_s));
   if (!priv)
     {
-      snerr("Failed to allocate instance\n");
+      snerr("ERROR: Failed to allocate instance\n");
       return -ENOMEM;
     }
 
@@ -615,7 +615,7 @@ int bmp180_register(FAR const char *devpath, FAR struct i2c_master_s *i2c)
   ret = bmp180_checkid(priv);
   if (ret < 0)
     {
-      snerr("Failed to register driver: %d\n", ret);
+      snerr("ERROR: Failed to register driver: %d\n", ret);
       kmm_free(priv);
       return ret;
     }
@@ -629,7 +629,7 @@ int bmp180_register(FAR const char *devpath, FAR struct i2c_master_s *i2c)
   ret = register_driver(devpath, &g_bmp180fops, 0666, priv);
   if (ret < 0)
     {
-      snerr("Failed to register driver: %d\n", ret);
+      snerr("ERROR: Failed to register driver: %d\n", ret);
       kmm_free(priv);
     }
 
diff --git a/drivers/sensors/lm75.c b/drivers/sensors/lm75.c
index e8f84e2933..ce9445558b 100644
--- a/drivers/sensors/lm75.c
+++ b/drivers/sensors/lm75.c
@@ -195,7 +195,7 @@ static int lm75_readb16(FAR struct lm75_dev_s *priv, uint8_t regaddr,
   ret = lm75_i2c_write(priv, ®addr, 1);
   if (ret < 0)
     {
-      snerr("i2c_write failed: %d\n", ret);
+      snerr("ERROR: i2c_write failed: %d\n", ret);
       return ret;
     }
 
@@ -204,7 +204,7 @@ static int lm75_readb16(FAR struct lm75_dev_s *priv, uint8_t regaddr,
   ret = lm75_i2c_read(priv, buffer, 2);
   if (ret < 0)
     {
-      snerr("i2c_read failed: %d\n", ret);
+      snerr("ERROR: i2c_read failed: %d\n", ret);
       return ret;
     }
 
@@ -214,7 +214,7 @@ static int lm75_readb16(FAR struct lm75_dev_s *priv, uint8_t regaddr,
    */
 
   *regvalue = b8tob16((b8_t)buffer[0] << 8 | (b8_t)buffer[1]);
-  snerr("addr: %02x value: %08x ret: %d\n", regaddr, *regvalue, ret);
+  sninfo("addr: %02x value: %08x ret: %d\n", regaddr, *regvalue, ret);
   return OK;
 }
 
@@ -232,7 +232,7 @@ static int lm75_writeb16(FAR struct lm75_dev_s *priv, uint8_t regaddr,
   uint8_t buffer[3];
   b8_t regb8;
 
-  snerr("addr: %02x value: %08x\n", regaddr, regval);
+  sninfo("addr: %02x value: %08x\n", regaddr, regval);
 
   /* Set up a 3 byte message to send */
 
@@ -265,11 +265,11 @@ static int lm75_readtemp(FAR struct lm75_dev_s *priv, FAR b16_t *temp)
   ret = lm75_readb16(priv, LM75_TEMP_REG, &temp16);
   if (ret < 0)
     {
-      snerr("lm75_readb16 failed: %d\n", ret);
+      snerr("ERROR: lm75_readb16 failed: %d\n", ret);
       return ret;
     }
 
-  snerr("Centigrade: %08x\n", temp16);
+  sninfo("Centigrade: %08x\n", temp16);
 
   /* Was fahrenheit requested? */
 
@@ -278,7 +278,7 @@ static int lm75_readtemp(FAR struct lm75_dev_s *priv, FAR b16_t *temp)
       /* Centigrade to Fahrenheit conversion:  F = 9*C/5 + 32 */
 
       temp16 =  b16mulb16(temp16, B16_9DIV5) + B16_32;
-      snerr("Fahrenheit: %08x\n", temp16);
+      sninfo("Fahrenheit: %08x\n", temp16);
     }
 
   *temp = temp16;
@@ -305,14 +305,14 @@ static int lm75_readconf(FAR struct lm75_dev_s *priv, FAR uint8_t *conf)
   ret = lm75_i2c_write(priv, &buffer, 1);
   if (ret < 0)
     {
-      snerr("i2c_write failed: %d\n", ret);
+      snerr("ERROR: i2c_write failed: %d\n", ret);
       return ret;
     }
 
   /* Restart and read 8-bits from the register */
 
   ret = lm75_i2c_read(priv, conf, 1);
-  snerr("conf: %02x ret: %d\n", *conf, ret);
+  sninfo("conf: %02x ret: %d\n", *conf, ret);
   return ret;
 }
 
@@ -328,7 +328,7 @@ static int lm75_writeconf(FAR struct lm75_dev_s *priv, uint8_t conf)
 {
   uint8_t buffer[2];
 
-  snerr("conf: %02x\n", conf);
+  sninfo("conf: %02x\n", conf);
 
   /* Set up a 2 byte message to send */
 
@@ -384,7 +384,7 @@ static ssize_t lm75_read(FAR struct file *filep, FAR char *buffer, size_t buflen
   nsamples = buflen / sizeof(b16_t);
   ptr      = (FAR b16_t *)buffer;
 
-  snerr("buflen: %d nsamples: %d\n", buflen, nsamples);
+  sninfo("buflen: %d nsamples: %d\n", buflen, nsamples);
 
   /* Get the requested number of samples */
 
@@ -397,7 +397,7 @@ static ssize_t lm75_read(FAR struct file *filep, FAR char *buffer, size_t buflen
       ret = lm75_readtemp(priv, &temp);
       if (ret < 0)
         {
-          snerr("lm75_readtemp failed: %d\n", ret);
+          snerr("ERROR: lm75_readtemp failed: %d\n", ret);
           return (ssize_t)ret;
         }
 
@@ -438,7 +438,7 @@ static int lm75_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
           FAR uint8_t *ptr = (FAR uint8_t *)((uintptr_t)arg);
           DEBUGASSERT(ptr != NULL);
           ret = lm75_readconf(priv, ptr);
-          snerr("conf: %02x ret: %d\n", *ptr, ret);
+          sninfo("conf: %02x ret: %d\n", *ptr, ret);
         }
         break;
 
@@ -446,7 +446,7 @@ static int lm75_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case SNIOC_WRITECONF:
         ret = lm75_writeconf(priv, (uint8_t)arg);
-        snerr("conf: %02x ret: %d\n", *(FAR uint8_t *)arg, ret);
+        sninfo("conf: %02x ret: %d\n", *(FAR uint8_t *)arg, ret);
         break;
 
       /* Shutdown the LM75, Arg: None */
@@ -460,7 +460,7 @@ static int lm75_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
               ret = lm75_writeconf(priv, conf | LM75_CONF_SHUTDOWN);
             }
 
-          snerr("conf: %02x ret: %d\n", conf | LM75_CONF_SHUTDOWN, ret);
+          sninfo("conf: %02x ret: %d\n", conf | LM75_CONF_SHUTDOWN, ret);
         }
         break;
 
@@ -475,7 +475,7 @@ static int lm75_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
               ret = lm75_writeconf(priv, conf & ~LM75_CONF_SHUTDOWN);
             }
 
-          snerr("conf: %02x ret: %d\n", conf & ~LM75_CONF_SHUTDOWN, ret);
+          sninfo("conf: %02x ret: %d\n", conf & ~LM75_CONF_SHUTDOWN, ret);
         }
         break;
 
@@ -483,14 +483,14 @@ static int lm75_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case SNIOC_FAHRENHEIT:
         priv->fahrenheit = true;
-        snerr("Fahrenheit\n");
+        sninfo("Fahrenheit\n");
         break;
 
       /* Report Samples in Centigrade */
 
       case SNIOC_CENTIGRADE:
         priv->fahrenheit = false;
-        snerr("Centigrade\n");
+        sninfo("Centigrade\n");
         break;
 
       /* Read THYS temperature register.  Arg: b16_t* pointer */
@@ -500,7 +500,7 @@ static int lm75_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
           FAR b16_t *ptr = (FAR b16_t *)((uintptr_t)arg);
           DEBUGASSERT(ptr != NULL);
           ret = lm75_readb16(priv, LM75_THYS_REG, ptr);
-          snerr("THYS: %08x ret: %d\n", *ptr, ret);
+          sninfo("THYS: %08x ret: %d\n", *ptr, ret);
         }
         break;
 
@@ -508,7 +508,7 @@ static int lm75_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case SNIOC_WRITETHYS:
         ret = lm75_writeb16(priv, LM75_THYS_REG, (b16_t)arg);
-        snerr("THYS: %08x ret: %d\n", (b16_t)arg, ret);
+        sninfo("THYS: %08x ret: %d\n", (b16_t)arg, ret);
         break;
 
       /* Read TOS (Over-temp Shutdown Threshold) Register. Arg: b16_t* pointer */
@@ -518,7 +518,7 @@ static int lm75_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
           FAR b16_t *ptr = (FAR b16_t *)((uintptr_t)arg);
           DEBUGASSERT(ptr != NULL);
           ret = lm75_readb16(priv, LM75_TOS_REG, ptr);
-          snerr("TOS: %08x ret: %d\n", *ptr, ret);
+          sninfo("TOS: %08x ret: %d\n", *ptr, ret);
         }
         break;
 
@@ -526,11 +526,11 @@ static int lm75_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case SNIOC_WRITETOS:
         ret = lm75_writeb16(priv, LM75_TOS_REG, (b16_t)arg);
-        snerr("TOS: %08x ret: %d\n", (b16_t)arg, ret);
+        sninfo("TOS: %08x ret: %d\n", (b16_t)arg, ret);
         break;
 
       default:
-        snerr("Unrecognized cmd: %d\n", cmd);
+        sninfo("Unrecognized cmd: %d\n", cmd);
         ret = -ENOTTY;
         break;
     }
@@ -578,7 +578,7 @@ int lm75_register(FAR const char *devpath, FAR struct i2c_master_s *i2c, uint8_t
   priv = (FAR struct lm75_dev_s *)kmm_malloc(sizeof(struct lm75_dev_s));
   if (priv == NULL)
     {
-      snerr("Failed to allocate instance\n");
+      snerr("ERROR: Failed to allocate instance\n");
       return -ENOMEM;
     }
 
@@ -591,7 +591,7 @@ int lm75_register(FAR const char *devpath, FAR struct i2c_master_s *i2c, uint8_t
   ret = register_driver(devpath, &g_lm75fops, 0666, priv);
   if (ret < 0)
     {
-      snerr("Failed to register driver: %d\n", ret);
+      snerr("ERROR: Failed to register driver: %d\n", ret);
       kmm_free(priv);
     }
 
diff --git a/drivers/sensors/lm92.c b/drivers/sensors/lm92.c
index b1d96f2040..c801e6633c 100644
--- a/drivers/sensors/lm92.c
+++ b/drivers/sensors/lm92.c
@@ -198,7 +198,7 @@ static int lm92_readb16(FAR struct lm92_dev_s *priv, uint8_t regaddr,
   ret = lm92_i2c_write(priv, ®addr, 1);
   if (ret < 0)
     {
-      snerr("i2c_write failed: %d\n", ret);
+      snerr("ERROR: i2c_write failed: %d\n", ret);
       return ret;
     }
 
@@ -207,7 +207,7 @@ static int lm92_readb16(FAR struct lm92_dev_s *priv, uint8_t regaddr,
   ret = lm92_i2c_read(priv, buffer, 2);
   if (ret < 0)
     {
-      snerr("i2c_read failed: %d\n", ret);
+      snerr("ERROR: i2c_read failed: %d\n", ret);
       return ret;
     }
 
@@ -218,7 +218,7 @@ static int lm92_readb16(FAR struct lm92_dev_s *priv, uint8_t regaddr,
   *regvalue = (b16_t)((uint32_t)(buffer[0] & (1 << 7)) << 24 |
                       (uint32_t)(buffer[0] & ~(1 << 7)) << 17 |
                       (uint32_t)(buffer[1] & ~7) << 9);
-  snerr("addr: %02x value: %08x ret: %d\n", regaddr, *regvalue, ret);
+  sninfo("addr: %02x value: %08x ret: %d\n", regaddr, *regvalue, ret);
   return OK;
 }
 
@@ -236,7 +236,7 @@ static int lm92_writeb16(FAR struct lm92_dev_s *priv, uint8_t regaddr,
 {
   uint8_t buffer[3];
 
-  snerr("addr: %02x value: %08x\n", regaddr, regval);
+  sninfo("addr: %02x value: %08x\n", regaddr, regval);
 
   /* Set up a 3-byte message to send */
 
@@ -268,11 +268,11 @@ static int lm92_readtemp(FAR struct lm92_dev_s *priv, FAR b16_t *temp)
   ret = lm92_readb16(priv, LM92_TEMP_REG, &temp16);
   if (ret < 0)
     {
-      snerr("lm92_readb16 failed: %d\n", ret);
+      snerr("ERROR: lm92_readb16 failed: %d\n", ret);
       return ret;
     }
 
-  snerr("Centigrade: %08x\n", temp16);
+  sninfo("Centigrade: %08x\n", temp16);
 
   /* Was Fahrenheit requested? */
 
@@ -281,7 +281,7 @@ static int lm92_readtemp(FAR struct lm92_dev_s *priv, FAR b16_t *temp)
       /* Centigrade to Fahrenheit conversion:  F = 9*C/5 + 32 */
 
       temp16 = b16mulb16(temp16, B16_9DIV5) + B16_32;
-      snerr("Fahrenheit: %08x\n", temp16);
+      sninfo("Fahrenheit: %08x\n", temp16);
     }
 
   *temp = temp16;
@@ -308,14 +308,14 @@ static int lm92_readconf(FAR struct lm92_dev_s *priv, FAR uint8_t *conf)
   ret = lm92_i2c_write(priv, &buffer, 1);
   if (ret < 0)
     {
-      snerr("i2c_write failed: %d\n", ret);
+      snerr("ERROR: i2c_write failed: %d\n", ret);
       return ret;
     }
 
   /* Restart and read 8 bits from the register */
 
   ret = lm92_i2c_read(priv, conf, 1);
-  snerr("conf: %02x ret: %d\n", *conf, ret);
+  sninfo("conf: %02x ret: %d\n", *conf, ret);
   return ret;
 }
 
@@ -331,7 +331,7 @@ static int lm92_writeconf(FAR struct lm92_dev_s *priv, uint8_t conf)
 {
   uint8_t buffer[2];
 
-  snerr("conf: %02x\n", conf);
+  sninfo("conf: %02x\n", conf);
 
   /* Set up a 2-byte message to send */
 
@@ -364,7 +364,7 @@ static int lm92_readid(FAR struct lm92_dev_s *priv, FAR uint16_t *id)
   ret = lm92_i2c_write(priv, ®addr, 1);
   if (ret < 0)
     {
-      snerr("i2c_write failed: %d\n", ret);
+      snerr("ERROR: i2c_write failed: %d\n", ret);
       return ret;
     }
 
@@ -373,12 +373,12 @@ static int lm92_readid(FAR struct lm92_dev_s *priv, FAR uint16_t *id)
   ret = lm92_i2c_read(priv, buffer, 2);
   if (ret < 0)
     {
-      snerr("i2c_read failed: %d\n", ret);
+      snerr("ERROR: i2c_read failed: %d\n", ret);
       return ret;
     }
 
   *id = (uint16_t)buffer[0] << 8 | (uint16_t)buffer[1];
-  snerr("id: %04x ret: %d\n", *id, ret);
+  sninfo("id: %04x ret: %d\n", *id, ret);
   return OK;
 }
 
@@ -427,7 +427,7 @@ static ssize_t lm92_read(FAR struct file *filep, FAR char *buffer,
   nsamples = buflen / sizeof(b16_t);
   ptr      = (FAR b16_t *)buffer;
 
-  snerr("buflen: %d nsamples: %d\n", buflen, nsamples);
+  sninfo("buflen: %d nsamples: %d\n", buflen, nsamples);
 
   /* Get the requested number of samples */
 
@@ -440,7 +440,7 @@ static ssize_t lm92_read(FAR struct file *filep, FAR char *buffer,
       ret = lm92_readtemp(priv, &temp);
       if (ret < 0)
         {
-          snerr("lm92_readtemp failed: %d\n", ret);
+          snerr("ERROR: lm92_readtemp failed: %d\n", ret);
           return (ssize_t)ret;
         }
 
@@ -481,7 +481,7 @@ static int lm92_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
           FAR uint8_t *ptr = (FAR uint8_t *)((uintptr_t)arg);
           DEBUGASSERT(ptr != NULL);
           ret = lm92_readconf(priv, ptr);
-          snerr("conf: %02x ret: %d\n", *ptr, ret);
+          sninfo("conf: %02x ret: %d\n", *ptr, ret);
         }
         break;
 
@@ -489,7 +489,7 @@ static int lm92_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case SNIOC_WRITECONF:
         ret = lm92_writeconf(priv, (uint8_t)arg);
-        snerr("conf: %02x ret: %d\n", *(uint8_t *)arg, ret);
+        sninfo("conf: %02x ret: %d\n", *(uint8_t *)arg, ret);
         break;
 
       /* Shutdown the LM92.  Arg:  None */
@@ -503,7 +503,7 @@ static int lm92_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
               ret = lm92_writeconf(priv, conf | LM92_CONF_SHUTDOWN);
             }
 
-          snerr("conf: %02x ret: %d\n", conf | LM92_CONF_SHUTDOWN, ret);
+          sninfo("conf: %02x ret: %d\n", conf | LM92_CONF_SHUTDOWN, ret);
         }
         break;
 
@@ -518,7 +518,7 @@ static int lm92_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
               ret = lm92_writeconf(priv, conf & ~LM92_CONF_SHUTDOWN);
             }
 
-          snerr("conf: %02x ret: %d\n", conf & ~LM92_CONF_SHUTDOWN, ret);
+          sninfo("conf: %02x ret: %d\n", conf & ~LM92_CONF_SHUTDOWN, ret);
         }
         break;
 
@@ -526,14 +526,14 @@ static int lm92_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case SNIOC_FAHRENHEIT:
         priv->fahrenheit = true;
-        snerr("Fahrenheit\n");
+        sninfo("Fahrenheit\n");
         break;
 
       /* Report samples in Centigrade.  Arg: None */
 
       case SNIOC_CENTIGRADE:
         priv->fahrenheit = false;
-        snerr("Centigrade\n");
+        sninfo("Centigrade\n");
         break;
 
       /* Read THYS temperature register.  Arg: b16_t* pointer */
@@ -543,7 +543,7 @@ static int lm92_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
           FAR b16_t *ptr = (FAR b16_t *)((uintptr_t)arg);
           DEBUGASSERT(ptr != NULL);
           ret = lm92_readb16(priv, LM92_THYS_REG, ptr);
-          snerr("THYS: %08x ret: %d\n", *ptr, ret);
+          sninfo("THYS: %08x ret: %d\n", *ptr, ret);
         }
         break;
 
@@ -551,7 +551,7 @@ static int lm92_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case SNIOC_WRITETHYS:
         ret = lm92_writeb16(priv, LM92_THYS_REG, (b16_t)arg);
-        snerr("THYS: %08x ret: %d\n", (b16_t)arg, ret);
+        sninfo("THYS: %08x ret: %d\n", (b16_t)arg, ret);
         break;
 
       /* Read TCRIT temperature register.  Arg: b16_t* pointer */
@@ -561,7 +561,7 @@ static int lm92_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
           FAR b16_t *ptr = (FAR b16_t *)((uintptr_t)arg);
           DEBUGASSERT(ptr != NULL);
           ret = lm92_readb16(priv, LM92_TCRIT_REG, ptr);
-          snerr("TCRIT: %08x ret: %d\n", *ptr, ret);
+          sninfo("TCRIT: %08x ret: %d\n", *ptr, ret);
         }
         break;
 
@@ -569,7 +569,7 @@ static int lm92_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case SNIOC_WRITETCRIT:
         ret = lm92_writeb16(priv, LM92_TCRIT_REG, (b16_t)arg);
-        snerr("TCRIT: %08x ret: %d\n", (b16_t)arg, ret);
+        sninfo("TCRIT: %08x ret: %d\n", (b16_t)arg, ret);
         break;
 
       /* Read TLOW temperature register.  Arg: b16_t* pointer */
@@ -579,7 +579,7 @@ static int lm92_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
           FAR b16_t *ptr = (FAR b16_t *)((uintptr_t)arg);
           DEBUGASSERT(ptr != NULL);
           ret = lm92_readb16(priv, LM92_TLOW_REG, ptr);
-          snerr("TLOW: %08x ret: %d\n", *ptr, ret);
+          sninfo("TLOW: %08x ret: %d\n", *ptr, ret);
         }
         break;
 
@@ -587,7 +587,7 @@ static int lm92_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case SNIOC_WRITETLOW:
         ret = lm92_writeb16(priv, LM92_TLOW_REG, (b16_t)arg);
-        snerr("TLOW: %08x ret: %d\n", (b16_t)arg, ret);
+        sninfo("TLOW: %08x ret: %d\n", (b16_t)arg, ret);
         break;
 
       /* Read THIGH temperature register.  Arg: b16_t* pointer */
@@ -597,7 +597,7 @@ static int lm92_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
           FAR b16_t *ptr = (FAR b16_t *)((uintptr_t)arg);
           DEBUGASSERT(ptr != NULL);
           ret = lm92_readb16(priv, LM92_THIGH_REG, ptr);
-          snerr("THIGH: %08x ret: %d\n", *ptr, ret);
+          sninfo("THIGH: %08x ret: %d\n", *ptr, ret);
         }
         break;
 
@@ -605,7 +605,7 @@ static int lm92_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case SNIOC_WRITETHIGH:
         ret = lm92_writeb16(priv, LM92_THIGH_REG, (b16_t)arg);
-        snerr("THIGH: %08x ret: %d\n", (b16_t)arg, ret);
+        sninfo("THIGH: %08x ret: %d\n", (b16_t)arg, ret);
         break;
 
       /* Read from the identification register.  Arg: uint16_t* pointer */
@@ -615,12 +615,12 @@ static int lm92_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
           FAR uint16_t *ptr = (FAR uint16_t *)((uintptr_t)arg);
           DEBUGASSERT(ptr != NULL);
           ret = lm92_readid(priv, ptr);
-          snerr("id: %04x ret: %d\n", *ptr, ret);
+          sninfo("id: %04x ret: %d\n", *ptr, ret);
         }
         break;
 
       default:
-        snerr("Unrecognized cmd: %d\n", cmd);
+        snerr("ERROR: Unrecognized cmd: %d\n", cmd);
         ret = -ENOTTY;
         break;
     }
@@ -668,7 +668,7 @@ int lm92_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
   priv = (FAR struct lm92_dev_s *)kmm_malloc(sizeof(struct lm92_dev_s));
   if (priv == NULL)
     {
-      snerr("Failed to allocate instance\n");
+      snerr("ERROR: Failed to allocate instance\n");
       return -ENOMEM;
     }
 
@@ -681,7 +681,7 @@ int lm92_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
   ret = register_driver(devpath, &g_lm92fops, 0666, priv);
   if (ret < 0)
     {
-      snerr("Failed to register driver: %d\n", ret);
+      snerr("ERROR: Failed to register driver: %d\n", ret);
       kmm_free(priv);
     }
 
diff --git a/drivers/sensors/lsm9ds1.c b/drivers/sensors/lsm9ds1.c
index be5d79b88c..ae69bd68c7 100644
--- a/drivers/sensors/lsm9ds1.c
+++ b/drivers/sensors/lsm9ds1.c
@@ -660,7 +660,7 @@ static int lsm9ds1_readreg8(FAR struct lsm9ds1_dev_s *priv, uint8_t regaddr,
   ret = i2c_write(priv->i2c, &config, ®addr, sizeof(regaddr));
   if (ret < 0)
     {
-      snerr("i2c_write failed: %d\n", ret);
+      snerr("ERROR: i2c_write failed: %d\n", ret);
       return ret;
     }
 
@@ -669,7 +669,7 @@ static int lsm9ds1_readreg8(FAR struct lsm9ds1_dev_s *priv, uint8_t regaddr,
   ret = i2c_read(priv->i2c, &config, regval, sizeof(*regval));
   if (ret < 0)
     {
-      snerr("i2c_read failed: %d\n", ret);
+      snerr("ERROR: i2c_read failed: %d\n", ret);
       return ret;
     }
 
@@ -712,7 +712,7 @@ static int lsm9ds1_writereg8(FAR struct lsm9ds1_dev_s *priv, uint8_t regaddr,
   ret = i2c_write(priv->i2c, &config, buffer, sizeof(buffer));
   if (ret < 0)
     {
-      snerr("i2c_write failed: %d\n", ret);
+      snerr("ERROR: i2c_write failed: %d\n", ret);
       return ret;
     }
 
@@ -741,7 +741,7 @@ static int lsm9ds1_modifyreg8(FAR struct lsm9ds1_dev_s *priv, uint8_t regaddr,
   ret = lsm9ds1_readreg8(priv, regaddr, ®val);
   if (ret < 0)
     {
-      snerr("lsm9ds1_readreg8 failed: %d\n", ret);
+      snerr("ERROR: lsm9ds1_readreg8 failed: %d\n", ret);
       return ret;
     }
 
@@ -751,7 +751,7 @@ static int lsm9ds1_modifyreg8(FAR struct lsm9ds1_dev_s *priv, uint8_t regaddr,
   ret = lsm9ds1_writereg8(priv, regaddr, regval);
   if (ret < 0)
     {
-      snerr("lsm9ds1_writereg8 failed: %d\n", ret);
+      snerr("ERROR: lsm9ds1_writereg8 failed: %d\n", ret);
       return ret;
     }
 
@@ -793,13 +793,13 @@ static int lsm9ds1accelgyro_config(FAR struct lsm9ds1_dev_s *priv)
   ret = lsm9ds1_readreg8(priv, LSM9DS1_WHO_AM_I, ®val);
   if (ret < 0)
     {
-      snerr("lsm9ds1_readreg8 failed: %d\n", ret);
+      snerr("ERROR: lsm9ds1_readreg8 failed: %d\n", ret);
       return ret;
     }
 
   if (regval != LSM9DS1_WHO_AM_I_VALUE)
     {
-      snerr("Invalid device identification %02x\n", regval);
+      snerr("ERROR: Invalid device identification %02x\n", regval);
       return -ENODEV;
     }
 
@@ -1047,13 +1047,13 @@ static int lsm9ds1mag_config(FAR struct lsm9ds1_dev_s *priv)
   ret = lsm9ds1_readreg8(priv, LSM9DS1_WHO_AM_I_M, ®val);
   if (ret < 0)
     {
-      snerr("lsm9ds1_readreg8 failed: %d\n", ret);
+      snerr("ERROR: lsm9ds1_readreg8 failed: %d\n", ret);
       return ret;
     }
 
   if (regval != LSM9DS1_WHO_AM_I_M_VALUE)
     {
-      snerr("Invalid device identification %02x\n", regval);
+      snerr("ERROR: Invalid device identification %02x\n", regval);
       return -ENODEV;
     }
 
@@ -1280,7 +1280,7 @@ static ssize_t lsm9ds1_read(FAR struct file *filep, FAR char *buffer,
           ret = lsm9ds1_readreg8(priv, regaddr, &lo);
           if (ret < 0)
             {
-              snerr("lsm9ds1_readreg8 failed: %d\n", ret);
+              snerr("ERROR: lsm9ds1_readreg8 failed: %d\n", ret);
               return (ssize_t)ret;
             }
 
@@ -1291,7 +1291,7 @@ static ssize_t lsm9ds1_read(FAR struct file *filep, FAR char *buffer,
           ret = lsm9ds1_readreg8(priv, regaddr, &hi);
           if (ret < 0)
             {
-              snerr("lsm9ds1_readreg8 failed: %d\n", ret);
+              snerr("ERROR: lsm9ds1_readreg8 failed: %d\n", ret);
               return (ssize_t)ret;
             }
 
@@ -1390,20 +1390,20 @@ static int lsm9ds1_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case SNIOC_SETSAMPLERATE:
         ret = priv->ops->setsamplerate(priv, (uint32_t)arg);
-        snerr("sample rate: %08x ret: %d\n", (uint32_t)arg, ret);
+        sninfo("sample rate: %08x ret: %d\n", (uint32_t)arg, ret);
         break;
 
       /* Set the full-scale range. Arg: uint32_t value. */
 
       case SNIOC_SETFULLSCALE:
         ret = priv->ops->setfullscale(priv, (uint32_t)arg);
-        snerr("full-scale range: %08x ret: %d\n", (uint32_t)arg, ret);
+        sninfo("full-scale range: %08x ret: %d\n", (uint32_t)arg, ret);
         break;
 
       /* Unrecognized commands */
 
       default:
-        snerr("Unrecognized cmd: %d arg: %lu\n", cmd, arg);
+        snerr("ERROR: Unrecognized cmd: %d arg: %lu\n", cmd, arg);
         ret = -ENOTTY;
         break;
     }
@@ -1453,7 +1453,7 @@ static int lsm9ds1_register(FAR const char *devpath,
   priv = (FAR struct lsm9ds1_dev_s *)kmm_malloc(sizeof(*priv));
   if (priv == NULL)
     {
-      snerr("Failed to allocate instance\n");
+      snerr("ERROR: Failed to allocate instance\n");
       return -ENOMEM;
     }
 
@@ -1468,7 +1468,7 @@ static int lsm9ds1_register(FAR const char *devpath,
   ret = priv->ops->config(priv);
   if (ret < 0)
     {
-      snerr("Failed to configure device: %d\n", ret);
+      snerr("ERROR: Failed to configure device: %d\n", ret);
       kmm_free(priv);
       return ret;
     }
@@ -1478,7 +1478,7 @@ static int lsm9ds1_register(FAR const char *devpath,
   ret = register_driver(devpath, &g_fops, 0666, priv);
   if (ret < 0)
     {
-      snerr("Failed to register driver: %d\n", ret);
+      snerr("ERROR: Failed to register driver: %d\n", ret);
       kmm_free(priv);
       return ret;
     }
diff --git a/drivers/sensors/max31855.c b/drivers/sensors/max31855.c
index 73e45c191c..19800a1c59 100644
--- a/drivers/sensors/max31855.c
+++ b/drivers/sensors/max31855.c
@@ -189,13 +189,13 @@ static ssize_t max31855_read(FAR struct file *filep, FAR char *buffer, size_t bu
 
   if (!buffer)
     {
-      snerr("Buffer is null\n");
+      snerr("ERROR: Buffer is null\n");
       return -EINVAL;
     }
 
   if (buflen != 2)
     {
-      snerr("You can't read something other than 16 bits (2 bytes)\n");
+      snerr("ERROR: You can't read something other than 16 bits (2 bytes)\n");
       return -EINVAL;
     }
 
@@ -218,7 +218,7 @@ static ssize_t max31855_read(FAR struct file *filep, FAR char *buffer, size_t bu
   regval |= (regmsb & 0xFF00) << 8;
   regval |= (regmsb & 0xFF) << 24;
 
-  snerr("Read from MAX31855 = 0x%08X\n", regval);
+  sninfo("Read from MAX31855 = 0x%08X\n", regval);
 
   /* If negative, fix signal bits */
 
@@ -235,21 +235,21 @@ static ssize_t max31855_read(FAR struct file *filep, FAR char *buffer, size_t bu
 
   if (regval & MAX31855_FAULT)
     {
-      snerr("Error: A fault was detected by MAX31855:\n");
+      snerr("ERROR: A fault was detected by MAX31855:\n");
 
       if (regval & MAX31855_SHORT_VCC)
         {
-          snerr("The thermocouple input is shorted to VCC!\n");
+          snerr("  The thermocouple input is shorted to VCC!\n");
         }
 
       if (regval & MAX31855_SHORT_GND)
         {
-          snerr("The thermocouple input is shorted to GND!\n");
+          snerr("  The thermocouple input is shorted to GND!\n");
         }
 
       if (regval & MAX31855_OPEN_CIRCUIT)
         {
-          snerr("The thermocouple input is not connected!\n");
+          snerr("  The thermocouple input is not connected!\n");
         }
 
       ret = -EINVAL;
@@ -308,7 +308,7 @@ int max31855_register(FAR const char *devpath, FAR struct spi_dev_s *spi)
   priv = (FAR struct max31855_dev_s *)kmm_malloc(sizeof(struct max31855_dev_s));
   if (priv == NULL)
     {
-      snerr("Failed to allocate instance\n");
+      snerr("ERROR: Failed to allocate instance\n");
       return -ENOMEM;
     }
 
@@ -320,7 +320,7 @@ int max31855_register(FAR const char *devpath, FAR struct spi_dev_s *spi)
   ret = register_driver(devpath, &g_max31855fops, 0666, priv);
   if (ret < 0)
     {
-      snerr("Failed to register driver: %d\n", ret);
+      snerr("ERROR: Failed to register driver: %d\n", ret);
       kmm_free(priv);
     }
 
diff --git a/drivers/sensors/max6675.c b/drivers/sensors/max6675.c
index 55c2ad47dd..1a97df163c 100644
--- a/drivers/sensors/max6675.c
+++ b/drivers/sensors/max6675.c
@@ -185,13 +185,13 @@ static ssize_t max6675_read(FAR struct file *filep, FAR char *buffer, size_t buf
 
   if (!buffer)
     {
-      snerr("Buffer is null\n");
+      snerr("ERROR: Buffer is null\n");
       return -EINVAL;
     }
 
   if (buflen != 2)
     {
-      snerr("You can't read something other than 16 bits (2 bytes)\n");
+      snerr("ERROR: You can't read something other than 16 bits (2 bytes)\n");
       return -EINVAL;
     }
 
@@ -212,7 +212,7 @@ static ssize_t max6675_read(FAR struct file *filep, FAR char *buffer, size_t buf
   regval  = (regmsb & 0xFF00) >> 8;
   regval |= (regmsb & 0xFF) << 8;
 
-  snerr("Read from MAX6675 = 0x%04X\n", regval);
+  sninfo("Read from MAX6675 = 0x%04X\n", regval);
 
   /* Verify if the device ID bit is really zero */
 
@@ -226,7 +226,7 @@ static ssize_t max6675_read(FAR struct file *filep, FAR char *buffer, size_t buf
 
   if (regval & MAX6675_OPEN_CIRCUIT)
     {
-      snerr("The thermocouple input is not connected!\n");
+      snerr("ERROR: The thermocouple input is not connected!\n");
       ret = -EINVAL;
     }
 
@@ -285,7 +285,7 @@ int max6675_register(FAR const char *devpath, FAR struct spi_dev_s *spi)
   priv = (FAR struct max6675_dev_s *)kmm_malloc(sizeof(struct max6675_dev_s));
   if (priv == NULL)
     {
-      snerr("Failed to allocate instance\n");
+      snerr("ERROR: Failed to allocate instance\n");
       return -ENOMEM;
     }
 
@@ -297,7 +297,7 @@ int max6675_register(FAR const char *devpath, FAR struct spi_dev_s *spi)
   ret = register_driver(devpath, &g_max6675fops, 0666, priv);
   if (ret < 0)
     {
-      snerr("Failed to register driver: %d\n", ret);
+      snerr("ERROR: Failed to register driver: %d\n", ret);
       kmm_free(priv);
     }
 
diff --git a/drivers/sensors/mb7040.c b/drivers/sensors/mb7040.c
index 57250c4c77..2bdaecee0e 100644
--- a/drivers/sensors/mb7040.c
+++ b/drivers/sensors/mb7040.c
@@ -131,7 +131,7 @@ static int mb7040_measurerange(FAR struct mb7040_dev_s *priv)
   uint8_t regaddr;
   int ret;
 
-  snerr("addr: %02x\n", regaddr);
+  sninfo("addr: %02x\n", regaddr);
 
   /* Set up the I2C configuration */
 
@@ -146,7 +146,7 @@ static int mb7040_measurerange(FAR struct mb7040_dev_s *priv)
   ret = i2c_write(priv->i2c, &config, ®addr, sizeof(regaddr));
   if (ret < 0)
     {
-      snerr("i2c_write failed: %d\n", ret);
+      snerr("ERROR: i2c_write failed: %d\n", ret);
     }
 
   return ret;
@@ -178,12 +178,12 @@ static int mb7040_readrange(FAR struct mb7040_dev_s *priv,
   ret = i2c_read(priv->i2c, &config, buffer, sizeof(buffer));
   if (ret < 0)
     {
-      snerr("i2c_read failed: %d\n", ret);
+      snerr("ERROR: i2c_read failed: %d\n", ret);
       return ret;
     }
 
   *range = (uint16_t)buffer[0] << 8 | (uint16_t)buffer[1];
-  snerr("range: %04x ret: %d\n", *range, ret);
+  sninfo("range: %04x ret: %d\n", *range, ret);
   return ret;
 }
 
@@ -201,7 +201,7 @@ static int mb7040_changeaddr(FAR struct mb7040_dev_s *priv, uint8_t addr)
   uint8_t buffer[3];
   int ret;
 
-  snerr("new addr: %02x\n", addr);
+  sninfo("new addr: %02x\n", addr);
 
   /* Sanity check */
 
@@ -225,7 +225,7 @@ static int mb7040_changeaddr(FAR struct mb7040_dev_s *priv, uint8_t addr)
   ret = i2c_write(priv->i2c, &config, buffer, sizeof(buffer));
   if (ret < 0)
     {
-      snerr("i2c_write failed: %d\n", ret);
+      snerr("ERROR: i2c_write failed: %d\n", ret);
       return ret;
     }
 
@@ -324,7 +324,8 @@ static int mb7040_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
             {
               *ptr = (int32_t)range;
             }
-          snerr("range: %04x ret: %d\n", *ptr, ret);
+
+          sninfo("range: %04x ret: %d\n", *ptr, ret);
         }
         break;
 
@@ -332,13 +333,13 @@ static int mb7040_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case SNIOC_CHANGEADDR:
         ret = mb7040_changeaddr(priv, (uint8_t)arg);
-        snerr("new addr: %02x ret: %d\n", *(uint8_t *)arg, ret);
+        sninfo("new addr: %02x ret: %d\n", *(uint8_t *)arg, ret);
         break;
 
       /* Unrecognized commands */
 
       default:
-        snerr("Unrecognized cmd: %d arg: %ld\n", cmd, arg);
+        snerr("ERROR: Unrecognized cmd: %d arg: %ld\n", cmd, arg);
         ret = -ENOTTY;
         break;
     }
@@ -381,7 +382,7 @@ int mb7040_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
   priv = (FAR struct mb7040_dev_s *)kmm_malloc(sizeof(*priv));
   if (priv == NULL)
     {
-      snerr("Failed to allocate instance\n");
+      snerr("ERROR: Failed to allocate instance\n");
       return -ENOMEM;
     }
 
@@ -393,7 +394,7 @@ int mb7040_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
   ret = register_driver(devpath, &g_fops, 0666, priv);
   if (ret < 0)
     {
-      snerr("Failed to register driver: %d\n", ret);
+      snerr("ERROR: Failed to register driver: %d\n", ret);
       kmm_free(priv);
     }
 
diff --git a/drivers/sensors/mcp9844.c b/drivers/sensors/mcp9844.c
index 47cab8fa9c..77dcee773e 100644
--- a/drivers/sensors/mcp9844.c
+++ b/drivers/sensors/mcp9844.c
@@ -157,7 +157,7 @@ static int mcp9844_read_u16(FAR struct mcp9844_dev_s *priv,
 
   *value = (((uint16_t)(buffer[0]))<<8) + ((uint16_t)(buffer[1]));
 
-  snerr("addr: %02x value: %08x ret: %d\n", regaddr, *value, ret);
+  sninfo("addr: %02x value: %08x ret: %d\n", regaddr, *value, ret);
   return OK;
 }
 
@@ -174,7 +174,7 @@ static int mcp9844_write_u16(FAR struct mcp9844_dev_s *priv,
 {
   struct i2c_config_s config;
 
-  snerr("addr: %02x value: %08x\n", regaddr, regval);
+  sninfo("addr: %02x value: %08x\n", regaddr, regval);
 
   /* Set up a 3 byte message to send */
 
@@ -293,7 +293,7 @@ static int mcp9844_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
             }
           else
             {
-              snerr("ioctl::SNIOC_READTEMP - mcp9844_read_u16 failed - no temperature retrieved\n");
+              snerr("ERROR: ioctl::SNIOC_READTEMP - mcp9844_read_u16 failed - no temperature retrieved\n");
             }
         }
         break;
@@ -303,13 +303,13 @@ static int mcp9844_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
           ret = mcp9844_write_u16(priv, MCP9844_RESO_REG, (uint16_t)(arg));
           if (ret != OK)
             {
-              snerr("ioctl::SNIOC_SETRESOLUTION - mcp9844_write_u16 failed - no resolution set\n");
+              snerr("ERROR: ioctl::SNIOC_SETRESOLUTION - mcp9844_write_u16 failed - no resolution set\n");
             }
         }
         break;
 
       default:
-        snerr("Unrecognized cmd: %d\n", cmd);
+        snerr("ERROR: Unrecognized cmd: %d\n", cmd);
         ret = -ENOTTY;
         break;
     }
@@ -351,7 +351,7 @@ int mcp9844_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
 
   if (priv == NULL)
     {
-      snerr("Failed to allocate instance\n");
+      snerr("ERROR: Failed to allocate instance\n");
       return -ENOMEM;
     }
 
@@ -363,7 +363,7 @@ int mcp9844_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
   int ret = register_driver(devpath, &g_mcp9844_fops, 0666, priv);
   if (ret < 0)
     {
-      snerr("Failed to register driver: %d\n", ret);
+      snerr("ERROR: Failed to register driver: %d\n", ret);
       kmm_free(priv);
     }
 
diff --git a/drivers/sensors/mpl115a.c b/drivers/sensors/mpl115a.c
index 71a137d5b7..5631bd7073 100644
--- a/drivers/sensors/mpl115a.c
+++ b/drivers/sensors/mpl115a.c
@@ -176,25 +176,25 @@ static void mpl115a_updatecaldata(FAR struct mpl115a_dev_s *priv)
 
   priv->mpl115a_cal_a0 = mpl115a_getreg8(priv, MPL115A_BASE_CMD | (MPL115A_A0_MSB << 1)) << 8;
   priv->mpl115a_cal_a0 |= mpl115a_getreg8(priv, MPL115A_BASE_CMD | (MPL115A_A0_LSB << 1));
-  snerr("a0 = %d\n", priv->mpl115a_cal_a0);
+  sninfo("a0 = %d\n", priv->mpl115a_cal_a0);
 
   /* Get b1 coefficient */
 
   priv->mpl115a_cal_b1 = mpl115a_getreg8(priv, MPL115A_BASE_CMD | (MPL115A_B1_MSB << 1)) << 8;
   priv->mpl115a_cal_b1 |= mpl115a_getreg8(priv, MPL115A_BASE_CMD | (MPL115A_B1_LSB << 1));
-  snerr("b1 = %d\n", priv->mpl115a_cal_b1);
+  sninfo("b1 = %d\n", priv->mpl115a_cal_b1);
 
   /* Get b2 coefficient */
 
   priv->mpl115a_cal_b2 = mpl115a_getreg8(priv, MPL115A_BASE_CMD | (MPL115A_B2_MSB << 1)) << 8;
   priv->mpl115a_cal_b2 |= mpl115a_getreg8(priv, MPL115A_BASE_CMD | (MPL115A_B2_LSB << 1));
-  snerr("b2 = %d\n", priv->mpl115a_cal_b2);
+  sninfo("b2 = %d\n", priv->mpl115a_cal_b2);
 
   /* Get c12 coefficient */
 
   priv->mpl115a_cal_c12 = mpl115a_getreg8(priv, MPL115A_BASE_CMD | (MPL115A_C12_MSB << 1)) << 8;
   priv->mpl115a_cal_c12 |= mpl115a_getreg8(priv, MPL115A_BASE_CMD | (MPL115A_C12_LSB << 1));
-  snerr("c12 = %d\n", priv->mpl115a_cal_c12);
+  sninfo("c12 = %d\n", priv->mpl115a_cal_c12);
 }
 
 /****************************************************************************
@@ -220,13 +220,13 @@ static void mpl115a_read_press_temp(FAR struct mpl115a_dev_s *priv)
   priv->mpl115a_pressure |= mpl115a_getreg8(priv, MPL115A_BASE_CMD | (MPL115A_PADC_LSB << 1));
   priv->mpl115a_pressure >>= 6; /* Padc is 10bit unsigned */
 
-  snerr("Pressure = %d\n", priv->mpl115a_pressure);
+  sninfo("Pressure = %d\n", priv->mpl115a_pressure);
 
   priv->mpl115a_temperature = mpl115a_getreg8(priv, MPL115A_BASE_CMD | (MPL115A_TADC_MSB << 1)) << 8;
   priv->mpl115a_temperature |= mpl115a_getreg8(priv, MPL115A_BASE_CMD | (MPL115A_TADC_LSB << 1));
   priv->mpl115a_temperature >>= 6; /* Tadc is 10bit unsigned */
 
-  snerr("Temperature = %d\n", priv->mpl115a_temperature);
+  sninfo("Temperature = %d\n", priv->mpl115a_temperature);
 }
 
 /****************************************************************************
@@ -274,7 +274,7 @@ static int mpl115a_getpressure(FAR struct mpl115a_dev_s *priv)
    * This may be eliminated by right shifting the result 4 bits.
    */
 
-  snerr("Final Pressure = %d\n", pressure >> 4);
+  sninfo("Final Pressure = %d\n", pressure >> 4);
   return pressure;
 }
 
@@ -316,13 +316,13 @@ static ssize_t mpl115a_read(FAR struct file *filep, FAR char *buffer, size_t buf
 
   if (!buffer)
     {
-      snerr("Buffer is null\n");
+      snerr("ERROR: Buffer is null\n");
       return -1;
     }
 
   if (buflen != 2)
     {
-      snerr("You can't read something other than 16 bits (2 bytes)\n");
+      snerr("ERROR: You can't read something other than 16 bits (2 bytes)\n");
       return -1;
     }
 
@@ -378,7 +378,7 @@ int mpl115a_register(FAR const char *devpath, FAR struct spi_dev_s *spi)
   priv = (FAR struct mpl115a_dev_s *)kmm_malloc(sizeof(struct mpl115a_dev_s));
   if (!priv)
     {
-      snerr("Failed to allocate instance\n");
+      snerr("ERROR: Failed to allocate instance\n");
       return -ENOMEM;
     }
 
@@ -397,7 +397,7 @@ int mpl115a_register(FAR const char *devpath, FAR struct spi_dev_s *spi)
   ret = register_driver(devpath, &g_mpl115afops, 0666, priv);
   if (ret < 0)
     {
-      snerr("Failed to register driver: %d\n", ret);
+      snerr("ERROR: Failed to register driver: %d\n", ret);
       kmm_free(priv);
     }
 
diff --git a/drivers/sensors/ms58xx.c b/drivers/sensors/ms58xx.c
index cbdd05cb36..4c948714b0 100644
--- a/drivers/sensors/ms58xx.c
+++ b/drivers/sensors/ms58xx.c
@@ -306,14 +306,14 @@ static int ms58xx_readu16(FAR struct ms58xx_dev_s *priv, uint8_t regaddr,
   uint8_t buffer[2];
   int ret;
 
-  snerr("addr: %02x\n", regaddr);
+  sninfo("addr: %02x\n", regaddr);
 
   /* Write the register address */
 
   ret = ms58xx_i2c_write(priv, ®addr, sizeof(regaddr));
   if (ret < 0)
     {
-      snerr("i2c_write failed: %d\n", ret);
+      snerr("ERROR: i2c_write failed: %d\n", ret);
       return ret;
     }
 
@@ -322,12 +322,12 @@ static int ms58xx_readu16(FAR struct ms58xx_dev_s *priv, uint8_t regaddr,
   ret = ms58xx_i2c_read(priv, buffer, sizeof(buffer));
   if (ret < 0)
     {
-      snerr("i2c_read failed: %d\n", ret);
+      snerr("ERROR: i2c_read failed: %d\n", ret);
       return ret;
     }
 
   *regval = (uint16_t)buffer[0] << 8 | (uint16_t)buffer[1];
-  snerr("value: %04x ret: %d\n", *regval, ret);
+  sninfo("value: %04x ret: %d\n", *regval, ret);
   return ret;
 }
 
@@ -346,14 +346,14 @@ static int ms58xx_readadc(FAR struct ms58xx_dev_s *priv, FAR uint32_t *adc)
   int ret;
 
   regaddr = MS58XX_ADC_REG;
-  snerr("addr: %02x\n", regaddr);
+  sninfo("addr: %02x\n", regaddr);
 
   /* Write the register address */
 
   ret = ms58xx_i2c_write(priv, ®addr, sizeof(regaddr));
   if (ret < 0)
     {
-      snerr("i2c_write failed: %d\n", ret);
+      snerr("ERROR: i2c_write failed: %d\n", ret);
       return ret;
     }
 
@@ -362,7 +362,7 @@ static int ms58xx_readadc(FAR struct ms58xx_dev_s *priv, FAR uint32_t *adc)
   ret = ms58xx_i2c_read(priv, buffer, sizeof(buffer));
   if (ret < 0)
     {
-      snerr("i2c_read failed: %d\n", ret);
+      snerr("ERROR: i2c_read failed: %d\n", ret);
       return ret;
     }
 
@@ -370,7 +370,7 @@ static int ms58xx_readadc(FAR struct ms58xx_dev_s *priv, FAR uint32_t *adc)
          (uint32_t)buffer[1] << 8 |
          (uint32_t)buffer[2];
 
-  snerr("adc: %06x ret: %d\n", *adc, ret);
+  sninfo("adc: %06x ret: %d\n", *adc, ret);
   return ret;
 }
 
@@ -483,7 +483,7 @@ static int ms58xx_setosr(FAR struct ms58xx_dev_s *priv, uint16_t osr)
 {
   int ret = OK;
 
-  snerr("osr: %04x\n", osr);
+  sninfo("osr: %04x\n", osr);
 
   switch (priv->model)
     {
@@ -558,7 +558,7 @@ static int ms58xx_readprom(FAR struct ms58xx_dev_s *priv)
       ret = ms58xx_readu16(priv, MS58XX_PROM_REG + i * 2, prom + i);
       if (ret < 0)
         {
-          snerr("ms58xx_readu16 failed: %d\n", ret);
+          snerr("ERROR: ms58xx_readu16 failed: %d\n", ret);
           return ret;
         }
     }
@@ -568,7 +568,7 @@ static int ms58xx_readprom(FAR struct ms58xx_dev_s *priv)
 
   if (crc != ms58xx_crc(prom, crcindex, crcmask))
     {
-      snerr("crc mismatch\n");
+      snerr("ERROR: crc mismatch\n");
       return -ENODEV;
     }
 
@@ -620,14 +620,14 @@ static int ms58xx_reset(FAR struct ms58xx_dev_s *priv)
   int ret;
 
   regaddr = MS58XX_RESET_REG;
-  snerr("addr: %02x\n", regaddr);
+  sninfo("addr: %02x\n", regaddr);
 
   /* Write the register address */
 
   ret = ms58xx_i2c_write(priv, ®addr, sizeof(regaddr));
   if (ret < 0)
     {
-      snerr("i2c_write failed: %d\n", ret);
+      snerr("ERROR: i2c_write failed: %d\n", ret);
       return ret;
     }
 
@@ -636,7 +636,7 @@ static int ms58xx_reset(FAR struct ms58xx_dev_s *priv)
   ret = ms58xx_readprom(priv);
   if (ret < 0)
     {
-      snerr("ms58xx_readprom failed: %d\n", ret);
+      snerr("ERROR: ms58xx_readprom failed: %d\n", ret);
     }
 
   return ret;
@@ -656,14 +656,14 @@ static int ms58xx_convert(FAR struct ms58xx_dev_s *priv, uint8_t regaddr,
   int ret;
 
   regaddr |= priv->osr;
-  snerr("addr: %02x\n", regaddr);
+  sninfo("addr: %02x\n", regaddr);
 
   /* Write the register address */
 
   ret = ms58xx_i2c_write(priv, ®addr, sizeof(regaddr));
   if (ret < 0)
     {
-      snerr("i2c_write failed: %d\n", ret);
+      snerr("ERROR: i2c_write failed: %d\n", ret);
     }
 
   /* Wait for the conversion to end */
@@ -675,7 +675,7 @@ static int ms58xx_convert(FAR struct ms58xx_dev_s *priv, uint8_t regaddr,
   ret = ms58xx_readadc(priv, regval);
   if (ret < 0)
     {
-      snerr("ms58xx_readadc failed: %d\n", ret);
+      snerr("ERROR: ms58xx_readadc failed: %d\n", ret);
       return ret;
     }
 
@@ -714,14 +714,14 @@ static int ms58xx_measure(FAR struct ms58xx_dev_s *priv)
   ret = ms58xx_convert(priv, MS58XX_PRESS_REG, &rawpress);
   if (ret < 0)
     {
-      snerr("ms58xx_convert failed: %d\n", ret);
+      snerr("ERROR: ms58xx_convert failed: %d\n", ret);
       return ret;
     }
 
   ret = ms58xx_convert(priv, MS58XX_TEMP_REG, &rawtemp);
   if (ret < 0)
     {
-      snerr("ms58xx_convert failed: %d\n", ret);
+      snerr("ERROR: ms58xx_convert failed: %d\n", ret);
       return ret;
     }
 
@@ -923,7 +923,7 @@ static int ms58xx_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
           FAR int32_t *ptr = (FAR int32_t *)((uintptr_t)arg);
           DEBUGASSERT(ptr != NULL);
           *ptr = priv->temp;
-          snerr("temp: %08x\n", *ptr);
+          sninfo("temp: %08x\n", *ptr);
         }
         break;
 
@@ -934,7 +934,7 @@ static int ms58xx_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
           FAR int32_t *ptr = (FAR int32_t *)((uintptr_t)arg);
           DEBUGASSERT(ptr != NULL);
           *ptr = priv->press;
-          snerr("press: %08x\n", *ptr);
+          sninfo("press: %08x\n", *ptr);
         }
         break;
 
@@ -949,13 +949,13 @@ static int ms58xx_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
       case SNIOC_OVERSAMPLING:
         ret = ms58xx_setosr(priv, (uint16_t)arg);
-        snerr("osr: %04x ret: %d\n", *(uint16_t *)arg, ret);
+        sninfo("osr: %04x ret: %d\n", *(uint16_t *)arg, ret);
         break;
 
       /* Unrecognized commands */
 
       default:
-        snerr("Unrecognized cmd: %d arg: %ld\n", cmd, arg);
+        snerr("ERROR: Unrecognized cmd: %d arg: %ld\n", cmd, arg);
         ret = -ENOTTY;
         break;
     }
@@ -1010,7 +1010,7 @@ int ms58xx_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
   priv = (FAR struct ms58xx_dev_s *)kmm_malloc(sizeof(*priv));
   if (priv == NULL)
     {
-      snerr("Failed to allocate instance\n");
+      snerr("ERROR: Failed to allocate instance\n");
       return -ENOMEM;
     }
 
@@ -1177,14 +1177,14 @@ int ms58xx_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
   ret = ms58xx_setosr(priv, osr);
   if (ret < 0)
     {
-      snerr("ms58xx_setosr failed: %d\n", ret);
+      snerr("ERROR: ms58xx_setosr failed: %d\n", ret);
       goto err;
     }
 
   ret = ms58xx_reset(priv);
   if (ret < 0)
     {
-      snerr("ms58xx_reset failed: %d\n", ret);
+      snerr("ERROR: ms58xx_reset failed: %d\n", ret);
       goto err;
     }
 
@@ -1193,7 +1193,7 @@ int ms58xx_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
   ret = register_driver(devpath, &g_fops, 0666, priv);
   if (ret < 0)
     {
-      snerr("Failed to register driver: %d\n", ret);
+      snerr("ERROR: Failed to register driver: %d\n", ret);
       goto err;
     }
 
diff --git a/drivers/sensors/qencoder.c b/drivers/sensors/qencoder.c
index 1171ed472d..eba9337a01 100644
--- a/drivers/sensors/qencoder.c
+++ b/drivers/sensors/qencoder.c
@@ -371,7 +371,7 @@ int qe_register(FAR const char *devpath, FAR struct qe_lowerhalf_s *lower)
   upper = (FAR struct qe_upperhalf_s *)kmm_zalloc(sizeof(struct qe_upperhalf_s));
   if (!upper)
     {
-      snerr("Allocation failed\n");
+      snerr("ERROR: Allocation failed\n");
       return -ENOMEM;
     }
 
-- 
GitLab


From f12da847d8522ea5b6ea00757b7b36edcb5430a2 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sat, 11 Jun 2016 19:03:57 -0600
Subject: [PATCH 33/91] drivers/wireless:  Change some *err() message to
 *info() messages if what was a *dbg() message does not indicate and error
 condition.

---
 drivers/wireless/cc3000/cc3000.c       | 20 +++++------
 drivers/wireless/cc3000/cc3000drv.c    | 22 +-----------
 drivers/wireless/cc3000/socket.c       | 19 +++++-----
 drivers/wireless/ieee802154/mrf24j40.c | 48 +++++++++++++-------------
 drivers/wireless/nrf24l01.c            | 14 ++++----
 drivers/wireless/pn532.c               | 41 ++++++++++++----------
 6 files changed, 75 insertions(+), 89 deletions(-)

diff --git a/drivers/wireless/cc3000/cc3000.c b/drivers/wireless/cc3000/cc3000.c
index d73680f320..db60f9ef9d 100644
--- a/drivers/wireless/cc3000/cc3000.c
+++ b/drivers/wireless/cc3000/cc3000.c
@@ -251,7 +251,7 @@ static inline void cc3000_devgive(FAR struct cc3000_dev_s *priv)
 
 static inline void cc3000_configspi(FAR struct spi_dev_s *spi)
 {
-  nerr("Mode: %d Bits: 8 Frequency: %d\n",
+  ninfo("Mode: %d Bits: 8 Frequency: %d\n",
        CONFIG_CC3000_SPI_MODE, CONFIG_CC3000_SPI_FREQUENCY);
 
   SPI_SETMODE(spi, CONFIG_CC3000_SPI_MODE);
@@ -500,7 +500,7 @@ static void * select_thread_func(FAR void *arg)
               if (priv->sockets[s].sd == CLOSE_SLOT)
                 {
                   priv->sockets[s].sd = FREE_SLOT;
-                  waitllerr("Close\n");
+                  waitllinfo("Close\n");
                   int count;
                   do
                     {
@@ -509,7 +509,7 @@ static void * select_thread_func(FAR void *arg)
                         {
                           /* Release the waiting threads */
 
-                          waitllerr("Closed Signaled %d\n", count);
+                          waitllinfo("Closed Signaled %d\n", count);
                           sem_post(&priv->sockets[s].semwait);
                         }
                     }
@@ -556,17 +556,17 @@ static void * select_thread_func(FAR void *arg)
             {
               if (ret > 0 && CC3000_FD_ISSET(priv->sockets[s].sd, &readsds)) /* and has pending data */
                 {
-                  waitllerr("Signaled %d\n", priv->sockets[s].sd);
+                  waitllinfo("Signaled %d\n", priv->sockets[s].sd);
                   sem_post(&priv->sockets[s].semwait);                       /* release the waiting thread */
                 }
               else if (ret > 0 && CC3000_FD_ISSET(priv->sockets[s].sd, &exceptsds)) /* or has pending exception */
                 {
-                  waitllerr("Signaled %d (exception)\n", priv->sockets[s].sd);
+                  waitllinfo("Signaled %d (exception)\n", priv->sockets[s].sd);
                   sem_post(&priv->sockets[s].semwait);                       /* release the waiting thread */
                 }
               else if (priv->sockets[s].received_closed_event)               /* or remote has closed connection and we have now read all of HW buffer. */
                 {
-                  waitllerr("Signaled %d (closed & empty)\n", priv->sockets[s].sd);
+                  waitllinfo("Signaled %d (closed & empty)\n", priv->sockets[s].sd);
                   priv->sockets[s].emptied_and_remotely_closed = true;
                   sem_post(&priv->sockets[s].semwait);                       /* release the waiting thread */
                 }
@@ -1071,7 +1071,7 @@ static ssize_t cc3000_read(FAR struct file *filep, FAR char *buffer, size_t len)
 
   if (len < priv->rx_buffer_max_len)
     {
-      nerr("Unsupported read size: %d\n", len);
+      nerr("ERROR: Unsupported read size: %d\n", len);
       nread = -ENOSYS;
       goto errout_with_sem;
     }
@@ -1531,7 +1531,7 @@ int cc3000_register(FAR struct spi_dev_s *spi,
   priv = (FAR struct cc3000_dev_s *)kmm_malloc(sizeof(struct cc3000_dev_s));
   if (!priv)
     {
-      nerr("kmm_malloc(%d) failed\n", sizeof(struct cc3000_dev_s));
+      nerr("ERROR: kmm_malloc(%d) failed\n", sizeof(struct cc3000_dev_s));
       return -ENOMEM;
     }
 #endif
@@ -1565,7 +1565,7 @@ int cc3000_register(FAR struct spi_dev_s *spi,
   ret = config->irq_attach(config, cc3000_interrupt);
   if (ret < 0)
     {
-      nerr("Failed to attach interrupt\n");
+      nerr("ERROR: Failed to attach interrupt\n");
       goto errout_with_priv;
     }
 
@@ -1577,7 +1577,7 @@ int cc3000_register(FAR struct spi_dev_s *spi,
   ret = register_driver(drvname, &cc3000_fops, 0666, priv);
   if (ret < 0)
     {
-      nerr("register_driver() failed: %d\n", ret);
+      nerr("ERROR: register_driver() failed: %d\n", ret);
       goto errout_with_priv;
     }
 
diff --git a/drivers/wireless/cc3000/cc3000drv.c b/drivers/wireless/cc3000/cc3000drv.c
index 44547d4889..02e366dd3c 100644
--- a/drivers/wireless/cc3000/cc3000drv.c
+++ b/drivers/wireless/cc3000/cc3000drv.c
@@ -57,26 +57,6 @@
 #include 
 #include 
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-#undef SPI_DEBUG   /* Define to enable debug */
-#undef SPI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SPI_DEBUG
-#  define spierr  llerr
-#  ifdef SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
-#else
-#  undef SPI_VERBOSE
-#  define spierr(x...)
-#  define spiinfo(x...)
-#endif
-
 /****************************************************************************
  * Private Types
  ****************************************************************************/
@@ -223,7 +203,7 @@ static void *unsoliced_thread_func(void *parameter)
                           sizeof(spiconf.rx_buffer), 0);
       if (nbytes > 0)
         {
-          nllerr("%d Processed\n", nbytes);
+          nllinfo("%d Processed\n", nbytes);
           spiconf.pfRxHandler(spiconf.rx_buffer.pbuffer);
         }
     }
diff --git a/drivers/wireless/cc3000/socket.c b/drivers/wireless/cc3000/socket.c
index 9ca0c2105f..255ce62b2f 100644
--- a/drivers/wireless/cc3000/socket.c
+++ b/drivers/wireless/cc3000/socket.c
@@ -63,6 +63,7 @@
 #endif
 
 #define waitllerr(x,...) // llerr
+#define waitllinfo(x,...) // llinfo
 
 /****************************************************************************
  * Private Types
@@ -194,13 +195,13 @@ int cc3000_closesocket(int sockfd)
   int ret;
 
 #ifdef CONFIG_CC3000_MT
-  waitllerr("remove\n");
+  waitllinfo("remove\n");
   cc3000_remove_socket(sockfd);
 #endif
   cc3000_lib_lock();
-  waitllerr("Call closesocketl\n");
+  waitllinfo("Call closesocketl\n");
   ret = cc3000_closesocket_impl(sockfd);
-  waitllerr("return closesocket\n");
+  waitllinfo("return closesocket\n");
   cc3000_lib_unlock();
   return ret;
 }
@@ -267,7 +268,7 @@ int cc3000_accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen)
   if (setsockopt(sockfd, CC3000_SOL_SOCKET, CC3000_SOCKOPT_ACCEPT_NONBLOCK,
                  &non_blocking, sizeof(non_blocking)) < 0)
    {
-     nerr("setsockopt failure %d\n", errno);
+     nerr("ERROR: setsockopt failure %d\n", errno);
      return -errno;
    }
 
@@ -282,7 +283,7 @@ int cc3000_accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen)
   if (setsockopt(sockfd, CC3000_SOL_SOCKET, CC3000_SOCKOPT_ACCEPT_NONBLOCK,
                  &nonBlocking, sizeof(nonBlocking)) < 0)
    {
-     nerr("setsockopt failure %d\n", errno);
+     nerr("ERROR: setsockopt failure %d\n", errno);
      return -errno;
    }
 
@@ -596,9 +597,9 @@ ssize_t cc3000_recv(int sockfd, FAR void *buf, size_t len, int flags)
   ssize_t ret;
 
 #ifdef CONFIG_CC3000_MT
-  waitllerr("wait\n");
+  waitllinfo("wait\n");
   ret = cc3000_wait_data(sockfd);
-  waitllerr("wait %d\n", ret);
+  waitllinfo("wait %d\n", ret);
 
   if (ret == -ECONNABORTED)
     {
@@ -612,9 +613,9 @@ ssize_t cc3000_recv(int sockfd, FAR void *buf, size_t len, int flags)
 #endif
 
   cc3000_lib_lock();
-  waitllerr("recv\n");
+  waitllinfo("recv\n");
   ret = cc3000_recv_impl(sockfd, buf, len, flags);
-  waitllerr("recv %d\n", ret);
+  waitllinfo("recv %d\n", ret);
   cc3000_lib_unlock();
   return ret;
 }
diff --git a/drivers/wireless/ieee802154/mrf24j40.c b/drivers/wireless/ieee802154/mrf24j40.c
index 8658ad9a37..c49713cd3e 100644
--- a/drivers/wireless/ieee802154/mrf24j40.c
+++ b/drivers/wireless/ieee802154/mrf24j40.c
@@ -169,7 +169,7 @@ static int     mrf24j40_transmit    (FAR struct ieee802154_dev_s *ieee, FAR stru
 
 static struct mrf24j40_dev_s g_mrf24j40_devices[1];
 
-static const struct ieee802154_devops_s mrf24j40_devops = 
+static const struct ieee802154_devops_s mrf24j40_devops =
 {
   mrf24j40_setchannel, mrf24j40_getchannel,
   mrf24j40_setpanid  , mrf24j40_getpanid,
@@ -303,7 +303,7 @@ static uint8_t mrf24j40_getreg(FAR struct spi_dev_s *spi, uint32_t addr)
   SPI_SELECT     (spi, SPIDEV_IEEE802154, false);
   mrf24j40_unlock(spi);
 
-  /*err("r[%04X]=%02X\n",addr,rx[len-1]);*/
+  /*winfo("r[%04X]=%02X\n", addr, rx[len-1]);*/
   return rx[len-1];
 }
 
@@ -443,7 +443,7 @@ static int mrf24j40_setrxmode(FAR struct mrf24j40_dev_s *dev, int mode)
   mrf24j40_setreg(dev->spi, MRF24J40_RXMCR, reg);
 
   dev->rxmode = mode;
-  err("%u\n",(unsigned)mode);
+  winfo("%u\n", (unsigned)mode);
   return OK;
 }
 
@@ -467,10 +467,10 @@ static int mrf24j40_setchannel(FAR struct ieee802154_dev_s *ieee,
                                uint8_t chan)
 {
   FAR struct mrf24j40_dev_s *dev = (FAR struct mrf24j40_dev_s *)ieee;
-  
+
   if (chan<11 || chan>26)
     {
-      err("Invalid chan: %d\n",chan);
+      werr("ERROR: Invalid chan: %d\n",chan);
       return -EINVAL;
     }
 
@@ -485,7 +485,7 @@ static int mrf24j40_setchannel(FAR struct ieee802154_dev_s *ieee,
   mrf24j40_resetrfsm(dev);
 
   dev->channel = chan;
-  //err("%u\n",(unsigned)chan);
+  //winfo("%u\n", (unsigned)chan);
 
   return OK;
 }
@@ -525,7 +525,7 @@ static int mrf24j40_setpanid(FAR struct ieee802154_dev_s *ieee,
   mrf24j40_setreg(dev->spi, MRF24J40_PANIDL, (uint8_t)(panid&0xFF));
 
   dev->panid = panid;
-  err("%04X\n",(unsigned)panid);
+  winfo("%04X\n", (unsigned)panid);
 
   return OK;
 }
@@ -567,7 +567,7 @@ static int mrf24j40_setsaddr(FAR struct ieee802154_dev_s *ieee,
   mrf24j40_setreg(dev->spi, MRF24J40_SADRL, (uint8_t)(saddr&0xFF));
 
   dev->saddr = saddr;
-  err("%04X\n",(unsigned)saddr);  
+  winfo("%04X\n", (unsigned)saddr);
   return OK;
 }
 
@@ -779,7 +779,7 @@ static int mrf24j40_settxpower(FAR struct ieee802154_dev_s *ieee,
       return -EINVAL;
     }
 
-  llerr("remaining attenuation: %d mBm\n",txpwr);
+  llinfo("remaining attenuation: %d mBm\n",txpwr);
 
   switch(txpwr/100)
     {
@@ -897,7 +897,7 @@ static int mrf24j40_regdump(FAR struct mrf24j40_dev_s *dev)
   char buf[4+16*3+2+1];
   int len=0;
 
-  err("Short regs:\n");
+  winfo("Short regs:\n");
 
   for (i = 0; i < 0x40; i++)
     {
@@ -910,11 +910,11 @@ static int mrf24j40_regdump(FAR struct mrf24j40_dev_s *dev)
       if ((i & 15) == 15)
         {
           sprintf(buf+len, "\n");
-          err("%s",buf);
+          winfo("%s", buf);
         }
     }
 
-  err("Long regs:\n");
+  winfo("Long regs:\n");
   for (i=0x80000200;i<0x80000250;i++)
     {
       if ((i&15)==0)
@@ -926,7 +926,7 @@ static int mrf24j40_regdump(FAR struct mrf24j40_dev_s *dev)
       if ((i & 15) == 15)
         {
           sprintf(buf+len, "\n");
-          err("%s",buf);
+          winfo("%s", buf);
         }
     }
 
@@ -952,7 +952,7 @@ static int mrf24j40_ioctl(FAR struct ieee802154_dev_s *ieee, int cmd,
         return mrf24j40_regdump(dev);
 
       case 1001: dev->paenabled = (uint8_t)arg;
-        err("PA %sabled\n",arg?"en":"dis");
+        winfo("PA %sabled\n", arg ? "en" : "dis");
         return OK;
 
       default:
@@ -1037,13 +1037,13 @@ static int mrf24j40_transmit(FAR struct ieee802154_dev_s *ieee, FAR struct ieee8
   reg  = mrf24j40_getreg(dev->spi, MRF24J40_INTCON);
   reg &= ~MRF24J40_INTCON_TXNIE;
   mrf24j40_setreg(dev->spi, MRF24J40_INTCON, reg);
- 
+
   /* Analyze frame control to compute header length */
 
   fc1 = packet->data[0];
   fc2 = packet->data[1];
 
- // err("fc1 %02X fc2 %02X\n", fc1,fc2);
+ // winfo("fc1 %02X fc2 %02X\n", fc1,fc2);
 
   if ((fc2 & IEEE802154_FC2_DADDR) == IEEE802154_DADDR_SHORT)
     {
@@ -1073,7 +1073,7 @@ static int mrf24j40_transmit(FAR struct ieee802154_dev_s *ieee, FAR struct ieee8
       hlen += 8; /* Ext saddr */
     }
 
-//  err("hlen %d\n",hlen);
+//  winfo("hlen %d\n",hlen);
 
   /* Header len, 0, TODO for security modes */
 
@@ -1090,7 +1090,7 @@ static int mrf24j40_transmit(FAR struct ieee802154_dev_s *ieee, FAR struct ieee8
       mrf24j40_setreg(dev->spi, addr++, packet->data[ret]);
     }
 
-  /* If the frame control field contains 
+  /* If the frame control field contains
    * an acknowledgment request, set the TXNACKREQ bit.
    * See IEEE 802.15.4/2003 7.2.1.1 page 112 for info.
    */
@@ -1131,7 +1131,7 @@ static void mrf24j40_irqwork_tx(FAR struct mrf24j40_dev_s *dev)
    * channel_busy = (tmp & (1 << CCAFAIL));
    */
 
-  //err("TXSTAT%02X!\n", txstat);
+  //winfo("TXSTAT%02X!\n", txstat);
 #warning TODO report errors
   UNUSED(txstat);
 
@@ -1159,7 +1159,7 @@ static int mrf24j40_rxenable(FAR struct ieee802154_dev_s *ieee, bool state,
 {
   FAR struct mrf24j40_dev_s *dev = (FAR struct mrf24j40_dev_s *)ieee;
   uint8_t reg;
-  
+
   if (state)
     {
       mrf24j40_pacontrol(dev, MRF24J40_PA_AUTO);
@@ -1193,7 +1193,7 @@ static void mrf24j40_irqwork_rx(FAR struct mrf24j40_dev_s *dev)
   uint32_t index;
   uint8_t  reg;
 
-  /*err("!\n");*/
+  /*winfo("!\n");*/
 
   /* Disable rx int */
 
@@ -1209,7 +1209,7 @@ static void mrf24j40_irqwork_rx(FAR struct mrf24j40_dev_s *dev)
 
   addr = 0x80000300;
   dev->ieee.rxbuf->len = mrf24j40_getreg(dev->spi, addr++);
-  /*err("len %3d\n", dev->ieee.rxbuf->len);*/
+  /*winfo("len %3d\n", dev->ieee.rxbuf->len);*/
 
   for (index = 0; index < dev->ieee.rxbuf->len; index++)
     {
@@ -1264,7 +1264,7 @@ static void mrf24j40_irqworker(FAR void *arg)
   /* Read and store INTSTAT - this clears the register. */
 
   intstat = mrf24j40_getreg(dev->spi, MRF24J40_INTSTAT);
-//  err("INT%02X\n", intstat);
+//  winfo("INT%02X\n", intstat);
 
   /* Do work according to the pending interrupts */
 
@@ -1375,7 +1375,7 @@ FAR struct ieee802154_dev_s *mrf24j40_init(FAR struct spi_dev_s *spi,
 
   dev->lower    = lower;
   dev->spi      = spi;
-  
+
   mrf24j40_initialize(dev);
 
   mrf24j40_setchannel(&dev->ieee, 11);
diff --git a/drivers/wireless/nrf24l01.c b/drivers/wireless/nrf24l01.c
index 582ac47ebf..4010efd0fe 100644
--- a/drivers/wireless/nrf24l01.c
+++ b/drivers/wireless/nrf24l01.c
@@ -551,7 +551,7 @@ static void nrf24l01_worker(FAR void *arg)
 
       bool ce = nrf24l01_chipenable(dev, false);
 
-      werr("RX_DR is set!\n");
+      winfo("RX_DR is set!\n");
 
       /* Read and store all received payloads */
 
@@ -586,8 +586,8 @@ static void nrf24l01_worker(FAR void *arg)
 
           status = nrf24l01_readreg(dev, NRF24L01_FIFO_STATUS, &fifo_status, 1);
 
-          werr("FIFO_STATUS=%02x\n", fifo_status);
-          werr("STATUS=%02x\n", status);
+          winfo("FIFO_STATUS=%02x\n", fifo_status);
+          winfo("STATUS=%02x\n", status);
         }
       while (!(fifo_status | NRF24L01_RX_EMPTY));
 
@@ -736,7 +736,7 @@ static int dosend(FAR struct nrf24l01_dev_s *dev, FAR const uint8_t *data, size_
     {
       /* Unexpected... */
 
-      werr("No TX_DS nor MAX_RT bit set in STATUS reg!\n");
+      werr("ERROR: No TX_DS nor MAX_RT bit set in STATUS reg!\n");
       result = -EIO;
     }
 
@@ -1257,7 +1257,7 @@ int nrf24l01_register(FAR struct spi_dev_s *spi, FAR struct nrf24l01_config_s *c
   result = register_driver(DEV_NAME, &nrf24l01_fops, 0666, dev);
   if (result < 0)
     {
-      werr("register_driver() failed: %d\n", result);
+      werr("ERROR: register_driver() failed: %d\n", result);
       nrf24l01_unregister(dev);
     }
 
@@ -1658,7 +1658,7 @@ int nrf24l01_sendto(FAR struct nrf24l01_dev_s *dev, FAR const uint8_t *data,
 
   if ((dev->en_aa & 1) && (memcmp(destaddr, dev->pipe0addr, dev->addrlen)))
     {
-      werr("Change pipe #0 addr to dest addr\n");
+      winfo("Change pipe #0 addr to dest addr\n");
       nrf24l01_writereg(dev, NRF24L01_RX_ADDR_P0, destaddr, NRF24L01_MAX_ADDR_LEN);
       pipeaddrchg = true;
     }
@@ -1670,7 +1670,7 @@ int nrf24l01_sendto(FAR struct nrf24l01_dev_s *dev, FAR const uint8_t *data,
       /* Restore pipe #0 addr */
 
       nrf24l01_writereg(dev, NRF24L01_RX_ADDR_P0, dev->pipe0addr, NRF24L01_MAX_ADDR_LEN);
-      werr("Pipe #0 default addr restored\n");
+      winfo("Pipe #0 default addr restored\n");
     }
 
   nrf24l01_unlock(dev->spi);
diff --git a/drivers/wireless/pn532.c b/drivers/wireless/pn532.c
index 877c80fb9d..afb575e7b1 100644
--- a/drivers/wireless/pn532.c
+++ b/drivers/wireless/pn532.c
@@ -57,12 +57,15 @@
  ****************************************************************************/
 
 #ifdef CONFIG_WL_PN532_DEBUG
-#  define pn532err err
+#  define pn532err    err
+#  define pn532info   info
 #else
 #  ifdef CONFIG_CPP_HAVE_VARARGS
 #    define pn532err(x...)
+#    define pn532info(x...)
 #  else
-#    define pn532err (void)
+#    define pn532err  (void)
+#    define pn532info (void)
 #    endif
 #endif
 
@@ -226,7 +229,8 @@ bool pn532_rx_frame_is_valid(struct pn532_frame *f, bool check_data)
 
   if (f->start_code != PN532_SOF)
     {
-      pn532err("Frame startcode 0x%X != 0x%X\n", PN532_SOF, f->start_code);
+      pn532err("ERROR: Frame startcode 0x%X != 0x%X\n",
+               PN532_SOF, f->start_code);
       return false;
     }
 
@@ -238,7 +242,7 @@ bool pn532_rx_frame_is_valid(struct pn532_frame *f, bool check_data)
   chk = pn532_checksum(f->len);
   if (chk != f->lcs)
     {
-      pn532err("Frame data len checksum failed");
+      pn532err("ERROR: Frame data len checksum failed");
       return false;
     }
 
@@ -247,7 +251,8 @@ bool pn532_rx_frame_is_valid(struct pn532_frame *f, bool check_data)
       chk = pn532_data_checksum(&f->tfi, f->len);
       if (chk != f->data[f->len-1])
         {
-          pn532err("Frame data checksum failed: calc=0x%X != 0x%X", chk, f->data[f->len-1]);
+          pn532err("ERROR: Frame data checksum failed: calc=0x%X != 0x%X",
+                   chk, f->data[f->len-1]);
           return false;
         }
     }
@@ -303,7 +308,7 @@ static int pn532_wait_rx_ready(struct pn532_dev_s *dev, int timeout)
     {
       if (--timeout == 0x00)
         {
-          pn532err("wait RX timeout!\n");
+          pn532err("ERROR: wait RX timeout!\n");
           return -ETIMEDOUT;
         }
 
@@ -414,7 +419,7 @@ int pn532_read_ack(struct pn532_dev_s *dev)
     }
   else
     {
-      pn532err("ACK NOK");
+      pn532info("ACK NOK");
       res = 0;
     }
 
@@ -460,7 +465,7 @@ int pn532_write_frame(struct pn532_dev_s *dev, struct pn532_frame *f)
     {
       if (!pn532_read_ack(dev))
         {
-          pn532err("command FAILED\n");
+          pn532err("ERROR: command FAILED\n");
           res = -EIO;
         }
     }
@@ -580,8 +585,8 @@ int pn532_get_fw_version(struct pn532_dev_s *dev,
           if (f->data[0] == PN532_COMMAND_GETFIRMWAREVERSION + 1)
             {
               fw = (struct pn_firmware_version*) &f->data[1];
-              pn532err("FW: %d.%d on IC:0x%X (Features: 0x%X)\n",
-                       fw->ver, fw->rev, fw->ic, fw->support);
+              pn532info("FW: %d.%d on IC:0x%X (Features: 0x%X)\n",
+                        fw->ver, fw->rev, fw->ic, fw->support);
               if (fv)
                 {
                   memcpy(fv, fw, sizeof(struct pn_firmware_version));
@@ -611,7 +616,7 @@ int pn532_write_gpio(struct pn532_dev_s *dev, uint8_t p3, uint8_t p7)
     {
       pn532_read(dev, cmd_buffer, 10);
       tracetx("Resp:", cmd_buffer, 10);
-      pn532err("TFI=%x, data0=%X", f->tfi, f->data[0]);
+      pn532info("TFI=%x, data0=%X", f->tfi, f->data[0]);
       if ((f->tfi == PN532_PN532TOHOST) && (f->data[0] == PN532_COMMAND_WRITEGPIO+1))
         {
           res = OK;
@@ -723,15 +728,15 @@ uint32_t pn532_read_passive_target_id(struct pn532_dev_s *dev, uint8_t baudrate)
 
               if (r->nbtg == 1)
                 {
-                  pn532err("Found %d card(s)\n", r->nbtg);
+                  pn532info("Found %d card(s)\n", r->nbtg);
 
                   /* now supports only type_a cards
                    * if (poll_mode == PN532_POLL_MOD_106KBPS_A)
                    */
 
                   struct pn_target_type_a *t = (struct pn_target_type_a *) &r->target_data;
-                  pn532err("sens:0x%x  sel:0x%x", t->sens_res, t->sel_res);
-                  pn532err("idlen:0x%x ", t->nfcid_len);
+                  pn532info("sens:0x%x  sel:0x%x", t->sens_res, t->sel_res);
+                  pn532info("idlen:0x%x ", t->nfcid_len);
 
                   /* generate 32bit cid from id (could be longer)
                    * HACK: Using only top 4 bytes.
@@ -817,7 +822,7 @@ static int irq_handler(int irq, FAR void *context)
   (void) irq;
   (void) context;
 
-  /* pn532err("*IRQ*\n"); */
+  /* pn532info("*IRQ*\n"); */
   /* work_queue(HPWORK, &g_dev->irq_work, pn532_worker, dev, 0); */
 
   return OK;
@@ -1064,7 +1069,7 @@ static int _ioctl(FAR struct file *filep, int cmd, unsigned long arg)
       break;
 
     default:
-      pn532err("Unrecognized cmd: %d\n", cmd);
+      pn532err("ERROR: Unrecognized cmd: %d\n", cmd);
       ret = -EINVAL;
       break;
     }
@@ -1105,7 +1110,7 @@ int pn532_register(FAR const char *devpath, FAR struct spi_dev_s *spi,
   dev = (FAR struct pn532_dev_s *)kmm_malloc(sizeof(struct pn532_dev_s));
   if (!dev)
     {
-      pn532err("Failed to allocate instance\n");
+      pn532err("ERROR: Failed to allocate instance\n");
       return -ENOMEM;
     }
 
@@ -1123,7 +1128,7 @@ int pn532_register(FAR const char *devpath, FAR struct spi_dev_s *spi,
   ret = register_driver(devpath, &g_pn532fops, 0666, dev);
   if (ret < 0)
     {
-      pn532err("Failed to register driver: %d\n", ret);
+      pn532err("ERROR: Failed to register driver: %d\n", ret);
       kmm_free(dev);
     }
 
-- 
GitLab


From e18e2b351ba0fcbeadf633da31fba88628d75cf8 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sat, 11 Jun 2016 19:05:32 -0600
Subject: [PATCH 34/91] Need a info() macro mapping

---
 drivers/wireless/cc3000/cc3000.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/wireless/cc3000/cc3000.c b/drivers/wireless/cc3000/cc3000.c
index db60f9ef9d..fdbd4a8aed 100644
--- a/drivers/wireless/cc3000/cc3000.c
+++ b/drivers/wireless/cc3000/cc3000.c
@@ -124,7 +124,8 @@ CCASSERT(sizeof(cc3000_buffer_desc) <= CONFIG_MQ_MAXMSGSIZE);
 #  define PROBE(pin,state)
 #endif
 
-#define waitllerr(x,...)
+#define waitllerr(x,...) // llerr
+#define waitllinfo(x,...) // llinfo
 
 /****************************************************************************
  * Private Types
-- 
GitLab


From f995f3c7bfa4af0f686536410f6e4f6f408f582b Mon Sep 17 00:00:00 2001
From: "Paul A. Patience" 
Date: Sun, 12 Jun 2016 08:15:48 -0400
Subject: [PATCH 35/91] assert: Simplify

---
 include/assert.h | 53 +++++++++++++-----------------------------------
 1 file changed, 14 insertions(+), 39 deletions(-)

diff --git a/include/assert.h b/include/assert.h
index 8f218f2cdd..847146494a 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -4,6 +4,9 @@
  *   Copyright (C) 2007-2009, 2011-2013, 2015-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
+ *   Copyright (C) 2016 Omni Hoverboards Inc. All rights reserved.
+ *   Author: Paul Alexander Patience 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -47,61 +50,33 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* Macro Name: ASSERT, VERIFY, et al. */
+/* Macro Name: PANIC, ASSERT, VERIFY, et al. */
 
+#undef PANIC        /* Unconditional abort */
 #undef ASSERT       /* Assert if the condition is not true */
 #undef VERIFY       /* Assert if a function returns a negative value */
-#undef PANIC        /* Unconditional abort */
+#undef DEBUGPANIC   /* Like PANIC, but only if CONFIG_DEBUG_ASSERTIONS is defined */
 #undef DEBUGASSERT  /* Like ASSERT, but only if CONFIG_DEBUG_ASSERTIONS is defined */
 #undef DEBUGVERIFY  /* Like VERIFY, but only if CONFIG_DEBUG_ASSERTIONS is defined */
-#undef DEBUGPANIC   /* Like PANIC, but only if CONFIG_DEBUG_ASSERTIONS is defined */
 
 #ifdef CONFIG_HAVE_FILENAME
-
-#  define ASSERT(f) \
-     do \
-       { \
-         if (!(f)) \
-           { \
-             up_assert((const uint8_t *)__FILE__, (int)__LINE__); \
-           } \
-       } \
-     while (0)
-
-#  define VERIFY(f) \
-     do \
-       { \
-         if ((f) < 0) \
-           { \
-             up_assert((const uint8_t *)__FILE__, (int)__LINE__); \
-           } \
-       } \
-     while (0)
-
-#  define PANIC() \
-     up_assert((const uint8_t *)__FILE__, (int)__LINE__)
-
+#  define PANIC()        up_assert((const uint8_t *)__FILE__, (int)__LINE__)
 #else
-
-#  define ASSERT(f)        do { if (!(f)) up_assert(); } while (0)
-#  define VERIFY(f)        do { if ((f) < 0) up_assert(); } while (0)
-#  define PANIC()          up_assert()
-
+#  define PANIC()        up_assert()
 #endif
 
-#ifdef CONFIG_DEBUG_ASSERTIONS
+#define ASSERT(f)        do { if (!(f)) PANIC(); } while (0)
+#define VERIFY(f)        do { if ((f) < 0) PANIC(); } while (0)
 
+#ifdef CONFIG_DEBUG_ASSERTIONS
+#  define DEBUGPANIC()   PANIC()
 #  define DEBUGASSERT(f) ASSERT(f)
 #  define DEBUGVERIFY(f) VERIFY(f)
-#  define DEBUGPANIC()   PANIC()
-
 #else
-
+#  define DEBUGPANIC()
 #  define DEBUGASSERT(f)
 #  define DEBUGVERIFY(f) ((void)(f))
-#  define DEBUGPANIC()
-
-#  endif /* CONFIG_DEBUG_ASSERTIONS */
+#endif
 
 /* The C standard states that if NDEBUG is defined, assert will do nothing.
  * Users can define and undefine NDEBUG as they see fit to choose when assert
-- 
GitLab


From 7d0950bb22f7985324810d72d285bb5e106a6b23 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sun, 12 Jun 2016 07:08:40 -0600
Subject: [PATCH 36/91] net/: Change some nerr() ERRORS to nwarn() WARNINGS. 
 Anomolous network events are not errors.

---
 drivers/wireless/cc3000/cc3000.c |  4 ----
 net/devif/ipv4_input.c           | 16 ++++++++--------
 net/devif/ipv6_input.c           | 10 +++++-----
 net/icmp/icmp_input.c            |  2 +-
 net/icmpv6/icmpv6_input.c        |  2 +-
 net/icmpv6/icmpv6_neighbor.c     |  2 +-
 net/igmp/igmp_input.c            |  8 ++++----
 net/tcp/tcp_input.c              |  4 ++--
 net/tcp/tcp_send_buffered.c      |  4 ++--
 net/tcp/tcp_send_unbuffered.c    |  2 +-
 net/udp/udp_input.c              |  4 ++--
 net/udp/udp_psock_sendto.c       |  4 ++--
 12 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/drivers/wireless/cc3000/cc3000.c b/drivers/wireless/cc3000/cc3000.c
index fdbd4a8aed..1e14d98fdf 100644
--- a/drivers/wireless/cc3000/cc3000.c
+++ b/drivers/wireless/cc3000/cc3000.c
@@ -127,10 +127,6 @@ CCASSERT(sizeof(cc3000_buffer_desc) <= CONFIG_MQ_MAXMSGSIZE);
 #define waitllerr(x,...) // llerr
 #define waitllinfo(x,...) // llinfo
 
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
 /****************************************************************************
  * Private Function Prototypes
  ****************************************************************************/
diff --git a/net/devif/ipv4_input.c b/net/devif/ipv4_input.c
index 778ff18b74..05f661a39d 100644
--- a/net/devif/ipv4_input.c
+++ b/net/devif/ipv4_input.c
@@ -339,8 +339,8 @@ int ipv4_input(FAR struct net_driver_s *dev)
       g_netstats.ipv4.drop++;
       g_netstats.ipv4.vhlerr++;
 #endif
-      nllerr("ERROR: Invalid IP version or header length: %02x\n",
-             pbuf->vhl);
+      nllwarn("WARNING: Invalid IP version or header length: %02x\n",
+              pbuf->vhl);
       goto drop;
     }
 
@@ -349,7 +349,7 @@ int ipv4_input(FAR struct net_driver_s *dev)
   hdrlen = NET_LL_HDRLEN(dev);
   if ((hdrlen + IPv4_HDRLEN) > dev->d_len)
     {
-      nllerr("ERROR: Packet shorter than IPv4 header\n");
+      nllwarn("WARNING: Packet shorter than IPv4 header\n");
       goto drop;
     }
 
@@ -369,7 +369,7 @@ int ipv4_input(FAR struct net_driver_s *dev)
     }
   else
     {
-      nllerr("ERROR: IP packet shorter than length in IP header\n");
+      nllwarn("WARNING: IP packet shorter than length in IP header\n");
       goto drop;
     }
 
@@ -388,7 +388,7 @@ int ipv4_input(FAR struct net_driver_s *dev)
       g_netstats.ipv4.drop++;
       g_netstats.ipv4.fragerr++;
 #endif
-      nllerr("ERROR: IP fragment dropped\n");
+      nllwarn("WARNING: IP fragment dropped\n");
       goto drop;
 #endif /* CONFIG_NET_TCP_REASSEMBLY */
     }
@@ -414,7 +414,7 @@ int ipv4_input(FAR struct net_driver_s *dev)
 #ifdef CONFIG_NET_ICMP
   if (net_ipv4addr_cmp(dev->d_ipaddr, INADDR_ANY))
     {
-      nllerr("ERROR: No IP address assigned\n");
+      nllwarn("WARNING: No IP address assigned\n");
       goto drop;
     }
 
@@ -447,7 +447,7 @@ int ipv4_input(FAR struct net_driver_s *dev)
       g_netstats.ipv4.drop++;
       g_netstats.ipv4.chkerr++;
 #endif
-      nllerr("ERROR: Bad IP checksum\n");
+      nllwarn("WARNING: Bad IP checksum\n");
       goto drop;
     }
 
@@ -495,7 +495,7 @@ int ipv4_input(FAR struct net_driver_s *dev)
         g_netstats.ipv4.protoerr++;
 #endif
 
-        nllerr("ERROR: Unrecognized IP protocol\n");
+        nllwarn("WARNING: Unrecognized IP protocol\n");
         goto drop;
     }
 
diff --git a/net/devif/ipv6_input.c b/net/devif/ipv6_input.c
index 547193825d..e3e7ba46f2 100644
--- a/net/devif/ipv6_input.c
+++ b/net/devif/ipv6_input.c
@@ -151,7 +151,7 @@ int ipv6_input(FAR struct net_driver_s *dev)
       g_netstats.ipv6.vhlerr++;
 #endif
 
-      nllerr("ERROR: Invalid IPv6 version: %d\n", ipv6->vtc >> 4);
+      nllwarn("WARNING: Invalid IPv6 version: %d\n", ipv6->vtc >> 4);
       goto drop;
     }
 
@@ -160,7 +160,7 @@ int ipv6_input(FAR struct net_driver_s *dev)
   hdrlen = NET_LL_HDRLEN(dev);
   if ((hdrlen + IPv6_HDRLEN) > dev->d_len)
     {
-      nllerr("ERROR: Packet shorter than IPv6 header\n");
+      nllwarn("WARNING: Packet shorter than IPv6 header\n");
       goto drop;
     }
 
@@ -187,7 +187,7 @@ int ipv6_input(FAR struct net_driver_s *dev)
     }
   else
     {
-      nllerr("ERROR: IP packet shorter than length in IP header\n");
+      nllwarn("WARNING: IP packet shorter than length in IP header\n");
       goto drop;
     }
 
@@ -216,7 +216,7 @@ int ipv6_input(FAR struct net_driver_s *dev)
        * packets.
        */
 
-      nllerr("ERROR: No IP address assigned\n");
+      nllwarn("WARNING: No IP address assigned\n");
       goto drop;
     }
 
@@ -279,7 +279,7 @@ int ipv6_input(FAR struct net_driver_s *dev)
         g_netstats.ipv6.protoerr++;
 #endif
 
-        nllerr("ERROR: Unrecognized IP protocol: %04x\n", ipv6->proto);
+        nllwarn("WARNING: Unrecognized IP protocol: %04x\n", ipv6->proto);
         goto drop;
     }
 
diff --git a/net/icmp/icmp_input.c b/net/icmp/icmp_input.c
index 368795e1ef..a065848270 100644
--- a/net/icmp/icmp_input.c
+++ b/net/icmp/icmp_input.c
@@ -164,7 +164,7 @@ void icmp_input(FAR struct net_driver_s *dev)
 
   else
     {
-      nllerr("ERROR: Unknown ICMP cmd: %d\n", picmp->type);
+      nllwarn("WARNING: Unknown ICMP cmd: %d\n", picmp->type);
       goto typeerr;
     }
 
diff --git a/net/icmpv6/icmpv6_input.c b/net/icmpv6/icmpv6_input.c
index cf65480a12..31de97b332 100644
--- a/net/icmpv6/icmpv6_input.c
+++ b/net/icmpv6/icmpv6_input.c
@@ -307,7 +307,7 @@ void icmpv6_input(FAR struct net_driver_s *dev)
 
     default:
       {
-        nllerr("ERROR: Unknown ICMPv6 type: %d\n", icmp->type);
+        nllwarn("WARNING: Unknown ICMPv6 type: %d\n", icmp->type);
         goto icmpv6_type_error;
       }
     }
diff --git a/net/icmpv6/icmpv6_neighbor.c b/net/icmpv6/icmpv6_neighbor.c
index 0f0dd9076a..0b4d9d13ce 100644
--- a/net/icmpv6/icmpv6_neighbor.c
+++ b/net/icmpv6/icmpv6_neighbor.c
@@ -298,7 +298,7 @@ int icmpv6_neighbor(const net_ipv6addr_t ipaddr)
   state.snd_cb = icmpv6_callback_alloc(dev);
   if (!state.snd_cb)
     {
-      nerr("ERROR: Failed to allocate a cllback\n");
+      nerr("ERROR: Failed to allocate a callback\n");
       ret = -ENOMEM;
       goto errout_with_lock;
     }
diff --git a/net/igmp/igmp_input.c b/net/igmp/igmp_input.c
index 7d3daa14f4..01d645715c 100644
--- a/net/igmp/igmp_input.c
+++ b/net/igmp/igmp_input.c
@@ -124,7 +124,7 @@ void igmp_input(struct net_driver_s *dev)
   if (dev->d_len < NET_LL_HDRLEN(dev) + IPIGMP_HDRLEN)
     {
       IGMP_STATINCR(g_netstats.igmp.length_errors);
-      nllerr("ERROR: Length error\n");
+      nllwarn("WARNING: Length error\n");
       return;
     }
 
@@ -133,7 +133,7 @@ void igmp_input(struct net_driver_s *dev)
   if (net_chksum((FAR uint16_t *)&IGMPBUF->type, IGMP_HDRLEN) != 0)
     {
       IGMP_STATINCR(g_netstats.igmp.chksum_errors);
-      nllerr("ERROR: Checksum error\n");
+      nllwarn("WARNING: Checksum error\n");
       return;
     }
 
@@ -192,7 +192,7 @@ void igmp_input(struct net_driver_s *dev)
                     IGMP_STATINCR(g_netstats.igmp.v1_received);
                     IGMPBUF->maxresp = 10;
 
-                    nllerr("ERROR: V1 not implemented\n");
+                    nllwarn("WARNING: V1 not implemented\n");
                   }
 
                 IGMP_STATINCR(g_netstats.igmp.query_received);
@@ -270,7 +270,7 @@ void igmp_input(struct net_driver_s *dev)
 
       default:
         {
-          nllerr("ERROR: Unexpected msg %02x\n", IGMPBUF->type);
+          nllwarn("WARNING: Unexpected msg %02x\n", IGMPBUF->type);
         }
       break;
     }
diff --git a/net/tcp/tcp_input.c b/net/tcp/tcp_input.c
index 757efe9cfc..277db67412 100644
--- a/net/tcp/tcp_input.c
+++ b/net/tcp/tcp_input.c
@@ -126,7 +126,7 @@ static void tcp_input(FAR struct net_driver_s *dev, unsigned int iplen)
       g_netstats.tcp.drop++;
       g_netstats.tcp.chkerr++;
 #endif
-      nllerr("ERROR: Bad TCP checksum\n");
+      nllwarn("WARNING: Bad TCP checksum\n");
       goto drop;
     }
 
@@ -398,7 +398,7 @@ found:
 
           if ((conn->tcpstateflags & TCP_STATE_MASK) == TCP_ESTABLISHED)
             {
-              nllerr("ERROR: conn->sndseq %d, conn->unacked %d\n",
+              nllwarn("WARNING: conn->sndseq %d, conn->unacked %d\n",
                      tcp_getsequence(conn->sndseq), conn->unacked);
               goto reset;
             }
diff --git a/net/tcp/tcp_send_buffered.c b/net/tcp/tcp_send_buffered.c
index fb67556ae6..a343d0d046 100644
--- a/net/tcp/tcp_send_buffered.c
+++ b/net/tcp/tcp_send_buffered.c
@@ -566,7 +566,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev,
 
           if (++WRB_NRTX(wrb) >= TCP_MAXRTX)
             {
-              nllerr("ERROR: Expiring wrb=%p nrtx=%u\n",
+              nllwarn("WARNING: Expiring wrb=%p nrtx=%u\n",
                      wrb, WRB_NRTX(wrb));
 
               /* The maximum retry count as been exhausted. Remove the write
@@ -632,7 +632,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev,
 
           if (++WRB_NRTX(wrb) >= TCP_MAXRTX)
             {
-              nllerr("ERROR: Expiring wrb=%p nrtx=%u\n",
+              nllwarn("WARNING: Expiring wrb=%p nrtx=%u\n",
                      wrb, WRB_NRTX(wrb));
 
               /* Return the write buffer to the free list */
diff --git a/net/tcp/tcp_send_unbuffered.c b/net/tcp/tcp_send_unbuffered.c
index 5e6ebec474..0e7e9fe7c4 100644
--- a/net/tcp/tcp_send_unbuffered.c
+++ b/net/tcp/tcp_send_unbuffered.c
@@ -570,7 +570,7 @@ static uint16_t tcpsend_interrupt(FAR struct net_driver_s *dev,
     {
       /* Yes.. report the timeout */
 
-      nllerr("ERROR: SEND timeout\n");
+      nllwarn("WARNING: SEND timeout\n");
       pstate->snd_sent = -ETIMEDOUT;
       goto end_wait;
     }
diff --git a/net/udp/udp_input.c b/net/udp/udp_input.c
index 2c380a4028..9047cf02ca 100644
--- a/net/udp/udp_input.c
+++ b/net/udp/udp_input.c
@@ -149,7 +149,7 @@ static int udp_input(FAR struct net_driver_s *dev, unsigned int iplen)
       g_netstats.udp.drop++;
       g_netstats.udp.chkerr++;
 #endif
-      nllerr("ERROR: Bad UDP checksum\n");
+      nllwarn("WARNING: Bad UDP checksum\n");
       dev->d_len = 0;
     }
   else
@@ -207,7 +207,7 @@ static int udp_input(FAR struct net_driver_s *dev, unsigned int iplen)
         }
       else
         {
-          nllerr("ERROR: No listener on UDP port\n");
+          nllwarn("WARNING: No listener on UDP port\n");
           dev->d_len = 0;
         }
     }
diff --git a/net/udp/udp_psock_sendto.c b/net/udp/udp_psock_sendto.c
index 9486851822..b962dadbfd 100644
--- a/net/udp/udp_psock_sendto.c
+++ b/net/udp/udp_psock_sendto.c
@@ -235,7 +235,7 @@ static uint16_t sendto_interrupt(FAR struct net_driver_s *dev, FAR void *conn,
         {
           /* Terminate the transfer with an error. */
 
-          nllerr("ERROR: Network is down\n");
+          nllwarn("WARNING: Network is down\n");
           pstate->st_sndlen = -ENETUNREACH;
         }
 
@@ -257,7 +257,7 @@ static uint16_t sendto_interrupt(FAR struct net_driver_s *dev, FAR void *conn,
             {
               /* Yes.. report the timeout */
 
-              nllerr("ERROR: SEND timeout\n");
+              nllwarn("WARNING: SEND timeout\n");
               pstate->st_sndlen = -ETIMEDOUT;
             }
           else
-- 
GitLab


From b1eb4fdd8e9436ec7a754f45e20effd8b4fa5e2d Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sun, 12 Jun 2016 07:17:04 -0600
Subject: [PATCH 37/91] Rethink some recent warning removal logic

---
 arch/arm/src/kl/kl_dumpgpio.c | 13 +++++++++----
 libc/spawn/lib_psfa_dump.c    | 13 +++++++++----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/arch/arm/src/kl/kl_dumpgpio.c b/arch/arm/src/kl/kl_dumpgpio.c
index 3ae1708a25..ef41826e5b 100644
--- a/arch/arm/src/kl/kl_dumpgpio.c
+++ b/arch/arm/src/kl/kl_dumpgpio.c
@@ -39,6 +39,15 @@
 
 #include 
 
+/* Output debug info even if debug output is not selected. */
+
+#undef  CONFIG_DEBUG_ERROR
+#undef  CONFIG_DEBUG_WARN
+#undef  CONFIG_DEBUG_INFO
+#define CONFIG_DEBUG_ERROR 1
+#define CONFIG_DEBUG_WARN 1
+#define CONFIG_DEBUG_INFO 1
+
 #include 
 #include 
 
@@ -55,7 +64,6 @@
  ****************************************************************************/
 /* Port letters for prettier debug output */
 
-#ifdef CONFIG_DEBUG_ERROR
 static const char g_portchar[KL_GPIO_NPORTS] =
 {
 #if KL_GPIO_NPORTS > 9
@@ -82,7 +90,6 @@ static const char g_portchar[KL_GPIO_NPORTS] =
 #  error "Bad number of GPIOs"
 #endif
 };
-#endif /* CONFIG_DEBUG_ERROR */
 
 /****************************************************************************
  * Public Functions
@@ -99,7 +106,6 @@ static const char g_portchar[KL_GPIO_NPORTS] =
 
 void kl_dumpgpio(gpio_cfgset_t pinset, const char *msg)
 {
-#ifdef CONFIG_DEBUG_ERROR
   irqstate_t flags;
   uintptr_t base;
   int port;
@@ -124,7 +130,6 @@ void kl_dumpgpio(gpio_cfgset_t pinset, const char *msg)
         getreg32(base + KL_GPIO_PDDR_OFFSET));
 
   leave_critical_section(flags);
-#endif /* CONFIG_DEBUG_ERROR */
 }
 
 #endif /* CONFIG_DEBUG_FEATURES */
diff --git a/libc/spawn/lib_psfa_dump.c b/libc/spawn/lib_psfa_dump.c
index a335fe6b4c..b56564e2ec 100644
--- a/libc/spawn/lib_psfa_dump.c
+++ b/libc/spawn/lib_psfa_dump.c
@@ -39,6 +39,15 @@
 
 #include 
 
+/* Output debug info even if debug output is not selected. */
+
+#undef  CONFIG_DEBUG_ERROR
+#undef  CONFIG_DEBUG_WARN
+#undef  CONFIG_DEBUG_INFO
+#define CONFIG_DEBUG_ERROR 1
+#define CONFIG_DEBUG_WARN 1
+#define CONFIG_DEBUG_INFO 1
+
 #include 
 #include 
 #include 
@@ -47,10 +56,6 @@
 
 #ifdef CONFIG_DEBUG_FEATURES
 
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
-- 
GitLab


From efb02f2ef1e3746403f9e3cc81f1fd0438379f90 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sun, 12 Jun 2016 08:31:22 -0600
Subject: [PATCH 38/91] drivers/: Change some nerr() ERRORS to nwarn()
 WARNINGS.  Anomolous network evernts are not errors.

---
 drivers/leds/pca9635pw.c            |  46 ++++---
 drivers/leds/rgbled.c               |  26 ++--
 drivers/leds/userled_upper.c        |   2 +-
 drivers/loop/losetup.c              |  20 +--
 drivers/mmcsd/mmcsd_sdio.c          |   8 +-
 drivers/mmcsd/mmcsd_spi.c           | 100 +++++++--------
 drivers/modem/u-blox.c              |  10 +-
 drivers/mtd/at45db.c                |   5 +-
 drivers/mtd/filemtd.c               |   8 +-
 drivers/mtd/ftl.c                   |  26 ++--
 drivers/mtd/hamming.c               |   2 +-
 drivers/mtd/is25xp.c                |   2 +-
 drivers/mtd/m25px.c                 |   2 +-
 drivers/mtd/mtd_config.c            |   2 +-
 drivers/mtd/mtd_nand.c              |   4 +-
 drivers/mtd/rammtd.c                |   4 +-
 drivers/mtd/ramtron.c               |   4 +-
 drivers/mtd/sector512.c             |   2 +-
 drivers/mtd/smart.c                 | 183 ++++++++++++++--------------
 drivers/mtd/sst25.c                 |   4 +-
 drivers/mtd/sst25xx.c               |   2 +-
 drivers/mtd/sst26.c                 |   6 +-
 drivers/mtd/sst39vf.c               |   4 +-
 drivers/mtd/w25.c                   |   4 +-
 drivers/net/cs89x0.c                |   8 +-
 drivers/net/dm90x0.c                |  45 +++----
 drivers/net/e1000.c                 |   6 +-
 drivers/net/enc28j60.c              |  22 ++--
 drivers/net/encx24j600.c            |  34 +++---
 drivers/net/ftmac100.c              |  14 +--
 drivers/net/loopback.c              |  16 +--
 drivers/net/phy_notify.c            |  16 ++-
 drivers/net/skeleton.c              |  14 +--
 drivers/net/telnet.c                |  14 +--
 drivers/net/tun.c                   |  14 +--
 drivers/net/vnet.c                  |   6 +-
 drivers/pipes/pipe_common.c         |   4 +-
 drivers/power/battery_charger.c     |   4 +-
 drivers/power/battery_gauge.c       |   4 +-
 drivers/power/bq2425x.c             |  47 +++----
 drivers/sercomm/console.c           |   2 +-
 drivers/serial/serial.c             |   2 +-
 drivers/serial/uart_16550.c         |   2 +-
 drivers/spi/spi_bitbang.c           |   4 +-
 drivers/timers/cs2100-cp.c          |  36 +++---
 drivers/timers/ds3231.c             |  22 ++--
 drivers/timers/pcf85263.c           |  22 ++--
 drivers/timers/timer.c              |   6 +-
 drivers/usbhost/usbhost_cdcacm.c    |   6 +-
 drivers/usbhost/usbhost_enumerate.c |   6 +-
 drivers/usbhost/usbhost_hidkbd.c    |  10 +-
 drivers/usbhost/usbhost_hidmouse.c  |  14 +--
 drivers/usbhost/usbhost_hub.c       |   4 +-
 drivers/usbhost/usbhost_skeleton.c  |   4 +-
 drivers/usbhost/usbhost_storage.c   |   4 +-
 55 files changed, 457 insertions(+), 431 deletions(-)

diff --git a/drivers/leds/pca9635pw.c b/drivers/leds/pca9635pw.c
index 7bb8f95d8b..62cf0c1cbf 100644
--- a/drivers/leds/pca9635pw.c
+++ b/drivers/leds/pca9635pw.c
@@ -48,6 +48,22 @@
 
 #if defined(CONFIG_I2C) && defined(CONFIG_PCA9635PW)
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#ifdef CONFIG_DEBUG_LEDS
+#  define derr llerr
+#  ifdef CONFIG_DEBUG_INFO
+#    define dinfo llinfo
+#  else
+#    define dinfo(x...)
+#  endif
+#else
+#  define derr(x...)
+#  define dinfo(x...)
+#endif
+
 /****************************************************************************
  * Private Type Definitions
  ****************************************************************************/
@@ -105,7 +121,7 @@ static int pca9635pw_i2c_write_byte(FAR struct pca9635pw_dev_s *priv,
 {
   struct i2c_config_s config;
 
-  err("pca9635pw_i2c_write_byte\n");
+  dinfo("pca9635pw_i2c_write_byte\n");
 
   /* assemble the 2 byte message comprised of reg_addr and reg_val */
 
@@ -123,14 +139,14 @@ static int pca9635pw_i2c_write_byte(FAR struct pca9635pw_dev_s *priv,
 
   /* Write the register address followed by the data (no RESTART) */
 
-  err("i2c addr: 0x%02X reg addr: 0x%02X value: 0x%02X\n", priv->i2c_addr,
-      buffer[0], buffer[1]);
+  dinfo("i2c addr: 0x%02X reg addr: 0x%02X value: 0x%02X\n", priv->i2c_addr,
+        buffer[0], buffer[1]);
 
 
   ret = i2c_write(priv->i2c, &config, buffer, BUFFER_SIZE);
   if (ret != OK)
     {
-      err("i2c_write returned error code %d\n", ret);
+      derr("ERROR: i2c_write returned error code %d\n", ret);
       return ret;
     }
 
@@ -173,7 +189,7 @@ static int pca9635pw_set_led_mode(FAR struct pca9635pw_dev_s *priv,
 
 static int pca9635pw_open(FAR struct file *filep)
 {
-  err("pca9635pw_open\n");
+  dinfo("pca9635pw_open\n");
 
   FAR struct inode *inode = filep->f_inode;
   FAR struct pca9635pw_dev_s *priv = inode->i_private;
@@ -192,7 +208,7 @@ static int pca9635pw_open(FAR struct file *filep)
                                  PCA9635PW_MODE_1_INITIAL_VALUE);
   if (ret != OK)
     {
-      err("Could not set initial config for PCA9635PW_MODE_1\n");
+      derr("ERROR: Could not set initial config for PCA9635PW_MODE_1\n");
       return ret;
     }
 
@@ -209,7 +225,7 @@ static int pca9635pw_open(FAR struct file *filep)
                                  PCA9635PW_MODE_2_INITIAL_VALUE);
   if (ret != OK)
     {
-      err("Could not set initial config for PCA9635PW_MODE_2\n");
+      derr("ERROR: Could not set initial config for PCA9635PW_MODE_2\n");
       return ret;
     }
 
@@ -227,7 +243,7 @@ static int pca9635pw_open(FAR struct file *filep)
   ret = pca9635pw_set_led_mode(priv, PCA9635PW_LED_OUT_x_MODE_2);
   if (ret != OK)
     {
-      err("Could not set led driver outputs to MODE2 (LED's brightness are "
+      derr("ERROR: Could not set led driver outputs to MODE2 (LED's brightness are "
           "controlled by pwm registers)\n");
       return ret;
     }
@@ -245,7 +261,7 @@ static int pca9635pw_open(FAR struct file *filep)
 
 static int pca9635pw_close(FAR struct file *filep)
 {
-  err("pca9635pw_close\n");
+  dinfo("pca9635pw_close\n");
 
   FAR struct inode *inode = filep->f_inode;
   FAR struct pca9635pw_dev_s *priv = inode->i_private;
@@ -257,7 +273,7 @@ static int pca9635pw_close(FAR struct file *filep)
   ret = pca9635pw_set_led_mode(priv, PCA9635PW_LED_OUT_x_MODE_0);
   if (ret != OK)
     {
-      err("Could not set led driver outputs to MODE0 (LED's are off)\n");
+      derr("ERROR: Could not set led driver outputs to MODE0 (LED's are off)\n");
       return ret;
     }
 
@@ -285,14 +301,14 @@ static int pca9635pw_close(FAR struct file *filep)
 
 static int pca9635pw_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 {
-  err("pca9635pw_ioctl\n");
+  dinfo("pca9635pw_ioctl\n");
 
   FAR struct inode *inode = filep->f_inode;
   FAR struct pca9635pw_dev_s *priv = inode->i_private;
 
   int ret = OK;
 
-  err("cmd: %d arg: %ld\n", cmd, arg);
+  dinfo("cmd: %d arg: %ld\n", cmd, arg);
 
   switch (cmd)
     {
@@ -319,7 +335,7 @@ static int pca9635pw_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
     default:
       {
-        err("Unrecognized cmd: %d\n", cmd);
+        derr("ERROR: Unrecognized cmd: %d\n", cmd);
         ret = -ENOTTY;
       }
       break;
@@ -364,7 +380,7 @@ int pca9635pw_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
 
   if (priv == NULL)
     {
-      err("Failed to allocate instance of pca9635pw_dev_s\n");
+      derr("ERROR: Failed to allocate instance of pca9635pw_dev_s\n");
       return -ENOMEM;
     }
 
@@ -376,7 +392,7 @@ int pca9635pw_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
   int const ret = register_driver(devpath, &g_pca9635pw_fileops, 666, priv);
   if (ret != OK)
     {
-      err("Failed to register driver: %d\n", ret);
+      derr("ERROR: Failed to register driver: %d\n", ret);
       kmm_free(priv);
       return ret;
     }
diff --git a/drivers/leds/rgbled.c b/drivers/leds/rgbled.c
index 7cd2117a3e..05c9976059 100644
--- a/drivers/leds/rgbled.c
+++ b/drivers/leds/rgbled.c
@@ -72,16 +72,16 @@
 /* Debug ********************************************************************/
 /* Non-standard debug that may be enabled just for testing PWM */
 
-#ifdef CONFIG_DEBUG_RGBLED
-#  define pwmerr    err
-#  define pwminfo   info
-#  define pwmllerr  llerr
-#  define pwmllinfo llinfo
+#ifdef CONFIG_DEBUG_LEDS
+#  define derr    err
+#  define dinfo   info
+#  define dllerr  llerr
+#  define dllinfo llinfo
 #else
-#  define pwmerr(x...)
-#  define pwminfo(x...)
-#  define pwmllerr(x...)
-#  define pwmllinfo(x...)
+#  define derr(x...)
+#  define dinfo(x...)
+#  define dllerr(x...)
+#  define dllinfo(x...)
 #endif
 
 /****************************************************************************
@@ -150,7 +150,7 @@ static int rgbled_open(FAR struct file *filep)
   uint8_t                     tmp;
   int                         ret;
 
-  pwminfo("crefs: %d\n", upper->crefs);
+  dinfo("crefs: %d\n", upper->crefs);
 
   /* Get exclusive access to the device structures */
 
@@ -201,7 +201,7 @@ static int rgbled_close(FAR struct file *filep)
   FAR struct rgbled_upperhalf_s *upper = inode->i_private;
   int                         ret;
 
-  pwminfo("crefs: %d\n", upper->crefs);
+  dinfo("crefs: %d\n", upper->crefs);
 
   /* Get exclusive access to the device structures */
 
@@ -395,7 +395,7 @@ int rgbled_register(FAR const char *path, FAR struct pwm_lowerhalf_s *ledr,
 
   if (!upper)
     {
-      pwmerr("Allocation failed\n");
+      derr("ERROR: Allocation failed\n");
       return -ENOMEM;
     }
 
@@ -410,7 +410,7 @@ int rgbled_register(FAR const char *path, FAR struct pwm_lowerhalf_s *ledr,
 
   /* Register the PWM device */
 
-  pwminfo("Registering %s\n", path);
+  dinfo("Registering %s\n", path);
   return register_driver(path, &g_rgbledops, 0666, upper);
 }
 
diff --git a/drivers/leds/userled_upper.c b/drivers/leds/userled_upper.c
index 00a6860e1b..e24eafef2c 100644
--- a/drivers/leds/userled_upper.c
+++ b/drivers/leds/userled_upper.c
@@ -69,7 +69,7 @@
 #ifdef CONFIG_DEBUG_LEDS
 #  define derr llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define dinfo llerr
+#    define dinfo llinfo
 #  else
 #    define dinfo(x...)
 #  endif
diff --git a/drivers/loop/losetup.c b/drivers/loop/losetup.c
index 61817cd19f..fe4a9b3792 100644
--- a/drivers/loop/losetup.c
+++ b/drivers/loop/losetup.c
@@ -246,7 +246,7 @@ static ssize_t loop_read(FAR struct inode *inode, FAR unsigned char *buffer,
 
   if (start_sector + nsectors > dev->nsectors)
     {
-      err("Read past end of file\n");
+      err("ERROR: Read past end of file\n");
       return -EIO;
     }
 
@@ -256,7 +256,7 @@ static ssize_t loop_read(FAR struct inode *inode, FAR unsigned char *buffer,
   ret = lseek(dev->fd, offset, SEEK_SET);
   if (ret == (off_t)-1)
     {
-      err("Seek failed for offset=%d: %d\n", (int)offset, get_errno());
+      err("ERROR: Seek failed for offset=%d: %d\n", (int)offset, get_errno());
       return -EIO;
     }
 
@@ -267,7 +267,7 @@ static ssize_t loop_read(FAR struct inode *inode, FAR unsigned char *buffer,
       nbytesread = read(dev->fd, buffer, nsectors * dev->sectsize);
       if (nbytesread < 0 && get_errno() != EINTR)
         {
-          err("Read failed: %d\n", get_errno());
+          err("ERROR: Read failed: %d\n", get_errno());
           return -get_errno();
         }
     }
@@ -304,7 +304,7 @@ static ssize_t loop_write(FAR struct inode *inode,
   ret = lseek(dev->fd, offset, SEEK_SET);
   if (ret == (off_t)-1)
     {
-      err("Seek failed for offset=%d: %d\n", (int)offset, get_errno());
+      err("ERROR: Seek failed for offset=%d: %d\n", (int)offset, get_errno());
     }
 
   /* Then write the requested number of sectors to that position */
@@ -314,7 +314,7 @@ static ssize_t loop_write(FAR struct inode *inode,
       nbyteswritten = write(dev->fd, buffer, nsectors * dev->sectsize);
       if (nbyteswritten < 0 && get_errno() != EINTR)
         {
-          err("Write failed: %d\n", get_errno());
+          err("ERROR: Write failed: %d\n", get_errno());
           return -get_errno();
         }
     }
@@ -391,7 +391,7 @@ int losetup(FAR const char *devname, FAR const char *filename,
   ret = stat(filename, &sb);
   if (ret < 0)
     {
-      err("Failed to stat %s: %d\n", filename, get_errno());
+      err("ERROR: Failed to stat %s: %d\n", filename, get_errno());
       return -get_errno();
     }
 
@@ -399,7 +399,7 @@ int losetup(FAR const char *devname, FAR const char *filename,
 
   if (sb.st_size - offset < sectsize)
     {
-      err("File is too small for blocksize\n");
+      err("ERROR: File is too small for blocksize\n");
       return -ERANGE;
     }
 
@@ -445,7 +445,7 @@ int losetup(FAR const char *devname, FAR const char *filename,
       dev->fd = open(filename, O_RDWR);
       if (dev->fd < 0)
         {
-          err("Failed to open %s: %d\n", filename, get_errno());
+          err("ERROR: Failed to open %s: %d\n", filename, get_errno());
           ret = -get_errno();
           goto errout_with_dev;
         }
@@ -456,7 +456,7 @@ int losetup(FAR const char *devname, FAR const char *filename,
   ret = register_blockdriver(devname, &g_bops, 0, dev);
   if (ret < 0)
     {
-      ferr("register_blockdriver failed: %d\n", -ret);
+      ferr("ERROR: register_blockdriver failed: %d\n", -ret);
       goto errout_with_fd;
     }
 
@@ -499,7 +499,7 @@ int loteardown(FAR const char *devname)
   ret = open_blockdriver(devname, MS_RDONLY, &inode);
   if (ret < 0)
     {
-      err("Failed to open %s: %d\n", devname, -ret);
+      err("ERROR: Failed to open %s: %d\n", devname, -ret);
       return ret;
     }
 
diff --git a/drivers/mmcsd/mmcsd_sdio.c b/drivers/mmcsd/mmcsd_sdio.c
index e93f326afb..eddf12cb4d 100644
--- a/drivers/mmcsd/mmcsd_sdio.c
+++ b/drivers/mmcsd/mmcsd_sdio.c
@@ -2411,7 +2411,7 @@ static int mmcsd_widebus(FAR struct mmcsd_state_s *priv)
       ret = mmcsd_recvR1(priv, SD_ACMD42);
       if (ret != OK)
         {
-          finfo("WARNING: SD card does not support ACMD42: %d\n", ret);
+          fwarn("WARNING: SD card does not support ACMD42: %d\n", ret);
           return ret;
         }
 
@@ -2449,7 +2449,7 @@ static int mmcsd_widebus(FAR struct mmcsd_state_s *priv)
 
   /* Wide bus operation not supported */
 
-  ferr("WARNING: Card does not support wide-bus operation\n");
+  fwarn("WARNING: Card does not support wide-bus operation\n");
   return -ENOSYS;
 
 #else /* CONFIG_SDIO_WIDTH_D1_ONLY */
@@ -2691,7 +2691,7 @@ static int mmcsd_sdinitialize(FAR struct mmcsd_state_s *priv)
   ret = mmcsd_widebus(priv);
   if (ret != OK)
     {
-      ferr("WARN: Failed to set wide bus operation: %d\n", ret);
+      ferr("ERROR: Failed to set wide bus operation: %d\n", ret);
     }
 
   /* TODO: If wide-bus selected, then send CMD6 to see if the card supports
@@ -2918,7 +2918,7 @@ static int mmcsd_cardidentify(FAR struct mmcsd_state_s *priv)
             {
               /* CMD1 succeeded... this must be an MMC card */
 
-              ferr("CMD1 succeeded, assuming MMC card\n");
+              finfo("CMD1 succeeded, assuming MMC card\n");
               priv->type = MMCSD_CARDTYPE_MMC;
 
               /* Check if the card is busy.  Very confusing, BUSY is set LOW
diff --git a/drivers/mmcsd/mmcsd_spi.c b/drivers/mmcsd/mmcsd_spi.c
index 80ec787063..2a4cdee73d 100644
--- a/drivers/mmcsd/mmcsd_spi.c
+++ b/drivers/mmcsd/mmcsd_spi.c
@@ -431,7 +431,7 @@ static int mmcsd_waitready(FAR struct mmcsd_slot_s *slot)
     }
   while (elapsed < MMCSD_DELAY_500MS);
 
-  ferr("Card still busy, last response: %02x\n", response);
+  finfo("Card still busy, last response: %02x\n", response);
   return -EBUSY;
 }
 
@@ -504,7 +504,7 @@ static uint32_t mmcsd_sendcmd(FAR struct mmcsd_slot_s *slot,
 
   if ((response & 0x80) != 0)
     {
-      ferr("Failed: i=%d response=%02x\n", i, response);
+      ferr("ERROR: Failed: i=%d response=%02x\n", i, response);
       return (uint32_t)-1;
     }
 
@@ -531,7 +531,7 @@ static uint32_t mmcsd_sendcmd(FAR struct mmcsd_slot_s *slot,
 
         if (busy != 0xff)
           {
-            ferr("Failed: card still busy (%02x)\n", busy);
+            ferr("ERROR: Failed: card still busy (%02x)\n", busy);
             return (uint32_t)-1;
           }
 
@@ -613,7 +613,7 @@ static void mmcsd_setblklen(FAR struct mmcsd_slot_s *slot, uint32_t length)
   response = mmcsd_sendcmd(slot, &g_cmd16, length);
   if (response != MMCSD_SPIR1_OK)
     {
-      ferr("Failed to set block length: %02x\n", response);
+      ferr("ERROR: Failed to set block length: %02x\n", response);
     }
 }
 
@@ -813,7 +813,7 @@ static void mmcsd_decodecsd(FAR struct mmcsd_slot_s *slot, uint8_t *csd)
     {
       if (readbllen > 9)
         {
-          ferr("Forcing 512 byte sector size\n");
+          fwarn("WARNING: Forcing 512 byte sector size\n");
           csizemult += (readbllen - 9);
           readbllen  = 9;
         }
@@ -880,7 +880,7 @@ static int mmcsd_getcardinfo(FAR struct mmcsd_slot_s *slot, uint8_t *buffer,
   result = mmcsd_sendcmd(slot, cmd, 0);
   if (result != MMCSD_SPIR1_OK)
     {
-      ferr("CMD9/10 failed: R1=%02x\n", result);
+      ferr("ERROR: CMD9/10 failed: R1=%02x\n", result);
       return -EIO;
     }
 
@@ -898,7 +898,7 @@ static int mmcsd_getcardinfo(FAR struct mmcsd_slot_s *slot, uint8_t *buffer,
 
       if (response != 0 && (response & MMCSD_SPIDET_UPPER) == 0)
         {
-          ferr("%d. Data transfer error: %02x\n", i, response);
+          ferr("ERROR: %d. Data transfer error: %02x\n", i, response);
           return -EIO;
         }
       else if (response == MMCSD_SPIDT_STARTBLKSNGL)
@@ -916,7 +916,7 @@ static int mmcsd_getcardinfo(FAR struct mmcsd_slot_s *slot, uint8_t *buffer,
         }
     }
 
-  ferr("%d. Did not find start of block\n");
+  ferr("ERROR: %d. Did not find start of block\n");
   return -EIO;
 }
 
@@ -960,7 +960,7 @@ static int mmcsd_recvblock(FAR struct mmcsd_slot_s *slot, uint8_t *buffer,
       return OK;
     }
 
-  ferr("Did not receive data token (%02x)\n", token);
+  ferr("ERROR: Did not receive data token (%02x)\n", token);
   return ERROR;
 }
 
@@ -1004,7 +1004,7 @@ static int mmcsd_xmitblock(FAR struct mmcsd_slot_s *slot,
   response = SPI_SEND(spi, 0xff);
   if ((response & MMCSD_SPIDR_MASK) != MMCSD_SPIDR_ACCEPTED)
     {
-      ferr("Bad data response: %02x\n", response);
+      ferr("ERROR: Bad data response: %02x\n", response);
       return -EIO;
     }
 
@@ -1034,7 +1034,7 @@ static int mmcsd_open(FAR struct inode *inode)
 #ifdef CONFIG_DEBUG_FEATURES
   if (!inode || !inode->i_private)
     {
-      ferr("Internal confusion\n");
+      ferr("ERROR: Internal confusion\n");
       return -EIO;
     }
 #endif
@@ -1047,7 +1047,7 @@ static int mmcsd_open(FAR struct inode *inode)
 #ifdef CONFIG_DEBUG_FEATURES
   if (!spi)
     {
-      ferr("Internal confusion\n");
+      ferr("ERROR: Internal confusion\n");
       return -EIO;
     }
 #endif
@@ -1119,13 +1119,13 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
 #ifdef CONFIG_DEBUG_FEATURES
   if (!buffer)
     {
-      ferr("Invalid parameters\n");
+      ferr("ERROR: Invalid parameters\n");
       return -EINVAL;
     }
 
   if (!inode || !inode->i_private)
     {
-      ferr("Internal confusion\n");
+      ferr("ERROR: Internal confusion\n");
       return -EIO;
     }
 #endif
@@ -1138,7 +1138,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
 #ifdef CONFIG_DEBUG_FEATURES
   if (!spi)
     {
-      ferr("Internal confusion\n");
+      ferr("ERROR: Internal confusion\n");
       return -EIO;
     }
 #endif
@@ -1147,7 +1147,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
 
   if (slot->state & MMCSD_SLOTSTATUS_NOTREADY)
     {
-      ferr("Slot not ready\n");
+      ferr("ERROR: Slot not ready\n");
       return -ENODEV;
     }
 
@@ -1190,7 +1190,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
       response = mmcsd_sendcmd(slot, &g_cmd17, offset);
       if (response != MMCSD_SPIR1_OK)
         {
-          ferr("CMD17 failed: R1=%02x\n", response);
+          ferr("ERROR: CMD17 failed: R1=%02x\n", response);
           goto errout_with_eio;
         }
 
@@ -1198,7 +1198,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
 
       if (mmcsd_recvblock(slot, buffer, SECTORSIZE(slot)) != 0)
         {
-          ferr("Failed: to receive the block\n");
+          ferr("ERROR: Failed: to receive the block\n");
           goto errout_with_eio;
         }
     }
@@ -1211,7 +1211,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
       response = mmcsd_sendcmd(slot, &g_cmd18, offset);
       if (response != MMCSD_SPIR1_OK)
         {
-          ferr("CMD18 failed: R1=%02x\n", response);
+          ferr("ERROR: CMD18 failed: R1=%02x\n", response);
           goto errout_with_eio;
         }
 
@@ -1221,7 +1221,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
         {
           if (mmcsd_recvblock(slot, buffer, SECTORSIZE(slot)) != 0)
             {
-              ferr("Failed: to receive the block\n");
+              ferr("ERROR: Failed: to receive the block\n");
               goto errout_with_eio;
             }
 
@@ -1273,13 +1273,13 @@ static ssize_t mmcsd_write(FAR struct inode *inode, const unsigned char *buffer,
 #ifdef CONFIG_DEBUG_FEATURES
   if (!buffer)
     {
-      ferr("Invalid parameters\n");
+      ferr("ERROR: Invalid parameters\n");
       return -EINVAL;
     }
 
   if (!inode || !inode->i_private)
     {
-      ferr("Internal confusion\n");
+      ferr("ERROR: Internal confusion\n");
       return -EIO;
     }
 #endif
@@ -1292,7 +1292,7 @@ static ssize_t mmcsd_write(FAR struct inode *inode, const unsigned char *buffer,
 #ifdef CONFIG_DEBUG_FEATURES
   if (!spi)
     {
-      ferr("Internal confusion\n");
+      ferr("ERROR: Internal confusion\n");
       return -EIO;
     }
 #endif
@@ -1301,7 +1301,7 @@ static ssize_t mmcsd_write(FAR struct inode *inode, const unsigned char *buffer,
 
   if (slot->state & MMCSD_SLOTSTATUS_NOTREADY)
     {
-      ferr("Slot not ready\n");
+      ferr("ERROR: Slot not ready\n");
       return -ENODEV;
     }
 
@@ -1309,7 +1309,7 @@ static ssize_t mmcsd_write(FAR struct inode *inode, const unsigned char *buffer,
 
   if (slot->state & MMCSD_SLOTSTATUS_WRPROTECT)
     {
-      ferr("Not write enabled\n");
+      ferr("ERROR: Not write enabled\n");
       return -EACCES;
     }
 
@@ -1352,7 +1352,7 @@ static ssize_t mmcsd_write(FAR struct inode *inode, const unsigned char *buffer,
       response = mmcsd_sendcmd(slot, &g_cmd24, offset);
       if (response != MMCSD_SPIR1_OK)
         {
-          ferr("CMD24 failed: R1=%02x\n", response);
+          ferr("ERROR: CMD24 failed: R1=%02x\n", response);
           goto errout_with_sem;
         }
 
@@ -1360,7 +1360,7 @@ static ssize_t mmcsd_write(FAR struct inode *inode, const unsigned char *buffer,
 
       if (mmcsd_xmitblock(slot, buffer, SECTORSIZE(slot), 0xfe) != 0)
         {
-          ferr("Block transfer failed\n");
+          ferr("ERROR: Block transfer failed\n");
           goto errout_with_sem;
         }
     }
@@ -1373,14 +1373,14 @@ static ssize_t mmcsd_write(FAR struct inode *inode, const unsigned char *buffer,
           response = mmcsd_sendcmd(slot, &g_cmd55, 0);
           if (response != MMCSD_SPIR1_OK)
             {
-              ferr("CMD55 failed: R1=%02x\n", response);
+              ferr("ERROR: CMD55 failed: R1=%02x\n", response);
               goto errout_with_sem;
             }
 
           response = mmcsd_sendcmd(slot, &g_acmd23, nsectors);
           if (response != MMCSD_SPIR1_OK)
             {
-              ferr("ACMD23 failed: R1=%02x\n", response);
+              ferr("ERROR: ACMD23 failed: R1=%02x\n", response);
               goto errout_with_sem;
             }
        }
@@ -1392,7 +1392,7 @@ static ssize_t mmcsd_write(FAR struct inode *inode, const unsigned char *buffer,
       response = mmcsd_sendcmd(slot, &g_cmd25, offset);
       if (response != MMCSD_SPIR1_OK)
         {
-          ferr("CMD25 failed: R1=%02x\n", response);
+          ferr("ERROR: CMD25 failed: R1=%02x\n", response);
           goto errout_with_sem;
         }
 
@@ -1402,14 +1402,14 @@ static ssize_t mmcsd_write(FAR struct inode *inode, const unsigned char *buffer,
         {
           if (mmcsd_xmitblock(slot, buffer, SECTORSIZE(slot), 0xfc) != 0)
             {
-              ferr("Failed: to receive the block\n");
+              ferr("ERROR: Failed: to receive the block\n");
               goto errout_with_sem;
             }
           buffer += SECTORSIZE(slot);
 
           if (mmcsd_waitready(slot) != OK)
             {
-              ferr("Failed: card is busy\n");
+              ferr("ERROR: Failed: card is busy\n");
               goto errout_with_sem;
             }
         }
@@ -1455,13 +1455,13 @@ static int mmcsd_geometry(FAR struct inode *inode, struct geometry *geometry)
 #ifdef CONFIG_DEBUG_FEATURES
   if (!geometry)
     {
-      ferr("Invalid parameters\n");
+      ferr("ERROR: Invalid parameters\n");
       return -EINVAL;
     }
 
   if (!inode || !inode->i_private)
     {
-      ferr("Internal confusion\n");
+      ferr("ERROR: Internal confusion\n");
       return -EIO;
     }
 #endif
@@ -1474,7 +1474,7 @@ static int mmcsd_geometry(FAR struct inode *inode, struct geometry *geometry)
 #ifdef CONFIG_DEBUG_FEATURES
   if (!spi)
     {
-      ferr("Internal confusion\n");
+      ferr("ERROR: Internal confusion\n");
       return -EIO;
     }
 #endif
@@ -1489,7 +1489,7 @@ static int mmcsd_geometry(FAR struct inode *inode, struct geometry *geometry)
   if (ret < 0)
     {
       mmcsd_semgive(slot);
-      ferr("mmcsd_getcsd returned %d\n", ret);
+      ferr("ERROR: mmcsd_getcsd returned %d\n", ret);
       return ret;
     }
 
@@ -1566,7 +1566,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
 
   if ((SPI_STATUS(spi, SPIDEV_MMCSD) & SPI_STATUS_PRESENT) == 0)
     {
-      ferr("No card present\n");
+      fwarn("WARNING: No card present\n");
       slot->state |= MMCSD_SLOTSTATUS_NODISK;
       return -ENODEV;
     }
@@ -1621,7 +1621,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
 
   if (result != MMCSD_SPIR1_IDLESTATE)
     {
-      ferr("Send CMD0 failed: R1=%02x\n", result);
+      ferr("ERROR: Send CMD0 failed: R1=%02x\n", result);
       SPI_SELECT(spi, SPIDEV_MMCSD, false);
       mmcsd_semgive(slot);
       return -EIO;
@@ -1678,12 +1678,12 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
                   finfo("OCR: %08x\n", slot->ocr);
                   if ((slot->ocr & MMCSD_OCR_CCS) != 0)
                     {
-                      ferr("Identified SD ver2 card/with block access\n");
+                      finfo("Identified SD ver2 card/with block access\n");
                       slot->type = MMCSD_CARDTYPE_SDV2 | MMCSD_CARDTYPE_BLOCK;
                     }
                   else
                     {
-                      ferr("Identified SD ver2 card\n");
+                      finfo("Identified SD ver2 card\n");
                       slot->type = MMCSD_CARDTYPE_SDV2;
                     }
                }
@@ -1706,7 +1706,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
           result = mmcsd_sendcmd(slot, &g_acmd41, 0);
           if (result == MMCSD_SPIR1_IDLESTATE || result == MMCSD_SPIR1_OK)
             {
-              ferr("Identified SD ver1 card\n");
+              finfo("Identified SD ver1 card\n");
               slot->type = MMCSD_CARDTYPE_SDV1;
             }
         }
@@ -1736,7 +1736,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
               result = mmcsd_sendcmd(slot, &g_cmd1, 0);
               if (result == MMCSD_SPIR1_OK)
                 {
-                   ferr("%d. Identified MMC card\n", i);
+                   finfo("%d. Identified MMC card\n", i);
                    slot->type = MMCSD_CARDTYPE_MMC;
                    break;
                 }
@@ -1748,7 +1748,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
 
       if (elapsed >= MMCSD_DELAY_1SEC)
         {
-          ferr("Failed to exit IDLE state\n");
+          ferr("ERROR: Failed to exit IDLE state\n");
           SPI_SELECT(spi, SPIDEV_MMCSD, false);
           mmcsd_semgive(slot);
           return -EIO;
@@ -1757,7 +1757,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
 
   if (slot->type == MMCSD_CARDTYPE_UNKNOWN)
     {
-      ferr("Failed to identify card\n");
+      ferr("ERROR: Failed to identify card\n");
       SPI_SELECT(spi, SPIDEV_MMCSD, false);
       mmcsd_semgive(slot);
       return -EIO;
@@ -1769,7 +1769,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
   result = mmcsd_getcsd(slot, csd);
   if (result != OK)
     {
-      ferr("mmcsd_getcsd(CMD9) failed: %d\n", result);
+      ferr("ERROR: mmcsd_getcsd(CMD9) failed: %d\n", result);
       SPI_SELECT(spi, SPIDEV_MMCSD, false);
       mmcsd_semgive(slot);
       return -EIO;
@@ -1836,7 +1836,7 @@ static void mmcsd_mediachanged(void *arg)
 #ifdef CONFIG_DEBUG_FEATURES
   if (!slot || !slot->spi)
     {
-      ferr("Internal confusion\n");
+      ferr("ERROR: Internal confusion\n");
       return;
     }
 #endif
@@ -1857,7 +1857,7 @@ static void mmcsd_mediachanged(void *arg)
     {
       /* Media is not present */
 
-      ferr("No card present\n");
+      fwarn("WARNING: No card present\n");
       slot->state |= (MMCSD_SLOTSTATUS_NODISK | MMCSD_SLOTSTATUS_NOTREADY);
 
       /* Was media removed? */
@@ -1918,7 +1918,7 @@ int mmcsd_spislotinitialize(int minor, int slotno, FAR struct spi_dev_s *spi)
 #ifdef CONFIG_DEBUG_FEATURES
   if ((unsigned)slotno >= CONFIG_MMCSD_NSLOTS || (unsigned)minor > 255 || !spi)
     {
-      ferr("Invalid arguments\n");
+      ferr("ERROR: Invalid arguments\n");
       return -EINVAL;
     }
 #endif
@@ -1932,7 +1932,7 @@ int mmcsd_spislotinitialize(int minor, int slotno, FAR struct spi_dev_s *spi)
 #ifdef CONFIG_DEBUG_FEATURES
   if (slot->spi)
     {
-      ferr("Already registered\n");
+      ferr("ERROR: Already registered\n");
       return -EBUSY;
     }
 #endif
@@ -1969,7 +1969,7 @@ int mmcsd_spislotinitialize(int minor, int slotno, FAR struct spi_dev_s *spi)
   ret = register_blockdriver(devname, &g_bops, MMCSD_MODE, slot);
   if (ret < 0)
     {
-      ferr("register_blockdriver failed: %d\n", -ret);
+      ferr("ERROR: register_blockdriver failed: %d\n", -ret);
       slot->spi = NULL;
       return ret;
     }
diff --git a/drivers/modem/u-blox.c b/drivers/modem/u-blox.c
index cfdfdc733f..5925d33bf4 100644
--- a/drivers/modem/u-blox.c
+++ b/drivers/modem/u-blox.c
@@ -58,8 +58,8 @@
 /* Non-standard debug that may be enabled just for testing the modem driver */
 
 #ifdef CONFIG_MODEM_U_BLOX_DEBUG
-#  define m_err    err
-#  define m_info   info
+#  define m_err     err
+#  define m_info    info
 #  define m_vllerr  llerr
 #  define m_vllinfo llinfo
 #else
@@ -286,7 +286,7 @@ FAR void* ubxmdm_register(FAR const char *path,
     kmm_zalloc(sizeof(struct ubxmdm_upper));
   if (!upper)
     {
-      m_err("Upper half allocation failed\n");
+      m_err("ERROR: Upper half allocation failed\n");
       goto errout;
     }
 
@@ -294,14 +294,14 @@ FAR void* ubxmdm_register(FAR const char *path,
   upper->path = strdup(path);
   if (!upper->path)
     {
-      m_err("Path allocation failed\n");
+      m_err("ERROR: Path allocation failed\n");
       goto errout_with_upper;
     }
 
   ret = register_driver(path, &ubxmdm_fops, 0666, upper);
   if (ret < 0)
     {
-      m_err("register_driver failed: %d\n", ret);
+      m_err("ERROR: register_driver failed: %d\n", ret);
       goto errout_with_path;
     }
 
diff --git a/drivers/mtd/at45db.c b/drivers/mtd/at45db.c
index fd928bacff..4219c0d3b9 100644
--- a/drivers/mtd/at45db.c
+++ b/drivers/mtd/at45db.c
@@ -869,7 +869,7 @@ FAR struct mtd_dev_s *at45db_initialize(FAR struct spi_dev_s *spi)
         {
           /* Unrecognized! Discard all of that work we just did and return NULL */
 
-          ferr("Unrecognized\n");
+          ferr("ERROR: Unrecognized\n");
           goto errout;
         }
 
@@ -887,7 +887,8 @@ FAR struct mtd_dev_s *at45db_initialize(FAR struct spi_dev_s *spi)
            * is required after the device has be re-programmed.
            */
 
-          ferr("Reprogramming page size\n");
+          fwarn("WARNING: Reprogramming page size\n");
+
           SPI_SELECT(priv->spi, SPIDEV_FLASH, true);
           SPI_SNDBLOCK(priv->spi, g_binpgsize, BINPGSIZE_SIZE);
           SPI_SELECT(priv->spi, SPIDEV_FLASH, false);
diff --git a/drivers/mtd/filemtd.c b/drivers/mtd/filemtd.c
index c1cd14fc6b..5eb2963eab 100644
--- a/drivers/mtd/filemtd.c
+++ b/drivers/mtd/filemtd.c
@@ -498,7 +498,7 @@ FAR struct mtd_dev_s *filemtd_initialize(FAR const char *path, size_t offset,
   priv = (FAR struct file_dev_s *)kmm_zalloc(sizeof(struct file_dev_s));
   if (!priv)
     {
-      ferr("Failed to allocate the FILE MTD state structure\n");
+      ferr("ERROR: Failed to allocate the FILE MTD state structure\n");
       return NULL;
     }
 
@@ -514,7 +514,7 @@ FAR struct mtd_dev_s *filemtd_initialize(FAR const char *path, size_t offset,
   ret = stat(path, &sb);
   if (ret < 0)
     {
-      err("Failed to stat %s: %d\n", path, get_errno());
+      err("ERROR: Failed to stat %s: %d\n", path, get_errno());
       return NULL;
     }
 
@@ -525,7 +525,7 @@ FAR struct mtd_dev_s *filemtd_initialize(FAR const char *path, size_t offset,
   priv->fd = open(path, mode);
   if (priv->fd == -1)
     {
-      ferr("Failed to open the FILE MTD file %s\n", path);
+      ferr("ERROR: Failed to open the FILE MTD file %s\n", path);
       kmm_free(priv);
       return NULL;
     }
@@ -557,7 +557,7 @@ FAR struct mtd_dev_s *filemtd_initialize(FAR const char *path, size_t offset,
   nblocks = (filelen - offset) / priv->erasesize;
   if (nblocks < 3)
     {
-      ferr("Need to provide at least three full erase block\n");
+      ferr("ERROR: Need to provide at least three full erase block\n");
       kmm_free(priv);
       return NULL;
     }
diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c
index fc11d3cc65..7fa0c5f4a0 100644
--- a/drivers/mtd/ftl.c
+++ b/drivers/mtd/ftl.c
@@ -168,7 +168,7 @@ static ssize_t ftl_reload(FAR void *priv, FAR uint8_t *buffer,
   nread   = MTD_BREAD(dev->mtd, startblock, nblocks, buffer);
   if (nread != nblocks)
     {
-      ferr("Read %d blocks starting at block %d failed: %d\n",
+      ferr("ERROR: Read %d blocks starting at block %d failed: %d\n",
             nblocks, startblock, nread);
     }
 
@@ -244,7 +244,7 @@ static ssize_t ftl_flush(FAR void *priv, FAR const uint8_t *buffer,
       nxfrd   = MTD_BREAD(dev->mtd, rwblock, dev->blkper, dev->eblock);
       if (nxfrd != dev->blkper)
         {
-          ferr("Read erase block %d failed: %d\n", rwblock, nxfrd);
+          ferr("ERROR: Read erase block %d failed: %d\n", rwblock, nxfrd);
           return -EIO;
         }
 
@@ -254,7 +254,7 @@ static ssize_t ftl_flush(FAR void *priv, FAR const uint8_t *buffer,
       ret        = MTD_ERASE(dev->mtd, eraseblock, 1);
       if (ret < 0)
         {
-          ferr("Erase block=%d failed: %d\n", eraseblock, ret);
+          ferr("ERROR: Erase block=%d failed: %d\n", eraseblock, ret);
           return ret;
         }
 
@@ -281,7 +281,7 @@ static ssize_t ftl_flush(FAR void *priv, FAR const uint8_t *buffer,
       nxfrd = MTD_BWRITE(dev->mtd, rwblock, dev->blkper, dev->eblock);
       if (nxfrd != dev->blkper)
         {
-          ferr("Write erase block %d failed: %d\n", rwblock, nxfrd);
+          ferr("ERROR: Write erase block %d failed: %d\n", rwblock, nxfrd);
           return -EIO;
         }
 
@@ -309,7 +309,7 @@ static ssize_t ftl_flush(FAR void *priv, FAR const uint8_t *buffer,
       ret        = MTD_ERASE(dev->mtd, eraseblock, 1);
       if (ret < 0)
         {
-          ferr("Erase block=%d failed: %d\n", eraseblock, ret);
+          ferr("ERROR: Erase block=%d failed: %d\n", eraseblock, ret);
           return ret;
         }
 
@@ -321,7 +321,7 @@ static ssize_t ftl_flush(FAR void *priv, FAR const uint8_t *buffer,
       nxfrd = MTD_BWRITE(dev->mtd, alignedblock, dev->blkper, buffer);
       if (nxfrd != dev->blkper)
         {
-          ferr("Write erase block %d failed: %d\n", alignedblock, nxfrd);
+          ferr("ERROR: Write erase block %d failed: %d\n", alignedblock, nxfrd);
           return -EIO;
         }
 
@@ -341,7 +341,7 @@ static ssize_t ftl_flush(FAR void *priv, FAR const uint8_t *buffer,
      nxfrd = MTD_BREAD(dev->mtd, alignedblock, dev->blkper, dev->eblock);
       if (nxfrd != dev->blkper)
         {
-          ferr("Read erase block %d failed: %d\n", alignedblock, nxfrd);
+          ferr("ERROR: Read erase block %d failed: %d\n", alignedblock, nxfrd);
           return -EIO;
         }
 
@@ -351,7 +351,7 @@ static ssize_t ftl_flush(FAR void *priv, FAR const uint8_t *buffer,
       ret        = MTD_ERASE(dev->mtd, eraseblock, 1);
       if (ret < 0)
         {
-          ferr("Erase block=%d failed: %d\n", eraseblock, ret);
+          ferr("ERROR: Erase block=%d failed: %d\n", eraseblock, ret);
           return ret;
         }
 
@@ -367,7 +367,7 @@ static ssize_t ftl_flush(FAR void *priv, FAR const uint8_t *buffer,
       nxfrd = MTD_BWRITE(dev->mtd, alignedblock, dev->blkper, dev->eblock);
       if (nxfrd != dev->blkper)
         {
-          ferr("Write erase block %d failed: %d\n", alignedblock, nxfrd);
+          ferr("ERROR: Write erase block %d failed: %d\n", alignedblock, nxfrd);
           return -EIO;
         }
     }
@@ -543,7 +543,7 @@ int ftl_initialize(int minor, FAR struct mtd_dev_s *mtd)
       ret = MTD_IOCTL(mtd, MTDIOC_GEOMETRY, (unsigned long)((uintptr_t)&dev->geo));
       if (ret < 0)
         {
-          ferr("MTD ioctl(MTDIOC_GEOMETRY) failed: %d\n", ret);
+          ferr("ERROR: MTD ioctl(MTDIOC_GEOMETRY) failed: %d\n", ret);
           kmm_free(dev);
           return ret;
         }
@@ -554,7 +554,7 @@ int ftl_initialize(int minor, FAR struct mtd_dev_s *mtd)
       dev->eblock  = (FAR uint8_t *)kmm_malloc(dev->geo.erasesize);
       if (!dev->eblock)
         {
-          ferr("Failed to allocate an erase block buffer\n");
+          ferr("ERROR: Failed to allocate an erase block buffer\n");
           kmm_free(dev);
           return -ENOMEM;
         }
@@ -585,7 +585,7 @@ int ftl_initialize(int minor, FAR struct mtd_dev_s *mtd)
       ret = rwb_initialize(&dev->rwb);
       if (ret < 0)
         {
-          ferr("rwb_initialize failed: %d\n", ret);
+          ferr("ERROR: rwb_initialize failed: %d\n", ret);
           kmm_free(dev);
           return ret;
         }
@@ -600,7 +600,7 @@ int ftl_initialize(int minor, FAR struct mtd_dev_s *mtd)
       ret = register_blockdriver(devname, &g_bops, 0, dev);
       if (ret < 0)
         {
-          ferr("register_blockdriver failed: %d\n", -ret);
+          ferr("ERROR: register_blockdriver failed: %d\n", -ret);
           kmm_free(dev);
         }
     }
diff --git a/drivers/mtd/hamming.c b/drivers/mtd/hamming.c
index 4ea0c81bfa..95d192db11 100644
--- a/drivers/mtd/hamming.c
+++ b/drivers/mtd/hamming.c
@@ -333,7 +333,7 @@ static int hamming_verify256(FAR uint8_t *data, FAR const uint8_t *original)
 
       /* Correct bit */
 
-      ferr("Correcting byte %d at bit %d\n", byte, bit);
+      finfo("Correcting byte %d at bit %d\n", byte, bit);
       data[byte] ^= (1 << bit);
 
       return HAMMING_ERROR_SINGLEBIT;
diff --git a/drivers/mtd/is25xp.c b/drivers/mtd/is25xp.c
index 1c4279ba86..2228f760b0 100644
--- a/drivers/mtd/is25xp.c
+++ b/drivers/mtd/is25xp.c
@@ -976,7 +976,7 @@ FAR struct mtd_dev_s *is25xp_initialize(FAR struct spi_dev_s *dev)
         {
           /* Unrecognized! Discard all of that work we just did and return NULL */
 
-          ferr("Unrecognized\n");
+          ferr("ERROR: Unrecognized\n");
           kmm_free(priv);
           priv = NULL;
         }
diff --git a/drivers/mtd/m25px.c b/drivers/mtd/m25px.c
index addfd85f49..eb2cade8ee 100644
--- a/drivers/mtd/m25px.c
+++ b/drivers/mtd/m25px.c
@@ -1031,7 +1031,7 @@ FAR struct mtd_dev_s *m25p_initialize(FAR struct spi_dev_s *dev)
         {
           /* Unrecognized! Discard all of that work we just did and return NULL */
 
-          ferr("Unrecognized\n");
+          ferr("ERROR: Unrecognized\n");
           kmm_free(priv);
           priv = NULL;
         }
diff --git a/drivers/mtd/mtd_config.c b/drivers/mtd/mtd_config.c
index 5c021c54dc..6bfe0d7fc6 100644
--- a/drivers/mtd/mtd_config.c
+++ b/drivers/mtd/mtd_config.c
@@ -1353,7 +1353,7 @@ int mtdconfig_register(FAR struct mtd_dev_s *mtd)
       ret = MTD_IOCTL(mtd, MTDIOC_GEOMETRY, (unsigned long)((uintptr_t)&geo));
       if (ret < 0)
         {
-          ferr("MTD ioctl(MTDIOC_GEOMETRY) failed: %d\n", ret);
+          ferr("ERROR: MTD ioctl(MTDIOC_GEOMETRY) failed: %d\n", ret);
           kmm_free(dev);
           goto errout;
         }
diff --git a/drivers/mtd/mtd_nand.c b/drivers/mtd/mtd_nand.c
index 826513939b..b5872e6854 100644
--- a/drivers/mtd/mtd_nand.c
+++ b/drivers/mtd/mtd_nand.c
@@ -153,7 +153,7 @@ static int nand_lock(FAR struct nand_dev_s *nand)
       errcode = errno;
       DEBUGASSERT(errcode != OK);
 
-      ferr("sem_wait failed: %d\n", errcode);
+      ferr("ERROR: sem_wait failed: %d\n", errcode);
       return -errcode;
     }
 
@@ -574,7 +574,7 @@ static int nand_erase(struct mtd_dev_s *dev, off_t startblock,
       ret = nand_eraseblock(nand, startblock, false);
       if (ret < 0)
         {
-          ferr("nand_eraseblock failed on block %ld: %d\n",
+          ferr("ERROR: nand_eraseblock failed on block %ld: %d\n",
                (long)startblock, ret);
           nand_unlock(nand);
           return ret;
diff --git a/drivers/mtd/rammtd.c b/drivers/mtd/rammtd.c
index 1e6c7c0fc7..46abf5fde2 100644
--- a/drivers/mtd/rammtd.c
+++ b/drivers/mtd/rammtd.c
@@ -446,7 +446,7 @@ FAR struct mtd_dev_s *rammtd_initialize(FAR uint8_t *start, size_t size)
   priv = (FAR struct ram_dev_s *)kmm_zalloc(sizeof(struct ram_dev_s));
   if (!priv)
     {
-      ferr("Failed to allocate the RAM MTD state structure\n");
+      ferr("ERROR: Failed to allocate the RAM MTD state structure\n");
       return NULL;
     }
 
@@ -455,7 +455,7 @@ FAR struct mtd_dev_s *rammtd_initialize(FAR uint8_t *start, size_t size)
   nblocks = size / CONFIG_RAMMTD_ERASESIZE;
   if (nblocks < 1)
     {
-      ferr("Need to provide at least one full erase block\n");
+      ferr("ERROR: Need to provide at least one full erase block\n");
       return NULL;
     }
 
diff --git a/drivers/mtd/ramtron.c b/drivers/mtd/ramtron.c
index 5784dc1622..a81469f92e 100644
--- a/drivers/mtd/ramtron.c
+++ b/drivers/mtd/ramtron.c
@@ -476,7 +476,7 @@ static int ramtron_waitwritecomplete(struct ramtron_dev_s *priv)
     }
   else
     {
-      ferr("timeout waiting for write completion\n");
+      ferr("ERROR: timeout waiting for write completion\n");
       retries = -EAGAIN;
     }
 
@@ -694,7 +694,7 @@ static ssize_t ramtron_read(FAR struct mtd_dev_s *dev, off_t offset, size_t nbyt
   status = SPI_SEND(priv->dev, RAMTRON_DUMMY);
   if ((status & ~RAMTRON_SR_SRWD) == 0)
     {
-      ferr("read status failed - got 0x%02x\n", (unsigned)status);
+      ferr("ERROR: read status failed - got 0x%02x\n", (unsigned)status);
       nbytes = -EIO;
     }
 #endif
diff --git a/drivers/mtd/sector512.c b/drivers/mtd/sector512.c
index 57cceabd0b..56e07c8c6a 100644
--- a/drivers/mtd/sector512.c
+++ b/drivers/mtd/sector512.c
@@ -629,7 +629,7 @@ FAR struct mtd_dev_s *s512_initialize(FAR struct mtd_dev_s *mtd)
         {
           /* Allocation failed! Discard all of that work we just did and return NULL */
 
-          ferr("Allocation failed\n");
+          ferr("ERROR: Allocation failed\n");
           kmm_free(priv);
           priv = NULL;
         }
diff --git a/drivers/mtd/smart.c b/drivers/mtd/smart.c
index 9ad4a342b7..050b38a9fc 100644
--- a/drivers/mtd/smart.c
+++ b/drivers/mtd/smart.c
@@ -493,7 +493,7 @@ FAR static void *smart_malloc(FAR struct smart_struct_s *dev,
         }
     }
 
-  ferr("SMART alloc: %ld\n", dev->bytesalloc);
+  finfo("SMART alloc: %ld\n", dev->bytesalloc);
   return ret;
 }
 #endif
@@ -672,12 +672,12 @@ int smart_checkfree(FAR struct smart_struct_s *dev, int lineno)
 #ifdef CONFIG_DEBUG_FS
   if (freecount != dev->freesectors)
     {
-      ferr("Free count incorrect in line %d!  Calculated=%d, dev->freesectors=%d\n",
+      fwarn("WARNING: Free count incorrect in line %d!  Calculated=%d, dev->freesectors=%d\n",
            lineno, freecount, dev->freesectors);
 
       /* Determine what changed from the last time which caused this error */
 
-      ferr("   ... Prev freesectors=%d, prev releasesectors=%d\n",
+      fwarn("   ... Prev freesectors=%d, prev releasesectors=%d\n",
            prev_freesectors, prev_releasesectors);
 
       if (prev_freecount)
@@ -695,7 +695,7 @@ int smart_checkfree(FAR struct smart_struct_s *dev, int lineno)
                 {
                   /* This block's values are different from the last time ... report it */
 
-                  ferr("   ... Block %d:  Old Free=%d, old release=%d,    New free=%d, new release = %d\n",
+                  fwarn("   ... Block %d:  Old Free=%d, old release=%d,    New free=%d, new release = %d\n",
                       x, prev_freecount[x], prev_releasecount[x], blockfree, blockrelease);
                 }
             }
@@ -771,7 +771,7 @@ static ssize_t smart_reload(struct smart_struct_s *dev, FAR uint8_t *buffer,
   nread = MTD_BREAD(dev->mtd, mtdStartBlock, mtdBlocks, buffer);
   if (nread != mtdBlocks)
     {
-      ferr("Read %d blocks starting at block %d failed: %d\n",
+      ferr("ERROR: Read %d blocks starting at block %d failed: %d\n",
            nblocks, startblock, nread);
     }
 
@@ -873,7 +873,7 @@ static ssize_t smart_write(FAR struct inode *inode,
           ret = MTD_ERASE(dev->mtd, eraseblock, 1);
           if (ret < 0)
             {
-              ferr("Erase block=%d failed: %d\n", eraseblock, ret);
+              ferr("ERROR: Erase block=%d failed: %d\n", eraseblock, ret);
 
               /* Unlock the mutex if we add one */
 
@@ -896,13 +896,13 @@ static ssize_t smart_write(FAR struct inode *inode,
 
       /* Try to write to the sector. */
 
-      ferr("Write MTD block %d from offset %d\n", nextblock, offset);
+      finfo("Write MTD block %d from offset %d\n", nextblock, offset);
       nxfrd = MTD_BWRITE(dev->mtd, nextblock, blkstowrite, &buffer[offset]);
       if (nxfrd != blkstowrite)
         {
           /* The block is not empty!!  What to do? */
 
-          ferr("Write block %d failed: %d.\n", nextblock, nxfrd);
+          ferr("ERROR: Write block %d failed: %d.\n", nextblock, nxfrd);
 
           /* Unlock the mutex if we add one */
 
@@ -1001,7 +1001,7 @@ static int smart_setsectorsize(FAR struct smart_struct_s *dev, uint16_t size)
 
   if (erasesize / dev->sectorsize > 256)
     {
-      /* We can't throw a err message here becasue it is too early.
+      /* We can't throw a error message here becasue it is too early.
        * set the erasesize to zero and exit, then we will detect
        * it during mksmartfs or mount.
        */
@@ -1079,7 +1079,7 @@ static int smart_setsectorsize(FAR struct smart_struct_s *dev, uint16_t size)
 
   if (totalsectors > 65536)
     {
-      err("Invalid SMART sector count %ld\n", totalsectors);
+      ferr("ERROR: Invalid SMART sector count %ld\n", totalsectors);
       return -EINVAL;
     }
   else if (totalsectors == 65536)
@@ -1099,7 +1099,7 @@ static int smart_setsectorsize(FAR struct smart_struct_s *dev, uint16_t size)
               allocsize, "Sector map");
   if (!dev->sMap)
     {
-      ferr("Error allocating SMART virtual map buffer\n");
+      ferr("ERROR: Error allocating SMART virtual map buffer\n");
       goto errexit;
     }
 
@@ -1109,7 +1109,7 @@ static int smart_setsectorsize(FAR struct smart_struct_s *dev, uint16_t size)
   dev->sBitMap = (FAR uint8_t *) smart_malloc(dev, (totalsectors+7) >> 3, "Sector Bitmap");
   if (dev->sBitMap == NULL)
     {
-      ferr("Error allocating SMART sector cache\n");
+      ferr("ERROR: Error allocating SMART sector cache\n");
       goto errexit;
     }
 
@@ -1144,7 +1144,7 @@ static int smart_setsectorsize(FAR struct smart_struct_s *dev, uint16_t size)
 
   if (!dev->sCache)
     {
-      ferr("Error allocating SMART sector cache\n");
+      ferr("ERROR: Error allocating SMART sector cache\n");
       goto errexit;
     }
 
@@ -1181,7 +1181,7 @@ static int smart_setsectorsize(FAR struct smart_struct_s *dev, uint16_t size)
 
   if (!dev->erasecounts)
     {
-      ferr("Error allocating erase count array\n");
+      ferr("ERROR: Error allocating erase count array\n");
       goto errexit;
     }
 
@@ -1195,7 +1195,7 @@ static int smart_setsectorsize(FAR struct smart_struct_s *dev, uint16_t size)
       SMART_WEAR_BIT_DIVIDE, "Wear status");
   if (!dev->wearstatus)
     {
-      ferr("Error allocating wear level status array\n");
+      ferr("ERROR: Error allocating wear level status array\n");
       goto errexit;
     }
 
@@ -1210,7 +1210,7 @@ static int smart_setsectorsize(FAR struct smart_struct_s *dev, uint16_t size)
   dev->rwbuffer = (FAR char *) smart_malloc(dev, size, "RW Buffer");
   if (!dev->rwbuffer)
     {
-      ferr("Error allocating SMART read/write buffer\n");
+      ferr("ERROR: Error allocating SMART read/write buffer\n");
       goto errexit;
     }
 
@@ -1304,7 +1304,7 @@ static ssize_t smart_bytewrite(FAR struct smart_struct_s *dev, size_t offset,
       ret = MTD_BREAD(dev->mtd, startblock, nblocks, (FAR uint8_t *) dev->rwbuffer);
       if (ret < 0)
         {
-          ferr("Error %d reading from device\n", -ret);
+          ferr("ERROR: Error %d reading from device\n", -ret);
           goto errout;
         }
 
@@ -1317,7 +1317,7 @@ static ssize_t smart_bytewrite(FAR struct smart_struct_s *dev, size_t offset,
       ret = MTD_BWRITE(dev->mtd, startblock, nblocks, (FAR uint8_t *) dev->rwbuffer);
       if (ret < 0)
         {
-          ferr("Error %d writing to device\n", -ret);
+          ferr("ERROR: Error %d writing to device\n", -ret);
           goto errout;
         }
     }
@@ -1712,7 +1712,7 @@ static int smart_set_wear_level(FAR struct smart_struct_s *dev, uint16_t block,
 
   if (level > 15)
     {
-      err("Fatal Design Error!  Wear level > 15, block=%d\n", block);
+      err("ERROR: Fatal Design Error!  Wear level > 15, block=%d\n", block);
 
       /* This is a design flaw, but we still allow processing, otherwise we
        * will corrupt the volume.  It's better to have a few blocks that are
@@ -1984,7 +1984,7 @@ static int smart_scan(FAR struct smart_struct_s *dev)
         {
           /* Error in logical sector read from the MTD device */
 
-          ferr("Invalid logical sector %d at physical %d.\n",
+          ferr("ERROR: Invalid logical sector %d at physical %d.\n",
                logicalsector, sector);
           continue;
         }
@@ -2001,7 +2001,7 @@ static int smart_scan(FAR struct smart_struct_s *dev)
                          (FAR uint8_t *)dev->rwbuffer);
           if (ret != 32)
             {
-              ferr("Error reading physical sector %d.\n", sector);
+              ferr("ERROR: Error reading physical sector %d.\n", sector);
               goto err_out;
             }
 
@@ -2053,7 +2053,7 @@ static int smart_scan(FAR struct smart_struct_s *dev)
                 smart_malloc(dev, sizeof(*rootdirdev), "Root Dir");
               if (rootdirdev == NULL)
                 {
-                  ferr("Memory alloc failed\n");
+                  ferr("ERROR: Memory alloc failed\n");
                   ret = -ENOMEM;
                   goto err_out;
                 }
@@ -2221,7 +2221,7 @@ static int smart_scan(FAR struct smart_struct_s *dev)
           ret = smart_bytewrite(dev, offset, 1, &header.status);
           if (ret < 0)
             {
-              ferr("Error %d releasing duplicate sector\n", -ret);
+              ferr("ERROR: Error %d releasing duplicate sector\n", -ret);
               goto err_out;
             }
         }
@@ -2267,7 +2267,7 @@ static int smart_scan(FAR struct smart_struct_s *dev)
               dev->mtdBlksPerSector, (uint8_t *) dev->rwbuffer);
       if (ret != dev->mtdBlksPerSector)
         {
-          ferr("Error reading physical sector %d.\n", sector);
+          ferr("ERROR: Error reading physical sector %d.\n", sector);
           goto err_out;
         }
 
@@ -2284,7 +2284,7 @@ static int smart_scan(FAR struct smart_struct_s *dev)
             {
               /* Unable to find a free sector!!! */
 
-              ferr("Can't find a free sector for relocation\n");
+              ferr("ERROR: Can't find a free sector for relocation\n");
               ret = -ENOSPC;
               goto err_out;
             }
@@ -2321,29 +2321,29 @@ static int smart_scan(FAR struct smart_struct_s *dev)
   smart_read_wearstatus(dev);
 #endif
 
-  ferr("SMART Scan\n");
-  ferr("   Erase size:   %10d\n", dev->sectorsPerBlk * dev->sectorsize);
-  ferr("   Erase count:  %10d\n", dev->neraseblocks);
-  ferr("   Sect/block:   %10d\n", dev->sectorsPerBlk);
-  ferr("   MTD Blk/Sect: %10d\n", dev->mtdBlksPerSector);
+  finfo("SMART Scan\n");
+  finfo("   Erase size:   %10d\n", dev->sectorsPerBlk * dev->sectorsize);
+  finfo("   Erase count:  %10d\n", dev->neraseblocks);
+  finfo("   Sect/block:   %10d\n", dev->sectorsPerBlk);
+  finfo("   MTD Blk/Sect: %10d\n", dev->mtdBlksPerSector);
 
   /* Validate the geometry */
 
   if (dev->mtdBlksPerSector == 0 || dev->sectorsPerBlk == 0 ||
       dev->sectorsPerBlk == 0 || dev->sectorsize == 0)
     {
-      ferr("Invalid Geometry!\n");
+      ferr("ERROR: Invalid Geometry!\n");
       ret = -EINVAL;
       goto err_out;
     }
 
 #ifdef CONFIG_MTD_SMART_ALLOC_DEBUG
-  ferr("   Allocations:\n");
+  finfo("   Allocations:\n");
   for (sector = 0; sector < SMART_MAX_ALLOCS; sector++)
     {
       if (dev->alloc[sector].ptr != NULL)
         {
-          ferr("       %s: %d\n", dev->alloc[sector].name, dev->alloc[sector].size);
+          finfo("       %s: %d\n", dev->alloc[sector].name, dev->alloc[sector].size);
         }
     }
 #endif
@@ -2515,7 +2515,7 @@ static void smart_erase_block_if_empty(FAR struct smart_struct_s *dev,
 #ifdef CONFIG_SMART_LOCAL_CHECKFREE
       if (smart_checkfree(dev, __LINE__) != OK)
         {
-          ferr("   ...while eraseing block %d\n", block);
+          fwarn("   ...while eraseing block %d\n", block);
         }
 #endif
     }
@@ -2554,7 +2554,7 @@ static int smart_relocate_static_data(FAR struct smart_struct_s *dev, uint16_t b
 #ifdef CONFIG_SMART_LOCAL_CHECKFREE
   if (smart_checkfree(dev, __LINE__) != OK)
     {
-      ferr("   ...about to relocate static data %d\n", block);
+      fwarn("   ...about to relocate static data %d\n", block);
     }
 #endif
 
@@ -2645,7 +2645,7 @@ static int smart_relocate_static_data(FAR struct smart_struct_s *dev, uint16_t b
               dev->mtdBlksPerSector, (FAR uint8_t *) dev->rwbuffer);
           if (ret != dev->mtdBlksPerSector)
             {
-              ferr("Error reading sector %d\n", sector);
+              ferr("ERROR: Error reading sector %d\n", sector);
               ret = -EIO;
               goto errout;
             }
@@ -2681,7 +2681,7 @@ static int smart_relocate_static_data(FAR struct smart_struct_s *dev, uint16_t b
                 {
                   /* Unable to find a free sector!!! */
 
-                  ferr("Can't find a free sector for relocation\n");
+                  ferr("ERROR: Can't find a free sector for relocation\n");
                   ret = -ENOSPC;
                   goto errout;
                 }
@@ -2736,7 +2736,7 @@ static int smart_relocate_static_data(FAR struct smart_struct_s *dev, uint16_t b
 #ifdef CONFIG_SMART_LOCAL_CHECKFREE
       if (smart_checkfree(dev, __LINE__) != OK)
         {
-          ferr("   ...about to erase static block %d\n", block);
+          fwarn("   ...about to erase static block %d\n", block);
         }
 #endif
 
@@ -2748,7 +2748,7 @@ static int smart_relocate_static_data(FAR struct smart_struct_s *dev, uint16_t b
 #ifdef CONFIG_SMART_LOCAL_CHECKFREE
   if (smart_checkfree(dev, __LINE__) != OK)
     {
-      ferr("   ...done erasing static block %d\n", block);
+      fwarn("   ...done erasing static block %d\n", block);
     }
 #endif
 
@@ -2862,10 +2862,10 @@ static inline int smart_llformat(FAR struct smart_struct_s *dev, unsigned long a
     {
       dev->erasesize = dev->geo.erasesize;
 
-      err("ERROR:  Invalid geometery ... Sectors per erase block must be 1-256\n");
-      err("        Erase block size    = %d\n", dev->erasesize);
-      err("        Sector size         = %d\n", dev->sectorsize);
-      err("        Sectors/erase block = %d\n", dev->erasesize / dev->sectorsize);
+      ferr("ERROR:  Invalid geometery ... Sectors per erase block must be 1-256\n");
+      ferr("        Erase block size    = %d\n", dev->erasesize);
+      ferr("        Sector size         = %d\n", dev->sectorsize);
+      ferr("        Sectors/erase block = %d\n", dev->erasesize / dev->sectorsize);
 
       return -EINVAL;
     }
@@ -2951,7 +2951,7 @@ static inline int smart_llformat(FAR struct smart_struct_s *dev, unsigned long a
     {
       /* The block is not empty!!  What to do? */
 
-      ferr("Write block 0 failed: %d.\n", wrcount);
+      ferr("ERROR: Write block 0 failed: %d.\n", wrcount);
 
       /* Unlock the mutex if we add one */
 
@@ -3132,7 +3132,7 @@ static int smart_relocate_sector(FAR struct smart_struct_s *dev,
   ret = smart_bytewrite(dev, offset, 1, &newstatus);
   if (ret < 0)
     {
-      ferr("Error %d committing new sector %d\n" -ret, newsector);
+      ferr("ERROR: Error %d committing new sector %d\n" -ret, newsector);
       goto errout;
     }
 #endif  /* CONFIG_MTD_SMART_ENABLE_CRC */
@@ -3149,7 +3149,7 @@ static int smart_relocate_sector(FAR struct smart_struct_s *dev,
   ret = smart_bytewrite(dev, offset, 1, &newstatus);
   if (ret < 0)
     {
-      ferr("Error %d releasing old sector %d\n" -ret, oldsector);
+      ferr("ERROR: Error %d releasing old sector %d\n" -ret, oldsector);
     }
 
 #ifndef CONFIG_MTD_SMART_ENABLE_CRC
@@ -3193,7 +3193,7 @@ static int smart_relocate_block(FAR struct smart_struct_s *dev, uint16_t block)
 #ifdef CONFIG_SMART_LOCAL_CHECKFREE
   if (smart_checkfree(dev, __LINE__) != OK)
     {
-      ferr("   ...while relocating block %d, free=%d\n", block, dev->freesectors);
+      fwarn("   ...while relocating block %d, free=%d\n", block, dev->freesectors);
     }
 #endif
 
@@ -3210,7 +3210,7 @@ static int smart_relocate_block(FAR struct smart_struct_s *dev, uint16_t block)
 
   if (freecount >= dev->freesectors)
     {
-      ferr("Program bug!  Relocating the only block (%d) with free sectors!\n",
+      ferr("ERROR: Program bug!  Relocating the only block (%d) with free sectors!\n",
            block);
       ret = -EIO;
       goto errout;
@@ -3240,7 +3240,7 @@ static int smart_relocate_block(FAR struct smart_struct_s *dev, uint16_t block)
           dev->mtdBlksPerSector, (FAR uint8_t *) dev->rwbuffer);
       if (ret != dev->mtdBlksPerSector)
         {
-          ferr("Error reading sector %d\n", x);
+          ferr("ERROR: Error reading sector %d\n", x);
           ret = -EIO;
           goto errout;
         }
@@ -3271,7 +3271,7 @@ static int smart_relocate_block(FAR struct smart_struct_s *dev, uint16_t block)
             {
               /* Unable to find a free sector!!! */
 
-              ferr("Can't find a free sector for relocation\n");
+              ferr("ERROR: Can't find a free sector for relocation\n");
               ret = -ENOSPC;
               goto errout;
             }
@@ -3303,7 +3303,7 @@ static int smart_relocate_block(FAR struct smart_struct_s *dev, uint16_t block)
             {
               /* Unable to find a free sector!!! */
 
-              ferr("Can't find a free sector for relocation\n");
+              ferr("ERROR: Can't find a free sector for relocation\n");
               ret = -ENOSPC;
               goto errout;
             }
@@ -3383,8 +3383,8 @@ static int smart_relocate_block(FAR struct smart_struct_s *dev, uint16_t block)
 #ifdef CONFIG_SMART_LOCAL_CHECKFREE
   if (smart_checkfree(dev, __LINE__) != OK)
     {
-      ferr("   ...while relocating block %d, free=%d, release=%d, oldrelease=%d\n",
-           block, freecount, releasecount, oldrelease);
+      fwarn("   ...while relocating block %d, free=%d, release=%d, oldrelease=%d\n",
+            block, freecount, releasecount, oldrelease);
     }
 #endif
 
@@ -3533,7 +3533,7 @@ retry:
                 {
                   if (smart_relocate_block(dev, block) < 0)
                     {
-                      ferr("Error relocating block while finding free phys sector\n");
+                      ferr("ERROR: Error relocating block while finding free phys sector\n");
                       return -1;
                     }
 
@@ -3566,7 +3566,7 @@ retry:
 #endif
 
       {
-        err("Program bug!  Expected a free sector, free=%d\n", dev->freesectors);
+        ferr("ERROR: Program bug!  Expected a free sector, free=%d\n", dev->freesectors);
         for (x = 0; x < dev->neraseblocks; x++)
           {
             printf("%d ", dev->freecount[x]);
@@ -3620,7 +3620,7 @@ retry:
               (FAR uint8_t *) &header);
       if (ret != sizeof(struct smart_sect_header_s))
         {
-          ferr("Error reading phys sector %d\n", physicalsector);
+          ferr("ERROR: Error reading phys sector %d\n", physicalsector);
           return -1;
         }
 
@@ -3641,12 +3641,12 @@ retry:
 
   if (physicalsector == 0xFFFF)
     {
-      err("Program bug!  Expected a free sector\n");
+      ferr("ERROR: Program bug!  Expected a free sector\n");
     }
 
   if (physicalsector >= dev->totalsectors)
     {
-      err("Program bug!  Selected sector too big!!!\n");
+      ferr("ERROR: Program bug!  Selected sector too big!!!\n");
     }
 
   return physicalsector;
@@ -3742,7 +3742,7 @@ static int smart_garbagecollect(FAR struct smart_struct_s *dev)
 #ifdef CONFIG_SMART_LOCAL_CHECKFREE
           if (smart_checkfree(dev, __LINE__) != OK)
             {
-              ferr("   ...before collecting block %d\n", collectblock);
+              fwarn("   ...before collecting block %d\n", collectblock);
             }
 #endif
 
@@ -3763,7 +3763,7 @@ static int smart_garbagecollect(FAR struct smart_struct_s *dev)
 #ifdef CONFIG_SMART_LOCAL_CHECKFREE
           if (smart_checkfree(dev, __LINE__) != OK)
             {
-              ferr("   ...while collecting block %d\n", collectblock);
+              fwarn("   ...while collecting block %d\n", collectblock);
             }
 #endif
 
@@ -3876,7 +3876,8 @@ static int smart_write_wearstatus(struct smart_struct_s *dev)
           if (sector >= SMART_FIRST_DIR_SECTOR)
             {
               /* Error, wear status bit too large! */
-              ferr("Invalid geometry - wear level status too large\n");
+
+              ferr("ERROR: Invalid geometry - wear level status too large\n");
               ret = -EINVAL;
               goto errout;
             }
@@ -3987,7 +3988,7 @@ static inline int smart_read_wearstatus(FAR struct smart_struct_s *dev)
           ret = smart_allocsector(dev, sector);
           if (ret != sector)
             {
-              ferr("Unable to allocate wear level status sector %d\n", sector);
+              ferr("ERROR: Unable to allocate wear level status sector %d\n", sector);
               ret = -EINVAL;
               goto errout;
             }
@@ -4014,7 +4015,7 @@ static inline int smart_read_wearstatus(FAR struct smart_struct_s *dev)
             {
               /* Error, wear status bit too large! */
 
-              ferr("Invalid geometry - wear level status too large\n");
+              ferr("ERROR: Invalid geometry - wear level status too large\n");
               ret = -EINVAL;
               goto errout;
             }
@@ -4095,7 +4096,7 @@ static int smart_write_alloc_sector(FAR struct smart_struct_s *dev,
     {
       /* The block is not empty!!  What to do? */
 
-      ferr("Write block %d failed: %d.\n", physical *
+      ferr("ERROR: Write block %d failed: %d.\n", physical *
            dev->mtdBlksPerSector, ret);
 
       /* Unlock the mutex if we add one */
@@ -4200,7 +4201,7 @@ static int smart_writesector(FAR struct smart_struct_s *dev,
 
   if (req->logsector >= dev->totalsectors)
     {
-      ferr("Logical sector %d too large\n", req->logsector);
+      ferr("ERROR: Logical sector %d too large\n", req->logsector);
 
       ret = -EINVAL;
       goto errout;
@@ -4239,7 +4240,7 @@ static int smart_writesector(FAR struct smart_struct_s *dev,
 #endif
   if (physsector == 0xFFFF)
     {
-      ferr("Logical sector %d not allocated\n", req->logsector);
+      ferr("ERROR: Logical sector %d not allocated\n", req->logsector);
       ret = -EINVAL;
       goto errout;
     }
@@ -4251,7 +4252,7 @@ static int smart_writesector(FAR struct smart_struct_s *dev,
           dev->rwbuffer);
   if (ret != dev->mtdBlksPerSector)
     {
-      ferr("Error reading phys sector %d\n", physsector);
+      ferr("ERROR: Error reading phys sector %d\n", physsector);
       ret = -EIO;
       goto errout;
     }
@@ -4323,7 +4324,7 @@ static int smart_writesector(FAR struct smart_struct_s *dev,
       physsector = smart_findfreephyssector(dev, FALSE);
       if (physsector == 0xFFFF)
         {
-          ferr("Error relocating sector %d\n", req->logsector);
+          ferr("ERROR: Error relocating sector %d\n", req->logsector);
           ret = -EIO;
           goto errout;
         }
@@ -4443,7 +4444,7 @@ static int smart_writesector(FAR struct smart_struct_s *dev,
               dev->mtdBlksPerSector, (FAR uint8_t *) dev->rwbuffer);
       if (ret != dev->mtdBlksPerSector)
         {
-          ferr("Error writing to physical sector %d\n", physsector);
+          ferr("ERROR: Error writing to physical sector %d\n", physsector);
           ret = -EIO;
           goto errout;
         }
@@ -4527,7 +4528,7 @@ static int smart_writesector(FAR struct smart_struct_s *dev,
               dev->mtdBlksPerSector, (FAR uint8_t *) dev->rwbuffer);
       if (ret != dev->mtdBlksPerSector)
         {
-          ferr("Error writing to physical sector %d\n", physsector);
+          ferr("ERROR: Error writing to physical sector %d\n", physsector);
           ret = -EIO;
           goto errout;
         }
@@ -4547,7 +4548,7 @@ static int smart_writesector(FAR struct smart_struct_s *dev,
         {
           /* TODO: Mark this as a bad block! */
 
-          ferr("Error validating physical sector %d\n", physsector);
+          ferr("ERROR: Error validating physical sector %d\n", physsector);
           ret = -EIO;
           goto errout;
         }
@@ -4602,7 +4603,7 @@ static int smart_readsector(FAR struct smart_struct_s *dev,
 
   if (req->logsector >= dev->totalsectors)
     {
-      ferr("Logical sector %d too large\n", req->logsector);
+      ferr("ERROR: Logical sector %d too large\n", req->logsector);
 
       ret = -EINVAL;
       goto errout;
@@ -4615,7 +4616,7 @@ static int smart_readsector(FAR struct smart_struct_s *dev,
 #endif
   if (physsector == 0xFFFF)
     {
-      ferr("Logical sector %d not allocated\n", req->logsector);
+      ferr("ERROR: Logical sector %d not allocated\n", req->logsector);
       ret = -EINVAL;
       goto errout;
     }
@@ -4632,7 +4633,7 @@ static int smart_readsector(FAR struct smart_struct_s *dev,
     {
       /* TODO:  Mark the block bad */
 
-      ferr("Error reading phys sector %d\n", physsector);
+      ferr("ERROR: Error reading phys sector %d\n", physsector);
       ret = -EIO;
       goto errout;
     }
@@ -4657,7 +4658,7 @@ static int smart_readsector(FAR struct smart_struct_s *dev,
         {
           /* TODO: Mark the block bad */
 
-          ferr("Error validating sector %d CRC during read\n", physsector);
+          ferr("ERROR: Error validating sector %d CRC during read\n", physsector);
           ret = -EIO;
           goto errout;
         }
@@ -4677,7 +4678,7 @@ static int smart_readsector(FAR struct smart_struct_s *dev,
           sizeof(struct smart_sect_header_s), (FAR uint8_t *) &header);
   if (ret != sizeof(struct smart_sect_header_s))
     {
-      finfo("Error reading sector %d header\n", physsector);
+      finfo("ERROR: Error reading sector %d header\n", physsector);
       ret = -EIO;
       goto errout;
     }
@@ -4690,7 +4691,7 @@ static int smart_readsector(FAR struct smart_struct_s *dev,
     {
       /* Error in sector header! How do we handle this? */
 
-      ferr("Error in logical sector %d header, phys=%d\n",
+      ferr("ERROR: Error in logical sector %d header, phys=%d\n",
           req->logsector, physsector);
       ret = -EIO;
       goto errout;
@@ -4705,7 +4706,7 @@ static int smart_readsector(FAR struct smart_struct_s *dev,
           req->buffer);
   if (ret != req->count)
     {
-      ferr("Error reading phys sector %d\n", physsector);
+      ferr("ERROR: Error reading phys sector %d\n", physsector);
       ret = -EIO;
       goto errout;
     }
@@ -4873,7 +4874,7 @@ static inline int smart_allocsector(FAR struct smart_struct_s *dev,
        * bug in our code?
        */
 
-      ferr("No free logical sector numbers!  Free sectors = %d\n",
+      ferr("ERROR: No free logical sector numbers!  Free sectors = %d\n",
               dev->freesectors);
 
       return -EIO;
@@ -4907,7 +4908,7 @@ static inline int smart_allocsector(FAR struct smart_struct_s *dev,
       kmm_malloc(sizeof(struct smart_allocsector_s));
     if (allocsect == NULL)
       {
-        ferr("Out of memory allocting sector\n");
+        ferr("ERROR: Out of memory allocting sector\n");
         return -ENOMEM;
       }
 
@@ -4988,7 +4989,7 @@ static inline int smart_freesector(FAR struct smart_struct_s *dev,
       if (!(dev->sBitMap[logicalsector >> 3] & (1 << (logicalsector & 0x07))))
 #endif
         {
-          ferr("Invalid release - sector %d not allocated\n", logicalsector);
+          ferr("ERROR: Invalid release - sector %d not allocated\n", logicalsector);
           ret = -EINVAL;
           goto errout;
         }
@@ -5015,7 +5016,7 @@ static inline int smart_freesector(FAR struct smart_struct_s *dev,
     {
       /* Hmmm... something is wrong.  This should always match!  Bug in our code? */
 
-      ferr("Sector %d logical sector in header doesn't match\n", logicalsector);
+      ferr("ERROR: Sector %d logical sector in header doesn't match\n", logicalsector);
       ret = -EINVAL;
       goto errout;
     }
@@ -5034,7 +5035,7 @@ static inline int smart_freesector(FAR struct smart_struct_s *dev,
   ret = smart_bytewrite(dev, offset, 1, &header.status);
   if (ret != 1)
     {
-      ferr("Error updating physical sector %d status\n", physsector);
+      ferr("ERROR: Error updating physical sector %d status\n", physsector);
       goto errout;
     }
 
@@ -5228,7 +5229,7 @@ static int smart_ioctl(FAR struct inode *inode, int cmd, unsigned long arg)
         {
         case SMART_DEBUG_CMD_SET_DEBUG_LEVEL:
           dev->debuglevel = debug_data->debugdata;
-          err("Debug level set to %d\n", dev->debuglevel);
+          finfo("Debug level set to %d\n", dev->debuglevel);
 
           ret = OK;
           goto ok_out;
@@ -5314,7 +5315,7 @@ int smart_initialize(int minor, FAR struct mtd_dev_s *mtd, FAR const char *partn
       ret = MTD_IOCTL(mtd, MTDIOC_GEOMETRY, (unsigned long)((uintptr_t)&dev->geo));
       if (ret < 0)
         {
-          ferr("MTD ioctl(MTDIOC_GEOMETRY) failed: %d\n", ret);
+          ferr("ERROR: MTD ioctl(MTDIOC_GEOMETRY) failed: %d\n", ret);
           goto errout;
         }
 
@@ -5348,7 +5349,7 @@ int smart_initialize(int minor, FAR struct mtd_dev_s *mtd, FAR const char *partn
       totalsectors = dev->neraseblocks * dev->sectorsPerBlk;
       if (totalsectors > 65536)
         {
-          ferr("SMART Sector size too small for device\n");
+          ferr("ERROR: SMART Sector size too small for device\n");
           ret = -EINVAL;
           goto errout;
         }
@@ -5399,7 +5400,7 @@ int smart_initialize(int minor, FAR struct mtd_dev_s *mtd, FAR const char *partn
         smart_malloc(dev, sizeof(*rootdirdev), "Root Dir");
       if (rootdirdev == NULL)
         {
-          ferr("register_blockdriver failed: %d\n", -ret);
+          ferr("ERROR: register_blockdriver failed: %d\n", -ret);
           ret = -ENOMEM;
           goto errout;
         }
@@ -5427,7 +5428,7 @@ int smart_initialize(int minor, FAR struct mtd_dev_s *mtd, FAR const char *partn
 
       if (ret < 0)
         {
-          ferr("register_blockdriver failed: %d\n", -ret);
+          ferr("ERROR: register_blockdriver failed: %d\n", -ret);
           goto errout;
         }
 
@@ -5436,7 +5437,7 @@ int smart_initialize(int minor, FAR struct mtd_dev_s *mtd, FAR const char *partn
       ret = smart_scan(dev);
       if (ret < 0)
         {
-          ferr("smart_scan failed: %d\n", -ret);
+          ferr("ERROR: smart_scan failed: %d\n", -ret);
           goto errout;
         }
     }
@@ -5564,7 +5565,7 @@ static int smart_loteardown(FAR const char *devname)
   ret = open_blockdriver(devname, MS_RDONLY, &inode);
   if (ret < 0)
     {
-      err("Failed to open %s: %d\n", devname, -ret);
+      ferr("ERROR: Failed to open %s: %d\n", devname, -ret);
       return ret;
     }
 
@@ -5576,7 +5577,7 @@ static int smart_loteardown(FAR const char *devname)
 
   if (!filemtd_isfilemtd(dev->mtd))
     {
-      ferr("Device is not a SMART loop: %s\n", devname);
+      ferr("ERROR: Device is not a SMART loop: %s\n", devname);
       return -EINVAL;
     }
 
diff --git a/drivers/mtd/sst25.c b/drivers/mtd/sst25.c
index e079de8b93..89d21324aa 100644
--- a/drivers/mtd/sst25.c
+++ b/drivers/mtd/sst25.c
@@ -1206,7 +1206,7 @@ FAR struct mtd_dev_s *sst25_initialize(FAR struct spi_dev_s *dev)
         {
           /* Unrecognized! Discard all of that work we just did and return NULL */
 
-          ferr("Unrecognized\n");
+          ferr("ERROR: Unrecognized\n");
           kmm_free(priv);
           priv = NULL;
         }
@@ -1226,7 +1226,7 @@ FAR struct mtd_dev_s *sst25_initialize(FAR struct spi_dev_s *dev)
             {
               /* Allocation failed! Discard all of that work we just did and return NULL */
 
-              ferr("Allocation failed\n");
+              ferr("ERROR: Allocation failed\n");
               kmm_free(priv);
               priv = NULL;
             }
diff --git a/drivers/mtd/sst25xx.c b/drivers/mtd/sst25xx.c
index 202019fda3..4d30be50bb 100644
--- a/drivers/mtd/sst25xx.c
+++ b/drivers/mtd/sst25xx.c
@@ -954,7 +954,7 @@ FAR struct mtd_dev_s *sst25xx_initialize(FAR struct spi_dev_s *dev)
         {
           /* Unrecognized! Discard all of that work we just did and return NULL */
 
-          ferr("Unrecognized\n");
+          ferr("ERROR: Unrecognized\n");
           kmm_free(priv);
           priv = NULL;
         }
diff --git a/drivers/mtd/sst26.c b/drivers/mtd/sst26.c
index 4e31a592a0..4b70c0f285 100644
--- a/drivers/mtd/sst26.c
+++ b/drivers/mtd/sst26.c
@@ -340,8 +340,8 @@ static inline int sst26_readid(struct sst26_dev_s *priv)
   SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
   sst26_unlock(priv->dev);
 
-  llerr("manufacturer: %02x memory: %02x capacity: %02x\n",
-        manufacturer, memory, capacity);
+  llinfo("manufacturer: %02x memory: %02x capacity: %02x\n",
+         manufacturer, memory, capacity);
 
   /* Check for a valid manufacturer and memory type */
 
@@ -936,7 +936,7 @@ FAR struct mtd_dev_s *sst26_initialize_spi(FAR struct spi_dev_s *dev)
         {
           /* Unrecognized! Discard all of that work we just did and return NULL */
 
-          ssterr("Unrecognized\n");
+          ssterr("ERROR: Unrecognized\n");
           kmm_free(priv);
           priv = NULL;
         }
diff --git a/drivers/mtd/sst39vf.c b/drivers/mtd/sst39vf.c
index 2b5cbe9c6a..9329508845 100644
--- a/drivers/mtd/sst39vf.c
+++ b/drivers/mtd/sst39vf.c
@@ -819,7 +819,7 @@ FAR struct mtd_dev_s *sst39vf_initialize(void)
 
   if (manufacturer != SST_MANUFACTURER_ID)
     {
-      ferr("Unrecognized manufacturer: %02x\n", manufacturer);
+      ferr("ERROR: Unrecognized manufacturer: %02x\n", manufacturer);
       return NULL;
     }
   else if (chipid == g_sst39vf1601.chipid)
@@ -840,7 +840,7 @@ FAR struct mtd_dev_s *sst39vf_initialize(void)
     }
   else
     {
-      ferr("Unrecognized chip ID: %04x\n", chipid);
+      ferr("ERROR: Unrecognized chip ID: %04x\n", chipid);
       return NULL;
     }
 
diff --git a/drivers/mtd/w25.c b/drivers/mtd/w25.c
index 8dce926494..3559f8d6a5 100644
--- a/drivers/mtd/w25.c
+++ b/drivers/mtd/w25.c
@@ -1256,7 +1256,7 @@ FAR struct mtd_dev_s *w25_initialize(FAR struct spi_dev_s *spi)
         {
           /* Unrecognized! Discard all of that work we just did and return NULL */
 
-          ferr("Unrecognized\n");
+          ferr("ERROR: Unrecognized\n");
           kmm_free(priv);
           priv = NULL;
         }
@@ -1276,7 +1276,7 @@ FAR struct mtd_dev_s *w25_initialize(FAR struct spi_dev_s *spi)
             {
               /* Allocation failed! Discard all of that work we just did and return NULL */
 
-              ferr("Allocation failed\n");
+              ferr("ERROR: Allocation failed\n");
               kmm_free(priv);
               priv = NULL;
             }
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index 274c247ebb..59df81c60f 100644
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -704,7 +704,7 @@ static int cs89x0_interrupt(int irq, FAR void *context)
         case ISQ_BUFEVENT:
             if ((isq & ISQ_BUFEVENT_TXUNDERRUN) != 0)
               {
-                nerr("Transmit underrun\n");
+                nerr("ERROR: Transmit underrun\n");
 #ifdef CONFIG_CS89x0_XMITEARLY
                 cd89x0->cs_txunderrun++;
                 if (cd89x0->cs_txunderrun == 3)
@@ -819,9 +819,9 @@ static int cs89x0_ifup(struct net_driver_s *dev)
 {
   struct cs89x0_driver_s *cs89x0 = (struct cs89x0_driver_s *)dev->d_private;
 
-  nerr("Bringing up: %d.%d.%d.%d\n",
-       dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
-       (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
+  ninfo("Bringing up: %d.%d.%d.%d\n",
+        dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
+        (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 
   /* Initialize the Ethernet interface */
 #warning "Missing logic"
diff --git a/drivers/net/dm90x0.c b/drivers/net/dm90x0.c
index 1b59a49485..f4b98bdc4a 100644
--- a/drivers/net/dm90x0.c
+++ b/drivers/net/dm90x0.c
@@ -865,7 +865,7 @@ static void dm9x_receive(FAR struct dm9x_driver_s *dm9x)
         {
           /* Bad RX packet... update statistics */
 
-          nerr("Received packet with errors: %02x\n", rx.desc.rx_status);
+          nerr("ERROR: Received packet with errors: %02x\n", rx.desc.rx_status);
           NETDEV_RXERRORS(&dm9x->dm_dev);
 
           /* Drop this packet and continue to check the next packet */
@@ -877,7 +877,7 @@ static void dm9x_receive(FAR struct dm9x_driver_s *dm9x)
 
       else if (rx.desc.rx_len < ETH_HDRLEN || rx.desc.rx_len > (CONFIG_NET_ETH_MTU + 2))
         {
-          nerr("RX length error\n");
+          nerr("ERROR: RX length error\n");
           NETDEV_RXERRORS(&dm9x->dm_dev);
 
           /* Drop this packet and continue to check the next packet */
@@ -1042,7 +1042,7 @@ static void dm9x_txdone(struct dm9x_driver_s *dm9x)
         }
       else
         {
-          nerr("Bad TX count (TX1END)\n");
+          nerr("ERROR: Bad TX count (TX1END)\n");
         }
     }
 
@@ -1054,7 +1054,7 @@ static void dm9x_txdone(struct dm9x_driver_s *dm9x)
         }
       else
         {
-          nerr("Bad TX count (TX2END)\n");
+          nerr("ERROR: Bad TX count (TX2END)\n");
         }
     }
 
@@ -1144,7 +1144,8 @@ static int dm9x_interrupt(int irq, FAR void *context)
             }
           up_mdelay(1);
         }
-      nerr("delay: %dmS speed: %s\n", i, dm9x->dm_b100M ? "100M" : "10M");
+
+      nerr("ERROR: delay: %dmS speed: %s\n", i, dm9x->dm_b100M ? "100M" : "10M");
     }
 
   /* Check if we received an incoming packet */
@@ -1206,17 +1207,17 @@ static void dm9x_txtimeout(int argc, uint32_t arg, ...)
 {
   struct dm9x_driver_s *dm9x = (struct dm9x_driver_s *)arg;
 
-  nerr("TX timeout\n");
+  nerr("ERROR: TX timeout\n");
 
   /* Increment statistics and dump debug info */
 
   NETDEV_TXTIMEOUTS(dm9x->dm_dev);
 
-  nerr("  TX packet count:           %d\n", dm9x->dm_ntxpending);
-  nerr("  TX read pointer address:   0x%02x:%02x\n",
-       getreg(DM9X_TRPAH), getreg(DM9X_TRPAL));
-  nerr("  Memory data write address: 0x%02x:%02x (DM9010)\n",
-       getreg(DM9X_MDWAH), getreg(DM9X_MDWAL));
+  ninfo("  TX packet count:           %d\n", dm9x->dm_ntxpending);
+  ninfo("  TX read pointer address:   0x%02x:%02x\n",
+        getreg(DM9X_TRPAH), getreg(DM9X_TRPAL));
+  ninfo("  Memory data write address: 0x%02x:%02x (DM9010)\n",
+        getreg(DM9X_MDWAH), getreg(DM9X_MDWAL));
 
   /* Then reset the DM90x0 */
 
@@ -1342,9 +1343,9 @@ static int dm9x_ifup(struct net_driver_s *dev)
   uint8_t netstatus;
   int i;
 
-  nerr("Bringing up: %d.%d.%d.%d\n",
-       dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
-       (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
+  ninfo("Bringing up: %d.%d.%d.%d\n",
+        dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
+        (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 
   /* Initilize DM90x0 chip */
 
@@ -1372,7 +1373,7 @@ static int dm9x_ifup(struct net_driver_s *dev)
       up_mdelay(1);
     }
 
-  nerr("delay: %dmS speed: %s\n", i, dm9x->dm_b100M ? "100M" : "10M");
+  ninfo("delay: %dmS speed: %s\n", i, dm9x->dm_b100M ? "100M" : "10M");
 
   /* Set and activate a timer process */
 
@@ -1407,7 +1408,7 @@ static int dm9x_ifdown(struct net_driver_s *dev)
   struct dm9x_driver_s *dm9x = (struct dm9x_driver_s *)dev->d_private;
   irqstate_t flags;
 
-  nerr("Stopping\n");
+  ninfo("Stopping\n");
 
   /* Disable the DM9X interrupt */
 
@@ -1456,7 +1457,7 @@ static int dm9x_txavail(struct net_driver_s *dev)
   struct dm9x_driver_s *dm9x = (struct dm9x_driver_s *)dev->d_private;
   irqstate_t flags;
 
-  nerr("Polling\n");
+  ninfo("Polling\n");
   flags = enter_critical_section();
 
   /* Ignore the notification if the interface is not yet up */
@@ -1557,7 +1558,7 @@ static int dm9x_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac)
 
 static void dm9x_bringup(struct dm9x_driver_s *dm9x)
 {
-  nerr("Initializing\n");
+  ninfo("Initializing\n");
 
   /* Set the internal PHY power-on, GPIOs normal, and wait 2ms */
 
@@ -1722,13 +1723,13 @@ int dm9x_initialize(void)
 
   vid = (((uint16_t)getreg(DM9X_VIDH)) << 8) | (uint16_t)getreg(DM9X_VIDL);
   pid = (((uint16_t)getreg(DM9X_PIDH)) << 8) | (uint16_t)getreg(DM9X_PIDL);
-  nllerr("I/O base: %08x VID: %04x PID: %04x\n", CONFIG_DM9X_BASE, vid, pid);
+  nllinfo("I/O base: %08x VID: %04x PID: %04x\n", CONFIG_DM9X_BASE, vid, pid);
 
   /* Check if a DM90x0 chip is recognized at this I/O base */
 
   if (vid != DM9X_DAVICOMVID || (pid != DM9X_DM9000PID && pid != DM9X_DM9010PID))
     {
-      nllerr("DM90x0 vendor/product ID not found at this base address\n");
+      nllerr("ERROR: DM90x0 vendor/product ID not found at this base address\n");
       return -ENODEV;
     }
 
@@ -1738,7 +1739,7 @@ int dm9x_initialize(void)
     {
       /* We could not attach the ISR to the ISR */
 
-      nllerr("irq_attach() failed\n");
+      nllerr("ERROR: irq_attach() failed\n");
       return -EAGAIN;
     }
 
@@ -1767,7 +1768,7 @@ int dm9x_initialize(void)
       mptr[i] = getreg(j);
     }
 
-  nllerr("MAC: %0x:%0x:%0x:%0x:%0x:%0x\n",
+  nllinfo("MAC: %0x:%0x:%0x:%0x:%0x:%0x\n",
          mptr[0], mptr[1], mptr[2], mptr[3], mptr[4], mptr[5]);
 
   /* Register the device with the OS so that socket IOCTLs can be performed */
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index ae65ce3532..ed9033ed2f 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -799,9 +799,9 @@ static int e1000_ifup(struct net_driver_s *dev)
 {
   struct e1000_dev *e1000 = (struct e1000_dev *)dev->d_private;
 
-  nerr("Bringing up: %d.%d.%d.%d\n",
-       dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
-       (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
+  ninfo("Bringing up: %d.%d.%d.%d\n",
+        dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
+        (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 
   /* Initialize PHYs, the Ethernet interface, and setup up Ethernet interrupts */
 
diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c
index 3f3e64c92c..bdb1b9d354 100644
--- a/drivers/net/enc28j60.c
+++ b/drivers/net/enc28j60.c
@@ -1484,7 +1484,7 @@ static void enc_rxdispatch(FAR struct enc_driver_s *priv)
   else
 #endif
     {
-      nllerr("Unsupported packet type dropped (%02x)\n", htons(BUF->type));
+      nllerr("ERROR: Unsupported packet type dropped (%02x)\n", htons(BUF->type));
       NETDEV_RXDROPPED(&priv->dev);
     }
 }
@@ -1558,7 +1558,7 @@ static void enc_pktif(FAR struct enc_driver_s *priv)
 
   else if (pktlen > (CONFIG_NET_ETH_MTU + 4) || pktlen <= (ETH_HDRLEN + 4))
     {
-      nllerr("Bad packet size dropped (%d)\n", pktlen);
+      nllerr("ERROR: Bad packet size dropped (%d)\n", pktlen);
       NETDEV_RXERRORS(&priv->dev);
     }
 
@@ -1878,7 +1878,7 @@ static void enc_toworker(FAR void *arg)
   net_lock_t lock;
   int ret;
 
-  nllerr("Tx timeout\n");
+  nllerr("ERROR: Tx timeout\n");
   DEBUGASSERT(priv);
 
   /* Get exclusive access to the network */
@@ -2067,9 +2067,9 @@ static int enc_ifup(struct net_driver_s *dev)
   FAR struct enc_driver_s *priv = (FAR struct enc_driver_s *)dev->d_private;
   int ret;
 
-  nllerr("Bringing up: %d.%d.%d.%d\n",
-         dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
-        (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
+  nllinfo("Bringing up: %d.%d.%d.%d\n",
+          dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
+          (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 
   /* Lock the SPI bus so that we have exclusive access */
 
@@ -2139,9 +2139,9 @@ static int enc_ifdown(struct net_driver_s *dev)
   irqstate_t flags;
   int ret;
 
-  nllerr("Taking down: %d.%d.%d.%d\n",
-         dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
-         (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
+  nllinfo("Taking down: %d.%d.%d.%d\n",
+          dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
+          (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 
   /* Lock the SPI bus so that we have exclusive access */
 
@@ -2473,7 +2473,7 @@ static int enc_reset(FAR struct enc_driver_s *priv)
 {
   uint8_t regval;
 
-  nllerr("Reset\n");
+  nllwarn("WARNING: Reset\n");
 
   /* Configure SPI for the ENC28J60 */
 
@@ -2524,7 +2524,7 @@ static int enc_reset(FAR struct enc_driver_s *priv)
   regval = enc_rdbreg(priv, ENC_EREVID);
   if (regval == 0x00 || regval == 0xff)
     {
-      nllerr("Bad Rev ID: %02x\n", regval);
+      nllerr("ERROR: Bad Rev ID: %02x\n", regval);
       return -ENODEV;
     }
 
diff --git a/drivers/net/encx24j600.c b/drivers/net/encx24j600.c
index 1ce5a53f25..02a2491901 100644
--- a/drivers/net/encx24j600.c
+++ b/drivers/net/encx24j600.c
@@ -1127,7 +1127,7 @@ static int enc_txenqueue(FAR struct enc_driver_s *priv)
     }
   else
     {
-      nllerr("no free descriptors\n");
+      nllerr("ERROR: no free descriptors\n");
       ret = -ENOMEM;
     }
 
@@ -1612,7 +1612,7 @@ static void enc_rxdispatch(FAR struct enc_driver_s *priv)
 
           enc_rxrmpkt(priv, descr);
 
-          nllerr("Unsupported packet type dropped (%02x)\n", htons(BUF->type));
+          nllerr("ERROR: Unsupported packet type dropped (%02x)\n", htons(BUF->type));
           NETDEV_RXDROPPED(&priv->dev);
         }
 
@@ -1719,7 +1719,7 @@ static void enc_pktif(FAR struct enc_driver_s *priv)
 
       else if (pktlen > (CONFIG_NET_ETH_MTU + 4) || pktlen <= (ETH_HDRLEN + 4))
         {
-          nllerr("Bad packet size dropped (%d)\n", pktlen);
+          nllerr("ERROR: Bad packet size dropped (%d)\n", pktlen);
 
           /* Discard packet */
 
@@ -1774,17 +1774,17 @@ static void enc_rxabtif(FAR struct enc_driver_s *priv)
 #if 0
   /* Free the last received packet from the RX queue */
 
-  nllerr("rx abort\n");
-  nllerr("ESTAT:   %04x\n", enc_rdreg(priv, ENC_ESTAT));
-  nllerr("EIR:     %04x\n", enc_rdreg(priv, ENC_EIR));
-  nllerr("ERXTAIL: %04x\n", enc_rdreg(priv, ENC_ERXTAIL));
-  nllerr("ERXHAED: %04x\n", enc_rdreg(priv, ENC_ERXHEAD));
+  nllinfo("rx abort\n");
+  nllinfo("ESTAT:   %04x\n", enc_rdreg(priv, ENC_ESTAT));
+  nllinfo("EIR:     %04x\n", enc_rdreg(priv, ENC_EIR));
+  nllinfo("ERXTAIL: %04x\n", enc_rdreg(priv, ENC_ERXTAIL));
+  nllinfo("ERXHAED: %04x\n", enc_rdreg(priv, ENC_ERXHEAD));
 
   descr = (FAR struct enc_descr_s *)sq_peek(&priv->rxqueue);
 
   while (descr != NULL)
     {
-      nllerr("addr: %04x len: %d\n", descr->addr, descr->len);
+      nllinfo("addr: %04x len: %d\n", descr->addr, descr->len);
       descr = (FAR struct enc_descr_s *)sq_next(descr);
     }
 
@@ -1797,7 +1797,7 @@ static void enc_rxabtif(FAR struct enc_driver_s *priv)
     {
       enc_rxrmpkt(priv, descr);
 
-      nllerr("pending packet freed\n");
+      nllinfo("pending packet freed\n");
     }
   else
     {
@@ -2043,7 +2043,7 @@ static void enc_toworker(FAR void *arg)
   net_lock_t lock;
   int ret;
 
-  nllerr("Tx timeout\n");
+  nllerr("ERROR: Tx timeout\n");
   DEBUGASSERT(priv);
 
   /* Get exclusive access to the network. */
@@ -2231,9 +2231,9 @@ static int enc_ifup(struct net_driver_s *dev)
   FAR struct enc_driver_s *priv = (FAR struct enc_driver_s *)dev->d_private;
   int ret;
 
-  nllerr("Bringing up: %d.%d.%d.%d\n",
-         dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
-        (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
+  nllinfo("Bringing up: %d.%d.%d.%d\n",
+          dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
+          (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 
   /* Lock the SPI bus so that we have exclusive access */
 
@@ -2307,9 +2307,9 @@ static int enc_ifdown(struct net_driver_s *dev)
   irqstate_t flags;
   int ret;
 
-  nllerr("Taking down: %d.%d.%d.%d\n",
-         dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
-         (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
+  nllinfo("Taking down: %d.%d.%d.%d\n",
+          dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
+          (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 
   /* Lock the SPI bus so that we have exclusive access */
 
diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c
index cf6bda2dbc..9349a3da01 100644
--- a/drivers/net/ftmac100.c
+++ b/drivers/net/ftmac100.c
@@ -1311,15 +1311,15 @@ static int ftmac100_ifup(struct net_driver_s *dev)
   FAR struct ftmac100_driver_s *priv = (FAR struct ftmac100_driver_s *)dev->d_private;
 
 #ifdef CONFIG_NET_IPv4
-  nerr("Bringing up: %d.%d.%d.%d\n",
-       dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
-       (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
+  ninfo("Bringing up: %d.%d.%d.%d\n",
+        dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
+        (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 #endif
 #ifdef CONFIG_NET_IPv6
-  nerr("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
-       dev->d_ipv6addr[0], dev->d_ipv6addr[1], dev->d_ipv6addr[2],
-       dev->d_ipv6addr[3], dev->d_ipv6addr[4], dev->d_ipv6addr[5],
-       dev->d_ipv6addr[6], dev->d_ipv6addr[7]);
+  ninfo("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
+        dev->d_ipv6addr[0], dev->d_ipv6addr[1], dev->d_ipv6addr[2],
+        dev->d_ipv6addr[3], dev->d_ipv6addr[4], dev->d_ipv6addr[5],
+        dev->d_ipv6addr[6], dev->d_ipv6addr[7]);
 #endif
 
   /* Initialize PHYs, the Ethernet interface, and setup up Ethernet
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index 759e11d9b0..5a51948615 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -203,7 +203,7 @@ static int lo_txpoll(FAR struct net_driver_s *dev)
       else
 #endif
         {
-          nerr("WARNING: Unrecognized packet type dropped: %02x\n", IPv4BUF->vhl);
+          nwarn("WARNING: Unrecognized packet type dropped: %02x\n", IPv4BUF->vhl);
           NETDEV_RXDROPPED(&priv->lo_dev);
           priv->lo_dev.d_len = 0;
         }
@@ -323,15 +323,15 @@ static int lo_ifup(FAR struct net_driver_s *dev)
   FAR struct lo_driver_s *priv = (FAR struct lo_driver_s *)dev->d_private;
 
 #ifdef CONFIG_NET_IPv4
-  nerr("Bringing up: %d.%d.%d.%d\n",
-       dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
-       (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
+  ninfo("Bringing up: %d.%d.%d.%d\n",
+        dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
+        (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 #endif
 #ifdef CONFIG_NET_IPv6
-  nerr("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
-       dev->d_ipv6addr[0], dev->d_ipv6addr[1], dev->d_ipv6addr[2],
-       dev->d_ipv6addr[3], dev->d_ipv6addr[4], dev->d_ipv6addr[5],
-       dev->d_ipv6addr[6], dev->d_ipv6addr[7]);
+  ninfo("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
+        dev->d_ipv6addr[0], dev->d_ipv6addr[1], dev->d_ipv6addr[2],
+        dev->d_ipv6addr[3], dev->d_ipv6addr[4], dev->d_ipv6addr[5],
+        dev->d_ipv6addr[6], dev->d_ipv6addr[7]);
 #endif
 
   /* Set and activate a timer process */
diff --git a/drivers/net/phy_notify.c b/drivers/net/phy_notify.c
index 6c8e6c8a1e..d480a361a8 100644
--- a/drivers/net/phy_notify.c
+++ b/drivers/net/phy_notify.c
@@ -82,9 +82,13 @@
  */
 
 #ifdef CONFIG_NETDEV_PHY_DEBUG
+#  define phyinfo   info
+#  define phyllinfo llinfo
 #  define phyerr    err
 #  define phyllerr  llerr
 #else
+#  define phyinfo(x...)
+#  define phyllinfo(x...)
 #  define phyerr(x...)
 #  define phyllerr(x...)
 #endif
@@ -208,7 +212,7 @@ static FAR struct phy_notify_s *phy_find_unassigned(void)
           /* Return the client entry assigned to the caller */
 
           phy_semgive();
-          phyerr("Returning client %d\n", i);
+          phyinfo("Returning client %d\n", i);
           return client;
         }
     }
@@ -243,7 +247,7 @@ static FAR struct phy_notify_s *phy_find_assigned(FAR const char *intf,
           /* Return the matching client entry to the caller */
 
           phy_semgive();
-          phyerr("Returning client %d\n", i);
+          phyinfo("Returning client %d\n", i);
           return client;
         }
     }
@@ -266,8 +270,8 @@ static int phy_handler(FAR struct phy_notify_s *client)
   int ret;
 
   DEBUGASSERT(client && client->assigned && client->enable);
-  phyllerr("Entry client %d, signalling PID=%d with signal %d\n",
-           client->index, client->pid, client->signo);
+  phyllinfo("Entry client %d, signalling PID=%d with signal %d\n",
+            client->index, client->pid, client->signo);
 
   /* Disable further interrupts */
 
@@ -287,7 +291,7 @@ static int phy_handler(FAR struct phy_notify_s *client)
       int errcode = errno;
       DEBUGASSERT(errcode > 0);
 
-      nllerr("ERROR: sigqueue failed: %d\n", errcode);
+      nllinfo("ERROR: sigqueue failed: %d\n", errcode);
       UNUSED(errcode);
     }
 
@@ -367,7 +371,7 @@ int phy_notify_subscribe(FAR const char *intf, pid_t pid, int signo,
   if (pid == 0)
     {
       pid = getpid();
-      phyerr("Actual PID=%d\n", pid);
+      phyinfo("Actual PID=%d\n", pid);
     }
 
   /* Check if this client already exists */
diff --git a/drivers/net/skeleton.c b/drivers/net/skeleton.c
index 59b2e56c77..ca3ea335dd 100644
--- a/drivers/net/skeleton.c
+++ b/drivers/net/skeleton.c
@@ -855,15 +855,15 @@ static int skel_ifup(FAR struct net_driver_s *dev)
   FAR struct skel_driver_s *priv = (FAR struct skel_driver_s *)dev->d_private;
 
 #ifdef CONFIG_NET_IPv4
-  nerr("Bringing up: %d.%d.%d.%d\n",
-       dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
-       (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
+  ninfo("Bringing up: %d.%d.%d.%d\n",
+        dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
+        (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 #endif
 #ifdef CONFIG_NET_IPv6
-  nerr("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
-       dev->d_ipv6addr[0], dev->d_ipv6addr[1], dev->d_ipv6addr[2],
-       dev->d_ipv6addr[3], dev->d_ipv6addr[4], dev->d_ipv6addr[5],
-       dev->d_ipv6addr[6], dev->d_ipv6addr[7]);
+  ninfo("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
+        dev->d_ipv6addr[0], dev->d_ipv6addr[1], dev->d_ipv6addr[2],
+        dev->d_ipv6addr[3], dev->d_ipv6addr[4], dev->d_ipv6addr[5],
+        dev->d_ipv6addr[6], dev->d_ipv6addr[7]);
 #endif
 
   /* Initialize PHYs, the Ethernet interface, and setup up Ethernet interrupts */
diff --git a/drivers/net/telnet.c b/drivers/net/telnet.c
index 903921f09f..e2a5dd270a 100644
--- a/drivers/net/telnet.c
+++ b/drivers/net/telnet.c
@@ -447,7 +447,7 @@ static void telnet_sendopt(FAR struct telnet_dev_s *priv, uint8_t option,
   telnet_dumpbuffer("Send optbuf", optbuf, 4);
   if (psock_send(&priv->td_psock, optbuf, 4, 0) < 0)
     {
-      nllerr("Failed to send TELNET_IAC\n");
+      nllerr("ERROR: Failed to send TELNET_IAC\n");
     }
 }
 
@@ -566,7 +566,7 @@ static int telnet_close(FAR struct file *filep)
 
               if (ret != -EBUSY)
                 {
-                  nllerr("Failed to unregister the driver %s: %d\n",
+                  nllerr("ERROR: Failed to unregister the driver %s: %d\n",
                          devpath, ret);
                 }
             }
@@ -706,7 +706,7 @@ static ssize_t telnet_write(FAR struct file *filep, FAR const char *buffer, size
           ret = psock_send(&priv->td_psock, priv->td_txbuffer, ncopied, 0);
           if (ret < 0)
             {
-              nllerr("psock_send failed '%s': %d\n", priv->td_txbuffer, ret);
+              nllerr("ERROR: psock_send failed '%s': %d\n", priv->td_txbuffer, ret);
               return ret;
             }
 
@@ -723,7 +723,7 @@ static ssize_t telnet_write(FAR struct file *filep, FAR const char *buffer, size
       ret = psock_send(&priv->td_psock, priv->td_txbuffer, ncopied, 0);
       if (ret < 0)
         {
-          nllerr("psock_send failed '%s': %d\n", priv->td_txbuffer, ret);
+          nllerr("ERROR: psock_send failed '%s': %d\n", priv->td_txbuffer, ret);
           return ret;
         }
     }
@@ -767,7 +767,7 @@ static int telnet_session(FAR struct telnet_session_s *session)
   priv = (FAR struct telnet_dev_s*)malloc(sizeof(struct telnet_dev_s));
   if (!priv)
     {
-      nllerr("Failed to allocate the driver data structure\n");
+      nllerr("ERROR: Failed to allocate the driver data structure\n");
       return -ENOMEM;
     }
 
@@ -788,7 +788,7 @@ static int telnet_session(FAR struct telnet_session_s *session)
   psock = sockfd_socket(session->ts_sd);
   if (!psock)
     {
-      nllerr("Failed to convert sd=%d to a socket structure\n", session->ts_sd);
+      nllerr("ERROR: Failed to convert sd=%d to a socket structure\n", session->ts_sd);
       ret = -EINVAL;
       goto errout_with_dev;
     }
@@ -796,7 +796,7 @@ static int telnet_session(FAR struct telnet_session_s *session)
   ret = net_clone(psock, &priv->td_psock);
   if (ret < 0)
     {
-      nllerr("net_clone failed: %d\n", ret);
+      nllerr("ERROR: net_clone failed: %d\n", ret);
       goto errout_with_dev;
     }
 
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index bffd391b36..965fcd97e5 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -646,15 +646,15 @@ static int tun_ifup(struct net_driver_s *dev)
   FAR struct tun_device_s *priv = (FAR struct tun_device_s *)dev->d_private;
 
 #ifdef CONFIG_NET_IPv4
-  nerr("Bringing up: %d.%d.%d.%d\n",
-       dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
-       (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
+  ninfo("Bringing up: %d.%d.%d.%d\n",
+        dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
+        (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 #endif
 #ifdef CONFIG_NET_IPv6
-  nerr("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
-       dev->d_ipv6addr[0], dev->d_ipv6addr[1], dev->d_ipv6addr[2],
-       dev->d_ipv6addr[3], dev->d_ipv6addr[4], dev->d_ipv6addr[5],
-       dev->d_ipv6addr[6], dev->d_ipv6addr[7]);
+  ninfo("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
+        dev->d_ipv6addr[0], dev->d_ipv6addr[1], dev->d_ipv6addr[2],
+        dev->d_ipv6addr[3], dev->d_ipv6addr[4], dev->d_ipv6addr[5],
+        dev->d_ipv6addr[6], dev->d_ipv6addr[7]);
 #endif
 
   /* Initialize PHYs, the Ethernet interface, and setup up Ethernet interrupts */
diff --git a/drivers/net/vnet.c b/drivers/net/vnet.c
index 86a5070813..7da2e9f3c4 100644
--- a/drivers/net/vnet.c
+++ b/drivers/net/vnet.c
@@ -546,9 +546,9 @@ static int vnet_ifup(struct net_driver_s *dev)
 {
   FAR struct vnet_driver_s *vnet = (FAR struct vnet_driver_s *)dev->d_private;
 
-  nerr("Bringing up: %d.%d.%d.%d\n",
-     dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
-     (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
+  ninfo("Bringing up: %d.%d.%d.%d\n",
+        dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
+        (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 
   /* Initialize PHYs, the Ethernet interface, and setup up Ethernet interrupts */
 
diff --git a/drivers/pipes/pipe_common.c b/drivers/pipes/pipe_common.c
index 3f5e72ae5a..a22a197fb0 100644
--- a/drivers/pipes/pipe_common.c
+++ b/drivers/pipes/pipe_common.c
@@ -205,7 +205,7 @@ int pipecommon_open(FAR struct file *filep)
   ret = sem_wait(&dev->d_bfsem);
   if (ret != OK)
     {
-      ferr("sem_wait failed: %d\n", get_errno());
+      ferr("ERROR: sem_wait failed: %d\n", get_errno());
       DEBUGASSERT(get_errno() > 0);
       return -get_errno();
     }
@@ -283,7 +283,7 @@ int pipecommon_open(FAR struct file *filep)
            * a signal.
            */
 
-          ferr("sem_wait failed: %d\n", get_errno());
+          ferr("ERROR: sem_wait failed: %d\n", get_errno());
           DEBUGASSERT(get_errno() > 0);
           ret = -get_errno();
 
diff --git a/drivers/power/battery_charger.c b/drivers/power/battery_charger.c
index 2fff5afc2c..514329f03e 100644
--- a/drivers/power/battery_charger.c
+++ b/drivers/power/battery_charger.c
@@ -228,7 +228,7 @@ static int bat_charger_ioctl(FAR struct file *filep, int cmd,
         break;
 
       default:
-        err("Unrecognized cmd: %d\n", cmd);
+        err("ERROR: Unrecognized cmd: %d\n", cmd);
         ret = -ENOTTY;
         break;
     }
@@ -268,7 +268,7 @@ int battery_charger_register(FAR const char *devpath,
   ret = register_driver(devpath, &g_batteryops, 0555, dev);
   if (ret < 0)
     {
-      err("Failed to register driver: %d\n", ret);
+      err("ERROR: Failed to register driver: %d\n", ret);
     }
 
   return ret;
diff --git a/drivers/power/battery_gauge.c b/drivers/power/battery_gauge.c
index e913c733c8..247d319180 100644
--- a/drivers/power/battery_gauge.c
+++ b/drivers/power/battery_gauge.c
@@ -213,7 +213,7 @@ static int bat_gauge_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
         break;
 
       default:
-        err("Unrecognized cmd: %d\n", cmd);
+        err("ERROR: Unrecognized cmd: %d\n", cmd);
         ret = -ENOTTY;
         break;
     }
@@ -253,7 +253,7 @@ int battery_gauge_register(FAR const char *devpath,
   ret = register_driver(devpath, &g_batteryops, 0555, dev);
   if (ret < 0)
     {
-      err("Failed to register driver: %d\n", ret);
+      err("ERROR: Failed to register driver: %d\n", ret);
     }
 
   return ret;
diff --git a/drivers/power/bq2425x.c b/drivers/power/bq2425x.c
index 8f2198f213..04a864b775 100644
--- a/drivers/power/bq2425x.c
+++ b/drivers/power/bq2425x.c
@@ -79,11 +79,14 @@
 
 #ifdef CONFIG_DEBUG_BQ2425X
 #  define baterr err
+#  define batreg err
 #else
 #  ifdef CONFIG_CPP_HAVE_VARARGS
 #    define baterr(x...)
+#    define batreg(x...)
 #  else
 #    define baterr (void)
+#    define batreg (void)
 #  endif
 #endif
 
@@ -176,7 +179,7 @@ static int bq2425x_getreg8(FAR struct bq2425x_dev_s *priv, uint8_t regaddr,
   ret = i2c_write(priv->i2c, &config, ®addr, 1);
   if (ret < 0)
     {
-      baterr("i2c_write failed: %d\n", ret);
+      baterr("ERROR: i2c_write failed: %d\n", ret);
       return ret;
     }
 
@@ -185,7 +188,7 @@ static int bq2425x_getreg8(FAR struct bq2425x_dev_s *priv, uint8_t regaddr,
   ret = i2c_read(priv->i2c, &config, &val, 1);
   if (ret < 0)
     {
-      baterr("i2c_read failed: %d\n", ret);
+      baterr("ERROR: i2c_read failed: %d\n", ret);
       return ret;
     }
 
@@ -217,7 +220,7 @@ static int bq2425x_putreg8(FAR struct bq2425x_dev_s *priv, uint8_t regaddr,
   config.address   = priv->addr;
   config.addrlen   = 7;
 
-  baterr("addr: %02x regval: %08x\n", regaddr, regval);
+  batreg("addr: %02x regval: %08x\n", regaddr, regval);
 
   /* Set up a 3 byte message to send */
 
@@ -270,7 +273,7 @@ static inline int bq2425x_reset(FAR struct bq2425x_dev_s *priv)
   ret = bq2425x_getreg8(priv, BQ2425X_REG_2, ®val);
   if (ret < 0)
     {
-      baterr("Error reading from BQ2425X! Error =  %d\n", ret);
+      baterr("ERROR: Error reading from BQ2425X! Error =  %d\n", ret);
       return ret;
     }
 
@@ -280,7 +283,7 @@ static inline int bq2425x_reset(FAR struct bq2425x_dev_s *priv)
   ret = bq2425x_putreg8(priv, BQ2425X_REG_2, regval);
   if (ret < 0)
     {
-      baterr("Error writing to BQ2425X! Error =  %d\n", ret);
+      baterr("ERROR: Error writing to BQ2425X! Error =  %d\n", ret);
       return ret;
     }
 
@@ -294,7 +297,7 @@ static inline int bq2425x_reset(FAR struct bq2425x_dev_s *priv)
   ret = bq2425x_putreg8(priv, BQ2425X_REG_2, regval);
   if (ret < 0)
     {
-      baterr("Error writing to BQ2425X! Error =  %d\n", ret);
+      baterr("ERROR: Error writing to BQ2425X! Error =  %d\n", ret);
       return ret;
     }
 
@@ -317,7 +320,7 @@ static inline int bq2425x_watchdog(FAR struct bq2425x_dev_s *priv, bool enable)
   ret = bq2425x_getreg8(priv, BQ2425X_REG_1, ®val);
   if (ret < 0)
     {
-      baterr("Error reading from BQ2425X! Error =  %d\n", ret);
+      baterr("ERROR: Error reading from BQ2425X! Error =  %d\n", ret);
       return ret;
     }
 
@@ -333,7 +336,7 @@ static inline int bq2425x_watchdog(FAR struct bq2425x_dev_s *priv, bool enable)
   ret = bq2425x_putreg8(priv, BQ2425X_REG_1, regval);
   if (ret < 0)
     {
-      baterr("Error writing to BQ2425X! Error =  %d\n", ret);
+      baterr("ERROR: Error writing to BQ2425X! Error =  %d\n", ret);
       return ret;
     }
 
@@ -515,7 +518,7 @@ static inline int bq2425x_powersupply(FAR struct bq2425x_dev_s *priv, int curren
     break;
 
   default:
-    baterr("Current not supported, setting default to 100mA.!\n");
+    baterr("ERROR: Current not supported, setting default to 100mA.!\n");
     idx = BQ2425X_INP_CURR_LIM_100MA;
     break;
   }
@@ -525,7 +528,7 @@ static inline int bq2425x_powersupply(FAR struct bq2425x_dev_s *priv, int curren
   ret = bq2425x_getreg8(priv, BQ2425X_REG_2, ®val);
   if (ret < 0)
     {
-      baterr("Error reading from BQ2425X! Error =  %d\n", ret);
+      baterr("ERROR: Error reading from BQ2425X! Error =  %d\n", ret);
       return ret;
     }
 
@@ -541,7 +544,7 @@ static inline int bq2425x_powersupply(FAR struct bq2425x_dev_s *priv, int curren
   ret = bq2425x_putreg8(priv, BQ2425X_REG_2, regval);
   if (ret < 0)
     {
-      baterr("Error writing to BQ2425X! Error =  %d\n", ret);
+      baterr("ERROR: Error writing to BQ2425X! Error =  %d\n", ret);
       return ret;
     }
 
@@ -565,14 +568,14 @@ static inline int bq2425x_setvolt(FAR struct bq2425x_dev_s *priv, int volts)
 
   if (volts < BQ2425X_VOLT_MIN || volts > BQ2425X_VOLT_MAX)
     {
-      baterr("Voltage %d mV is out of range.\n", volts);
+      baterr("ERROR: Voltage %d mV is out of range.\n", volts);
       return -EINVAL;
     }
 
   ret = bq2425x_getreg8(priv, BQ2425X_REG_3, ®val);
   if (ret < 0)
     {
-      baterr("Error reading from BQ2425X! Error =  %d\n", ret);
+      baterr("ERROR: Error reading from BQ2425X! Error =  %d\n", ret);
       return ret;
     }
 
@@ -589,7 +592,7 @@ static inline int bq2425x_setvolt(FAR struct bq2425x_dev_s *priv, int volts)
   ret = bq2425x_putreg8(priv, BQ2425X_REG_3, regval);
   if (ret < 0)
     {
-      baterr("Error writing to BQ2425X! Error =  %d\n", ret);
+      baterr("ERROR: Error writing to BQ2425X! Error =  %d\n", ret);
       return ret;
     }
 
@@ -613,14 +616,14 @@ static inline int bq2425x_setcurr(FAR struct bq2425x_dev_s *priv, int current)
 
   if (current < BQ2425X_CURR_MIN || current > BQ2425X_CURR_MAX)
     {
-      baterr("Current %d mA is out of range.\n", volts);
+      baterr("ERROR: Current %d mA is out of range.\n", volts);
       return -EINVAL;
     }
 
   ret = bq2425x_getreg8(priv, BQ2425X_REG_4, ®val);
   if (ret < 0)
     {
-      baterr("Error reading from BQ2425X! Error =  %d\n", ret);
+      baterr("ERROR: Error reading from BQ2425X! Error =  %d\n", ret);
       return ret;
     }
 
@@ -637,7 +640,7 @@ static inline int bq2425x_setcurr(FAR struct bq2425x_dev_s *priv, int current)
   ret = bq2425x_putreg8(priv, BQ2425X_REG_4, regval);
   if (ret < 0)
     {
-      baterr("Error writing to BQ2425X! Error =  %d\n", ret);
+      baterr("ERROR: Error writing to BQ2425X! Error =  %d\n", ret);
       return ret;
     }
 
@@ -663,7 +666,7 @@ static int bq2425x_voltage(struct battery_charger_dev_s *dev, int value)
   ret = bq2425x_setvolt(priv, value);
   if (ret < 0)
     {
-      baterr("Error setting voltage to BQ2425X! Error =  %d\n", ret);
+      baterr("ERROR: Error setting voltage to BQ2425X! Error =  %d\n", ret);
       return ret;
     }
 
@@ -688,7 +691,7 @@ static int bq2425x_current(struct battery_charger_dev_s *dev, int value)
   ret = bq2425x_setcurr(priv, value);
   if (ret < 0)
     {
-      baterr("Error setting current to BQ2425X! Error =  %d\n", ret);
+      baterr("ERROR: Error setting current to BQ2425X! Error =  %d\n", ret);
       return ret;
     }
 
@@ -749,7 +752,7 @@ FAR struct battery_charger_dev_s *
       ret = bq2425x_reset(priv);
       if (ret < 0)
         {
-          baterr("Failed to reset the BQ2425x: %d\n", ret);
+          baterr("ERROR: Failed to reset the BQ2425x: %d\n", ret);
           kmm_free(priv);
           return NULL;
         }
@@ -759,7 +762,7 @@ FAR struct battery_charger_dev_s *
       ret = bq2425x_watchdog(priv, false);
       if (ret < 0)
         {
-          baterr("Failed to disable BQ2425x watchdog: %d\n", ret);
+          baterr("ERROR: Failed to disable BQ2425x watchdog: %d\n", ret);
           kmm_free(priv);
           return NULL;
         }
@@ -769,7 +772,7 @@ FAR struct battery_charger_dev_s *
       ret = bq2425x_powersupply(priv, 2000);
       if (ret < 0)
         {
-          baterr("Failed to set BQ2425x power supply current: %d\n", ret);
+          baterr("ERROR: Failed to set BQ2425x power supply current: %d\n", ret);
           kmm_free(priv);
           return NULL;
         }
diff --git a/drivers/sercomm/console.c b/drivers/sercomm/console.c
index 5936d2d5b3..579a3f605a 100644
--- a/drivers/sercomm/console.c
+++ b/drivers/sercomm/console.c
@@ -187,7 +187,7 @@ int sercomm_register(FAR const char *path, FAR uart_dev_t *dev)
   sem_init(&dev->pollsem,  0, 1);
 #endif
 
-  err("Registering %s\n", path);
+  info("Registering %s\n", path);
   return register_driver(path, &g_sercom_console_ops, 0666, NULL);
 }
 
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index b643b2b604..ca695afb76 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -1369,7 +1369,7 @@ int uart_register(FAR const char *path, FAR uart_dev_t *dev)
   sem_init(&dev->pollsem,  0, 1);
 #endif
 
-  err("Registering %s\n", path);
+  info("Registering %s\n", path);
   return register_driver(path, &g_serialops, 0666, dev);
 }
 
diff --git a/drivers/serial/uart_16550.c b/drivers/serial/uart_16550.c
index 2bbae910ad..59ebdbfa9a 100644
--- a/drivers/serial/uart_16550.c
+++ b/drivers/serial/uart_16550.c
@@ -848,7 +848,7 @@ static int u16550_interrupt(int irq, void *context)
 
           default:
             {
-              err("Unexpected IIR: %02x\n", status);
+              err("ERROR: Unexpected IIR: %02x\n", status);
               break;
             }
         }
diff --git a/drivers/spi/spi_bitbang.c b/drivers/spi/spi_bitbang.c
index e2bc8bcc42..429c4d18cd 100644
--- a/drivers/spi/spi_bitbang.c
+++ b/drivers/spi/spi_bitbang.c
@@ -91,7 +91,7 @@
 #ifdef CONFIG_DEBUG_SPI
 #  define spierr llerr
 #  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo llerr
+#    define spiinfo llinfo
 #  else
 #    define spiinfo(x...)
 #  endif
@@ -564,7 +564,7 @@ FAR struct spi_dev_s *spi_create_bitbang(FAR const struct spi_bitbang_ops_s *low
   priv = (FAR struct spi_bitbang_s *)zalloc(sizeof(struct spi_bitbang_s));
   if (!priv)
     {
-      spierr("Failed to allocate the device structure\n");
+      spierr("ERROR: Failed to allocate the device structure\n");
       return NULL;
     }
 
diff --git a/drivers/timers/cs2100-cp.c b/drivers/timers/cs2100-cp.c
index 40f5191cc5..dfd1c58ba8 100644
--- a/drivers/timers/cs2100-cp.c
+++ b/drivers/timers/cs2100-cp.c
@@ -81,18 +81,18 @@
 #  endif
 #endif
 
-#undef regerr
+#undef reginfo
 #ifdef CONFIG_CS2100CP_REGDEBUG
 #  ifdef CONFIG_CPP_HAVE_VARARGS
-#    define regerr(format, ...) err(format, ##__VA_ARGS__)
+#    define reginfo(format, ...) err(format, ##__VA_ARGS__)
 #  else
-#    define regerr              err
+#    define reginfo              err
 #  endif
 #else
 #  ifdef CONFIG_CPP_HAVE_VARARGS
-#    define regerr(x...)
+#    define reginfo(x...)
 #  else
-#    define regerr              (void)
+#    define reginfo              (void)
 #  endif
 #endif
 
@@ -129,7 +129,7 @@ static int cs2100_write_reg(FAR const struct cs2100_config_s *config,
 {
   struct i2c_msg_s msgs[2];
 
-  regerr("%02x<-%02x\n", regaddr, regval);
+  reginfo("%02x<-%02x\n", regaddr, regval);
   DEBUGASSERT(config->i2c->ops && config->i2c->ops->transfer);
 
   /* Construct the I2C message (write N+1 bytes with no restart) */
@@ -200,7 +200,7 @@ static int cs2100_read_reg(FAR const struct cs2100_config_s *config,
       ret = I2C_TRANSFER(config->i2c, &msg, 1);
       if (ret == OK)
         {
-          regerr("%02x->%02x\n", regaddr, *regval);
+          reginfo("%02x->%02x\n", regaddr, *regval);
         }
     }
 
@@ -229,7 +229,7 @@ static int cs2100_write_ratio(FAR const struct cs2100_config_s *config,
   struct i2c_msg_s msg;
   uint8_t buffer[5];
 
-  regerr("%02x<-%04l\n", CS2100_RATIO0, (unsigned long)ratio);
+  reginfo("%02x<-%04l\n", CS2100_RATIO0, (unsigned long)ratio);
   DEBUGASSERT(config->i2c->ops && config->i2c->ops->transfer);
 
   /* Construct the I2C message (write N+1 bytes with no restart) */
@@ -310,7 +310,7 @@ static int cs2100_read_ratio(FAR const struct cs2100_config_s *config,
                     ((uint32_t)buffer[2] << 8) |
                      (uint32_t)buffer[0];
 
-           regerr("%02x->%04l\n", CS2100_RATIO0, (unsigned long)*ratio);
+           reginfo("%02x->%04l\n", CS2100_RATIO0, (unsigned long)*ratio);
         }
     }
 
@@ -764,7 +764,7 @@ int cs2100_dump(FAR const struct cs2100_config_s *config)
   uint8_t regval;
   int ret;
 
-  err("CS200-CP Registers:\n");
+  csinfo("CS200-CP Registers:\n");
 
   ret = cs2100_read_reg(config, CS2100_DEVID, ®val);
   if (ret < 0)
@@ -773,7 +773,7 @@ int cs2100_dump(FAR const struct cs2100_config_s *config)
       return ret;
     }
 
-  err("     Devid: %02x\n", regval);
+  csinfo("     Devid: %02x\n", regval);
 
   ret = cs2100_read_reg(config, CS2100_DEVCTL, ®val);
   if (ret < 0)
@@ -782,7 +782,7 @@ int cs2100_dump(FAR const struct cs2100_config_s *config)
       return ret;
     }
 
-  err("    DevCtl: %02x\n", regval);
+  csinfo("    DevCtl: %02x\n", regval);
 
   ret = cs2100_read_reg(config, CS2100_DEVCFG1, ®val);
   if (ret < 0)
@@ -791,7 +791,7 @@ int cs2100_dump(FAR const struct cs2100_config_s *config)
       return ret;
     }
 
-  err("   DevCfg1: %02x\n", regval);
+  csinfo("   DevCfg1: %02x\n", regval);
 
   ret = cs2100_read_reg(config, CS2100_GBLCFG, ®val);
   if (ret < 0)
@@ -800,7 +800,7 @@ int cs2100_dump(FAR const struct cs2100_config_s *config)
       return ret;
     }
 
-  err("    GblCfg: %02x\n", regval);
+  csinfo("    GblCfg: %02x\n", regval);
 
   ret = cs2100_read_ratio(config, &ratio);
   if (ret < 0)
@@ -809,7 +809,7 @@ int cs2100_dump(FAR const struct cs2100_config_s *config)
       return ret;
     }
 
-  err("     Ratio: %04lx\n", (unsigned long)ratio);
+  csinfo("     Ratio: %04lx\n", (unsigned long)ratio);
 
   ret = cs2100_read_reg(config, CS2100_FNCCFG1, ®val);
   if (ret < 0)
@@ -818,7 +818,7 @@ int cs2100_dump(FAR const struct cs2100_config_s *config)
       return ret;
     }
 
-  err("  FuncCfg1: %02x\n", regval);
+  csinfo("  FuncCfg1: %02x\n", regval);
 
   ret = cs2100_read_reg(config, CS2100_FNCCFG2, ®val);
   if (ret < 0)
@@ -827,7 +827,7 @@ int cs2100_dump(FAR const struct cs2100_config_s *config)
       return ret;
     }
 
-  err("  FuncCfg2: %02x\n", regval);
+  csinfo("  FuncCfg2: %02x\n", regval);
 
   ret = cs2100_read_reg(config, CS2100_FNCCFG3, ®val);
   if (ret < 0)
@@ -836,7 +836,7 @@ int cs2100_dump(FAR const struct cs2100_config_s *config)
       return ret;
     }
 
-  err("  FuncCfg3: %02x\n", regval);
+  csinfo("  FuncCfg3: %02x\n", regval);
   return OK;
 }
 
diff --git a/drivers/timers/ds3231.c b/drivers/timers/ds3231.c
index f8cd2c6189..aa35fe7363 100644
--- a/drivers/timers/ds3231.c
+++ b/drivers/timers/ds3231.c
@@ -140,20 +140,20 @@ static struct ds3231_dev_s g_ds3231;
  *
  ************************************************************************************/
 
-#ifdef CONFIG_DEBUG_RTC
+#if defined(CONFIG_DEBUG_RTC) && defined(CONFIG_DEBUG_INFO)
 static void rtc_dumptime(FAR struct tm *tp, FAR const char *msg)
 {
-  rtcllerr("%s:\n", msg);
-  rtcllerr("   tm_sec: %08x\n", tp->tm_sec);
-  rtcllerr("   tm_min: %08x\n", tp->tm_min);
-  rtcllerr("  tm_hour: %08x\n", tp->tm_hour);
-  rtcllerr("  tm_mday: %08x\n", tp->tm_mday);
-  rtcllerr("   tm_mon: %08x\n", tp->tm_mon);
-  rtcllerr("  tm_year: %08x\n", tp->tm_year);
+  rtcllinfo("%s:\n", msg);
+  rtcllinfo("   tm_sec: %08x\n", tp->tm_sec);
+  rtcllinfo("   tm_min: %08x\n", tp->tm_min);
+  rtcllinfo("  tm_hour: %08x\n", tp->tm_hour);
+  rtcllinfo("  tm_mday: %08x\n", tp->tm_mday);
+  rtcllinfo("   tm_mon: %08x\n", tp->tm_mon);
+  rtcllinfo("  tm_year: %08x\n", tp->tm_year);
 #if defined(CONFIG_LIBC_LOCALTIME) || defined(CONFIG_TIME_EXTENDED)
-  rtcllerr("  tm_wday: %08x\n", tp->tm_wday);
-  rtcllerr("  tm_yday: %08x\n", tp->tm_yday);
-  rtcllerr(" tm_isdst: %08x\n", tp->tm_isdst);
+  rtcllinfo("  tm_wday: %08x\n", tp->tm_wday);
+  rtcllinfo("  tm_yday: %08x\n", tp->tm_yday);
+  rtcllinfo(" tm_isdst: %08x\n", tp->tm_isdst);
 #endif
 }
 #else
diff --git a/drivers/timers/pcf85263.c b/drivers/timers/pcf85263.c
index a72b534e8c..cc5ec728df 100644
--- a/drivers/timers/pcf85263.c
+++ b/drivers/timers/pcf85263.c
@@ -140,20 +140,20 @@ static struct pcf85263_dev_s g_pcf85263;
  *
  ************************************************************************************/
 
-#ifdef CONFIG_DEBUG_RTC
+#if defined(CONFIG_DEBUG_RTC) && defined(CONFIG_DEBUG_INFO)
 static void rtc_dumptime(FAR struct tm *tp, FAR const char *msg)
 {
-  rtcllerr("%s:\n", msg);
-  rtcllerr("   tm_sec: %08x\n", tp->tm_sec);
-  rtcllerr("   tm_min: %08x\n", tp->tm_min);
-  rtcllerr("  tm_hour: %08x\n", tp->tm_hour);
-  rtcllerr("  tm_mday: %08x\n", tp->tm_mday);
-  rtcllerr("   tm_mon: %08x\n", tp->tm_mon);
-  rtcllerr("  tm_year: %08x\n", tp->tm_year);
+  rtcllinfo("%s:\n", msg);
+  rtcllinfo("   tm_sec: %08x\n", tp->tm_sec);
+  rtcllinfo("   tm_min: %08x\n", tp->tm_min);
+  rtcllinfo("  tm_hour: %08x\n", tp->tm_hour);
+  rtcllinfo("  tm_mday: %08x\n", tp->tm_mday);
+  rtcllinfo("   tm_mon: %08x\n", tp->tm_mon);
+  rtcllinfo("  tm_year: %08x\n", tp->tm_year);
 #if defined(CONFIG_LIBC_LOCALTIME) || defined(CONFIG_TIME_EXTENDED)
-  rtcllerr("  tm_wday: %08x\n", tp->tm_wday);
-  rtcllerr("  tm_yday: %08x\n", tp->tm_yday);
-  rtcllerr(" tm_isdst: %08x\n", tp->tm_isdst);
+  rtcllinfo("  tm_wday: %08x\n", tp->tm_wday);
+  rtcllinfo("  tm_yday: %08x\n", tp->tm_yday);
+  rtcllinfo(" tm_isdst: %08x\n", tp->tm_isdst);
 #endif
 }
 #else
diff --git a/drivers/timers/timer.c b/drivers/timers/timer.c
index 6db72e795f..1a5c485a84 100644
--- a/drivers/timers/timer.c
+++ b/drivers/timers/timer.c
@@ -451,7 +451,7 @@ FAR void *timer_register(FAR const char *path,
     kmm_zalloc(sizeof(struct timer_upperhalf_s));
   if (!upper)
     {
-      tmrerr("Upper half allocation failed\n");
+      tmrerr("ERROR: Upper half allocation failed\n");
       goto errout;
     }
 
@@ -466,7 +466,7 @@ FAR void *timer_register(FAR const char *path,
   upper->path = strdup(path);
   if (!upper->path)
     {
-      tmrerr("Path allocation failed\n");
+      tmrerr("ERROR: Path allocation failed\n");
       goto errout_with_upper;
     }
 
@@ -475,7 +475,7 @@ FAR void *timer_register(FAR const char *path,
   ret = register_driver(path, &g_timerops, 0666, upper);
   if (ret < 0)
     {
-      tmrerr("register_driver failed: %d\n", ret);
+      tmrerr("ERROR: register_driver failed: %d\n", ret);
       goto errout_with_path;
     }
 
diff --git a/drivers/usbhost/usbhost_cdcacm.c b/drivers/usbhost/usbhost_cdcacm.c
index 336d9e639b..35610e1308 100644
--- a/drivers/usbhost/usbhost_cdcacm.c
+++ b/drivers/usbhost/usbhost_cdcacm.c
@@ -2002,7 +2002,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass,
   ret = usbhost_cfgdesc(priv, configdesc, desclen);
   if (ret < 0)
     {
-      uerr("usbhost_cfgdesc() failed: %d\n", ret);
+      uerr("ERROR: usbhost_cfgdesc() failed: %d\n", ret);
       goto errout;
     }
 
@@ -2021,7 +2021,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass,
   ret = usbhost_linecoding_send(priv);
   if (ret < 0)
     {
-      uerr("usbhost_linecoding_send() failed: %d\n", ret);
+      uerr("ERROR: usbhost_linecoding_send() failed: %d\n", ret);
     }
 #endif
 
@@ -2034,7 +2034,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass,
   ret = uart_register(devname, &priv->uartdev);
   if (ret < 0)
     {
-      uerr("uart_register() failed: %d\n", ret);
+      uerr("ERROR: uart_register() failed: %d\n", ret);
       goto errout;
     }
 
diff --git a/drivers/usbhost/usbhost_enumerate.c b/drivers/usbhost/usbhost_enumerate.c
index f3f3579e90..b92c0e6fc9 100644
--- a/drivers/usbhost/usbhost_enumerate.c
+++ b/drivers/usbhost/usbhost_enumerate.c
@@ -256,7 +256,7 @@ static inline int usbhost_classbind(FAR struct usbhost_hubport_s *hport,
                * should then free the allocated devclass instance.
                */
 
-              uerr("CLASS_CONNECT failed: %d\n", ret);
+              uerr("ERROR: CLASS_CONNECT failed: %d\n", ret);
               CLASS_DISCONNECTED(devclass);
             }
           else
@@ -326,14 +326,14 @@ int usbhost_enumerate(FAR struct usbhost_hubport_s *hport,
   ret = DRVR_ALLOC(hport->drvr, (FAR uint8_t **)&ctrlreq, &maxlen);
   if (ret < 0)
     {
-      uerr("DRVR_ALLOC failed: %d\n", ret);
+      uerr("ERROR: DRVR_ALLOC failed: %d\n", ret);
       return ret;
     }
 
   ret = DRVR_ALLOC(hport->drvr, &buffer, &maxlen);
   if (ret < 0)
     {
-      uerr("DRVR_ALLOC failed: %d\n", ret);
+      uerr("ERROR: DRVR_ALLOC failed: %d\n", ret);
       goto errout;
     }
 
diff --git a/drivers/usbhost/usbhost_hidkbd.c b/drivers/usbhost/usbhost_hidkbd.c
index 910438680c..3cce14abdd 100644
--- a/drivers/usbhost/usbhost_hidkbd.c
+++ b/drivers/usbhost/usbhost_hidkbd.c
@@ -1087,7 +1087,7 @@ static int usbhost_kbdpoll(int argc, char *argv[])
 
           if (nerrors > 200)
             {
-              uerr("Too many errors... aborting: %d\n", nerrors);
+              uerr("  Too many errors... aborting: %d\n", nerrors);
               break;
             }
         }
@@ -1227,7 +1227,7 @@ static int usbhost_kbdpoll(int argc, char *argv[])
       npolls++;
       if ((npolls & 31) == 0)
         {
-          uerr("Still polling: %d\n", npolls);
+          uinfo("Still polling: %d\n", npolls);
         }
 #endif
       /* Wait for the required amount (or until a signal is received).  We
@@ -1267,7 +1267,7 @@ static int usbhost_kbdpoll(int argc, char *argv[])
    * of the file descriptors are closed.
    */
 
-  uerr("Keyboard removed, polling halted\n");
+  uinfo("Keyboard removed, polling halted\n");
 
   flags = enter_critical_section();
   priv->polling = false;
@@ -1932,7 +1932,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass,
   ret = usbhost_cfgdesc(priv, configdesc, desclen);
   if (ret < 0)
     {
-      uerr("usbhost_cfgdesc() failed: %d\n", ret);
+      uerr("ERROR: usbhost_cfgdesc() failed: %d\n", ret);
     }
   else
     {
@@ -1941,7 +1941,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass,
       ret = usbhost_devinit(priv);
       if (ret < 0)
         {
-          uerr("usbhost_devinit() failed: %d\n", ret);
+          uerr("ERROR: usbhost_devinit() failed: %d\n", ret);
         }
     }
 
diff --git a/drivers/usbhost/usbhost_hidmouse.c b/drivers/usbhost/usbhost_hidmouse.c
index 50decb0e85..2c04dc4a6d 100644
--- a/drivers/usbhost/usbhost_hidmouse.c
+++ b/drivers/usbhost/usbhost_hidmouse.c
@@ -1108,7 +1108,7 @@ static int usbhost_mouse_poll(int argc, char *argv[])
             {
               if (++nerrors > 200)
                 {
-                  uerr("Too many errors... aborting: %d\n", nerrors);
+                  uerr("  Too many errors... aborting: %d\n", nerrors);
                   ret = (int)nbytes;
                   break;
                 }
@@ -1212,7 +1212,7 @@ static int usbhost_mouse_poll(int argc, char *argv[])
       npolls++;
       if ((npolls & 31) == 0)
         {
-          uerr("Still polling: %d\n", npolls);
+          uinfo("Still polling: %d\n", npolls);
         }
 #endif
     }
@@ -1233,7 +1233,7 @@ static int usbhost_mouse_poll(int argc, char *argv[])
    * of the file descriptors are closed.
    */
 
-  uerr("Mouse removed, polling halted\n");
+  uinfo("Mouse removed, polling halted\n");
 
   flags = enter_critical_section();
   priv->polling = false;
@@ -1389,7 +1389,7 @@ static int usbhost_waitsample(FAR struct usbhost_state_s *priv,
            * the failure now.
            */
 
-          ierr("sem_wait: %d\n", errno);
+          ierr("ERROR: sem_wait: %d\n", errno);
           DEBUGASSERT(errno == EINTR);
           ret = -EINTR;
           goto errout;
@@ -2002,7 +2002,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass,
   ret = usbhost_cfgdesc(priv, configdesc, desclen);
   if (ret < 0)
     {
-      uerr("usbhost_cfgdesc() failed: %d\n", ret);
+      uerr("ERROR: usbhost_cfgdesc() failed: %d\n", ret);
     }
   else
     {
@@ -2011,7 +2011,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass,
       ret = usbhost_devinit(priv);
       if (ret < 0)
         {
-          uerr("usbhost_devinit() failed: %d\n", ret);
+          uerr("ERROR: usbhost_devinit() failed: %d\n", ret);
         }
     }
 
@@ -2345,7 +2345,7 @@ static ssize_t usbhost_read(FAR struct file *filep, FAR char *buffer, size_t len
         {
           /* We might have been awakened by a signal */
 
-          ierr("usbhost_waitsample: %d\n", ret);
+          ierr("ERROR: usbhost_waitsample: %d\n", ret);
           goto errout;
         }
     }
diff --git a/drivers/usbhost/usbhost_hub.c b/drivers/usbhost/usbhost_hub.c
index 516b123094..0956bd104b 100644
--- a/drivers/usbhost/usbhost_hub.c
+++ b/drivers/usbhost/usbhost_hub.c
@@ -961,7 +961,7 @@ static void usbhost_hub_event(FAR void *arg)
         }
       else if (change)
         {
-          uerr("WARNING: status %04x change %04x not handled\n", status, change);
+          uwarn("WARNING: status %04x change %04x not handled\n", status, change);
         }
     }
 
@@ -971,7 +971,7 @@ static void usbhost_hub_event(FAR void *arg)
     {
       /* Hub status changed */
 
-      uerr("WARNING: Hub status changed, not handled\n");
+      uwarn("WARNING: Hub status changed, not handled\n");
     }
 
   /* The preceding sequence of events may take a significant amount of
diff --git a/drivers/usbhost/usbhost_skeleton.c b/drivers/usbhost/usbhost_skeleton.c
index 29fe5172a8..fa44f54109 100644
--- a/drivers/usbhost/usbhost_skeleton.c
+++ b/drivers/usbhost/usbhost_skeleton.c
@@ -955,7 +955,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass,
   ret = usbhost_cfgdesc(priv, configdesc, desclen);
   if (ret < 0)
     {
-      uerr("usbhost_cfgdesc() failed: %d\n", ret);
+      uerr("ERROR: usbhost_cfgdesc() failed: %d\n", ret);
     }
   else
     {
@@ -964,7 +964,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass,
       ret = usbhost_devinit(priv);
       if (ret < 0)
         {
-          uerr("usbhost_devinit() failed: %d\n", ret);
+          uerr("ERROR: usbhost_devinit() failed: %d\n", ret);
         }
     }
 
diff --git a/drivers/usbhost/usbhost_storage.c b/drivers/usbhost/usbhost_storage.c
index 668daa5595..13e6fae03d 100644
--- a/drivers/usbhost/usbhost_storage.c
+++ b/drivers/usbhost/usbhost_storage.c
@@ -1772,7 +1772,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass,
   ret = usbhost_cfgdesc(priv, configdesc, desclen);
   if (ret < 0)
     {
-      uerr("usbhost_cfgdesc() failed: %d\n", ret);
+      uerr("ERROR: usbhost_cfgdesc() failed: %d\n", ret);
     }
   else
     {
@@ -1781,7 +1781,7 @@ static int usbhost_connect(FAR struct usbhost_class_s *usbclass,
       ret = usbhost_initvolume(priv);
       if (ret < 0)
         {
-          uerr("usbhost_initvolume() failed: %d\n", ret);
+          uerr("ERROR: usbhost_initvolume() failed: %d\n", ret);
         }
     }
 
-- 
GitLab


From 61969a5f889990ab0e2f9357d21d0dd3ff274b73 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sun, 12 Jun 2016 08:37:03 -0600
Subject: [PATCH 39/91] Eliminate some warnings

---
 arch/arm/src/armv7-m/mpu.h           |  3 ++-
 arch/arm/src/lpc11xx/lpc11_gpiodbg.c | 17 +++++++++--------
 arch/arm/src/lpc17xx/lpc17_gpiodbg.c | 17 +++++++++--------
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/arch/arm/src/armv7-m/mpu.h b/arch/arm/src/armv7-m/mpu.h
index c58403dcf7..6f4617a670 100644
--- a/arch/arm/src/armv7-m/mpu.h
+++ b/arch/arm/src/armv7-m/mpu.h
@@ -219,8 +219,9 @@ uint32_t mpu_subregion(uintptr_t base, size_t size, uint8_t l2size);
 
 static inline void mpu_showtype(void)
 {
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_ERROR
   uint32_t regval = getreg32(MPU_TYPE);
+
   err("%s MPU Regions: data=%d instr=%d\n",
       (regval & MPU_TYPE_SEPARATE) != 0 ? "Separate" : "Unified",
       (regval & MPU_TYPE_DREGION_MASK) >> MPU_TYPE_DREGION_SHIFT,
diff --git a/arch/arm/src/lpc11xx/lpc11_gpiodbg.c b/arch/arm/src/lpc11xx/lpc11_gpiodbg.c
index c14e11a7b8..b86b4973db 100644
--- a/arch/arm/src/lpc11xx/lpc11_gpiodbg.c
+++ b/arch/arm/src/lpc11xx/lpc11_gpiodbg.c
@@ -39,6 +39,15 @@
 
 #include 
 
+/* Output debug info even if debug output is not selected. */
+
+#undef  CONFIG_DEBUG_ERROR
+#undef  CONFIG_DEBUG_WARN
+#undef  CONFIG_DEBUG_INFO
+#define CONFIG_DEBUG_ERROR 1
+#define CONFIG_DEBUG_WARN 1
+#define CONFIG_DEBUG_INFO 1
+
 #include 
 #include 
 #include 
@@ -59,14 +68,6 @@
 
 #ifdef CONFIG_DEBUG_GPIO
 
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
diff --git a/arch/arm/src/lpc17xx/lpc17_gpiodbg.c b/arch/arm/src/lpc17xx/lpc17_gpiodbg.c
index 70f8698ef0..590aa80fb1 100644
--- a/arch/arm/src/lpc17xx/lpc17_gpiodbg.c
+++ b/arch/arm/src/lpc17xx/lpc17_gpiodbg.c
@@ -39,6 +39,15 @@
 
 #include 
 
+/* Output debug info even if debug output is not selected. */
+
+#undef  CONFIG_DEBUG_ERROR
+#undef  CONFIG_DEBUG_WARN
+#undef  CONFIG_DEBUG_INFO
+#define CONFIG_DEBUG_ERROR 1
+#define CONFIG_DEBUG_WARN 1
+#define CONFIG_DEBUG_INFO 1
+
 #include 
 #include 
 #include 
@@ -59,14 +68,6 @@
 
 #ifdef CONFIG_DEBUG_GPIO
 
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
-- 
GitLab


From 0665c7e06c3ba8345097c705ddc12c41452769bf Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sun, 12 Jun 2016 09:26:00 -0600
Subject: [PATCH 40/91] drivers/: Change some nerr() ERRORS to ninfo() and
 nwarn() WARNINGS.

---
 drivers/analog/ad5410.c            |  2 +-
 drivers/analog/ads1242.c           |  8 ++---
 drivers/analog/ads1255.c           |  2 +-
 drivers/audio/audio_null.c         |  2 +-
 drivers/audio/vs1053.c             | 53 ++++++++++++++++--------------
 drivers/audio/wm8904.c             |  6 ++--
 drivers/bch/bchdev_register.c      |  4 +--
 drivers/bch/bchdev_unregister.c    |  4 +--
 drivers/bch/bchlib_read.c          |  2 +-
 drivers/bch/bchlib_setup.c         | 12 +++----
 drivers/bch/bchlib_write.c         |  4 +--
 drivers/input/ads7843e.c           | 22 ++++++-------
 drivers/input/max11802.c           | 24 +++++++-------
 drivers/input/mxt.c                | 14 ++++----
 drivers/input/stmpe811_adc.c       |  8 ++---
 drivers/input/stmpe811_base.c      |  8 ++---
 drivers/input/stmpe811_gpio.c      | 12 +++----
 drivers/input/stmpe811_tsc.c       |  2 +-
 drivers/input/tsc2007.c            | 26 +++++++--------
 drivers/lcd/ili9341.c              | 14 ++++----
 drivers/lcd/memlcd.c               | 19 +++++++----
 drivers/lcd/mio283qt2.c            |  6 ++--
 drivers/lcd/mio283qt9a.c           |  4 ++-
 drivers/lcd/nokia6100.c            | 19 +++++++----
 drivers/lcd/p14201.c               | 26 +++++++++------
 drivers/lcd/pcf8574_lcd_backpack.c |  2 ++
 drivers/lcd/ra8875.c               | 12 +++----
 drivers/lcd/skeleton.c             |  6 +++-
 drivers/lcd/ssd1289.c              | 20 ++++++-----
 drivers/lcd/ssd1306_i2c.c          |  4 +--
 drivers/lcd/ssd1351.c              |  6 ++--
 drivers/lcd/st7565.c               |  8 -----
 drivers/lcd/st7567.c               |  8 -----
 drivers/lcd/ug-9664hswag01.c       |  8 -----
 34 files changed, 196 insertions(+), 181 deletions(-)

diff --git a/drivers/analog/ad5410.c b/drivers/analog/ad5410.c
index 217a2c8a44..15ceedf4a7 100644
--- a/drivers/analog/ad5410.c
+++ b/drivers/analog/ad5410.c
@@ -256,7 +256,7 @@ static int dac_send(FAR struct dac_dev_s *dev, FAR struct dac_msg_s *msg)
 
 static int dac_ioctl(FAR struct dac_dev_s *dev, int cmd, unsigned long arg)
 {
-  err("Fix me:Not Implemented\n");
+  err("ERROR: Fix me; Not Implemented\n");
   return 0;
 }
 
diff --git a/drivers/analog/ads1242.c b/drivers/analog/ads1242.c
index b3c72852f1..d15f58e3b4 100644
--- a/drivers/analog/ads1242.c
+++ b/drivers/analog/ads1242.c
@@ -403,15 +403,15 @@ static void ads1242_print_regs(FAR struct ads1242_dev_s *dev, char const *msg)
  uint8_t mux_reg_value   = 0;
  uint8_t acr_reg_value   = 0;
 
- err("%s\n", msg);
+ info("%s\n", msg);
 
  ads1242_read_reg(dev, ADS1242_REG_SETUP, &setup_reg_value);
  ads1242_read_reg(dev, ADS1242_REG_MUX, &mux_reg_value);
  ads1242_read_reg(dev, ADS1242_REG_ACR, &acr_reg_value);
 
- err("SETUP  %02X\n", setup_reg_value);
- err("MUX    %02X\n", mux_reg_value);
- err("ACR    %02X\n", acr_reg_value);
+ info("SETUP  %02X\n", setup_reg_value);
+ info("MUX    %02X\n", mux_reg_value);
+ info("ACR    %02X\n", acr_reg_value);
 }
 #endif /* CONFIG_DEBUG_FEATURES && CONFIG_DEBUG_INFO */
 
diff --git a/drivers/analog/ads1255.c b/drivers/analog/ads1255.c
index a70ce9795b..ea70d36174 100644
--- a/drivers/analog/ads1255.c
+++ b/drivers/analog/ads1255.c
@@ -396,7 +396,7 @@ static void adc_rxint(FAR struct adc_dev_s *dev, bool enable)
 
 static int adc_ioctl(FAR struct adc_dev_s *dev, int cmd, unsigned long arg)
 {
-  err("Fix me:Not Implemented\n");
+  err("ERROR: Fix me; Not Implemented\n");
   return 0;
 }
 
diff --git a/drivers/audio/audio_null.c b/drivers/audio/audio_null.c
index 6545d7df39..d6c522101a 100644
--- a/drivers/audio/audio_null.c
+++ b/drivers/audio/audio_null.c
@@ -375,7 +375,7 @@ static int null_configure(FAR struct audio_lowerhalf_s *dev,
 #endif  /* CONFIG_AUDIO_EXCLUDE_TONE */
 
         default:
-          auderr("    Unrecognized feature unit\n");
+          auderr("    ERROR: Unrecognized feature unit\n");
           break;
         }
       break;
diff --git a/drivers/audio/vs1053.c b/drivers/audio/vs1053.c
index e52b0c388a..fd00b37444 100644
--- a/drivers/audio/vs1053.c
+++ b/drivers/audio/vs1053.c
@@ -967,7 +967,7 @@ static void vs1053_feeddata(FAR struct vs1053_struct_s *dev)
   /* Local stack copy of our active buffer */
 
   apb = dev->apb;
-  //auderr("Entry apb=%p, Bytes left=%d\n", apb, apb->nbytes - apb->curbyte);
+  //audinfo("Entry apb=%p, Bytes left=%d\n", apb, apb->nbytes - apb->curbyte);
 
   /* Setup pointer to the next sample in the buffer */
 
@@ -1039,12 +1039,16 @@ static void vs1053_feeddata(FAR struct vs1053_struct_s *dev)
                 {
                   (void)SPI_SETFREQUENCY(dev->spi, dev->spi_freq);
                   dev->hw_lower->disable(dev->hw_lower);   /* Disable the DREQ interrupt */
-                  auderr("HDAT1: 0x%0X   HDAT0: 0x%0X\n",
-                      vs1053_readreg(dev, VS1053_SCI_HDAT1),
-                      vs1053_readreg(dev, VS1053_SCI_HDAT0));
+
+                  audinfo("HDAT1: 0x%0X   HDAT0: 0x%0X\n",
+                          vs1053_readreg(dev, VS1053_SCI_HDAT1),
+                          vs1053_readreg(dev, VS1053_SCI_HDAT0));
+
                   vs1053_writereg(dev, VS1053_SCI_WRAMADDR, VS1053_END_FILL_BYTE);
                   dev->endfillchar = vs1053_readreg(dev, VS1053_SCI_WRAM) >> 8;
-                  auderr("EndFillChar: 0x%0X\n", dev->endfillchar);
+
+                  audinfo("EndFillChar: 0x%0X\n", dev->endfillchar);
+
                   reg = vs1053_readreg(dev, VS1053_SCI_MODE);
                   vs1053_writereg(dev, VS1053_SCI_MODE, reg | VS1053_SM_RESET);
 
@@ -1171,7 +1175,7 @@ static void vs1053_feeddata(FAR struct vs1053_struct_s *dev)
                   dev->lower.upper(dev->lower.priv,
                       AUDIO_CALLBACK_IOERR, NULL, ret);
 #endif
-                  auderr("I/O error!\n");
+                  auderr("ERROR: I/O error!\n");
 
                   goto err_out;
                 }
@@ -1181,7 +1185,7 @@ static void vs1053_feeddata(FAR struct vs1053_struct_s *dev)
               apb = (struct ap_buffer_s *) dq_remfirst(&dev->apbq);
               dev->apb = apb;
 
-              //auderr("Next Buffer = %p, bytes = %d\n", apb, apb ? apb->nbytes : 0);
+              //audinfo("Next Buffer = %p, bytes = %d\n", apb, apb ? apb->nbytes : 0);
               if (apb == NULL)
                 {
                   sem_post(&dev->apbq_sem);
@@ -1274,7 +1278,7 @@ static void *vs1053_workerthread(pthread_addr_t pvarg)
 #endif
   uint8_t                 timeout;
 
-  auderr("Entry\n");
+  audinfo("Entry\n");
 
 #ifndef CONFIG_AUDIO_EXCLUDE_STOP
   dev->cancelmode   = false;
@@ -1404,8 +1408,7 @@ static void *vs1053_workerthread(pthread_addr_t pvarg)
   dev->lower.upper(dev->lower.priv, AUDIO_CALLBACK_COMPLETE, NULL, OK);
 #endif
 
-  auderr("Exit\n");
-
+  audinfo("Exit\n");
   return NULL;
 }
 
@@ -1430,12 +1433,12 @@ static int vs1053_start(FAR struct audio_lowerhalf_s *lower)
   int                 ret;
   void                *value;
 
-  auderr("Entry\n");
+  audinfo("Entry\n");
 
   vs1053_spi_lock(dev->spi, dev->spi_freq);     /* Lock the device */
-  auderr("Entry HDAT1=0x%0X  HDAT0=0x%0X\n",
-      vs1053_readreg(dev, VS1053_SCI_HDAT1),
-      vs1053_readreg(dev, VS1053_SCI_HDAT0));
+  audinfo("Entry HDAT1=0x%0X  HDAT0=0x%0X\n",
+          vs1053_readreg(dev, VS1053_SCI_HDAT1),
+          vs1053_readreg(dev, VS1053_SCI_HDAT0));
   vs1053_spi_unlock(dev->spi);
 
   /* Do a soft reset, just in case */
@@ -1446,9 +1449,9 @@ static int vs1053_start(FAR struct audio_lowerhalf_s *lower)
 
   vs1053_spi_lock(dev->spi, dev->spi_freq);     /* Lock the device */
   vs1053_setfrequency(dev, CONFIG_VS1053_MP3_DECODE_FREQ);
-  auderr("Reset HDAT1=0x%0X  HDAT0=0x%0X\n",
-      vs1053_readreg(dev, VS1053_SCI_HDAT1),
-      vs1053_readreg(dev, VS1053_SCI_HDAT0));
+  audinfo("Reset HDAT1=0x%0X  HDAT0=0x%0X\n",
+          vs1053_readreg(dev, VS1053_SCI_HDAT1),
+          vs1053_readreg(dev, VS1053_SCI_HDAT0));
   vs1053_spi_unlock(dev->spi);
 
   /* Create a message queue for the worker thread */
@@ -1463,7 +1466,7 @@ static int vs1053_start(FAR struct audio_lowerhalf_s *lower)
     {
       /* Error creating message queue! */
 
-      auderr("Couldn't allocate message queue\n");
+      auderr("ERROR: Couldn't allocate message queue\n");
       return -ENOMEM;
     }
 
@@ -1477,7 +1480,7 @@ static int vs1053_start(FAR struct audio_lowerhalf_s *lower)
     }
   else
     {
-      auderr("Error getting APB Queue sem\n");
+      auderr("ERROR: Error getting APB Queue sem\n");
       return ret;
     }
 
@@ -1485,7 +1488,7 @@ static int vs1053_start(FAR struct audio_lowerhalf_s *lower)
 
   if (dev->threadid != 0)
     {
-      auderr("Joining old thread\n");
+      audinfo("Joining old thread\n");
       pthread_join(dev->threadid, &value);
     }
 
@@ -1496,17 +1499,17 @@ static int vs1053_start(FAR struct audio_lowerhalf_s *lower)
   (void)pthread_attr_setschedparam(&tattr, &sparam);
   (void)pthread_attr_setstacksize(&tattr, CONFIG_VS1053_WORKER_STACKSIZE);
 
-  auderr("Starting workerthread\n");
+  audinfo("Starting workerthread\n");
   ret = pthread_create(&dev->threadid, &tattr, vs1053_workerthread,
       (pthread_addr_t) dev);
   if (ret != OK)
     {
-      auderr("Can't create worker thread, errno=%d\n", errno);
+      auderr("ERROR: Can't create worker thread, errno=%d\n", errno);
     }
   else
     {
       pthread_setname_np(dev->threadid, "vs1053");
-      auderr("Created worker thread\n");
+      audinfo("Created worker thread\n");
     }
 
   return ret;
@@ -1896,13 +1899,13 @@ struct audio_lowerhalf_s *vs1053_initialize(FAR struct spi_dev_s *spi,
       id = (status & VS1053_SS_VER) >> VS1053_VER_SHIFT;
       if (id != VS1053_VER_VS1053)
         {
-          auderr("Unexpected VER bits: 0x%0X\n", id);
+          auderr("ERROR: Unexpected VER bits: 0x%0X\n", id);
           kmm_free(dev);
           return NULL;
         }
       else
         {
-          auderr("VS1053 Detected!\n");
+          audinfo("VS1053 Detected!\n");
         }
 
       /* Attach our ISR to this device */
diff --git a/drivers/audio/wm8904.c b/drivers/audio/wm8904.c
index 33779d5eb7..07f87741ce 100644
--- a/drivers/audio/wm8904.c
+++ b/drivers/audio/wm8904.c
@@ -283,7 +283,7 @@ uint16_t wm8904_readreg(FAR struct wm8904_dev_s *priv, uint8_t regaddr)
 #ifdef CONFIG_I2C_RESET
           /* Perhaps the I2C bus is locked up?  Try to shake the bus free */
 
-          auderr("WARNING: I2C_TRANSFER failed: %d ... Resetting\n", ret);
+          audwarn("WARNING: I2C_TRANSFER failed: %d ... Resetting\n", ret);
 
           ret = I2C_RESET(priv->i2c);
           if (ret < 0)
@@ -359,7 +359,7 @@ static void wm8904_writereg(FAR struct wm8904_dev_s *priv, uint8_t regaddr,
 #ifdef CONFIG_I2C_RESET
           /* Perhaps the I2C bus is locked up?  Try to shake the bus free */
 
-          auderr("WARNING: i2c_write failed: %d ... Resetting\n", ret);
+          audwarn("WARNING: i2c_write failed: %d ... Resetting\n", ret);
 
           ret = I2C_RESET(priv->i2c);
           if (ret < 0)
@@ -1207,7 +1207,7 @@ static int wm8904_configure(FAR struct audio_lowerhalf_s *dev,
 #endif  /* CONFIG_AUDIO_EXCLUDE_TONE */
 
         default:
-          auderr("    Unrecognized feature unit\n");
+          auderr("    ERROR: Unrecognized feature unit\n");
           ret = -ENOTTY;
           break;
         }
diff --git a/drivers/bch/bchdev_register.c b/drivers/bch/bchdev_register.c
index c92d744e84..2efb0e5338 100644
--- a/drivers/bch/bchdev_register.c
+++ b/drivers/bch/bchdev_register.c
@@ -86,7 +86,7 @@ int bchdev_register(FAR const char *blkdev, FAR const char *chardev,
   ret = bchlib_setup(blkdev, readonly, &handle);
   if (ret < 0)
     {
-      ferr("bchlib_setup failed: %d\n", -ret);
+      ferr("ERROR: bchlib_setup failed: %d\n", -ret);
       return ret;
     }
 
@@ -95,7 +95,7 @@ int bchdev_register(FAR const char *blkdev, FAR const char *chardev,
   ret = register_driver(chardev, &bch_fops, 0666, handle);
   if (ret < 0)
     {
-      ferr("register_driver failed: %d\n", -ret);
+      ferr("ERROR: register_driver failed: %d\n", -ret);
       bchlib_teardown(handle);
       handle = NULL;
     }
diff --git a/drivers/bch/bchdev_unregister.c b/drivers/bch/bchdev_unregister.c
index 3867a62974..6c2e4dd506 100644
--- a/drivers/bch/bchdev_unregister.c
+++ b/drivers/bch/bchdev_unregister.c
@@ -103,7 +103,7 @@ int bchdev_unregister(FAR const char *chardev)
   fd = open(chardev, O_RDONLY);
   if (fd < 0)
     {
-      err("Failed to open %s: %d\n", chardev, errno);
+      err("ERROR: Failed to open %s: %d\n", chardev, errno);
       return -errno;
     }
 
@@ -116,7 +116,7 @@ int bchdev_unregister(FAR const char *chardev)
 
   if (ret < 0)
     {
-      err("ioctl failed: %d\n", errno);
+      err("ERROR: ioctl failed: %d\n", errno);
       return -errno;
     }
 
diff --git a/drivers/bch/bchlib_read.c b/drivers/bch/bchlib_read.c
index 0978af9963..45804d3560 100644
--- a/drivers/bch/bchlib_read.c
+++ b/drivers/bch/bchlib_read.c
@@ -160,7 +160,7 @@ ssize_t bchlib_read(FAR void *handle, FAR char *buffer, size_t offset, size_t le
                                        sector, nsectors);
       if (ret < 0)
         {
-          ferr("Read failed: %d\n");
+          ferr("ERROR: Read failed: %d\n");
           return ret;
         }
 
diff --git a/drivers/bch/bchlib_setup.c b/drivers/bch/bchlib_setup.c
index e2924c1743..803c5058ce 100644
--- a/drivers/bch/bchlib_setup.c
+++ b/drivers/bch/bchlib_setup.c
@@ -96,7 +96,7 @@ int bchlib_setup(const char *blkdev, bool readonly, FAR void **handle)
   bch = (FAR struct bchlib_s *)kmm_zalloc(sizeof(struct bchlib_s));
   if (!bch)
     {
-      ferr("Failed to allocate BCH structure\n");
+      ferr("ERROR: Failed to allocate BCH structure\n");
       return -ENOMEM;
     }
 
@@ -105,7 +105,7 @@ int bchlib_setup(const char *blkdev, bool readonly, FAR void **handle)
   ret = open_blockdriver(blkdev, readonly ? MS_RDONLY : 0, &bch->inode);
   if (ret < 0)
     {
-      ferr("Failed to open driver %s: %d\n", blkdev, -ret);
+      ferr("ERROR: Failed to open driver %s: %d\n", blkdev, -ret);
       goto errout_with_bch;
     }
 
@@ -114,20 +114,20 @@ int bchlib_setup(const char *blkdev, bool readonly, FAR void **handle)
   ret = bch->inode->u.i_bops->geometry(bch->inode, &geo);
   if (ret < 0)
     {
-      ferr("geometry failed: %d\n", -ret);
+      ferr("ERROR: geometry failed: %d\n", -ret);
       goto errout_with_bch;
     }
 
   if (!geo.geo_available)
     {
-      ferr("geometry failed: %d\n", -ret);
+      ferr("ERROR: geometry failed: %d\n", -ret);
       ret = -ENODEV;
       goto errout_with_bch;
     }
 
   if (!readonly && (!bch->inode->u.i_bops->write || !geo.geo_writeenabled))
     {
-      ferr("write access not supported\n");
+      ferr("ERROR: write access not supported\n");
       ret = -EACCES;
       goto errout_with_bch;
     }
@@ -145,7 +145,7 @@ int bchlib_setup(const char *blkdev, bool readonly, FAR void **handle)
   bch->buffer = (FAR uint8_t *)kmm_malloc(bch->sectsize);
   if (!bch->buffer)
     {
-      ferr("Failed to allocate sector buffer\n");
+      ferr("ERROR: Failed to allocate sector buffer\n");
       ret = -ENOMEM;
       goto errout_with_bch;
     }
diff --git a/drivers/bch/bchlib_write.c b/drivers/bch/bchlib_write.c
index 06d3f39dc7..712839ef06 100644
--- a/drivers/bch/bchlib_write.c
+++ b/drivers/bch/bchlib_write.c
@@ -162,7 +162,7 @@ ssize_t bchlib_write(FAR void *handle, FAR const char *buffer, size_t offset, si
                                         sector, nsectors);
       if (ret < 0)
         {
-          ferr("Write failed: %d\n", ret);
+          ferr("ERROR: Write failed: %d\n", ret);
           return ret;
         }
 
@@ -204,7 +204,7 @@ ssize_t bchlib_write(FAR void *handle, FAR const char *buffer, size_t offset, si
   ret = bchlib_flushsector(bch);
   if (ret < 0)
     {
-      ferr("Flush failed: %d\n", ret);
+      ferr("ERROR: Flush failed: %d\n", ret);
       return ret;
     }
 
diff --git a/drivers/input/ads7843e.c b/drivers/input/ads7843e.c
index df0e24e584..0ce1f897cb 100644
--- a/drivers/input/ads7843e.c
+++ b/drivers/input/ads7843e.c
@@ -427,7 +427,7 @@ static int ads7843e_waitsample(FAR struct ads7843e_dev_s *priv,
            * the failure now.
            */
 
-          ierr("sem_wait: %d\n", errno);
+          ierr("ERROR: sem_wait: %d\n", errno);
           DEBUGASSERT(errno == EINTR);
           ret = -EINTR;
           goto errout;
@@ -498,7 +498,7 @@ static int ads7843e_schedule(FAR struct ads7843e_dev_s *priv)
   ret = work_queue(HPWORK, &priv->work, ads7843e_worker, priv, 0);
   if (ret != 0)
     {
-      illerr("Failed to queue work: %d\n", ret);
+      illerr("ERROR: Failed to queue work: %d\n", ret);
     }
 
   return OK;
@@ -870,7 +870,7 @@ static ssize_t ads7843e_read(FAR struct file *filep, FAR char *buffer, size_t le
        * handle smaller reads... but why?
        */
 
-      ierr("Unsupported read size: %d\n", len);
+      ierr("ERROR: Unsupported read size: %d\n", len);
       return -ENOSYS;
     }
 
@@ -881,7 +881,7 @@ static ssize_t ads7843e_read(FAR struct file *filep, FAR char *buffer, size_t le
     {
       /* This should only happen if the wait was cancelled by an signal */
 
-      ierr("sem_wait: %d\n", errno);
+      ierr("ERROR: sem_wait: %d\n", errno);
       DEBUGASSERT(errno == EINTR);
       return -EINTR;
     }
@@ -910,7 +910,7 @@ static ssize_t ads7843e_read(FAR struct file *filep, FAR char *buffer, size_t le
         {
           /* We might have been awakened by a signal */
 
-          ierr("ads7843e_waitsample: %d\n", ret);
+          ierr("ERROR: ads7843e_waitsample: %d\n", ret);
           goto errout;
         }
     }
@@ -1170,7 +1170,7 @@ int ads7843e_register(FAR struct spi_dev_s *spi,
   priv = (FAR struct ads7843e_dev_s *)kmm_malloc(sizeof(struct ads7843e_dev_s));
   if (!priv)
     {
-      ierr("kmm_malloc(%d) failed\n", sizeof(struct ads7843e_dev_s));
+      ierr("ERROR: kmm_malloc(%d) failed\n", sizeof(struct ads7843e_dev_s));
       return -ENOMEM;
     }
 #endif
@@ -1197,12 +1197,12 @@ int ads7843e_register(FAR struct spi_dev_s *spi,
   ret = config->attach(config, ads7843e_interrupt);
   if (ret < 0)
     {
-      ierr("Failed to attach interrupt\n");
+      ierr("ERROR: Failed to attach interrupt\n");
       goto errout_with_priv;
     }
 
-  ierr("Mode: %d Bits: 8 Frequency: %d\n",
-       CONFIG_ADS7843E_SPIMODE, CONFIG_ADS7843E_FREQUENCY);
+  iinfo("Mode: %d Bits: 8 Frequency: %d\n",
+        CONFIG_ADS7843E_SPIMODE, CONFIG_ADS7843E_FREQUENCY);
 
   /* Lock the SPI bus so that we have exclusive access */
 
@@ -1224,7 +1224,7 @@ int ads7843e_register(FAR struct spi_dev_s *spi,
   ret = register_driver(devname, &ads7843e_fops, 0666, priv);
   if (ret < 0)
     {
-      ierr("register_driver() failed: %d\n", ret);
+      ierr("ERROR: register_driver() failed: %d\n", ret);
       goto errout_with_priv;
     }
 
@@ -1246,7 +1246,7 @@ int ads7843e_register(FAR struct spi_dev_s *spi,
   ret = work_queue(HPWORK, &priv->work, ads7843e_worker, priv, 0);
   if (ret != 0)
     {
-      ierr("Failed to queue work: %d\n", ret);
+      ierr("ERROR: Failed to queue work: %d\n", ret);
       goto errout_with_priv;
     }
 
diff --git a/drivers/input/max11802.c b/drivers/input/max11802.c
index 2d579cefed..ca46086142 100644
--- a/drivers/input/max11802.c
+++ b/drivers/input/max11802.c
@@ -392,7 +392,7 @@ static int max11802_waitsample(FAR struct max11802_dev_s *priv,
            * the failure now.
            */
 
-          ierr("sem_wait: %d\n", errno);
+          ierr("ERROR: sem_wait: %d\n", errno);
           DEBUGASSERT(errno == EINTR);
           ret = -EINTR;
           goto errout;
@@ -463,7 +463,7 @@ static int max11802_schedule(FAR struct max11802_dev_s *priv)
   ret = work_queue(HPWORK, &priv->work, max11802_worker, priv, 0);
   if (ret != 0)
     {
-      illerr("Failed to queue work: %d\n", ret);
+      illerr("ERROR: Failed to queue work: %d\n", ret);
     }
 
   return OK;
@@ -877,7 +877,7 @@ static ssize_t max11802_read(FAR struct file *filep, FAR char *buffer,
        * handle smaller reads... but why?
        */
 
-      ierr("Unsupported read size: %d\n", len);
+      ierr("ERROR: Unsupported read size: %d\n", len);
       return -ENOSYS;
     }
 
@@ -888,7 +888,7 @@ static ssize_t max11802_read(FAR struct file *filep, FAR char *buffer,
     {
       /* This should only happen if the wait was cancelled by an signal */
 
-      ierr("sem_wait: %d\n", errno);
+      ierr("ERROR: sem_wait: %d\n", errno);
       DEBUGASSERT(errno == EINTR);
       return -EINTR;
     }
@@ -917,7 +917,7 @@ static ssize_t max11802_read(FAR struct file *filep, FAR char *buffer,
         {
           /* We might have been awakened by a signal */
 
-          ierr("max11802_waitsample: %d\n", ret);
+          ierr("ERROR: max11802_waitsample: %d\n", ret);
           goto errout;
         }
     }
@@ -1173,7 +1173,7 @@ int max11802_register(FAR struct spi_dev_s *spi,
   priv = (FAR struct max11802_dev_s *)kmm_malloc(sizeof(struct max11802_dev_s));
   if (!priv)
     {
-      ierr("kmm_malloc(%d) failed\n", sizeof(struct max11802_dev_s));
+      ierr("ERROR: kmm_malloc(%d) failed\n", sizeof(struct max11802_dev_s));
       return -ENOMEM;
     }
 #endif
@@ -1200,12 +1200,12 @@ int max11802_register(FAR struct spi_dev_s *spi,
   ret = config->attach(config, max11802_interrupt);
   if (ret < 0)
     {
-      ierr("Failed to attach interrupt\n");
+      ierr("ERROR: Failed to attach interrupt\n");
       goto errout_with_priv;
     }
 
-  ierr("Mode: %d Bits: 8 Frequency: %d\n",
-       CONFIG_MAX11802_SPIMODE, CONFIG_MAX11802_FREQUENCY);
+  iinfo("Mode: %d Bits: 8 Frequency: %d\n",
+        CONFIG_MAX11802_SPIMODE, CONFIG_MAX11802_FREQUENCY);
 
   /* Lock the SPI bus so that we have exclusive access */
 
@@ -1246,7 +1246,7 @@ int max11802_register(FAR struct spi_dev_s *spi,
 
   if (ret != MAX11802_MODE)
   {
-    ierr("max11802 mode readback failed: %02x\n", ret);
+    ierr("ERROR: max11802 mode readback failed: %02x\n", ret);
     goto errout_with_priv;
   }
 
@@ -1258,7 +1258,7 @@ int max11802_register(FAR struct spi_dev_s *spi,
   ret = register_driver(devname, &max11802_fops, 0666, priv);
   if (ret < 0)
     {
-      ierr("register_driver() failed: %d\n", ret);
+      ierr("ERROR: register_driver() failed: %d\n", ret);
       goto errout_with_priv;
     }
 
@@ -1281,7 +1281,7 @@ int max11802_register(FAR struct spi_dev_s *spi,
   ret = work_queue(HPWORK, &priv->work, max11802_worker, priv, 0);
   if (ret != 0)
     {
-      ierr("Failed to queue work: %d\n", ret);
+      ierr("ERROR: Failed to queue work: %d\n", ret);
       goto errout_with_priv;
     }
 
diff --git a/drivers/input/mxt.c b/drivers/input/mxt.c
index 7801b72b5b..48c3dd33aa 100644
--- a/drivers/input/mxt.c
+++ b/drivers/input/mxt.c
@@ -343,7 +343,7 @@ static int mxt_getreg(FAR struct mxt_dev_s *priv, uint16_t regaddr,
 #ifdef CONFIG_I2C_RESET
           /* Perhaps the I2C bus is locked up?  Try to shake the bus free */
 
-          ierr("WARNING: I2C_TRANSFER failed: %d ... Resetting\n", ret);
+          iwarn("WARNING: I2C_TRANSFER failed: %d ... Resetting\n", ret);
 
           ret = I2C_RESET(priv->i2c);
           if (ret < 0)
@@ -417,7 +417,7 @@ static int mxt_putreg(FAR struct mxt_dev_s *priv, uint16_t regaddr,
 #ifdef CONFIG_I2C_RESET
           /* Perhaps the I2C bus is locked up?  Try to shake the bus free */
 
-          ierr("WARNING: I2C_TRANSFER failed: %d ... Resetting\n", ret);
+          iwarn("WARNING: I2C_TRANSFER failed: %d ... Resetting\n", ret);
 
           ret = I2C_RESET(priv->i2c);
           if (ret < 0)
@@ -1097,7 +1097,7 @@ static int mxt_interrupt(FAR const struct mxt_lower_s *lower, FAR void *arg)
   ret = work_queue(HPWORK, &priv->work, mxt_worker, priv, 0);
   if (ret != 0)
     {
-      illerr("Failed to queue work: %d\n", ret);
+      illerr("ERROR: Failed to queue work: %d\n", ret);
     }
 
   /* Clear any pending interrupts and return success */
@@ -1575,7 +1575,7 @@ static int mxt_poll(FAR struct file *filep, FAR struct pollfd *fds,
 
       if ((fds->events & POLLIN) == 0)
         {
-          ierr("Missing POLLIN: revents: %08x\n", fds->revents);
+          ierr("ERROR: Missing POLLIN: revents: %08x\n", fds->revents);
           ret = -EDEADLK;
           goto errout;
         }
@@ -1600,7 +1600,7 @@ static int mxt_poll(FAR struct file *filep, FAR struct pollfd *fds,
 
       if (i >= CONFIG_MXT_NPOLLWAITERS)
         {
-          ierr("No availabled slot found: %d\n", i);
+          ierr("ERROR: No availabled slot found: %d\n", i);
           fds->priv    = NULL;
           ret          = -EBUSY;
           goto errout;
@@ -1897,7 +1897,7 @@ int mxt_register(FAR struct i2c_master_s *i2c,
   ret = MXT_ATTACH(lower, mxt_interrupt, priv);
   if (ret < 0)
     {
-      ierr("Failed to attach interrupt\n");
+      ierr("ERROR: Failed to attach interrupt\n");
       goto errout_with_priv;
     }
 
@@ -1918,7 +1918,7 @@ int mxt_register(FAR struct i2c_master_s *i2c,
   ret = register_driver(devname, &mxt_fops, 0666, priv);
   if (ret < 0)
     {
-      ierr("register_driver() failed: %d\n", ret);
+      ierr("ERROR: register_driver() failed: %d\n", ret);
       goto errout_with_hwinit;
     }
 
diff --git a/drivers/input/stmpe811_adc.c b/drivers/input/stmpe811_adc.c
index cdd2aaac2c..563ebb2651 100644
--- a/drivers/input/stmpe811_adc.c
+++ b/drivers/input/stmpe811_adc.c
@@ -101,7 +101,7 @@ int stmpe811_adcinitialize(STMPE811_HANDLE handle)
   if (ret < 0)
     {
       int errval = errno;
-      ierr("sem_wait failed: %d\n", errval);
+      ierr("ERROR: sem_wait failed: %d\n", errval);
       return -errval;
     }
 
@@ -161,7 +161,7 @@ int stmpe811_adcconfig(STMPE811_HANDLE handle, int pin)
   if (ret < 0)
     {
       int errval = errno;
-      ierr("sem_wait failed: %d\n", errval);
+      ierr("ERROR: sem_wait failed: %d\n", errval);
       return -errval;
     }
 
@@ -169,7 +169,7 @@ int stmpe811_adcconfig(STMPE811_HANDLE handle, int pin)
 
   if ((priv->inuse & pinmask) != 0)
     {
-      ierr("PIN%d is already in-use\n", pin);
+      ierr("ERROR: PIN%d is already in-use\n", pin);
       sem_post(&priv->exclsem);
       return -EBUSY;
     }
@@ -221,7 +221,7 @@ uint16_t stmpe811_adcread(STMPE811_HANDLE handle, int pin)
   if (ret < 0)
     {
       int errval = errno;
-      ierr("sem_wait failed: %d\n", errval);
+      ierr("ERROR: sem_wait failed: %d\n", errval);
       return -errval;
     }
 
diff --git a/drivers/input/stmpe811_base.c b/drivers/input/stmpe811_base.c
index d4b6d50f23..8aea42e09d 100644
--- a/drivers/input/stmpe811_base.c
+++ b/drivers/input/stmpe811_base.c
@@ -199,7 +199,7 @@ static int stmpe811_interrupt(int irq, FAR void *context)
       ret = work_queue(HPWORK, &priv->work, stmpe811_worker, priv, 0);
       if (ret != 0)
         {
-          illerr("Failed to queue work: %d\n", ret);
+          illerr("ERROR: Failed to queue work: %d\n", ret);
         }
     }
 
@@ -422,7 +422,7 @@ uint8_t stmpe811_getreg8(FAR struct stmpe811_dev_s *priv, uint8_t regaddr)
   ret = I2C_TRANSFER(priv->i2c, msg, 2);
   if (ret < 0)
     {
-      ierr("I2C_TRANSFER failed: %d\n", ret);
+      ierr("ERROR: I2C_TRANSFER failed: %d\n", ret);
       return 0;
     }
 
@@ -479,7 +479,7 @@ void stmpe811_putreg8(FAR struct stmpe811_dev_s *priv,
   ret = I2C_TRANSFER(priv->i2c, &msg, 1);
   if (ret < 0)
     {
-      ierr("I2C_TRANSFER failed: %d\n", ret);
+      ierr("ERROR: I2C_TRANSFER failed: %d\n", ret);
     }
 }
 #endif
@@ -530,7 +530,7 @@ uint16_t stmpe811_getreg16(FAR struct stmpe811_dev_s *priv, uint8_t regaddr)
   ret = I2C_TRANSFER(priv->i2c, msg, 2);
   if (ret < 0)
     {
-      ierr("I2C_TRANSFER failed: %d\n", ret);
+      ierr("ERROR: I2C_TRANSFER failed: %d\n", ret);
       return 0;
     }
 
diff --git a/drivers/input/stmpe811_gpio.c b/drivers/input/stmpe811_gpio.c
index e794f732ba..1af52ad1d7 100644
--- a/drivers/input/stmpe811_gpio.c
+++ b/drivers/input/stmpe811_gpio.c
@@ -144,7 +144,7 @@ int stmpe811_gpioconfig(STMPE811_HANDLE handle, uint8_t pinconfig)
   if (ret < 0)
     {
       int errval = errno;
-      ierr("sem_wait failed: %d\n", errval);
+      ierr("ERROR: sem_wait failed: %d\n", errval);
       return -errval;
     }
 
@@ -152,7 +152,7 @@ int stmpe811_gpioconfig(STMPE811_HANDLE handle, uint8_t pinconfig)
 
   if ((priv->inuse & pinmask) != 0)
     {
-      ierr("PIN%d is already in-use\n", pin);
+      ierr("ERROR: PIN%d is already in-use\n", pin);
       sem_post(&priv->exclsem);
       return -EBUSY;
     }
@@ -259,7 +259,7 @@ void stmpe811_gpiowrite(STMPE811_HANDLE handle, uint8_t pinconfig, bool value)
   ret = sem_wait(&priv->exclsem);
   if (ret < 0)
     {
-      ierr("sem_wait failed: %d\n", errno);
+      ierr("ERROR: sem_wait failed: %d\n", errno);
       return;
     }
 
@@ -313,7 +313,7 @@ int stmpe811_gpioread(STMPE811_HANDLE handle, uint8_t pinconfig, bool *value)
   if (ret < 0)
     {
       int errval = errno;
-      ierr("sem_wait failed: %d\n", errval);
+      ierr("ERROR: sem_wait failed: %d\n", errval);
       return -errval;
     }
 
@@ -362,7 +362,7 @@ int stmpe811_gpioattach(STMPE811_HANDLE handle, uint8_t pinconfig,
   if (ret < 0)
     {
       int errval = errno;
-      ierr("sem_wait failed: %d\n", errval);
+      ierr("ERROR: sem_wait failed: %d\n", errval);
       return -errval;
     }
 
@@ -438,7 +438,7 @@ void stmpe811_gpioworker(FAR struct stmpe811_dev_s *priv)
             }
           else
             {
-              illerr("No handler for PIN%d, GPIO_INTSTA: %02x\n", pin, regval);
+              illerr("ERROR: No handler for PIN%d, GPIO_INTSTA: %02x\n", pin, regval);
             }
 
           /* Clear the pending GPIO interrupt by writing a '1' to the
diff --git a/drivers/input/stmpe811_tsc.c b/drivers/input/stmpe811_tsc.c
index b41f325685..8ab3d8fd5a 100644
--- a/drivers/input/stmpe811_tsc.c
+++ b/drivers/input/stmpe811_tsc.c
@@ -786,7 +786,7 @@ static void stmpe811_timeout(int argc, uint32_t arg1, ...)
           ret = work_queue(HPWORK, &priv->timeout, stmpe811_timeoutworker, priv, 0);
           if (ret != 0)
             {
-              illerr("Failed to queue work: %d\n", ret);
+              illerr("ERROR: Failed to queue work: %d\n", ret);
             }
         }
     }
diff --git a/drivers/input/tsc2007.c b/drivers/input/tsc2007.c
index 1361617621..7b2e90b104 100644
--- a/drivers/input/tsc2007.c
+++ b/drivers/input/tsc2007.c
@@ -456,7 +456,7 @@ static int tsc2007_activate(FAR struct tsc2007_dev_s *priv, uint8_t cmd)
    ret = I2C_TRANSFER(priv->i2c, &msg, 1);
    if (ret < 0)
      {
-       ierr("I2C_TRANSFER failed: %d\n", ret);
+       ierr("ERROR: I2C_TRANSFER failed: %d\n", ret);
      }
    return ret;
 }
@@ -495,7 +495,7 @@ static int tsc2007_transfer(FAR struct tsc2007_dev_s *priv, uint8_t cmd)
    ret = I2C_TRANSFER(priv->i2c, &msg, 1);
    if (ret < 0)
      {
-       ierr("I2C_TRANSFER failed: %d\n", ret);
+       ierr("ERROR: I2C_TRANSFER failed: %d\n", ret);
        return ret;
      }
 
@@ -540,7 +540,7 @@ static int tsc2007_transfer(FAR struct tsc2007_dev_s *priv, uint8_t cmd)
    ret = I2C_TRANSFER(priv->i2c, &msg, 1);
    if (ret < 0)
      {
-       ierr("I2C_TRANSFER failed: %d\n", ret);
+       ierr("ERROR: I2C_TRANSFER failed: %d\n", ret);
        return ret;
      }
 
@@ -672,7 +672,7 @@ static void tsc2007_worker(FAR void *arg)
 
       if (z1 == 0)
         {
-          ierr("Z1 zero\n");
+          ierr("ERROR: Z1 zero\n");
           pressure = 0;
         }
       else
@@ -687,7 +687,7 @@ static void tsc2007_worker(FAR void *arg)
 
           if (pressure > 0x0fff)
             {
-              ierr("Dropped out-of-range pressure: %d\n", pressure);
+              ierr("ERROR: Dropped out-of-range pressure: %d\n", pressure);
               pressure = 0;
             }
         }
@@ -783,7 +783,7 @@ static int tsc2007_interrupt(int irq, FAR void *context)
   ret = work_queue(HPWORK, &priv->work, tsc2007_worker, priv, 0);
   if (ret != 0)
     {
-      illerr("Failed to queue work: %d\n", ret);
+      illerr("ERROR: Failed to queue work: %d\n", ret);
     }
 
   /* Clear any pending interrupts and return success */
@@ -1131,7 +1131,7 @@ static int tsc2007_poll(FAR struct file *filep, FAR struct pollfd *fds,
 
       if ((fds->events & POLLIN) == 0)
         {
-          ierr("Missing POLLIN: revents: %08x\n", fds->revents);
+          ierr("ERROR: Missing POLLIN: revents: %08x\n", fds->revents);
           ret = -EDEADLK;
           goto errout;
         }
@@ -1156,7 +1156,7 @@ static int tsc2007_poll(FAR struct file *filep, FAR struct pollfd *fds,
 
       if (i >= CONFIG_TSC2007_NPOLLWAITERS)
         {
-          ierr("No availabled slot found: %d\n", i);
+          ierr("ERROR: No available slot found: %d\n", i);
           fds->priv    = NULL;
           ret          = -EBUSY;
           goto errout;
@@ -1242,7 +1242,7 @@ int tsc2007_register(FAR struct i2c_master_s *dev,
   priv = (FAR struct tsc2007_dev_s *)kmm_malloc(sizeof(struct tsc2007_dev_s));
   if (!priv)
     {
-      ierr("kmm_malloc(%d) failed\n", sizeof(struct tsc2007_dev_s));
+      ierr("ERROR: kmm_malloc(%d) failed\n", sizeof(struct tsc2007_dev_s));
       return -ENOMEM;
     }
 #endif
@@ -1265,7 +1265,7 @@ int tsc2007_register(FAR struct i2c_master_s *dev,
   ret = config->attach(config, tsc2007_interrupt);
   if (ret < 0)
     {
-      ierr("Failed to attach interrupt\n");
+      ierr("ERROR: Failed to attach interrupt\n");
       goto errout_with_priv;
     }
 
@@ -1276,7 +1276,7 @@ int tsc2007_register(FAR struct i2c_master_s *dev,
   ret = tsc2007_transfer(priv, TSC2007_ENABLE_PENIRQ);
   if (ret < 0)
     {
-      ierr("tsc2007_transfer failed: %d\n", ret);
+      ierr("ERROR: tsc2007_transfer failed: %d\n", ret);
       goto errout_with_priv;
     }
 
@@ -1288,7 +1288,7 @@ int tsc2007_register(FAR struct i2c_master_s *dev,
   ret = register_driver(devname, &tsc2007_fops, 0666, priv);
   if (ret < 0)
     {
-      ierr("register_driver() failed: %d\n", ret);
+      ierr("ERROR: register_driver() failed: %d\n", ret);
       goto errout_with_priv;
     }
 
@@ -1311,7 +1311,7 @@ int tsc2007_register(FAR struct i2c_master_s *dev,
   ret = work_queue(HPWORK, &priv->work, tsc2007_worker, priv, 0);
   if (ret != 0)
     {
-      ierr("Failed to queue work: %d\n", ret);
+      ierr("ERROR: Failed to queue work: %d\n", ret);
       goto errout_with_priv;
     }
 
diff --git a/drivers/lcd/ili9341.c b/drivers/lcd/ili9341.c
index af6ffaef16..a920a12f0a 100644
--- a/drivers/lcd/ili9341.c
+++ b/drivers/lcd/ili9341.c
@@ -371,9 +371,11 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcderr       err
+#  define lcdinfo      warn
 #  define lcdinfo      info
 #else
 #  define lcderr(x...)
+#  define lcdwarn(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -772,7 +774,7 @@ static int ili9341_hwinitialize(FAR struct ili9341_dev_s *dev)
 
   /* Select spi device */
 
-  lcderr("Initialize lcd driver\n");
+  lcdinfo("Initialize lcd driver\n");
   lcd->select(lcd);
 
 #ifdef CONFIG_DEBUG_LCD
@@ -780,13 +782,13 @@ static int ili9341_hwinitialize(FAR struct ili9341_dev_s *dev)
 
   lcd->sendcmd(lcd, ILI9341_READ_ID1);
   lcd->recvparam(lcd, ¶m);
-  lcderr("ili9341 LCD driver: LCD modules manufacturer ID: %d\n", param);
+  lcdinfo("ili9341 LCD driver: LCD modules manufacturer ID: %d\n", param);
   lcd->sendcmd(lcd, ILI9341_READ_ID2);
   lcd->recvparam(lcd, ¶m);
-  lcderr("ili9341 LCD driver: LCD modules driver version ID: %d\n", param);
+  lcdinfo("ili9341 LCD driver: LCD modules driver version ID: %d\n", param);
   lcd->sendcmd(lcd, ILI9341_READ_ID3);
   lcd->recvparam(lcd, ¶m);
-  lcderr("ili9341 LCD driver: LCD modules driver ID: %d\n", param);
+  lcdinfo("ili9341 LCD driver: LCD modules driver ID: %d\n", param);
 #endif
 
   /* Reset the lcd display to the default state */
@@ -1020,7 +1022,7 @@ static int ili9341_getpower(FAR struct lcd_dev_s *dev)
 
   if (priv)
     {
-      lcderr("%d\n", priv->power);
+      lcdinfo("%d\n", priv->power);
 
       return priv->power;
     }
@@ -1053,7 +1055,7 @@ static int ili9341_setpower(FAR struct lcd_dev_s *dev, int power)
 
   if (dev)
     {
-      lcderr("%d\n", power);
+      lcdinfo("%d\n", power);
 
       lcd->select(lcd);
 
diff --git a/drivers/lcd/memlcd.c b/drivers/lcd/memlcd.c
index 37d76345fb..b9e31ed75c 100644
--- a/drivers/lcd/memlcd.c
+++ b/drivers/lcd/memlcd.c
@@ -113,9 +113,11 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcderr(format, ...)  err(format, ##__VA_ARGS__)
+#  define lcdwarn(format, ...) warn(format, ##__VA_ARGS__)
 #  define lcdinfo(format, ...) info(format, ##__VA_ARGS__)
 #else
 #  define lcderr(x...)
+#  define lcdwarn(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -339,7 +341,8 @@ static void memlcd_deselect(FAR struct spi_dev_s *spi)
 static inline void memlcd_clear(FAR struct memlcd_dev_s *mlcd)
 {
   uint16_t cmd = MEMLCD_CMD_ALL_CLEAR;
-  lcderr("Clear display\n");
+
+  lcdinfo("Clear display\n");
   memlcd_select(mlcd->spi);
   /* XXX Ensure 2us here */
   SPI_SNDBLOCK(mlcd->spi, &cmd, 2);
@@ -593,8 +596,9 @@ static int memlcd_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
 static int memlcd_getpower(FAR struct lcd_dev_s *dev)
 {
   FAR struct memlcd_dev_s *mlcd = (FAR struct memlcd_dev_s *)dev;
+
   DEBUGASSERT(mlcd);
-  lcderr("%d\n", mlcd->power);
+  lcdinfo("%d\n", mlcd->power);
   return mlcd->power;
 }
 
@@ -610,8 +614,9 @@ static int memlcd_getpower(FAR struct lcd_dev_s *dev)
 static int memlcd_setpower(FAR struct lcd_dev_s *dev, int power)
 {
   struct memlcd_dev_s *mlcd = (struct memlcd_dev_s *)dev;
+
   DEBUGASSERT(mlcd && (unsigned)power <= CONFIG_LCD_MAXPOWER && mlcd->spi);
-  lcderr("%d\n", power);
+  lcdinfo("%d\n", power);
   mlcd->power = power;
 
   if (power > 0)
@@ -638,8 +643,9 @@ static int memlcd_setpower(FAR struct lcd_dev_s *dev, int power)
 static int memlcd_getcontrast(struct lcd_dev_s *dev)
 {
   struct memlcd_dev_s *mlcd = (struct memlcd_dev_s *)dev;
+
   DEBUGASSERT(mlcd);
-  lcderr("contrast: %d\n", mlcd->contrast);
+  lcdinfo("contrast: %d\n", mlcd->contrast);
   return mlcd->contrast;
 }
 
@@ -654,8 +660,9 @@ static int memlcd_getcontrast(struct lcd_dev_s *dev)
 static int memlcd_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
 {
   struct memlcd_dev_s *mlcd = (struct memlcd_dev_s *)dev;
+
   DEBUGASSERT(mlcd);
-  lcderr("contrast: %d\n", contrast);
+  lcdinfo("contrast: %d\n", contrast);
   if (contrast > MEMLCD_MAXCONTRAST)
     {
       contrast = MEMLCD_MAXCONTRAST;
@@ -710,6 +717,6 @@ FAR struct lcd_dev_s *memlcd_initialize(FAR struct spi_dev_s *spi,
 
   mlcd->priv->attachirq(memlcd_extcominisr);
 
-  lcderr("done\n");
+  lcdinfo("done\n");
   return &mlcd->dev;
 }
diff --git a/drivers/lcd/mio283qt2.c b/drivers/lcd/mio283qt2.c
index 531f83e6d0..96f97b6109 100644
--- a/drivers/lcd/mio283qt2.c
+++ b/drivers/lcd/mio283qt2.c
@@ -241,9 +241,11 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcderr              err
+#  define lcdwarn             warn
 #  define lcdinfo             info
 #else
 #  define lcderr(x...)
+#  define lcdwarn(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -820,7 +822,7 @@ static inline int mio283qt2_hwinitialize(FAR struct mio283qt2_dev_s *priv)
 
 #ifndef CONFIG_LCD_NOGETRUN
   id = mio283qt2_readreg(lcd, 0x00);
-  lcderr("LCD ID: %04x\n", id);
+  lcdinfo("LCD ID: %04x\n", id);
 
   /* Check if the ID is for the MIO283QT2 */
 
@@ -926,7 +928,7 @@ static inline int mio283qt2_hwinitialize(FAR struct mio283qt2_dev_s *priv)
 #ifndef CONFIG_LCD_NOGETRUN
   else
     {
-      lcderr("Unsupported LCD type\n");
+      lcderr("ERROR: Unsupported LCD type\n");
       ret = -ENODEV;
     }
 #endif
diff --git a/drivers/lcd/mio283qt9a.c b/drivers/lcd/mio283qt9a.c
index e4eb342a69..9b50bc183d 100644
--- a/drivers/lcd/mio283qt9a.c
+++ b/drivers/lcd/mio283qt9a.c
@@ -140,9 +140,11 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcderr              err
+#  define lcdwarn             warn
 #  define lcdinfo             info
 #else
 #  define lcderr(x...)
+#  define lcdwarn(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -819,7 +821,7 @@ static inline int mio283qt9a_hwinitialize(FAR struct mio283qt9a_dev_s *priv)
 #ifndef CONFIG_LCD_NOGETRUN
   else
     {
-      lcderr("Unsupported LCD type\n");
+      lcderr("ERROR: Unsupported LCD type\n");
       ret = -ENODEV;
     }
 #endif
diff --git a/drivers/lcd/nokia6100.c b/drivers/lcd/nokia6100.c
index 227220d6f3..eafcb10fd8 100644
--- a/drivers/lcd/nokia6100.c
+++ b/drivers/lcd/nokia6100.c
@@ -308,9 +308,13 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_LCD_REGDEBUG
-# define lcderr(format, ...) llinfo(format, ##__VA_ARGS__)
+# define lcderr(format, ...)  llerr(format, ##__VA_ARGS__)
+# define lcdwarn(format, ...) llwarn(format, ##__VA_ARGS__)
+# define lcdinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 # define lcderr(x...)
+# define lcdwarn(x...)
+# define lcdinfo(x...)
 #endif
 
 /**************************************************************************************
@@ -666,7 +670,8 @@ static void nokia_select(FAR struct spi_dev_s *spi)
    * devices competing for the SPI bus
    */
 
-  lcderr("SELECTED\n");
+  lcdinfo("SELECTED\n");
+
   SPI_LOCK(spi, true);
   SPI_SELECT(spi, SPIDEV_DISPLAY, true);
 
@@ -700,7 +705,8 @@ static void nokia_deselect(FAR struct spi_dev_s *spi)
 {
   /* De-select Nokia 6100 chip and relinquish the SPI bus. */
 
-  lcderr("DE-SELECTED\n");
+  lcdinfo("DE-SELECTED\n");
+
   SPI_SELECT(spi, SPIDEV_DISPLAY, false);
   SPI_LOCK(spi, false);
 }
@@ -717,7 +723,8 @@ static void nokia_sndcmd(FAR struct spi_dev_s *spi, const uint8_t cmd)
 {
   /* Select the LCD */
 
-  lcderr("cmd: %02x\n", cmd);
+  lcdinfo("cmd: %02x\n", cmd);
+
   nokia_select(spi);
 
   /* Send the command. Bit 8 == 0 denotes a command */
@@ -743,7 +750,7 @@ static void nokia_cmddata(FAR struct spi_dev_s *spi, uint8_t cmd, int datlen,
   uint16_t *rowbuf = g_rowbuf;
   int i;
 
-  lcderr("cmd: %02x datlen: %d\n", cmd, datlen);
+  lcdinfo("cmd: %02x datlen: %d\n", cmd, datlen);
   DEBUGASSERT(datlen <= NOKIA_STRIDE);
 
   /* Copy the command into the line buffer. Bit 8 == 0 denotes a command. */
@@ -800,7 +807,7 @@ static void nokia_cmdarray(FAR struct spi_dev_s *spi, int len, const uint8_t *cm
 
   for (i = 0; i < len; i++)
     {
-      lcderr("cmddata[%d]: %02x\n", i, cmddata[i]);
+      lcdinfo("cmddata[%d]: %02x\n", i, cmddata[i]);
     }
 #endif
   nokia_cmddata(spi, cmddata[0], len-1, &cmddata[1]);
diff --git a/drivers/lcd/p14201.c b/drivers/lcd/p14201.c
index ad1513e05d..f7d2d91b97 100644
--- a/drivers/lcd/p14201.c
+++ b/drivers/lcd/p14201.c
@@ -180,9 +180,13 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_LCD_RITDEBUG
-#  define riterr(format, ...)  info(format, ##__VA_ARGS__)
+#  define riterr(format, ...)  err(format, ##__VA_ARGS__)
+#  define ritwarn(format, ...) warn(format, ##__VA_ARGS__)
+#  define ritinfo(format, ...) info(format, ##__VA_ARGS__)
 #else
 #  define riterr(x...)
+#  define ritwarn(x...)
+#  define ritinfo(x...)
 #endif
 
 /**************************************************************************************
@@ -508,8 +512,8 @@ static void rit_sndbytes(FAR struct rit_dev_s *priv, FAR const uint8_t *buffer,
   FAR struct spi_dev_s *spi = priv->spi;
   uint8_t tmp;
 
-  riterr("buflen: %d cmd: %s [%02x %02x %02x]\n",
-         buflen, cmd ? "YES" : "NO", buffer[0], buffer[1], buffer[2]);
+  ritinfo("buflen: %d cmd: %s [%02x %02x %02x]\n",
+          buflen, cmd ? "YES" : "NO", buffer[0], buffer[1], buffer[2]);
   DEBUGASSERT(spi);
 
   /* Clear/set the D/Cn bit to enable command or data mode */
@@ -552,7 +556,8 @@ static void rit_sndcmds(FAR struct rit_dev_s *priv, FAR const uint8_t *table)
 
   while ((cmdlen = *table++) != 0)
     {
-      riterr("command: %02x cmdlen: %d\n", *table, cmdlen);
+      ritinfo("command: %02x cmdlen: %d\n", *table, cmdlen);
+
       rit_sndcmd(priv, table, cmdlen);
       table += cmdlen;
     }
@@ -578,7 +583,7 @@ static inline void rit_clear(FAR struct rit_dev_s *priv)
   FAR uint8_t *ptr = g_framebuffer;
   unsigned int row;
 
-  riterr("Clear display\n");
+  ritinfo("Clear display\n");
 
   /* Initialize the framebuffer */
 
@@ -605,7 +610,7 @@ static inline void rit_clear(FAR struct rit_dev_s *priv)
 {
   unsigned int row;
 
-  riterr("Clear display\n");
+  ritinfo("Clear display\n");
 
   /* Create a black row */
 
@@ -655,7 +660,7 @@ static int rit_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer,
   int aend;
   int i;
 
-  riterr("row: %d col: %d npixels: %d\n", row, col, npixels);
+  ritinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer);
 
   /* Toss out the special case of the empty run now */
@@ -678,7 +683,8 @@ static int rit_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer,
   start = col >> 1;
   aend  = (col + npixels) >> 1;
   end   = (col + npixels + 1) >> 1;
-  riterr("start: %d aend: %d end: %d\n", start, aend, end);
+
+  ritinfo("start: %d aend: %d end: %d\n", start, aend, end);
 
   /* Copy the run into the framebuffer, handling nibble alignment.
    *
@@ -814,7 +820,7 @@ static int rit_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer,
   FAR struct rit_dev_s *priv = (FAR struct rit_dev_s *)&g_oleddev;
   uint8_t cmd[3];
 
-  riterr("row: %d col: %d npixels: %d\n", row, col, npixels);
+  ritinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer);
 
   if (npixels > 0)
@@ -885,7 +891,7 @@ static int rit_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
   int aend;
   int i;
 
-  riterr("row: %d col: %d npixels: %d\n", row, col, npixels);
+  ritinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer);
 
   /* Can't read from OLED GDDRAM in SPI mode, but we can read from the framebuffer */
diff --git a/drivers/lcd/pcf8574_lcd_backpack.c b/drivers/lcd/pcf8574_lcd_backpack.c
index e0fa2315fa..9f802aa1b1 100644
--- a/drivers/lcd/pcf8574_lcd_backpack.c
+++ b/drivers/lcd/pcf8574_lcd_backpack.c
@@ -80,9 +80,11 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcderr            err
+#  define lcdwarn           warn
 #  define lcdinfo           info
 #else
 #  define lcderr(x...)
+#  define lcdwarn(x...)
 #  define lcdinfo(x...)
 #endif
 
diff --git a/drivers/lcd/ra8875.c b/drivers/lcd/ra8875.c
index 96c7a637ff..a046c7af64 100644
--- a/drivers/lcd/ra8875.c
+++ b/drivers/lcd/ra8875.c
@@ -574,18 +574,18 @@ static void ra8875_showrun(FAR struct ra8875_dev_s *priv, fb_coord_t row,
 
       if (priv->firstrow != priv->lastrow)
         {
-          lcderr("...\n");
-          lcderr("%s row: %d col: %d npixels: %d\n",
-                 priv->put ? "PUT" : "GET",
-                 priv->lastrow, priv->col, priv->npixels);
+          lcdinfo("...\n");
+          lcdinfo("%s row: %d col: %d npixels: %d\n",
+                  priv->put ? "PUT" : "GET",
+                  priv->lastrow, priv->col, priv->npixels);
         }
 
       /* And we are starting a new sequence.  Output the first run of the
        * new sequence
        */
 
-      lcderr("%s row: %d col: %d npixels: %d\n",
-             put ? "PUT" : "GET", row, col, npixels);
+      lcdinfo("%s row: %d col: %d npixels: %d\n",
+              put ? "PUT" : "GET", row, col, npixels);
 
       /* And save information about the run so that we can detect continuations
        * of the sequence.
diff --git a/drivers/lcd/skeleton.c b/drivers/lcd/skeleton.c
index 53b343b3a6..3bcfc9bcf1 100644
--- a/drivers/lcd/skeleton.c
+++ b/drivers/lcd/skeleton.c
@@ -90,9 +90,13 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_LCD_SKELDEBUG
-# define skelerr(format, ...)  info(format, ##__VA_ARGS__)
+# define skelerr(format, ...)  err(format, ##__VA_ARGS__)
+# define skelwarn(format, ...) warn(format, ##__VA_ARGS__)
+# define skelinfo(format, ...) info(format, ##__VA_ARGS__)
 #else
 # define skelerr(x...)
+# define skelwarn(x...)
+# define skelinfo(x...)
 #endif
 
 /**************************************************************************************
diff --git a/drivers/lcd/ssd1289.c b/drivers/lcd/ssd1289.c
index fcd124f6dc..ea89ce3929 100644
--- a/drivers/lcd/ssd1289.c
+++ b/drivers/lcd/ssd1289.c
@@ -230,9 +230,11 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcderr  err
+#  define lcdwarn  warn
 #  define lcdinfo info
 #else
 #  define lcderr(x...)
+#  define lcdwarn(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -543,18 +545,18 @@ static void ssd1289_showrun(FAR struct ssd1289_dev_s *priv, fb_coord_t row,
 
       if (priv->firstrow != priv->lastrow)
         {
-          lcderr("...\n");
-          lcderr("%s row: %d col: %d npixels: %d\n",
-                 priv->put ? "PUT" : "GET",
-                 priv->lastrow, priv->col, priv->npixels);
+          lcdinfo("...\n");
+          lcdinfo("%s row: %d col: %d npixels: %d\n",
+                  priv->put ? "PUT" : "GET",
+                  priv->lastrow, priv->col, priv->npixels);
         }
 
       /* And we are starting a new sequence.  Output the first run of the
        * new sequence
        */
 
-      lcderr("%s row: %d col: %d npixels: %d\n",
-             put ? "PUT" : "GET", row, col, npixels);
+      lcdinfo("%s row: %d col: %d npixels: %d\n",
+              put ? "PUT" : "GET", row, col, npixels);
 
       /* And save information about the run so that we can detect continuations
        * of the sequence.
@@ -1020,7 +1022,7 @@ static inline int ssd1289_hwinitialize(FAR struct ssd1289_dev_s *priv)
   id = ssd1289_readreg(lcd, SSD1289_DEVCODE);
   if (id != 0)
     {
-      lcderr("LCD ID: %04x\n", id);
+      lcdinfo("LCD ID: %04x\n", id);
     }
 
   /* If we could not get the ID, then let's just assume that this is an SSD1289.
@@ -1030,7 +1032,7 @@ static inline int ssd1289_hwinitialize(FAR struct ssd1289_dev_s *priv)
 
   else
     {
-      lcderr("No LCD ID, assuming SSD1289\n");
+      lcdwarn("WARNING: No LCD ID, assuming SSD1289\n");
       id = SSD1289_DEVCODE_VALUE;
     }
 
@@ -1273,7 +1275,7 @@ static inline int ssd1289_hwinitialize(FAR struct ssd1289_dev_s *priv)
 #ifndef CONFIG_LCD_NOGETRUN
   else
     {
-      lcderr("Unsupported LCD type\n");
+      lcderr("ERROR: Unsupported LCD type\n");
       ret = -ENODEV;
     }
 #endif
diff --git a/drivers/lcd/ssd1306_i2c.c b/drivers/lcd/ssd1306_i2c.c
index a3c30fd702..343a0e3199 100644
--- a/drivers/lcd/ssd1306_i2c.c
+++ b/drivers/lcd/ssd1306_i2c.c
@@ -94,7 +94,7 @@ void ssd1306_sendbyte(FAR struct ssd1306_dev_s *priv, uint8_t regval)
   ret = I2C_TRANSFER(priv->i2c, &msg, 1);
   if (ret < 0)
     {
-      snerr("I2C_TRANSFER failed: %d\n", ret);
+      snerr("ERROR: I2C_TRANSFER failed: %d\n", ret);
     }
 }
 
@@ -130,7 +130,7 @@ void ssd1306_sendblk(FAR struct ssd1306_dev_s *priv, uint8_t *data, uint8_t len)
   ret = I2C_TRANSFER(priv->i2c, &msg, 1);
   if (ret < 0)
     {
-      snerr("I2C_TRANSFER failed: %d\n", ret);
+      snerr("ERROR: I2C_TRANSFER failed: %d\n", ret);
     }
 }
 
diff --git a/drivers/lcd/ssd1351.c b/drivers/lcd/ssd1351.c
index a9e799e7ca..f88c85ff85 100644
--- a/drivers/lcd/ssd1351.c
+++ b/drivers/lcd/ssd1351.c
@@ -499,7 +499,8 @@ static void ssd1351_select(FAR struct ssd1351_dev_s *priv)
    * competing for the SPI bus
    */
 
-  gerr("SELECTED\n");
+  ginfo("SELECTED\n");
+
   SPI_LOCK(spi, true);
   SPI_SELECT(spi, SPIDEV_DISPLAY, true);
 
@@ -529,7 +530,8 @@ static void ssd1351_deselect(FAR struct ssd1351_dev_s *priv)
 
   /* De-select the chip and relinquish the SPI bus */
 
-  gerr("DE-SELECTED\n");
+  ginfo("DE-SELECTED\n");
+
   SPI_SELECT(spi, SPIDEV_DISPLAY, false);
   SPI_LOCK(spi, false);
 }
diff --git a/drivers/lcd/st7565.c b/drivers/lcd/st7565.c
index b50b873647..0e52b58a3e 100644
--- a/drivers/lcd/st7565.c
+++ b/drivers/lcd/st7565.c
@@ -176,14 +176,6 @@
 #define LS_BIT          (1 << 0)
 #define MS_BIT          (1 << 7)
 
-/* Debug ******************************************************************************/
-
-#ifdef CONFIG_LCD_ST7565DEBUG
-#  define st7565err(format, ...)  info(format, ##__VA_ARGS__)
-#else
-#  define st7565err(x...)
-#endif
-
 /**************************************************************************************
  * Private Type Definition
  **************************************************************************************/
diff --git a/drivers/lcd/st7567.c b/drivers/lcd/st7567.c
index 05bce776f9..a1f8b13661 100644
--- a/drivers/lcd/st7567.c
+++ b/drivers/lcd/st7567.c
@@ -206,14 +206,6 @@
 #define LS_BIT          (1 << 0)
 #define MS_BIT          (1 << 7)
 
-/* Debug ******************************************************************************/
-
-#ifdef CONFIG_LCD_ST7567DEBUG
-# define st7567err(format, ...)  info(format, ##__VA_ARGS__)
-#else
-# define st7567err(x...)
-#endif
-
 /**************************************************************************************
  * Private Type Definition
  **************************************************************************************/
diff --git a/drivers/lcd/ug-9664hswag01.c b/drivers/lcd/ug-9664hswag01.c
index b93b5e60f3..e69694367e 100644
--- a/drivers/lcd/ug-9664hswag01.c
+++ b/drivers/lcd/ug-9664hswag01.c
@@ -221,14 +221,6 @@
 #define LS_BIT          (1 << 0)
 #define MS_BIT          (1 << 7)
 
-/* Debug ******************************************************************************/
-
-#ifdef CONFIG_DEBUG_LCD
-# define lcderr(format, ...)  info(format, ##__VA_ARGS__)
-#else
-# define lcderr(x...)
-#endif
-
 /**************************************************************************************
  * Private Type Definition
  **************************************************************************************/
-- 
GitLab


From b29a4dd49c7244c6aaac5191c4754f897515598a Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sun, 12 Jun 2016 09:46:23 -0600
Subject: [PATCH 41/91] audio/, crypto/, libnx/, and mm/: Change some err()
 ERRORS to warn() WARNINGS or info()

---
 audio/audio.c                   |  4 ++--
 audio/pcm_decode.c              | 36 ++++++++++++++++-----------------
 crypto/crypto.c                 |  2 +-
 crypto/testmngr.c               |  4 ++--
 libnx/nxfonts/nxfonts_getfont.c |  6 +++---
 libnx/nxmu/nx_bitmap.c          |  2 +-
 libnx/nxmu/nx_connect.c         |  8 ++++----
 libnx/nxmu/nx_eventhandler.c    |  5 +++--
 libnx/nxmu/nx_getrectangle.c    |  2 +-
 libnx/nxmu/nxmu_sendserver.c    |  2 +-
 libxx/libxx_new.cxx             |  2 +-
 libxx/libxx_newa.cxx            |  2 +-
 libxx/libxx_stdthrow.cxx        |  8 ++++----
 mm/mm_gran/mm_gran.h            |  8 ++++++--
 mm/mm_gran/mm_pgalloc.c         |  8 ++++++--
 mm/mm_heap/mm_initialize.c      |  4 ++--
 mm/mm_heap/mm_malloc.c          |  2 +-
 mm/mm_heap/mm_sem.c             |  8 ++++----
 mm/shm/shm_initialize.c         |  2 +-
 mm/shm/shmat.c                  |  6 +++---
 mm/shm/shmctl.c                 |  4 ++--
 mm/shm/shmdt.c                  |  6 +++---
 mm/shm/shmget.c                 |  8 ++++----
 23 files changed, 74 insertions(+), 65 deletions(-)

diff --git a/audio/audio.c b/audio/audio.c
index 8b35368174..184ef74a6f 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -832,7 +832,7 @@ static void audio_callback(FAR void *handle, uint16_t reason,
 
       default:
         {
-          auderr("Unknown callback reason code %d\n", reason);
+          auderr("ERROR: Unknown callback reason code %d\n", reason);
           break;
         }
     }
@@ -885,7 +885,7 @@ int audio_register(FAR const char *name, FAR struct audio_lowerhalf_s *dev)
   upper = (FAR struct audio_upperhalf_s *)kmm_zalloc(sizeof(struct audio_upperhalf_s));
   if (!upper)
     {
-      auderr("Allocation failed\n");
+      auderr("ERROR: Allocation failed\n");
       return -ENOMEM;
     }
 
diff --git a/audio/pcm_decode.c b/audio/pcm_decode.c
index 28dafc41a9..a9d739dd44 100644
--- a/audio/pcm_decode.c
+++ b/audio/pcm_decode.c
@@ -259,23 +259,23 @@ static void pcm_callback(FAR void *arg, uint16_t reason,
 #ifdef CONFIG_PCM_DEBUG
 static void pcm_dump(FAR const struct wav_header_s *wav)
 {
-  err("Wave file header\n");
-  err("  Header Chunk:\n");
-  err("    Chunk ID:        0x%08x\n", wav->hdr.chunkid);
-  err("    Chunk Size:      %u\n",     wav->hdr.chunklen);
-  err("    Format:          0x%08x\n", wav->hdr.format);
-  err("  Format Chunk:\n");
-  err("    Chunk ID:        0x%08x\n", wav->fmt.chunkid);
-  err("    Chunk Size:      %u\n",     wav->fmt.chunklen);
-  err("    Audio Format:    0x%04x\n", wav->fmt.format);
-  err("    Num. Channels:   %d\n",     wav->fmt.nchannels);
-  err("    Sample Rate:     %u\n",     wav->fmt.samprate);
-  err("    Byte Rate:       %u\n",     wav->fmt.byterate);
-  err("    Block Align:     %d\n",     wav->fmt.align);
-  err("    Bits Per Sample: %d\n",     wav->fmt.bpsamp);
-  err("  Data Chunk:\n");
-  err("    Chunk ID:        0x%08x\n", wav->data.chunkid);
-  err("    Chunk Size:      %u\n",     wav->data.chunklen);
+  info("Wave file header\n");
+  info("  Header Chunk:\n");
+  info("    Chunk ID:        0x%08x\n", wav->hdr.chunkid);
+  info("    Chunk Size:      %u\n",     wav->hdr.chunklen);
+  info("    Format:          0x%08x\n", wav->hdr.format);
+  info("  Format Chunk:\n");
+  info("    Chunk ID:        0x%08x\n", wav->fmt.chunkid);
+  info("    Chunk Size:      %u\n",     wav->fmt.chunklen);
+  info("    Audio Format:    0x%04x\n", wav->fmt.format);
+  info("    Num. Channels:   %d\n",     wav->fmt.nchannels);
+  info("    Sample Rate:     %u\n",     wav->fmt.samprate);
+  info("    Byte Rate:       %u\n",     wav->fmt.byterate);
+  info("    Block Align:     %d\n",     wav->fmt.align);
+  info("    Bits Per Sample: %d\n",     wav->fmt.bpsamp);
+  info("  Data Chunk:\n");
+  info("    Chunk ID:        0x%08x\n", wav->data.chunkid);
+  info("    Chunk Size:      %u\n",     wav->data.chunklen);
 }
 #endif
 
@@ -691,7 +691,7 @@ static int pcm_getcaps(FAR struct audio_lowerhalf_s *dev, int type,
   ret = lower->ops->getcaps(lower, type, caps);
   if (ret < 0)
     {
-      auderr("Lower getcaps() failed: %d\n", ret);
+      auderr("ERROR: Lower getcaps() failed: %d\n", ret);
       return ret;
     }
 
diff --git a/crypto/crypto.c b/crypto/crypto.c
index e0095ef6d1..fef0a91897 100644
--- a/crypto/crypto.c
+++ b/crypto/crypto.c
@@ -81,7 +81,7 @@ int up_cryptoinitialize(void)
   res = crypto_test();
   if (res)
     {
-      cryptllerr("crypto test failed\n");
+      cryptllerr("ERROR: crypto test failed\n");
     }
   else
     {
diff --git a/crypto/testmngr.c b/crypto/testmngr.c
index f95628f4a9..12db7541a3 100644
--- a/crypto/testmngr.c
+++ b/crypto/testmngr.c
@@ -86,7 +86,7 @@ static int do_test_aes(FAR struct cipher_testvec *test, int mode, int encrypt)
 #define AES_CYPHER_TEST_ENCRYPT(mode, mode_str, count, template) \
   for (i = 0; i < count; i++) { \
     if (do_test_aes(template + i, mode, CYPHER_ENCRYPT)) { \
-      cryptllerr("Failed " mode_str " encrypt test #%i\n", i); \
+      cryptllerr("ERROR: Failed " mode_str " encrypt test #%i\n", i); \
       return -1; \
     } \
   }
@@ -94,7 +94,7 @@ static int do_test_aes(FAR struct cipher_testvec *test, int mode, int encrypt)
 #define AES_CYPHER_TEST_DECRYPT(mode, mode_str, count, template) \
   for (i = 0; i < count; i++) { \
     if (do_test_aes(template + i, mode, CYPHER_DECRYPT)) { \
-      cryptllerr("Failed " mode_str " decrypt test #%i\n", i); \
+      cryptllerr("ERROR: Failed " mode_str " decrypt test #%i\n", i); \
       return -1; \
     } \
   }
diff --git a/libnx/nxfonts/nxfonts_getfont.c b/libnx/nxfonts/nxfonts_getfont.c
index 86cdc98bfb..1e8f80edc2 100644
--- a/libnx/nxfonts/nxfonts_getfont.c
+++ b/libnx/nxfonts/nxfonts_getfont.c
@@ -475,7 +475,7 @@ static inline FAR const struct nx_fontset_s *
 
       fontset = &package->font8;
 #else
-      gerr("8-bit font support disabled: %d\n", ch);
+      gwarn("WARNING: 8-bit font support disabled: %d\n", ch);
       return NULL;
 #endif
     }
@@ -483,7 +483,7 @@ static inline FAR const struct nx_fontset_s *
     {
       /* Someday, perhaps 16-bit fonts will go here */
 
-      gerr("16-bit font not currently supported\n");
+      gerr("ERROR: 16-bit font not currently supported\n");
       return NULL;
     }
 
@@ -494,7 +494,7 @@ static inline FAR const struct nx_fontset_s *
       return fontset;
     }
 
-  gerr("No bitmap for code %02x\n", ch);
+  gerr("ERROR: No bitmap for code %02x\n", ch);
   return NULL;
 }
 
diff --git a/libnx/nxmu/nx_bitmap.c b/libnx/nxmu/nx_bitmap.c
index d59e237ef6..0d8ec93f40 100644
--- a/libnx/nxmu/nx_bitmap.c
+++ b/libnx/nxmu/nx_bitmap.c
@@ -133,7 +133,7 @@ int nx_bitmap(NXWINDOW hwnd, FAR const struct nxgl_rect_s *dest,
 
   if (ret != OK)
     {
-      gerr("sem_init failed: %d\n", errno);
+      gerr("ERROR: sem_init failed: %d\n", errno);
       return ret;
     }
 
diff --git a/libnx/nxmu/nx_connect.c b/libnx/nxmu/nx_connect.c
index b5a5ab83ed..7b2db2808f 100644
--- a/libnx/nxmu/nx_connect.c
+++ b/libnx/nxmu/nx_connect.c
@@ -160,7 +160,7 @@ NXHANDLE nx_connectinstance(FAR const char *svrmqname)
 #endif
   if (conn->crdmq == (mqd_t)-1)
     {
-      gerr("mq_open(%s) failed: %d\n", climqname, errno);
+      gerr("ERROR: mq_open(%s) failed: %d\n", climqname, errno);
       goto errout_with_conn;
     }
 
@@ -173,7 +173,7 @@ NXHANDLE nx_connectinstance(FAR const char *svrmqname)
   conn->cwrmq = mq_open(svrmqname, O_WRONLY|O_CREAT, 0666, &attr);
   if (conn->cwrmq == (mqd_t)-1)
     {
-      gerr("mq_open(%s) failed: %d\n", svrmqname, errno);
+      gerr("ERROR: mq_open(%s) failed: %d\n", svrmqname, errno);
       goto errout_with_rmq;
     }
 
@@ -185,7 +185,7 @@ NXHANDLE nx_connectinstance(FAR const char *svrmqname)
   ret = nxmu_sendserver(conn, &outmsg, sizeof(struct nxsvrmsg_s));
   if (ret < 0)
     {
-      gerr("nxmu_sendserver failed: %d\n", errno);
+      gerr("ERROR: nxmu_sendserver failed: %d\n", errno);
       goto errout_with_wmq;
     }
 
@@ -201,7 +201,7 @@ NXHANDLE nx_connectinstance(FAR const char *svrmqname)
       ret = nx_eventhandler((NXHANDLE)conn);
       if (ret < 0)
         {
-          gerr("nx_message failed: %d\n", errno);
+          gerr("ERROR: nx_message failed: %d\n", errno);
           goto errout_with_wmq;
         }
       usleep(300000);
diff --git a/libnx/nxmu/nx_eventhandler.c b/libnx/nxmu/nx_eventhandler.c
index da32903e25..fbc694826d 100644
--- a/libnx/nxmu/nx_eventhandler.c
+++ b/libnx/nxmu/nx_eventhandler.c
@@ -164,7 +164,7 @@ int nx_eventhandler(NXHANDLE handle)
                 }
               else
                 {
-                  gerr("mq_receive failed: %d\n", errno);
+                  gerr("ERROR: mq_receive failed: %d\n", errno);
                   return ERROR;
                 }
             }
@@ -254,7 +254,8 @@ int nx_eventhandler(NXHANDLE handle)
       break;
 
     default:
-      gerr("Unrecognized message opcode: %d\n", ((FAR struct nxsvrmsg_s *)buffer)->msgid);
+      gerr("ERROR: Unrecognized message opcode: %d\n",
+           ((FAR struct nxsvrmsg_s *)buffer)->msgid);
       break;
     }
 
diff --git a/libnx/nxmu/nx_getrectangle.c b/libnx/nxmu/nx_getrectangle.c
index 9fd53d9fcf..3bac5a3ae9 100644
--- a/libnx/nxmu/nx_getrectangle.c
+++ b/libnx/nxmu/nx_getrectangle.c
@@ -127,7 +127,7 @@ int nx_getrectangle(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
 
   if (ret != OK)
     {
-      gerr("sem_init failed: %d\n", errno);
+      gerr("ERROR: sem_init failed: %d\n", errno);
       return ret;
     }
 
diff --git a/libnx/nxmu/nxmu_sendserver.c b/libnx/nxmu/nxmu_sendserver.c
index 6400cf07bb..59bd5b795d 100644
--- a/libnx/nxmu/nxmu_sendserver.c
+++ b/libnx/nxmu/nxmu_sendserver.c
@@ -105,7 +105,7 @@ int nxmu_sendserver(FAR struct nxfe_conn_s *conn, FAR const void *msg,
   ret = mq_send(conn->cwrmq, msg, msglen, NX_SVRMSG_PRIO);
   if (ret < 0)
     {
-      gerr("mq_send failed: %d\n", errno);
+      gerr("ERROR: mq_send failed: %d\n", errno);
     }
 
   return ret;
diff --git a/libxx/libxx_new.cxx b/libxx/libxx_new.cxx
index 953da41fd0..83d2b00009 100644
--- a/libxx/libxx_new.cxx
+++ b/libxx/libxx_new.cxx
@@ -93,7 +93,7 @@ void *operator new(unsigned int nbytes)
       // Oh my.. we are required to return a valid pointer and
       // we cannot throw an exception!  We are bad.
 
-      err("Failed to allocate\n");
+      err("ERROR: Failed to allocate\n");
     }
 #endif
 
diff --git a/libxx/libxx_newa.cxx b/libxx/libxx_newa.cxx
index cc8d9a1869..3dfb53dbd2 100644
--- a/libxx/libxx_newa.cxx
+++ b/libxx/libxx_newa.cxx
@@ -93,7 +93,7 @@ void *operator new[](unsigned int nbytes)
       // Oh my.. we are required to return a valid pointer and
       // we cannot throw an exception!  We are bad.
 
-      err("Failed to allocate\n");
+      err("ERROR: Failed to allocate\n");
     }
 #endif
 
diff --git a/libxx/libxx_stdthrow.cxx b/libxx/libxx_stdthrow.cxx
index 12eae86485..18960a266f 100644
--- a/libxx/libxx_stdthrow.cxx
+++ b/libxx/libxx_stdthrow.cxx
@@ -56,25 +56,25 @@ namespace std
 {
   void __throw_out_of_range(const char*)
   {
-    err("C++: Vector .at() with argument out of range\n");
+    err("ERROR: C++: Vector .at() with argument out of range\n");
     abort();
    }
 
   void __throw_length_error(const char*)
   {
-    err("C++: Vector resize to excessive length\n");
+    err("ERROR: C++: Vector resize to excessive length\n");
     abort();
   }
 
   void __throw_bad_alloc()
   {
-    err("C++: Bad allocation\n");
+    err("ERROR: C++: Bad allocation\n");
     abort();
   }
 
   void __throw_bad_function_call()
   {
-    err("C++: Bad function call\n");
+    err("ERROR: C++: Bad function call\n");
     abort();
   }
 }
diff --git a/mm/mm_gran/mm_gran.h b/mm/mm_gran/mm_gran.h
index 4685788611..fb7378ac58 100644
--- a/mm/mm_gran/mm_gran.h
+++ b/mm/mm_gran/mm_gran.h
@@ -64,18 +64,22 @@
 #ifdef CONFIG_CPP_HAVE_VARARGS
 #  ifdef CONFIG_DEBUG_GRAM
 #    define granerr(format, ...)       err(format, ##__VA_ARGS__)
+#    define granwarn(format, ...)      warn(format, ##__VA_ARGS__)
 #    define graninfo(format, ...)      info(format, ##__VA_ARGS__)
 #  else
 #    define granerr(format, ...)       merr(format, ##__VA_ARGS__)
+#    define granwarn(format, ...)      mwarn(format, ##__VA_ARGS__)
 #    define graninfo(format, ...)      minfo(format, ##__VA_ARGS__)
 #  endif
 #else
 #  ifdef CONFIG_DEBUG_GRAM
 #    define granerr                    err
+#    define granwarn                   warn
 #    define graninfo                   info
 #  else
-#    define granerr                    (void)
-#    define graninfo                   (void)
+#    define granerr                    merr
+#    define granwarn                   mwarn
+#    define graninfo                   minfo
 #  endif
 #endif
 
diff --git a/mm/mm_gran/mm_pgalloc.c b/mm/mm_gran/mm_pgalloc.c
index 64e1a0ede8..f65e0b8982 100644
--- a/mm/mm_gran/mm_pgalloc.c
+++ b/mm/mm_gran/mm_pgalloc.c
@@ -67,18 +67,22 @@
 #ifdef CONFIG_CPP_HAVE_VARARGS
 #  ifdef CONFIG_DEBUG_PGALLOC
 #    define pgaerr(format, ...)       err(format, ##__VA_ARGS__)
+#    define pgawarn(format, ...)      warn(format, ##__VA_ARGS__)
 #    define pgainfo(format, ...)      info(format, ##__VA_ARGS__)
 #  else
 #    define pgaerr(format, ...)       merr(format, ##__VA_ARGS__)
+#    define pgawarn(format, ...)      mwarn(format, ##__VA_ARGS__)
 #    define pgainfo(format, ...)      minfo(format, ##__VA_ARGS__)
 #  endif
 #else
 #  ifdef CONFIG_DEBUG_PGALLOC
 #    define pgaerr                    err
+#    define pgawarn                   warn
 #    define pgainfo                   info
 #  else
-#    define pgaerr                    (void)
-#    define pgainfo                   (void)
+#    define pgaerr                    merr
+#    define pgawarn                   mwarn
+#    define pgainfo                   minfo
 #  endif
 #endif
 
diff --git a/mm/mm_heap/mm_initialize.c b/mm/mm_heap/mm_initialize.c
index bb76d76544..d92a8d8de7 100644
--- a/mm/mm_heap/mm_initialize.c
+++ b/mm/mm_heap/mm_initialize.c
@@ -96,7 +96,7 @@ void mm_addregion(FAR struct mm_heap_s *heap, FAR void *heapstart,
   heapend  = MM_ALIGN_DOWN((uintptr_t)heapstart + (uintptr_t)heapsize);
   heapsize = heapend - heapbase;
 
-  mllerr("Region %d: base=%p size=%u\n", IDX+1, heapstart, heapsize);
+  mllinfo("Region %d: base=%p size=%u\n", IDX+1, heapstart, heapsize);
 
   /* Add the size of this region to the total size of the heap */
 
@@ -157,7 +157,7 @@ void mm_initialize(FAR struct mm_heap_s *heap, FAR void *heapstart,
 {
   int i;
 
-  mllerr("Heap: start=%p size=%u\n", heapstart, heapsize);
+  mllinfo("Heap: start=%p size=%u\n", heapstart, heapsize);
 
   /* The following two lines have cause problems for some older ZiLog
    * compilers in the past (but not the more recent).  Life is easier if we
diff --git a/mm/mm_heap/mm_malloc.c b/mm/mm_heap/mm_malloc.c
index 84457eef77..3efa15259f 100644
--- a/mm/mm_heap/mm_malloc.c
+++ b/mm/mm_heap/mm_malloc.c
@@ -186,7 +186,7 @@ FAR void *mm_malloc(FAR struct mm_heap_s *heap, size_t size)
 #ifdef CONFIG_DEBUG_MM
   if (!ret)
     {
-      merr("Allocation failed, size %d\n", size);
+      mwarn("WARNING: Allocation failed, size %d\n", size);
     }
   else
     {
diff --git a/mm/mm_heap/mm_sem.c b/mm/mm_heap/mm_sem.c
index d0b6775854..bd39606b5c 100644
--- a/mm/mm_heap/mm_sem.c
+++ b/mm/mm_heap/mm_sem.c
@@ -157,7 +157,7 @@ void mm_takesemaphore(FAR struct mm_heap_s *heap)
     {
       /* Take the semaphore (perhaps waiting) */
 
-      msemerr("PID=%d taking\n", my_pid);
+      mseminfo("PID=%d taking\n", my_pid);
       while (sem_wait(&heap->mm_semaphore) != 0)
         {
           /* The only case that an error should occur here is if
@@ -173,7 +173,7 @@ void mm_takesemaphore(FAR struct mm_heap_s *heap)
       heap->mm_counts_held = 1;
     }
 
-  msemerr("Holder=%d count=%d\n", heap->mm_holder, heap->mm_counts_held);
+  mseminfo("Holder=%d count=%d\n", heap->mm_holder, heap->mm_counts_held);
 }
 
 /****************************************************************************
@@ -201,13 +201,13 @@ void mm_givesemaphore(FAR struct mm_heap_s *heap)
       /* Yes, just release one count and return */
 
       heap->mm_counts_held--;
-      msemerr("Holder=%d count=%d\n", heap->mm_holder, heap->mm_counts_held);
+      mseminfo("Holder=%d count=%d\n", heap->mm_holder, heap->mm_counts_held);
     }
   else
     {
       /* Nope, this is the last reference I have */
 
-      msemerr("PID=%d giving\n", my_pid);
+      mseminfo("PID=%d giving\n", my_pid);
 
       heap->mm_holder      = -1;
       heap->mm_counts_held = 0;
diff --git a/mm/shm/shm_initialize.c b/mm/shm/shm_initialize.c
index 38c82f2b93..f20e7b0873 100644
--- a/mm/shm/shm_initialize.c
+++ b/mm/shm/shm_initialize.c
@@ -127,7 +127,7 @@ int shm_group_initialize(FAR struct task_group_s *group)
 
   if (!group->tg_shm.gs_handle)
     {
-      shmerr("gran_initialize() failed\n");
+      shmerr("ERROR: gran_initialize() failed\n");
       return -ENOMEM;
     }
 
diff --git a/mm/shm/shmat.c b/mm/shm/shmat.c
index bec7c5e87a..6b677e5ddd 100644
--- a/mm/shm/shmat.c
+++ b/mm/shm/shmat.c
@@ -136,7 +136,7 @@ FAR void *shmat(int shmid, FAR const void *shmaddr, int shmflg)
   ret = sem_wait(®ion->sr_sem);
   if (ret < 0)
     {
-      shmerr("sem_wait failed: %d\n", ret);
+      shmerr("ERROR: sem_wait failed: %d\n", ret);
       goto errout;
     }
 
@@ -146,7 +146,7 @@ FAR void *shmat(int shmid, FAR const void *shmaddr, int shmflg)
                                 region->sr_ds.shm_segsz);
   if (vaddr == 0)
     {
-      shmerr("gran_alloc() failed\n");
+      shmerr("ERROR: gran_alloc() failed\n");
       ret = -ENOMEM;
       goto errout_with_semaphore;
     }
@@ -160,7 +160,7 @@ FAR void *shmat(int shmid, FAR const void *shmaddr, int shmflg)
   ret = up_shmat(region->sr_pages, npages, vaddr);
   if (ret < 0)
     {
-      shmerr("up_shmat() failed\n");
+      shmerr("ERROR: up_shmat() failed\n");
       goto errout_with_vaddr;
     }
 
diff --git a/mm/shm/shmctl.c b/mm/shm/shmctl.c
index e5eea7abcc..4e5ac13c5f 100644
--- a/mm/shm/shmctl.c
+++ b/mm/shm/shmctl.c
@@ -134,7 +134,7 @@ int shmctl(int shmid, int cmd, struct shmid_ds *buf)
   ret = sem_wait(®ion->sr_sem);
   if (ret < 0)
     {
-      shmerr("sem_wait failed: %d\n", ret);
+      shmerr("ERROR: sem_wait failed: %d\n", ret);
       return ret;
     }
 
@@ -190,7 +190,7 @@ int shmctl(int shmid, int cmd, struct shmid_ds *buf)
         break;
 
       default:
-        shmerr("Unrecognized command: %d\n", cmd);
+        shmerr("ERROR: Unrecognized command: %d\n", cmd);
         ret = -EINVAL;
         goto errout_with_semaphore;
     }
diff --git a/mm/shm/shmdt.c b/mm/shm/shmdt.c
index 2014674ed2..55c2fd0554 100644
--- a/mm/shm/shmdt.c
+++ b/mm/shm/shmdt.c
@@ -106,7 +106,7 @@ int shmdt(FAR const void *shmaddr)
 
   if (shmid >= CONFIG_ARCH_SHM_MAXREGIONS)
     {
-      shmerr("No region matching this virtual address: %p\n", shmaddr);
+      shmerr("ERROR: No region matching this virtual address: %p\n", shmaddr);
       ret = -EINVAL;
       goto errout_with_errno;
     }
@@ -121,7 +121,7 @@ int shmdt(FAR const void *shmaddr)
   ret = sem_wait(®ion->sr_sem);
   if (ret < 0)
     {
-      shmerr("sem_wait failed: %d\n", ret);
+      shmerr("ERROR: sem_wait failed: %d\n", ret);
       goto errout;
     }
 
@@ -141,7 +141,7 @@ int shmdt(FAR const void *shmaddr)
   ret = up_shmdt((uintptr_t)shmaddr, npages);
   if (ret < 0)
     {
-      shmerr("up_shmdt() failed\n");
+      shmerr("ERROR: up_shmdt() failed\n");
     }
 
   /* Indicate that there is no longer any mapping for this region. */
diff --git a/mm/shm/shmget.c b/mm/shm/shmget.c
index 10d5e3ed2b..460850605a 100644
--- a/mm/shm/shmget.c
+++ b/mm/shm/shmget.c
@@ -188,7 +188,7 @@ static int shm_extend(int shmid, size_t size)
       region->sr_pages[pgalloc] = mm_pgalloc(1);
       if (region->sr_pages[pgalloc] == 0)
         {
-          shmerr("mm_pgalloc(1) failed\n");
+          shmerr("ERROR: mm_pgalloc(1) failed\n");
           break;
         }
 
@@ -249,7 +249,7 @@ static int shm_create(key_t key, size_t size, int shmflg)
   ret = shm_reserve(key, shmflg);
   if (ret < 0)
     {
-      shmerr("shm_reserve failed: %d\n", ret);
+      shmerr("ERROR: shm_reserve failed: %d\n", ret);
       return ret;
     }
 
@@ -400,7 +400,7 @@ int shmget(key_t key, size_t size, int shmflg)
               ret = shm_create(key, size, shmflg);
               if (ret < 0)
                 {
-                  shmerr("shm_create failed: %d\n", ret);
+                  shmerr("ERROR: shm_create failed: %d\n", ret);
                   goto errout_with_semaphore;
                 }
 
@@ -443,7 +443,7 @@ int shmget(key_t key, size_t size, int shmflg)
                   ret = shm_extend(shmid, size);
                   if (ret < 0)
                     {
-                      shmerr("shm_create failed: %d\n", ret);
+                      shmerr("ERROR: shm_create failed: %d\n", ret);
                       goto errout_with_semaphore;
                     }
                 }
-- 
GitLab


From 4f97f15b5e46703937b88feb02f3e50771b7a169 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sun, 12 Jun 2016 11:11:57 -0600
Subject: [PATCH 42/91] graphics/, libc/: Change some err() ERRORS to warn()
 WARNINGS or info()

---
 graphics/nxbe/nxbe_bitmap.c                |  4 ++--
 graphics/nxbe/nxbe_clipper.c               |  2 +-
 graphics/nxbe/nxbe_configure.c             | 10 +++++-----
 graphics/nxmu/nxmu_reportposition.c        |  2 +-
 graphics/nxmu/nxmu_sendclient.c            |  2 +-
 graphics/nxmu/nxmu_server.c                | 20 ++++++++++----------
 graphics/nxsu/nx_open.c                    |  4 ++--
 graphics/nxterm/nxterm_font.c              |  2 +-
 graphics/nxterm/nxterm_redraw.c            |  2 +-
 graphics/nxterm/nxterm_register.c          |  6 +++---
 graphics/nxterm/nxterm_scroll.c            |  8 ++++----
 graphics/vnc/server/vnc_fbdev.c            | 11 ++++++-----
 graphics/vnc/server/vnc_negotiate.c        | 10 +++++-----
 graphics/vnc/server/vnc_receiver.c         |  2 +-
 graphics/vnc/server/vnc_server.h           |  8 ++++++++
 libc/misc/Make.defs                        |  2 +-
 libc/misc/{lib_dbg.c => lib_debug.c}       |  0
 libc/misc/lib_slcddecode.c                 | 10 ++++++----
 libc/netdb/lib_dnsquery.c                  |  8 ++++----
 libc/pthread/pthread_attrdestroy.c         |  4 ++--
 libc/pthread/pthread_attrgetaffinity.c     |  2 +-
 libc/pthread/pthread_attrgetinheritsched.c |  6 ++----
 libc/pthread/pthread_attrgetschedparam.c   |  4 ++--
 libc/pthread/pthread_attrgetschedpolicy.c  |  4 ++--
 libc/pthread/pthread_attrgetstacksize.c    |  4 ++--
 libc/pthread/pthread_attrinit.c            |  4 ++--
 libc/pthread/pthread_attrsetaffinity.c     |  2 +-
 libc/pthread/pthread_attrsetinheritsched.c |  4 ++--
 libc/pthread/pthread_attrsetschedparam.c   |  4 ++--
 libc/pthread/pthread_attrsetschedpolicy.c  |  4 ++--
 libc/pthread/pthread_attrsetstacksize.c    |  4 ++--
 libc/pthread/pthread_condattrdestroy.c     |  4 ++--
 libc/pthread/pthread_condattrinit.c        |  4 ++--
 libc/pthread/pthread_mutexattrdestroy.c    |  4 ++--
 libc/pthread/pthread_mutexattrgetpshared.c |  4 ++--
 libc/pthread/pthread_mutexattrinit.c       |  4 ++--
 libc/pthread/pthread_mutexattrsetpshared.c |  4 ++--
 libc/spawn/lib_psa_dump.c                  |  9 +++++++++
 libc/stdio/lib_dtoa.c                      | 13 +++++++------
 libc/time/lib_gmtimer.c                    | 10 +++++-----
 libc/time/lib_mktime.c                     |  8 ++++----
 41 files changed, 121 insertions(+), 102 deletions(-)
 rename libc/misc/{lib_dbg.c => lib_debug.c} (100%)

diff --git a/graphics/nxbe/nxbe_bitmap.c b/graphics/nxbe/nxbe_bitmap.c
index 94069fa124..61a380ca10 100644
--- a/graphics/nxbe/nxbe_bitmap.c
+++ b/graphics/nxbe/nxbe_bitmap.c
@@ -138,7 +138,7 @@ void nxbe_bitmap(FAR struct nxbe_window_s *wnd, FAR const struct nxgl_rect_s *de
 
   if (dest->pt1.x < origin->x || dest->pt1.y < origin->y)
     {
-      gerr("Bad dest start position\n");
+      gerr("ERROR: Bad dest start position\n");
       return;
     }
 
@@ -149,7 +149,7 @@ void nxbe_bitmap(FAR struct nxbe_window_s *wnd, FAR const struct nxgl_rect_s *de
   deststride = (((dest->pt2.x - origin->x + 1) * wnd->be->plane[0].pinfo.bpp + 7) >> 3);
   if (deststride > stride)
     {
-      gerr("Bad dest width\n");
+      gerr("ERROR: Bad dest width\n");
       return;
     }
 
diff --git a/graphics/nxbe/nxbe_clipper.c b/graphics/nxbe/nxbe_clipper.c
index 652b6e61c0..e73ba6c853 100644
--- a/graphics/nxbe/nxbe_clipper.c
+++ b/graphics/nxbe/nxbe_clipper.c
@@ -115,7 +115,7 @@ static inline void nxbe_pushrectangle(FAR struct nxbe_clipstack_s *stack,
                              sizeof(struct nxbe_cliprect_s) * mxrects);
       if (!newstack)
         {
-          gerr("Failed to reallocate stack\n");
+          gerr("ERROR: Failed to reallocate stack\n");
           return;
         }
 
diff --git a/graphics/nxbe/nxbe_configure.c b/graphics/nxbe/nxbe_configure.c
index 4fd38552f3..891d2e15c5 100644
--- a/graphics/nxbe/nxbe_configure.c
+++ b/graphics/nxbe/nxbe_configure.c
@@ -89,7 +89,7 @@ int nxbe_configure(FAR NX_DRIVERTYPE *dev, FAR struct nxbe_state_s *be)
   ret = dev->getvideoinfo(dev, &be->vinfo);
   if (ret < 0)
     {
-      gerr("Failed to get vinfo\n");
+      gerr("ERROR: Failed to get vinfo\n");
       return ret;
     }
 
@@ -102,13 +102,13 @@ int nxbe_configure(FAR NX_DRIVERTYPE *dev, FAR struct nxbe_state_s *be)
 #ifdef CONFIG_DEBUG_FEATURES
   if (be->vinfo.nplanes > CONFIG_NX_NPLANES)
     {
-      gerr("NX configured for only %d planes, controller wants %d\n",
+      gerr("ERROR: NX configured for only %d planes, controller wants %d\n",
            CONFIG_NX_NPLANES, be->vinfo.nplanes);
       return -E2BIG;
     }
   else if (be->vinfo.nplanes < CONFIG_NX_NPLANES)
     {
-      gerr("NX configured for %d planes, controller only needs %d\n",
+      gwarn("WARNING: NX configured for %d planes, controller only needs %d\n",
            CONFIG_NX_NPLANES, be->vinfo.nplanes);
     }
 #endif
@@ -120,7 +120,7 @@ int nxbe_configure(FAR NX_DRIVERTYPE *dev, FAR struct nxbe_state_s *be)
       ret = dev->getplaneinfo(dev, i, &be->plane[i].pinfo);
       if (ret < 0)
         {
-          gerr("Failed to get pinfo[%d]\n", i);
+          gerr("ERROR: Failed to get pinfo[%d]\n", i);
           return ret;
         }
 
@@ -216,7 +216,7 @@ int nxbe_configure(FAR NX_DRIVERTYPE *dev, FAR struct nxbe_state_s *be)
       else
 #endif
         {
-          gerr("Unsupported pinfo[%d] BPP: %d\n", i, be->plane[i].pinfo.bpp);
+          gerr("ERROR: Unsupported pinfo[%d] BPP: %d\n", i, be->plane[i].pinfo.bpp);
           return -ENOSYS;
         }
     }
diff --git a/graphics/nxmu/nxmu_reportposition.c b/graphics/nxmu/nxmu_reportposition.c
index 5e7584464c..757873ac1e 100644
--- a/graphics/nxmu/nxmu_reportposition.c
+++ b/graphics/nxmu/nxmu_reportposition.c
@@ -103,6 +103,6 @@ void nxfe_reportposition(FAR struct nxbe_window_s *wnd)
   ret = nxmu_sendclientwindow(wnd, &outmsg, sizeof(struct nxclimsg_newposition_s));
   if (ret < 0)
     {
-      gerr("nxmu_sendclient failed: %d\n", errno);
+      gerr("ERROR: nxmu_sendclient failed: %d\n", errno);
     }
 }
diff --git a/graphics/nxmu/nxmu_sendclient.c b/graphics/nxmu/nxmu_sendclient.c
index 511b5814a1..7a0ab2be7b 100644
--- a/graphics/nxmu/nxmu_sendclient.c
+++ b/graphics/nxmu/nxmu_sendclient.c
@@ -105,7 +105,7 @@ int nxmu_sendclient(FAR struct nxfe_conn_s *conn, FAR const void *msg,
   ret = mq_send(conn->swrmq, msg, msglen, NX_CLIMSG_PRIO);
   if (ret < 0)
     {
-      gerr("mq_send failed: %d\n", errno);
+      gerr("ERROR: mq_send failed: %d\n", errno);
     }
 
   return ret;
diff --git a/graphics/nxmu/nxmu_server.c b/graphics/nxmu/nxmu_server.c
index 28b37518b9..5ceb92d532 100644
--- a/graphics/nxmu/nxmu_server.c
+++ b/graphics/nxmu/nxmu_server.c
@@ -87,7 +87,7 @@ static inline void nxmu_disconnect(FAR struct nxfe_conn_s *conn)
   ret = nxmu_sendclient(conn, &outmsg, sizeof(struct nxclimsg_disconnected_s));
   if (ret < 0)
     {
-      gerr("nxmu_sendclient failed: %d\n", errno);
+      gerr("ERROR: nxmu_sendclient failed: %d\n", errno);
     }
 
   /* Close the outgoing client message queue */
@@ -114,7 +114,7 @@ static inline void nxmu_connect(FAR struct nxfe_conn_s *conn)
   conn->swrmq  = mq_open(mqname, O_WRONLY);
   if (conn->swrmq == (mqd_t)-1)
     {
-      gerr("mq_open(%s) failed: %d\n", mqname, errno);
+      gerr("ERROR: mq_open(%s) failed: %d\n", mqname, errno);
       outmsg.msgid = NX_CLIMSG_DISCONNECTED;
     }
 
@@ -124,7 +124,7 @@ static inline void nxmu_connect(FAR struct nxfe_conn_s *conn)
   ret = nxmu_sendclient(conn, &outmsg, sizeof(struct nxclimsg_connected_s));
   if (ret < 0)
     {
-      gerr("nxmu_sendclient failed: %d\n", errno);
+      gerr("ERROR: nxmu_sendclient failed: %d\n", errno);
     }
 }
 
@@ -166,7 +166,7 @@ static inline void nxmu_blocked(FAR struct nxbe_window_s *wnd, FAR void *arg)
   ret = nxmu_sendclient(wnd->conn, &outmsg, sizeof(struct nxclimsg_blocked_s));
   if (ret < 0)
     {
-      gerr("nxmu_sendclient failed: %d\n", errno);
+      gerr("ERROR: nxmu_sendclient failed: %d\n", errno);
     }
 }
 
@@ -187,7 +187,7 @@ static inline int nxmu_setup(FAR const char *mqname, FAR NX_DRIVERTYPE *dev,
   ret = nxbe_configure(dev, &fe->be);
   if (ret < 0)
     {
-      gerr("nxbe_configure failed: %d\n", -ret);
+      gerr("ERROR: nxbe_configure failed: %d\n", -ret);
       errno = -ret;
       return ERROR;
     }
@@ -196,7 +196,7 @@ static inline int nxmu_setup(FAR const char *mqname, FAR NX_DRIVERTYPE *dev,
   ret = nxbe_colormap(dev);
   if (ret < 0)
     {
-      gerr("nxbe_colormap failed: %d\n", -ret);
+      gerr("ERROR: nxbe_colormap failed: %d\n", -ret);
       errno = -ret;
       return ERROR;
     }
@@ -217,7 +217,7 @@ static inline int nxmu_setup(FAR const char *mqname, FAR NX_DRIVERTYPE *dev,
   fe->conn.crdmq = mq_open(mqname, O_RDONLY | O_CREAT, 0666, &attr);
   if (fe->conn.crdmq == (mqd_t)-1)
     {
-      gerr("mq_open(%s) failed: %d\n", mqname, errno);
+      gerr("ERROR: mq_open(%s) failed: %d\n", mqname, errno);
       return ERROR; /* mq_open sets errno */
     }
 
@@ -233,7 +233,7 @@ static inline int nxmu_setup(FAR const char *mqname, FAR NX_DRIVERTYPE *dev,
   fe->conn.swrmq = mq_open(mqname, O_WRONLY);
   if (fe->conn.swrmq == (mqd_t)-1)
     {
-      gerr("mq_open(%s) failed: %d\n", mqname, errno);
+      gerr("ERROR: mq_open(%s) failed: %d\n", mqname, errno);
       mq_close(fe->conn.crdmq);
       return ERROR; /* mq_open sets errno */
     }
@@ -334,7 +334,7 @@ int nx_runinstance(FAR const char *mqname, FAR NX_DRIVERTYPE *dev)
          {
            if (errno != EINTR)
              {
-               gerr("mq_receive failed: %d\n", errno);
+               gerr("ERROR: mq_receive failed: %d\n", errno);
                goto errout; /* mq_receive sets errno */
              }
            continue;
@@ -545,7 +545,7 @@ int nx_runinstance(FAR const char *mqname, FAR NX_DRIVERTYPE *dev)
          case NX_CLIMSG_CONNECTED:    /* Shouldn't happen */
          case NX_CLIMSG_DISCONNECTED:
          default:
-           gerr("Unrecognized command: %d\n", msg->msgid);
+           gerr("ERROR: Unrecognized command: %d\n", msg->msgid);
            break;
          }
     }
diff --git a/graphics/nxsu/nx_open.c b/graphics/nxsu/nx_open.c
index 202e011ee8..5162c02004 100644
--- a/graphics/nxsu/nx_open.c
+++ b/graphics/nxsu/nx_open.c
@@ -120,7 +120,7 @@ static inline int nxsu_setup(FAR NX_DRIVERTYPE *dev,
   ret = nxbe_configure(dev, &fe->be);
   if (ret < 0)
     {
-      gerr("nxbe_configure failed: %d\n", -ret);
+      gerr("ERROR: nxbe_configure failed: %d\n", -ret);
       errno = -ret;
       return ERROR;
     }
@@ -129,7 +129,7 @@ static inline int nxsu_setup(FAR NX_DRIVERTYPE *dev,
   ret = nxbe_colormap(dev);
   if (ret < 0)
     {
-      gerr("nxbe_colormap failed: %d\n", -ret);
+      gerr("ERROR: nxbe_colormap failed: %d\n", -ret);
       errno = -ret;
       return ERROR;
     }
diff --git a/graphics/nxterm/nxterm_font.c b/graphics/nxterm/nxterm_font.c
index 7c8035aebb..b3e95d220d 100644
--- a/graphics/nxterm/nxterm_font.c
+++ b/graphics/nxterm/nxterm_font.c
@@ -318,7 +318,7 @@ nxterm_renderglyph(FAR struct nxterm_state_s *priv,
         {
           /* Actually, the RENDERER never returns a failure */
 
-          gerr("nxterm_renderglyph: RENDERER failed\n");
+          gerr("ERROR: nxterm_renderglyph: RENDERER failed\n");
           nxterm_freeglyph(glyph);
           glyph = NULL;
         }
diff --git a/graphics/nxterm/nxterm_redraw.c b/graphics/nxterm/nxterm_redraw.c
index 8130dfae68..925495dfd2 100644
--- a/graphics/nxterm/nxterm_redraw.c
+++ b/graphics/nxterm/nxterm_redraw.c
@@ -137,7 +137,7 @@ void nxterm_redraw(NXTERM handle, FAR const struct nxgl_rect_s *rect, bool more)
   ret = priv->ops->fill(priv, rect, priv->wndo.wcolor);
   if (ret < 0)
     {
-      gerr("fill failed: %d\n", errno);
+      gerr("ERROR: fill failed: %d\n", errno);
     }
 
   /* Then redraw each character on the display (Only the characters within
diff --git a/graphics/nxterm/nxterm_register.c b/graphics/nxterm/nxterm_register.c
index 797e60f49a..41cd456789 100644
--- a/graphics/nxterm/nxterm_register.c
+++ b/graphics/nxterm/nxterm_register.c
@@ -87,7 +87,7 @@ FAR struct nxterm_state_s *
   priv = (FAR struct nxterm_state_s *)kmm_zalloc(sizeof(struct nxterm_state_s));
   if (!priv)
     {
-      gerr("Failed to allocate the NX driver structure\n");
+      gerr("ERROR: Failed to allocate the NX driver structure\n");
       return NULL;
     }
 
@@ -112,7 +112,7 @@ FAR struct nxterm_state_s *
   priv->font = nxf_getfonthandle(wndo->fontid);
   if (!priv->font)
     {
-      gerr("Failed to get font ID %d: %d\n", wndo->fontid, errno);
+      gerr("ERROR: Failed to get font ID %d: %d\n", wndo->fontid, errno);
       goto errout;
     }
 
@@ -150,7 +150,7 @@ FAR struct nxterm_state_s *
   ret = register_driver(devname, &g_nxterm_drvrops, 0666, priv);
   if (ret < 0)
     {
-      gerr("Failed to register %s\n", devname);
+      gerr("ERROR: Failed to register %s\n", devname);
     }
   return (NXTERM)priv;
 
diff --git a/graphics/nxterm/nxterm_scroll.c b/graphics/nxterm/nxterm_scroll.c
index ff648c7421..50a983a56e 100644
--- a/graphics/nxterm/nxterm_scroll.c
+++ b/graphics/nxterm/nxterm_scroll.c
@@ -118,7 +118,7 @@ static inline void nxterm_movedisplay(FAR struct nxterm_state_s *priv,
       ret = priv->ops->fill(priv, &rect, priv->wndo.wcolor);
       if (ret < 0)
         {
-          gerr("Fill failed: %d\n", errno);
+          gerr("ERROR: Fill failed: %d\n", errno);
         }
 
       /* Fill each character that might lie within in the bounding box */
@@ -141,7 +141,7 @@ static inline void nxterm_movedisplay(FAR struct nxterm_state_s *priv,
   ret = priv->ops->fill(priv, &rect, priv->wndo.wcolor);
   if (ret < 0)
     {
-      gerr("Fill failed: %d\n", errno);
+      gerr("ERROR: Fill failed: %d\n", errno);
     }
 }
 #else
@@ -177,7 +177,7 @@ static inline void nxterm_movedisplay(FAR struct nxterm_state_s *priv,
   ret = priv->ops->move(priv, &rect, &offset);
   if (ret < 0)
     {
-      gerr("Move failed: %d\n", errno);
+      gerr("ERROR: Move failed: %d\n", errno);
     }
 
   /* Finally, clear the vacated bottom part of the display */
@@ -187,7 +187,7 @@ static inline void nxterm_movedisplay(FAR struct nxterm_state_s *priv,
   ret = priv->ops->fill(priv, &rect, priv->wndo.wcolor);
   if (ret < 0)
     {
-      gerr("Fill failed: %d\n", errno);
+      gerr("ERROR: Fill failed: %d\n", errno);
     }
 }
 #endif
diff --git a/graphics/vnc/server/vnc_fbdev.c b/graphics/vnc/server/vnc_fbdev.c
index 13e81330c9..2e56d53e8e 100644
--- a/graphics/vnc/server/vnc_fbdev.c
+++ b/graphics/vnc/server/vnc_fbdev.c
@@ -237,7 +237,7 @@ static int up_getplaneinfo(FAR struct fb_vtable_s *vtable, int planeno,
       return OK;
     }
 
-  gerr("Returning EINVAL\n");
+  gerr("ERROR: Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -274,7 +274,7 @@ static int up_getcmap(FAR struct fb_vtable_s *vtable,
       return OK;
     }
 
-  gerr("Returning EINVAL\n");
+  gerr("ERROR: Returning EINVAL\n");
   return -EINVAL;
 }
 #endif
@@ -311,7 +311,7 @@ static int up_putcmap(FAR struct fb_vtable_s *vtable, FAR const struct fb_cmap_s
       return OK;
     }
 
-  gerr("Returning EINVAL\n");
+  gerr("ERROR: Returning EINVAL\n");
   return -EINVAL;
 }
 #endif
@@ -347,7 +347,8 @@ static int up_getcursor(FAR struct fb_vtable_s *vtable,
 
       return OK;
     }
-  gerr("Returning EINVAL\n");
+
+  gerr("ERROR: Returning EINVAL\n");
   return -EINVAL;
 }
 #endif
@@ -400,7 +401,7 @@ static int up_setcursor(FAR struct fb_vtable_s *vtable,
       return OK;
     }
 
-  gerr("Returning EINVAL\n");
+  gerr("ERROR: Returning EINVAL\n");
   return -EINVAL;
 }
 #endif
diff --git a/graphics/vnc/server/vnc_negotiate.c b/graphics/vnc/server/vnc_negotiate.c
index 3a28cb3350..910d0b6f26 100644
--- a/graphics/vnc/server/vnc_negotiate.c
+++ b/graphics/vnc/server/vnc_negotiate.c
@@ -168,7 +168,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
     }
   else if (nrecvd == 0)
     {
-      gerr("Connection closed\n");
+      gwarn("WARNING: Connection closed\n");
       return -ECONNABORTED;
     }
 
@@ -240,7 +240,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
     }
   else if (nrecvd == 0)
     {
-      gerr("Connection closed\n");
+      gwarn("WARNING: Connection closed\n");
       return -ECONNABORTED;
     }
 
@@ -329,7 +329,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
     }
   else if (nrecvd == 0)
     {
-      gerr("Connection closed\n");
+      gwarn("WARNING: Connection closed\n");
       return -ECONNABORTED;
     }
 
@@ -404,7 +404,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
     }
   else if (nrecvd == 0)
     {
-      gerr("Connection closed\n");
+      gwarn("WARNING: Connection closed\n");
       return -ECONNABORTED;
     }
   else if (nrecvd != sizeof(struct rfb_setpixelformat_s))
@@ -451,7 +451,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
     }
   else if (nrecvd == 0)
     {
-      gerr("Connection closed\n");
+      gwarn("WARNING: Connection closed\n");
       return -ECONNABORTED;
     }
 
diff --git a/graphics/vnc/server/vnc_receiver.c b/graphics/vnc/server/vnc_receiver.c
index 530f5c0ab3..8f4e0988af 100644
--- a/graphics/vnc/server/vnc_receiver.c
+++ b/graphics/vnc/server/vnc_receiver.c
@@ -186,7 +186,7 @@ int vnc_receiver(FAR struct vnc_session_s *session)
 
       else if (nrecvd == 0)
         {
-          gerr("Connection closed\n", errcode);
+          gwarn("WARNING: Connection closed\n", errcode);
           return OK;
         }
 
diff --git a/graphics/vnc/server/vnc_server.h b/graphics/vnc/server/vnc_server.h
index a625b1ed1c..9b9406038b 100644
--- a/graphics/vnc/server/vnc_server.h
+++ b/graphics/vnc/server/vnc_server.h
@@ -190,9 +190,13 @@
 #    define updllerr(format, ...)  llerr(format, ##__VA_ARGS__)
 #    define updinfo(format, ...)   info(format, ##__VA_ARGS__)
 #    define updllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
+#    define updinfo(format, ...)   info(format, ##__VA_ARGS__)
+#    define updllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #  else
 #   define upderr                  err
 #   define updllerr                llerr
+#   define updwarn                 warn
+#   define updllwarn               llwarn
 #   define updinfo                 info
 #   define updllinfo               llinfo
 #  endif
@@ -200,11 +204,15 @@
 #  ifdef CONFIG_CPP_HAVE_VARARGS
 #    define upderr(x...)
 #    define updllerr(x...)
+#    define updwarn(x...)
+#    define updllwarn(x...)
 #    define updinfo(x...)
 #    define updllinfo(x...)
 #  else
 #    define upderr                 (void)
 #    define updllerr               (void)
+#    define updwarn                (void)
+#    define updllwarn              (void)
 #    define updinfo                (void)
 #    define updllinfo              (void)
 #  endif
diff --git a/libc/misc/Make.defs b/libc/misc/Make.defs
index 6fa349e0f9..e25b6a783a 100644
--- a/libc/misc/Make.defs
+++ b/libc/misc/Make.defs
@@ -79,7 +79,7 @@ CSRCS += lib_crc64.c lib_crc32.c lib_crc16.c lib_crc8.c
 CSRCS += lib_dumpbuffer.c lib_match.c
 
 ifeq ($(CONFIG_DEBUG_FEATURES),y)
-CSRCS += lib_dbg.c
+CSRCS += lib_debug.c
 endif
 
 # Keyboard driver encoder/decoder
diff --git a/libc/misc/lib_dbg.c b/libc/misc/lib_debug.c
similarity index 100%
rename from libc/misc/lib_dbg.c
rename to libc/misc/lib_debug.c
diff --git a/libc/misc/lib_slcddecode.c b/libc/misc/lib_slcddecode.c
index 40ff576683..1c079018dc 100644
--- a/libc/misc/lib_slcddecode.c
+++ b/libc/misc/lib_slcddecode.c
@@ -93,9 +93,11 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcderr         err
+#  define lcdwarn        warn
 #  define lcdinfo        info
 #else
 #  define lcderr(x...)
+#  define lcdwarn(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -264,7 +266,7 @@ enum slcdret_e slcd_decode(FAR struct lib_instream_s *stream,
        * return the following characters later.
        */
 
-      lcderr("Parsing failed: ESC followed by %02x\n", ch);
+      lcderr("ERROR: Parsing failed: ESC followed by %02x\n", ch);
       return slcd_reget(state, pch, parg);
     }
 
@@ -295,7 +297,7 @@ enum slcdret_e slcd_decode(FAR struct lib_instream_s *stream,
 
       if (code < (int)FIRST_SLCDCODE || code > (int)LAST_SLCDCODE)
         {
-          lcderr("Parsing failed: ESC-L followed by %02x\n", ch);
+          lcderr("ERROR: Parsing failed: ESC-L followed by %02x\n", ch);
 
           /* Not a special command code.. put the character in the reget
            * buffer.
@@ -338,7 +340,7 @@ enum slcdret_e slcd_decode(FAR struct lib_instream_s *stream,
            * following characters later.
            */
 
-          lcderr("Parsing failed: ESC-L-%c followed by %02x\n",
+          lcderr("ERROR: Parsing failed: ESC-L-%c followed by %02x\n",
                  state->buf[NDX_COUNTH], ch);
 
           return slcd_reget(state, pch, parg);
@@ -384,7 +386,7 @@ enum slcdret_e slcd_decode(FAR struct lib_instream_s *stream,
            * of the characters later.
            */
 
-          lcderr("Parsing failed: ESC-L-%c-%c followed by %02x\n",
+          lcderr("ERROR: Parsing failed: ESC-L-%c-%c followed by %02x\n",
                  state->buf[NDX_COUNTH], state->buf[NDX_COUNTL], ch);
 
           return slcd_reget(state, pch, parg);
diff --git a/libc/netdb/lib_dnsquery.c b/libc/netdb/lib_dnsquery.c
index 636bad4fe4..21ed201ba8 100644
--- a/libc/netdb/lib_dnsquery.c
+++ b/libc/netdb/lib_dnsquery.c
@@ -283,16 +283,16 @@ static int dns_recv_response(int sd, FAR struct sockaddr *addr,
    * match.
    */
 
-#ifdef CONFIG_DEBUG_NET
+#if defined(CONFIG_DEBUG_NET) && defined(CONFIG_DEBUG_INFO)
   {
     int d = 64;
     nameptr = dns_parse_name((uint8_t *)buffer + 12) + 4;
 
     for (; ; )
       {
-        nerr("%02X %02X %02X %02X %02X %02X %02X %02X \n",
-             nameptr[0], nameptr[1], nameptr[2], nameptr[3],
-             nameptr[4], nameptr[5], nameptr[6], nameptr[7]);
+        ninfo("%02X %02X %02X %02X %02X %02X %02X %02X \n",
+              nameptr[0], nameptr[1], nameptr[2], nameptr[3],
+              nameptr[4], nameptr[5], nameptr[6], nameptr[7]);
 
         nameptr += 8;
         d -= 8;
diff --git a/libc/pthread/pthread_attrdestroy.c b/libc/pthread/pthread_attrdestroy.c
index beb505242c..7dc431f808 100644
--- a/libc/pthread/pthread_attrdestroy.c
+++ b/libc/pthread/pthread_attrdestroy.c
@@ -69,7 +69,7 @@ int pthread_attr_destroy(FAR pthread_attr_t *attr)
 {
   int ret;
 
-  serr("attr=0x%p\n", attr);
+  linfo("attr=0x%p\n", attr);
 
   if (!attr)
     {
@@ -81,7 +81,7 @@ int pthread_attr_destroy(FAR pthread_attr_t *attr)
       ret = OK;
     }
 
-  serr("Returning %d\n", ret);
+  linfo("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/libc/pthread/pthread_attrgetaffinity.c b/libc/pthread/pthread_attrgetaffinity.c
index 5588c51342..a08f18cb00 100644
--- a/libc/pthread/pthread_attrgetaffinity.c
+++ b/libc/pthread/pthread_attrgetaffinity.c
@@ -66,7 +66,7 @@
 int pthread_attr_getaffinity_np(FAR const pthread_attr_t *attr,
                                 size_t cpusetsize, cpu_set_t *cpuset)
 {
-  serr("attr=0x%p cpusetsize=%d cpuset=0x%p\n", attr, (int)cpusetsize, cpuset);
+  linfo("attr=0x%p cpusetsize=%d cpuset=0x%p\n", attr, (int)cpusetsize, cpuset);
 
   DEBUGASSERT(attr != NULL && cpusetsize == sizeof(cpu_set_t) && cpuset != NULL);
 
diff --git a/libc/pthread/pthread_attrgetinheritsched.c b/libc/pthread/pthread_attrgetinheritsched.c
index 3a52eaee1f..0f6b42a879 100644
--- a/libc/pthread/pthread_attrgetinheritsched.c
+++ b/libc/pthread/pthread_attrgetinheritsched.c
@@ -72,7 +72,7 @@ int pthread_attr_getinheritsched(FAR const pthread_attr_t *attr,
 {
   int ret;
 
-  serr("attr=0x%p inheritsched=0x%p\n", attr, inheritsched);
+  linfo("attr=0x%p inheritsched=0x%p\n", attr, inheritsched);
 
   if (!attr || !inheritsched)
     {
@@ -84,8 +84,6 @@ int pthread_attr_getinheritsched(FAR const pthread_attr_t *attr,
       ret = OK;
     }
 
-  serr("Returning %d\n", ret);
+  linfo("Returning %d\n", ret);
   return ret;
 }
-
-
diff --git a/libc/pthread/pthread_attrgetschedparam.c b/libc/pthread/pthread_attrgetschedparam.c
index fb84828f1a..beea2a595b 100644
--- a/libc/pthread/pthread_attrgetschedparam.c
+++ b/libc/pthread/pthread_attrgetschedparam.c
@@ -70,7 +70,7 @@ int pthread_attr_getschedparam(FAR const pthread_attr_t *attr,
 {
   int ret;
 
-  serr("attr=0x%p param=0x%p\n", attr, param);
+  linfo("attr=0x%p param=0x%p\n", attr, param);
 
   if (!attr || !param)
     {
@@ -90,6 +90,6 @@ int pthread_attr_getschedparam(FAR const pthread_attr_t *attr,
       ret = OK;
     }
 
-  serr("Returning %d\n", ret);
+  linfo("Returning %d\n", ret);
   return ret;
 }
diff --git a/libc/pthread/pthread_attrgetschedpolicy.c b/libc/pthread/pthread_attrgetschedpolicy.c
index 821c0bffc8..601b3cebea 100644
--- a/libc/pthread/pthread_attrgetschedpolicy.c
+++ b/libc/pthread/pthread_attrgetschedpolicy.c
@@ -68,7 +68,7 @@ int pthread_attr_getschedpolicy(FAR const pthread_attr_t *attr, int *policy)
 {
   int ret;
 
-  serr("attr=0x%p policy=0x%p\n", attr, policy);
+  linfo("attr=0x%p policy=0x%p\n", attr, policy);
 
   if (!attr || !policy)
     {
@@ -80,6 +80,6 @@ int pthread_attr_getschedpolicy(FAR const pthread_attr_t *attr, int *policy)
       ret = OK;
     }
 
-  serr("Returning %d\n", ret);
+  linfo("Returning %d\n", ret);
   return ret;
 }
diff --git a/libc/pthread/pthread_attrgetstacksize.c b/libc/pthread/pthread_attrgetstacksize.c
index 3a8df45b89..130bed7fb6 100644
--- a/libc/pthread/pthread_attrgetstacksize.c
+++ b/libc/pthread/pthread_attrgetstacksize.c
@@ -67,7 +67,7 @@ int pthread_attr_getstacksize(FAR const pthread_attr_t *attr, FAR long *stacksiz
 {
   int ret;
 
-  serr("attr=0x%p stacksize=0x%p\n", attr, stacksize);
+  linfo("attr=0x%p stacksize=0x%p\n", attr, stacksize);
 
   if (!stacksize)
     {
@@ -79,7 +79,7 @@ int pthread_attr_getstacksize(FAR const pthread_attr_t *attr, FAR long *stacksiz
       ret = OK;
     }
 
-  serr("Returning %d\n", ret);
+  linfo("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/libc/pthread/pthread_attrinit.c b/libc/pthread/pthread_attrinit.c
index 18d3fa09b0..1d303a05f0 100644
--- a/libc/pthread/pthread_attrinit.c
+++ b/libc/pthread/pthread_attrinit.c
@@ -87,7 +87,7 @@ int pthread_attr_init(FAR pthread_attr_t *attr)
 {
   int ret = OK;
 
-  serr("attr=0x%p\n", attr);
+  linfo("attr=0x%p\n", attr);
   if (!attr)
     {
       ret = ENOMEM;
@@ -102,7 +102,7 @@ int pthread_attr_init(FAR pthread_attr_t *attr)
       memcpy(attr, &g_default_pthread_attr, sizeof(pthread_attr_t));
     }
 
-  serr("Returning %d\n", ret);
+  linfo("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/libc/pthread/pthread_attrsetaffinity.c b/libc/pthread/pthread_attrsetaffinity.c
index 6a526cd46e..c8e7c3607d 100644
--- a/libc/pthread/pthread_attrsetaffinity.c
+++ b/libc/pthread/pthread_attrsetaffinity.c
@@ -68,7 +68,7 @@ int pthread_attr_setaffinity_np(FAR pthread_attr_t *attr,
                                 size_t cpusetsize,
                                 FAR const cpu_set_t *cpuset)
 {
-  serr("attr=0x%p cpusetsize=%d cpuset=0x%p\n", attr, (int)cpusetsize, cpuset);
+  linfo("attr=0x%p cpusetsize=%d cpuset=0x%p\n", attr, (int)cpusetsize, cpuset);
 
   DEBUGASSERT(attr != NULL && cpusetsize == sizeof(cpu_set_t) &&
               cpuset != NULL && *cpuset != 0);
diff --git a/libc/pthread/pthread_attrsetinheritsched.c b/libc/pthread/pthread_attrsetinheritsched.c
index a3ee237410..89d29d07bb 100644
--- a/libc/pthread/pthread_attrsetinheritsched.c
+++ b/libc/pthread/pthread_attrsetinheritsched.c
@@ -73,7 +73,7 @@ int pthread_attr_setinheritsched(FAR pthread_attr_t *attr,
 {
   int ret;
 
-  serr("inheritsched=%d\n", inheritsched);
+  linfo("inheritsched=%d\n", inheritsched);
 
   if (!attr ||
       (inheritsched != PTHREAD_INHERIT_SCHED &&
@@ -87,7 +87,7 @@ int pthread_attr_setinheritsched(FAR pthread_attr_t *attr,
       ret = OK;
     }
 
-  serr("Returning %d\n", ret);
+  linfo("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/libc/pthread/pthread_attrsetschedparam.c b/libc/pthread/pthread_attrsetschedparam.c
index 12af4c8ca8..602f76eafa 100644
--- a/libc/pthread/pthread_attrsetschedparam.c
+++ b/libc/pthread/pthread_attrsetschedparam.c
@@ -70,7 +70,7 @@ int pthread_attr_setschedparam(FAR pthread_attr_t *attr,
 {
   int ret;
 
-  serr("attr=0x%p param=0x%p\n", attr, param);
+  linfo("attr=0x%p param=0x%p\n", attr, param);
 
   if (!attr || !param)
     {
@@ -90,6 +90,6 @@ int pthread_attr_setschedparam(FAR pthread_attr_t *attr,
       ret = OK;
     }
 
-  serr("Returning %d\n", ret);
+  linfo("Returning %d\n", ret);
   return ret;
 }
diff --git a/libc/pthread/pthread_attrsetschedpolicy.c b/libc/pthread/pthread_attrsetschedpolicy.c
index 932954edfb..2aa2686157 100644
--- a/libc/pthread/pthread_attrsetschedpolicy.c
+++ b/libc/pthread/pthread_attrsetschedpolicy.c
@@ -70,7 +70,7 @@ int pthread_attr_setschedpolicy(FAR pthread_attr_t *attr, int policy)
 {
   int ret;
 
-  serr("attr=0x%p policy=%d\n", attr, policy);
+  linfo("attr=0x%p policy=%d\n", attr, policy);
 
   if (!attr ||
       (policy != SCHED_FIFO
@@ -90,6 +90,6 @@ int pthread_attr_setschedpolicy(FAR pthread_attr_t *attr, int policy)
       ret = OK;
     }
 
-  serr("Returning %d\n", ret);
+  linfo("Returning %d\n", ret);
   return ret;
 }
diff --git a/libc/pthread/pthread_attrsetstacksize.c b/libc/pthread/pthread_attrsetstacksize.c
index 41bec38f19..3ed309981c 100644
--- a/libc/pthread/pthread_attrsetstacksize.c
+++ b/libc/pthread/pthread_attrsetstacksize.c
@@ -68,7 +68,7 @@ int pthread_attr_setstacksize(FAR pthread_attr_t *attr, long stacksize)
 {
   int ret;
 
-  serr("attr=0x%p stacksize=%ld\n", attr, stacksize);
+  linfo("attr=0x%p stacksize=%ld\n", attr, stacksize);
 
   if (!attr || stacksize < PTHREAD_STACK_MIN)
     {
@@ -80,7 +80,7 @@ int pthread_attr_setstacksize(FAR pthread_attr_t *attr, long stacksize)
       ret = OK;
     }
 
-  serr("Returning %d\n", ret);
+  linfo("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/libc/pthread/pthread_condattrdestroy.c b/libc/pthread/pthread_condattrdestroy.c
index 92af75db74..d538891f82 100644
--- a/libc/pthread/pthread_condattrdestroy.c
+++ b/libc/pthread/pthread_condattrdestroy.c
@@ -67,14 +67,14 @@ int pthread_condattr_destroy(FAR pthread_condattr_t *attr)
 {
   int ret = OK;
 
-  serr("attr=0x%p\n", attr);
+  linfo("attr=0x%p\n", attr);
 
   if (!attr)
     {
       ret = EINVAL;
     }
 
-  serr("Returning %d\n", ret);
+  linfo("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/libc/pthread/pthread_condattrinit.c b/libc/pthread/pthread_condattrinit.c
index ac6889dc01..64d2d0ac25 100644
--- a/libc/pthread/pthread_condattrinit.c
+++ b/libc/pthread/pthread_condattrinit.c
@@ -67,7 +67,7 @@ int pthread_condattr_init(FAR pthread_condattr_t *attr)
 {
   int ret = OK;
 
-  serr("attr=0x%p\n", attr);
+  linfo("attr=0x%p\n", attr);
 
   if (!attr)
     {
@@ -78,7 +78,7 @@ int pthread_condattr_init(FAR pthread_condattr_t *attr)
       *attr = 0;
     }
 
-  serr("Returning %d\n", ret);
+  linfo("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/libc/pthread/pthread_mutexattrdestroy.c b/libc/pthread/pthread_mutexattrdestroy.c
index 3b0aaba28a..c20a67bdf7 100644
--- a/libc/pthread/pthread_mutexattrdestroy.c
+++ b/libc/pthread/pthread_mutexattrdestroy.c
@@ -68,7 +68,7 @@ int pthread_mutexattr_destroy(FAR pthread_mutexattr_t *attr)
 {
   int ret = OK;
 
-  serr("attr=0x%p\n", attr);
+  linfo("attr=0x%p\n", attr);
 
   if (!attr)
     {
@@ -79,6 +79,6 @@ int pthread_mutexattr_destroy(FAR pthread_mutexattr_t *attr)
       attr->pshared = 0;
     }
 
-  serr("Returning %d\n", ret);
+  linfo("Returning %d\n", ret);
   return ret;
 }
diff --git a/libc/pthread/pthread_mutexattrgetpshared.c b/libc/pthread/pthread_mutexattrgetpshared.c
index a7f8ce6d8f..b8f0b77ec4 100644
--- a/libc/pthread/pthread_mutexattrgetpshared.c
+++ b/libc/pthread/pthread_mutexattrgetpshared.c
@@ -68,7 +68,7 @@ int pthread_mutexattr_getpshared(FAR const pthread_mutexattr_t *attr, FAR int *p
 {
   int ret = OK;
 
-  serr("attr=0x%p pshared=0x%p\n", attr, pshared);
+  linfo("attr=0x%p pshared=0x%p\n", attr, pshared);
 
   if (!attr || !pshared)
     {
@@ -79,6 +79,6 @@ int pthread_mutexattr_getpshared(FAR const pthread_mutexattr_t *attr, FAR int *p
       *pshared = attr->pshared;
     }
 
-  serr("Returning %d\n", ret);
+  linfo("Returning %d\n", ret);
   return ret;
 }
diff --git a/libc/pthread/pthread_mutexattrinit.c b/libc/pthread/pthread_mutexattrinit.c
index 620736e2c6..95f5ba8ab8 100644
--- a/libc/pthread/pthread_mutexattrinit.c
+++ b/libc/pthread/pthread_mutexattrinit.c
@@ -67,7 +67,7 @@ int pthread_mutexattr_init(FAR pthread_mutexattr_t *attr)
 {
   int ret = OK;
 
-  serr("attr=0x%p\n", attr);
+  linfo("attr=0x%p\n", attr);
 
   if (!attr)
     {
@@ -81,6 +81,6 @@ int pthread_mutexattr_init(FAR pthread_mutexattr_t *attr)
 #endif
     }
 
-  serr("Returning %d\n", ret);
+  linfo("Returning %d\n", ret);
   return ret;
 }
diff --git a/libc/pthread/pthread_mutexattrsetpshared.c b/libc/pthread/pthread_mutexattrsetpshared.c
index ebcc3c7e3c..3418521ee8 100644
--- a/libc/pthread/pthread_mutexattrsetpshared.c
+++ b/libc/pthread/pthread_mutexattrsetpshared.c
@@ -68,7 +68,7 @@ int pthread_mutexattr_setpshared(FAR pthread_mutexattr_t *attr, int pshared)
 {
   int ret = OK;
 
-  serr("attr=0x%p pshared=%d\n", attr, pshared);
+  linfo("attr=0x%p pshared=%d\n", attr, pshared);
 
   if (!attr || (pshared != 0 && pshared != 1))
     {
@@ -79,6 +79,6 @@ int pthread_mutexattr_setpshared(FAR pthread_mutexattr_t *attr, int pshared)
       attr->pshared = pshared;
     }
 
-  serr("Returning %d\n", ret);
+  linfo("Returning %d\n", ret);
   return ret;
 }
diff --git a/libc/spawn/lib_psa_dump.c b/libc/spawn/lib_psa_dump.c
index b4be80293a..81ccc7a675 100644
--- a/libc/spawn/lib_psa_dump.c
+++ b/libc/spawn/lib_psa_dump.c
@@ -39,6 +39,15 @@
 
 #include 
 
+/* Output debug info even if debug output is not selected. */
+
+#undef  CONFIG_DEBUG_ERROR
+#undef  CONFIG_DEBUG_WARN
+#undef  CONFIG_DEBUG_INFO
+#define CONFIG_DEBUG_ERROR 1
+#define CONFIG_DEBUG_WARN 1
+#define CONFIG_DEBUG_INFO 1
+
 #include 
 #include 
 
diff --git a/libc/stdio/lib_dtoa.c b/libc/stdio/lib_dtoa.c
index 480165ed06..8ddc3bfd35 100644
--- a/libc/stdio/lib_dtoa.c
+++ b/libc/stdio/lib_dtoa.c
@@ -556,15 +556,16 @@ static int cmp(Bigint * a, Bigint * b)
 
   i = a->wds;
   j = b->wds;
+
 #ifdef CONFIG_DEBUG_LIB
   if (i > 1 && !a->x[i - 1])
    {
-    lerr("cmp called with a->x[a->wds-1] == 0\n");
+    lerr("ERROR: cmp called with a->x[a->wds-1] == 0\n");
    }
 
   if (j > 1 && !b->x[j - 1])
    {
-    lerr("cmp called with b->x[b->wds-1] == 0\n");
+    lerr("ERROR: cmp called with b->x[b->wds-1] == 0\n");
    }
 #endif
 
@@ -722,7 +723,7 @@ static Bigint *d2b(double d, int *e, int *bits)
 #ifdef CONFIG_DEBUG_LIB
       if (!z)
         {
-          lerr("Zero passed to d2b\n");
+          lerr("ERROR: Zero passed to d2b\n");
         }
 #endif
       k = lo0bits(&z);
@@ -763,7 +764,7 @@ static Bigint *d2b(double d, int *e, int *bits)
 #ifdef CONFIG_DEBUG_LIB
       if (!z)
         {
-          lerr("Zero passed to d2b\n");
+          lerr("ERROR: Zero passed to d2b\n");
         }
 #endif
       k = lo0bits(&z);
@@ -851,7 +852,7 @@ static int quorem(Bigint * b, Bigint * S)
 #ifdef CONFIG_DEBUG_LIB
   if (b->wds > n)
     {
-      lerr("oversize b in quorem\n");
+      lerr("ERROR: oversize b in quorem\n");
     }
 #endif
   if (b->wds < n)
@@ -867,7 +868,7 @@ static int quorem(Bigint * b, Bigint * S)
 #ifdef CONFIG_DEBUG_LIB
   if (q > 9)
    {
-     lerr("oversized quotient in quorem\n");
+     lerr("ERROR: oversized quotient in quorem\n");
    }
 #endif
 
diff --git a/libc/time/lib_gmtimer.c b/libc/time/lib_gmtimer.c
index a3439e3c03..a9624747c9 100644
--- a/libc/time/lib_gmtimer.c
+++ b/libc/time/lib_gmtimer.c
@@ -317,7 +317,7 @@ FAR struct tm *gmtime_r(FAR const time_t *timer, FAR struct tm *result)
   /* Get the seconds since the EPOCH */
 
   epoch = *timer;
-  serr("timer=%d\n", (int)epoch);
+  linfo("timer=%d\n", (int)epoch);
 
   /* Convert to days, hours, minutes, and seconds since the EPOCH */
 
@@ -332,15 +332,15 @@ FAR struct tm *gmtime_r(FAR const time_t *timer, FAR struct tm *result)
 
   sec    = epoch;
 
-  serr("hour=%d min=%d sec=%d\n",
-       (int)hour, (int)min, (int)sec);
+  linfo("hour=%d min=%d sec=%d\n",
+        (int)hour, (int)min, (int)sec);
 
   /* Convert the days since the EPOCH to calendar day */
 
   clock_utc2calendar(jdn, &year, &month, &day);
 
-  serr("jdn=%d year=%d month=%d day=%d\n",
-       (int)jdn, (int)year, (int)month, (int)day);
+  linfo("jdn=%d year=%d month=%d day=%d\n",
+        (int)jdn, (int)year, (int)month, (int)day);
 
   /* Then return the struct tm contents */
 
diff --git a/libc/time/lib_mktime.c b/libc/time/lib_mktime.c
index 327e86f4c7..160e10fcf1 100644
--- a/libc/time/lib_mktime.c
+++ b/libc/time/lib_mktime.c
@@ -94,14 +94,14 @@ time_t mktime(FAR struct tm *tp)
    */
 
   jdn = clock_calendar2utc(tp->tm_year + 1900, tp->tm_mon, tp->tm_mday);
-  serr("jdn=%d tm_year=%d tm_mon=%d tm_mday=%d\n",
-       (int)jdn, tp->tm_year, tp->tm_mon, tp->tm_mday);
+  linfo("jdn=%d tm_year=%d tm_mon=%d tm_mday=%d\n",
+        (int)jdn, tp->tm_year, tp->tm_mon, tp->tm_mday);
 
   /* Return the seconds into the julian day. */
 
   ret = ((jdn * 24 + tp->tm_hour) * 60 + tp->tm_min) * 60 + tp->tm_sec;
-  serr("ret=%d tm_hour=%d tm_min=%d tm_sec=%d\n",
-       (int)ret, tp->tm_hour, tp->tm_min, tp->tm_sec);
+  linfo("ret=%d tm_hour=%d tm_min=%d tm_sec=%d\n",
+        (int)ret, tp->tm_hour, tp->tm_min, tp->tm_sec);
 
   return ret;
 }
-- 
GitLab


From 823b4b0cffca342c72a87db7ec91f1bfac113ac5 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sun, 12 Jun 2016 11:11:08 -0600
Subject: [PATCH 43/91] Forget to define an info() macro

---
 mm/mm_heap/mm_sem.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/mm/mm_heap/mm_sem.c b/mm/mm_heap/mm_sem.c
index bd39606b5c..1fcb870737 100644
--- a/mm/mm_heap/mm_sem.c
+++ b/mm/mm_heap/mm_sem.c
@@ -53,12 +53,10 @@
 //#define MONITOR_MM_SEMAPHORE 1
 
 #ifdef MONITOR_MM_SEMAPHORE
-#  ifdef CONFIG_DEBUG_ERRORS
-#    include 
-#    define msemerr err
-#  else
-#    define msemerr printf
-#  endif
+#  include 
+#  define msemerr  err
+#  define msemwarn warn
+#  define mseminfo info
 #else
 #  ifdef CONFIG_CPP_HAVE_VARARGS
 #    define msemerr(x...)
@@ -186,7 +184,8 @@ void mm_takesemaphore(FAR struct mm_heap_s *heap)
 
 void mm_givesemaphore(FAR struct mm_heap_s *heap)
 {
-#if defined(CONFIG_DEBUG_ASSERTIONS) || defined(CONFIG_DEBUG_ERRORS)
+#if defined(CONFIG_DEBUG_ASSERTIONS) || \
+   (defined(MONITOR_MM_SEMAPHORE) && defined(CONFIG_DEBUG_INFO))
   pid_t my_pid = getpid();
 #endif
 
@@ -201,7 +200,8 @@ void mm_givesemaphore(FAR struct mm_heap_s *heap)
       /* Yes, just release one count and return */
 
       heap->mm_counts_held--;
-      mseminfo("Holder=%d count=%d\n", heap->mm_holder, heap->mm_counts_held);
+      mseminfo("Holder=%d count=%d\n", heap->mm_holder,
+               heap->mm_counts_held);
     }
   else
     {
-- 
GitLab


From cf4075c741b4dd9390d2e57595815abd651d1983 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sun, 12 Jun 2016 11:13:34 -0600
Subject: [PATCH 44/91] Missed macro definition in one case

---
 mm/mm_heap/mm_sem.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mm/mm_heap/mm_sem.c b/mm/mm_heap/mm_sem.c
index 1fcb870737..b34d61f8af 100644
--- a/mm/mm_heap/mm_sem.c
+++ b/mm/mm_heap/mm_sem.c
@@ -60,8 +60,12 @@
 #else
 #  ifdef CONFIG_CPP_HAVE_VARARGS
 #    define msemerr(x...)
+#    define msemwarn(x...)
+#    define mseminfo(x...)
 #  else
 #    define msemerr (void)
+#    define msemwarn (void)
+#    define mseminfo (void)
 #  endif
 #endif
 
-- 
GitLab


From f3ec664f6306eda51de30f95d27260eb51036547 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sun, 12 Jun 2016 13:08:23 -0600
Subject: [PATCH 45/91] Debug output level (error, warning, info) is now
 selectable on a per-subsystem, per-driver basis

---
 Kconfig                             | 447 +++++++++++++++++++++--
 include/debug.h                     | 544 ++++++++++++++++++++--------
 sched/pthread/pthread_mutexunlock.c |   2 +-
 3 files changed, 807 insertions(+), 186 deletions(-)

diff --git a/Kconfig b/Kconfig
index 2881c6cce8..4d132bbcd4 100644
--- a/Kconfig
+++ b/Kconfig
@@ -452,51 +452,227 @@ config DEBUG_ASSERTIONS
 comment "Subsystem Debug Options"
 
 config DEBUG_AUDIO
-	bool "Audio Device Debug Output"
+	bool "Audio Device Debug Features"
 	default n
 	depends on AUDIO
 	---help---
-		Enable low level debug SYSLOG output from the audio subsystem and
+		Enable audio device debug features.
+		Enable low level debug featurs for the audio subsystem and for audio
 		device drivers. (disabled by default).  Support for this debug option
 		is architecture-specific and may not be available for some MCUs.
 
+if DEBUG_AUDIO
+
+config DEBUG_AUDIO_ERROR
+	bool "Audio Device Error Output"
+	default n
+	depends on DEBUG_ERROR
+	---help---
+		Enable audio device error output to SYSLOG.
+
+config DEBUG_AUDIO_WARN
+	bool "Audio Device Warnings Output"
+	default n
+	depends on DEBUG_WARN
+	---help---
+		Enable audio device warning output to SYSLOG.
+
+config DEBUG_AUDIO_INFO
+	bool "Audio Device Informational Output"
+	default n
+	depends on DEBUG_INFO
+	---help---
+		Enable audio device informational output to SYSLOG.
+
+endif # DEBUG_AUDIO
+
 config DEBUG_BINFMT
-	bool "Binary Loader Debug Output"
+	bool "Binary Loader Debug Features"
 	default n
 	depends on !BINFMT_DISABLE
 	---help---
-		Enable binary loader debug SYSLOG output (disabled by default)
+		Enable binary loader debug features.
+
+if DEBUG_BINFMT
+
+config DEBUG_BINFMT_ERROR
+	bool "Binary Loader Error Output"
+	default n
+	depends on DEBUG_ERROR
+	---help---
+		Enable binary loader error output to SYSLOG.
+
+config DEBUG_BINFMT_WARN
+	bool "Binary Loader Warnings Output"
+	default n
+	depends on DEBUG_WARN
+	---help---
+		Enable binary loader warning output to SYSLOG.
+
+config DEBUG_BINFMT_INFO
+	bool "Binary Loader Informational Output"
+	default n
+	depends on DEBUG_INFO
+	---help---
+		Enable binary loader informational output to SYSLOG.
+
+endif # DEBUG_BINFMT
 
 config DEBUG_CRYPTO
-	bool "Crypto Debug Output"
+	bool "Crypto Debug Features"
 	default n
 	depends on CRYPTO
 	---help---
-		Enable Crypto debug SYSLOG output (disabled by default)
+		Enable cryptographic debug features.
+
+if DEBUG_CRYPTO
+
+config DEBUG_CRYPTO_ERROR
+	bool "Crypto Error Output"
+	default n
+	depends on DEBUG_ERROR
+	---help---
+		Enable cryptographic error output to SYSLOG.
+
+config DEBUG_CRYPTO_WARN
+	bool "Crypto Warnings Output"
+	default n
+	depends on DEBUG_WARN
+	---help---
+		Enable cryptographic warning output to SYSLOG.
+
+config DEBUG_CRYPTO_INFO
+	bool "Crypto Informational Output"
+	default n
+	depends on DEBUG_INFO
+	---help---
+		Enable cryptographic informational output to SYSLOG.
+
+endif # DEBUG_CRYPTO
 
 config DEBUG_FS
-	bool "File System Debug Output"
+	bool "File System Debug Features"
+	default n
+	---help---
+		Enable file system debug features.
+
+if DEBUG_FS
+
+config DEBUG_FS_ERROR
+	bool "File System Error Output"
+	default n
+	depends on DEBUG_ERROR
+	---help---
+		Enable file system error output to SYSLOG.
+
+config DEBUG_FS_WARN
+	bool "File System Warnings Output"
 	default n
+	depends on DEBUG_WARN
 	---help---
-		Enable file system debug SYSLOG output (disabled by default)
+		Enable file system warning output to SYSLOG.
+
+config DEBUG_FS_INFO
+	bool "File System Informational Output"
+	default n
+	depends on DEBUG_INFO
+	---help---
+		Enable file system informational output to SYSLOG.
+
+endif # DEBUG_FS
 
 config DEBUG_GRAPHICS
-	bool "Graphics Debug Output"
+	bool "Graphics Debug Features"
 	default n
 	---help---
-		Enable NX graphics debug SYSLOG output (disabled by default)
+		Enable NX graphics subsystem debug features.
+
+if DEBUG_GRAPHICS
+
+config DEBUG_GRAPHICS_ERROR
+	bool "Graphics Error Output"
+	default n
+	depends on DEBUG_ERROR
+	---help---
+		Enable NX graphics subsystem error output to SYSLOG.
+
+config DEBUG_GRAPHICS_WARN
+	bool "Graphics Warnings Output"
+	default n
+	depends on DEBUG_WARN
+	---help---
+		Enable NX graphics subsystem warning output to SYSLOG.
+
+config DEBUG_GRAPHICS_INFO
+	bool "Graphics Informational Output"
+	default n
+	depends on DEBUG_INFO
+	---help---
+		Enable NX graphics subsystem informational output to SYSLOG.
+
+endif # DEBUG_GRAPHICS
 
 config DEBUG_LIB
-	bool "C Library Debug Output"
+	bool "C Library Debug Features"
+	default n
+	---help---
+		Enable C library debug features.
+
+if DEBUG_LIB
+
+config DEBUG_LIB_ERROR
+	bool "C Library Error Output"
 	default n
+	depends on DEBUG_ERROR
+	---help---
+		Enable C library error output to SYSLOG.
+
+config DEBUG_LIB_WARN
+	bool "C Library Warnings Output"
+	default n
+	depends on DEBUG_WARN
 	---help---
-		Enable C library debug SYSLOG output (disabled by default)
+		Enable C library warning output to SYSLOG.
+
+config DEBUG_LIB_INFO
+	bool "C Library Informational Output"
+	default n
+	depends on DEBUG_INFO
+	---help---
+		Enable C library informational output to SYSLOG.
+
+endif # DEBUG_LIB
 
 config DEBUG_MM
-	bool "Memory Manager Debug Output"
+	bool "Memory Manager Debug Features"
+	default n
+	---help---
+		Enable memory management debug features.
+
+if DEBUG_MM
+
+config DEBUG_MM_ERROR
+	bool "Memory Manager Error Output"
+	default n
+	depends on DEBUG_ERROR
+	---help---
+		Enable memory management error output to SYSLOG.
+
+config DEBUG_MM_WARN
+	bool "Memory Manager Warnings Output"
+	default n
+	depends on DEBUG_WARN
+	---help---
+		Enable memory management warning output to SYSLOG.
+
+config DEBUG_MM_INFO
+	bool "Memory Manager Informational Output"
 	default n
+	depends on DEBUG_INFO
 	---help---
-		Enable memory management debug SYSLOG output (disabled by default)
+		Enable memory management informational output to SYSLOG.
+
+endif # DEBUG_MM
 
 config DEBUG_SHM
 	bool "Shared Memory Debug Output"
@@ -506,17 +682,67 @@ config DEBUG_SHM
 		Enable shared memory management debug SYSLOG output (disabled by default)
 
 config DEBUG_NET
-	bool "Network Debug Output"
+	bool "Network Debug Features"
 	default n
 	depends on ARCH_HAVE_NET
 	---help---
-		Enable network debug SYSLOG output (disabled by default)
+		Enable network debug features.
+
+if DEBUG_NET
+
+config DEBUG_NET_ERROR
+	bool "Network Error Output"
+	default n
+	depends on DEBUG_ERROR
+	---help---
+		Enable network error output to SYSLOG.
+
+config DEBUG_NET_WARN
+	bool "Network Warnings Output"
+	default n
+	depends on DEBUG_WARN
+	---help---
+		Enable network warning output to SYSLOG.
+
+config DEBUG_NET_INFO
+	bool "Network Informational Output"
+	default n
+	depends on DEBUG_INFO
+	---help---
+		Enable network informational output to SYSLOG.
+
+endif # DEBUG_NET
 
 config DEBUG_SCHED
-	bool "Scheduler Debug Output"
+	bool "Scheduler Debug Features"
 	default n
 	---help---
-		Enable OS debug SYSLOG output (disabled by default)
+		Enable OS scheduler debug features.
+
+if DEBUG_SCHED
+
+config DEBUG_SCHED_ERROR
+	bool "Scheduler Error Output"
+	default n
+	depends on DEBUG_ERROR
+	---help---
+		Enable OS scheduler error output to SYSLOG.
+
+config DEBUG_SCHED_WARN
+	bool "Scheduler Warnings Output"
+	default n
+	depends on DEBUG_WARN
+	---help---
+		Enable OS scheduler warning output to SYSLOG.
+
+config DEBUG_SCHED_INFO
+	bool "Scheduler Informational Output"
+	default n
+	depends on DEBUG_INFO
+	---help---
+		Enable OS scheduler informational output to SYSLOG.
+
+endif # DEBUG_SCHED
 
 config DEBUG_SYSCALL
 	bool "SYSCALL Debug Output"
@@ -538,14 +764,40 @@ config DEBUG_WIRELESS
 comment "OS Function Debug Options"
 
 config DEBUG_DMA
-	bool "DMA Debug Output"
+	bool "DMA Debug Features"
 	default n
 	depends on ARCH_DMA
 	---help---
-		Enable DMA-releated debug SYSLOG output (disabled by default).
+		Enable DMA debug features.
+
 		Support for this debug option is architecture-specific and may not
 		be available for some MCUs.
 
+if DEBUG_DMA
+
+config DEBUG_DMA_ERROR
+	bool "DMA Error Output"
+	default n
+	depends on DEBUG_ERROR
+	---help---
+		Enable DMA error output to SYSLOG.
+
+config DEBUG_DMA_WARN
+	bool "DMA Warnings Output"
+	default n
+	depends on DEBUG_WARN
+	---help---
+		Enable DMA warning output to SYSLOG.
+
+config DEBUG_DMA_INFO
+	bool "DMA Informational Output"
+	default n
+	depends on DEBUG_INFO
+	---help---
+		Enable DMA informational output to SYSLOG.
+
+endif # DEBUG_DMA
+
 config DEBUG_HEAP
 	bool "Heap usage debug hooks"
 	default n
@@ -565,11 +817,36 @@ config DEBUG_IRQ
 		option may even cause crashes! Use with care!
 
 config DEBUG_PAGING
-	bool "Demand Paging Debug Output"
+	bool "Paging Debug Features"
 	default n
 	depends on PAGING
 	---help---
-		Enable demand paging debug SYSLOG output (disabled by default)
+		Enable OS demand paging debug features.
+
+if DEBUG_PAGING
+
+config DEBUG_PAGING_ERROR
+	bool "Paging Error Output"
+	default n
+	depends on DEBUG_ERROR
+	---help---
+		Enable OS demand paging error output to SYSLOG.
+
+config DEBUG_PAGING_WARN
+	bool "Paging Warnings Output"
+	default n
+	depends on DEBUG_WARN
+	---help---
+		Enable OS demand paging warning output to SYSLOG.
+
+config DEBUG_PAGING_INFO
+	bool "Paging Informational Output"
+	default n
+	depends on DEBUG_INFO
+	---help---
+		Enable OS demand paging informational output to SYSLOG.
+
+endif # DEBUG_PAGING
 
 comment "Driver Debug Options"
 
@@ -592,23 +869,76 @@ config DEBUG_LEDS
 		some boards.
 
 config DEBUG_INPUT
-	bool "Input Device Debug Output"
+	bool "Input Device Debug Features"
 	default n
 	depends on INPUT
 	---help---
-		Enable low level debug SYSLOG output from the input device drivers
+		Enable input d.
+		Enable low level evice debug features for the input device drivers
 		such as mice and touchscreens (disabled by default).  Support for
 		this debug option is board-specific and may not be available for
 		some boards.
 
+if DEBUG_INPUT
+
+config DEBUG_INPUT_ERROR
+	bool "Input Device Error Output"
+	default n
+	depends on DEBUG_ERROR
+	---help---
+		Enable input device error output to SYSLOG.
+
+config DEBUG_INPUT_WARN
+	bool "Input Device Warnings Output"
+	default n
+	depends on DEBUG_WARN
+	---help---
+		Enable input device warning output to SYSLOG.
+
+config DEBUG_INPUT_INFO
+	bool "Input Device Informational Output"
+	default n
+	depends on DEBUG_INFO
+	---help---
+		Enable input device informational output to SYSLOG.
+
+endif # DEBUG_INPUT
+
 config DEBUG_ANALOG
-	bool "Analog Device Debug Output"
+	bool "Analog Device Debug Features"
 	default n
+	depends on ANALOG
 	---help---
-		Enable low level debug SYSLOG output from the analog device drivers
-		such as A/D and D/A converters (disabled by default).  Support for
-		this debug option is architecture-specific and may not be available
-		for some MCUs.
+		Enable  debug features.
+		Enable low level debug features the analog device drivers such as
+		A/D and D/A converters (disabled by default).  Support for this
+		debug option is architecture-specific and may not be available for
+		some MCUs.
+
+if DEBUG_ANALOG
+
+config DEBUG_ANALOG_ERROR
+	bool "Analog Device Error Output"
+	default n
+	depends on DEBUG_ERROR
+	---help---
+		Enable analog device error output to SYSLOG.
+
+config DEBUG_ANALOG_WARN
+	bool "Analog Device Warnings Output"
+	default n
+	depends on DEBUG_WARN
+	---help---
+		Enable analog device warning output to SYSLOG.
+
+config DEBUG_ANALOG_INFO
+	bool "Analog Device Informational Output"
+	default n
+	depends on DEBUG_INFO
+	---help---
+		Enable analog device informational output to SYSLOG.
+
+endif # DEBUG_ANALOG
 
 config DEBUG_CAN
 	bool "CAN Debug Output"
@@ -673,14 +1003,40 @@ config DEBUG_SDIO
 		be available for some MCUs.
 
 config DEBUG_SENSORS
-	bool "Sensor Debug Output"
+	bool "Sensor Debug Features"
 	default n
 	depends on SENSORS
 	---help---
-		Enable sensor driver debug SYSLOG output (disabled by default).
+		Enable sensor driver debug features.
+
 		Support for this debug option is architecture-specific and may not
 		be available for some MCUs.
 
+if DEBUG_SENSORS
+
+config DEBUG_SENSORS_ERROR
+	bool "Sensor Error Output"
+	default n
+	depends on DEBUG_ERROR
+	---help---
+		Enable sensor driver error output to SYSLOG.
+
+config DEBUG_SENSORS_WARN
+	bool "Sensor Warnings Output"
+	default n
+	depends on DEBUG_WARN
+	---help---
+		Enable sensor driver warning output to SYSLOG.
+
+config DEBUG_SENSORS_INFO
+	bool "Sensor Informational Output"
+	default n
+	depends on DEBUG_INFO
+	---help---
+		Enable sensor driver informational output to SYSLOG.
+
+endif # DEBUG_SENSORS
+
 config DEBUG_SPI
 	bool "SPI Debug Output"
 	default n
@@ -700,11 +1056,36 @@ config DEBUG_TIMER
 		be available for some MCUs.
 
 config DEBUG_USB
-	bool "USB Debug Output"
+	bool "USB Debug Features"
 	default n
 	depends on USBDEV || USBHOST
 	---help---
-		Enable usb debug SYSLOG output (disabled by default)
+		Enable USB debug features.
+
+if DEBUG_USB
+
+config DEBUG_USB_ERROR
+	bool "USB Error Output"
+	default n
+	depends on DEBUG_ERROR
+	---help---
+		Enable USB error output to SYSLOG.
+
+config DEBUG_USB_WARN
+	bool "USB Warnings Output"
+	default n
+	depends on DEBUG_WARN
+	---help---
+		Enable USB warning output to SYSLOG.
+
+config DEBUG_USB_INFO
+	bool "USB Informational Output"
+	default n
+	depends on DEBUG_INFO
+	---help---
+		Enable USB informational output to SYSLOG.
+
+endif # DEBUG_USB
 
 config DEBUG_WATCHDOG
 	bool "Watchdog Timer Debug Output"
diff --git a/include/debug.h b/include/debug.h
index 5fe9af5f88..43f27a6cf5 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -179,242 +179,362 @@
 
 /* Subsystem specific debug */
 
-#ifdef CONFIG_DEBUG_MM
+#ifdef CONFIG_DEBUG_MM_ERROR
 #  define merr(format, ...)    err(format, ##__VA_ARGS__)
 #  define mllerr(format, ...)  llerr(format, ##__VA_ARGS__)
-#  define mwarn(format, ...)   warn(format, ##__VA_ARGS__)
-#  define mllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
-#  define minfo(format, ...)   info(format, ##__VA_ARGS__)
-#  define mllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 #  define merr(x...)
 #  define mllerr(x...)
+#endif
+
+#ifdef CONFIG_DEBUG_MM_WARN
+#  define mwarn(format, ...)   warn(format, ##__VA_ARGS__)
+#  define mllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
+#else
 #  define mwarn(x...)
 #  define mllwarn(x...)
+#endif
+
+#ifdef CONFIG_DEBUG_MM_INFO
+#  define minfo(format, ...)   info(format, ##__VA_ARGS__)
+#  define mllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
+#else
 #  define minfo(x...)
 #  define mllinfo(x...)
 #endif
 
-#ifdef CONFIG_DEBUG_SCHED
+#ifdef CONFIG_DEBUG_SCHED_ERROR
 #  define serr(format, ...)    err(format, ##__VA_ARGS__)
 #  define sllerr(format, ...)  llerr(format, ##__VA_ARGS__)
-#  define swarn(format, ...)   warn(format, ##__VA_ARGS__)
-#  define sllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
-#  define sinfo(format, ...)   info(format, ##__VA_ARGS__)
-#  define sllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 #  define serr(x...)
 #  define sllerr(x...)
+#endif
+
+#ifdef CONFIG_DEBUG_SCHED_WARN
+#  define swarn(format, ...)   warn(format, ##__VA_ARGS__)
+#  define sllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
+#else
 #  define swarn(x...)
 #  define sllwarn(x...)
+#endif
+
+#ifdef CONFIG_DEBUG_SCHED_INFO
+#  define sinfo(format, ...)   info(format, ##__VA_ARGS__)
+#  define sllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
+#else
 #  define sinfo(x...)
 #  define sllinfo(x...)
 #endif
 
-#ifdef CONFIG_DEBUG_PAGING
+#ifdef CONFIG_DEBUG_PAGING_ERROR
 #  define pgerr(format, ...)    err(format, ##__VA_ARGS__)
 #  define pgllerr(format, ...)  llerr(format, ##__VA_ARGS__)
+#else
+#  define pgerr(x...)
+#  define pgllerr(x...)
+#endif
+
+#ifdef CONFIG_DEBUG_PAGING_WARN
 #  define pgwarn(format, ...)   warn(format, ##__VA_ARGS__)
 #  define pgllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
+#else
+#  define pgwarn(x...)
+#  define pgllwarn(x...)
+#endif
+
+#ifdef CONFIG_DEBUG_PAGING_INFO
 #  define pginfo(format, ...)   info(format, ##__VA_ARGS__)
 #  define pgllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 #  define pgerr(x...)
 #  define pgllerr(x...)
-#  define pgwarn(x...)
-#  define pgllwarn(x...)
-#  define pginfo(x...)
-#  define pgllinfo(x...)
 #endif
 
-#ifdef CONFIG_DEBUG_DMA
+#ifdef CONFIG_DEBUG_DMA_ERROR
 #  define dmaerr(format, ...)    err(format, ##__VA_ARGS__)
 #  define dmallerr(format, ...)  llerr(format, ##__VA_ARGS__)
-#  define dmawarn(format, ...)   warn(format, ##__VA_ARGS__)
-#  define dmallwarn(format, ...) llwarn(format, ##__VA_ARGS__)
-#  define dmainfo(format, ...)   info(format, ##__VA_ARGS__)
-#  define dmallinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 #  define dmaerr(x...)
 #  define dmallerr(x...)
+#endif
+
+#ifdef CONFIG_DEBUG_DMA_WARN
+#  define dmawarn(format, ...)   warn(format, ##__VA_ARGS__)
+#  define dmallwarn(format, ...) llwarn(format, ##__VA_ARGS__)
+#else
 #  define dmawarn(x...)
 #  define dmallwarn(x...)
+#endif
+
+#ifdef CONFIG_DEBUG_DMA_INFO
+#  define dmainfo(format, ...)   info(format, ##__VA_ARGS__)
+#  define dmallinfo(format, ...) llinfo(format, ##__VA_ARGS__)
+#else
 #  define dmainfo(x...)
 #  define dmallinfo(x...)
 #endif
 
-#ifdef CONFIG_DEBUG_NET
+#ifdef CONFIG_DEBUG_NET_ERROR
 #  define nerr(format, ...)    err(format, ##__VA_ARGS__)
 #  define nllerr(format, ...)  llerr(format, ##__VA_ARGS__)
-#  define nwarn(format, ...)   warn(format, ##__VA_ARGS__)
-#  define nllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
-#  define ninfo(format, ...)   info(format, ##__VA_ARGS__)
-#  define nllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 #  define nerr(x...)
 #  define nllerr(x...)
+#endif
+
+#ifdef CONFIG_DEBUG_NET_WARN
+#  define nwarn(format, ...)   warn(format, ##__VA_ARGS__)
+#  define nllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
+#else
 #  define nwarn(x...)
 #  define nllwarn(x...)
+#endif
+
+#ifdef CONFIG_DEBUG_NET_INFO
+#  define ninfo(format, ...)   info(format, ##__VA_ARGS__)
+#  define nllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
+#else
 #  define ninfo(x...)
 #  define nllinfo(x...)
 #endif
 
-#ifdef CONFIG_DEBUG_USB
+#ifdef CONFIG_DEBUG_USB_ERROR
 #  define uerr(format, ...)    err(format, ##__VA_ARGS__)
 #  define ullerr(format, ...)  llerr(format, ##__VA_ARGS__)
-#  define uwarn(format, ...)   warn(format, ##__VA_ARGS__)
-#  define ullwarn(format, ...) llwarn(format, ##__VA_ARGS__)
-#  define uinfo(format, ...)   info(format, ##__VA_ARGS__)
-#  define ullinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 #  define uerr(x...)
 #  define ullerr(x...)
+#endif
+
+#ifdef CONFIG_DEBUG_USB_WARN
+#  define uwarn(format, ...)   warn(format, ##__VA_ARGS__)
+#  define ullwarn(format, ...) llwarn(format, ##__VA_ARGS__)
+#else
 #  define uwarn(x...)
 #  define ullwarn(x...)
+#endif
+
+#ifdef CONFIG_DEBUG_USB_INFO
+#  define uinfo(format, ...)   info(format, ##__VA_ARGS__)
+#  define ullinfo(format, ...) llinfo(format, ##__VA_ARGS__)
+#else
 #  define uinfo(x...)
 #  define ullinfo(x...)
 #endif
 
-#ifdef CONFIG_DEBUG_FS
+#ifdef CONFIG_DEBUG_FS_ERROR
 #  define ferr(format, ...)    err(format, ##__VA_ARGS__)
 #  define fllerr(format, ...)  llerr(format, ##__VA_ARGS__)
-#  define fwarn(format, ...)   warn(format, ##__VA_ARGS__)
-#  define fllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
-#  define finfo(format, ...)   info(format, ##__VA_ARGS__)
-#  define fllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 #  define ferr(x...)
 #  define fllerr(x...)
+#endif
+
+#ifdef CONFIG_DEBUG_FS_WARN
+#  define fwarn(format, ...)   warn(format, ##__VA_ARGS__)
+#  define fllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
+#else
 #  define fwarn(x...)
 #  define fllwarn(x...)
+#endif
+
+#ifdef CONFIG_DEBUG_FS_INFO
+#  define finfo(format, ...)   info(format, ##__VA_ARGS__)
+#  define fllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
+#else
 #  define finfo(x...)
 #  define fllinfo(x...)
 #endif
 
-#ifdef CONFIG_DEBUG_CRYPTO
+#ifdef CONFIG_DEBUG_CRYPTO_ERROR
 #  define crypterr(format, ...)    err(format, ##__VA_ARGS__)
 #  define cryptllerr(format, ...)  llerr(format, ##__VA_ARGS__)
-#  define cryptwarn(format, ...)   warn(format, ##__VA_ARGS__)
-#  define cryptllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
-#  define cryptinfo(format, ...)   info(format, ##__VA_ARGS__)
-#  define cryptllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 #  define crypterr(x...)
 #  define cryptllerr(x...)
+#endif
+
+#ifdef CONFIG_DEBUG_CRYPTO_WARN
+#  define cryptwarn(format, ...)   warn(format, ##__VA_ARGS__)
+#  define cryptllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
+#else
 #  define cryptwarn(x...)
 #  define cryptllwarn(x...)
+#endif
+
+#ifdef CONFIG_DEBUG_CRYPTO_INFO
+#  define cryptinfo(format, ...)   info(format, ##__VA_ARGS__)
+#  define cryptllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
+#else
 #  define cryptinfo(x...)
 #  define cryptllinfo(x...)
 #endif
 
-#ifdef CONFIG_DEBUG_INPUT
+#ifdef CONFIG_DEBUG_INPUT_ERROR
 #  define ierr(format, ...)    err(format, ##__VA_ARGS__)
 #  define illerr(format, ...)  llerr(format, ##__VA_ARGS__)
-#  define iwarn(format, ...)   warn(format, ##__VA_ARGS__)
-#  define illwarn(format, ...) llwarn(format, ##__VA_ARGS__)
-#  define iinfo(format, ...)   info(format, ##__VA_ARGS__)
-#  define illinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 #  define ierr(x...)
 #  define illerr(x...)
+#endif
+
+#ifdef CONFIG_DEBUG_INPUT_WARN
+#  define iwarn(format, ...)   warn(format, ##__VA_ARGS__)
+#  define illwarn(format, ...) llwarn(format, ##__VA_ARGS__)
+#else
 #  define iwarn(x...)
 #  define illwarn(x...)
+#endif
+
+#ifdef CONFIG_DEBUG_INPUT_INFO
+#  define iinfo(format, ...)   info(format, ##__VA_ARGS__)
+#  define illinfo(format, ...) llinfo(format, ##__VA_ARGS__)
+#else
 #  define iinfo(x...)
 #  define illinfo(x...)
 #endif
 
-#ifdef CONFIG_DEBUG_SENSORS
+#ifdef CONFIG_DEBUG_SENSORS_ERROR
 #  define snerr(format, ...)    err(format, ##__VA_ARGS__)
 #  define snllerr(format, ...)  llerr(format, ##__VA_ARGS__)
-#  define snwarn(format, ...)   warn(format, ##__VA_ARGS__)
-#  define snllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
-#  define sninfo(format, ...)   info(format, ##__VA_ARGS__)
-#  define snllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 #  define snerr(x...)
 #  define snllerr(x...)
+#endif
+
+#ifdef CONFIG_DEBUG_SENSORS_WARN
+#  define snwarn(format, ...)   warn(format, ##__VA_ARGS__)
+#  define snllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
+#else
 #  define snwarn(x...)
 #  define snllwarn(x...)
+#endif
+
+#ifdef CONFIG_DEBUG_SENSORS_INFO
+#  define sninfo(format, ...)   info(format, ##__VA_ARGS__)
+#  define snllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
+#else
 #  define sninfo(x...)
 #  define snllinfo(x...)
 #endif
 
-#ifdef CONFIG_DEBUG_ANALOG
+#ifdef CONFIG_DEBUG_ANALOG_ERROR
 #  define aerr(format, ...)    err(format, ##__VA_ARGS__)
 #  define allerr(format, ...)  llerr(format, ##__VA_ARGS__)
-#  define awarn(format, ...)   warn(format, ##__VA_ARGS__)
-#  define allwarn(format, ...) llwarn(format, ##__VA_ARGS__)
-#  define ainfo(format, ...)   info(format, ##__VA_ARGS__)
-#  define allinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 #  define aerr(x...)
 #  define allerr(x...)
+#endif
+
+#ifdef CONFIG_DEBUG_ANALOG_WARN
+#  define awarn(format, ...)   warn(format, ##__VA_ARGS__)
+#  define allwarn(format, ...) llwarn(format, ##__VA_ARGS__)
+#else
 #  define awarn(x...)
 #  define allwarn(x...)
+#endif
+
+#ifdef CONFIG_DEBUG_ANALOG_INFO
+#  define ainfo(format, ...)   info(format, ##__VA_ARGS__)
+#  define allinfo(format, ...) llinfo(format, ##__VA_ARGS__)
+#else
 #  define ainfo(x...)
 #  define allinfo(x...)
 #endif
 
-#ifdef CONFIG_DEBUG_GRAPHICS
+#ifdef CONFIG_DEBUG_GRAPHICS_ERROR
 #  define gerr(format, ...)    err(format, ##__VA_ARGS__)
 #  define gllerr(format, ...)  llerr(format, ##__VA_ARGS__)
-#  define gwarn(format, ...)   warn(format, ##__VA_ARGS__)
-#  define gllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
-#  define ginfo(format, ...)   info(format, ##__VA_ARGS__)
-#  define gllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 #  define gerr(x...)
 #  define gllerr(x...)
+#endif
+
+#ifdef CONFIG_DEBUG_GRAPHICS_WARN
+#  define gwarn(format, ...)   warn(format, ##__VA_ARGS__)
+#  define gllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
+#else
 #  define gwarn(x...)
 #  define gllwarn(x...)
+#endif
+
+#ifdef CONFIG_DEBUG_GRAPHICS_INFO
+#  define ginfo(format, ...)   info(format, ##__VA_ARGS__)
+#  define gllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
+#else
 #  define ginfo(x...)
 #  define gllinfo(x...)
 #endif
 
-#ifdef CONFIG_DEBUG_BINFMT
+#ifdef CONFIG_DEBUG_BINFMT_ERROR
 #  define berr(format, ...)    err(format, ##__VA_ARGS__)
 #  define bllerr(format, ...)  llerr(format, ##__VA_ARGS__)
-#  define bwarn(format, ...)   warn(format, ##__VA_ARGS__)
-#  define bllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
-#  define binfo(format, ...)   info(format, ##__VA_ARGS__)
-#  define bllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 #  define berr(x...)
 #  define bllerr(x...)
+#endif
+
+#ifdef CONFIG_DEBUG_BINFMT_WARN
+#  define bwarn(format, ...)   warn(format, ##__VA_ARGS__)
+#  define bllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
+#else
 #  define bwarn(x...)
 #  define bllwarn(x...)
+#endif
+
+#ifdef CONFIG_DEBUG_BINFMT_INFO
+#  define binfo(format, ...)   info(format, ##__VA_ARGS__)
+#  define bllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
+#else
 #  define binfo(x...)
 #  define bllinfo(x...)
 #endif
 
-#ifdef CONFIG_DEBUG_LIB
+#ifdef CONFIG_DEBUG_LIB_ERROR
 #  define lerr(format, ...)    err(format, ##__VA_ARGS__)
 #  define lllerr(format, ...)  llerr(format, ##__VA_ARGS__)
-#  define lwarn(format, ...)   warn(format, ##__VA_ARGS__)
-#  define lllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
-#  define linfo(format, ...)   info(format, ##__VA_ARGS__)
-#  define lllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 #  define lerr(x...)
 #  define lllerr(x...)
+#endif
+
+#ifdef CONFIG_DEBUG_LIB_WARN
+#  define lwarn(format, ...)   warn(format, ##__VA_ARGS__)
+#  define lllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
+#else
 #  define lwarn(x...)
 #  define lllwarn(x...)
+#endif
+
+#ifdef CONFIG_DEBUG_LIB_INFO
+#  define linfo(format, ...)   info(format, ##__VA_ARGS__)
+#  define lllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
+#else
 #  define linfo(x...)
 #  define lllinfo(x...)
 #endif
 
-#ifdef CONFIG_DEBUG_AUDIO
+#ifdef CONFIG_DEBUG_AUDIO_ERROR
 #  define auderr(format, ...)    err(format, ##__VA_ARGS__)
 #  define audllerr(format, ...)  llerr(format, ##__VA_ARGS__)
-#  define audwarn(format, ...)   warn(format, ##__VA_ARGS__)
-#  define audllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
-#  define audinfo(format, ...)   info(format, ##__VA_ARGS__)
-#  define audllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 #  define auderr(x...)
 #  define audllerr(x...)
+#endif
+
+#ifdef CONFIG_DEBUG_AUDIO_WARN
+#  define audwarn(format, ...)   warn(format, ##__VA_ARGS__)
+#  define audllwarn(format, ...) llwarn(format, ##__VA_ARGS__)
+#else
 #  define audwarn(x...)
 #  define audllwarn(x...)
+#endif
+
+#ifdef CONFIG_DEBUG_AUDIO_INFO
+#  define audinfo(format, ...)   info(format, ##__VA_ARGS__)
+#  define audllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
+#else
 #  define audinfo(x...)
 #  define audllinfo(x...)
 #endif
@@ -452,242 +572,362 @@
 
 /* Subsystem specific debug */
 
-#ifdef CONFIG_DEBUG_MM
+#ifdef CONFIG_DEBUG_MM_ERROR
 #  define merr        err
 #  define mllerr      llerr
-#  define mwarn       warn
-#  define mllwarn     llwarn
-#  define minfo       info
-#  define mllinfo     llinfo
 #else
 #  define merr        (void)
 #  define mllerr      (void)
+#endif
+
+#ifdef CONFIG_DEBUG_MM_WARN
+#  define mwarn       warn
+#  define mllwarn     llwarn
+#else
 #  define mwarn       (void)
 #  define mllwarn     (void)
+#endif
+
+#ifdef CONFIG_DEBUG_MM_INFO
+#  define minfo       info
+#  define mllinfo     llinfo
+#else
 #  define minfo       (void)
 #  define mllinfo     (void)
 #endif
 
-#ifdef CONFIG_DEBUG_SCHED
+#ifdef CONFIG_DEBUG_SCHED_ERROR
 #  define serr        err
 #  define sllerr      llerr
-#  define swarn       warn
-#  define sllwarn     llwarn
-#  define sinfo       info
-#  define sllinfo     llinfo
 #else
 #  define serr        (void)
 #  define sllerr      (void)
+#endif
+
+#ifdef CONFIG_DEBUG_SCHED_WARN
+#  define swarn       warn
+#  define sllwarn     llwarn
+#else
 #  define swarn       (void)
 #  define sllwarn     (void)
+#endif
+
+#ifdef CONFIG_DEBUG_SCHED_INFO
+#  define sinfo       info
+#  define sllinfo     llinfo
+#else
 #  define sinfo       (void)
 #  define sllinfo     (void)
 #endif
 
-#ifdef CONFIG_DEBUG_PAGING
+#ifdef CONFIG_DEBUG_PAGING_ERROR
 #  define pgerr       err
 #  define pgllerr     llerr
-#  define pgwarn      warn
-#  define pgllwarn    llwarn
-#  define pginfo      info
-#  define pgllinfo    llinfo
 #else
 #  define pgerr       (void)
 #  define pgllerr     (void)
+#endif
+
+#ifdef CONFIG_DEBUG_PAGING_WARN
+#  define pgwarn      warn
+#  define pgllwarn    llwarn
+#else
 #  define pgwarn      (void)
 #  define pgllwarn    (void)
+#endif
+
+#ifdef CONFIG_DEBUG_PAGING_INFO
+#  define pginfo      info
+#  define pgllinfo    llinfo
+#else
 #  define pginfo      (void)
 #  define pgllinfo    (void)
 #endif
 
-#ifdef CONFIG_DEBUG_DMA
+#ifdef CONFIG_DEBUG_DMA_ERROR
 #  define dmaerr      err
 #  define dmallerr    llerr
-#  define dmawarn     warn
-#  define dmallwarn   llwarn
-#  define dmainfo     info
-#  define dmallinfo   llinfo
 #else
 #  define dmaerr      (void)
 #  define dmallerr    (void)
+#endif
+
+#ifdef CONFIG_DEBUG_DMA_WARN
+#  define dmawarn     warn
+#  define dmallwarn   llwarn
+#else
 #  define dmawarn     (void)
 #  define dmallwarn   (void)
+#endif
+
+#ifdef CONFIG_DEBUG_DMA_INFO
+#  define dmainfo     info
+#  define dmallinfo   llinfo
+#else
 #  define dmainfo     (void)
 #  define dmallinfo   (void)
 #endif
 
-#ifdef CONFIG_DEBUG_NET
+#ifdef CONFIG_DEBUG_NET_ERROR
 #  define nerr        err
 #  define nllerr      llerr
-#  define nwarn       warn
-#  define nllwarn     llwarn
-#  define ninfo       info
-#  define nllinfo     llinfo
 #else
 #  define nerr        (void)
 #  define nllerr      (void)
+#endif
+
+#ifdef CONFIG_DEBUG_NET_WARN
+#  define nwarn       warn
+#  define nllwarn     llwarn
+#else
 #  define nwarn       (void)
 #  define nllwarn     (void)
+#endif
+
+#ifdef CONFIG_DEBUG_NET_INFO
+#  define ninfo       info
+#  define nllinfo     llinfo
+#else
 #  define ninfo       (void)
 #  define nllinfo     (void)
 #endif
 
-#ifdef CONFIG_DEBUG_USB
+#ifdef CONFIG_DEBUG_USB_ERROR
 #  define uerr        err
 #  define ullerr      llerr
-#  define uwarn       warn
-#  define ullwarn     llwarn
-#  define uinfo       info
-#  define ullinfo     llinfo
 #else
 #  define uerr        (void)
 #  define ullerr      (void)
+#endif
+
+#ifdef CONFIG_DEBUG_USB_WARN
+#  define uwarn       warn
+#  define ullwarn     llwarn
+#else
 #  define uwarn       (void)
 #  define ullwarn     (void)
+#endif
+
+#ifdef CONFIG_DEBUG_USB_INFO
+#  define uinfo       info
+#  define ullinfo     llinfo
+#else
 #  define uinfo       (void)
 #  define ullinfo     (void)
 #endif
 
-#ifdef CONFIG_DEBUG_FS
+#ifdef CONFIG_DEBUG_FS_ERROR
 #  define ferr        err
 #  define fllerr      llerr
-#  define fwarn       warn
-#  define fllwarn     llwarn
-#  define finfo       info
-#  define fllinfo     llinfo
 #else
 #  define ferr        (void)
 #  define fllerr      (void)
+#endif
+
+#ifdef CONFIG_DEBUG_FS_WARN
+#  define fwarn       warn
+#  define fllwarn     llwarn
+#else
 #  define fwarn       (void)
 #  define fllwarn     (void)
+#endif
+
+#ifdef CONFIG_DEBUG_FS_INFO
+#  define finfo       info
+#  define fllinfo     llinfo
+#else
 #  define finfo       (void)
 #  define fllinfo     (void)
 #endif
 
-#ifdef CONFIG_DEBUG_CRYPTO
+#ifdef CONFIG_DEBUG_CRYPTO_ERROR
 #  define crypterr    err
 #  define cryptllerr  llerr
-#  define cryptwarn   warn
-#  define cryptllwarn llwarn
-#  define cryptinfo   info
-#  define cryptllinfo llinfo
 #else
 #  define crypterr    (void)
 #  define cryptllerr  (void)
+#endif
+
+#ifdef CONFIG_DEBUG_CRYPTO_WARN
+#  define cryptwarn   warn
+#  define cryptllwarn llwarn
+#else
 #  define cryptwarn   (void)
 #  define cryptllwarn (void)
-#  define cryptinfo   (void)
-#  define cryptllinfo (void)
 #endif
 
-#ifdef CONFIG_DEBUG_INPUT
+#ifdef CONFIG_DEBUG_CRYPTO_INFO
+#  define cryptinfo   info
+#  define cryptllinfo llinfo
+#else
+#  define cryptinfo(x...)
+#  define cryptllinfo(x...)
+#endif
+
+#ifdef CONFIG_DEBUG_INPUT_ERROR
 #  define ierr        err
 #  define illerr      llerr
-#  define iwarn       warn
-#  define illwarn     llwarn
-#  define iinfo       info
-#  define illinfo     llinfo
 #else
 #  define ierr        (void)
 #  define illerr      (void)
+#endif
+
+#ifdef CONFIG_DEBUG_INPUT_WARN
+#  define iwarn       warn
+#  define illwarn     llwarn
+#else
 #  define iwarn       (void)
 #  define illwarn     (void)
+#endif
+
+#ifdef CONFIG_DEBUG_INPUT_INFO
+#  define iinfo       info
+#  define illinfo     llinfo
+#else
 #  define iinfo       (void)
 #  define illinfo     (void)
 #endif
 
-#ifdef CONFIG_DEBUG_SENSORS
+#ifdef CONFIG_DEBUG_SENSORS_ERROR
 #  define snerr       err
 #  define snllerr     llerr
-#  define snwarn      warn
-#  define snllwarn    llwarn
-#  define sninfo      info
-#  define snllinfo    llinfo
 #else
 #  define snerr       (void)
 #  define snllerr     (void)
+#endif
+
+#ifdef CONFIG_DEBUG_SENSORS_WARN
+#  define snwarn      warn
+#  define snllwarn    llwarn
+#else
 #  define snwarn      (void)
 #  define snllwarn    (void)
+#endif
+
+#ifdef CONFIG_DEBUG_SENSORS_INFO
+#  define sninfo      info
+#  define snllinfo    llinfo
+#else
 #  define sninfo      (void)
 #  define snllinfo    (void)
 #endif
 
-#ifdef CONFIG_DEBUG_ANALOG
+#ifdef CONFIG_DEBUG_ANALOG_ERROR
 #  define aerr        err
 #  define allerr      llerr
-#  define awarn       warn
-#  define allwarn     llwarn
-#  define ainfo       info
-#  define allinfo     llinfo
 #else
 #  define aerr        (void)
 #  define allerr      (void)
+#endif
+
+#ifdef CONFIG_DEBUG_ANALOG_WARN
+#  define awarn       warn
+#  define allwarn     llwarn
+#else
 #  define awarn       (void)
 #  define allwarn     (void)
+#endif
+
+#ifdef CONFIG_DEBUG_ANALOG_INFO
+#  define ainfo       info
+#  define allinfo     llinfo
+#else
 #  define ainfo       (void)
 #  define allinfo     (void)
 #endif
 
-#ifdef CONFIG_DEBUG_GRAPHICS
+#ifdef CONFIG_DEBUG_GRAPHICS_ERROR
 #  define gerr        err
 #  define gllerr      llerr
-#  define gwarn       warn
-#  define gllwarn     llwarn
-#  define ginfo       info
-#  define gllinfo     llinfo
 #else
 #  define gerr        (void)
 #  define gllerr      (void)
+#endif
+
+#ifdef CONFIG_DEBUG_GRAPHICS_WARN
+#  define gwarn       warn
+#  define gllwarn     llwarn
+#else
 #  define gwarn       (void)
 #  define gllwarn     (void)
+#endif
+
+#ifdef CONFIG_DEBUG_GRAPHICS_INFO
+#  define ginfo       info
+#  define gllinfo     llinfo
+#else
 #  define ginfo       (void)
 #  define gllinfo     (void)
 #endif
 
-#ifdef CONFIG_DEBUG_BINFMT
+#ifdef CONFIG_DEBUG_BINFMT_ERROR
 #  define berr        err
 #  define bllerr      llerr
-#  define bwarn       warn
-#  define bllwarn     llwarn
-#  define binfo       info
-#  define bllinfo     llinfo
 #else
 #  define berr        (void)
 #  define bllerr      (void)
+#endif
+
+#ifdef CONFIG_DEBUG_BINFMT_WARN
+#  define bwarn       warn
+#  define bllwarn     llwarn
+#else
 #  define bwarn       (void)
 #  define bllwarn     (void)
+#endif
+
+#ifdef CONFIG_DEBUG_BINFMT_INFO
+#  define binfo       info
+#  define bllinfo     llinfo
+#else
 #  define binfo       (void)
 #  define bllinfo     (void)
 #endif
 
-#ifdef CONFIG_DEBUG_LIB
+#ifdef CONFIG_DEBUG_LIB_ERROR
 #  define lerr        err
 #  define lllerr      llerr
-#  define lwarn       warn
-#  define lllwarn     llwarn
-#  define linfo       info
-#  define lllinfo     llinfo
 #else
 #  define lerr        (void)
 #  define lllerr      (void)
+#endif
+
+#ifdef CONFIG_DEBUG_LIB_WARN
+#  define lwarn       warn
+#  define lllwarn     llwarn
+#else
 #  define lwarn       (void)
 #  define lllwarn     (void)
+#endif
+
+#ifdef CONFIG_DEBUG_LIB_INFO
+#  define linfo       info
+#  define lllinfo     llinfo
+#else
 #  define linfo       (void)
 #  define lllinfo     (void)
 #endif
 
-#ifdef CONFIG_DEBUG_AUDIO
+#ifdef CONFIG_DEBUG_AUDIO_ERROR
 #  define auderr      err
 #  define audllerr    llerr
-#  define audwarn     warn
-#  define audllwarn   llwarn
-#  define audinfo     info
-#  define audllinfo   llinfo
 #else
 #  define auderr      (void)
 #  define audllerr    (void)
+#endif
+
+#ifdef CONFIG_DEBUG_AUDIO_WARN
+#  define audwarn     warn
+#  define audllwarn   llwarn
+#else
 #  define audwarn     (void)
 #  define audllwarn   (void)
+#endif
+
+#ifdef CONFIG_DEBUG_AUDIO_INFO
+#  define audinfo     info
+#  define audllinfo   llinfo
+#else
 #  define audinfo     (void)
 #  define audllinfo   (void)
 #endif
diff --git a/sched/pthread/pthread_mutexunlock.c b/sched/pthread/pthread_mutexunlock.c
index 77b1c8f36e..078d9094b9 100644
--- a/sched/pthread/pthread_mutexunlock.c
+++ b/sched/pthread/pthread_mutexunlock.c
@@ -102,7 +102,7 @@ int pthread_mutex_unlock(FAR pthread_mutex_t *mutex)
         {
           /* No... return an error (default behavior is like PTHREAD_MUTEX_ERRORCHECK) */
 
-          serr(ERROR: "Holder=%d returning EPERM\n", mutex->pid);
+          serr("ERROR: Holder=%d returning EPERM\n", mutex->pid);
           ret = EPERM;
         }
 
-- 
GitLab


From 26718cee5cb7852bf1e9c74bb22e7b4323a8aa0e Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sun, 12 Jun 2016 14:44:04 -0600
Subject: [PATCH 46/91] Eliminate some warnings when CONFIG_DEBUG_FEATURES is
 enabled, but no output is enabled

---
 arch/arm/src/sama5/sama5d3x4x_pio.c     |  75 ++++++------
 arch/arm/src/stm32/stm32_allocateheap.c |   1 +
 arch/arm/src/stm32/stm32_dma.h          |   6 +-
 arch/arm/src/stm32/stm32_dumpgpio.c     | 153 ++++++++++++------------
 arch/arm/src/stm32/stm32_sdio.c         |  16 ++-
 arch/arm/src/stm32/stm32f10xxx_dma.c    |  16 +--
 arch/arm/src/stm32/stm32f20xxx_dma.c    |  22 ++--
 arch/arm/src/stm32/stm32f40xxx_dma.c    |  22 ++--
 8 files changed, 160 insertions(+), 151 deletions(-)

diff --git a/arch/arm/src/sama5/sama5d3x4x_pio.c b/arch/arm/src/sama5/sama5d3x4x_pio.c
index c054625ac8..1fde4bacfe 100644
--- a/arch/arm/src/sama5/sama5d3x4x_pio.c
+++ b/arch/arm/src/sama5/sama5d3x4x_pio.c
@@ -40,6 +40,17 @@
 
 #include 
 
+#ifdef CONFIG_DEBUG_GPIO
+/* Output informational debug info even if debug output is not enabled. */
+
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
+#  undef  CONFIG_DEBUG_INFO
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 1
+#  define CONFIG_DEBUG_INFO 1
+#endif
+
 #include 
 #include 
 #include 
@@ -67,10 +78,6 @@
 #define PIO_INPUT_BITS (PIO_INPUT | PIO_CFG_DEFAULT)
 #define MK_INPUT(p)    (((p) & (PIO_PORT_MASK | PIO_PIN_MASK)) | PIO_INPUT_BITS)
 
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
 /****************************************************************************
  * Public Data
  ****************************************************************************/
@@ -869,41 +876,41 @@ int sam_dumppio(uint32_t pinset, const char *msg)
   /* The following requires exclusive access to the PIO registers */
 
   flags = enter_critical_section();
-  llerr("PIO%c pinset: %08x base: %08x -- %s\n",
-        g_portchar[port], pinset, base, msg);
+  llinfo("PIO%c pinset: %08x base: %08x -- %s\n",
+         g_portchar[port], pinset, base, msg);
 
 #ifdef SAM_PIO_ISLR_OFFSET
-  llerr("    PSR: %08x   ISLR: %08x    OSR: %08x   IFSR: %08x\n",
-        getreg32(base + SAM_PIO_PSR_OFFSET), getreg32(base + SAM_PIO_ISLR_OFFSET),
-        getreg32(base + SAM_PIO_OSR_OFFSET), getreg32(base + SAM_PIO_IFSR_OFFSET));
+  llinfo("    PSR: %08x   ISLR: %08x    OSR: %08x   IFSR: %08x\n",
+         getreg32(base + SAM_PIO_PSR_OFFSET), getreg32(base + SAM_PIO_ISLR_OFFSET),
+         getreg32(base + SAM_PIO_OSR_OFFSET), getreg32(base + SAM_PIO_IFSR_OFFSET));
 #else
-  llerr("    PSR: %08x    OSR: %08x   IFSR: %08x\n",
-        getreg32(base + SAM_PIO_PSR_OFFSET), getreg32(base + SAM_PIO_OSR_OFFSET),
-        getreg32(base + SAM_PIO_IFSR_OFFSET));
-#endif
-  llerr("   ODSR: %08x   PDSR: %08x    IMR: %08x    ISR: %08x\n",
-        getreg32(base + SAM_PIO_ODSR_OFFSET), getreg32(base + SAM_PIO_PDSR_OFFSET),
-        getreg32(base + SAM_PIO_IMR_OFFSET), getreg32(base + SAM_PIO_ISR_OFFSET));
-  llerr("   MDSR: %08x   PUSR: %08x ABDCSR: %08x %08x\n",
-        getreg32(base + SAM_PIO_MDSR_OFFSET), getreg32(base + SAM_PIO_PUSR_OFFSET),
-        getreg32(base + SAM_PIO_ABCDSR1_OFFSET), getreg32(base + SAM_PIO_ABCDSR2_OFFSET));
-  llerr(" IFSCSR: %08x   SCDR: %08x  PPDSR: %08x   OWSR: %08x\n",
-        getreg32(base + SAM_PIO_IFSCSR_OFFSET), getreg32(base + SAM_PIO_SCDR_OFFSET),
-        getreg32(base + SAM_PIO_PPDSR_OFFSET), getreg32(base + SAM_PIO_OWSR_OFFSET));
+  llinfo("    PSR: %08x    OSR: %08x   IFSR: %08x\n",
+         getreg32(base + SAM_PIO_PSR_OFFSET), getreg32(base + SAM_PIO_OSR_OFFSET),
+         getreg32(base + SAM_PIO_IFSR_OFFSET));
+#endif
+  llinfo("   ODSR: %08x   PDSR: %08x    IMR: %08x    ISR: %08x\n",
+         getreg32(base + SAM_PIO_ODSR_OFFSET), getreg32(base + SAM_PIO_PDSR_OFFSET),
+         getreg32(base + SAM_PIO_IMR_OFFSET), getreg32(base + SAM_PIO_ISR_OFFSET));
+  llinfo("   MDSR: %08x   PUSR: %08x ABDCSR: %08x %08x\n",
+         getreg32(base + SAM_PIO_MDSR_OFFSET), getreg32(base + SAM_PIO_PUSR_OFFSET),
+         getreg32(base + SAM_PIO_ABCDSR1_OFFSET), getreg32(base + SAM_PIO_ABCDSR2_OFFSET));
+  llinfo(" IFSCSR: %08x   SCDR: %08x  PPDSR: %08x   OWSR: %08x\n",
+         getreg32(base + SAM_PIO_IFSCSR_OFFSET), getreg32(base + SAM_PIO_SCDR_OFFSET),
+         getreg32(base + SAM_PIO_PPDSR_OFFSET), getreg32(base + SAM_PIO_OWSR_OFFSET));
 #ifdef SAM_PIO_LOCKSR_OFFSET
-  llerr("  AIMMR: %08x   ELSR: %08x FRLHSR: %08x LOCKSR: %08x\n",
-        getreg32(base + SAM_PIO_AIMMR_OFFSET), getreg32(base + SAM_PIO_ELSR_OFFSET),
-        getreg32(base + SAM_PIO_FRLHSR_OFFSET), getreg32(base + SAM_PIO_LOCKSR_OFFSET));
+  llinfo("  AIMMR: %08x   ELSR: %08x FRLHSR: %08x LOCKSR: %08x\n",
+         getreg32(base + SAM_PIO_AIMMR_OFFSET), getreg32(base + SAM_PIO_ELSR_OFFSET),
+         getreg32(base + SAM_PIO_FRLHSR_OFFSET), getreg32(base + SAM_PIO_LOCKSR_OFFSET));
 #else
-  llerr("  AIMMR: %08x   ELSR: %08x FRLHSR: %08x\n",
-        getreg32(base + SAM_PIO_AIMMR_OFFSET), getreg32(base + SAM_PIO_ELSR_OFFSET),
-        getreg32(base + SAM_PIO_FRLHSR_OFFSET));
-#endif
-  llerr("SCHMITT: %08x DRIVER: %08x %08x\n",
-        getreg32(base + SAM_PIO_SCHMITT_OFFSET), getreg32(base + SAM_PIO_DRIVER1_OFFSET),
-        getreg32(base + SAM_PIO_DRIVER2_OFFSET));
-  llerr("   WPMR: %08x   WPSR: %08x\n",
-        getreg32(base + SAM_PIO_WPMR_OFFSET), getreg32(base + SAM_PIO_WPSR_OFFSET));
+  llinfo("  AIMMR: %08x   ELSR: %08x FRLHSR: %08x\n",
+         getreg32(base + SAM_PIO_AIMMR_OFFSET), getreg32(base + SAM_PIO_ELSR_OFFSET),
+         getreg32(base + SAM_PIO_FRLHSR_OFFSET));
+#endif
+  llinfo("SCHMITT: %08x DRIVER: %08x %08x\n",
+         getreg32(base + SAM_PIO_SCHMITT_OFFSET), getreg32(base + SAM_PIO_DRIVER1_OFFSET),
+         getreg32(base + SAM_PIO_DRIVER2_OFFSET));
+  llinfo("   WPMR: %08x   WPSR: %08x\n",
+         getreg32(base + SAM_PIO_WPMR_OFFSET), getreg32(base + SAM_PIO_WPSR_OFFSET));
 
   leave_critical_section(flags);
   return OK;
diff --git a/arch/arm/src/stm32/stm32_allocateheap.c b/arch/arm/src/stm32/stm32_allocateheap.c
index 8a844b6d22..02ba165a13 100644
--- a/arch/arm/src/stm32/stm32_allocateheap.c
+++ b/arch/arm/src/stm32/stm32_allocateheap.c
@@ -41,6 +41,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 
diff --git a/arch/arm/src/stm32/stm32_dma.h b/arch/arm/src/stm32/stm32_dma.h
index b2f968fe1f..d26428c35b 100644
--- a/arch/arm/src/stm32/stm32_dma.h
+++ b/arch/arm/src/stm32/stm32_dma.h
@@ -104,7 +104,7 @@ typedef FAR void *DMA_HANDLE;
 
 typedef void (*dma_callback_t)(DMA_HANDLE handle, uint8_t status, void *arg);
 
-#ifdef CONFIG_DEBUG_DMA
+#ifdef CONFIG_DEBUG_DMA_INFO
 #if defined(CONFIG_STM32_STM32L15XX) || defined(CONFIG_STM32_STM32F10XX) || \
     defined(CONFIG_STM32_STM32F30XX) || defined(CONFIG_STM32_STM32F37XX)
 struct stm32_dmaregs_s
@@ -299,7 +299,7 @@ bool stm32_dmacapable(uintptr_t maddr, uint32_t count, uint32_t ccr);
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_DMA
+#ifdef CONFIG_DEBUG_DMA_INFO
 void stm32_dmasample(DMA_HANDLE handle, struct stm32_dmaregs_s *regs);
 #else
 #  define stm32_dmasample(handle,regs)
@@ -316,7 +316,7 @@ void stm32_dmasample(DMA_HANDLE handle, struct stm32_dmaregs_s *regs);
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_DMA
+#ifdef CONFIG_DEBUG_DMA_INFO
 void stm32_dmadump(DMA_HANDLE handle, const struct stm32_dmaregs_s *regs,
                    const char *msg);
 #else
diff --git a/arch/arm/src/stm32/stm32_dumpgpio.c b/arch/arm/src/stm32/stm32_dumpgpio.c
index c3023c21a8..3731e4158b 100644
--- a/arch/arm/src/stm32/stm32_dumpgpio.c
+++ b/arch/arm/src/stm32/stm32_dumpgpio.c
@@ -39,6 +39,15 @@
 
 #include 
 
+/* Output debug info even if debug output is not selected. */
+
+#undef  CONFIG_DEBUG_ERROR
+#undef  CONFIG_DEBUG_WARN
+#undef  CONFIG_DEBUG_INFO
+#define CONFIG_DEBUG_ERROR 1
+#define CONFIG_DEBUG_WARN 1
+#define CONFIG_DEBUG_INFO 1
+
 #include 
 #include 
 
@@ -56,7 +65,6 @@
  ****************************************************************************/
 /* Port letters for prettier debug output */
 
-#ifdef CONFIG_DEBUG_FEATURES
 static const char g_portchar[STM32_NGPIO_PORTS] =
 {
 #if STM32_NGPIO_PORTS > 11
@@ -87,15 +95,6 @@ static const char g_portchar[STM32_NGPIO_PORTS] =
 #  error "Bad number of GPIOs"
 #endif
 };
-#endif
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
 
 /****************************************************************************
  * Public Functions
@@ -125,111 +124,107 @@ int stm32_dumpgpio(uint32_t pinset, const char *msg)
   flags = enter_critical_section();
 
 #if defined(CONFIG_STM32_STM32F10XX)
-
-  llerr("GPIO%c pinset: %08x base: %08x -- %s\n",
-        g_portchar[port], pinset, base, msg);
+  llinfo("GPIO%c pinset: %08x base: %08x -- %s\n",
+         g_portchar[port], pinset, base, msg);
 
   if ((getreg32(STM32_RCC_APB2ENR) & RCC_APB2ENR_IOPEN(port)) != 0)
     {
-      llerr("  CR: %08x %08x IDR: %04x ODR: %04x LCKR: %04x\n",
-            getreg32(base + STM32_GPIO_CRH_OFFSET),
-            getreg32(base + STM32_GPIO_CRL_OFFSET),
-            getreg32(base + STM32_GPIO_IDR_OFFSET),
-            getreg32(base + STM32_GPIO_ODR_OFFSET),
-            getreg32(base + STM32_GPIO_LCKR_OFFSET));
-      llerr("  EVCR: %02x MAPR: %08x CR: %04x %04x %04x %04x\n",
-            getreg32(STM32_AFIO_EVCR), getreg32(STM32_AFIO_MAPR),
-            getreg32(STM32_AFIO_EXTICR1),
-            getreg32(STM32_AFIO_EXTICR2),
-            getreg32(STM32_AFIO_EXTICR3),
-            getreg32(STM32_AFIO_EXTICR4));
+      llinfo("  CR: %08x %08x IDR: %04x ODR: %04x LCKR: %04x\n",
+             getreg32(base + STM32_GPIO_CRH_OFFSET),
+             getreg32(base + STM32_GPIO_CRL_OFFSET),
+             getreg32(base + STM32_GPIO_IDR_OFFSET),
+             getreg32(base + STM32_GPIO_ODR_OFFSET),
+             getreg32(base + STM32_GPIO_LCKR_OFFSET));
+      llinfo("  EVCR: %02x MAPR: %08x CR: %04x %04x %04x %04x\n",
+             getreg32(STM32_AFIO_EVCR), getreg32(STM32_AFIO_MAPR),
+             getreg32(STM32_AFIO_EXTICR1),
+             getreg32(STM32_AFIO_EXTICR2),
+             getreg32(STM32_AFIO_EXTICR3),
+             getreg32(STM32_AFIO_EXTICR4));
     }
   else
     {
-      llerr("  GPIO%c not enabled: APB2ENR: %08x\n",
+      llinfo("  GPIO%c not enabled: APB2ENR: %08x\n",
             g_portchar[port], getreg32(STM32_RCC_APB2ENR));
     }
 
 #elif defined(CONFIG_STM32_STM32L15XX)
-
   DEBUGASSERT(port < STM32_NGPIO_PORTS);
 
-  llerr("GPIO%c pinset: %08x base: %08x -- %s\n",
-        g_portchar[port], pinset, base, msg);
+  llinfo("GPIO%c pinset: %08x base: %08x -- %s\n",
+         g_portchar[port], pinset, base, msg);
 
   if ((getreg32(STM32_RCC_AHBENR) & RCC_AHBENR_GPIOEN(port)) != 0)
     {
-      llerr(" MODE: %08x OTYPE: %04x     OSPEED: %08x PUPDR: %08x\n",
-            getreg32(base + STM32_GPIO_MODER_OFFSET),
-            getreg32(base + STM32_GPIO_OTYPER_OFFSET),
-            getreg32(base + STM32_GPIO_OSPEED_OFFSET),
-            getreg32(base + STM32_GPIO_PUPDR_OFFSET));
-      llerr("  IDR: %04x       ODR: %04x       BSRR: %08x  LCKR: %04x\n",
-            getreg32(base + STM32_GPIO_IDR_OFFSET),
-            getreg32(base + STM32_GPIO_ODR_OFFSET),
-            getreg32(base + STM32_GPIO_BSRR_OFFSET),
-            getreg32(base + STM32_GPIO_LCKR_OFFSET));
-      llerr(" AFRH: %08x  AFRL: %08x\n",
-            getreg32(base + STM32_GPIO_AFRH_OFFSET),
-            getreg32(base + STM32_GPIO_AFRL_OFFSET));
+      llinfo(" MODE: %08x OTYPE: %04x     OSPEED: %08x PUPDR: %08x\n",
+             getreg32(base + STM32_GPIO_MODER_OFFSET),
+             getreg32(base + STM32_GPIO_OTYPER_OFFSET),
+             getreg32(base + STM32_GPIO_OSPEED_OFFSET),
+             getreg32(base + STM32_GPIO_PUPDR_OFFSET));
+      llinfo("  IDR: %04x       ODR: %04x       BSRR: %08x  LCKR: %04x\n",
+             getreg32(base + STM32_GPIO_IDR_OFFSET),
+             getreg32(base + STM32_GPIO_ODR_OFFSET),
+             getreg32(base + STM32_GPIO_BSRR_OFFSET),
+             getreg32(base + STM32_GPIO_LCKR_OFFSET));
+      llinfo(" AFRH: %08x  AFRL: %08x\n",
+             getreg32(base + STM32_GPIO_AFRH_OFFSET),
+             getreg32(base + STM32_GPIO_AFRL_OFFSET));
     }
   else
     {
-      llerr("  GPIO%c not enabled: AHBENR: %08x\n",
-            g_portchar[port], getreg32(STM32_RCC_AHBENR));
+      llinfo("  GPIO%c not enabled: AHBENR: %08x\n",
+             g_portchar[port], getreg32(STM32_RCC_AHBENR));
     }
 
 #elif defined(CONFIG_STM32_STM32F30XX) || defined(CONFIG_STM32_STM32F37XX)
-
   DEBUGASSERT(port < STM32_NGPIO_PORTS);
 
-  llerr("GPIO%c pinset: %08x base: %08x -- %s\n",
-        g_portchar[port], pinset, base, msg);
+  llinfo("GPIO%c pinset: %08x base: %08x -- %s\n",
+         g_portchar[port], pinset, base, msg);
 
   /* GPIOs are always enabled */
 
-  llerr(" MODE: %08x OTYPE: %04x     OSPEED: %08x PUPDR: %08x\n",
-        getreg32(base + STM32_GPIO_MODER_OFFSET),
-        getreg32(base + STM32_GPIO_OTYPER_OFFSET),
-        getreg32(base + STM32_GPIO_OSPEED_OFFSET),
-        getreg32(base + STM32_GPIO_PUPDR_OFFSET));
-  llerr("  IDR: %04x       ODR: %04x       BSRR: %08x  LCKR: %04x\n",
-        getreg32(base + STM32_GPIO_IDR_OFFSET),
-        getreg32(base + STM32_GPIO_ODR_OFFSET),
-        getreg32(base + STM32_GPIO_BSRR_OFFSET),
-        getreg32(base + STM32_GPIO_LCKR_OFFSET));
-  llerr(" AFRH: %08x  AFRL: %08x   BRR: %04x\n",
-        getreg32(base + STM32_GPIO_AFRH_OFFSET),
-        getreg32(base + STM32_GPIO_AFRL_OFFSET),
-        getreg32(base + STM32_GPIO_BRR_OFFSET));
+  llinfo(" MODE: %08x OTYPE: %04x     OSPEED: %08x PUPDR: %08x\n",
+         getreg32(base + STM32_GPIO_MODER_OFFSET),
+         getreg32(base + STM32_GPIO_OTYPER_OFFSET),
+         getreg32(base + STM32_GPIO_OSPEED_OFFSET),
+         getreg32(base + STM32_GPIO_PUPDR_OFFSET));
+  llinfo("  IDR: %04x       ODR: %04x       BSRR: %08x  LCKR: %04x\n",
+         getreg32(base + STM32_GPIO_IDR_OFFSET),
+         getreg32(base + STM32_GPIO_ODR_OFFSET),
+         getreg32(base + STM32_GPIO_BSRR_OFFSET),
+         getreg32(base + STM32_GPIO_LCKR_OFFSET));
+  llinfo(" AFRH: %08x  AFRL: %08x   BRR: %04x\n",
+         getreg32(base + STM32_GPIO_AFRH_OFFSET),
+         getreg32(base + STM32_GPIO_AFRL_OFFSET),
+         getreg32(base + STM32_GPIO_BRR_OFFSET));
 
 #elif defined(CONFIG_STM32_STM32F20XX) || defined(CONFIG_STM32_STM32F40XX)
-
   DEBUGASSERT(port < STM32_NGPIO_PORTS);
 
-  llerr("GPIO%c pinset: %08x base: %08x -- %s\n",
-        g_portchar[port], pinset, base, msg);
+  llinfo("GPIO%c pinset: %08x base: %08x -- %s\n",
+         g_portchar[port], pinset, base, msg);
 
   if ((getreg32(STM32_RCC_AHB1ENR) & RCC_AHB1ENR_GPIOEN(port)) != 0)
     {
-      llerr(" MODE: %08x OTYPE: %04x     OSPEED: %08x PUPDR: %08x\n",
-            getreg32(base + STM32_GPIO_MODER_OFFSET),
-            getreg32(base + STM32_GPIO_OTYPER_OFFSET),
-            getreg32(base + STM32_GPIO_OSPEED_OFFSET),
-            getreg32(base + STM32_GPIO_PUPDR_OFFSET));
-      llerr("  IDR: %04x       ODR: %04x       BSRR: %08x  LCKR: %04x\n",
-            getreg32(base + STM32_GPIO_IDR_OFFSET),
-            getreg32(base + STM32_GPIO_ODR_OFFSET),
-            getreg32(base + STM32_GPIO_BSRR_OFFSET),
-            getreg32(base + STM32_GPIO_LCKR_OFFSET));
-      llerr(" AFRH: %08x  AFRL: %08x\n",
-            getreg32(base + STM32_GPIO_AFRH_OFFSET),
-            getreg32(base + STM32_GPIO_AFRL_OFFSET));
+      llinfo(" MODE: %08x OTYPE: %04x     OSPEED: %08x PUPDR: %08x\n",
+             getreg32(base + STM32_GPIO_MODER_OFFSET),
+             getreg32(base + STM32_GPIO_OTYPER_OFFSET),
+             getreg32(base + STM32_GPIO_OSPEED_OFFSET),
+             getreg32(base + STM32_GPIO_PUPDR_OFFSET));
+      llinfo("  IDR: %04x       ODR: %04x       BSRR: %08x  LCKR: %04x\n",
+             getreg32(base + STM32_GPIO_IDR_OFFSET),
+             getreg32(base + STM32_GPIO_ODR_OFFSET),
+             getreg32(base + STM32_GPIO_BSRR_OFFSET),
+             getreg32(base + STM32_GPIO_LCKR_OFFSET));
+      llinfo(" AFRH: %08x  AFRL: %08x\n",
+             getreg32(base + STM32_GPIO_AFRH_OFFSET),
+             getreg32(base + STM32_GPIO_AFRL_OFFSET));
     }
   else
     {
-      llerr("  GPIO%c not enabled: AHB1ENR: %08x\n",
-            g_portchar[port], getreg32(STM32_RCC_AHB1ENR));
+      llinfo("  GPIO%c not enabled: AHB1ENR: %08x\n",
+             g_portchar[port], getreg32(STM32_RCC_AHB1ENR));
     }
 #else
 # error "Unsupported STM32 chip"
diff --git a/arch/arm/src/stm32/stm32_sdio.c b/arch/arm/src/stm32/stm32_sdio.c
index 49bf6f1bcf..7fdf1c6cae 100644
--- a/arch/arm/src/stm32/stm32_sdio.c
+++ b/arch/arm/src/stm32/stm32_sdio.c
@@ -345,7 +345,7 @@ struct stm32_sdioregs_s
 struct stm32_sampleregs_s
 {
   struct stm32_sdioregs_s sdio;
-#if defined(CONFIG_DEBUG_DMA) && defined(CONFIG_SDIO_DMA)
+#if defined(CONFIG_DEBUG_DMA_INFO) && defined(CONFIG_SDIO_DMA)
   struct stm32_dmaregs_s  dma;
 #endif
 };
@@ -789,12 +789,14 @@ static void stm32_sdiosample(struct stm32_sdioregs_s *regs)
 static void stm32_sample(struct stm32_dev_s *priv, int index)
 {
   struct stm32_sampleregs_s *regs = &g_sampleregs[index];
-#if defined(CONFIG_DEBUG_DMA) && defined(CONFIG_SDIO_DMA)
+
+#if defined(CONFIG_DEBUG_DMA_INFO) && defined(CONFIG_SDIO_DMA)
   if (priv->dmamode)
     {
       stm32_dmasample(priv->dma, ®s->dma);
     }
 #endif
+
   stm32_sdiosample(®s->sdio);
 }
 #endif
@@ -835,12 +837,13 @@ static void stm32_sdiodump(struct stm32_sdioregs_s *regs, const char *msg)
 static void stm32_dumpsample(struct stm32_dev_s *priv,
                              struct stm32_sampleregs_s *regs, const char *msg)
 {
-#if defined(CONFIG_DEBUG_DMA) && defined(CONFIG_SDIO_DMA)
+#if defined(CONFIG_DEBUG_DMA_INFO) && defined(CONFIG_SDIO_DMA)
   if (priv->dmamode)
     {
       stm32_dmadump(priv->dma, ®s->dma, msg);
     }
 #endif
+
   stm32_sdiodump(®s->sdio, msg);
 }
 #endif
@@ -857,15 +860,18 @@ static void stm32_dumpsample(struct stm32_dev_s *priv,
 static void stm32_dumpsamples(struct stm32_dev_s *priv)
 {
   stm32_dumpsample(priv, &g_sampleregs[SAMPLENDX_BEFORE_SETUP], "Before setup");
-#if defined(CONFIG_DEBUG_DMA) && defined(CONFIG_SDIO_DMA)
+
+#if defined(CONFIG_DEBUG_DMA_INFO) && defined(CONFIG_SDIO_DMA)
   if (priv->dmamode)
     {
       stm32_dumpsample(priv, &g_sampleregs[SAMPLENDX_BEFORE_ENABLE], "Before DMA enable");
     }
 #endif
+
   stm32_dumpsample(priv, &g_sampleregs[SAMPLENDX_AFTER_SETUP], "After setup");
   stm32_dumpsample(priv, &g_sampleregs[SAMPLENDX_END_TRANSFER], "End of transfer");
-#if defined(CONFIG_DEBUG_DMA) && defined(CONFIG_SDIO_DMA)
+
+#if defined(CONFIG_DEBUG_DMA_INFO) && defined(CONFIG_SDIO_DMA)
   if (priv->dmamode)
     {
       stm32_dumpsample(priv, &g_sampleregs[SAMPLENDX_DMA_CALLBACK], "DMA Callback");
diff --git a/arch/arm/src/stm32/stm32f10xxx_dma.c b/arch/arm/src/stm32/stm32f10xxx_dma.c
index 32f485c447..8a7782773e 100644
--- a/arch/arm/src/stm32/stm32f10xxx_dma.c
+++ b/arch/arm/src/stm32/stm32f10xxx_dma.c
@@ -707,7 +707,7 @@ bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr)
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_DMA
+#ifdef CONFIG_DEBUG_DMA_INFO
 void stm32_dmasample(DMA_HANDLE handle, struct stm32_dmaregs_s *regs)
 {
   struct stm32_dma_s *dmach = (struct stm32_dma_s *)handle;
@@ -734,19 +734,19 @@ void stm32_dmasample(DMA_HANDLE handle, struct stm32_dmaregs_s *regs)
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_DMA
+#ifdef CONFIG_DEBUG_DMA_INFO
 void stm32_dmadump(DMA_HANDLE handle, const struct stm32_dmaregs_s *regs,
                    const char *msg)
 {
   struct stm32_dma_s *dmach = (struct stm32_dma_s *)handle;
   uint32_t dmabase = DMA_BASE(dmach->base);
 
-  dmaerr("DMA Registers: %s\n", msg);
-  dmaerr("   ISRC[%08x]: %08x\n", dmabase + STM32_DMA_ISR_OFFSET, regs->isr);
-  dmaerr("    CCR[%08x]: %08x\n", dmach->base + STM32_DMACHAN_CCR_OFFSET, regs->ccr);
-  dmaerr("  CNDTR[%08x]: %08x\n", dmach->base + STM32_DMACHAN_CNDTR_OFFSET, regs->cndtr);
-  dmaerr("   CPAR[%08x]: %08x\n", dmach->base + STM32_DMACHAN_CPAR_OFFSET, regs->cpar);
-  dmaerr("   CMAR[%08x]: %08x\n", dmach->base + STM32_DMACHAN_CMAR_OFFSET, regs->cmar);
+  dmainfo("DMA Registers: %s\n", msg);
+  dmainfo("   ISRC[%08x]: %08x\n", dmabase + STM32_DMA_ISR_OFFSET, regs->isr);
+  dmainfo("    CCR[%08x]: %08x\n", dmach->base + STM32_DMACHAN_CCR_OFFSET, regs->ccr);
+  dmainfo("  CNDTR[%08x]: %08x\n", dmach->base + STM32_DMACHAN_CNDTR_OFFSET, regs->cndtr);
+  dmainfo("   CPAR[%08x]: %08x\n", dmach->base + STM32_DMACHAN_CPAR_OFFSET, regs->cpar);
+  dmainfo("   CMAR[%08x]: %08x\n", dmach->base + STM32_DMACHAN_CMAR_OFFSET, regs->cmar);
 }
 #endif
 
diff --git a/arch/arm/src/stm32/stm32f20xxx_dma.c b/arch/arm/src/stm32/stm32f20xxx_dma.c
index 8dbe917e93..335a9cd009 100644
--- a/arch/arm/src/stm32/stm32f20xxx_dma.c
+++ b/arch/arm/src/stm32/stm32f20xxx_dma.c
@@ -973,7 +973,7 @@ bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr)
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_DMA
+#ifdef CONFIG_DEBUG_DMA_INFO
 void stm32_dmasample(DMA_HANDLE handle, struct stm32_dmaregs_s *regs)
 {
   struct stm32_dma_s *dmast = (struct stm32_dma_s *)handle;
@@ -1003,22 +1003,22 @@ void stm32_dmasample(DMA_HANDLE handle, struct stm32_dmaregs_s *regs)
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_DMA
+#ifdef CONFIG_DEBUG_DMA_INFO
 void stm32_dmadump(DMA_HANDLE handle, const struct stm32_dmaregs_s *regs,
                    const char *msg)
 {
   struct stm32_dma_s *dmast = (struct stm32_dma_s *)handle;
   uint32_t dmabase = DMA_BASE(dmast->base);
 
-  dmaerr("DMA Registers: %s\n", msg);
-  dmaerr("   LISR[%08x]: %08x\n", dmabase + STM32_DMA_LISR_OFFSET, regs->lisr);
-  dmaerr("   HISR[%08x]: %08x\n", dmabase + STM32_DMA_HISR_OFFSET, regs->hisr);
-  dmaerr("    SCR[%08x]: %08x\n", dmast->base + STM32_DMA_SCR_OFFSET, regs->scr);
-  dmaerr("  SNDTR[%08x]: %08x\n", dmast->base + STM32_DMA_SNDTR_OFFSET, regs->sndtr);
-  dmaerr("   SPAR[%08x]: %08x\n", dmast->base + STM32_DMA_SPAR_OFFSET, regs->spar);
-  dmaerr("  SM0AR[%08x]: %08x\n", dmast->base + STM32_DMA_SM0AR_OFFSET, regs->sm0ar);
-  dmaerr("  SM1AR[%08x]: %08x\n", dmast->base + STM32_DMA_SM1AR_OFFSET, regs->sm1ar);
-  dmaerr("   SFCR[%08x]: %08x\n", dmast->base + STM32_DMA_SFCR_OFFSET, regs->sfcr);
+  dmainfo("DMA Registers: %s\n", msg);
+  dmainfo("   LISR[%08x]: %08x\n", dmabase + STM32_DMA_LISR_OFFSET, regs->lisr);
+  dmainfo("   HISR[%08x]: %08x\n", dmabase + STM32_DMA_HISR_OFFSET, regs->hisr);
+  dmainfo("    SCR[%08x]: %08x\n", dmast->base + STM32_DMA_SCR_OFFSET, regs->scr);
+  dmainfo("  SNDTR[%08x]: %08x\n", dmast->base + STM32_DMA_SNDTR_OFFSET, regs->sndtr);
+  dmainfo("   SPAR[%08x]: %08x\n", dmast->base + STM32_DMA_SPAR_OFFSET, regs->spar);
+  dmainfo("  SM0AR[%08x]: %08x\n", dmast->base + STM32_DMA_SM0AR_OFFSET, regs->sm0ar);
+  dmainfo("  SM1AR[%08x]: %08x\n", dmast->base + STM32_DMA_SM1AR_OFFSET, regs->sm1ar);
+  dmainfo("   SFCR[%08x]: %08x\n", dmast->base + STM32_DMA_SFCR_OFFSET, regs->sfcr);
 }
 #endif
 
diff --git a/arch/arm/src/stm32/stm32f40xxx_dma.c b/arch/arm/src/stm32/stm32f40xxx_dma.c
index b7a968c84b..8aae23d833 100644
--- a/arch/arm/src/stm32/stm32f40xxx_dma.c
+++ b/arch/arm/src/stm32/stm32f40xxx_dma.c
@@ -1001,7 +1001,7 @@ bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr)
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_DMA
+#ifdef CONFIG_DEBUG_DMA_INFO
 void stm32_dmasample(DMA_HANDLE handle, struct stm32_dmaregs_s *regs)
 {
   struct stm32_dma_s *dmast = (struct stm32_dma_s *)handle;
@@ -1031,22 +1031,22 @@ void stm32_dmasample(DMA_HANDLE handle, struct stm32_dmaregs_s *regs)
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_DMA
+#ifdef CONFIG_DEBUG_DMA_INFO
 void stm32_dmadump(DMA_HANDLE handle, const struct stm32_dmaregs_s *regs,
                    const char *msg)
 {
   struct stm32_dma_s *dmast = (struct stm32_dma_s *)handle;
   uint32_t dmabase = DMA_BASE(dmast->base);
 
-  dmaerr("DMA Registers: %s\n", msg);
-  dmaerr("   LISR[%08x]: %08x\n", dmabase + STM32_DMA_LISR_OFFSET, regs->lisr);
-  dmaerr("   HISR[%08x]: %08x\n", dmabase + STM32_DMA_HISR_OFFSET, regs->hisr);
-  dmaerr("    SCR[%08x]: %08x\n", dmast->base + STM32_DMA_SCR_OFFSET, regs->scr);
-  dmaerr("  SNDTR[%08x]: %08x\n", dmast->base + STM32_DMA_SNDTR_OFFSET, regs->sndtr);
-  dmaerr("   SPAR[%08x]: %08x\n", dmast->base + STM32_DMA_SPAR_OFFSET, regs->spar);
-  dmaerr("  SM0AR[%08x]: %08x\n", dmast->base + STM32_DMA_SM0AR_OFFSET, regs->sm0ar);
-  dmaerr("  SM1AR[%08x]: %08x\n", dmast->base + STM32_DMA_SM1AR_OFFSET, regs->sm1ar);
-  dmaerr("   SFCR[%08x]: %08x\n", dmast->base + STM32_DMA_SFCR_OFFSET, regs->sfcr);
+  dmainfo("DMA Registers: %s\n", msg);
+  dmainfo("   LISR[%08x]: %08x\n", dmabase + STM32_DMA_LISR_OFFSET, regs->lisr);
+  dmainfo("   HISR[%08x]: %08x\n", dmabase + STM32_DMA_HISR_OFFSET, regs->hisr);
+  dmainfo("    SCR[%08x]: %08x\n", dmast->base + STM32_DMA_SCR_OFFSET, regs->scr);
+  dmainfo("  SNDTR[%08x]: %08x\n", dmast->base + STM32_DMA_SNDTR_OFFSET, regs->sndtr);
+  dmainfo("   SPAR[%08x]: %08x\n", dmast->base + STM32_DMA_SPAR_OFFSET, regs->spar);
+  dmainfo("  SM0AR[%08x]: %08x\n", dmast->base + STM32_DMA_SM0AR_OFFSET, regs->sm0ar);
+  dmainfo("  SM1AR[%08x]: %08x\n", dmast->base + STM32_DMA_SM1AR_OFFSET, regs->sm1ar);
+  dmainfo("   SFCR[%08x]: %08x\n", dmast->base + STM32_DMA_SFCR_OFFSET, regs->sfcr);
 }
 #endif
 
-- 
GitLab


From a5457987d83c41586c3a5ac666d407d6dd45241c Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sun, 12 Jun 2016 17:02:46 -0600
Subject: [PATCH 47/91] configs/: Change some err() ERRORS to warn() WARNINGS
 or info()

---
 configs/stm3210e-eval/src/stm32_adc.c         |  2 +-
 configs/stm3210e-eval/src/stm32_idle.c        |  4 +-
 configs/stm3210e-eval/src/stm32_lcd.c         | 66 ++++++++++---------
 configs/stm3210e-eval/src/stm32_spi.c         | 24 ++-----
 configs/stm3210e-eval/src/stm32_usbdev.c      |  3 +-
 configs/stm3220g-eval/src/stm32_adc.c         |  2 +-
 configs/stm3220g-eval/src/stm32_lcd.c         |  9 ++-
 configs/stm3220g-eval/src/stm32_pwm.c         |  4 +-
 configs/stm3220g-eval/src/stm32_spi.c         | 24 ++-----
 configs/stm3220g-eval/src/stm32_stmpe811.c    |  8 +--
 configs/stm3220g-eval/src/stm32_usb.c         |  2 +-
 configs/stm3240g-eval/src/stm32_adc.c         |  2 +-
 configs/stm3240g-eval/src/stm32_lcd.c         |  9 ++-
 configs/stm3240g-eval/src/stm32_pwm.c         |  4 +-
 configs/stm3240g-eval/src/stm32_spi.c         | 24 ++-----
 configs/stm3240g-eval/src/stm32_stmpe811.c    |  8 +--
 configs/stm3240g-eval/src/stm32_usb.c         |  2 +-
 configs/stm32_tiny/src/stm32_pwm.c            |  4 +-
 configs/stm32_tiny/src/stm32_usbdev.c         |  5 +-
 configs/stm32_tiny/src/stm32_wireless.c       |  4 +-
 configs/stm32f103-minimum/src/stm32_usbdev.c  |  2 +-
 configs/stm32f3discovery/src/stm32_pwm.c      |  4 +-
 configs/stm32f3discovery/src/stm32_qencoder.c |  2 +-
 configs/stm32f3discovery/src/stm32_spi.c      | 24 ++-----
 configs/stm32f3discovery/src/stm32_usb.c      |  5 +-
 configs/stm32f429i-disco/src/stm32_appinit.c  |  2 +-
 configs/stm32f429i-disco/src/stm32_idle.c     |  2 +-
 .../stm32f429i-disco/src/stm32_ili93414ws.c   | 15 +++--
 configs/stm32f429i-disco/src/stm32_lcd.c      | 41 ++++++++----
 configs/stm32f429i-disco/src/stm32_spi.c      | 22 +++----
 configs/stm32f429i-disco/src/stm32_usb.c      |  2 +-
 .../stm32f4discovery/src/stm32_bh1750fvi.c    |  4 +-
 configs/stm32f4discovery/src/stm32_bmp180.c   |  4 +-
 configs/stm32f4discovery/src/stm32_ethernet.c | 10 +--
 configs/stm32f4discovery/src/stm32_idle.c     |  2 +-
 configs/stm32f4discovery/src/stm32_max31855.c |  2 +-
 configs/stm32f4discovery/src/stm32_max6675.c  |  2 +-
 configs/stm32f4discovery/src/stm32_pca9635.c  |  2 +-
 configs/stm32f4discovery/src/stm32_pwm.c      |  4 +-
 configs/stm32f4discovery/src/stm32_qencoder.c |  6 +-
 configs/stm32f4discovery/src/stm32_rgbled.c   | 18 +++--
 configs/stm32f4discovery/src/stm32_sdio.c     |  4 +-
 configs/stm32f4discovery/src/stm32_spi.c      | 24 ++-----
 configs/stm32f4discovery/src/stm32_ssd1351.c  |  6 +-
 .../src/stm32_ug2864ambag01.c                 |  6 +-
 .../src/stm32_ug2864hsweg01.c                 |  6 +-
 configs/stm32f4discovery/src/stm32_usb.c      |  6 +-
 configs/stm32f746g-disco/src/stm32_spi.c      | 27 +++-----
 configs/stm32l476vg-disco/src/stm32_spi.c     | 16 ++---
 configs/stm32ldiscovery/src/stm32_pwm.c       |  4 +-
 configs/stm32ldiscovery/src/stm32_qencoder.c  |  6 +-
 configs/stm32ldiscovery/src/stm32_spi.c       | 24 ++-----
 configs/teensy-2.0/src/at90usb_spi.c          | 17 ++---
 configs/teensy-3.x/src/k20_pwm.c              | 12 ++--
 configs/teensy-3.x/src/k20_spi.c              | 19 ++----
 configs/teensy-3.x/src/k20_usbdev.c           |  2 +-
 configs/teensy-lc/src/kl_pwm.c                |  4 +-
 .../tm4c123g-launchpad/src/tm4c_autoleds.c    | 12 +---
 configs/tm4c123g-launchpad/src/tm4c_ssi.c     | 10 ++-
 .../tm4c1294-launchpad/src/tm4c_ethernet.c    |  2 +-
 configs/twr-k60n512/src/k60_spi.c             | 19 ++----
 configs/twr-k60n512/src/k60_usbdev.c          |  3 +-
 configs/u-blox-c027/src/lpc17_adc.c           |  2 +-
 configs/u-blox-c027/src/lpc17_dac.c           |  2 +-
 configs/u-blox-c027/src/lpc17_pwm.c           | 16 ++---
 configs/u-blox-c027/src/lpc17_ssp.c           | 24 +++----
 configs/viewtool-stm32f107/src/stm32_mmcsd.c  |  6 +-
 .../viewtool-stm32f107/src/stm32_mpl115a.c    |  2 +-
 configs/viewtool-stm32f107/src/stm32_spi.c    | 26 +++-----
 .../viewtool-stm32f107/src/stm32_ssd1289.c    | 42 ++++++------
 .../src/stm32_touchscreen.c                   |  6 +-
 configs/viewtool-stm32f107/src/stm32_usbdev.c |  2 +-
 configs/zkit-arm-1769/src/lpc17_adc.c         |  4 +-
 configs/zkit-arm-1769/src/lpc17_dac.c         |  2 +-
 configs/zkit-arm-1769/src/lpc17_lcd.c         |  8 +--
 configs/zkit-arm-1769/src/lpc17_spi.c         | 14 ++--
 configs/zkit-arm-1769/src/lpc17_ssp.c         | 18 +++--
 configs/zp214xpa/src/lpc2148_spi1.c           | 34 +++++-----
 configs/zp214xpa/src/lpc2148_ug2864ambag01.c  |  6 +-
 79 files changed, 365 insertions(+), 463 deletions(-)

diff --git a/configs/stm3210e-eval/src/stm32_adc.c b/configs/stm3210e-eval/src/stm32_adc.c
index 38a55145cb..a0c5b87fa3 100644
--- a/configs/stm3210e-eval/src/stm32_adc.c
+++ b/configs/stm3210e-eval/src/stm32_adc.c
@@ -145,7 +145,7 @@ int board_adc_setup(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          aerr("adc_register failed: %d\n", ret);
+          aerr("ERROR: adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/stm3210e-eval/src/stm32_idle.c b/configs/stm3210e-eval/src/stm32_idle.c
index 24bdfde3d1..cbe7e9f812 100644
--- a/configs/stm3210e-eval/src/stm32_idle.c
+++ b/configs/stm3210e-eval/src/stm32_idle.c
@@ -229,7 +229,7 @@ static int stm32_rtc_alarm(time_t tv_sec, time_t tv_nsec, bool exti)
   ret = stm32_rtc_setalarm(&alarmtime, stm32_alarmcb);
   if (ret < 0)
     {
-      llerr("Warning: The alarm is already set\n");
+      sllerr("ERROR: Warning: The alarm is already set\n");
     }
 
   return ret;
@@ -366,7 +366,7 @@ static void stm32_idlepm(void)
             ret = stm32_rtc_cancelalarm();
             if (ret < 0)
               {
-                llerr("Warning: Cancel alarm failed\n");
+                sllwarn("WARNING: Cancel alarm failed\n");
               }
 #endif
             /* Note:  See the additional PM_STANDBY related logic at the
diff --git a/configs/stm3210e-eval/src/stm32_lcd.c b/configs/stm3210e-eval/src/stm32_lcd.c
index 302a8c25a4..f4893cb512 100644
--- a/configs/stm3210e-eval/src/stm32_lcd.c
+++ b/configs/stm3210e-eval/src/stm32_lcd.c
@@ -36,6 +36,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  **************************************************************************************/
+
 /* This driver supports the following LCDs:
  *
  * 1. Ampire AM-240320LTNQW00H
@@ -81,6 +82,7 @@
 /**************************************************************************************
  * Pre-processor Definitions
  **************************************************************************************/
+
 /* Configuration **********************************************************************/
 /* Check contrast selection */
 
@@ -312,9 +314,13 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-# define lcderr(format, ...)  info(format, ##__VA_ARGS__)
+# define lcderr(format, ...)  err(format, ##__VA_ARGS__)
+# define lcdwarn(format, ...) warn(format, ##__VA_ARGS__)
+# define lcdinfo(format, ...) info(format, ##__VA_ARGS__)
 #else
 # define lcderr(x...)
+# define lcdwarn(x...)
+# define lcdinfo(x...)
 #endif
 
 /**************************************************************************************
@@ -742,7 +748,7 @@ static int stm3210e_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *bu
 
   /* Buffer must be provided and aligned to a 16-bit address boundary */
 
-  lcderr("row: %d col: %d npixels: %d\n", row, col, npixels);
+  lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0);
 
   /* Write the run to GRAM. */
@@ -835,7 +841,7 @@ static int stm3210e_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
 
   /* Buffer must be provided and aligned to a 16-bit address boundary */
 
-  lcderr("row: %d col: %d npixels: %d\n", row, col, npixels);
+  lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
   DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0);
 
   /* Configure according to the LCD type */
@@ -1321,7 +1327,7 @@ static inline void stm3210e_lcdinitialize(void)
    */
 
   id = stm3210e_readreg(LCD_REG_0);
-  lcderr("LCD ID: %04x\n", id);
+  lcdinfo("LCD ID: %04x\n", id);
 
   /* Check if the ID is for the SPFD5408B */
 
@@ -1331,7 +1337,7 @@ static inline void stm3210e_lcdinitialize(void)
       /* Set the LCD type for the SPFD5408B */
 
       g_lcddev.type = LCD_TYPE_SPFD5408B;
-      lcderr("LCD type: %d\n", g_lcddev.type);
+      lcdinfo("LCD type: %d\n", g_lcddev.type);
 
       /* Start Initial Sequence */
 
@@ -1436,7 +1442,7 @@ static inline void stm3210e_lcdinitialize(void)
       /* Set the LCD type for the R61580 */
 
       g_lcddev.type = LCD_TYPE_R61580;
-      lcderr("LCD type: %d\n", g_lcddev.type);
+      lcdinfo("LCD type: %d\n", g_lcddev.type);
 
       /* Start Initial Sequence */
 
@@ -1506,7 +1512,7 @@ static inline void stm3210e_lcdinitialize(void)
       /* Set the LCD type for the AM240320 */
 
       g_lcddev.type = LCD_TYPE_AM240320;
-      lcderr("LCD type: %d\n", g_lcddev.type);
+      lcdinfo("LCD type: %d\n", g_lcddev.type);
 
       /* Start Initial Sequence */
 
@@ -1595,7 +1601,7 @@ static inline void stm3210e_lcdinitialize(void)
       stm3210e_writereg(LCD_REG_3, 0x1018);
       stm3210e_writereg(LCD_REG_7, 0);       /* Display off */
 #else
-      lcderr("Unsupported LCD type\n");
+      lcderr("ERROR: Unsupported LCD type\n");
 #endif
   }
 }
@@ -1743,25 +1749,25 @@ static void stm3210e_backlight(void)
 
   /* Dump timer1 registers */
 
-  lcderr("APB2ENR: %08x\n", getreg32(STM32_RCC_APB2ENR));
-  lcderr("CR1:     %04x\n", getreg32(STM32_TIM1_CR1));
-  lcderr("CR2:     %04x\n", getreg32(STM32_TIM1_CR2));
-  lcderr("SMCR:    %04x\n", getreg32(STM32_TIM1_SMCR));
-  lcderr("DIER:    %04x\n", getreg32(STM32_TIM1_DIER));
-  lcderr("SR:      %04x\n", getreg32(STM32_TIM1_SR));
-  lcderr("BDTR:    %04x\n", getreg32(STM32_TIM1_BDTR));
-  lcderr("CCMR1:   %04x\n", getreg32(STM32_TIM1_CCMR1));
-  lcderr("CCMR2:   %04x\n", getreg32(STM32_TIM1_CCMR2));
-  lcderr("CCER:    %04x\n", getreg32(STM32_TIM1_CCER));
-  lcderr("CNT:     %04x\n", getreg32(STM32_TIM1_CNT));
-  lcderr("PSC:     %04x\n", getreg32(STM32_TIM1_PSC));
-  lcderr("ARR:     %04x\n", getreg32(STM32_TIM1_ARR));
-  lcderr("RCR:     %04x\n", getreg32(STM32_TIM1_RCR));
-  lcderr("CCR1:    %04x\n", getreg32(STM32_TIM1_CCR1));
-  lcderr("CCR2:    %04x\n", getreg32(STM32_TIM1_CCR2));
-  lcderr("CCR3:    %04x\n", getreg32(STM32_TIM1_CCR3));
-  lcderr("CCR4:    %04x\n", getreg32(STM32_TIM1_CCR4));
-  lcderr("DMAR:    %04x\n", getreg32(STM32_TIM1_DMAR));
+  lcdinfo("APB2ENR: %08x\n", getreg32(STM32_RCC_APB2ENR));
+  lcdinfo("CR1:     %04x\n", getreg32(STM32_TIM1_CR1));
+  lcdinfo("CR2:     %04x\n", getreg32(STM32_TIM1_CR2));
+  lcdinfo("SMCR:    %04x\n", getreg32(STM32_TIM1_SMCR));
+  lcdinfo("DIER:    %04x\n", getreg32(STM32_TIM1_DIER));
+  lcdinfo("SR:      %04x\n", getreg32(STM32_TIM1_SR));
+  lcdinfo("BDTR:    %04x\n", getreg32(STM32_TIM1_BDTR));
+  lcdinfo("CCMR1:   %04x\n", getreg32(STM32_TIM1_CCMR1));
+  lcdinfo("CCMR2:   %04x\n", getreg32(STM32_TIM1_CCMR2));
+  lcdinfo("CCER:    %04x\n", getreg32(STM32_TIM1_CCER));
+  lcdinfo("CNT:     %04x\n", getreg32(STM32_TIM1_CNT));
+  lcdinfo("PSC:     %04x\n", getreg32(STM32_TIM1_PSC));
+  lcdinfo("ARR:     %04x\n", getreg32(STM32_TIM1_ARR));
+  lcdinfo("RCR:     %04x\n", getreg32(STM32_TIM1_RCR));
+  lcdinfo("CCR1:    %04x\n", getreg32(STM32_TIM1_CCR1));
+  lcdinfo("CCR2:    %04x\n", getreg32(STM32_TIM1_CCR2));
+  lcdinfo("CCR3:    %04x\n", getreg32(STM32_TIM1_CCR3));
+  lcdinfo("CCR4:    %04x\n", getreg32(STM32_TIM1_CCR4));
+  lcdinfo("DMAR:    %04x\n", getreg32(STM32_TIM1_DMAR));
 #endif
 }
 #endif
@@ -1793,9 +1799,9 @@ int board_lcd_initialize(void)
 #ifdef CONFIG_PM
   ret = pm_register(&g_lcdcb);
   if (ret != OK)
-  {
-    lcderr("ERROR: pm_register failed: %d\n", ret);
-  }
+    {
+      lcderr("ERROR: pm_register failed: %d\n", ret);
+    }
 #endif
 
   /* Configure GPIO pins and configure the FSMC to support the LCD */
diff --git a/configs/stm3210e-eval/src/stm32_spi.c b/configs/stm3210e-eval/src/stm32_spi.c
index 623363ca7c..be83e9618f 100644
--- a/configs/stm3210e-eval/src/stm32_spi.c
+++ b/configs/stm3210e-eval/src/stm32_spi.c
@@ -59,26 +59,16 @@
 
 /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
-#undef SPI_DEBUG   /* Define to enable debug */
-#undef SPI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SPI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
@@ -134,7 +124,7 @@ void weak_function stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
   if (devid == SPIDEV_FLASH)
     {
@@ -153,7 +143,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -165,7 +155,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
diff --git a/configs/stm3210e-eval/src/stm32_usbdev.c b/configs/stm3210e-eval/src/stm32_usbdev.c
index 58676d1dca..143c938af1 100644
--- a/configs/stm3210e-eval/src/stm32_usbdev.c
+++ b/configs/stm3210e-eval/src/stm32_usbdev.c
@@ -110,6 +110,5 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable)
 
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ullerr("resume: %d\n", resume);
+  ullinfo("resume: %d\n", resume);
 }
-
diff --git a/configs/stm3220g-eval/src/stm32_adc.c b/configs/stm3220g-eval/src/stm32_adc.c
index 2d9041c6ec..9db71d0bd0 100644
--- a/configs/stm3220g-eval/src/stm32_adc.c
+++ b/configs/stm3220g-eval/src/stm32_adc.c
@@ -149,7 +149,7 @@ int board_adc_setup(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          aerr("adc_register failed: %d\n", ret);
+          aerr("ERROR: adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/stm3220g-eval/src/stm32_lcd.c b/configs/stm3220g-eval/src/stm32_lcd.c
index b7f4b1ec4d..704433da76 100644
--- a/configs/stm3220g-eval/src/stm32_lcd.c
+++ b/configs/stm3220g-eval/src/stm32_lcd.c
@@ -33,6 +33,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  **************************************************************************************/
+
 /* This driver supports the following LCDs on the STM324xG_EVAL board:
  *
  *   AM-240320L8TNQW00H (LCD_ILI9320 or LCD_ILI9321) OR
@@ -266,9 +267,11 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcderr              err
+#  define lcdwarn             warn
 #  define lcdinfo             info
 #else
 #  define lcderr(x...)
+#  define lcdwarn(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -967,7 +970,7 @@ static inline void stm3220g_lcdinitialize(void)
   /* Check LCD ID */
 
   id = stm3220g_readreg(LCD_REG_0);
-  lcderr("LCD ID: %04x\n", id);
+  lcdinfo("LCD ID: %04x\n", id);
 
   /* Check if the ID is for the STM32_ILI9320 (or ILI9321) or STM32_ILI9325 */
 
@@ -996,7 +999,7 @@ static inline void stm3220g_lcdinitialize(void)
 #else /* if !defined(CONFIG_STM32_ILI9325_DISABLE) */
       g_lcddev.type = LCD_TYPE_ILI9325;
 #endif
-      lcderr("LCD type: %d\n", g_lcddev.type);
+      lcdinfo("LCD type: %d\n", g_lcddev.type);
 
       /* Start Initial Sequence */
 
@@ -1114,7 +1117,7 @@ static inline void stm3220g_lcdinitialize(void)
     }
   else
     {
-      lcderr("Unsupported LCD type\n");
+      lcderr("ERROR: Unsupported LCD type\n");
     }
 }
 
diff --git a/configs/stm3220g-eval/src/stm32_pwm.c b/configs/stm3220g-eval/src/stm32_pwm.c
index c5c26352e0..b934120856 100644
--- a/configs/stm3220g-eval/src/stm32_pwm.c
+++ b/configs/stm3220g-eval/src/stm32_pwm.c
@@ -97,7 +97,7 @@ int board_pwm_setup(void)
       pwm = stm32_pwminitialize(STM3220G_EVAL_PWMTIMER);
       if (!pwm)
         {
-          err("Failed to get the STM32 PWM lower half\n");
+          aerr("ERROR: Failed to get the STM32 PWM lower half\n");
           return -ENODEV;
         }
 
@@ -106,7 +106,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          aerr("pwm_register failed: %d\n", ret);
+          aerr("ERROR: pwm_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/stm3220g-eval/src/stm32_spi.c b/configs/stm3220g-eval/src/stm32_spi.c
index 8cb939c519..030283e683 100644
--- a/configs/stm3220g-eval/src/stm32_spi.c
+++ b/configs/stm3220g-eval/src/stm32_spi.c
@@ -59,26 +59,16 @@
 
 /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
-#undef SPI_DEBUG   /* Define to enable debug */
-#undef SPI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SPI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
@@ -124,7 +114,7 @@ void weak_function stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -136,7 +126,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -148,7 +138,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
diff --git a/configs/stm3220g-eval/src/stm32_stmpe811.c b/configs/stm3220g-eval/src/stm32_stmpe811.c
index 03d5cff876..5748600e95 100644
--- a/configs/stm3220g-eval/src/stm32_stmpe811.c
+++ b/configs/stm3220g-eval/src/stm32_stmpe811.c
@@ -279,7 +279,7 @@ int board_tsc_setup(int minor)
   FAR struct i2c_master_s *dev;
   int ret;
 
-  ierr("minor %d\n", minor);
+  iinfo("minor %d\n", minor);
   DEBUGASSERT(minor == 0);
 
   /* Check if we are already initialized */
@@ -297,7 +297,7 @@ int board_tsc_setup(int minor)
       dev = stm32_i2cbus_initialize(CONFIG_STMPE811_I2CDEV);
       if (!dev)
         {
-          ierr("Failed to initialize I2C bus %d\n", CONFIG_STMPE811_I2CDEV);
+          ierr("ERROR: Failed to initialize I2C bus %d\n", CONFIG_STMPE811_I2CDEV);
           return -ENODEV;
         }
 
@@ -307,7 +307,7 @@ int board_tsc_setup(int minor)
         stmpe811_instantiate(dev, (FAR struct stmpe811_config_s *)&g_stmpe811config);
       if (!g_stmpe811config.handle)
         {
-          ierr("Failed to instantiate the STMPE811 driver\n");
+          ierr("ERROR: Failed to instantiate the STMPE811 driver\n");
           return -ENODEV;
         }
 
@@ -316,7 +316,7 @@ int board_tsc_setup(int minor)
       ret = stmpe811_register(g_stmpe811config.handle, CONFIG_STMPE811_DEVMINOR);
       if (ret < 0)
         {
-          ierr("Failed to register STMPE driver: %d\n", ret);
+          ierr("ERROR: Failed to register STMPE driver: %d\n", ret);
           /* stm32_i2cbus_uninitialize(dev); */
           return -ENODEV;
         }
diff --git a/configs/stm3220g-eval/src/stm32_usb.c b/configs/stm3220g-eval/src/stm32_usb.c
index 1fc1fdf74a..36b48c2c70 100644
--- a/configs/stm3220g-eval/src/stm32_usb.c
+++ b/configs/stm3220g-eval/src/stm32_usb.c
@@ -300,7 +300,7 @@ xcpt_t stm32_setup_overcurrent(xcpt_t handler)
 #ifdef CONFIG_USBDEV
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ullerr("resume: %d\n", resume);
+  ullinfo("resume: %d\n", resume);
 }
 #endif
 
diff --git a/configs/stm3240g-eval/src/stm32_adc.c b/configs/stm3240g-eval/src/stm32_adc.c
index 8ca5ae99b0..1d78797043 100644
--- a/configs/stm3240g-eval/src/stm32_adc.c
+++ b/configs/stm3240g-eval/src/stm32_adc.c
@@ -149,7 +149,7 @@ int board_adc_setup(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          aerr("adc_register failed: %d\n", ret);
+          aerr("ERROR: adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/stm3240g-eval/src/stm32_lcd.c b/configs/stm3240g-eval/src/stm32_lcd.c
index 676bb777e8..71c06380c9 100644
--- a/configs/stm3240g-eval/src/stm32_lcd.c
+++ b/configs/stm3240g-eval/src/stm32_lcd.c
@@ -33,6 +33,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  **************************************************************************************/
+
 /* This driver supports the following LCDs on the STM324xG_EVAL board:
  *
  *   AM-240320L8TNQW00H (LCD_ILI9320 or LCD_ILI9321) OR
@@ -266,9 +267,11 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcderr              err
+#  define lcdwarn             warn
 #  define lcdinfo             info
 #else
 #  define lcderr(x...)
+#  define lcdwarn(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -966,7 +969,7 @@ static inline void stm3240g_lcdinitialize(void)
   /* Check LCD ID */
 
   id = stm3240g_readreg(LCD_REG_0);
-  lcderr("LCD ID: %04x\n", id);
+  lcdinfo("LCD ID: %04x\n", id);
 
   /* Check if the ID is for the STM32_ILI9320 (or ILI9321) or STM32_ILI9325 */
 
@@ -995,7 +998,7 @@ static inline void stm3240g_lcdinitialize(void)
 #else /* if !defined(CONFIG_STM3240G_ILI9325_DISABLE) */
       g_lcddev.type = LCD_TYPE_ILI9325;
 #endif
-      lcderr("LCD type: %d\n", g_lcddev.type);
+      lcdinfo("LCD type: %d\n", g_lcddev.type);
 
       /* Start Initial Sequence */
 
@@ -1113,7 +1116,7 @@ static inline void stm3240g_lcdinitialize(void)
     }
   else
     {
-      lcderr("Unsupported LCD type\n");
+      lcderr("ERROR: Unsupported LCD type\n");
     }
 }
 
diff --git a/configs/stm3240g-eval/src/stm32_pwm.c b/configs/stm3240g-eval/src/stm32_pwm.c
index bc3054e477..4ccf6dad9c 100644
--- a/configs/stm3240g-eval/src/stm32_pwm.c
+++ b/configs/stm3240g-eval/src/stm32_pwm.c
@@ -97,7 +97,7 @@ int board_pwm_setup(void)
       pwm = stm32_pwminitialize(STM3240G_EVAL_PWMTIMER);
       if (!pwm)
         {
-          err("Failed to get the STM32 PWM lower half\n");
+          aerr("ERROR: Failed to get the STM32 PWM lower half\n");
           return -ENODEV;
         }
 
@@ -106,7 +106,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          aerr("pwm_register failed: %d\n", ret);
+          aerr("ERROR: pwm_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/stm3240g-eval/src/stm32_spi.c b/configs/stm3240g-eval/src/stm32_spi.c
index a89daa6521..6db6401c85 100644
--- a/configs/stm3240g-eval/src/stm32_spi.c
+++ b/configs/stm3240g-eval/src/stm32_spi.c
@@ -59,26 +59,16 @@
 
 /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
-#undef SPI_DEBUG   /* Define to enable debug */
-#undef SPI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SPI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
@@ -124,7 +114,7 @@ void weak_function stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -136,7 +126,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -148,7 +138,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
diff --git a/configs/stm3240g-eval/src/stm32_stmpe811.c b/configs/stm3240g-eval/src/stm32_stmpe811.c
index 77b9ffadf3..0bb25376fa 100644
--- a/configs/stm3240g-eval/src/stm32_stmpe811.c
+++ b/configs/stm3240g-eval/src/stm32_stmpe811.c
@@ -279,7 +279,7 @@ int board_tsc_setup(int minor)
   FAR struct i2c_master_s *dev;
   int ret;
 
-  ierr("minor %d\n", minor);
+  iinfo("minor %d\n", minor);
   DEBUGASSERT(minor == 0);
 
   /* Check if we are already initialized */
@@ -297,7 +297,7 @@ int board_tsc_setup(int minor)
       dev = stm32_i2cbus_initialize(CONFIG_STMPE811_I2CDEV);
       if (!dev)
         {
-          ierr("Failed to initialize I2C bus %d\n", CONFIG_STMPE811_I2CDEV);
+          ierr("ERROR: Failed to initialize I2C bus %d\n", CONFIG_STMPE811_I2CDEV);
           return -ENODEV;
         }
 
@@ -307,7 +307,7 @@ int board_tsc_setup(int minor)
         stmpe811_instantiate(dev, (FAR struct stmpe811_config_s *)&g_stmpe811config);
       if (!g_stmpe811config.handle)
         {
-          ierr("Failed to instantiate the STMPE811 driver\n");
+          ierr("ERROR: Failed to instantiate the STMPE811 driver\n");
           return -ENODEV;
         }
 
@@ -316,7 +316,7 @@ int board_tsc_setup(int minor)
       ret = stmpe811_register(g_stmpe811config.handle, CONFIG_STMPE811_DEVMINOR);
       if (ret < 0)
         {
-          ierr("Failed to register STMPE driver: %d\n", ret);
+          ierr("ERROR: Failed to register STMPE driver: %d\n", ret);
           /* stm32_i2cbus_uninitialize(dev); */
           return -ENODEV;
         }
diff --git a/configs/stm3240g-eval/src/stm32_usb.c b/configs/stm3240g-eval/src/stm32_usb.c
index 48f2f392b9..e289ad19e8 100644
--- a/configs/stm3240g-eval/src/stm32_usb.c
+++ b/configs/stm3240g-eval/src/stm32_usb.c
@@ -300,7 +300,7 @@ xcpt_t stm32_setup_overcurrent(xcpt_t handler)
 #ifdef CONFIG_USBDEV
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ullerr("resume: %d\n", resume);
+  ullinfo("resume: %d\n", resume);
 }
 #endif
 
diff --git a/configs/stm32_tiny/src/stm32_pwm.c b/configs/stm32_tiny/src/stm32_pwm.c
index 46bddca185..8efec614b6 100644
--- a/configs/stm32_tiny/src/stm32_pwm.c
+++ b/configs/stm32_tiny/src/stm32_pwm.c
@@ -95,7 +95,7 @@ int board_pwm_setup(void)
       pwm = stm32_pwminitialize(STM32TINY_PWMTIMER);
       if (!pwm)
         {
-          aerr("Failed to get the STM32 PWM lower half\n");
+          aerr("ERROR: Failed to get the STM32 PWM lower half\n");
           return -ENODEV;
         }
 
@@ -104,7 +104,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          aerr("pwm_register failed: %d\n", ret);
+          aerr("ERROR: pwm_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/stm32_tiny/src/stm32_usbdev.c b/configs/stm32_tiny/src/stm32_usbdev.c
index d27594b65a..5331dd7fff 100644
--- a/configs/stm32_tiny/src/stm32_usbdev.c
+++ b/configs/stm32_tiny/src/stm32_usbdev.c
@@ -74,7 +74,7 @@
 
 void stm32_usbinitialize(void)
 {
-  ullerr("called\n");
+  ullinfo("called\n");
 
   /* USB Soft Connect Pullup */
   stm32_configgpio(GPIO_USB_PULLUP);
@@ -112,6 +112,5 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable)
 
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ullerr("resume: %d\n", resume);
+  ullinfo("resume: %d\n", resume);
 }
-
diff --git a/configs/stm32_tiny/src/stm32_wireless.c b/configs/stm32_tiny/src/stm32_wireless.c
index 842cb51c59..e13bf24c97 100644
--- a/configs/stm32_tiny/src/stm32_wireless.c
+++ b/configs/stm32_tiny/src/stm32_wireless.c
@@ -114,14 +114,14 @@ void stm32_wlinitialize(void)
   spidev = stm32_spibus_initialize(2);
   if (!spidev)
     {
-      err("Failed to initialize SPI bus\n");
+      err("ERROR: Failed to initialize SPI bus\n");
       return;
     }
 
   result = nrf24l01_register(spidev, &nrf_cfg);
   if (result != OK)
     {
-      err("Failed to register initialize SPI bus\n");
+      err("ERROR: Failed to register initialize SPI bus\n");
       return;
     }
 }
diff --git a/configs/stm32f103-minimum/src/stm32_usbdev.c b/configs/stm32f103-minimum/src/stm32_usbdev.c
index 092196cd32..753d292dcd 100644
--- a/configs/stm32f103-minimum/src/stm32_usbdev.c
+++ b/configs/stm32f103-minimum/src/stm32_usbdev.c
@@ -103,5 +103,5 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable)
 
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ullerr("resume: %d\n", resume);
+  ullinfo("resume: %d\n", resume);
 }
diff --git a/configs/stm32f3discovery/src/stm32_pwm.c b/configs/stm32f3discovery/src/stm32_pwm.c
index bb419cb6b8..1cdfb8c9c4 100644
--- a/configs/stm32f3discovery/src/stm32_pwm.c
+++ b/configs/stm32f3discovery/src/stm32_pwm.c
@@ -119,7 +119,7 @@ int board_pwm_setup(void)
       pwm = stm32_pwminitialize(STM32F3DISCOVERY_PWMTIMER);
       if (!pwm)
         {
-          err("Failed to get the STM32 PWM lower half\n");
+          aerr("ERROR: Failed to get the STM32 PWM lower half\n");
           return -ENODEV;
         }
 
@@ -128,7 +128,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          aerr("pwm_register failed: %d\n", ret);
+          aerr("ERROR: pwm_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/stm32f3discovery/src/stm32_qencoder.c b/configs/stm32f3discovery/src/stm32_qencoder.c
index 45d7f274c4..d4fa6051cc 100644
--- a/configs/stm32f3discovery/src/stm32_qencoder.c
+++ b/configs/stm32f3discovery/src/stm32_qencoder.c
@@ -149,7 +149,7 @@ int qe_devinit(void)
       ret = stm32_qeinitialize("/dev/qe0", TIMID);
       if (ret < 0)
         {
-          snerr("stm32_qeinitialize failed: %d\n", ret);
+          snerr("ERROR: stm32_qeinitialize failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/stm32f3discovery/src/stm32_spi.c b/configs/stm32f3discovery/src/stm32_spi.c
index cd082fc996..0397692aba 100644
--- a/configs/stm32f3discovery/src/stm32_spi.c
+++ b/configs/stm32f3discovery/src/stm32_spi.c
@@ -60,26 +60,16 @@
 
 /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
-#undef SPI_DEBUG   /* Define to enable debug */
-#undef SPI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SPI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
@@ -129,7 +119,7 @@ void weak_function stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
   stm32_gpiowrite(GPIO_MEMS_CS, !selected);
 }
@@ -143,7 +133,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -155,7 +145,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
diff --git a/configs/stm32f3discovery/src/stm32_usb.c b/configs/stm32f3discovery/src/stm32_usb.c
index 7c071b91b9..658e796c2b 100644
--- a/configs/stm32f3discovery/src/stm32_usb.c
+++ b/configs/stm32f3discovery/src/stm32_usb.c
@@ -121,10 +121,7 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable)
 
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ullerr("resume: %d\n", resume);
+  ullinfo("Resume: %d\n", resume);
 }
 
 #endif /* CONFIG_STM32_USB */
-
-
-
diff --git a/configs/stm32f429i-disco/src/stm32_appinit.c b/configs/stm32f429i-disco/src/stm32_appinit.c
index 4f2eca3b31..c7f1d4fb76 100644
--- a/configs/stm32f429i-disco/src/stm32_appinit.c
+++ b/configs/stm32f429i-disco/src/stm32_appinit.c
@@ -284,7 +284,7 @@ int board_app_initialize(uintptr_t arg)
 
             if (mtd_part == NULL)
               {
-                err("Error: failed to create partition %s\n", partname);
+                ferr("ERROR: failed to create partition %s\n", partname);
                 return -1;
               }
 
diff --git a/configs/stm32f429i-disco/src/stm32_idle.c b/configs/stm32f429i-disco/src/stm32_idle.c
index c71eaa61f0..bb23e39065 100644
--- a/configs/stm32f429i-disco/src/stm32_idle.c
+++ b/configs/stm32f429i-disco/src/stm32_idle.c
@@ -125,7 +125,7 @@ static void stm32_idlepm(void)
 
   if (newstate != oldstate)
     {
-      llerr("newstate= %d oldstate=%d\n", newstate, oldstate);
+      sllinfo("newstate= %d oldstate=%d\n", newstate, oldstate);
 
       flags = enter_critical_section();
 
diff --git a/configs/stm32f429i-disco/src/stm32_ili93414ws.c b/configs/stm32f429i-disco/src/stm32_ili93414ws.c
index c2cfffd44a..a862efdef9 100644
--- a/configs/stm32f429i-disco/src/stm32_ili93414ws.c
+++ b/configs/stm32f429i-disco/src/stm32_ili93414ws.c
@@ -134,11 +134,13 @@
 
 /* Debug option */
 
-#ifdef CONFIG_DEBUG_LCD
-#  define lcderr       err
-#  define lcdinfo      info
+#ifdef CONFIG_DEBUG_SPI
+#  define lcderr  err
+#  define lcdwarn warn
+#  define lcdinfo info
 #else
 #  define lcderr(x...)
+#  define lcdwarn(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -503,7 +505,6 @@ static int stm32_ili93414ws_sendblock(FAR struct ili93414ws_lcd_s *lcd,
   return OK;
 }
 
-
 /****************************************************************************
  * Name: stm32_ili93414ws_recvword
  *
@@ -587,7 +588,7 @@ static uint16_t stm32_ili93414ws_recvword(void)
         }
     }
 
-  err("Timeout during receiving pixel word\n");
+  lcdinfo("Timeout during receiving pixel word\n");
 
   return 0;
 }
@@ -1174,7 +1175,7 @@ FAR struct ili9341_lcd_s *stm32_ili93414ws_initialize(void)
   FAR struct spi_dev_s *spi;
   FAR struct ili93414ws_lcd_s *priv = &g_lcddev;
 
-  lcderr("initialize ili9341 4-wire serial subdriver\n");
+  lcdinfo("initialize ili9341 4-wire serial subdriver\n");
 
   lcdinfo("initialize spi device: %d\n", ILI93414WS_SPI_DEVICE);
   spi = stm32_spi5initialize();
@@ -1206,7 +1207,7 @@ FAR struct ili9341_lcd_s *stm32_ili93414ws_initialize(void)
   uint32_t    regval;
   FAR struct ili93414ws_lcd_s *priv = &g_lcddev;
 
-  lcderr("initialize ili9341 4-wire serial subdriver\n");
+  lcdinfo("initialize ili9341 4-wire serial subdriver\n");
 
   /* Enable spi bus */
 
diff --git a/configs/stm32f429i-disco/src/stm32_lcd.c b/configs/stm32f429i-disco/src/stm32_lcd.c
index 0624b68809..f674bfdebd 100644
--- a/configs/stm32f429i-disco/src/stm32_lcd.c
+++ b/configs/stm32f429i-disco/src/stm32_lcd.c
@@ -57,6 +57,7 @@
 /************************************************************************************
  * Pre-processor Definitions
  ************************************************************************************/
+
 #ifdef CONFIG_STM32F429I_DISCO_ILI9341_LCDDEVICE
 # define ILI9341_LCD_DEVICE CONFIG_STM32F429I_DISCO_ILI9341_LCDDEVICE
 #else
@@ -279,6 +280,18 @@
 #define ILI9341_YRES BOARD_LTDC_HEIGHT
 #endif /* CONFIG_STM32F429I_DISCO_ILI9341_FBIFACE */
 
+/* Debug */
+
+#ifdef CONFIG_DEBUG_LCD
+#  define lcderr  err
+#  define lcdwarn warn
+#  define lcdinfo info
+#else
+#  define lcderr(x...)
+#  define lcdwarn(x...)
+#  define lcdinfo(x...)
+#endif
+
 /************************************************************************************
  * Private Data
  ************************************************************************************/
@@ -317,7 +330,7 @@ static int stm32_ili9341_initialize(void)
 
   /* Select spi device */
 
-  err("Initialize ili9341 lcd driver\n");
+  lcdinfo("Initialize ili9341 lcd driver\n");
   lcd->select(lcd);
 
 #ifdef CONFIG_DEBUG_LCD
@@ -325,36 +338,38 @@ static int stm32_ili9341_initialize(void)
 
   lcd->sendcmd(lcd, ILI9341_READ_ID1);
   lcd->recvparam(lcd, ¶m);
-  err("ili9341 LCD driver: LCD modules manufacturer ID: %d\n", param);
+  lcdinfo("ili9341 LCD driver: LCD modules manufacturer ID: %d\n", param);
+
   lcd->sendcmd(lcd, ILI9341_READ_ID2);
   lcd->recvparam(lcd, ¶m);
-  err("ili9341 LCD driver: LCD modules driver version ID: %d\n", param);
+  lcdinfo("ili9341 LCD driver: LCD modules driver version ID: %d\n", param);
+
   lcd->sendcmd(lcd, ILI9341_READ_ID3);
   lcd->recvparam(lcd, ¶m);
-  err("ili9341 LCD driver: LCD modules driver ID: %d\n", param);
+  lcdinfo("ili9341 LCD driver: LCD modules driver ID: %d\n", param);
 #endif
 
   /* Reset the lcd display to the default state */
 
-  info("ili9341 LCD driver: Software Reset\n");
+  lcdinfo("ili9341 LCD driver: Software Reset\n");
   lcd->sendcmd(lcd, ILI9341_SOFTWARE_RESET);
   up_mdelay(5);
 
-  info("ili9341 LCD driver: set Memory Access Control %08x\n",
+  lcdinfo("ili9341 LCD driver: set Memory Access Control %08x\n",
         STM32_ILI9341_MADCTL_PARAM);
   lcd->sendcmd(lcd, ILI9341_MEMORY_ACCESS_CONTROL);
   lcd->sendparam(lcd, STM32_ILI9341_MADCTL_PARAM);
 
   /* Pixel Format */
 
-  info("ili9341 LCD driver: Set Pixel Format: %02x\n",
+  lcdinfo("ili9341 LCD driver: Set Pixel Format: %02x\n",
           STM32_ILI9341_PIXSET_PARAM);
   lcd->sendcmd(lcd, ILI9341_PIXEL_FORMAT_SET);
   lcd->sendparam(lcd, STM32_ILI9341_PIXSET_PARAM);
 
   /* Select column */
 
-  info("ili9341 LCD driver: Set Column Address\n");
+  lcdinfo("ili9341 LCD driver: Set Column Address\n");
   lcd->sendcmd(lcd, ILI9341_COLUMN_ADDRESS_SET);
   lcd->sendparam(lcd, 0);
   lcd->sendparam(lcd, 0);
@@ -363,7 +378,7 @@ static int stm32_ili9341_initialize(void)
 
   /* Select page */
 
-  info("ili9341 LCD driver: Set Page Address\n");
+  lcdinfo("ili9341 LCD driver: Set Page Address\n");
   lcd->sendcmd(lcd, ILI9341_PAGE_ADDRESS_SET);
   lcd->sendparam(lcd, 0);
   lcd->sendparam(lcd, 0);
@@ -372,14 +387,14 @@ static int stm32_ili9341_initialize(void)
 
   /* RGB Interface signal control */
 
-  info("ili9341 LCD driver: Set RGB Interface signal control: %02x\n",
+  lcdinfo("ili9341 LCD driver: Set RGB Interface signal control: %02x\n",
           STM32_ILI9341_IFMODE_PARAM);
   lcd->sendcmd(lcd, ILI9341_RGB_SIGNAL_CONTROL);
   lcd->sendparam(lcd, STM32_ILI9341_IFMODE_PARAM);
 
   /* Interface control */
 
-  info("ili9341 LCD driver: Set Interface control: %d:%d:%d\n",
+  lcdinfo("ili9341 LCD driver: Set Interface control: %d:%d:%d\n",
           STM32_ILI9341_IFCTL_PARAM1,
           STM32_ILI9341_IFCTL_PARAM2,
           STM32_ILI9341_IFCTL_PARAM3);
@@ -391,13 +406,13 @@ static int stm32_ili9341_initialize(void)
 
   /* Sleep out set to the end */
 
-  info("ili9341 LCD driver: Sleep Out\n");
+  lcdinfo("ili9341 LCD driver: Sleep Out\n");
   lcd->sendcmd(lcd, ILI9341_SLEEP_OUT);
   up_mdelay(5); /* 120? */
 
   /* Display on */
 
-  info("ili9341 LCD driver: Display On\n");
+  lcdinfo("ili9341 LCD driver: Display On\n");
   lcd->sendcmd(lcd, ILI9341_DISPLAY_ON);
 
   /* Deselect spi device */
diff --git a/configs/stm32f429i-disco/src/stm32_spi.c b/configs/stm32f429i-disco/src/stm32_spi.c
index 90cd6cab82..b9538bcd60 100644
--- a/configs/stm32f429i-disco/src/stm32_spi.c
+++ b/configs/stm32f429i-disco/src/stm32_spi.c
@@ -62,19 +62,13 @@
 
 /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
-#undef SPI_DEBUG   /* Define to enable debug */
-#undef SPI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SPI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -143,7 +137,7 @@ void weak_function stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -155,7 +149,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -167,7 +161,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -196,7 +190,7 @@ uint8_t stm32_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI5
 void stm32_spi5select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
 #if defined(CONFIG_STM32F429I_DISCO_ILI9341)
   if (devid == SPIDEV_DISPLAY)
diff --git a/configs/stm32f429i-disco/src/stm32_usb.c b/configs/stm32f429i-disco/src/stm32_usb.c
index 428dffa81c..6d6da4d931 100644
--- a/configs/stm32f429i-disco/src/stm32_usb.c
+++ b/configs/stm32f429i-disco/src/stm32_usb.c
@@ -306,7 +306,7 @@ xcpt_t stm32_setup_overcurrent(xcpt_t handler)
 #ifdef CONFIG_USBDEV
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ullerr("resume: %d\n", resume);
+  ullinfo("resume: %d\n", resume);
 }
 #endif
 
diff --git a/configs/stm32f4discovery/src/stm32_bh1750fvi.c b/configs/stm32f4discovery/src/stm32_bh1750fvi.c
index a1ea035402..be89640964 100644
--- a/configs/stm32f4discovery/src/stm32_bh1750fvi.c
+++ b/configs/stm32f4discovery/src/stm32_bh1750fvi.c
@@ -80,7 +80,7 @@ int stm32_bh1750initialize(FAR const char *devpath)
   FAR struct i2c_master_s *i2c;
   int ret;
 
-  snerr("Initializing BH1750FVI!\n");
+  sninfo("Initializing BH1750FVI!\n");
 
   /* Initialize I2C */
 
@@ -96,7 +96,7 @@ int stm32_bh1750initialize(FAR const char *devpath)
   ret = bh1750fvi_register(devpath, i2c, BH1750FVI_I2C_ADDR);
   if (ret < 0)
     {
-      snerr("Error registering BM180\n");
+      snerr("ERROR: Error registering BM180\n");
     }
 
   return ret;
diff --git a/configs/stm32f4discovery/src/stm32_bmp180.c b/configs/stm32f4discovery/src/stm32_bmp180.c
index 75f0a31275..bd90a808f7 100644
--- a/configs/stm32f4discovery/src/stm32_bmp180.c
+++ b/configs/stm32f4discovery/src/stm32_bmp180.c
@@ -80,7 +80,7 @@ int stm32_bmp180initialize(FAR const char *devpath)
   FAR struct i2c_master_s *i2c;
   int ret;
 
-  snerr("Initializing BMP180!\n");
+  sninfo("Initializing BMP180!\n");
 
   /* Initialize I2C */
 
@@ -96,7 +96,7 @@ int stm32_bmp180initialize(FAR const char *devpath)
   ret = bmp180_register(devpath, i2c);
   if (ret < 0)
     {
-      snerr("Error registering BM180\n");
+      snerr("ERROR: Error registering BM180\n");
     }
 
   return ret;
diff --git a/configs/stm32f4discovery/src/stm32_ethernet.c b/configs/stm32f4discovery/src/stm32_ethernet.c
index a29d538af2..6ccd0b7271 100644
--- a/configs/stm32f4discovery/src/stm32_ethernet.c
+++ b/configs/stm32f4discovery/src/stm32_ethernet.c
@@ -105,7 +105,7 @@ static xcpt_t g_ethmac_handler;
 #ifdef HAVE_NETMONITOR
 static void stm32_emac0_phy_enable(bool enable)
 {
-  phyerr("enable=%d\n", enable);
+  phyinfo("enable=%d\n", enable);
   if (enable && g_ethmac_handler != NULL)
     {
       /* Attach and enable GPIO interrupt (and event) on the falling edge */
@@ -138,7 +138,7 @@ void weak_function stm32_netinitialize(void)
 #ifdef HAVE_NETMONITOR
   /* Configure the PHY interrupt GPIO */
 
-  phyerr("Configuring %08x\n", GPIO_EMAC_NINT);
+  phyinfo("Configuring %08x\n", GPIO_EMAC_NINT);
   stm32_configgpio(GPIO_EMAC_NINT);
 #endif
 
@@ -218,7 +218,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
   irqstate_t flags;
 
   ninfo("%s: handler=%p\n", intf, handler);
-  phyerr("ETHMAC: devname=%s\n", STM32_ETHMAC_DEVNAME);
+  phyinfo("ETHMAC: devname=%s\n", STM32_ETHMAC_DEVNAME);
 
   DEBUGASSERT(intf);
 
@@ -227,13 +227,13 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
 
   if (strcmp(intf, STM32_ETHMAC_DEVNAME) == 0)
     {
-      phyerr("Select ETHMAC\n");
+      phyinfo("Select ETHMAC\n");
       g_ethmac_handler = handler;
       enabler          = stm32_emac0_phy_enable;
     }
   else
     {
-      nerr("Unsupported interface: %s\n", intf);
+      nerr("ERROR: Unsupported interface: %s\n", intf);
       enabler          = NULL;
     }
 
diff --git a/configs/stm32f4discovery/src/stm32_idle.c b/configs/stm32f4discovery/src/stm32_idle.c
index 6dc0f27b0b..4fb9a0d0f7 100644
--- a/configs/stm32f4discovery/src/stm32_idle.c
+++ b/configs/stm32f4discovery/src/stm32_idle.c
@@ -122,7 +122,7 @@ static void stm32_idlepm(void)
 
   if (newstate != oldstate)
     {
-      llerr("newstate= %d oldstate=%d\n", newstate, oldstate);
+      sllinfo("newstate= %d oldstate=%d\n", newstate, oldstate);
 
       flags = enter_critical_section();
 
diff --git a/configs/stm32f4discovery/src/stm32_max31855.c b/configs/stm32f4discovery/src/stm32_max31855.c
index 378b91fe09..8b4539fa5b 100644
--- a/configs/stm32f4discovery/src/stm32_max31855.c
+++ b/configs/stm32f4discovery/src/stm32_max31855.c
@@ -92,7 +92,7 @@ int stm32_max31855initialize(FAR const char *devpath)
   ret = max31855_register(devpath, spi);
   if (ret < 0)
     {
-      snerr("Error registering MAX31855\n");
+      snerr("ERROR: Error registering MAX31855\n");
     }
 
   return ret;
diff --git a/configs/stm32f4discovery/src/stm32_max6675.c b/configs/stm32f4discovery/src/stm32_max6675.c
index 852abd5490..1b298daf9f 100644
--- a/configs/stm32f4discovery/src/stm32_max6675.c
+++ b/configs/stm32f4discovery/src/stm32_max6675.c
@@ -92,7 +92,7 @@ int stm32_max6675initialize(FAR const char *devpath)
   ret = max6675_register(devpath, spi);
   if (ret < 0)
     {
-      snerr("Error registering MAX6675\n");
+      snerr("ERROR: Error registering MAX6675\n");
     }
 
   return ret;
diff --git a/configs/stm32f4discovery/src/stm32_pca9635.c b/configs/stm32f4discovery/src/stm32_pca9635.c
index 71df097945..739b43e16a 100644
--- a/configs/stm32f4discovery/src/stm32_pca9635.c
+++ b/configs/stm32f4discovery/src/stm32_pca9635.c
@@ -93,7 +93,7 @@ int stm32_pca9635_initialize(void)
   ret = pca9635pw_register("/dev/leddrv0", i2c, PCA9635_I2CADDR);
   if (ret < 0)
     {
-      snerr("Failed to register PCA9635 driver: %d\n", ret);
+      snerr("ERROR: Failed to register PCA9635 driver: %d\n", ret);
      return ret;
     }
 
diff --git a/configs/stm32f4discovery/src/stm32_pwm.c b/configs/stm32f4discovery/src/stm32_pwm.c
index 16f4bfdbba..9e80b06c7e 100644
--- a/configs/stm32f4discovery/src/stm32_pwm.c
+++ b/configs/stm32f4discovery/src/stm32_pwm.c
@@ -117,7 +117,7 @@ int board_pwm_setup(void)
       pwm = stm32_pwminitialize(STM32F4DISCOVERY_PWMTIMER);
       if (!pwm)
         {
-          aerr("Failed to get the STM32 PWM lower half\n");
+          aerr("ERROR: Failed to get the STM32 PWM lower half\n");
           return -ENODEV;
         }
 
@@ -126,7 +126,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          aerr("pwm_register failed: %d\n", ret);
+          aerr("ERROR: pwm_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/stm32f4discovery/src/stm32_qencoder.c b/configs/stm32f4discovery/src/stm32_qencoder.c
index a5b2b23c65..5d0ae6460a 100644
--- a/configs/stm32f4discovery/src/stm32_qencoder.c
+++ b/configs/stm32f4discovery/src/stm32_qencoder.c
@@ -117,10 +117,6 @@
 
 #ifdef HAVE_QENCODER
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
@@ -149,7 +145,7 @@ int qe_devinit(void)
       ret = stm32_qeinitialize("/dev/qe0", TIMID);
       if (ret < 0)
         {
-          snerr("stm32_qeinitialize failed: %d\n", ret);
+          snerr("ERROR: stm32_qeinitialize failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/stm32f4discovery/src/stm32_rgbled.c b/configs/stm32f4discovery/src/stm32_rgbled.c
index 714844e8f4..614fb9b57e 100644
--- a/configs/stm32f4discovery/src/stm32_rgbled.c
+++ b/configs/stm32f4discovery/src/stm32_rgbled.c
@@ -86,6 +86,16 @@
 #  undef HAVE_RGBLED
 #endif
 
+#ifdef CONFIG_DEBUG_LCD
+#  define lcderr  llerr
+#  define lcdwarn llwarn
+#  define lcdinfo llinfo
+#else
+#  define lcderr(x...)
+#  define lcdwarn(x...)
+#  define lcdinfo(x...)
+#endif
+
 #ifdef HAVE_RGBLED
 
 /************************************************************************************
@@ -119,7 +129,7 @@ int stm32_rgbled_setup(void)
       ledr = stm32_pwminitialize(1);
       if (!ledr)
         {
-          err("Failed to get the STM32 PWM lower half to LEDR\n");
+          lcderr("ERROR: Failed to get the STM32 PWM lower half to LEDR\n");
           return -ENODEV;
         }
 
@@ -138,7 +148,7 @@ int stm32_rgbled_setup(void)
       ledg = stm32_pwminitialize(2);
       if (!ledg)
         {
-          err("Failed to get the STM32 PWM lower half to LEDG\n");
+          lcderr("ERROR: Failed to get the STM32 PWM lower half to LEDG\n");
           return -ENODEV;
         }
 
@@ -152,7 +162,7 @@ int stm32_rgbled_setup(void)
       ledb = stm32_pwminitialize(3);
       if (!ledb)
         {
-          err("Failed to get the STM32 PWM lower half to LEDB\n");
+          lcderr("ERROR: Failed to get the STM32 PWM lower half to LEDB\n");
           return -ENODEV;
         }
 
@@ -166,7 +176,7 @@ int stm32_rgbled_setup(void)
       ret = rgbled_register("/dev/rgbled0", ledr, ledg, ledb);
       if (ret < 0)
         {
-          err("rgbled_register failed: %d\n", ret);
+          lcderr("ERROR: rgbled_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/stm32f4discovery/src/stm32_sdio.c b/configs/stm32f4discovery/src/stm32_sdio.c
index 79b7412c88..a82a38d348 100644
--- a/configs/stm32f4discovery/src/stm32_sdio.c
+++ b/configs/stm32f4discovery/src/stm32_sdio.c
@@ -139,7 +139,7 @@ int stm32_sdio_initialize(void)
   g_sdio_dev = sdio_initialize(SDIO_SLOTNO);
   if (!g_sdio_dev)
     {
-      ferr("Failed to initialize SDIO slot %d\n", SDIO_SLOTNO);
+      ferr("ERROR: Failed to initialize SDIO slot %d\n", SDIO_SLOTNO);
       return -ENODEV;
     }
 
@@ -150,7 +150,7 @@ int stm32_sdio_initialize(void)
   ret = mmcsd_slotinitialize(SDIO_MINOR, g_sdio_dev);
   if (ret != OK)
     {
-      ferr("Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
+      ferr("ERROR: Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
       return ret;
     }
 
diff --git a/configs/stm32f4discovery/src/stm32_spi.c b/configs/stm32f4discovery/src/stm32_spi.c
index 45441059bd..9ff8a256d1 100644
--- a/configs/stm32f4discovery/src/stm32_spi.c
+++ b/configs/stm32f4discovery/src/stm32_spi.c
@@ -61,26 +61,16 @@
 
 /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
-#undef SPI_DEBUG   /* Define to enable debug */
-#undef SPI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SPI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
@@ -144,7 +134,7 @@ void weak_function stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
 #if defined(CONFIG_LCD_UG2864AMBAG01) || defined(CONFIG_LCD_UG2864HSWEG01) || \
     defined(CONFIG_LCD_SSD1351)
@@ -168,7 +158,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
 #if defined(CONFIG_MAX31855)
   if (devid == SPIDEV_TEMPERATURE)
@@ -193,7 +183,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
diff --git a/configs/stm32f4discovery/src/stm32_ssd1351.c b/configs/stm32f4discovery/src/stm32_ssd1351.c
index 261ee51c73..c7996ff08b 100644
--- a/configs/stm32f4discovery/src/stm32_ssd1351.c
+++ b/configs/stm32f4discovery/src/stm32_ssd1351.c
@@ -75,9 +75,11 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcderr(format, ...)  err(format, ##__VA_ARGS__)
+#  define lcdwarn(format, ...) warn(format, ##__VA_ARGS__)
 #  define lcdinfo(format, ...) info(format, ##__VA_ARGS__)
 #else
 #  define lcderr(x...)
+#  define lcdwarn(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -114,7 +116,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
   spi = stm32_spibus_initialize(1);
   if (spi == NULL)
     {
-      lcderr("Failed to initialize SPI port 1\n");
+      lcderr("ERROR: Failed to initialize SPI port 1\n");
     }
   else
     {
@@ -123,7 +125,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
       dev = ssd1351_initialize(spi, devno);
       if (dev == NULL)
         {
-          lcderr("Failed to bind SPI port 1 to OLED %d: %d\n", devno);
+          lcderr("ERROR: Failed to bind SPI port 1 to OLED %d: %d\n", devno);
         }
      else
         {
diff --git a/configs/stm32f4discovery/src/stm32_ug2864ambag01.c b/configs/stm32f4discovery/src/stm32_ug2864ambag01.c
index 73f8f9920d..8395d3830c 100644
--- a/configs/stm32f4discovery/src/stm32_ug2864ambag01.c
+++ b/configs/stm32f4discovery/src/stm32_ug2864ambag01.c
@@ -97,9 +97,11 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcderr(format, ...)   err(format, ##__VA_ARGS__)
+#  define lcdwarn(format, ...)  warn(format, ##__VA_ARGS__)
 #  define lcdinfo(format, ...)  info(format, ##__VA_ARGS__)
 #else
 #  define lcderr(x...)
+#  define lcdwarn(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -136,7 +138,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
   spi = stm32_spibus_initialize(1);
   if (!spi)
     {
-      lcderr("Failed to initialize SPI port 1\n");
+      lcderr("ERROR: Failed to initialize SPI port 1\n");
     }
   else
     {
@@ -145,7 +147,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
       dev = ug2864ambag01_initialize(spi, devno);
       if (!dev)
         {
-          lcderr("Failed to bind SPI port 1 to OLED %d: %d\n", devno);
+          lcderr("ERROR: Failed to bind SPI port 1 to OLED %d: %d\n", devno);
         }
      else
         {
diff --git a/configs/stm32f4discovery/src/stm32_ug2864hsweg01.c b/configs/stm32f4discovery/src/stm32_ug2864hsweg01.c
index 42b04ce7e6..b2711d89d0 100644
--- a/configs/stm32f4discovery/src/stm32_ug2864hsweg01.c
+++ b/configs/stm32f4discovery/src/stm32_ug2864hsweg01.c
@@ -97,9 +97,11 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcderr(format, ...)   err(format, ##__VA_ARGS__)
+#  define lcdwarn(format, ...)  warn(format, ##__VA_ARGS__)
 #  define lcdinfo(format, ...)  info(format, ##__VA_ARGS__)
 #else
 #  define lcderr(x...)
+#  define lcdwarn(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -136,7 +138,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
   spi = stm32_spibus_initialize(1);
   if (!spi)
     {
-      lcderr("Failed to initialize SPI port 1\n");
+      lcderr("ERROR: Failed to initialize SPI port 1\n");
     }
   else
     {
@@ -145,7 +147,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
       dev = ssd1306_initialize(spi, devno);
       if (!dev)
         {
-          lcderr("Failed to bind SPI port 1 to OLED %d: %d\n", devno);
+          lcderr("ERROR: Failed to bind SPI port 1 to OLED %d: %d\n", devno);
         }
      else
         {
diff --git a/configs/stm32f4discovery/src/stm32_usb.c b/configs/stm32f4discovery/src/stm32_usb.c
index 457f9d9bf1..b77b34c72e 100644
--- a/configs/stm32f4discovery/src/stm32_usb.c
+++ b/configs/stm32f4discovery/src/stm32_usb.c
@@ -213,7 +213,7 @@ int stm32_usbhost_initialize(void)
   ret = usbhost_kbdinit();
   if (ret != OK)
     {
-      uerr("Failed to register the HID keyboard class\n");
+      uerr("ERROR: Failed to register the HID keyboard class\n");
     }
 #endif
 
@@ -223,7 +223,7 @@ int stm32_usbhost_initialize(void)
   ret = usbhost_mouse_init();
   if (ret != OK)
     {
-      uerr("Failed to register the HID mouse class\n");
+      uerr("ERROR: Failed to register the HID mouse class\n");
     }
 #endif
 
@@ -329,7 +329,7 @@ xcpt_t stm32_setup_overcurrent(xcpt_t handler)
 #ifdef CONFIG_USBDEV
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ullerr("resume: %d\n", resume);
+  ullinfo("resume: %d\n", resume);
 }
 #endif
 
diff --git a/configs/stm32f746g-disco/src/stm32_spi.c b/configs/stm32f746g-disco/src/stm32_spi.c
index f52f454ae3..54495266bb 100644
--- a/configs/stm32f746g-disco/src/stm32_spi.c
+++ b/configs/stm32f746g-disco/src/stm32_spi.c
@@ -63,25 +63,14 @@
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Data
- ************************************************************************************/
-
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
@@ -126,7 +115,7 @@ void weak_function stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32F7_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -138,7 +127,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32F7_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -150,7 +139,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32F7_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -162,7 +151,7 @@ uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32F7_SPI4
 void stm32_spi4select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -174,7 +163,7 @@ uint8_t stm32_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32F7_SPI5
 void stm32_spi5select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi5status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
diff --git a/configs/stm32l476vg-disco/src/stm32_spi.c b/configs/stm32l476vg-disco/src/stm32_spi.c
index 506bd9f1e4..4de5480adf 100644
--- a/configs/stm32l476vg-disco/src/stm32_spi.c
+++ b/configs/stm32l476vg-disco/src/stm32_spi.c
@@ -68,13 +68,11 @@
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -113,7 +111,7 @@ void weak_function stm32_spiinitialize(void)
   g_spi1 = up_spiinitialize(1);
   if (!g_spi1)
     {
-      spierr("[boot] FAILED to initialize SPI port 1\n");
+      spierr("ERROR: [boot] FAILED to initialize SPI port 1\n");
     }
 
 #ifdef CONFIG_WL_CC3000
@@ -168,7 +166,7 @@ void weak_function stm32_spiinitialize(void)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
 #ifdef CONFIG_WL_CC3000
   if (devid == SPIDEV_WIRELESS)
@@ -194,7 +192,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
 #ifdef CONFIG_WL_CC3000
   if (devid == SPIDEV_WIRELESS)
@@ -213,7 +211,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
diff --git a/configs/stm32ldiscovery/src/stm32_pwm.c b/configs/stm32ldiscovery/src/stm32_pwm.c
index 8bf395e297..9285c2a821 100644
--- a/configs/stm32ldiscovery/src/stm32_pwm.c
+++ b/configs/stm32ldiscovery/src/stm32_pwm.c
@@ -120,7 +120,7 @@ int board_pwm_setup(void)
       pwm = stm32_pwminitialize(STM32F3DISCOVERY_PWMTIMER);
       if (!pwm)
         {
-          err("Failed to get the STM32 PWM lower half\n");
+          err("ERROR: Failed to get the STM32 PWM lower half\n");
           return -ENODEV;
         }
 
@@ -129,7 +129,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          aerr("pwm_register failed: %d\n", ret);
+          aerr("ERROR: pwm_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/stm32ldiscovery/src/stm32_qencoder.c b/configs/stm32ldiscovery/src/stm32_qencoder.c
index ca38ecb56d..ebd78514aa 100644
--- a/configs/stm32ldiscovery/src/stm32_qencoder.c
+++ b/configs/stm32ldiscovery/src/stm32_qencoder.c
@@ -118,10 +118,6 @@
 
 #ifdef HAVE_QENCODER
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
@@ -150,7 +146,7 @@ int qe_devinit(void)
       ret = stm32_qeinitialize("/dev/qe0", TIMID);
       if (ret < 0)
         {
-          snerr("stm32_qeinitialize failed: %d\n", ret);
+          snerr("ERROR: stm32_qeinitialize failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/stm32ldiscovery/src/stm32_spi.c b/configs/stm32ldiscovery/src/stm32_spi.c
index 3d86fcea1f..d4a82df275 100644
--- a/configs/stm32ldiscovery/src/stm32_spi.c
+++ b/configs/stm32ldiscovery/src/stm32_spi.c
@@ -61,26 +61,16 @@
 
 /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
-#undef SPI_DEBUG   /* Define to enable debug */
-#undef SPI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SPI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
@@ -130,7 +120,7 @@ void weak_function stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
   stm32_gpiowrite(GPIO_MEMS_CS, !selected);
 }
@@ -144,7 +134,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -156,7 +146,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
diff --git a/configs/teensy-2.0/src/at90usb_spi.c b/configs/teensy-2.0/src/at90usb_spi.c
index 6a130d8bbb..ca651a189c 100644
--- a/configs/teensy-2.0/src/at90usb_spi.c
+++ b/configs/teensy-2.0/src/at90usb_spi.c
@@ -88,21 +88,14 @@
 
 #ifdef CONFIG_SPI_DEBUG
 #  define ssperr  llerr
-#  ifdef CONFIG_SPI_VERBOSE
-#    define sspinfo llerr
-#  else
-#    define sspinfo(x...)
-#  endif
+#  define sspwarn llwarn
+#  define sspinfo llinfo
 #else
-#  undef CONFIG_SPI_VERBOSE
 #  define ssperr(x...)
+#  define sspwarn(x...)
 #  define sspinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
@@ -161,7 +154,7 @@ void weak_function at90usb_spidev_initialize(void)
 
 void  avr_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  sspinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
   /* Assert/de-assert the CS pin to the card */
 
@@ -194,7 +187,7 @@ uint8_t avr_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
       ret |= SPI_STATUS_WRPROTECTED;
     }
 
-  ssperr("Returning %02x\n", ret);
+  sspinfo("Returning %02x\n", ret);
   return ret;
 }
 
diff --git a/configs/teensy-3.x/src/k20_pwm.c b/configs/teensy-3.x/src/k20_pwm.c
index 281cea3af9..97658c9e2b 100644
--- a/configs/teensy-3.x/src/k20_pwm.c
+++ b/configs/teensy-3.x/src/k20_pwm.c
@@ -99,7 +99,7 @@ int board_pwm_setup(void)
       pwm = kinetis_pwminitialize(0);
       if (!pwm)
         {
-          aerr("Failed to get the KL20 PWM lower half\n");
+          aerr("ERROR: Failed to get the KL20 PWM lower half\n");
           return -ENODEV;
         }
 
@@ -108,7 +108,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          aerr("pwm_register failed: %d\n", ret);
+          aerr("ERROR: pwm_register failed: %d\n", ret);
           return ret;
         }
 
@@ -119,7 +119,7 @@ int board_pwm_setup(void)
       pwm = kinetis_pwminitialize(1);
       if (!pwm)
         {
-          aerr("Failed to get the KL20 PWM lower half\n");
+          aerr("ERROR: Failed to get the KL20 PWM lower half\n");
           return -ENODEV;
         }
 
@@ -128,7 +128,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm1", pwm);
       if (ret < 0)
         {
-          aerr("pwm_register failed: %d\n", ret);
+          aerr("ERROR: pwm_register failed: %d\n", ret);
           return ret;
         }
 
@@ -139,7 +139,7 @@ int board_pwm_setup(void)
       pwm = kinetis_pwminitialize(2);
       if (!pwm)
         {
-          aerr("Failed to get the KL20 PWM lower half\n");
+          aerr("ERROR: Failed to get the KL20 PWM lower half\n");
           return -ENODEV;
         }
 
@@ -148,7 +148,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm2", pwm);
       if (ret < 0)
         {
-          aerr("pwm_register failed: %d\n", ret);
+          aerr("ERROR: pwm_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/teensy-3.x/src/k20_spi.c b/configs/teensy-3.x/src/k20_spi.c
index 73cf617965..be31459de8 100644
--- a/configs/teensy-3.x/src/k20_spi.c
+++ b/configs/teensy-3.x/src/k20_spi.c
@@ -61,21 +61,14 @@
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef CONFIG_DEBUG_SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef CONFIG_DEBUG_SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
@@ -121,7 +114,7 @@ void weak_function kinetis_spidev_initialize(void)
 #ifdef CONFIG_KINETIS_SPI1
 void kinetis_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 # warning "Missing logic"
 }
 
@@ -135,7 +128,7 @@ uint8_t kinetis_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_KINETIS_SPI2
 void kinetis_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 # warning "Missing logic"
 }
 
@@ -149,7 +142,7 @@ uint8_t kinetis_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_KINETIS_SPI3
 void kinetis_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 # warning "Missing logic"
 }
 
diff --git a/configs/teensy-3.x/src/k20_usbdev.c b/configs/teensy-3.x/src/k20_usbdev.c
index 7df3d8d990..ae8e2976d6 100644
--- a/configs/teensy-3.x/src/k20_usbdev.c
+++ b/configs/teensy-3.x/src/k20_usbdev.c
@@ -136,6 +136,6 @@ int kinetis_usbpullup(FAR struct usbdev_s *dev, bool enable)
 
 void kinetis_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ullerr("resume: %d\n", resume);
+  ullinfo("resume: %d\n", resume);
 #warning "Missing logic"
 }
diff --git a/configs/teensy-lc/src/kl_pwm.c b/configs/teensy-lc/src/kl_pwm.c
index 40d5e87e6d..91623d9e98 100644
--- a/configs/teensy-lc/src/kl_pwm.c
+++ b/configs/teensy-lc/src/kl_pwm.c
@@ -98,7 +98,7 @@ int board_pwm_setup(void)
       pwm = kl_pwminitialize(0);
       if (!pwm)
         {
-          aerr("Failed to get the KL25 PWM lower half\n");
+          aerr("ERROR: Failed to get the KL25 PWM lower half\n");
           return -ENODEV;
         }
 
@@ -107,7 +107,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          aerr("pwm_register failed: %d\n", ret);
+          aerr("ERROR: pwm_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/tm4c123g-launchpad/src/tm4c_autoleds.c b/configs/tm4c123g-launchpad/src/tm4c_autoleds.c
index 367569b67f..a7b4a76242 100644
--- a/configs/tm4c123g-launchpad/src/tm4c_autoleds.c
+++ b/configs/tm4c123g-launchpad/src/tm4c_autoleds.c
@@ -103,9 +103,11 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define lederr  llerr
+#  define ledwarn llwarn
 #  define ledinfo llinfo
 #else
 #  define lederr(x...)
+#  define ledwarn(x...)
 #  define ledinfo(x...)
 #endif
 
@@ -117,14 +119,6 @@
 #  define led_dumpgpio(m)
 #endif
 
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -140,7 +134,7 @@
 #ifdef CONFIG_ARCH_LEDS
 void tm4c_led_initialize(void)
 {
-  lederr("Initializing\n");
+  ledinfo("Initializing\n");
 
   /* Configure Port E, Bit 1 as an output, initial value=OFF */
 
diff --git a/configs/tm4c123g-launchpad/src/tm4c_ssi.c b/configs/tm4c123g-launchpad/src/tm4c_ssi.c
index a884c89534..c0e39cc3a1 100644
--- a/configs/tm4c123g-launchpad/src/tm4c_ssi.c
+++ b/configs/tm4c123g-launchpad/src/tm4c_ssi.c
@@ -62,9 +62,13 @@
 /* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define ssierr llerr
+#  define ssierr  llerr
+#  define ssiwarn llwarn
+#  define ssiinfo llinfo
 #else
 #  define ssierr(x...)
+#  define ssiwarn(x...)
+#  define ssiinfo(x...)
 #endif
 
 /* Dump GPIO registers */
@@ -118,14 +122,14 @@ void weak_function tm4c_ssidev_initialize(void)
 
 void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  ssierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  ssiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   ssi_dumpgpio("tiva_ssiselect() Entry");
   ssi_dumpgpio("tiva_ssiselect() Exit");
 }
 
 uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  ssierr("Returning SPI_STATUS_PRESENT\n");
+  ssiinfo("Returning SPI_STATUS_PRESENT\n");
   return SPI_STATUS_PRESENT;
 }
 
diff --git a/configs/tm4c1294-launchpad/src/tm4c_ethernet.c b/configs/tm4c1294-launchpad/src/tm4c_ethernet.c
index 642b8ac0e6..2460d0f04e 100644
--- a/configs/tm4c1294-launchpad/src/tm4c_ethernet.c
+++ b/configs/tm4c1294-launchpad/src/tm4c_ethernet.c
@@ -84,7 +84,7 @@ void tiva_ethernetmac(struct ether_addr *ethaddr)
   user0 = getreg32(TIVA_FLASH_USERREG0);
   user1 = getreg32(TIVA_FLASH_USERREG1);
 
-  nllerr("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
+  nllinfo("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
   DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff);
 
   /* Re-format that MAC address the way that the network expects to see it */
diff --git a/configs/twr-k60n512/src/k60_spi.c b/configs/twr-k60n512/src/k60_spi.c
index 4afe34fe97..79e9e402bc 100644
--- a/configs/twr-k60n512/src/k60_spi.c
+++ b/configs/twr-k60n512/src/k60_spi.c
@@ -61,21 +61,14 @@
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef CONFIG_DEBUG_SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef CONFIG_DEBUG_SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
@@ -121,7 +114,7 @@ void weak_function kinetis_spidev_initialize(void)
 #ifdef CONFIG_KINETIS_SPI1
 void kinetis_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 # warning "Missing logic"
 }
 
@@ -135,7 +128,7 @@ uint8_t kinetis_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_KINETIS_SPI2
 void kinetis_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 # warning "Missing logic"
 }
 
@@ -149,7 +142,7 @@ uint8_t kinetis_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_KINETIS_SPI3
 void kinetis_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 # warning "Missing logic"
 }
 
diff --git a/configs/twr-k60n512/src/k60_usbdev.c b/configs/twr-k60n512/src/k60_usbdev.c
index c9a7514ad9..7944ccdbc6 100644
--- a/configs/twr-k60n512/src/k60_usbdev.c
+++ b/configs/twr-k60n512/src/k60_usbdev.c
@@ -108,7 +108,6 @@ int kinetis_usbpullup(FAR struct usbdev_s *dev, bool enable)
 
 void kinetis_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ullerr("resume: %d\n", resume);
+  ullinfo("resume: %d\n", resume);
 #warning "Missing logic"
 }
-
diff --git a/configs/u-blox-c027/src/lpc17_adc.c b/configs/u-blox-c027/src/lpc17_adc.c
index e9244045d3..bc876a8d53 100644
--- a/configs/u-blox-c027/src/lpc17_adc.c
+++ b/configs/u-blox-c027/src/lpc17_adc.c
@@ -98,7 +98,7 @@ int board_adc_setup(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          aerr("adc_register failed: %d\n", ret);
+          aerr("ERROR: adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/u-blox-c027/src/lpc17_dac.c b/configs/u-blox-c027/src/lpc17_dac.c
index f1dd0887ac..c1924c2f30 100644
--- a/configs/u-blox-c027/src/lpc17_dac.c
+++ b/configs/u-blox-c027/src/lpc17_dac.c
@@ -92,7 +92,7 @@ int dac_devinit(void)
       ret = dac_register("/dev/dac0", dac);
       if (ret < 0)
         {
-          aerr("dac_register failed: %d\n", ret);
+          aerr("ERROR: dac_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/u-blox-c027/src/lpc17_pwm.c b/configs/u-blox-c027/src/lpc17_pwm.c
index 93c22a8ceb..435acf3473 100644
--- a/configs/u-blox-c027/src/lpc17_pwm.c
+++ b/configs/u-blox-c027/src/lpc17_pwm.c
@@ -64,10 +64,6 @@ FAR struct pwm_lowerhalf_s *lpc17_pwminitialize(int timer);
 FAR struct pwm_lowerhalf_s *lpc17_mcpwminitialize(int timer);
 FAR struct pwm_lowerhalf_s *lpc17_timerinitialize(int timer);
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
@@ -98,7 +94,7 @@ int board_pwm_setup(void)
       pwm = lpc17_pwminitialize(0);
       if (!pwm)
         {
-          aerr("Failed to get the LPC17XX PWM lower half\n");
+          aerr("ERROR: Failed to get the LPC17XX PWM lower half\n");
           return -ENODEV;
         }
 
@@ -107,14 +103,14 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          aerr("pwm_register failed: %d\n", ret);
+          aerr("ERROR: pwm_register failed: %d\n", ret);
           return ret;
         }
 
       mcpwm = lpc17_mcpwminitialize(0);
       if (!mcpwm)
         {
-          aerr("Failed to get the LPC17XX MOTOR PWM lower half\n");
+          aerr("ERROR: Failed to get the LPC17XX MOTOR PWM lower half\n");
           return -ENODEV;
         }
 
@@ -123,14 +119,14 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/mcpwm0", mcpwm);
       if (ret < 0)
         {
-          aerr("mcpwm_register failed: %d\n", ret);
+          aerr("ERROR: mcpwm_register failed: %d\n", ret);
           return ret;
         }
 
       timer = lpc17_timerinitialize(0);
       if (!timer)
         {
-          aerr("Failed to get the LPC17XX TIMER lower half\n");
+          aerr("ERROR: Failed to get the LPC17XX TIMER lower half\n");
           return -ENODEV;
         }
 
@@ -139,7 +135,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/timer0", timer);
       if (ret < 0)
         {
-          aerr("timer_register failed: %d\n", ret);
+          aerr("ERROR: timer_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/u-blox-c027/src/lpc17_ssp.c b/configs/u-blox-c027/src/lpc17_ssp.c
index 722ec61f4a..dd8bcb3d0d 100644
--- a/configs/u-blox-c027/src/lpc17_ssp.c
+++ b/configs/u-blox-c027/src/lpc17_ssp.c
@@ -60,19 +60,13 @@
 
 /* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
-#undef SSP_DEBUG   /* Define to enable debug */
-#undef SSP_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SSP_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define ssperr  llerr
-#  ifdef SSP_VERBOSE
-#    define sspinfo llerr
-#  else
-#    define sspinfo(x...)
-#  endif
+#  define sspwarn llwarn
+#  define sspinfo llinfo
 #else
-#  undef SSP_VERBOSE
 #  define ssperr(x...)
+#  define sspwarn(x...)
 #  define sspinfo(x...)
 #endif
 
@@ -140,7 +134,7 @@ void weak_function c027_sspdev_initialize(void)
 #ifdef CONFIG_LPC17_SSP0
 void  lpc17_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  sspinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   ssp_dumpgpio("lpc17_ssp0select() Entry");
 
 #warning "Assert CS here (false)"
@@ -150,7 +144,7 @@ void  lpc17_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel
 
 uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  ssperr("Returning SPI_STATUS_PRESENT\n");
+  sspinfo("Returning SPI_STATUS_PRESENT\n");
   return SPI_STATUS_PRESENT;
 }
 #endif
@@ -158,7 +152,7 @@ uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_LPC17_SSP1
 void  lpc17_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  sspinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   ssp_dumpgpio("lpc17_ssp1select() Entry");
 
   if (devid == SPIDEV_MMCSD)
@@ -186,12 +180,12 @@ uint8_t lpc17_ssp1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 
       if (lpc17_gpioread(C027_SD_CD) == 0)
         {
-          ssperr("Returning SPI_STATUS_PRESENT\n");
+          sspinfo("Returning SPI_STATUS_PRESENT\n");
           return SPI_STATUS_PRESENT;
         }
     }
 
-  ssperr("Returning zero\n");
+  sspinfo("Returning zero\n");
   return 0;
 }
 #endif
diff --git a/configs/viewtool-stm32f107/src/stm32_mmcsd.c b/configs/viewtool-stm32f107/src/stm32_mmcsd.c
index 9b9aa9030f..d40b86899c 100644
--- a/configs/viewtool-stm32f107/src/stm32_mmcsd.c
+++ b/configs/viewtool-stm32f107/src/stm32_mmcsd.c
@@ -100,7 +100,7 @@ int stm32_sdinitialize(int minor)
   sdio = sdio_initialize(STM32_MMCSDSLOTNO);
   if (!sdio)
     {
-      ferr("Failed to initialize SDIO slot %d\n", STM32_MMCSDSLOTNO);
+      ferr("ERROR: Failed to initialize SDIO slot %d\n", STM32_MMCSDSLOTNO);
       return -ENODEV;
     }
 
@@ -111,8 +111,8 @@ int stm32_sdinitialize(int minor)
   ret = mmcsd_slotinitialize(minor, sdio);
   if (ret != OK)
     {
-      ferr("Failed to bind SDIO slot %d to the MMC/SD driver, minor=%d\n",
-              STM32_MMCSDSLOTNO, minor);
+      ferr("ERROR: Failed to bind SDIO slot %d to the MMC/SD driver, minor=%d\n",
+           STM32_MMCSDSLOTNO, minor);
     }
 
   finfo("Bound SDIO slot %d to the MMC/SD driver, minor=%d\n",
diff --git a/configs/viewtool-stm32f107/src/stm32_mpl115a.c b/configs/viewtool-stm32f107/src/stm32_mpl115a.c
index abd27ca3d2..487f7392f4 100644
--- a/configs/viewtool-stm32f107/src/stm32_mpl115a.c
+++ b/configs/viewtool-stm32f107/src/stm32_mpl115a.c
@@ -92,7 +92,7 @@ int stm32_mpl115ainitialize(FAR const char *devpath)
   ret = mpl115a_register(devpath, spi);
   if (ret < 0)
     {
-      snerr("Error registering MPL115A\n");
+      snerr("ERROR: Error registering MPL115A\n");
     }
 
   return ret;
diff --git a/configs/viewtool-stm32f107/src/stm32_spi.c b/configs/viewtool-stm32f107/src/stm32_spi.c
index 5acc91c134..f27c43bc35 100644
--- a/configs/viewtool-stm32f107/src/stm32_spi.c
+++ b/configs/viewtool-stm32f107/src/stm32_spi.c
@@ -57,28 +57,18 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
+/* Enables debug output from this file */
 
-#undef SPI_DEBUG   /* Define to enable debug */
-#undef SPI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SPI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
@@ -141,7 +131,7 @@ void weak_function stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -153,7 +143,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
 #ifdef CONFIG_INPUT_ADS7843E
   /* Select/de-select the touchscreen */
@@ -174,7 +164,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
diff --git a/configs/viewtool-stm32f107/src/stm32_ssd1289.c b/configs/viewtool-stm32f107/src/stm32_ssd1289.c
index 421ed2abd9..a19b0a5695 100644
--- a/configs/viewtool-stm32f107/src/stm32_ssd1289.c
+++ b/configs/viewtool-stm32f107/src/stm32_ssd1289.c
@@ -105,9 +105,11 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcderr         err
+#  define lcdwarn        warn
 #  define lcdinfo        info
 #else
 #  define lcderr(x...)
+#  define lcdwarn(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -425,26 +427,26 @@ static void init_lcd_backlight(void)
 
   /* Dump timer3 registers */
 
-  lcderr("APB1ENR: %08x\n", getreg32(STM32_RCC_APB1ENR));
-  lcderr("CR1:     %04x\n", getreg32(STM32_TIM3_CR1));
-  lcderr("CR2:     %04x\n", getreg32(STM32_TIM3_CR2));
-  lcderr("SMCR:    %04x\n", getreg32(STM32_TIM3_SMCR));
-  lcderr("DIER:    %04x\n", getreg32(STM32_TIM3_DIER));
-  lcderr("SR:      %04x\n", getreg32(STM32_TIM3_SR));
-  lcderr("EGR:     %04x\n", getreg32(STM32_TIM3_EGR));
-  lcderr("CCMR1:   %04x\n", getreg32(STM32_TIM3_CCMR1));
-  lcderr("CCMR2:   %04x\n", getreg32(STM32_TIM3_CCMR2));
-  lcderr("CCER:    %04x\n", getreg32(STM32_TIM3_CCER));
-  lcderr("CNT:     %04x\n", getreg32(STM32_TIM3_CNT));
-  lcderr("PSC:     %04x\n", getreg32(STM32_TIM3_PSC));
-  lcderr("ARR:     %04x\n", getreg32(STM32_TIM3_ARR));
-  lcderr("CCR1:    %04x\n", getreg32(STM32_TIM3_CCR1));
-  lcderr("CCR2:    %04x\n", getreg32(STM32_TIM3_CCR2));
-  lcderr("CCR3:    %04x\n", getreg32(STM32_TIM3_CCR3));
-  lcderr("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
-  lcderr("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
-  lcderr("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
-  lcderr("DMAR:    %04x\n", getreg32(STM32_TIM3_DMAR));
+  lcdinfo("APB1ENR: %08x\n", getreg32(STM32_RCC_APB1ENR));
+  lcdinfo("CR1:     %04x\n", getreg32(STM32_TIM3_CR1));
+  lcdinfo("CR2:     %04x\n", getreg32(STM32_TIM3_CR2));
+  lcdinfo("SMCR:    %04x\n", getreg32(STM32_TIM3_SMCR));
+  lcdinfo("DIER:    %04x\n", getreg32(STM32_TIM3_DIER));
+  lcdinfo("SR:      %04x\n", getreg32(STM32_TIM3_SR));
+  lcdinfo("EGR:     %04x\n", getreg32(STM32_TIM3_EGR));
+  lcdinfo("CCMR1:   %04x\n", getreg32(STM32_TIM3_CCMR1));
+  lcdinfo("CCMR2:   %04x\n", getreg32(STM32_TIM3_CCMR2));
+  lcdinfo("CCER:    %04x\n", getreg32(STM32_TIM3_CCER));
+  lcdinfo("CNT:     %04x\n", getreg32(STM32_TIM3_CNT));
+  lcdinfo("PSC:     %04x\n", getreg32(STM32_TIM3_PSC));
+  lcdinfo("ARR:     %04x\n", getreg32(STM32_TIM3_ARR));
+  lcdinfo("CCR1:    %04x\n", getreg32(STM32_TIM3_CCR1));
+  lcdinfo("CCR2:    %04x\n", getreg32(STM32_TIM3_CCR2));
+  lcdinfo("CCR3:    %04x\n", getreg32(STM32_TIM3_CCR3));
+  lcdinfo("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
+  lcdinfo("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
+  lcdinfo("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
+  lcdinfo("DMAR:    %04x\n", getreg32(STM32_TIM3_DMAR));
 }
 
 /************************************************************************************
diff --git a/configs/viewtool-stm32f107/src/stm32_touchscreen.c b/configs/viewtool-stm32f107/src/stm32_touchscreen.c
index 08399b2903..6abba71e5c 100644
--- a/configs/viewtool-stm32f107/src/stm32_touchscreen.c
+++ b/configs/viewtool-stm32f107/src/stm32_touchscreen.c
@@ -260,7 +260,7 @@ int board_tsc_setup(int minor)
   static bool initialized = false;
   int ret;
 
-  ierr("minor %d\n", minor);
+  iinfo("minor %d\n", minor);
   DEBUGASSERT(minor == 0);
 
   /* Have we already initialized?  Since we never uninitialize we must prevent
@@ -280,7 +280,7 @@ int board_tsc_setup(int minor)
       dev = stm32_spibus_initialize(TSC_DEVNUM);
       if (!dev)
         {
-          ierr("Failed to initialize SPI%d\n", TSC_DEVNUM);
+          ierr("ERROR: Failed to initialize SPI%d\n", TSC_DEVNUM);
           return -ENODEV;
         }
 
@@ -289,7 +289,7 @@ int board_tsc_setup(int minor)
       ret = ads7843e_register(dev, &g_tscinfo.config, CONFIG_ADS7843E_DEVMINOR);
       if (ret < 0)
         {
-          ierr("Failed to register touchscreen device\n");
+          ierr("ERROR: Failed to register touchscreen device\n");
           /* up_spiuninitialize(dev); */
           return -ENODEV;
         }
diff --git a/configs/viewtool-stm32f107/src/stm32_usbdev.c b/configs/viewtool-stm32f107/src/stm32_usbdev.c
index 54235c462a..05d91fb36c 100644
--- a/configs/viewtool-stm32f107/src/stm32_usbdev.c
+++ b/configs/viewtool-stm32f107/src/stm32_usbdev.c
@@ -118,7 +118,7 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable)
 
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ullerr("resume: %d\n", resume);
+  ullinfo("resume: %d\n", resume);
 }
 
 #endif /* CONFIG_STM32_OTGFS || CONFIG_STM32_USB*/
diff --git a/configs/zkit-arm-1769/src/lpc17_adc.c b/configs/zkit-arm-1769/src/lpc17_adc.c
index 0d2bcee96f..3d3628ea9c 100644
--- a/configs/zkit-arm-1769/src/lpc17_adc.c
+++ b/configs/zkit-arm-1769/src/lpc17_adc.c
@@ -99,7 +99,7 @@ int board_adc_setup(void)
       adc = lpc17_adcinitialize();
       if (adc == NULL)
         {
-          aerr("ERROR: Failed to get ADC interface\n");
+          aerr("ERROR: ERROR: Failed to get ADC interface\n");
           return -ENODEV;
         }
 
@@ -108,7 +108,7 @@ int board_adc_setup(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          aerr("adc_register failed: %d\n", ret);
+          aerr("ERROR: adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/zkit-arm-1769/src/lpc17_dac.c b/configs/zkit-arm-1769/src/lpc17_dac.c
index 71816af9a4..70616d39a4 100644
--- a/configs/zkit-arm-1769/src/lpc17_dac.c
+++ b/configs/zkit-arm-1769/src/lpc17_dac.c
@@ -87,7 +87,7 @@ int dac_devinit(void)
     ret = dac_register("/dev/dac0", dac);
     if (ret < 0)
       {
-        aerr("dac_register failed: %d\n", ret);
+        aerr("ERROR: dac_register failed: %d\n", ret);
         return ret;
       }
 
diff --git a/configs/zkit-arm-1769/src/lpc17_lcd.c b/configs/zkit-arm-1769/src/lpc17_lcd.c
index e020846736..b04405f34c 100644
--- a/configs/zkit-arm-1769/src/lpc17_lcd.c
+++ b/configs/zkit-arm-1769/src/lpc17_lcd.c
@@ -95,10 +95,6 @@
 FAR struct spi_dev_s *g_spidev;
 FAR struct lcd_dev_s *g_lcddev;
 
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -118,7 +114,7 @@ int board_lcd_initialize(void)
   g_spidev = lpc17_sspbus_initialize(0);
   if (!g_spidev)
     {
-      gllerr("Failed to initialize SSP port 0\n");
+      gllerr("ERROR: Failed to initialize SSP port 0\n");
       return 0;
     }
 
@@ -137,7 +133,7 @@ FAR struct lcd_dev_s *board_lcd_getdev(int lcddev)
   g_lcddev = st7567_initialize(g_spidev, lcddev);
   if (!g_lcddev)
     {
-      gllerr("Failed to bind SSI port 0 to OLCD %d: %d\n", lcddev);
+      gllerr("ERROR: Failed to bind SSI port 0 to OLCD %d: %d\n", lcddev);
     }
   else
     {
diff --git a/configs/zkit-arm-1769/src/lpc17_spi.c b/configs/zkit-arm-1769/src/lpc17_spi.c
index f7bef7c2cc..926298699c 100644
--- a/configs/zkit-arm-1769/src/lpc17_spi.c
+++ b/configs/zkit-arm-1769/src/lpc17_spi.c
@@ -67,13 +67,11 @@
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -143,7 +141,7 @@ void weak_function zkit_spidev_initialize(void)
 
 void  lpc17_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   spi_dumpgpio("lpc17_spiselect() Entry");
 
   if (devid == SPIDEV_MMCSD)
@@ -164,12 +162,12 @@ uint8_t lpc17_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 
       if (lpc17_gpioread(ZKITARM_SD_CD) == 0)
         {
-          spierr("Returning SPI_STATUS_PRESENT\n");
+          spiinfo("Returning SPI_STATUS_PRESENT\n");
           return SPI_STATUS_PRESENT;
         }
     }
 
-  spierr("Returning zero\n");
+  spiinfo("Returning zero\n");
   return 0;
 }
 
diff --git a/configs/zkit-arm-1769/src/lpc17_ssp.c b/configs/zkit-arm-1769/src/lpc17_ssp.c
index 16288dcce3..cf55667df3 100644
--- a/configs/zkit-arm-1769/src/lpc17_ssp.c
+++ b/configs/zkit-arm-1769/src/lpc17_ssp.c
@@ -67,13 +67,11 @@
 
 #ifdef CONFIG_DEBUG_SPI
 #  define ssperr  llerr
-#  ifdef CONFIG_DEBUG_INFO
-#    define sspinfo llerr
-#  else
-#    define sspinfo(x...)
-#  endif
+#  define sspwarn llwarn
+#  define sspinfo llinfo
 #else
 #  define ssperr(x...)
+#  define sspwarn(x...)
 #  define sspinfo(x...)
 #endif
 
@@ -146,7 +144,7 @@ void weak_function zkit_sspdev_initialize(void)
 #ifdef CONFIG_LPC17_SSP1
 void  lpc17_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  sspinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   ssp_dumpgpio("lpc17_ssp1select() Entry");
 
 #warning "Assert CS here (false)"
@@ -156,7 +154,7 @@ void  lpc17_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel
 
 uint8_t lpc17_ssp1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  ssperr("Returning SPI_STATUS_PRESENT\n");
+  sspinfo("Returning SPI_STATUS_PRESENT\n");
   return SPI_STATUS_PRESENT;
 }
 
@@ -180,7 +178,7 @@ int weak_function lpc17_ssp1cmddata(FAR struct spi_dev_s *dev,
 #ifdef CONFIG_LPC17_SSP0
 void  lpc17_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  sspinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   ssp_dumpgpio("lpc17_ssp0select() Entry");
 
 #ifdef CONFIG_NX_LCDDRIVER
@@ -199,11 +197,11 @@ uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
   if (devid == SPIDEV_DISPLAY)
     {
-      ssperr("Returning SPI_STATUS_PRESENT\n");
+      sspinfo("Returning SPI_STATUS_PRESENT\n");
       return SPI_STATUS_PRESENT;
     }
 
-  ssperr("Returning zero\n");
+  sspinfo("Returning zero\n");
   return 0;
 }
 
diff --git a/configs/zp214xpa/src/lpc2148_spi1.c b/configs/zp214xpa/src/lpc2148_spi1.c
index 2a7fdd67bb..90cc35953a 100644
--- a/configs/zp214xpa/src/lpc2148_spi1.c
+++ b/configs/zp214xpa/src/lpc2148_spi1.c
@@ -91,13 +91,11 @@
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -247,14 +245,14 @@ static void spi_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel
       /* Enable slave select (low enables) */
 
       putreg32(bit, CS_CLR_REGISTER);
-      spierr("CS asserted: %08x->%08x\n", regval, getreg32(CS_PIN_REGISTER));
+      spiinfo("CS asserted: %08x->%08x\n", regval, getreg32(CS_PIN_REGISTER));
     }
   else
     {
       /* Disable slave select (low enables) */
 
       putreg32(bit, CS_SET_REGISTER);
-      spierr("CS de-asserted: %08x->%08x\n", regval, getreg32(CS_PIN_REGISTER));
+      spiinfo("CS de-asserted: %08x->%08x\n", regval, getreg32(CS_PIN_REGISTER));
 
       /* Wait for the TX FIFO not full indication */
 
@@ -310,7 +308,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
   divisor = (divisor + 1) & ~1;
   putreg8(divisor, LPC214X_SPI1_CPSR);
 
-  spierr("Frequency %d->%d\n", frequency, LPC214X_PCLKFREQ / divisor);
+  spiinfo("Frequency %d->%d\n", frequency, LPC214X_PCLKFREQ / divisor);
   return LPC214X_PCLKFREQ / divisor;
 }
 
@@ -331,7 +329,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
 
 static uint8_t spi_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  spierr("Return 0\n");
+  spiinfo("Return 0\n");
   return 0;
 }
 
@@ -387,14 +385,14 @@ static int spi_cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd
       /* L: the inputs at D0 to D7 are transferred to the command registers */
 
       putreg32(bit, CS_CLR_REGISTER);
-      spierr("Command: %08x->%08x\n", regval, getreg32(CS_PIN_REGISTER));
+      spiinfo("Command: %08x->%08x\n", regval, getreg32(CS_PIN_REGISTER));
     }
   else
     {
       /* H: the inputs at D0 to D7 are treated as display data. */
 
       putreg32(bit, CS_SET_REGISTER);
-      spierr("Data: %08x->%08x\n", regval, getreg32(CS_PIN_REGISTER));
+      spiinfo("Data: %08x->%08x\n", regval, getreg32(CS_PIN_REGISTER));
     }
 
   return OK;
@@ -436,7 +434,7 @@ static uint16_t spi_send(FAR struct spi_dev_s *dev, uint16_t wd)
   /* Get the value from the RX FIFO and return it */
 
   regval = getreg16(LPC214X_SPI1_DR);
-  spierr("%04x->%04x\n", wd, regval);
+  spiinfo("%04x->%04x\n", wd, regval);
   return regval;
 }
 
@@ -466,7 +464,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size
 
   /* Loop while thre are bytes remaining to be sent */
 
-  spierr("nwords: %d\n", nwords);
+  spiinfo("nwords: %d\n", nwords);
   while (nwords > 0)
     {
       /* While the TX FIFO is not full and there are bytes left to send */
@@ -483,7 +481,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size
 
   /* Then discard all card responses until the RX & TX FIFOs are emptied. */
 
-  spierr("discarding\n");
+  spiinfo("discarding\n");
   do
     {
       /* Is there anything in the RX fifo? */
@@ -537,7 +535,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw
 
   /* While there is remaining to be sent (and no synchronization error has occurred) */
 
-  spierr("nwords: %d\n", nwords);
+  spiinfo("nwords: %d\n", nwords);
   while (nwords || rxpending)
     {
       /* Fill the transmit FIFO with 0xff...
@@ -635,9 +633,9 @@ FAR struct spi_dev_s *lpc214x_spibus_initialize(int port)
   regval32 |= getreg32(CS_DIR_REGISTER);
   putreg32(regval32, CS_DIR_REGISTER);
 
-  spierr("CS Pin Config: PINSEL1: %08x PIN: %08x DIR: %08x\n",
-         getreg32(LPC214X_PINSEL1), getreg32(CS_PIN_REGISTER),
-         getreg32(CS_DIR_REGISTER));
+  spiinfo("CS Pin Config: PINSEL1: %08x PIN: %08x DIR: %08x\n",
+          getreg32(LPC214X_PINSEL1), getreg32(CS_PIN_REGISTER),
+          getreg32(CS_DIR_REGISTER));
 
   /* Enable peripheral clocking to SPI1 */
 
diff --git a/configs/zp214xpa/src/lpc2148_ug2864ambag01.c b/configs/zp214xpa/src/lpc2148_ug2864ambag01.c
index 24a6be8a0e..e2e221a925 100644
--- a/configs/zp214xpa/src/lpc2148_ug2864ambag01.c
+++ b/configs/zp214xpa/src/lpc2148_ug2864ambag01.c
@@ -101,9 +101,11 @@
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcderr(format, ...)   err(format, ##__VA_ARGS__)
+#  define lcdwarn(format, ...)  warn(format, ##__VA_ARGS__)
 #  define lcdinfo(format, ...)  info(format, ##__VA_ARGS__)
 #else
 #  define lcderr(x...)
+#  define lcdwarm(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -160,7 +162,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
   spi = lpc214x_spibus_initialize(1);
   if (!spi)
     {
-      lcderr("Failed to initialize SPI port 1\n");
+      lcderr("ERROR: Failed to initialize SPI port 1\n");
     }
   else
     {
@@ -169,7 +171,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
       dev = ug2864ambag01_initialize(spi, devno);
       if (!dev)
         {
-          lcderr("Failed to bind SPI port 1 to OLED %d: %d\n", devno);
+          lcderr("ERROR: Failed to bind SPI port 1 to OLED %d: %d\n", devno);
         }
      else
         {
-- 
GitLab


From eab652bd9a6b0b9a9782d08f31300957f90977cb Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sun, 12 Jun 2016 17:34:42 -0600
Subject: [PATCH 48/91] Update ChangeLog

---
 ChangeLog | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 7cfae89153..88b34ff733 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -11958,3 +11958,50 @@
 	  and the full packet length, need to subtract the size of the link
 	  layer header before making the comparison or we will get false
 	  positives (i.e., the packet is really too small) (2016-06-09)
+	* drivers/mtd: Added driver of IS25xP SPI flash devices.  Based on
+	  sst25xx driver. From Marten Svanfeldt (2016-06-09).
+	* arch/arm/src/kinetis:  Teensy clock fixes.  The High Gain bit in
+	  MCG_C1 was preventing teensy from booting except after a programming
+	  session. The second change doesn't appear to change any functionality,
+	  but complies with restrictions in the k20  family reference manual on
+	  FEI -> FBE clock transiions.  From kfazz (2016-06-09).
+	* arch/arm/src/stm32: Fix timer input clock definitions.  From David
+	  Sidrane (2016-06-09).
+	* configs/: All configurations that have both CONFIG_NSH_LIBRARY=y and
+	  CONFIG_NET=y must now also have CONFIG_NSH_NETINIT=y (2016-06-09).
+	* arch/arm/src/kinetis: Kinetis pwm support, based on kl_pwm driver.
+	  From kfazz (2016-06-09).
+	* net/: In both IPv6 and IPv4 incoming logic:  (1) Should check if the
+	  packet size is large enough before trying to access the packet length
+	  in the IP header.  (2) In the comparison between the IP length and the
+	  full packet length, need to subtract the size of the link layer header
+	  before making the comparison or we will get false positives (i.e., the
+	  packet is really too small) (2016-06-09).
+	* arch/srm/src/stm32: Fix compilation errors in debug mode of
+	  stm32_pwm.c.  From Konstantin Berezenko (2016-06-09).
+	* arch/arm/src/kinetis: Support up to 8 channels per timer.  From kfazz
+	  (2016-06-09).
+	* lib/: crc16: fix error. From  Paul Alexander Patience (2016-06-10).
+	* lib/: Add crc64 support. From  Paul Alexander Patience (2016-06-10).
+	* arch/arm/src/kinetis: Added kl_dumpgpio functionality as
+	  kinetis_pindump. From kfazz (2016-06-10).
+	* arch/arm/src/sam34: Fix some errors in AFEC header file.  From
+	  OrbitalFox (2016-06-10).
+	* arch/arm/include/stm32: Correct the can2 rx irq number for stm32f10xx
+	  chips. From Konstantin Berezenko (2016-06-10).
+	* drivers/include/input: Button upper half driver:  Add definitions
+	  needed for compilation with the poll() interface is not disabled
+	  (2016-06-11).  
+	* Kconfig/, include/debug.h, and many other files:  (1) Debug features
+	  are now enabled separately from debug output. CONFIG_DEBUG is gone.
+	  It is replaced with CONFIG_DEBUG_FEATURES. (2) The macros dbg() and
+	  vdbg() have renamed as err() and info(), respectively. This also
+	  applies to all of the variants as well, lldbg(), llvdbg(), XXdbg(),
+	  XXvdbg(), XXlldbg(), and XXllvdbg().  (3) Add a new debug level,
+	  warn() (and all variants vwarn(), llwarn(), etc.). (4) Debug
+	  assertions can now be enabled separately from debug output. (5) You
+	  can now enable subsystem/device driver debug output at different
+	  output levels. For example, CONFIG_DEBUG_FS no longer enables file
+	  system debug output. It enables general file system debug logic and
+	  enables selection of CONFIG_DEBUG_FS_ERROR, CONFIG_DEBUG_FS_WARN,
+	  and CONFIG_DEBUG_FS_INFO (2016-06-12).
-- 
GitLab


From b0458e36dacfbef874f401ec63bbaab179527ca8 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sun, 12 Jun 2016 17:57:12 -0600
Subject: [PATCH 49/91] configs/: Remove references to non-existent SPI_VERBOSE
 setting

---
 configs/demo9s12ne64/src/m9s12_spi.c         | 20 ++++------------
 configs/ea3131/src/lpc31_spi.c               | 20 ++++------------
 configs/ea3152/src/lpc31_spi.c               | 20 ++++------------
 configs/fire-stm32v2/src/stm32_spi.c         | 20 ++++------------
 configs/hymini-stm32v/src/stm32_spi.c        | 20 ++++------------
 configs/kwikstik-k40/src/k40_spi.c           | 15 ++++--------
 configs/mikroe-stm32f4/src/stm32_spi.c       | 20 ++++------------
 configs/ne64badge/src/m9s12_spi.c            | 20 ++++------------
 configs/nucleo-144/src/stm32_spi.c           | 11 ++++-----
 configs/nucleo-f303re/src/stm32_spi.c        | 24 ++++++--------------
 configs/olimex-lpc-h3131/src/lpc31_spi.c     | 20 ++++------------
 configs/olimex-stm32-p107/src/stm32_spi.c    | 20 ++++------------
 configs/olimexino-stm32/src/stm32_spi.c      | 20 ++++------------
 configs/pic32mx-starterkit/src/pic32mx_spi.c | 21 ++++-------------
 configs/pic32mz-starterkit/src/pic32mz_spi.c | 15 ++++--------
 configs/sam3u-ek/src/sam_spi.c               | 20 ++++------------
 configs/sam4e-ek/src/sam_spi.c               | 20 ++++------------
 configs/sam4l-xplained/src/sam_spi.c         | 19 ++++------------
 configs/sama5d3-xplained/src/sam_spi.c       | 20 ++++------------
 configs/sama5d3x-ek/src/sam_spi.c            | 20 ++++------------
 configs/sama5d4-ek/src/sam_spi.c             | 20 ++++------------
 configs/samd20-xplained/src/sam_spi.c        | 20 ++++------------
 configs/samd21-xplained/src/sam_spi.c        | 20 ++++------------
 configs/same70-xplained/src/sam_spi.c        | 20 ++++------------
 configs/saml21-xplained/src/sam_spi.c        | 20 ++++------------
 configs/samv71-xult/src/sam_spi.c            | 20 ++++------------
 configs/spark/src/stm32_spi.c                | 20 ++++------------
 configs/stm32f429i-disco/src/stm32_spi.c     |  2 +-
 configs/teensy-2.0/src/at90usb_spi.c         |  8 ++-----
 29 files changed, 138 insertions(+), 397 deletions(-)

diff --git a/configs/demo9s12ne64/src/m9s12_spi.c b/configs/demo9s12ne64/src/m9s12_spi.c
index 312aebffc7..0cccbecbb6 100644
--- a/configs/demo9s12ne64/src/m9s12_spi.c
+++ b/configs/demo9s12ne64/src/m9s12_spi.c
@@ -54,28 +54,18 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
+/* Enables debug output from this file */
 
-#undef SPI_DEBUG   /* Define to enable debug */
-#undef SPI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SPI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
diff --git a/configs/ea3131/src/lpc31_spi.c b/configs/ea3131/src/lpc31_spi.c
index e71c7fd974..eb70c52379 100644
--- a/configs/ea3131/src/lpc31_spi.c
+++ b/configs/ea3131/src/lpc31_spi.c
@@ -59,28 +59,18 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
+/* Enables debug output from this file */
 
-#undef SPI_DEBUG   /* Define to enable debug */
-#undef SPI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SPI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
diff --git a/configs/ea3152/src/lpc31_spi.c b/configs/ea3152/src/lpc31_spi.c
index 8ecd50e111..30437379af 100644
--- a/configs/ea3152/src/lpc31_spi.c
+++ b/configs/ea3152/src/lpc31_spi.c
@@ -59,28 +59,18 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
+/* Enables debug output from this file */
 
-#undef SPI_DEBUG   /* Define to enable debug */
-#undef SPI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SPI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
diff --git a/configs/fire-stm32v2/src/stm32_spi.c b/configs/fire-stm32v2/src/stm32_spi.c
index b040fdc0c9..83e21852db 100644
--- a/configs/fire-stm32v2/src/stm32_spi.c
+++ b/configs/fire-stm32v2/src/stm32_spi.c
@@ -57,28 +57,18 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
+/* Enables debug output from this file */
 
-#undef SPI_DEBUG   /* Define to enable debug */
-#undef SPI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SPI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
diff --git a/configs/hymini-stm32v/src/stm32_spi.c b/configs/hymini-stm32v/src/stm32_spi.c
index c8c781f644..e803e52e70 100644
--- a/configs/hymini-stm32v/src/stm32_spi.c
+++ b/configs/hymini-stm32v/src/stm32_spi.c
@@ -58,28 +58,18 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
+/* Enables debug output from this file */
 
-#define SPI_DEBUG   /* Define to enable debug */
-#define SPI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SPI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
diff --git a/configs/kwikstik-k40/src/k40_spi.c b/configs/kwikstik-k40/src/k40_spi.c
index ec06535419..c9bfc1aa08 100644
--- a/configs/kwikstik-k40/src/k40_spi.c
+++ b/configs/kwikstik-k40/src/k40_spi.c
@@ -57,25 +57,18 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
+/* Enables debug output from this file */
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef CONFIG_DEBUG_SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef CONFIG_DEBUG_SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
diff --git a/configs/mikroe-stm32f4/src/stm32_spi.c b/configs/mikroe-stm32f4/src/stm32_spi.c
index f38ede5164..2b1ff95748 100644
--- a/configs/mikroe-stm32f4/src/stm32_spi.c
+++ b/configs/mikroe-stm32f4/src/stm32_spi.c
@@ -63,28 +63,18 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
+/* Enables debug output from this file */
 
-#undef SPI_DEBUG   /* Define to enable debug */
-#undef SPI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SPI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
diff --git a/configs/ne64badge/src/m9s12_spi.c b/configs/ne64badge/src/m9s12_spi.c
index 051c98c065..37708f4042 100644
--- a/configs/ne64badge/src/m9s12_spi.c
+++ b/configs/ne64badge/src/m9s12_spi.c
@@ -54,28 +54,18 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
+/* Enables debug output from this file */
 
-#undef SPI_DEBUG   /* Define to enable debug */
-#undef SPI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SPI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
diff --git a/configs/nucleo-144/src/stm32_spi.c b/configs/nucleo-144/src/stm32_spi.c
index f94d02edc4..73d7a573f4 100644
--- a/configs/nucleo-144/src/stm32_spi.c
+++ b/configs/nucleo-144/src/stm32_spi.c
@@ -61,16 +61,15 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
+/* Enables debug output from this file */
+
 #ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
diff --git a/configs/nucleo-f303re/src/stm32_spi.c b/configs/nucleo-f303re/src/stm32_spi.c
index 800b0f0e96..b38745341f 100644
--- a/configs/nucleo-f303re/src/stm32_spi.c
+++ b/configs/nucleo-f303re/src/stm32_spi.c
@@ -60,28 +60,18 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
-
-#undef SPI_DEBUG   /* Define to enable debug */
-#undef SPI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SPI_DEBUG
-#  define spierr llerr
-#  ifdef SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+/* Enables debug output from this file */
+
+#ifdef CONFIG_DEBUG_SPI
+#  define spierr  llerr
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
diff --git a/configs/olimex-lpc-h3131/src/lpc31_spi.c b/configs/olimex-lpc-h3131/src/lpc31_spi.c
index 0d91d346b4..2dd3fa4e10 100644
--- a/configs/olimex-lpc-h3131/src/lpc31_spi.c
+++ b/configs/olimex-lpc-h3131/src/lpc31_spi.c
@@ -59,28 +59,18 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
+/* Enables debug output from this file */
 
-#undef SPI_DEBUG   /* Define to enable debug */
-#undef SPI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SPI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
diff --git a/configs/olimex-stm32-p107/src/stm32_spi.c b/configs/olimex-stm32-p107/src/stm32_spi.c
index 3b84b1f907..2567e2de91 100644
--- a/configs/olimex-stm32-p107/src/stm32_spi.c
+++ b/configs/olimex-stm32-p107/src/stm32_spi.c
@@ -58,28 +58,18 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
+/* Enables debug output from this file */
 
-#undef SPI_DEBUG   /* Define to enable debug */
-#undef SPI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SPI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
diff --git a/configs/olimexino-stm32/src/stm32_spi.c b/configs/olimexino-stm32/src/stm32_spi.c
index 8dce537409..5ee47db85a 100644
--- a/configs/olimexino-stm32/src/stm32_spi.c
+++ b/configs/olimexino-stm32/src/stm32_spi.c
@@ -59,28 +59,18 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
+/* Enables debug output from this file */
 
-#undef SPI_DEBUG   /* Define to enable debug */
-#undef SPI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SPI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
diff --git a/configs/pic32mx-starterkit/src/pic32mx_spi.c b/configs/pic32mx-starterkit/src/pic32mx_spi.c
index 1884607ad9..6acb1efa9a 100644
--- a/configs/pic32mx-starterkit/src/pic32mx_spi.c
+++ b/configs/pic32mx-starterkit/src/pic32mx_spi.c
@@ -58,29 +58,18 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* The following enable debug output from this file (needs CONFIG_DEBUG_FEATURES too).
- *
- * CONFIG_SPI_DEBUG - Define to enable basic SPI debug
- * CONFIG_SPI_VERBOSE - Define to enable verbose SPI debug
- */
+/* Enables debug output from this file */
 
-#ifdef CONFIG_SPI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef CONFIG_SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef CONFIG_SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
diff --git a/configs/pic32mz-starterkit/src/pic32mz_spi.c b/configs/pic32mz-starterkit/src/pic32mz_spi.c
index 8207b478b6..6289c71899 100644
--- a/configs/pic32mz-starterkit/src/pic32mz_spi.c
+++ b/configs/pic32mz-starterkit/src/pic32mz_spi.c
@@ -56,25 +56,18 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Debug */
+/* Enables debug output from this file */
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef CONFIG_SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef CONFIG_SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
diff --git a/configs/sam3u-ek/src/sam_spi.c b/configs/sam3u-ek/src/sam_spi.c
index e6546c65e0..0802267498 100644
--- a/configs/sam3u-ek/src/sam_spi.c
+++ b/configs/sam3u-ek/src/sam_spi.c
@@ -59,28 +59,18 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
+/* Enables debug output from this file */
 
-#undef SPI_DEBUG   /* Define to enable debug */
-#undef SPI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SPI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
diff --git a/configs/sam4e-ek/src/sam_spi.c b/configs/sam4e-ek/src/sam_spi.c
index a18c85a47a..3a238b2448 100644
--- a/configs/sam4e-ek/src/sam_spi.c
+++ b/configs/sam4e-ek/src/sam_spi.c
@@ -59,28 +59,18 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
+/* Enables debug output from this file */
 
-#undef SPI_DEBUG   /* Define to enable debug */
-#undef SPI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SPI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
diff --git a/configs/sam4l-xplained/src/sam_spi.c b/configs/sam4l-xplained/src/sam_spi.c
index 4aad0f04d9..5a43b8a6f5 100644
--- a/configs/sam4l-xplained/src/sam_spi.c
+++ b/configs/sam4l-xplained/src/sam_spi.c
@@ -54,28 +54,19 @@
 /************************************************************************************
  * Pre-processor Definitions
  ************************************************************************************/
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
 
-#undef SPI_DEBUG   /* Define to enable debug */
-#undef SPI_VERBOSE /* Define to enable verbose debug */
+/* Enables debug output from this file */
 
-#ifdef SPI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
diff --git a/configs/sama5d3-xplained/src/sam_spi.c b/configs/sama5d3-xplained/src/sam_spi.c
index 41a57cd63f..720d1f430f 100644
--- a/configs/sama5d3-xplained/src/sam_spi.c
+++ b/configs/sama5d3-xplained/src/sam_spi.c
@@ -59,28 +59,18 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
+/* Enables debug output from this file */
 
-#undef SPI_DEBUG   /* Define to enable debug */
-#undef SPI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SPI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
diff --git a/configs/sama5d3x-ek/src/sam_spi.c b/configs/sama5d3x-ek/src/sam_spi.c
index 0dc1129553..5b7b2f04ab 100644
--- a/configs/sama5d3x-ek/src/sam_spi.c
+++ b/configs/sama5d3x-ek/src/sam_spi.c
@@ -59,28 +59,18 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
+/* Enables debug output from this file */
 
-#undef SPI_DEBUG   /* Define to enable debug */
-#undef SPI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SPI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
diff --git a/configs/sama5d4-ek/src/sam_spi.c b/configs/sama5d4-ek/src/sam_spi.c
index c93158cbdb..fff11d2cb7 100644
--- a/configs/sama5d4-ek/src/sam_spi.c
+++ b/configs/sama5d4-ek/src/sam_spi.c
@@ -59,28 +59,18 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
+/* Enables debug output from this file */
 
-#undef SPI_DEBUG   /* Define to enable debug */
-#undef SPI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SPI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
diff --git a/configs/samd20-xplained/src/sam_spi.c b/configs/samd20-xplained/src/sam_spi.c
index 9d13875acc..9c647d9eb2 100644
--- a/configs/samd20-xplained/src/sam_spi.c
+++ b/configs/samd20-xplained/src/sam_spi.c
@@ -57,28 +57,18 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
+/* Enables debug output from this file */
 
-#undef SPI_DEBUG   /* Define to enable debug */
-#undef SPI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SPI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
diff --git a/configs/samd21-xplained/src/sam_spi.c b/configs/samd21-xplained/src/sam_spi.c
index fcebdb5ea0..1b896da9c6 100644
--- a/configs/samd21-xplained/src/sam_spi.c
+++ b/configs/samd21-xplained/src/sam_spi.c
@@ -57,28 +57,18 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
+/* Enables debug output from this file */
 
-#undef SPI_DEBUG   /* Define to enable debug */
-#undef SPI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SPI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
diff --git a/configs/same70-xplained/src/sam_spi.c b/configs/same70-xplained/src/sam_spi.c
index 28ea3c2eac..eda55db06f 100644
--- a/configs/same70-xplained/src/sam_spi.c
+++ b/configs/same70-xplained/src/sam_spi.c
@@ -59,28 +59,18 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
+/* Enables debug output from this file */
 
-#undef SPI_DEBUG   /* Define to enable debug */
-#undef SPI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SPI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
diff --git a/configs/saml21-xplained/src/sam_spi.c b/configs/saml21-xplained/src/sam_spi.c
index 64e94d3896..0fcc1084f4 100644
--- a/configs/saml21-xplained/src/sam_spi.c
+++ b/configs/saml21-xplained/src/sam_spi.c
@@ -57,28 +57,18 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
+/* Enables debug output from this file */
 
-#undef SPI_DEBUG   /* Define to enable debug */
-#undef SPI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SPI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
diff --git a/configs/samv71-xult/src/sam_spi.c b/configs/samv71-xult/src/sam_spi.c
index ddf7714ecc..f84bfe2d2a 100644
--- a/configs/samv71-xult/src/sam_spi.c
+++ b/configs/samv71-xult/src/sam_spi.c
@@ -59,28 +59,18 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
+/* Enables debug output from this file */
 
-#undef SPI_DEBUG   /* Define to enable debug */
-#undef SPI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SPI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
diff --git a/configs/spark/src/stm32_spi.c b/configs/spark/src/stm32_spi.c
index 8c12859c49..8871b805a8 100644
--- a/configs/spark/src/stm32_spi.c
+++ b/configs/spark/src/stm32_spi.c
@@ -63,28 +63,18 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
+/* Enables debug output from this file */
 
-#undef SPI_DEBUG   /* Define to enable debug */
-#undef SPI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SPI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
diff --git a/configs/stm32f429i-disco/src/stm32_spi.c b/configs/stm32f429i-disco/src/stm32_spi.c
index b9538bcd60..293d378a88 100644
--- a/configs/stm32f429i-disco/src/stm32_spi.c
+++ b/configs/stm32f429i-disco/src/stm32_spi.c
@@ -60,7 +60,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
+/* Enables debug output from this file */
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
diff --git a/configs/teensy-2.0/src/at90usb_spi.c b/configs/teensy-2.0/src/at90usb_spi.c
index ca651a189c..42304c55ad 100644
--- a/configs/teensy-2.0/src/at90usb_spi.c
+++ b/configs/teensy-2.0/src/at90usb_spi.c
@@ -80,13 +80,9 @@
 #define TEENSY_CD (1 << 4)
 #define TEENSY_WP (1 << 5)
 
-/* The following enable debug output from this file (needs CONFIG_DEBUG_FEATURES too).
- *
- * CONFIG_SPI_DEBUG - Define to enable basic SSP debug
- * CONFIG_SPI_VERBOSE - Define to enable verbose SSP debug
- */
+/* The following enable debug output from this file */
 
-#ifdef CONFIG_SPI_DEBUG
+#ifdef CONFIG_CONFIG_DEBUG_SPI
 #  define ssperr  llerr
 #  define sspwarn llwarn
 #  define sspinfo llinfo
-- 
GitLab


From bed85cc5158f10ef45215c53bf683e60da1e9131 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sun, 12 Jun 2016 18:48:13 -0600
Subject: [PATCH 50/91] configs/: Remove one more reference to non-existent
 SPI_VERBOSE setting

---
 arch/avr/src/avr/up_spi.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/arch/avr/src/avr/up_spi.c b/arch/avr/src/avr/up_spi.c
index 66cf745e92..6f13f7cd58 100644
--- a/arch/avr/src/avr/up_spi.c
+++ b/arch/avr/src/avr/up_spi.c
@@ -66,21 +66,15 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
+/* Enables debug output from this file */
 
-#undef SPI_DEBUG     /* Define to enable debug */
-#undef SPI_VERBOSE   /* Define to enable verbose debug */
-
-#ifdef SPI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef SPI_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef SPI_VERBOSE
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-- 
GitLab


From 5073bf1de6a18ec47302ae96c7ce643e9872828d Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 13 Jun 2016 07:02:45 -0600
Subject: [PATCH 51/91] Update some comments

---
 include/syslog.h             | 14 +++++---------
 libc/syslog/lib_setlogmask.c |  6 +++++-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/syslog.h b/include/syslog.h
index 6c1316a7e6..efc62ac599 100644
--- a/include/syslog.h
+++ b/include/syslog.h
@@ -128,14 +128,6 @@
 #define LOG_UPTO(p)   ((1 << (p)) - 1)
 #define LOG_ALL       0xff
 
-/****************************************************************************
- * Public Type Declarations
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
 /****************************************************************************
  * Public Function Prototypes
  ****************************************************************************/
@@ -225,8 +217,12 @@ int lowvsyslog(int priority, FAR const IPTR char *format, va_list ap);
  *   to a priority p is LOG_MASK(p); LOG_UPTO(p) provides the mask of all
  *   priorities in the above list up to and including p.
  *
+ *   Per OpenGroup.org "If the maskpri argument is 0, the current log mask
+ *   is not modified."  In this implementation, the value zero is permitted
+ *   in order to disable all syslog levels.
+ *
  *   REVISIT: Per POSIX the syslog mask should be a per-process value but in
- *   NuttX, the scope of the mask is dependent on the nature of the build.
+ *   NuttX, the scope of the mask is dependent on the nature of the build:
  *
  *   Flat Build:  There is one, global SYSLOG mask that controls all output.
  *   Protected Build:  There are two SYSLOG masks.  One within the kernel
diff --git a/libc/syslog/lib_setlogmask.c b/libc/syslog/lib_setlogmask.c
index 84352411bd..1d91d40555 100644
--- a/libc/syslog/lib_setlogmask.c
+++ b/libc/syslog/lib_setlogmask.c
@@ -70,8 +70,12 @@ uint8_t g_syslog_mask = LOG_ALL;
  *   to a priority p is LOG_MASK(p); LOG_UPTO(p) provides the mask of all
  *   priorities in the above list up to and including p.
  *
+ *   Per OpenGroup.org "If the maskpri argument is 0, the current log mask
+ *   is not modified."  In this implementation, the value zero is permitted
+ *   in order to disable all syslog levels.
+ *
  *   REVISIT: Per POSIX the syslog mask should be a per-process value but in
- *   NuttX, the scope of the mask is dependent on the nature of the build.
+ *   NuttX, the scope of the mask is dependent on the nature of the build:
  *
  *   Flat Build:  There is one, global SYSLOG mask that controls all output.
  *   Protected Build:  There are two SYSLOG masks.  One within the kernel
-- 
GitLab


From 15c92867de577c871f64d0005c86cf27673d469a Mon Sep 17 00:00:00 2001
From: Sebastien Lorquet 
Date: Mon, 13 Jun 2016 15:29:05 +0200
Subject: [PATCH 52/91] Fixes for strtoul/strtoull. Fixes Issue #1

---
 libc/stdlib/lib_checkbase.c | 11 +++++++++++
 libc/stdlib/lib_strtoul.c   | 30 +++++++++++++++++++++++++-----
 libc/stdlib/lib_strtoull.c  | 28 +++++++++++++++++++++++++---
 3 files changed, 61 insertions(+), 8 deletions(-)

diff --git a/libc/stdlib/lib_checkbase.c b/libc/stdlib/lib_checkbase.c
index 05abe7b896..d291eefc4e 100644
--- a/libc/stdlib/lib_checkbase.c
+++ b/libc/stdlib/lib_checkbase.c
@@ -63,6 +63,11 @@
  * Assumptions:
  *   *ptr points to the first, non-whitespace character in the string.
  *
+ * Returns:
+ *   - if base is valid, the actual base to use, and pptr is updated to point
+ *     at the first digit.
+ *   - if base is invalid (<2 or >36), return -1.
+ *
  ****************************************************************************/
 
 int lib_checkbase(int base, FAR const char **pptr)
@@ -107,6 +112,12 @@ int lib_checkbase(int base, FAR const char **pptr)
         }
     }
 
+  /* Check for incorrect bases. */
+  else if (base < 2 || base > 26)
+    {
+    return -1; /* Means incorrect base */
+    }
+
   /* Return the updated pointer and base */
 
   *pptr = ptr;
diff --git a/libc/stdlib/lib_strtoul.c b/libc/stdlib/lib_strtoul.c
index 3dfe5a5e60..144e68bf54 100644
--- a/libc/stdlib/lib_strtoul.c
+++ b/libc/stdlib/lib_strtoul.c
@@ -59,13 +59,17 @@
  *   nptr to a long unsigned integer value according to the given base, which
  *   must be between 2 and 36 inclusive, or be the special value 0.
  *
- * Warning: does not check for integer overflow!
+ * Returns:
+ *   - The converted value, if the base and number are valid
+ *   - 0 if an error occurs, and seterrno to:
+ *     * EINVAL if base < 2 or base > 36
+ *     * ERANGE if the number cannot be represented using unsigned long
  *
  ****************************************************************************/
 
 unsigned long strtoul(FAR const char *nptr, FAR char **endptr, int base)
 {
-  unsigned long accum = 0;
+  unsigned long prev, accum = 0;
   int value;
 
   if (nptr)
@@ -74,16 +78,32 @@ unsigned long strtoul(FAR const char *nptr, FAR char **endptr, int base)
 
       lib_skipspace(&nptr);
 
-      /* Check for unspecified base */
+      /* Check for unspecified or incorrect base */
 
       base = lib_checkbase(base, &nptr);
 
+      if (base < 0)
+        {
+          set_errno(EINVAL);
+          return 0;
+        }
+
       /* Accumulate each "digit" */
 
       while (lib_isbasedigit(*nptr, base, &value))
         {
-            accum = accum*base + value;
-            nptr++;
+          prev  = accum;
+          accum = accum*base + value;
+          nptr++;
+
+          /* Check for overflow */
+
+          if (accum < prev)
+            {
+            set_errno(ERANGE);
+            accum = 0;
+            break;
+            }
         }
 
       /* Return the final pointer to the unused value */
diff --git a/libc/stdlib/lib_strtoull.c b/libc/stdlib/lib_strtoull.c
index 82adc0450a..b662ff65c4 100644
--- a/libc/stdlib/lib_strtoull.c
+++ b/libc/stdlib/lib_strtoull.c
@@ -62,11 +62,17 @@
  *   nptr to a long unsigned integer value according to the given base, which
  *   must be between 2 and 36 inclusive, or be the special value 0.
  *
+ * Returns:
+ *   - The converted value, if the base and number are valid
+ *   - 0 if an error occurs, and seterrno to:
+ *     * EINVAL if base < 2 or base > 36
+ *     * ERANGE if the number cannot be represented using unsigned long long
+ *
  ****************************************************************************/
 
 unsigned long long strtoull(FAR const char *nptr, FAR char **endptr, int base)
 {
-  unsigned long long accum = 0;
+  unsigned long long prev, accum = 0;
   int value;
 
   if (nptr)
@@ -79,12 +85,28 @@ unsigned long long strtoull(FAR const char *nptr, FAR char **endptr, int base)
 
       base = lib_checkbase(base, &nptr);
 
+      if (base < 0)
+        {
+          set_errno(EINVAL);
+          return 0;
+        }
+
       /* Accumulate each "digit" */
 
       while (lib_isbasedigit(*nptr, base, &value))
         {
-            accum = accum*base + value;
-            nptr++;
+          prev  = accum;
+          accum = accum*base + value;
+          nptr++;
+
+          /* Check for overflow */
+
+          if (accum < prev)
+            {
+            set_errno(ERANGE);
+            accum = 0;
+            break;
+            }
         }
 
       /* Return the final pointer to the unused value */
-- 
GitLab


From c494454bc442a9d77ea4d80e9036a118a12df91f Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 13 Jun 2016 07:43:55 -0600
Subject: [PATCH 53/91] configs/:  Change some *err() message to *info()
 messages if what was a *dbg() message does not indicate and error condition.

---
 configs/sam3u-ek/src/sam_lcd.c                | 30 ++++++++++-------
 configs/sam3u-ek/src/sam_touchscreen.c        |  6 ++--
 configs/sam3u-ek/src/sam_usbdev.c             |  2 +-
 configs/sam4e-ek/src/sam_ads7843e.c           |  6 ++--
 configs/sam4e-ek/src/sam_ethernet.c           | 24 +++++++++-----
 configs/sam4e-ek/src/sam_hsmci.c              |  4 +--
 configs/sam4e-ek/src/sam_udp.c                |  2 +-
 configs/sam4l-xplained/src/sam_mmcsd.c        |  4 +--
 .../sam4l-xplained/src/sam_ug2832hsweg04.c    |  4 +--
 configs/sam4s-xplained-pro/src/sam_hsmci.c    |  6 ++--
 configs/sam4s-xplained-pro/src/sam_tc.c       | 16 +++++-----
 configs/sam4s-xplained-pro/src/sam_udp.c      |  2 +-
 configs/sam4s-xplained-pro/src/sam_wdt.c      | 12 +++----
 configs/sama5d3-xplained/src/sam_adc.c        |  2 +-
 configs/sama5d3-xplained/src/sam_ethernet.c   | 32 ++++++++++++-------
 configs/sama5d3-xplained/src/sam_hsmci.c      |  8 ++---
 configs/sama5d3-xplained/src/sam_pwm.c        |  4 +--
 configs/sama5d3-xplained/src/sam_usb.c        |  2 +-
 configs/sama5d3x-ek/src/sam_adc.c             |  2 +-
 configs/sama5d3x-ek/src/sam_ethernet.c        | 32 ++++++++++++-------
 configs/sama5d3x-ek/src/sam_hsmci.c           |  8 ++---
 configs/sama5d3x-ek/src/sam_pwm.c             |  4 +--
 configs/sama5d3x-ek/src/sam_touchscreen.c     |  2 +-
 configs/sama5d3x-ek/src/sam_usb.c             |  2 +-
 configs/sama5d3x-ek/src/sam_wm8904.c          |  8 ++---
 configs/sama5d4-ek/src/sam_adc.c              |  2 +-
 configs/sama5d4-ek/src/sam_audio_null.c       |  4 +--
 configs/sama5d4-ek/src/sam_ethernet.c         | 32 ++++++++++++-------
 configs/sama5d4-ek/src/sam_maxtouch.c         |  4 +--
 configs/sama5d4-ek/src/sam_pwm.c              |  4 +--
 configs/sama5d4-ek/src/sam_usb.c              |  2 +-
 configs/sama5d4-ek/src/sam_wm8904.c           |  8 ++---
 configs/samd20-xplained/src/sam_mmcsd.c       |  4 +--
 .../samd20-xplained/src/sam_ug2832hsweg04.c   |  4 +--
 configs/samd21-xplained/src/sam_mmcsd.c       |  4 +--
 .../samd21-xplained/src/sam_ug2832hsweg04.c   |  4 +--
 configs/same70-xplained/src/sam_ethernet.c    | 24 +++++++++-----
 configs/same70-xplained/src/sam_usbdev.c      |  2 +-
 configs/saml21-xplained/src/sam_mmcsd.c       |  4 +--
 .../saml21-xplained/src/sam_ug2832hsweg04.c   |  4 +--
 configs/samv71-xult/src/sam_audio_null.c      |  4 +--
 configs/samv71-xult/src/sam_ethernet.c        | 25 ++++++++++-----
 configs/samv71-xult/src/sam_ili9488.c         |  2 +-
 configs/samv71-xult/src/sam_maxtouch.c        |  4 +--
 configs/samv71-xult/src/sam_usbdev.c          |  2 +-
 configs/samv71-xult/src/sam_wm8904.c          |  8 ++---
 configs/shenzhou/src/stm32_adc.c              |  2 +-
 configs/shenzhou/src/stm32_ili93xx.c          | 22 ++++++-------
 configs/shenzhou/src/stm32_mmcsd.c            |  4 +--
 configs/shenzhou/src/stm32_spi.c              |  8 ++---
 configs/shenzhou/src/stm32_ssd1289.c          | 14 ++++----
 configs/shenzhou/src/stm32_touchscreen.c      |  6 ++--
 configs/shenzhou/src/stm32_usb.c              |  2 +-
 configs/sim/src/sim_touchscreen.c             | 12 +++----
 configs/spark/src/stm32_spi.c                 |  6 ++--
 configs/spark/src/stm32_usbdev.c              |  4 +--
 configs/spark/src/stm32_wireless.c            |  6 ++--
 configs/stm32f4discovery/src/stm32_ethernet.c |  8 +++++
 58 files changed, 264 insertions(+), 205 deletions(-)

diff --git a/configs/sam3u-ek/src/sam_lcd.c b/configs/sam3u-ek/src/sam_lcd.c
index f93e1e467f..c9e11964c5 100644
--- a/configs/sam3u-ek/src/sam_lcd.c
+++ b/configs/sam3u-ek/src/sam_lcd.c
@@ -160,16 +160,22 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_LCD_REGDEBUG
-#  define regerr(format, ...)  info(format, ##__VA_ARGS__)
+#  define regerr(format, ...)  err(format, ##__VA_ARGS__)
+#  define regwarn(format, ...) warn(format, ##__VA_ARGS__)
+#  define reginfo(format, ...) info(format, ##__VA_ARGS__)
 #else
 #  define regerr(x...)
+#  define regwarn(x...)
+#  define reginfo(x...)
 #endif
 
 #ifdef CONFIG_DEBUG_LCD
 #  define lcderr(format, ...)  err(format, ##__VA_ARGS__)
+#  define lcdwarn(format, ...) warn(format, ##__VA_ARGS__)
 #  define lcdinfo(format, ...) info(format, ##__VA_ARGS__)
 #else
 #  define lcderr(x...)
+#  define lcdwarn(x...)
 #  define lcdinfo(x...)
 #endif
 
@@ -438,7 +444,7 @@ static struct sam_dev_s g_lcddev_s =
 
 static void sam_putreg(uint16_t reg,  uint16_t data)
 {
-  regerr("base: %08x RS: %04x data: %04x\n", LCD_BASE, LCD_BASE + HX843X_LCD_RS, data);
+  reginfo("base: %08x RS: %04x data: %04x\n", LCD_BASE, LCD_BASE + HX843X_LCD_RS, data);
   putreg16(reg, LCD_BASE);
   putreg16(data, LCD_BASE + HX843X_LCD_RS);
 }
@@ -457,7 +463,7 @@ static uint16_t sam_getreg(uint16_t reg)
   uint16_t data;
   putreg16(reg, LCD_BASE);
   data = getreg16(LCD_BASE + HX843X_LCD_RS);
-  regerr("base: %08x RS: %04x data: %04x\n", LCD_BASE, LCD_BASE + HX843X_LCD_RS, data);
+  reginfo("base: %08x RS: %04x data: %04x\n", LCD_BASE, LCD_BASE + HX843X_LCD_RS, data);
   return data;
 }
 #endif
@@ -586,7 +592,7 @@ static void sam_dumpreg(uint8_t startreg, uint8_t endreg)
   for (addr = startreg; addr <= endreg; addr++)
     {
       value = sam_getreg(addr);
-      lcderr(" %02x: %04x\n", addr, value);
+      lcdinfo(" %02x: %04x\n", addr, value);
     }
 }
 #endif
@@ -912,7 +918,7 @@ int board_lcd_initialize(void)
   /* Enable SMC peripheral clock */
 
   putreg32((1 << SAM_PID_SMC), SAM_PMC_PCER);
-  regerr("PMC PCSR: %08x SMC: %08x\n", getreg32(SAM_PMC_PCSR), (1 << SAM_PID_SMC));
+  reginfo("PMC PCSR: %08x SMC: %08x\n", getreg32(SAM_PMC_PCSR), (1 << SAM_PID_SMC));
 
   /* Configure SMC CS2 */
 
@@ -932,12 +938,12 @@ int board_lcd_initialize(void)
   regval |= (SMCCS_MODE_READMODE)  | (SMCCS_MODE_WRITEMODE) | (SMCCS_MODE_DBW_16BITS);
   putreg32(regval, SAM_SMCCS_MODE(2));
 
-  regerr("SMC SETUP[%08x]: %08x PULSE[%08x]: %08x\n",
-         SAM_SMCCS_SETUP(2), getreg32(SAM_SMCCS_SETUP(2)),
-         SAM_SMCCS_PULSE(2), getreg32(SAM_SMCCS_PULSE(2)));
-  regerr("    CYCLE[%08x]: %08x MODE[%08x]:  %08x\n",
-         SAM_SMCCS_CYCLE(2), getreg32(SAM_SMCCS_CYCLE(2)),
-         SAM_SMCCS_MODE(2),  getreg32(SAM_SMCCS_MODE(2)));
+  reginfo("SMC SETUP[%08x]: %08x PULSE[%08x]: %08x\n",
+          SAM_SMCCS_SETUP(2), getreg32(SAM_SMCCS_SETUP(2)),
+          SAM_SMCCS_PULSE(2), getreg32(SAM_SMCCS_PULSE(2)));
+  reginfo("    CYCLE[%08x]: %08x MODE[%08x]:  %08x\n",
+          SAM_SMCCS_CYCLE(2), getreg32(SAM_SMCCS_CYCLE(2)),
+          SAM_SMCCS_MODE(2),  getreg32(SAM_SMCCS_MODE(2)));
 
   /* Check HX8347 Chip ID */
 
@@ -946,7 +952,7 @@ int board_lcd_initialize(void)
   lcdinfo("Chip ID: %04x\n", hxregval);
   if (hxregval != HX8347_CHIPID)
     {
-      lcderr("Bad chip ID: %04x Expected: %04x\n", hxregval, HX8347_CHIPID);
+      lcderr("ERROR: Bad chip ID: %04x Expected: %04x\n", hxregval, HX8347_CHIPID);
       return -ENODEV;
     }
 #endif
diff --git a/configs/sam3u-ek/src/sam_touchscreen.c b/configs/sam3u-ek/src/sam_touchscreen.c
index 0c10f8ae1e..7dec7f8e7a 100644
--- a/configs/sam3u-ek/src/sam_touchscreen.c
+++ b/configs/sam3u-ek/src/sam_touchscreen.c
@@ -238,7 +238,7 @@ int board_tsc_setup(int minor)
   FAR struct spi_dev_s *dev;
   int ret;
 
-  ierr("minor %d\n", minor);
+  iinfo("minor %d\n", minor);
   DEBUGASSERT(minor == 0);
 
   /* Configure and enable the ADS7843E interrupt pin as an input */
@@ -255,7 +255,7 @@ int board_tsc_setup(int minor)
   dev = sam_spibus_initialize(TSC_CSNUM);
   if (!dev)
     {
-      ierr("Failed to initialize SPI chip select %d\n", TSC_CSNUM);
+      ierr("ERROR: Failed to initialize SPI chip select %d\n", TSC_CSNUM);
       return -ENODEV;
     }
 
@@ -264,7 +264,7 @@ int board_tsc_setup(int minor)
   ret = ads7843e_register(dev, &g_tscinfo, CONFIG_ADS7843E_DEVMINOR);
   if (ret < 0)
     {
-      ierr("Failed to initialize SPI chip select %d\n", TSC_CSNUM);
+      ierr("ERROR: Failed to initialize SPI chip select %d\n", TSC_CSNUM);
       /* sam_spibus_uninitialize(dev); */
       return -ENODEV;
     }
diff --git a/configs/sam3u-ek/src/sam_usbdev.c b/configs/sam3u-ek/src/sam_usbdev.c
index da36afc2da..ae3d3ba68e 100644
--- a/configs/sam3u-ek/src/sam_usbdev.c
+++ b/configs/sam3u-ek/src/sam_usbdev.c
@@ -75,5 +75,5 @@
 
 void sam_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ullerr("resume: %d\n", resume);
+  ullinfo("resume: %d\n", resume);
 }
diff --git a/configs/sam4e-ek/src/sam_ads7843e.c b/configs/sam4e-ek/src/sam_ads7843e.c
index 01e35b06d9..d4b555aa44 100644
--- a/configs/sam4e-ek/src/sam_ads7843e.c
+++ b/configs/sam4e-ek/src/sam_ads7843e.c
@@ -235,7 +235,7 @@ int board_tsc_setup(int minor)
   FAR struct spi_dev_s *dev;
   int ret;
 
-  ierr("minor %d\n", minor);
+  iinfo("minor %d\n", minor);
   DEBUGASSERT(minor == 0);
 
   /* Configure and enable the ADS7843E interrupt pin as an input */
@@ -252,7 +252,7 @@ int board_tsc_setup(int minor)
   dev = sam_spibus_initialize(TSC_CSNUM);
   if (!dev)
     {
-      ierr("Failed to initialize SPI chip select %d\n", TSC_CSNUM);
+      ierr("ERROR: Failed to initialize SPI chip select %d\n", TSC_CSNUM);
       return -ENODEV;
     }
 
@@ -261,7 +261,7 @@ int board_tsc_setup(int minor)
   ret = ads7843e_register(dev, &g_tscinfo, CONFIG_ADS7843E_DEVMINOR);
   if (ret < 0)
     {
-      ierr("Failed to initialize SPI chip select %d\n", TSC_CSNUM);
+      ierr("ERROR: Failed to initialize SPI chip select %d\n", TSC_CSNUM);
       /* sam_spibus_uninitialize(dev); */
       return -ENODEV;
     }
diff --git a/configs/sam4e-ek/src/sam_ethernet.c b/configs/sam4e-ek/src/sam_ethernet.c
index f243414a50..b949658ada 100644
--- a/configs/sam4e-ek/src/sam_ethernet.c
+++ b/configs/sam4e-ek/src/sam_ethernet.c
@@ -75,10 +75,18 @@
 
 #ifdef CONFIG_NETDEV_PHY_DEBUG
 #  define phyerr    err
+#  define phywarn   warn
+#  define phyinfo   info
 #  define phyllerr  llerr
+#  define phyllwarn llwarn
+#  define phyllinfo llinfo
 #else
 #  define phyerr(x...)
+#  define phywarn(x...)
+#  define phyinfo(x...)
 #  define phyllerr(x...)
+#  define phyllwarn(x...)
+#  define phyllinfo(x...)
 #endif
 
 /************************************************************************************
@@ -100,7 +108,7 @@ static xcpt_t g_emac_handler;
 #ifdef CONFIG_SAM34_GPIOD_IRQ
 static void sam_emac_phy_enable(bool enable)
 {
-  phyerr("IRQ%d: enable=%d\n", SAM_PHY_IRQ, enable);
+  phyinfo("IRQ%d: enable=%d\n", SAM_PHY_IRQ, enable);
   if (enable)
     {
       sam_gpioirqenable(SAM_PHY_IRQ);
@@ -126,7 +134,7 @@ static void sam_emac_phy_enable(bool enable)
 
 void weak_function sam_netinitialize(void)
 {
-  phyerr("Configuring %08x\n", GPIO_PHY_IRQ);
+  phyinfo("Configuring %08x\n", GPIO_PHY_IRQ);
   sam_configgpio(GPIO_PHY_IRQ);
 }
 
@@ -206,11 +214,11 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
   DEBUGASSERT(intf);
 
   ninfo("%s: handler=%p\n", intf, handler);
-  phyerr("EMAC: devname=%s\n", SAM34_EMAC_DEVNAME);
+  phyinfo("EMAC: devname=%s\n", SAM34_EMAC_DEVNAME);
 
   if (strcmp(intf, SAM34_EMAC_DEVNAME) == 0)
     {
-      phyerr("Select EMAC\n");
+      phyinfo("Select EMAC\n");
       phandler = &g_emac_handler;
       pinset   = GPIO_PHY_IRQ;
       irq      = SAM_PHY_IRQ;
@@ -218,7 +226,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
     }
   else
     {
-      nerr("Unsupported interface: %s\n", intf);
+      nerr("ERROR: Unsupported interface: %s\n", intf);
       return NULL;
     }
 
@@ -237,15 +245,15 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
 
   if (handler)
     {
-      phyerr("Configure pin: %08x\n", pinset);
+      phyinfo("Configure pin: %08x\n", pinset);
       sam_gpioirq(pinset);
 
-      phyerr("Attach IRQ%d\n", irq);
+      phyinfo("Attach IRQ%d\n", irq);
       (void)irq_attach(irq, handler);
     }
   else
     {
-      phyerr("Detach IRQ%d\n", irq);
+      phyinfo("Detach IRQ%d\n", irq);
       (void)irq_detach(irq);
       enabler = NULL;
     }
diff --git a/configs/sam4e-ek/src/sam_hsmci.c b/configs/sam4e-ek/src/sam_hsmci.c
index d9d0d675ab..b10dc5c2fc 100644
--- a/configs/sam4e-ek/src/sam_hsmci.c
+++ b/configs/sam4e-ek/src/sam_hsmci.c
@@ -144,7 +144,7 @@ int sam_hsmci_initialize(int minor)
       g_hsmci.hsmci = sdio_initialize(0);
       if (!g_hsmci.hsmci)
         {
-          ferr("Failed to initialize SDIO\n");
+          ferr("ERROR: Failed to initialize SDIO\n");
           return -ENODEV;
         }
 
@@ -153,7 +153,7 @@ int sam_hsmci_initialize(int minor)
       ret = mmcsd_slotinitialize(minor, g_hsmci.hsmci);
       if (ret != OK)
         {
-          ferr("Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
+          ferr("ERROR: Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/sam4e-ek/src/sam_udp.c b/configs/sam4e-ek/src/sam_udp.c
index 7ed32cb291..d275ffef74 100644
--- a/configs/sam4e-ek/src/sam_udp.c
+++ b/configs/sam4e-ek/src/sam_udp.c
@@ -83,5 +83,5 @@
 
 void sam_udp_suspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ullerr("resume: %d\n", resume);
+  ullinfo("resume: %d\n", resume);
 }
diff --git a/configs/sam4l-xplained/src/sam_mmcsd.c b/configs/sam4l-xplained/src/sam_mmcsd.c
index f4603d8107..4cd42ab6c2 100644
--- a/configs/sam4l-xplained/src/sam_mmcsd.c
+++ b/configs/sam4l-xplained/src/sam_mmcsd.c
@@ -99,7 +99,7 @@ int sam_sdinitialize(int minor)
   spi = sam_spibus_initialize(SD_CSNO);
   if (!spi)
     {
-      ferr("Failed to initialize SPI chip select %d\n", SD_CSNO);
+      ferr("ERROR: Failed to initialize SPI chip select %d\n", SD_CSNO);
       return -ENODEV;
     }
 
@@ -113,7 +113,7 @@ int sam_sdinitialize(int minor)
   ret = mmcsd_spislotinitialize(minor, SAM34_MMCSDSLOTNO, spi);
   if (ret < 0)
     {
-      ferr("Failed to bind SPI chip select %d to MMC/SD slot %d: %d\n",
+      ferr("ERROR: Failed to bind SPI chip select %d to MMC/SD slot %d: %d\n",
             SD_CSNO, SAM34_MMCSDSLOTNO, ret);
       return ret;
     }
diff --git a/configs/sam4l-xplained/src/sam_ug2832hsweg04.c b/configs/sam4l-xplained/src/sam_ug2832hsweg04.c
index a6a7e9cfda..e2de87e24a 100644
--- a/configs/sam4l-xplained/src/sam_ug2832hsweg04.c
+++ b/configs/sam4l-xplained/src/sam_ug2832hsweg04.c
@@ -157,7 +157,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
   spi = sam_spibus_initialize(OLED_CSNO);
   if (!spi)
     {
-      lcderr("Failed to initialize SPI port 1\n");
+      lcderr("ERROR: Failed to initialize SPI port 1\n");
     }
   else
     {
@@ -166,7 +166,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
       dev = ssd1306_initialize(spi, devno);
       if (!dev)
         {
-          lcderr("Failed to bind SPI port 1 to OLED %d: %d\n", devno);
+          lcderr("ERROR: Failed to bind SPI port 1 to OLED %d: %d\n", devno);
         }
      else
         {
diff --git a/configs/sam4s-xplained-pro/src/sam_hsmci.c b/configs/sam4s-xplained-pro/src/sam_hsmci.c
index d7404ddd37..d01a199815 100644
--- a/configs/sam4s-xplained-pro/src/sam_hsmci.c
+++ b/configs/sam4s-xplained-pro/src/sam_hsmci.c
@@ -135,7 +135,7 @@ static int sam_hsmci_cardetect_int(int irq, void *regs)
 int sam_hsmci_initialize(void)
 {
   int ret;
-  ferr("Initializing SDIO\n");
+  finfo("Initializing SDIO\n");
 
   /* Have we already initialized? */
 
@@ -147,7 +147,7 @@ int sam_hsmci_initialize(void)
       g_hsmci.hsmci = sdio_initialize(CONFIG_NSH_MMCSDSLOTNO);
       if (!g_hsmci.hsmci)
         {
-          ferr("Failed to initialize SDIO\n");
+          ferr("ERROR: Failed to initialize SDIO\n");
           return -ENODEV;
         }
 
@@ -156,7 +156,7 @@ int sam_hsmci_initialize(void)
       ret = mmcsd_slotinitialize(CONFIG_NSH_MMCSDMINOR, g_hsmci.hsmci);
       if (ret != OK)
         {
-          ferr("Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
+          ferr("ERROR: Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/sam4s-xplained-pro/src/sam_tc.c b/configs/sam4s-xplained-pro/src/sam_tc.c
index ab036d212b..12b374a738 100644
--- a/configs/sam4s-xplained-pro/src/sam_tc.c
+++ b/configs/sam4s-xplained-pro/src/sam_tc.c
@@ -211,7 +211,7 @@ int sam_timerinitialize(void)
   fd = open(CONFIG_SAM4S_XPLAINED_PRO_SCHED_TIMER_DEVPATH, O_RDONLY);
   if (fd < 0)
     {
-      tcerr("open %s failed: %d\n",
+      tcerr("ERROR: open %s failed: %d\n",
             CONFIG_SAM4S_XPLAINED_PRO_SCHED_TIMER_DEVPATH, errno);
       goto errout;
     }
@@ -222,7 +222,7 @@ int sam_timerinitialize(void)
   ret = ioctl(fd, TCIOC_SETTIMEOUT, (unsigned long)USEC_PER_TICK);
   if (ret < 0)
     {
-      tcerr("ioctl(TCIOC_SETTIMEOUT) failed: %d\n", errno);
+      tcerr("ERROR: ioctl(TCIOC_SETTIMEOUT) failed: %d\n", errno);
       goto errout_with_dev;
     }
 
@@ -235,7 +235,7 @@ int sam_timerinitialize(void)
     ret = ioctl(fd, TCIOC_SETHANDLER, (unsigned long)&tccb);
     if (ret < 0)
       {
-        tcerr("ioctl(TCIOC_SETHANDLER) failed: %d\n", errno);
+        tcerr("ERROR: ioctl(TCIOC_SETHANDLER) failed: %d\n", errno);
         goto errout_with_dev;
       }
   }
@@ -246,7 +246,7 @@ int sam_timerinitialize(void)
   ret = ioctl(fd, TCIOC_START, 0);
   if (ret < 0)
     {
-      tcerr("ioctl(TCIOC_START) failed: %d\n", errno);
+      tcerr("ERROR: ioctl(TCIOC_START) failed: %d\n", errno);
       goto errout_with_dev;
     }
 #endif
@@ -259,7 +259,7 @@ int sam_timerinitialize(void)
   fd = open(CONFIG_SAM4S_XPLAINED_PRO_CPULOAD_TIMER_DEVPATH, O_RDONLY);
   if (fd < 0)
     {
-      tcerr("open %s failed: %d\n",
+      tcerr("ERROR: open %s failed: %d\n",
             CONFIG_SAM4S_XPLAINED_PRO_CPULOAD_TIMER_DEVPATH, errno);
       goto errout;
     }
@@ -272,7 +272,7 @@ int sam_timerinitialize(void)
              (unsigned long)1000000 / CONFIG_SCHED_CPULOAD_TICKSPERSEC);
   if (ret < 0)
     {
-      tcerr("ioctl(TCIOC_SETTIMEOUT) failed: %d\n", errno);
+      tcerr("ERROR: ioctl(TCIOC_SETTIMEOUT) failed: %d\n", errno);
       goto errout_with_dev;
     }
 
@@ -286,7 +286,7 @@ int sam_timerinitialize(void)
     ret = ioctl(fd, TCIOC_SETHANDLER, (unsigned long)&tccb);
     if (ret < 0)
       {
-        tcerr("ioctl(TCIOC_SETHANDLER) failed: %d\n", errno);
+        tcerr("ERROR: ioctl(TCIOC_SETHANDLER) failed: %d\n", errno);
         goto errout_with_dev;
       }
   }
@@ -297,7 +297,7 @@ int sam_timerinitialize(void)
   ret = ioctl(fd, TCIOC_START, 0);
   if (ret < 0)
     {
-      tcerr("ioctl(TCIOC_START) failed: %d\n", errno);
+      tcerr("ERROR: ioctl(TCIOC_START) failed: %d\n", errno);
       goto errout_with_dev;
     }
 #endif
diff --git a/configs/sam4s-xplained-pro/src/sam_udp.c b/configs/sam4s-xplained-pro/src/sam_udp.c
index 6ea2507bec..2f83c9d12f 100644
--- a/configs/sam4s-xplained-pro/src/sam_udp.c
+++ b/configs/sam4s-xplained-pro/src/sam_udp.c
@@ -84,5 +84,5 @@
 
 void sam_udp_suspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ullerr("resume: %d\n", resume);
+  ullinfo("resume: %d\n", resume);
 }
diff --git a/configs/sam4s-xplained-pro/src/sam_wdt.c b/configs/sam4s-xplained-pro/src/sam_wdt.c
index 1229069905..5ad2a36255 100644
--- a/configs/sam4s-xplained-pro/src/sam_wdt.c
+++ b/configs/sam4s-xplained-pro/src/sam_wdt.c
@@ -128,7 +128,7 @@ static int wdog_daemon(int argc, char *argv[])
   fd = open(CONFIG_WATCHDOG_DEVPATH, O_RDONLY);
   if (fd < 0)
     {
-      wdgerr("open %s failed: %d\n", CONFIG_WATCHDOG_DEVPATH, errno);
+      wdgerr("ERROR: open %s failed: %d\n", CONFIG_WATCHDOG_DEVPATH, errno);
       goto errout;
     }
 
@@ -138,7 +138,7 @@ static int wdog_daemon(int argc, char *argv[])
   ret = ioctl(fd, WDIOC_START, 0);
   if (ret < 0)
     {
-      wdgerr("ioctl(WDIOC_START) failed: %d\n", errno);
+      wdgerr("ERROR: ioctl(WDIOC_START) failed: %d\n", errno);
       goto errout_with_dev;
     }
 
@@ -151,7 +151,7 @@ static int wdog_daemon(int argc, char *argv[])
       ret = ioctl(fd, WDIOC_KEEPALIVE, 0);
       if (ret < 0)
         {
-          wdgerr("ioctl(WDIOC_KEEPALIVE) failed: %d\n", errno);
+          wdgerr("ERROR: ioctl(WDIOC_KEEPALIVE) failed: %d\n", errno);
           goto errout_with_dev;
         }
     }
@@ -190,7 +190,7 @@ int sam_watchdog_initialize(void)
   fd = open(CONFIG_WATCHDOG_DEVPATH, O_RDONLY);
   if (fd < 0)
     {
-      wdgerr("open %s failed: %d\n", CONFIG_WATCHDOG_DEVPATH, errno);
+      wdgerr("ERROR: open %s failed: %d\n", CONFIG_WATCHDOG_DEVPATH, errno);
       goto errout;
     }
 
@@ -200,7 +200,7 @@ int sam_watchdog_initialize(void)
   ret = ioctl(fd, WDIOC_SETTIMEOUT, (unsigned long)CONFIG_WDT_TIMEOUT);
   if (ret < 0)
     {
-      wdgerr("ioctl(WDIOC_SETTIMEOUT) failed: %d\n", errno);
+      wdgerr("ERROR: ioctl(WDIOC_SETTIMEOUT) failed: %d\n", errno);
       goto errout_with_dev;
     }
 
@@ -210,7 +210,7 @@ int sam_watchdog_initialize(void)
   ret = ioctl(fd, WDIOC_MINTIME, (unsigned long)CONFIG_WDT_MINTIME);
   if (ret < 0)
     {
-      wdgerr("ioctl(WDIOC_MINTIME) failed: %d\n", errno);
+      wdgerr("ERROR: ioctl(WDIOC_MINTIME) failed: %d\n", errno);
       goto errout_with_dev;
     }
 
diff --git a/configs/sama5d3-xplained/src/sam_adc.c b/configs/sama5d3-xplained/src/sam_adc.c
index 876669ad56..797dbe182e 100644
--- a/configs/sama5d3-xplained/src/sam_adc.c
+++ b/configs/sama5d3-xplained/src/sam_adc.c
@@ -97,7 +97,7 @@ int board_adc_initialize(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          aerr("adc_register failed: %d\n", ret);
+          aerr("ERROR: adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/sama5d3-xplained/src/sam_ethernet.c b/configs/sama5d3-xplained/src/sam_ethernet.c
index d7a29ed54e..c6ef0d3f53 100644
--- a/configs/sama5d3-xplained/src/sam_ethernet.c
+++ b/configs/sama5d3-xplained/src/sam_ethernet.c
@@ -85,10 +85,18 @@
 
 #ifdef CONFIG_NETDEV_PHY_DEBUG
 #  define phyerr    err
+#  define phywarn   warn
+#  define phyinfo   info
 #  define phyllerr  llerr
+#  define phyllwarn llwarn
+#  define phyllinfo llinfo
 #else
 #  define phyerr(x...)
+#  define phywarn(x...)
+#  define phyinfo(x...)
 #  define phyllerr(x...)
+#  define phyllwarn(x...)
+#  define phyllinfo(x...)
 #endif
 
 /************************************************************************************
@@ -116,7 +124,7 @@ static xcpt_t g_gmac_handler;
 #ifdef CONFIG_SAMA5_EMACA
 static void sam_emac_phy_enable(bool enable)
 {
-  phyerr("IRQ%d: enable=%d\n", IRQ_INT_ETH1, enable);
+  phyinfo("IRQ%d: enable=%d\n", IRQ_INT_ETH1, enable);
   if (enable)
     {
       sam_pioirqenable(IRQ_INT_ETH1);
@@ -132,7 +140,7 @@ static void sam_emac_phy_enable(bool enable)
 #ifdef CONFIG_SAMA5_GMAC
 static void sam_gmac_phy_enable(bool enable)
 {
-  phyerr("IRQ%d: enable=%d\n", IRQ_INT_ETH0, enable);
+  phyinfo("IRQ%d: enable=%d\n", IRQ_INT_ETH0, enable);
   if (enable)
     {
       sam_pioirqenable(IRQ_INT_ETH0);
@@ -179,7 +187,7 @@ void weak_function sam_netinitialize(void)
    * The KSZ8051 PHY interrupt is available on PE30 INT_ETH1
   */
 
-  phyerr("Configuring %08x\n", PIO_INT_ETH1);
+  phyinfo("Configuring %08x\n", PIO_INT_ETH1);
   sam_configpio(PIO_INT_ETH1);
 #endif
 
@@ -196,7 +204,7 @@ void weak_function sam_netinitialize(void)
    * The KSZ9021/31 interrupt is available on PB35 INT_GETH0
    */
 
-  phyerr("Configuring %08x\n", PIO_INT_ETH0);
+  phyinfo("Configuring %08x\n", PIO_INT_ETH0);
   sam_configpio(PIO_INT_ETH0);
 #endif
 }
@@ -278,16 +286,16 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
 
   ninfo("%s: handler=%p\n", intf, handler);
 #ifdef CONFIG_SAMA5_EMACA
-  phyerr("EMAC: devname=%s\n", SAMA5_EMAC_DEVNAME);
+  phyinfo("EMAC: devname=%s\n", SAMA5_EMAC_DEVNAME);
 #endif
 #ifdef CONFIG_SAMA5_GMAC
-  phyerr("GMAC: devname=%s\n", SAMA5_GMAC_DEVNAME);
+  phyinfo("GMAC: devname=%s\n", SAMA5_GMAC_DEVNAME);
 #endif
 
 #ifdef CONFIG_SAMA5_EMACA
   if (strcmp(intf, SAMA5_EMAC_DEVNAME) == 0)
     {
-      phyerr("Select EMAC\n");
+      phyinfo("Select EMAC\n");
       phandler = &g_emac_handler;
       pinset   = PIO_INT_ETH1;
       irq      = IRQ_INT_ETH1;
@@ -298,7 +306,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
 #ifdef CONFIG_SAMA5_GMAC
   if (strcmp(intf, SAMA5_GMAC_DEVNAME) == 0)
     {
-      phyerr("Select GMAC\n");
+      phyinfo("Select GMAC\n");
       phandler = &g_gmac_handler;
       pinset   = PIO_INT_ETH0;
       irq      = IRQ_INT_ETH0;
@@ -307,7 +315,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
   else
 #endif
     {
-      nerr("Unsupported interface: %s\n", intf);
+      nerr("ERROR: Unsupported interface: %s\n", intf);
       return NULL;
     }
 
@@ -326,15 +334,15 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
 
   if (handler)
     {
-      phyerr("Configure pin: %08x\n", pinset);
+      phyinfo("Configure pin: %08x\n", pinset);
       sam_pioirq(pinset);
 
-      phyerr("Attach IRQ%d\n", irq);
+      phyinfo("Attach IRQ%d\n", irq);
       (void)irq_attach(irq, handler);
     }
   else
     {
-      phyerr("Detach IRQ%d\n", irq);
+      phyinfo("Detach IRQ%d\n", irq);
       (void)irq_detach(irq);
       enabler = NULL;
     }
diff --git a/configs/sama5d3-xplained/src/sam_hsmci.c b/configs/sama5d3-xplained/src/sam_hsmci.c
index a3416189fb..cbb8e3b654 100644
--- a/configs/sama5d3-xplained/src/sam_hsmci.c
+++ b/configs/sama5d3-xplained/src/sam_hsmci.c
@@ -257,7 +257,7 @@ int sam_hsmci_initialize(int slotno, int minor)
   state = sam_hsmci_state(slotno);
   if (!state)
     {
-      ferr("No state for slotno %d\n", slotno);
+      ferr("ERROR: No state for slotno %d\n", slotno);
       return -EINVAL;
     }
 
@@ -271,7 +271,7 @@ int sam_hsmci_initialize(int slotno, int minor)
   state->hsmci = sdio_initialize(slotno);
   if (!state->hsmci)
     {
-      ferr("Failed to initialize SDIO slot %d\n",  slotno);
+      ferr("ERROR: Failed to initialize SDIO slot %d\n",  slotno);
       return -ENODEV;
     }
 
@@ -280,7 +280,7 @@ int sam_hsmci_initialize(int slotno, int minor)
   ret = mmcsd_slotinitialize(minor, state->hsmci);
   if (ret != OK)
     {
-      ferr("Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
+      ferr("ERROR: Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
       return ret;
     }
 
@@ -317,7 +317,7 @@ bool sam_cardinserted(int slotno)
   state = sam_hsmci_state(slotno);
   if (!state)
     {
-      ferr("No state for slotno %d\n", slotno);
+      ferr("ERROR: No state for slotno %d\n", slotno);
       return false;
     }
 
diff --git a/configs/sama5d3-xplained/src/sam_pwm.c b/configs/sama5d3-xplained/src/sam_pwm.c
index 15be11b576..cd78ff2338 100644
--- a/configs/sama5d3-xplained/src/sam_pwm.c
+++ b/configs/sama5d3-xplained/src/sam_pwm.c
@@ -139,7 +139,7 @@ int board_pwm_setup(void)
       pwm = sam_pwminitialize(CONFIG_SAMA5D3XPLAINED_CHANNEL);
       if (!pwm)
         {
-          err("Failed to get the SAMA5 PWM lower half\n");
+          err("ERROR: Failed to get the SAMA5 PWM lower half\n");
           return -ENODEV;
         }
 
@@ -148,7 +148,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          aerr("pwm_register failed: %d\n", ret);
+          aerr("ERROR: pwm_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/sama5d3-xplained/src/sam_usb.c b/configs/sama5d3-xplained/src/sam_usb.c
index a12e09f31b..98aafc0dbb 100644
--- a/configs/sama5d3-xplained/src/sam_usb.c
+++ b/configs/sama5d3-xplained/src/sam_usb.c
@@ -546,7 +546,7 @@ xcpt_t sam_setup_overcurrent(xcpt_t handler)
 #ifdef CONFIG_USBDEV
 void sam_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ullerr("resume: %d\n", resume);
+  ullinfo("resume: %d\n", resume);
 }
 #endif
 
diff --git a/configs/sama5d3x-ek/src/sam_adc.c b/configs/sama5d3x-ek/src/sam_adc.c
index 2c9c5e974f..2600ffd098 100644
--- a/configs/sama5d3x-ek/src/sam_adc.c
+++ b/configs/sama5d3x-ek/src/sam_adc.c
@@ -101,7 +101,7 @@ int board_adc_setup(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          aerr("adc_register failed: %d\n", ret);
+          aerr("ERROR: adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/sama5d3x-ek/src/sam_ethernet.c b/configs/sama5d3x-ek/src/sam_ethernet.c
index 4285577a03..ec7a9a21c6 100644
--- a/configs/sama5d3x-ek/src/sam_ethernet.c
+++ b/configs/sama5d3x-ek/src/sam_ethernet.c
@@ -85,10 +85,18 @@
 
 #ifdef CONFIG_NETDEV_PHY_DEBUG
 #  define phyerr    err
+#  define phywarn   warn
+#  define phyinfo   info
 #  define phyllerr  llerr
+#  define phyllwarn llwarn
+#  define phyllinfo llinfo
 #else
 #  define phyerr(x...)
+#  define phywarn(x...)
+#  define phyinfo(x...)
 #  define phyllerr(x...)
+#  define phyllwarn(x...)
+#  define phyllinfo(x...)
 #endif
 
 /************************************************************************************
@@ -116,7 +124,7 @@ static xcpt_t g_gmac_handler;
 #ifdef CONFIG_SAMA5_EMACA
 static void sam_emac_phy_enable(bool enable)
 {
-  phyerr("IRQ%d: enable=%d\n", IRQ_INT_ETH1, enable);
+  phyinfo("IRQ%d: enable=%d\n", IRQ_INT_ETH1, enable);
   if (enable)
     {
       sam_pioirqenable(IRQ_INT_ETH1);
@@ -132,7 +140,7 @@ static void sam_emac_phy_enable(bool enable)
 #ifdef CONFIG_SAMA5_GMAC
 static void sam_gmac_phy_enable(bool enable)
 {
-  phyerr("IRQ%d: enable=%d\n", IRQ_INT_ETH0, enable);
+  phyinfo("IRQ%d: enable=%d\n", IRQ_INT_ETH0, enable);
   if (enable)
     {
       sam_pioirqenable(IRQ_INT_ETH0);
@@ -179,7 +187,7 @@ void weak_function sam_netinitialize(void)
    * The KSZ8051 PHY interrupt is available on PE30 INT_ETH1
    */
 
-  phyerr("Configuring %08x\n", PIO_INT_ETH1);
+  phyinfo("Configuring %08x\n", PIO_INT_ETH1);
   sam_configpio(PIO_INT_ETH1);
 #endif
 
@@ -196,7 +204,7 @@ void weak_function sam_netinitialize(void)
    * The KSZ9021/31 interrupt is available on PB35 INT_GETH0
    */
 
-  phyerr("Configuring %08x\n", PIO_INT_ETH0);
+  phyinfo("Configuring %08x\n", PIO_INT_ETH0);
   sam_configpio(PIO_INT_ETH0);
 #endif
 }
@@ -278,16 +286,16 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
 
   ninfo("%s: handler=%p\n", intf, handler);
 #ifdef CONFIG_SAMA5_EMACA
-  phyerr("EMAC: devname=%s\n", SAMA5_EMAC_DEVNAME);
+  phyinfo("EMAC: devname=%s\n", SAMA5_EMAC_DEVNAME);
 #endif
 #ifdef CONFIG_SAMA5_GMAC
-  phyerr("GMAC: devname=%s\n", SAMA5_GMAC_DEVNAME);
+  phyinfo("GMAC: devname=%s\n", SAMA5_GMAC_DEVNAME);
 #endif
 
 #ifdef CONFIG_SAMA5_EMACA
   if (strcmp(intf, SAMA5_EMAC_DEVNAME) == 0)
     {
-      phyerr("Select EMAC\n");
+      phyinfo("Select EMAC\n");
       phandler = &g_emac_handler;
       pinset   = PIO_INT_ETH1;
       irq      = IRQ_INT_ETH1;
@@ -298,7 +306,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
 #ifdef CONFIG_SAMA5_GMAC
   if (strcmp(intf, SAMA5_GMAC_DEVNAME) == 0)
     {
-      phyerr("Select GMAC\n");
+      phyinfo("Select GMAC\n");
       phandler = &g_gmac_handler;
       pinset   = PIO_INT_ETH0;
       irq      = IRQ_INT_ETH0;
@@ -307,7 +315,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
   else
 #endif
     {
-      nerr("Unsupported interface: %s\n", intf);
+      nerr("ERROR: Unsupported interface: %s\n", intf);
       return NULL;
     }
 
@@ -326,15 +334,15 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
 
   if (handler)
     {
-      phyerr("Configure pin: %08x\n", pinset);
+      phyinfo("Configure pin: %08x\n", pinset);
       sam_pioirq(pinset);
 
-      phyerr("Attach IRQ%d\n", irq);
+      phyinfo("Attach IRQ%d\n", irq);
       (void)irq_attach(irq, handler);
     }
   else
     {
-      phyerr("Detach IRQ%d\n", irq);
+      phyinfo("Detach IRQ%d\n", irq);
       (void)irq_detach(irq);
       enabler = NULL;
     }
diff --git a/configs/sama5d3x-ek/src/sam_hsmci.c b/configs/sama5d3x-ek/src/sam_hsmci.c
index 5976b2ca3e..8cbcfa4e40 100644
--- a/configs/sama5d3x-ek/src/sam_hsmci.c
+++ b/configs/sama5d3x-ek/src/sam_hsmci.c
@@ -257,7 +257,7 @@ int sam_hsmci_initialize(int slotno, int minor)
   state = sam_hsmci_state(slotno);
   if (!state)
     {
-      ferr("No state for slotno %d\n", slotno);
+      ferr("ERROR: No state for slotno %d\n", slotno);
       return -EINVAL;
     }
 
@@ -271,7 +271,7 @@ int sam_hsmci_initialize(int slotno, int minor)
   state->hsmci = sdio_initialize(slotno);
   if (!state->hsmci)
     {
-      ferr("Failed to initialize SDIO slot %d\n",  slotno);
+      ferr("ERROR: Failed to initialize SDIO slot %d\n",  slotno);
       return -ENODEV;
     }
 
@@ -280,7 +280,7 @@ int sam_hsmci_initialize(int slotno, int minor)
   ret = mmcsd_slotinitialize(minor, state->hsmci);
   if (ret != OK)
     {
-      ferr("Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
+      ferr("ERROR: Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
       return ret;
     }
 
@@ -317,7 +317,7 @@ bool sam_cardinserted(int slotno)
   state = sam_hsmci_state(slotno);
   if (!state)
     {
-      ferr("No state for slotno %d\n", slotno);
+      ferr("ERROR: No state for slotno %d\n", slotno);
       return false;
     }
 
diff --git a/configs/sama5d3x-ek/src/sam_pwm.c b/configs/sama5d3x-ek/src/sam_pwm.c
index 6bafa8c2db..26d14ce4dc 100644
--- a/configs/sama5d3x-ek/src/sam_pwm.c
+++ b/configs/sama5d3x-ek/src/sam_pwm.c
@@ -139,7 +139,7 @@ int board_pwm_setup(void)
       pwm = sam_pwminitialize(CONFIG_SAMA5D3xEK_CHANNEL);
       if (!pwm)
         {
-          err("Failed to get the SAMA5 PWM lower half\n");
+          err("ERROR: Failed to get the SAMA5 PWM lower half\n");
           return -ENODEV;
         }
 
@@ -148,7 +148,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          aerr("pwm_register failed: %d\n", ret);
+          aerr("ERROR: pwm_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/sama5d3x-ek/src/sam_touchscreen.c b/configs/sama5d3x-ek/src/sam_touchscreen.c
index 2b03f01cb1..ba5126643a 100644
--- a/configs/sama5d3x-ek/src/sam_touchscreen.c
+++ b/configs/sama5d3x-ek/src/sam_touchscreen.c
@@ -108,7 +108,7 @@ int board_tsc_setup(int minor)
   static bool initialized = false;
   int ret;
 
-  ierr("initialized:%d minor:%d\n", initialized, minor);
+  iinfo("initialized:%d minor:%d\n", initialized, minor);
   DEBUGASSERT(minor == 0);
 
   /* Since there is no uninitialized logic, this initialization can be
diff --git a/configs/sama5d3x-ek/src/sam_usb.c b/configs/sama5d3x-ek/src/sam_usb.c
index 91b5cfbf9c..e8d7c5c705 100644
--- a/configs/sama5d3x-ek/src/sam_usb.c
+++ b/configs/sama5d3x-ek/src/sam_usb.c
@@ -538,7 +538,7 @@ xcpt_t sam_setup_overcurrent(xcpt_t handler)
 #ifdef CONFIG_USBDEV
 void sam_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ullerr("resume: %d\n", resume);
+  ullinfo("resume: %d\n", resume);
 }
 #endif
 
diff --git a/configs/sama5d3x-ek/src/sam_wm8904.c b/configs/sama5d3x-ek/src/sam_wm8904.c
index 4df81d2178..7727afcd35 100644
--- a/configs/sama5d3x-ek/src/sam_wm8904.c
+++ b/configs/sama5d3x-ek/src/sam_wm8904.c
@@ -253,7 +253,7 @@ int sam_wm8904_initialize(int minor)
   char devname[12];
   int ret;
 
-  auderr("minor %d\n", minor);
+  audinfo("minor %d\n", minor);
   DEBUGASSERT(minor >= 0 && minor <= 25);
 
   /* Have we already initialized?  Since we never uninitialize we must prevent
@@ -273,7 +273,7 @@ int sam_wm8904_initialize(int minor)
       i2c = sam_i2cbus_initialize(WM8904_TWI_BUS);
       if (!i2c)
         {
-          auderr("Failed to initialize TWI%d\n", WM8904_TWI_BUS);
+          auderr("ERROR: Failed to initialize TWI%d\n", WM8904_TWI_BUS);
           ret = -ENODEV;
           goto errout;
         }
@@ -283,7 +283,7 @@ int sam_wm8904_initialize(int minor)
       i2s = sam_ssc_initialize(WM8904_SSC_BUS);
       if (!i2s)
         {
-          auderr("Failed to initialize SSC%d\n", WM8904_SSC_BUS);
+          auderr("ERROR: Failed to initialize SSC%d\n", WM8904_SSC_BUS);
           ret = -ENODEV;
           goto errout_with_i2c;
         }
@@ -325,7 +325,7 @@ int sam_wm8904_initialize(int minor)
       wm8904 = wm8904_initialize(i2c, i2s, &g_wm8904info.lower);
       if (!wm8904)
         {
-          auderr("Failed to initialize the WM8904\n");
+          auderr("ERROR: Failed to initialize the WM8904\n");
           ret = -ENODEV;
           goto errout_with_irq;
         }
diff --git a/configs/sama5d4-ek/src/sam_adc.c b/configs/sama5d4-ek/src/sam_adc.c
index 7615553455..762caccd20 100644
--- a/configs/sama5d4-ek/src/sam_adc.c
+++ b/configs/sama5d4-ek/src/sam_adc.c
@@ -100,7 +100,7 @@ int board_adc_setup(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          aerr("adc_register failed: %d\n", ret);
+          aerr("ERROR: adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/sama5d4-ek/src/sam_audio_null.c b/configs/sama5d4-ek/src/sam_audio_null.c
index f5bf2c5980..2777298deb 100644
--- a/configs/sama5d4-ek/src/sam_audio_null.c
+++ b/configs/sama5d4-ek/src/sam_audio_null.c
@@ -100,7 +100,7 @@ int sam_audio_null_initialize(int minor)
   char devname[12];
   int ret;
 
-  auderr("minor %d\n", minor);
+  audinfo("minor %d\n", minor);
   DEBUGASSERT(minor >= 0 && minor <= 25);
 
   /* Have we already initialized?  Since we never uninitialize we must prevent
@@ -117,7 +117,7 @@ int sam_audio_null_initialize(int minor)
       nullaudio = audio_null_initialize();
       if (!nullaudio)
         {
-          auderr("Failed to get the NULL audio interface\n");
+          auderr("ERROR: Failed to get the NULL audio interface\n");
           ret = -ENODEV;
           goto errout;
         }
diff --git a/configs/sama5d4-ek/src/sam_ethernet.c b/configs/sama5d4-ek/src/sam_ethernet.c
index 25cf9813b2..952d60771a 100644
--- a/configs/sama5d4-ek/src/sam_ethernet.c
+++ b/configs/sama5d4-ek/src/sam_ethernet.c
@@ -85,10 +85,18 @@
 
 #ifdef CONFIG_NETDEV_PHY_DEBUG
 #  define phyerr    err
+#  define phywarn   warn
+#  define phyinfo   info
 #  define phyllerr  llerr
+#  define phyllwarn llwarn
+#  define phyllinfo llinfo
 #else
 #  define phyerr(x...)
+#  define phywarn(x...)
+#  define phyinfo(x...)
 #  define phyllerr(x...)
+#  define phyllwarn(x...)
+#  define phyllinfo(x...)
 #endif
 
 /************************************************************************************
@@ -116,7 +124,7 @@ static xcpt_t g_emac1_handler;
 #ifdef CONFIG_SAMA5_EMAC0
 static void sam_emac0_phy_enable(bool enable)
 {
-  phyerr("IRQ%d: enable=%d\n", IRQ_INT_ETH0, enable);
+  phyinfo("IRQ%d: enable=%d\n", IRQ_INT_ETH0, enable);
   if (enable)
     {
       sam_pioirqenable(IRQ_INT_ETH0);
@@ -132,7 +140,7 @@ static void sam_emac0_phy_enable(bool enable)
 #ifdef CONFIG_SAMA5_EMAC1
 static void sam_emac1_phy_enable(bool enable)
 {
-  phyerr("IRQ%d: enable=%d\n", IRQ_INT_ETH1, enable);
+  phyinfo("IRQ%d: enable=%d\n", IRQ_INT_ETH1, enable);
   if (enable)
     {
       sam_pioirqenable(IRQ_INT_ETH1);
@@ -160,12 +168,12 @@ static void sam_emac1_phy_enable(bool enable)
 void weak_function sam_netinitialize(void)
 {
 #ifdef CONFIG_SAMA5_EMAC0
-  phyerr("Configuring %08x\n", PIO_INT_ETH0);
+  phyinfo("Configuring %08x\n", PIO_INT_ETH0);
   sam_configpio(PIO_INT_ETH0);
 #endif
 
 #ifdef CONFIG_SAMA5_EMAC1
-  phyerr("Configuring %08x\n", PIO_INT_ETH1);
+  phyinfo("Configuring %08x\n", PIO_INT_ETH1);
   sam_configpio(PIO_INT_ETH1);
 #endif
 }
@@ -247,16 +255,16 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
 
   ninfo("%s: handler=%p\n", intf, handler);
 #ifdef CONFIG_SAMA5_EMAC0
-  phyerr("EMAC0: devname=%s\n", SAMA5_EMAC0_DEVNAME);
+  phyinfo("EMAC0: devname=%s\n", SAMA5_EMAC0_DEVNAME);
 #endif
 #ifdef CONFIG_SAMA5_EMAC1
-  phyerr("EMAC1: devname=%s\n", SAMA5_EMAC1_DEVNAME);
+  phyinfo("EMAC1: devname=%s\n", SAMA5_EMAC1_DEVNAME);
 #endif
 
 #ifdef CONFIG_SAMA5_EMAC0
   if (strcmp(intf, SAMA5_EMAC0_DEVNAME) == 0)
     {
-      phyerr("Select EMAC0\n");
+      phyinfo("Select EMAC0\n");
       phandler = &g_emac0_handler;
       pinset   = PIO_INT_ETH0;
       irq      = IRQ_INT_ETH0;
@@ -267,7 +275,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
 #ifdef CONFIG_SAMA5_EMAC1
   if (strcmp(intf, SAMA5_EMAC1_DEVNAME) == 0)
     {
-      phyerr("Select EMAC1\n");
+      phyinfo("Select EMAC1\n");
       phandler = &g_emac1_handler;
       pinset   = PIO_INT_ETH1;
       irq      = IRQ_INT_ETH1;
@@ -276,7 +284,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
   else
 #endif
     {
-      nerr("Unsupported interface: %s\n", intf);
+      nerr("ERROR: Unsupported interface: %s\n", intf);
       return NULL;
     }
 
@@ -295,15 +303,15 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
 
   if (handler)
     {
-      phyerr("Configure pin: %08x\n", pinset);
+      phyinfo("Configure pin: %08x\n", pinset);
       sam_pioirq(pinset);
 
-      phyerr("Attach IRQ%d\n", irq);
+      phyinfo("Attach IRQ%d\n", irq);
       (void)irq_attach(irq, handler);
     }
   else
     {
-      phyerr("Detach IRQ%d\n", irq);
+      phyinfo("Detach IRQ%d\n", irq);
       (void)irq_detach(irq);
       enabler = NULL;
     }
diff --git a/configs/sama5d4-ek/src/sam_maxtouch.c b/configs/sama5d4-ek/src/sam_maxtouch.c
index 1129ba4c4b..adc98320ad 100644
--- a/configs/sama5d4-ek/src/sam_maxtouch.c
+++ b/configs/sama5d4-ek/src/sam_maxtouch.c
@@ -242,7 +242,7 @@ int board_tsc_setup(int minor)
   static bool initialized = false;
   int ret;
 
-  ierr("minor %d\n", minor);
+  iinfo("minor %d\n", minor);
   DEBUGASSERT(minor == 0);
 
   /* Have we already initialized?  Since we never uninitialize we must prevent
@@ -262,7 +262,7 @@ int board_tsc_setup(int minor)
       i2c = sam_i2cbus_initialize(MXT_TWI_BUS);
       if (!i2c)
         {
-          ierr("Failed to initialize I2C%d\n", MXT_TWI_BUS);
+          ierr("ERROR: Failed to initialize I2C%d\n", MXT_TWI_BUS);
           return -ENODEV;
         }
 
diff --git a/configs/sama5d4-ek/src/sam_pwm.c b/configs/sama5d4-ek/src/sam_pwm.c
index 10496a6cd9..5e74de17f1 100644
--- a/configs/sama5d4-ek/src/sam_pwm.c
+++ b/configs/sama5d4-ek/src/sam_pwm.c
@@ -139,7 +139,7 @@ int board_pwm_setup(void)
       pwm = sam_pwminitialize(CONFIG_SAMA5D4EK_CHANNEL);
       if (!pwm)
         {
-          err("Failed to get the SAMA5 PWM lower half\n");
+          err("ERROR: Failed to get the SAMA5 PWM lower half\n");
           return -ENODEV;
         }
 
@@ -148,7 +148,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          aerr("pwm_register failed: %d\n", ret);
+          aerr("ERROR: pwm_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/sama5d4-ek/src/sam_usb.c b/configs/sama5d4-ek/src/sam_usb.c
index f2009f6361..3b9bbc407c 100644
--- a/configs/sama5d4-ek/src/sam_usb.c
+++ b/configs/sama5d4-ek/src/sam_usb.c
@@ -539,7 +539,7 @@ xcpt_t sam_setup_overcurrent(xcpt_t handler)
 #ifdef CONFIG_USBDEV
 void sam_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ullerr("resume: %d\n", resume);
+  ullinfo("resume: %d\n", resume);
 }
 #endif
 
diff --git a/configs/sama5d4-ek/src/sam_wm8904.c b/configs/sama5d4-ek/src/sam_wm8904.c
index 17c50ffc4d..7afb4b85af 100644
--- a/configs/sama5d4-ek/src/sam_wm8904.c
+++ b/configs/sama5d4-ek/src/sam_wm8904.c
@@ -253,7 +253,7 @@ int sam_wm8904_initialize(int minor)
   char devname[12];
   int ret;
 
-  auderr("minor %d\n", minor);
+  audinfo("minor %d\n", minor);
   DEBUGASSERT(minor >= 0 && minor <= 25);
 
   /* Have we already initialized?  Since we never uninitialize we must prevent
@@ -273,7 +273,7 @@ int sam_wm8904_initialize(int minor)
       i2c = sam_i2cbus_initialize(WM8904_TWI_BUS);
       if (!i2c)
         {
-          auderr("Failed to initialize TWI%d\n", WM8904_TWI_BUS);
+          auderr("ERROR: Failed to initialize TWI%d\n", WM8904_TWI_BUS);
           ret = -ENODEV;
           goto errout;
         }
@@ -283,7 +283,7 @@ int sam_wm8904_initialize(int minor)
       i2s = sam_ssc_initialize(WM8904_SSC_BUS);
       if (!i2s)
         {
-          auderr("Failed to initialize SSC%d\n", WM8904_SSC_BUS);
+          auderr("ERROR: Failed to initialize SSC%d\n", WM8904_SSC_BUS);
           ret = -ENODEV;
           goto errout_with_i2c;
         }
@@ -325,7 +325,7 @@ int sam_wm8904_initialize(int minor)
       wm8904 = wm8904_initialize(i2c, i2s, &g_wm8904info.lower);
       if (!wm8904)
         {
-          auderr("Failed to initialize the WM8904\n");
+          auderr("ERROR: Failed to initialize the WM8904\n");
           ret = -ENODEV;
           goto errout_with_irq;
         }
diff --git a/configs/samd20-xplained/src/sam_mmcsd.c b/configs/samd20-xplained/src/sam_mmcsd.c
index 1cfe12e2ec..1470db2a1a 100644
--- a/configs/samd20-xplained/src/sam_mmcsd.c
+++ b/configs/samd20-xplained/src/sam_mmcsd.c
@@ -100,7 +100,7 @@ int sam_sdinitialize(int port, int minor)
   spi = sam_spibus_initialize(port);
   if (!spi)
     {
-      ferr("Failed to initialize SPI%d\n", port);
+      ferr("ERROR: Failed to initialize SPI%d\n", port);
       return -ENODEV;
     }
 
@@ -113,7 +113,7 @@ int sam_sdinitialize(int port, int minor)
   ret = mmcsd_spislotinitialize(minor, SAMDL_MMCSDSLOTNO, spi);
   if (ret < 0)
     {
-      ferr("Failed to bind SPI%d to MMC/SD slot %d: %d\n",
+      ferr("ERROR: Failed to bind SPI%d to MMC/SD slot %d: %d\n",
             port, SAMDL_MMCSDSLOTNO, ret);
       return ret;
     }
diff --git a/configs/samd20-xplained/src/sam_ug2832hsweg04.c b/configs/samd20-xplained/src/sam_ug2832hsweg04.c
index 900f6fb0db..2728353e9f 100644
--- a/configs/samd20-xplained/src/sam_ug2832hsweg04.c
+++ b/configs/samd20-xplained/src/sam_ug2832hsweg04.c
@@ -187,7 +187,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
   spi = sam_spibus_initialize(OLED_CSNO);
   if (!spi)
     {
-      lcderr("Failed to initialize SPI port 1\n");
+      lcderr("ERROR: Failed to initialize SPI port 1\n");
     }
   else
     {
@@ -196,7 +196,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
       dev = ssd1306_initialize(spi, devno);
       if (!dev)
         {
-          lcderr("Failed to bind SPI port 1 to OLED %d: %d\n", devno);
+          lcderr("ERROR: Failed to bind SPI port 1 to OLED %d: %d\n", devno);
         }
      else
         {
diff --git a/configs/samd21-xplained/src/sam_mmcsd.c b/configs/samd21-xplained/src/sam_mmcsd.c
index 1b828aea17..caa2c32a23 100644
--- a/configs/samd21-xplained/src/sam_mmcsd.c
+++ b/configs/samd21-xplained/src/sam_mmcsd.c
@@ -100,7 +100,7 @@ int sam_sdinitialize(int port, int minor)
   spi = sam_spibus_initialize(port);
   if (!spi)
     {
-      ferr("Failed to initialize SPI%d\n", port);
+      ferr("ERROR: Failed to initialize SPI%d\n", port);
       return -ENODEV;
     }
 
@@ -113,7 +113,7 @@ int sam_sdinitialize(int port, int minor)
   ret = mmcsd_spislotinitialize(minor, SAMDL_MMCSDSLOTNO, spi);
   if (ret < 0)
     {
-      ferr("Failed to bind SPI%d to MMC/SD slot %d: %d\n",
+      ferr("ERROR: Failed to bind SPI%d to MMC/SD slot %d: %d\n",
             port, SAMDL_MMCSDSLOTNO, ret);
       return ret;
     }
diff --git a/configs/samd21-xplained/src/sam_ug2832hsweg04.c b/configs/samd21-xplained/src/sam_ug2832hsweg04.c
index 6ecd3320cf..35999d286d 100644
--- a/configs/samd21-xplained/src/sam_ug2832hsweg04.c
+++ b/configs/samd21-xplained/src/sam_ug2832hsweg04.c
@@ -187,7 +187,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
   spi = sam_spibus_initialize(OLED_CSNO);
   if (!spi)
     {
-      lcderr("Failed to initialize SPI port 1\n");
+      lcderr("ERROR: Failed to initialize SPI port 1\n");
     }
   else
     {
@@ -196,7 +196,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
       dev = ssd1306_initialize(spi, devno);
       if (!dev)
         {
-          lcderr("Failed to bind SPI port 1 to OLED %d: %d\n", devno);
+          lcderr("ERROR: Failed to bind SPI port 1 to OLED %d: %d\n", devno);
         }
      else
         {
diff --git a/configs/same70-xplained/src/sam_ethernet.c b/configs/same70-xplained/src/sam_ethernet.c
index 4f4492692b..ca56f783d6 100644
--- a/configs/same70-xplained/src/sam_ethernet.c
+++ b/configs/same70-xplained/src/sam_ethernet.c
@@ -81,10 +81,18 @@
 
 #ifdef CONFIG_NETDEV_PHY_DEBUG
 #  define phyerr    err
+#  define phywarn   warn
+#  define phyinfo   info
 #  define phyllerr  llerr
+#  define phyllwarn llwarn
+#  define phyllinfo llinfo
 #else
 #  define phyerr(x...)
+#  define phywarn(x...)
+#  define phyinfo(x...)
 #  define phyllerr(x...)
+#  define phyllwarn(x...)
+#  define phyllinfo(x...)
 #endif
 
 /************************************************************************************
@@ -106,7 +114,7 @@ static xcpt_t g_emac0_handler;
 #ifdef CONFIG_SAMV7_GPIOA_IRQ
 static void sam_emac0_phy_enable(bool enable)
 {
-  phyerr("IRQ%d: enable=%d\n", IRQ_EMAC0_INT, enable);
+  phyinfo("IRQ%d: enable=%d\n", IRQ_EMAC0_INT, enable);
   if (enable)
     {
       sam_gpioirqenable(IRQ_EMAC0_INT);
@@ -134,7 +142,7 @@ void weak_function sam_netinitialize(void)
 {
   /* Configure the PHY interrupt GPIO */
 
-  phyerr("Configuring %08x\n", GPIO_EMAC0_INT);
+  phyinfo("Configuring %08x\n", GPIO_EMAC0_INT);
   sam_configgpio(GPIO_EMAC0_INT);
 
   /* Configure PHY /RESET output */
@@ -310,11 +318,11 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
   DEBUGASSERT(intf);
 
   ninfo("%s: handler=%p\n", intf, handler);
-  phyerr("EMAC0: devname=%s\n", SAMV7_EMAC0_DEVNAME);
+  phyinfo("EMAC0: devname=%s\n", SAMV7_EMAC0_DEVNAME);
 
   if (strcmp(intf, SAMV7_EMAC0_DEVNAME) == 0)
     {
-      phyerr("Select EMAC0\n");
+      phyinfo("Select EMAC0\n");
       phandler = &g_emac0_handler;
       pinset   = GPIO_EMAC0_INT;
       irq      = IRQ_EMAC0_INT;
@@ -322,7 +330,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
     }
   else
     {
-      nerr("Unsupported interface: %s\n", intf);
+      nerr("ERROR: Unsupported interface: %s\n", intf);
       return NULL;
     }
 
@@ -341,15 +349,15 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
 
   if (handler)
     {
-      phyerr("Configure pin: %08x\n", pinset);
+      phyinfo("Configure pin: %08x\n", pinset);
       sam_gpioirq(pinset);
 
-      phyerr("Attach IRQ%d\n", irq);
+      phyinfo("Attach IRQ%d\n", irq);
       (void)irq_attach(irq, handler);
     }
   else
     {
-      phyerr("Detach IRQ%d\n", irq);
+      phyinfo("Detach IRQ%d\n", irq);
       (void)irq_detach(irq);
       enabler = NULL;
     }
diff --git a/configs/same70-xplained/src/sam_usbdev.c b/configs/same70-xplained/src/sam_usbdev.c
index 444cf8bbb2..e4be8a893a 100644
--- a/configs/same70-xplained/src/sam_usbdev.c
+++ b/configs/same70-xplained/src/sam_usbdev.c
@@ -94,5 +94,5 @@ void sam_usbinitialize(void)
 
 void sam_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ullerr("resume: %d\n", resume);
+  ullinfo("resume: %d\n", resume);
 }
diff --git a/configs/saml21-xplained/src/sam_mmcsd.c b/configs/saml21-xplained/src/sam_mmcsd.c
index 5dbff63a89..b57f1d58ff 100644
--- a/configs/saml21-xplained/src/sam_mmcsd.c
+++ b/configs/saml21-xplained/src/sam_mmcsd.c
@@ -100,7 +100,7 @@ int sam_sdinitialize(int port, int minor)
   spi = sam_spibus_initialize(port);
   if (!spi)
     {
-      ferr("Failed to initialize SPI%d\n", port);
+      ferr("ERROR: Failed to initialize SPI%d\n", port);
       return -ENODEV;
     }
 
@@ -113,7 +113,7 @@ int sam_sdinitialize(int port, int minor)
   ret = mmcsd_spislotinitialize(minor, SAMDL_MMCSDSLOTNO, spi);
   if (ret < 0)
     {
-      ferr("Failed to bind SPI%d to MMC/SD slot %d: %d\n",
+      ferr("ERROR: Failed to bind SPI%d to MMC/SD slot %d: %d\n",
             port, SAMDL_MMCSDSLOTNO, ret);
       return ret;
     }
diff --git a/configs/saml21-xplained/src/sam_ug2832hsweg04.c b/configs/saml21-xplained/src/sam_ug2832hsweg04.c
index 9cbbfab082..bee4cc4f3a 100644
--- a/configs/saml21-xplained/src/sam_ug2832hsweg04.c
+++ b/configs/saml21-xplained/src/sam_ug2832hsweg04.c
@@ -187,7 +187,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
   spi = sam_spibus_initialize(OLED_CSNO);
   if (!spi)
     {
-      lcderr("Failed to initialize SPI port 1\n");
+      lcderr("ERROR: Failed to initialize SPI port 1\n");
     }
   else
     {
@@ -196,7 +196,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
       dev = ssd1306_initialize(spi, devno);
       if (!dev)
         {
-          lcderr("Failed to bind SPI port 1 to OLED %d: %d\n", devno);
+          lcderr("ERROR: Failed to bind SPI port 1 to OLED %d: %d\n", devno);
         }
      else
         {
diff --git a/configs/samv71-xult/src/sam_audio_null.c b/configs/samv71-xult/src/sam_audio_null.c
index 59a599eceb..a1edbc5019 100644
--- a/configs/samv71-xult/src/sam_audio_null.c
+++ b/configs/samv71-xult/src/sam_audio_null.c
@@ -100,7 +100,7 @@ int sam_audio_null_initialize(int minor)
   char devname[12];
   int ret;
 
-  auderr("minor %d\n", minor);
+  audinfo("minor %d\n", minor);
   DEBUGASSERT(minor >= 0 && minor <= 25);
 
   /* Have we already initialized?  Since we never uninitialize we must prevent
@@ -117,7 +117,7 @@ int sam_audio_null_initialize(int minor)
       nullaudio = audio_null_initialize();
       if (!nullaudio)
         {
-          auderr("Failed to get the NULL audio interface\n");
+          auderr("ERROR: Failed to get the NULL audio interface\n");
           ret = -ENODEV;
           goto errout;
         }
diff --git a/configs/samv71-xult/src/sam_ethernet.c b/configs/samv71-xult/src/sam_ethernet.c
index 4c3b3ad680..119ada6455 100644
--- a/configs/samv71-xult/src/sam_ethernet.c
+++ b/configs/samv71-xult/src/sam_ethernet.c
@@ -81,10 +81,18 @@
 
 #ifdef CONFIG_NETDEV_PHY_DEBUG
 #  define phyerr    err
+#  define phywarn   warn
+#  define phyinfo   info
 #  define phyllerr  llerr
+#  define phyllwarn llwarn
+#  define phyllinfo llinfo
 #else
 #  define phyerr(x...)
+#  define phywarn(x...)
+#  define phyinfo(x...)
 #  define phyllerr(x...)
+#  define phyllwarn(x...)
+#  define phyllinfo(x...)
 #endif
 
 /************************************************************************************
@@ -106,7 +114,7 @@ static xcpt_t g_emac0_handler;
 #ifdef CONFIG_SAMV7_GPIOA_IRQ
 static void sam_emac0_phy_enable(bool enable)
 {
-  phyerr("IRQ%d: enable=%d\n", IRQ_EMAC0_INT, enable);
+  phyinfo("IRQ%d: enable=%d\n", IRQ_EMAC0_INT, enable);
   if (enable)
     {
       sam_gpioirqenable(IRQ_EMAC0_INT);
@@ -134,7 +142,7 @@ void weak_function sam_netinitialize(void)
 {
   /* Configure the PHY interrupt GPIO */
 
-  phyerr("Configuring %08x\n", GPIO_EMAC0_INT);
+  phyinfo("Configuring %08x\n", GPIO_EMAC0_INT);
   sam_configgpio(GPIO_EMAC0_INT);
 
   /* Configure the PHY SIGDET input */
@@ -314,11 +322,12 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
   DEBUGASSERT(intf);
 
   ninfo("%s: handler=%p\n", intf, handler);
-  phyerr("EMAC0: devname=%s\n", SAMV7_EMAC0_DEVNAME);
+  phyinfo("EMAC0: devname=%s\n", SAMV7_EMAC0_DEVNAME);
 
   if (strcmp(intf, SAMV7_EMAC0_DEVNAME) == 0)
     {
-      phyerr("Select EMAC0\n");
+      phyinfo("Select EMAC0\n");
+
       phandler = &g_emac0_handler;
       pinset   = GPIO_EMAC0_INT;
       irq      = IRQ_EMAC0_INT;
@@ -326,7 +335,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
     }
   else
     {
-      nerr("Unsupported interface: %s\n", intf);
+      nerr("ERROR: Unsupported interface: %s\n", intf);
       return NULL;
     }
 
@@ -345,15 +354,15 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
 
   if (handler)
     {
-      phyerr("Configure pin: %08x\n", pinset);
+      phyinfo("Configure pin: %08x\n", pinset);
       sam_gpioirq(pinset);
 
-      phyerr("Attach IRQ%d\n", irq);
+      phyinfo("Attach IRQ%d\n", irq);
       (void)irq_attach(irq, handler);
     }
   else
     {
-      phyerr("Detach IRQ%d\n", irq);
+      phyinfo("Detach IRQ%d\n", irq);
       (void)irq_detach(irq);
       enabler = NULL;
     }
diff --git a/configs/samv71-xult/src/sam_ili9488.c b/configs/samv71-xult/src/sam_ili9488.c
index aba728c7b5..21f939f644 100644
--- a/configs/samv71-xult/src/sam_ili9488.c
+++ b/configs/samv71-xult/src/sam_ili9488.c
@@ -874,7 +874,7 @@ static void sam_lcd_dumpone(struct sam_dev_s *priv, int index,
     }
   else
     {
-      ferr("%s: Not collected\n", msg);
+      finfo("%s: Not collected\n", msg);
     }
 }
 #endif
diff --git a/configs/samv71-xult/src/sam_maxtouch.c b/configs/samv71-xult/src/sam_maxtouch.c
index 2f44a0759b..7bce968fcd 100644
--- a/configs/samv71-xult/src/sam_maxtouch.c
+++ b/configs/samv71-xult/src/sam_maxtouch.c
@@ -241,7 +241,7 @@ int board_tsc_setup(int minor)
   static bool initialized = false;
   int ret;
 
-  ierr("minor %d\n", minor);
+  iinfo("minor %d\n", minor);
   DEBUGASSERT(minor == 0);
 
   /* Have we already initialized?  Since we never uninitialize we must prevent
@@ -261,7 +261,7 @@ int board_tsc_setup(int minor)
       i2c = sam_i2cbus_initialize(MXT_TWI_BUS);
       if (!i2c)
         {
-          ierr("Failed to initialize I2C%d\n", MXT_TWI_BUS);
+          ierr("ERROR: Failed to initialize I2C%d\n", MXT_TWI_BUS);
           return -ENODEV;
         }
 
diff --git a/configs/samv71-xult/src/sam_usbdev.c b/configs/samv71-xult/src/sam_usbdev.c
index cc718cf7ed..39e39a1997 100644
--- a/configs/samv71-xult/src/sam_usbdev.c
+++ b/configs/samv71-xult/src/sam_usbdev.c
@@ -94,5 +94,5 @@ void sam_usbinitialize(void)
 
 void sam_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ullerr("resume: %d\n", resume);
+  ullinfo("resume: %d\n", resume);
 }
diff --git a/configs/samv71-xult/src/sam_wm8904.c b/configs/samv71-xult/src/sam_wm8904.c
index 352a89c560..abb920bd0b 100644
--- a/configs/samv71-xult/src/sam_wm8904.c
+++ b/configs/samv71-xult/src/sam_wm8904.c
@@ -253,7 +253,7 @@ int sam_wm8904_initialize(int minor)
   char devname[12];
   int ret;
 
-  auderr("minor %d\n", minor);
+  audinfo("minor %d\n", minor);
   DEBUGASSERT(minor >= 0 && minor <= 25);
 
   /* Have we already initialized?  Since we never uninitialize we must prevent
@@ -273,7 +273,7 @@ int sam_wm8904_initialize(int minor)
       i2c = sam_i2cbus_initialize(WM8904_TWI_BUS);
       if (!i2c)
         {
-          auderr("Failed to initialize TWI%d\n", WM8904_TWI_BUS);
+          auderr("ERROR: Failed to initialize TWI%d\n", WM8904_TWI_BUS);
           ret = -ENODEV;
           goto errout;
         }
@@ -283,7 +283,7 @@ int sam_wm8904_initialize(int minor)
       i2s = sam_ssc_initialize(WM8904_SSC_BUS);
       if (!i2s)
         {
-          auderr("Failed to initialize SSC%d\n", WM8904_SSC_BUS);
+          auderr("ERROR: Failed to initialize SSC%d\n", WM8904_SSC_BUS);
           ret = -ENODEV;
           goto errout_with_i2c;
         }
@@ -325,7 +325,7 @@ int sam_wm8904_initialize(int minor)
       wm8904 = wm8904_initialize(i2c, i2s, &g_wm8904info.lower);
       if (!wm8904)
         {
-          auderr("Failed to initialize the WM8904\n");
+          auderr("ERROR: Failed to initialize the WM8904\n");
           ret = -ENODEV;
           goto errout_with_irq;
         }
diff --git a/configs/shenzhou/src/stm32_adc.c b/configs/shenzhou/src/stm32_adc.c
index dbdc5a2963..0b61b68f8e 100644
--- a/configs/shenzhou/src/stm32_adc.c
+++ b/configs/shenzhou/src/stm32_adc.c
@@ -154,7 +154,7 @@ int board_adc_setup(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          aerr("adc_register failed: %d\n", ret);
+          aerr("ERROR: adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/shenzhou/src/stm32_ili93xx.c b/configs/shenzhou/src/stm32_ili93xx.c
index dfe869e7f6..6b43340ad5 100644
--- a/configs/shenzhou/src/stm32_ili93xx.c
+++ b/configs/shenzhou/src/stm32_ili93xx.c
@@ -594,18 +594,18 @@ static struct stm32_dev_s g_lcddev =
 #ifdef CONFIG_LCD_REGDEBUG
 static void stm32_lcdshow(FAR struct stm32_lower_s *priv, FAR const char *msg)
 {
-  err("%s:\n", msg);
-  err("  CRTL   RS: %d CS: %d RD: %d WR: %d LE: %d\n",
-      getreg32(LCD_RS_READ), getreg32(LCD_CS_READ), getreg32(LCD_RD_READ),
-      getreg32(LCD_WR_READ), getreg32(LCD_LE_READ));
-  err("  DATA   CR: %08x %08x\n", getreg32(LCD_CRL), getreg32(LCD_CRH));
+  info("%s:\n", msg);
+  info("  CRTL   RS: %d CS: %d RD: %d WR: %d LE: %d\n",
+       getreg32(LCD_RS_READ), getreg32(LCD_CS_READ), getreg32(LCD_RD_READ),
+       getreg32(LCD_WR_READ), getreg32(LCD_LE_READ));
+  info("  DATA   CR: %08x %08x\n", getreg32(LCD_CRL), getreg32(LCD_CRH));
   if (priv->output)
     {
-      err("  OUTPUT: %08x\n", getreg32(LCD_ODR));
+      info("  OUTPUT: %08x\n", getreg32(LCD_ODR));
     }
   else
     {
-      err("  INPUT:  %08x\n", getreg32(LCD_IDR));
+      info("  INPUT:  %08x\n", getreg32(LCD_IDR));
     }
 }
 #endif
@@ -1254,7 +1254,7 @@ static int stm32_setpower(struct lcd_dev_s *dev, int power)
       else
 #endif
         {
-          gerr("Unsupported LCD: %d\n", priv->type);
+          lcderr("ERROR: Unsupported LCD: %d\n", priv->type);
         }
 
       up_mdelay(50);
@@ -1780,7 +1780,7 @@ static inline int stm32_lcdinitialize(FAR struct stm32_dev_s *priv)
   up_mdelay(50);
 
   id = stm32_readreg(priv, LCD_REG_0);     /* Read the ID register */
-  lcderr("LCD ID: %04x\n", id);
+  lcdinfo("LCD ID: %04x\n", id);
 
   stm32_lcdoutput(priv);
   up_mdelay(10);
@@ -1852,11 +1852,11 @@ static inline int stm32_lcdinitialize(FAR struct stm32_dev_s *priv)
   else
 #endif
     {
-      lcderr("Unsupported LCD type\n");
+      lcderr("ERROR: Unsupported LCD type\n");
       ret = -ENODEV;
     }
 
-  lcderr("LCD type: %d\n", priv->type);
+  lcdinfo("LCD type: %d\n", priv->type);
   return ret;
 }
 
diff --git a/configs/shenzhou/src/stm32_mmcsd.c b/configs/shenzhou/src/stm32_mmcsd.c
index b1ebe96400..3621c655ea 100644
--- a/configs/shenzhou/src/stm32_mmcsd.c
+++ b/configs/shenzhou/src/stm32_mmcsd.c
@@ -100,7 +100,7 @@ int stm32_sdinitialize(int minor)
   spi = stm32_spibus_initialize(STM32_MMCSDSPIPORTNO);
   if (!spi)
     {
-      ferr("Failed to initialize SPI port %d\n", STM32_MMCSDSPIPORTNO);
+      ferr("ERROR: Failed to initialize SPI port %d\n", STM32_MMCSDSPIPORTNO);
       return -ENODEV;
     }
 
@@ -114,7 +114,7 @@ int stm32_sdinitialize(int minor)
   ret = mmcsd_spislotinitialize(minor, STM32_MMCSDSLOTNO, spi);
   if (ret < 0)
     {
-      ferr("Failed to bind SPI port %d to MMC/SD slot %d: %d\n",
+      ferr("ERROR: Failed to bind SPI port %d to MMC/SD slot %d: %d\n",
             STM32_MMCSDSPIPORTNO, STM32_MMCSDSLOTNO, ret);
       return ret;
     }
diff --git a/configs/shenzhou/src/stm32_spi.c b/configs/shenzhou/src/stm32_spi.c
index 9f85fca6f3..747f92cfc9 100644
--- a/configs/shenzhou/src/stm32_spi.c
+++ b/configs/shenzhou/src/stm32_spi.c
@@ -75,10 +75,6 @@
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
@@ -145,7 +141,7 @@ void weak_function stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
   /* SPI1 connects to the SD CARD and to the SPI FLASH */
 
@@ -181,7 +177,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
   /* SPI3 connects to TFT LCD (for touchscreen and SD) and the RF24L01 2.4G
    * wireless module.
diff --git a/configs/shenzhou/src/stm32_ssd1289.c b/configs/shenzhou/src/stm32_ssd1289.c
index 7a28c222ca..f602f7e9d0 100644
--- a/configs/shenzhou/src/stm32_ssd1289.c
+++ b/configs/shenzhou/src/stm32_ssd1289.c
@@ -277,18 +277,18 @@ static struct stm32_lower_s g_lcdlower =
 #ifdef CONFIG_LCD_REGDEBUG
 static void stm32_lcdshow(FAR struct stm32_lower_s *priv, FAR const char *msg)
 {
-  err("%s:\n", msg);
-  err("  CRTL   RS: %d CS: %d RD: %d WR: %d LE: %d\n",
-      getreg32(LCD_RS_READ), getreg32(LCD_CS_READ), getreg32(LCD_RD_READ),
-      getreg32(LCD_WR_READ), getreg32(LCD_LE_READ));
-  err("  DATA   CR: %08x %08x\n", getreg32(LCD_CRL), getreg32(LCD_CRH));
+  info("%s:\n", msg);
+  info("  CRTL   RS: %d CS: %d RD: %d WR: %d LE: %d\n",
+       getreg32(LCD_RS_READ), getreg32(LCD_CS_READ), getreg32(LCD_RD_READ),
+       getreg32(LCD_WR_READ), getreg32(LCD_LE_READ));
+  info("  DATA   CR: %08x %08x\n", getreg32(LCD_CRL), getreg32(LCD_CRH));
   if (priv->output)
     {
-      err("  OUTPUT: %08x\n", getreg32(LCD_ODR));
+      info("  OUTPUT: %08x\n", getreg32(LCD_ODR));
     }
   else
     {
-      err("  INPUT:  %08x\n", getreg32(LCD_IDR));
+      info("  INPUT:  %08x\n", getreg32(LCD_IDR));
     }
 }
 #endif
diff --git a/configs/shenzhou/src/stm32_touchscreen.c b/configs/shenzhou/src/stm32_touchscreen.c
index b20789cd9e..dec42e95ff 100644
--- a/configs/shenzhou/src/stm32_touchscreen.c
+++ b/configs/shenzhou/src/stm32_touchscreen.c
@@ -251,7 +251,7 @@ int board_tsc_setup(int minor)
   FAR struct spi_dev_s *dev;
   int ret;
 
-  ierr("minor %d\n", minor);
+  iinfo("minor %d\n", minor);
   DEBUGASSERT(minor == 0);
 
   /* Configure and enable the ADS7843E interrupt pin as an input. */
@@ -263,7 +263,7 @@ int board_tsc_setup(int minor)
   dev = stm32_spibus_initialize(CONFIG_ADS7843E_SPIDEV);
   if (!dev)
     {
-      ierr("Failed to initialize SPI bus %d\n", CONFIG_ADS7843E_SPIDEV);
+      ierr("ERROR: Failed to initialize SPI bus %d\n", CONFIG_ADS7843E_SPIDEV);
       return -ENODEV;
     }
 
@@ -272,7 +272,7 @@ int board_tsc_setup(int minor)
   ret = ads7843e_register(dev, &g_tscinfo.dev, CONFIG_ADS7843E_DEVMINOR);
   if (ret < 0)
     {
-      ierr("Failed to initialize SPI bus %d\n", CONFIG_ADS7843E_SPIDEV);
+      ierr("ERROR: Failed to initialize SPI bus %d\n", CONFIG_ADS7843E_SPIDEV);
       /* up_spiuninitialize(dev); */
       return -ENODEV;
     }
diff --git a/configs/shenzhou/src/stm32_usb.c b/configs/shenzhou/src/stm32_usb.c
index 054270e04d..35c2ff422b 100644
--- a/configs/shenzhou/src/stm32_usb.c
+++ b/configs/shenzhou/src/stm32_usb.c
@@ -300,7 +300,7 @@ xcpt_t stm32_setup_overcurrent(xcpt_t handler)
 #ifdef CONFIG_USBDEV
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ullerr("resume: %d\n", resume);
+  ullinfo("resume: %d\n", resume);
 }
 #endif
 
diff --git a/configs/sim/src/sim_touchscreen.c b/configs/sim/src/sim_touchscreen.c
index 622e631382..c81c88325e 100644
--- a/configs/sim/src/sim_touchscreen.c
+++ b/configs/sim/src/sim_touchscreen.c
@@ -111,14 +111,14 @@ int board_tsc_setup(int minor)
   ret = up_fbinitialize(0);
   if (ret < 0)
     {
-      ierr("up_fbinitialize failed: %d\n", -ret);
+      ierr("ERROR: up_fbinitialize failed: %d\n", -ret);
       goto errout;
     }
 
   dev = up_fbgetvplane(0, 0);
   if (!dev)
     {
-      ierr("up_fbgetvplane 0 failed\n");
+      ierr("ERROR: up_fbgetvplane 0 failed\n");
       ret = -ENODEV;
       goto errout_with_fb;
     }
@@ -130,7 +130,7 @@ int board_tsc_setup(int minor)
   if (!g_simtc.hnx)
     {
       ret = -errno;
-      ierr("nx_open failed: %d\n", ret);
+      ierr("ERROR: nx_open failed: %d\n", ret);
       goto errout_with_fb;
     }
 
@@ -140,7 +140,7 @@ int board_tsc_setup(int minor)
   ret = vnc_default_fbinitialize(0, g_simtc.hnx);
   if (ret < 0)
     {
-      ierr("vnc_default_fbinitialize failed: %d\n", ret);
+      ierr("ERROR: vnc_default_fbinitialize failed: %d\n", ret);
       goto errout_with_fb;
     }
 #endif
@@ -153,7 +153,7 @@ int board_tsc_setup(int minor)
   ret = nx_setbgcolor(g_simtc.hnx, &color);
   if (ret < 0)
     {
-      ierr("nx_setbgcolor failed: %d\n", ret);
+      ierr("ERROR: nx_setbgcolor failed: %d\n", ret);
       goto errout_with_nx;
     }
 
@@ -162,7 +162,7 @@ int board_tsc_setup(int minor)
   ret = board_tsc_setup(minor);
   if (ret < 0)
     {
-      ierr("board_tsc_setup failed: %d\n", ret);
+      ierr("ERROR: board_tsc_setup failed: %d\n", ret);
       goto errout_with_nx;
     }
   return OK;
diff --git a/configs/spark/src/stm32_spi.c b/configs/spark/src/stm32_spi.c
index 8871b805a8..572dd22c0a 100644
--- a/configs/spark/src/stm32_spi.c
+++ b/configs/spark/src/stm32_spi.c
@@ -134,7 +134,7 @@ void weak_function stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -146,7 +146,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
 #if defined(CONFIG_MTD_SST25)
 
@@ -176,7 +176,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
 }
 
diff --git a/configs/spark/src/stm32_usbdev.c b/configs/spark/src/stm32_usbdev.c
index 9b801a670a..47f8d558ed 100644
--- a/configs/spark/src/stm32_usbdev.c
+++ b/configs/spark/src/stm32_usbdev.c
@@ -74,7 +74,7 @@
 
 void stm32_usbinitialize(void)
 {
-  ullerr("called\n");
+  ullinfo("called\n");
 
   /* USB Soft Connect Pullup */
 
@@ -113,5 +113,5 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable)
 
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ullerr("resume: %d\n", resume);
+  ullinfo("resume: %d\n", resume);
 }
diff --git a/configs/spark/src/stm32_wireless.c b/configs/spark/src/stm32_wireless.c
index 69a73be746..2d1f6855d8 100644
--- a/configs/spark/src/stm32_wireless.c
+++ b/configs/spark/src/stm32_wireless.c
@@ -281,7 +281,7 @@ int wireless_archinitialize(size_t max_rx_size)
 
   /* Init SPI bus */
 
-  ierr("minor %d\n", minor);
+  iinfo("minor %d\n", minor);
   DEBUGASSERT(CONFIG_CC3000_DEVMINOR == 0);
 
 #ifdef CONFIG_CC3000_PROBES
@@ -296,7 +296,7 @@ int wireless_archinitialize(size_t max_rx_size)
   spi = stm32_spibus_initialize(CONFIG_CC3000_SPIDEV);
   if (!spi)
     {
-      ierr("Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV);
+      ierr("ERROR: Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV);
       return -ENODEV;
     }
 
@@ -305,7 +305,7 @@ int wireless_archinitialize(size_t max_rx_size)
   int ret = cc3000_register(spi, &g_cc3000_info.dev, CONFIG_CC3000_DEVMINOR);
   if (ret < 0)
     {
-      ierr("Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV);
+      ierr("ERROR: Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV);
       return -ENODEV;
     }
 
diff --git a/configs/stm32f4discovery/src/stm32_ethernet.c b/configs/stm32f4discovery/src/stm32_ethernet.c
index 6ccd0b7271..6c58def651 100644
--- a/configs/stm32f4discovery/src/stm32_ethernet.c
+++ b/configs/stm32f4discovery/src/stm32_ethernet.c
@@ -80,10 +80,18 @@
 
 #ifdef CONFIG_NETDEV_PHY_DEBUG
 #  define phyerr    err
+#  define phywarn   warn
+#  define phyinfo   info
 #  define phyllerr  llerr
+#  define phyllwarn llwarn
+#  define phyllinfo llinfo
 #else
 #  define phyerr(x...)
+#  define phywarn(x...)
+#  define phyinfo(x...)
 #  define phyllerr(x...)
+#  define phyllwarn(x...)
+#  define phyllinfo(x...)
 #endif
 
 /************************************************************************************
-- 
GitLab


From 56c5da3030bfc03476949d8281af68b76090d2c3 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 13 Jun 2016 08:21:06 -0600
Subject: [PATCH 54/91] Cosmetic change from review of PR53

---
 libc/stdlib/lib_checkbase.c | 12 ++++--------
 libc/stdlib/lib_strtoul.c   | 15 ++++++---------
 libc/stdlib/lib_strtoull.c  | 18 ++++++++----------
 3 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/libc/stdlib/lib_checkbase.c b/libc/stdlib/lib_checkbase.c
index d291eefc4e..a94140e81e 100644
--- a/libc/stdlib/lib_checkbase.c
+++ b/libc/stdlib/lib_checkbase.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * libc/stdlib/lib_checkbase.c
  *
- *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -44,10 +44,6 @@
 
 #include "libc.h"
 
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -72,7 +68,7 @@
 
 int lib_checkbase(int base, FAR const char **pptr)
 {
-   const char *ptr = *pptr;
+  FAR const char *ptr = *pptr;
 
   /* Check for unspecified base */
 
@@ -113,9 +109,10 @@ int lib_checkbase(int base, FAR const char **pptr)
     }
 
   /* Check for incorrect bases. */
+
   else if (base < 2 || base > 26)
     {
-    return -1; /* Means incorrect base */
+      return -1; /* Means incorrect base */
     }
 
   /* Return the updated pointer and base */
@@ -123,4 +120,3 @@ int lib_checkbase(int base, FAR const char **pptr)
   *pptr = ptr;
   return base;
 }
-
diff --git a/libc/stdlib/lib_strtoul.c b/libc/stdlib/lib_strtoul.c
index 144e68bf54..9500947ec1 100644
--- a/libc/stdlib/lib_strtoul.c
+++ b/libc/stdlib/lib_strtoul.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * /libc/stdlib/lib_strtoul.c
  *
- *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,10 +43,6 @@
 
 #include "libc.h"
 
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -69,7 +65,8 @@
 
 unsigned long strtoul(FAR const char *nptr, FAR char **endptr, int base)
 {
-  unsigned long prev, accum = 0;
+  unsigned long accum = 0;
+  unsigned long prev;
   int value;
 
   if (nptr)
@@ -100,9 +97,9 @@ unsigned long strtoul(FAR const char *nptr, FAR char **endptr, int base)
 
           if (accum < prev)
             {
-            set_errno(ERANGE);
-            accum = 0;
-            break;
+              set_errno(ERANGE);
+              accum = 0;
+              break;
             }
         }
 
diff --git a/libc/stdlib/lib_strtoull.c b/libc/stdlib/lib_strtoull.c
index b662ff65c4..0ded0af961 100644
--- a/libc/stdlib/lib_strtoull.c
+++ b/libc/stdlib/lib_strtoull.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * /libc/stdlib/lib_strtoull.c
  *
- *   Copyright (C) 2009, 2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2010, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -46,10 +46,6 @@
 
 #ifdef CONFIG_HAVE_LONG_LONG
 
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -72,7 +68,8 @@
 
 unsigned long long strtoull(FAR const char *nptr, FAR char **endptr, int base)
 {
-  unsigned long long prev, accum = 0;
+  unsigned long long accum = 0;
+  unsigned long long prev;
   int value;
 
   if (nptr)
@@ -103,9 +100,9 @@ unsigned long long strtoull(FAR const char *nptr, FAR char **endptr, int base)
 
           if (accum < prev)
             {
-            set_errno(ERANGE);
-            accum = 0;
-            break;
+              set_errno(ERANGE);
+              accum = 0;
+              break;
             }
         }
 
@@ -116,7 +113,8 @@ unsigned long long strtoull(FAR const char *nptr, FAR char **endptr, int base)
           *endptr = (char *)nptr;
         }
     }
-   return accum;
+
+  return accum;
 }
 
 #endif
-- 
GitLab


From b9aadf7242682630859480f168bec16a2c55e2e9 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 13 Jun 2016 08:45:54 -0600
Subject: [PATCH 55/91] configs/:  Change some *err() message to *info()
 messages if what was a *dbg() message does not indicate and error condition.

---
 arch/arm/src/lpc43xx/lpc43_ssp.c              | 25 +++++----------
 configs/lpcxpresso-lpc1115/src/lpc11_ssp.c    | 18 ++++-------
 configs/lpcxpresso-lpc1768/src/lpc17_ssp.c    | 18 ++++-------
 configs/nucleo-144/src/stm32_sdio.c           |  4 +--
 configs/nucleo-144/src/stm32_spi.c            | 12 +++----
 configs/nucleo-f303re/src/stm32_adc.c         |  2 +-
 configs/nucleo-f303re/src/stm32_pwm.c         |  4 +--
 configs/nucleo-f303re/src/stm32_spi.c         |  6 ++--
 configs/nucleo-f303re/src/stm32_ssd1351.c     |  4 +--
 configs/nucleo-f4x1re/src/stm32_adc.c         |  2 +-
 configs/nucleo-f4x1re/src/stm32_spi.c         | 21 ++++--------
 configs/nucleo-f4x1re/src/stm32_wireless.c    |  6 ++--
 configs/nucleo-l476rg/src/stm32_adc.c         |  2 +-
 configs/nucleo-l476rg/src/stm32_spi.c         | 21 ++++--------
 configs/nucleo-l476rg/src/stm32_wireless.c    |  6 ++--
 configs/olimex-lpc-h3131/src/lpc31_spi.c      |  2 +-
 .../olimex-lpc1766stk/src/lpc17_hidmouse.c    |  4 +--
 configs/olimex-lpc1766stk/src/lpc17_lcd.c     |  4 +--
 configs/olimex-lpc1766stk/src/lpc17_ssp.c     | 28 +++++++---------
 configs/olimex-stm32-h405/src/stm32_adc.c     |  2 +-
 configs/olimex-stm32-h405/src/stm32_usb.c     |  2 +-
 configs/olimex-stm32-h407/src/stm32_adc.c     |  2 +-
 configs/olimex-stm32-h407/src/stm32_sdio.c    |  4 +--
 configs/olimex-stm32-h407/src/stm32_usb.c     |  2 +-
 .../olimex-stm32-p107/src/stm32_encx24j600.c  |  4 +--
 configs/olimex-stm32-p107/src/stm32_spi.c     |  2 +-
 configs/olimex-stm32-p207/src/stm32_adc.c     |  2 +-
 configs/olimex-stm32-p207/src/stm32_usb.c     |  2 +-
 configs/olimex-strp711/src/str71_enc28j60.c   |  6 ++--
 configs/olimexino-stm32/src/stm32_spi.c       |  6 ++--
 configs/olimexino-stm32/src/stm32_usbdev.c    |  4 +--
 configs/open1788/src/lpc17_ssp.c              | 32 ++++++-------------
 configs/open1788/src/lpc17_touchscreen.c      |  6 ++--
 configs/pic32mx-starterkit/src/pic32mx_spi.c  | 16 +++++-----
 configs/pic32mx7mmb/src/pic32_spi.c           | 22 ++++++-------
 configs/pic32mx7mmb/src/pic32_touchscreen.c   | 10 +++---
 configs/pic32mz-starterkit/src/pic32mz_spi.c  | 24 +++++++-------
 configs/u-blox-c027/src/lpc17_ssp.c           |  2 +-
 38 files changed, 141 insertions(+), 198 deletions(-)

diff --git a/arch/arm/src/lpc43xx/lpc43_ssp.c b/arch/arm/src/lpc43xx/lpc43_ssp.c
index ae66e5753f..78c880b92e 100644
--- a/arch/arm/src/lpc43xx/lpc43_ssp.c
+++ b/arch/arm/src/lpc43xx/lpc43_ssp.c
@@ -69,27 +69,18 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* The following enable debug output from this file (needs CONFIG_DEBUG_FEATURES too).
- *
- * CONFIG_SSP_DEBUG - Define to enable basic SSP debug
- * CONFIG_SSP_VERBOSE - Define to enable verbose SSP debug
- */
+/* The following enable debug output from this file */
 
-#ifdef CONFIG_SSP_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define ssperr  llerr
-#  ifdef CONFIG_SSP_VERBOSE
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define sspwarn llwarn
+#  define sspinfo llinfo
 #else
-#  undef CONFIG_SSP_VERBOSE
 #  define ssperr(x...)
-#  define spiinfo(x...)
+#  define sspwarn(x...)
+#  define sspinfo(x...)
 #endif
 
-
-
 /****************************************************************************
  * Private Types
  ****************************************************************************/
@@ -576,7 +567,7 @@ static void ssp_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
        * and (3) there are more bytes to be sent.
        */
 
-      spiinfo("TX: rxpending: %d nwords: %d\n", rxpending, nwords);
+      sspinfo("TX: rxpending: %d nwords: %d\n", rxpending, nwords);
       while ((ssp_getreg(priv, LPC43_SSP_SR_OFFSET) & SSP_SR_TNF) &&
              (rxpending < LPC43_SSP_FIFOSZ) && nwords)
         {
@@ -599,7 +590,7 @@ static void ssp_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
 
       /* Now, read the RX data from the RX FIFO while the RX FIFO is not empty */
 
-      spiinfo("RX: rxpending: %d\n", rxpending);
+      sspinfo("RX: rxpending: %d\n", rxpending);
       while (ssp_getreg(priv, LPC43_SSP_SR_OFFSET) & SSP_SR_RNE)
         {
           data = ssp_getreg(priv, LPC43_SSP_DR_OFFSET);
diff --git a/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c b/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c
index be82e42668..19df11758e 100644
--- a/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c
+++ b/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c
@@ -58,27 +58,21 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
+/* Enables debug output from this file */
 
-#undef SSP_DEBUG   /* Define to enable debug */
-#undef SSP_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SSP_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define ssperr  llerr
-#  ifdef SSP_VERBOSE
-#    define sspinfo llerr
-#  else
-#    define sspinfo(x...)
-#  endif
+#  define sspwarn llwarn
+#  define sspinfo llinfo
 #else
-#  undef SSP_VERBOSE
 #  define ssperr(x...)
+#  define sspwarn(x...)
 #  define sspinfo(x...)
 #endif
 
 /* Dump GPIO registers */
 
-#ifdef SSP_VERBOSE
+#ifdef CONFIG_DEBUG_GPIO
 #  define ssp_dumpgpio(m) lpc11_dumpgpio(SDCCS_GPIO, m)
 #else
 #  define ssp_dumpgpio(m)
diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c b/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c
index 082210b880..7974fec855 100644
--- a/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c
+++ b/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c
@@ -58,27 +58,21 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
+/* Enables debug output from this file */
 
-#undef SSP_DEBUG   /* Define to enable debug */
-#undef SSP_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SSP_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define ssperr  llerr
-#  ifdef SSP_VERBOSE
-#    define sspinfo llerr
-#  else
-#    define sspinfo(x...)
-#  endif
+#  define sspwarn llwarn
+#  define sspinfo llinfo
 #else
-#  undef SSP_VERBOSE
 #  define ssperr(x...)
+#  define sspwarn(x...)
 #  define sspinfo(x...)
 #endif
 
 /* Dump GPIO registers */
 
-#ifdef SSP_VERBOSE
+#ifdef CONFIG_DEBUG_GPIO
 #  define ssp_dumpgpio(m) lpc17_dumpgpio(SDCCS_GPIO, m)
 #else
 #  define ssp_dumpgpio(m)
diff --git a/configs/nucleo-144/src/stm32_sdio.c b/configs/nucleo-144/src/stm32_sdio.c
index 447740e40d..87b316be2e 100644
--- a/configs/nucleo-144/src/stm32_sdio.c
+++ b/configs/nucleo-144/src/stm32_sdio.c
@@ -140,7 +140,7 @@ int stm32_sdio_initialize(void)
   g_sdio_dev = sdio_initialize(SDIO_SLOTNO);
   if (!g_sdio_dev)
     {
-      ferr("Failed to initialize SDIO slot %d\n", SDIO_SLOTNO);
+      ferr("ERROR: Failed to initialize SDIO slot %d\n", SDIO_SLOTNO);
       return -ENODEV;
     }
 
@@ -151,7 +151,7 @@ int stm32_sdio_initialize(void)
   ret = mmcsd_slotinitialize(SDIO_MINOR, g_sdio_dev);
   if (ret != OK)
     {
-      ferr("Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
+      ferr("ERROR: Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
       return ret;
     }
 
diff --git a/configs/nucleo-144/src/stm32_spi.c b/configs/nucleo-144/src/stm32_spi.c
index 73d7a573f4..310af8fecd 100644
--- a/configs/nucleo-144/src/stm32_spi.c
+++ b/configs/nucleo-144/src/stm32_spi.c
@@ -227,7 +227,7 @@ void weak_function stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32F7_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   stm32_gpiowrite(g_spigpio[i], !selected);
 }
 
@@ -240,7 +240,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32F7_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   stm32_gpiowrite(g_spigpio[i], !selected);
 }
 
@@ -253,7 +253,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32F7_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   stm32_gpiowrite(g_spigpio[i], !selected);
 }
 
@@ -270,7 +270,7 @@ uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 
 void stm32_spi4select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   stm32_gpiowrite(g_spigpio[i], !selected);
 }
 
@@ -287,7 +287,7 @@ uint8_t stm32_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 
 void stm32_spi5select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   stm32_gpiowrite(g_spigpio[i], !selected);
 }
 
@@ -303,7 +303,7 @@ uint8_t stm32_spi5status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #  endif
 void stm32_spi5select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   stm32_gpiowrite(g_spigpio[i], !selected);
 }
 
diff --git a/configs/nucleo-f303re/src/stm32_adc.c b/configs/nucleo-f303re/src/stm32_adc.c
index 98282ba957..10871a82da 100644
--- a/configs/nucleo-f303re/src/stm32_adc.c
+++ b/configs/nucleo-f303re/src/stm32_adc.c
@@ -231,7 +231,7 @@ int board_adc_setup(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          aerr("adc_register failed: %d\n", ret);
+          aerr("ERROR: adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/nucleo-f303re/src/stm32_pwm.c b/configs/nucleo-f303re/src/stm32_pwm.c
index da5fc9c2d6..1813271caa 100644
--- a/configs/nucleo-f303re/src/stm32_pwm.c
+++ b/configs/nucleo-f303re/src/stm32_pwm.c
@@ -112,7 +112,7 @@ int board_pwm_setup(void)
       pwm = stm32_pwminitialize(NUCLEO_F303RE_PWMTIMER);
       if (pwm == NULL)
         {
-          pwmerr("Failed to get the STM32 PWM lower half\n");
+          pwmerr("ERROR: Failed to get the STM32 PWM lower half\n");
           return -ENODEV;
         }
 
@@ -121,7 +121,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          pwmerr("pwm_register failed: %d\n", ret);
+          pwmerr("ERROR: pwm_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/nucleo-f303re/src/stm32_spi.c b/configs/nucleo-f303re/src/stm32_spi.c
index b38745341f..dccd4ca9ea 100644
--- a/configs/nucleo-f303re/src/stm32_spi.c
+++ b/configs/nucleo-f303re/src/stm32_spi.c
@@ -122,7 +122,7 @@ void weak_function stm32_spidev_initialize(void)
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
                       bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
 #if defined(CONFIG_LCD_SSD1351)
   if (devid == SPIDEV_DISPLAY)
@@ -142,7 +142,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
                       bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -155,7 +155,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
                       bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
diff --git a/configs/nucleo-f303re/src/stm32_ssd1351.c b/configs/nucleo-f303re/src/stm32_ssd1351.c
index b915c110bc..e006c03c06 100644
--- a/configs/nucleo-f303re/src/stm32_ssd1351.c
+++ b/configs/nucleo-f303re/src/stm32_ssd1351.c
@@ -114,7 +114,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
   spi = stm32_spibus_initialize(1);
   if (spi == NULL)
     {
-      lcderr("Failed to initialize SPI port 1\n");
+      lcderr("ERROR: Failed to initialize SPI port 1\n");
     }
   else
     {
@@ -123,7 +123,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
       dev = ssd1351_initialize(spi, devno);
       if (dev == NULL)
         {
-          lcderr("Failed to bind SPI port 1 to OLED %d: %d\n", devno);
+          lcderr("ERROR: Failed to bind SPI port 1 to OLED %d: %d\n", devno);
         }
      else
         {
diff --git a/configs/nucleo-f4x1re/src/stm32_adc.c b/configs/nucleo-f4x1re/src/stm32_adc.c
index 0a82058cfe..3b55e7ef7d 100644
--- a/configs/nucleo-f4x1re/src/stm32_adc.c
+++ b/configs/nucleo-f4x1re/src/stm32_adc.c
@@ -146,7 +146,7 @@ int board_adc_initialize(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          aerr("adc_register failed: %d\n", ret);
+          aerr("ERROR: adc_register failed: %d\n", ret);
           return ret;
         }
 #endif
diff --git a/configs/nucleo-f4x1re/src/stm32_spi.c b/configs/nucleo-f4x1re/src/stm32_spi.c
index ea86096b6f..abe60c0c0f 100644
--- a/configs/nucleo-f4x1re/src/stm32_spi.c
+++ b/configs/nucleo-f4x1re/src/stm32_spi.c
@@ -61,20 +61,13 @@
 
 /* Enables debug output from this file */
 
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_DEBUG_SPI
-#  undef CONFIG_DEBUG_INFO
-#endif
-
 #ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -111,7 +104,7 @@ void weak_function stm32_spidev_initialize(void)
   g_spi1 = stm32_spibus_initialize(1);
   if (!g_spi1)
     {
-      spierr("[boot] FAILED to initialize SPI port 1\n");
+      spierr("ERROR: FAILED to initialize SPI port 1\n");
     }
 
 #ifdef CONFIG_WL_CC3000
@@ -166,7 +159,7 @@ void weak_function stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
 #ifdef CONFIG_WL_CC3000
   if (devid == SPIDEV_WIRELESS)
@@ -192,7 +185,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
 #ifdef CONFIG_WL_CC3000
   if (devid == SPIDEV_WIRELESS)
@@ -211,7 +204,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
diff --git a/configs/nucleo-f4x1re/src/stm32_wireless.c b/configs/nucleo-f4x1re/src/stm32_wireless.c
index 07680a724d..0cd4e2e066 100644
--- a/configs/nucleo-f4x1re/src/stm32_wireless.c
+++ b/configs/nucleo-f4x1re/src/stm32_wireless.c
@@ -280,7 +280,7 @@ int wireless_archinitialize(size_t max_rx_size)
 
   /* Init SPI bus */
 
-  ierr("minor %d\n", minor);
+  iinfo("minor %d\n", minor);
   DEBUGASSERT(CONFIG_CC3000_DEVMINOR == 0);
 
 #ifdef CONFIG_CC3000_PROBES
@@ -295,7 +295,7 @@ int wireless_archinitialize(size_t max_rx_size)
   spi = stm32_spibus_initialize(CONFIG_CC3000_SPIDEV);
   if (!spi)
     {
-      ierr("Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV);
+      ierr("ERROR: Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV);
       return -ENODEV;
     }
 
@@ -305,7 +305,7 @@ int wireless_archinitialize(size_t max_rx_size)
   int ret = cc3000_register(spi, &g_cc3000_info.dev, CONFIG_CC3000_DEVMINOR);
   if (ret < 0)
     {
-      ierr("Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV);
+      ierr("ERROR: Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV);
       return -ENODEV;
     }
 
diff --git a/configs/nucleo-l476rg/src/stm32_adc.c b/configs/nucleo-l476rg/src/stm32_adc.c
index 0148f769ad..77ed219a31 100644
--- a/configs/nucleo-l476rg/src/stm32_adc.c
+++ b/configs/nucleo-l476rg/src/stm32_adc.c
@@ -146,7 +146,7 @@ int board_adc_initialize(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          aerr("adc_register failed: %d\n", ret);
+          aerr("ERROR: adc_register failed: %d\n", ret);
           return ret;
         }
 #endif
diff --git a/configs/nucleo-l476rg/src/stm32_spi.c b/configs/nucleo-l476rg/src/stm32_spi.c
index a5dec3a6db..c8c055fbe8 100644
--- a/configs/nucleo-l476rg/src/stm32_spi.c
+++ b/configs/nucleo-l476rg/src/stm32_spi.c
@@ -61,20 +61,13 @@
 
 /* Enables debug output from this file */
 
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_DEBUG_SPI
-#  undef CONFIG_DEBUG_INFO
-#endif
-
 #ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -111,7 +104,7 @@ void weak_function stm32_spiinitialize(void)
   g_spi1 = up_spiinitialize(1);
   if (!g_spi1)
     {
-      spierr("[boot] FAILED to initialize SPI port 1\n");
+      spierr("ERROR: FAILED to initialize SPI port 1\n");
     }
 
 #ifdef CONFIG_WL_CC3000
@@ -166,7 +159,7 @@ void weak_function stm32_spiinitialize(void)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
 #ifdef CONFIG_WL_CC3000
   if (devid == SPIDEV_WIRELESS)
@@ -192,7 +185,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
 #ifdef CONFIG_WL_CC3000
   if (devid == SPIDEV_WIRELESS)
@@ -211,7 +204,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
diff --git a/configs/nucleo-l476rg/src/stm32_wireless.c b/configs/nucleo-l476rg/src/stm32_wireless.c
index bdd8f2f6af..c17da677fe 100644
--- a/configs/nucleo-l476rg/src/stm32_wireless.c
+++ b/configs/nucleo-l476rg/src/stm32_wireless.c
@@ -280,7 +280,7 @@ int wireless_archinitialize(size_t max_rx_size)
 
   /* Init SPI bus */
 
-  ierr("minor %d\n", minor);
+  iinfo("minor %d\n", minor);
   DEBUGASSERT(CONFIG_CC3000_DEVMINOR == 0);
 
 #ifdef CONFIG_CC3000_PROBES
@@ -295,7 +295,7 @@ int wireless_archinitialize(size_t max_rx_size)
   spi = up_spiinitialize(CONFIG_CC3000_SPIDEV);
   if (!spi)
     {
-      ierr("Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV);
+      ierr("ERROR: Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV);
       return -ENODEV;
     }
 
@@ -305,7 +305,7 @@ int wireless_archinitialize(size_t max_rx_size)
   int ret = cc3000_register(spi, &g_cc3000_info.dev, CONFIG_CC3000_DEVMINOR);
   if (ret < 0)
     {
-      ierr("Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV);
+      ierr("ERROR: Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV);
       return -ENODEV;
     }
 
diff --git a/configs/olimex-lpc-h3131/src/lpc31_spi.c b/configs/olimex-lpc-h3131/src/lpc31_spi.c
index 2dd3fa4e10..5fbc30ae7f 100644
--- a/configs/olimex-lpc-h3131/src/lpc31_spi.c
+++ b/configs/olimex-lpc-h3131/src/lpc31_spi.c
@@ -117,7 +117,7 @@ void weak_function lpc31_spidev_intialize(void)
 
 void lpc31_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
diff --git a/configs/olimex-lpc1766stk/src/lpc17_hidmouse.c b/configs/olimex-lpc1766stk/src/lpc17_hidmouse.c
index 003b6e9e53..28df025df1 100644
--- a/configs/olimex-lpc1766stk/src/lpc17_hidmouse.c
+++ b/configs/olimex-lpc1766stk/src/lpc17_hidmouse.c
@@ -114,7 +114,7 @@ int board_tsc_setup(int minor)
   static bool initialized = false;
   int ret;
 
-  ierr("minor %d\n", minor);
+  iinfo("minor %d\n", minor);
   DEBUGASSERT(minor == 0);
 
   /* Have we already initialized?  Since we never uninitialize we must prevent
@@ -140,7 +140,7 @@ int board_tsc_setup(int minor)
       ret = usbhost_mouse_init();
       if (ret < 0)
         {
-          ierr("Failed to register USB HID mouse device class\n");
+          ierr("ERROR: Failed to register USB HID mouse device class\n");
           return -ENODEV;
         }
 
diff --git a/configs/olimex-lpc1766stk/src/lpc17_lcd.c b/configs/olimex-lpc1766stk/src/lpc17_lcd.c
index 9ed0623a0f..acd8923677 100644
--- a/configs/olimex-lpc1766stk/src/lpc17_lcd.c
+++ b/configs/olimex-lpc1766stk/src/lpc17_lcd.c
@@ -214,7 +214,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
   spi = lpc17_sspbus_initialize(0);
   if (!spi)
     {
-      gllerr("Failed to initialize SSP port 0\n");
+      gllerr("ERROR: Failed to initialize SSP port 0\n");
     }
   else
     {
@@ -223,7 +223,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
       dev = nokia_lcdinitialize(spi, devno);
       if (!dev)
         {
-          gllerr("Failed to bind SSP port 0 to LCD %d: %d\n", devno);
+          gllerr("ERROR: Failed to bind SSP port 0 to LCD %d: %d\n", devno);
         }
      else
         {
diff --git a/configs/olimex-lpc1766stk/src/lpc17_ssp.c b/configs/olimex-lpc1766stk/src/lpc17_ssp.c
index ed659ad932..e48baac9f1 100644
--- a/configs/olimex-lpc1766stk/src/lpc17_ssp.c
+++ b/configs/olimex-lpc1766stk/src/lpc17_ssp.c
@@ -74,28 +74,22 @@
 #endif
 
 /* Debug ********************************************************************/
-/* The following enable debug output from this file (needs CONFIG_DEBUG_FEATURES too).
- *
- * CONFIG_SSP_DEBUG - Define to enable basic SSP debug
- * CONFIG_SSP_VERBOSE - Define to enable verbose SSP debug
- */
 
-#ifdef CONFIG_SSP_DEBUG
+/* The following enable debug output from this file */
+
+#ifdef CONFIG_DEBUG_SPI
 #  define ssperr  llerr
-#  ifdef CONFIG_SSP_VERBOSE
-#    define sspinfo llerr
-#  else
-#    define sspinfo(x...)
-#  endif
+#  define sspwarn llwarn
+#  define sspinfo llinfo
 #else
-#  undef CONFIG_SSP_VERBOSE
 #  define ssperr(x...)
+#  define sspwarn(x...)
 #  define sspinfo(x...)
 #endif
 
 /* Dump GPIO registers */
 
-#ifdef CONFIG_SSP_VERBOSE
+#ifdef CONFIG_DEBUG_GPIO
 #  define ssp_dumpssp0gpio(m) lpc17_dumpgpio(LPC1766STK_LCD_CS, m)
 #  define ssp_dumpssp1gpio(m) lpc17_dumpgpio(LPC1766STK_MMC_CS, m)
 #else
@@ -284,7 +278,7 @@ void weak_function lpc1766stk_sspdev_initialize(void)
 #ifdef CONFIG_LPC17_SSP0
 void  lpc17_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  sspinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   if (devid == SPIDEV_DISPLAY)
     {
       /* Assert/de-assert the CS pin to the card */
@@ -297,7 +291,7 @@ void  lpc17_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel
 
 uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  ssperr("Returning nothing\n");
+  sspinfo("Returning nothing\n");
   return 0;
 }
 #endif
@@ -305,7 +299,7 @@ uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_LPC17_SSP1
 void  lpc17_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  sspinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   if (devid == SPIDEV_MMCSD)
     {
       /* Assert/de-assert the CS pin to the card */
@@ -318,7 +312,7 @@ void  lpc17_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel
 
 uint8_t lpc17_ssp1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  ssperr("Returning SPI_STATUS_PRESENT\n");
+  sspinfo("Returning SPI_STATUS_PRESENT\n");
   return SPI_STATUS_PRESENT;
 }
 #endif
diff --git a/configs/olimex-stm32-h405/src/stm32_adc.c b/configs/olimex-stm32-h405/src/stm32_adc.c
index aed729e149..f7cee47b8b 100644
--- a/configs/olimex-stm32-h405/src/stm32_adc.c
+++ b/configs/olimex-stm32-h405/src/stm32_adc.c
@@ -168,7 +168,7 @@ int stm32_adc_initialize(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          aerr("adc_register failed: %d\n", ret);
+          aerr("ERROR: adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/olimex-stm32-h405/src/stm32_usb.c b/configs/olimex-stm32-h405/src/stm32_usb.c
index d825f90752..d35c6aef3a 100644
--- a/configs/olimex-stm32-h405/src/stm32_usb.c
+++ b/configs/olimex-stm32-h405/src/stm32_usb.c
@@ -110,7 +110,7 @@ void stm32_usbinitialize(void)
 #ifdef CONFIG_USBDEV
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ullerr("resume: %d\n", resume);
+  ullinfo("resume: %d\n", resume);
 }
 #endif
 
diff --git a/configs/olimex-stm32-h407/src/stm32_adc.c b/configs/olimex-stm32-h407/src/stm32_adc.c
index 211b403eb4..9fa020954c 100644
--- a/configs/olimex-stm32-h407/src/stm32_adc.c
+++ b/configs/olimex-stm32-h407/src/stm32_adc.c
@@ -168,7 +168,7 @@ int stm32_adc_initialize(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          aerr("adc_register failed: %d\n", ret);
+          aerr("ERROR: adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/olimex-stm32-h407/src/stm32_sdio.c b/configs/olimex-stm32-h407/src/stm32_sdio.c
index 8c5ffa7cbd..05df07dee8 100644
--- a/configs/olimex-stm32-h407/src/stm32_sdio.c
+++ b/configs/olimex-stm32-h407/src/stm32_sdio.c
@@ -139,7 +139,7 @@ int stm32_sdio_initialize(void)
   g_sdio_dev = sdio_initialize(SDIO_SLOTNO);
   if (!g_sdio_dev)
     {
-      ferr("Failed to initialize SDIO slot %d\n", SDIO_SLOTNO);
+      ferr("ERROR: Failed to initialize SDIO slot %d\n", SDIO_SLOTNO);
       return -ENODEV;
     }
 
@@ -150,7 +150,7 @@ int stm32_sdio_initialize(void)
   ret = mmcsd_slotinitialize(SDIO_MINOR, g_sdio_dev);
   if (ret != OK)
     {
-      ferr("Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
+      ferr("ERROR: Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
       return ret;
     }
 
diff --git a/configs/olimex-stm32-h407/src/stm32_usb.c b/configs/olimex-stm32-h407/src/stm32_usb.c
index d954374967..549820309c 100644
--- a/configs/olimex-stm32-h407/src/stm32_usb.c
+++ b/configs/olimex-stm32-h407/src/stm32_usb.c
@@ -307,7 +307,7 @@ xcpt_t stm32_setup_overcurrent(xcpt_t handler)
 #ifdef CONFIG_USBDEV
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ullerr("resume: %d\n", resume);
+  ullinfo("resume: %d\n", resume);
 }
 #endif
 
diff --git a/configs/olimex-stm32-p107/src/stm32_encx24j600.c b/configs/olimex-stm32-p107/src/stm32_encx24j600.c
index daa818e2af..37c46548b5 100644
--- a/configs/olimex-stm32-p107/src/stm32_encx24j600.c
+++ b/configs/olimex-stm32-p107/src/stm32_encx24j600.c
@@ -180,7 +180,7 @@ void up_netinitialize(void)
   spi = stm32_spibus_initialize(ENCX24J600_SPI_PORTNO);
   if (!spi)
     {
-      nllerr("Failed to initialize SPI port %d\n", ENCX24J600_SPI_PORTNO);
+      nllerr("ERROR: Failed to initialize SPI port %d\n", ENCX24J600_SPI_PORTNO);
       return;
     }
 
@@ -190,7 +190,7 @@ void up_netinitialize(void)
 
   if (ret < 0)
     {
-      nllerr("Failed to bind SPI port %d ENCX24J600 device %d: %d\n",
+      nllerr("ERROR: Failed to bind SPI port %d ENCX24J600 device %d: %d\n",
              ENCX24J600_SPI_PORTNO, ENCX24J600_DEVNO, ret);
       return;
     }
diff --git a/configs/olimex-stm32-p107/src/stm32_spi.c b/configs/olimex-stm32-p107/src/stm32_spi.c
index 2567e2de91..a466092b17 100644
--- a/configs/olimex-stm32-p107/src/stm32_spi.c
+++ b/configs/olimex-stm32-p107/src/stm32_spi.c
@@ -126,7 +126,7 @@ void weak_function stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
   if (devid == SPIDEV_ETHERNET)
     {
diff --git a/configs/olimex-stm32-p207/src/stm32_adc.c b/configs/olimex-stm32-p207/src/stm32_adc.c
index 293f4d27d4..75a451176a 100644
--- a/configs/olimex-stm32-p207/src/stm32_adc.c
+++ b/configs/olimex-stm32-p207/src/stm32_adc.c
@@ -160,7 +160,7 @@ int stm32_adc_initialize(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          aerr("adc_register failed: %d\n", ret);
+          aerr("ERROR: adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/olimex-stm32-p207/src/stm32_usb.c b/configs/olimex-stm32-p207/src/stm32_usb.c
index ed6572dd44..492c7d26e8 100644
--- a/configs/olimex-stm32-p207/src/stm32_usb.c
+++ b/configs/olimex-stm32-p207/src/stm32_usb.c
@@ -311,7 +311,7 @@ void stm32_usbhost_vbusdrive(int iface, bool enable)
 #ifdef CONFIG_USBDEV
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ullerr("resume: %d\n", resume);
+  ullinfo("resume: %d\n", resume);
 }
 #endif
 
diff --git a/configs/olimex-strp711/src/str71_enc28j60.c b/configs/olimex-strp711/src/str71_enc28j60.c
index 3e93da0fe6..ab49dc72b1 100644
--- a/configs/olimex-strp711/src/str71_enc28j60.c
+++ b/configs/olimex-strp711/src/str71_enc28j60.c
@@ -216,7 +216,7 @@ void up_netinitialize(void)
   spi = str71_spibus_initialize(ENC28J60_SPI_PORTNO);
   if (!spi)
     {
-      nllerr("Failed to initialize SPI port %d\n", ENC28J60_SPI_PORTNO);
+      nllerr("ERROR: Failed to initialize SPI port %d\n", ENC28J60_SPI_PORTNO);
       return;
     }
 
@@ -225,7 +225,7 @@ void up_netinitialize(void)
   ret = str71x_xticonfig(ENC28J60_IRQ, false);
   if (ret < 0)
     {
-      nllerr("Failed configure interrupt for IRQ %d: %d\n", ENC28J60_IRQ, ret);
+      nllerr("ERROR: Failed configure interrupt for IRQ %d: %d\n", ENC28J60_IRQ, ret);
       return;
     }
 
@@ -240,7 +240,7 @@ void up_netinitialize(void)
   ret = enc_initialize(spi, &g_enclower, ENC28J60_DEVNO);
   if (ret < 0)
     {
-      nllerr("Failed to bind SPI port %d ENC28J60 device %d: %d\n",
+      nllerr("ERROR: Failed to bind SPI port %d ENC28J60 device %d: %d\n",
              ENC28J60_SPI_PORTNO, ENC28J60_DEVNO, ret);
       return;
     }
diff --git a/configs/olimexino-stm32/src/stm32_spi.c b/configs/olimexino-stm32/src/stm32_spi.c
index 5ee47db85a..e10a0861c5 100644
--- a/configs/olimexino-stm32/src/stm32_spi.c
+++ b/configs/olimexino-stm32/src/stm32_spi.c
@@ -125,7 +125,7 @@ void weak_function stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   if (devid == SPIDEV_USER)
     {
       stm32_gpiowrite(USER_CSn, !selected);
@@ -141,7 +141,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #if defined(CONFIG_MMCSD)
   if (devid == SPIDEV_MMCSD)
     {
@@ -161,7 +161,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
diff --git a/configs/olimexino-stm32/src/stm32_usbdev.c b/configs/olimexino-stm32/src/stm32_usbdev.c
index 30ea651457..d810a55365 100644
--- a/configs/olimexino-stm32/src/stm32_usbdev.c
+++ b/configs/olimexino-stm32/src/stm32_usbdev.c
@@ -90,7 +90,7 @@ void stm32_usb_set_pwr_callback(xcpt_t pwr_changed_handler)
 
 void stm32_usbinitialize(void)
 {
-  ullerr("called\n");
+  ullinfo("called\n");
 
   /* USB Soft Connect Pullup */
 
@@ -129,5 +129,5 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable)
 
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ullerr("resume: %d\n", resume);
+  ullinfo("resume: %d\n", resume);
 }
diff --git a/configs/open1788/src/lpc17_ssp.c b/configs/open1788/src/lpc17_ssp.c
index c8be1a5da0..929c8a5a65 100644
--- a/configs/open1788/src/lpc17_ssp.c
+++ b/configs/open1788/src/lpc17_ssp.c
@@ -65,13 +65,11 @@
 
 #ifdef CONFIG_DEBUG_SPI
 #  define ssperr  llerr
-#  ifdef CONFIG_DEBUG_INFO
-#    define sspinfo llerr
-#  else
-#    define sspinfo(x...)
-#  endif
+#  define sspwarn llwarn
+#  define sspinfo llinfo
 #else
 #  define ssperr(x...)
+#  define sspwarn(x...)
 #  define sspinfo(x...)
 #endif
 
@@ -83,18 +81,6 @@
 #  define ssp_dumpgpio(p,m)
 #endif
 
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -158,12 +144,12 @@ void weak_function open1788_sspdev_initialize(void)
 #ifdef CONFIG_LPC17_SSP0
 void  lpc17_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  sspinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  ssperr("Returning nothing\n");
+  sspinfo("Returning nothing\n");
   return 0;
 }
 #endif
@@ -171,7 +157,7 @@ uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_LPC17_SSP1
 void  lpc17_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  sspinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   if (devid == SPIDEV_TOUCHSCREEN)
     {
       /* Assert/de-assert the CS pin to the touchscreen */
@@ -184,7 +170,7 @@ void  lpc17_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel
 
 uint8_t lpc17_ssp1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  ssperr("Returning nothing\n");
+  sspinfo("Returning nothing\n");
   return 0;
 }
 #endif
@@ -192,12 +178,12 @@ uint8_t lpc17_ssp1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_LPC17_SSP2
 void  lpc17_ssp2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  sspinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t lpc17_ssp2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  ssperr("Returning nothing\n");
+  sspinfo("Returning nothing\n");
   return 0;
 }
 #endif
diff --git a/configs/open1788/src/lpc17_touchscreen.c b/configs/open1788/src/lpc17_touchscreen.c
index 1dcf9bb560..1d1af3ff8b 100644
--- a/configs/open1788/src/lpc17_touchscreen.c
+++ b/configs/open1788/src/lpc17_touchscreen.c
@@ -277,7 +277,7 @@ int board_tsc_setup(int minor)
   FAR struct spi_dev_s *dev;
   int ret;
 
-  ierr("initialized:%d minor:%d\n", initialized, minor);
+  iinfo("initialized:%d minor:%d\n", initialized, minor);
   DEBUGASSERT(minor == 0);
 
   /* Since there is no uninitialized logic, this initialization can be
@@ -301,7 +301,7 @@ int board_tsc_setup(int minor)
       dev = lpc17_sspbus_initialize(CONFIG_ADS7843E_SPIDEV);
       if (!dev)
         {
-          ierr("Failed to initialize SPI bus %d\n", CONFIG_ADS7843E_SPIDEV);
+          ierr("ERROR: Failed to initialize SPI bus %d\n", CONFIG_ADS7843E_SPIDEV);
           return -ENODEV;
         }
 
@@ -310,7 +310,7 @@ int board_tsc_setup(int minor)
       ret = ads7843e_register(dev, &g_tscinfo, CONFIG_ADS7843E_DEVMINOR);
       if (ret < 0)
         {
-          ierr("Failed to register touchscreen device minor=%d\n",
+          ierr("ERROR: Failed to register touchscreen device minor=%d\n",
                CONFIG_ADS7843E_DEVMINOR);
        /* up_spiuninitialize(dev); */
           return -ENODEV;
diff --git a/configs/pic32mx-starterkit/src/pic32mx_spi.c b/configs/pic32mx-starterkit/src/pic32mx_spi.c
index 6acb1efa9a..f2f150952b 100644
--- a/configs/pic32mx-starterkit/src/pic32mx_spi.c
+++ b/configs/pic32mx-starterkit/src/pic32mx_spi.c
@@ -123,13 +123,13 @@ enum spi_dev_e;
 #ifdef CONFIG_PIC32MX_SPI1
 void  pic32mx_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
 uint8_t pic32mx_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  spierr("Returning nothing\n");
+  spiinfo("Returning nothing\n");
 #warning "Missing logic"
   return 0;
 }
@@ -145,13 +145,13 @@ int pic32mx_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
 #ifdef CONFIG_PIC32MX_SPI1
 void  pic32mx_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
 uint8_t pic32mx_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  spierr("Returning nothing\n");
+  spiinfo("Returning nothing\n");
 #warning "Missing logic"
   return 0;
 }
@@ -167,13 +167,13 @@ int pic32mx_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
 #ifdef CONFIG_PIC32MX_SPI3
 void  pic32mx_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
 uint8_t pic32mx_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  spierr("Returning nothing\n");
+  spiinfo("Returning nothing\n");
 #warning "Missing logic"
   return 0;
 }
@@ -189,13 +189,13 @@ int pic32mx_spi3cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
 #ifdef CONFIG_PIC32MX_SPI4
 void  pic32mx_spi4select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
 uint8_t pic32mx_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  spierr("Returning nothing\n");
+  spiinfo("Returning nothing\n");
 #warning "Missing logic"
   return 0;
 }
diff --git a/configs/pic32mx7mmb/src/pic32_spi.c b/configs/pic32mx7mmb/src/pic32_spi.c
index 1b62c22f0c..23a190eec1 100644
--- a/configs/pic32mx7mmb/src/pic32_spi.c
+++ b/configs/pic32mx7mmb/src/pic32_spi.c
@@ -82,16 +82,14 @@
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
+#  define spiwarn llwarn
 #  define spiinfo llinfo
 #else
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
@@ -150,7 +148,7 @@ enum spi_dev_e;
 #ifdef CONFIG_PIC32MX_SPI1
 void  pic32mx_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
   if (devid == SPIDEV_MMCSD)
     {
@@ -179,7 +177,7 @@ uint8_t pic32mx_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
         }
     }
 
-  spierr("Returning %02x\n", ret);
+  spiinfo("Returning %02x\n", ret);
   return ret;
 }
 #ifdef CONFIG_SPI_CMDDATA
@@ -194,13 +192,13 @@ int pic32mx_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
 #ifdef CONFIG_PIC32MX_SPI2
 void  pic31mx_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
 uint8_t pic31mx_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  spierr("Returning nothing\n");
+  spiinfo("Returning nothing\n");
 #warning "Missing logic"
   return 0;
 }
@@ -217,13 +215,13 @@ int pic31mx_spi2cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
 #ifdef CONFIG_PIC32MX_SPI3
 void  pic32mx_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
 uint8_t pic32mx_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  spierr("Returning nothing\n");
+  spiinfo("Returning nothing\n");
 #warning "Missing logic"
   return 0;
 }
@@ -240,13 +238,13 @@ int pic32mx_spi3cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
 #ifdef CONFIG_PIC32MX_SPI4
 void  pic32mx_spi4select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
 uint8_t pic32mx_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  spierr("Returning nothing\n");
+  spiinfo("Returning nothing\n");
 #warning "Missing logic"
   return 0;
 }
diff --git a/configs/pic32mx7mmb/src/pic32_touchscreen.c b/configs/pic32mx7mmb/src/pic32_touchscreen.c
index 6359ea07bd..95b51479e7 100644
--- a/configs/pic32mx7mmb/src/pic32_touchscreen.c
+++ b/configs/pic32mx7mmb/src/pic32_touchscreen.c
@@ -1282,7 +1282,7 @@ static int tc_poll(FAR struct file *filep, FAR struct pollfd *fds,
 
       if ((fds->events & POLLIN) == 0)
         {
-          ierr("Missing POLLIN: revents: %08x\n", fds->revents);
+          ierr("ERROR: Missing POLLIN: revents: %08x\n", fds->revents);
           ret = -EDEADLK;
           goto errout;
         }
@@ -1307,7 +1307,7 @@ static int tc_poll(FAR struct file *filep, FAR struct pollfd *fds,
 
       if (i >= CONFIG_TOUCHSCREEN_NPOLLWAITERS)
         {
-          ierr("No availabled slot found: %d\n", i);
+          ierr("ERROR: No available slot found: %d\n", i);
           fds->priv    = NULL;
           ret          = -EBUSY;
           goto errout;
@@ -1389,7 +1389,7 @@ int board_tsc_setup(int minor)
   priv = (FAR struct tc_dev_s *)kmm_malloc(sizeof(struct tc_dev_s));
   if (!priv)
     {
-      ierr("kmm_malloc(%d) failed\n", sizeof(struct tc_dev_s));
+      ierr("ERROR: kmm_malloc(%d) failed\n", sizeof(struct tc_dev_s));
       return -ENOMEM;
     }
 #endif
@@ -1408,7 +1408,7 @@ int board_tsc_setup(int minor)
   ret = register_driver(devname, &tc_fops, 0666, priv);
   if (ret < 0)
     {
-      ierr("register_driver() failed: %d\n", ret);
+      ierr("ERROR: register_driver() failed: %d\n", ret);
       goto errout_with_priv;
     }
 
@@ -1420,7 +1420,7 @@ int board_tsc_setup(int minor)
   ret = work_queue(HPWORK, &priv->work, tc_worker, priv, 0);
   if (ret != 0)
     {
-      ierr("Failed to queue work: %d\n", ret);
+      ierr("ERROR: Failed to queue work: %d\n", ret);
       goto errout_with_priv;
     }
 
diff --git a/configs/pic32mz-starterkit/src/pic32mz_spi.c b/configs/pic32mz-starterkit/src/pic32mz_spi.c
index 6289c71899..6e28274b46 100644
--- a/configs/pic32mz-starterkit/src/pic32mz_spi.c
+++ b/configs/pic32mz-starterkit/src/pic32mz_spi.c
@@ -121,13 +121,13 @@ enum spi_dev_e;
 #ifdef CONFIG_PIC32MZ_SPI1
 void  pic32mz_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
 uint8_t pic32mz_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  spierr("Returning nothing\n");
+  spiinfo("Returning nothing\n");
 #warning "Missing logic"
   return 0;
 }
@@ -143,13 +143,13 @@ int pic32mz_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
 #ifdef CONFIG_PIC32MZ_SPI2
 void  pic32mz_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
 uint8_t pic32mz_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  spierr("Returning nothing\n");
+  spiinfo("Returning nothing\n");
 #warning "Missing logic"
   return 0;
 }
@@ -165,13 +165,13 @@ int pic32mz_spi2cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
 #ifdef CONFIG_PIC32MZ_SPI3
 void  pic32mz_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
 uint8_t pic32mz_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  spierr("Returning nothing\n");
+  spiinfo("Returning nothing\n");
 #warning "Missing logic"
   return 0;
 }
@@ -187,13 +187,13 @@ int pic32mz_spi3cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
 #ifdef CONFIG_PIC32MZ_SPI4
 void  pic32mz_spi4select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
 uint8_t pic32mz_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  spierr("Returning nothing\n");
+  spiinfo("Returning nothing\n");
 #warning "Missing logic"
   return 0;
 }
@@ -209,13 +209,13 @@ int pic32mz_spi4cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
 #ifdef CONFIG_PIC32MZ_SPI5
 void  pic32mz_spi5select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
 uint8_t pic32mz_spi5status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  spierr("Returning nothing\n");
+  spiinfo("Returning nothing\n");
 #warning "Missing logic"
   return 0;
 }
@@ -231,13 +231,13 @@ int pic32mz_spi5cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cm
 #ifdef CONFIG_PIC32MZ_SPI6
 void  pic32mz_spi6select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
 uint8_t pic32mz_spi6status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  spierr("Returning nothing\n");
+  spiinfo("Returning nothing\n");
 #warning "Missing logic"
   return 0;
 }
diff --git a/configs/u-blox-c027/src/lpc17_ssp.c b/configs/u-blox-c027/src/lpc17_ssp.c
index dd8bcb3d0d..2b90577995 100644
--- a/configs/u-blox-c027/src/lpc17_ssp.c
+++ b/configs/u-blox-c027/src/lpc17_ssp.c
@@ -72,7 +72,7 @@
 
 /* Dump GPIO registers */
 
-#ifdef SSP_VERBOSE
+#ifdef CONFIG_DEBUG_GPIO
 #  define ssp_dumpgpio(m) lpc17_dumpgpio(SDCCS_GPIO, m)
 #else
 #  define ssp_dumpgpio(m)
-- 
GitLab


From 90e60513b1fe6a39b8b30e4a557155a262920852 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 13 Jun 2016 08:49:46 -0600
Subject: [PATCH 56/91] New strtoul[l] functions need to include errno.h

---
 libc/stdlib/lib_strtoul.c  | 1 +
 libc/stdlib/lib_strtoull.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/libc/stdlib/lib_strtoul.c b/libc/stdlib/lib_strtoul.c
index 9500947ec1..30ffbd31c3 100644
--- a/libc/stdlib/lib_strtoul.c
+++ b/libc/stdlib/lib_strtoul.c
@@ -40,6 +40,7 @@
 #include 
 
 #include 
+#include 
 
 #include "libc.h"
 
diff --git a/libc/stdlib/lib_strtoull.c b/libc/stdlib/lib_strtoull.c
index 0ded0af961..fab588891b 100644
--- a/libc/stdlib/lib_strtoull.c
+++ b/libc/stdlib/lib_strtoull.c
@@ -41,6 +41,7 @@
 #include 
 
 #include 
+#include 
 
 #include "libc.h"
 
-- 
GitLab


From 40f0481478764878c8c22bf98fbfd463fd8a5322 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 13 Jun 2016 09:44:12 -0600
Subject: [PATCH 57/91] configs/:  Change some *err() message to *info()
 messages if what was a *dbg() message does not indicate and error condition.

---
 arch/arm/src/tiva/tiva_ssi.c                  | 16 +++---
 configs/eagle100/src/lm_ssi.c                 | 24 +++------
 configs/ekk-lm3s9b96/src/lm_ssi.c             | 30 +++--------
 configs/hymini-stm32v/src/stm32_r61505u.c     | 50 ++++++++++---------
 configs/hymini-stm32v/src/stm32_ssd1289.c     | 48 +++++++++---------
 configs/lm3s6432-s2e/src/lm_ethernet.c        |  2 +-
 configs/lm3s6432-s2e/src/lm_leds.c            |  2 +-
 configs/lm3s6432-s2e/src/lm_ssi.c             | 32 +++---------
 configs/lm3s6965-ek/src/lm_ethernet.c         |  2 +-
 configs/lm3s6965-ek/src/lm_leds.c             | 24 ++-------
 configs/lm3s6965-ek/src/lm_oled.c             |  4 +-
 configs/lm3s6965-ek/src/lm_ssi.c              | 32 +++---------
 configs/lm3s8962-ek/src/lm_ethernet.c         |  2 +-
 configs/lm3s8962-ek/src/lm_leds.c             | 22 +++-----
 configs/lm3s8962-ek/src/lm_oled.c             |  4 +-
 configs/lm3s8962-ek/src/lm_ssi.c              | 32 +++---------
 configs/lm4f120-launchpad/src/lm4f_autoleds.c |  2 +-
 configs/lm4f120-launchpad/src/lm4f_ssi.c      | 24 +++------
 configs/lpc4337-ws/src/lpc43_adc.c            |  2 +-
 configs/lpc4370-link2/src/lpc43_adc.c         |  2 +-
 configs/lpcxpresso-lpc1115/src/lpc11_adc.c    |  2 +-
 configs/lpcxpresso-lpc1115/src/lpc11_dac.c    |  2 +-
 configs/lpcxpresso-lpc1115/src/lpc11_pwm.c    | 12 ++---
 configs/lpcxpresso-lpc1115/src/lpc11_ssp.c    | 10 ++--
 configs/lpcxpresso-lpc1768/src/lpc17_adc.c    |  2 +-
 configs/lpcxpresso-lpc1768/src/lpc17_dac.c    |  2 +-
 configs/lpcxpresso-lpc1768/src/lpc17_oled.c   |  4 +-
 configs/lpcxpresso-lpc1768/src/lpc17_pwm.c    | 12 ++---
 configs/lpcxpresso-lpc1768/src/lpc17_ssp.c    | 10 ++--
 configs/maple/src/stm32_lcd.c                 | 18 +++----
 configs/maple/src/stm32_spi.c                 | 23 +++------
 configs/maple/src/stm32_usbdev.c              |  4 +-
 configs/mbed/src/lpc17_adc.c                  |  2 +-
 configs/mbed/src/lpc17_dac.c                  |  2 +-
 configs/mbed/src/lpc17_pwm.c                  | 12 ++---
 configs/mcu123-lpc214x/src/lpc2148_spi1.c     | 16 +++---
 configs/mikroe-stm32f4/src/stm32_idle.c       |  2 +-
 configs/mikroe-stm32f4/src/stm32_pwm.c        |  4 +-
 configs/mikroe-stm32f4/src/stm32_qencoder.c   |  2 +-
 configs/mikroe-stm32f4/src/stm32_spi.c        |  4 +-
 .../mikroe-stm32f4/src/stm32_touchscreen.c    | 16 +++---
 configs/mikroe-stm32f4/src/stm32_usb.c        |  2 +-
 configs/mikroe-stm32f4/src/stm32_vs1053.c     |  4 +-
 configs/mirtoo/src/pic32_spi2.c               |  8 ++-
 configs/ntosd-dm320/src/dm320_network.c       | 10 ++--
 45 files changed, 211 insertions(+), 330 deletions(-)

diff --git a/arch/arm/src/tiva/tiva_ssi.c b/arch/arm/src/tiva/tiva_ssi.c
index eb8972bb0b..db35b5350c 100644
--- a/arch/arm/src/tiva/tiva_ssi.c
+++ b/arch/arm/src/tiva/tiva_ssi.c
@@ -66,18 +66,18 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES with
- * CONFIG_DEBUG_INFO too)
- */
-
-#undef SSI_DEBUG  /* Define to enable debug */
+/* CONFIG_DEBUG_SPI enables debug output from this file */
 
-#ifdef SSI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define ssierr  llerr
+#  define ssiwarn llwarn
 #  define ssiinfo llinfo
+#  define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m)
 #else
 #  define ssierr(x...)
+#  define ssiwarn(x...)
 #  define ssiinfo(x...)
+#  define ssi_dumpgpio(m)
 #endif
 
 /* How many SSI modules does this chip support? The LM3S6918 supports 2 SSI
@@ -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_INFO)
+#if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO)
   uint32_t regval  = ssi_getreg(priv, TIVA_SSI_DR_OFFSET);
   ssiinfo("RX: discard %04x\n", regval);
 #else
@@ -1022,7 +1022,7 @@ static int ssi_interrupt(int irq, void *context)
 
   /* Check for Rx FIFO overruns */
 
-#ifdef SSI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
   if ((regval & SSI_RIS_ROR) != 0)
     {
       ssierr("Rx FIFO Overrun!\n");
diff --git a/configs/eagle100/src/lm_ssi.c b/configs/eagle100/src/lm_ssi.c
index f0a1fbb28f..066c12d11d 100644
--- a/configs/eagle100/src/lm_ssi.c
+++ b/configs/eagle100/src/lm_ssi.c
@@ -59,29 +59,17 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
+/* CONFIG_DEBUG_SPI enables debug output from this file */
 
-#undef SSI_DEBUG   /* Define to enable debug */
-#undef SSI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SSI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define ssierr  llerr
-#  ifdef SSI_VERBOSE
-#    define ssiinfo llerr
-#  else
-#    define ssiinfo(x...)
-#  endif
+#  define ssiwarn llwarn
+#  define ssiinfo llinfo
+#  define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m)
 #else
-#  undef SSI_VERBOSE
 #  define ssierr(x...)
+#  define ssiwarn(x...)
 #  define ssiinfo(x...)
-#endif
-
-/* Dump GPIO registers */
-
-#ifdef SSI_VERBOSE
-#  define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m)
-#else
 #  define ssi_dumpgpio(m)
 #endif
 
diff --git a/configs/ekk-lm3s9b96/src/lm_ssi.c b/configs/ekk-lm3s9b96/src/lm_ssi.c
index 1e4e379213..f22fc206cf 100644
--- a/configs/ekk-lm3s9b96/src/lm_ssi.c
+++ b/configs/ekk-lm3s9b96/src/lm_ssi.c
@@ -58,38 +58,20 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
+/* CONFIG_DEBUG_SPI enables debug output from this file */
 
-#undef SSI_DEBUG   /* Define to enable debug */
-#undef SSI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SSI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define ssierr  llerr
-#  ifdef SSI_VERBOSE
-#    define ssiinfo llerr
-#  else
-#    define ssiinfo(x...)
-#  endif
+#  define ssiwarn llwarn
+#  define ssiinfo llinfo
+#  define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m)
 #else
-#  undef SSI_VERBOSE
 #  define ssierr(x...)
+#  define ssiwarn(x...)
 #  define ssiinfo(x...)
-#endif
-
-/* Dump GPIO registers */
-
-#ifdef SSI_VERBOSE
-#if 0
-#  define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m)
-#endif
-#else
 #  define ssi_dumpgpio(m)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
diff --git a/configs/hymini-stm32v/src/stm32_r61505u.c b/configs/hymini-stm32v/src/stm32_r61505u.c
index 8f23b6a344..40da4c42ec 100644
--- a/configs/hymini-stm32v/src/stm32_r61505u.c
+++ b/configs/hymini-stm32v/src/stm32_r61505u.c
@@ -94,9 +94,13 @@
 /* Debug ******************************************************************************/
 
 #ifdef CONFIG_DEBUG_LCD
-# define lcderr(format, ...)  info(format, ##__VA_ARGS__)
+#  define lcderr         err
+#  define lcdwarn        warn
+#  define lcdinfo        info
 #else
-# define lcderr(x...)
+#  define lcderr(x...)
+#  define lcdwarn(x...)
+#  define lcdinfo(x...)
 #endif
 
 /* This should be put elsewhere (possibly include/nuttx/compiler.h) */
@@ -880,26 +884,26 @@ static void lcd_backlight(void)
 
   /* Dump timer3 registers */
 
-  lcderr("APB1ENR: %08x\n", getreg32(STM32_RCC_APB1ENR));
-  lcderr("CR1:     %04x\n", getreg32(STM32_TIM3_CR1));
-  lcderr("CR2:     %04x\n", getreg32(STM32_TIM3_CR2));
-  lcderr("SMCR:    %04x\n", getreg32(STM32_TIM3_SMCR));
-  lcderr("DIER:    %04x\n", getreg32(STM32_TIM3_DIER));
-  lcderr("SR:      %04x\n", getreg32(STM32_TIM3_SR));
-  lcderr("EGR:     %04x\n", getreg32(STM32_TIM3_EGR));
-  lcderr("CCMR1:   %04x\n", getreg32(STM32_TIM3_CCMR1));
-  lcderr("CCMR2:   %04x\n", getreg32(STM32_TIM3_CCMR2));
-  lcderr("CCER:    %04x\n", getreg32(STM32_TIM3_CCER));
-  lcderr("CNT:     %04x\n", getreg32(STM32_TIM3_CNT));
-  lcderr("PSC:     %04x\n", getreg32(STM32_TIM3_PSC));
-  lcderr("ARR:     %04x\n", getreg32(STM32_TIM3_ARR));
-  lcderr("CCR1:    %04x\n", getreg32(STM32_TIM3_CCR1));
-  lcderr("CCR2:    %04x\n", getreg32(STM32_TIM3_CCR2));
-  lcderr("CCR3:    %04x\n", getreg32(STM32_TIM3_CCR3));
-  lcderr("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
-  lcderr("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
-  lcderr("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
-  lcderr("DMAR:    %04x\n", getreg32(STM32_TIM3_DMAR));
+  lcdinfo("APB1ENR: %08x\n", getreg32(STM32_RCC_APB1ENR));
+  lcdinfo("CR1:     %04x\n", getreg32(STM32_TIM3_CR1));
+  lcdinfo("CR2:     %04x\n", getreg32(STM32_TIM3_CR2));
+  lcdinfo("SMCR:    %04x\n", getreg32(STM32_TIM3_SMCR));
+  lcdinfo("DIER:    %04x\n", getreg32(STM32_TIM3_DIER));
+  lcdinfo("SR:      %04x\n", getreg32(STM32_TIM3_SR));
+  lcdinfo("EGR:     %04x\n", getreg32(STM32_TIM3_EGR));
+  lcdinfo("CCMR1:   %04x\n", getreg32(STM32_TIM3_CCMR1));
+  lcdinfo("CCMR2:   %04x\n", getreg32(STM32_TIM3_CCMR2));
+  lcdinfo("CCER:    %04x\n", getreg32(STM32_TIM3_CCER));
+  lcdinfo("CNT:     %04x\n", getreg32(STM32_TIM3_CNT));
+  lcdinfo("PSC:     %04x\n", getreg32(STM32_TIM3_PSC));
+  lcdinfo("ARR:     %04x\n", getreg32(STM32_TIM3_ARR));
+  lcdinfo("CCR1:    %04x\n", getreg32(STM32_TIM3_CCR1));
+  lcdinfo("CCR2:    %04x\n", getreg32(STM32_TIM3_CCR2));
+  lcdinfo("CCR3:    %04x\n", getreg32(STM32_TIM3_CCR3));
+  lcdinfo("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
+  lcdinfo("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
+  lcdinfo("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
+  lcdinfo("DMAR:    %04x\n", getreg32(STM32_TIM3_DMAR));
 }
 #endif
 
@@ -938,7 +942,7 @@ int board_lcd_initialize(void)
     {
       /* Not a R61505U ? */
 
-      gerr("board_lcd_initialize: LCD ctrl is not a R61505U");
+      lcderr("ERROR: board_lcd_initialize: LCD ctrl is not a R61505U");
       return ERROR;
     }
 
diff --git a/configs/hymini-stm32v/src/stm32_ssd1289.c b/configs/hymini-stm32v/src/stm32_ssd1289.c
index 7bd48a1529..dc9c0b964c 100644
--- a/configs/hymini-stm32v/src/stm32_ssd1289.c
+++ b/configs/hymini-stm32v/src/stm32_ssd1289.c
@@ -103,21 +103,21 @@
 #define LCD_DATA         0x60020000  /* RS = 1 */
 
 /* Debug ******************************************************************************/
+
 #ifdef CONFIG_DEBUG_LCD
 #  define lcderr         err
+#  define lcdwarn        warn
 #  define lcdinfo        info
 #else
 #  define lcderr(x...)
+#  define lcdwarn(x...)
 #  define lcdinfo(x...)
 #endif
 
-/**************************************************************************************
- * Private Type Definition
- **************************************************************************************/
-
 /**************************************************************************************
  * Private Function Prototypes
  **************************************************************************************/
+
 /* Low Level LCD access */
 
 static void stm32_select(FAR struct ssd1289_lcd_s *dev);
@@ -359,26 +359,26 @@ static void init_lcd_backlight(void)
 
   /* Dump timer3 registers */
 
-  lcderr("APB1ENR: %08x\n", getreg32(STM32_RCC_APB1ENR));
-  lcderr("CR1:     %04x\n", getreg32(STM32_TIM3_CR1));
-  lcderr("CR2:     %04x\n", getreg32(STM32_TIM3_CR2));
-  lcderr("SMCR:    %04x\n", getreg32(STM32_TIM3_SMCR));
-  lcderr("DIER:    %04x\n", getreg32(STM32_TIM3_DIER));
-  lcderr("SR:      %04x\n", getreg32(STM32_TIM3_SR));
-  lcderr("EGR:     %04x\n", getreg32(STM32_TIM3_EGR));
-  lcderr("CCMR1:   %04x\n", getreg32(STM32_TIM3_CCMR1));
-  lcderr("CCMR2:   %04x\n", getreg32(STM32_TIM3_CCMR2));
-  lcderr("CCER:    %04x\n", getreg32(STM32_TIM3_CCER));
-  lcderr("CNT:     %04x\n", getreg32(STM32_TIM3_CNT));
-  lcderr("PSC:     %04x\n", getreg32(STM32_TIM3_PSC));
-  lcderr("ARR:     %04x\n", getreg32(STM32_TIM3_ARR));
-  lcderr("CCR1:    %04x\n", getreg32(STM32_TIM3_CCR1));
-  lcderr("CCR2:    %04x\n", getreg32(STM32_TIM3_CCR2));
-  lcderr("CCR3:    %04x\n", getreg32(STM32_TIM3_CCR3));
-  lcderr("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
-  lcderr("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
-  lcderr("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
-  lcderr("DMAR:    %04x\n", getreg32(STM32_TIM3_DMAR));
+  lcdinfo("APB1ENR: %08x\n", getreg32(STM32_RCC_APB1ENR));
+  lcdinfo("CR1:     %04x\n", getreg32(STM32_TIM3_CR1));
+  lcdinfo("CR2:     %04x\n", getreg32(STM32_TIM3_CR2));
+  lcdinfo("SMCR:    %04x\n", getreg32(STM32_TIM3_SMCR));
+  lcdinfo("DIER:    %04x\n", getreg32(STM32_TIM3_DIER));
+  lcdinfo("SR:      %04x\n", getreg32(STM32_TIM3_SR));
+  lcdinfo("EGR:     %04x\n", getreg32(STM32_TIM3_EGR));
+  lcdinfo("CCMR1:   %04x\n", getreg32(STM32_TIM3_CCMR1));
+  lcdinfo("CCMR2:   %04x\n", getreg32(STM32_TIM3_CCMR2));
+  lcdinfo("CCER:    %04x\n", getreg32(STM32_TIM3_CCER));
+  lcdinfo("CNT:     %04x\n", getreg32(STM32_TIM3_CNT));
+  lcdinfo("PSC:     %04x\n", getreg32(STM32_TIM3_PSC));
+  lcdinfo("ARR:     %04x\n", getreg32(STM32_TIM3_ARR));
+  lcdinfo("CCR1:    %04x\n", getreg32(STM32_TIM3_CCR1));
+  lcdinfo("CCR2:    %04x\n", getreg32(STM32_TIM3_CCR2));
+  lcdinfo("CCR3:    %04x\n", getreg32(STM32_TIM3_CCR3));
+  lcdinfo("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
+  lcdinfo("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
+  lcdinfo("CCR4:    %04x\n", getreg32(STM32_TIM3_CCR4));
+  lcdinfo("DMAR:    %04x\n", getreg32(STM32_TIM3_DMAR));
 }
 
 /************************************************************************************
diff --git a/configs/lm3s6432-s2e/src/lm_ethernet.c b/configs/lm3s6432-s2e/src/lm_ethernet.c
index befbdd7c0c..2d7f2c6414 100644
--- a/configs/lm3s6432-s2e/src/lm_ethernet.c
+++ b/configs/lm3s6432-s2e/src/lm_ethernet.c
@@ -83,7 +83,7 @@ void tiva_ethernetmac(struct ether_addr *ethaddr)
   user0 = getreg32(TIVA_FLASH_USERREG0);
   user1 = getreg32(TIVA_FLASH_USERREG1);
 
-  nllerr("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
+  nllinfo("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
   DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff);
 
   /* Re-format that MAC address the way that the network expects to see it */
diff --git a/configs/lm3s6432-s2e/src/lm_leds.c b/configs/lm3s6432-s2e/src/lm_leds.c
index 276a168c4a..5dc259383f 100644
--- a/configs/lm3s6432-s2e/src/lm_leds.c
+++ b/configs/lm3s6432-s2e/src/lm_leds.c
@@ -96,7 +96,7 @@ static uint8_t g_nest;
 #ifdef CONFIG_ARCH_LEDS
 void board_autoled_initialize(void)
 {
-  lederr("Initializing\n");
+  ledinfo("Initializing\n");
 
   /* Configure Port F, Bit 2 as an output, initial value=OFF */
 
diff --git a/configs/lm3s6432-s2e/src/lm_ssi.c b/configs/lm3s6432-s2e/src/lm_ssi.c
index 250b29bddc..9c3e7ebc5a 100644
--- a/configs/lm3s6432-s2e/src/lm_ssi.c
+++ b/configs/lm3s6432-s2e/src/lm_ssi.c
@@ -57,36 +57,20 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
+/* CONFIG_DEBUG_SPI enables debug output from this file */
 
-#undef SSI_DEBUG   /* Define to enable debug */
-#undef SSI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SSI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define ssierr  llerr
-#  ifdef SSI_VERBOSE
-#    define ssiinfo llerr
-#  else
-#    define ssiinfo(x...)
-#  endif
+#  define ssiwarn llwarn
+#  define ssiinfo llinfo
+#  define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m)
 #else
-#  undef SSI_VERBOSE
 #  define ssierr(x...)
+#  define ssiwarn(x...)
 #  define ssiinfo(x...)
-#endif
-
-/* Dump GPIO registers */
-
-#ifdef SSI_VERBOSE
-#  define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m)
-#else
 #  define ssi_dumpgpio(m)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
@@ -129,7 +113,7 @@ void weak_function lm_ssidev_initialize(void)
 
 void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  ssierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  ssiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   ssi_dumpgpio("tiva_ssiselect() Entry");
 
   if (devid == SPIDEV_MMCSD)
@@ -144,7 +128,7 @@ void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool select
 
 uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  ssierr("Returning SPI_STATUS_PRESENT\n");
+  ssiinfo("Returning SPI_STATUS_PRESENT\n");
   return SPI_STATUS_PRESENT;
 }
 
diff --git a/configs/lm3s6965-ek/src/lm_ethernet.c b/configs/lm3s6965-ek/src/lm_ethernet.c
index d6e8725de3..bc26a77ef5 100644
--- a/configs/lm3s6965-ek/src/lm_ethernet.c
+++ b/configs/lm3s6965-ek/src/lm_ethernet.c
@@ -83,7 +83,7 @@ void tiva_ethernetmac(struct ether_addr *ethaddr)
   user0 = getreg32(TIVA_FLASH_USERREG0);
   user1 = getreg32(TIVA_FLASH_USERREG1);
 
-  nllerr("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
+  nllinfo("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
   DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff);
 
   /* Re-format that MAC address the way that the network expects to see it */
diff --git a/configs/lm3s6965-ek/src/lm_leds.c b/configs/lm3s6965-ek/src/lm_leds.c
index 95c4695739..a26dd8cec9 100644
--- a/configs/lm3s6965-ek/src/lm_leds.c
+++ b/configs/lm3s6965-ek/src/lm_leds.c
@@ -55,34 +55,20 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
- * with CONFIG_DEBUG_INFO too)
- */
+/* CONFIG_DEBUG_LEDS enables debug output from this file */
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define lederr  llerr
 #  define ledinfo llinfo
+#  define ledinfo llinfo
+#  define led_dumpgpio(m) tiva_dumpgpio(LED_GPIO, m)
 #else
 #  define lederr(x...)
 #  define ledinfo(x...)
-#endif
-
-/* Dump GPIO registers */
-
-#ifdef CONFIG_DEBUG_LEDS
-#  define led_dumpgpio(m) tiva_dumpgpio(LED_GPIO, m)
-#else
+#  define ledinfo(x...)
 #  define led_dumpgpio(m)
 #endif
 
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -96,7 +82,7 @@ static uint8_t g_nest;
 #ifdef CONFIG_ARCH_LEDS
 void board_autoled_initialize(void)
 {
-  lederr("Initializing\n");
+  ledinfo("Initializing\n");
 
   /* Configure Port E, Bit 1 as an output, initial value=OFF */
 
diff --git a/configs/lm3s6965-ek/src/lm_oled.c b/configs/lm3s6965-ek/src/lm_oled.c
index f9eb8d8644..de1a4a23e2 100644
--- a/configs/lm3s6965-ek/src/lm_oled.c
+++ b/configs/lm3s6965-ek/src/lm_oled.c
@@ -114,7 +114,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
   spi = tiva_ssibus_initialize(0);
   if (!spi)
     {
-      gllerr("Failed to initialize SSI port 0\n");
+      gllerr("ERROR: Failed to initialize SSI port 0\n");
     }
   else
     {
@@ -123,7 +123,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
       dev = rit_initialize(spi, devno);
       if (!dev)
         {
-          gllerr("Failed to bind SSI port 0 to OLED %d: %d\n", devno);
+          gllerr("ERROR: Failed to bind SSI port 0 to OLED %d: %d\n", devno);
         }
      else
         {
diff --git a/configs/lm3s6965-ek/src/lm_ssi.c b/configs/lm3s6965-ek/src/lm_ssi.c
index 600e1f2ccf..829567da7e 100644
--- a/configs/lm3s6965-ek/src/lm_ssi.c
+++ b/configs/lm3s6965-ek/src/lm_ssi.c
@@ -59,36 +59,20 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
+/* CONFIG_DEBUG_SPI enables debug output from this file */
 
-#undef SSI_DEBUG   /* Define to enable debug */
-#undef SSI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SSI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define ssierr  llerr
-#  ifdef SSI_VERBOSE
-#    define ssiinfo llerr
-#  else
-#    define ssiinfo(x...)
-#  endif
+#  define ssiwarn llwarn
+#  define ssiinfo llinfo
+#  define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m)
 #else
-#  undef SSI_VERBOSE
 #  define ssierr(x...)
+#  define ssiwarn(x...)
 #  define ssiinfo(x...)
-#endif
-
-/* Dump GPIO registers */
-
-#ifdef SSI_VERBOSE
-#  define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m)
-#else
 #  define ssi_dumpgpio(m)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
@@ -134,7 +118,7 @@ void weak_function lm_ssidev_initialize(void)
 
 void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  ssierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  ssiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   ssi_dumpgpio("tiva_ssiselect() Entry");
 
   if (devid == SPIDEV_MMCSD)
@@ -156,7 +140,7 @@ void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool select
 
 uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  ssierr("Returning SPI_STATUS_PRESENT\n");
+  ssiinfo("Returning SPI_STATUS_PRESENT\n");
   return SPI_STATUS_PRESENT;
 }
 
diff --git a/configs/lm3s8962-ek/src/lm_ethernet.c b/configs/lm3s8962-ek/src/lm_ethernet.c
index 319e0fac59..d93810f066 100644
--- a/configs/lm3s8962-ek/src/lm_ethernet.c
+++ b/configs/lm3s8962-ek/src/lm_ethernet.c
@@ -83,7 +83,7 @@ void tiva_ethernetmac(struct ether_addr *ethaddr)
   user0 = getreg32(TIVA_FLASH_USERREG0);
   user1 = getreg32(TIVA_FLASH_USERREG1);
 
-  nllerr("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
+  nllinfo("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
   DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff);
 
   /* Re-format that MAC address the way that the network expects to see it */
diff --git a/configs/lm3s8962-ek/src/lm_leds.c b/configs/lm3s8962-ek/src/lm_leds.c
index bf8eb48ddc..a6a938f2ac 100644
--- a/configs/lm3s8962-ek/src/lm_leds.c
+++ b/configs/lm3s8962-ek/src/lm_leds.c
@@ -55,23 +55,17 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
- * with CONFIG_DEBUG_INFO too)
- */
+/* CONFIG_DEBUG_LEDS enables debug output from this file */
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define lederr  llerr
 #  define ledinfo llinfo
+#  define ledinfo llinfo
+#  define led_dumpgpio(m) tiva_dumpgpio(LED_GPIO, m)
 #else
 #  define lederr(x...)
 #  define ledinfo(x...)
-#endif
-
-/* Dump GPIO registers */
-
-#ifdef CONFIG_DEBUG_LEDS
-#  define led_dumpgpio(m) tiva_dumpgpio(LED_GPIO, m)
-#else
+#  define ledinfo(x...)
 #  define led_dumpgpio(m)
 #endif
 
@@ -79,16 +73,12 @@
  * Private Data
  ****************************************************************************/
 
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
+static uint8_t g_nest;
 
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
 
-static uint8_t g_nest;
-
 /****************************************************************************
  * Name: board_autoled_initialize
  ****************************************************************************/
@@ -96,7 +86,7 @@ static uint8_t g_nest;
 #ifdef CONFIG_ARCH_LEDS
 void board_autoled_initialize(void)
 {
-  lederr("Initializing\n");
+  ledinfo("Initializing\n");
 
   /* Configure Port E, Bit 1 as an output, initial value=OFF */
 
diff --git a/configs/lm3s8962-ek/src/lm_oled.c b/configs/lm3s8962-ek/src/lm_oled.c
index d42049227b..d6298212e5 100644
--- a/configs/lm3s8962-ek/src/lm_oled.c
+++ b/configs/lm3s8962-ek/src/lm_oled.c
@@ -113,7 +113,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
   spi = tiva_ssibus_initialize(0);
   if (!spi)
     {
-      gllerr("Failed to initialize SSI port 0\n");
+      gllerr("ERROR: Failed to initialize SSI port 0\n");
     }
   else
     {
@@ -122,7 +122,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
       dev = rit_initialize(spi, devno);
       if (!dev)
         {
-          gllerr("Failed to bind SSI port 0 to OLED %d: %d\n", devno);
+          gllerr("ERROR: Failed to bind SSI port 0 to OLED %d: %d\n", devno);
         }
      else
         {
diff --git a/configs/lm3s8962-ek/src/lm_ssi.c b/configs/lm3s8962-ek/src/lm_ssi.c
index 60fc30bfec..c5b9efa53d 100644
--- a/configs/lm3s8962-ek/src/lm_ssi.c
+++ b/configs/lm3s8962-ek/src/lm_ssi.c
@@ -59,36 +59,20 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
+/* CONFIG_DEBUG_SPI enables debug output from this file */
 
-#undef SSI_DEBUG   /* Define to enable debug */
-#undef SSI_VERBOSE /* Define to enable verbose debug */
-
-#ifdef SSI_DEBUG
+#ifdef CONFIG_DEBUG_SPI
 #  define ssierr  llerr
-#  ifdef SSI_VERBOSE
-#    define ssiinfo llerr
-#  else
-#    define ssiinfo(x...)
-#  endif
+#  define ssiwarn llwarn
+#  define ssiinfo llinfo
+#  define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m)
 #else
-#  undef SSI_VERBOSE
 #  define ssierr(x...)
+#  define ssiwarn(x...)
 #  define ssiinfo(x...)
-#endif
-
-/* Dump GPIO registers */
-
-#ifdef SSI_VERBOSE
-#  define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m)
-#else
 #  define ssi_dumpgpio(m)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
@@ -134,7 +118,7 @@ void weak_function lm_ssidev_initialize(void)
 
 void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  ssierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  ssiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   ssi_dumpgpio("tiva_ssiselect() Entry");
 
   if (devid == SPIDEV_MMCSD)
@@ -156,7 +140,7 @@ void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool select
 
 uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  ssierr("Returning SPI_STATUS_PRESENT\n");
+  ssiinfo("Returning SPI_STATUS_PRESENT\n");
   return SPI_STATUS_PRESENT;
 }
 
diff --git a/configs/lm4f120-launchpad/src/lm4f_autoleds.c b/configs/lm4f120-launchpad/src/lm4f_autoleds.c
index 0e7fe05da3..0d905af81a 100644
--- a/configs/lm4f120-launchpad/src/lm4f_autoleds.c
+++ b/configs/lm4f120-launchpad/src/lm4f_autoleds.c
@@ -140,7 +140,7 @@
 #ifdef CONFIG_ARCH_LEDS
 void lm4f_led_initialize(void)
 {
-  lederr("Initializing\n");
+  ledinfo("Initializing\n");
 
   /* Configure Port E, Bit 1 as an output, initial value=OFF */
 
diff --git a/configs/lm4f120-launchpad/src/lm4f_ssi.c b/configs/lm4f120-launchpad/src/lm4f_ssi.c
index 68aaab1553..c89b6d4c13 100644
--- a/configs/lm4f120-launchpad/src/lm4f_ssi.c
+++ b/configs/lm4f120-launchpad/src/lm4f_ssi.c
@@ -60,28 +60,20 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
+/* CONFIG_DEBUG_SPI enables debug output from this file */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define ssierr llerr
-#else
-#  define ssierr(x...)
-#endif
-
-/* Dump GPIO registers */
-
-#if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO)
-#  define ssiinfo llerr
+#  define ssierr  llerr
+#  define ssiwarn llwarn
+#  define ssiinfo llinfo
 #  define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m)
 #else
+#  define ssierr(x...)
+#  define ssiwarn(x...)
 #  define ssiinfo(x...)
 #  define ssi_dumpgpio(m)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
@@ -119,14 +111,14 @@ void weak_function lm4f_spidev_initialize(void)
 
 void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  ssierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  ssiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   ssi_dumpgpio("tiva_ssiselect() Entry");
   ssi_dumpgpio("tiva_ssiselect() Exit");
 }
 
 uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  ssierr("Returning SPI_STATUS_PRESENT\n");
+  ssiinfo("Returning SPI_STATUS_PRESENT\n");
   return SPI_STATUS_PRESENT;
 }
 
diff --git a/configs/lpc4337-ws/src/lpc43_adc.c b/configs/lpc4337-ws/src/lpc43_adc.c
index 0e5f77ca46..c1cb491f61 100644
--- a/configs/lpc4337-ws/src/lpc43_adc.c
+++ b/configs/lpc4337-ws/src/lpc43_adc.c
@@ -95,7 +95,7 @@ int board_adc_setup(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          aerr("adc_register failed: %d\n", ret);
+          aerr("ERROR: adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/lpc4370-link2/src/lpc43_adc.c b/configs/lpc4370-link2/src/lpc43_adc.c
index 10eeaffcc8..def52a5748 100644
--- a/configs/lpc4370-link2/src/lpc43_adc.c
+++ b/configs/lpc4370-link2/src/lpc43_adc.c
@@ -95,7 +95,7 @@ int board_adc_setup(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          aerr("adc_register failed: %d\n", ret);
+          aerr("ERROR: adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/lpcxpresso-lpc1115/src/lpc11_adc.c b/configs/lpcxpresso-lpc1115/src/lpc11_adc.c
index 93d6c0f7b9..75936ee338 100644
--- a/configs/lpcxpresso-lpc1115/src/lpc11_adc.c
+++ b/configs/lpcxpresso-lpc1115/src/lpc11_adc.c
@@ -107,7 +107,7 @@ int adc_devinit(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          aerr("adc_register failed: %d\n", ret);
+          aerr("ERROR: adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/lpcxpresso-lpc1115/src/lpc11_dac.c b/configs/lpcxpresso-lpc1115/src/lpc11_dac.c
index 420805ae8e..93730ed078 100644
--- a/configs/lpcxpresso-lpc1115/src/lpc11_dac.c
+++ b/configs/lpcxpresso-lpc1115/src/lpc11_dac.c
@@ -90,7 +90,7 @@ int dac_devinit(void)
     ret = dac_register("/dev/dac0", dac);
     if (ret < 0)
       {
-        aerr("dac_register failed: %d\n", ret);
+        aerr("ERROR: dac_register failed: %d\n", ret);
         return ret;
       }
 
diff --git a/configs/lpcxpresso-lpc1115/src/lpc11_pwm.c b/configs/lpcxpresso-lpc1115/src/lpc11_pwm.c
index 1821e4cd5c..6f303e5f5e 100644
--- a/configs/lpcxpresso-lpc1115/src/lpc11_pwm.c
+++ b/configs/lpcxpresso-lpc1115/src/lpc11_pwm.c
@@ -96,7 +96,7 @@ int pwm_devinit(void)
       pwm = lpc11_pwminitialize(0);
       if (!pwm)
         {
-          aerr("Failed to get the LPC17XX PWM lower half\n");
+          aerr("ERROR: Failed to get the LPC17XX PWM lower half\n");
           return -ENODEV;
         }
 
@@ -105,14 +105,14 @@ int pwm_devinit(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          aerr("pwm_register failed: %d\n", ret);
+          aerr("ERROR: pwm_register failed: %d\n", ret);
           return ret;
         }
 
       mcpwm = lpc11_mcpwminitialize(0);
       if (!mcpwm)
         {
-          aerr("Failed to get the LPC17XX MOTOR PWM lower half\n");
+          aerr("ERROR: Failed to get the LPC17XX MOTOR PWM lower half\n");
           return -ENODEV;
         }
 
@@ -121,14 +121,14 @@ int pwm_devinit(void)
       ret = pwm_register("/dev/mcpwm0", mcpwm);
       if (ret < 0)
         {
-          aerr("mcpwm_register failed: %d\n", ret);
+          aerr("ERROR: mcpwm_register failed: %d\n", ret);
           return ret;
         }
 
       timer = lpc11_timerinitialize(0);
       if (!timer)
         {
-          aerr("Failed to get the LPC17XX TIMER lower half\n");
+          aerr("ERROR: Failed to get the LPC17XX TIMER lower half\n");
           return -ENODEV;
         }
 
@@ -137,7 +137,7 @@ int pwm_devinit(void)
       ret = pwm_register("/dev/timer0", timer);
       if (ret < 0)
         {
-          aerr("timer_register failed: %d\n", ret);
+          aerr("ERROR: timer_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c b/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c
index 19df11758e..f7db6c7b29 100644
--- a/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c
+++ b/configs/lpcxpresso-lpc1115/src/lpc11_ssp.c
@@ -148,7 +148,7 @@ void weak_function lpcxpresso_sspdev_initialize(void)
 #ifdef CONFIG_LPC17_SSP0
 void  lpc11_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  sspinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   ssp_dumpgpio("lpc11_ssp0select() Entry");
 
 #warning "Assert CS here (false)"
@@ -158,7 +158,7 @@ void  lpc11_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel
 
 uint8_t lpc11_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  ssperr("Returning SPI_STATUS_PRESENT\n");
+  sspinfo("Returning SPI_STATUS_PRESENT\n");
   return SPI_STATUS_PRESENT;
 }
 #endif
@@ -166,7 +166,7 @@ uint8_t lpc11_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_LPC17_SSP1
 void  lpc11_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  sspinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   ssp_dumpgpio("lpc11_ssp1select() Entry");
 
   if (devid == SPIDEV_MMCSD)
@@ -194,12 +194,12 @@ uint8_t lpc11_ssp1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 
       if (lpc11_gpioread(LPCXPRESSO_SD_CD) == 0)
         {
-          ssperr("Returning SPI_STATUS_PRESENT\n");
+          sspinfo("Returning SPI_STATUS_PRESENT\n");
           return SPI_STATUS_PRESENT;
         }
     }
 
-  ssperr("Returning zero\n");
+  sspinfo("Returning zero\n");
   return 0;
 }
 #endif
diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_adc.c b/configs/lpcxpresso-lpc1768/src/lpc17_adc.c
index 3cb72e2e93..b7d1b6ddb9 100644
--- a/configs/lpcxpresso-lpc1768/src/lpc17_adc.c
+++ b/configs/lpcxpresso-lpc1768/src/lpc17_adc.c
@@ -108,7 +108,7 @@ int board_adc_setup(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          aerr("adc_register failed: %d\n", ret);
+          aerr("ERROR: adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_dac.c b/configs/lpcxpresso-lpc1768/src/lpc17_dac.c
index 73657d135a..1948b4312c 100644
--- a/configs/lpcxpresso-lpc1768/src/lpc17_dac.c
+++ b/configs/lpcxpresso-lpc1768/src/lpc17_dac.c
@@ -86,7 +86,7 @@ int dac_devinit(void)
     ret = dac_register("/dev/dac0", dac);
     if (ret < 0)
       {
-        aerr("dac_register failed: %d\n", ret);
+        aerr("ERROR: dac_register failed: %d\n", ret);
         return ret;
       }
 
diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_oled.c b/configs/lpcxpresso-lpc1768/src/lpc17_oled.c
index 4b3b9f5e12..4f3717190d 100644
--- a/configs/lpcxpresso-lpc1768/src/lpc17_oled.c
+++ b/configs/lpcxpresso-lpc1768/src/lpc17_oled.c
@@ -128,7 +128,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
   spi = lpc17_sspbus_initialize(1);
   if (!spi)
     {
-      gllerr("Failed to initialize SPI port 1\n");
+      gllerr("ERROR: Failed to initialize SPI port 1\n");
     }
   else
     {
@@ -137,7 +137,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
       dev = ug_initialize(spi, devno);
       if (!dev)
         {
-          gllerr("Failed to bind SPI port 1 to OLED %d: %d\n", devno);
+          gllerr("ERROR: Failed to bind SPI port 1 to OLED %d: %d\n", devno);
         }
      else
         {
diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_pwm.c b/configs/lpcxpresso-lpc1768/src/lpc17_pwm.c
index 746a529a3b..4b261555cb 100644
--- a/configs/lpcxpresso-lpc1768/src/lpc17_pwm.c
+++ b/configs/lpcxpresso-lpc1768/src/lpc17_pwm.c
@@ -98,7 +98,7 @@ int board_pwm_setup(void)
       pwm = lpc17_pwminitialize(0);
       if (!pwm)
         {
-          aerr("Failed to get the LPC17XX PWM lower half\n");
+          aerr("ERROR: Failed to get the LPC17XX PWM lower half\n");
           return -ENODEV;
         }
 
@@ -107,14 +107,14 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          aerr("pwm_register failed: %d\n", ret);
+          aerr("ERROR: pwm_register failed: %d\n", ret);
           return ret;
         }
 
       mcpwm = lpc17_mcpwminitialize(0);
       if (!mcpwm)
         {
-          aerr("Failed to get the LPC17XX MOTOR PWM lower half\n");
+          aerr("ERROR: Failed to get the LPC17XX MOTOR PWM lower half\n");
           return -ENODEV;
         }
 
@@ -123,14 +123,14 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/mcpwm0", mcpwm);
       if (ret < 0)
         {
-          aerr("mcpwm_register failed: %d\n", ret);
+          aerr("ERROR: mcpwm_register failed: %d\n", ret);
           return ret;
         }
 
       timer = lpc17_timerinitialize(0);
       if (!timer)
         {
-          aerr("Failed to get the LPC17XX TIMER lower half\n");
+          aerr("ERROR: Failed to get the LPC17XX TIMER lower half\n");
           return -ENODEV;
         }
 
@@ -139,7 +139,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/timer0", timer);
       if (ret < 0)
         {
-          aerr("timer_register failed: %d\n", ret);
+          aerr("ERROR: timer_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c b/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c
index 7974fec855..c41ac36d46 100644
--- a/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c
+++ b/configs/lpcxpresso-lpc1768/src/lpc17_ssp.c
@@ -148,7 +148,7 @@ void weak_function lpcxpresso_sspdev_initialize(void)
 #ifdef CONFIG_LPC17_SSP0
 void  lpc17_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  sspinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   ssp_dumpgpio("lpc17_ssp0select() Entry");
 
 #warning "Assert CS here (false)"
@@ -158,7 +158,7 @@ void  lpc17_ssp0select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel
 
 uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  ssperr("Returning SPI_STATUS_PRESENT\n");
+  sspinfo("Returning SPI_STATUS_PRESENT\n");
   return SPI_STATUS_PRESENT;
 }
 #endif
@@ -166,7 +166,7 @@ uint8_t lpc17_ssp0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_LPC17_SSP1
 void  lpc17_ssp1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  ssperr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  sspinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   ssp_dumpgpio("lpc17_ssp1select() Entry");
 
   if (devid == SPIDEV_MMCSD)
@@ -194,12 +194,12 @@ uint8_t lpc17_ssp1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 
       if (lpc17_gpioread(LPCXPRESSO_SD_CD) == 0)
         {
-          ssperr("Returning SPI_STATUS_PRESENT\n");
+          sspinfo("Returning SPI_STATUS_PRESENT\n");
           return SPI_STATUS_PRESENT;
         }
     }
 
-  ssperr("Returning zero\n");
+  sspinfo("Returning zero\n");
   return 0;
 }
 #endif
diff --git a/configs/maple/src/stm32_lcd.c b/configs/maple/src/stm32_lcd.c
index c273ba54c6..1df1a23709 100644
--- a/configs/maple/src/stm32_lcd.c
+++ b/configs/maple/src/stm32_lcd.c
@@ -107,7 +107,7 @@ static int up_lcdextcominisr(int irq, void *context)
   STM32_TIM_ACKINT(tim, 0);
   if (g_isr == NULL)
     {
-      lcderr("error, irq not attached, disabled\n");
+      lcderr("ERROR: error, irq not attached, disabled\n");
       STM32_TIM_DISABLEINT(tim, 0);
       return OK;
     }
@@ -117,7 +117,7 @@ static int up_lcdextcominisr(int irq, void *context)
 
 static int up_lcdirqattach(xcpt_t isr)
 {
-  lcderr("%s IRQ\n", isr == NULL ? "Detach" : "Attach");
+  lcdinfo("%s IRQ\n", isr == NULL ? "Detach" : "Attach");
 
   if (isr != NULL)
     {
@@ -135,7 +135,7 @@ static int up_lcdirqattach(xcpt_t isr)
 
 static void up_lcddispcontrol(bool on)
 {
-  lcderr("set: %s\n", on ? "on" : "off");
+  lcdinfo("set: %s\n", on ? "on" : "off");
 
   if (on)
     {
@@ -159,7 +159,7 @@ static void up_lcdsetpolarity(bool pol)
 
 static void up_lcdsetvcomfreq(unsigned int freq)
 {
-  lcderr("freq: %d\n", freq);
+  lcdinfo("freq: %d\n", freq);
   DEBUGASSERT(freq >= 1 && freq <= 60);
   STM32_TIM_SETPERIOD(tim, TIMER_FREQ / freq);
 }
@@ -190,17 +190,17 @@ static FAR struct memlcd_priv_s memlcd_priv =
 
 FAR int board_lcd_initialize(void)
 {
-  lcderr("Initializing lcd\n");
+  lcdinfo("Initializing lcd\n");
 
-  lcderr("init spi1\n");
+  lcdinfo("init spi1\n");
   spi = stm32_spibus_initialize(1);
   DEBUGASSERT(spi);
 
-  lcderr("configure related io\n");
+  lcdinfo("configure related io\n");
   stm32_configgpio(GPIO_MEMLCD_EXTCOMIN);
   stm32_configgpio(GPIO_MEMLCD_DISP);
 
-  lcderr("configure EXTCOMIN timer\n");
+  lcdinfo("configure EXTCOMIN timer\n");
   if (tim == NULL)
     {
       tim = stm32_tim_init(2);
@@ -210,7 +210,7 @@ FAR int board_lcd_initialize(void)
       STM32_TIM_SETMODE(tim, STM32_TIM_MODE_UP);
     }
 
-  lcderr("init lcd\n");
+  lcdinfo("init lcd\n");
   l_lcddev = memlcd_initialize(spi, &memlcd_priv, 0);
   DEBUGASSERT(l_lcddev);
 
diff --git a/configs/maple/src/stm32_spi.c b/configs/maple/src/stm32_spi.c
index 881adf8d72..7c25c23f05 100644
--- a/configs/maple/src/stm32_spi.c
+++ b/configs/maple/src/stm32_spi.c
@@ -59,29 +59,18 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
-
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_DEBUG_INFO
-#  undef CONFIG_DEBUG_SPI
-#endif
+/* Enables debug output from this file */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spierr llerr
-#  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spierr  llerr
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -134,7 +123,7 @@ void weak_function stm32_spidev_initialize(void)
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
                       bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
 #  if defined(CONFIG_LCD_SHARP_MEMLCD)
   if (devid == SPIDEV_DISPLAY)
diff --git a/configs/maple/src/stm32_usbdev.c b/configs/maple/src/stm32_usbdev.c
index 6fdb963ec8..d27177a240 100644
--- a/configs/maple/src/stm32_usbdev.c
+++ b/configs/maple/src/stm32_usbdev.c
@@ -74,7 +74,7 @@
 
 void stm32_usbinitialize(void)
 {
-  ullerr("called\n");
+  ullinfo("called\n");
 
   /* USB Soft Connect Pullup */
 
@@ -113,5 +113,5 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable)
 
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ullerr("resume: %d\n", resume);
+  ullinfo("resume: %d\n", resume);
 }
diff --git a/configs/mbed/src/lpc17_adc.c b/configs/mbed/src/lpc17_adc.c
index b8f0724d7f..4cc9b6ad8d 100644
--- a/configs/mbed/src/lpc17_adc.c
+++ b/configs/mbed/src/lpc17_adc.c
@@ -110,7 +110,7 @@ int board_adc_setup(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          aerr("adc_register failed: %d\n", ret);
+          aerr("ERROR: adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/mbed/src/lpc17_dac.c b/configs/mbed/src/lpc17_dac.c
index d3a4733278..dccdbb92f5 100644
--- a/configs/mbed/src/lpc17_dac.c
+++ b/configs/mbed/src/lpc17_dac.c
@@ -88,7 +88,7 @@ int dac_devinit(void)
     ret = dac_register("/dev/dac0", dac);
     if (ret < 0)
       {
-        aerr("dac_register failed: %d\n", ret);
+        aerr("ERROR: dac_register failed: %d\n", ret);
         return ret;
       }
 
diff --git a/configs/mbed/src/lpc17_pwm.c b/configs/mbed/src/lpc17_pwm.c
index 6cc6f33101..c8b6881dc9 100644
--- a/configs/mbed/src/lpc17_pwm.c
+++ b/configs/mbed/src/lpc17_pwm.c
@@ -100,7 +100,7 @@ int board_pwm_setup(void)
       pwm = lpc17_pwminitialize(0);
       if (!pwm)
         {
-          aerr("Failed to get the LPC17XX PWM lower half\n");
+          aerr("ERROR: Failed to get the LPC17XX PWM lower half\n");
           return -ENODEV;
         }
 
@@ -109,14 +109,14 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          aerr("pwm_register failed: %d\n", ret);
+          aerr("ERROR: pwm_register failed: %d\n", ret);
           return ret;
         }
 
       mcpwm = lpc17_mcpwminitialize(0);
       if (!mcpwm)
         {
-          aerr("Failed to get the LPC17XX MOTOR PWM lower half\n");
+          aerr("ERROR: Failed to get the LPC17XX MOTOR PWM lower half\n");
           return -ENODEV;
         }
 
@@ -125,14 +125,14 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/mcpwm0", mcpwm);
       if (ret < 0)
         {
-          aerr("mcpwm_register failed: %d\n", ret);
+          aerr("ERROR: mcpwm_register failed: %d\n", ret);
           return ret;
         }
 
       timer = lpc17_timerinitialize(0);
       if (!timer)
         {
-          aerr("Failed to get the LPC17XX TIMER lower half\n");
+          aerr("ERROR: Failed to get the LPC17XX TIMER lower half\n");
           return -ENODEV;
         }
 
@@ -141,7 +141,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/timer0", timer);
       if (ret < 0)
         {
-          aerr("timer_register failed: %d\n", ret);
+          aerr("ERROR: timer_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/mcu123-lpc214x/src/lpc2148_spi1.c b/configs/mcu123-lpc214x/src/lpc2148_spi1.c
index 336a0b0d61..99a5fa7117 100644
--- a/configs/mcu123-lpc214x/src/lpc2148_spi1.c
+++ b/configs/mcu123-lpc214x/src/lpc2148_spi1.c
@@ -232,14 +232,14 @@ static void spi_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sel
     {
       /* Enable slave select (low enables) */
 
-      spierr("CS asserted\n");
+      spiinfo("CS asserted\n");
       putreg32(bit, CS_CLR_REGISTER);
     }
   else
     {
       /* Disable slave select (low enables) */
 
-      spierr("CS de-asserted\n");
+      spiinfo("CS de-asserted\n");
       putreg32(bit, CS_SET_REGISTER);
 
       /* Wait for the TX FIFO not full indication */
@@ -296,7 +296,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
   divisor = (divisor + 1) & ~1;
   putreg8(divisor, LPC214X_SPI1_CPSR);
 
-  spierr("Frequency %d->%d\n", frequency, LPC214X_PCLKFREQ / divisor);
+  spiinfo("Frequency %d->%d\n", frequency, LPC214X_PCLKFREQ / divisor);
   return LPC214X_PCLKFREQ / divisor;
 }
 
@@ -321,7 +321,7 @@ static uint8_t spi_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
    * board.
    */
 
-  spierr("Return SPI_STATUS_PRESENT\n");
+  spiinfo("Return SPI_STATUS_PRESENT\n");
   return SPI_STATUS_PRESENT;
 }
 
@@ -392,7 +392,7 @@ static uint16_t spi_send(FAR struct spi_dev_s *dev, uint16_t wd)
   /* Get the value from the RX FIFO and return it */
 
   regval = getreg16(LPC214X_SPI1_DR);
-  spierr("%04x->%04x\n", wd, regval);
+  spiinfo("%04x->%04x\n", wd, regval);
   return regval;
 }
 
@@ -422,7 +422,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size
 
   /* Loop while thre are bytes remaining to be sent */
 
-  spierr("nwords: %d\n", nwords);
+  spiinfo("nwords: %d\n", nwords);
   while (nwords > 0)
     {
       /* While the TX FIFO is not full and there are bytes left to send */
@@ -439,7 +439,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size
 
   /* Then discard all card responses until the RX & TX FIFOs are emptied. */
 
-  spierr("discarding\n");
+  spiinfo("discarding\n");
   do
     {
       /* Is there anything in the RX fifo? */
@@ -493,7 +493,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw
 
   /* While there is remaining to be sent (and no synchronization error has occurred) */
 
-  spierr("nwords: %d\n", nwords);
+  spiinfo("nwords: %d\n", nwords);
   while (nwords || rxpending)
     {
       /* Fill the transmit FIFO with 0xff...
diff --git a/configs/mikroe-stm32f4/src/stm32_idle.c b/configs/mikroe-stm32f4/src/stm32_idle.c
index 4af462bb6b..bde6c70038 100644
--- a/configs/mikroe-stm32f4/src/stm32_idle.c
+++ b/configs/mikroe-stm32f4/src/stm32_idle.c
@@ -125,7 +125,7 @@ static void up_idlepm(void)
 
   if (newstate != oldstate)
     {
-      llerr("newstate= %d oldstate=%d\n", newstate, oldstate);
+      llinfo("newstate= %d oldstate=%d\n", newstate, oldstate);
 
       flags = enter_critical_section();
 
diff --git a/configs/mikroe-stm32f4/src/stm32_pwm.c b/configs/mikroe-stm32f4/src/stm32_pwm.c
index 11a0f2b38c..a7eda30906 100644
--- a/configs/mikroe-stm32f4/src/stm32_pwm.c
+++ b/configs/mikroe-stm32f4/src/stm32_pwm.c
@@ -119,7 +119,7 @@ int board_pwm_setup(void)
       pwm = stm32_pwminitialize(STM32F4DISCOVERY_PWMTIMER);
       if (!pwm)
         {
-          err("Failed to get the STM32 PWM lower half\n");
+          err("ERROR: Failed to get the STM32 PWM lower half\n");
           return -ENODEV;
         }
 
@@ -128,7 +128,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          aerr("pwm_register failed: %d\n", ret);
+          aerr("ERROR: pwm_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/mikroe-stm32f4/src/stm32_qencoder.c b/configs/mikroe-stm32f4/src/stm32_qencoder.c
index 4cd7738402..33855fbaf5 100644
--- a/configs/mikroe-stm32f4/src/stm32_qencoder.c
+++ b/configs/mikroe-stm32f4/src/stm32_qencoder.c
@@ -149,7 +149,7 @@ int qe_devinit(void)
       ret = stm32_qeinitialize("/dev/qe0", TIMID);
       if (ret < 0)
         {
-          snerr("stm32_qeinitialize failed: %d\n", ret);
+          snerr("ERROR: stm32_qeinitialize failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/mikroe-stm32f4/src/stm32_spi.c b/configs/mikroe-stm32f4/src/stm32_spi.c
index 2b1ff95748..e4882185ba 100644
--- a/configs/mikroe-stm32f4/src/stm32_spi.c
+++ b/configs/mikroe-stm32f4/src/stm32_spi.c
@@ -201,7 +201,7 @@ uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -213,7 +213,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
diff --git a/configs/mikroe-stm32f4/src/stm32_touchscreen.c b/configs/mikroe-stm32f4/src/stm32_touchscreen.c
index 35b05c439e..ea863e8f3d 100644
--- a/configs/mikroe-stm32f4/src/stm32_touchscreen.c
+++ b/configs/mikroe-stm32f4/src/stm32_touchscreen.c
@@ -530,7 +530,7 @@ static uint16_t tc_adc_read_sample(void)
 
   if (count > 0)
     {
-      ierr("Count = %d\n", count);
+      iinfo("Count = %d\n", count);
     }
 
   return retval;
@@ -1017,7 +1017,7 @@ static void tc_worker(FAR void *arg)
 
           /* Notify any waiters that new touchscreen data is available */
 
-          ierr("1:X=%d, Y=%d\n", priv->sample.x, priv->sample.y);
+          iinfo("1:X=%d, Y=%d\n", priv->sample.x, priv->sample.y);
 
           tc_notify(priv);
         }
@@ -1089,7 +1089,7 @@ static void tc_worker(FAR void *arg)
 
               /* Notify any waiters that nes touchscreen data is available */
 
-              ierr("2:X=%d, Y=%d\n", priv->sample.x, priv->sample.y);
+              iinfo("2:X=%d, Y=%d\n", priv->sample.x, priv->sample.y);
 
               tc_notify(priv);
             }
@@ -1413,7 +1413,7 @@ static int tc_poll(FAR struct file *filep, FAR struct pollfd *fds,
 
       if ((fds->events & POLLIN) == 0)
         {
-          ierr("Missing POLLIN: revents: %08x\n", fds->revents);
+          ierr("ERROR: Missing POLLIN: revents: %08x\n", fds->revents);
           ret = -EDEADLK;
           goto errout;
         }
@@ -1438,7 +1438,7 @@ static int tc_poll(FAR struct file *filep, FAR struct pollfd *fds,
 
       if (i >= CONFIG_TOUCHSCREEN_NPOLLWAITERS)
         {
-          ierr("No availabled slot found: %d\n", i);
+          ierr("ERROR: No availabled slot found: %d\n", i);
           fds->priv    = NULL;
           ret          = -EBUSY;
           goto errout;
@@ -1533,7 +1533,7 @@ int board_tsc_setup(int minor)
   priv = (FAR struct tc_dev_s *)kmm_malloc(sizeof(struct tc_dev_s));
   if (!priv)
     {
-      ierr("kmm_malloc(%d) failed\n", sizeof(struct tc_dev_s));
+      ierr("ERROR: kmm_malloc(%d) failed\n", sizeof(struct tc_dev_s));
       return -ENOMEM;
     }
 #endif
@@ -1552,7 +1552,7 @@ int board_tsc_setup(int minor)
   ret = register_driver(devname, &tc_fops, 0666, priv);
   if (ret < 0)
     {
-      ierr("register_driver() failed: %d\n", ret);
+      ierr("ERROR: register_driver() failed: %d\n", ret);
       goto errout_with_priv;
     }
 
@@ -1564,7 +1564,7 @@ int board_tsc_setup(int minor)
   ret = work_queue(HPWORK, &priv->work, tc_worker, priv, 0);
   if (ret != 0)
     {
-      ierr("Failed to queue work: %d\n", ret);
+      ierr("ERROR: Failed to queue work: %d\n", ret);
       goto errout_with_priv;
     }
 
diff --git a/configs/mikroe-stm32f4/src/stm32_usb.c b/configs/mikroe-stm32f4/src/stm32_usb.c
index 2553d0d97d..c8b819fea3 100644
--- a/configs/mikroe-stm32f4/src/stm32_usb.c
+++ b/configs/mikroe-stm32f4/src/stm32_usb.c
@@ -300,7 +300,7 @@ xcpt_t stm32_setup_overcurrent(xcpt_t handler)
 #ifdef CONFIG_USBDEV
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ullerr("resume: %d\n", resume);
+  ullinfo("resume: %d\n", resume);
 }
 #endif
 
diff --git a/configs/mikroe-stm32f4/src/stm32_vs1053.c b/configs/mikroe-stm32f4/src/stm32_vs1053.c
index e45ebfad7c..98b8aeddcc 100644
--- a/configs/mikroe-stm32f4/src/stm32_vs1053.c
+++ b/configs/mikroe-stm32f4/src/stm32_vs1053.c
@@ -187,7 +187,7 @@ void up_vs1053initialize(FAR struct spi_dev_s* spi)
   pVs1053 = vs1053_initialize(spi, &g_vs1053lower.lower, VS1053_DEVNO);
   if (pVs1053 == NULL)
     {
-      audllerr("Failed to bind SPI port %d VS1053 device\n", VS1053_DEVNO);
+      audllerr("ERROR: Failed to bind SPI port %d VS1053 device\n", VS1053_DEVNO);
       return;
     }
 
@@ -197,7 +197,7 @@ void up_vs1053initialize(FAR struct spi_dev_s* spi)
   ret = audio_register(name, pVs1053);
   if (ret < 0)
     {
-      auderr("up_vs1053initialize: Failed to register VS1053 Audio device\n");
+      auderr("ERROR: Failed to register VS1053 Audio device\n");
     }
 
   audllinfo("Bound SPI port to VS1053 device %s\n", name);
diff --git a/configs/mirtoo/src/pic32_spi2.c b/configs/mirtoo/src/pic32_spi2.c
index 0a857e9735..a81488facd 100644
--- a/configs/mirtoo/src/pic32_spi2.c
+++ b/configs/mirtoo/src/pic32_spi2.c
@@ -99,16 +99,14 @@
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
+#  define spiwarn llwarn
 #  define spiinfo llinfo
 #else
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
@@ -175,7 +173,7 @@ enum spi_dev_e;
 
 void  pic32mx_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
   if (devid == SPIDEV_FLASH)
     {
diff --git a/configs/ntosd-dm320/src/dm320_network.c b/configs/ntosd-dm320/src/dm320_network.c
index a08f4a4e3f..fc8e1592d9 100644
--- a/configs/ntosd-dm320/src/dm320_network.c
+++ b/configs/ntosd-dm320/src/dm320_network.c
@@ -79,8 +79,8 @@ void up_netinitialize(void)
    * width is 16-bits.
    */
 
-  nllerr("CS4CTRL1=%04x CS4CTRL2=%04x\n",
-         getreg16(DM320_EMIF_CS4CTRL1), getreg16(DM320_EMIF_CS4CTRL2));
+  nllinfo("CS4CTRL1=%04x CS4CTRL2=%04x\n",
+          getreg16(DM320_EMIF_CS4CTRL1), getreg16(DM320_EMIF_CS4CTRL2));
 
   /* It is assumed that bootloader has already configured CS4.  Here,
    * we will only make certain that the GIO is properly configured
@@ -91,9 +91,9 @@ void up_netinitialize(void)
   GIO_INTERRUPT(GIO_DM9000A_INT);
   GIO_RISINGEDGE(GIO_DM9000A_INT);
 
-  nllerr("GIO DIR0=%04x INV0=%04x IRQPORT=%04x IRQEDGE=%04x\n",
-         getreg16(DM320_GIO_DIR0), getreg16(DM320_GIO_INV0),
-         getreg16(DM320_GIO_IRQPORT), getreg16(DM320_GIO_IRQEDGE));
+  nllinfo("GIO DIR0=%04x INV0=%04x IRQPORT=%04x IRQEDGE=%04x\n",
+          getreg16(DM320_GIO_DIR0), getreg16(DM320_GIO_INV0),
+          getreg16(DM320_GIO_IRQPORT), getreg16(DM320_GIO_IRQEDGE));
 
   /* Then initialize the driver */
 
-- 
GitLab


From 94f5e872227ebdbef1bb3e1d09a62021a7d7904a Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 13 Jun 2016 11:04:19 -0600
Subject: [PATCH 58/91] configs/:  Change some *err() message to *info()
 messages if what was a *dbg() message does not indicate and error condition.

---
 configs/arduino-due/src/sam_mmcsd.c       |  4 ++--
 configs/arduino-due/src/sam_touchscreen.c |  6 +++---
 configs/cloudctrl/src/stm32_adc.c         |  2 +-
 configs/cloudctrl/src/stm32_spi.c         | 22 ++++++---------------
 configs/cloudctrl/src/stm32_usb.c         |  5 +----
 configs/compal_e99/src/ssd1783.c          |  3 ++-
 configs/dk-tm4c129x/src/tm4c_ethernet.c   |  2 +-
 configs/dk-tm4c129x/src/tm4c_ssi.c        | 24 ++++++++---------------
 configs/ea3131/src/lpc31_fillpage.c       |  4 ++--
 configs/ea3131/src/lpc31_spi.c            |  2 +-
 configs/ea3152/src/lpc31_fillpage.c       |  4 ++--
 configs/ea3152/src/lpc31_spi.c            |  2 +-
 configs/eagle100/src/lm_ethernet.c        |  2 +-
 configs/eagle100/src/lm_leds.c            |  2 +-
 configs/eagle100/src/lm_ssi.c             |  4 ++--
 configs/ekk-lm3s9b96/src/lm_ethernet.c    |  2 +-
 configs/ekk-lm3s9b96/src/lm_leds.c        |  2 +-
 configs/ekk-lm3s9b96/src/lm_ssi.c         |  4 ++--
 configs/fire-stm32v2/src/stm32_enc28j60.c |  4 ++--
 configs/fire-stm32v2/src/stm32_mmcsd.c    |  4 ++--
 configs/fire-stm32v2/src/stm32_spi.c      |  4 ++--
 configs/fire-stm32v2/src/stm32_usbdev.c   |  3 +--
 configs/freedom-kl25z/src/kl_adxl345.c    |  8 ++++----
 configs/freedom-kl25z/src/kl_pwm.c        |  4 ++--
 configs/freedom-kl25z/src/kl_wifi.c       |  6 +++---
 configs/freedom-kl26z/src/kl_pwm.c        |  4 ++--
 configs/hymini-stm32v/src/stm32_spi.c     |  6 +++---
 configs/hymini-stm32v/src/stm32_ts.c      |  4 ++--
 configs/hymini-stm32v/src/stm32_usbdev.c  |  5 ++---
 configs/kwikstik-k40/src/k40_leds.c       | 10 ++--------
 configs/kwikstik-k40/src/k40_spi.c        |  6 +++---
 configs/kwikstik-k40/src/k40_usbdev.c     |  2 +-
 configs/stm32f4discovery/src/stm32_spi.c  |  2 +-
 33 files changed, 70 insertions(+), 98 deletions(-)

diff --git a/configs/arduino-due/src/sam_mmcsd.c b/configs/arduino-due/src/sam_mmcsd.c
index 3edad36db0..b7556ea082 100644
--- a/configs/arduino-due/src/sam_mmcsd.c
+++ b/configs/arduino-due/src/sam_mmcsd.c
@@ -259,7 +259,7 @@ int sam_sdinitialize(int minor)
   spi = sam_mmcsd_spiinitialize();
   if (!spi)
     {
-      ferr("Failed to bit bang SPI for the MMC/SD slot\n");
+      ferr("ERROR: Failed to bit bang SPI for the MMC/SD slot\n");
       return -ENODEV;
     }
 
@@ -273,7 +273,7 @@ int sam_sdinitialize(int minor)
   ret = mmcsd_spislotinitialize(minor, SAM34_MMCSDSLOTNO, spi);
   if (ret < 0)
     {
-      ferr("Failed to bind  bit bang SPI device to MMC/SD slot %d: %d\n",
+      ferr("ERROR: Failed to bind  bit bang SPI device to MMC/SD slot %d: %d\n",
             SAM34_MMCSDSLOTNO, ret);
       return ret;
     }
diff --git a/configs/arduino-due/src/sam_touchscreen.c b/configs/arduino-due/src/sam_touchscreen.c
index 6f105ff2bf..d16184a6cd 100644
--- a/configs/arduino-due/src/sam_touchscreen.c
+++ b/configs/arduino-due/src/sam_touchscreen.c
@@ -359,7 +359,7 @@ int board_tsc_setup(int minor)
   static bool initialized = false;
   int ret;
 
-  ierr("minor %d\n", minor);
+  iinfo("minor %d\n", minor);
   DEBUGASSERT(minor == 0);
 
   /* Have we already initialized?  Since we never uninitialize we must prevent
@@ -383,7 +383,7 @@ int board_tsc_setup(int minor)
       dev = sam_tsc_spiinitialize();
       if (!dev)
         {
-          ierr("Failed to initialize bit bang SPI\n");
+          ierr("ERROR: Failed to initialize bit bang SPI\n");
           return -ENODEV;
         }
 
@@ -392,7 +392,7 @@ int board_tsc_setup(int minor)
       ret = ads7843e_register(dev, &g_tscinfo, CONFIG_ADS7843E_DEVMINOR);
       if (ret < 0)
         {
-          ierr("Failed to register touchscreen device\n");
+          ierr("ERROR: Failed to register touchscreen device\n");
           /* up_spiuninitialize(dev); */
           return -ENODEV;
         }
diff --git a/configs/cloudctrl/src/stm32_adc.c b/configs/cloudctrl/src/stm32_adc.c
index ba10061c0b..346100b782 100644
--- a/configs/cloudctrl/src/stm32_adc.c
+++ b/configs/cloudctrl/src/stm32_adc.c
@@ -155,7 +155,7 @@ int board_adc_setup(void)
       ret = adc_register("/dev/adc0", adc);
       if (ret < 0)
         {
-          aerr("adc_register failed: %d\n", ret);
+          aerr("ERROR: adc_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/cloudctrl/src/stm32_spi.c b/configs/cloudctrl/src/stm32_spi.c
index 5bcfe53763..aa28e24f7f 100644
--- a/configs/cloudctrl/src/stm32_spi.c
+++ b/configs/cloudctrl/src/stm32_spi.c
@@ -58,28 +58,18 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
-
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_DEBUG_SPI
-#endif
+/* Enables debug output from this file */
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
@@ -141,7 +131,7 @@ void weak_function stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
   /* SPI1 connects to the SD CARD and to the SPI FLASH */
 
@@ -163,7 +153,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
 }
 
diff --git a/configs/cloudctrl/src/stm32_usb.c b/configs/cloudctrl/src/stm32_usb.c
index 44b6fd02c6..9af1565f91 100644
--- a/configs/cloudctrl/src/stm32_usb.c
+++ b/configs/cloudctrl/src/stm32_usb.c
@@ -301,11 +301,8 @@ xcpt_t stm32_setup_overcurrent(xcpt_t handler)
 #ifdef CONFIG_USBDEV
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ullerr("resume: %d\n", resume);
+  ullinfo("resume: %d\n", resume);
 }
 #endif
 
 #endif /* CONFIG_STM32_OTGFS */
-
-
-
diff --git a/configs/compal_e99/src/ssd1783.c b/configs/compal_e99/src/ssd1783.c
index 66831938b4..de9cd80494 100644
--- a/configs/compal_e99/src/ssd1783.c
+++ b/configs/compal_e99/src/ssd1783.c
@@ -250,7 +250,8 @@ static void lcd_write_prepare(unsigned int x1, unsigned int x2, unsigned int y1,
     { CMD,  0x5c },                  /* enter write display ram mode */
     { END,  0x00 }
   };
-  err("x1:%d, x2:%d, y1:%d, y2:%d\n",x1, x2,y1, y2);
+
+  info("x1:%d, x2:%d, y1:%d, y2:%d\n",x1, x2,y1, y2);
   fb_ssd1783_send_cmdlist(prepare_disp_write_cmds);
 }
 
diff --git a/configs/dk-tm4c129x/src/tm4c_ethernet.c b/configs/dk-tm4c129x/src/tm4c_ethernet.c
index abe1dbb53d..927757e16d 100644
--- a/configs/dk-tm4c129x/src/tm4c_ethernet.c
+++ b/configs/dk-tm4c129x/src/tm4c_ethernet.c
@@ -84,7 +84,7 @@ void tiva_ethernetmac(struct ether_addr *ethaddr)
   user0 = getreg32(TIVA_FLASH_USERREG0);
   user1 = getreg32(TIVA_FLASH_USERREG1);
 
-  nllerr("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
+  nllinfo("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
   DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff);
 
   /* Re-format that MAC address the way that the network expects to see it */
diff --git a/configs/dk-tm4c129x/src/tm4c_ssi.c b/configs/dk-tm4c129x/src/tm4c_ssi.c
index 5eae9d3c87..6e889b94bd 100644
--- a/configs/dk-tm4c129x/src/tm4c_ssi.c
+++ b/configs/dk-tm4c129x/src/tm4c_ssi.c
@@ -59,28 +59,20 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
+/* Enables debug output from this file */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define ssierr llerr
-#else
-#  define ssierr(x...)
-#endif
-
-/* Dump GPIO registers */
-
-#if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_INFO)
-#  define ssiinfo llerr
+#  define ssierr  llerr
+#  define ssiwarn llwarn
+#  define ssiinfo llinfo
 #  define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m)
 #else
+#  define ssierr(x...)
+#  define ssiwarn(x...)
 #  define ssiinfo(x...)
 #  define ssi_dumpgpio(m)
 #endif
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
@@ -118,14 +110,14 @@ void weak_function tm4c_ssidev_initialize(void)
 
 void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  ssierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  ssiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   ssi_dumpgpio("tiva_ssiselect() Entry");
   ssi_dumpgpio("tiva_ssiselect() Exit");
 }
 
 uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  ssierr("Returning SPI_STATUS_PRESENT\n");
+  ssiinfo("Returning SPI_STATUS_PRESENT\n");
   return SPI_STATUS_PRESENT;
 }
 
diff --git a/configs/ea3131/src/lpc31_fillpage.c b/configs/ea3131/src/lpc31_fillpage.c
index 7f1b62b70a..2020c844d9 100644
--- a/configs/ea3131/src/lpc31_fillpage.c
+++ b/configs/ea3131/src/lpc31_fillpage.c
@@ -412,7 +412,7 @@ int up_fillpage(FAR struct tcb_s *tcb, FAR void *vpage)
   off_t   offset;
 #endif
 
-  pgllerr("TCB: %p vpage: %p far: %08x\n", tcb, vpage, tcb->xcp.far);
+  pgllinfo("TCB: %p vpage: %p far: %08x\n", tcb, vpage, tcb->xcp.far);
   DEBUGASSERT(tcb->xcp.far >= PG_PAGED_VBASE && tcb->xcp.far < PG_PAGED_VEND);
 
   /* If BINPATH is defined, then it is the full path to a file on a mounted file
@@ -475,7 +475,7 @@ int up_fillpage(FAR struct tcb_s *tcb, FAR void *vpage)
 
 int up_fillpage(FAR struct tcb_s *tcb, FAR void *vpage, up_pgcallback_t pg_callback)
 {
-  pgllerr("TCB: %p vpage: %d far: %08x\n", tcb, vpage, tcb->xcp.far);
+  pgllinfo("TCB: %p vpage: %d far: %08x\n", tcb, vpage, tcb->xcp.far);
   DEBUGASSERT(tcb->xcp.far >= PG_PAGED_VBASE && tcb->xcp.far < PG_PAGED_VEND);
 
 #if defined(CONFIG_PAGING_BINPATH)
diff --git a/configs/ea3131/src/lpc31_spi.c b/configs/ea3131/src/lpc31_spi.c
index eb70c52379..a49eba9477 100644
--- a/configs/ea3131/src/lpc31_spi.c
+++ b/configs/ea3131/src/lpc31_spi.c
@@ -117,7 +117,7 @@ void weak_function lpc31_spidev_intialize(void)
 
 void lpc31_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
diff --git a/configs/ea3152/src/lpc31_fillpage.c b/configs/ea3152/src/lpc31_fillpage.c
index 62745695cb..33dd4dc08a 100644
--- a/configs/ea3152/src/lpc31_fillpage.c
+++ b/configs/ea3152/src/lpc31_fillpage.c
@@ -412,7 +412,7 @@ int up_fillpage(FAR struct tcb_s *tcb, FAR void *vpage)
   off_t   offset;
 #endif
 
-  pgllerr("TCB: %p vpage: %p far: %08x\n", tcb, vpage, tcb->xcp.far);
+  pgllinfo("TCB: %p vpage: %p far: %08x\n", tcb, vpage, tcb->xcp.far);
   DEBUGASSERT(tcb->xcp.far >= PG_PAGED_VBASE && tcb->xcp.far < PG_PAGED_VEND);
 
   /* If BINPATH is defined, then it is the full path to a file on a mounted file
@@ -475,7 +475,7 @@ int up_fillpage(FAR struct tcb_s *tcb, FAR void *vpage)
 
 int up_fillpage(FAR struct tcb_s *tcb, FAR void *vpage, up_pgcallback_t pg_callback)
 {
-  pgllerr("TCB: %p vpage: %d far: %08x\n", tcb, vpage, tcb->xcp.far);
+  pgllinfo("TCB: %p vpage: %d far: %08x\n", tcb, vpage, tcb->xcp.far);
   DEBUGASSERT(tcb->xcp.far >= PG_PAGED_VBASE && tcb->xcp.far < PG_PAGED_VEND);
 
 #if defined(CONFIG_PAGING_BINPATH)
diff --git a/configs/ea3152/src/lpc31_spi.c b/configs/ea3152/src/lpc31_spi.c
index 30437379af..a34576b900 100644
--- a/configs/ea3152/src/lpc31_spi.c
+++ b/configs/ea3152/src/lpc31_spi.c
@@ -117,7 +117,7 @@ void weak_function lpc31_spidev_intialize(void)
 
 void lpc31_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 #warning "Missing logic"
 }
 
diff --git a/configs/eagle100/src/lm_ethernet.c b/configs/eagle100/src/lm_ethernet.c
index b556e1d7cd..cc81b1667e 100644
--- a/configs/eagle100/src/lm_ethernet.c
+++ b/configs/eagle100/src/lm_ethernet.c
@@ -83,7 +83,7 @@ void tiva_ethernetmac(struct ether_addr *ethaddr)
   user0 = getreg32(TIVA_FLASH_USERREG0);
   user1 = getreg32(TIVA_FLASH_USERREG1);
 
-  nllerr("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
+  nllinfo("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
   DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff);
 
   /* Re-format that MAC address the way that the network expects to see it */
diff --git a/configs/eagle100/src/lm_leds.c b/configs/eagle100/src/lm_leds.c
index 91cabe6afa..86951bfc3e 100644
--- a/configs/eagle100/src/lm_leds.c
+++ b/configs/eagle100/src/lm_leds.c
@@ -100,7 +100,7 @@ static uint8_t g_nest;
 #ifdef CONFIG_ARCH_LEDS
 void board_autoled_initialize(void)
 {
-  lederr("Initializing\n");
+  ledinfo("Initializing\n");
 
   /* Configure Port E, Bit 1 as an output, initial value=OFF */
 
diff --git a/configs/eagle100/src/lm_ssi.c b/configs/eagle100/src/lm_ssi.c
index 066c12d11d..9c3f5b04d3 100644
--- a/configs/eagle100/src/lm_ssi.c
+++ b/configs/eagle100/src/lm_ssi.c
@@ -115,7 +115,7 @@ void weak_function lm_ssidev_initialize(void)
 
 void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  ssierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  ssiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   if (devid == SPIDEV_MMCSD)
     {
       /* Assert the CS pin to the card */
@@ -128,7 +128,7 @@ void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool select
 
 uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  ssierr("Returning SPI_STATUS_PRESENT\n");
+  ssiinfo("Returning SPI_STATUS_PRESENT\n");
   return SPI_STATUS_PRESENT;
 }
 
diff --git a/configs/ekk-lm3s9b96/src/lm_ethernet.c b/configs/ekk-lm3s9b96/src/lm_ethernet.c
index db8a560be5..16156f0d93 100644
--- a/configs/ekk-lm3s9b96/src/lm_ethernet.c
+++ b/configs/ekk-lm3s9b96/src/lm_ethernet.c
@@ -84,7 +84,7 @@ void tiva_ethernetmac(struct ether_addr *ethaddr)
   user0 = getreg32(TIVA_FLASH_USERREG0);
   user1 = getreg32(TIVA_FLASH_USERREG1);
 
-  nllerr("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
+  nllinfo("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
   DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff);
 
   /* Re-format that MAC address the way that the network expects to see it */
diff --git a/configs/ekk-lm3s9b96/src/lm_leds.c b/configs/ekk-lm3s9b96/src/lm_leds.c
index 8df76950a4..dff55f504e 100644
--- a/configs/ekk-lm3s9b96/src/lm_leds.c
+++ b/configs/ekk-lm3s9b96/src/lm_leds.c
@@ -97,7 +97,7 @@ static uint8_t g_nest;
 #ifdef CONFIG_ARCH_LEDS
 void board_autoled_initialize(void)
 {
-  lederr("Initializing\n");
+  ledinfo("Initializing\n");
 
   /* Configure Port D, Bit 0 as an output, initial value=OFF */
 
diff --git a/configs/ekk-lm3s9b96/src/lm_ssi.c b/configs/ekk-lm3s9b96/src/lm_ssi.c
index f22fc206cf..6fc632f65b 100644
--- a/configs/ekk-lm3s9b96/src/lm_ssi.c
+++ b/configs/ekk-lm3s9b96/src/lm_ssi.c
@@ -115,7 +115,7 @@ void weak_function lm_ssidev_initialize(void)
 
 void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  ssierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  ssiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
   ssi_dumpgpio("tiva_ssiselect() Entry");
   if (devid == SPIDEV_MMCSD)
     {
@@ -136,7 +136,7 @@ void tiva_ssiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool select
 
 uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
-  ssierr("Returning SPI_STATUS_PRESENT\n");
+  ssiinfo("Returning SPI_STATUS_PRESENT\n");
   return SPI_STATUS_PRESENT;
 }
 #endif
diff --git a/configs/fire-stm32v2/src/stm32_enc28j60.c b/configs/fire-stm32v2/src/stm32_enc28j60.c
index ac1e82381a..41565d288f 100644
--- a/configs/fire-stm32v2/src/stm32_enc28j60.c
+++ b/configs/fire-stm32v2/src/stm32_enc28j60.c
@@ -188,7 +188,7 @@ void up_netinitialize(void)
   spi = stm32_spibus_initialize(ENC28J60_SPI_PORTNO);
   if (!spi)
     {
-      nllerr("Failed to initialize SPI port %d\n", ENC28J60_SPI_PORTNO);
+      nllerr("ERROR: Failed to initialize SPI port %d\n", ENC28J60_SPI_PORTNO);
       return;
     }
 
@@ -201,7 +201,7 @@ void up_netinitialize(void)
   ret = enc_initialize(spi, &g_enclower.lower, ENC28J60_DEVNO);
   if (ret < 0)
     {
-      nllerr("Failed to bind SPI port %d ENC28J60 device %d: %d\n",
+      nllerr("ERROR: Failed to bind SPI port %d ENC28J60 device %d: %d\n",
              ENC28J60_SPI_PORTNO, ENC28J60_DEVNO, ret);
       return;
     }
diff --git a/configs/fire-stm32v2/src/stm32_mmcsd.c b/configs/fire-stm32v2/src/stm32_mmcsd.c
index 3bbd49d892..a29276836c 100644
--- a/configs/fire-stm32v2/src/stm32_mmcsd.c
+++ b/configs/fire-stm32v2/src/stm32_mmcsd.c
@@ -93,7 +93,7 @@ int stm32_sdinitialize(int minor)
   sdio = sdio_initialize(STM32_MMCSDSLOTNO);
   if (!sdio)
     {
-      ferr("Failed to initialize SDIO slot %d\n", STM32_MMCSDSLOTNO);
+      ferr("ERROR: Failed to initialize SDIO slot %d\n", STM32_MMCSDSLOTNO);
       return -ENODEV;
     }
 
@@ -104,7 +104,7 @@ int stm32_sdinitialize(int minor)
   ret = mmcsd_slotinitialize(minor, sdio);
   if (ret != OK)
     {
-      ferr("Failed to bind SDIO slot %d to the MMC/SD driver, minor=%d\n",
+      ferr("ERROR: Failed to bind SDIO slot %d to the MMC/SD driver, minor=%d\n",
               STM32_MMCSDSLOTNO, minor);
     }
 
diff --git a/configs/fire-stm32v2/src/stm32_spi.c b/configs/fire-stm32v2/src/stm32_spi.c
index 83e21852db..b92bbdd2b4 100644
--- a/configs/fire-stm32v2/src/stm32_spi.c
+++ b/configs/fire-stm32v2/src/stm32_spi.c
@@ -149,7 +149,7 @@ void weak_function stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
 #if 0 /* Need to study this */
   if (devid == SPIDEV_LCD)
@@ -186,7 +186,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
   if (devid == SPIDEV_AUDIO)
     {
diff --git a/configs/fire-stm32v2/src/stm32_usbdev.c b/configs/fire-stm32v2/src/stm32_usbdev.c
index 5ba1c8cbfd..ca46743f73 100644
--- a/configs/fire-stm32v2/src/stm32_usbdev.c
+++ b/configs/fire-stm32v2/src/stm32_usbdev.c
@@ -114,6 +114,5 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable)
 
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ullerr("resume: %d\n", resume);
+  ullinfo("resume: %d\n", resume);
 }
-
diff --git a/configs/freedom-kl25z/src/kl_adxl345.c b/configs/freedom-kl25z/src/kl_adxl345.c
index e0dcd781ea..3560e3d7fa 100644
--- a/configs/freedom-kl25z/src/kl_adxl345.c
+++ b/configs/freedom-kl25z/src/kl_adxl345.c
@@ -257,7 +257,7 @@ int adxl345_archinitialize(int minor)
   FAR struct spi_dev_s *dev;
   int ret;
 
-  snerr("minor %d\n", minor);
+  sninfo("minor %d\n", minor);
   DEBUGASSERT(minor == 0);
 
   /* Check if we are already initialized */
@@ -275,7 +275,7 @@ int adxl345_archinitialize(int minor)
       dev = kl_spibus_initialize(CONFIG_ADXL345_SPIDEV);
       if (!dev)
         {
-          snerr("Failed to initialize SPI bus %d\n", CONFIG_ADXL345_SPIDEV);
+          snerr("ERROR: Failed to initialize SPI bus %d\n", CONFIG_ADXL345_SPIDEV);
           return -ENODEV;
         }
 
@@ -285,7 +285,7 @@ int adxl345_archinitialize(int minor)
         adxl345_instantiate(dev, (FAR struct adxl345_config_s *)&g_adxl345config);
       if (!g_adxl345config.handle)
         {
-          snerr("Failed to instantiate the ADXL345 driver\n");
+          snerr("ERROR: Failed to instantiate the ADXL345 driver\n");
           return -ENODEV;
         }
 
@@ -294,7 +294,7 @@ int adxl345_archinitialize(int minor)
       ret = adxl345_register(g_adxl345config.handle, CONFIG_ADXL345_DEVMINOR);
       if (ret < 0)
         {
-          snerr("Failed to register ADXL345 driver: %d\n", ret);
+          snerr("ERROR: Failed to register ADXL345 driver: %d\n", ret);
           return ret;
         }
     }
diff --git a/configs/freedom-kl25z/src/kl_pwm.c b/configs/freedom-kl25z/src/kl_pwm.c
index 18b51097d1..e00d1ca52b 100644
--- a/configs/freedom-kl25z/src/kl_pwm.c
+++ b/configs/freedom-kl25z/src/kl_pwm.c
@@ -98,7 +98,7 @@ int board_pwm_setup(void)
       pwm = kl_pwminitialize(0);
       if (!pwm)
         {
-          aerr("Failed to get the KL25 PWM lower half\n");
+          aerr("ERROR: Failed to get the KL25 PWM lower half\n");
           return -ENODEV;
         }
 
@@ -107,7 +107,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          aerr("pwm_register failed: %d\n", ret);
+          aerr("ERROR: pwm_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/freedom-kl25z/src/kl_wifi.c b/configs/freedom-kl25z/src/kl_wifi.c
index 12924682d8..5687388571 100644
--- a/configs/freedom-kl25z/src/kl_wifi.c
+++ b/configs/freedom-kl25z/src/kl_wifi.c
@@ -289,7 +289,7 @@ int wireless_archinitialize(size_t max_rx_size)
 
   /* Init SPI bus */
 
-  ierr("minor %d\n", minor);
+  iinfo("minor %d\n", minor);
   DEBUGASSERT(CONFIG_CC3000_DEVMINOR == 0);
 
 #ifdef CONFIG_CC3000_PROBES
@@ -304,7 +304,7 @@ int wireless_archinitialize(size_t max_rx_size)
   spi = kl_spibus_initialize(CONFIG_CC3000_SPIDEV);
   if (!spi)
     {
-      ierr("Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV);
+      ierr("ERROR: Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV);
       return -ENODEV;
     }
 
@@ -314,7 +314,7 @@ int wireless_archinitialize(size_t max_rx_size)
   int ret = cc3000_register(spi, &g_cc3000_info.dev, CONFIG_CC3000_DEVMINOR);
   if (ret < 0)
     {
-      ierr("Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV);
+      ierr("ERROR: Failed to initialize SPI bus %d\n", CONFIG_CC3000_SPIDEV);
       return -ENODEV;
     }
 
diff --git a/configs/freedom-kl26z/src/kl_pwm.c b/configs/freedom-kl26z/src/kl_pwm.c
index e57a9936bb..672d49e70e 100644
--- a/configs/freedom-kl26z/src/kl_pwm.c
+++ b/configs/freedom-kl26z/src/kl_pwm.c
@@ -98,7 +98,7 @@ int board_pwm_setup(void)
       pwm = kl_pwminitialize(0);
       if (!pwm)
         {
-          aerr("Failed to get the KL26 PWM lower half\n");
+          aerr("ERROR: Failed to get the KL26 PWM lower half\n");
           return -ENODEV;
         }
 
@@ -107,7 +107,7 @@ int board_pwm_setup(void)
       ret = pwm_register("/dev/pwm0", pwm);
       if (ret < 0)
         {
-          aerr("pwm_register failed: %d\n", ret);
+          aerr("ERROR: pwm_register failed: %d\n", ret);
           return ret;
         }
 
diff --git a/configs/hymini-stm32v/src/stm32_spi.c b/configs/hymini-stm32v/src/stm32_spi.c
index e803e52e70..757dffb6cc 100644
--- a/configs/hymini-stm32v/src/stm32_spi.c
+++ b/configs/hymini-stm32v/src/stm32_spi.c
@@ -125,7 +125,7 @@ void stm32_spidev_initialize(void)
 #ifdef CONFIG_STM32_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
   if (devid == SPIDEV_TOUCHSCREEN)
   {
@@ -144,7 +144,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -156,7 +156,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_STM32_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 }
 
 uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
diff --git a/configs/hymini-stm32v/src/stm32_ts.c b/configs/hymini-stm32v/src/stm32_ts.c
index 77e83d66f2..678dba89a2 100644
--- a/configs/hymini-stm32v/src/stm32_ts.c
+++ b/configs/hymini-stm32v/src/stm32_ts.c
@@ -153,12 +153,12 @@ int board_tsc_setup(int minor)
 {
   FAR struct spi_dev_s *dev;
 
-  ierr("minor %d\n", minor);
+  iinfo("minor %d\n", minor);
 
   dev = stm32_spibus_initialize(1);
   if (!dev)
     {
-      ierr("Failed to initialize SPI bus\n");
+      ierr("ERROR: Failed to initialize SPI bus\n");
       return -ENODEV;
     }
 
diff --git a/configs/hymini-stm32v/src/stm32_usbdev.c b/configs/hymini-stm32v/src/stm32_usbdev.c
index 49f7f83339..c1a21be624 100644
--- a/configs/hymini-stm32v/src/stm32_usbdev.c
+++ b/configs/hymini-stm32v/src/stm32_usbdev.c
@@ -73,7 +73,7 @@
 
 void stm32_usbinitialize(void)
 {
-  ullerr("called\n");
+  ullinfo("called\n");
 
   /* USB Soft Connect Pullup */
   stm32_configgpio(GPIO_USB_PULLUP);
@@ -111,6 +111,5 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable)
 
 void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ullerr("resume: %d\n", resume);
+  ullinfo("resume: %d\n", resume);
 }
-
diff --git a/configs/kwikstik-k40/src/k40_leds.c b/configs/kwikstik-k40/src/k40_leds.c
index 277da4de96..8605c334fc 100644
--- a/configs/kwikstik-k40/src/k40_leds.c
+++ b/configs/kwikstik-k40/src/k40_leds.c
@@ -53,20 +53,14 @@
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define lederr  llerr
+#  define ledwarn llwarn
 #  define ledinfo llinfo
 #else
 #  define lederr(x...)
+#  define ledwarn(x...)
 #  define ledinfo(x...)
 #endif
 
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
diff --git a/configs/kwikstik-k40/src/k40_spi.c b/configs/kwikstik-k40/src/k40_spi.c
index c9bfc1aa08..4c4769bf6c 100644
--- a/configs/kwikstik-k40/src/k40_spi.c
+++ b/configs/kwikstik-k40/src/k40_spi.c
@@ -114,7 +114,7 @@ void weak_function kinetis_spidev_initialize(void)
 #ifdef CONFIG_KINETIS_SPI1
 void kinetis_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 # warning "Missing logic"
 }
 
@@ -128,7 +128,7 @@ uint8_t kinetis_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_KINETIS_SPI2
 void kinetis_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 # warning "Missing logic"
 }
 
@@ -142,7 +142,7 @@ uint8_t kinetis_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 #ifdef CONFIG_KINETIS_SPI3
 void kinetis_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
-  spierr("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
+  spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 # warning "Missing logic"
 }
 
diff --git a/configs/kwikstik-k40/src/k40_usbdev.c b/configs/kwikstik-k40/src/k40_usbdev.c
index da038aa0a8..f4e206578c 100644
--- a/configs/kwikstik-k40/src/k40_usbdev.c
+++ b/configs/kwikstik-k40/src/k40_usbdev.c
@@ -108,6 +108,6 @@ int kinetis_usbpullup(FAR struct usbdev_s *dev, bool enable)
 
 void kinetis_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ullerr("resume: %d\n", resume);
+  ullinfo("resume: %d\n", resume);
 #warning "Missing logic"
 }
diff --git a/configs/stm32f4discovery/src/stm32_spi.c b/configs/stm32f4discovery/src/stm32_spi.c
index 9ff8a256d1..905dcd41b2 100644
--- a/configs/stm32f4discovery/src/stm32_spi.c
+++ b/configs/stm32f4discovery/src/stm32_spi.c
@@ -59,7 +59,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* Enables debug output from this file (needs CONFIG_DEBUG_FEATURES too) */
+/* Enables debug output from this file */
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-- 
GitLab


From eac916c90797d1c342e9e9663084b3155d49a481 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 13 Jun 2016 11:48:20 -0600
Subject: [PATCH 59/91] Fix some warnings

---
 arch/arm/src/arm/up_assert.c              | 18 +++----
 arch/arm/src/armv6-m/up_dumpnvic.c        | 53 ++++++++++----------
 arch/arm/src/kinetis/kinetis_serial.c     | 13 +++--
 arch/arm/src/lpc17xx/lpc17_usbdev.c       | 25 ++++++----
 arch/arm/src/lpc43xx/lpc43_debug.c        | 13 +----
 arch/arm/src/sam34/sam_udp.c              | 61 ++++++++++++-----------
 arch/arm/src/sama5/sam_ohci.c             |  2 +-
 arch/arm/src/sama5/sam_xdmac.c            |  2 +-
 arch/arm/src/samdl/sam_sercom.c           | 24 +++------
 arch/arm/src/samv7/sam_xdmac.c            |  2 +-
 arch/arm/src/tiva/tiva_dumpgpio.c         | 37 ++++++++------
 configs/zkit-arm-1769/src/lpc17_appinit.c |  6 +--
 drivers/input/stmpe811_tsc.c              |  2 +-
 fs/driver/fs_devsyslog.c                  |  2 +-
 14 files changed, 129 insertions(+), 131 deletions(-)

diff --git a/arch/arm/src/arm/up_assert.c b/arch/arm/src/arm/up_assert.c
index b17ea04700..5c0ed9a678 100644
--- a/arch/arm/src/arm/up_assert.c
+++ b/arch/arm/src/arm/up_assert.c
@@ -43,16 +43,14 @@
  * selected.
  */
 
-#ifdef CONFIG_ARCH_STACKDUMP
-#  undef  CONFIG_DEBUG_FEATURES
-#  undef  CONFIG_DEBUG_ERROR
-#  undef  CONFIG_DEBUG_WARN
-#  undef  CONFIG_DEBUG_INFO
-#  define CONFIG_DEBUG_FEATURES 1
-#  define CONFIG_DEBUG_ERROR 1
-#  define CONFIG_DEBUG_WARN 1
-#  define CONFIG_DEBUG_INFO 1
-#endif
+#undef  CONFIG_DEBUG_FEATURES
+#undef  CONFIG_DEBUG_ERROR
+#undef  CONFIG_DEBUG_WARN
+#undef  CONFIG_DEBUG_INFO
+#define CONFIG_DEBUG_FEATURES 1
+#define CONFIG_DEBUG_ERROR 1
+#define CONFIG_DEBUG_WARN 1
+#define CONFIG_DEBUG_INFO 1
 
 #include 
 #include 
diff --git a/arch/arm/src/armv6-m/up_dumpnvic.c b/arch/arm/src/armv6-m/up_dumpnvic.c
index a5746d5829..678e8efefc 100644
--- a/arch/arm/src/armv6-m/up_dumpnvic.c
+++ b/arch/arm/src/armv6-m/up_dumpnvic.c
@@ -39,6 +39,15 @@
 
 #include 
 
+/* Output debug info even if debug output is not selected. */
+
+#undef  CONFIG_DEBUG_ERROR
+#undef  CONFIG_DEBUG_WARN
+#undef  CONFIG_DEBUG_INFO
+#define CONFIG_DEBUG_ERROR 1
+#define CONFIG_DEBUG_WARN 1
+#define CONFIG_DEBUG_INFO 1
+
 #include 
 #include 
 
@@ -50,18 +59,6 @@
 
 #ifdef CONFIG_DEBUG_FEATURES
 
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -83,27 +80,27 @@ void up_dumpnvic(FAR const char *msg)
 
   flags = enter_critical_section();
 
-  llerr("NVIC: %s\n", msg);
-  llerr("   ISER: %08x  ICER: %08x  ISPR: %08x  ICPR: %08x\n",
-        getreg32(ARMV6M_NVIC_ISER), getreg32(ARMV6M_NVIC_ICER),
-        getreg32(ARMV6M_NVIC_ISPR), getreg32(ARMV6M_NVIC_ICPR));
+  llinfo("NVIC: %s\n", msg);
+  llinfo("   ISER: %08x  ICER: %08x  ISPR: %08x  ICPR: %08x\n",
+         getreg32(ARMV6M_NVIC_ISER), getreg32(ARMV6M_NVIC_ICER),
+         getreg32(ARMV6M_NVIC_ISPR), getreg32(ARMV6M_NVIC_ICPR));
 
   for (i = 0 ; i < 8; i += 4)
     {
-      llerr("   IPR%d: %08x  IPR%d: %08x  IPR%d: %08x  IPR%d: %08x\n",
-            i,   getreg32(ARMV6M_NVIC_IPR(i)),
-            i+1, getreg32(ARMV6M_NVIC_IPR(i+1)),
-            i+2, getreg32(ARMV6M_NVIC_IPR(i+2)),
-            i+3, getreg32(ARMV6M_NVIC_IPR(i+3)));
+      llinfo("   IPR%d: %08x  IPR%d: %08x  IPR%d: %08x  IPR%d: %08x\n",
+             i,   getreg32(ARMV6M_NVIC_IPR(i)),
+             i+1, getreg32(ARMV6M_NVIC_IPR(i+1)),
+             i+2, getreg32(ARMV6M_NVIC_IPR(i+2)),
+             i+3, getreg32(ARMV6M_NVIC_IPR(i+3)));
     }
 
-  llerr("SYSCON:\n");
-  llerr("  CPUID: %08x  ICSR: %08x AIRCR: %08x   SCR: %08x\n",
-        getreg32(ARMV6M_SYSCON_CPUID), getreg32(ARMV6M_SYSCON_ICSR),
-        getreg32(ARMV6M_SYSCON_AIRCR), getreg32(ARMV6M_SYSCON_SCR));
-  llerr("    CCR: %08x SHPR2: %08x SHPR3: %08x\n",
-        getreg32(ARMV6M_SYSCON_CCR),   getreg32(ARMV6M_SYSCON_SHPR2),
-        getreg32(ARMV6M_SYSCON_SHPR3));
+  llinfo("SYSCON:\n");
+  llinfo("  CPUID: %08x  ICSR: %08x AIRCR: %08x   SCR: %08x\n",
+         getreg32(ARMV6M_SYSCON_CPUID), getreg32(ARMV6M_SYSCON_ICSR),
+         getreg32(ARMV6M_SYSCON_AIRCR), getreg32(ARMV6M_SYSCON_SCR));
+  llinfo("    CCR: %08x SHPR2: %08x SHPR3: %08x\n",
+         getreg32(ARMV6M_SYSCON_CCR),   getreg32(ARMV6M_SYSCON_SHPR2),
+         getreg32(ARMV6M_SYSCON_SHPR3));
 
   leave_critical_section(flags);
 }
diff --git a/arch/arm/src/kinetis/kinetis_serial.c b/arch/arm/src/kinetis/kinetis_serial.c
index 4b9f1641f0..3b169232a9 100644
--- a/arch/arm/src/kinetis/kinetis_serial.c
+++ b/arch/arm/src/kinetis/kinetis_serial.c
@@ -251,7 +251,7 @@ static void up_shutdown(struct uart_dev_s *dev);
 static int  up_attach(struct uart_dev_s *dev);
 static void up_detach(struct uart_dev_s *dev);
 #ifdef CONFIG_DEBUG_FEATURES
-static int  up_interrupte(int irq, void *context);
+static int  up_interrupt(int irq, void *context);
 #endif
 static int  up_interrupts(int irq, void *context);
 static int  up_ioctl(struct file *filep, int cmd, unsigned long arg);
@@ -684,7 +684,7 @@ static int up_attach(struct uart_dev_s *dev)
 #ifdef CONFIG_DEBUG_FEATURES
   if (ret == OK)
     {
-      ret = irq_attach(priv->irqe, up_interrupte);
+      ret = irq_attach(priv->irqe, up_interrupt);
     }
 #endif
 
@@ -730,7 +730,7 @@ static void up_detach(struct uart_dev_s *dev)
 }
 
 /****************************************************************************
- * Name: up_interrupte
+ * Name: up_interrupt
  *
  * Description:
  *   This is the UART error interrupt handler.  It will be invoked when an
@@ -739,7 +739,7 @@ static void up_detach(struct uart_dev_s *dev)
  ****************************************************************************/
 
 #ifdef CONFIG_DEBUG_FEATURES
-static int up_interrupte(int irq, void *context)
+static int up_interrupt(int irq, void *context)
 {
   struct uart_dev_s *dev = NULL;
   struct up_dev_s   *priv;
@@ -790,6 +790,7 @@ static int up_interrupte(int irq, void *context)
     {
       PANIC();
     }
+
   priv = (struct up_dev_s *)dev->priv;
   DEBUGASSERT(priv);
 
@@ -805,7 +806,11 @@ static int up_interrupte(int irq, void *context)
 
   regval = up_serialin(priv, KINETIS_UART_S1_OFFSET);
   llerr("S1: %02x\n", regval);
+  UNUSED(regval);
+
   regval = up_serialin(priv, KINETIS_UART_D_OFFSET);
+  UNUSED(regval);
+
   return OK;
 }
 #endif /* CONFIG_DEBUG_FEATURES */
diff --git a/arch/arm/src/lpc17xx/lpc17_usbdev.c b/arch/arm/src/lpc17xx/lpc17_usbdev.c
index 300d1ca6ef..ef796bb0de 100644
--- a/arch/arm/src/lpc17xx/lpc17_usbdev.c
+++ b/arch/arm/src/lpc17xx/lpc17_usbdev.c
@@ -99,7 +99,7 @@
 #  define USB_FRAME_INT 0
 #endif
 
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_USB
 #  define USB_ERROR_INT USBDEV_INT_ERRINT
 #else
 #  undef  CONFIG_LPC17_USBDEV_REGDEBUG
@@ -2090,7 +2090,7 @@ static int lpc17_usbinterrupt(int irq, FAR void *context)
 
 #endif
 
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_USB
       /* USB engine error interrupt */
 
       if ((devintstatus & USBDEV_INT_ERRINT) != 0)
@@ -2412,7 +2412,7 @@ static int lpc17_dmasetup(struct lpc17_usbdev_s *priv, uint8_t epphy,
   struct lpc17_dmadesc_s *dmadesc = priv;
   uint32_t regval;
 
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_USB
   if (!priv || epphy < 2)
     {
       usbtrace(TRACE_DEVERROR(LPC17_TRACEERR_INVALIDPARMS), 0);
@@ -2611,13 +2611,14 @@ static int lpc17_epdisable(FAR struct usbdev_ep_s *ep)
   uint32_t mask = (1 << privep->epphy);
   uint32_t regval;
 
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_USB
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(LPC17_TRACEERR_INVALIDPARMS), 0);
       return -EINVAL;
     }
 #endif
+
   usbtrace(TRACE_EPDISABLE, privep->epphy);
 
   /* Cancel any ongoing activity */
@@ -2653,13 +2654,14 @@ static FAR struct usbdev_req_s *lpc17_epallocreq(FAR struct usbdev_ep_s *ep)
 {
   FAR struct lpc17_req_s *privreq;
 
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_USB
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(LPC17_TRACEERR_INVALIDPARMS), 0);
       return NULL;
     }
 #endif
+
   usbtrace(TRACE_EPALLOCREQ, ((FAR struct lpc17_ep_s *)ep)->epphy);
 
   privreq = (FAR struct lpc17_req_s *)kmm_malloc(sizeof(struct lpc17_req_s));
@@ -2685,13 +2687,14 @@ static void lpc17_epfreereq(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s
 {
   FAR struct lpc17_req_s *privreq = (FAR struct lpc17_req_s *)req;
 
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_USB
   if (!ep || !req)
     {
       usbtrace(TRACE_DEVERROR(LPC17_TRACEERR_INVALIDPARMS), 0);
       return;
     }
 #endif
+
   usbtrace(TRACE_EPFREEREQ, ((FAR struct lpc17_ep_s *)ep)->epphy);
 
   kmm_free(privreq);
@@ -2793,7 +2796,7 @@ static int lpc17_epsubmit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *r
   irqstate_t flags;
   int ret = OK;
 
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_USB
   if (!req || !req->callback || !req->buf || !ep)
     {
       usbtrace(TRACE_DEVERROR(LPC17_TRACEERR_INVALIDPARMS), 0);
@@ -2878,7 +2881,7 @@ static int lpc17_epcancel(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *r
   FAR struct lpc17_ep_s *privep = (FAR struct lpc17_ep_s *)ep;
   irqstate_t flags;
 
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_USB
   if (!ep || !req)
     {
       usbtrace(TRACE_DEVERROR(LPC17_TRACEERR_INVALIDPARMS), 0);
@@ -3142,7 +3145,7 @@ static int lpc17_selfpowered(struct usbdev_s *dev, bool selfpowered)
 
   usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered);
 
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_USB
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(LPC17_TRACEERR_INVALIDPARMS), 0);
@@ -3406,7 +3409,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
 
   usbtrace(TRACE_DEVREGISTER, 0);
 
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_USB
   if (!driver || !driver->ops->bind || !driver->ops->unbind ||
       !driver->ops->disconnect || !driver->ops->setup)
     {
@@ -3456,7 +3459,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
 {
   usbtrace(TRACE_DEVUNREGISTER, 0);
 
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_USB
   if (driver != g_usbdev.driver)
     {
       usbtrace(TRACE_DEVERROR(LPC17_TRACEERR_INVALIDPARMS), 0);
diff --git a/arch/arm/src/lpc43xx/lpc43_debug.c b/arch/arm/src/lpc43xx/lpc43_debug.c
index 06a5ea71fb..3b20bc63e7 100644
--- a/arch/arm/src/lpc43xx/lpc43_debug.c
+++ b/arch/arm/src/lpc43xx/lpc43_debug.c
@@ -49,21 +49,10 @@
 
 #ifdef CONFIG_DEBUG_FEATURES
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
+
 /****************************************************************************
  * Function:  lpc43_pin_dump
  *
diff --git a/arch/arm/src/sam34/sam_udp.c b/arch/arm/src/sam34/sam_udp.c
index b1842e9d9f..851b61c741 100644
--- a/arch/arm/src/sam34/sam_udp.c
+++ b/arch/arm/src/sam34/sam_udp.c
@@ -90,7 +90,7 @@
  * enabled.
  */
 
-#ifndef CONFIG_DEBUG_FEATURES
+#ifndef CONFIG_DEBUG_USB
 #  undef CONFIG_SAM34_UDP_REGDEBUG
 #endif
 
@@ -606,7 +606,7 @@ const struct trace_msg_t g_usb_trace_strings_intdecode[] =
 #ifdef CONFIG_SAM34_UDP_REGDEBUG
 static void sam_printreg(uintptr_t regaddr, uint32_t regval, bool iswrite)
 {
-  llerr("%p%s%08x\n", regaddr, iswrite ? "<-" : "->", regval);
+  llinfo("%p%s%08x\n", regaddr, iswrite ? "<-" : "->", regval);
 }
 #endif
 
@@ -657,7 +657,7 @@ static void sam_checkreg(uintptr_t regaddr, uint32_t regval, bool iswrite)
             {
               /* No.. More than one. */
 
-              llerr("[repeats %d more times]\n", count);
+              llinfo("[repeats %d more times]\n", count);
             }
         }
 
@@ -732,20 +732,20 @@ static inline void sam_putreg(uint32_t regval, uint32_t regaddr)
  * Name: sam_dumpep
  ****************************************************************************/
 
-#if defined(CONFIG_SAM34_UDP_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
+#if defined(CONFIG_SAM34_UDP_REGDEBUG) && defined(CONFIG_DEBUG_USB)
 static void sam_dumpep(struct sam_usbdev_s *priv, uint8_t epno)
 {
   /* Global Registers */
 
-  llerr("Global Registers:\n");
-  llerr(" FRMNUM:    %08x\n", sam_getreg(SAM_UDP_FRMNUM));
-  llerr("GLBSTAT:    %08x\n", sam_getreg(SAM_UDP_GLBSTAT));
-  llerr("  FADDR:    %08x\n", sam_getreg(SAM_UDP_FADDR));
-  llerr("    IMR:    %08x\n", sam_getreg(SAM_UDP_IMR));
-  llerr("    ISR:    %08x\n", sam_getreg(SAM_UDP_ISR));
-  llerr("  RSTEP:    %08x\n", sam_getreg(SAM_UDP_RSTEP));
-  llerr("   TXVC:    %08x\n", sam_getreg(SAM_UDP_TXVC));
-  llerr(" CSR[%d]:    %08x\n", epno, sam_getreg(SAM_UDPEP_CSR(epno)));
+  llinfo("Global Registers:\n");
+  llinfo(" FRMNUM:    %08x\n", sam_getreg(SAM_UDP_FRMNUM));
+  llinfo("GLBSTAT:    %08x\n", sam_getreg(SAM_UDP_GLBSTAT));
+  llinfo("  FADDR:    %08x\n", sam_getreg(SAM_UDP_FADDR));
+  llinfo("    IMR:    %08x\n", sam_getreg(SAM_UDP_IMR));
+  llinfo("    ISR:    %08x\n", sam_getreg(SAM_UDP_ISR));
+  llinfo("  RSTEP:    %08x\n", sam_getreg(SAM_UDP_RSTEP));
+  llinfo("   TXVC:    %08x\n", sam_getreg(SAM_UDP_TXVC));
+  llinfo(" CSR[%d]:    %08x\n", epno, sam_getreg(SAM_UDPEP_CSR(epno)));
 }
 #endif
 
@@ -2891,7 +2891,7 @@ static int sam_ep_configure(struct usbdev_ep_s *ep,
 
   /* Verify parameters.  Endpoint 0 is not available at this interface */
 
-#if defined(CONFIG_DEBUG_FEATURES) || defined(CONFIG_USBDEV_TRACE)
+#if defined(CONFIG_DEBUG_USB) || defined(CONFIG_USBDEV_TRACE)
   uint8_t epno = USB_EPNO(desc->addr);
   usbtrace(TRACE_EPCONFIGURE, (uint16_t)epno);
 
@@ -2942,7 +2942,7 @@ static int sam_ep_disable(struct usbdev_ep_s *ep)
   irqstate_t flags;
   uint8_t epno;
 
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_USB
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -2979,13 +2979,14 @@ static struct usbdev_req_s *sam_ep_allocreq(struct usbdev_ep_s *ep)
 {
   struct sam_req_s *privreq;
 
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_USB
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
       return NULL;
     }
 #endif
+
   usbtrace(TRACE_EPALLOCREQ, USB_EPNO(ep->eplog));
 
   privreq = (struct sam_req_s *)kmm_malloc(sizeof(struct sam_req_s));
@@ -3011,7 +3012,7 @@ static void sam_ep_freereq(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
 {
   struct sam_req_s *privreq = (struct sam_req_s *)req;
 
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_USB
   if (!ep || !req)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3074,7 +3075,7 @@ static int sam_ep_submit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
   uint8_t epno;
   int ret = OK;
 
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_USB
   if (!req || !req->callback || !req->buf || !ep)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3086,7 +3087,7 @@ static int sam_ep_submit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
   usbtrace(TRACE_EPSUBMIT, USB_EPNO(ep->eplog));
   priv = privep->dev;
 
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_USB
   if (!priv->driver)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_NOTCONFIGURED), priv->usbdev.speed);
@@ -3182,13 +3183,14 @@ static int sam_ep_cancel(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
   struct sam_ep_s *privep = (struct sam_ep_s *)ep;
   irqstate_t flags;
 
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_USB
   if (!ep || !req)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
       return -EINVAL;
     }
 #endif
+
   usbtrace(TRACE_EPCANCEL, USB_EPNO(ep->eplog));
 
   flags = enter_critical_section();
@@ -3208,7 +3210,7 @@ static int sam_ep_stallresume(struct usbdev_ep_s *ep, bool resume)
   irqstate_t flags;
   int ret;
 
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_USB
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3283,7 +3285,8 @@ static struct usbdev_ep_s *sam_allocep(struct usbdev_s *dev, uint8_t epno,
   uint16_t epset = SAM_EPSET_NOTEP0;
 
   usbtrace(TRACE_DEVALLOCEP, (uint16_t)epno);
-#ifdef CONFIG_DEBUG_FEATURES
+
+#ifdef CONFIG_DEBUG_USB
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3345,13 +3348,14 @@ static void sam_freeep(struct usbdev_s *dev, struct usbdev_ep_s *ep)
   struct sam_usbdev_s *priv;
   struct sam_ep_s *privep;
 
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_USB
   if (!dev || !ep)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
       return;
     }
 #endif
+
   priv   = (struct sam_usbdev_s *)dev;
   privep = (struct sam_ep_s *)ep;
   usbtrace(TRACE_DEVFREEEP, (uint16_t)USB_EPNO(ep->eplog));
@@ -3377,7 +3381,7 @@ static int sam_getframe(struct usbdev_s *dev)
   uint32_t regval;
   uint16_t frameno;
 
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_USB
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3409,7 +3413,8 @@ static int sam_wakeup(struct usbdev_s *dev)
   uint32_t regval;
 
   usbtrace(TRACE_DEVWAKEUP, 0);
-#ifdef CONFIG_DEBUG_FEATURES
+
+#ifdef CONFIG_DEBUG_USB
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3480,7 +3485,7 @@ static int sam_selfpowered(struct usbdev_s *dev, bool selfpowered)
 
   usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered);
 
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_USB
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
@@ -3926,7 +3931,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
 
   usbtrace(TRACE_DEVREGISTER, 0);
 
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_USB
   if (!driver || !driver->ops->bind || !driver->ops->unbind ||
       !driver->ops->disconnect || !driver->ops->setup)
     {
@@ -4000,7 +4005,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
 
   usbtrace(TRACE_DEVUNREGISTER, 0);
 
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_USB
   if (driver != priv->driver)
     {
       usbtrace(TRACE_DEVERROR(SAM_TRACEERR_INVALIDPARMS), 0);
diff --git a/arch/arm/src/sama5/sam_ohci.c b/arch/arm/src/sama5/sam_ohci.c
index 9996dd18f8..e20a1adb24 100644
--- a/arch/arm/src/sama5/sam_ohci.c
+++ b/arch/arm/src/sama5/sam_ohci.c
@@ -2835,7 +2835,7 @@ errout:
 
 static int sam_epfree(struct usbhost_driver_s *drvr, usbhost_ep_t ep)
 {
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_ASSERTIONS
   struct sam_rhport_s *rhport = (struct sam_rhport_s *)drvr;
 #endif
   struct sam_eplist_s *eplist = (struct sam_eplist_s *)ep;
diff --git a/arch/arm/src/sama5/sam_xdmac.c b/arch/arm/src/sama5/sam_xdmac.c
index 93989db63a..48a69a16e3 100644
--- a/arch/arm/src/sama5/sam_xdmac.c
+++ b/arch/arm/src/sama5/sam_xdmac.c
@@ -1650,7 +1650,7 @@ static inline int sam_single(struct sam_xdmach_s *xdmach)
 static inline int sam_multiple(struct sam_xdmach_s *xdmach)
 {
   struct sam_xdmac_s *xdmac = sam_controller(xdmach);
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_ASSERTIONS
   struct chnext_view1_s *llhead = xdmach->llhead;
 #endif
   uintptr_t paddr;
diff --git a/arch/arm/src/samdl/sam_sercom.c b/arch/arm/src/samdl/sam_sercom.c
index e44e895a87..779db03738 100644
--- a/arch/arm/src/samdl/sam_sercom.c
+++ b/arch/arm/src/samdl/sam_sercom.c
@@ -68,14 +68,6 @@
 #  define HAVE_SERCOM0_4
 #endif
 
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -162,9 +154,9 @@ void sercom_slowclk_configure(int sercom, int gclkgen)
 #ifdef CONFIG_SAMDL_SERCOM5
   static bool configured5 = false;
 #endif
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_ASSERTIONS
 #ifdef HAVE_SERCOM0_4
-  static uint8_t slowgen  = 0xff;
+  static uint8_t slowgen04  = 0xff;
 #endif
 #ifdef CONFIG_SAMDL_SERCOM5
   static uint8_t slowgen5 = 0xff;
@@ -205,19 +197,19 @@ void sercom_slowclk_configure(int sercom, int gclkgen)
            */
 
           configured = true;
-#ifdef CONFIG_DEBUG_FEATURES
-          slowgen    = (uint8_t)gclkgen;
+#ifdef CONFIG_DEBUG_ASSERTIONS
+          slowgen04  = (uint8_t)gclkgen;
 #endif
         }
 
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_ASSERTIONS
       /* Already configured.  This is okay provided that the same GCLK
        * generator is being used.  Otherwise, there is a problem.
        */
 
       else
         {
-          DEBUGASSERT((int)slowgen == gclkgen);
+          DEBUGASSERT((int)slowgen04 == gclkgen);
         }
 #endif
       break;
@@ -236,12 +228,12 @@ void sercom_slowclk_configure(int sercom, int gclkgen)
            */
 
           configured5 = true;
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_ASSERTIONS
           slowgen5    = (uint8_t)gclkgen;
 #endif
         }
 
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_ASSERTIONS
       /* Already configured.  This is okay provided that the same GCLK
        * generator is being used.  Otherwise, there is a problem.
        */
diff --git a/arch/arm/src/samv7/sam_xdmac.c b/arch/arm/src/samv7/sam_xdmac.c
index 24a5eaf9fa..2666457a40 100644
--- a/arch/arm/src/samv7/sam_xdmac.c
+++ b/arch/arm/src/samv7/sam_xdmac.c
@@ -1340,7 +1340,7 @@ static inline int sam_single(struct sam_xdmach_s *xdmach)
 static inline int sam_multiple(struct sam_xdmach_s *xdmach)
 {
   struct sam_xdmac_s *xdmac = sam_controller(xdmach);
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_ASSERTIONS
   struct chnext_view1_s *llhead = xdmach->llhead;
 #endif
   uintptr_t paddr;
diff --git a/arch/arm/src/tiva/tiva_dumpgpio.c b/arch/arm/src/tiva/tiva_dumpgpio.c
index ba58e92297..f0f66756dd 100644
--- a/arch/arm/src/tiva/tiva_dumpgpio.c
+++ b/arch/arm/src/tiva/tiva_dumpgpio.c
@@ -39,6 +39,15 @@
 
 #include 
 
+/* Output debug info even if debug output is not selected. */
+
+#undef  CONFIG_DEBUG_ERROR
+#undef  CONFIG_DEBUG_WARN
+#undef  CONFIG_DEBUG_INFO
+#define CONFIG_DEBUG_ERROR 1
+#define CONFIG_DEBUG_WARN 1
+#define CONFIG_DEBUG_INFO 1
+
 #include 
 #include 
 #include 
@@ -163,13 +172,13 @@ int tiva_dumpgpio(uint32_t pinset, const char *msg)
   enabled  = ((rcgc2 & SYSCON_RCGC2_GPIO(port)) != 0);
 #endif
 
-  llerr("GPIO%c pinset: %08x base: %08x -- %s\n",
+  llinfo("GPIO%c pinset: %08x base: %08x -- %s\n",
         tiva_gpioport(port), pinset, base, msg);
 #ifdef TIVA_SYSCON_RCGCGPIO
-  llerr("RCGCGPIO: %08x (%s)\n",
+  llinfo("RCGCGPIO: %08x (%s)\n",
         rcgcgpio, enabled ? "enabled" : "disabled");
 #else
-  llerr("   RCGC2: %08x (%s)\n",
+  llinfo("   RCGC2: %08x (%s)\n",
         rcgc2, enabled ? "enabled" : "disabled");
 #endif
 
@@ -177,17 +186,17 @@ int tiva_dumpgpio(uint32_t pinset, const char *msg)
 
   if (enabled)
     {
-      llerr("   AFSEL: %02x DEN: %02x DIR: %02x DATA: %02x\n",
-            getreg32(base + TIVA_GPIO_AFSEL_OFFSET), getreg32(base + TIVA_GPIO_DEN_OFFSET),
-            getreg32(base + TIVA_GPIO_DIR_OFFSET), getreg32(base + TIVA_GPIO_DATA_OFFSET + 0x3fc));
-      llerr("      IS:  %02x IBE: %02x IEV: %02x IM:  %02x RIS: %08x MIS: %08x\n",
-            getreg32(base + TIVA_GPIO_IEV_OFFSET), getreg32(base + TIVA_GPIO_IM_OFFSET),
-            getreg32(base + TIVA_GPIO_RIS_OFFSET), getreg32(base + TIVA_GPIO_MIS_OFFSET));
-      llerr("     2MA:  %02x 4MA: %02x 8MA: %02x ODR: %02x PUR %02x PDR: %02x SLR: %02x\n",
-            getreg32(base + TIVA_GPIO_DR2R_OFFSET), getreg32(base + TIVA_GPIO_DR4R_OFFSET),
-            getreg32(base + TIVA_GPIO_DR8R_OFFSET), getreg32(base + TIVA_GPIO_ODR_OFFSET),
-            getreg32(base + TIVA_GPIO_PUR_OFFSET), getreg32(base + TIVA_GPIO_PDR_OFFSET),
-            getreg32(base + TIVA_GPIO_SLR_OFFSET));
+      llinfo("   AFSEL: %02x DEN: %02x DIR: %02x DATA: %02x\n",
+             getreg32(base + TIVA_GPIO_AFSEL_OFFSET), getreg32(base + TIVA_GPIO_DEN_OFFSET),
+             getreg32(base + TIVA_GPIO_DIR_OFFSET), getreg32(base + TIVA_GPIO_DATA_OFFSET + 0x3fc));
+      llinfo("      IS:  %02x IBE: %02x IEV: %02x IM:  %02x RIS: %08x MIS: %08x\n",
+             getreg32(base + TIVA_GPIO_IEV_OFFSET), getreg32(base + TIVA_GPIO_IM_OFFSET),
+             getreg32(base + TIVA_GPIO_RIS_OFFSET), getreg32(base + TIVA_GPIO_MIS_OFFSET));
+      llinfo("     2MA:  %02x 4MA: %02x 8MA: %02x ODR: %02x PUR %02x PDR: %02x SLR: %02x\n",
+             getreg32(base + TIVA_GPIO_DR2R_OFFSET), getreg32(base + TIVA_GPIO_DR4R_OFFSET),
+             getreg32(base + TIVA_GPIO_DR8R_OFFSET), getreg32(base + TIVA_GPIO_ODR_OFFSET),
+             getreg32(base + TIVA_GPIO_PUR_OFFSET), getreg32(base + TIVA_GPIO_PDR_OFFSET),
+             getreg32(base + TIVA_GPIO_SLR_OFFSET));
     }
 
   leave_critical_section(flags);
diff --git a/configs/zkit-arm-1769/src/lpc17_appinit.c b/configs/zkit-arm-1769/src/lpc17_appinit.c
index c8afc9304e..2eebdc5196 100644
--- a/configs/zkit-arm-1769/src/lpc17_appinit.c
+++ b/configs/zkit-arm-1769/src/lpc17_appinit.c
@@ -116,14 +116,14 @@
 /* Debug ********************************************************************/
 
 #ifdef CONFIG_CPP_HAVE_VARARGS
-#  ifdef CONFIG_DEBUG_FEATURES
-#    define message(...) lib_lowprintf(__VA_ARGS__)
+#  ifdef CONFIG_DEBUG_INFO
+#    define message(...) llinfo(__VA_ARGS__)
 #  else
 #    define message(...) printf(__VA_ARGS__)
 #  endif
 #else
 #  ifdef CONFIG_DEBUG_FEATURES
-#    define message lib_lowprintf
+#    define message llinfo
 #  else
 #    define message printf
 #  endif
diff --git a/drivers/input/stmpe811_tsc.c b/drivers/input/stmpe811_tsc.c
index 8ab3d8fd5a..83068d8011 100644
--- a/drivers/input/stmpe811_tsc.c
+++ b/drivers/input/stmpe811_tsc.c
@@ -306,7 +306,7 @@ static inline int stmpe811_waitsample(FAR struct stmpe811_dev_s *priv,
 
       if (ret < 0)
         {
-#ifdef CONFIG_DEBUG_FEATURES
+#if defined(CONFIG_DEBUG_INPUT_ERROR) || defined(CONFIG_DEBUG_ASSERTIONS)
           /* Sample the errno (debug output could change it) */
 
           int errval = errno;
diff --git a/fs/driver/fs_devsyslog.c b/fs/driver/fs_devsyslog.c
index 2c35dab48d..84b594077c 100644
--- a/fs/driver/fs_devsyslog.c
+++ b/fs/driver/fs_devsyslog.c
@@ -167,7 +167,7 @@ static inline int syslog_takesem(void)
 
 static inline void syslog_givesem(void)
 {
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_ASSERTIONS
   pid_t me = getpid();
   DEBUGASSERT(g_sysdev.sl_holder == me);
 #endif
-- 
GitLab


From d5275e48d07da146850335c84b7b804ed728fcae Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 13 Jun 2016 13:16:03 -0600
Subject: [PATCH 60/91] Eliminate some warnings

---
 arch/mips/src/mips32/up_dumpstate.c | 12 ++++--------
 fs/nxffs/nxffs_open.c               |  4 ++--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/arch/mips/src/mips32/up_dumpstate.c b/arch/mips/src/mips32/up_dumpstate.c
index efcf44103d..e31035f159 100644
--- a/arch/mips/src/mips32/up_dumpstate.c
+++ b/arch/mips/src/mips32/up_dumpstate.c
@@ -42,8 +42,12 @@
 /* Output debug info -- even if debug is not selected. */
 
 #undef  CONFIG_DEBUG_FEATURES
+#undef  CONFIG_DEBUG_ERROR
+#undef  CONFIG_DEBUG_WARN
 #undef  CONFIG_DEBUG_INFO
 #define CONFIG_DEBUG_FEATURES 1
+#define CONFIG_DEBUG_ERROR 1
+#define CONFIG_DEBUG_WARN 1
 #define CONFIG_DEBUG_INFO 1
 
 #include 
@@ -61,14 +65,6 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
diff --git a/fs/nxffs/nxffs_open.c b/fs/nxffs/nxffs_open.c
index 8807e53bc5..6a03207e91 100644
--- a/fs/nxffs/nxffs_open.c
+++ b/fs/nxffs/nxffs_open.c
@@ -1064,7 +1064,7 @@ int nxffs_open(FAR struct file *filep, FAR const char *relpath,
 
 int nxffs_dup(FAR const struct file *oldp, FAR struct file *newp)
 {
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_ASSERTIONS
   FAR struct nxffs_volume_s *volume;
 #endif
   FAR struct nxffs_ofile_s *ofile;
@@ -1073,7 +1073,7 @@ int nxffs_dup(FAR const struct file *oldp, FAR struct file *newp)
 
   /* Sanity checks */
 
-#ifdef CONFIG_DEBUG_FEATURES
+#ifdef CONFIG_DEBUG_ASSERTIONS
   DEBUGASSERT(oldp->f_priv == NULL && oldp->f_inode != NULL);
 
   /* Get the mountpoint private data from the NuttX inode reference in the
-- 
GitLab


From 0f249016a0591c69c017994d39dc1a9989ac4969 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 13 Jun 2016 14:01:32 -0600
Subject: [PATCH 61/91] Eliminate some warnings

---
 arch/arm/src/arm/up_dataabort.c          | 12 ++++++++----
 arch/arm/src/arm/up_prefetchabort.c      | 12 ++++++++----
 arch/arm/src/arm/up_syscall.c            | 12 ++++++++----
 arch/arm/src/arm/up_undefinedinsn.c      | 12 ++++++++----
 arch/arm/src/armv7-a/arm_dataabort.c     | 12 ++++++++----
 arch/arm/src/armv7-a/arm_prefetchabort.c | 12 ++++++++----
 arch/arm/src/armv7-a/arm_syscall.c       | 12 ++++++++----
 arch/arm/src/armv7-a/arm_undefinedinsn.c | 12 ++++++++----
 arch/arm/src/armv7-r/arm_assert.c        | 13 ++++++++----
 arch/arm/src/armv7-r/arm_dataabort.c     | 12 ++++++++----
 arch/arm/src/armv7-r/arm_prefetchabort.c | 12 ++++++++----
 arch/arm/src/armv7-r/arm_syscall.c       | 15 +++++++++-----
 arch/arm/src/armv7-r/arm_undefinedinsn.c | 24 ++++++++---------------
 arch/arm/src/lpc31xx/lpc31_ehci.c        | 11 ++---------
 arch/arm/src/lpc43xx/lpc43_spi.c         |  9 +++------
 arch/arm/src/sam34/sam_spi.c             | 21 +++++---------------
 arch/arm/src/sama5/sam_ehci.c            | 11 ++---------
 arch/arm/src/sama5/sam_spi.c             | 21 +++++---------------
 arch/arm/src/samdl/sam_spi.c             | 22 +++++----------------
 arch/arm/src/samv7/sam_qspi.c            | 25 +++++++-----------------
 arch/arm/src/samv7/sam_spi.c             | 21 +++++---------------
 arch/arm/src/samv7/sam_spi_slave.c       | 19 +++++-------------
 arch/arm/src/samv7/sam_ssc.c             | 21 +++++++-------------
 arch/arm/src/stm32/stm32_spi.c           | 17 +++++-----------
 arch/arm/src/stm32l4/stm32l4_qspi.c      | 21 +++++---------------
 arch/arm/src/stm32l4/stm32l4_spi.c       | 18 +++++------------
 arch/avr/src/avr/up_dumpstate.c          |  4 ++++
 arch/avr/src/avr32/up_dumpstate.c        |  4 ++++
 arch/avr/src/common/up_assert.c          | 12 ++++++++----
 arch/hc/src/m9s12/m9s12_assert.c         | 12 ++++++++----
 arch/hc/src/m9s12/m9s12_dumpgpio.c       | 11 +++++++++++
 arch/mips/src/mips32/up_assert.c         | 12 ++++++++----
 arch/sh/src/common/up_assert.c           | 10 +++++++---
 arch/sh/src/m16c/m16c_dumpstate.c        |  4 ++++
 arch/sh/src/sh1/sh1_dumpstate.c          |  4 ++++
 arch/sim/src/board_lcd.c                 | 19 +++++-------------
 arch/sim/src/up_spiflash.c               | 17 +++++-----------
 arch/x86/src/common/up_assert.c          | 12 ++++++++----
 arch/x86/src/i486/up_regdump.c           |  4 ++++
 arch/z16/src/common/up_assert.c          | 12 ++++++++----
 arch/z16/src/common/up_registerdump.c    |  4 ++++
 arch/z16/src/common/up_stackdump.c       |  4 ++++
 arch/z16/src/z16f/z16f_espi.c            | 24 +++++++----------------
 arch/z80/src/common/up_assert.c          | 12 ++++++++----
 arch/z80/src/common/up_stackdump.c       |  4 ++++
 arch/z80/src/common/up_stackframe.c      |  8 --------
 arch/z80/src/ez80/ez80_registerdump.c    |  4 ++++
 arch/z80/src/z180/z180_registerdump.c    |  4 ++++
 arch/z80/src/z8/z8_registerdump.c        |  6 ++++++
 arch/z80/src/z80/z80_registerdump.c      |  4 ++++
 drivers/pipes/pipe_common.c              |  4 ++--
 51 files changed, 303 insertions(+), 321 deletions(-)

diff --git a/arch/arm/src/arm/up_dataabort.c b/arch/arm/src/arm/up_dataabort.c
index 264eb5324d..6b547bdea6 100644
--- a/arch/arm/src/arm/up_dataabort.c
+++ b/arch/arm/src/arm/up_dataabort.c
@@ -44,10 +44,14 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG_FEATURES
-# undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG_FEATURES 1
-# define CONFIG_DEBUG_INFO 1
+#  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
+#  undef  CONFIG_DEBUG_INFO
+#  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 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 cbe91d130c..998024a8f9 100644
--- a/arch/arm/src/arm/up_prefetchabort.c
+++ b/arch/arm/src/arm/up_prefetchabort.c
@@ -44,10 +44,14 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG_FEATURES
-# undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG_FEATURES 1
-# define CONFIG_DEBUG_INFO 1
+#  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
+#  undef  CONFIG_DEBUG_INFO
+#  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 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 1493163120..e6d07f9ecd 100644
--- a/arch/arm/src/arm/up_syscall.c
+++ b/arch/arm/src/arm/up_syscall.c
@@ -44,10 +44,14 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG_FEATURES
-# undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG_FEATURES 1
-# define CONFIG_DEBUG_INFO 1
+#  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
+#  undef  CONFIG_DEBUG_INFO
+#  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 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 a51d972a2e..2326ae9b0e 100644
--- a/arch/arm/src/arm/up_undefinedinsn.c
+++ b/arch/arm/src/arm/up_undefinedinsn.c
@@ -44,10 +44,14 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG_FEATURES
-# undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG_FEATURES 1
-# define CONFIG_DEBUG_INFO 1
+#  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
+#  undef  CONFIG_DEBUG_INFO
+#  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 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 033d0473c6..0ec5df5513 100644
--- a/arch/arm/src/armv7-a/arm_dataabort.c
+++ b/arch/arm/src/armv7-a/arm_dataabort.c
@@ -44,10 +44,14 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG_FEATURES
-# undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG_FEATURES 1
-# define CONFIG_DEBUG_INFO 1
+#  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
+#  undef  CONFIG_DEBUG_INFO
+#  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 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 f65286f2aa..68e88a6f48 100644
--- a/arch/arm/src/armv7-a/arm_prefetchabort.c
+++ b/arch/arm/src/armv7-a/arm_prefetchabort.c
@@ -44,10 +44,14 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG_FEATURES
-# undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG_FEATURES 1
-# define CONFIG_DEBUG_INFO 1
+#  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
+#  undef  CONFIG_DEBUG_INFO
+#  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 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 b0b8201756..e331edabd8 100644
--- a/arch/arm/src/armv7-a/arm_syscall.c
+++ b/arch/arm/src/armv7-a/arm_syscall.c
@@ -44,10 +44,14 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG_FEATURES
-# undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG_FEATURES 1
-# define CONFIG_DEBUG_INFO 1
+#  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
+#  undef  CONFIG_DEBUG_INFO
+#  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 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 34081e11a0..899d0a099e 100644
--- a/arch/arm/src/armv7-a/arm_undefinedinsn.c
+++ b/arch/arm/src/armv7-a/arm_undefinedinsn.c
@@ -44,10 +44,14 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG_FEATURES
-# undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG_FEATURES 1
-# define CONFIG_DEBUG_INFO 1
+#  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
+#  undef  CONFIG_DEBUG_INFO
+#  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 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 40dec555cd..790465d843 100644
--- a/arch/arm/src/armv7-r/arm_assert.c
+++ b/arch/arm/src/armv7-r/arm_assert.c
@@ -44,10 +44,14 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG_FEATURES
-# undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG_FEATURES 1
-# define CONFIG_DEBUG_INFO 1
+#  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
+#  undef  CONFIG_DEBUG_INFO
+#  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 1
+#  define CONFIG_DEBUG_INFO 1
 #endif
 
 #include 
@@ -69,6 +73,7 @@
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
+
 /* USB trace dumping */
 
 #ifndef CONFIG_USBDEV_TRACE
diff --git a/arch/arm/src/armv7-r/arm_dataabort.c b/arch/arm/src/armv7-r/arm_dataabort.c
index 802a67984a..aeb6654452 100644
--- a/arch/arm/src/armv7-r/arm_dataabort.c
+++ b/arch/arm/src/armv7-r/arm_dataabort.c
@@ -44,10 +44,14 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG_FEATURES
-# undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG_FEATURES 1
-# define CONFIG_DEBUG_INFO 1
+#  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
+#  undef  CONFIG_DEBUG_INFO
+#  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 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 26c1c052fe..8d000a16de 100644
--- a/arch/arm/src/armv7-r/arm_prefetchabort.c
+++ b/arch/arm/src/armv7-r/arm_prefetchabort.c
@@ -44,10 +44,14 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG_FEATURES
-# undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG_FEATURES 1
-# define CONFIG_DEBUG_INFO 1
+#  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
+#  undef  CONFIG_DEBUG_INFO
+#  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 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 5bf59d595e..f3d2ae9f10 100644
--- a/arch/arm/src/armv7-r/arm_syscall.c
+++ b/arch/arm/src/armv7-r/arm_syscall.c
@@ -44,10 +44,14 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG_FEATURES
-# undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG_FEATURES 1
-# define CONFIG_DEBUG_INFO 1
+#  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
+#  undef  CONFIG_DEBUG_INFO
+#  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 1
+#  define CONFIG_DEBUG_INFO 1
 #endif
 
 #include 
@@ -66,6 +70,7 @@
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
+
 /* Debug ********************************************************************/
 
 #if defined(CONFIG_DEBUG_SYSCALL)
@@ -75,7 +80,7 @@
 #endif
 
 /****************************************************************************
- * Private Data
+ * Private Functions
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/arm/src/armv7-r/arm_undefinedinsn.c b/arch/arm/src/armv7-r/arm_undefinedinsn.c
index 0c61b5f19c..8b5f8c689a 100644
--- a/arch/arm/src/armv7-r/arm_undefinedinsn.c
+++ b/arch/arm/src/armv7-r/arm_undefinedinsn.c
@@ -44,10 +44,14 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG_FEATURES
-# undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG_FEATURES 1
-# define CONFIG_DEBUG_INFO 1
+#  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
+#  undef  CONFIG_DEBUG_INFO
+#  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 1
+#  define CONFIG_DEBUG_INFO 1
 #endif
 
 #include 
@@ -58,18 +62,6 @@
 
 #include "up_internal.h"
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
diff --git a/arch/arm/src/lpc31xx/lpc31_ehci.c b/arch/arm/src/lpc31xx/lpc31_ehci.c
index d77700e327..0734e85e51 100644
--- a/arch/arm/src/lpc31xx/lpc31_ehci.c
+++ b/arch/arm/src/lpc31xx/lpc31_ehci.c
@@ -122,13 +122,6 @@
 #undef CONFIG_USBHOST_ISOC_DISABLE
 #define CONFIG_USBHOST_ISOC_DISABLE 1
 
-/* Simplify DEBUG checks */
-
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_DEBUG_INFO
-#  undef CONFIG_DEBUG_USB
-#endif
-
 /* Registers *******************************************************************/
 /* Traditionally, NuttX specifies register locations using individual
  * register offsets from a base address.  That tradition is broken here and,
@@ -4887,7 +4880,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_INFO)
+#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_ASSERTIONS)
   uint16_t regval16;
   unsigned int nports;
 #endif
@@ -5140,7 +5133,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_INFO)
+#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_ASSERTIONS)
   /* Show the EHCI version */
 
   regval16 = lpc31_swap16(HCCR->hciversion);
diff --git a/arch/arm/src/lpc43xx/lpc43_spi.c b/arch/arm/src/lpc43xx/lpc43_spi.c
index 1d425bc5ff..16dde2582e 100644
--- a/arch/arm/src/lpc43xx/lpc43_spi.c
+++ b/arch/arm/src/lpc43xx/lpc43_spi.c
@@ -68,14 +68,11 @@
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  undef CONFIG_DEBUG_INFO
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
diff --git a/arch/arm/src/sam34/sam_spi.c b/arch/arm/src/sam34/sam_spi.c
index 04860eb4bf..a495bb9007 100644
--- a/arch/arm/src/sam34/sam_spi.c
+++ b/arch/arm/src/sam34/sam_spi.c
@@ -132,30 +132,19 @@
 #define DMA_TIMEOUT_TICKS MSEC2TICK(DMA_TIMEOUT_MS)
 
 /* Debug *******************************************************************/
-/* Check if SPI debut is enabled (non-standard.. no support in
- * include/debug.h
- */
-
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_DEBUG_INFO
-#  undef CONFIG_DEBUG_SPI
-#  undef CONFIG_SAM34_SPI_DMADEBUG
-#  undef CONFIG_SAM34_SPI_REGDEBUG
-#endif
+/* Check if SPI debut is enabled */
 
 #ifndef CONFIG_DEBUG_DMA
 #  undef CONFIG_SAM34_SPI_DMADEBUG
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spierr llerr
-#  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spierr  llerr
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
diff --git a/arch/arm/src/sama5/sam_ehci.c b/arch/arm/src/sama5/sam_ehci.c
index 9dc19e57ab..731290b6ab 100644
--- a/arch/arm/src/sama5/sam_ehci.c
+++ b/arch/arm/src/sama5/sam_ehci.c
@@ -127,13 +127,6 @@
 #  undef CONFIG_SAMA5_UHPHS_RHPORT1
 #endif
 
-/* Simplify DEBUG checks */
-
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_DEBUG_INFO
-#  undef CONFIG_DEBUG_USB
-#endif
-
 /* For now, suppress use of PORTA in any event.  I use that for SAM-BA and
  * would prefer that the board not try to drive VBUS on that port!
  */
@@ -4701,7 +4694,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_INFO)
+#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_ASSERTIONS)
   uint16_t regval16;
   unsigned int nports;
 #endif
@@ -4952,7 +4945,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_INFO)
+#if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_ASSERTIONS)
   /* Show the EHCI version */
 
   regval16 = sam_swap16(HCCR->hciversion);
diff --git a/arch/arm/src/sama5/sam_spi.c b/arch/arm/src/sama5/sam_spi.c
index 920257f79f..ed5283af04 100644
--- a/arch/arm/src/sama5/sam_spi.c
+++ b/arch/arm/src/sama5/sam_spi.c
@@ -125,30 +125,19 @@
 #define DMA_TIMEOUT_TICKS MSEC2TICK(DMA_TIMEOUT_MS)
 
 /* Debug *******************************************************************/
-/* Check if SPI debut is enabled (non-standard.. no support in
- * include/debug.h
- */
-
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_DEBUG_INFO
-#  undef CONFIG_DEBUG_SPI
-#  undef CONFIG_SAMA5_SPI_DMADEBUG
-#  undef CONFIG_SAMA5_SPI_REGDEBUG
-#endif
+/* Check if SPI debug is enabled */
 
 #ifndef CONFIG_DEBUG_DMA
 #  undef CONFIG_SAMA5_SPI_DMADEBUG
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spierr llerr
-#  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spierr  llerr
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
diff --git a/arch/arm/src/samdl/sam_spi.c b/arch/arm/src/samdl/sam_spi.c
index 9a58a954ee..f2108ff368 100644
--- a/arch/arm/src/samdl/sam_spi.c
+++ b/arch/arm/src/samdl/sam_spi.c
@@ -77,28 +77,16 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* Clocking *****************************************************************/
-
 /* Debug *******************************************************************/
-/* Check if SPI debug is enabled (non-standard.. no support in
- * include/debug.h
- */
-
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_DEBUG_INFO
-#  undef CONFIG_DEBUG_SPI
-#  undef CONFIG_SAMDL_SPI_REGDEBUG
-#endif
+/* Check if SPI debug is enabled */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spierr llerr
-#  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spierr  llerr
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
diff --git a/arch/arm/src/samv7/sam_qspi.c b/arch/arm/src/samv7/sam_qspi.c
index ac0446c2a0..615894f930 100644
--- a/arch/arm/src/samv7/sam_qspi.c
+++ b/arch/arm/src/samv7/sam_qspi.c
@@ -138,31 +138,20 @@
 #define IS_ALIGNED(n)     (((uint32_t)(n) & ALIGN_MASK) == 0)
 
 /* Debug *******************************************************************/
-/* Check if QSPI debug is enabled (non-standard.. no support in
- * include/debug.h
- */
-
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_DEBUG_INFO
-#  undef CONFIG_DEBUG_SPI
-#  undef CONFIG_SAMV7_QSPI_DMADEBUG
-#  undef CONFIG_SAMV7_QSPI_REGDEBUG
-#endif
+/* Check if QSPI debug is enabled */
 
 #ifndef CONFIG_DEBUG_DMA
 #  undef CONFIG_SAMV7_QSPI_DMADEBUG
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define qspierr llerr
-#  ifdef CONFIG_DEBUG_INFO
-#    define qspiinfo llerr
-#  else
-#    define qspiinfo(x...)
-#  endif
+#  define spierr  llerr
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  define qspierr(x...)
-#  define qspiinfo(x...)
+#  define spierr(x...)
+#  define spiwarn(x...)
+#  define spiinfo(x...)
 #endif
 
 #define DMA_INITIAL      0
diff --git a/arch/arm/src/samv7/sam_spi.c b/arch/arm/src/samv7/sam_spi.c
index f9fee7548a..6168c78f9a 100644
--- a/arch/arm/src/samv7/sam_spi.c
+++ b/arch/arm/src/samv7/sam_spi.c
@@ -120,30 +120,19 @@
 #define DMA_TIMEOUT_TICKS MSEC2TICK(DMA_TIMEOUT_MS)
 
 /* Debug *******************************************************************/
-/* Check if SPI debug is enabled (non-standard.. no support in
- * include/debug.h
- */
-
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_DEBUG_INFO
-#  undef CONFIG_DEBUG_SPI
-#  undef CONFIG_SAMV7_SPI_DMADEBUG
-#  undef CONFIG_SAMV7_SPI_REGDEBUG
-#endif
+/* Check if SPI debug is enabled */
 
 #ifndef CONFIG_DEBUG_DMA
 #  undef CONFIG_SAMV7_SPI_DMADEBUG
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spierr llerr
-#  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spierr  llerr
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
diff --git a/arch/arm/src/samv7/sam_spi_slave.c b/arch/arm/src/samv7/sam_spi_slave.c
index f854b11ba0..fe8d1f6f4b 100644
--- a/arch/arm/src/samv7/sam_spi_slave.c
+++ b/arch/arm/src/samv7/sam_spi_slave.c
@@ -75,24 +75,15 @@
 #endif
 
 /* Debug *******************************************************************/
-/* Check if SPI debug is enabled (non-standard.. no support in
- * include/debug.h
- */
-
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_DEBUG_INFO
-#  undef CONFIG_DEBUG_SPI
-#endif
+/* Check if SPI debug is enabled */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spierr llerr
-#  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spierr  llerr
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
diff --git a/arch/arm/src/samv7/sam_ssc.c b/arch/arm/src/samv7/sam_ssc.c
index d83471706c..c8be8e850d 100644
--- a/arch/arm/src/samv7/sam_ssc.c
+++ b/arch/arm/src/samv7/sam_ssc.c
@@ -366,14 +366,7 @@
 #define DMA_TIMEOUT_TICKS MSEC2TICK(DMA_TIMEOUT_MS)
 
 /* Debug *******************************************************************/
-/* Check if SSC debug is enabled (non-standard.. no support in
- * include/debug.h
- */
-
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_DEBUG_INFO
-#  undef CONFIG_DEBUG_I2S
-#endif
+/* Check if SSC debug is enabled */
 
 #ifndef CONFIG_DEBUG_I2S
 #  undef CONFIG_SAMV7_SSC_DMADEBUG
@@ -389,15 +382,15 @@
 #ifdef CONFIG_DEBUG_I2S
 #  define i2serr         err
 #  define i2sllerr       llerr
-#  ifdef CONFIG_DEBUG_INFO
-#    define i2sinfo      err
-#    define i2sllinfo    llerr
-#  else
-#    define i2sinfo(x...)
-#  endif
+#  define i2swarn        warn
+#  define i2sllwarn      llwarn
+#  define i2sinfo        info
+#  define i2sllinfo      llinfo
 #else
 #  define i2serr(x...)
 #  define i2sllerr(x...)
+#  define i2swarn(x...)
+#  define i2sllwarn(x...)
 #  define i2sinfo(x...)
 #  define i2sllinfo(x...)
 #endif
diff --git a/arch/arm/src/stm32/stm32_spi.c b/arch/arm/src/stm32/stm32_spi.c
index 8b871665a5..d674444145 100644
--- a/arch/arm/src/stm32/stm32_spi.c
+++ b/arch/arm/src/stm32/stm32_spi.c
@@ -157,22 +157,15 @@
 
 
 /* Debug ****************************************************************************/
-/* Check if (non-standard) SPI debug is enabled */
-
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_DEBUG_INFO
-#  undef CONFIG_DEBUG_SPI
-#endif
+/* Check if SPI debug is enabled */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spierr llerr
-#  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spierr  llerr
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
diff --git a/arch/arm/src/stm32l4/stm32l4_qspi.c b/arch/arm/src/stm32l4/stm32l4_qspi.c
index 90fb091d55..c5863cc5de 100644
--- a/arch/arm/src/stm32l4/stm32l4_qspi.c
+++ b/arch/arm/src/stm32l4/stm32l4_qspi.c
@@ -85,30 +85,19 @@
 #define IS_ALIGNED(n)     (((uint32_t)(n) & ALIGN_MASK) == 0)
 
 /* Debug *******************************************************************/
-/* Check if QSPI debug is enabled (non-standard.. no support in
- * include/debug.h
- */
-
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_DEBUG_INFO
-#  undef CONFIG_DEBUG_SPI
-#  undef CONFIG_STM32L4_QSPI_DMADEBUG
-#  undef CONFIG_STM32L4_QSPI_REGDEBUG
-#endif
+/* Check if QSPI debug is enabled */
 
 #ifndef CONFIG_DEBUG_DMA
 #  undef CONFIG_STM32L4_QSPI_DMADEBUG
 #endif
 
 #ifdef CONFIG_DEBUG_SPI
-#  define qspierr llerr
-#  ifdef CONFIG_DEBUG_INFO
-#    define qspiinfo llerr
-#  else
-#    define qspiinfo(x...)
-#  endif
+#  define qspierr  llerr
+#  define qspiwarn llwarn
+#  define qspiinfo llinfo
 #else
 #  define qspierr(x...)
+#  define qspiwarn(x...)
 #  define qspiinfo(x...)
 #endif
 
diff --git a/arch/arm/src/stm32l4/stm32l4_spi.c b/arch/arm/src/stm32l4/stm32l4_spi.c
index dc8811dfd9..d64e7d5ccf 100644
--- a/arch/arm/src/stm32l4/stm32l4_spi.c
+++ b/arch/arm/src/stm32l4/stm32l4_spi.c
@@ -136,24 +136,16 @@
 #define SPI_TXDMA16NULL_CONFIG    (SPI_DMA_PRIO|DMA_CCR_MSIZE_8BITS |DMA_CCR_PSIZE_16BITS             |DMA_CCR_DIR)
 #define SPI_TXDMA8NULL_CONFIG     (SPI_DMA_PRIO|DMA_CCR_MSIZE_8BITS |DMA_CCR_PSIZE_8BITS              |DMA_CCR_DIR)
 
-
 /* Debug ****************************************************************************/
-/* Check if (non-standard) SPI debug is enabled */
-
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_DEBUG_INFO
-#  undef CONFIG_DEBUG_SPI
-#endif
+/* Check if SPI debug is enabled */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spierr llerr
-#  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spierr  llerr
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
diff --git a/arch/avr/src/avr/up_dumpstate.c b/arch/avr/src/avr/up_dumpstate.c
index 2a33bff5a5..fa04857067 100644
--- a/arch/avr/src/avr/up_dumpstate.c
+++ b/arch/avr/src/avr/up_dumpstate.c
@@ -42,8 +42,12 @@
 /* Output debug info -- even if debug is not selected. */
 
 #undef  CONFIG_DEBUG_FEATURES
+#undef  CONFIG_DEBUG_ERROR
+#undef  CONFIG_DEBUG_WARN
 #undef  CONFIG_DEBUG_INFO
 #define CONFIG_DEBUG_FEATURES 1
+#define CONFIG_DEBUG_ERROR 1
+#define CONFIG_DEBUG_WARN 1
 #define CONFIG_DEBUG_INFO 1
 
 #include 
diff --git a/arch/avr/src/avr32/up_dumpstate.c b/arch/avr/src/avr32/up_dumpstate.c
index 8cdcdb91b0..4f67d1bef4 100644
--- a/arch/avr/src/avr32/up_dumpstate.c
+++ b/arch/avr/src/avr32/up_dumpstate.c
@@ -42,8 +42,12 @@
 /* Output debug info -- even if debug is not selected. */
 
 #undef  CONFIG_DEBUG_FEATURES
+#undef  CONFIG_DEBUG_ERROR
+#undef  CONFIG_DEBUG_WARN
 #undef  CONFIG_DEBUG_INFO
 #define CONFIG_DEBUG_FEATURES 1
+#define CONFIG_DEBUG_ERROR 1
+#define CONFIG_DEBUG_WARN 1
 #define CONFIG_DEBUG_INFO 1
 
 #include 
diff --git a/arch/avr/src/common/up_assert.c b/arch/avr/src/common/up_assert.c
index 664417fe03..5ef623bd40 100644
--- a/arch/avr/src/common/up_assert.c
+++ b/arch/avr/src/common/up_assert.c
@@ -44,10 +44,14 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG_FEATURES
-# undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG_FEATURES 1
-# define CONFIG_DEBUG_INFO 1
+#  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
+#  undef  CONFIG_DEBUG_INFO
+#  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 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 2805650bcf..c7dc444767 100644
--- a/arch/hc/src/m9s12/m9s12_assert.c
+++ b/arch/hc/src/m9s12/m9s12_assert.c
@@ -44,10 +44,14 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG_FEATURES
-# undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG_FEATURES 1
-# define CONFIG_DEBUG_INFO 1
+#  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
+#  undef  CONFIG_DEBUG_INFO
+#  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 1
+#  define CONFIG_DEBUG_INFO 1
 #endif
 
 #include 
diff --git a/arch/hc/src/m9s12/m9s12_dumpgpio.c b/arch/hc/src/m9s12/m9s12_dumpgpio.c
index 42313c0e3e..c9a0875176 100644
--- a/arch/hc/src/m9s12/m9s12_dumpgpio.c
+++ b/arch/hc/src/m9s12/m9s12_dumpgpio.c
@@ -40,6 +40,17 @@
 
 #include 
 
+/* Output debug info -- even if debug is not selected. */
+
+#undef  CONFIG_DEBUG_FEATURES
+#undef  CONFIG_DEBUG_ERROR
+#undef  CONFIG_DEBUG_WARN
+#undef  CONFIG_DEBUG_INFO
+#define CONFIG_DEBUG_FEATURES 1
+#define CONFIG_DEBUG_ERROR 1
+#define CONFIG_DEBUG_WARN 1
+#define CONFIG_DEBUG_INFO 1
+
 #include 
 #include 
 #include 
diff --git a/arch/mips/src/mips32/up_assert.c b/arch/mips/src/mips32/up_assert.c
index 8742eb468a..1a5174d67d 100644
--- a/arch/mips/src/mips32/up_assert.c
+++ b/arch/mips/src/mips32/up_assert.c
@@ -44,10 +44,14 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG_FEATURES
-# undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG_FEATURES 1
-# define CONFIG_DEBUG_INFO 1
+#  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
+#  undef  CONFIG_DEBUG_INFO
+#  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 1
+#  define CONFIG_DEBUG_INFO 1
 #endif
 
 #include 
diff --git a/arch/sh/src/common/up_assert.c b/arch/sh/src/common/up_assert.c
index ec63c54098..a82bde6e90 100644
--- a/arch/sh/src/common/up_assert.c
+++ b/arch/sh/src/common/up_assert.c
@@ -44,9 +44,13 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG_FEATURES
-# undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG_FEATURES 1
+#  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
+#  undef  CONFIG_DEBUG_INFO
+#  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 1
 # define CONFIG_DEBUG_INFO 1
 #endif
 
diff --git a/arch/sh/src/m16c/m16c_dumpstate.c b/arch/sh/src/m16c/m16c_dumpstate.c
index 39a19252ff..54dfbd8b29 100644
--- a/arch/sh/src/m16c/m16c_dumpstate.c
+++ b/arch/sh/src/m16c/m16c_dumpstate.c
@@ -42,8 +42,12 @@
 /* Output debug info -- even if debug is not selected. */
 
 #undef  CONFIG_DEBUG_FEATURES
+#undef  CONFIG_DEBUG_ERROR
+#undef  CONFIG_DEBUG_WARN
 #undef  CONFIG_DEBUG_INFO
 #define CONFIG_DEBUG_FEATURES 1
+#define CONFIG_DEBUG_ERROR 1
+#define CONFIG_DEBUG_WARN 1
 #define CONFIG_DEBUG_INFO 1
 
 #include 
diff --git a/arch/sh/src/sh1/sh1_dumpstate.c b/arch/sh/src/sh1/sh1_dumpstate.c
index 1d36a6e058..a5f7f6c1ef 100644
--- a/arch/sh/src/sh1/sh1_dumpstate.c
+++ b/arch/sh/src/sh1/sh1_dumpstate.c
@@ -42,8 +42,12 @@
 /* Output debug info -- even if debug is not selected. */
 
 #undef  CONFIG_DEBUG_FEATURES
+#undef  CONFIG_DEBUG_ERROR
+#undef  CONFIG_DEBUG_WARN
 #undef  CONFIG_DEBUG_INFO
 #define CONFIG_DEBUG_FEATURES 1
+#define CONFIG_DEBUG_ERROR 1
+#define CONFIG_DEBUG_WARN 1
 #define CONFIG_DEBUG_INFO 1
 
 #include 
diff --git a/arch/sim/src/board_lcd.c b/arch/sim/src/board_lcd.c
index e2afcbaeae..7d2fde8aa1 100644
--- a/arch/sim/src/board_lcd.c
+++ b/arch/sim/src/board_lcd.c
@@ -101,24 +101,15 @@
 #endif
 
 /* Debug ********************************************************************/
-/* Define CONFIG_DEBUG_LCD to enable detailed LCD debug output. Verbose debug must
- * also be enabled.
- */
-
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_DEBUG_INFO
-#  undef CONFIG_DEBUG_GRAPHICS
-#  undef CONFIG_DEBUG_LCD
-#endif
-
-#ifndef CONFIG_DEBUG_INFO
-#  undef CONFIG_DEBUG_LCD
-#endif
 
 #ifdef CONFIG_DEBUG_LCD
-# define lcderr(format, ...)  info(format, ##__VA_ARGS__)
+# define lcderr(format, ...)  err(format, ##__VA_ARGS__)
+# define lcdwarn(format, ...) warn(format, ##__VA_ARGS__)
+# define lcdinfo(format, ...) info(format, ##__VA_ARGS__)
 #else
 # define lcderr(x...)
+# define lcdwarn(x...)
+# define lcdinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/arch/sim/src/up_spiflash.c b/arch/sim/src/up_spiflash.c
index 3b182a8129..51be923fd3 100644
--- a/arch/sim/src/up_spiflash.c
+++ b/arch/sim/src/up_spiflash.c
@@ -61,22 +61,15 @@
 /* Configuration ********************************************************************/
 
 /* Debug ****************************************************************************/
-/* Check if (non-standard) SPI debug is enabled */
-
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_DEBUG_INFO
-#  undef CONFIG_DEBUG_SPI
-#endif
+/* Check if SPI debug is enabled */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spierr llerr
-#  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spierr  llerr
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
diff --git a/arch/x86/src/common/up_assert.c b/arch/x86/src/common/up_assert.c
index 1732b8d824..6106e2397e 100644
--- a/arch/x86/src/common/up_assert.c
+++ b/arch/x86/src/common/up_assert.c
@@ -44,10 +44,14 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG_FEATURES
-# undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG_FEATURES 1
-# define CONFIG_DEBUG_INFO 1
+#  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
+#  undef  CONFIG_DEBUG_INFO
+#  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 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 52c74b1600..3c4137b198 100644
--- a/arch/x86/src/i486/up_regdump.c
+++ b/arch/x86/src/i486/up_regdump.c
@@ -42,8 +42,12 @@
 /* Output debug info -- even if debug is not selected. */
 
 #undef  CONFIG_DEBUG_FEATURES
+#undef  CONFIG_DEBUG_ERROR
+#undef  CONFIG_DEBUG_WARN
 #undef  CONFIG_DEBUG_INFO
 #define CONFIG_DEBUG_FEATURES 1
+#define CONFIG_DEBUG_ERROR 1
+#define CONFIG_DEBUG_WARN 1
 #define CONFIG_DEBUG_INFO 1
 
 #include 
diff --git a/arch/z16/src/common/up_assert.c b/arch/z16/src/common/up_assert.c
index ea941b805b..f647a9093b 100644
--- a/arch/z16/src/common/up_assert.c
+++ b/arch/z16/src/common/up_assert.c
@@ -44,10 +44,14 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG_FEATURES
-# undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG_FEATURES 1
-# define CONFIG_DEBUG_INFO 1
+#  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
+#  undef  CONFIG_DEBUG_INFO
+#  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 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 9c7993da51..fd79284b83 100644
--- a/arch/z16/src/common/up_registerdump.c
+++ b/arch/z16/src/common/up_registerdump.c
@@ -45,8 +45,12 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 #  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
 #  undef  CONFIG_DEBUG_INFO
 #  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 1
 #  define CONFIG_DEBUG_INFO 1
 #endif
 
diff --git a/arch/z16/src/common/up_stackdump.c b/arch/z16/src/common/up_stackdump.c
index 48f63bef37..14123807ff 100644
--- a/arch/z16/src/common/up_stackdump.c
+++ b/arch/z16/src/common/up_stackdump.c
@@ -42,8 +42,12 @@
 /* Output debug info -- even if debug is not selected. */
 
 #undef  CONFIG_DEBUG_FEATURES
+#undef  CONFIG_DEBUG_ERROR
+#undef  CONFIG_DEBUG_WARN
 #undef  CONFIG_DEBUG_INFO
 #define CONFIG_DEBUG_FEATURES 1
+#define CONFIG_DEBUG_ERROR 1
+#define CONFIG_DEBUG_WARN 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 31971a11fd..6cf1ce07c6 100644
--- a/arch/z16/src/z16f/z16f_espi.c
+++ b/arch/z16/src/z16f/z16f_espi.c
@@ -59,26 +59,16 @@
  * Pre-processor Definitions
  ****************************************************************************/
 /* Debug *******************************************************************/
-/* Check if SPI debug is enabled (non-standard.. no support in
- * include/debug.h
- */
-
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_DEBUG_INFO
-#  undef CONFIG_DEBUG_SPI
-#  undef CONFIG_Z16F_ESPI_REGDEBUG
-#endif
+/* Check if SPI debug is enabled */
 
 #ifdef CONFIG_DEBUG_SPI
-#  define spierr    llerr
-#  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo llerr
-#  else
-#    define spiinfo (void)
-#  endif
+#  define spierr  llerr
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
-#  define spierr    (void)
-#  define spiinfo   (void)
+#  define spierr(x...)
+#  define spiwarn(x...)
+#  define spiinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/arch/z80/src/common/up_assert.c b/arch/z80/src/common/up_assert.c
index b459aa00af..53855992bf 100644
--- a/arch/z80/src/common/up_assert.c
+++ b/arch/z80/src/common/up_assert.c
@@ -44,10 +44,14 @@
  */
 
 #ifdef CONFIG_ARCH_STACKDUMP
-# undef  CONFIG_DEBUG_FEATURES
-# undef  CONFIG_DEBUG_INFO
-# define CONFIG_DEBUG_FEATURES 1
-# define CONFIG_DEBUG_INFO 1
+#  undef  CONFIG_DEBUG_FEATURES
+#  undef  CONFIG_DEBUG_ERROR
+#  undef  CONFIG_DEBUG_WARN
+#  undef  CONFIG_DEBUG_INFO
+#  define CONFIG_DEBUG_FEATURES 1
+#  define CONFIG_DEBUG_ERROR 1
+#  define CONFIG_DEBUG_WARN 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 ee2d5ee31f..e240ed655f 100644
--- a/arch/z80/src/common/up_stackdump.c
+++ b/arch/z80/src/common/up_stackdump.c
@@ -42,8 +42,12 @@
 /* Output debug info -- even if debug is not selected. */
 
 #undef  CONFIG_DEBUG_FEATURES
+#undef  CONFIG_DEBUG_ERROR
+#undef  CONFIG_DEBUG_WARN
 #undef  CONFIG_DEBUG_INFO
 #define CONFIG_DEBUG_FEATURES 1
+#define CONFIG_DEBUG_ERROR 1
+#define CONFIG_DEBUG_WARN 1
 #define CONFIG_DEBUG_INFO 1
 
 #include 
diff --git a/arch/z80/src/common/up_stackframe.c b/arch/z80/src/common/up_stackframe.c
index 9da978a4f7..8f4a0f1806 100644
--- a/arch/z80/src/common/up_stackframe.c
+++ b/arch/z80/src/common/up_stackframe.c
@@ -63,14 +63,6 @@
 #define STACK_ALIGN_DOWN(a) ((a) & ~STACK_ALIGN_MASK)
 #define STACK_ALIGN_UP(a)   (((a) + STACK_ALIGN_MASK) & ~STACK_ALIGN_MASK)
 
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Function Prototypes
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
diff --git a/arch/z80/src/ez80/ez80_registerdump.c b/arch/z80/src/ez80/ez80_registerdump.c
index 350af5a697..0a30eb1c0f 100644
--- a/arch/z80/src/ez80/ez80_registerdump.c
+++ b/arch/z80/src/ez80/ez80_registerdump.c
@@ -42,8 +42,12 @@
 /* Output debug info -- even if debug is not selected. */
 
 #undef  CONFIG_DEBUG_FEATURES
+#undef  CONFIG_DEBUG_ERROR
+#undef  CONFIG_DEBUG_WARN
 #undef  CONFIG_DEBUG_INFO
 #define CONFIG_DEBUG_FEATURES 1
+#define CONFIG_DEBUG_ERROR 1
+#define CONFIG_DEBUG_WARN 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 322b0fc7c0..d7a9b2d58e 100644
--- a/arch/z80/src/z180/z180_registerdump.c
+++ b/arch/z80/src/z180/z180_registerdump.c
@@ -42,8 +42,12 @@
 /* Output debug info -- even if debug is not selected. */
 
 #undef  CONFIG_DEBUG_FEATURES
+#undef  CONFIG_DEBUG_ERROR
+#undef  CONFIG_DEBUG_WARN
 #undef  CONFIG_DEBUG_INFO
 #define CONFIG_DEBUG_FEATURES 1
+#define CONFIG_DEBUG_ERROR 1
+#define CONFIG_DEBUG_WARN 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 ffe393b068..aff6aa88ec 100644
--- a/arch/z80/src/z8/z8_registerdump.c
+++ b/arch/z80/src/z8/z8_registerdump.c
@@ -41,9 +41,15 @@
 
 /* Output debug info -- even if debug is not selected. */
 
+/* Output debug info -- even if debug is not selected. */
+
 #undef  CONFIG_DEBUG_FEATURES
+#undef  CONFIG_DEBUG_ERROR
+#undef  CONFIG_DEBUG_WARN
 #undef  CONFIG_DEBUG_INFO
 #define CONFIG_DEBUG_FEATURES 1
+#define CONFIG_DEBUG_ERROR 1
+#define CONFIG_DEBUG_WARN 1
 #define CONFIG_DEBUG_INFO 1
 
 #include 
diff --git a/arch/z80/src/z80/z80_registerdump.c b/arch/z80/src/z80/z80_registerdump.c
index b32b3cc7b0..961e763cec 100644
--- a/arch/z80/src/z80/z80_registerdump.c
+++ b/arch/z80/src/z80/z80_registerdump.c
@@ -42,8 +42,12 @@
 /* Output debug info -- even if debug is not selected. */
 
 #undef  CONFIG_DEBUG_FEATURES
+#undef  CONFIG_DEBUG_ERROR
+#undef  CONFIG_DEBUG_WARN
 #undef  CONFIG_DEBUG_INFO
 #define CONFIG_DEBUG_FEATURES 1
+#define CONFIG_DEBUG_ERROR 1
+#define CONFIG_DEBUG_WARN 1
 #define CONFIG_DEBUG_INFO 1
 
 #include 
diff --git a/drivers/pipes/pipe_common.c b/drivers/pipes/pipe_common.c
index a22a197fb0..2b9eb67e3a 100644
--- a/drivers/pipes/pipe_common.c
+++ b/drivers/pipes/pipe_common.c
@@ -795,7 +795,7 @@ int pipecommon_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
               count = dev->d_wrndx - dev->d_rdndx;
             }
 
-          *(FAR int *)arg = count;
+          *(FAR int *)((uintptr_t)arg) = count;
           ret = 0;
         }
         break;
@@ -815,7 +815,7 @@ int pipecommon_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
               count = ((CONFIG_DEV_PIPE_SIZE - dev->d_wrndx) + dev->d_rdndx) - 1;
             }
 
-          *(FAR int *)arg = count;
+          *(FAR int *)((uintptr_t)arg) = count;
           ret = 0;
         }
         break;
-- 
GitLab


From 93e7b5d7a0fc416f0912601d74dcc3eea9286550 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 13 Jun 2016 14:15:54 -0600
Subject: [PATCH 62/91] Eliminate some warnings

---
 arch/arm/src/armv6-m/nvic.h        |  1 +
 arch/avr/src/avr/up_initialstate.c | 26 +++++++-------------------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/arch/arm/src/armv6-m/nvic.h b/arch/arm/src/armv6-m/nvic.h
index 06d11d5d63..b6f4391a4a 100644
--- a/arch/arm/src/armv6-m/nvic.h
+++ b/arch/arm/src/armv6-m/nvic.h
@@ -41,6 +41,7 @@
  ****************************************************************************************************/
 
 #include 
+#include 
 
 /****************************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/avr/src/avr/up_initialstate.c b/arch/avr/src/avr/up_initialstate.c
index 506b28c620..8ce4ad029e 100644
--- a/arch/avr/src/avr/up_initialstate.c
+++ b/arch/avr/src/avr/up_initialstate.c
@@ -50,18 +50,6 @@
 #include "up_internal.h"
 #include "up_arch.h"
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -91,18 +79,18 @@ void up_initial_state(struct tcb_s *tcb)
 
   /* Set the initial stack pointer to the "base" of the allocated stack */
 
-  xcp->regs[REG_SPH]   = (uint8_t)((uint16_t)tcb->adj_stack_ptr >> 8);
-  xcp->regs[REG_SPL]   = (uint8_t)((uint16_t)tcb->adj_stack_ptr & 0xff);
+  xcp->regs[REG_SPH]   = (uint8_t)((uintptr_t)tcb->adj_stack_ptr >> 8);
+  xcp->regs[REG_SPL]   = (uint8_t)((uintptr_t)tcb->adj_stack_ptr & 0xff);
 
   /* Save the task entry point */
 
 #if !defined(REG_PC2)
-  xcp->regs[REG_PC0]   = (uint8_t)((uint16_t)tcb->start >> 8);
-  xcp->regs[REG_PC1]   = (uint8_t)((uint16_t)tcb->start & 0xff);
+  xcp->regs[REG_PC0]   = (uint8_t)((uintptr_t)tcb->start >> 8);
+  xcp->regs[REG_PC1]   = (uint8_t)((uintptr_t)tcb->start & 0xff);
 #else
-  xcp->regs[REG_PC0]   = (uint8_t)((uint32_t)tcb->start >> 16);
-  xcp->regs[REG_PC1]   = (uint8_t)((uint32_t)tcb->start >> 8);
-  xcp->regs[REG_PC2]   = (uint8_t)((uint32_t)tcb->start & 0xff);
+  xcp->regs[REG_PC0]   = (uint8_t)((uintptr_t)tcb->start >> 16);
+  xcp->regs[REG_PC1]   = (uint8_t)((uintptr_t)tcb->start >> 8);
+  xcp->regs[REG_PC2]   = (uint8_t)((uintptr_t)tcb->start & 0xff);
 #endif
 
   /* Enable or disable interrupts, based on user configuration */
-- 
GitLab


From fd57fde65971d63b72030efe8fc3232e03a8f69c Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 13 Jun 2016 14:44:28 -0600
Subject: [PATCH 63/91] Back out part of previous commit

---
 arch/avr/src/avr/up_initialstate.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/avr/src/avr/up_initialstate.c b/arch/avr/src/avr/up_initialstate.c
index 8ce4ad029e..057054d437 100644
--- a/arch/avr/src/avr/up_initialstate.c
+++ b/arch/avr/src/avr/up_initialstate.c
@@ -79,18 +79,18 @@ void up_initial_state(struct tcb_s *tcb)
 
   /* Set the initial stack pointer to the "base" of the allocated stack */
 
-  xcp->regs[REG_SPH]   = (uint8_t)((uintptr_t)tcb->adj_stack_ptr >> 8);
-  xcp->regs[REG_SPL]   = (uint8_t)((uintptr_t)tcb->adj_stack_ptr & 0xff);
+  xcp->regs[REG_SPH]   = (uint8_t)((uint16_t)tcb->adj_stack_ptr >> 8);
+  xcp->regs[REG_SPL]   = (uint8_t)((uint16_t)tcb->adj_stack_ptr & 0xff);
 
   /* Save the task entry point */
 
 #if !defined(REG_PC2)
-  xcp->regs[REG_PC0]   = (uint8_t)((uintptr_t)tcb->start >> 8);
-  xcp->regs[REG_PC1]   = (uint8_t)((uintptr_t)tcb->start & 0xff);
+  xcp->regs[REG_PC0]   = (uint8_t)((uint16_t)tcb->start >> 8);
+  xcp->regs[REG_PC1]   = (uint8_t)((uint16_t)tcb->start & 0xff);
 #else
-  xcp->regs[REG_PC0]   = (uint8_t)((uintptr_t)tcb->start >> 16);
-  xcp->regs[REG_PC1]   = (uint8_t)((uintptr_t)tcb->start >> 8);
-  xcp->regs[REG_PC2]   = (uint8_t)((uintptr_t)tcb->start & 0xff);
+  xcp->regs[REG_PC0]   = (uint8_t)((uint32_t)tcb->start >> 16);
+  xcp->regs[REG_PC1]   = (uint8_t)((uint32_t)tcb->start >> 8);
+  xcp->regs[REG_PC2]   = (uint8_t)((uint32_t)tcb->start & 0xff);
 #endif
 
   /* Enable or disable interrupts, based on user configuration */
-- 
GitLab


From 749de4076872b62c12581cc265beb07d98855f20 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 13 Jun 2016 15:13:19 -0600
Subject: [PATCH 64/91] Teensy-2.0: Add board_app_initalize()

---
 configs/teensy-2.0/src/Makefile          |  5 +-
 configs/teensy-2.0/src/at90usb_appinit.c | 81 ++++++++++++++++++++++++
 2 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 configs/teensy-2.0/src/at90usb_appinit.c

diff --git a/configs/teensy-2.0/src/Makefile b/configs/teensy-2.0/src/Makefile
index 48e413ceda..ebf8c9b876 100644
--- a/configs/teensy-2.0/src/Makefile
+++ b/configs/teensy-2.0/src/Makefile
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/teensy-2.0/src/Makefile
 #
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt 
 #
 # Redistribution and use in source and binary forms, with or without
@@ -41,6 +41,9 @@ CSRCS = at90usb_boot.c
 ifeq ($(CONFIG_ARCH_LEDS),y)
 CSRCS += at90usb_leds.c
 endif
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
+CSRCS += at90usb_appinit.c
+endif
 ifeq ($(CONFIG_USBMSC),y)
 CSRCS += at90usb_usbmsc.c
 endif
diff --git a/configs/teensy-2.0/src/at90usb_appinit.c b/configs/teensy-2.0/src/at90usb_appinit.c
new file mode 100644
index 0000000000..ab482aa62f
--- /dev/null
+++ b/configs/teensy-2.0/src/at90usb_appinit.c
@@ -0,0 +1,81 @@
+/****************************************************************************
+ * configs/teensy-2.0/src/at90usb_appinit.c
+ *
+ *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt 
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include 
+
+#include 
+#include 
+
+#ifdef CONFIG_LIB_BOARDCTL
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: board_app_initialize
+ *
+ * Description:
+ *   Perform application specific initialization.  This function is never
+ *   called directly from application code, but only indirectly via the
+ *   (non-standard) boardctl() interface using the command BOARDIOC_INIT.
+ *
+ * Input Parameters:
+ *   arg - The boardctl() argument is passed to the board_app_initialize()
+ *         implementation without modification.  The argument has no
+ *         meaning to NuttX; the meaning of the argument is a contract
+ *         between the board-specific initalization logic and the the
+ *         matching application logic.  The value cold be such things as a
+ *         mode enumeration value, a set of DIP switch switch settings, a
+ *         pointer to configuration data read from a file or serial FLASH,
+ *         or whatever you would like to do with it.  Every implementation
+ *         should accept zero/NULL as a default configuration.
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is returned on
+ *   any failure to indicate the nature of the failure.
+ *
+ ****************************************************************************/
+
+int board_app_initialize(uintptr_t arg)
+{
+  return OK;
+}
+
+#endif /* CONFIG_LIB_BOARDCTL */
-- 
GitLab


From 191d875b05761aa0d2ee90a5965b954828ce5fdc Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 13 Jun 2016 16:03:16 -0600
Subject: [PATCH 65/91] Cleanup of configs/teensy-2.0/src files

---
 configs/teensy-2.0/src/at90usb_boot.c   | 12 ++----------
 configs/teensy-2.0/src/at90usb_leds.c   | 16 ++++------------
 configs/teensy-2.0/src/at90usb_usbmsc.c | 14 ++++----------
 configs/teensy-2.0/src/teensy-20.h      | 15 +--------------
 4 files changed, 11 insertions(+), 46 deletions(-)

diff --git a/configs/teensy-2.0/src/at90usb_boot.c b/configs/teensy-2.0/src/at90usb_boot.c
index ad3379a42f..93ce9a76ff 100644
--- a/configs/teensy-2.0/src/at90usb_boot.c
+++ b/configs/teensy-2.0/src/at90usb_boot.c
@@ -49,14 +49,6 @@
 #include "at90usb.h"
 #include "teensy-20.h"
 
-/************************************************************************************
- * Pre-processor Definitions
- ************************************************************************************/
-
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
@@ -73,20 +65,20 @@
 
 void at90usb_boardinitialize(void)
 {
+#ifdef CONFIG_AVR_SPI
   /* Configure SSP chip selects if 1) at least one SSP is enabled, and 2) the weak
    * function at90usb_spidev_initialize() has been brought into the link.
    */
 
-#ifdef CONFIG_AVR_SPI
   if (at90usb_spidev_initialize)
     {
       at90usb_spidev_initialize();
     }
 #endif
 
+#ifdef CONFIG_ARCH_LEDS
   /* Configure on-board LEDs if LED support has been selected. */
 
-#ifdef CONFIG_ARCH_LEDS
   at90usb_led_initialize();
 #endif
 }
diff --git a/configs/teensy-2.0/src/at90usb_leds.c b/configs/teensy-2.0/src/at90usb_leds.c
index 30c62d110b..ebe96f65bf 100644
--- a/configs/teensy-2.0/src/at90usb_leds.c
+++ b/configs/teensy-2.0/src/at90usb_leds.c
@@ -57,19 +57,15 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG_FEATURES
- * with CONFIG_DEBUG_INFO too)
- */
+/* CONFIG_DEBUG_LEDS enables debug output from this file */
 
 #ifdef CONFIG_DEBUG_LEDS
 #  define lederr  llerr
-#  ifdef CONFIG_DEBUG_INFO
-#    define ledinfo llerr
-#  else
-#    define ledinfo(x...)
-#  endif
+#  define ledwarn llwarn
+#  define ledinfo llinfo
 #else
 #  define lederr(x...)
+#  define ledwarn(x...)
 #  define ledinfo(x...)
 #endif
 
@@ -79,10 +75,6 @@
 
 static bool g_ncoff;
 
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
diff --git a/configs/teensy-2.0/src/at90usb_usbmsc.c b/configs/teensy-2.0/src/at90usb_usbmsc.c
index d519c5d429..9fbc1735b9 100644
--- a/configs/teensy-2.0/src/at90usb_usbmsc.c
+++ b/configs/teensy-2.0/src/at90usb_usbmsc.c
@@ -49,6 +49,7 @@
 #include 
 #include 
 
+#include "avr.h"
 #include "at90usb.h"
 #include "teensy-20.h"
 
@@ -62,17 +63,10 @@
 #  define CONFIG_SYSTEM_USBMSC_DEVMINOR1 0
 #endif
 
-/* PORT and SLOT number probably depend on the board configuration */
+/* MMC/SD PORT and SLOT number */
 
-#ifdef CONFIG_ARCH_BOARD_TEENSY_20
-#  undef AVR_MMCSDSPIPORTNO
-#  define AVR_MMCSDSPIPORTNO 0
-#  undef AVR_MMCSDSLOTNO
-#  define AVR_MMCSDSLOTNO 0
-#else
-   /* Add configuration for new AVR boards here */
-#  error "Unrecognized AVR board"
-#endif
+#define AVR_MMCSDSPIPORTNO 0
+#define AVR_MMCSDSLOTNO 0
 
 /****************************************************************************
  * Public Functions
diff --git a/configs/teensy-2.0/src/teensy-20.h b/configs/teensy-2.0/src/teensy-20.h
index ad1f2530bb..16dbb086b1 100644
--- a/configs/teensy-2.0/src/teensy-20.h
+++ b/configs/teensy-2.0/src/teensy-20.h
@@ -43,24 +43,11 @@
 #include 
 
 /****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-/* Configuration ************************************************************/
-
-/****************************************************************************
- * Public Types
+ * Public Function Prototypes
  ****************************************************************************/
 
 #ifndef __ASSEMBLY__
 
-/****************************************************************************
- * Inline Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
 #ifdef __cplusplus
 #define EXTERN extern "C"
 extern "C"
-- 
GitLab


From 3c2050040c12c75567d12c7aa461419722a00f82 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 13 Jun 2016 18:55:24 -0600
Subject: [PATCH 66/91] arch/z80/:  Change some *err() message to *info()
 messages if what was a *dbg() message does not indicate and error condition.

---
 arch/z80/src/common/up_assert.c            | 12 ++--
 arch/z80/src/common/up_blocktask.c         |  2 +-
 arch/z80/src/common/up_exit.c              | 22 +++----
 arch/z80/src/common/up_initialize.c        |  4 +-
 arch/z80/src/common/up_releasepending.c    |  2 +-
 arch/z80/src/common/up_reprioritizertr.c   |  2 +-
 arch/z80/src/common/up_stackdump.c         | 10 ++--
 arch/z80/src/common/up_unblocktask.c       |  2 +-
 arch/z80/src/ez80/ez80_emac.c              | 70 +++++++++++-----------
 arch/z80/src/ez80/ez80_i2c.c               | 18 +++---
 arch/z80/src/ez80/ez80_registerdump.c      | 32 +++++-----
 arch/z80/src/ez80/ez80_schedulesigaction.c |  2 +-
 arch/z80/src/ez80/ez80_sigdeliver.c        |  6 +-
 arch/z80/src/z180/z180_registerdump.c      | 28 ++++-----
 arch/z80/src/z180/z180_schedulesigaction.c |  2 +-
 arch/z80/src/z180/z180_sigdeliver.c        |  6 +-
 arch/z80/src/z8/z8_i2c.c                   |  2 +-
 arch/z80/src/z8/z8_registerdump.c          | 16 ++---
 arch/z80/src/z8/z8_schedulesigaction.c     |  2 +-
 arch/z80/src/z8/z8_sigdeliver.c            |  6 +-
 arch/z80/src/z80/z80_registerdump.c        | 16 ++---
 arch/z80/src/z80/z80_schedulesigaction.c   |  2 +-
 arch/z80/src/z80/z80_sigdeliver.c          |  6 +-
 23 files changed, 127 insertions(+), 143 deletions(-)

diff --git a/arch/z80/src/common/up_assert.c b/arch/z80/src/common/up_assert.c
index 53855992bf..546b763751 100644
--- a/arch/z80/src/common/up_assert.c
+++ b/arch/z80/src/common/up_assert.c
@@ -161,17 +161,17 @@ void up_assert(void)
 
 #ifdef CONFIG_HAVE_FILENAME
 #if CONFIG_TASK_NAME_SIZE > 0
-  llerr("Assertion failed at file:%s line: %d task: %s\n",
-        filename, lineno, rtcb->name);
+  llinfo("Assertion failed at file:%s line: %d task: %s\n",
+         filename, lineno, rtcb->name);
 #else
-  llerr("Assertion failed at file:%s line: %d\n",
-        filename, lineno);
+  llinfo("Assertion failed at file:%s line: %d\n",
+         filename, lineno);
 #endif
 #else
 #if CONFIG_TASK_NAME_SIZE > 0
-  llerr("Assertion failed: task: %s\n", rtcb->name);
+  llinfo("Assertion failed: task: %s\n", rtcb->name);
 #else
-  llerr("Assertion failed\n");
+  llinfo("Assertion failed\n");
 #endif
 #endif
 
diff --git a/arch/z80/src/common/up_blocktask.c b/arch/z80/src/common/up_blocktask.c
index 8d0bcfc3a0..3ce49030af 100644
--- a/arch/z80/src/common/up_blocktask.c
+++ b/arch/z80/src/common/up_blocktask.c
@@ -85,7 +85,7 @@ void up_block_task(FAR struct tcb_s *tcb, tstate_t task_state)
   ASSERT((tcb->task_state >= FIRST_READY_TO_RUN_STATE) &&
          (tcb->task_state <= LAST_READY_TO_RUN_STATE));
 
-  /* err("Blocking TCB=%p\n", tcb); */
+  /* info("Blocking TCB=%p\n", tcb); */
 
   /* Remove the tcb task from the ready-to-run list.  If we
    * are blocking the task at the head of the task list (the
diff --git a/arch/z80/src/common/up_exit.c b/arch/z80/src/common/up_exit.c
index ddbf062f59..ac534d7222 100644
--- a/arch/z80/src/common/up_exit.c
+++ b/arch/z80/src/common/up_exit.c
@@ -88,8 +88,8 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
   int i;
 #endif
 
-  llerr("  TCB=%p name=%s\n", tcb, tcb->argv[0]);
-  llerr("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
+  llinfo("  TCB=%p name=%s\n", tcb, tcb->argv[0]);
+  llinfo("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
 
 #if CONFIG_NFILE_DESCRIPTORS > 0
   filelist = tcb->group->tg_filelist;
@@ -98,8 +98,8 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
       struct inode *inode = filelist->fl_files[i].f_inode;
       if (inode)
         {
-          llerr("      fd=%d refcount=%d\n",
-                i, inode->i_crefs);
+          llinfo("      fd=%d refcount=%d\n",
+                 i, inode->i_crefs);
         }
     }
 #endif
@@ -112,11 +112,11 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
       if (filep->fs_fd >= 0)
         {
 #if CONFIG_STDIO_BUFFER_SIZE > 0
-          llerr("      fd=%d nbytes=%d\n",
-                filep->fs_fd,
-                filep->fs_bufpos - filep->fs_bufstart);
+          llinfo("      fd=%d nbytes=%d\n",
+                 filep->fs_fd,
+                 filep->fs_bufpos - filep->fs_bufstart);
 #else
-          llerr("      fd=%d\n", filep->fs_fd);
+          llinfo("      fd=%d\n", filep->fs_fd);
 #endif
         }
     }
@@ -149,10 +149,10 @@ void _exit(int status)
 
   (void)up_irq_save();
 
-  sllerr("TCB=%p exiting\n", tcb);
+  sllinfo("TCB=%p exiting\n", tcb);
 
 #if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
-  llerr("Other tasks:\n");
+  llinfo("Other tasks:\n");
   sched_foreach(_up_dumponexit, NULL);
 #endif
 
@@ -165,7 +165,7 @@ void _exit(int status)
    */
 
   tcb = this_task();
-  sllerr("New Active Task TCB=%p\n", tcb);
+  sllinfo("New Active Task TCB=%p\n", tcb);
 
 #ifdef CONFIG_ARCH_ADDRENV
   /* Make sure that the address environment for the previously running
diff --git a/arch/z80/src/common/up_initialize.c b/arch/z80/src/common/up_initialize.c
index 585db52c62..f631238c46 100644
--- a/arch/z80/src/common/up_initialize.c
+++ b/arch/z80/src/common/up_initialize.c
@@ -75,13 +75,13 @@ static void up_calibratedelay(void)
 {
   int i;
 
-  llerr("Beginning 100s delay\n");
+  llwarn("Beginning 100s delay\n");
   for (i = 0; i < 100; i++)
     {
       up_mdelay(1000);
     }
 
-  llerr("End 100s delay\n");
+  llwarn("End 100s delay\n");
 }
 #else
 # define up_calibratedelay()
diff --git a/arch/z80/src/common/up_releasepending.c b/arch/z80/src/common/up_releasepending.c
index 411559b194..bf824018cc 100644
--- a/arch/z80/src/common/up_releasepending.c
+++ b/arch/z80/src/common/up_releasepending.c
@@ -70,7 +70,7 @@ void up_release_pending(void)
 {
   FAR struct tcb_s *rtcb = this_task();
 
-  sllerr("From TCB=%p\n", rtcb);
+  sllinfo("From TCB=%p\n", rtcb);
 
   /* Merge the g_pendingtasks list into the ready-to-run task list */
 
diff --git a/arch/z80/src/common/up_reprioritizertr.c b/arch/z80/src/common/up_reprioritizertr.c
index ad6de96fbf..4e3a74157d 100644
--- a/arch/z80/src/common/up_reprioritizertr.c
+++ b/arch/z80/src/common/up_reprioritizertr.c
@@ -98,7 +98,7 @@ void up_reprioritize_rtr(FAR struct tcb_s *tcb, uint8_t priority)
       FAR struct tcb_s *rtcb = this_task();
       bool switch_needed;
 
-      sllerr("TCB=%p PRI=%d\n", tcb, priority);
+      sllinfo("TCB=%p PRI=%d\n", tcb, priority);
 
       /* Remove the tcb task from the ready-to-run list.
        * sched_removereadytorun will return true if we just
diff --git a/arch/z80/src/common/up_stackdump.c b/arch/z80/src/common/up_stackdump.c
index e240ed655f..89f197895f 100644
--- a/arch/z80/src/common/up_stackdump.c
+++ b/arch/z80/src/common/up_stackdump.c
@@ -87,13 +87,13 @@ static void up_stackdump(void)
   uint16_t stack_base = (uint16_t)rtcb->adj_stack_ptr;
   uint16_t stack_size = (uint16_t)rtcb->adj_stack_size;
 
-  llerr("stack_base: %04x\n", stack_base);
-  llerr("stack_size: %04x\n", stack_size);
-  llerr("sp:         %04x\n", sp);
+  llinfo("stack_base: %04x\n", stack_base);
+  llinfo("stack_size: %04x\n", stack_size);
+  llinfo("sp:         %04x\n", sp);
 
   if (sp >= stack_base || sp < stack_base - stack_size)
     {
-      llerr("ERROR: Stack pointer is not within allocated stack\n");
+      llinfo("ERROR: Stack pointer is not within allocated stack\n");
       return;
     }
   else
@@ -103,7 +103,7 @@ static void up_stackdump(void)
       for (stack = sp & ~0x0f; stack < stack_base; stack += 8*sizeof(uint16_t))
         {
           uint16_t *ptr = (uint16_t*)stack;
-          llerr("%04x: %04x %04x %04x %04x %04x %04x %04x %04x\n",
+          llinfo("%04x: %04x %04x %04x %04x %04x %04x %04x %04x\n",
                  stack, ptr[0], ptr[1], ptr[2], ptr[3],
                  ptr[4], ptr[5], ptr[6], ptr[7]);
         }
diff --git a/arch/z80/src/common/up_unblocktask.c b/arch/z80/src/common/up_unblocktask.c
index a3bad89b49..123881386e 100644
--- a/arch/z80/src/common/up_unblocktask.c
+++ b/arch/z80/src/common/up_unblocktask.c
@@ -81,7 +81,7 @@ void up_unblock_task(FAR struct tcb_s *tcb)
   ASSERT((tcb->task_state >= FIRST_BLOCKED_STATE) &&
          (tcb->task_state <= LAST_BLOCKED_STATE));
 
-  /* err("Unblocking TCB=%p\n", tcb); */
+  /* info("Unblocking TCB=%p\n", tcb); */
 
   /* Remove the task from the blocked task list */
 
diff --git a/arch/z80/src/ez80/ez80_emac.c b/arch/z80/src/ez80/ez80_emac.c
index 12feabae9e..0080cb388d 100644
--- a/arch/z80/src/ez80/ez80_emac.c
+++ b/arch/z80/src/ez80/ez80_emac.c
@@ -578,7 +578,7 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
   phyval = ez80emac_miiread(priv, MII_PHYID1);
   if (phyval != MII_PHYID1_AM79C874)
     {
-      nerr("Not an Am79c874 PHY: PHY1=%04x vs %04x\n", phyval, MII_PHYID1_AM79C874);
+      nerr("ERROR: Not an Am79c874 PHY: PHY1=%04x vs %04x\n", phyval, MII_PHYID1_AM79C874);
       ret = -ENODEV;
       goto dumpregs;
     }
@@ -586,7 +586,7 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
   phyval = ez80emac_miiread(priv, MII_PHYID2);
   if (phyval != MII_PHYID2_AM79C874)
     {
-      nerr("Not an Am79c874 PHY: PHY2=%04x vs %04x\n", phyval, MII_PHYID2_AM79C874);
+      nerr("ERROR: Not an Am79c874 PHY: PHY2=%04x vs %04x\n", phyval, MII_PHYID2_AM79C874);
       ret = -ENODEV;
       goto dumpregs;
     }
@@ -618,7 +618,7 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
 
 #if CONFIG_EZ80_PHYCONFIG == EZ80_EMAC_AUTONEG
 
-   nerr("Configure autonegotiation\n");
+   ninfo("Configure autonegotiation\n");
    if (bauto)
     {
       ez80emac_miiwrite(priv, MII_ADVERTISE,
@@ -628,12 +628,12 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
     }
   else
     {
-      nerr("Am79c784 is not capable of autonegotiation\n");
+      nerr("ERROR: Am79c784 is not capable of autonegotiation\n");
     }
 
 #elif CONFIG_EZ80_PHYCONFIG == EZ80_EMAC_100BFD
 
-  nerr("100BASETX full duplex\n");
+  ninfo("100BASETX full duplex\n");
   phyval |= MII_MCR_SPEED100 | MII_MCR_FULLDPLX;
   ez80emac_miiwrite(priv, MII_ADVERTISE,
                     MII_ADVERTISE_100BASETXFULL|MII_ADVERTISE_100BASETXHALF|
@@ -642,7 +642,7 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
 
 #elif CONFIG_EZ80_PHYCONFIG == EZ80_EMAC_100BHD
 
-  nerr("100BASETX half duplex\n");
+  ninfo("100BASETX half duplex\n");
   phyval |= MII_MCR_SPEED100;
   ez80emac_miiwrite(priv, MII_ADVERTISE,
                     MII_ADVERTISE_100BASETXHALF|MII_ADVERTISE_10BASETXFULL|
@@ -650,14 +650,14 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
 
 #elif CONFIG_EZ80_PHYCONFIG == EZ80_EMAC_10BFD
 
-  nerr("10BASETX full duplex\n");
+  ninfo("10BASETX full duplex\n");
   phyval |= MII_MCR_FULLDPLX;
   ez80emac_miiwrite(priv, MII_ADVERTISE,
                     MII_ADVERTISE_10BASETXFULL|MII_ADVERTISE_10BASETXHALF|MII_ADVERTISE_CSMA);
 
 #elif CONFIG_EZ80_PHYCONFIG == EZ80_EMAC_10BHD
 
-  nerr("10BASETX half duplex\n");
+  ninfo("10BASETX half duplex\n");
   ez80emac_miiwrite(priv, MII_ADVERTISE,
                     MII_ADVERTISE_10BASETXHALF|MII_ADVERTISE_CSMA);
 
@@ -681,7 +681,7 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
 
   if ((phyval & MII_MSR_LINKSTATUS) == 0)
     {
-      nerr("Failed to establish link\n");
+      nerr("ERROR: Failed to establish link\n");
       ret = -ETIMEDOUT;
     }
   else
@@ -731,21 +731,21 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
 
   if (!ez80emac_miipoll(priv, MII_MCR, MII_MCR_ANRESTART, false))
     {
-      nerr("Autonegotiation didn't start.\n");
+      nerr("ERROR: Autonegotiation didn't start.\n");
     }
 
   /* Wait for auto-negotiation to complete */
 
   if (!ez80emac_miipoll(priv, MII_MSR, MII_MSR_ANEGCOMPLETE, true))
     {
-      nerr("Autonegotiation didn't complete.\n");
+      nerr("ERROR: Autonegotiation didn't complete.\n");
     }
 
   /* Wait link */
 
   if (!ez80emac_miipoll(priv, MII_MSR, MII_MSR_LINKSTATUS, true))
     {
-      nerr("Link is down!\n");
+      nwarn("WARNING: Link is down!\n");
       priv->blinkok = false;
     }
   else
@@ -763,7 +763,7 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
 
   if ((advertise & MII_ADVERTISE_100BASETXFULL) && (lpa & MII_LPA_100BASETXFULL))
     {
-      nerr("100BASETX full duplex\n");
+      ninfo("100BASETX full duplex\n");
       regval            = inp(EZ80_EMAC_CFG1);
       regval           |= EMAC_CFG1_FULLHD; /* Enable full duplex mode */
       outp(EZ80_EMAC_CFG1, regval);
@@ -775,7 +775,7 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
 
   else if ((advertise & MII_ADVERTISE_100BASETXHALF) && (lpa & MII_LPA_100BASETXHALF))
     {
-      nerr("100BASETX half duplex\n");
+      ninfo("100BASETX half duplex\n");
       regval            = inp(EZ80_EMAC_CFG1);
       regval           &= ~EMAC_CFG1_FULLHD; /* Disable full duplex mode */
       outp(EZ80_EMAC_CFG1, regval);
@@ -787,7 +787,7 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
 
   else if ((advertise & MII_ADVERTISE_10BASETXFULL) && (lpa & MII_LPA_10BASETXFULL))
     {
-      nerr("10BASETX full duplex\n");
+      ninfo("10BASETX full duplex\n");
       regval            = inp(EZ80_EMAC_CFG1);
       regval           |= EMAC_CFG1_FULLHD; /* Enable full duplex mode */
       outp(EZ80_EMAC_CFG1, regval);
@@ -799,7 +799,7 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
 
   else if ((advertise & MII_ADVERTISE_10BASETXHALF) && (lpa & MII_LPA_10BASETXHALF))
     {
-      nerr("10BASETX half duplex\n");
+      ninfo("10BASETX half duplex\n");
       regval            = inp(EZ80_EMAC_CFG1);
       regval           &= ~EMAC_CFG1_FULLHD; /* Disable full duplex mode */
       outp(EZ80_EMAC_CFG1, regval);
@@ -808,7 +808,7 @@ static int ez80emac_miiconfigure(FAR struct ez80emac_driver_s *priv)
     }
   else
     {
-      nerr("No valid connection; force 10Mbps half-duplex.\n");
+      nwarn("WARNING: No valid connection; force 10Mbps half-duplex.\n");
       regval            = inp(EZ80_EMAC_CFG1);
       regval           &= ~EMAC_CFG1_FULLHD; /* Disable full duplex mode */
       outp(EZ80_EMAC_CFG1, regval);
@@ -1400,7 +1400,7 @@ static int ez80emac_receive(struct ez80emac_driver_s *priv)
       else
 #endif
         {
-          nerr("Unsupported packet type dropped (%02x)\n", ETHBUF->type);
+          ninfo("Unsupported packet type dropped (%02x)\n", ETHBUF->type);
           EMAC_STAT(priv, rx_dropped);
         }
 
@@ -1458,9 +1458,9 @@ static int ez80emac_txinterrupt(int irq, FAR void *context)
     {
       if ((txhead->stat & EMAC_TXDESC_ABORT) != 0)
         {
-          nerr("Descriptor %p aborted {%06x, %u, %04x} trp=%02x%02x\n",
-               txhead, txhead->np, txhead->pktsize, txhead->stat,
-               inp(EZ80_EMAC_TRP_H), inp(EZ80_EMAC_TRP_L));
+          nwarn("WARNING: Descriptor %p aborted {%06x, %u, %04x} trp=%02x%02x\n",
+                txhead, txhead->np, txhead->pktsize, txhead->stat,
+                inp(EZ80_EMAC_TRP_H), inp(EZ80_EMAC_TRP_L));
 
           EMAC_STAT(priv, tx_errors);
           EMAC_STAT(priv, tx_abterrors);
@@ -1604,7 +1604,7 @@ static int ez80emac_sysinterrupt(int irq, FAR void *context)
 
   if ((istat & EMAC_ISTAT_TXFSMERR) != 0)
     {
-      nerr("Tx FSMERR txhead=%p {%06x, %u, %04x} trp=%02x%02x istat=%02x\n",
+      nwarn("WARNING: Tx FSMERR txhead=%p {%06x, %u, %04x} trp=%02x%02x istat=%02x\n",
            priv->txhead, priv->txhead->np, priv->txhead->pktsize, priv->txhead->stat,
            inp(EZ80_EMAC_TRP_H), inp(EZ80_EMAC_TRP_L), istat);
 
@@ -1620,7 +1620,7 @@ static int ez80emac_sysinterrupt(int irq, FAR void *context)
 
   if ((istat & EMAC_ISTAT_RXOVR) != 0)
     {
-      nerr("Rx OVR rxnext=%p {%06x, %u, %04x} rrp=%02x%02x rwp=%02x%02x blkslft=%02x istat=%02x\n",
+      nwarn("WARNING: Rx OVR rxnext=%p {%06x, %u, %04x} rrp=%02x%02x rwp=%02x%02x blkslft=%02x istat=%02x\n",
            priv->rxnext, priv->rxnext->np, priv->rxnext->pktsize, priv->rxnext->stat,
            inp(EZ80_EMAC_RRP_H), inp(EZ80_EMAC_RRP_L),
            inp(EZ80_EMAC_RWP_H), inp(EZ80_EMAC_RWP_L),
@@ -1728,13 +1728,13 @@ static int ez80emac_ifup(FAR struct net_driver_s *dev)
   uint8_t regval;
   int ret;
 
-  nerr("Bringing up: MAC %02x:%02x:%02x:%02x:%02x:%02x\n",
-       dev->d_mac.ether_addr_octet[0], dev->d_mac.ether_addr_octet[1],
-       dev->d_mac.ether_addr_octet[2], dev->d_mac.ether_addr_octet[3],
-       dev->d_mac.ether_addr_octet[4], dev->d_mac.ether_addr_octet[5]);
-  nerr("             IP  %d.%d.%d.%d\n",
-       dev->d_ipaddr >> 24,       (dev->d_ipaddr >> 16) & 0xff,
-      (dev->d_ipaddr >> 8) & 0xff, dev->d_ipaddr & 0xff);
+  ninfo("Bringing up: MAC %02x:%02x:%02x:%02x:%02x:%02x\n",
+        dev->d_mac.ether_addr_octet[0], dev->d_mac.ether_addr_octet[1],
+        dev->d_mac.ether_addr_octet[2], dev->d_mac.ether_addr_octet[3],
+        dev->d_mac.ether_addr_octet[4], dev->d_mac.ether_addr_octet[5]);
+  ninfo("             IP  %d.%d.%d.%d\n",
+        dev->d_ipaddr >> 24,       (dev->d_ipaddr >> 16) & 0xff,
+       (dev->d_ipaddr >> 8) & 0xff, dev->d_ipaddr & 0xff);
 
   /* Bring up the interface -- Must be down right now */
 
@@ -2094,7 +2094,7 @@ static int ez80_emacinitialize(void)
   ez80emac_miiwrite(priv, MII_MCR, MII_MCR_RESET);
   if (!ez80emac_miipoll(priv, MII_MCR, MII_MCR_RESET, false))
     {
-      nerr("PHY reset error.\n");
+      nerr("ERROR: PHY reset error.\n");
     }
 
   /*  Initialize MAC */
@@ -2149,7 +2149,7 @@ static int ez80_emacinitialize(void)
   ez80emac_miiwrite(priv, MII_MCR, MII_MCR_RESET);
   if (!ez80emac_miipoll(priv, MII_MCR, MII_MCR_RESET, false))
     {
-      nerr("PHY reset error.\n");
+      nerr("ERROR: PHY reset error.\n");
       ret = -EIO;
       goto errout;
     }
@@ -2200,7 +2200,7 @@ int up_netinitialize(void)
   ret = irq_attach(EZ80_EMACSYS_IRQ, ez80emac_sysinterrupt);
   if (ret < 0)
     {
-      nllerr("Unable to attach IRQ %d\n", EZ80_EMACSYS_IRQ);
+      nllerr("ERROR: Unable to attach IRQ %d\n", EZ80_EMACSYS_IRQ);
       ret = -EAGAIN;
       goto errout;
     }
@@ -2208,7 +2208,7 @@ int up_netinitialize(void)
   ret = irq_attach(EZ80_EMACRX_IRQ, ez80emac_rxinterrupt);
   if (ret < 0)
     {
-      nllerr("Unable to attach IRQ %d\n", EZ80_EMACRX_IRQ);
+      nllerr("ERROR: Unable to attach IRQ %d\n", EZ80_EMACRX_IRQ);
       ret = -EAGAIN;
       goto errout;
     }
@@ -2216,7 +2216,7 @@ int up_netinitialize(void)
   ret = irq_attach(EZ80_EMACTX_IRQ, ez80emac_txinterrupt);
   if (ret < 0)
     {
-      nllerr("Unable to attach IRQ %d\n", EZ80_EMACTX_IRQ);
+      nllerr("ERROR: Unable to attach IRQ %d\n", EZ80_EMACTX_IRQ);
       ret = -EAGAIN;
       goto errout;
     }
diff --git a/arch/z80/src/ez80/ez80_i2c.c b/arch/z80/src/ez80/ez80_i2c.c
index 73f78fc2e7..04c45c3c4c 100644
--- a/arch/z80/src/ez80/ez80_i2c.c
+++ b/arch/z80/src/ez80/ez80_i2c.c
@@ -404,7 +404,7 @@ static int ez80_i2c_sendaddr(struct ez80_i2cdev_s *priv, uint8_t readbit)
     {
       /* This error should never occur */
 
-      err("Bad START status: %02x\n", sr);
+      err("ERROR: Bad START status: %02x\n", sr);
       ez80_i2c_clriflg();
       return -EIO;
     }
@@ -426,7 +426,7 @@ static int ez80_i2c_sendaddr(struct ez80_i2cdev_s *priv, uint8_t readbit)
       sr = ez80_i2c_waitiflg();
       if (sr != I2C_SR_MADDRWRACK && sr != I2C_SR_MADDRWR)
         {
-          err("Bad ADDR8 status: %02x\n", sr);
+          err("ERROR: Bad ADDR8 status: %02x\n", sr);
           goto failure;
         }
     }
@@ -445,7 +445,7 @@ static int ez80_i2c_sendaddr(struct ez80_i2cdev_s *priv, uint8_t readbit)
       sr = ez80_i2c_waitiflg();
       if (sr != I2C_SR_MADDRWRACK && sr != I2C_SR_MADDRWR)
         {
-         err("Bad ADDR10H status: %02x\n", sr);
+         err("ERROR: Bad ADDR10H status: %02x\n", sr);
          goto failure;
         }
 
@@ -459,7 +459,7 @@ static int ez80_i2c_sendaddr(struct ez80_i2cdev_s *priv, uint8_t readbit)
       sr = ez80_i2c_waitiflg();
       if (sr != I2C_SR_MADDR2WRACK && sr != I2C_SR_MADDR2WR)
         {
-          err("Bad ADDR10L status: %02x\n", sr);
+          err("ERROR: Bad ADDR10L status: %02x\n", sr);
           goto failure;
         }
     }
@@ -479,12 +479,12 @@ failure:
                              * Call address received, ACK transmitted */
       case I2C_SR_ARBLOST4: /* Arbitration lost in address as master, slave
                              * address and Read bit received, ACK transmitted */
-        err("Arbitration lost: %02x\n", sr);
+        err("ERROR: Arbitration lost: %02x\n", sr);
         ez80_i2c_clriflg();
         return -EAGAIN;
 
       default:
-        err("Unexpected status: %02x\n", sr);
+        err("ERROR: Unexpected status: %02x\n", sr);
         ez80_i2c_clriflg();
         return -EIO;
     }
@@ -634,7 +634,7 @@ static int ez80_i2c_read_transfer(FAR struct ez80_i2cdev_s *priv,
              * this will cause the whole transfer to start over
              */
 
-            err("Arbitration lost: %02x\n", regval);
+            err("ERROR: Arbitration lost: %02x\n", regval);
             ez80_i2c_clriflg();
             break;
           }
@@ -643,7 +643,7 @@ static int ez80_i2c_read_transfer(FAR struct ez80_i2cdev_s *priv,
 
         else
           {
-            err("Unexpected status: %02x\n", regval);
+            err("ERROR: Unexpected status: %02x\n", regval);
             ez80_i2c_clriflg();
             return-EIO;
           }
@@ -731,7 +731,7 @@ static int ez80_i2c_write_transfer(FAR struct ez80_i2cdev_s *priv,
           sr = ez80_i2c_waitiflg();
           if (sr != I2C_SR_MDATAWRACK && sr != I2C_SR_MDATAWR)
             {
-              err("Bad DATA status: %02x\n", sr);
+              err("ERROR: Bad DATA status: %02x\n", sr);
               ez80_i2c_clriflg();
               if (sr == I2C_SR_ARBLOST1)
                 {
diff --git a/arch/z80/src/ez80/ez80_registerdump.c b/arch/z80/src/ez80/ez80_registerdump.c
index 0a30eb1c0f..4ccd09ce57 100644
--- a/arch/z80/src/ez80/ez80_registerdump.c
+++ b/arch/z80/src/ez80/ez80_registerdump.c
@@ -81,23 +81,23 @@ static void ez80_registerdump(void)
   if (g_current_regs)
     {
 #ifdef CONFIG_EZ80_Z80MODE
-      llerr("AF: %04x  I: %04x\n",
-            g_current_regs[XCPT_AF], g_current_regs[XCPT_I]);
-      llerr("BC: %04x DE: %04x HL: %04x\n",
-            g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]);
-      llerr("IX: %04x IY: %04x\n",
-            g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]);
-      llerr("SP: %04x PC: %04x\n"
-            g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]);
+      llinfo("AF: %04x  I: %04x\n",
+             g_current_regs[XCPT_AF], g_current_regs[XCPT_I]);
+      llinfo("BC: %04x DE: %04x HL: %04x\n",
+             g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]);
+      llinfo("IX: %04x IY: %04x\n",
+             g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]);
+      llinfo("SP: %04x PC: %04x\n"
+             g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]);
 #else
-      llerr("AF: %06x  I: %06x\n",
-            g_current_regs[XCPT_AF], g_current_regs[XCPT_I]);
-      llerr("BC: %06x DE: %06x HL: %06x\n",
-            g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]);
-      llerr("IX: %06x IY: %06x\n",
-            g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]);
-      llerr("SP: %06x PC: %06x\n"
-            g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]);
+      llinfo("AF: %06x  I: %06x\n",
+             g_current_regs[XCPT_AF], g_current_regs[XCPT_I]);
+      llinfo("BC: %06x DE: %06x HL: %06x\n",
+             g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]);
+      llinfo("IX: %06x IY: %06x\n",
+             g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]);
+      llinfo("SP: %06x PC: %06x\n"
+             g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]);
 #endif
     }
 }
diff --git a/arch/z80/src/ez80/ez80_schedulesigaction.c b/arch/z80/src/ez80/ez80_schedulesigaction.c
index b8de5d3c73..6cc6b57c66 100644
--- a/arch/z80/src/ez80/ez80_schedulesigaction.c
+++ b/arch/z80/src/ez80/ez80_schedulesigaction.c
@@ -125,7 +125,7 @@ void up_schedule_sigaction(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver)
 {
   irqstate_t flags;
 
-  serr("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver);
+  sinfo("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver);
 
   /* Make sure that interrupts are disabled */
 
diff --git a/arch/z80/src/ez80/ez80_sigdeliver.c b/arch/z80/src/ez80/ez80_sigdeliver.c
index 3532758f63..694b3c0186 100644
--- a/arch/z80/src/ez80/ez80_sigdeliver.c
+++ b/arch/z80/src/ez80/ez80_sigdeliver.c
@@ -95,8 +95,8 @@ void up_sigdeliver(void)
 
   board_autoled_on(LED_SIGNAL);
 
-  serr("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
-        rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
+  sinfo("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
+         rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
   ASSERT(rtcb->xcp.sigdeliver != NULL);
 
   /* Save the real return state on the stack. */
@@ -127,7 +127,7 @@ void up_sigdeliver(void)
    * errno that is needed by the user logic (it is probably EINTR).
    */
 
-  serr("Resuming\n");
+  sinfo("Resuming\n");
   (void)up_irq_save();
   rtcb->pterrno = saved_errno;
 
diff --git a/arch/z80/src/z180/z180_registerdump.c b/arch/z80/src/z180/z180_registerdump.c
index d7a9b2d58e..83d7faaa55 100644
--- a/arch/z80/src/z180/z180_registerdump.c
+++ b/arch/z80/src/z180/z180_registerdump.c
@@ -60,14 +60,6 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -80,16 +72,16 @@ static void z180_registerdump(void)
 {
   if (g_current_regs)
     {
-      llerr("AF: %04x  I: %04x\n",
-            g_current_regs[XCPT_AF], g_current_regs[XCPT_I]);
-      llerr("BC: %04x DE: %04x HL: %04x\n",
-            g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]);
-      llerr("IX: %04x IY: %04x\n",
-            g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]);
-      llerr("SP: %04x PC: %04x\n"
-            g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]);
-      llerr("CBAR: %02x BBR: %02x CBR: %02x\n"
-            inp(Z180_MMU_CBAR), inp(Z180_MMU_BBR), inp(Z180_MMU_CBR));
+      llinfo("AF: %04x  I: %04x\n",
+             g_current_regs[XCPT_AF], g_current_regs[XCPT_I]);
+      llinfo("BC: %04x DE: %04x HL: %04x\n",
+             g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]);
+      llinfo("IX: %04x IY: %04x\n",
+             g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]);
+      llinfo("SP: %04x PC: %04x\n"
+             g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]);
+      llinfo("CBAR: %02x BBR: %02x CBR: %02x\n"
+             inp(Z180_MMU_CBAR), inp(Z180_MMU_BBR), inp(Z180_MMU_CBR));
     }
 }
 
diff --git a/arch/z80/src/z180/z180_schedulesigaction.c b/arch/z80/src/z180/z180_schedulesigaction.c
index 360f06bb1a..ade86734e9 100644
--- a/arch/z80/src/z180/z180_schedulesigaction.c
+++ b/arch/z80/src/z180/z180_schedulesigaction.c
@@ -125,7 +125,7 @@ void up_schedule_sigaction(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver)
 {
   irqstate_t flags;
 
-  err("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver);
+  info("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver);
 
   /* Make sure that interrupts are disabled */
 
diff --git a/arch/z80/src/z180/z180_sigdeliver.c b/arch/z80/src/z180/z180_sigdeliver.c
index 42925eb31a..3a67b345f8 100644
--- a/arch/z80/src/z180/z180_sigdeliver.c
+++ b/arch/z80/src/z180/z180_sigdeliver.c
@@ -94,8 +94,8 @@ void up_sigdeliver(void)
 
   board_autoled_on(LED_SIGNAL);
 
-  serr("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
-       rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
+  sinfo("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
+        rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
   ASSERT(rtcb->xcp.sigdeliver != NULL);
 
   /* Save the real return state on the stack. */
@@ -126,7 +126,7 @@ void up_sigdeliver(void)
    * errno that is needed by the user logic (it is probably EINTR).
    */
 
-  serr("Resuming\n");
+  sinfo("Resuming\n");
   (void)up_irq_save();
   rtcb->pterrno = saved_errno;
 
diff --git a/arch/z80/src/z8/z8_i2c.c b/arch/z80/src/z8/z8_i2c.c
index cf8c347068..a5c597cba9 100644
--- a/arch/z80/src/z8/z8_i2c.c
+++ b/arch/z80/src/z8/z8_i2c.c
@@ -236,7 +236,7 @@ static uint16_t z8_i2c_getbrg(uint32_t frequency)
 
   if (frequency > 400*1000)
     {
-      err("Invalid inputs\n");
+      err("ERROR: Invalid inputs\n");
       frequency = 400*1000;
     }
 
diff --git a/arch/z80/src/z8/z8_registerdump.c b/arch/z80/src/z8/z8_registerdump.c
index aff6aa88ec..f6a6b91ac7 100644
--- a/arch/z80/src/z8/z8_registerdump.c
+++ b/arch/z80/src/z8/z8_registerdump.c
@@ -63,30 +63,22 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
 
 static inline void z8_dumpregs(FAR chipret_t *regs)
 {
-  llerr("REGS: %04x %04x %04x %04x %04x %04x %04x %04x\n",
+  llinfo("REGS: %04x %04x %04x %04x %04x %04x %04x %04x\n",
          regs[XCPT_RR0], regs[XCPT_RR2], regs[XCPT_RR4], regs[XCPT_RR6],
-         regs[XCPT_RR8], regs[XCPT_RR10], regs[XCPT_RR12], regs[XCPT_RR14]);
+          regs[XCPT_RR8], regs[XCPT_RR10], regs[XCPT_RR12], regs[XCPT_RR14]);
 }
 
 static inline void z8_dumpstate(chipreg_t sp, chipreg_t pc, uint8_t irqctl,
                                 chipreg_t rpflags)
 {
-  llerr("SP: %04x PC: %04x IRQCTL: %02x RP: %02x FLAGS: %02x\n",
-        sp, pc, irqctl & 0xff, rpflags >> 8, rpflags & 0xff);
+  llinfo("SP: %04x PC: %04x IRQCTL: %02x RP: %02x FLAGS: %02x\n",
+         sp, pc, irqctl & 0xff, rpflags >> 8, rpflags & 0xff);
 }
 
 /****************************************************************************
diff --git a/arch/z80/src/z8/z8_schedulesigaction.c b/arch/z80/src/z8/z8_schedulesigaction.c
index 94d9dc0541..679bccd617 100644
--- a/arch/z80/src/z8/z8_schedulesigaction.c
+++ b/arch/z80/src/z8/z8_schedulesigaction.c
@@ -125,7 +125,7 @@ void up_schedule_sigaction(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver)
 {
   irqstate_t flags;
 
-  err("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver);
+  info("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver);
 
   /* Make sure that interrupts are disabled */
 
diff --git a/arch/z80/src/z8/z8_sigdeliver.c b/arch/z80/src/z8/z8_sigdeliver.c
index 0edcb9e8c7..b6abac296a 100644
--- a/arch/z80/src/z8/z8_sigdeliver.c
+++ b/arch/z80/src/z8/z8_sigdeliver.c
@@ -109,8 +109,8 @@ void up_sigdeliver(void)
 
   board_autoled_on(LED_SIGNAL);
 
-  serr("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
-       rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
+  sinfo("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
+        rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
   ASSERT(rtcb->xcp.sigdeliver != NULL);
 
   /* Save the real return state on the stack. */
@@ -141,7 +141,7 @@ void up_sigdeliver(void)
    * errno that is needed by the user logic (it is probably EINTR).
    */
 
-  serr("Resuming\n");
+  sinfo("Resuming\n");
   (void)up_irq_save();
   rtcb->pterrno = saved_errno;
 
diff --git a/arch/z80/src/z80/z80_registerdump.c b/arch/z80/src/z80/z80_registerdump.c
index 961e763cec..43494e24e8 100644
--- a/arch/z80/src/z80/z80_registerdump.c
+++ b/arch/z80/src/z80/z80_registerdump.c
@@ -80,14 +80,14 @@ static void z80_registerdump(void)
 {
   if (g_current_regs)
     {
-      llerr("AF: %04x  I: %04x\n",
-            g_current_regs[XCPT_AF], g_current_regs[XCPT_I]);
-      llerr("BC: %04x DE: %04x HL: %04x\n",
-            g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]);
-      llerr("IX: %04x IY: %04x\n",
-            g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]);
-      llerr("SP: %04x PC: %04x\n"
-            g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]);
+      llinfo("AF: %04x  I: %04x\n",
+             g_current_regs[XCPT_AF], g_current_regs[XCPT_I]);
+      llinfo("BC: %04x DE: %04x HL: %04x\n",
+             g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]);
+      llinfo("IX: %04x IY: %04x\n",
+             g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]);
+      llinfo("SP: %04x PC: %04x\n"
+             g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]);
     }
 }
 
diff --git a/arch/z80/src/z80/z80_schedulesigaction.c b/arch/z80/src/z80/z80_schedulesigaction.c
index a90d495c3c..dbb3cb5537 100644
--- a/arch/z80/src/z80/z80_schedulesigaction.c
+++ b/arch/z80/src/z80/z80_schedulesigaction.c
@@ -125,7 +125,7 @@ void up_schedule_sigaction(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver)
 {
   irqstate_t flags;
 
-  err("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver);
+  info("tcb=0x%p sigdeliver=0x%04x\n", tcb, (uint16_t)sigdeliver);
 
   /* Make sure that interrupts are disabled */
 
diff --git a/arch/z80/src/z80/z80_sigdeliver.c b/arch/z80/src/z80/z80_sigdeliver.c
index 198ac4b4c7..232eb4be98 100644
--- a/arch/z80/src/z80/z80_sigdeliver.c
+++ b/arch/z80/src/z80/z80_sigdeliver.c
@@ -94,8 +94,8 @@ void up_sigdeliver(void)
 
   board_autoled_on(LED_SIGNAL);
 
-  serr("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
-       rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
+  sinfo("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
+        rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
   ASSERT(rtcb->xcp.sigdeliver != NULL);
 
   /* Save the real return state on the stack. */
@@ -126,7 +126,7 @@ void up_sigdeliver(void)
    * errno that is needed by the user logic (it is probably EINTR).
    */
 
-  serr("Resuming\n");
+  sinfo("Resuming\n");
   (void)up_irq_save();
   rtcb->pterrno = saved_errno;
 
-- 
GitLab


From 3659bf58c0bf6db094ce68e24224dde8a923e6f5 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 13 Jun 2016 19:08:23 -0600
Subject: [PATCH 67/91] arch/z16/:  Change some *err() message to *info()
 messages if what was a *dbg() message does not indicate and error condition.

---
 arch/z16/src/common/up_blocktask.c         |  2 +-
 arch/z16/src/common/up_exit.c              | 22 ++++++++--------
 arch/z16/src/common/up_initialize.c        |  4 +--
 arch/z16/src/common/up_registerdump.c      | 29 +++++++++-------------
 arch/z16/src/common/up_releasepending.c    |  2 +-
 arch/z16/src/common/up_reprioritizertr.c   |  2 +-
 arch/z16/src/common/up_schedulesigaction.c |  4 +--
 arch/z16/src/common/up_sigdeliver.c        |  4 +--
 arch/z16/src/common/up_stackdump.c         |  8 +++---
 arch/z16/src/common/up_unblocktask.c       |  2 +-
 arch/z16/src/z16f/z16f_espi.c              | 10 ++++----
 11 files changed, 42 insertions(+), 47 deletions(-)

diff --git a/arch/z16/src/common/up_blocktask.c b/arch/z16/src/common/up_blocktask.c
index dd8ea8ef17..584aec0ea8 100644
--- a/arch/z16/src/common/up_blocktask.c
+++ b/arch/z16/src/common/up_blocktask.c
@@ -83,7 +83,7 @@ void up_block_task(FAR struct tcb_s *tcb, tstate_t task_state)
   ASSERT((tcb->task_state >= FIRST_READY_TO_RUN_STATE) &&
          (tcb->task_state <= LAST_READY_TO_RUN_STATE));
 
-  /* err("Blocking TCB=%p\n", tcb); */
+  /* sinfo("Blocking TCB=%p\n", tcb); */
 
   /* Remove the tcb task from the ready-to-run list.  If we
    * are blocking the task at the head of the task list (the
diff --git a/arch/z16/src/common/up_exit.c b/arch/z16/src/common/up_exit.c
index ba2aefb418..df4d62c381 100644
--- a/arch/z16/src/common/up_exit.c
+++ b/arch/z16/src/common/up_exit.c
@@ -78,8 +78,8 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
   int i;
 #endif
 
-  llerr("  TCB=%p name=%s\n", tcb, tcb->argv[0]);
-  llerr("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
+  sllinfo("  TCB=%p name=%s\n", tcb, tcb->argv[0]);
+  sllinfo("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
 
 #if CONFIG_NFILE_DESCRIPTORS > 0
   filelist = tcb->group->tg_filelist;
@@ -88,8 +88,8 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
       struct inode *inode = filelist->fl_files[i].f_inode;
       if (inode)
         {
-          llerr("      fd=%d refcount=%d\n",
-                i, inode->i_crefs);
+          sllinfo("      fd=%d refcount=%d\n",
+                  i, inode->i_crefs);
         }
     }
 #endif
@@ -102,11 +102,11 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
       if (filep->fs_fd >= 0)
         {
 #if CONFIG_STDIO_BUFFER_SIZE > 0
-          llerr("      fd=%d nbytes=%d\n",
-                filep->fs_fd,
-                filep->fs_bufpos - filep->fs_bufstart);
+          sllinfo("      fd=%d nbytes=%d\n",
+                  filep->fs_fd,
+                  filep->fs_bufpos - filep->fs_bufstart);
 #else
-          llerr("      fd=%d\n", filep->fs_fd);
+          sllinfo("      fd=%d\n", filep->fs_fd);
 #endif
         }
     }
@@ -139,10 +139,10 @@ void _exit(int status)
 
   (void)up_irq_save();
 
-  sllerr("TCB=%p exiting\n", tcb);
+  sllinfo("TCB=%p exiting\n", tcb);
 
 #if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
-  llerr("Other tasks:\n");
+  sllinfo("Other tasks:\n");
   sched_foreach(_up_dumponexit, NULL);
 #endif
 
@@ -155,7 +155,7 @@ void _exit(int status)
    */
 
   tcb = this_task();
-  sllerr("New Active Task TCB=%p\n", tcb);
+  sllinfo("New Active Task TCB=%p\n", tcb);
 
   /* Then switch contexts */
 
diff --git a/arch/z16/src/common/up_initialize.c b/arch/z16/src/common/up_initialize.c
index 6251b2a41f..a832942f19 100644
--- a/arch/z16/src/common/up_initialize.c
+++ b/arch/z16/src/common/up_initialize.c
@@ -87,13 +87,13 @@ static void up_calibratedelay(void)
 {
   int i;
 
-  llerr("Beginning 100s delay\n");
+  llwarn("Beginning 100s delay\n");
   for (i = 0; i < 100; i++)
     {
       up_mdelay(1000);
     }
 
-  llerr("End 100s delay\n");
+  llwarn("End 100s delay\n");
 }
 #else
 # define up_calibratedelay()
diff --git a/arch/z16/src/common/up_registerdump.c b/arch/z16/src/common/up_registerdump.c
index fd79284b83..0604e0f7d4 100644
--- a/arch/z16/src/common/up_registerdump.c
+++ b/arch/z16/src/common/up_registerdump.c
@@ -64,14 +64,6 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -82,16 +74,19 @@
 
 static void up_registerdump(void)
 {
+#ifdef CONFIG_DEBUG_INFO
   FAR uint32_t *regs32 = (FAR uint32_t*)g_current_regs;
-  llerr("R0 :%08x R1 :%08x R2 :%08x R3 :%08x "
-        "R4 :%08x R5 :%08x R6 :%08x R7 :%08x\n"
-        regs32[REG_R0/2],  regs32[REG_R1/2], regs32[REG_R2/2], regs32[REG_R3/2],
-        regs32[REG_R4/2],  regs32[REG_R5/2], regs32[REG_R6/2], regs32[REG_R7/2]);
-  llerr("R8 :%08x R9 :%08x R10:%08x R11:%08x R12:%08x R13:%08x\n"
-        regs32[REG_R8/2],  regs32[REG_R9/2], regs32[REG_R10/2], regs3[REG_R11/2],
-        regs32[REG_R12/2], regs32[REG_R13/2]);
-  llerr("FP :%08x SP :%08x FLG:%04x\n"
-        regs32[REG_R14/2], regs32[REG_R15/2], g_current_regs[REG_FLAGS]);
+
+  llinfo("R0 :%08x R1 :%08x R2 :%08x R3 :%08x "
+         "R4 :%08x R5 :%08x R6 :%08x R7 :%08x\n"
+         regs32[REG_R0/2],  regs32[REG_R1/2], regs32[REG_R2/2], regs32[REG_R3/2],
+         regs32[REG_R4/2],  regs32[REG_R5/2], regs32[REG_R6/2], regs32[REG_R7/2]);
+  llinfo("R8 :%08x R9 :%08x R10:%08x R11:%08x R12:%08x R13:%08x\n"
+         regs32[REG_R8/2],  regs32[REG_R9/2], regs32[REG_R10/2], regs3[REG_R11/2],
+         regs32[REG_R12/2], regs32[REG_R13/2]);
+  llinfo("FP :%08x SP :%08x FLG:%04x\n"
+         regs32[REG_R14/2], regs32[REG_R15/2], g_current_regs[REG_FLAGS]);
+#endif
 }
 
 #endif /* CONFIG_ARCH_STACKDUMP */
diff --git a/arch/z16/src/common/up_releasepending.c b/arch/z16/src/common/up_releasepending.c
index 90cae6fbb3..ff6d24f4fb 100644
--- a/arch/z16/src/common/up_releasepending.c
+++ b/arch/z16/src/common/up_releasepending.c
@@ -68,7 +68,7 @@ void up_release_pending(void)
 {
   FAR struct tcb_s *rtcb = this_task();
 
-  sllerr("From TCB=%p\n", rtcb);
+  sllinfo("From TCB=%p\n", rtcb);
 
   /* Merge the g_pendingtasks list into the ready-to-run task list */
 
diff --git a/arch/z16/src/common/up_reprioritizertr.c b/arch/z16/src/common/up_reprioritizertr.c
index 0083f855bd..8af6cc003b 100644
--- a/arch/z16/src/common/up_reprioritizertr.c
+++ b/arch/z16/src/common/up_reprioritizertr.c
@@ -96,7 +96,7 @@ void up_reprioritize_rtr(FAR struct tcb_s *tcb, uint8_t priority)
       FAR struct tcb_s *rtcb = this_task();
       bool switch_needed;
 
-      sllerr("TCB=%p PRI=%d\n", tcb, priority);
+      sllinfo("TCB=%p PRI=%d\n", tcb, priority);
 
       /* Remove the tcb task from the ready-to-run list.
        * sched_removereadytorun will return true if we just
diff --git a/arch/z16/src/common/up_schedulesigaction.c b/arch/z16/src/common/up_schedulesigaction.c
index 090c641f60..557dcdf5f4 100644
--- a/arch/z16/src/common/up_schedulesigaction.c
+++ b/arch/z16/src/common/up_schedulesigaction.c
@@ -92,7 +92,7 @@ void up_schedule_sigaction(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver)
 {
   irqstate_t flags;
 
-  err("tcb=0x%p sigdeliver=0x%06x\n", tcb, (uint32_t)sigdeliver);
+  sinfo("tcb=0x%p sigdeliver=0x%06x\n", tcb, (uint32_t)sigdeliver);
 
   /* Make sure that interrupts are disabled */
 
@@ -106,7 +106,7 @@ void up_schedule_sigaction(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver)
        * being delivered to the currently executing task.
        */
 
-      err("rtcb=0x%p g_current_regs=0x%p\n", this_task(), g_current_regs);
+      sinfo("rtcb=0x%p g_current_regs=0x%p\n", this_task(), g_current_regs);
 
       if (tcb == this_task())
         {
diff --git a/arch/z16/src/common/up_sigdeliver.c b/arch/z16/src/common/up_sigdeliver.c
index cbe9e95ca6..7860f1d1de 100644
--- a/arch/z16/src/common/up_sigdeliver.c
+++ b/arch/z16/src/common/up_sigdeliver.c
@@ -84,7 +84,7 @@ void up_sigdeliver(void)
 
   board_autoled_on(LED_SIGNAL);
 
-  serr("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
+  sinfo("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
         rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
   ASSERT(rtcb->xcp.sigdeliver != NULL);
 
@@ -119,7 +119,7 @@ void up_sigdeliver(void)
    * errno that is needed by the user logic (it is probably EINTR).
    */
 
-  serr("Resuming\n");
+  sinfo("Resuming\n");
   (void)up_irq_save();
   rtcb->pterrno = saved_errno;
 
diff --git a/arch/z16/src/common/up_stackdump.c b/arch/z16/src/common/up_stackdump.c
index 14123807ff..9ae0cb71e4 100644
--- a/arch/z16/src/common/up_stackdump.c
+++ b/arch/z16/src/common/up_stackdump.c
@@ -78,9 +78,9 @@ static void up_stackdump(void)
   chipreg_t stack_base = (chipreg_t)rtcb->adj_stack_ptr;
   chipreg_t stack_size = (chipreg_t)rtcb->adj_stack_size;
 
-  llerr("stack_base: %08x\n", stack_base);
-  llerr("stack_size: %08x\n", stack_size);
-  llerr("sp:         %08x\n", sp);
+  llinfo("stack_base: %08x\n", stack_base);
+  llinfo("stack_size: %08x\n", stack_size);
+  llinfo("sp:         %08x\n", sp);
 
   if (sp >= stack_base || sp < stack_base - stack_size)
     {
@@ -94,7 +94,7 @@ static void up_stackdump(void)
       for (stack = sp & ~0x0f; stack < stack_base; stack += 8*sizeof(chipreg_t))
         {
           chipreg_t *ptr = (chipreg_t*)stack;
-          llerr("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+          llinfo("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
                  stack, ptr[0], ptr[1], ptr[2], ptr[3],
                  ptr[4], ptr[5], ptr[6], ptr[7]);
         }
diff --git a/arch/z16/src/common/up_unblocktask.c b/arch/z16/src/common/up_unblocktask.c
index 26aac84675..8fe8beccfa 100644
--- a/arch/z16/src/common/up_unblocktask.c
+++ b/arch/z16/src/common/up_unblocktask.c
@@ -79,7 +79,7 @@ void up_unblock_task(FAR struct tcb_s *tcb)
   ASSERT((tcb->task_state >= FIRST_BLOCKED_STATE) &&
          (tcb->task_state <= LAST_BLOCKED_STATE));
 
-  /* err("Unblocking TCB=%p\n", tcb); */
+  /* sinfo("Unblocking TCB=%p\n", tcb); */
 
   /* Remove the task from the blocked task list */
 
diff --git a/arch/z16/src/z16f/z16f_espi.c b/arch/z16/src/z16f/z16f_espi.c
index 6cf1ce07c6..354974e580 100644
--- a/arch/z16/src/z16f/z16f_espi.c
+++ b/arch/z16/src/z16f/z16f_espi.c
@@ -221,7 +221,7 @@ static bool spi_checkreg(FAR struct z16f_spi_s *priv, bool wr, uint16_t regval,
         {
           /* Yes... show how many times we did it */
 
-          llerr("...[Repeats %d times]...\n", priv->ntimes);
+          syslog(LOG_INFO, "...[Repeats %d times]...\n", priv->ntimes);
         }
 
       /* Save information about the new access */
@@ -253,7 +253,7 @@ static uint8_t spi_getreg8(FAR struct z16f_spi_s *priv, uintptr_t regaddr)
 
   if (spi_checkreg(priv, false, (uint16_t)regval, regaddr))
     {
-      llerr("%06x->%02x\n", regaddr, regval);
+      syslog(LOG_INFO, "%06x->%02x\n", regaddr, regval);
     }
 
   return regval;
@@ -274,7 +274,7 @@ static void spi_putreg8(FAR struct z16f_spi_s *priv, uint8_t regval,
 {
   if (spi_checkreg(priv, true, (uint16_t)regval, regaddr))
     {
-      llerr("%06x<-%02x\n", regaddr, regval);
+      syslog(LOG_INFO, "%06x<-%02x\n", regaddr, regval);
     }
 
   putreg8(regval, regaddr);
@@ -295,7 +295,7 @@ static void spi_putreg16(FAR struct z16f_spi_s *priv, uint16_t regval,
 {
   if (spi_checkreg(priv, true, regval, regaddr))
     {
-      llerr("%06x<-%04x\n", regaddr, regval);
+      syslog(LOG_INFO, "%06x<-%04x\n", regaddr, regval);
     }
 
   putreg8(regval, regaddr);
@@ -466,7 +466,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
   priv->frequency = frequency;
   priv->actual    = actual;
 
-  spierr("Frequency %d->%d\n", frequency, actual);
+  spiinfo("Frequency %d->%d\n", frequency, actual);
   return actual;
 }
 
-- 
GitLab


From 6d88df680221f9545de554f1adb8ee76757bd3a6 Mon Sep 17 00:00:00 2001
From: David Sidrane 
Date: Tue, 14 Jun 2016 07:00:06 -0600
Subject: [PATCH 68/91] Remove duplicate settings from stm32/Kconfig

---
 arch/arm/src/stm32f7/Kconfig | 40 ------------------------------------
 1 file changed, 40 deletions(-)

diff --git a/arch/arm/src/stm32f7/Kconfig b/arch/arm/src/stm32f7/Kconfig
index e4bb50c884..47bd03c3e1 100644
--- a/arch/arm/src/stm32f7/Kconfig
+++ b/arch/arm/src/stm32f7/Kconfig
@@ -470,10 +470,6 @@ config ARCH_CHIP_STM32F779AI
 
 endchoice # STM32 F7 Chip Selection
 
-config STM32F7_STM32F74XX
-	bool
-	default n
-
 config STM32F7_STM32F74XX
 	bool
 	default n
@@ -486,42 +482,6 @@ config STM32F7_STM32F76XX
 	bool
 	default n
 
-config STM32F7_STM32F76XX
-	bool
-	default n
-
-config STM32F7_STM32F76XX
-	bool
-	default n
-
-config STM32F7_STM32F76XX
-	bool
-	default n
-
-config STM32F7_STM32F76XX
-	bool
-	default n
-
-config STM32F7_STM32F76XX
-	bool
-	default n
-
-config STM32F7_STM32F77XX
-	bool
-	default n
-
-config STM32F7_STM32F77XX
-	bool
-	default n
-
-config STM32F7_STM32F77XX
-	bool
-	default n
-
-config STM32F7_STM32F77XX
-	bool
-	default n
-
 config STM32F7_STM32F77XX
 	bool
 	default n
-- 
GitLab


From 189b0d004fa1a678cf628c385b75b7abc230a9ab Mon Sep 17 00:00:00 2001
From: David Sidrane 
Date: Tue, 14 Jun 2016 07:02:41 -0600
Subject: [PATCH 69/91] Added Pinmap to F7

---
 arch/arm/src/stm32f7/chip.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/src/stm32f7/chip.h b/arch/arm/src/stm32f7/chip.h
index 536b8e0010..6a8e21995f 100644
--- a/arch/arm/src/stm32f7/chip.h
+++ b/arch/arm/src/stm32f7/chip.h
@@ -48,6 +48,7 @@
 
 #include 
 #include 
+#include "chip/stm32_pinmap.h"
 #include "chip/stm32_memorymap.h"
 
 /* If the common ARMv7-M vector handling logic is used, then it expects the
-- 
GitLab


From ccfcb12ef76745d2ea47e6b987ada918573a4a8d Mon Sep 17 00:00:00 2001
From: David Sidrane 
Date: Tue, 14 Jun 2016 07:11:55 -0600
Subject: [PATCH 70/91] STM32F7: Add SPI driver.  DMA not yet supported.

---
 arch/arm/src/stm32f7/Kconfig          |   31 +
 arch/arm/src/stm32f7/Make.defs        |    4 +
 arch/arm/src/stm32f7/chip/stm32_spi.h |  258 ++++
 arch/arm/src/stm32f7/stm32_spi.c      | 1832 +++++++++++++++++++++++++
 arch/arm/src/stm32f7/stm32_spi.h      |   35 +-
 5 files changed, 2143 insertions(+), 17 deletions(-)
 create mode 100644 arch/arm/src/stm32f7/chip/stm32_spi.h
 create mode 100644 arch/arm/src/stm32f7/stm32_spi.c

diff --git a/arch/arm/src/stm32f7/Kconfig b/arch/arm/src/stm32f7/Kconfig
index 47bd03c3e1..72a6935112 100644
--- a/arch/arm/src/stm32f7/Kconfig
+++ b/arch/arm/src/stm32f7/Kconfig
@@ -1613,6 +1613,25 @@ config STM32F7_SERIALBRK_BSDCOMPAT
 
 endmenu # U[S]ART Configuration
 
+menu "SPI Configuration"
+	depends on STM32F7_SPI
+
+config STM32F7_SPI_INTERRUPTS
+	bool "Interrupt driver SPI"
+	default n
+	---help---
+		Select to enable interrupt driven SPI support. Non-interrupt-driven,
+		poll-waiting is recommended if the interrupt rate would be to high in
+		the interrupt driven case.
+
+config STM32F7_SPI_DMA
+	bool "SPI DMA"
+	default n
+	---help---
+		Use DMA to improve SPI transfer performance.  Cannot be used with STM32F7_SPI_INTERRUPT.
+
+endmenu # "SPI Configuration"
+
 config STM32F7_CUSTOM_CLOCKCONFIG
 		bool "Custom clock configuration"
 	default n
@@ -1628,6 +1647,18 @@ config STM32F7_DTCM_PROCFS
 		will provide statistics about DTCM memory use similar to what you
 		would get from mallinfo() for the user heap.
 
+config STM32F7_DMACAPABLE
+	bool "Workaround non-DMA capable memory"
+	depends on ARCH_DMA
+	default y if !STM32_CCMEXCLUDE
+	default n if STM32_CCMEXCLUDE
+	---help---
+		This option enables the DMA interface stm32_dmacapable that can be
+		used to check if it is possible to do DMA from the selected address.
+		Drivers then may use this information to determine if they should
+		attempt the DMA or fall back to a different transfer method.
+
+
 if STM32F7_ETHMAC
 menu "Ethernet MAC configuration"
 
diff --git a/arch/arm/src/stm32f7/Make.defs b/arch/arm/src/stm32f7/Make.defs
index a23e141e21..c8ac72f1b9 100644
--- a/arch/arm/src/stm32f7/Make.defs
+++ b/arch/arm/src/stm32f7/Make.defs
@@ -145,6 +145,10 @@ CHIP_CSRCS += stm32_exti_alarm.c
 endif
 endif
 
+ifeq ($(CONFIG_STM32F7_SPI),y)
+CHIP_CSRCS += stm32_spi.c
+endif
+
 ifeq ($(CONFIG_STM32F7_ETHMAC),y)
 CHIP_CSRCS += stm32_ethernet.c
 endif
diff --git a/arch/arm/src/stm32f7/chip/stm32_spi.h b/arch/arm/src/stm32f7/chip/stm32_spi.h
new file mode 100644
index 0000000000..dbd4d7301e
--- /dev/null
+++ b/arch/arm/src/stm32f7/chip/stm32_spi.h
@@ -0,0 +1,258 @@
+/************************************************************************************
+ * arch/arm/src/stm32f7/chip/stm32_spi.h
+ *
+ *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+ *   Authors: Gregory Nutt 
+ *            David Sidrane 
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ************************************************************************************/
+
+#ifndef __ARCH_ARM_STC_STM32F7_CHIP_STM32_SPI_H
+#define __ARCH_ARM_STC_STM32F7_CHIP_STM32_SPI_H
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include 
+#include "chip.h"
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
+/* Maximum allowed speed as per data sheet for all SPIs (both pclk1 and pclk2)*/
+
+#if defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX)
+#  define STM32_SPI_CLK_MAX     50000000UL
+#elif defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX)
+#  define STM32_SPI_CLK_MAX     54000000UL
+#endif
+
+/* Register Offsets *****************************************************************/
+
+#define STM32_SPI_CR1_OFFSET       0x0000  /* SPI Control Register 1 (16-bit) */
+#define STM32_SPI_CR2_OFFSET       0x0004  /* SPI control register 2 (16-bit) */
+#define STM32_SPI_SR_OFFSET        0x0008  /* SPI status register (16-bit) */
+#define STM32_SPI_DR_OFFSET        0x000c  /* SPI data register (16-bit) */
+#define STM32_SPI_CRCPR_OFFSET     0x0010  /* SPI CRC polynomial register (16-bit) */
+#define STM32_SPI_RXCRCR_OFFSET    0x0014  /* SPI Rx CRC register (16-bit) */
+#define STM32_SPI_TXCRCR_OFFSET    0x0018  /* SPI Tx CRC register (16-bit) */
+#define STM32_SPI_I2SCFGR_OFFSET   0x001c  /* I2S configuration register */
+#define STM32_SPI_I2SPR_OFFSET     0x0020  /* I2S prescaler register */
+
+/* Register Addresses ***************************************************************/
+
+#if STM32F7_NSPI > 0
+#  define STM32_SPI1_CR1          (STM32_SPI1_BASE+STM32_SPI_CR1_OFFSET)
+#  define STM32_SPI1_CR2          (STM32_SPI1_BASE+STM32_SPI_CR2_OFFSET)
+#  define STM32_SPI1_SR           (STM32_SPI1_BASE+STM32_SPI_SR_OFFSET)
+#  define STM32_SPI1_DR           (STM32_SPI1_BASE+STM32_SPI_DR_OFFSET)
+#  define STM32_SPI1_CRCPR        (STM32_SPI1_BASE+STM32_SPI_CRCPR_OFFSET)
+#  define STM32_SPI1_RXCRCR       (STM32_SPI1_BASE+STM32_SPI_RXCRCR_OFFSET)
+#  define STM32_SPI1_TXCRCR       (STM32_SPI1_BASE+STM32_SPI_TXCRCR_OFFSET)
+#endif
+
+#if STM32F7_NSPI > 1
+#  define STM32_SPI2_CR1          (STM32_SPI2_BASE+STM32_SPI_CR1_OFFSET)
+#  define STM32_SPI2_CR2          (STM32_SPI2_BASE+STM32_SPI_CR2_OFFSET)
+#  define STM32_SPI2_SR           (STM32_SPI2_BASE+STM32_SPI_SR_OFFSET)
+#  define STM32_SPI2_DR           (STM32_SPI2_BASE+STM32_SPI_DR_OFFSET)
+#  define STM32_SPI2_CRCPR        (STM32_SPI2_BASE+STM32_SPI_CRCPR_OFFSET)
+#  define STM32_SPI2_RXCRCR       (STM32_SPI2_BASE+STM32_SPI_RXCRCR_OFFSET)
+#  define STM32_SPI2_TXCRCR       (STM32_SPI2_BASE+STM32_SPI_TXCRCR_OFFSET)
+#  define STM32_SPI2_I2SCFGR      (STM32_SPI2_BASE+STM32_SPI_I2SCFGR_OFFSET)
+#  define STM32_SPI2_I2SPR        (STM32_SPI2_BASE+STM32_SPI_I2SPR_OFFSET)
+#endif
+
+#if STM32F7_NSPI > 2
+#  define STM32_SPI3_CR1          (STM32_SPI3_BASE+STM32_SPI_CR1_OFFSET)
+#  define STM32_SPI3_CR2          (STM32_SPI3_BASE+STM32_SPI_CR2_OFFSET)
+#  define STM32_SPI3_SR           (STM32_SPI3_BASE+STM32_SPI_SR_OFFSET)
+#  define STM32_SPI3_DR           (STM32_SPI3_BASE+STM32_SPI_DR_OFFSET)
+#  define STM32_SPI3_CRCPR        (STM32_SPI3_BASE+STM32_SPI_CRCPR_OFFSET)
+#  define STM32_SPI3_RXCRCR       (STM32_SPI3_BASE+STM32_SPI_RXCRCR_OFFSET)
+#  define STM32_SPI3_TXCRCR       (STM32_SPI3_BASE+STM32_SPI_TXCRCR_OFFSET)
+#  define STM32_SPI3_I2SCFGR      (STM32_SPI3_BASE+STM32_SPI_I2SCFGR_OFFSET)
+#  define STM32_SPI3_I2SPR        (STM32_SPI3_BASE+STM32_SPI_I2SPR_OFFSET)
+#endif
+
+#if STM32F7_NSPI > 3
+#  define STM32_SPI4_CR1          (STM32_SPI4_BASE+STM32_SPI_CR1_OFFSET)
+#  define STM32_SPI4_CR2          (STM32_SPI4_BASE+STM32_SPI_CR2_OFFSET)
+#  define STM32_SPI4_SR           (STM32_SPI4_BASE+STM32_SPI_SR_OFFSET)
+#  define STM32_SPI4_DR           (STM32_SPI4_BASE+STM32_SPI_DR_OFFSET)
+#  define STM32_SPI4_CRCPR        (STM32_SPI4_BASE+STM32_SPI_CRCPR_OFFSET)
+#  define STM32_SPI4_RXCRCR       (STM32_SPI4_BASE+STM32_SPI_RXCRCR_OFFSET)
+#  define STM32_SPI4_TXCRCR       (STM32_SPI4_BASE+STM32_SPI_TXCRCR_OFFSET)
+#  define STM32_SPI4_I2SCFGR      (STM32_SPI4_BASE+STM32_SPI_I2SCFGR_OFFSET)
+#  define STM32_SPI4_I2SPR        (STM32_SPI4_BASE+STM32_SPI_I2SPR_OFFSET)
+#endif
+
+#if STM32F7_NSPI > 4
+#  define STM32_SPI5_CR1          (STM32_SPI5_BASE+STM32_SPI_CR1_OFFSET)
+#  define STM32_SPI5_CR2          (STM32_SPI5_BASE+STM32_SPI_CR2_OFFSET)
+#  define STM32_SPI5_SR           (STM32_SPI5_BASE+STM32_SPI_SR_OFFSET)
+#  define STM32_SPI5_DR           (STM32_SPI5_BASE+STM32_SPI_DR_OFFSET)
+#  define STM32_SPI5_CRCPR        (STM32_SPI5_BASE+STM32_SPI_CRCPR_OFFSET)
+#  define STM32_SPI5_RXCRCR       (STM32_SPI5_BASE+STM32_SPI_RXCRCR_OFFSET)
+#  define STM32_SPI5_TXCRCR       (STM32_SPI5_BASE+STM32_SPI_TXCRCR_OFFSET)
+#  define STM32_SPI5_I2SCFGR      (STM32_SPI5_BASE+STM32_SPI_I2SCFGR_OFFSET)
+#  define STM32_SPI5_I2SPR        (STM32_SPI5_BASE+STM32_SPI_I2SPR_OFFSET)
+#endif
+
+#if STM32F7_NSPI > 5
+#  define STM32_SPI6_CR1          (STM32_SPI6_BASE+STM32_SPI_CR1_OFFSET)
+#  define STM32_SPI6_CR2          (STM32_SPI6_BASE+STM32_SPI_CR2_OFFSET)
+#  define STM32_SPI6_SR           (STM32_SPI6_BASE+STM32_SPI_SR_OFFSET)
+#  define STM32_SPI6_DR           (STM32_SPI6_BASE+STM32_SPI_DR_OFFSET)
+#  define STM32_SPI6_CRCPR        (STM32_SPI6_BASE+STM32_SPI_CRCPR_OFFSET)
+#  define STM32_SPI6_RXCRCR       (STM32_SPI6_BASE+STM32_SPI_RXCRCR_OFFSET)
+#  define STM32_SPI6_TXCRCR       (STM32_SPI6_BASE+STM32_SPI_TXCRCR_OFFSET)
+#  define STM32_SPI6_I2SCFGR      (STM32_SPI6_BASE+STM32_SPI_I2SCFGR_OFFSET)
+#  define STM32_SPI6_I2SPR        (STM32_SPI6_BASE+STM32_SPI_I2SPR_OFFSET)
+#endif
+
+/* Register Bitfield Definitions ****************************************************/
+
+/* SPI Control Register 1 */
+
+#define SPI_CR1_CPHA              (1 << 0)  /* Bit 0: Clock Phase */
+#define SPI_CR1_CPOL              (1 << 1)  /* Bit 1: Clock Polarity */
+#define SPI_CR1_MSTR              (1 << 2)  /* Bit 2: Master Selection */
+#define SPI_CR1_BR_SHIFT          (3)       /* Bits 5:3 Baud Rate Control */
+#define SPI_CR1_BR_MASK           (7 << SPI_CR1_BR_SHIFT)
+#  define SPI_CR1_FPCLCKd2        (0 << SPI_CR1_BR_SHIFT) /* 000: fPCLK/2 */
+#  define SPI_CR1_FPCLCKd4        (1 << SPI_CR1_BR_SHIFT) /* 001: fPCLK/4 */
+#  define SPI_CR1_FPCLCKd8        (2 << SPI_CR1_BR_SHIFT) /* 010: fPCLK/8 */
+#  define SPI_CR1_FPCLCKd16       (3 << SPI_CR1_BR_SHIFT) /* 011: fPCLK/16 */
+#  define SPI_CR1_FPCLCKd32       (4 << SPI_CR1_BR_SHIFT) /* 100: fPCLK/32 */
+#  define SPI_CR1_FPCLCKd64       (5 << SPI_CR1_BR_SHIFT) /* 101: fPCLK/64 */
+#  define SPI_CR1_FPCLCKd128      (6 << SPI_CR1_BR_SHIFT) /* 110: fPCLK/128 */
+#  define SPI_CR1_FPCLCKd256      (7 << SPI_CR1_BR_SHIFT) /* 111: fPCLK/256 */
+#define SPI_CR1_SPE               (1 << 6)  /* Bit 6: SPI Enable */
+#define SPI_CR1_LSBFIRST          (1 << 7)  /* Bit 7: Frame Format */
+#define SPI_CR1_SSI               (1 << 8)  /* Bit 8: Internal slave select */
+#define SPI_CR1_SSM               (1 << 9)  /* Bit 9: Software slave management */
+#define SPI_CR1_RXONLY            (1 << 10) /* Bit 10: Receive only */
+#define SPI_CR1_CRCL              (1 << 11) /* Bit 11: CRC length */
+#define SPI_CR1_CRCNEXT           (1 << 12) /* Bit 12: Transmit CRC next */
+#define SPI_CR1_CRCEN             (1 << 13) /* Bit 13: Hardware CRC calculation enable */
+#define SPI_CR1_BIDIOE            (1 << 14) /* Bit 14: Output enable in bidirectional mode */
+#define SPI_CR1_BIDIMODE          (1 << 15) /* Bit 15: Bidirectional data mode enable */
+
+/* SPI Control Register 2 */
+
+#define SPI_CR2_RXDMAEN           (1 << 0)  /* Bit 0: Rx Buffer DMA Enable */
+#define SPI_CR2_TXDMAEN           (1 << 1)  /* Bit 1: Tx Buffer DMA Enable */
+#define SPI_CR2_SSOE              (1 << 2)  /* Bit 2: SS Output Enable */
+#define SPI_CR2_NSSP              (1 << 3)  /* Bit 3 NSSP: NSS pulse management */
+#define SPI_CR2_FRF               (1 << 4)  /* Bit 4: Frame format */
+#define SPI_CR2_ERRIE             (1 << 5)  /* Bit 5: Error interrupt enable */
+#define SPI_CR2_RXNEIE            (1 << 6)  /* Bit 6: RX buffer not empty interrupt enable */
+#define SPI_CR2_TXEIE             (1 << 7)  /* Bit 7: Tx buffer empty interrupt enable */
+#define SPI_CR2_DS_SHIFT          (8)       /* Bits 8-11:  Data size */
+#define SPI_CR2_DS_MASK           (0xf << SPI_CR2_DS_SHIFT)
+#  define SPI_CR2_DS_VAL(bits)    (((bits)-1) << SPI_CR2_DS_SHIFT)
+#  define SPI_CR2_DS_4BIT         SPI_CR2_DS_VAL(4)
+#  define SPI_CR2_DS_5BIT         SPI_CR2_DS_VAL(5)
+#  define SPI_CR2_DS_6BIT         SPI_CR2_DS_VAL(6)
+#  define SPI_CR2_DS_7BIT         SPI_CR2_DS_VAL(7)
+#  define SPI_CR2_DS_8BIT         SPI_CR2_DS_VAL(8)
+#  define SPI_CR2_DS_9BIT         SPI_CR2_DS_VAL(9)
+#  define SPI_CR2_DS_10BIT        SPI_CR2_DS_VAL(10)
+#  define SPI_CR2_DS_11BIT        SPI_CR2_DS_VAL(11)
+#  define SPI_CR2_DS_12BIT        SPI_CR2_DS_VAL(12)
+#  define SPI_CR2_DS_13BIT        SPI_CR2_DS_VAL(13)
+#  define SPI_CR2_DS_14BIT        SPI_CR2_DS_VAL(14)
+#  define SPI_CR2_DS_15BIT        SPI_CR2_DS_VAL(15)
+#  define SPI_CR2_DS_16BIT        SPI_CR2_DS_VAL(16)
+#define SPI_CR2_FRXTH             (1 << 12) /* Bit 12: FIFO reception threshold */
+#define SPI_CR2_LDMARX            (1 << 13) /* Bit 13: Last DMA transfer for receptione */
+#define SPI_CR2_LDMATX            (1 << 14) /* Bit 14: Last DMA transfer for transmission */
+
+/* SPI status register */
+
+#define SPI_SR_RXNE               (1 << 0)  /* Bit 0: Receive buffer not empty */
+#define SPI_SR_TXE                (1 << 1)  /* Bit 1: Transmit buffer empty */
+#define SPI_SR_CHSIDE             (1 << 2)  /* Bit 2: Channel side (i2s) */
+#define SPI_SR_UDR                (1 << 3)  /* Bit 3: Underrun flag (i2s) */
+#define SPI_SR_CRCERR             (1 << 4)  /* Bit 4: CRC error flag */
+#define SPI_SR_MODF               (1 << 5)  /* Bit 5: Mode fault */
+#define SPI_SR_OVR                (1 << 6)  /* Bit 6: Overrun flag */
+#define SPI_SR_BSY                (1 << 7)  /* Bit 7: Busy flag */
+#define SPI_SR_FRE                (1 << 8)  /* Bit 8: Frame format error */
+#define SPI_SR_FRLVL_SHIFT       (9)       /* Bits 9-10: FIFO reception level */
+#define SPI_SR_FRLVL_MASK        (0x3 << SPI_SR_FRLVL_SHIFT)
+#  define SPI_SR_FRLVL_EMPTY     (0 << SPI_SR_FRLVL_SHIFT) /* FIFO empty */
+#  define SPI_SR_FRLVL_QUARTER   (1 << SPI_SR_FRLVL_SHIFT) /* 1/4 FIFO */
+#  define SPI_SR_FRLVL_HALF      (2 << SPI_SR_FRLVL_SHIFT) /* 1/2 FIFO */
+#  define SPI_SR_FRLVL_FULL      (3 << SPI_SR_FRLVL_SHIFT) /* FIFO full */
+#define SPI_SR_FTLVL_SHIFT       (11)      /* Bits 11-12: FIFO transmission level */
+#define SPI_SR_FTLVL_MASK        (0x3 << SPI_SR_FTLVL_SHIFT)
+#  define SPI_SR_FTLVL_EMPTY     (0 << SPI_SR_FTLVL_SHIFT) /* FIFO empty */
+#  define SPI_SR_FTLVL_QUARTER   (1 << SPI_SR_FTLVL_SHIFT) /* 1/4 FIFO */
+#  define SPI_SR_FTLVL_HALF      (2 << SPI_SR_FTLVL_SHIFT) /* 1/2 FIFO */
+#  define SPI_SR_FTLVL_FULL      (3 << SPI_SR_FTLVL_SHIFT) /* FIFO full */
+
+/* I2S configuration register */
+
+#define SPI_I2SCFGR_CHLEN          (1 << 0)  /* Bit 0: Channel length (number of bits per audio channel) */
+#define SPI_I2SCFGR_DATLEN_SHIFT   (1)       /* Bit 1-2: Data length to be transferred */
+#define SPI_I2SCFGR_DATLEN_MASK    (3 << SPI_I2SCFGR_DATLEN_SHIFT)
+#  define SPI_I2SCFGR_DATLEN_16BIT (0 << SPI_I2SCFGR_DATLEN_SHIFT) /* 00: 16-bit data length */
+#  define SPI_I2SCFGR_DATLEN_8BIT  (1 << SPI_I2SCFGR_DATLEN_SHIFT) /* 01: 24-bit data length */
+#  define SPI_I2SCFGR_DATLEN_32BIT (2 << SPI_I2SCFGR_DATLEN_SHIFT) /* 10: 32-bit data length */
+#define SPI_I2SCFGR_CKPOL          (1 << 3)  /* Bit 3: Steady state clock polarity */
+#define SPI_I2SCFGR_I2SSTD_SHIFT   (4)       /* Bit 4-5: I2S standard selection */
+#define SPI_I2SCFGR_I2SSTD_MASK    (3 << SPI_I2SCFGR_I2SSTD_SHIFT)
+#  define SPI_I2SCFGR_I2SSTD_PHILLIPS    (00 << SPI_I2SCFGR_I2SSTD_SHIFT) /* 00: I2S Phillips standard. */
+#  define SPI_I2SCFGR_I2SSTD_MSB   (1 << SPI_I2SCFGR_I2SSTD_SHIFT) /* 01: MSB justified standard (left justified) */
+#  define SPI_I2SCFGR_I2SSTD_LSB   (2 << SPI_I2SCFGR_I2SSTD_SHIFT) /* 10: LSB justified standard (right justified) */
+#  define SPI_I2SCFGR_I2SSTD_PCM   (3 << SPI_I2SCFGR_I2SSTD_SHIFT) /* 11: PCM standard */
+#define SPI_I2SCFGR_PCMSYNC        (1 << 7)  /* Bit 7: PCM frame synchronization */
+#define SPI_I2SCFGR_I2SCFG_SHIFT   (8)       /* Bit 8-9: I2S configuration mode */
+#define SPI_I2SCFGR_I2SCFG_MASK    (3 << SPI_I2SCFGR_I2SCFG_SHIFT)
+#  define SPI_I2SCFGR_I2SCFG_STX   (0 << SPI_I2SCFGR_I2SCFG_SHIFT) /* 00: Slave - transmit */
+#  define SPI_I2SCFGR_I2SCFG_SRX   (1 << SPI_I2SCFGR_I2SCFG_SHIFT) /* 01: Slave - receive */
+#  define SPI_I2SCFGR_I2SCFG_MTX   (2 << SPI_I2SCFGR_I2SCFG_SHIFT) /* 10: Master - transmit */
+#  define SPI_I2SCFGR_I2SCFG_MRX   (3 << SPI_I2SCFGR_I2SCFG_SHIFT) /* 11: Master - receive */
+#define SPI_I2SCFGR_I2SE           (1 << 10) /* Bit 10: I2S Enable */
+#define SPI_I2SCFGR_I2SMOD         (1 << 11) /* Bit 11: I2S mode selection */
+#define SPI_I2SCFGR_ASTRTEN        (1 << 12) /* Bit 12: Asynchronous start enable */
+
+/* I2S prescaler register */
+
+#define SPI_I2SPR_I2SDIV_SHIFT     (0)       /* Bit 0-7: I2S Linear prescaler */
+#define SPI_I2SPR_I2SDIV_MASK      (0xff << SPI_I2SPR_I2SDIV_SHIFT)
+#define SPI_I2SPR_ODD              (1 << 8)  /* Bit 8: Odd factor for the prescaler */
+#define SPI_I2SPR_MCKOE            (1 << 9)  /* Bit 9: Master clock output enable */
+
+#endif /* __ARCH_ARM_STC_STM32F7_CHIP_STM32_SPI_H */
diff --git a/arch/arm/src/stm32f7/stm32_spi.c b/arch/arm/src/stm32f7/stm32_spi.c
new file mode 100644
index 0000000000..2a442daa94
--- /dev/null
+++ b/arch/arm/src/stm32f7/stm32_spi.c
@@ -0,0 +1,1832 @@
+/************************************************************************************
+ * arm/arm/src/stm32f7/stm32_spi.c
+ *
+ *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+ *   Authors: Gregory Nutt 
+ *            David Sidrane 
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ************************************************************************************/
+
+/************************************************************************************
+ * The external functions, stm32_spi1/2/3/4/5/6select and stm32_spi1/2/3/4/5/6status
+ * must be * provided by board-specific logic.  They are implementations of the select
+ * and status methods of the SPI interface defined by struct spi_ops_s (see
+ * include/nuttx/spi/spi.h). All other methods (including stm32_spibus_initialize())
+ * are provided by common STM32 logic.  To use this common SPI logic on your
+ * board:
+ *
+ *   1. Provide logic in stm32_boardinitialize() to configure SPI chip select
+ *      pins.
+ *   2. Provide stm32_spi1/2/3/4/5/6select() and stm32_spi1/2/3/4/5/6status()
+ *      functions in your board-specific logic.  These functions will perform chip
+ *      selection and status operations using GPIOs in the way your board is
+ *      configured.
+ *   3. Add a calls to stm32_spibus_initialize() in your low level application
+ *      initialization logic
+ *   4. The handle returned by stm32_spibus_initialize() may then be used to bind the
+ *      SPI driver to higher level logic (e.g., calling
+ *      mmcsd_spislotinitialize(), for example, will bind the SPI driver to
+ *      the SPI MMC/SD driver).
+ *
+ ****************************************************c*******************************/
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+
+#include 
+
+#include "up_internal.h"
+#include "up_arch.h"
+
+#include "chip.h"
+#include "stm32_gpio.h"
+#include "stm32_dma.h"
+#include "stm32_spi.h"
+
+#if defined(CONFIG_STM32F7_SPI1) || defined(CONFIG_STM32F7_SPI2) || \
+    defined(CONFIG_STM32F7_SPI3) || defined(CONFIG_STM32F7_SPI4) || \
+    defined(CONFIG_STM32F7_SPI5) || defined(CONFIG_STM32F7_SPI6)
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
+/* Configuration ********************************************************************/
+/* SPI interrupts */
+
+#ifdef CONFIG_STM32F7_SPI_INTERRUPTS
+#  error "Interrupt driven SPI not yet supported"
+#endif
+
+/* Can't have both interrupt driven SPI and SPI DMA */
+
+#if defined(CONFIG_STM32F7_SPI_INTERRUPTS) && defined(CONFIG_STM32F7_SPI_DMA)
+#  error "Cannot enable both interrupt mode and DMA mode for SPI"
+#endif
+
+/* SPI DMA priority */
+
+#ifdef CONFIG_STM32F7_SPI_DMA
+
+#  error "SPI DMA not yet supported"
+
+#  if defined(CONFIG_SPI_DMAPRIO)
+#    define SPI_DMA_PRIO  CONFIG_SPI_DMAPRIO
+#  elif defined(DMA_SCR_PRIMED)
+#    define SPI_DMA_PRIO  DMA_SCR_PRIMED
+#  else
+#    error "Unknown STM32 DMA"
+#  endif
+
+#if (SPI_DMA_PRIO & ~DMA_SCR_PL_MASK) != 0
+#    error "Illegal value for CONFIG_SPI_DMAPRIO"
+#endif
+
+
+/* DMA channel configuration */
+
+#  define SPI_RXDMA16_CONFIG        (SPI_DMA_PRIO|DMA_SCR_MSIZE_16BITS|DMA_SCR_PSIZE_16BITS|DMA_SCR_MINC|DMA_SCR_DIR_P2M)
+#  define SPI_RXDMA8_CONFIG         (SPI_DMA_PRIO|DMA_SCR_MSIZE_8BITS |DMA_SCR_PSIZE_8BITS |DMA_SCR_MINC|DMA_SCR_DIR_P2M)
+#  define SPI_RXDMA16NULL_CONFIG    (SPI_DMA_PRIO|DMA_SCR_MSIZE_8BITS |DMA_SCR_PSIZE_16BITS             |DMA_SCR_DIR_P2M)
+#  define SPI_RXDMA8NULL_CONFIG     (SPI_DMA_PRIO|DMA_SCR_MSIZE_8BITS |DMA_SCR_PSIZE_8BITS              |DMA_SCR_DIR_P2M)
+#  define SPI_TXDMA16_CONFIG        (SPI_DMA_PRIO|DMA_SCR_MSIZE_16BITS|DMA_SCR_PSIZE_16BITS|DMA_SCR_MINC|DMA_SCR_DIR_M2P)
+#  define SPI_TXDMA8_CONFIG         (SPI_DMA_PRIO|DMA_SCR_MSIZE_8BITS |DMA_SCR_PSIZE_8BITS |DMA_SCR_MINC|DMA_SCR_DIR_M2P)
+#  define SPI_TXDMA16NULL_CONFIG    (SPI_DMA_PRIO|DMA_SCR_MSIZE_8BITS |DMA_SCR_PSIZE_16BITS             |DMA_SCR_DIR_M2P)
+#  define SPI_TXDMA8NULL_CONFIG     (SPI_DMA_PRIO|DMA_SCR_MSIZE_8BITS |DMA_SCR_PSIZE_8BITS              |DMA_SCR_DIR_M2P)
+#endif
+
+/* Debug ****************************************************************************/
+/* Check if SPI debug is enabled */
+
+#ifdef CONFIG_DEBUG_SPI
+#  define spierr   llerr
+#  define spiwarn  llwarn
+#  define spiinfo  llinfo
+#else
+#  define spierr(x...)
+#  define spiwarn(x...)
+#  define spiinfo(x...)
+#endif
+
+/************************************************************************************
+ * Private Types
+ ************************************************************************************/
+
+struct stm32_spidev_s
+{
+  struct spi_dev_s spidev;     /* Externally visible part of the SPI interface */
+  uint32_t         spibase;    /* SPIn base address */
+  uint32_t         spiclock;   /* Clocking for the SPI module */
+#ifdef CONFIG_STM32F7_SPI_INTERRUPTS
+  uint8_t          spiirq;     /* SPI IRQ number */
+#endif
+#ifdef CONFIG_STM32F7_SPI_DMA
+  volatile uint8_t rxresult;   /* Result of the RX DMA */
+  volatile uint8_t txresult;   /* Result of the RX DMA */
+  uint8_t          rxch;       /* The RX DMA channel number */
+  uint8_t          txch;       /* The TX DMA channel number */
+  DMA_HANDLE       rxdma;      /* DMA channel handle for RX transfers */
+  DMA_HANDLE       txdma;      /* DMA channel handle for TX transfers */
+  sem_t            rxsem;      /* Wait for RX DMA to complete */
+  sem_t            txsem;      /* Wait for TX DMA to complete */
+  uint32_t         txccr;      /* DMA control register for TX transfers */
+  uint32_t         rxccr;      /* DMA control register for RX transfers */
+#endif
+  sem_t            exclsem;    /* Held while chip is selected for mutual exclusion */
+  uint32_t         frequency;  /* Requested clock frequency */
+  uint32_t         actual;     /* Actual clock frequency */
+  int8_t           nbits;      /* Width of word in bits */
+  uint8_t          mode;       /* Mode 0,1,2,3 */
+};
+
+/************************************************************************************
+ * Private Function Prototypes
+ ************************************************************************************/
+
+/* Helpers */
+
+static inline uint16_t spi_getreg(FAR struct stm32_spidev_s *priv, uint8_t offset);
+static inline void spi_putreg(FAR struct stm32_spidev_s *priv, uint8_t offset,
+                                 uint16_t value);
+static inline uint16_t spi_readword(FAR struct stm32_spidev_s *priv);
+static inline void spi_writeword(FAR struct stm32_spidev_s *priv, uint16_t byte);
+static inline bool spi_9to16bitmode(FAR struct stm32_spidev_s *priv);
+
+/* DMA support */
+
+#ifdef CONFIG_STM32F7_SPI_DMA
+static void        spi_dmarxwait(FAR struct stm32_spidev_s *priv);
+static void        spi_dmatxwait(FAR struct stm32_spidev_s *priv);
+static inline void spi_dmarxwakeup(FAR struct stm32_spidev_s *priv);
+static inline void spi_dmatxwakeup(FAR struct stm32_spidev_s *priv);
+static void        spi_dmarxcallback(DMA_HANDLE handle, uint8_t isr, void *arg);
+static void        spi_dmatxcallback(DMA_HANDLE handle, uint8_t isr, void *arg);
+static void        spi_dmarxsetup(FAR struct stm32_spidev_s *priv,
+                                  FAR void *rxbuffer, FAR void *rxdummy, size_t nwords);
+static void        spi_dmatxsetup(FAR struct stm32_spidev_s *priv,
+                                  FAR const void *txbuffer, FAR const void *txdummy, size_t nwords);
+static inline void spi_dmarxstart(FAR struct stm32_spidev_s *priv);
+static inline void spi_dmatxstart(FAR struct stm32_spidev_s *priv);
+#endif
+
+/* SPI methods */
+
+static int         spi_lock(FAR struct spi_dev_s *dev, bool lock);
+static uint32_t    spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency);
+static void        spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode);
+static void        spi_setbits(FAR struct spi_dev_s *dev, int nbits);
+static uint16_t    spi_send(FAR struct spi_dev_s *dev, uint16_t wd);
+static void        spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
+                                FAR void *rxbuffer, size_t nwords);
+#ifndef CONFIG_SPI_EXCHANGE
+static void        spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
+                                size_t nwords);
+static void        spi_recvblock(FAR struct spi_dev_s *dev, FAR void *rxbuffer,
+                                 size_t nwords);
+#endif
+
+/* Initialization */
+
+static void        spi_bus_initialize(FAR struct stm32_spidev_s *priv);
+
+/************************************************************************************
+ * Private Data
+ ************************************************************************************/
+
+#ifdef CONFIG_STM32F7_SPI1
+static const struct spi_ops_s g_sp1iops =
+{
+  .lock              = spi_lock,
+  .select            = stm32_spi1select,
+  .setfrequency      = spi_setfrequency,
+  .setmode           = spi_setmode,
+  .setbits           = spi_setbits,
+#ifdef CONFIG_SPI_HWFEATURES
+  .hwfeatures        = 0,                   /* Not supported */
+#endif
+  .status            = stm32_spi1status,
+#ifdef CONFIG_SPI_CMDDATA
+  .cmddata           = stm32_spi1cmddata,
+#endif
+  .send              = spi_send,
+#ifdef CONFIG_SPI_EXCHANGE
+  .exchange          = spi_exchange,
+#else
+  .sndblock          = spi_sndblock,
+  .recvblock         = spi_recvblock,
+#endif
+#ifdef CONFIG_SPI_CALLBACK
+  .registercallback  = stm32_spi1register,  /* Provided externally */
+#else
+  .registercallback  = 0,                   /* Not implemented */
+#endif
+};
+
+static struct stm32_spidev_s g_spi1dev =
+{
+  .spidev   = { &g_sp1iops },
+  .spibase  = STM32_SPI1_BASE,
+  .spiclock = STM32_PCLK2_FREQUENCY,
+#ifdef CONFIG_STM32F7_SPI_INTERRUPTS
+  .spiirq   = STM32_IRQ_SPI1,
+#endif
+#ifdef CONFIG_STM32F7_SPI_DMA
+  .rxch     = DMACHAN_SPI1_RX,
+  .txch     = DMACHAN_SPI1_TX,
+#endif
+};
+#endif
+
+#ifdef CONFIG_STM32F7_SPI2
+static const struct spi_ops_s g_sp2iops =
+{
+  .lock              = spi_lock,
+  .select            = stm32_spi2select,
+  .setfrequency      = spi_setfrequency,
+  .setmode           = spi_setmode,
+  .setbits           = spi_setbits,
+  .status            = stm32_spi2status,
+#ifdef CONFIG_SPI_CMDDATA
+  .cmddata           = stm32_spi2cmddata,
+#endif
+  .send              = spi_send,
+#ifdef CONFIG_SPI_EXCHANGE
+  .exchange          = spi_exchange,
+#else
+  .sndblock          = spi_sndblock,
+  .recvblock         = spi_recvblock,
+#endif
+#ifdef CONFIG_SPI_CALLBACK
+  .registercallback  = stm32_spi2register,  /* provided externally */
+#else
+  .registercallback  = 0,  /* not implemented */
+#endif
+};
+
+static struct stm32_spidev_s g_spi2dev =
+{
+  .spidev   = { &g_sp2iops },
+  .spibase  = STM32_SPI2_BASE,
+  .spiclock = STM32_PCLK1_FREQUENCY,
+#ifdef CONFIG_STM32F7_SPI_INTERRUPTS
+  .spiirq   = STM32_IRQ_SPI2,
+#endif
+#ifdef CONFIG_STM32F7_SPI_DMA
+  .rxch     = DMACHAN_SPI2_RX,
+  .txch     = DMACHAN_SPI2_TX,
+#endif
+};
+#endif
+
+#ifdef CONFIG_STM32F7_SPI3
+static const struct spi_ops_s g_sp3iops =
+{
+  .lock              = spi_lock,
+  .select            = stm32_spi3select,
+  .setfrequency      = spi_setfrequency,
+  .setmode           = spi_setmode,
+  .setbits           = spi_setbits,
+  .status            = stm32_spi3status,
+#ifdef CONFIG_SPI_CMDDATA
+  .cmddata           = stm32_spi3cmddata,
+#endif
+  .send              = spi_send,
+#ifdef CONFIG_SPI_EXCHANGE
+  .exchange          = spi_exchange,
+#else
+  .sndblock          = spi_sndblock,
+  .recvblock         = spi_recvblock,
+#endif
+#ifdef CONFIG_SPI_CALLBACK
+  .registercallback  = stm32_spi3register,  /* provided externally */
+#else
+  .registercallback  = 0,  /* not implemented */
+#endif
+};
+
+static struct stm32_spidev_s g_spi3dev =
+{
+  .spidev   = { &g_sp3iops },
+  .spibase  = STM32_SPI3_BASE,
+  .spiclock = STM32_PCLK1_FREQUENCY,
+#ifdef CONFIG_STM32F7_SPI_INTERRUPTS
+  .spiirq   = STM32_IRQ_SPI3,
+#endif
+#ifdef CONFIG_STM32F7_SPI_DMA
+  .rxch     = DMACHAN_SPI3_RX,
+  .txch     = DMACHAN_SPI3_TX,
+#endif
+};
+#endif
+
+#ifdef CONFIG_STM32F7_SPI4
+static const struct spi_ops_s g_sp4iops =
+{
+  .lock              = spi_lock,
+  .select            = stm32_spi4select,
+  .setfrequency      = spi_setfrequency,
+  .setmode           = spi_setmode,
+  .setbits           = spi_setbits,
+  .status            = stm32_spi4status,
+#ifdef CONFIG_SPI_CMDDATA
+  .cmddata           = stm32_spi4cmddata,
+#endif
+  .send              = spi_send,
+#ifdef CONFIG_SPI_EXCHANGE
+  .exchange          = spi_exchange,
+#else
+  .sndblock          = spi_sndblock,
+  .recvblock         = spi_recvblock,
+#endif
+#ifdef CONFIG_SPI_CALLBACK
+  .registercallback  = stm32_spi4register,  /* provided externally */
+#else
+  .registercallback  = 0,  /* not implemented */
+#endif
+};
+
+static struct stm32_spidev_s g_spi4dev =
+{
+  .spidev   = { &g_sp4iops },
+  .spibase  = STM32_SPI4_BASE,
+  .spiclock = STM32_PCLK2_FREQUENCY,
+#ifdef CONFIG_STM32F7_SPI_INTERRUPTS
+  .spiirq   = STM32_IRQ_SPI4,
+#endif
+#ifdef CONFIG_STM32F7_SPI_DMA
+  .rxch     = DMACHAN_SPI4_RX,
+  .txch     = DMACHAN_SPI4_TX,
+#endif
+};
+#endif
+
+#ifdef CONFIG_STM32F7_SPI5
+static const struct spi_ops_s g_sp5iops =
+{
+  .lock              = spi_lock,
+  .select            = stm32_spi5select,
+  .setfrequency      = spi_setfrequency,
+  .setmode           = spi_setmode,
+  .setbits           = spi_setbits,
+  .status            = stm32_spi5status,
+#ifdef CONFIG_SPI_CMDDATA
+  .cmddata           = stm32_spi5cmddata,
+#endif
+  .send              = spi_send,
+#ifdef CONFIG_SPI_EXCHANGE
+  .exchange          = spi_exchange,
+#else
+  .sndblock          = spi_sndblock,
+  .recvblock         = spi_recvblock,
+#endif
+#ifdef CONFIG_SPI_CALLBACK
+  .registercallback  = stm32_spi5register,  /* provided externally */
+#else
+  .registercallback  = 0,  /* not implemented */
+#endif
+};
+
+static struct stm32_spidev_s g_spi5dev =
+{
+  .spidev   = { &g_sp5iops },
+  .spibase  = STM32_SPI5_BASE,
+  .spiclock = STM32_PCLK2_FREQUENCY,
+#ifdef CONFIG_STM32F7_SPI_INTERRUPTS
+  .spiirq   = STM32_IRQ_SPI5,
+#endif
+#ifdef CONFIG_STM32F7_SPI_DMA
+  .rxch     = DMACHAN_SPI5_RX,
+  .txch     = DMACHAN_SPI5_TX,
+#endif
+};
+#endif
+
+#ifdef CONFIG_STM32F7_SPI6
+static const struct spi_ops_s g_sp6iops =
+{
+  .lock              = spi_lock,
+  .select            = stm32_spi6select,
+  .setfrequency      = spi_setfrequency,
+  .setmode           = spi_setmode,
+  .setbits           = spi_setbits,
+  .status            = stm32_spi6status,
+#ifdef CONFIG_SPI_CMDDATA
+  .cmddata           = stm32_spi3cmddata,
+#endif
+  .send              = spi_send,
+#ifdef CONFIG_SPI_EXCHANGE
+  .exchange          = spi_exchange,
+#else
+  .sndblock          = spi_sndblock,
+  .recvblock         = spi_recvblock,
+#endif
+#ifdef CONFIG_SPI_CALLBACK
+  .registercallback  = stm32_spi6register,  /* provided externally */
+#else
+  .registercallback  = 0,  /* not implemented */
+#endif
+};
+
+static struct stm32_spidev_s g_spi6dev =
+{
+  .spidev   = { &g_sp6iops },
+  .spibase  = STM32_SPI6_BASE,
+  .spiclock = STM32_PCLK2_FREQUENCY,
+#ifdef CONFIG_STM32F7_SPI_INTERRUPTS
+  .spiirq   = STM32_IRQ_SPI6,
+#endif
+#ifdef CONFIG_STM32F7_SPI_DMA
+  .rxch     = DMACHAN_SPI6_RX,
+  .txch     = DMACHAN_SPI6_TX,
+#endif
+};
+#endif
+
+/************************************************************************************
+ * Private Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Name: spi_getreg8
+ *
+ * Description:
+ *   Get the contents of the SPI register at offset
+ *
+ * Input Parameters:
+ *   priv   - private SPI device structure
+ *   offset - offset to the register of interest
+ *
+ * Returned Value:
+ *   The contents of the 8-bit register
+ *
+ ************************************************************************************/
+
+static inline uint8_t spi_getreg8(FAR struct stm32_spidev_s *priv, uint8_t offset)
+{
+  return getreg8(priv->spibase + offset);
+}
+
+/************************************************************************************
+ * Name: spi_putreg8
+ *
+ * Description:
+ *   Write a 8-bit value to the SPI register at offset
+ *
+ * Input Parameters:
+ *   priv   - private SPI device structure
+ *   offset - offset to the register of interest
+ *   value  - the 8-bit value to be written
+ *
+ ************************************************************************************/
+
+static inline void spi_putreg8(FAR struct stm32_spidev_s *priv, uint8_t offset,
+                               uint8_t value)
+{
+  putreg8(value, priv->spibase + offset);
+}
+
+/************************************************************************************
+ * Name: spi_getreg
+ *
+ * Description:
+ *   Get the contents of the SPI register at offset
+ *
+ * Input Parameters:
+ *   priv   - private SPI device structure
+ *   offset - offset to the register of interest
+ *
+ * Returned Value:
+ *   The contents of the 16-bit register
+ *
+ ************************************************************************************/
+
+static inline uint16_t spi_getreg(FAR struct stm32_spidev_s *priv, uint8_t offset)
+{
+  return getreg16(priv->spibase + offset);
+}
+
+/************************************************************************************
+ * Name: spi_putreg
+ *
+ * Description:
+ *   Write a 16-bit value to the SPI register at offset
+ *
+ * Input Parameters:
+ *   priv   - private SPI device structure
+ *   offset - offset to the register of interest
+ *   value  - the 16-bit value to be written
+ *
+ * Returned Value:
+ *   The contents of the 16-bit register
+ *
+ ************************************************************************************/
+
+static inline void spi_putreg(FAR struct stm32_spidev_s *priv, uint8_t offset,
+                              uint16_t value)
+{
+  putreg16(value, priv->spibase + offset);
+}
+
+/************************************************************************************
+ * Name: spi_readword
+ *
+ * Description:
+ *   Read one byte from SPI
+ *
+ * Input Parameters:
+ *   priv - Device-specific state data
+ *
+ * Returned Value:
+ *   Byte as read
+ *
+ ************************************************************************************/
+
+static inline uint16_t spi_readword(FAR struct stm32_spidev_s *priv)
+{
+  /* Wait until the receive buffer is not empty */
+
+  while ((spi_getreg(priv, STM32_SPI_SR_OFFSET) & SPI_SR_RXNE) == 0);
+
+  /* Then return the received byte */
+
+  return spi_getreg(priv, STM32_SPI_DR_OFFSET);
+}
+
+/************************************************************************************
+ * Name: spi_writeword
+ *
+ * Description:
+ *   Write one byte to SPI
+ *
+ * Input Parameters:
+ *   priv - Device-specific state data
+ *   byte - Byte to send
+ *
+ * Returned Value:
+ *   None
+ *
+ ************************************************************************************/
+
+static inline void spi_writeword(FAR struct stm32_spidev_s *priv, uint16_t word)
+{
+  /* Wait until the transmit buffer is empty */
+
+  while ((spi_getreg(priv, STM32_SPI_SR_OFFSET) & SPI_SR_TXE) == 0);
+
+  /* Then send the byte */
+
+  spi_putreg(priv, STM32_SPI_DR_OFFSET, word);
+}
+
+/************************************************************************************
+ * Name: spi_readbyte
+ *
+ * Description:
+ *   Read one byte from SPI
+ *
+ * Input Parameters:
+ *   priv - Device-specific state data
+ *
+ * Returned Value:
+ *   Byte as read
+ *
+ ************************************************************************************/
+
+static inline uint8_t spi_readbyte(FAR struct stm32_spidev_s *priv)
+{
+  /* Wait until the receive buffer is not empty */
+
+  while ((spi_getreg(priv, STM32_SPI_SR_OFFSET) & SPI_SR_RXNE) == 0);
+
+  /* Then return the received byte */
+
+  return spi_getreg8(priv, STM32_SPI_DR_OFFSET);
+}
+
+/************************************************************************************
+ * Name: spi_writebyte
+ *
+ * Description:
+ *   Write one 8-bit frame to the SPI FIFO
+ *
+ * Input Parameters:
+ *   priv - Device-specific state data
+ *   byte - Byte to send
+ *
+ * Returned Value:
+ *   None
+ *
+ ************************************************************************************/
+
+static inline void spi_writebyte(FAR struct stm32_spidev_s *priv, uint8_t byte)
+{
+  /* Wait until the transmit buffer is empty */
+
+  while ((spi_getreg(priv, STM32_SPI_SR_OFFSET) & SPI_SR_TXE) == 0);
+
+  /* Then send the byte */
+
+  spi_putreg8(priv, STM32_SPI_DR_OFFSET, byte);
+}
+
+/************************************************************************************
+ * Name: spi_9to16bitmode
+ *
+ * Description:
+ *   Check if the SPI is operating in more then 8 bit mode
+ *
+ * Input Parameters:
+ *   priv     - Device-specific state data
+ *
+ * Returned Value:
+ *   true: >8 bit mode-bit mode, false: <= 8-bit mode
+ *
+ ************************************************************************************/
+
+static inline bool spi_9to16bitmode(FAR struct stm32_spidev_s *priv)
+{
+  return ((spi_getreg(priv, STM32_SPI_CR2_OFFSET) & SPI_CR2_DS_9BIT) == SPI_CR2_DS_9BIT);
+}
+
+/************************************************************************************
+ * Name: spi_dmarxwait
+ *
+ * Description:
+ *   Wait for DMA to complete.
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_STM32F7_SPI_DMA
+static void spi_dmarxwait(FAR struct stm32_spidev_s *priv)
+{
+  /* Take the semaphore (perhaps waiting).  If the result is zero, then the DMA
+   * must not really have completed???
+   */
+
+  while (sem_wait(&priv->rxsem) != 0 || priv->rxresult == 0)
+    {
+      /* The only case that an error should occur here is if the wait was awakened
+       * by a signal.
+       */
+
+      ASSERT(errno == EINTR);
+    }
+}
+#endif
+
+/************************************************************************************
+ * Name: spi_dmatxwait
+ *
+ * Description:
+ *   Wait for DMA to complete.
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_STM32F7_SPI_DMA
+static void spi_dmatxwait(FAR struct stm32_spidev_s *priv)
+{
+  /* Take the semaphore (perhaps waiting).  If the result is zero, then the DMA
+   * must not really have completed???
+   */
+
+  while (sem_wait(&priv->txsem) != 0 || priv->txresult == 0)
+    {
+      /* The only case that an error should occur here is if the wait was awakened
+       * by a signal.
+       */
+
+      ASSERT(errno == EINTR);
+    }
+}
+#endif
+
+/************************************************************************************
+ * Name: spi_dmarxwakeup
+ *
+ * Description:
+ *   Signal that DMA is complete
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_STM32F7_SPI_DMA
+static inline void spi_dmarxwakeup(FAR struct stm32_spidev_s *priv)
+{
+  (void)sem_post(&priv->rxsem);
+}
+#endif
+
+/************************************************************************************
+ * Name: spi_dmatxwakeup
+ *
+ * Description:
+ *   Signal that DMA is complete
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_STM32F7_SPI_DMA
+static inline void spi_dmatxwakeup(FAR struct stm32_spidev_s *priv)
+{
+  (void)sem_post(&priv->txsem);
+}
+#endif
+
+/************************************************************************************
+ * Name: spi_dmarxcallback
+ *
+ * Description:
+ *   Called when the RX DMA completes
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_STM32F7_SPI_DMA
+static void spi_dmarxcallback(DMA_HANDLE handle, uint8_t isr, void *arg)
+{
+  FAR struct stm32_spidev_s *priv = (FAR struct stm32_spidev_s *)arg;
+
+  /* Wake-up the SPI driver */
+
+  priv->rxresult = isr | 0x080;  /* OR'ed with 0x80 to assure non-zero */
+  spi_dmarxwakeup(priv);
+}
+#endif
+
+/************************************************************************************
+ * Name: spi_dmatxcallback
+ *
+ * Description:
+ *   Called when the RX DMA completes
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_STM32F7_SPI_DMA
+static void spi_dmatxcallback(DMA_HANDLE handle, uint8_t isr, void *arg)
+{
+  FAR struct stm32_spidev_s *priv = (FAR struct stm32_spidev_s *)arg;
+
+  /* Wake-up the SPI driver */
+
+  priv->txresult = isr | 0x080;  /* OR'ed with 0x80 to assure non-zero */
+  spi_dmatxwakeup(priv);
+}
+#endif
+
+/************************************************************************************
+ * Name: spi_dmarxsetup
+ *
+ * Description:
+ *   Setup to perform RX DMA
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_STM32F7_SPI_DMA
+static void spi_dmarxsetup(FAR struct stm32_spidev_s *priv, FAR void *rxbuffer,
+                           FAR void *rxdummy, size_t nwords)
+{
+  /* 8- or 16-bit mode? */
+
+  if (spi_9to16bitmode(priv))
+    {
+      /* 16-bit mode -- is there a buffer to receive data in? */
+
+      if (rxbuffer)
+        {
+          priv->rxccr = SPI_RXDMA16_CONFIG;
+        }
+      else
+        {
+          rxbuffer    = rxdummy;
+          priv->rxccr = SPI_RXDMA16NULL_CONFIG;
+        }
+    }
+  else
+    {
+      /* 8-bit mode -- is there a buffer to receive data in? */
+
+      if (rxbuffer)
+        {
+          priv->rxccr = SPI_RXDMA8_CONFIG;
+        }
+      else
+        {
+          rxbuffer    = rxdummy;
+          priv->rxccr = SPI_RXDMA8NULL_CONFIG;
+        }
+    }
+
+  /* Configure the RX DMA */
+
+  stm32_dmasetup(priv->rxdma, priv->spibase + STM32_SPI_DR_OFFSET,
+                 (uint32_t)rxbuffer, nwords, priv->rxccr);
+}
+#endif
+
+/************************************************************************************
+ * Name: spi_dmatxsetup
+ *
+ * Description:
+ *   Setup to perform TX DMA
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_STM32F7_SPI_DMA
+static void spi_dmatxsetup(FAR struct stm32_spidev_s *priv, FAR const void *txbuffer,
+                           FAR const void *txdummy, size_t nwords)
+{
+  /* 8- or 16-bit mode? */
+
+  if (spi_9to16bitmode(priv))
+    {
+      /* 16-bit mode -- is there a buffer to transfer data from? */
+
+      if (txbuffer)
+        {
+          priv->txccr = SPI_TXDMA16_CONFIG;
+        }
+      else
+        {
+          txbuffer    = txdummy;
+          priv->txccr = SPI_TXDMA16NULL_CONFIG;
+        }
+    }
+  else
+    {
+      /* 8-bit mode -- is there a buffer to transfer data from? */
+
+      if (txbuffer)
+        {
+          priv->txccr = SPI_TXDMA8_CONFIG;
+        }
+      else
+        {
+          txbuffer    = txdummy;
+          priv->txccr = SPI_TXDMA8NULL_CONFIG;
+        }
+    }
+
+  /* Setup the TX DMA */
+
+  stm32_dmasetup(priv->txdma, priv->spibase + STM32_SPI_DR_OFFSET,
+                 (uint32_t)txbuffer, nwords, priv->txccr);
+}
+#endif
+
+/************************************************************************************
+ * Name: spi_dmarxstart
+ *
+ * Description:
+ *   Start RX DMA
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_STM32F7_SPI_DMA
+static inline void spi_dmarxstart(FAR struct stm32_spidev_s *priv)
+{
+  priv->rxresult = 0;
+  stm32_dmastart(priv->rxdma, spi_dmarxcallback, priv, false);
+}
+#endif
+
+/************************************************************************************
+ * Name: spi_dmatxstart
+ *
+ * Description:
+ *   Start TX DMA
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_STM32F7_SPI_DMA
+static inline void spi_dmatxstart(FAR struct stm32_spidev_s *priv)
+{
+  priv->txresult = 0;
+  stm32_dmastart(priv->txdma, spi_dmatxcallback, priv, false);
+}
+#endif
+
+/************************************************************************************
+ * Name: spi_modifycr1
+ *
+ * Description:
+ *   Clear and set bits in the CR1 register
+ *
+ * Input Parameters:
+ *   priv    - Device-specific state data
+ *   clrbits - The bits to clear
+ *   setbits - The bits to set
+ *
+ * Returned Value:
+ *   None
+ *
+ ************************************************************************************/
+
+static void spi_modifycr1(FAR struct stm32_spidev_s *priv, uint16_t setbits,
+                          uint16_t clrbits)
+{
+  uint16_t cr1;
+  cr1 = spi_getreg(priv, STM32_SPI_CR1_OFFSET);
+  cr1 &= ~clrbits;
+  cr1 |= setbits;
+  spi_putreg(priv, STM32_SPI_CR1_OFFSET, cr1);
+}
+
+/************************************************************************************
+ * Name: spi_modifycr2
+ *
+ * Description:
+ *   Clear and set bits in the CR2 register
+ *
+ * Input Parameters:
+ *   priv    - Device-specific state data
+ *   clrbits - The bits to clear
+ *   setbits - The bits to set
+ *
+ * Returned Value:
+ *   None
+ *
+ ************************************************************************************/
+
+static void spi_modifycr2(FAR struct stm32_spidev_s *priv, uint16_t setbits,
+                          uint16_t clrbits)
+{
+  uint16_t cr2;
+  cr2 = spi_getreg(priv, STM32_SPI_CR2_OFFSET);
+  cr2 &= ~clrbits;
+  cr2 |= setbits;
+  spi_putreg(priv, STM32_SPI_CR2_OFFSET, cr2);
+}
+
+/************************************************************************************
+ * Name: spi_lock
+ *
+ * Description:
+ *   On SPI busses where there are multiple devices, it will be necessary to
+ *   lock SPI to have exclusive access to the busses for a sequence of
+ *   transfers.  The bus should be locked before the chip is selected. After
+ *   locking the SPI bus, the caller should then also call the setfrequency,
+ *   setbits, and setmode methods to make sure that the SPI is properly
+ *   configured for the device.  If the SPI buss is being shared, then it
+ *   may have been left in an incompatible state.
+ *
+ * Input Parameters:
+ *   dev  - Device-specific state data
+ *   lock - true: Lock spi bus, false: unlock SPI bus
+ *
+ * Returned Value:
+ *   None
+ *
+ ************************************************************************************/
+
+static int spi_lock(FAR struct spi_dev_s *dev, bool lock)
+{
+  FAR struct stm32_spidev_s *priv = (FAR struct stm32_spidev_s *)dev;
+
+  if (lock)
+    {
+      /* Take the semaphore (perhaps waiting) */
+
+      while (sem_wait(&priv->exclsem) != 0)
+        {
+          /* The only case that an error should occur here is if the wait was awakened
+           * by a signal.
+           */
+
+          ASSERT(errno == EINTR);
+        }
+    }
+  else
+    {
+      (void)sem_post(&priv->exclsem);
+    }
+
+  return OK;
+}
+
+/************************************************************************************
+ * Name: spi_setfrequency
+ *
+ * Description:
+ *   Set the SPI frequency.
+ *
+ * Input Parameters:
+ *   dev -       Device-specific state data
+ *   frequency - The SPI frequency requested
+ *
+ * Returned Value:
+ *   Returns the actual frequency selected
+ *
+ ************************************************************************************/
+
+static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
+{
+  FAR struct stm32_spidev_s *priv = (FAR struct stm32_spidev_s *)dev;
+  uint16_t setbits;
+  uint32_t actual;
+
+  /* Limit to max possible (if STM32_SPI_CLK_MAX is defined in board.h) */
+
+  if (frequency > STM32_SPI_CLK_MAX)
+    {
+      frequency = STM32_SPI_CLK_MAX;
+    }
+
+  /* Has the frequency changed? */
+
+  if (frequency != priv->frequency)
+    {
+      /* Choices are limited by PCLK frequency with a set of divisors */
+
+      if (frequency >= priv->spiclock >> 1)
+        {
+          /* More than fPCLK/2.  This is as fast as we can go */
+
+          setbits = SPI_CR1_FPCLCKd2; /* 000: fPCLK/2 */
+          actual = priv->spiclock >> 1;
+        }
+      else if (frequency >= priv->spiclock >> 2)
+        {
+          /* Between fPCLCK/2 and fPCLCK/4, pick the slower */
+
+          setbits = SPI_CR1_FPCLCKd4; /* 001: fPCLK/4 */
+          actual = priv->spiclock >> 2;
+        }
+      else if (frequency >= priv->spiclock >> 3)
+        {
+          /* Between fPCLCK/4 and fPCLCK/8, pick the slower */
+
+          setbits = SPI_CR1_FPCLCKd8; /* 010: fPCLK/8 */
+          actual = priv->spiclock >> 3;
+        }
+      else if (frequency >= priv->spiclock >> 4)
+        {
+          /* Between fPCLCK/8 and fPCLCK/16, pick the slower */
+
+          setbits = SPI_CR1_FPCLCKd16; /* 011: fPCLK/16 */
+          actual = priv->spiclock >> 4;
+        }
+      else if (frequency >= priv->spiclock >> 5)
+        {
+          /* Between fPCLCK/16 and fPCLCK/32, pick the slower */
+
+          setbits = SPI_CR1_FPCLCKd32; /* 100: fPCLK/32 */
+          actual = priv->spiclock >> 5;
+        }
+      else if (frequency >= priv->spiclock >> 6)
+        {
+          /* Between fPCLCK/32 and fPCLCK/64, pick the slower */
+
+          setbits = SPI_CR1_FPCLCKd64; /*  101: fPCLK/64 */
+          actual = priv->spiclock >> 6;
+        }
+      else if (frequency >= priv->spiclock >> 7)
+        {
+          /* Between fPCLCK/64 and fPCLCK/128, pick the slower */
+
+          setbits = SPI_CR1_FPCLCKd128; /* 110: fPCLK/128 */
+          actual = priv->spiclock >> 7;
+        }
+      else
+        {
+          /* Less than fPCLK/128.  This is as slow as we can go */
+
+          setbits = SPI_CR1_FPCLCKd256; /* 111: fPCLK/256 */
+          actual = priv->spiclock >> 8;
+        }
+
+      spi_modifycr1(priv, 0, SPI_CR1_SPE);
+      spi_modifycr1(priv, setbits, SPI_CR1_BR_MASK);
+      spi_modifycr1(priv, SPI_CR1_SPE, 0);
+
+      /* Save the frequency selection so that subsequent reconfigurations will be
+       * faster.
+       */
+
+      spiinfo("Frequency %d->%d\n", frequency, actual);
+
+      priv->frequency = frequency;
+      priv->actual    = actual;
+    }
+
+  return priv->actual;
+}
+
+/************************************************************************************
+ * Name: spi_setmode
+ *
+ * Description:
+ *   Set the SPI mode.  see enum spi_mode_e for mode definitions
+ *
+ * Input Parameters:
+ *   dev  - Device-specific state data
+ *   mode - The SPI mode requested
+ *
+ * Returned Value:
+ *   Returns the actual frequency selected
+ *
+ ************************************************************************************/
+
+static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode)
+{
+  FAR struct stm32_spidev_s *priv = (FAR struct stm32_spidev_s *)dev;
+  uint16_t setbits;
+  uint16_t clrbits;
+
+  spiinfo("mode=%d\n", mode);
+
+  /* Has the mode changed? */
+
+  if (mode != priv->mode)
+    {
+      /* Yes... Set CR1 appropriately */
+
+      switch (mode)
+        {
+        case SPIDEV_MODE0: /* CPOL=0; CPHA=0 */
+          setbits = 0;
+          clrbits = SPI_CR1_CPOL | SPI_CR1_CPHA;
+          break;
+
+        case SPIDEV_MODE1: /* CPOL=0; CPHA=1 */
+          setbits = SPI_CR1_CPHA;
+          clrbits = SPI_CR1_CPOL;
+          break;
+
+        case SPIDEV_MODE2: /* CPOL=1; CPHA=0 */
+          setbits = SPI_CR1_CPOL;
+          clrbits = SPI_CR1_CPHA;
+          break;
+
+        case SPIDEV_MODE3: /* CPOL=1; CPHA=1 */
+          setbits = SPI_CR1_CPOL | SPI_CR1_CPHA;
+          clrbits = 0;
+          break;
+
+        default:
+          return;
+        }
+
+      spi_modifycr1(priv, 0, SPI_CR1_SPE);
+      spi_modifycr1(priv, setbits, clrbits);
+      spi_modifycr1(priv, SPI_CR1_SPE, 0);
+
+      /* Save the mode so that subsequent re-configurations will be faster */
+
+      priv->mode = mode;
+    }
+}
+
+/************************************************************************************
+ * Name: spi_setbits
+ *
+ * Description:
+ *   Set the number of bits per word.
+ *
+ * Input Parameters:
+ *   dev   - Device-specific state data
+ *   nbits - The number of bits requested
+ *
+ * Returned Value:
+ *   None
+ *
+ ************************************************************************************/
+
+static void spi_setbits(FAR struct spi_dev_s *dev, int nbits)
+{
+  FAR struct stm32_spidev_s *priv = (FAR struct stm32_spidev_s *)dev;
+  uint16_t setbitscr1;
+  uint16_t clrbitscr1;
+  uint16_t setbitscr2;
+  uint16_t clrbitscr2;
+  int savbits = nbits;
+
+  spiinfo("nbits=%d\n", nbits);
+
+  /* Has the number of bits changed? */
+
+  if (nbits != priv->nbits)
+    {
+      /* Yes... Set CR1/2 appropriately */
+      /* Negative sign means LSBFIRST, set this in CR1*/
+
+      if (nbits < 0)
+        {
+          setbitscr1 = SPI_CR1_LSBFIRST;
+          clrbitscr1 = 0;
+          nbits    = -nbits;
+        }
+      else
+        {
+          setbitscr1 = 0;
+          clrbitscr1 = SPI_CR1_LSBFIRST;
+        }
+
+      /* Set the number of bits (valid range 4-16) */
+
+      if (nbits < 4 || nbits > 16)
+        {
+          return;
+        }
+
+      clrbitscr2 = SPI_CR2_DS_MASK;
+      setbitscr2 = SPI_CR2_DS_VAL(nbits);
+
+      /* If nbits is <=8, then we are in byte mode and FRXTH shall be set
+       * (else, transaction will not complete).
+       */
+
+      if (nbits < 9)
+        {
+          setbitscr2 |= SPI_CR2_FRXTH; /* RX FIFO Threshold = 1 byte */
+        }
+      else
+        {
+          clrbitscr2 |= SPI_CR2_FRXTH; /* RX FIFO Threshold = 2 bytes */
+        }
+
+      spi_modifycr1(priv, 0, SPI_CR1_SPE);
+      spi_modifycr1(priv, setbitscr1, clrbitscr1);
+      spi_modifycr2(priv, setbitscr2, clrbitscr2);
+      spi_modifycr1(priv, SPI_CR1_SPE, 0);
+
+      /* Save the selection so the subsequence re-configurations will be faster */
+
+      priv->nbits = savbits; // nbits has been clobbered... save the signed value.
+    }
+}
+
+/************************************************************************************
+ * Name: spi_send
+ *
+ * Description:
+ *   Exchange one word on SPI
+ *
+ * Input Parameters:
+ *   dev - Device-specific state data
+ *   wd  - The word to send.  the size of the data is determined by the
+ *         number of bits selected for the SPI interface.
+ *
+ * Returned Value:
+ *   response
+ *
+ ************************************************************************************/
+
+static uint16_t spi_send(FAR struct spi_dev_s *dev, uint16_t wd)
+{
+  FAR struct stm32_spidev_s *priv = (FAR struct stm32_spidev_s *)dev;
+  uint32_t regval;
+  uint16_t ret;
+
+  DEBUGASSERT(priv && priv->spibase);
+
+  /* According to the number of bits, access data register as word or byte
+   * This is absolutely required because of packing. With nbits <=8 bit frames,
+   * two bytes are received by a 16-bit read of the data register!
+   */
+
+  if (spi_9to16bitmode(priv))
+    {
+      spi_writeword(priv, wd);
+      ret = spi_readword(priv);
+    }
+  else
+    {
+      spi_writebyte(priv, (uint8_t)(wd & 0xFF));
+      ret = (uint16_t)spi_readbyte(priv);
+    }
+
+  /* Check and clear any error flags (Reading from the SR clears the error
+   * flags).
+   */
+
+  regval = spi_getreg(priv, STM32_SPI_SR_OFFSET);
+
+  if (spi_9to16bitmode(priv))
+    {
+      spiinfo("Sent: %04x Return: %04x Status: %02x\n", wd, ret, regval);
+    }
+  else
+    {
+      spiinfo("Sent: %02x Return: %02x Status: %02x\n", wd, ret, regval);
+    }
+
+  UNUSED(regval);
+  return ret;
+}
+
+/************************************************************************************
+ * Name: spi_exchange (no DMA).  aka spi_exchange_nodma
+ *
+ * Description:
+ *   Exchange a block of data on SPI without using DMA
+ *
+ * Input Parameters:
+ *   dev      - Device-specific state data
+ *   txbuffer - A pointer to the buffer of data to be sent
+ *   rxbuffer - A pointer to a buffer in which to receive data
+ *   nwords   - the length of data to be exchaned in units of words.
+ *              The wordsize is determined by the number of bits-per-word
+ *              selected for the SPI interface.  If nbits <= 8, the data is
+ *              packed into uint8_t's; if nbits >8, the data is packed into uint16_t's
+ *
+ * Returned Value:
+ *   None
+ *
+ ************************************************************************************/
+
+#if !defined(CONFIG_STM32F7_SPI_DMA) || defined(CONFIG_STM32F7_DMACAPABLE)
+#if !defined(CONFIG_STM32F7_SPI_DMA)
+static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
+                         FAR void *rxbuffer, size_t nwords)
+#else
+static void spi_exchange_nodma(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
+                               FAR void *rxbuffer, size_t nwords)
+#endif
+{
+  FAR struct stm32_spidev_s *priv = (FAR struct stm32_spidev_s *)dev;
+  DEBUGASSERT(priv && priv->spibase);
+
+  spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords);
+
+  /* 8- or 16-bit mode? */
+
+  if (spi_9to16bitmode(priv))
+    {
+      /* 16-bit mode */
+
+      const uint16_t *src  = (const uint16_t *)txbuffer;
+            uint16_t *dest = (uint16_t *)rxbuffer;
+            uint16_t  word;
+
+      while (nwords-- > 0)
+        {
+          /* Get the next word to write.  Is there a source buffer? */
+
+          if (src)
+            {
+              word = *src++;
+            }
+          else
+            {
+              word = 0xffff;
+            }
+
+          /* Exchange one word */
+
+          word = spi_send(dev, word);
+
+          /* Is there a buffer to receive the return value? */
+
+          if (dest)
+            {
+              *dest++ = word;
+            }
+        }
+    }
+  else
+    {
+      /* 8-bit mode */
+
+      const uint8_t *src  = (const uint8_t *)txbuffer;
+            uint8_t *dest = (uint8_t *)rxbuffer;
+            uint8_t  word;
+
+      while (nwords-- > 0)
+        {
+          /* Get the next word to write.  Is there a source buffer? */
+
+          if (src)
+            {
+              word = *src++;
+            }
+          else
+            {
+              word = 0xff;
+            }
+
+          /* Exchange one word */
+
+          word = (uint8_t)spi_send(dev, (uint16_t)word);
+
+          /* Is there a buffer to receive the return value? */
+
+          if (dest)
+            {
+              *dest++ = word;
+            }
+        }
+    }
+}
+#endif /* !CONFIG_STM32F7_SPI_DMA || CONFIG_STM32F7_DMACAPABLE */
+
+/****************************************************************************
+ * Name: spi_exchange (with DMA capability)
+ *
+ * Description:
+ *   Exchange a block of data on SPI using DMA
+ *
+ * Input Parameters:
+ *   dev      - Device-specific state data
+ *   txbuffer - A pointer to the buffer of data to be sent
+ *   rxbuffer - A pointer to a buffer in which to receive data
+ *   nwords   - the length of data to be exchanged in units of words.
+ *              The wordsize is determined by the number of bits-per-word
+ *              selected for the SPI interface.  If nbits <= 8, the data is
+ *              packed into uint8_t's; if nbits >8, the data is packed into uint16_t's
+ *
+ * Returned Value:
+ *   None
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_STM32F7_SPI_DMA
+static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
+                         FAR void *rxbuffer, size_t nwords)
+{
+  FAR struct stm32_spidev_s *priv = (FAR struct stm32_spidev_s *)dev;
+
+#ifdef CONFIG_STM32F7_DMACAPABLE
+  if ((txbuffer && !stm32_dmacapable((uint32_t)txbuffer, nwords, priv->txccr)) ||
+      (rxbuffer && !stm32_dmacapable((uint32_t)rxbuffer, nwords, priv->rxccr)))
+    {
+      /* Unsupported memory region, fall back to non-DMA method. */
+
+      spi_exchange_nodma(dev, txbuffer, rxbuffer, nwords);
+    }
+  else
+#endif
+    {
+      static uint16_t rxdummy = 0xffff;
+      static const uint16_t txdummy = 0xffff;
+
+      spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords);
+      DEBUGASSERT(priv && priv->spibase);
+
+      /* Setup DMAs */
+
+      spi_dmarxsetup(priv, rxbuffer, &rxdummy, nwords);
+      spi_dmatxsetup(priv, txbuffer, &txdummy, nwords);
+
+      /* Start the DMAs */
+
+      spi_dmarxstart(priv);
+      spi_dmatxstart(priv);
+
+      /* Then wait for each to complete */
+
+      spi_dmarxwait(priv);
+      spi_dmatxwait(priv);
+    }
+}
+#endif /* CONFIG_STM32F7_SPI_DMA */
+
+/****************************************************************************
+ * Name: spi_sndblock
+ *
+ * Description:
+ *   Send a block of data on SPI
+ *
+ * Input Parameters:
+ *   dev      - Device-specific state data
+ *   txbuffer - A pointer to the buffer of data to be sent
+ *   nwords   - the length of data to send from the buffer in number of words.
+ *              The wordsize is determined by the number of bits-per-word
+ *              selected for the SPI interface.  If nbits <= 8, the data is
+ *              packed into uint8_t's; if nbits >8, the data is packed into uint16_t's
+ *
+ * Returned Value:
+ *   None
+ *
+ ************************************************************************************/
+
+#ifndef CONFIG_SPI_EXCHANGE
+static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *txbuffer, size_t nwords)
+{
+  spiinfo("txbuffer=%p nwords=%d\n", txbuffer, nwords);
+  return spi_exchange(dev, txbuffer, NULL, nwords);
+}
+#endif
+
+/************************************************************************************
+ * Name: spi_recvblock
+ *
+ * Description:
+ *   Receive a block of data from SPI
+ *
+ * Input Parameters:
+ *   dev      - Device-specific state data
+ *   rxbuffer - A pointer to the buffer in which to recieve data
+ *   nwords   - the length of data that can be received in the buffer in number
+ *              of words.  The wordsize is determined by the number of bits-per-word
+ *              selected for the SPI interface.  If nbits <= 8, the data is
+ *              packed into uint8_t's; if nbits >8, the data is packed into uint16_t's
+ *
+ * Returned Value:
+ *   None
+ *
+ ************************************************************************************/
+
+#ifndef CONFIG_SPI_EXCHANGE
+static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *rxbuffer, size_t nwords)
+{
+  spiinfo("rxbuffer=%p nwords=%d\n", rxbuffer, nwords);
+  return spi_exchange(dev, NULL, rxbuffer, nwords);
+}
+#endif
+
+/************************************************************************************
+ * Name: spi_bus_initialize
+ *
+ * Description:
+ *   Initialize the selected SPI bus in its default state (Master, 8-bit, mode 0, etc.)
+ *
+ * Input Parameter:
+ *   priv   - private SPI device structure
+ *
+ * Returned Value:
+ *   None
+ *
+ ************************************************************************************/
+
+static void spi_bus_initialize(FAR struct stm32_spidev_s *priv)
+{
+  uint16_t setbits;
+  uint16_t clrbits;
+
+  /* Configure CR1 and CR2. Default configuration:
+   *   Mode 0:                        CR1.CPHA=0 and CR1.CPOL=0
+   *   Master:                        CR1.MSTR=1
+   *   8-bit:                         CR2.DS=7
+   *   MSB tranmitted first:          CR1.LSBFIRST=0
+   *   Replace NSS with SSI & SSI=1:  CR1.SSI=1 CR1.SSM=1 (prevents MODF error)
+   *   Two lines full duplex:         CR1.BIDIMODE=0 CR1.BIDIOIE=(Don't care) and CR1.RXONLY=0
+   */
+
+  clrbits = SPI_CR1_CPHA | SPI_CR1_CPOL | SPI_CR1_BR_MASK | SPI_CR1_LSBFIRST |
+            SPI_CR1_RXONLY | SPI_CR1_BIDIOE | SPI_CR1_BIDIMODE;
+  setbits = SPI_CR1_MSTR | SPI_CR1_SSI | SPI_CR1_SSM;
+  spi_modifycr1(priv, setbits, clrbits);
+
+  clrbits = SPI_CR2_DS_MASK;
+  setbits = SPI_CR2_DS_8BIT | SPI_CR2_FRXTH; /* FRXTH must be high in 8-bit mode */
+  spi_modifycr2(priv, setbits, clrbits);
+
+  priv->frequency = 0;
+  priv->nbits     = 8;
+  priv->mode      = SPIDEV_MODE0;
+
+  /* Select a default frequency of approx. 400KHz */
+
+  spi_setfrequency((FAR struct spi_dev_s *)priv, 400000);
+
+  /* CRCPOLY configuration */
+
+  spi_putreg(priv, STM32_SPI_CRCPR_OFFSET, 7);
+
+  /* Initialize the SPI semaphore that enforces mutually exclusive access */
+
+  sem_init(&priv->exclsem, 0, 1);
+
+  /* Initialize the SPI semaphores that is used to wait for DMA completion */
+
+#ifdef CONFIG_STM32F7_SPI_DMA
+  sem_init(&priv->rxsem, 0, 0);
+  sem_init(&priv->txsem, 0, 0);
+
+  /* Get DMA channels.  NOTE: stm32_dmachannel() will always assign the DMA channel.
+   * if the channel is not available, then stm32_dmachannel() will block and wait
+   * until the channel becomes available.  WARNING: If you have another device sharing
+   * a DMA channel with SPI and the code never releases that channel, then the call
+   * to stm32_dmachannel()  will hang forever in this function!  Don't let your
+   * design do that!
+   */
+
+  priv->rxdma = stm32_dmachannel(priv->rxch);
+  priv->txdma = stm32_dmachannel(priv->txch);
+  DEBUGASSERT(priv->rxdma && priv->txdma);
+
+  spi_putreg(priv, STM32_SPI_CR2_OFFSET, SPI_CR2_RXDMAEN | SPI_CR2_TXDMAEN);
+#endif
+
+  /* Enable spi */
+
+  spi_modifycr1(priv, SPI_CR1_SPE, 0);
+}
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Name: stm32_spibus_initialize
+ *
+ * Description:
+ *   Initialize the selected SPI bus
+ *
+ * Input Parameter:
+ *   Port number (for hardware that has mutiple SPI interfaces)
+ *
+ * Returned Value:
+ *   Valid SPI device structure reference on succcess; a NULL on failure
+ *
+ ************************************************************************************/
+
+FAR struct spi_dev_s *stm32_spibus_initialize(int bus)
+{
+  FAR struct stm32_spidev_s *priv = NULL;
+
+  irqstate_t flags = enter_critical_section();
+
+#ifdef CONFIG_STM32F7_SPI1
+  if (bus == 1)
+    {
+      /* Select SPI1 */
+
+      priv = &g_spi1dev;
+
+      /* Only configure if the bus is not already configured */
+
+      if ((spi_getreg(priv, STM32_SPI_CR1_OFFSET) & SPI_CR1_SPE) == 0)
+        {
+          /* Configure SPI1 pins: SCK, MISO, and MOSI */
+
+          stm32_configgpio(GPIO_SPI1_SCK);
+          stm32_configgpio(GPIO_SPI1_MISO);
+          stm32_configgpio(GPIO_SPI1_MOSI);
+
+          /* Set up default configuration: Master, 8-bit, etc. */
+
+          spi_bus_initialize(priv);
+        }
+    }
+  else
+#endif
+#ifdef CONFIG_STM32F7_SPI2
+  if (bus == 2)
+    {
+      /* Select SPI2 */
+
+      priv = &g_spi2dev;
+
+      /* Only configure if the bus is not already configured */
+
+      if ((spi_getreg(priv, STM32_SPI_CR1_OFFSET) & SPI_CR1_SPE) == 0)
+        {
+          /* Configure SPI2 pins: SCK, MISO, and MOSI */
+
+          stm32_configgpio(GPIO_SPI2_SCK);
+          stm32_configgpio(GPIO_SPI2_MISO);
+          stm32_configgpio(GPIO_SPI2_MOSI);
+
+          /* Set up default configuration: Master, 8-bit, etc. */
+
+          spi_bus_initialize(priv);
+        }
+    }
+  else
+#endif
+#ifdef CONFIG_STM32F7_SPI3
+  if (bus == 3)
+    {
+      /* Select SPI3 */
+
+      priv = &g_spi3dev;
+
+      /* Only configure if the bus is not already configured */
+
+      if ((spi_getreg(priv, STM32_SPI_CR1_OFFSET) & SPI_CR1_SPE) == 0)
+        {
+          /* Configure SPI3 pins: SCK, MISO, and MOSI */
+
+          stm32_configgpio(GPIO_SPI3_SCK);
+          stm32_configgpio(GPIO_SPI3_MISO);
+          stm32_configgpio(GPIO_SPI3_MOSI);
+
+          /* Set up default configuration: Master, 8-bit, etc. */
+
+          spi_bus_initialize(priv);
+        }
+    }
+  else
+#endif
+#ifdef CONFIG_STM32F7_SPI4
+  if (bus == 4)
+    {
+      /* Select SPI4 */
+
+      priv = &g_spi4dev;
+
+      /* Only configure if the bus is not already configured */
+
+      if ((spi_getreg(priv, STM32_SPI_CR1_OFFSET) & SPI_CR1_SPE) == 0)
+        {
+          /* Configure SPI4 pins: SCK, MISO, and MOSI */
+
+          stm32_configgpio(GPIO_SPI4_SCK);
+          stm32_configgpio(GPIO_SPI4_MISO);
+          stm32_configgpio(GPIO_SPI4_MOSI);
+
+          /* Set up default configuration: Master, 8-bit, etc. */
+
+          spi_bus_initialize(priv);
+        }
+    }
+  else
+#endif
+#ifdef CONFIG_STM32F7_SPI5
+  if (bus == 5)
+    {
+      /* Select SPI5 */
+
+      priv = &g_spi5dev;
+
+      /* Only configure if the bus is not already configured */
+
+      if ((spi_getreg(priv, STM32_SPI_CR1_OFFSET) & SPI_CR1_SPE) == 0)
+        {
+          /* Configure SPI5 pins: SCK, MISO, and MOSI */
+
+          stm32_configgpio(GPIO_SPI5_SCK);
+          stm32_configgpio(GPIO_SPI5_MISO);
+          stm32_configgpio(GPIO_SPI5_MOSI);
+
+          /* Set up default configuration: Master, 8-bit, etc. */
+
+          spi_bus_initialize(priv);
+        }
+    }
+  else
+#endif
+#ifdef CONFIG_STM32F7_SPI6
+  if (bus == 6)
+    {
+      /* Select SPI6 */
+
+      priv = &g_spi6dev;
+
+      /* Only configure if the bus is not already configured */
+
+      if ((spi_getreg(priv, STM32_SPI_CR1_OFFSET) & SPI_CR1_SPE) == 0)
+        {
+          /* Configure SPI6 pins: SCK, MISO, and MOSI */
+
+          stm32_configgpio(GPIO_SPI6_SCK);
+          stm32_configgpio(GPIO_SPI6_MISO);
+          stm32_configgpio(GPIO_SPI6_MOSI);
+
+          /* Set up default configuration: Master, 8-bit, etc. */
+
+          spi_bus_initialize(priv);
+        }
+    }
+  else
+#endif
+    {
+      spierr("ERROR: Unsupported SPI bus: %d\n", bus);
+      return NULL;
+    }
+
+  leave_critical_section(flags);
+  return (FAR struct spi_dev_s *)priv;
+}
+
+#endif /* CONFIG_STM32F7_SPI1 || CONFIG_STM32F7_SPI2 || CONFIG_STM32F7_SPI3 || \
+        * CONFIG_STM32F7_SPI4 || CONFIG_STM32F7_SPI5 || CONFIG_STM32F7_SPI6 */
diff --git a/arch/arm/src/stm32f7/stm32_spi.h b/arch/arm/src/stm32f7/stm32_spi.h
index 2d606d2f45..2a2aa91881 100644
--- a/arch/arm/src/stm32f7/stm32_spi.h
+++ b/arch/arm/src/stm32f7/stm32_spi.h
@@ -2,7 +2,8 @@
  * arch/arm/src/stm32f7/stm32_spi.h
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt 
+ *   Authors: Gregory Nutt 
+ *            David Sidrane 
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -33,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_STC_STM32F7_STM32_SPI_H
-#define __ARCH_ARM_STC_STM32F7_STM32_SPI_H
+#ifndef __ARCH_ARM_SRC_STM32F7_STM32_SPI_H
+#define __ARCH_ARM_SRC_STM32F7_STM32_SPI_H
 
 /************************************************************************************
  * Included Files
@@ -45,7 +46,7 @@
 #include 
 
 #include "chip.h"
-//#include "chip/stm32_spi.h"
+#include "chip/stm32_spi.h"
 
 /************************************************************************************
  * Public Functions
@@ -110,37 +111,37 @@ FAR struct spi_dev_s *stm32_spibus_initialize(int bus);
  *
  ************************************************************************************/
 
-#ifdef CONFIG_STM32_SPI1
+#ifdef CONFIG_STM32F7_SPI1
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected);
 uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
 int stm32_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
 #endif
 
-#ifdef CONFIG_STM32_SPI2
+#ifdef CONFIG_STM32F7_SPI2
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected);
 uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
 int stm32_spi2cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
 #endif
 
-#ifdef CONFIG_STM32_SPI3
+#ifdef CONFIG_STM32F7_SPI3
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected);
 uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
 int stm32_spi3cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
 #endif
 
-#ifdef CONFIG_STM32_SPI4
+#ifdef CONFIG_STM32F7_SPI4
 void stm32_spi4select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected);
 uint8_t stm32_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
 int stm32_spi4cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
 #endif
 
-#ifdef CONFIG_STM32_SPI5
+#ifdef CONFIG_STM32F7_SPI5
 void stm32_spi5select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected);
 uint8_t stm32_spi5status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
 int stm32_spi5cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
 #endif
 
-#ifdef CONFIG_STM32_SPI6
+#ifdef CONFIG_STM32F7_SPI6
 void stm32_spi6select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected);
 uint8_t stm32_spi6status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
 int stm32_spi6cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
@@ -167,32 +168,32 @@ int stm32_spi6cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
  ****************************************************************************/
 
 #ifdef CONFIG_SPI_CALLBACK
-#ifdef CONFIG_STM32_SPI1
+#ifdef CONFIG_STM32F7_SPI1
 int stm32_spi1register(FAR struct spi_dev_s *dev, spi_mediachange_t callback,
                        FAR void *arg);
 #endif
 
-#ifdef CONFIG_STM32_SPI2
+#ifdef CONFIG_STM32F7_SPI2
 int stm32_spi2register(FAR struct spi_dev_s *dev, spi_mediachange_t callback,
                        FAR void *arg);
 #endif
 
-#ifdef CONFIG_STM32_SPI3
+#ifdef CONFIG_STM32F7_SPI3
 int stm32_spi3register(FAR struct spi_dev_s *dev, spi_mediachange_t callback,
                        FAR void *arg);
 #endif
 
-#ifdef CONFIG_STM32_SPI4
+#ifdef CONFIG_STM32F7_SPI4
 int stm32_spi4register(FAR struct spi_dev_s *dev, spi_mediachange_t callback,
                        FAR void *arg);
 #endif
 
-#ifdef CONFIG_STM32_SPI5
+#ifdef CONFIG_STM32F7_SPI5
 int stm32_spi5register(FAR struct spi_dev_s *dev, spi_mediachange_t callback,
                        FAR void *arg);
 #endif
 
-#ifdef CONFIG_STM32_SPI6
+#ifdef CONFIG_STM32F7_SPI6
 int stm32_spi6register(FAR struct spi_dev_s *dev, spi_mediachange_t callback,
                        FAR void *arg);
 #endif
@@ -204,5 +205,5 @@ int stm32_spi6register(FAR struct spi_dev_s *dev, spi_mediachange_t callback,
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_STC_STM32F7_STM32_SPI_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_STM32_SPI_H */
 
-- 
GitLab


From 4f72ad74d2e691000c3dc2ac5439581a5490e0e9 Mon Sep 17 00:00:00 2001
From: David Sidrane 
Date: Tue, 14 Jun 2016 07:30:28 -0600
Subject: [PATCH 71/91] configs/nucleo-144: Test F7 SPI

---
 configs/nucleo-144/README.txt                | 35 ++++++++++++++++++++
 configs/nucleo-144/include/board.h           | 30 ++++++++++++++++-
 configs/nucleo-144/src/nucleo-144.h          | 10 +++---
 configs/nucleo-144/src/stm32_appinitialize.c |  4 +--
 configs/nucleo-144/src/stm32_boot.c          |  2 +-
 configs/nucleo-144/src/stm32_spi.c           | 24 ++++++++------
 6 files changed, 85 insertions(+), 20 deletions(-)

diff --git a/configs/nucleo-144/README.txt b/configs/nucleo-144/README.txt
index 1a5d6f4b3b..6226299546 100644
--- a/configs/nucleo-144/README.txt
+++ b/configs/nucleo-144/README.txt
@@ -21,6 +21,7 @@ Contents
     - U[S]ARTs and Serial Consoles
     - SPI
     - SDIO - MMC
+  - SPI Test
   - Configurations
      f7xx-nsh
      f7xx-evalos
@@ -437,6 +438,40 @@ SDIO
           DAT2   PC10 CN11-1
           CD     PC11 CN11-2
 
+SPI Test
+========
+
+  The builtin SPI test facility can be enabled with the following settings:
+
+    +CONFIG_STM32F7_SPI=y
+    +CONFIG_STM32F7_SPI1=y
+    +CONFIG_STM32F7_SPI2=y
+    +CONFIG_STM32F7_SPI3=y
+
+    +# CONFIG_STM32F7_SPI_INTERRUPTS is not set
+    +# CONFIG_STM32F7_SPI_DMA is not set
+     # CONFIG_STM32F7_CUSTOM_CLOCKCONFIG is not set
+
+    +CONFIG_NUCLEO_SPI_TEST=y
+    +CONFIG_NUCLEO_SPI_TEST_MESSAGE="Hello World"
+    +CONFIG_NUCLEO_SPI1_TEST=y
+    +CONFIG_NUCLEO_SPI1_TEST_FREQ=1000000
+    +CONFIG_NUCLEO_SPI1_TEST_BITS=8
+    +CONFIG_NUCLEO_SPI1_TEST_MODE3=y
+
+    +CONFIG_NUCLEO_SPI2_TEST=y
+    +CONFIG_NUCLEO_SPI2_TEST_FREQ=12000000
+    +CONFIG_NUCLEO_SPI2_TEST_BITS=8
+    +CONFIG_NUCLEO_SPI2_TEST_MODE3=y
+
+    +CONFIG_NUCLEO_SPI3_TEST=y
+    +CONFIG_NUCLEO_SPI3_TEST_FREQ=40000000
+    +CONFIG_NUCLEO_SPI3_TEST_BITS=8
+    +CONFIG_NUCLEO_SPI3_TEST_MODE3=y
+
+    +CONFIG_LIB_BOARDCTL=y
+    +CONFIG_NSH_ARCHINIT=y
+
 Configurations
 ==============
 
diff --git a/configs/nucleo-144/include/board.h b/configs/nucleo-144/include/board.h
index d309e13938..ea4e2efbe2 100644
--- a/configs/nucleo-144/include/board.h
+++ b/configs/nucleo-144/include/board.h
@@ -296,6 +296,7 @@
 /* USART3:
  * Use  USART3 and the USB virtual COM port
 */
+
 #if defined(CONFIG_NUCLEO_CONSOLE_VIRTUAL)
  # define GPIO_USART3_RX GPIO_USART3_RX_3
  # define GPIO_USART3_TX GPIO_USART3_TX_3
@@ -307,9 +308,36 @@
  * with the serial interface with the adaptor's RX on pin CN11 pin 64 and
  * TX on pin CN11 pin 61
  *
- * USART8: has noit remap
+ * USART8: has no remap
  */
 
+/* SPI
+ *
+ *
+ *  PA6   MISO CN12-13
+ *  PA7   MOSI CN12-15
+ *  PA5   SCK  CN12-11
+ *
+ *  PB14  MISO CN12-28
+ *  PB15  MOSI CN12-26
+ *  PB10  SCK  CN12-25
+ *
+ *  PB4   MISO CN12-27
+ *  PB5   MOSI CN12-29
+ *  PB3   SCK  CN12-31
+ */
+
+#define GPIO_SPI1_MISO   GPIO_SPI1_MISO_1
+#define GPIO_SPI1_MOSI   GPIO_SPI1_MOSI_1
+#define GPIO_SPI1_SCK    GPIO_SPI1_SCK_1
+
+#define GPIO_SPI2_MISO   GPIO_SPI2_MISO_1
+#define GPIO_SPI2_MOSI   GPIO_SPI2_MOSI_1
+#define GPIO_SPI2_SCK    GPIO_SPI2_SCK_2
+
+#define GPIO_SPI3_MISO  GPIO_SPI3_MISO_1
+#define GPIO_SPI3_MOSI  GPIO_SPI3_MOSI_2
+#define GPIO_SPI3_SCK   GPIO_SPI3_SCK_1
 
 /* The STM32 F7 connects to a SMSC LAN8742A PHY using these pins:
  *
diff --git a/configs/nucleo-144/src/nucleo-144.h b/configs/nucleo-144/src/nucleo-144.h
index 3e35c0821a..8737deee61 100644
--- a/configs/nucleo-144/src/nucleo-144.h
+++ b/configs/nucleo-144/src/nucleo-144.h
@@ -102,11 +102,11 @@
                         GPIO_OUTPUT_SET)
 
 #define GPIO_SPI1_CS0   (GPIO_SPI_CS | GPIO_PORTA | GPIO_PIN15)
-#define GPIO_SPI1_CS1   (GPIO_SPI_CS | GPIO_PORTC | GPIO_PIN13)
-#define GPIO_SPI1_CS2   (GPIO_SPI_CS | GPIO_PORTC | GPIO_PIN13)
-#define GPIO_SPI1_CS3   (GPIO_SPI_CS | GPIO_PORTC | GPIO_PIN14)
+#define GPIO_SPI1_CS1   (GPIO_SPI_CS | GPIO_PORTC | GPIO_PIN15)
+#define GPIO_SPI1_CS2   (GPIO_SPI_CS | GPIO_PORTC | GPIO_PIN14)
+#define GPIO_SPI1_CS3   (GPIO_SPI_CS | GPIO_PORTC | GPIO_PIN2)
 #define GPIO_SPI2_CS0   (GPIO_SPI_CS | GPIO_PORTD | GPIO_PIN7)
-#define GPIO_SPI2_CS1   (GPIO_SPI_CS | GPIO_PORTC | GPIO_PIN15)
+#define GPIO_SPI2_CS1   (GPIO_SPI_CS | GPIO_PORTG | GPIO_PIN1)
 #define GPIO_SPI2_CS2   (GPIO_SPI_CS | GPIO_PORTG | GPIO_PIN2)
 #define GPIO_SPI2_CS3   (GPIO_SPI_CS | GPIO_PORTG | GPIO_PIN3)
 #define GPIO_SPI3_CS0   (GPIO_SPI_CS | GPIO_PORTG | GPIO_PIN4)
@@ -164,7 +164,7 @@ void stm32_spidev_initialize(void);
  *
  ************************************************************************************/
 
-#if defined(NUCLEO_SPI_TEST)
+#if defined(CONFIG_NUCLEO_SPI_TEST)
 int stm32_spidev_bus_test(void);
 #endif
 
diff --git a/configs/nucleo-144/src/stm32_appinitialize.c b/configs/nucleo-144/src/stm32_appinitialize.c
index 447a2ee8f6..9daf02a3ff 100644
--- a/configs/nucleo-144/src/stm32_appinitialize.c
+++ b/configs/nucleo-144/src/stm32_appinitialize.c
@@ -111,10 +111,10 @@ int board_app_initialize(uintptr_t arg)
 #if defined(CONFIG_NUCLEO_SPI_TEST)
   /* Create SPI interfaces */
 
-  ret = stm32_spidev_bus_init();
+  ret = stm32_spidev_bus_test();
   if (ret != OK)
     {
-      ferr("ERROR: Failed to initialize SPI interfaces: %d\n", ret);
+      syslog(LOG_ERR, "ERROR: Failed to initialize SPI interfaces: %d\n", ret);
       return ret;
     }
 #endif
diff --git a/configs/nucleo-144/src/stm32_boot.c b/configs/nucleo-144/src/stm32_boot.c
index 87286e934d..6e767a2975 100644
--- a/configs/nucleo-144/src/stm32_boot.c
+++ b/configs/nucleo-144/src/stm32_boot.c
@@ -70,7 +70,7 @@ void stm32_boardinitialize(void)
   board_autoled_initialize();
 #endif
 
-#if defined(CONFIG__SPI)
+#if defined(CONFIG_SPI)
   /* Configure SPI chip selects */
 
   stm32_spidev_initialize();
diff --git a/configs/nucleo-144/src/stm32_spi.c b/configs/nucleo-144/src/stm32_spi.c
index 310af8fecd..f206a0a61f 100644
--- a/configs/nucleo-144/src/stm32_spi.c
+++ b/configs/nucleo-144/src/stm32_spi.c
@@ -228,7 +228,7 @@ void weak_function stm32_spidev_initialize(void)
 void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
   spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
-  stm32_gpiowrite(g_spigpio[i], !selected);
+  stm32_gpiowrite(g_spigpio[devid], !selected);
 }
 
 uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -241,7 +241,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
   spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
-  stm32_gpiowrite(g_spigpio[i], !selected);
+  stm32_gpiowrite(g_spigpio[devid], !selected);
 }
 
 uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -254,7 +254,7 @@ uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
   spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
-  stm32_gpiowrite(g_spigpio[i], !selected);
+  stm32_gpiowrite(g_spigpio[devid], !selected);
 }
 
 uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -271,7 +271,7 @@ uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 void stm32_spi4select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
   spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
-  stm32_gpiowrite(g_spigpio[i], !selected);
+  stm32_gpiowrite(g_spigpio[devid], !selected);
 }
 
 uint8_t stm32_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -288,7 +288,7 @@ uint8_t stm32_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 void stm32_spi5select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
   spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
-  stm32_gpiowrite(g_spigpio[i], !selected);
+  stm32_gpiowrite(g_spigpio[devid], !selected);
 }
 
 uint8_t stm32_spi5status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -304,7 +304,7 @@ uint8_t stm32_spi5status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 void stm32_spi5select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
 {
   spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
-  stm32_gpiowrite(g_spigpio[i], !selected);
+  stm32_gpiowrite(g_spigpio[devid], !selected);
 }
 
 uint8_t stm32_spi5status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
@@ -382,11 +382,11 @@ int stm32_spi5cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
 #endif /* CONFIG_SPI_CMDDATA */
 
 #if defined(CONFIG_NUCLEO_SPI_TEST)
-int stm32_spidev_bus_init(void)
+int stm32_spidev_bus_test(void)
 {
   /* Configure and test SPI-*/
 
-  uint8_t *tx = CONFIG_NUCLEO_SPI_TEST_MESSAGE;
+  uint8_t *tx = (uint8_t *)CONFIG_NUCLEO_SPI_TEST_MESSAGE;
 
 #if defined(CONFIG_NUCLEO_SPI1_TEST)
   spi1 = stm32_spibus_initialize(1);
@@ -414,9 +414,9 @@ int stm32_spidev_bus_init(void)
       return -ENODEV;
     }
 
-  /* Default SPI1 to NUCLEO_SPI2_FREQ and mode */
+  /* Default SPI2 to NUCLEO_SPI2_FREQ and mode */
 
-  SPI_SETFREQUENCY(spi2, CONFIG_NUCLEO_SPI1_TEST_FREQ);
+  SPI_SETFREQUENCY(spi2, CONFIG_NUCLEO_SPI2_TEST_FREQ);
   SPI_SETBITS(spi2, CONFIG_NUCLEO_SPI2_TEST_BITS);
   SPI_SETMODE(spi2, CONFIG_NUCLEO_SPI2_TEST_MODE);
   SPI_EXCHANGE(spi2, tx, NULL, ArraySize(CONFIG_NUCLEO_SPI_TEST_MESSAGE));
@@ -431,13 +431,15 @@ int stm32_spidev_bus_init(void)
       return -ENODEV;
     }
 
-  /* Default SPI1 to NUCLEO_SPI3_FREQ and mode */
+  /* Default SPI3 to NUCLEO_SPI3_FREQ and mode */
 
   SPI_SETFREQUENCY(spi3, CONFIG_NUCLEO_SPI3_TEST_FREQ);
   SPI_SETBITS(spi3, CONFIG_NUCLEO_SPI3_TEST_BITS);
   SPI_SETMODE(spi3, CONFIG_NUCLEO_SPI3_TEST_MODE);
   SPI_EXCHANGE(spi3, tx, NULL, ArraySize(CONFIG_NUCLEO_SPI_TEST_MESSAGE));
 #endif
+
+  return OK;
 }
 #endif /* NUCLEO_SPI_TEST */
 #endif /* defined(CONFIG_SPI) */
-- 
GitLab


From a98bc05f650e57516a8e40d8627f81ece66ee1ca Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 14 Jun 2016 09:07:53 -0600
Subject: [PATCH 72/91] New debug macro: alert().  This is high priority,
 unconditional output and is used to simplify and stanardize crash error
 reporting.

---
 arch/arm/src/arm/up_assert.c             | 76 ++++++--------------
 arch/arm/src/arm/up_dataabort.c          | 34 +--------
 arch/arm/src/arm/up_prefetchabort.c      | 19 +----
 arch/arm/src/arm/up_syscall.c            | 39 ++--------
 arch/arm/src/arm/up_undefinedinsn.c      | 31 +-------
 arch/arm/src/armv6-m/up_assert.c         | 88 ++++++++---------------
 arch/arm/src/armv6-m/up_dumpnvic.c       | 13 +---
 arch/arm/src/armv7-a/arm_assert.c        | 84 ++++++++--------------
 arch/arm/src/armv7-a/arm_dataabort.c     | 21 +-----
 arch/arm/src/armv7-a/arm_prefetchabort.c | 21 +-----
 arch/arm/src/armv7-a/arm_syscall.c       | 47 +++++--------
 arch/arm/src/armv7-a/arm_undefinedinsn.c | 19 +----
 arch/arm/src/armv7-m/up_assert.c         | 90 ++++++++----------------
 arch/arm/src/armv7-r/arm_assert.c        | 36 ++--------
 arch/arm/src/armv7-r/arm_dataabort.c     | 19 +----
 arch/arm/src/armv7-r/arm_prefetchabort.c | 19 +----
 arch/arm/src/armv7-r/arm_syscall.c       | 55 ++++++---------
 arch/arm/src/armv7-r/arm_undefinedinsn.c | 19 +----
 arch/arm/src/kl/kl_dumpgpio.c            | 16 ++---
 arch/arm/src/lpc11xx/lpc11_gpiodbg.c     | 41 +++++------
 arch/arm/src/lpc17xx/lpc17_gpiodbg.c     | 43 ++++++-----
 arch/arm/src/sama5/sama5d3x4x_pio.c      |  4 --
 arch/arm/src/stm32/stm32_dumpgpio.c      |  4 --
 arch/arm/src/tiva/tiva_dumpgpio.c        |  4 --
 arch/avr/src/avr/up_dumpstate.c          | 57 ++++++---------
 arch/avr/src/avr32/up_dumpstate.c        | 51 ++++++--------
 arch/avr/src/common/up_assert.c          | 42 ++---------
 arch/hc/src/m9s12/m9s12_assert.c         | 78 ++++++--------------
 arch/hc/src/m9s12/m9s12_dumpgpio.c       | 66 ++++++++---------
 arch/mips/src/mips32/up_assert.c         | 40 ++---------
 arch/mips/src/mips32/up_dumpstate.c      | 49 +++++--------
 arch/sh/src/common/up_assert.c           | 27 ++-----
 arch/sh/src/m16c/m16c_dumpstate.c        | 51 +++++---------
 arch/sh/src/sh1/sh1_dumpstate.c          | 55 +++++----------
 arch/x86/src/common/up_assert.c          | 34 +--------
 arch/x86/src/i486/up_regdump.c           | 34 ++-------
 arch/z16/src/common/up_assert.c          | 25 ++-----
 arch/z16/src/common/up_registerdump.c    | 35 +++------
 arch/z16/src/common/up_stackdump.c       | 25 ++-----
 arch/z80/src/common/up_assert.c          | 33 ++-------
 arch/z80/src/common/up_stackdump.c       | 35 +++------
 arch/z80/src/ez80/ez80_registerdump.c    | 45 +++++-------
 arch/z80/src/z180/z180_registerdump.c    | 33 +++------
 arch/z80/src/z8/z8_registerdump.c        | 25 ++-----
 arch/z80/src/z80/z80_registerdump.c      | 35 +++------
 include/debug.h                          | 26 +++++--
 libc/misc/lib_debug.c                    | 26 +++++--
 47 files changed, 517 insertions(+), 1252 deletions(-)

diff --git a/arch/arm/src/arm/up_assert.c b/arch/arm/src/arm/up_assert.c
index 5c0ed9a678..05fbbbb031 100644
--- a/arch/arm/src/arm/up_assert.c
+++ b/arch/arm/src/arm/up_assert.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/arm/src/arm/up_assert.c
  *
- *   Copyright (C) 2007-2010, 2012-2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2010, 2012-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,19 +39,6 @@
 
 #include 
 
-/* Output debug info if stack dump is selected -- even if debug is not
- * selected.
- */
-
-#undef  CONFIG_DEBUG_FEATURES
-#undef  CONFIG_DEBUG_ERROR
-#undef  CONFIG_DEBUG_WARN
-#undef  CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG_FEATURES 1
-#define CONFIG_DEBUG_ERROR 1
-#define CONFIG_DEBUG_WARN 1
-#define CONFIG_DEBUG_INFO 1
-
 #include 
 #include 
 #include 
@@ -79,23 +66,6 @@
 #  undef CONFIG_ARCH_USBDUMP
 #endif
 
-/* The following is just intended to keep some ugliness out of the mainline
- * code.  We are going to print the task name if:
- *
- *  CONFIG_TASK_NAME_SIZE > 0 &&    <-- The task has a name
- *  (defined(CONFIG_DEBUG_FEATURES)    ||    <-- And the debug is enabled (llerr used)
- *   defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used
- */
-
-#undef CONFIG_PRINT_TASKNAME
-#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG_FEATURES) || defined(CONFIG_ARCH_STACKDUMP))
-#  define CONFIG_PRINT_TASKNAME 1
-#endif
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -129,7 +99,7 @@ static void up_stackdump(uint32_t sp, uint32_t stack_base)
   for (stack = sp & ~0x1f; stack < stack_base; stack += 32)
     {
       uint32_t *ptr = (uint32_t *)stack;
-      llerr("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
              stack, ptr[0], ptr[1], ptr[2], ptr[3],
              ptr[4], ptr[5], ptr[6], ptr[7]);
     }
@@ -156,12 +126,12 @@ static inline void up_registerdump(void)
       for (regs = REG_R0; regs <= REG_R15; regs += 8)
         {
           uint32_t *ptr = (uint32_t *)&CURRENT_REGS[regs];
-          llerr("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+          alert("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n",
                  regs, ptr[0], ptr[1], ptr[2], ptr[3],
                  ptr[4], ptr[5], ptr[6], ptr[7]);
         }
 
-      llerr("CPSR: %08x\n", CURRENT_REGS[REG_CPSR]);
+      alert("CPSR: %08x\n", CURRENT_REGS[REG_CPSR]);
     }
 }
 #else
@@ -230,12 +200,12 @@ static void up_dumpstate(void)
 
   /* Show interrupt stack info */
 
-  llerr("sp:     %08x\n", sp);
-  llerr("IRQ stack:\n");
-  llerr("  base: %08x\n", istackbase);
-  llerr("  size: %08x\n", istacksize);
+  alert("sp:     %08x\n", sp);
+  alert("IRQ stack:\n");
+  alert("  base: %08x\n", istackbase);
+  alert("  size: %08x\n", istacksize);
 #ifdef CONFIG_STACK_COLORATION
-  llerr("  used: %08x\n", up_check_intstack());
+  alert("  used: %08x\n", up_check_intstack());
 #endif
 
   /* Does the current stack pointer lie within the interrupt
@@ -253,24 +223,24 @@ static void up_dumpstate(void)
        */
 
       sp = g_intstackbase;
-      llerr("sp:     %08x\n", sp);
+      alert("sp:     %08x\n", sp);
     }
 
   /* Show user stack info */
 
-  llerr("User stack:\n");
-  llerr("  base: %08x\n", ustackbase);
-  llerr("  size: %08x\n", ustacksize);
+  alert("User stack:\n");
+  alert("  base: %08x\n", ustackbase);
+  alert("  size: %08x\n", ustacksize);
 #ifdef CONFIG_STACK_COLORATION
-  llerr("  used: %08x\n", up_check_tcbstack(rtcb));
+  alert("  used: %08x\n", up_check_tcbstack(rtcb));
 #endif
 
 #else
-  llerr("sp:         %08x\n", sp);
-  llerr("stack base: %08x\n", ustackbase);
-  llerr("stack size: %08x\n", ustacksize);
+  alert("sp:         %08x\n", sp);
+  alert("stack base: %08x\n", ustackbase);
+  alert("stack size: %08x\n", ustacksize);
 #ifdef CONFIG_STACK_COLORATION
-  llerr("stack used: %08x\n", up_check_tcbstack(rtcb));
+  alert("stack used: %08x\n", up_check_tcbstack(rtcb));
 #endif
 #endif
 
@@ -281,7 +251,7 @@ static void up_dumpstate(void)
   if (sp > ustackbase || sp <= ustackbase - ustacksize)
     {
 #if !defined(CONFIG_ARCH_INTERRUPTSTACK) || CONFIG_ARCH_INTERRUPTSTACK < 4
-      llerr("ERROR: Stack pointer is not within allocated stack\n");
+      alert("ERROR: Stack pointer is not within allocated stack\n");
 #endif
     }
   else
@@ -341,17 +311,17 @@ static void _up_assert(int errorcode)
 
 void up_assert(const uint8_t *filename, int lineno)
 {
-#ifdef CONFIG_PRINT_TASKNAME
+#if CONFIG_TASK_NAME_SIZE > 0
   struct tcb_s *rtcb = this_task();
 #endif
 
   board_autoled_on(LED_ASSERTION);
 
-#ifdef CONFIG_PRINT_TASKNAME
-  llerr("Assertion failed at file:%s line: %d task: %s\n",
+#if CONFIG_TASK_NAME_SIZE > 0
+  alert("Assertion failed at file:%s line: %d task: %s\n",
         filename, lineno, rtcb->name);
 #else
-  llerr("Assertion failed at file:%s line: %d\n",
+  alert("Assertion failed at file:%s line: %d\n",
         filename, lineno);
 #endif
 
diff --git a/arch/arm/src/arm/up_dataabort.c b/arch/arm/src/arm/up_dataabort.c
index 6b547bdea6..621a42d328 100644
--- a/arch/arm/src/arm/up_dataabort.c
+++ b/arch/arm/src/arm/up_dataabort.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/arm/src/arm/up_dataabort.c
  *
- *   Copyright (C) 2007-2011, 2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2011, 2013, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,21 +39,6 @@
 
 #include 
 
-/* Output debug info if stack dump is selected -- even if debug is not
- * selected.
- */
-
-#ifdef CONFIG_ARCH_STACKDUMP
-#  undef  CONFIG_DEBUG_FEATURES
-#  undef  CONFIG_DEBUG_ERROR
-#  undef  CONFIG_DEBUG_WARN
-#  undef  CONFIG_DEBUG_INFO
-#  define CONFIG_DEBUG_FEATURES 1
-#  define CONFIG_DEBUG_ERROR 1
-#  define CONFIG_DEBUG_WARN 1
-#  define CONFIG_DEBUG_INFO 1
-#endif
-
 #include 
 #include 
 
@@ -67,18 +52,6 @@
 #  include "arm.h"
 #endif
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -116,7 +89,6 @@ void up_dataabort(uint32_t *regs, uint32_t far, uint32_t fsr)
    * for register dumps and possibly context switching.
    */
 
-
   savestate    = (uint32_t *)CURRENT_REGS;
 #endif
   CURRENT_REGS = regs;
@@ -184,7 +156,7 @@ void up_dataabort(uint32_t *regs, uint32_t far, uint32_t fsr)
 
 segfault:
 #endif
-  llerr("Data abort. PC: %08x FAR: %08x FSR: %08x\n", regs[REG_PC], far, fsr);
+  alert("Data abort. PC: %08x FAR: %08x FSR: %08x\n", regs[REG_PC], far, fsr);
   PANIC();
 }
 
@@ -200,7 +172,7 @@ void up_dataabort(uint32_t *regs)
 
   /* Crash -- possibly showing diagnost debug information. */
 
-  llerr("Data abort. PC: %08x\n", regs[REG_PC]);
+  alert("Data abort. PC: %08x\n", regs[REG_PC]);
   PANIC();
 }
 
diff --git a/arch/arm/src/arm/up_prefetchabort.c b/arch/arm/src/arm/up_prefetchabort.c
index 998024a8f9..5d9d9561dc 100644
--- a/arch/arm/src/arm/up_prefetchabort.c
+++ b/arch/arm/src/arm/up_prefetchabort.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  *  arch/arm/src/arm/up_prefetchabort.c
  *
- *   Copyright (C) 2007-2011, 2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2011, 2013, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,21 +39,6 @@
 
 #include 
 
-/* Output debug info if stack dump is selected -- even if debug is not
- * selected.
- */
-
-#ifdef CONFIG_ARCH_STACKDUMP
-#  undef  CONFIG_DEBUG_FEATURES
-#  undef  CONFIG_DEBUG_ERROR
-#  undef  CONFIG_DEBUG_WARN
-#  undef  CONFIG_DEBUG_INFO
-#  define CONFIG_DEBUG_FEATURES 1
-#  define CONFIG_DEBUG_ERROR 1
-#  define CONFIG_DEBUG_WARN 1
-#  define CONFIG_DEBUG_INFO 1
-#endif
-
 #include 
 #include 
 
@@ -152,7 +137,7 @@ void up_prefetchabort(uint32_t *regs)
   else
 #endif
     {
-      llerr("Prefetch abort. PC: %08x\n", regs[REG_PC]);
+      alert("Prefetch abort. PC: %08x\n", regs[REG_PC]);
       PANIC();
     }
 }
diff --git a/arch/arm/src/arm/up_syscall.c b/arch/arm/src/arm/up_syscall.c
index e6d07f9ecd..f7ee6f1312 100644
--- a/arch/arm/src/arm/up_syscall.c
+++ b/arch/arm/src/arm/up_syscall.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  *  arch/arm/src/arm/up_syscall.c
  *
- *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,21 +39,6 @@
 
 #include 
 
-/* Output debug info if stack dump is selected -- even if debug is not
- * selected.
- */
-
-#ifdef CONFIG_ARCH_STACKDUMP
-#  undef  CONFIG_DEBUG_FEATURES
-#  undef  CONFIG_DEBUG_ERROR
-#  undef  CONFIG_DEBUG_WARN
-#  undef  CONFIG_DEBUG_INFO
-#  define CONFIG_DEBUG_FEATURES 1
-#  define CONFIG_DEBUG_ERROR 1
-#  define CONFIG_DEBUG_WARN 1
-#  define CONFIG_DEBUG_INFO 1
-#endif
-
 #include 
 #include 
 
@@ -62,22 +47,6 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * vectors
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -86,8 +55,8 @@
  * Name: up_syscall
  *
  * Description:
- *   SWI interrupts will vection here with insn=the SWI
- *   instruction and xcp=the interrupt context
+ *   SWI interrupts will vector here with insn=the SWI instruction and
+ *   xcp=the interrupt context
  *
  *   The handler may get the SWI number be de-referencing
  *   the return address saved in the xcp and decoding
@@ -97,7 +66,7 @@
 
 void up_syscall(uint32_t *regs)
 {
-  llerr("Syscall from 0x%x\n", regs[REG_PC]);
+  alert("Syscall from 0x%x\n", regs[REG_PC]);
   CURRENT_REGS = regs;
   PANIC();
 }
diff --git a/arch/arm/src/arm/up_undefinedinsn.c b/arch/arm/src/arm/up_undefinedinsn.c
index 2326ae9b0e..22a895b816 100644
--- a/arch/arm/src/arm/up_undefinedinsn.c
+++ b/arch/arm/src/arm/up_undefinedinsn.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/arm/src/arm/up_undefinedinsn.c
  *
- *   Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2013, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,21 +39,6 @@
 
 #include 
 
-/* Output debug info if stack dump is selected -- even if debug is not
- * selected.
- */
-
-#ifdef CONFIG_ARCH_STACKDUMP
-#  undef  CONFIG_DEBUG_FEATURES
-#  undef  CONFIG_DEBUG_ERROR
-#  undef  CONFIG_DEBUG_WARN
-#  undef  CONFIG_DEBUG_INFO
-#  define CONFIG_DEBUG_FEATURES 1
-#  define CONFIG_DEBUG_ERROR 1
-#  define CONFIG_DEBUG_WARN 1
-#  define CONFIG_DEBUG_INFO 1
-#endif
-
 #include 
 #include 
 #include 
@@ -62,18 +47,6 @@
 
 #include "up_internal.h"
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -84,7 +57,7 @@
 
 void up_undefinedinsn(uint32_t *regs)
 {
-  llerr("Undefined instruction at 0x%x\n", regs[REG_PC]);
+  alert("Undefined instruction at 0x%x\n", regs[REG_PC]);
   CURRENT_REGS = regs;
   PANIC();
 }
diff --git a/arch/arm/src/armv6-m/up_assert.c b/arch/arm/src/armv6-m/up_assert.c
index 4e38270d0f..ef1757126a 100644
--- a/arch/arm/src/armv6-m/up_assert.c
+++ b/arch/arm/src/armv6-m/up_assert.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/arm/src/armv6-m/up_assert.c
  *
- *   Copyright (C) 2013-2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2013-2015, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,21 +39,6 @@
 
 #include 
 
-/* Output debug info if stack dump is selected -- even if debug is not
- * selected.
- */
-
-#ifdef CONFIG_ARCH_STACKDUMP
-#  undef  CONFIG_DEBUG_FEATURES
-#  undef  CONFIG_DEBUG_ERROR
-#  undef  CONFIG_DEBUG_WARN
-#  undef  CONFIG_DEBUG_INFO
-#  define CONFIG_DEBUG_FEATURES 1
-#  define CONFIG_DEBUG_ERROR 1
-#  define CONFIG_DEBUG_WARN 1
-#  define CONFIG_DEBUG_INFO 1
-#endif
-
 #include 
 #include 
 #include 
@@ -80,23 +65,6 @@
 #  undef CONFIG_ARCH_USBDUMP
 #endif
 
-/* The following is just intended to keep some ugliness out of the mainline
- * code.  We are going to print the task name if:
- *
- *  CONFIG_TASK_NAME_SIZE > 0 &&       <-- The task has a name
- *  (defined(CONFIG_DEBUG_FEATURES) || <-- And the debug is enabled (llerr used)
- *   defined(CONFIG_ARCH_STACKDUMP)    <-- Or lowsyslog() is used
- */
-
-#undef CONFIG_PRINT_TASKNAME
-#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG_FEATURES) || defined(CONFIG_ARCH_STACKDUMP))
-#  define CONFIG_PRINT_TASKNAME 1
-#endif
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -130,7 +98,7 @@ static void up_stackdump(uint32_t sp, uint32_t stack_base)
   for (stack = sp & ~0x1f; stack < stack_base; stack += 32)
     {
       uint32_t *ptr = (uint32_t *)stack;
-      llerr("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
              stack, ptr[0], ptr[1], ptr[2], ptr[3],
              ptr[4], ptr[5], ptr[6], ptr[7]);
     }
@@ -148,12 +116,12 @@ static void up_taskdump(FAR struct tcb_s *tcb, FAR void *arg)
 {
   /* Dump interesting properties of this task */
 
-#ifdef CONFIG_PRINT_TASKNAME
-  llerr("%s: PID=%d Stack Used=%lu of %lu\n",
+#if CONFIG_TASK_NAME_SIZE > 0
+  alert("%s: PID=%d Stack Used=%lu of %lu\n",
         tcb->name, tcb->pid, (unsigned long)up_check_tcbstack(tcb),
         (unsigned long)tcb->adj_stack_size);
 #else
-  llerr("PID: %d Stack Used=%lu of %lu\n",
+  alert("PID: %d Stack Used=%lu of %lu\n",
         tcb->pid, (unsigned long)up_check_tcbstack(tcb),
         (unsigned long)tcb->adj_stack_size);
 #endif
@@ -188,22 +156,22 @@ static inline void up_registerdump(void)
     {
       /* Yes.. dump the interrupt registers */
 
-      llerr("R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      alert("R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
             CURRENT_REGS[REG_R0],  CURRENT_REGS[REG_R1],
             CURRENT_REGS[REG_R2],  CURRENT_REGS[REG_R3],
             CURRENT_REGS[REG_R4],  CURRENT_REGS[REG_R5],
             CURRENT_REGS[REG_R6],  CURRENT_REGS[REG_R7]);
-      llerr("R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      alert("R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
             CURRENT_REGS[REG_R8],  CURRENT_REGS[REG_R9],
             CURRENT_REGS[REG_R10], CURRENT_REGS[REG_R11],
             CURRENT_REGS[REG_R12], CURRENT_REGS[REG_R13],
             CURRENT_REGS[REG_R14], CURRENT_REGS[REG_R15]);
 #ifdef CONFIG_BUILD_PROTECTED
-      llerr("xPSR: %08x PRIMASK: %08x EXEC_RETURN: %08x\n",
+      alert("xPSR: %08x PRIMASK: %08x EXEC_RETURN: %08x\n",
             CURRENT_REGS[REG_XPSR], CURRENT_REGS[REG_PRIMASK],
             CURRENT_REGS[REG_EXC_RETURN]);
 #else
-      llerr("xPSR: %08x PRIMASK: %08x\n",
+      alert("xPSR: %08x PRIMASK: %08x\n",
             CURRENT_REGS[REG_XPSR], CURRENT_REGS[REG_PRIMASK]);
 #endif
     }
@@ -274,12 +242,12 @@ static void up_dumpstate(void)
 
   /* Show interrupt stack info */
 
-  llerr("sp:     %08x\n", sp);
-  llerr("IRQ stack:\n");
-  llerr("  base: %08x\n", istackbase);
-  llerr("  size: %08x\n", istacksize);
+  alert("sp:     %08x\n", sp);
+  alert("IRQ stack:\n");
+  alert("  base: %08x\n", istackbase);
+  alert("  size: %08x\n", istacksize);
 #ifdef CONFIG_STACK_COLORATION
-  llerr("  used: %08x\n", up_check_intstack());
+  alert("  used: %08x\n", up_check_intstack());
 #endif
 
   /* Does the current stack pointer lie within the interrupt
@@ -301,14 +269,14 @@ static void up_dumpstate(void)
   if (CURRENT_REGS)
     {
       sp = CURRENT_REGS[REG_R13];
-      llerr("sp:     %08x\n", sp);
+      alert("sp:     %08x\n", sp);
     }
 
-  llerr("User stack:\n");
-  llerr("  base: %08x\n", ustackbase);
-  llerr("  size: %08x\n", ustacksize);
+  alert("User stack:\n");
+  alert("  base: %08x\n", ustackbase);
+  alert("  size: %08x\n", ustacksize);
 #ifdef CONFIG_STACK_COLORATION
-  llerr("  used: %08x\n", up_check_tcbstack(rtcb));
+  alert("  used: %08x\n", up_check_tcbstack(rtcb));
 #endif
 
   /* Dump the user stack if the stack pointer lies within the allocated user
@@ -321,11 +289,11 @@ static void up_dumpstate(void)
     }
 
 #else
-  llerr("sp:         %08x\n", sp);
-  llerr("stack base: %08x\n", ustackbase);
-  llerr("stack size: %08x\n", ustacksize);
+  alert("sp:         %08x\n", sp);
+  alert("stack base: %08x\n", ustackbase);
+  alert("stack size: %08x\n", ustacksize);
 #ifdef CONFIG_STACK_COLORATION
-  llerr("stack used: %08x\n", up_check_tcbstack(rtcb));
+  alert("stack used: %08x\n", up_check_tcbstack(rtcb));
 #endif
 
   /* Dump the user stack if the stack pointer lies within the allocated user
@@ -334,7 +302,7 @@ static void up_dumpstate(void)
 
   if (sp > ustackbase || sp <= ustackbase - ustacksize)
     {
-      llerr("ERROR: Stack pointer is not within allocated stack\n");
+      alert("ERROR: Stack pointer is not within allocated stack\n");
     }
   else
     {
@@ -398,17 +366,17 @@ static void _up_assert(int errorcode)
 
 void up_assert(const uint8_t *filename, int lineno)
 {
-#ifdef CONFIG_PRINT_TASKNAME
+#if CONFIG_TASK_NAME_SIZE > 0
   struct tcb_s *rtcb = this_task();
 #endif
 
   board_autoled_on(LED_ASSERTION);
 
-#ifdef CONFIG_PRINT_TASKNAME
-  llerr("Assertion failed at file:%s line: %d task: %s\n",
+#if CONFIG_TASK_NAME_SIZE > 0
+  alert("Assertion failed at file:%s line: %d task: %s\n",
         filename, lineno, rtcb->name);
 #else
-  llerr("Assertion failed at file:%s line: %d\n",
+  alert("Assertion failed at file:%s line: %d\n",
         filename, lineno);
 #endif
 
diff --git a/arch/arm/src/armv6-m/up_dumpnvic.c b/arch/arm/src/armv6-m/up_dumpnvic.c
index 678e8efefc..a50d91aac0 100644
--- a/arch/arm/src/armv6-m/up_dumpnvic.c
+++ b/arch/arm/src/armv6-m/up_dumpnvic.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/arm/src/armv6-m/up_dumpnvic.c
  *
- *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2013, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,15 +39,6 @@
 
 #include 
 
-/* Output debug info even if debug output is not selected. */
-
-#undef  CONFIG_DEBUG_ERROR
-#undef  CONFIG_DEBUG_WARN
-#undef  CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG_ERROR 1
-#define CONFIG_DEBUG_WARN 1
-#define CONFIG_DEBUG_INFO 1
-
 #include 
 #include 
 
@@ -73,6 +64,7 @@
 
 void up_dumpnvic(FAR const char *msg)
 {
+#ifdef CONFIG_DEBUG_INFO
   irqstate_t flags;
   int i;
 
@@ -103,6 +95,7 @@ void up_dumpnvic(FAR const char *msg)
          getreg32(ARMV6M_SYSCON_SHPR3));
 
   leave_critical_section(flags);
+#endif
 }
 
 #endif /* CONFIG_DEBUG_FEATURES */
diff --git a/arch/arm/src/armv7-a/arm_assert.c b/arch/arm/src/armv7-a/arm_assert.c
index 1d8e1c8fec..d79200e0f5 100644
--- a/arch/arm/src/armv7-a/arm_assert.c
+++ b/arch/arm/src/armv7-a/arm_assert.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/arm/src/armv7-a/arm_assert.c
  *
- *   Copyright (C) 2013-2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2013-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,21 +39,6 @@
 
 #include 
 
-/* Output debug info if stack dump is selected -- even if debug is not
- * selected.
- */
-
-#ifdef CONFIG_ARCH_STACKDUMP
-#  undef  CONFIG_DEBUG_FEATURES
-#  undef  CONFIG_DEBUG_ERROR
-#  undef  CONFIG_DEBUG_WARN
-#  undef  CONFIG_DEBUG_INFO
-#  define CONFIG_DEBUG_FEATURES 1
-#  define CONFIG_DEBUG_ERROR 1
-#  define CONFIG_DEBUG_WARN 1
-#  define CONFIG_DEBUG_INFO 1
-#endif
-
 #include 
 #include 
 #include 
@@ -79,19 +64,6 @@
 #  undef CONFIG_ARCH_USBDUMP
 #endif
 
-/* The following is just intended to keep some ugliness out of the mainline
- * code.  We are going to print the task name if:
- *
- *  CONFIG_TASK_NAME_SIZE > 0 &&    <-- The task has a name
- *  (defined(CONFIG_DEBUG_FEATURES)    ||    <-- And the debug is enabled (llerr used)
- *   defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used
- */
-
-#undef CONFIG_PRINT_TASKNAME
-#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG_FEATURES) || defined(CONFIG_ARCH_STACKDUMP))
-#  define CONFIG_PRINT_TASKNAME 1
-#endif
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -125,7 +97,7 @@ static void up_stackdump(uint32_t sp, uint32_t stack_base)
   for (stack = sp & ~0x1f; stack < stack_base; stack += 32)
     {
       uint32_t *ptr = (uint32_t *)stack;
-      llerr("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
              stack, ptr[0], ptr[1], ptr[2], ptr[3],
              ptr[4], ptr[5], ptr[6], ptr[7]);
     }
@@ -143,12 +115,12 @@ static void up_taskdump(FAR struct tcb_s *tcb, FAR void *arg)
 {
   /* Dump interesting properties of this task */
 
-#ifdef CONFIG_PRINT_TASKNAME
-  llerr("%s: PID=%d Stack Used=%lu of %lu\n",
+#if CONFIG_TASK_NAME_SIZE > 0
+  alert("%s: PID=%d Stack Used=%lu of %lu\n",
         tcb->name, tcb->pid, (unsigned long)up_check_tcbstack(tcb),
         (unsigned long)tcb->adj_stack_size);
 #else
-  llerr("PID: %d Stack Used=%lu of %lu\n",
+  alert("PID: %d Stack Used=%lu of %lu\n",
         tcb->pid, (unsigned long)up_check_tcbstack(tcb),
         (unsigned long)tcb->adj_stack_size);
 #endif
@@ -188,12 +160,12 @@ static inline void up_registerdump(void)
       for (regs = REG_R0; regs <= REG_R15; regs += 8)
         {
           uint32_t *ptr = (uint32_t *)&CURRENT_REGS[regs];
-          llerr("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+          alert("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n",
                  regs, ptr[0], ptr[1], ptr[2], ptr[3],
                  ptr[4], ptr[5], ptr[6], ptr[7]);
         }
 
-      llerr("CPSR: %08x\n", CURRENT_REGS[REG_CPSR]);
+      alert("CPSR: %08x\n", CURRENT_REGS[REG_CPSR]);
     }
 }
 #else
@@ -257,7 +229,7 @@ static void up_dumpstate(void)
       ustacksize = (uint32_t)rtcb->adj_stack_size;
     }
 
-  llerr("Current sp: %08x\n", sp);
+  alert("Current sp: %08x\n", sp);
 
 #if CONFIG_ARCH_INTERRUPTSTACK > 3
   /* Get the limits on the interrupt stack memory */
@@ -267,21 +239,21 @@ static void up_dumpstate(void)
 
   /* Show interrupt stack info */
 
-  llerr("Interrupt stack:\n");
-  llerr("  base: %08x\n", istackbase);
-  llerr("  size: %08x\n", istacksize);
+  alert("Interrupt stack:\n");
+  alert("  base: %08x\n", istackbase);
+  alert("  size: %08x\n", istacksize);
 #ifdef CONFIG_STACK_COLORATION
-  llerr("  used: %08x\n", up_check_intstack());
+  alert("  used: %08x\n", up_check_intstack());
 #endif
 #endif
 
   /* Show user stack info */
 
-  llerr("User stack:\n");
-  llerr("  base: %08x\n", ustackbase);
-  llerr("  size: %08x\n", ustacksize);
+  alert("User stack:\n");
+  alert("  base: %08x\n", ustackbase);
+  alert("  size: %08x\n", ustacksize);
 #ifdef CONFIG_STACK_COLORATION
-  llerr("  used: %08x\n", up_check_tcbstack(rtcb));
+  alert("  used: %08x\n", up_check_tcbstack(rtcb));
 #endif
 
 #ifdef CONFIG_ARCH_KERNEL_STACK
@@ -291,9 +263,9 @@ static void up_dumpstate(void)
     {
       kstackbase = (uint32_t)rtcb->xcp.kstack + CONFIG_ARCH_KERNEL_STACKSIZE - 4;
 
-      llerr("Kernel stack:\n");
-      llerr("  base: %08x\n", kstackbase);
-      llerr("  size: %08x\n", CONFIG_ARCH_KERNEL_STACKSIZE);
+      alert("Kernel stack:\n");
+      alert("  base: %08x\n", kstackbase);
+      alert("  size: %08x\n", CONFIG_ARCH_KERNEL_STACKSIZE);
     }
 #endif
 
@@ -304,7 +276,7 @@ static void up_dumpstate(void)
     {
       /* Yes.. dump the interrupt stack */
 
-      llerr("Interrupt Stack\n", sp);
+      alert("Interrupt Stack\n", sp);
       up_stackdump(sp, istackbase);
 
       /* Extract the user stack pointer which should lie
@@ -312,7 +284,7 @@ static void up_dumpstate(void)
        */
 
       sp = g_intstackbase;
-      llerr("User sp: %08x\n", sp);
+      alert("User sp: %08x\n", sp);
     }
 #endif
 
@@ -322,7 +294,7 @@ static void up_dumpstate(void)
 
   if (sp > ustackbase - ustacksize && sp < ustackbase)
     {
-      llerr("User Stack\n", sp);
+      alert("User Stack\n", sp);
       up_stackdump(sp, ustackbase);
     }
 
@@ -333,7 +305,7 @@ static void up_dumpstate(void)
 
   if (sp >= (uint32_t)rtcb->xcp.kstack && sp < kstackbase)
     {
-      llerr("Kernel Stack\n", sp);
+      alert("Kernel Stack\n", sp);
       up_stackdump(sp, kstackbase);
     }
 #endif
@@ -341,7 +313,7 @@ static void up_dumpstate(void)
 #ifdef CONFIG_SMP
   /* Show the CPU number */
 
-  llerr("CPU%d:\n", up_cpu_index());
+  alert("CPU%d:\n", up_cpu_index());
 #endif
 
   /* Then dump the CPU registers (if available) */
@@ -400,16 +372,16 @@ static void _up_assert(int errorcode)
 
 void up_assert(const uint8_t *filename, int lineno)
 {
-#ifdef CONFIG_PRINT_TASKNAME
+#if CONFIG_TASK_NAME_SIZE > 0
   struct tcb_s *rtcb = this_task();
 #endif
   board_autoled_on(LED_ASSERTION);
 
-#ifdef CONFIG_PRINT_TASKNAME
-  llerr("Assertion failed at file:%s line: %d task: %s\n",
+#if CONFIG_TASK_NAME_SIZE > 0
+  alert("Assertion failed at file:%s line: %d task: %s\n",
         filename, lineno, rtcb->name);
 #else
-  llerr("Assertion failed at file:%s line: %d\n",
+  alert("Assertion failed at file:%s line: %d\n",
         filename, lineno);
 #endif
   up_dumpstate();
diff --git a/arch/arm/src/armv7-a/arm_dataabort.c b/arch/arm/src/armv7-a/arm_dataabort.c
index 0ec5df5513..00a686f8a7 100644
--- a/arch/arm/src/armv7-a/arm_dataabort.c
+++ b/arch/arm/src/armv7-a/arm_dataabort.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/arm/src/armv7-a/arm_dataabort.c
  *
- *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2013, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,21 +39,6 @@
 
 #include 
 
-/* Output debug info if stack dump is selected -- even if debug is not
- * selected.
- */
-
-#ifdef CONFIG_ARCH_STACKDUMP
-#  undef  CONFIG_DEBUG_FEATURES
-#  undef  CONFIG_DEBUG_ERROR
-#  undef  CONFIG_DEBUG_WARN
-#  undef  CONFIG_DEBUG_INFO
-#  define CONFIG_DEBUG_FEATURES 1
-#  define CONFIG_DEBUG_ERROR 1
-#  define CONFIG_DEBUG_WARN 1
-#  define CONFIG_DEBUG_INFO 1
-#endif
-
 #include 
 #include 
 
@@ -167,7 +152,7 @@ uint32_t *arm_dataabort(uint32_t *regs, uint32_t dfar, uint32_t dfsr)
   return regs;
 
 segfault:
-  llerr("Data abort. PC: %08x DFAR: %08x DFSR: %08x\n",
+  alert("Data abort. PC: %08x DFAR: %08x DFSR: %08x\n",
         regs[REG_PC], dfar, dfsr);
   PANIC();
   return regs; /* To keep the compiler happy */
@@ -185,7 +170,7 @@ uint32_t *arm_dataabort(uint32_t *regs, uint32_t dfar, uint32_t dfsr)
 
   /* Crash -- possibly showing diagnostic debug information. */
 
-  llerr("Data abort. PC: %08x DFAR: %08x DFSR: %08x\n",
+  alert("Data abort. PC: %08x DFAR: %08x DFSR: %08x\n",
         regs[REG_PC], dfar, dfsr);
   PANIC();
   return regs; /* To keep the compiler happy */
diff --git a/arch/arm/src/armv7-a/arm_prefetchabort.c b/arch/arm/src/armv7-a/arm_prefetchabort.c
index 68e88a6f48..a6b73e3ad2 100644
--- a/arch/arm/src/armv7-a/arm_prefetchabort.c
+++ b/arch/arm/src/armv7-a/arm_prefetchabort.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  *  arch/arm/src/armv7-a/arm_prefetchabort.c
  *
- *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2013, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,21 +39,6 @@
 
 #include 
 
-/* Output debug info if stack dump is selected -- even if debug is not
- * selected.
- */
-
-#ifdef CONFIG_ARCH_STACKDUMP
-#  undef  CONFIG_DEBUG_FEATURES
-#  undef  CONFIG_DEBUG_ERROR
-#  undef  CONFIG_DEBUG_WARN
-#  undef  CONFIG_DEBUG_INFO
-#  define CONFIG_DEBUG_FEATURES 1
-#  define CONFIG_DEBUG_ERROR 1
-#  define CONFIG_DEBUG_WARN 1
-#  define CONFIG_DEBUG_INFO 1
-#endif
-
 #include 
 #include 
 
@@ -138,7 +123,7 @@ uint32_t *arm_prefetchabort(uint32_t *regs, uint32_t ifar, uint32_t ifsr)
     }
   else
     {
-      llerr("Prefetch abort. PC: %08x IFAR: %08x IFSR: %08x\n",
+      alert("Prefetch abort. PC: %08x IFAR: %08x IFSR: %08x\n",
             regs[REG_PC], ifar, ifsr);
       PANIC();
     }
@@ -158,7 +143,7 @@ uint32_t *arm_prefetchabort(uint32_t *regs, uint32_t ifar, uint32_t ifsr)
 
   /* Crash -- possibly showing diagnostic debug information. */
 
-  llerr("Prefetch abort. PC: %08x IFAR: %08x IFSR: %08x\n",
+  alert("Prefetch abort. PC: %08x IFAR: %08x IFSR: %08x\n",
         regs[REG_PC], ifar, ifsr);
   PANIC();
   return regs; /* To keep the compiler happy */
diff --git a/arch/arm/src/armv7-a/arm_syscall.c b/arch/arm/src/armv7-a/arm_syscall.c
index e331edabd8..c9505aaadf 100644
--- a/arch/arm/src/armv7-a/arm_syscall.c
+++ b/arch/arm/src/armv7-a/arm_syscall.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  *  arch/arm/src/armv7-a/arm_syscall.c
  *
- *   Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2013-2014, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,21 +39,6 @@
 
 #include 
 
-/* Output debug info if stack dump is selected -- even if debug is not
- * selected.
- */
-
-#ifdef CONFIG_ARCH_STACKDUMP
-#  undef  CONFIG_DEBUG_FEATURES
-#  undef  CONFIG_DEBUG_ERROR
-#  undef  CONFIG_DEBUG_WARN
-#  undef  CONFIG_DEBUG_INFO
-#  define CONFIG_DEBUG_FEATURES 1
-#  define CONFIG_DEBUG_ERROR 1
-#  define CONFIG_DEBUG_WARN 1
-#  define CONFIG_DEBUG_INFO 1
-#endif
-
 #include 
 #include 
 #include 
@@ -75,9 +60,13 @@
 /* Debug ********************************************************************/
 
 #if defined(CONFIG_DEBUG_SYSCALL)
-# define svcerr(format, ...) llerr(format, ##__VA_ARGS__)
+# define svcerr(format, ...)  llerr(format, ##__VA_ARGS__)
+# define svcwarn(format, ...) llwarn(format, ##__VA_ARGS__)
+# define svcinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 # define svcerr(x...)
+# define svcwarn(x...)
+# define svcinfo(x...)
 #endif
 
 /****************************************************************************
@@ -183,14 +172,14 @@ uint32_t *arm_syscall(uint32_t *regs)
    */
 
 #if defined(CONFIG_DEBUG_SYSCALL)
-  svcerr("SYSCALL Entry: regs: %p cmd: %d\n", regs, cmd);
-  svcerr("  R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+  svcinfo("SYSCALL Entry: regs: %p cmd: %d\n", regs, cmd);
+  svcinfo("  R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
          regs[REG_R0],  regs[REG_R1],  regs[REG_R2],  regs[REG_R3],
          regs[REG_R4],  regs[REG_R5],  regs[REG_R6],  regs[REG_R7]);
-  svcerr("  R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+  svcinfo("  R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
          regs[REG_R8],  regs[REG_R9],  regs[REG_R10], regs[REG_R11],
          regs[REG_R12], regs[REG_R13], regs[REG_R14], regs[REG_R15]);
-  svcerr("CPSR: %08x\n", regs[REG_CPSR]);
+  svcinfo("CPSR: %08x\n", regs[REG_CPSR]);
 #endif
 
   /* Handle the SVCall according to the command in R0 */
@@ -508,14 +497,14 @@ uint32_t *arm_syscall(uint32_t *regs)
 #if defined(CONFIG_DEBUG_SYSCALL)
   /* Report what happened */
 
-  svcerr("SYSCALL Exit: regs: %p\n", regs);
-  svcerr("  R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
-         regs[REG_R0],  regs[REG_R1],  regs[REG_R2],  regs[REG_R3],
-         regs[REG_R4],  regs[REG_R5],  regs[REG_R6],  regs[REG_R7]);
-  svcerr("  R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
-         regs[REG_R8],  regs[REG_R9],  regs[REG_R10], regs[REG_R11],
+  svcinfo("SYSCALL Exit: regs: %p\n", regs);
+  svcinfo("  R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+          regs[REG_R0],  regs[REG_R1],  regs[REG_R2],  regs[REG_R3],
+          regs[REG_R4],  regs[REG_R5],  regs[REG_R6],  regs[REG_R7]);
+  svcinfo("  R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+          regs[REG_R8],  regs[REG_R9],  regs[REG_R10], regs[REG_R11],
          regs[REG_R12], regs[REG_R13], regs[REG_R14], regs[REG_R15]);
-  svcerr("CPSR: %08x\n", regs[REG_CPSR]);
+  svcinfo("CPSR: %08x\n", regs[REG_CPSR]);
 #endif
 
   /* Return the last value of curent_regs.  This supports context switches
@@ -530,7 +519,7 @@ uint32_t *arm_syscall(uint32_t *regs)
 
 uint32_t *arm_syscall(uint32_t *regs)
 {
-  llerr("SYSCALL from 0x%x\n", regs[REG_PC]);
+  alert("SYSCALL from 0x%x\n", regs[REG_PC]);
   CURRENT_REGS = regs;
   PANIC();
 }
diff --git a/arch/arm/src/armv7-a/arm_undefinedinsn.c b/arch/arm/src/armv7-a/arm_undefinedinsn.c
index 899d0a099e..70442b49ff 100644
--- a/arch/arm/src/armv7-a/arm_undefinedinsn.c
+++ b/arch/arm/src/armv7-a/arm_undefinedinsn.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/arm/src/armv7-a/arm_undefinedinsn.c
  *
- *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2013, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,21 +39,6 @@
 
 #include 
 
-/* Output debug info if stack dump is selected -- even if debug is not
- * selected.
- */
-
-#ifdef CONFIG_ARCH_STACKDUMP
-#  undef  CONFIG_DEBUG_FEATURES
-#  undef  CONFIG_DEBUG_ERROR
-#  undef  CONFIG_DEBUG_WARN
-#  undef  CONFIG_DEBUG_INFO
-#  define CONFIG_DEBUG_FEATURES 1
-#  define CONFIG_DEBUG_ERROR 1
-#  define CONFIG_DEBUG_WARN 1
-#  define CONFIG_DEBUG_INFO 1
-#endif
-
 #include 
 #include 
 #include 
@@ -72,7 +57,7 @@
 
 uint32_t *arm_undefinedinsn(uint32_t *regs)
 {
-  llerr("Undefined instruction at 0x%x\n", regs[REG_PC]);
+  alert("Undefined instruction at 0x%x\n", regs[REG_PC]);
   CURRENT_REGS = regs;
   PANIC();
   return regs; /* To keep the compiler happy */
diff --git a/arch/arm/src/armv7-m/up_assert.c b/arch/arm/src/armv7-m/up_assert.c
index c7e770fb88..fbf29b29e7 100644
--- a/arch/arm/src/armv7-m/up_assert.c
+++ b/arch/arm/src/armv7-m/up_assert.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/arm/src/armv7-m/up_assert.c
  *
- *   Copyright (C) 2009-2010, 2012-2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009-2010, 2012-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,21 +39,6 @@
 
 #include 
 
-/* Output debug info if stack dump is selected -- even if debug is not
- * selected.
- */
-
-#ifdef CONFIG_ARCH_STACKDUMP
-#  undef  CONFIG_DEBUG_FEATURES
-#  undef  CONFIG_DEBUG_ERROR
-#  undef  CONFIG_DEBUG_WARN
-#  undef  CONFIG_DEBUG_INFO
-#  define CONFIG_DEBUG_FEATURES 1
-#  define CONFIG_DEBUG_ERROR 1
-#  define CONFIG_DEBUG_WARN 1
-#  define CONFIG_DEBUG_INFO 1
-#endif
-
 #include 
 #include 
 #include 
@@ -79,23 +64,6 @@
 #  undef CONFIG_ARCH_USBDUMP
 #endif
 
-/* The following is just intended to keep some ugliness out of the mainline
- * code.  We are going to print the task name if:
- *
- *  CONFIG_TASK_NAME_SIZE > 0 &&    <-- The task has a name
- *  (defined(CONFIG_DEBUG_FEATURES)    ||    <-- And the debug is enabled (llerr used)
- *   defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used
- */
-
-#undef CONFIG_PRINT_TASKNAME
-#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG_FEATURES) || defined(CONFIG_ARCH_STACKDUMP))
-#  define CONFIG_PRINT_TASKNAME 1
-#endif
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -129,7 +97,7 @@ static void up_stackdump(uint32_t sp, uint32_t stack_base)
   for (stack = sp & ~0x1f; stack < stack_base; stack += 32)
     {
       uint32_t *ptr = (uint32_t *)stack;
-      llerr("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
              stack, ptr[0], ptr[1], ptr[2], ptr[3],
              ptr[4], ptr[5], ptr[6], ptr[7]);
     }
@@ -147,12 +115,12 @@ static void up_taskdump(FAR struct tcb_s *tcb, FAR void *arg)
 {
   /* Dump interesting properties of this task */
 
-#ifdef CONFIG_PRINT_TASKNAME
-  llerr("%s: PID=%d Stack Used=%lu of %lu\n",
+#if CONFIG_TASK_NAME_SIZE > 0
+  alert("%s: PID=%d Stack Used=%lu of %lu\n",
         tcb->name, tcb->pid, (unsigned long)up_check_tcbstack(tcb),
         (unsigned long)tcb->adj_stack_size);
 #else
-  llerr("PID: %d Stack Used=%lu of %lu\n",
+  alert("PID: %d Stack Used=%lu of %lu\n",
         tcb->pid, (unsigned long)up_check_tcbstack(tcb),
         (unsigned long)tcb->adj_stack_size);
 #endif
@@ -187,29 +155,29 @@ static inline void up_registerdump(void)
     {
       /* Yes.. dump the interrupt registers */
 
-      llerr("R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      alert("R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
             CURRENT_REGS[REG_R0],  CURRENT_REGS[REG_R1],
             CURRENT_REGS[REG_R2],  CURRENT_REGS[REG_R3],
             CURRENT_REGS[REG_R4],  CURRENT_REGS[REG_R5],
             CURRENT_REGS[REG_R6],  CURRENT_REGS[REG_R7]);
-      llerr("R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      alert("R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
             CURRENT_REGS[REG_R8],  CURRENT_REGS[REG_R9],
             CURRENT_REGS[REG_R10], CURRENT_REGS[REG_R11],
             CURRENT_REGS[REG_R12], CURRENT_REGS[REG_R13],
             CURRENT_REGS[REG_R14], CURRENT_REGS[REG_R15]);
 
 #ifdef CONFIG_ARMV7M_USEBASEPRI
-      llerr("xPSR: %08x BASEPRI: %08x CONTROL: %08x\n",
+      alert("xPSR: %08x BASEPRI: %08x CONTROL: %08x\n",
             CURRENT_REGS[REG_XPSR],  CURRENT_REGS[REG_BASEPRI],
             getcontrol());
 #else
-      llerr("xPSR: %08x PRIMASK: %08x CONTROL: %08x\n",
+      alert("xPSR: %08x PRIMASK: %08x CONTROL: %08x\n",
             CURRENT_REGS[REG_XPSR],  CURRENT_REGS[REG_PRIMASK],
             getcontrol());
 #endif
 
 #ifdef REG_EXC_RETURN
-      llerr("EXC_RETURN: %08x\n", CURRENT_REGS[REG_EXC_RETURN]);
+      alert("EXC_RETURN: %08x\n", CURRENT_REGS[REG_EXC_RETURN]);
 #endif
     }
 }
@@ -279,12 +247,12 @@ static void up_dumpstate(void)
 
   /* Show interrupt stack info */
 
-  llerr("sp:     %08x\n", sp);
-  llerr("IRQ stack:\n");
-  llerr("  base: %08x\n", istackbase);
-  llerr("  size: %08x\n", istacksize);
+  alert("sp:     %08x\n", sp);
+  alert("IRQ stack:\n");
+  alert("  base: %08x\n", istackbase);
+  alert("  size: %08x\n", istacksize);
 #ifdef CONFIG_STACK_COLORATION
-  llerr("  used: %08x\n", up_check_intstack());
+  alert("  used: %08x\n", up_check_intstack());
 #endif
 
   /* Does the current stack pointer lie within the interrupt
@@ -306,14 +274,14 @@ static void up_dumpstate(void)
   if (CURRENT_REGS)
     {
       sp = CURRENT_REGS[REG_R13];
-      llerr("sp:     %08x\n", sp);
+      alert("sp:     %08x\n", sp);
     }
 
-  llerr("User stack:\n");
-  llerr("  base: %08x\n", ustackbase);
-  llerr("  size: %08x\n", ustacksize);
+  alert("User stack:\n");
+  alert("  base: %08x\n", ustackbase);
+  alert("  size: %08x\n", ustacksize);
 #ifdef CONFIG_STACK_COLORATION
-  llerr("  used: %08x\n", up_check_tcbstack(rtcb));
+  alert("  used: %08x\n", up_check_tcbstack(rtcb));
 #endif
 
   /* Dump the user stack if the stack pointer lies within the allocated user
@@ -329,11 +297,11 @@ static void up_dumpstate(void)
 
   /* Show user stack info */
 
-  llerr("sp:         %08x\n", sp);
-  llerr("stack base: %08x\n", ustackbase);
-  llerr("stack size: %08x\n", ustacksize);
+  alert("sp:         %08x\n", sp);
+  alert("stack base: %08x\n", ustackbase);
+  alert("stack size: %08x\n", ustacksize);
 #ifdef CONFIG_STACK_COLORATION
-  llerr("stack used: %08x\n", up_check_tcbstack(rtcb));
+  alert("stack used: %08x\n", up_check_tcbstack(rtcb));
 #endif
 
   /* Dump the user stack if the stack pointer lies within the allocated user
@@ -342,7 +310,7 @@ static void up_dumpstate(void)
 
   if (sp > ustackbase || sp <= ustackbase - ustacksize)
     {
-      llerr("ERROR: Stack pointer is not within the allocated stack\n");
+      alert("ERROR: Stack pointer is not within the allocated stack\n");
     }
   else
     {
@@ -407,17 +375,17 @@ static void _up_assert(int errorcode)
 
 void up_assert(const uint8_t *filename, int lineno)
 {
-#ifdef CONFIG_PRINT_TASKNAME
+#if CONFIG_TASK_NAME_SIZE > 0
   struct tcb_s *rtcb = this_task();
 #endif
 
   board_autoled_on(LED_ASSERTION);
 
-#ifdef CONFIG_PRINT_TASKNAME
-  llerr("Assertion failed at file:%s line: %d task: %s\n",
+#if CONFIG_TASK_NAME_SIZE > 0
+  alert("Assertion failed at file:%s line: %d task: %s\n",
         filename, lineno, rtcb->name);
 #else
-  llerr("Assertion failed at file:%s line: %d\n",
+  alert("Assertion failed at file:%s line: %d\n",
         filename, lineno);
 #endif
 
diff --git a/arch/arm/src/armv7-r/arm_assert.c b/arch/arm/src/armv7-r/arm_assert.c
index 790465d843..9218e4da8a 100644
--- a/arch/arm/src/armv7-r/arm_assert.c
+++ b/arch/arm/src/armv7-r/arm_assert.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/arm/src/armv7-r/arm_assert.c
  *
- *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2015-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,21 +39,6 @@
 
 #include 
 
-/* Output debug info if stack dump is selected -- even if debug is not
- * selected.
- */
-
-#ifdef CONFIG_ARCH_STACKDUMP
-#  undef  CONFIG_DEBUG_FEATURES
-#  undef  CONFIG_DEBUG_ERROR
-#  undef  CONFIG_DEBUG_WARN
-#  undef  CONFIG_DEBUG_INFO
-#  define CONFIG_DEBUG_FEATURES 1
-#  define CONFIG_DEBUG_ERROR 1
-#  define CONFIG_DEBUG_WARN 1
-#  define CONFIG_DEBUG_INFO 1
-#endif
-
 #include 
 #include 
 #include 
@@ -80,19 +65,6 @@
 #  undef CONFIG_ARCH_USBDUMP
 #endif
 
-/* The following is just intended to keep some ugliness out of the mainline
- * code.  We are going to print the task name if:
- *
- *  CONFIG_TASK_NAME_SIZE > 0 &&       <-- The task has a name
- *  (defined(CONFIG_DEBUG_FEATURES) || <-- And the debug is enabled (llerr used)
- *   defined(CONFIG_ARCH_STACKDUMP)    <-- Or lowsyslog() is used
- */
-
-#undef CONFIG_PRINT_TASKNAME
-#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG_FEATURES) || defined(CONFIG_ARCH_STACKDUMP))
-#  define CONFIG_PRINT_TASKNAME 1
-#endif
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -144,7 +116,7 @@ static void up_taskdump(FAR struct tcb_s *tcb, FAR void *arg)
 {
   /* Dump interesting properties of this task */
 
-#ifdef CONFIG_PRINT_TASKNAME
+#if CONFIG_TASK_NAME_SIZE > 0
   llerr("%s: PID=%d Stack Used=%lu of %lu\n",
         tcb->name, tcb->pid, (unsigned long)up_check_tcbstack(tcb),
         (unsigned long)tcb->adj_stack_size);
@@ -395,12 +367,12 @@ static void _up_assert(int errorcode)
 
 void up_assert(const uint8_t *filename, int lineno)
 {
-#ifdef CONFIG_PRINT_TASKNAME
+#if CONFIG_TASK_NAME_SIZE > 0
   struct tcb_s *rtcb = this_task();
 #endif
   board_autoled_on(LED_ASSERTION);
 
-#ifdef CONFIG_PRINT_TASKNAME
+#if CONFIG_TASK_NAME_SIZE > 0
   llerr("Assertion failed at file:%s line: %d task: %s\n",
         filename, lineno, rtcb->name);
 #else
diff --git a/arch/arm/src/armv7-r/arm_dataabort.c b/arch/arm/src/armv7-r/arm_dataabort.c
index aeb6654452..56cf88d8bc 100644
--- a/arch/arm/src/armv7-r/arm_dataabort.c
+++ b/arch/arm/src/armv7-r/arm_dataabort.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/arm/src/armv7-r/arm_dataabort.c
  *
- *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2015-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,21 +39,6 @@
 
 #include 
 
-/* Output debug info if stack dump is selected -- even if debug is not
- * selected.
- */
-
-#ifdef CONFIG_ARCH_STACKDUMP
-#  undef  CONFIG_DEBUG_FEATURES
-#  undef  CONFIG_DEBUG_ERROR
-#  undef  CONFIG_DEBUG_WARN
-#  undef  CONFIG_DEBUG_INFO
-#  define CONFIG_DEBUG_FEATURES 1
-#  define CONFIG_DEBUG_ERROR 1
-#  define CONFIG_DEBUG_WARN 1
-#  define CONFIG_DEBUG_INFO 1
-#endif
-
 #include 
 #include 
 
@@ -90,7 +75,7 @@ uint32_t *arm_dataabort(uint32_t *regs, uint32_t dfar, uint32_t dfsr)
 
   /* Crash -- possibly showing diagnostic debug information. */
 
-  llerr("Data abort. PC: %08x DFAR: %08x DFSR: %08x\n",
+  alert("Data abort. PC: %08x DFAR: %08x DFSR: %08x\n",
         regs[REG_PC], dfar, dfsr);
   PANIC();
   return regs; /* To keep the compiler happy */
diff --git a/arch/arm/src/armv7-r/arm_prefetchabort.c b/arch/arm/src/armv7-r/arm_prefetchabort.c
index 8d000a16de..ee9c38be0a 100644
--- a/arch/arm/src/armv7-r/arm_prefetchabort.c
+++ b/arch/arm/src/armv7-r/arm_prefetchabort.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  *  arch/arm/src/armv7-r/arm_prefetchabort.c
  *
- *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2015-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,21 +39,6 @@
 
 #include 
 
-/* Output debug info if stack dump is selected -- even if debug is not
- * selected.
- */
-
-#ifdef CONFIG_ARCH_STACKDUMP
-#  undef  CONFIG_DEBUG_FEATURES
-#  undef  CONFIG_DEBUG_ERROR
-#  undef  CONFIG_DEBUG_WARN
-#  undef  CONFIG_DEBUG_INFO
-#  define CONFIG_DEBUG_FEATURES 1
-#  define CONFIG_DEBUG_ERROR 1
-#  define CONFIG_DEBUG_WARN 1
-#  define CONFIG_DEBUG_INFO 1
-#endif
-
 #include 
 #include 
 
@@ -86,7 +71,7 @@ uint32_t *arm_prefetchabort(uint32_t *regs, uint32_t ifar, uint32_t ifsr)
 
   /* Crash -- possibly showing diagnostic debug information. */
 
-  llerr("Prefetch abort. PC: %08x IFAR: %08x IFSR: %08x\n",
+  alert("Prefetch abort. PC: %08x IFAR: %08x IFSR: %08x\n",
         regs[REG_PC], ifar, ifsr);
   PANIC();
   return regs; /* To keep the compiler happy */
diff --git a/arch/arm/src/armv7-r/arm_syscall.c b/arch/arm/src/armv7-r/arm_syscall.c
index f3d2ae9f10..28fad77f4e 100644
--- a/arch/arm/src/armv7-r/arm_syscall.c
+++ b/arch/arm/src/armv7-r/arm_syscall.c
@@ -39,21 +39,6 @@
 
 #include 
 
-/* Output debug info if stack dump is selected -- even if debug is not
- * selected.
- */
-
-#ifdef CONFIG_ARCH_STACKDUMP
-#  undef  CONFIG_DEBUG_FEATURES
-#  undef  CONFIG_DEBUG_ERROR
-#  undef  CONFIG_DEBUG_WARN
-#  undef  CONFIG_DEBUG_INFO
-#  define CONFIG_DEBUG_FEATURES 1
-#  define CONFIG_DEBUG_ERROR 1
-#  define CONFIG_DEBUG_WARN 1
-#  define CONFIG_DEBUG_INFO 1
-#endif
-
 #include 
 #include 
 #include 
@@ -74,9 +59,13 @@
 /* Debug ********************************************************************/
 
 #if defined(CONFIG_DEBUG_SYSCALL)
-# define svcerr(format, ...) llerr(format, ##__VA_ARGS__)
+# define svcerr(format, ...)  llerr(format, ##__VA_ARGS__)
+# define svcwarn(format, ...) llwarn(format, ##__VA_ARGS__)
+# define svcinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 # define svcerr(x...)
+# define svcwarn(x...)
+# define svcinfo(x...)
 #endif
 
 /****************************************************************************
@@ -182,14 +171,14 @@ uint32_t *arm_syscall(uint32_t *regs)
    */
 
 #if defined(CONFIG_DEBUG_SYSCALL)
-  svcerr("SYSCALL Entry: regs: %p cmd: %d\n", regs, cmd);
-  svcerr("  R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
-         regs[REG_R0],  regs[REG_R1],  regs[REG_R2],  regs[REG_R3],
-         regs[REG_R4],  regs[REG_R5],  regs[REG_R6],  regs[REG_R7]);
-  svcerr("  R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
-         regs[REG_R8],  regs[REG_R9],  regs[REG_R10], regs[REG_R11],
-         regs[REG_R12], regs[REG_R13], regs[REG_R14], regs[REG_R15]);
-  svcerr("CPSR: %08x\n", regs[REG_CPSR]);
+  svcinfo("SYSCALL Entry: regs: %p cmd: %d\n", regs, cmd);
+  svcinfo("  R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+          regs[REG_R0],  regs[REG_R1],  regs[REG_R2],  regs[REG_R3],
+          regs[REG_R4],  regs[REG_R5],  regs[REG_R6],  regs[REG_R7]);
+  svcinfo("  R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+          regs[REG_R8],  regs[REG_R9],  regs[REG_R10], regs[REG_R11],
+          regs[REG_R12], regs[REG_R13], regs[REG_R14], regs[REG_R15]);
+  svcinfo("CPSR: %08x\n", regs[REG_CPSR]);
 #endif
 
   /* Handle the SVCall according to the command in R0 */
@@ -507,14 +496,14 @@ uint32_t *arm_syscall(uint32_t *regs)
 #if defined(CONFIG_DEBUG_SYSCALL)
   /* Report what happened */
 
-  svcerr("SYSCALL Exit: regs: %p\n", regs);
-  svcerr("  R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
-         regs[REG_R0],  regs[REG_R1],  regs[REG_R2],  regs[REG_R3],
-         regs[REG_R4],  regs[REG_R5],  regs[REG_R6],  regs[REG_R7]);
-  svcerr("  R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
-         regs[REG_R8],  regs[REG_R9],  regs[REG_R10], regs[REG_R11],
-         regs[REG_R12], regs[REG_R13], regs[REG_R14], regs[REG_R15]);
-  svcerr("CPSR: %08x\n", regs[REG_CPSR]);
+  svcinfo("SYSCALL Exit: regs: %p\n", regs);
+  svcinfo("  R0: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+          regs[REG_R0],  regs[REG_R1],  regs[REG_R2],  regs[REG_R3],
+          regs[REG_R4],  regs[REG_R5],  regs[REG_R6],  regs[REG_R7]);
+  svcinfo("  R8: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+          regs[REG_R8],  regs[REG_R9],  regs[REG_R10], regs[REG_R11],
+          regs[REG_R12], regs[REG_R13], regs[REG_R14], regs[REG_R15]);
+  svcinfo("CPSR: %08x\n", regs[REG_CPSR]);
 #endif
 
   /* Return the last value of curent_regs.  This supports context switches
@@ -529,7 +518,7 @@ uint32_t *arm_syscall(uint32_t *regs)
 
 uint32_t *arm_syscall(uint32_t *regs)
 {
-  llerr("SYSCALL from 0x%x\n", regs[REG_PC]);
+  alert("SYSCALL from 0x%x\n", regs[REG_PC]);
   CURRENT_REGS = regs;
   PANIC();
 }
diff --git a/arch/arm/src/armv7-r/arm_undefinedinsn.c b/arch/arm/src/armv7-r/arm_undefinedinsn.c
index 8b5f8c689a..d23af75301 100644
--- a/arch/arm/src/armv7-r/arm_undefinedinsn.c
+++ b/arch/arm/src/armv7-r/arm_undefinedinsn.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/arm/src/armv7-r/arm_undefinedinsn.c
  *
- *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2015-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,21 +39,6 @@
 
 #include 
 
-/* Output debug info if stack dump is selected -- even if debug is not
- * selected.
- */
-
-#ifdef CONFIG_ARCH_STACKDUMP
-#  undef  CONFIG_DEBUG_FEATURES
-#  undef  CONFIG_DEBUG_ERROR
-#  undef  CONFIG_DEBUG_WARN
-#  undef  CONFIG_DEBUG_INFO
-#  define CONFIG_DEBUG_FEATURES 1
-#  define CONFIG_DEBUG_ERROR 1
-#  define CONFIG_DEBUG_WARN 1
-#  define CONFIG_DEBUG_INFO 1
-#endif
-
 #include 
 #include 
 #include 
@@ -72,7 +57,7 @@
 
 uint32_t *arm_undefinedinsn(uint32_t *regs)
 {
-  llerr("Undefined instruction at 0x%x\n", regs[REG_PC]);
+  alert("Undefined instruction at 0x%x\n", regs[REG_PC]);
   CURRENT_REGS = regs;
   PANIC();
   return regs; /* To keep the compiler happy */
diff --git a/arch/arm/src/kl/kl_dumpgpio.c b/arch/arm/src/kl/kl_dumpgpio.c
index ef41826e5b..60eea46009 100644
--- a/arch/arm/src/kl/kl_dumpgpio.c
+++ b/arch/arm/src/kl/kl_dumpgpio.c
@@ -41,11 +41,7 @@
 
 /* Output debug info even if debug output is not selected. */
 
-#undef  CONFIG_DEBUG_ERROR
-#undef  CONFIG_DEBUG_WARN
 #undef  CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG_ERROR 1
-#define CONFIG_DEBUG_WARN 1
 #define CONFIG_DEBUG_INFO 1
 
 #include 
@@ -122,12 +118,12 @@ void kl_dumpgpio(gpio_cfgset_t pinset, const char *msg)
 
   flags = enter_critical_section();
 
-  llerr("GPIO%c pinset: %08x base: %08x -- %s\n",
-        g_portchar[port], pinset, base, msg);
-  llerr("  PDOR: %08x  PDIR: %08x  PDDR: %08x\n",
-        getreg32(base + KL_GPIO_PDOR_OFFSET),
-        getreg32(base + KL_GPIO_PDIR_OFFSET),
-        getreg32(base + KL_GPIO_PDDR_OFFSET));
+  llinfo("GPIO%c pinset: %08x base: %08x -- %s\n",
+         g_portchar[port], pinset, base, msg);
+  llinfo("  PDOR: %08x  PDIR: %08x  PDDR: %08x\n",
+         getreg32(base + KL_GPIO_PDOR_OFFSET),
+         getreg32(base + KL_GPIO_PDIR_OFFSET),
+         getreg32(base + KL_GPIO_PDDR_OFFSET));
 
   leave_critical_section(flags);
 }
diff --git a/arch/arm/src/lpc11xx/lpc11_gpiodbg.c b/arch/arm/src/lpc11xx/lpc11_gpiodbg.c
index b86b4973db..d88aeb7362 100644
--- a/arch/arm/src/lpc11xx/lpc11_gpiodbg.c
+++ b/arch/arm/src/lpc11xx/lpc11_gpiodbg.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/arm/src/lpc11xx/lpc11_gpiodbg.c
  *
- *   Copyright (C) 2010-2011, 2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010-2011, 2013, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,11 +41,7 @@
 
 /* Output debug info even if debug output is not selected. */
 
-#undef  CONFIG_DEBUG_ERROR
-#undef  CONFIG_DEBUG_WARN
 #undef  CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG_ERROR 1
-#define CONFIG_DEBUG_WARN 1
 #define CONFIG_DEBUG_INFO 1
 
 #include 
@@ -158,32 +154,33 @@ int lpc11_dumpgpio(lpc11_pinset_t pinset, const char *msg)
   /* The following requires exclusive access to the GPIO registers */
 
   flags = enter_critical_section();
-  llerr("GPIO%c pin%d (pinset: %08x) -- %s\n",
+  llinfo("GPIO%c pin%d (pinset: %08x) -- %s\n",
         port + '0', pin, pinset, msg);
 
 #if defined(LPC176x)
-  llerr("  PINSEL[%08x]: %08x PINMODE[%08x]: %08x ODMODE[%08x]: %08x\n",
-        pinsel,  pinsel  ? getreg32(pinsel) : 0,
-        pinmode, pinmode ? getreg32(pinmode) : 0,
-        g_odmode[port],    getreg32(g_odmode[port]));
+  llinfo("  PINSEL[%08x]: %08x PINMODE[%08x]: %08x ODMODE[%08x]: %08x\n",
+         pinsel,  pinsel  ? getreg32(pinsel) : 0,
+         pinmode, pinmode ? getreg32(pinmode) : 0,
+         g_odmode[port],    getreg32(g_odmode[port]));
 #elif defined(LPC178x)
-  llerr("  IOCON[%08x]: %08x\n", iocon, getreg32(iocon));
+  llinfo("  IOCON[%08x]: %08x\n", iocon, getreg32(iocon));
 #endif
 
   base = g_fiobase[port];
-  llerr("  FIODIR[%08x]: %08x FIOMASK[%08x]: %08x FIOPIN[%08x]: %08x\n",
-        base+LPC11_FIO_DIR_OFFSET,  getreg32(base+LPC11_FIO_DIR_OFFSET),
-        base+LPC11_FIO_MASK_OFFSET, getreg32(base+LPC11_FIO_MASK_OFFSET),
-        base+LPC11_FIO_PIN_OFFSET,  getreg32(base+LPC11_FIO_PIN_OFFSET));
+  llinfo("  FIODIR[%08x]: %08x FIOMASK[%08x]: %08x FIOPIN[%08x]: %08x\n",
+         base+LPC11_FIO_DIR_OFFSET,  getreg32(base+LPC11_FIO_DIR_OFFSET),
+         base+LPC11_FIO_MASK_OFFSET, getreg32(base+LPC11_FIO_MASK_OFFSET),
+         base+LPC11_FIO_PIN_OFFSET,  getreg32(base+LPC11_FIO_PIN_OFFSET));
 
   base = g_intbase[port];
-  llerr("  IOINTSTATUS[%08x]: %08x INTSTATR[%08x]: %08x INSTATF[%08x]: %08x\n",
-        LPC11_GPIOINT_IOINTSTATUS,          getreg32(LPC11_GPIOINT_IOINTSTATUS),
-        base+LPC11_GPIOINT_INTSTATR_OFFSET, getreg32(base+LPC11_GPIOINT_INTSTATR_OFFSET),
-        base+LPC11_GPIOINT_INTSTATF_OFFSET, getreg32(base+LPC11_GPIOINT_INTSTATF_OFFSET));
-  llerr("  INTENR[%08x]: %08x INTENF[%08x]: %08x\n",
-        base+LPC11_GPIOINT_INTENR_OFFSET,   getreg32(base+LPC11_GPIOINT_INTENR_OFFSET),
-        base+LPC11_GPIOINT_INTENF_OFFSET,   getreg32(base+LPC11_GPIOINT_INTENF_OFFSET));
+  llinfo("  IOINTSTATUS[%08x]: %08x INTSTATR[%08x]: %08x INSTATF[%08x]: %08x\n",
+         LPC11_GPIOINT_IOINTSTATUS,          getreg32(LPC11_GPIOINT_IOINTSTATUS),
+         base+LPC11_GPIOINT_INTSTATR_OFFSET, getreg32(base+LPC11_GPIOINT_INTSTATR_OFFSET),
+         base+LPC11_GPIOINT_INTSTATF_OFFSET, getreg32(base+LPC11_GPIOINT_INTSTATF_OFFSET));
+  llinfo("  INTENR[%08x]: %08x INTENF[%08x]: %08x\n",
+         base+LPC11_GPIOINT_INTENR_OFFSET,   getreg32(base+LPC11_GPIOINT_INTENR_OFFSET),
+         base+LPC11_GPIOINT_INTENF_OFFSET,   getreg32(base+LPC11_GPIOINT_INTENF_OFFSET));
+
   leave_critical_section(flags);
   return OK;
 }
diff --git a/arch/arm/src/lpc17xx/lpc17_gpiodbg.c b/arch/arm/src/lpc17xx/lpc17_gpiodbg.c
index 590aa80fb1..abe2534cdc 100644
--- a/arch/arm/src/lpc17xx/lpc17_gpiodbg.c
+++ b/arch/arm/src/lpc17xx/lpc17_gpiodbg.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/arm/src/lpc17xx/lpc17_gpiodbg.c
  *
- *   Copyright (C) 2010-2011, 2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010-2011, 2013, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,11 +41,7 @@
 
 /* Output debug info even if debug output is not selected. */
 
-#undef  CONFIG_DEBUG_ERROR
-#undef  CONFIG_DEBUG_WARN
 #undef  CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG_ERROR 1
-#define CONFIG_DEBUG_WARN 1
 #define CONFIG_DEBUG_INFO 1
 
 #include 
@@ -158,32 +154,33 @@ int lpc17_dumpgpio(lpc17_pinset_t pinset, const char *msg)
   /* The following requires exclusive access to the GPIO registers */
 
   flags = enter_critical_section();
-  llerr("GPIO%c pin%d (pinset: %08x) -- %s\n",
-        port + '0', pin, pinset, msg);
+  llinfo("GPIO%c pin%d (pinset: %08x) -- %s\n",
+         port + '0', pin, pinset, msg);
 
 #if defined(LPC176x)
-  llerr("  PINSEL[%08x]: %08x PINMODE[%08x]: %08x ODMODE[%08x]: %08x\n",
-        pinsel,  pinsel  ? getreg32(pinsel) : 0,
-        pinmode, pinmode ? getreg32(pinmode) : 0,
-        g_odmode[port],    getreg32(g_odmode[port]));
+  llinfo("  PINSEL[%08x]: %08x PINMODE[%08x]: %08x ODMODE[%08x]: %08x\n",
+         pinsel,  pinsel  ? getreg32(pinsel) : 0,
+         pinmode, pinmode ? getreg32(pinmode) : 0,
+         g_odmode[port],    getreg32(g_odmode[port]));
 #elif defined(LPC178x)
-  llerr("  IOCON[%08x]: %08x\n", iocon, getreg32(iocon));
+  llinfo("  IOCON[%08x]: %08x\n", iocon, getreg32(iocon));
 #endif
 
   base = g_fiobase[port];
-  llerr("  FIODIR[%08x]: %08x FIOMASK[%08x]: %08x FIOPIN[%08x]: %08x\n",
-        base+LPC17_FIO_DIR_OFFSET,  getreg32(base+LPC17_FIO_DIR_OFFSET),
-        base+LPC17_FIO_MASK_OFFSET, getreg32(base+LPC17_FIO_MASK_OFFSET),
-        base+LPC17_FIO_PIN_OFFSET,  getreg32(base+LPC17_FIO_PIN_OFFSET));
+  llinfo("  FIODIR[%08x]: %08x FIOMASK[%08x]: %08x FIOPIN[%08x]: %08x\n",
+         base+LPC17_FIO_DIR_OFFSET,  getreg32(base+LPC17_FIO_DIR_OFFSET),
+         base+LPC17_FIO_MASK_OFFSET, getreg32(base+LPC17_FIO_MASK_OFFSET),
+         base+LPC17_FIO_PIN_OFFSET,  getreg32(base+LPC17_FIO_PIN_OFFSET));
 
   base = g_intbase[port];
-  llerr("  IOINTSTATUS[%08x]: %08x INTSTATR[%08x]: %08x INSTATF[%08x]: %08x\n",
-        LPC17_GPIOINT_IOINTSTATUS,          getreg32(LPC17_GPIOINT_IOINTSTATUS),
-        base+LPC17_GPIOINT_INTSTATR_OFFSET, getreg32(base+LPC17_GPIOINT_INTSTATR_OFFSET),
-        base+LPC17_GPIOINT_INTSTATF_OFFSET, getreg32(base+LPC17_GPIOINT_INTSTATF_OFFSET));
-  llerr("  INTENR[%08x]: %08x INTENF[%08x]: %08x\n",
-        base+LPC17_GPIOINT_INTENR_OFFSET,   getreg32(base+LPC17_GPIOINT_INTENR_OFFSET),
-        base+LPC17_GPIOINT_INTENF_OFFSET,   getreg32(base+LPC17_GPIOINT_INTENF_OFFSET));
+  llinfo("  IOINTSTATUS[%08x]: %08x INTSTATR[%08x]: %08x INSTATF[%08x]: %08x\n",
+         LPC17_GPIOINT_IOINTSTATUS,          getreg32(LPC17_GPIOINT_IOINTSTATUS),
+         base+LPC17_GPIOINT_INTSTATR_OFFSET, getreg32(base+LPC17_GPIOINT_INTSTATR_OFFSET),
+         base+LPC17_GPIOINT_INTSTATF_OFFSET, getreg32(base+LPC17_GPIOINT_INTSTATF_OFFSET));
+  llinfo("  INTENR[%08x]: %08x INTENF[%08x]: %08x\n",
+         base+LPC17_GPIOINT_INTENR_OFFSET,   getreg32(base+LPC17_GPIOINT_INTENR_OFFSET),
+         base+LPC17_GPIOINT_INTENF_OFFSET,   getreg32(base+LPC17_GPIOINT_INTENF_OFFSET));
+
   leave_critical_section(flags);
   return OK;
 }
diff --git a/arch/arm/src/sama5/sama5d3x4x_pio.c b/arch/arm/src/sama5/sama5d3x4x_pio.c
index 1fde4bacfe..5bd0e765f2 100644
--- a/arch/arm/src/sama5/sama5d3x4x_pio.c
+++ b/arch/arm/src/sama5/sama5d3x4x_pio.c
@@ -43,11 +43,7 @@
 #ifdef CONFIG_DEBUG_GPIO
 /* Output informational debug info even if debug output is not enabled. */
 
-#  undef  CONFIG_DEBUG_ERROR
-#  undef  CONFIG_DEBUG_WARN
 #  undef  CONFIG_DEBUG_INFO
-#  define CONFIG_DEBUG_ERROR 1
-#  define CONFIG_DEBUG_WARN 1
 #  define CONFIG_DEBUG_INFO 1
 #endif
 
diff --git a/arch/arm/src/stm32/stm32_dumpgpio.c b/arch/arm/src/stm32/stm32_dumpgpio.c
index 3731e4158b..5de501f033 100644
--- a/arch/arm/src/stm32/stm32_dumpgpio.c
+++ b/arch/arm/src/stm32/stm32_dumpgpio.c
@@ -41,11 +41,7 @@
 
 /* Output debug info even if debug output is not selected. */
 
-#undef  CONFIG_DEBUG_ERROR
-#undef  CONFIG_DEBUG_WARN
 #undef  CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG_ERROR 1
-#define CONFIG_DEBUG_WARN 1
 #define CONFIG_DEBUG_INFO 1
 
 #include 
diff --git a/arch/arm/src/tiva/tiva_dumpgpio.c b/arch/arm/src/tiva/tiva_dumpgpio.c
index f0f66756dd..dff948c376 100644
--- a/arch/arm/src/tiva/tiva_dumpgpio.c
+++ b/arch/arm/src/tiva/tiva_dumpgpio.c
@@ -41,11 +41,7 @@
 
 /* Output debug info even if debug output is not selected. */
 
-#undef  CONFIG_DEBUG_ERROR
-#undef  CONFIG_DEBUG_WARN
 #undef  CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG_ERROR 1
-#define CONFIG_DEBUG_WARN 1
 #define CONFIG_DEBUG_INFO 1
 
 #include 
diff --git a/arch/avr/src/avr/up_dumpstate.c b/arch/avr/src/avr/up_dumpstate.c
index fa04857067..9e406b6cab 100644
--- a/arch/avr/src/avr/up_dumpstate.c
+++ b/arch/avr/src/avr/up_dumpstate.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/avr/src/avr/up_dumpstate.c
  *
- *   Copyright (C) 2011, 2014 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2014, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,17 +39,6 @@
 
 #include 
 
-/* Output debug info -- even if debug is not selected. */
-
-#undef  CONFIG_DEBUG_FEATURES
-#undef  CONFIG_DEBUG_ERROR
-#undef  CONFIG_DEBUG_WARN
-#undef  CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG_FEATURES 1
-#define CONFIG_DEBUG_ERROR 1
-#define CONFIG_DEBUG_WARN 1
-#define CONFIG_DEBUG_INFO 1
-
 #include 
 #include 
 #include 
@@ -101,7 +90,7 @@ static void up_stackdump(uint16_t sp, uint16_t stack_base)
   for (stack = sp & ~3; stack < stack_base; stack += 12)
     {
       uint8_t *ptr = (uint8_t *)stack;
-      llerr("%04x: %02x %02x %02x %02x %02x %02x %02x %02x"
+      alert("%04x: %02x %02x %02x %02x %02x %02x %02x %02x"
             " %02x %02x %02x %02x\n",
              stack,
              ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7],
@@ -119,28 +108,28 @@ static inline void up_registerdump(void)
 
   if (g_current_regs)
     {
-      llerr("R%02d: %02x %02x %02x %02x %02x %02x %02x %02x\n",
+      alert("R%02d: %02x %02x %02x %02x %02x %02x %02x %02x\n",
             0,
             g_current_regs[REG_R0],  g_current_regs[REG_R1],
             g_current_regs[REG_R2],  g_current_regs[REG_R3],
             g_current_regs[REG_R4],  g_current_regs[REG_R5],
             g_current_regs[REG_R6],  g_current_regs[REG_R7]);
 
-      llerr("R%02d: %02x %02x %02x %02x %02x %02x %02x %02x\n",
+      alert("R%02d: %02x %02x %02x %02x %02x %02x %02x %02x\n",
             8,
             g_current_regs[REG_R8],  g_current_regs[REG_R9],
             g_current_regs[REG_R10], g_current_regs[REG_R11],
             g_current_regs[REG_R12], g_current_regs[REG_R13],
             g_current_regs[REG_R14], g_current_regs[REG_R15]);
 
-      llerr("R%02d: %02x %02x %02x %02x %02x %02x %02x %02x\n",
+      alert("R%02d: %02x %02x %02x %02x %02x %02x %02x %02x\n",
             16,
             g_current_regs[REG_R16], g_current_regs[REG_R17],
             g_current_regs[REG_R18], g_current_regs[REG_R19],
             g_current_regs[REG_R20], g_current_regs[REG_R21],
             g_current_regs[REG_R22], g_current_regs[REG_R23]);
 
-      llerr("R%02d: %02x %02x %02x %02x %02x %02x %02x %02x\n",
+      alert("R%02d: %02x %02x %02x %02x %02x %02x %02x %02x\n",
             24,
             g_current_regs[REG_R24], g_current_regs[REG_R25],
             g_current_regs[REG_R26], g_current_regs[REG_R27],
@@ -148,12 +137,12 @@ static inline void up_registerdump(void)
             g_current_regs[REG_R30], g_current_regs[REG_R31]);
 
 #if !defined(REG_PC2)
-      llerr("PC:  %02x%02x  SP: %02x%02x SREG: %02x\n",
+      alert("PC:  %02x%02x  SP: %02x%02x SREG: %02x\n",
             g_current_regs[REG_PC0], g_current_regs[REG_PC1],
             g_current_regs[REG_SPH], g_current_regs[REG_SPL],
             g_current_regs[REG_SREG]);
 #else
-      llerr("PC:  %02x%02x%02x  SP: %02x%02x SREG: %02x\n",
+      alert("PC:  %02x%02x%02x  SP: %02x%02x SREG: %02x\n",
             g_current_regs[REG_PC0], g_current_regs[REG_PC1],
             g_current_regs[REG_PC2], g_current_regs[REG_SPH],
             g_current_regs[REG_SPL], g_current_regs[REG_SREG]);
@@ -201,12 +190,12 @@ void up_dumpstate(void)
 
   /* Show interrupt stack info */
 
-  llerr("sp:     %04x\n", sp);
-  llerr("IRQ stack:\n");
-  llerr("  base: %04x\n", istackbase);
-  llerr("  size: %04x\n", istacksize);
+  alert("sp:     %04x\n", sp);
+  alert("IRQ stack:\n");
+  alert("  base: %04x\n", istackbase);
+  alert("  size: %04x\n", istacksize);
 #ifdef CONFIG_STACK_COLORATION
-  llerr("  used: %08x\n", up_check_intstack());
+  alert("  used: %08x\n", up_check_intstack());
 #endif
 
   /* Does the current stack pointer lie within the interrupt
@@ -228,14 +217,14 @@ void up_dumpstate(void)
   if (g_current_regs)
     {
       sp = g_current_regs[REG_R13];
-      llerr("sp:     %04x\n", sp);
+      alert("sp:     %04x\n", sp);
     }
 
-  llerr("User stack:\n");
-  llerr("  base: %04x\n", ustackbase);
-  llerr("  size: %04x\n", ustacksize);
+  alert("User stack:\n");
+  alert("  base: %04x\n", ustackbase);
+  alert("  size: %04x\n", ustacksize);
 #ifdef CONFIG_STACK_COLORATION
-  llerr("  used: %08x\n", up_check_tcbstack(rtcb));
+  alert("  used: %08x\n", up_check_tcbstack(rtcb));
 #endif
 
   /* Dump the user stack if the stack pointer lies within the allocated user
@@ -247,11 +236,11 @@ void up_dumpstate(void)
       up_stackdump(sp, ustackbase);
     }
 #else
-  llerr("sp:         %04x\n", sp);
-  llerr("stack base: %04x\n", ustackbase);
-  llerr("stack size: %04x\n", ustacksize);
+  alert("sp:         %04x\n", sp);
+  alert("stack base: %04x\n", ustackbase);
+  alert("stack size: %04x\n", ustacksize);
 #ifdef CONFIG_STACK_COLORATION
-  llerr("stack used: %08x\n", up_check_tcbstack(rtcb));
+  alert("stack used: %08x\n", up_check_tcbstack(rtcb));
 #endif
 
   /* Dump the user stack if the stack pointer lies within the allocated user
@@ -260,7 +249,7 @@ void up_dumpstate(void)
 
   if (sp > ustackbase || sp <= ustackbase - ustacksize)
     {
-      llerr("ERROR: Stack pointer is not within allocated stack\n");
+      alert("ERROR: Stack pointer is not within allocated stack\n");
     }
   else
     {
diff --git a/arch/avr/src/avr32/up_dumpstate.c b/arch/avr/src/avr32/up_dumpstate.c
index 4f67d1bef4..16a5406aa4 100644
--- a/arch/avr/src/avr32/up_dumpstate.c
+++ b/arch/avr/src/avr32/up_dumpstate.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/avr/src/avr32/up_dumpstate.c
  *
- *   Copyright (C) 2010-2011, 2014 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010-2011, 2014, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,17 +39,6 @@
 
 #include 
 
-/* Output debug info -- even if debug is not selected. */
-
-#undef  CONFIG_DEBUG_FEATURES
-#undef  CONFIG_DEBUG_ERROR
-#undef  CONFIG_DEBUG_WARN
-#undef  CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG_FEATURES 1
-#define CONFIG_DEBUG_ERROR 1
-#define CONFIG_DEBUG_WARN 1
-#define CONFIG_DEBUG_INFO 1
-
 #include 
 #include 
 #include 
@@ -97,7 +86,7 @@ static void up_stackdump(uint32_t sp, uint32_t stack_base)
   for (stack = sp & ~0x1f; stack < stack_base; stack += 32)
     {
       uint32_t *ptr = (uint32_t *)stack;
-      llerr("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
              stack, ptr[0], ptr[1], ptr[2], ptr[3],
              ptr[4], ptr[5], ptr[6], ptr[7]);
     }
@@ -113,21 +102,21 @@ static inline void up_registerdump(void)
 
   if (g_current_regs)
     {
-      llerr("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      alert("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n",
             0,
             g_current_regs[REG_R0], g_current_regs[REG_R1],
             g_current_regs[REG_R2], g_current_regs[REG_R3],
             g_current_regs[REG_R4], g_current_regs[REG_R5],
             g_current_regs[REG_R6], g_current_regs[REG_R7]);
 
-      llerr("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      alert("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n",
             8,
             g_current_regs[REG_R8],  g_current_regs[REG_R9],
             g_current_regs[REG_R10], g_current_regs[REG_R11],
             g_current_regs[REG_R12], g_current_regs[REG_R13],
             g_current_regs[REG_R14], g_current_regs[REG_R15]);
 
-      llerr("SR: %08x\n", g_current_regs[REG_SR]);
+      alert("SR: %08x\n", g_current_regs[REG_SR]);
     }
 }
 
@@ -167,12 +156,12 @@ void up_dumpstate(void)
 
   /* Show interrupt stack info */
 
-  llerr("sp:     %08x\n", sp);
-  llerr("IRQ stack:\n");
-  llerr("  base: %08x\n", istackbase);
-  llerr("  size: %08x\n", istacksize);
+  alert("sp:     %08x\n", sp);
+  alert("IRQ stack:\n");
+  alert("  base: %08x\n", istackbase);
+  alert("  size: %08x\n", istacksize);
 #ifdef CONFIG_STACK_COLORATION
-  llerr("  used: %08x\n", up_check_intstack());
+  alert("  used: %08x\n", up_check_intstack());
 #endif
 
   /* Does the current stack pointer lie within the interrupt
@@ -194,14 +183,14 @@ void up_dumpstate(void)
   if (g_current_regs)
     {
       sp = g_current_regs[REG_R13];
-      llerr("sp:     %08x\n", sp);
+      alert("sp:     %08x\n", sp);
     }
 
-  llerr("User stack:\n");
-  llerr("  base: %08x\n", ustackbase);
-  llerr("  size: %08x\n", ustacksize);
+  alert("User stack:\n");
+  alert("  base: %08x\n", ustackbase);
+  alert("  size: %08x\n", ustacksize);
 #ifdef CONFIG_STACK_COLORATION
-  llerr("  used: %08x\n", up_check_tcbstack(rtcb));
+  alert("  used: %08x\n", up_check_tcbstack(rtcb));
 #endif
 
   /* Dump the user stack if the stack pointer lies within the allocated user
@@ -213,11 +202,11 @@ void up_dumpstate(void)
       up_stackdump(sp, ustackbase);
     }
 #else
-  llerr("sp:         %08x\n", sp);
-  llerr("stack base: %08x\n", ustackbase);
-  llerr("stack size: %08x\n", ustacksize);
+  alert("sp:         %08x\n", sp);
+  alert("stack base: %08x\n", ustackbase);
+  alert("stack size: %08x\n", ustacksize);
 #ifdef CONFIG_STACK_COLORATION
-  llerr("stack used: %08x\n", up_check_tcbstack(rtcb));
+  alert("stack used: %08x\n", up_check_tcbstack(rtcb));
 #endif
 
   /* Dump the user stack if the stack pointer lies within the allocated user
@@ -226,7 +215,7 @@ void up_dumpstate(void)
 
   if (sp > ustackbase || sp <= ustackbase - ustacksize)
     {
-      llerr("ERROR: Stack pointer is not within allocated stack\n");
+      alert("ERROR: Stack pointer is not within allocated stack\n");
     }
   else
     {
diff --git a/arch/avr/src/common/up_assert.c b/arch/avr/src/common/up_assert.c
index 5ef623bd40..dc6411081e 100644
--- a/arch/avr/src/common/up_assert.c
+++ b/arch/avr/src/common/up_assert.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/avr/src/common/up_assert.c
  *
- *   Copyright (C) 2010-2011, 2013-2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010-2011, 2013-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,21 +39,6 @@
 
 #include 
 
-/* Output debug info if stack dump is selected -- even if debug is not
- * selected.
- */
-
-#ifdef CONFIG_ARCH_STACKDUMP
-#  undef  CONFIG_DEBUG_FEATURES
-#  undef  CONFIG_DEBUG_ERROR
-#  undef  CONFIG_DEBUG_WARN
-#  undef  CONFIG_DEBUG_INFO
-#  define CONFIG_DEBUG_FEATURES 1
-#  define CONFIG_DEBUG_ERROR 1
-#  define CONFIG_DEBUG_WARN 1
-#  define CONFIG_DEBUG_INFO 1
-#endif
-
 #include 
 #include 
 #include 
@@ -79,23 +64,6 @@
 #  undef CONFIG_ARCH_USBDUMP
 #endif
 
-/* The following is just intended to keep some ugliness out of the mainline
- * code.  We are going to print the task name if:
- *
- *  CONFIG_TASK_NAME_SIZE > 0 &&     <-- The task has a name
- *  (defined(CONFIG_DEBUG_FEATURES)    ||     <-- And the debug is enabled (llerr used)
- *   defined(CONFIG_ARCH_STACKDUMP)) <-- Or lowsyslog() is used
- */
-
-#undef CONFIG_PRINT_TASKNAME
-#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG_FEATURES) || defined(CONFIG_ARCH_STACKDUMP))
-#  define CONFIG_PRINT_TASKNAME 1
-#endif
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -163,17 +131,17 @@ static int assert_tracecallback(FAR struct usbtrace_s *trace, FAR void *arg)
 
 void up_assert(const uint8_t *filename, int lineno)
 {
-#ifdef CONFIG_PRINT_TASKNAME
+#if CONFIG_TASK_NAME_SIZE > 0
   struct tcb_s *rtcb = this_task();
 #endif
 
   board_autoled_on(LED_ASSERTION);
 
-#ifdef CONFIG_PRINT_TASKNAME
-  llerr("Assertion failed at file:%s line: %d task: %s\n",
+#if CONFIG_TASK_NAME_SIZE > 0
+  alert("Assertion failed at file:%s line: %d task: %s\n",
         filename, lineno, rtcb->name);
 #else
-  llerr("Assertion failed at file:%s line: %d\n",
+  alert("Assertion failed at file:%s line: %d\n",
         filename, lineno);
 #endif
 
diff --git a/arch/hc/src/m9s12/m9s12_assert.c b/arch/hc/src/m9s12/m9s12_assert.c
index c7dc444767..1074adfb80 100644
--- a/arch/hc/src/m9s12/m9s12_assert.c
+++ b/arch/hc/src/m9s12/m9s12_assert.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/hc/src/m9s12/m9s12_assert.c
  *
- *   Copyright (C) 2011-2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,21 +39,6 @@
 
 #include 
 
-/* Output debug info if stack dump is selected -- even if debug is not
- * selected.
- */
-
-#ifdef CONFIG_ARCH_STACKDUMP
-#  undef  CONFIG_DEBUG_FEATURES
-#  undef  CONFIG_DEBUG_ERROR
-#  undef  CONFIG_DEBUG_WARN
-#  undef  CONFIG_DEBUG_INFO
-#  define CONFIG_DEBUG_FEATURES 1
-#  define CONFIG_DEBUG_ERROR 1
-#  define CONFIG_DEBUG_WARN 1
-#  define CONFIG_DEBUG_INFO 1
-#endif
-
 #include 
 #include 
 #include 
@@ -79,23 +64,6 @@
 #  undef CONFIG_ARCH_USBDUMP
 #endif
 
-/* The following is just intended to keep some ugliness out of the mainline
- * code.  We are going to print the task name if:
- *
- *  CONFIG_TASK_NAME_SIZE > 0 &&    <-- The task has a name
- *  (defined(CONFIG_DEBUG_FEATURES)    ||    <-- And the debug is enabled (llerr used)
- *   defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used
- */
-
-#undef CONFIG_PRINT_TASKNAME
-#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG_FEATURES) || defined(CONFIG_ARCH_STACKDUMP))
-#  define CONFIG_PRINT_TASKNAME 1
-#endif
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -112,7 +80,7 @@ static void up_stackdump(uint16_t sp, uint16_t stack_base)
   for (stack = sp; stack < stack_base; stack += 16)
     {
       uint8_t *ptr = (uint8_t*)stack;
-      llerr("%04x: %02x %02x %02x %02x %02x %02x %02x %02x"
+      alert("%04x: %02x %02x %02x %02x %02x %02x %02x %02x"
             "   %02x %02x %02x %02x %02x %02x %02x %02x\n",
              stack, ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7],
              ptr[8], ptr[9], ptr[10], ptr[11], ptr[12], ptr[13], ptr[14], ptr[15]);
@@ -133,11 +101,11 @@ static inline void up_registerdump(void)
 
   if (g_current_regs)
     {
-      llerr("A:%02x B:%02x X:%02x%02x Y:%02x%02x PC:%02x%02x CCR:%02x\n",
+      alert("A:%02x B:%02x X:%02x%02x Y:%02x%02x PC:%02x%02x CCR:%02x\n",
              g_current_regs[REG_A], g_current_regs[REG_B], g_current_regs[REG_XH],
              g_current_regs[REG_XL], g_current_regs[REG_YH], g_current_regs[REG_YL],
              g_current_regs[REG_PCH], g_current_regs[REG_PCL], g_current_regs[REG_CCR]);
-      llerr("SP:%02x%02x FRAME:%02x%02x TMP:%02x%02x Z:%02x%02x XY:%02x\n",
+      alert("SP:%02x%02x FRAME:%02x%02x TMP:%02x%02x Z:%02x%02x XY:%02x\n",
              g_current_regs[REG_SPH], g_current_regs[REG_SPL],
              g_current_regs[REG_FRAMEH], g_current_regs[REG_FRAMEL],
              g_current_regs[REG_TMPL], g_current_regs[REG_TMPH], g_current_regs[REG_ZL],
@@ -146,16 +114,16 @@ static inline void up_registerdump(void)
 #if CONFIG_HCS12_MSOFTREGS > 2
 #  error "Need to save more registers"
 #elif CONFIG_HCS12_MSOFTREGS == 2
-      llerr("SOFTREGS: %02x%02x :%02x%02x\n",
+      alert("SOFTREGS: %02x%02x :%02x%02x\n",
             g_current_regs[REG_SOFTREG1], g_current_regs[REG_SOFTREG1+1],
             g_current_regs[REG_SOFTREG2], g_current_regs[REG_SOFTREG2+1]);
 #elif CONFIG_HCS12_MSOFTREGS == 1
-      llerr("SOFTREGS: %02x%02x\n", g_current_regs[REG_SOFTREG1],
+      alert("SOFTREGS: %02x%02x\n", g_current_regs[REG_SOFTREG1],
             g_current_regs[REG_SOFTREG1+1]);
 #endif
 
 #ifndef CONFIG_HCS12_NONBANKED
-      llerr("PPAGE: %02x\n", g_current_regs[REG_PPAGE],);
+      alert("PPAGE: %02x\n", g_current_regs[REG_PPAGE],);
 #endif
     }
 }
@@ -225,10 +193,10 @@ static void up_dumpstate(void)
 
   /* Show interrupt stack info */
 
-  llerr("sp:     %04x\n", sp);
-  llerr("IRQ stack:\n");
-  llerr("  base: %04x\n", istackbase);
-  llerr("  size: %04x\n", istacksize);
+  alert("sp:     %04x\n", sp);
+  alert("IRQ stack:\n");
+  alert("  base: %04x\n", istackbase);
+  alert("  size: %04x\n", istacksize);
 
   /* Does the current stack pointer lie within the interrupt
    * stack?
@@ -245,18 +213,18 @@ static void up_dumpstate(void)
        */
 
       sp = g_intstackbase;
-      llerr("sp:     %04x\n", sp);
+      alert("sp:     %04x\n", sp);
     }
 
   /* Show user stack info */
 
-  llerr("User stack:\n");
-  llerr("  base: %04x\n", ustackbase);
-  llerr("  size: %04x\n", ustacksize);
+  alert("User stack:\n");
+  alert("  base: %04x\n", ustackbase);
+  alert("  size: %04x\n", ustacksize);
 #else
-  llerr("sp:         %04x\n", sp);
-  llerr("stack base: %04x\n", ustackbase);
-  llerr("stack size: %04x\n", ustacksize);
+  alert("sp:         %04x\n", sp);
+  alert("stack base: %04x\n", ustackbase);
+  alert("stack size: %04x\n", ustacksize);
 #endif
 
   /* Dump the user stack if the stack pointer lies within the allocated user
@@ -266,7 +234,7 @@ static void up_dumpstate(void)
   if (sp > ustackbase || sp <= ustackbase - ustacksize)
     {
 #if !defined(CONFIG_ARCH_INTERRUPTSTACK) || CONFIG_ARCH_INTERRUPTSTACK < 4
-      llerr("ERROR: Stack pointer is not within allocated stack\n");
+      alert("ERROR: Stack pointer is not within allocated stack\n");
 #endif
     }
   else
@@ -326,17 +294,17 @@ static void _up_assert(int errorcode)
 
 void up_assert(const uint8_t *filename, int lineno)
 {
-#ifdef CONFIG_PRINT_TASKNAME
+#if CONFIG_TASK_NAME_SIZE > 0
   struct tcb_s *rtcb = this_task();
 #endif
 
   board_autoled_on(LED_ASSERTION);
 
-#ifdef CONFIG_PRINT_TASKNAME
-  llerr("Assertion failed at file:%s line: %d task: %s\n",
+#if CONFIG_TASK_NAME_SIZE > 0
+  alert("Assertion failed at file:%s line: %d task: %s\n",
         filename, lineno, rtcb->name);
 #else
-  llerr("Assertion failed at file:%s line: %d\n",
+  alert("Assertion failed at file:%s line: %d\n",
         filename, lineno);
 #endif
 
diff --git a/arch/hc/src/m9s12/m9s12_dumpgpio.c b/arch/hc/src/m9s12/m9s12_dumpgpio.c
index c9a0875176..9a4ae61a65 100644
--- a/arch/hc/src/m9s12/m9s12_dumpgpio.c
+++ b/arch/hc/src/m9s12/m9s12_dumpgpio.c
@@ -1,8 +1,7 @@
 /****************************************************************************
  * arch/arm/src/m9s12/m9s12_dumpgpio.c
- * arch/arm/src/chip/m9s12_dumpgpio.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,12 +42,8 @@
 /* Output debug info -- even if debug is not selected. */
 
 #undef  CONFIG_DEBUG_FEATURES
-#undef  CONFIG_DEBUG_ERROR
-#undef  CONFIG_DEBUG_WARN
 #undef  CONFIG_DEBUG_INFO
 #define CONFIG_DEBUG_FEATURES 1
-#define CONFIG_DEBUG_ERROR 1
-#define CONFIG_DEBUG_WARN 1
 #define CONFIG_DEBUG_INFO 1
 
 #include 
@@ -177,39 +172,39 @@ static inline void hcs12_pimdump(uint8_t portndx)
 
   if (portndx >= HCS12_PIM_NPORTS)
     {
-      llerr("  Illegal PIM port index: %d\n", portndx);
+      llinfo("  Illegal PIM port index: %d\n", portndx);
       return;
     }
 
   ptr = &piminfo[portndx];
-  llerr(" PIM Port%c:\n", ptr->name);
-  llerr("   IO:%02x  INP:%02x DDR:%02x RDR:%02x\n",
-        getreg8(ptr->base+HCS12_PIM_IO_OFFSET),
-        getreg8(ptr->base+HCS12_PIM_INPUT_OFFSET),
-        getreg8(ptr->base+HCS12_PIM_DDR_OFFSET),
-        getreg8(ptr->base+HCS12_PIM_RDR_OFFSET));
+  llinfo(" PIM Port%c:\n", ptr->name);
+  llinfo("   IO:%02x  INP:%02x DDR:%02x RDR:%02x\n",
+         getreg8(ptr->base+HCS12_PIM_IO_OFFSET),
+         getreg8(ptr->base+HCS12_PIM_INPUT_OFFSET),
+         getreg8(ptr->base+HCS12_PIM_DDR_OFFSET),
+         getreg8(ptr->base+HCS12_PIM_RDR_OFFSET));
 
   switch (ptr->form)
     {
     case PIMPORT_FORM1:
-      llerr("  PER:%02x  PS:%02x\n",
-            getreg8(ptr->base+HCS12_PIM_PER_OFFSET),
-            getreg8(ptr->base+HCS12_PIM_PS_OFFSET));
+      llinfo("  PER:%02x  PS:%02x\n",
+             getreg8(ptr->base+HCS12_PIM_PER_OFFSET),
+             getreg8(ptr->base+HCS12_PIM_PS_OFFSET));
       break;
 
     case PIMPORT_FORM2:
-      llerr("  PER:%02x  PS:%02x WOM:%02x\n",
-            getreg8(ptr->base+HCS12_PIM_PER_OFFSET),
-            getreg8(ptr->base+HCS12_PIM_PS_OFFSET),
-            getreg8(ptr->base+HCS12_PIM_WOM_OFFSET));
+      llinfo("  PER:%02x  PS:%02x WOM:%02x\n",
+             getreg8(ptr->base+HCS12_PIM_PER_OFFSET),
+             getreg8(ptr->base+HCS12_PIM_PS_OFFSET),
+             getreg8(ptr->base+HCS12_PIM_WOM_OFFSET));
       break;
 
     case PIMPORT_FORM3:
-      llerr("  PER:%02x  PS:%02x  IE:%02x  IF:%02x\n",
-            getreg8(ptr->base+HCS12_PIM_PER_OFFSET),
-            getreg8(ptr->base+HCS12_PIM_PS_OFFSET),
-            getreg8(ptr->base+HCS12_PIM_IE_OFFSET),
-            getreg8(ptr->base+HCS12_PIM_IF_OFFSET));
+      llinfo("  PER:%02x  PS:%02x  IE:%02x  IF:%02x\n",
+             getreg8(ptr->base+HCS12_PIM_PER_OFFSET),
+             getreg8(ptr->base+HCS12_PIM_PS_OFFSET),
+             getreg8(ptr->base+HCS12_PIM_IE_OFFSET),
+             getreg8(ptr->base+HCS12_PIM_IF_OFFSET));
       break;
 
     default:
@@ -231,30 +226,30 @@ static inline void hcs12_mebidump(uint8_t portndx)
 
   if (portndx >= HCS12_MEBI_NPORTS)
     {
-      llerr("  Illegal MEBI port index: %d\n", portndx);
+      llinfo("  Illegal MEBI port index: %d\n", portndx);
       return;
     }
 
   ptr = &mebiinfo[portndx];
-  llerr(" MEBI Port%c:\n", ptr->name);
+  llinfo(" MEBI Port%c:\n", ptr->name);
 
   switch (ptr->form)
     {
     case MEBIPORT_AB:
-      llerr("   DATA:%02x DDR:%02x\n",
+      llinfo("   DATA:%02x DDR:%02x\n",
             getreg8(ptr->data), getreg8(ptr->ddr));
       break;
 
     case MEBIPORT_E:
-      llerr("   DATA:%02x DDR:%02x MODE:%02x PEAR:%02x\n",
-            getreg8(ptr->data), getreg8(ptr->ddr),
-            getreg8(HCS12_MEBI_MODE), getreg8(HCS12_MEBI_PEAR));
+      llinfo("   DATA:%02x DDR:%02x MODE:%02x PEAR:%02x\n",
+             getreg8(ptr->data), getreg8(ptr->ddr),
+             getreg8(HCS12_MEBI_MODE), getreg8(HCS12_MEBI_PEAR));
       break;
 
     case MEBIPORT_K:
-      llerr("   DATA:%02x DDR:%02x MODE:%02x\n",
-            getreg8(ptr->data), getreg8(ptr->ddr),
-            getreg8(HCS12_MEBI_MODE));
+      llinfo("   DATA:%02x DDR:%02x MODE:%02x\n",
+             getreg8(ptr->data), getreg8(ptr->ddr),
+             getreg8(HCS12_MEBI_MODE));
       break;
 
     default:
@@ -279,7 +274,7 @@ int hcs12_dumpgpio(uint16_t pinset, const char *msg)
   uint8_t portndx = HCS12_PORTNDX(pinset);
   irqstate_t flags = enter_critical_section();
 
-  llerr("pinset: %08x -- %s\n", pinset, msg);
+  llinfo("pinset: %08x -- %s\n", pinset, msg);
 
   if (HCS12_PIMPORT(pinset))
     {
@@ -295,4 +290,3 @@ int hcs12_dumpgpio(uint16_t pinset, const char *msg)
 }
 
 #endif /* CONFIG_DEBUG_GPIO */
-
diff --git a/arch/mips/src/mips32/up_assert.c b/arch/mips/src/mips32/up_assert.c
index 1a5174d67d..1f4ab15d6b 100644
--- a/arch/mips/src/mips32/up_assert.c
+++ b/arch/mips/src/mips32/up_assert.c
@@ -39,21 +39,6 @@
 
 #include 
 
-/* Output debug info if stack dump is selected -- even if debug is not
- * selected.
- */
-
-#ifdef CONFIG_ARCH_STACKDUMP
-#  undef  CONFIG_DEBUG_FEATURES
-#  undef  CONFIG_DEBUG_ERROR
-#  undef  CONFIG_DEBUG_WARN
-#  undef  CONFIG_DEBUG_INFO
-#  define CONFIG_DEBUG_FEATURES 1
-#  define CONFIG_DEBUG_ERROR 1
-#  define CONFIG_DEBUG_WARN 1
-#  define CONFIG_DEBUG_INFO 1
-#endif
-
 #include 
 #include 
 #include 
@@ -79,23 +64,6 @@
 #  undef CONFIG_ARCH_USBDUMP
 #endif
 
-/* The following is just intended to keep some ugliness out of the mainline
- * code.  We are going to print the task name if:
- *
- *  CONFIG_TASK_NAME_SIZE > 0 &&    <-- The task has a name
- *  (defined(CONFIG_DEBUG_FEATURES)    ||    <-- And the debug is enabled (llerr used)
- *   defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used
- */
-
-#undef CONFIG_PRINT_TASKNAME
-#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG_FEATURES) || defined(CONFIG_ARCH_STACKDUMP))
-#  define CONFIG_PRINT_TASKNAME 1
-#endif
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -163,17 +131,17 @@ static int assert_tracecallback(FAR struct usbtrace_s *trace, FAR void *arg)
 
 void up_assert(const uint8_t *filename, int lineno)
 {
-#ifdef CONFIG_PRINT_TASKNAME
+#if CONFIG_TASK_NAME_SIZE > 0
   struct tcb_s *rtcb = this_task();
 #endif
 
   board_autoled_on(LED_ASSERTION);
 
-#ifdef CONFIG_PRINT_TASKNAME
-  llerr("Assertion failed at file:%s line: %d task: %s\n",
+#if CONFIG_TASK_NAME_SIZE > 0
+  alert("Assertion failed at file:%s line: %d task: %s\n",
         filename, lineno, rtcb->name);
 #else
-  llerr("Assertion failed at file:%s line: %d\n",
+  alert("Assertion failed at file:%s line: %d\n",
         filename, lineno);
 #endif
 
diff --git a/arch/mips/src/mips32/up_dumpstate.c b/arch/mips/src/mips32/up_dumpstate.c
index e31035f159..f5a2a8474d 100644
--- a/arch/mips/src/mips32/up_dumpstate.c
+++ b/arch/mips/src/mips32/up_dumpstate.c
@@ -39,17 +39,6 @@
 
 #include 
 
-/* Output debug info -- even if debug is not selected. */
-
-#undef  CONFIG_DEBUG_FEATURES
-#undef  CONFIG_DEBUG_ERROR
-#undef  CONFIG_DEBUG_WARN
-#undef  CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG_FEATURES 1
-#define CONFIG_DEBUG_ERROR 1
-#define CONFIG_DEBUG_WARN 1
-#define CONFIG_DEBUG_INFO 1
-
 #include 
 #include 
 #include 
@@ -97,7 +86,7 @@ static void up_stackdump(uint32_t sp, uint32_t stack_base)
   for (stack = sp & ~0x1f; stack < stack_base; stack += 32)
     {
       uint32_t *ptr = (uint32_t *)stack;
-      llerr("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
              stack, ptr[0], ptr[1], ptr[2], ptr[3],
              ptr[4], ptr[5], ptr[6], ptr[7]);
     }
@@ -113,27 +102,27 @@ static inline void up_registerdump(void)
 
   if (g_current_regs)
     {
-      llerr("MFLO:%08x MFHI:%08x EPC:%08x STATUS:%08x\n",
+      alert("MFLO:%08x MFHI:%08x EPC:%08x STATUS:%08x\n",
             g_current_regs[REG_MFLO], g_current_regs[REG_MFHI], g_current_regs[REG_EPC],
             g_current_regs[REG_STATUS]);
-      llerr("AT:%08x V0:%08x V1:%08x A0:%08x A1:%08x A2:%08x A3:%08x\n",
+      alert("AT:%08x V0:%08x V1:%08x A0:%08x A1:%08x A2:%08x A3:%08x\n",
             g_current_regs[REG_AT], g_current_regs[REG_V0], g_current_regs[REG_V1],
             g_current_regs[REG_A0], g_current_regs[REG_A1], g_current_regs[REG_A2],
             g_current_regs[REG_A3]);
-      llerr("T0:%08x T1:%08x T2:%08x T3:%08x T4:%08x T5:%08x T6:%08x T7:%08x\n",
+      alert("T0:%08x T1:%08x T2:%08x T3:%08x T4:%08x T5:%08x T6:%08x T7:%08x\n",
             g_current_regs[REG_T0], g_current_regs[REG_T1], g_current_regs[REG_T2],
             g_current_regs[REG_T3], g_current_regs[REG_T4], g_current_regs[REG_T5],
             g_current_regs[REG_T6], g_current_regs[REG_T7]);
-      llerr("S0:%08x S1:%08x S2:%08x S3:%08x S4:%08x S5:%08x S6:%08x S7:%08x\n",
+      alert("S0:%08x S1:%08x S2:%08x S3:%08x S4:%08x S5:%08x S6:%08x S7:%08x\n",
             g_current_regs[REG_S0], g_current_regs[REG_S1], g_current_regs[REG_S2],
             g_current_regs[REG_S3], g_current_regs[REG_S4], g_current_regs[REG_S5],
             g_current_regs[REG_S6], g_current_regs[REG_S7]);
 #ifdef MIPS32_SAVE_GP
-      llerr("T8:%08x T9:%08x GP:%08x SP:%08x FP:%08x RA:%08x\n",
+      alert("T8:%08x T9:%08x GP:%08x SP:%08x FP:%08x RA:%08x\n",
             g_current_regs[REG_T8], g_current_regs[REG_T9], g_current_regs[REG_GP],
             g_current_regs[REG_SP], g_current_regs[REG_FP], g_current_regs[REG_RA]);
 #else
-      llerr("T8:%08x T9:%08x SP:%08x FP:%08x RA:%08x\n",
+      alert("T8:%08x T9:%08x SP:%08x FP:%08x RA:%08x\n",
             g_current_regs[REG_T8], g_current_regs[REG_T9], g_current_regs[REG_SP],
             g_current_regs[REG_FP], g_current_regs[REG_RA]);
 #endif
@@ -180,10 +169,10 @@ void up_dumpstate(void)
 
   /* Show interrupt stack info */
 
-  llerr("sp:     %08x\n", sp);
-  llerr("IRQ stack:\n");
-  llerr("  base: %08x\n", istackbase);
-  llerr("  size: %08x\n", istacksize);
+  alert("sp:     %08x\n", sp);
+  alert("IRQ stack:\n");
+  alert("  base: %08x\n", istackbase);
+  alert("  size: %08x\n", istacksize);
 
   /* Does the current stack pointer lie within the interrupt
    * stack?
@@ -200,18 +189,18 @@ void up_dumpstate(void)
        */
 
       sp = g_intstackbase;
-      llerr("sp:     %08x\n", sp);
+      alert("sp:     %08x\n", sp);
     }
 
   /* Show user stack info */
 
-  llerr("User stack:\n");
-  llerr("  base: %08x\n", ustackbase);
-  llerr("  size: %08x\n", ustacksize);
+  alert("User stack:\n");
+  alert("  base: %08x\n", ustackbase);
+  alert("  size: %08x\n", ustacksize);
 #else
-  llerr("sp:         %08x\n", sp);
-  llerr("stack base: %08x\n", ustackbase);
-  llerr("stack size: %08x\n", ustacksize);
+  alert("sp:         %08x\n", sp);
+  alert("stack base: %08x\n", ustackbase);
+  alert("stack size: %08x\n", ustacksize);
 #endif
 
   /* Dump the user stack if the stack pointer lies within the allocated user
@@ -221,7 +210,7 @@ void up_dumpstate(void)
   if (sp > ustackbase || sp <= ustackbase - ustacksize)
     {
 #if !defined(CONFIG_ARCH_INTERRUPTSTACK) || CONFIG_ARCH_INTERRUPTSTACK < 4
-      llerr("ERROR: Stack pointer is not within allocated stack\n");
+      alert("ERROR: Stack pointer is not within allocated stack\n");
 #endif
     }
   else
diff --git a/arch/sh/src/common/up_assert.c b/arch/sh/src/common/up_assert.c
index a82bde6e90..4919a30363 100644
--- a/arch/sh/src/common/up_assert.c
+++ b/arch/sh/src/common/up_assert.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/sh/src/common/up_assert.c
  *
- *   Copyright (C) 2008-2009, 2012-2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2012-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,21 +39,6 @@
 
 #include 
 
-/* Output debug info if stack dump is selected -- even if debug is not
- * selected.
- */
-
-#ifdef CONFIG_ARCH_STACKDUMP
-#  undef  CONFIG_DEBUG_FEATURES
-#  undef  CONFIG_DEBUG_ERROR
-#  undef  CONFIG_DEBUG_WARN
-#  undef  CONFIG_DEBUG_INFO
-#  define CONFIG_DEBUG_FEATURES 1
-#  define CONFIG_DEBUG_ERROR 1
-#  define CONFIG_DEBUG_WARN 1
-# define CONFIG_DEBUG_INFO 1
-#endif
-
 #include 
 #include 
 #include 
@@ -80,10 +65,6 @@
 #  undef CONFIG_ARCH_USBDUMP
 #endif
 
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -151,17 +132,17 @@ static int assert_tracecallback(FAR struct usbtrace_s *trace, FAR void *arg)
 
 void up_assert(const uint8_t *filename, int lineno)
 {
-#if CONFIG_TASK_NAME_SIZE > 0 && defined(CONFIG_DEBUG_FEATURES)
+#if CONFIG_TASK_NAME_SIZE > 0
   struct tcb_s *rtcb = this_task();
 #endif
 
   board_autoled_on(LED_ASSERTION);
 
 #if CONFIG_TASK_NAME_SIZE > 0
-  llerr("Assertion failed at file:%s line: %d task: %s\n",
+  alert("Assertion failed at file:%s line: %d task: %s\n",
         filename, lineno, rtcb->name);
 #else
-  llerr("Assertion failed at file:%s line: %d\n",
+  alert("Assertion failed at file:%s line: %d\n",
         filename, lineno);
 #endif
 
diff --git a/arch/sh/src/m16c/m16c_dumpstate.c b/arch/sh/src/m16c/m16c_dumpstate.c
index 54dfbd8b29..6cd4f545d4 100644
--- a/arch/sh/src/m16c/m16c_dumpstate.c
+++ b/arch/sh/src/m16c/m16c_dumpstate.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/sh/src/m16c/m16c_assert.c
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,17 +39,6 @@
 
 #include 
 
-/* Output debug info -- even if debug is not selected. */
-
-#undef  CONFIG_DEBUG_FEATURES
-#undef  CONFIG_DEBUG_ERROR
-#undef  CONFIG_DEBUG_WARN
-#undef  CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG_FEATURES 1
-#define CONFIG_DEBUG_ERROR 1
-#define CONFIG_DEBUG_WARN 1
-#define CONFIG_DEBUG_INFO 1
-
 #include 
 #include 
 
@@ -63,14 +52,6 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -116,7 +97,7 @@ static void m16c_stackdump(uint16_t sp, uint16_t stack_base)
   for (stack = sp & ~7; stack < stack_base; stack += 8)
     {
       uint8_t *ptr = (uint8_t*)stack;
-      llerr("%04x: %02x %02x %02x %02x %02x %02x %02x %02x\n",
+      alert("%04x: %02x %02x %02x %02x %02x %02x %02x %02x\n",
              stack, ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7]);
     }
 }
@@ -135,14 +116,14 @@ static inline void m16c_registerdump(void)
     {
       /* Yes.. dump the interrupt registers */
 
-      llerr("PC: %02x%02x%02x FLG: %02x00%02x FB: %02x%02x SB: %02x%02x SP: %02x%02x\n",
+      alert("PC: %02x%02x%02x FLG: %02x00%02x FB: %02x%02x SB: %02x%02x SP: %02x%02x\n",
             ptr[REG_FLGPCHI] & 0xff, ptr[REG_PC], ptr[REG_PC+1],
             ptr[REG_FLGPCHI] >> 8, ptr[REG_FLG],
             ptr[REG_FB], ptr[REG_FB+1],
             ptr[REG_SB], ptr[REG_SB+1],
             ptr[REG_SP], ptr[REG_SP+1]);
 
-      llerr("R0: %02x%02x R1: %02x%02x R2: %02x%02x A0: %02x%02x A1: %02x%02x\n",
+      alert("R0: %02x%02x R1: %02x%02x R2: %02x%02x A0: %02x%02x A1: %02x%02x\n",
             ptr[REG_R0], ptr[REG_R0+1], ptr[REG_R1], ptr[REG_R1+1],
             ptr[REG_R2], ptr[REG_R2+1], ptr[REG_R3], ptr[REG_R3+1],
             ptr[REG_A0], ptr[REG_A0+1], ptr[REG_A1], ptr[REG_A1+1]);
@@ -198,10 +179,10 @@ void up_dumpstate(void)
 
   /* Show interrupt stack info */
 
-  llerr("sp:     %04x\n", sp);
-  llerr("IRQ stack:\n");
-  llerr("  base: %04x\n", istackbase);
-  llerr("  size: %04x\n", istacksize);
+  alert("sp:     %04x\n", sp);
+  alert("IRQ stack:\n");
+  alert("  base: %04x\n", istackbase);
+  alert("  size: %04x\n", istacksize);
 
   /* Does the current stack pointer lie within the interrupt
    * stack?
@@ -216,18 +197,18 @@ void up_dumpstate(void)
       /* Extract the user stack pointer from the register area */
 
       sp = m16c_getusersp();
-      llerr("sp:     %04x\n", sp);
+      alert("sp:     %04x\n", sp);
     }
 
   /* Show user stack info */
 
-  llerr("User stack:\n");
-  llerr("  base: %04x\n", ustackbase);
-  llerr("  size: %04x\n", ustacksize);
+  alert("User stack:\n");
+  alert("  base: %04x\n", ustackbase);
+  alert("  size: %04x\n", ustacksize);
 #else
-  llerr("sp:         %04x\n", sp);
-  llerr("stack base: %04x\n", ustackbase);
-  llerr("stack size: %04x\n", ustacksize);
+  alert("sp:         %04x\n", sp);
+  alert("stack base: %04x\n", ustackbase);
+  alert("stack size: %04x\n", ustacksize);
 #endif
 
   /* Dump the user stack if the stack pointer lies within the allocated user
@@ -237,7 +218,7 @@ void up_dumpstate(void)
   if (sp > ustackbase || sp <= ustackbase - ustacksize)
     {
 #if !defined(CONFIG_ARCH_INTERRUPTSTACK) || CONFIG_ARCH_INTERRUPTSTACK < 4
-      llerr("ERROR: Stack pointer is not within allocated stack\n");
+      alert("ERROR: Stack pointer is not within allocated stack\n");
 #endif
     }
   else
diff --git a/arch/sh/src/sh1/sh1_dumpstate.c b/arch/sh/src/sh1/sh1_dumpstate.c
index a5f7f6c1ef..487bc854ad 100644
--- a/arch/sh/src/sh1/sh1_dumpstate.c
+++ b/arch/sh/src/sh1/sh1_dumpstate.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/sh/src/sh1/sh1_assert.c
  *
- *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,17 +39,6 @@
 
 #include 
 
-/* Output debug info -- even if debug is not selected. */
-
-#undef  CONFIG_DEBUG_FEATURES
-#undef  CONFIG_DEBUG_ERROR
-#undef  CONFIG_DEBUG_WARN
-#undef  CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG_FEATURES 1
-#define CONFIG_DEBUG_ERROR 1
-#define CONFIG_DEBUG_WARN 1
-#define CONFIG_DEBUG_INFO 1
-
 #include 
 #include 
 
@@ -62,14 +51,6 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -103,7 +84,7 @@ static void sh1_stackdump(uint32_t sp, uint32_t stack_base)
   for (stack = sp & ~0x1f; stack < stack_base; stack += 32)
     {
       uint32_t *ptr = (uint32_t*)stack;
-      llerr("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+      alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
              stack, ptr[0], ptr[1], ptr[2], ptr[3],
              ptr[4], ptr[5], ptr[6], ptr[7]);
     }
@@ -123,17 +104,17 @@ static inline void sh1_registerdump(void)
     {
       /* Yes.. dump the interrupt registers */
 
-      llerr("PC: %08x SR=%08x\n",
+      alert("PC: %08x SR=%08x\n",
             ptr[REG_PC], ptr[REG_SR]);
 
-      llerr("PR: %08x GBR: %08x MACH: %08x MACL: %08x\n",
+      alert("PR: %08x GBR: %08x MACH: %08x MACL: %08x\n",
             ptr[REG_PR], ptr[REG_GBR], ptr[REG_MACH], ptr[REG_MACL]);
 
-      llerr("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n", 0,
+      alert("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n", 0,
             ptr[REG_R0], ptr[REG_R1], ptr[REG_R2], ptr[REG_R3],
             ptr[REG_R4], ptr[REG_R5], ptr[REG_R6], ptr[REG_R7]);
 
-      llerr("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n", 8,
+      alert("R%d: %08x %08x %08x %08x %08x %08x %08x %08x\n", 8,
             ptr[REG_R8], ptr[REG_R9], ptr[REG_R10], ptr[REG_R11],
             ptr[REG_R12], ptr[REG_R13], ptr[REG_R14], ptr[REG_R15]);
     }
@@ -179,10 +160,10 @@ void up_dumpstate(void)
 
   /* Show interrupt stack info */
 
-  llerr("sp:     %08x\n", sp);
-  llerr("IRQ stack:\n");
-  llerr("  base: %08x\n", istackbase);
-  llerr("  size: %08x\n", istacksize);
+  alert("sp:     %08x\n", sp);
+  alert("IRQ stack:\n");
+  alert("  base: %08x\n", istackbase);
+  alert("  size: %08x\n", istacksize);
 
   /* Does the current stack pointer lie within the interrupt
    * stack?
@@ -199,18 +180,18 @@ void up_dumpstate(void)
        */
 
       sp = g_intstackbase;
-      llerr("sp:     %08x\n", sp);
+      alert("sp:     %08x\n", sp);
     }
 
   /* Show user stack info */
 
-  llerr("User stack:\n");
-  llerr("  base: %08x\n", ustackbase);
-  llerr("  size: %08x\n", ustacksize);
+  alert("User stack:\n");
+  alert("  base: %08x\n", ustackbase);
+  alert("  size: %08x\n", ustacksize);
 #else
-  llerr("sp:         %08x\n", sp);
-  llerr("stack base: %08x\n", ustackbase);
-  llerr("stack size: %08x\n", ustacksize);
+  alert("sp:         %08x\n", sp);
+  alert("stack base: %08x\n", ustackbase);
+  alert("stack size: %08x\n", ustacksize);
 #endif
 
   /* Dump the user stack if the stack pointer lies within the allocated user
@@ -220,7 +201,7 @@ void up_dumpstate(void)
   if (sp > ustackbase || sp <= ustackbase - ustacksize)
     {
 #if !defined(CONFIG_ARCH_INTERRUPTSTACK) || CONFIG_ARCH_INTERRUPTSTACK < 4
-      llerr("ERROR: Stack pointer is not within allocated stack\n");
+      alert("ERROR: Stack pointer is not within allocated stack\n");
 #endif
     }
   else
diff --git a/arch/x86/src/common/up_assert.c b/arch/x86/src/common/up_assert.c
index 6106e2397e..c4daa69393 100644
--- a/arch/x86/src/common/up_assert.c
+++ b/arch/x86/src/common/up_assert.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/x86/src/common/up_assert.c
  *
- *   Copyright (C) 2011-2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,21 +39,6 @@
 
 #include 
 
-/* Output debug info if stack dump is selected -- even if debug is not
- * selected.
- */
-
-#ifdef CONFIG_ARCH_STACKDUMP
-#  undef  CONFIG_DEBUG_FEATURES
-#  undef  CONFIG_DEBUG_ERROR
-#  undef  CONFIG_DEBUG_WARN
-#  undef  CONFIG_DEBUG_INFO
-#  define CONFIG_DEBUG_FEATURES 1
-#  define CONFIG_DEBUG_ERROR 1
-#  define CONFIG_DEBUG_WARN 1
-#  define CONFIG_DEBUG_INFO 1
-#endif
-
 #include 
 #include 
 #include 
@@ -80,19 +65,6 @@
 #  undef CONFIG_ARCH_USBDUMP
 #endif
 
-/* The following is just intended to keep some ugliness out of the mainline
- * code.  We are going to print the task name if:
- *
- *  CONFIG_TASK_NAME_SIZE > 0 &&    <-- The task has a name
- *  (defined(CONFIG_DEBUG_FEATURES)    ||    <-- And the debug is enabled (llerr used)
- *   defined(CONFIG_ARCH_STACKDUMP) <-- Or lowsyslog() is used
- */
-
-#undef CONFIG_PRINT_TASKNAME
-#if CONFIG_TASK_NAME_SIZE > 0 && (defined(CONFIG_DEBUG_FEATURES) || defined(CONFIG_ARCH_STACKDUMP))
-#  define CONFIG_PRINT_TASKNAME 1
-#endif
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -284,13 +256,13 @@ static void _up_assert(int errorcode)
 
 void up_assert(const uint8_t *filename, int lineno)
 {
-#ifdef CONFIG_PRINT_TASKNAME
+#if CONFIG_TASK_NAME_SIZE > 0
   struct tcb_s *rtcb = this_task();
 #endif
 
   board_autoled_on(LED_ASSERTION);
 
-#ifdef CONFIG_PRINT_TASKNAME
+#if CONFIG_TASK_NAME_SIZE > 0
   llerr("Assertion failed at file:%s line: %d task: %s\n",
         filename, lineno, rtcb->name);
 #else
diff --git a/arch/x86/src/i486/up_regdump.c b/arch/x86/src/i486/up_regdump.c
index 3c4137b198..b3da1b603e 100644
--- a/arch/x86/src/i486/up_regdump.c
+++ b/arch/x86/src/i486/up_regdump.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/x86/src/i486/up_regdump.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,50 +39,28 @@
 
 #include 
 
-/* Output debug info -- even if debug is not selected. */
-
-#undef  CONFIG_DEBUG_FEATURES
-#undef  CONFIG_DEBUG_ERROR
-#undef  CONFIG_DEBUG_WARN
-#undef  CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG_FEATURES 1
-#define CONFIG_DEBUG_ERROR 1
-#define CONFIG_DEBUG_WARN 1
-#define CONFIG_DEBUG_INFO 1
-
 #include 
 #include 
 
 #include "up_internal.h"
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
+
 /****************************************************************************
  * Name: up_registerdump
  ****************************************************************************/
 
 void up_registerdump(uint32_t *regs)
 {
-  llerr(" ds:%08x irq:%08x err:%08x\n",
+  alert(" ds:%08x irq:%08x err:%08x\n",
         regs[REG_DS], regs[REG_IRQNO], regs[REG_ERRCODE]);
-  llerr("edi:%08x esi:%08x ebp:%08x esp:%08x\n",
+  alert("edi:%08x esi:%08x ebp:%08x esp:%08x\n",
         regs[REG_EDI], regs[REG_ESI], regs[REG_EBP], regs[REG_ESP]);
-  llerr("ebx:%08x edx:%08x ecx:%08x eax:%08x\n",
+  alert("ebx:%08x edx:%08x ecx:%08x eax:%08x\n",
         regs[REG_EBX], regs[REG_EDX], regs[REG_ECX], regs[REG_EAX]);
-  llerr("eip:%08x  cs:%08x flg:%08x  sp:%08x ss:%08x\n",
+  alert("eip:%08x  cs:%08x flg:%08x  sp:%08x ss:%08x\n",
         regs[REG_EIP], regs[REG_CS], regs[REG_EFLAGS], regs[REG_SP],
         regs[REG_SS]);
 }
diff --git a/arch/z16/src/common/up_assert.c b/arch/z16/src/common/up_assert.c
index f647a9093b..1ef880a041 100644
--- a/arch/z16/src/common/up_assert.c
+++ b/arch/z16/src/common/up_assert.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * common/up_assert.c
  *
- *   Copyright (C) 2008-2009, 2012-2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2012-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,21 +39,6 @@
 
 #include 
 
-/* Output debug info if stack dump is selected -- even if debug is not
- * selected.
- */
-
-#ifdef CONFIG_ARCH_STACKDUMP
-#  undef  CONFIG_DEBUG_FEATURES
-#  undef  CONFIG_DEBUG_ERROR
-#  undef  CONFIG_DEBUG_WARN
-#  undef  CONFIG_DEBUG_INFO
-#  define CONFIG_DEBUG_FEATURES 1
-#  define CONFIG_DEBUG_ERROR 1
-#  define CONFIG_DEBUG_WARN 1
-#  define CONFIG_DEBUG_INFO 1
-#endif
-
 #include 
 #include 
 #include 
@@ -158,17 +143,17 @@ void up_assert(void)
 
 #ifdef CONFIG_HAVE_FILENAME
 #if CONFIG_TASK_NAME_SIZE > 0
-  llerr("Assertion failed at file:%s line: %d task: %s\n",
+  alert("Assertion failed at file:%s line: %d task: %s\n",
         filename, lineno, rtcb->name);
 #else
-  llerr("Assertion failed at file:%s line: %d\n",
+  alert("Assertion failed at file:%s line: %d\n",
         filename, lineno);
 #endif
 #else
 #if CONFIG_TASK_NAME_SIZE > 0
-  llerr("Assertion failed: task: %s\n", rtcb->name);
+  alert("Assertion failed: task: %s\n", rtcb->name);
 #else
-  llerr("Assertion failed\n");
+  alert("Assertion failed\n");
 #endif
 #endif
 
diff --git a/arch/z16/src/common/up_registerdump.c b/arch/z16/src/common/up_registerdump.c
index 0604e0f7d4..f167926a52 100644
--- a/arch/z16/src/common/up_registerdump.c
+++ b/arch/z16/src/common/up_registerdump.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * common/up_registerdump.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,21 +39,6 @@
 
 #include 
 
-/* Output debug info if stack dump is selected -- even if
- * debug is not selected.
- */
-
-#ifdef CONFIG_ARCH_STACKDUMP
-#  undef  CONFIG_DEBUG_FEATURES
-#  undef  CONFIG_DEBUG_ERROR
-#  undef  CONFIG_DEBUG_WARN
-#  undef  CONFIG_DEBUG_INFO
-#  define CONFIG_DEBUG_FEATURES 1
-#  define CONFIG_DEBUG_ERROR 1
-#  define CONFIG_DEBUG_WARN 1
-#  define CONFIG_DEBUG_INFO 1
-#endif
-
 #include 
 #include 
 
@@ -77,15 +62,15 @@ static void up_registerdump(void)
 #ifdef CONFIG_DEBUG_INFO
   FAR uint32_t *regs32 = (FAR uint32_t*)g_current_regs;
 
-  llinfo("R0 :%08x R1 :%08x R2 :%08x R3 :%08x "
-         "R4 :%08x R5 :%08x R6 :%08x R7 :%08x\n"
-         regs32[REG_R0/2],  regs32[REG_R1/2], regs32[REG_R2/2], regs32[REG_R3/2],
-         regs32[REG_R4/2],  regs32[REG_R5/2], regs32[REG_R6/2], regs32[REG_R7/2]);
-  llinfo("R8 :%08x R9 :%08x R10:%08x R11:%08x R12:%08x R13:%08x\n"
-         regs32[REG_R8/2],  regs32[REG_R9/2], regs32[REG_R10/2], regs3[REG_R11/2],
-         regs32[REG_R12/2], regs32[REG_R13/2]);
-  llinfo("FP :%08x SP :%08x FLG:%04x\n"
-         regs32[REG_R14/2], regs32[REG_R15/2], g_current_regs[REG_FLAGS]);
+  alert("R0 :%08x R1 :%08x R2 :%08x R3 :%08x "
+        "R4 :%08x R5 :%08x R6 :%08x R7 :%08x\n"
+        regs32[REG_R0/2],  regs32[REG_R1/2], regs32[REG_R2/2], regs32[REG_R3/2],
+        regs32[REG_R4/2],  regs32[REG_R5/2], regs32[REG_R6/2], regs32[REG_R7/2]);
+  alert("R8 :%08x R9 :%08x R10:%08x R11:%08x R12:%08x R13:%08x\n"
+        regs32[REG_R8/2],  regs32[REG_R9/2], regs32[REG_R10/2], regs3[REG_R11/2],
+        regs32[REG_R12/2], regs32[REG_R13/2]);
+  alert("FP :%08x SP :%08x FLG:%04x\n"
+        regs32[REG_R14/2], regs32[REG_R15/2], g_current_regs[REG_FLAGS]);
 #endif
 }
 
diff --git a/arch/z16/src/common/up_stackdump.c b/arch/z16/src/common/up_stackdump.c
index 9ae0cb71e4..4b439b8d87 100644
--- a/arch/z16/src/common/up_stackdump.c
+++ b/arch/z16/src/common/up_stackdump.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * common/up_stackdump.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,17 +39,6 @@
 
 #include 
 
-/* Output debug info -- even if debug is not selected. */
-
-#undef  CONFIG_DEBUG_FEATURES
-#undef  CONFIG_DEBUG_ERROR
-#undef  CONFIG_DEBUG_WARN
-#undef  CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG_FEATURES 1
-#define CONFIG_DEBUG_ERROR 1
-#define CONFIG_DEBUG_WARN 1
-#define CONFIG_DEBUG_INFO 1
-
 #include 
 
 #include "chip/chip.h"
@@ -78,9 +67,9 @@ static void up_stackdump(void)
   chipreg_t stack_base = (chipreg_t)rtcb->adj_stack_ptr;
   chipreg_t stack_size = (chipreg_t)rtcb->adj_stack_size;
 
-  llinfo("stack_base: %08x\n", stack_base);
-  llinfo("stack_size: %08x\n", stack_size);
-  llinfo("sp:         %08x\n", sp);
+  alert("stack_base: %08x\n", stack_base);
+  alert("stack_size: %08x\n", stack_size);
+  alert("sp:         %08x\n", sp);
 
   if (sp >= stack_base || sp < stack_base - stack_size)
     {
@@ -94,9 +83,9 @@ static void up_stackdump(void)
       for (stack = sp & ~0x0f; stack < stack_base; stack += 8*sizeof(chipreg_t))
         {
           chipreg_t *ptr = (chipreg_t*)stack;
-          llinfo("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
-                 stack, ptr[0], ptr[1], ptr[2], ptr[3],
-                 ptr[4], ptr[5], ptr[6], ptr[7]);
+          alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+                stack, ptr[0], ptr[1], ptr[2], ptr[3],
+                ptr[4], ptr[5], ptr[6], ptr[7]);
         }
     }
 }
diff --git a/arch/z80/src/common/up_assert.c b/arch/z80/src/common/up_assert.c
index 546b763751..ea1dd0c5d7 100644
--- a/arch/z80/src/common/up_assert.c
+++ b/arch/z80/src/common/up_assert.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * common/up_assert.c
  *
- *   Copyright (C) 2007-2009, 2012-2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2012-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,21 +39,6 @@
 
 #include 
 
-/* Output debug info if stack dump is selected -- even if debug is not
- * selected.
- */
-
-#ifdef CONFIG_ARCH_STACKDUMP
-#  undef  CONFIG_DEBUG_FEATURES
-#  undef  CONFIG_DEBUG_ERROR
-#  undef  CONFIG_DEBUG_WARN
-#  undef  CONFIG_DEBUG_INFO
-#  define CONFIG_DEBUG_FEATURES 1
-#  define CONFIG_DEBUG_ERROR 1
-#  define CONFIG_DEBUG_WARN 1
-#  define CONFIG_DEBUG_INFO 1
-#endif
-
 #include 
 #include 
 #include 
@@ -79,10 +64,6 @@
 #  undef CONFIG_ARCH_USBDUMP
 #endif
 
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -161,17 +142,17 @@ void up_assert(void)
 
 #ifdef CONFIG_HAVE_FILENAME
 #if CONFIG_TASK_NAME_SIZE > 0
-  llinfo("Assertion failed at file:%s line: %d task: %s\n",
-         filename, lineno, rtcb->name);
+  alert("Assertion failed at file:%s line: %d task: %s\n",
+        filename, lineno, rtcb->name);
 #else
-  llinfo("Assertion failed at file:%s line: %d\n",
-         filename, lineno);
+  alert("Assertion failed at file:%s line: %d\n",
+        filename, lineno);
 #endif
 #else
 #if CONFIG_TASK_NAME_SIZE > 0
-  llinfo("Assertion failed: task: %s\n", rtcb->name);
+  alert("Assertion failed: task: %s\n", rtcb->name);
 #else
-  llinfo("Assertion failed\n");
+  alert("Assertion failed\n");
 #endif
 #endif
 
diff --git a/arch/z80/src/common/up_stackdump.c b/arch/z80/src/common/up_stackdump.c
index 89f197895f..0e4e4ea9c4 100644
--- a/arch/z80/src/common/up_stackdump.c
+++ b/arch/z80/src/common/up_stackdump.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * common/up_stackdump.c
  *
- *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,17 +39,6 @@
 
 #include 
 
-/* Output debug info -- even if debug is not selected. */
-
-#undef  CONFIG_DEBUG_FEATURES
-#undef  CONFIG_DEBUG_ERROR
-#undef  CONFIG_DEBUG_WARN
-#undef  CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG_FEATURES 1
-#define CONFIG_DEBUG_ERROR 1
-#define CONFIG_DEBUG_WARN 1
-#define CONFIG_DEBUG_INFO 1
-
 #include 
 #include 
 
@@ -59,14 +48,6 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -87,13 +68,13 @@ static void up_stackdump(void)
   uint16_t stack_base = (uint16_t)rtcb->adj_stack_ptr;
   uint16_t stack_size = (uint16_t)rtcb->adj_stack_size;
 
-  llinfo("stack_base: %04x\n", stack_base);
-  llinfo("stack_size: %04x\n", stack_size);
-  llinfo("sp:         %04x\n", sp);
+  alert("stack_base: %04x\n", stack_base);
+  alert("stack_size: %04x\n", stack_size);
+  alert("sp:         %04x\n", sp);
 
   if (sp >= stack_base || sp < stack_base - stack_size)
     {
-      llinfo("ERROR: Stack pointer is not within allocated stack\n");
+      alert("ERROR: Stack pointer is not within allocated stack\n");
       return;
     }
   else
@@ -103,9 +84,9 @@ static void up_stackdump(void)
       for (stack = sp & ~0x0f; stack < stack_base; stack += 8*sizeof(uint16_t))
         {
           uint16_t *ptr = (uint16_t*)stack;
-          llinfo("%04x: %04x %04x %04x %04x %04x %04x %04x %04x\n",
-                 stack, ptr[0], ptr[1], ptr[2], ptr[3],
-                 ptr[4], ptr[5], ptr[6], ptr[7]);
+          alert("%04x: %04x %04x %04x %04x %04x %04x %04x %04x\n",
+                stack, ptr[0], ptr[1], ptr[2], ptr[3],
+                ptr[4], ptr[5], ptr[6], ptr[7]);
         }
     }
 }
diff --git a/arch/z80/src/ez80/ez80_registerdump.c b/arch/z80/src/ez80/ez80_registerdump.c
index 4ccd09ce57..43faf25fee 100644
--- a/arch/z80/src/ez80/ez80_registerdump.c
+++ b/arch/z80/src/ez80/ez80_registerdump.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/z80/src/ez80/ez80_registerdump.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,17 +39,6 @@
 
 #include 
 
-/* Output debug info -- even if debug is not selected. */
-
-#undef  CONFIG_DEBUG_FEATURES
-#undef  CONFIG_DEBUG_ERROR
-#undef  CONFIG_DEBUG_WARN
-#undef  CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG_FEATURES 1
-#define CONFIG_DEBUG_ERROR 1
-#define CONFIG_DEBUG_WARN 1
-#define CONFIG_DEBUG_INFO 1
-
 #include 
 
 #include 
@@ -81,23 +70,23 @@ static void ez80_registerdump(void)
   if (g_current_regs)
     {
 #ifdef CONFIG_EZ80_Z80MODE
-      llinfo("AF: %04x  I: %04x\n",
-             g_current_regs[XCPT_AF], g_current_regs[XCPT_I]);
-      llinfo("BC: %04x DE: %04x HL: %04x\n",
-             g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]);
-      llinfo("IX: %04x IY: %04x\n",
-             g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]);
-      llinfo("SP: %04x PC: %04x\n"
-             g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]);
+      alert("AF: %04x  I: %04x\n",
+            g_current_regs[XCPT_AF], g_current_regs[XCPT_I]);
+      alert("BC: %04x DE: %04x HL: %04x\n",
+            g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]);
+      alert("IX: %04x IY: %04x\n",
+            g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]);
+      alert("SP: %04x PC: %04x\n"
+            g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]);
 #else
-      llinfo("AF: %06x  I: %06x\n",
-             g_current_regs[XCPT_AF], g_current_regs[XCPT_I]);
-      llinfo("BC: %06x DE: %06x HL: %06x\n",
-             g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]);
-      llinfo("IX: %06x IY: %06x\n",
-             g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]);
-      llinfo("SP: %06x PC: %06x\n"
-             g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]);
+      alert("AF: %06x  I: %06x\n",
+            g_current_regs[XCPT_AF], g_current_regs[XCPT_I]);
+      alert("BC: %06x DE: %06x HL: %06x\n",
+            g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]);
+      alert("IX: %06x IY: %06x\n",
+            g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]);
+      alert("SP: %06x PC: %06x\n"
+            g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]);
 #endif
     }
 }
diff --git a/arch/z80/src/z180/z180_registerdump.c b/arch/z80/src/z180/z180_registerdump.c
index 83d7faaa55..32b351c36d 100644
--- a/arch/z80/src/z180/z180_registerdump.c
+++ b/arch/z80/src/z180/z180_registerdump.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/z80/src/z180/z180_registerdump.c
  *
- *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,17 +39,6 @@
 
 #include 
 
-/* Output debug info -- even if debug is not selected. */
-
-#undef  CONFIG_DEBUG_FEATURES
-#undef  CONFIG_DEBUG_ERROR
-#undef  CONFIG_DEBUG_WARN
-#undef  CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG_FEATURES 1
-#define CONFIG_DEBUG_ERROR 1
-#define CONFIG_DEBUG_WARN 1
-#define CONFIG_DEBUG_INFO 1
-
 #include 
 
 #include 
@@ -72,16 +61,16 @@ static void z180_registerdump(void)
 {
   if (g_current_regs)
     {
-      llinfo("AF: %04x  I: %04x\n",
-             g_current_regs[XCPT_AF], g_current_regs[XCPT_I]);
-      llinfo("BC: %04x DE: %04x HL: %04x\n",
-             g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]);
-      llinfo("IX: %04x IY: %04x\n",
-             g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]);
-      llinfo("SP: %04x PC: %04x\n"
-             g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]);
-      llinfo("CBAR: %02x BBR: %02x CBR: %02x\n"
-             inp(Z180_MMU_CBAR), inp(Z180_MMU_BBR), inp(Z180_MMU_CBR));
+      alert("AF: %04x  I: %04x\n",
+            g_current_regs[XCPT_AF], g_current_regs[XCPT_I]);
+      alert("BC: %04x DE: %04x HL: %04x\n",
+            g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]);
+      alert("IX: %04x IY: %04x\n",
+            g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]);
+      alert("SP: %04x PC: %04x\n"
+            g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]);
+      alert("CBAR: %02x BBR: %02x CBR: %02x\n"
+            inp(Z180_MMU_CBAR), inp(Z180_MMU_BBR), inp(Z180_MMU_CBR));
     }
 }
 
diff --git a/arch/z80/src/z8/z8_registerdump.c b/arch/z80/src/z8/z8_registerdump.c
index f6a6b91ac7..92ba675b40 100644
--- a/arch/z80/src/z8/z8_registerdump.c
+++ b/arch/z80/src/z8/z8_registerdump.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/z80/src/z8/z8_registerdump.c
  *
- *   Copyright (C) 2008-2009,2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2011, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,19 +39,6 @@
 
 #include 
 
-/* Output debug info -- even if debug is not selected. */
-
-/* Output debug info -- even if debug is not selected. */
-
-#undef  CONFIG_DEBUG_FEATURES
-#undef  CONFIG_DEBUG_ERROR
-#undef  CONFIG_DEBUG_WARN
-#undef  CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG_FEATURES 1
-#define CONFIG_DEBUG_ERROR 1
-#define CONFIG_DEBUG_WARN 1
-#define CONFIG_DEBUG_INFO 1
-
 #include 
 #include 
 
@@ -69,16 +56,16 @@
 
 static inline void z8_dumpregs(FAR chipret_t *regs)
 {
-  llinfo("REGS: %04x %04x %04x %04x %04x %04x %04x %04x\n",
-         regs[XCPT_RR0], regs[XCPT_RR2], regs[XCPT_RR4], regs[XCPT_RR6],
-          regs[XCPT_RR8], regs[XCPT_RR10], regs[XCPT_RR12], regs[XCPT_RR14]);
+  alert("REGS: %04x %04x %04x %04x %04x %04x %04x %04x\n",
+        regs[XCPT_RR0], regs[XCPT_RR2], regs[XCPT_RR4], regs[XCPT_RR6],
+        regs[XCPT_RR8], regs[XCPT_RR10], regs[XCPT_RR12], regs[XCPT_RR14]);
 }
 
 static inline void z8_dumpstate(chipreg_t sp, chipreg_t pc, uint8_t irqctl,
                                 chipreg_t rpflags)
 {
-  llinfo("SP: %04x PC: %04x IRQCTL: %02x RP: %02x FLAGS: %02x\n",
-         sp, pc, irqctl & 0xff, rpflags >> 8, rpflags & 0xff);
+  alert("SP: %04x PC: %04x IRQCTL: %02x RP: %02x FLAGS: %02x\n",
+        sp, pc, irqctl & 0xff, rpflags >> 8, rpflags & 0xff);
 }
 
 /****************************************************************************
diff --git a/arch/z80/src/z80/z80_registerdump.c b/arch/z80/src/z80/z80_registerdump.c
index 43494e24e8..7f02662a06 100644
--- a/arch/z80/src/z80/z80_registerdump.c
+++ b/arch/z80/src/z80/z80_registerdump.c
@@ -39,17 +39,6 @@
 
 #include 
 
-/* Output debug info -- even if debug is not selected. */
-
-#undef  CONFIG_DEBUG_FEATURES
-#undef  CONFIG_DEBUG_ERROR
-#undef  CONFIG_DEBUG_WARN
-#undef  CONFIG_DEBUG_INFO
-#define CONFIG_DEBUG_FEATURES 1
-#define CONFIG_DEBUG_ERROR 1
-#define CONFIG_DEBUG_WARN 1
-#define CONFIG_DEBUG_INFO 1
-
 #include 
 
 #include 
@@ -60,14 +49,6 @@
 
 #ifdef CONFIG_ARCH_STACKDUMP
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -80,14 +61,14 @@ static void z80_registerdump(void)
 {
   if (g_current_regs)
     {
-      llinfo("AF: %04x  I: %04x\n",
-             g_current_regs[XCPT_AF], g_current_regs[XCPT_I]);
-      llinfo("BC: %04x DE: %04x HL: %04x\n",
-             g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]);
-      llinfo("IX: %04x IY: %04x\n",
-             g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]);
-      llinfo("SP: %04x PC: %04x\n"
-             g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]);
+      alert("AF: %04x  I: %04x\n",
+            g_current_regs[XCPT_AF], g_current_regs[XCPT_I]);
+      alert("BC: %04x DE: %04x HL: %04x\n",
+            g_current_regs[XCPT_BC], g_current_regs[XCPT_DE], g_current_regs[XCPT_HL]);
+      alert("IX: %04x IY: %04x\n",
+            g_current_regs[XCPT_IX], g_current_regs[XCPT_IY]);
+      alert("SP: %04x PC: %04x\n"
+            g_current_regs[XCPT_SP], g_current_regs[XCPT_PC]);
     }
 }
 
diff --git a/include/debug.h b/include/debug.h
index 43f27a6cf5..2737b4e787 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -105,6 +105,9 @@
  *    CONFIG_DEBUG_ERROR be defined. This is intended for important error-related
  *    information that you probably not want to suppress during normal debug
  *    general debugging.
+ *
+ * alert() - is a special, high-priority, unconditional version that is really
+ *    intended only for crash error reporting.
  */
 
 #ifdef CONFIG_HAVE_FUNCTIONNAME
@@ -132,6 +135,13 @@
 
 /* C-99 style variadic macros are supported */
 
+#ifdef CONFIG_ARCH_LOWPUTC
+#  define alert(format, ...) \
+   __arch_lowsyslog(LOG_EMERG, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
+# else
+#  define alert(x...)
+# endif
+
 #ifdef CONFIG_DEBUG_ERROR
 #  define err(format, ...) \
    __arch_syslog(LOG_ERR, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
@@ -149,11 +159,11 @@
 
 #ifdef CONFIG_DEBUG_WARN
 #  define warn(format, ...) \
-   __arch_syslog(LOG_DEBUG, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
+   __arch_syslog(LOG_WARNING, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
 
 #  ifdef CONFIG_ARCH_LOWPUTC
 #    define llwarn(format, ...) \
-     __arch_lowsyslog(LOG_DEBUG, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
+     __arch_lowsyslog(LOG_WARNING, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
 #  else
 #    define llwarn(x...)
 #  endif
@@ -164,11 +174,11 @@
 
 #ifdef CONFIG_DEBUG_INFO
 #  define info(format, ...) \
-   __arch_syslog(LOG_DEBUG, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
+   __arch_syslog(LOG_INFO, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
 
 #  ifdef CONFIG_ARCH_LOWPUTC
 #    define llinfo(format, ...) \
-     __arch_lowsyslog(LOG_DEBUG, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
+     __arch_lowsyslog(LOG_INFO, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
 #  else
 #    define llinfo(x...)
 #  endif
@@ -543,6 +553,10 @@
 
 /* Variadic macros NOT supported */
 
+#ifndef CONFIG_ARCH_LOWPUTC
+#  define alert       (void)
+# endif
+
 #ifdef CONFIG_DEBUG_ERROR
 #  ifndef CONFIG_ARCH_LOWPUTC
 #    define llerr     (void)
@@ -1078,6 +1092,10 @@ void lib_dumpbuffer(FAR const char *msg, FAR const uint8_t *buffer,
  */
 
 #ifndef CONFIG_CPP_HAVE_VARARGS
+#ifndef CONFIG_ARCH_LOWPUTC
+int alert(const char *format, ...);
+#endif
+
 #ifdef CONFIG_DEBUG_ERROR
 int err(const char *format, ...);
 
diff --git a/libc/misc/lib_debug.c b/libc/misc/lib_debug.c
index 1687ddfc8b..cd1e703c09 100644
--- a/libc/misc/lib_debug.c
+++ b/libc/misc/lib_debug.c
@@ -51,14 +51,28 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: err, llerr, info
+ * Name: alert, err, llerr, warn, llwarn, info, llinfo
  *
  * Description:
  *  If the cross-compiler's pre-processor does not support variable
- * length arguments, then these additional APIs will be built.
+ *  length arguments, then these additional APIs will be built.
  *
  ****************************************************************************/
 
+#ifdef CONFIG_ARCH_LOWPUTC
+int alert(const char *format, ...)
+{
+  va_list ap;
+  int     ret;
+
+  va_start(ap, format);
+  ret = lowvsyslog(LOG_EMERG, format, ap);
+  va_end(ap);
+
+  return ret;
+}
+#endif /* CONFIG_ARCH_LOWPUTC */
+
 #ifdef CONFIG_DEBUG_FEATURES
 int err(const char *format, ...)
 {
@@ -66,7 +80,7 @@ int err(const char *format, ...)
   int     ret;
 
   va_start(ap, format);
-  ret = vsyslog(LOG_DEBUG, format, ap);
+  ret = vsyslog(LOG_ERR, format, ap);
   va_end(ap);
 
   return ret;
@@ -107,7 +121,7 @@ int llwarn(const char *format, ...)
   int     ret;
 
   va_start(ap, format);
-  ret = lowvsyslog(LOG_DEBUG, format, ap);
+  ret = lowvsyslog(LOG_WARNING, format, ap);
   va_end(ap);
 
   return ret;
@@ -122,7 +136,7 @@ int info(const char *format, ...)
   int     ret;
 
   va_start(ap, format);
-  ret = vsyslog(LOG_DEBUG, format, ap);
+  ret = vsyslog(LOG_INFO, format, ap);
   va_end(ap);
 
   return ret;
@@ -135,7 +149,7 @@ int llinfo(const char *format, ...)
   int     ret;
 
   va_start(ap, format);
-  ret = lowvsyslog(LOG_DEBUG, format, ap);
+  ret = lowvsyslog(LOG_INFO, format, ap);
   va_end(ap);
 
   return ret;
-- 
GitLab


From 01ee8ccc6ca906f8b538ac89a1f9301ba673f27c Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 14 Jun 2016 09:16:34 -0600
Subject: [PATCH 73/91] arch/x86/:  Change some *err() message to *info()
 messages if what was a *dbg() message does not indicate and error condition.

---
 arch/x86/src/common/up_assert.c          | 34 ++++++++++++------------
 arch/x86/src/common/up_elf.c             |  5 ++--
 arch/x86/src/common/up_exit.c            | 22 +++++++--------
 arch/x86/src/common/up_initialize.c      |  4 +--
 arch/x86/src/common/up_releasepending.c  |  2 +-
 arch/x86/src/common/up_reprioritizertr.c |  4 +--
 arch/x86/src/i486/up_schedulesigaction.c |  4 +--
 arch/x86/src/i486/up_sigdeliver.c        |  4 +--
 8 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/arch/x86/src/common/up_assert.c b/arch/x86/src/common/up_assert.c
index c4daa69393..5d450e6fd9 100644
--- a/arch/x86/src/common/up_assert.c
+++ b/arch/x86/src/common/up_assert.c
@@ -81,9 +81,9 @@ static void up_stackdump(uint32_t sp, uint32_t stack_base)
   for (stack = sp & ~0x1f; stack < stack_base; stack += 32)
     {
       uint32_t *ptr = (uint32_t*)stack;
-      llerr("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
-             stack, ptr[0], ptr[1], ptr[2], ptr[3],
-             ptr[4], ptr[5], ptr[6], ptr[7]);
+      alert("%08x: %08x %08x %08x %08x %08x %08x %08x %08x\n",
+            stack, ptr[0], ptr[1], ptr[2], ptr[3],
+            ptr[4], ptr[5], ptr[6], ptr[7]);
     }
 }
 #else
@@ -152,10 +152,10 @@ static void up_dumpstate(void)
 
   /* Show interrupt stack info */
 
-  llerr("sp:     %08x\n", sp);
-  llerr("IRQ stack:\n");
-  llerr("  base: %08x\n", istackbase);
-  llerr("  size: %08x\n", istacksize);
+  alert("sp:     %08x\n", sp);
+  alert("IRQ stack:\n");
+  alert("  base: %08x\n", istackbase);
+  alert("  size: %08x\n", istacksize);
 
   /* Does the current stack pointer lie within the interrupt
    * stack?
@@ -172,18 +172,18 @@ static void up_dumpstate(void)
        */
 
       sp = g_intstackbase;
-      llerr("sp:     %08x\n", sp);
+      alert("sp:     %08x\n", sp);
     }
 
   /* Show user stack info */
 
-  llerr("User stack:\n");
-  llerr("  base: %08x\n", ustackbase);
-  llerr("  size: %08x\n", ustacksize);
+  alert("User stack:\n");
+  alert("  base: %08x\n", ustackbase);
+  alert("  size: %08x\n", ustacksize);
 #else
-  llerr("sp:         %08x\n", sp);
-  llerr("stack base: %08x\n", ustackbase);
-  llerr("stack size: %08x\n", ustacksize);
+  alert("sp:         %08x\n", sp);
+  alert("stack base: %08x\n", ustackbase);
+  alert("stack size: %08x\n", ustacksize);
 #endif
 
   /* Dump the user stack if the stack pointer lies within the allocated user
@@ -193,7 +193,7 @@ static void up_dumpstate(void)
   if (sp > ustackbase || sp <= ustackbase - ustacksize)
     {
 #if !defined(CONFIG_ARCH_INTERRUPTSTACK) || CONFIG_ARCH_INTERRUPTSTACK < 4
-      llerr("ERROR: Stack pointer is not within allocated stack\n");
+      alert("ERROR: Stack pointer is not within allocated stack\n");
 #endif
     }
   else
@@ -263,10 +263,10 @@ void up_assert(const uint8_t *filename, int lineno)
   board_autoled_on(LED_ASSERTION);
 
 #if CONFIG_TASK_NAME_SIZE > 0
-  llerr("Assertion failed at file:%s line: %d task: %s\n",
+  alert("Assertion failed at file:%s line: %d task: %s\n",
         filename, lineno, rtcb->name);
 #else
-  llerr("Assertion failed at file:%s line: %d\n",
+  alert("Assertion failed at file:%s line: %d\n",
         filename, lineno);
 #endif
 
diff --git a/arch/x86/src/common/up_elf.c b/arch/x86/src/common/up_elf.c
index f150799543..7f169dee73 100644
--- a/arch/x86/src/common/up_elf.c
+++ b/arch/x86/src/common/up_elf.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/x86/src/up_elf.c
  *
- *   Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012, 2014, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -146,7 +146,6 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
 int up_relocateadd(FAR const Elf32_Rela *rel, FAR const Elf32_Sym *sym,
                    uintptr_t addr)
 {
-  berr("Not supported\n");
+  bwarn("WARNING: Not supported\n");
   return -ENOSYS;
 }
-
diff --git a/arch/x86/src/common/up_exit.c b/arch/x86/src/common/up_exit.c
index 463cb8c5cf..7e96c48e88 100644
--- a/arch/x86/src/common/up_exit.c
+++ b/arch/x86/src/common/up_exit.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * common/up_exit.c
  *
- *   Copyright (C) 2011, 2013-2014 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2013-2014, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -85,8 +85,8 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
   int i;
 #endif
 
-  serr("  TCB=%p name=%s pid=%d\n", tcb, tcb->argv[0], tcb->pid);
-  serr("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
+  sinfo("  TCB=%p name=%s pid=%d\n", tcb, tcb->argv[0], tcb->pid);
+  sinfo("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
 
 #if CONFIG_NFILE_DESCRIPTORS > 0
   filelist = tcb->group->tg_filelist;
@@ -95,8 +95,8 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
       struct inode *inode = filelist->fl_files[i].f_inode;
       if (inode)
         {
-          serr("      fd=%d refcount=%d\n",
-               i, inode->i_crefs);
+          sinfo("      fd=%d refcount=%d\n",
+                i, inode->i_crefs);
         }
     }
 #endif
@@ -109,11 +109,11 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
       if (filep->fs_fd >= 0)
         {
 #if CONFIG_STDIO_BUFFER_SIZE > 0
-          serr("      fd=%d nbytes=%d\n",
-               filep->fs_fd,
-               filep->fs_bufpos - filep->fs_bufstart);
+          sinfo("      fd=%d nbytes=%d\n",
+                filep->fs_fd,
+                filep->fs_bufpos - filep->fs_bufstart);
 #else
-          serr("      fd=%d\n", filep->fs_fd);
+          sinfo("      fd=%d\n", filep->fs_fd);
 #endif
         }
     }
@@ -146,10 +146,10 @@ void _exit(int status)
 
   (void)up_irq_save();
 
-  sllerr("TCB=%p exiting\n", this_task());
+  sllinfo("TCB=%p exiting\n", this_task());
 
 #if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
-  sllerr("Other tasks:\n");
+  sllinfo("Other tasks:\n");
   sched_foreach(_up_dumponexit, NULL);
 #endif
 
diff --git a/arch/x86/src/common/up_initialize.c b/arch/x86/src/common/up_initialize.c
index 0c7baed29c..ff68a14fc2 100644
--- a/arch/x86/src/common/up_initialize.c
+++ b/arch/x86/src/common/up_initialize.c
@@ -76,13 +76,13 @@ static void up_calibratedelay(void)
 {
   int i;
 
-  llerr("Beginning 100s delay\n");
+  llwarn("Beginning 100s delay\n");
   for (i = 0; i < 100; i++)
     {
       up_mdelay(1000);
     }
 
-  llerr("End 100s delay\n");
+  llwarn("End 100s delay\n");
 }
 #else
 # define up_calibratedelay()
diff --git a/arch/x86/src/common/up_releasepending.c b/arch/x86/src/common/up_releasepending.c
index 6b22f7b2d0..9271d8e404 100644
--- a/arch/x86/src/common/up_releasepending.c
+++ b/arch/x86/src/common/up_releasepending.c
@@ -67,7 +67,7 @@ void up_release_pending(void)
 {
   struct tcb_s *rtcb = this_task();
 
-  sllerr("From TCB=%p\n", rtcb);
+  sllinfo("From TCB=%p\n", rtcb);
 
   /* Merge the g_pendingtasks list into the ready-to-run task list */
 
diff --git a/arch/x86/src/common/up_reprioritizertr.c b/arch/x86/src/common/up_reprioritizertr.c
index 7400fb1fce..e78cdf04bd 100644
--- a/arch/x86/src/common/up_reprioritizertr.c
+++ b/arch/x86/src/common/up_reprioritizertr.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  *  arch/arm/src/arm/up_reprioritizertr.c
  *
- *   Copyright (C) 2011, 2013-2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2013-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -95,7 +95,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
       struct tcb_s *rtcb = this_task();
       bool switch_needed;
 
-      sllerr("TCB=%p PRI=%d\n", tcb, priority);
+      sllinfo("TCB=%p PRI=%d\n", tcb, priority);
 
       /* Remove the tcb task from the ready-to-run list.
        * sched_removereadytorun will return true if we just
diff --git a/arch/x86/src/i486/up_schedulesigaction.c b/arch/x86/src/i486/up_schedulesigaction.c
index 6719699bb2..5faf6d1ebd 100644
--- a/arch/x86/src/i486/up_schedulesigaction.c
+++ b/arch/x86/src/i486/up_schedulesigaction.c
@@ -101,7 +101,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
 {
   irqstate_t flags;
 
-  serr("tcb=0x%p sigdeliver=0x%p\n", tcb, sigdeliver);
+  sinfo("tcb=0x%p sigdeliver=0x%p\n", tcb, sigdeliver);
 
   /* Make sure that interrupts are disabled */
 
@@ -115,7 +115,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
        * to the currently executing task.
        */
 
-      serr("rtcb=0x%p g_current_regs=0x%p\n", this_task(), g_current_regs);
+      sinfo("rtcb=0x%p g_current_regs=0x%p\n", this_task(), g_current_regs);
 
       if (tcb == this_task())
         {
diff --git a/arch/x86/src/i486/up_sigdeliver.c b/arch/x86/src/i486/up_sigdeliver.c
index 1411786d5a..b6ec9a09d5 100644
--- a/arch/x86/src/i486/up_sigdeliver.c
+++ b/arch/x86/src/i486/up_sigdeliver.c
@@ -95,7 +95,7 @@ void up_sigdeliver(void)
 
   board_autoled_on(LED_SIGNAL);
 
-  serr("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
+  sinfo("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
         rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
   ASSERT(rtcb->xcp.sigdeliver != NULL);
 
@@ -126,7 +126,7 @@ void up_sigdeliver(void)
    * errno that is needed by the user logic (it is probably EINTR).
    */
 
-  serr("Resuming\n");
+  sinfo("Resuming\n");
   (void)up_irq_save();
   rtcb->pterrno = saved_errno;
 
-- 
GitLab


From 0bded28cf351341bd39a3834034f58790be57412 Mon Sep 17 00:00:00 2001
From: David Sidrane 
Date: Tue, 14 Jun 2016 09:42:04 -0600
Subject: [PATCH 74/91] Fix some naming errors that were recently introduced
 with mass substirutions

---
 arch/arm/src/stm32/stm32_iwdg.c | 2 +-
 arch/arm/src/stm32/stm32_wwdg.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/src/stm32/stm32_iwdg.c b/arch/arm/src/stm32/stm32_iwdg.c
index a4fda31c89..cc38922ff5 100644
--- a/arch/arm/src/stm32/stm32_iwdg.c
+++ b/arch/arm/src/stm32/stm32_iwdg.c
@@ -51,7 +51,7 @@
 
 #include "up_arch.h"
 #include "stm32_rcc.h"
-#include "chip/stm32_errmcu.h"
+#include "chip/stm32_dbgmcu.h"
 #include "stm32_wdg.h"
 
 #if defined(CONFIG_WATCHDOG) && defined(CONFIG_STM32_IWDG)
diff --git a/arch/arm/src/stm32/stm32_wwdg.c b/arch/arm/src/stm32/stm32_wwdg.c
index b2f9a616f7..28a1bd8201 100644
--- a/arch/arm/src/stm32/stm32_wwdg.c
+++ b/arch/arm/src/stm32/stm32_wwdg.c
@@ -49,7 +49,7 @@
 #include 
 
 #include "up_arch.h"
-#include "chip/stm32_errmcu.h"
+#include "chip/stm32_dbgmcu.h"
 #include "stm32_wdg.h"
 
 #if defined(CONFIG_WATCHDOG) && defined(CONFIG_STM32_WWDG)
-- 
GitLab


From 078e9b7082ac02b2a90580e1ff9c798378b19ae3 Mon Sep 17 00:00:00 2001
From: Shirshak Sengupta 
Date: Tue, 14 Jun 2016 10:47:18 -0600
Subject: [PATCH 75/91] Bug Fix in tiva_serial.c - UART5, UART6 and UART7 were
 not being configured as TTYS0 for printing over serial console

---
 arch/arm/src/tiva/tiva_serial.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/arch/arm/src/tiva/tiva_serial.c b/arch/arm/src/tiva/tiva_serial.c
index fb9ea3ee61..e131fbd5d6 100644
--- a/arch/arm/src/tiva/tiva_serial.c
+++ b/arch/arm/src/tiva/tiva_serial.c
@@ -109,13 +109,16 @@
 #    define UART4_ASSIGNED      1
 #elif defined(CONFIG_UART5_SERIAL_CONSOLE)
 #    define CONSOLE_DEV         g_uart5port /* UART5 is console */
-#    define TTYS5_DEV           g_uart5port /* UART5 is ttyS0 */
+#    define TTYS0_DEV           g_uart5port /* UART5 is ttyS0 */
+#    define UART5_ASSIGNED      1
 #elif defined(CONFIG_UART6_SERIAL_CONSOLE)
 #    define CONSOLE_DEV         g_uart6port /* UART6 is console */
-#    define TTYS5_DEV           g_uart6port /* UART6 is ttyS0 */
+#    define TTYS0_DEV           g_uart6port /* UART6 is ttyS0 */
+#    define UART6_ASSIGNED      1
 #elif defined(CONFIG_UART7_SERIAL_CONSOLE)
 #    define CONSOLE_DEV         g_uart7port /* UART7 is console */
-#    define TTYS5_DEV           g_uart7port /* UART7 is ttyS0 */
+#    define TTYS0_DEV           g_uart7port /* UART7 is ttyS0 */
+#    define UART7_ASSIGNED      1
 #else
 #  undef CONSOLE_DEV                        /* No console */
 #  if defined(CONFIG_TIVA_UART0)
-- 
GitLab


From dfc703f250da099277fb3ad7a1309f8070548483 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 14 Jun 2016 11:49:55 -0600
Subject: [PATCH 76/91] arch/sim/:  Change some *err() message to *info()
 messages if what was a *dbg() message does not indicate and error condition.

---
 arch/sim/src/board_lcd.c          |  4 +--
 arch/sim/src/up_blocktask.c       |  6 ++---
 arch/sim/src/up_deviceimage.c     |  4 +--
 arch/sim/src/up_elf.c             |  2 +-
 arch/sim/src/up_exit.c            |  7 +++--
 arch/sim/src/up_framebuffer.c     | 44 ++++++++++++++++++-------------
 arch/sim/src/up_releasepending.c  |  6 ++---
 arch/sim/src/up_reprioritizertr.c |  6 ++---
 arch/sim/src/up_smpsignal.c       |  2 +-
 arch/sim/src/up_touchscreen.c     |  4 +--
 arch/sim/src/up_unblocktask.c     |  8 +++---
 11 files changed, 49 insertions(+), 44 deletions(-)

diff --git a/arch/sim/src/board_lcd.c b/arch/sim/src/board_lcd.c
index 7d2fde8aa1..76b68bbeb7 100644
--- a/arch/sim/src/board_lcd.c
+++ b/arch/sim/src/board_lcd.c
@@ -248,7 +248,7 @@ static struct sim_dev_s g_lcddev =
 static int sim_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer,
                        size_t npixels)
 {
-  lcderr("row: %d col: %d npixels: %d\n", row, col, npixels);
+  lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
   return OK;
 }
 
@@ -269,7 +269,7 @@ static int sim_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer,
 static int sim_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
                        size_t npixels)
 {
-  lcderr("row: %d col: %d npixels: %d\n", row, col, npixels);
+  lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
   return -ENOSYS;
 }
 
diff --git a/arch/sim/src/up_blocktask.c b/arch/sim/src/up_blocktask.c
index bf65f35eae..63749556c3 100644
--- a/arch/sim/src/up_blocktask.c
+++ b/arch/sim/src/up_blocktask.c
@@ -83,7 +83,7 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state)
   ASSERT((tcb->task_state >= FIRST_READY_TO_RUN_STATE) &&
          (tcb->task_state <= LAST_READY_TO_RUN_STATE));
 
-  serr("Blocking TCB=%p\n", tcb);
+  sinfo("Blocking TCB=%p\n", tcb);
 
   /* Remove the tcb task from the ready-to-run list.  If we
    * are blocking the task at the head of the task list (the
@@ -127,7 +127,7 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state)
            */
 
           rtcb = this_task();
-          serr("New Active Task TCB=%p\n", rtcb);
+          sinfo("New Active Task TCB=%p\n", rtcb);
 
           /* The way that we handle signals in the simulation is kind of
            * a kludge.  This would be unsafe in a truly multi-threaded, interrupt
@@ -136,7 +136,7 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state)
 
           if (rtcb->xcp.sigdeliver)
             {
-              serr("Delivering signals TCB=%p\n", rtcb);
+              sinfo("Delivering signals TCB=%p\n", rtcb);
               ((sig_deliver_t)rtcb->xcp.sigdeliver)(rtcb);
               rtcb->xcp.sigdeliver = NULL;
             }
diff --git a/arch/sim/src/up_deviceimage.c b/arch/sim/src/up_deviceimage.c
index 059b268498..bf3ccc0dc2 100644
--- a/arch/sim/src/up_deviceimage.c
+++ b/arch/sim/src/up_deviceimage.c
@@ -223,7 +223,7 @@ char *up_deviceimage(void)
   ret           = inflateInit(&strm);
   if (ret != Z_OK)
     {
-      serr("inflateInit FAILED: ret=%d msg=\"%s\"\n",
+      serr("ERROR: inflateInit FAILED: ret=%d msg=\"%s\"\n",
            ret, strm.msg ? strm.msg : "No message");
       return NULL;
     }
@@ -260,7 +260,7 @@ char *up_deviceimage(void)
           case Z_DATA_ERROR:
           case Z_MEM_ERROR:
           case Z_STREAM_ERROR:
-              serr("inflate FAILED: ret=%d msg=\"%s\"\n",
+              serr("ERROR: inflate FAILED: ret=%d msg=\"%s\"\n",
                     ret, strm.msg ? strm.msg : "No message");
               (void)inflateEnd(&strm);
               kmm_free(pbuffer);
diff --git a/arch/sim/src/up_elf.c b/arch/sim/src/up_elf.c
index 2e17cadeaa..bba6010ac9 100644
--- a/arch/sim/src/up_elf.c
+++ b/arch/sim/src/up_elf.c
@@ -138,7 +138,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
 int up_relocateadd(FAR const Elf32_Rela *rel, FAR const Elf32_Sym *sym,
                    uintptr_t addr)
 {
-  berr("Not supported\n");
+  berr("ERROR: Not supported\n");
   return -ENOSYS;
 }
 
diff --git a/arch/sim/src/up_exit.c b/arch/sim/src/up_exit.c
index 318a3dbcfb..2a17a8075b 100644
--- a/arch/sim/src/up_exit.c
+++ b/arch/sim/src/up_exit.c
@@ -67,7 +67,7 @@ void _exit(int status)
 {
   FAR struct tcb_s *tcb;
 
-  serr("TCB=%p exiting\n", tcb);
+  sinfo("TCB=%p exiting\n", tcb);
 
   /* Destroy the task at the head of the ready to run list. */
 
@@ -78,7 +78,7 @@ void _exit(int status)
    */
 
   tcb = this_task();
-  serr("New Active Task TCB=%p\n", tcb);
+  sinfo("New Active Task TCB=%p\n", tcb);
 
   /* The way that we handle signals in the simulation is kind of
    * a kludge.  This would be unsafe in a truly multi-threaded, interrupt
@@ -87,7 +87,7 @@ void _exit(int status)
 
   if (tcb->xcp.sigdeliver)
     {
-      serr("Delivering signals TCB=%p\n", tcb);
+      sinfo("Delivering signals TCB=%p\n", tcb);
       ((sig_deliver_t)tcb->xcp.sigdeliver)(tcb);
       tcb->xcp.sigdeliver = NULL;
     }
@@ -96,4 +96,3 @@ void _exit(int status)
 
   up_longjmp(tcb->xcp.regs, 1);
 }
-
diff --git a/arch/sim/src/up_framebuffer.c b/arch/sim/src/up_framebuffer.c
index b621a4aa4d..ff1e3629bc 100644
--- a/arch/sim/src/up_framebuffer.c
+++ b/arch/sim/src/up_framebuffer.c
@@ -191,13 +191,14 @@ struct fb_vtable_s g_fbobject =
 static int up_getvideoinfo(FAR struct fb_vtable_s *vtable,
                            FAR struct fb_videoinfo_s *vinfo)
 {
-  err("vtable=%p vinfo=%p\n", vtable, vinfo);
+  info("vtable=%p vinfo=%p\n", vtable, vinfo);
   if (vtable && vinfo)
     {
       memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s));
       return OK;
     }
-  err("Returning EINVAL\n");
+
+  err("ERROR: Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -208,13 +209,14 @@ static int up_getvideoinfo(FAR struct fb_vtable_s *vtable,
 static int up_getplaneinfo(FAR struct fb_vtable_s *vtable, int planeno,
                            FAR struct fb_planeinfo_s *pinfo)
 {
-  err("vtable=%p planeno=%d pinfo=%p\n", vtable, planeno, pinfo);
+  info("vtable=%p planeno=%d pinfo=%p\n", vtable, planeno, pinfo);
   if (vtable && planeno == 0 && pinfo)
     {
       memcpy(pinfo, &g_planeinfo, sizeof(struct fb_planeinfo_s));
       return OK;
     }
-  err("Returning EINVAL\n");
+
+  err("ERROR: Returning EINVAL\n");
   return -EINVAL;
 }
 
@@ -228,7 +230,7 @@ static int up_getcmap(FAR struct fb_vtable_s *vtable, FAR struct fb_cmap_s *cmap
   int len;
   int i;
 
-  err("vtable=%p cmap=%p len=%d\n", vtable, cmap, cmap->len);
+  info("vtable=%p cmap=%p len=%d\n", vtable, cmap, cmap->len);
   if (vtable && cmap)
     {
       for (i = cmap->first, len = 0; i < 256 && len < cmap->len; i++, len++)
@@ -244,7 +246,8 @@ static int up_getcmap(FAR struct fb_vtable_s *vtable, FAR struct fb_cmap_s *cmap
       cmap->len = len;
       return OK;
     }
-  err("Returning EINVAL\n");
+
+  err("ERROR: Returning EINVAL\n");
   return -EINVAL;
 }
 #endif
@@ -259,12 +262,13 @@ static int up_putcmap(FAR struct fb_vtable_s *vtable, FAR const struct fb_cmap_s
 #ifdef CONFIG_SIM_X11FB
   return up_x11cmap(cmap->first, cmap->len, cmap->red, cmap->green, cmap->blue, NULL);
 #else
-  err("vtable=%p cmap=%p len=%d\n", vtable, cmap, cmap->len);
+  info("vtable=%p cmap=%p len=%d\n", vtable, cmap, cmap->len);
   if (vtable && cmap)
     {
       return OK;
     }
-  err("Returning EINVAL\n");
+
+  err("ERROR: Returning EINVAL\n");
   return -EINVAL;
 #endif
 }
@@ -278,23 +282,24 @@ static int up_putcmap(FAR struct fb_vtable_s *vtable, FAR const struct fb_cmap_s
 static int up_getcursor(FAR struct fb_vtable_s *vtable,
                         FAR struct fb_cursorattrib_s *attrib)
 {
-  err("vtable=%p attrib=%p\n", vtable, attrib);
+  info("vtable=%p attrib=%p\n", vtable, attrib);
   if (vtable && attrib)
     {
 #ifdef CONFIG_FB_HWCURSORIMAGE
       attrib->fmt      = FB_FMT;
 #endif
-      err("pos:      (x=%d, y=%d)\n", g_cpos.x, g_cpos.y);
+      info("pos:      (x=%d, y=%d)\n", g_cpos.x, g_cpos.y);
       attrib->pos      = g_cpos;
 #ifdef CONFIG_FB_HWCURSORSIZE
       attrib->mxsize.h = CONFIG_SIM_FBHEIGHT;
       attrib->mxsize.w = CONFIG_SIM_FBWIDTH;
-      err("size:     (h=%d, w=%d)\n", g_csize.h, g_csize.w);
+      info("size:     (h=%d, w=%d)\n", g_csize.h, g_csize.w);
       attrib->size     = g_csize;
 #endif
       return OK;
     }
-  err("Returning EINVAL\n");
+
+  err("ERROR: Returning EINVAL\n");
   return -EINVAL;
 }
 #endif
@@ -307,32 +312,33 @@ static int up_getcursor(FAR struct fb_vtable_s *vtable,
 static int up_setcursor(FAR struct fb_vtable_s *vtable,
                        FAR struct fb_setcursor_s *setttings)
 {
-  err("vtable=%p setttings=%p\n", vtable, setttings);
+  info("vtable=%p setttings=%p\n", vtable, setttings);
   if (vtable && setttings)
     {
-      err("flags:   %02x\n", settings->flags);
+      info("flags:   %02x\n", settings->flags);
       if ((flags & FB_CUR_SETPOSITION) != 0)
         {
           g_cpos = settings->pos;
-          err("pos:     (h:%d, w:%d)\n", g_cpos.x, g_cpos.y);
+          info("pos:     (h:%d, w:%d)\n", g_cpos.x, g_cpos.y);
         }
 #ifdef CONFIG_FB_HWCURSORSIZE
       if ((flags & FB_CUR_SETSIZE) != 0)
         {
           g_csize = settings->size;
-          err("size:    (h:%d, w:%d)\n", g_csize.h, g_csize.w);
+          info("size:    (h:%d, w:%d)\n", g_csize.h, g_csize.w);
         }
 #endif
 #ifdef CONFIG_FB_HWCURSORIMAGE
       if ((flags & FB_CUR_SETIMAGE) != 0)
         {
-          err("image:   (h:%d, w:%d) @ %p\n",
-              settings->img.height, settings->img.width, settings->img.image);
+          info("image:   (h:%d, w:%d) @ %p\n",
+               settings->img.height, settings->img.width, settings->img.image);
         }
 #endif
       return OK;
     }
-  err("Returning EINVAL\n");
+
+  err("ERROR: Returning EINVAL\n");
   return -EINVAL;
 }
 #endif
diff --git a/arch/sim/src/up_releasepending.c b/arch/sim/src/up_releasepending.c
index 8b92003340..7a1df74827 100644
--- a/arch/sim/src/up_releasepending.c
+++ b/arch/sim/src/up_releasepending.c
@@ -66,7 +66,7 @@ void up_release_pending(void)
 {
   FAR struct tcb_s *rtcb = this_task();
 
-  serr("From TCB=%p\n", rtcb);
+  sinfo("From TCB=%p\n", rtcb);
 
   /* Merge the g_pendingtasks list into the ready-to-run task list */
 
@@ -93,7 +93,7 @@ void up_release_pending(void)
            */
 
           rtcb = this_task();
-          serr("New Active Task TCB=%p\n", rtcb);
+          sinfo("New Active Task TCB=%p\n", rtcb);
 
           /* The way that we handle signals in the simulation is kind of
            * a kludge.  This would be unsafe in a truly multi-threaded, interrupt
@@ -102,7 +102,7 @@ void up_release_pending(void)
 
           if (rtcb->xcp.sigdeliver)
             {
-              serr("Delivering signals TCB=%p\n", rtcb);
+              sinfo("Delivering signals TCB=%p\n", rtcb);
               ((sig_deliver_t)rtcb->xcp.sigdeliver)(rtcb);
               rtcb->xcp.sigdeliver = NULL;
             }
diff --git a/arch/sim/src/up_reprioritizertr.c b/arch/sim/src/up_reprioritizertr.c
index 0c50facd24..048c311559 100644
--- a/arch/sim/src/up_reprioritizertr.c
+++ b/arch/sim/src/up_reprioritizertr.c
@@ -95,7 +95,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
       FAR struct tcb_s *rtcb = this_task();
       bool switch_needed;
 
-      serr("TCB=%p PRI=%d\n", tcb, priority);
+      sinfo("TCB=%p PRI=%d\n", tcb, priority);
 
       /* Remove the tcb task from the ready-to-run list.
        * sched_removereadytorun will return true if we just
@@ -148,7 +148,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
                */
 
               rtcb = this_task();
-              serr("New Active Task TCB=%p\n", rtcb);
+              sinfo("New Active Task TCB=%p\n", rtcb);
 
               /* The way that we handle signals in the simulation is kind of
                * a kludge.  This would be unsafe in a truly multi-threaded, interrupt
@@ -157,7 +157,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
 
               if (rtcb->xcp.sigdeliver)
                 {
-                  serr("Delivering signals TCB=%p\n", rtcb);
+                  sinfo("Delivering signals TCB=%p\n", rtcb);
                   ((sig_deliver_t)rtcb->xcp.sigdeliver)(rtcb);
                   rtcb->xcp.sigdeliver = NULL;
                 }
diff --git a/arch/sim/src/up_smpsignal.c b/arch/sim/src/up_smpsignal.c
index b69bfb75ab..f921c7f3b4 100644
--- a/arch/sim/src/up_smpsignal.c
+++ b/arch/sim/src/up_smpsignal.c
@@ -112,7 +112,7 @@ void sim_cpu_pause(int cpu, volatile spinlock_t *wait,
 
       if (rtcb->xcp.sigdeliver)
         {
-          serr("CPU%d: Delivering signals TCB=%p\n", cpu, rtcb);
+          sinfo("CPU%d: Delivering signals TCB=%p\n", cpu, rtcb);
           ((sig_deliver_t)rtcb->xcp.sigdeliver)(rtcb);
           rtcb->xcp.sigdeliver = NULL;
         }
diff --git a/arch/sim/src/up_touchscreen.c b/arch/sim/src/up_touchscreen.c
index 2869bcf0bb..a56870c850 100644
--- a/arch/sim/src/up_touchscreen.c
+++ b/arch/sim/src/up_touchscreen.c
@@ -670,7 +670,7 @@ int board_tsc_setup(int minor)
   ret = register_driver(devname, &up_fops, 0666, priv);
   if (ret < 0)
     {
-      ierr("register_driver() failed: %d\n", ret);
+      ierr("ERROR: register_driver() failed: %d\n", ret);
       goto errout_with_priv;
     }
 
@@ -737,7 +737,7 @@ void board_tsc_teardown(void)
   ret = unregister_driver(devname);
   if (ret < 0)
     {
-      ierr("uregister_driver() failed: %d\n", ret);
+      ierr("ERROR: uregister_driver() failed: %d\n", ret);
     }
 
   /* Clean up any resources.  Ouch!  While we are holding the semaphore? */
diff --git a/arch/sim/src/up_unblocktask.c b/arch/sim/src/up_unblocktask.c
index 60bee25261..5217efeb8f 100644
--- a/arch/sim/src/up_unblocktask.c
+++ b/arch/sim/src/up_unblocktask.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/sim/src/up_unblocktask.c
  *
- *   Copyright (C) 2007-2009, 2013, 2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2013, 2015-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -77,7 +77,7 @@ void up_unblock_task(FAR struct tcb_s *tcb)
   ASSERT((tcb->task_state >= FIRST_BLOCKED_STATE) &&
          (tcb->task_state <= LAST_BLOCKED_STATE));
 
-  serr("Unblocking TCB=%p\n", tcb);
+  sinfo("Unblocking TCB=%p\n", tcb);
 
   /* Remove the task from the blocked task list */
 
@@ -107,7 +107,7 @@ void up_unblock_task(FAR struct tcb_s *tcb)
            */
 
           rtcb = this_task();
-          serr("New Active Task TCB=%p\n", rtcb);
+          sinfo("New Active Task TCB=%p\n", rtcb);
 
           /* The way that we handle signals in the simulation is kind of
            * a kludge.  This would be unsafe in a truly multi-threaded, interrupt
@@ -116,7 +116,7 @@ void up_unblock_task(FAR struct tcb_s *tcb)
 
           if (rtcb->xcp.sigdeliver)
             {
-              serr("Delivering signals TCB=%p\n", rtcb);
+              sinfo("Delivering signals TCB=%p\n", rtcb);
               ((sig_deliver_t)rtcb->xcp.sigdeliver)(rtcb);
               rtcb->xcp.sigdeliver = NULL;
             }
-- 
GitLab


From f165dd96bf9ca2dcd1e213cf7d198e58c3d3c775 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 14 Jun 2016 11:53:36 -0600
Subject: [PATCH 77/91] arch/sh/:  Change some *err() message to *info()
 messages if what was a *dbg() message does not indicate and error condition.

---
 arch/sh/src/common/up_exit.c              | 20 ++++++++++----------
 arch/sh/src/common/up_initialize.c        |  4 ++--
 arch/sh/src/common/up_releasepending.c    |  2 +-
 arch/sh/src/common/up_reprioritizertr.c   |  2 +-
 arch/sh/src/m16c/m16c_schedulesigaction.c |  4 ++--
 arch/sh/src/m16c/m16c_serial.c            | 10 +++++-----
 arch/sh/src/m16c/m16c_sigdeliver.c        |  4 ++--
 arch/sh/src/sh1/sh1_irq.c                 |  4 ++--
 arch/sh/src/sh1/sh1_schedulesigaction.c   |  4 ++--
 arch/sh/src/sh1/sh1_sigdeliver.c          |  4 ++--
 10 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/arch/sh/src/common/up_exit.c b/arch/sh/src/common/up_exit.c
index 1ee0f1695d..4b4ba44337 100644
--- a/arch/sh/src/common/up_exit.c
+++ b/arch/sh/src/common/up_exit.c
@@ -86,8 +86,8 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
   int i;
 #endif
 
-  serr("  TCB=%p name=%s\n", tcb, tcb->argv[0]);
-  serr("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
+  sinfo("  TCB=%p name=%s\n", tcb, tcb->argv[0]);
+  sinfo("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
 
 #if CONFIG_NFILE_DESCRIPTORS > 0
   filelist = tcb->group->tg_filelist;
@@ -96,8 +96,8 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
       struct inode *inode = filelist->fl_files[i].f_inode;
       if (inode)
         {
-          serr("      fd=%d refcount=%d\n",
-               i, inode->i_crefs);
+          sinfo("      fd=%d refcount=%d\n",
+                i, inode->i_crefs);
         }
     }
 #endif
@@ -110,11 +110,11 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
       if (filep->fs_fd >= 0)
         {
 #if CONFIG_STDIO_BUFFER_SIZE > 0
-          serr("      fd=%d nbytes=%d\n",
-               filep->fs_fd,
-               filep->fs_bufpos - filep->fs_bufstart);
+          sinfo("      fd=%d nbytes=%d\n",
+                filep->fs_fd,
+                filep->fs_bufpos - filep->fs_bufstart);
 #else
-          serr("      fd=%d\n", filep->fs_fd);
+          sinfo("      fd=%d\n", filep->fs_fd);
 #endif
         }
     }
@@ -147,10 +147,10 @@ void _exit(int status)
 
   (void)up_irq_save();
 
-  sllerr("TCB=%p exiting\n", this_task());
+  sllinfo("TCB=%p exiting\n", this_task());
 
 #if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
-  sllerr("Other tasks:\n");
+  sllinfo("Other tasks:\n");
   sched_foreach(_up_dumponexit, NULL);
 #endif
 
diff --git a/arch/sh/src/common/up_initialize.c b/arch/sh/src/common/up_initialize.c
index 98c38fe504..89fb6579c3 100644
--- a/arch/sh/src/common/up_initialize.c
+++ b/arch/sh/src/common/up_initialize.c
@@ -82,13 +82,13 @@ static void up_calibratedelay(void)
 {
   int i;
 
-  sllerr("Beginning 100s delay\n");
+  sllwarn("Beginning 100s delay\n");
   for (i = 0; i < 100; i++)
     {
       up_mdelay(1000);
     }
 
-  sllerr("End 100s delay\n");
+  sllwarn("End 100s delay\n");
 }
 #else
 # define up_calibratedelay()
diff --git a/arch/sh/src/common/up_releasepending.c b/arch/sh/src/common/up_releasepending.c
index 3112f52532..1f36fd752b 100644
--- a/arch/sh/src/common/up_releasepending.c
+++ b/arch/sh/src/common/up_releasepending.c
@@ -67,7 +67,7 @@ void up_release_pending(void)
 {
   struct tcb_s *rtcb = this_task();
 
-  sllerr("From TCB=%p\n", rtcb);
+  sllinfo("From TCB=%p\n", rtcb);
 
   /* Merge the g_pendingtasks list into the ready-to-run task list */
 
diff --git a/arch/sh/src/common/up_reprioritizertr.c b/arch/sh/src/common/up_reprioritizertr.c
index 8578dfef47..bce7c4e144 100644
--- a/arch/sh/src/common/up_reprioritizertr.c
+++ b/arch/sh/src/common/up_reprioritizertr.c
@@ -95,7 +95,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
       struct tcb_s *rtcb = this_task();
       bool switch_needed;
 
-      sllerr("TCB=%p PRI=%d\n", tcb, priority);
+      sllinfo("TCB=%p PRI=%d\n", tcb, priority);
 
       /* Remove the tcb task from the ready-to-run list.
        * sched_removereadytorun will return true if we just
diff --git a/arch/sh/src/m16c/m16c_schedulesigaction.c b/arch/sh/src/m16c/m16c_schedulesigaction.c
index 7394dce29c..23d105240b 100644
--- a/arch/sh/src/m16c/m16c_schedulesigaction.c
+++ b/arch/sh/src/m16c/m16c_schedulesigaction.c
@@ -93,7 +93,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
 {
   irqstate_t flags;
 
-  serr("tcb=0x%p sigdeliver=0x%p\n", tcb, sigdeliver);
+  sinfo("tcb=0x%p sigdeliver=0x%p\n", tcb, sigdeliver);
 
   /* Make sure that interrupts are disabled */
 
@@ -107,7 +107,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
        * being delivered to the currently executing task.
        */
 
-      serr("rtcb=0x%p g_current_regs=0x%p\n", this_task(), g_current_regs);
+      sinfo("rtcb=0x%p g_current_regs=0x%p\n", this_task(), g_current_regs);
 
       if (tcb == this_task())
         {
diff --git a/arch/sh/src/m16c/m16c_serial.c b/arch/sh/src/m16c/m16c_serial.c
index b89d70e898..34c3d9019a 100644
--- a/arch/sh/src/m16c/m16c_serial.c
+++ b/arch/sh/src/m16c/m16c_serial.c
@@ -588,7 +588,7 @@ static int up_setup(struct uart_dev_s *dev)
   else
 #endif
     {
-      err("Invalid UART #\n");
+      err("ERROR: Invalid UART #\n");
     }
 
   /* Set UART transmit/receive control register 1 to enable transmit and receive */
@@ -613,7 +613,7 @@ static int up_setup(struct uart_dev_s *dev)
     }
   else
     {
-      err("Invalid bits=%d\n", priv->bits);
+      err("ERROR: Invalid bits=%d\n", priv->bits);
     }
 
   if (priv->parity != 0)
@@ -665,7 +665,7 @@ static int up_setup(struct uart_dev_s *dev)
   else
 #endif
     {
-      err("Invalid UART #\n");
+      err("ERROR: Invalid UART #\n");
     }
 
   /* Read any data left in the RX fifo */
@@ -872,7 +872,7 @@ static void m16c_rxint(struct up_dev_s *dev, bool enable)
   else
 #endif
     {
-      err("Invalid UART #\n");
+      err("ERROR: Invalid UART #\n");
       return;
     }
 
@@ -1027,7 +1027,7 @@ static void m16c_txint(struct up_dev_s *dev, bool enable)
   else
 #endif
     {
-      err("Invalid UART #\n");
+      err("ERROR: Invalid UART #\n");
       return;
     }
 
diff --git a/arch/sh/src/m16c/m16c_sigdeliver.c b/arch/sh/src/m16c/m16c_sigdeliver.c
index c8612c5000..40976346f3 100644
--- a/arch/sh/src/m16c/m16c_sigdeliver.c
+++ b/arch/sh/src/m16c/m16c_sigdeliver.c
@@ -95,7 +95,7 @@ void up_sigdeliver(void)
 
   board_autoled_on(LED_SIGNAL);
 
-  serr("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
+  sinfo("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
         rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
   ASSERT(rtcb->xcp.sigdeliver != NULL);
 
@@ -128,7 +128,7 @@ void up_sigdeliver(void)
    * errno that is needed by the user logic (it is probably EINTR).
    */
 
-  serr("Resuming\n");
+  sinfo("Resuming\n");
   (void)up_irq_save();
   rtcb->pterrno = saved_errno;
 
diff --git a/arch/sh/src/sh1/sh1_irq.c b/arch/sh/src/sh1/sh1_irq.c
index 3f5ce17b4f..36164ae9d1 100644
--- a/arch/sh/src/sh1/sh1_irq.c
+++ b/arch/sh/src/sh1/sh1_irq.c
@@ -95,7 +95,7 @@ void up_prioritize_irq(int irq, int priority)
 #ifdef CONFIG_DEBUG_FEATURES
   if ((unsigned) irq > NR_IRQS || (unsigned)priority > 15)
     {
-      err("Invalid parameters\n");
+      err("ERROR: Invalid parameters\n");
       return;
     }
 #endif
@@ -260,7 +260,7 @@ void up_prioritize_irq(int irq, int priority)
 #endif
 
     default:
-      err("Invalid irq=%d\n", irq);
+      err("ERROR: Invalid irq=%d\n", irq);
       return;
     }
 
diff --git a/arch/sh/src/sh1/sh1_schedulesigaction.c b/arch/sh/src/sh1/sh1_schedulesigaction.c
index d1f87406d5..11c241ddea 100644
--- a/arch/sh/src/sh1/sh1_schedulesigaction.c
+++ b/arch/sh/src/sh1/sh1_schedulesigaction.c
@@ -93,7 +93,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
 {
   irqstate_t flags;
 
-  serr("tcb=0x%p sigdeliver=0x%p\n", tcb, sigdeliver);
+  sinfo("tcb=0x%p sigdeliver=0x%p\n", tcb, sigdeliver);
 
   /* Make sure that interrupts are disabled */
 
@@ -107,7 +107,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
        * being delivered to the currently executing task.
        */
 
-      serr("rtcb=0x%p g_current_regs=0x%p\n", this_task(), g_current_regs);
+      sinfo("rtcb=0x%p g_current_regs=0x%p\n", this_task(), g_current_regs);
 
       if (tcb == this_task())
         {
diff --git a/arch/sh/src/sh1/sh1_sigdeliver.c b/arch/sh/src/sh1/sh1_sigdeliver.c
index 7a408d293d..85b8f57978 100644
--- a/arch/sh/src/sh1/sh1_sigdeliver.c
+++ b/arch/sh/src/sh1/sh1_sigdeliver.c
@@ -95,7 +95,7 @@ void up_sigdeliver(void)
 
   board_autoled_on(LED_SIGNAL);
 
-  serr("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
+  sinfo("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
         rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
   ASSERT(rtcb->xcp.sigdeliver != NULL);
 
@@ -127,7 +127,7 @@ void up_sigdeliver(void)
    * errno that is needed by the user logic (it is probably EINTR).
    */
 
-  serr("Resuming\n");
+  sinfo("Resuming\n");
   (void)up_irq_save();
   rtcb->pterrno = saved_errno;
 
-- 
GitLab


From 2f3b9ccc812898cfb52fe9a436fe279702e44d74 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 14 Jun 2016 12:00:38 -0600
Subject: [PATCH 78/91] arch/rgmp/:  Change some *err() message to *info()
 messages if what was a *dbg() message does not indicate and error condition.

---
 arch/rgmp/src/x86/com.c | 61 ++++++++++++++++++++++++++++-------------
 1 file changed, 42 insertions(+), 19 deletions(-)

diff --git a/arch/rgmp/src/x86/com.c b/arch/rgmp/src/x86/com.c
index 018293ee66..fced9f66e8 100644
--- a/arch/rgmp/src/x86/com.c
+++ b/arch/rgmp/src/x86/com.c
@@ -245,19 +245,22 @@ static int up_setup(struct uart_dev_s *dev)
     } data;
 
     // clear and disable FIFO
+
     outb(base+COM_FCR, 1);
     outb(base+COM_FCR, 3);
     outb(base+COM_FCR, 0);
 
     // Clear any preexisting overrun indications and interrupts
     // Serial port doesn't exist if COM_LSR returns 0xFF
+
     inb(base+COM_LSR);
     inb(base+COM_IIR);
     inb(base+COM_RX);
-    if (inb(base+COM_LSR) == 0xff) {
-        err("COM %d does not exist\n", base);
+    if (inb(base+COM_LSR) == 0xff)
+      {
+        err("ERROR: COM %d does not exist\n", base);
         return -1;
-    }
+      }
 
     // Set speed; requires DLAB latch
     outb(base+COM_LCR, COM_LCR_DLAB);
@@ -583,42 +586,62 @@ void up_serialinit(void)
 #ifdef CONFIG_COM1
     dev = up_alloc_com(COM1, 4);
     if (dev == NULL)
-        err("alloc com1 fail\n");
-    else {
+      {
+        err("ERROR: alloc com1 fail\n");
+      }
+    else
+      {
         errcode = uart_register("/dev/ttyS0", dev);
         if (errcode)
-            err("register com1 fail\n");
-    }
+          {
+            err("ERROR: register com1 fail\n");
+          }
+      }
 #endif
 #ifdef CONFIG_COM2
     dev = up_alloc_com(COM2, 3);
     if (dev == NULL)
-        err("alloc com2 fail\n");
-    else {
+      {
+        err("ERROR: alloc com2 fail\n");
+      }
+    else
+      {
         errcode = uart_register("/dev/ttyS1", dev);
         if (errcode)
-            err("register com2 fail\n");
-    }
+          {
+            err("ERROR: register com2 fail\n");
+          }
+      }
 #endif
 #ifdef CONFIG_COM3
     dev = up_alloc_com(COM3, 4);
     if (dev == NULL)
-        err("alloc com3 fail\n");
-    else {
+      {
+        err("ERROR: alloc com3 fail\n");
+      }
+    else
+      {
         errcode = uart_register("/dev/ttyS2", dev);
         if (errcode)
-            err("register com3 fail\n");
-    }
+          {
+            err("ERROR: register com3 fail\n");
+          }
+      }
 #endif
 #ifdef CONFIG_COM4
     dev = up_alloc_com(COM4, 3);
     if (dev == NULL)
-        err("alloc com4 fail\n");
-    else {
+      {
+        err("ERROR: alloc com4 fail\n");
+      }
+    else
+      {
         errcode = uart_register("/dev/ttyS3", dev);
         if (errcode)
-            err("register com4 fail\n");
-    }
+          {
+            err("ERROR: register com4 fail\n");
+          }
+      }
 #endif
 }
 
-- 
GitLab


From 080aa07110227574f91268f49af39c510278ca7e Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 14 Jun 2016 12:34:29 -0600
Subject: [PATCH 79/91] arch/mips/:  Change some *err() message to *info()
 messages if what was a *dbg() message does not indicate and error condition.

---
 arch/mips/src/common/up_exit.c              |  20 ++--
 arch/mips/src/common/up_initialize.c        |   4 +-
 arch/mips/src/mips32/up_releasepending.c    |   2 +-
 arch/mips/src/mips32/up_reprioritizertr.c   |   2 +-
 arch/mips/src/mips32/up_schedulesigaction.c |   5 +-
 arch/mips/src/mips32/up_sigdeliver.c        |   2 +-
 arch/mips/src/mips32/up_swint0.c            |  52 +++++-----
 arch/mips/src/mips32/up_vfork.c             |   4 +-
 arch/mips/src/pic32mx/Kconfig               |   2 +-
 arch/mips/src/pic32mx/pic32mx-ethernet.c    | 102 +++++++++---------
 arch/mips/src/pic32mx/pic32mx-exception.c   |  98 ++++++++----------
 arch/mips/src/pic32mx/pic32mx-gpio.c        |  22 ++--
 arch/mips/src/pic32mx/pic32mx-spi.c         |  27 +++--
 arch/mips/src/pic32mx/pic32mx-usbdev.c      | 109 ++++++++++----------
 arch/mips/src/pic32mz/Kconfig               |   4 +-
 arch/mips/src/pic32mz/pic32mz-ethernet.c    | 103 +++++++++---------
 arch/mips/src/pic32mz/pic32mz-exception.c   |  98 ++++++++----------
 arch/mips/src/pic32mz/pic32mz-gpio.c        |  24 ++---
 arch/mips/src/pic32mz/pic32mz-gpio.h        |   2 +-
 arch/mips/src/pic32mz/pic32mz-spi.c         |  30 +++---
 arch/rgmp/src/x86/com.c                     |   6 +-
 21 files changed, 338 insertions(+), 380 deletions(-)

diff --git a/arch/mips/src/common/up_exit.c b/arch/mips/src/common/up_exit.c
index ad1dbeb343..d26de05841 100644
--- a/arch/mips/src/common/up_exit.c
+++ b/arch/mips/src/common/up_exit.c
@@ -87,8 +87,8 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
   int i;
 #endif
 
-  serr("  TCB=%p name=%s pid=%d\n", tcb, tcb->argv[0], tcb->pid);
-  serr("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
+  sinfo("  TCB=%p name=%s pid=%d\n", tcb, tcb->argv[0], tcb->pid);
+  sinfo("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
 
 #if CONFIG_NFILE_DESCRIPTORS > 0
   filelist = tcb->group->tg_filelist;
@@ -97,8 +97,8 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
       struct inode *inode = filelist->fl_files[i].f_inode;
       if (inode)
         {
-          serr("      fd=%d refcount=%d\n",
-               i, inode->i_crefs);
+          sinfo("      fd=%d refcount=%d\n",
+                i, inode->i_crefs);
         }
     }
 #endif
@@ -111,11 +111,11 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
       if (filep->fs_fd >= 0)
         {
 #if CONFIG_STDIO_BUFFER_SIZE > 0
-          serr("      fd=%d nbytes=%d\n",
-               filep->fs_fd,
-               filep->fs_bufpos - filep->fs_bufstart);
+          sinfo("      fd=%d nbytes=%d\n",
+                filep->fs_fd,
+                filep->fs_bufpos - filep->fs_bufstart);
 #else
-          serr("      fd=%d\n", filep->fs_fd);
+          sinfo("      fd=%d\n", filep->fs_fd);
 #endif
         }
     }
@@ -148,10 +148,10 @@ void _exit(int status)
 
   (void)up_irq_save();
 
-  sllerr("TCB=%p exiting\n", this_task());
+  sllinfo("TCB=%p exiting\n", this_task());
 
 #if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
-  sllerr("Other tasks:\n");
+  sllinfo("Other tasks:\n");
   sched_foreach(_up_dumponexit, NULL);
 #endif
 
diff --git a/arch/mips/src/common/up_initialize.c b/arch/mips/src/common/up_initialize.c
index f87882685b..2529020267 100644
--- a/arch/mips/src/common/up_initialize.c
+++ b/arch/mips/src/common/up_initialize.c
@@ -76,13 +76,13 @@ static void up_calibratedelay(void)
 {
   int i;
 
-  llerr("Beginning 100s delay\n");
+  llwarn("Beginning 100s delay\n");
   for (i = 0; i < 100; i++)
     {
       up_mdelay(1000);
     }
 
-  llerr("End 100s delay\n");
+  llwarn("End 100s delay\n");
 }
 #else
 # define up_calibratedelay()
diff --git a/arch/mips/src/mips32/up_releasepending.c b/arch/mips/src/mips32/up_releasepending.c
index 57310e30d1..862f81ed75 100644
--- a/arch/mips/src/mips32/up_releasepending.c
+++ b/arch/mips/src/mips32/up_releasepending.c
@@ -69,7 +69,7 @@ void up_release_pending(void)
 {
   struct tcb_s *rtcb = this_task();
 
-  sllerr("From TCB=%p\n", rtcb);
+  sllinfo("From TCB=%p\n", rtcb);
 
   /* Merge the g_pendingtasks list into the ready-to-run task list */
 
diff --git a/arch/mips/src/mips32/up_reprioritizertr.c b/arch/mips/src/mips32/up_reprioritizertr.c
index 0f34c13894..7f80dd31fb 100644
--- a/arch/mips/src/mips32/up_reprioritizertr.c
+++ b/arch/mips/src/mips32/up_reprioritizertr.c
@@ -97,7 +97,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
       struct tcb_s *rtcb = this_task();
       bool switch_needed;
 
-      sllerr("TCB=%p PRI=%d\n", tcb, priority);
+      sllinfo("TCB=%p PRI=%d\n", tcb, priority);
 
       /* Remove the tcb task from the ready-to-run list.
        * sched_removereadytorun will return true if we just
diff --git a/arch/mips/src/mips32/up_schedulesigaction.c b/arch/mips/src/mips32/up_schedulesigaction.c
index 2af3169ee6..e44384c5aa 100644
--- a/arch/mips/src/mips32/up_schedulesigaction.c
+++ b/arch/mips/src/mips32/up_schedulesigaction.c
@@ -95,7 +95,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
   irqstate_t flags;
   uint32_t status;
 
-  serr("tcb=0x%p sigdeliver=0x%p\n", tcb, sigdeliver);
+  sinfo("tcb=0x%p sigdeliver=0x%p\n", tcb, sigdeliver);
 
   /* Make sure that interrupts are disabled */
 
@@ -109,7 +109,8 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
        * being delivered to the currently executing task.
        */
 
-      serr("rtcb=0x%p g_current_regs=0x%p\n", this_task(), g_current_regs);
+      sinfo("rtcb=0x%p g_current_regs=0x%p\n",
+            this_task(), g_current_regs);
 
       if (tcb == this_task())
         {
diff --git a/arch/mips/src/mips32/up_sigdeliver.c b/arch/mips/src/mips32/up_sigdeliver.c
index c514731ca1..bf8f8e1708 100644
--- a/arch/mips/src/mips32/up_sigdeliver.c
+++ b/arch/mips/src/mips32/up_sigdeliver.c
@@ -96,7 +96,7 @@ void up_sigdeliver(void)
 
   board_autoled_on(LED_SIGNAL);
 
-  serr("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
+  sinfo("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
         rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
   ASSERT(rtcb->xcp.sigdeliver != NULL);
 
diff --git a/arch/mips/src/mips32/up_swint0.c b/arch/mips/src/mips32/up_swint0.c
index 6e23087108..720aaa3bce 100644
--- a/arch/mips/src/mips32/up_swint0.c
+++ b/arch/mips/src/mips32/up_swint0.c
@@ -66,18 +66,14 @@
 
 #ifdef CONFIG_DEBUG_SYSCALL
 # define swierr(format, ...) llerr(format, ##__VA_ARGS__)
+# define swiwarn(format, ...) llwarn(format, ##__VA_ARGS__)
+# define swiinfo(format, ...) llinfo(format, ##__VA_ARGS__)
 #else
 # define swierr(x...)
+# define swiwarn(x...)
+# define swiinfo(x...)
 #endif
 
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -89,25 +85,25 @@
 #ifdef CONFIG_DEBUG_SYSCALL
 static void up_registerdump(const uint32_t *regs)
 {
-  swierr("MFLO:%08x MFHI:%08x EPC:%08x STATUS:%08x\n",
-         regs[REG_MFLO], regs[REG_MFHI], regs[REG_EPC], regs[REG_STATUS]);
-  swierr("AT:%08x V0:%08x V1:%08x A0:%08x A1:%08x A2:%08x A3:%08x\n",
-         regs[REG_AT], regs[REG_V0], regs[REG_V1], regs[REG_A0],
-         regs[REG_A1], regs[REG_A2], regs[REG_A3]);
-  swierr("T0:%08x T1:%08x T2:%08x T3:%08x T4:%08x T5:%08x T6:%08x T7:%08x\n",
-         regs[REG_T0], regs[REG_T1], regs[REG_T2], regs[REG_T3],
-         regs[REG_T4], regs[REG_T5], regs[REG_T6], regs[REG_T7]);
-  swierr("S0:%08x S1:%08x S2:%08x S3:%08x S4:%08x S5:%08x S6:%08x S7:%08x\n",
-         regs[REG_S0], regs[REG_S1], regs[REG_S2], regs[REG_S3],
-         regs[REG_S4], regs[REG_S5], regs[REG_S6], regs[REG_S7]);
+  swiinfo("MFLO:%08x MFHI:%08x EPC:%08x STATUS:%08x\n",
+          regs[REG_MFLO], regs[REG_MFHI], regs[REG_EPC], regs[REG_STATUS]);
+  swiinfo("AT:%08x V0:%08x V1:%08x A0:%08x A1:%08x A2:%08x A3:%08x\n",
+          regs[REG_AT], regs[REG_V0], regs[REG_V1], regs[REG_A0],
+          regs[REG_A1], regs[REG_A2], regs[REG_A3]);
+  swiinfo("T0:%08x T1:%08x T2:%08x T3:%08x T4:%08x T5:%08x T6:%08x T7:%08x\n",
+          regs[REG_T0], regs[REG_T1], regs[REG_T2], regs[REG_T3],
+          regs[REG_T4], regs[REG_T5], regs[REG_T6], regs[REG_T7]);
+  swiinfo("S0:%08x S1:%08x S2:%08x S3:%08x S4:%08x S5:%08x S6:%08x S7:%08x\n",
+          regs[REG_S0], regs[REG_S1], regs[REG_S2], regs[REG_S3],
+          regs[REG_S4], regs[REG_S5], regs[REG_S6], regs[REG_S7]);
 #ifdef MIPS32_SAVE_GP
-  swierr("T8:%08x T9:%08x GP:%08x SP:%08x FP:%08x RA:%08x\n",
-         regs[REG_T8], regs[REG_T9], regs[REG_GP], regs[REG_SP],
-         regs[REG_FP], regs[REG_RA]);
+  swiinfo("T8:%08x T9:%08x GP:%08x SP:%08x FP:%08x RA:%08x\n",
+          regs[REG_T8], regs[REG_T9], regs[REG_GP], regs[REG_SP],
+          regs[REG_FP], regs[REG_RA]);
 #else
-  swierr("T8:%08x T9:%08x SP:%08x FP:%08x RA:%08x\n",
-         regs[REG_T8], regs[REG_T9], regs[REG_SP], regs[REG_FP],
-         regs[REG_RA]);
+  swiinfo("T8:%08x T9:%08x SP:%08x FP:%08x RA:%08x\n",
+          regs[REG_T8], regs[REG_T9], regs[REG_SP], regs[REG_FP],
+          regs[REG_RA]);
 #endif
 }
 #else
@@ -168,7 +164,7 @@ int up_swint0(int irq, FAR void *context)
    */
 
 #ifdef CONFIG_DEBUG_SYSCALL
-  swierr("Entry: regs: %p cmd: %d\n", regs, regs[REG_R4]);
+  swiinfo("Entry: regs: %p cmd: %d\n", regs, regs[REG_R4]);
   up_registerdump(regs);
 #endif
 
@@ -300,12 +296,12 @@ int up_swint0(int irq, FAR void *context)
 #ifdef CONFIG_DEBUG_SYSCALL
   if (regs != g_current_regs)
     {
-      swierr("SWInt Return: Context switch!\n");
+      swiinfo("SWInt Return: Context switch!\n");
       up_registerdump((const uint32_t *)g_current_regs);
     }
   else
     {
-      swierr("SWInt Return: %d\n", regs[REG_V0]);
+      swiinfo("SWInt Return: %d\n", regs[REG_V0]);
     }
 #endif
 
diff --git a/arch/mips/src/mips32/up_vfork.c b/arch/mips/src/mips32/up_vfork.c
index 4ceb0a7215..06b79f7bb1 100644
--- a/arch/mips/src/mips32/up_vfork.c
+++ b/arch/mips/src/mips32/up_vfork.c
@@ -152,7 +152,7 @@ pid_t up_vfork(const struct vfork_s *context)
   child = task_vforksetup((start_t)context->ra);
   if (!child)
     {
-      serr("task_vforksetup failed\n");
+      sinfo("task_vforksetup failed\n");
       return (pid_t)ERROR;
     }
 
@@ -171,7 +171,7 @@ pid_t up_vfork(const struct vfork_s *context)
                         parent->flags & TCB_FLAG_TTYPE_MASK);
   if (ret != OK)
     {
-      serr("up_create_stack failed: %d\n", ret);
+      serr("ERROR: up_create_stack failed: %d\n", ret);
       task_vforkabort(child, -ret);
       return (pid_t)ERROR;
     }
diff --git a/arch/mips/src/pic32mx/Kconfig b/arch/mips/src/pic32mx/Kconfig
index 6d24c3e355..61b5b71c7f 100644
--- a/arch/mips/src/pic32mx/Kconfig
+++ b/arch/mips/src/pic32mx/Kconfig
@@ -1034,7 +1034,7 @@ config PIC32MX_SPI_ENHBUF
 
 config PIC32MX_SPI_REGDEBUG
 	bool "SPI Register level debug"
-	depends on DEBUG_FEATURES
+	depends on DEBUG_INFO
 	default n
 	---help---
 		Output detailed register-level SPI device debug information.
diff --git a/arch/mips/src/pic32mx/pic32mx-ethernet.c b/arch/mips/src/pic32mx/pic32mx-ethernet.c
index 0ae50a7357..47cb807acf 100644
--- a/arch/mips/src/pic32mx/pic32mx-ethernet.c
+++ b/arch/mips/src/pic32mx/pic32mx-ethernet.c
@@ -141,15 +141,6 @@
 #define PIC32MX_NBUFFERS (CONFIG_NET_NRXDESC + CONFIG_NET_NTXDESC + 1)
 
 /* Debug Configuration *****************************************************/
-/* Register/Descriptor debug -- can only happen of CONFIG_DEBUG_FEATURES is selected.
- * This will probably generate much more output than you care to see.
- */
-
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_NET_REGDEBUG
-#  undef CONFIG_NET_DESCDEBUG
-#endif
-
 /* CONFIG_NET_DUMPPACKET will dump the contents of each packet to the
  * console.
  */
@@ -447,7 +438,7 @@ static void pic32mx_ethreset(struct pic32mx_driver_s *priv);
 #ifdef CONFIG_NET_REGDEBUG
 static void pic32mx_printreg(uint32_t addr, uint32_t val, bool iswrite)
 {
-  llerr("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val);
+  nllinfo("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val);
 }
 #endif
 
@@ -497,7 +488,7 @@ static void pic32mx_checkreg(uint32_t addr, uint32_t val, bool iswrite)
             {
               /* No.. More than one. */
 
-              llerr("[repeats %d more times]\n", count);
+              nllinfo("[repeats %d more times]\n", count);
             }
         }
 
@@ -576,12 +567,12 @@ static void pic32mx_putreg(uint32_t val, uint32_t addr)
 #ifdef CONFIG_NET_DESCDEBUG
 static void pic32mx_dumptxdesc(struct pic32mx_txdesc_s *txdesc, const char *msg)
 {
-  llerr("TX Descriptor [%p]: %s\n", txdesc, msg);
-  llerr("   status: %08x\n", txdesc->status);
-  llerr("  address: %08x [%08x]\n", txdesc->address, VIRT_ADDR(txdesc->address));
-  llerr("     tsv1: %08x\n", txdesc->tsv1);
-  llerr("     tsv2: %08x\n", txdesc->tsv2);
-  llerr("   nexted: %08x [%08x]\n", txdesc->nexted, VIRT_ADDR(txdesc->nexted));
+  nllinfo("TX Descriptor [%p]: %s\n", txdesc, msg);
+  nllinfo("   status: %08x\n", txdesc->status);
+  nllinfo("  address: %08x [%08x]\n", txdesc->address, VIRT_ADDR(txdesc->address));
+  nllinfo("     tsv1: %08x\n", txdesc->tsv1);
+  nllinfo("     tsv2: %08x\n", txdesc->tsv2);
+  nllinfo("   nexted: %08x [%08x]\n", txdesc->nexted, VIRT_ADDR(txdesc->nexted));
 }
 #endif
 
@@ -603,12 +594,12 @@ static void pic32mx_dumptxdesc(struct pic32mx_txdesc_s *txdesc, const char *msg)
 #ifdef CONFIG_NET_DESCDEBUG
 static void pic32mx_dumprxdesc(struct pic32mx_rxdesc_s *rxdesc, const char *msg)
 {
-  llerr("RX Descriptor [%p]: %s\n", rxdesc, msg);
-  llerr("   status: %08x\n", rxdesc->status);
-  llerr("  address: %08x [%08x]\n", rxdesc->address, VIRT_ADDR(rxdesc->address));
-  llerr("     rsv1: %08x\n", rxdesc->rsv1);
-  llerr("     rsv2: %08x\n", rxdesc->rsv2);
-  llerr("   nexted: %08x [%08x]\n", rxdesc->nexted, VIRT_ADDR(rxdesc->nexted));
+  nllinfo("RX Descriptor [%p]: %s\n", rxdesc, msg);
+  nllinfo("   status: %08x\n", rxdesc->status);
+  nllinfo("  address: %08x [%08x]\n", rxdesc->address, VIRT_ADDR(rxdesc->address));
+  nllinfo("     rsv1: %08x\n", rxdesc->rsv1);
+  nllinfo("     rsv2: %08x\n", rxdesc->rsv2);
+  nllinfo("   nexted: %08x [%08x]\n", rxdesc->nexted, VIRT_ADDR(rxdesc->nexted));
 }
 #endif
 
@@ -1366,7 +1357,8 @@ static void pic32mx_rxdone(struct pic32mx_driver_s *priv)
 
       if ((rxdesc->rsv2 & RXDESC_RSV2_OK) == 0)
         {
-          nllerr("ERROR. rsv1: %08x rsv2: %08x\n", rxdesc->rsv1, rxdesc->rsv2);
+          nllerr("ERROR. rsv1: %08x rsv2: %08x\n",
+                 rxdesc->rsv1, rxdesc->rsv2);
           NETDEV_RXERRORS(&priv->pd_dev);
           pic32mx_rxreturn(rxdesc);
         }
@@ -1379,7 +1371,7 @@ static void pic32mx_rxdone(struct pic32mx_driver_s *priv)
 
       else if (priv->pd_dev.d_len > CONFIG_NET_ETH_MTU)
         {
-          nllerr("Too big. packet length: %d rxdesc: %08x\n",
+          nllerr("ERROR: Too big. packet length: %d rxdesc: %08x\n",
                  priv->pd_dev.d_len, rxdesc->status);
           NETDEV_RXERRORS(&priv->pd_dev);
           pic32mx_rxreturn(rxdesc);
@@ -1390,7 +1382,8 @@ static void pic32mx_rxdone(struct pic32mx_driver_s *priv)
       else if ((rxdesc->status & (RXDESC_STATUS_EOP | RXDESC_STATUS_SOP)) !=
                (RXDESC_STATUS_EOP | RXDESC_STATUS_SOP))
         {
-          nllerr("Fragment. packet length: %d rxdesc: %08x\n", priv->pd_dev.d_len, rxdesc->status);
+          nllerr("ERROR: Fragment. packet length: %d rxdesc: %08x\n",
+                  priv->pd_dev.d_len, rxdesc->status);
           NETDEV_RXFRAGMENTS(&priv->pd_dev);
           pic32mx_rxreturn(rxdesc);
         }
@@ -1529,7 +1522,8 @@ static void pic32mx_rxdone(struct pic32mx_driver_s *priv)
             {
               /* Unrecognized... drop it. */
 
-              nllerr("Unrecognized packet type dropped: %04x\n", ntohs(BUF->type));
+              nllerr("ERROR: Unrecognized packet type dropped: %04x\n",
+                     ntohs(BUF->type));
               NETDEV_RXDROPPED(&priv->pd_dev);
             }
 
@@ -1691,7 +1685,7 @@ static int pic32mx_interrupt(int irq, void *context)
 
       if ((status & ETH_INT_RXOVFLW) != 0)
         {
-          nllerr("RX Overrun. status: %08x\n", status);
+          nllerr("ERROR: RX Overrun. status: %08x\n", status);
           NETDEV_RXERRORS(&priv->pd_dev);
         }
 
@@ -1702,7 +1696,7 @@ static int pic32mx_interrupt(int irq, void *context)
 
       if ((status & ETH_INT_RXBUFNA) != 0)
         {
-          nllerr("RX buffer descriptor overrun. status: %08x\n", status);
+          nllerr("ERROR: RX buffer descriptor overrun. status: %08x\n", status);
           NETDEV_RXERRORS(&priv->pd_dev);
         }
 
@@ -1713,7 +1707,7 @@ static int pic32mx_interrupt(int irq, void *context)
 
       if ((status & ETH_INT_RXBUSE) != 0)
         {
-          nllerr("RX BVCI bus error. status: %08x\n", status);
+          nllerr("ERROR: RX BVCI bus error. status: %08x\n", status);
           NETDEV_RXERRORS(&priv->pd_dev);
         }
 
@@ -1756,7 +1750,7 @@ static int pic32mx_interrupt(int irq, void *context)
 
       if ((status & ETH_INT_TXABORT) != 0)
         {
-          nllerr("TX abort. status: %08x\n", status);
+          nllerr("ERROR: TX abort. status: %08x\n", status);
           NETDEV_TXERRORS(&priv->pd_dev);
         }
 
@@ -1767,7 +1761,7 @@ static int pic32mx_interrupt(int irq, void *context)
 
       if ((status & ETH_INT_TXBUSE) != 0)
         {
-          nllerr("TX BVCI bus error. status: %08x\n", status);
+          nllerr("ERROR: TX BVCI bus error. status: %08x\n", status);
           NETDEV_TXERRORS(&priv->pd_dev);
         }
 
@@ -1921,9 +1915,9 @@ static int pic32mx_ifup(struct net_driver_s *dev)
   uint32_t regval;
   int ret;
 
-  nerr("Bringing up: %d.%d.%d.%d\n",
-       dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
-       (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
+  ninfo("Bringing up: %d.%d.%d.%d\n",
+        dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
+        (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 
   /* Reset the Ethernet controller (again) */
 
@@ -2011,7 +2005,7 @@ static int pic32mx_ifup(struct net_driver_s *dev)
   ret = pic32mx_phyinit(priv);
   if (ret != 0)
     {
-      nerr("pic32mx_phyinit failed: %d\n", ret);
+      nerr("ERROR: pic32mx_phyinit failed: %d\n", ret);
       return ret;
     }
 
@@ -2373,14 +2367,14 @@ static int pic32mx_rmmac(struct net_driver_s *dev, const uint8_t *mac)
 #if defined(CONFIG_NET_REGDEBUG) && defined(PIC32MX_HAVE_PHY)
 static void pic32mx_showmii(uint8_t phyaddr, const char *msg)
 {
-  err("PHY " PIC32MX_PHYNAME ": %s\n", msg);
-  err("  MCR:       %04x\n", pic32mx_phyread(phyaddr, MII_MCR));
-  err("  MSR:       %04x\n", pic32mx_phyread(phyaddr, MII_MSR));
-  err("  ADVERTISE: %04x\n", pic32mx_phyread(phyaddr, MII_ADVERTISE));
-  err("  LPA:       %04x\n", pic32mx_phyread(phyaddr, MII_LPA));
-  err("  EXPANSION: %04x\n", pic32mx_phyread(phyaddr, MII_EXPANSION));
+  nllinfo("PHY " PIC32MX_PHYNAME ": %s\n", msg);
+  nllinfo("  MCR:       %04x\n", pic32mx_phyread(phyaddr, MII_MCR));
+  nllinfo("  MSR:       %04x\n", pic32mx_phyread(phyaddr, MII_MSR));
+  nllinfo("  ADVERTISE: %04x\n", pic32mx_phyread(phyaddr, MII_ADVERTISE));
+  nllinfo("  LPA:       %04x\n", pic32mx_phyread(phyaddr, MII_LPA));
+  nllinfo("  EXPANSION: %04x\n", pic32mx_phyread(phyaddr, MII_EXPANSION));
 #ifdef CONFIG_ETH0_PHY_KS8721
-  err("  10BTCR:    %04x\n", pic32mx_phyread(phyaddr, MII_KS8721_10BTCR));
+  nllinfo("  10BTCR:    %04x\n", pic32mx_phyread(phyaddr, MII_KS8721_10BTCR));
 #endif
 }
 #endif
@@ -2543,7 +2537,7 @@ static inline int pic32mx_phyreset(uint8_t phyaddr)
         }
     }
 
-  nerr("Reset failed. MCR: %04x\n", phyreg);
+  nerr("ERROR: Reset failed. MCR: %04x\n", phyreg);
   return -ETIMEDOUT;
 }
 #endif
@@ -2590,7 +2584,7 @@ static inline int pic32mx_phyautoneg(uint8_t phyaddr)
         }
     }
 
-  nerr("Auto-negotiation failed. MSR: %04x\n", phyreg);
+  nerr("ERROR: Auto-negotiation failed. MSR: %04x\n", phyreg);
   return -ETIMEDOUT;
 }
 #endif
@@ -2669,7 +2663,7 @@ static int pic32mx_phymode(uint8_t phyaddr, uint8_t mode)
 #endif
     }
 
-  nerr("Link failed. MSR: %04x\n", phyreg);
+  nerr("ERROR: Link failed. MSR: %04x\n", phyreg);
   return -ETIMEDOUT;
 }
 #endif
@@ -2738,7 +2732,7 @@ static inline int pic32mx_phyinit(struct pic32mx_driver_s *priv)
       ret = pic32mx_phyreset(phyaddr);
       if (ret < 0)
         {
-          nerr("Failed to reset PHY at address %d\n", phyaddr);
+          nerr("ERROR: Failed to reset PHY at address %d\n", phyaddr);
           continue;
         }
 
@@ -2771,7 +2765,7 @@ static inline int pic32mx_phyinit(struct pic32mx_driver_s *priv)
     {
       /* Failed to find PHY at any location */
 
-      nerr("No PHY detected\n");
+      nerr("ERROR: No PHY detected\n");
       return -ENODEV;
     }
   ninfo("phyaddr: %d\n", phyaddr);
@@ -2875,7 +2869,7 @@ static inline int pic32mx_phyinit(struct pic32mx_driver_s *priv)
         priv->pd_mode = PIC32MX_100BASET_FD;
         break;
       default:
-        nerr("Unrecognized mode: %04x\n", phyreg);
+        nerr("ERROR: Unrecognized mode: %04x\n", phyreg);
         return -ENODEV;
     }
 #elif defined(CONFIG_ETH0_PHY_DP83848C)
@@ -2898,7 +2892,7 @@ static inline int pic32mx_phyinit(struct pic32mx_driver_s *priv)
         priv->pd_mode = PIC32MX_10BASET_FD;
         break;
       default:
-        nerr("Unrecognized mode: %04x\n", phyreg);
+        nerr("ERROR: Unrecognized mode: %04x\n", phyreg);
         return -ENODEV;
     }
 #elif defined(CONFIG_ETH0_PHY_LAN8720)
@@ -2943,7 +2937,7 @@ static inline int pic32mx_phyinit(struct pic32mx_driver_s *priv)
       }
     else
       {
-        nerr("Unrecognized mode: %04x\n", phyreg);
+        nerr("ERROR: Unrecognized mode: %04x\n", phyreg);
         return -ENODEV;
       }
   }
@@ -2951,9 +2945,9 @@ static inline int pic32mx_phyinit(struct pic32mx_driver_s *priv)
 #  warning "PHY Unknown: speed and duplex are bogus"
 #endif
 
-  nerr("%dBase-T %s duplex\n",
-       (priv->pd_mode & PIC32MX_SPEED_MASK) ==  PIC32MX_SPEED_100 ? 100 : 10,
-       (priv->pd_mode & PIC32MX_DUPLEX_MASK) == PIC32MX_DUPLEX_FULL ?"full" : "half");
+  ninfo("%dBase-T %s duplex\n",
+        (priv->pd_mode & PIC32MX_SPEED_MASK) ==  PIC32MX_SPEED_100 ? 100 : 10,
+        (priv->pd_mode & PIC32MX_DUPLEX_MASK) == PIC32MX_DUPLEX_FULL ?"full" : "half");
 
   /* Disable auto-configuration.  Set the fixed speed/duplex mode.
    * (probably more than little redundant).
diff --git a/arch/mips/src/pic32mx/pic32mx-exception.c b/arch/mips/src/pic32mx/pic32mx-exception.c
index 66feb977f9..7ff728db31 100644
--- a/arch/mips/src/pic32mx/pic32mx-exception.c
+++ b/arch/mips/src/pic32mx/pic32mx-exception.c
@@ -55,22 +55,6 @@
 #include "pic32mx-int.h"
 #include "pic32mx.h"
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -106,88 +90,88 @@ uint32_t *pic32mx_exception(uint32_t *regs)
   switch (cause & CP0_CAUSE_EXCCODE_MASK)
     {
     case CP0_CAUSE_EXCCODE_INT:      /* Interrupt */
-      llinfo("EXCEPTION: Interrupt"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: Interrupt"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_TLBL:     /* TLB exception (load or instruction fetch) */
-      llinfo("EXCEPTION: TLB exception (load or instruction fetch)"
-             " CAUSE: %08x EPC:%08x\n", cause, epc);
+      alert("EXCEPTION: TLB exception (load or instruction fetch)"
+            " CAUSE: %08x EPC:%08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_TLBS:     /* TLB exception (store) */
-      llinfo("EXCEPTION: TLB exception (store)"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: TLB exception (store)"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_ADEL:     /* Address error exception (load or instruction fetch) */
-      llinfo("EXCEPTION: Address error exception (load or instruction fetch)"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: Address error exception (load or instruction fetch)"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_ADES:     /* Address error exception (store) */
-      llinfo("EXCEPTION: Address error exception (store)"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: Address error exception (store)"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_IBE:      /* Bus error exception (instruction fetch) */
-      llinfo("EXCEPTION: Bus error exception (instruction fetch)"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: Bus error exception (instruction fetch)"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_DBE:      /* Bus error exception (data reference: load or store) */
-      llinfo("EXCEPTION: Bus error exception (data reference: load or store)"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: Bus error exception (data reference: load or store)"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_SYS:      /* Syscall exception */
-      llinfo("EXCEPTION: Syscall exception"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: Syscall exception"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_BP:       /* Breakpoint exception */
-      llinfo("EXCEPTION: Breakpoint exception"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: Breakpoint exception"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_RI:       /* Reserved instruction exception */
-      llinfo("EXCEPTION: Reserved instruction exception"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: Reserved instruction exception"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_CPU:      /* Coprocessor Unusable exception */
-      llinfo("EXCEPTION: Coprocessor Unusable exception"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: Coprocessor Unusable exception"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_OV:       /* Arithmetic Overflow exception */
-      llinfo("EXCEPTION: Arithmetic Overflow exception"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: Arithmetic Overflow exception"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_TR:       /* Trap exception */
-      llinfo("EXCEPTION: Trap exception"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: Trap exception"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_FPE:      /* Floating point exception */
-      llinfo("EXCEPTION: Floating point exception"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: Floating point exception"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_C2E:      /* Precise Coprocessor 2 exceptions */
-      llinfo("EXCEPTION: Precise Coprocessor 2 exceptions"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: Precise Coprocessor 2 exceptions"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_MDMX:     /* MDMX Unusable (MIPS64) */
-      llinfo("EXCEPTION: MDMX Unusable (MIPS64)"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: MDMX Unusable (MIPS64)"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_WATCH:    /* WatchHi/WatchLo address */
-      llinfo("EXCEPTION: WatchHi/WatchLo address"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: WatchHi/WatchLo address"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_MCHECK:   /* Machine check */
-      llinfo("EXCEPTION: Machine check"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: Machine check"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_CACHEERR: /* Cache error */
-      llinfo("EXCEPTION: Cache error"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: Cache error"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     default:
-      llinfo("EXCEPTION: Unknown"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: Unknown"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     }
 #else
-  llerr("EXCEPTION: CAUSE: %08x EPC: %08x\n", cause, epc);
+  alert("EXCEPTION: CAUSE: %08x EPC: %08x\n", cause, epc);
 #endif
 #endif
 
diff --git a/arch/mips/src/pic32mx/pic32mx-gpio.c b/arch/mips/src/pic32mx/pic32mx-gpio.c
index 355d152477..61ecde9e8c 100644
--- a/arch/mips/src/pic32mx/pic32mx-gpio.c
+++ b/arch/mips/src/pic32mx/pic32mx-gpio.c
@@ -321,17 +321,17 @@ void pic32mx_dumpgpio(uint32_t pinset, const char *msg)
       /* The following requires exclusive access to the GPIO registers */
 
       sched_lock();
-      llerr("IOPORT%c pinset: %04x base: %08x -- %s\n",
-            'A'+port, pinset, base, msg);
-      llerr("   TRIS: %08x   PORT: %08x    LAT: %08x    ODC: %08x\n",
-            getreg32(base + PIC32MX_IOPORT_TRIS_OFFSET),
-            getreg32(base + PIC32MX_IOPORT_PORT_OFFSET),
-            getreg32(base + PIC32MX_IOPORT_LAT_OFFSET),
-            getreg32(base + PIC32MX_IOPORT_ODC_OFFSET));
-      llerr("  CNCON: %08x   CNEN: %08x  CNPUE: %08x\n",
-            getreg32(PIC32MX_IOPORT_CNCON),
-            getreg32(PIC32MX_IOPORT_CNEN),
-            getreg32(PIC32MX_IOPORT_CNPUE));
+      llinfo("IOPORT%c pinset: %04x base: %08x -- %s\n",
+             'A'+port, pinset, base, msg);
+      llinfo("   TRIS: %08x   PORT: %08x    LAT: %08x    ODC: %08x\n",
+             getreg32(base + PIC32MX_IOPORT_TRIS_OFFSET),
+             getreg32(base + PIC32MX_IOPORT_PORT_OFFSET),
+             getreg32(base + PIC32MX_IOPORT_LAT_OFFSET),
+             getreg32(base + PIC32MX_IOPORT_ODC_OFFSET));
+      llinfo("  CNCON: %08x   CNEN: %08x  CNPUE: %08x\n",
+             getreg32(PIC32MX_IOPORT_CNCON),
+             getreg32(PIC32MX_IOPORT_CNEN),
+             getreg32(PIC32MX_IOPORT_CNPUE));
       sched_unlock();
     }
 }
diff --git a/arch/mips/src/pic32mx/pic32mx-spi.c b/arch/mips/src/pic32mx/pic32mx-spi.c
index 94e20314fc..886dbcae0e 100644
--- a/arch/mips/src/pic32mx/pic32mx-spi.c
+++ b/arch/mips/src/pic32mx/pic32mx-spi.c
@@ -76,13 +76,11 @@
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -329,7 +327,7 @@ static uint32_t spi_getreg(FAR struct pic32mx_dev_s *priv, unsigned int offset)
         {
            if (count == 4)
              {
-               llerr("...\n");
+               llinfo("...\n");
              }
           return value;
         }
@@ -345,7 +343,7 @@ static uint32_t spi_getreg(FAR struct pic32mx_dev_s *priv, unsigned int offset)
          {
            /* Yes.. then show how many times the value repeated */
 
-           llerr("[repeats %d more times]\n", count-3);
+           llinfo("[repeats %d more times]\n", count-3);
          }
 
        /* Save the new address, value, and count */
@@ -357,7 +355,7 @@ static uint32_t spi_getreg(FAR struct pic32mx_dev_s *priv, unsigned int offset)
 
   /* Show the register value read */
 
-  llerr("%08x->%08x\n", addr, value);
+  llinfo("%08x->%08x\n", addr, value);
   return value;
 }
 #else
@@ -395,7 +393,7 @@ static void spi_putreg(FAR struct pic32mx_dev_s *priv, unsigned int offset,
 
   /* Show the register value being written */
 
-  llerr("%08x<-%08x\n", addr, value);
+  llinfo("%08x<-%08x\n", addr, value);
 
   /* Then do the write */
 
@@ -526,7 +524,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
   priv->frequency = frequency;
   priv->actual    = actual;
 
-  spierr("New frequency: %d Actual: %d\n", frequency, actual);
+  spiinfo("New frequency: %d Actual: %d\n", frequency, actual);
   return actual;
 }
 
@@ -665,7 +663,7 @@ static void spi_setbits(FAR struct spi_dev_s *dev, int nbits)
         }
       else
         {
-          spierr("Unsupported nbits: %d\n", nbits);
+          spierr("ERROR: Unsupported nbits: %d\n", nbits);
           return;
         }
 
@@ -897,7 +895,7 @@ FAR struct spi_dev_s *pic32mx_spibus_initialize(int port)
   else
 #endif
    {
-     spierr("Unsuppport port: %d\n", port);
+     spierr("ERROR: Unsuppport port: %d\n", port);
      return NULL;
    }
 
@@ -926,7 +924,8 @@ FAR struct spi_dev_s *pic32mx_spibus_initialize(int port)
   ret = irq_attach(priv->vector, spi_interrupt);
   if (ret < 0)
     {
-      spierr("Failed to attach vector: %d port: %d\n", priv->vector, port);
+      spierr("ERROR: Failed to attach vector: %d port: %d\n",
+             priv->vector, port);
       goto errout;
     }
 #endif
@@ -976,7 +975,7 @@ FAR struct spi_dev_s *pic32mx_spibus_initialize(int port)
   ret = up_prioritize_irq(priv->vector, CONFIG_PIC32MX_SPI_PRIORITY)
   if (ret < 0)
     {
-      spierr("up_prioritize_irq failed: %d\n", ret);
+      spierr("ERROR: up_prioritize_irq failed: %d\n", ret);
       goto errout;
     }
 #endif
diff --git a/arch/mips/src/pic32mx/pic32mx-usbdev.c b/arch/mips/src/pic32mx/pic32mx-usbdev.c
index 948df83d89..0c43382e1c 100644
--- a/arch/mips/src/pic32mx/pic32mx-usbdev.c
+++ b/arch/mips/src/pic32mx/pic32mx-usbdev.c
@@ -79,15 +79,6 @@
 #  define CONFIG_USBDEV_EP0_MAXSIZE 64
 #endif
 
-/* Extremely detailed register/BDT debug that you would normally never want
- * enabled.
- */
-
-#ifndef CONFIG_DEBUG_FEATURES
-#  undef CONFIG_PIC32MX_USBDEV_REGDEBUG
-#  undef CONFIG_PIC32MX_USBDEV_BDTDEBUG
-#endif
-
 /* Disable this logic because it is buggy.  It works most of the time but
  * has some lurking issues that keep this higher performance solution from
  * being usable.
@@ -289,18 +280,16 @@
 #  undef CONFIG_PIC32MX_USBDEV_BDTDEBUG
 #  define CONFIG_PIC32MX_USBDEV_BDTDEBUG 1
 
-#  define regerr llerr
-#  ifdef CONFIG_DEBUG_INFO
-#    define reginfo llerr
-#  else
-#    define reginfo(x...)
-#  endif
+#  define regerr  llerr
+#  define regwarn llwarn
+#  define reginfo llinfo
 
 #else
 
 #  define pic32mx_getreg(addr)      getreg16(addr)
 #  define pic32mx_putreg(val,addr)  putreg16(val,addr)
 #  define regerr(x...)
+#  define regwarn(x...)
 #  define reginfo(x...)
 
 #endif
@@ -309,16 +298,14 @@
 
 #ifdef CONFIG_PIC32MX_USBDEV_BDTDEBUG
 
-#  define bdterr llerr
-#  ifdef CONFIG_DEBUG_INFO
-#    define bdtinfo llerr
-#  else
-#    define bdtinfo(x...)
-#  endif
+#  define bdterr  llerr
+#  define bdtwarn llwarn
+#  define bdtinfo llinfo
 
 #else
 
 #  define bdterr(x...)
+#  define bdtwarn(x...)
 #  define bdtinfo(x...)
 
 #endif
@@ -602,16 +589,13 @@ static volatile struct usbotg_bdtentry_s g_bdt[4*PIC32MX_NENDPOINTS]
   __attribute__ ((aligned(512)));
 
 /****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Private Functions
+ * Private Functions
  ****************************************************************************/
 
 /****************************************************************************
  * Register Operations
  ****************************************************************************/
+
 /****************************************************************************
  * Name: pic32mx_getreg
  ****************************************************************************/
@@ -637,8 +621,9 @@ static uint16_t pic32mx_getreg(uint32_t addr)
         {
            if (count == 4)
              {
-               llerr("...\n");
+               reginfo("...\n");
              }
+
           return val;
         }
     }
@@ -653,7 +638,7 @@ static uint16_t pic32mx_getreg(uint32_t addr)
          {
            /* Yes.. then show how many times the value repeated */
 
-           llerr("[repeats %d more times]\n", count-3);
+           reginfo("[repeats %d more times]\n", count-3);
          }
 
        /* Save the new address, value, and count */
@@ -665,7 +650,7 @@ static uint16_t pic32mx_getreg(uint32_t addr)
 
   /* Show the register value read */
 
-  llerr("%08x->%04x\n", addr, val);
+  reginfo("%08x->%04x\n", addr, val);
   return val;
 }
 #endif
@@ -679,7 +664,7 @@ static void pic32mx_putreg(uint16_t val, uint32_t addr)
 {
   /* Show the register value being written */
 
-  llerr("%08x<-%04x\n", addr, val);
+  reginfo("%08x<-%04x\n", addr, val);
 
   /* Write the value */
 
@@ -874,8 +859,8 @@ static void pic32mx_epwrite(struct pic32mx_ep_s *privep,
 
   /* And, finally, give the BDT to the USB */
 
-  bdterr("EP%d BDT IN [%p] {%08x, %08x}\n",
-         USB_EPNO(privep->ep.eplog), bdt, status, bdt->addr);
+  bdtinfo("EP%d BDT IN [%p] {%08x, %08x}\n",
+          USB_EPNO(privep->ep.eplog), bdt, status, bdt->addr);
 
   bdt->status = status;
 }
@@ -915,8 +900,8 @@ static void pic32mx_wrcomplete(struct pic32mx_usbdev_s *priv,
           epno, privreq->req.len, privreq->req.xfrd,
           privreq->inflight[0], privreq->inflight[1]);
 #endif
-  bdterr("EP%d BDT IN [%p] {%08x, %08x}\n",
-         epno, bdtin, bdtin->status, bdtin->addr);
+  bdtinfo("EP%d BDT IN [%p] {%08x, %08x}\n",
+          epno, bdtin, bdtin->status, bdtin->addr);
 
   /* We should own the BDT that just completed. But NULLify the entire BDT IN.
    * Why?  So that we can tell later that the BDT available.  No, it is not
@@ -1340,8 +1325,8 @@ static int pic32mx_rdcomplete(struct pic32mx_usbdev_s *priv,
 
   ullinfo("EP%d: len=%d xfrd=%d\n",
           epno, privreq->req.len, privreq->req.xfrd);
-  bdterr("EP%d BDT OUT [%p] {%08x, %08x}\n",
-         epno, bdtout, bdtout->status, bdtout->addr);
+  bdtinfo("EP%d BDT OUT [%p] {%08x, %08x}\n",
+          epno, bdtout, bdtout->status, bdtout->addr);
 
   /* We should own the BDT that just completed */
 
@@ -1484,7 +1469,8 @@ static int pic32mx_ep0rdsetup(struct pic32mx_usbdev_s *priv, uint8_t *dest,
 
   /* Then give the BDT to the USB */
 
-  bdterr("EP0 BDT OUT [%p] {%08x, %08x}\n", bdtout, status, bdtout->addr);
+  bdtinfo("EP0 BDT OUT [%p] {%08x, %08x}\n",
+          bdtout, status, bdtout->addr);
   bdtout->status = status;
 
   priv->ctrlstate = CTRLSTATE_RDREQUEST;
@@ -1585,7 +1571,8 @@ static int pic32mx_rdsetup(struct pic32mx_ep_s *privep, uint8_t *dest, int readl
 
   /* Then give the BDT to the USB */
 
-  bdterr("EP%d BDT OUT [%p] {%08x, %08x}\n",  epno, bdtout, status, bdtout->addr);
+  bdtinfo("EP%d BDT OUT [%p] {%08x, %08x}\n",
+          epno, bdtout, status, bdtout->addr);
 
   bdtout->status = status;
   return OK;
@@ -2596,7 +2583,8 @@ static void pic32mx_ep0transfer(struct pic32mx_usbdev_s *priv, uint16_t ustat)
       bdt   = &g_bdt[index];
       priv->eplist[0].bdtout = bdt;
 
-      bdterr("EP0 BDT OUT [%p] {%08x, %08x}\n", bdt, bdt->status, bdt->addr);
+      bdtinfo("EP0 BDT OUT [%p] {%08x, %08x}\n",
+              bdt, bdt->status, bdt->addr);
 
       /* Check the current EP0 OUT buffer contains a SETUP packet */
 
@@ -2832,7 +2820,7 @@ static int pic32mx_interrupt(int irq, void *context)
   if ((usbir & USB_INT_UERR) != 0)
     {
       usbtrace(TRACE_INTDECODE(PIC32MX_TRACEINTID_UERR), usbir);
-      ullerr("Error: EIR=%04x\n", pic32mx_getreg(PIC32MX_USB_EIR));
+      ullerr("ERROR: EIR=%04x\n", pic32mx_getreg(PIC32MX_USB_EIR));
 
       /* Clear all pending USB error interrupts */
 
@@ -3210,7 +3198,8 @@ static int pic32mx_epconfigure(struct usbdev_ep_s *ep,
       bdt->status = 0;
       bdt->addr   = 0;
 
-      bdterr("EP%d BDT IN [%p] {%08x, %08x}\n", epno, bdt, bdt->status, bdt->addr);
+      bdtinfo("EP%d BDT IN [%p] {%08x, %08x}\n",
+              epno, bdt, bdt->status, bdt->addr);
 
       /* Now do the same for the other buffer. */
 
@@ -3218,7 +3207,8 @@ static int pic32mx_epconfigure(struct usbdev_ep_s *ep,
       bdt->status = 0;
       bdt->addr   = 0;
 
-      bdterr("EP%d BDT IN [%p] {%08x, %08x}\n", epno, bdt, bdt->status, bdt->addr);
+      bdtinfo("EP%d BDT IN [%p] {%08x, %08x}\n",
+              epno, bdt, bdt->status, bdt->addr);
     }
 
   if (!epin || bidi)
@@ -3232,7 +3222,8 @@ static int pic32mx_epconfigure(struct usbdev_ep_s *ep,
       bdt->status = 0;
       bdt->addr   = 0;
 
-      bdterr("EP%d BDT OUT [%p] {%08x, %08x}\n", epno, bdt, bdt->status, bdt->addr);
+      bdtinfo("EP%d BDT OUT [%p] {%08x, %08x}\n",
+              epno, bdt, bdt->status, bdt->addr);
 
       /* Now do the same for the other buffer. */
 
@@ -3240,7 +3231,8 @@ static int pic32mx_epconfigure(struct usbdev_ep_s *ep,
       bdt->status = 0;
       bdt->addr   = 0;
 
-      bdterr("EP%d BDT OUT [%p] {%08x, %08x}\n", epno, bdt, bdt->status, bdt->addr);
+      bdtinfo("EP%d BDT OUT [%p] {%08x, %08x}\n",
+              epno, bdt, bdt->status, bdt->addr);
     }
 
   /* Get the maxpacket size of the endpoint. */
@@ -3376,7 +3368,8 @@ static int pic32mx_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
   if (!req || !req->callback || !req->buf || !ep)
     {
       usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_INVALIDPARMS), 0);
-      ullerr("ERROR: req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep);
+      ullerr("ERROR: req=%p callback=%p buf=%p ep=%p\n",
+             req, req->callback, req->buf, ep);
       return -EINVAL;
     }
 #endif
@@ -3575,10 +3568,10 @@ static int pic32mx_epbdtstall(struct usbdev_ep_s *ep, bool resume, bool epin)
           bdt->addr          = (uint8_t *)physaddr;
           bdt->status        = (USB_BDT_UOWN | bytecount);
 
-          bdterr("EP0 BDT IN [%p] {%08x, %08x}\n",
-                 bdt, bdt->status, bdt->addr);
-          bdterr("EP0 BDT IN [%p] {%08x, %08x}\n",
-                 otherbdt, otherbdt->status, otherbdt->addr);
+          bdtinfo("EP0 BDT IN [%p] {%08x, %08x}\n",
+                  bdt, bdt->status, bdt->addr);
+          bdtinfo("EP0 BDT IN [%p] {%08x, %08x}\n",
+                  otherbdt, otherbdt->status, otherbdt->addr);
         }
       else
         {
@@ -3592,10 +3585,11 @@ static int pic32mx_epbdtstall(struct usbdev_ep_s *ep, bool resume, bool epin)
           bdt->addr        = 0;
           bdt->status      = 0;
 
-          bdterr("EP%d BDT %s [%p] {%08x, %08x}\n",
-                 epno, epin ? "IN" : "OUT", bdt, bdt->status, bdt->addr);
-          bdterr("EP%d BDT %s [%p] {%08x, %08x}\n",
-                 epno, epin ? "IN" : "OUT", otherbdt, otherbdt->status, otherbdt->addr);
+          bdtinfo("EP%d BDT %s [%p] {%08x, %08x}\n",
+                  epno, epin ? "IN" : "OUT", bdt, bdt->status, bdt->addr);
+          bdtinfo("EP%d BDT %s [%p] {%08x, %08x}\n",
+                  epno, epin ? "IN" : "OUT", otherbdt, otherbdt->status,
+                  otherbdt->addr);
 
           /* Restart any queued requests (after a delay so that we can be assured
            * that the hardware has recovered from the stall -- I don't know of any
@@ -3627,10 +3621,11 @@ static int pic32mx_epbdtstall(struct usbdev_ep_s *ep, bool resume, bool epin)
 
       pic32mx_rqstop(privep);
 
-      bdterr("EP%d BDT %s [%p] {%08x, %08x}\n",
-             epno, epin ? "IN" : "OUT", bdt, bdt->status, bdt->addr);
-      bdterr("EP%d BDT %s [%p] {%08x, %08x}\n",
-             epno, epin ? "IN" : "OUT", otherbdt, otherbdt->status, otherbdt->addr);
+      bdtinfo("EP%d BDT %s [%p] {%08x, %08x}\n",
+              epno, epin ? "IN" : "OUT", bdt, bdt->status, bdt->addr);
+      bdtinfo("EP%d BDT %s [%p] {%08x, %08x}\n",
+              epno, epin ? "IN" : "OUT", otherbdt, otherbdt->status,
+              otherbdt->addr);
     }
 
   return OK;
diff --git a/arch/mips/src/pic32mz/Kconfig b/arch/mips/src/pic32mz/Kconfig
index 6a66969184..70dcf7d076 100644
--- a/arch/mips/src/pic32mz/Kconfig
+++ b/arch/mips/src/pic32mz/Kconfig
@@ -332,7 +332,7 @@ config PIC32MZ_SPI_ENHBUF
 
 config PIC32MZ_SPI_REGDEBUG
 	bool "SPI Register level debug"
-	depends on DEBUG_FEATURES
+	depends on DEBUG_INFO
 	default n
 	---help---
 		Output detailed register-level SPI device debug information.
@@ -400,7 +400,7 @@ config NET_WOL
 config NET_REGDEBUG
 	bool "Register level debug"
 	default n
-	depends on PIC32MZ_ETHERNET && DEBUG_FEATURES
+	depends on PIC32MZ_ETHERNET && DEBUG_NET_INFO
 	---help---
 		Enabled low level register debug.  Also needs CONFIG_DEBUG_FEATURES.
 
diff --git a/arch/mips/src/pic32mz/pic32mz-ethernet.c b/arch/mips/src/pic32mz/pic32mz-ethernet.c
index af83f64f2a..c1e2671f92 100644
--- a/arch/mips/src/pic32mz/pic32mz-ethernet.c
+++ b/arch/mips/src/pic32mz/pic32mz-ethernet.c
@@ -465,7 +465,7 @@ static void pic32mz_ethreset(struct pic32mz_driver_s *priv);
 #ifdef CONFIG_NET_REGDEBUG
 static void pic32mz_printreg(uint32_t addr, uint32_t val, bool iswrite)
 {
-  llerr("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val);
+  nllinfo("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val);
 }
 #endif
 
@@ -515,7 +515,7 @@ static void pic32mz_checkreg(uint32_t addr, uint32_t val, bool iswrite)
             {
               /* No.. More than one. */
 
-              llerr("[repeats %d more times]\n", count);
+              nllinfo("[repeats %d more times]\n", count);
             }
         }
 
@@ -594,12 +594,12 @@ static void pic32mz_putreg(uint32_t val, uint32_t addr)
 #ifdef CONFIG_NET_DESCDEBUG
 static void pic32mz_dumptxdesc(struct pic32mz_txdesc_s *txdesc, const char *msg)
 {
-  llerr("TX Descriptor [%p]: %s\n", txdesc, msg);
-  llerr("   status: %08x\n", txdesc->status);
-  llerr("  address: %08x [%08x]\n", txdesc->address, VIRT_ADDR(txdesc->address));
-  llerr("     tsv1: %08x\n", txdesc->tsv1);
-  llerr("     tsv2: %08x\n", txdesc->tsv2);
-  llerr("   nexted: %08x [%08x]\n", txdesc->nexted, VIRT_ADDR(txdesc->nexted));
+  nllinfo("TX Descriptor [%p]: %s\n", txdesc, msg);
+  nllinfo("   status: %08x\n", txdesc->status);
+  nllinfo("  address: %08x [%08x]\n", txdesc->address, VIRT_ADDR(txdesc->address));
+  nllinfo("     tsv1: %08x\n", txdesc->tsv1);
+  nllinfo("     tsv2: %08x\n", txdesc->tsv2);
+  nllinfo("   nexted: %08x [%08x]\n", txdesc->nexted, VIRT_ADDR(txdesc->nexted));
 }
 #endif
 
@@ -621,12 +621,12 @@ static void pic32mz_dumptxdesc(struct pic32mz_txdesc_s *txdesc, const char *msg)
 #ifdef CONFIG_NET_DESCDEBUG
 static void pic32mz_dumprxdesc(struct pic32mz_rxdesc_s *rxdesc, const char *msg)
 {
-  llerr("RX Descriptor [%p]: %s\n", rxdesc, msg);
-  llerr("   status: %08x\n", rxdesc->status);
-  llerr("  address: %08x [%08x]\n", rxdesc->address, VIRT_ADDR(rxdesc->address));
-  llerr("     rsv1: %08x\n", rxdesc->rsv1);
-  llerr("     rsv2: %08x\n", rxdesc->rsv2);
-  llerr("   nexted: %08x [%08x]\n", rxdesc->nexted, VIRT_ADDR(rxdesc->nexted));
+  nllinfo("RX Descriptor [%p]: %s\n", rxdesc, msg);
+  nllinfo("   status: %08x\n", rxdesc->status);
+  nllinfo("  address: %08x [%08x]\n", rxdesc->address, VIRT_ADDR(rxdesc->address));
+  nllinfo("     rsv1: %08x\n", rxdesc->rsv1);
+  nllinfo("     rsv2: %08x\n", rxdesc->rsv2);
+  nllinfo("   nexted: %08x [%08x]\n", rxdesc->nexted, VIRT_ADDR(rxdesc->nexted));
 }
 #endif
 
@@ -1384,7 +1384,8 @@ static void pic32mz_rxdone(struct pic32mz_driver_s *priv)
 
       if ((rxdesc->rsv2 & RXDESC_RSV2_OK) == 0)
         {
-          nllerr("ERROR. rsv1: %08x rsv2: %08x\n", rxdesc->rsv1, rxdesc->rsv2);
+          nllwarn("WARNING. rsv1: %08x rsv2: %08x\n",
+                 rxdesc->rsv1, rxdesc->rsv2);
           NETDEV_RXERRORS(&priv->pd_dev);
           pic32mz_rxreturn(rxdesc);
         }
@@ -1397,7 +1398,8 @@ static void pic32mz_rxdone(struct pic32mz_driver_s *priv)
 
       else if (priv->pd_dev.d_len > CONFIG_NET_ETH_MTU)
         {
-          nllerr("Too big. packet length: %d rxdesc: %08x\n", priv->pd_dev.d_len, rxdesc->status);
+          nllwarn("WARNING: Too big. packet length: %d rxdesc: %08x\n",
+                  priv->pd_dev.d_len, rxdesc->status);
           NETDEV_RXERRORS(&priv->pd_dev);
           pic32mz_rxreturn(rxdesc);
         }
@@ -1407,7 +1409,8 @@ static void pic32mz_rxdone(struct pic32mz_driver_s *priv)
       else if ((rxdesc->status & (RXDESC_STATUS_EOP | RXDESC_STATUS_SOP)) !=
                (RXDESC_STATUS_EOP | RXDESC_STATUS_SOP))
         {
-          nllerr("Fragment. packet length: %d rxdesc: %08x\n", priv->pd_dev.d_len, rxdesc->status);
+          nllwarn("WARNING: Fragment. packet length: %d rxdesc: %08x\n",
+                 priv->pd_dev.d_len, rxdesc->status);
           NETDEV_RXFRAGMENTS(&priv->pd_dev);
           pic32mz_rxreturn(rxdesc);
         }
@@ -1546,7 +1549,8 @@ static void pic32mz_rxdone(struct pic32mz_driver_s *priv)
             {
               /* Unrecognized... drop it. */
 
-              nllerr("Unrecognized packet type dropped: %04x\n", ntohs(BUF->type));
+              nllwarn("WARNING: Unrecognized packet type dropped: %04x\n",
+                      ntohs(BUF->type));
               NETDEV_RXDROPPED(&priv->pd_dev);
             }
 
@@ -1708,7 +1712,7 @@ static int pic32mz_interrupt(int irq, void *context)
 
       if ((status & ETH_INT_RXOVFLW) != 0)
         {
-          nllerr("RX Overrun. status: %08x\n", status);
+          nllerr("ERROR: RX Overrun. status: %08x\n", status);
           NETDEV_RXERRORS(&priv->pd_dev);
         }
 
@@ -1719,7 +1723,7 @@ static int pic32mz_interrupt(int irq, void *context)
 
       if ((status & ETH_INT_RXBUFNA) != 0)
         {
-          nllerr("RX buffer descriptor overrun. status: %08x\n", status);
+          nllerr("ERROR: RX buffer descriptor overrun. status: %08x\n", status);
           NETDEV_RXERRORS(&priv->pd_dev);
         }
 
@@ -1730,7 +1734,7 @@ static int pic32mz_interrupt(int irq, void *context)
 
       if ((status & ETH_INT_RXBUSE) != 0)
         {
-          nllerr("RX BVCI bus error. status: %08x\n", status);
+          nllerr("ERROR: RX BVCI bus error. status: %08x\n", status);
           NETDEV_RXERRORS(&priv->pd_dev);
         }
 
@@ -1773,7 +1777,7 @@ static int pic32mz_interrupt(int irq, void *context)
 
       if ((status & ETH_INT_TXABORT) != 0)
         {
-          nllerr("TX abort. status: %08x\n", status);
+          nllerr("ERROR: TX abort. status: %08x\n", status);
           NETDEV_TXERRORS(&priv->pd_dev);
         }
 
@@ -1784,7 +1788,7 @@ static int pic32mz_interrupt(int irq, void *context)
 
       if ((status & ETH_INT_TXBUSE) != 0)
         {
-          nllerr("TX BVCI bus error. status: %08x\n", status);
+          nllerr("ERROR: TX BVCI bus error. status: %08x\n", status);
           NETDEV_TXERRORS(&priv->pd_dev);
         }
 
@@ -1938,9 +1942,9 @@ static int pic32mz_ifup(struct net_driver_s *dev)
   uint32_t regval;
   int ret;
 
-  nerr("Bringing up: %d.%d.%d.%d\n",
-       dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
-       (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
+  nnllinfoBringing up: %d.%d.%d.%d\n",
+        dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
+        (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
 
   /* Reset the Ethernet controller (again) */
 
@@ -2028,7 +2032,7 @@ static int pic32mz_ifup(struct net_driver_s *dev)
   ret = pic32mz_phyinit(priv);
   if (ret != 0)
     {
-      nerr("pic32mz_phyinit failed: %d\n", ret);
+      nerr("ERROR: pic32mz_phyinit failed: %d\n", ret);
       return ret;
     }
 
@@ -2105,11 +2109,10 @@ static int pic32mz_ifup(struct net_driver_s *dev)
   priv->pd_dev.d_mac.ether_addr_octet[0] = (uint32_t)(regval & 0xff);
   priv->pd_dev.d_mac.ether_addr_octet[1] = (uint32_t)((regval >> 8) & 0xff);
 
-  nerr("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
-         dev->d_mac.ether_addr_octet[0], dev->d_mac.ether_addr_octet[1],
-         dev->d_mac.ether_addr_octet[2], dev->d_mac.ether_addr_octet[3],
-         dev->d_mac.ether_addr_octet[4], dev->d_mac.ether_addr_octet[5]);
-
+  ninfo("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+        dev->d_mac.ether_addr_octet[0], dev->d_mac.ether_addr_octet[1],
+        dev->d_mac.ether_addr_octet[2], dev->d_mac.ether_addr_octet[3],
+        dev->d_mac.ether_addr_octet[4], dev->d_mac.ether_addr_octet[5]);
 #endif
 
   /* Continue Ethernet Controller Initialization ****************************/
@@ -2396,14 +2399,14 @@ static int pic32mz_rmmac(struct net_driver_s *dev, const uint8_t *mac)
 #if defined(CONFIG_NET_REGDEBUG) && defined(PIC32MZ_HAVE_PHY)
 static void pic32mz_showmii(uint8_t phyaddr, const char *msg)
 {
-  err("PHY " PIC32MZ_PHYNAME ": %s\n", msg);
-  err("  MCR:       %04x\n", pic32mz_phyread(phyaddr, MII_MCR));
-  err("  MSR:       %04x\n", pic32mz_phyread(phyaddr, MII_MSR));
-  err("  ADVERTISE: %04x\n", pic32mz_phyread(phyaddr, MII_ADVERTISE));
-  err("  LPA:       %04x\n", pic32mz_phyread(phyaddr, MII_LPA));
-  err("  EXPANSION: %04x\n", pic32mz_phyread(phyaddr, MII_EXPANSION));
+  nllinfo("PHY " PIC32MZ_PHYNAME ": %s\n", msg);
+  nllinfo("  MCR:       %04x\n", pic32mz_phyread(phyaddr, MII_MCR));
+  nllinfo("  MSR:       %04x\n", pic32mz_phyread(phyaddr, MII_MSR));
+  nllinfo("  ADVERTISE: %04x\n", pic32mz_phyread(phyaddr, MII_ADVERTISE));
+  nllinfo("  LPA:       %04x\n", pic32mz_phyread(phyaddr, MII_LPA));
+  nllinfo("  EXPANSION: %04x\n", pic32mz_phyread(phyaddr, MII_EXPANSION));
 #ifdef CONFIG_ETH0_PHY_KS8721
-  err("  10BTCR:    %04x\n", pic32mz_phyread(phyaddr, MII_KS8721_10BTCR));
+  nllinfo("  10BTCR:    %04x\n", pic32mz_phyread(phyaddr, MII_KS8721_10BTCR));
 #endif
 }
 #endif
@@ -2566,7 +2569,7 @@ static inline int pic32mz_phyreset(uint8_t phyaddr)
         }
     }
 
-  nerr("Reset failed. MCR: %04x\n", phyreg);
+  nerr("ERROR: Reset failed. MCR: %04x\n", phyreg);
   return -ETIMEDOUT;
 }
 #endif
@@ -2613,7 +2616,7 @@ static inline int pic32mz_phyautoneg(uint8_t phyaddr)
         }
     }
 
-  nerr("Auto-negotiation failed. MSR: %04x\n", phyreg);
+  nerr("ERROR: Auto-negotiation failed. MSR: %04x\n", phyreg);
   return -ETIMEDOUT;
 }
 #endif
@@ -2692,7 +2695,7 @@ static int pic32mz_phymode(uint8_t phyaddr, uint8_t mode)
 #endif
     }
 
-  nerr("Link failed. MSR: %04x\n", phyreg);
+  nerr("ERROR: Link failed. MSR: %04x\n", phyreg);
   return -ETIMEDOUT;
 }
 #endif
@@ -2761,7 +2764,7 @@ static inline int pic32mz_phyinit(struct pic32mz_driver_s *priv)
       ret = pic32mz_phyreset(phyaddr);
       if (ret < 0)
         {
-          nerr("Failed to reset PHY at address %d\n", phyaddr);
+          nerr("ERROR: Failed to reset PHY at address %d\n", phyaddr);
           continue;
         }
 
@@ -2794,7 +2797,7 @@ static inline int pic32mz_phyinit(struct pic32mz_driver_s *priv)
     {
       /* Failed to find PHY at any location */
 
-      nerr("No PHY detected\n");
+      nerr("ERROR: No PHY detected\n");
       return -ENODEV;
     }
   ninfo("phyaddr: %d\n", phyaddr);
@@ -2898,7 +2901,7 @@ static inline int pic32mz_phyinit(struct pic32mz_driver_s *priv)
         priv->pd_mode = PIC32MZ_100BASET_FD;
         break;
       default:
-        nerr("Unrecognized mode: %04x\n", phyreg);
+        nerr("ERROR: Unrecognized mode: %04x\n", phyreg);
         return -ENODEV;
     }
 #elif defined(CONFIG_ETH0_PHY_DP83848C)
@@ -2921,7 +2924,7 @@ static inline int pic32mz_phyinit(struct pic32mz_driver_s *priv)
         priv->pd_mode = PIC32MZ_10BASET_FD;
         break;
       default:
-        nerr("Unrecognized mode: %04x\n", phyreg);
+        nerr("ERROR: Unrecognized mode: %04x\n", phyreg);
         return -ENODEV;
     }
 #elif defined(CONFIG_ETH0_PHY_LAN8720) || defined(CONFIG_ETH0_PHY_LAN8740) || defined(CONFIG_ETH0_PHY_LAN8740A)
@@ -2966,7 +2969,7 @@ static inline int pic32mz_phyinit(struct pic32mz_driver_s *priv)
       }
     else
       {
-        nerr("Unrecognized mode: %04x\n", phyreg);
+        nerr("ERROR: Unrecognized mode: %04x\n", phyreg);
         return -ENODEV;
       }
   }
@@ -2974,9 +2977,9 @@ static inline int pic32mz_phyinit(struct pic32mz_driver_s *priv)
 #  warning "PHY Unknown: speed and duplex are bogus"
 #endif
 
-  nerr("%dBase-T %s duplex\n",
-       (priv->pd_mode & PIC32MZ_SPEED_MASK) ==  PIC32MZ_SPEED_100 ? 100 : 10,
-       (priv->pd_mode & PIC32MZ_DUPLEX_MASK) == PIC32MZ_DUPLEX_FULL ?"full" : "half");
+  ninfo("%dBase-T %s duplex\n",
+        (priv->pd_mode & PIC32MZ_SPEED_MASK) ==  PIC32MZ_SPEED_100 ? 100 : 10,
+        (priv->pd_mode & PIC32MZ_DUPLEX_MASK) == PIC32MZ_DUPLEX_FULL ?"full" : "half");
 
   /* Disable auto-configuration.  Set the fixed speed/duplex mode.
    * (probably more than little redundant).
diff --git a/arch/mips/src/pic32mz/pic32mz-exception.c b/arch/mips/src/pic32mz/pic32mz-exception.c
index e9cda39ba8..1397d1063f 100644
--- a/arch/mips/src/pic32mz/pic32mz-exception.c
+++ b/arch/mips/src/pic32mz/pic32mz-exception.c
@@ -55,22 +55,6 @@
 
 #include "chip/pic32mz-int.h"
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -106,88 +90,88 @@ uint32_t *pic32mz_exception(uint32_t *regs)
   switch (cause & CP0_CAUSE_EXCCODE_MASK)
     {
     case CP0_CAUSE_EXCCODE_INT:      /* Interrupt */
-      llinfo("EXCEPTION: Interrupt"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: Interrupt"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_TLBL:     /* TLB exception (load or instruction fetch) */
-      llinfo("EXCEPTION: TLB exception (load or instruction fetch)"
-             " CAUSE: %08x EPC:%08x\n", cause, epc);
+      alert("EXCEPTION: TLB exception (load or instruction fetch)"
+            " CAUSE: %08x EPC:%08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_TLBS:     /* TLB exception (store) */
-      llinfo("EXCEPTION: TLB exception (store)"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: TLB exception (store)"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_ADEL:     /* Address error exception (load or instruction fetch) */
-      llinfo("EXCEPTION: Address error exception (load or instruction fetch)"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: Address error exception (load or instruction fetch)"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_ADES:     /* Address error exception (store) */
-      llinfo("EXCEPTION: Address error exception (store)"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: Address error exception (store)"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_IBE:      /* Bus error exception (instruction fetch) */
-      llinfo("EXCEPTION: Bus error exception (instruction fetch)"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: Bus error exception (instruction fetch)"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_DBE:      /* Bus error exception (data reference: load or store) */
-      llinfo("EXCEPTION: Bus error exception (data reference: load or store)"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: Bus error exception (data reference: load or store)"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_SYS:      /* Syscall exception */
-      llinfo("EXCEPTION: Syscall exception"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: Syscall exception"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_BP:       /* Breakpoint exception */
-      llinfo("EXCEPTION: Breakpoint exception"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: Breakpoint exception"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_RI:       /* Reserved instruction exception */
-      llinfo("EXCEPTION: Reserved instruction exception"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: Reserved instruction exception"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_CPU:      /* Coprocessor Unusable exception */
-      llinfo("EXCEPTION: Coprocessor Unusable exception"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: Coprocessor Unusable exception"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_OV:       /* Arithmetic Overflow exception */
-      llinfo("EXCEPTION: Arithmetic Overflow exception"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: Arithmetic Overflow exception"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_TR:       /* Trap exception */
-      llinfo("EXCEPTION: Trap exception"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: Trap exception"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_FPE:      /* Floating point exception */
-      llinfo("EXCEPTION: Floating point exception"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: Floating point exception"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_C2E:      /* Precise Coprocessor 2 exceptions */
-      llinfo("EXCEPTION: Precise Coprocessor 2 exceptions"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: Precise Coprocessor 2 exceptions"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_MDMX:     /* MDMX Unusable (MIPS64) */
-      llinfo("EXCEPTION: MDMX Unusable (MIPS64)"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: MDMX Unusable (MIPS64)"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_WATCH:    /* WatchHi/WatchLo address */
-      llinfo("EXCEPTION: WatchHi/WatchLo address"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: WatchHi/WatchLo address"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_MCHECK:   /* Machine check */
-      llinfo("EXCEPTION: Machine check"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: Machine check"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     case CP0_CAUSE_EXCCODE_CACHEERR: /* Cache error */
-      llinfo("EXCEPTION: Cache error"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: Cache error"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     default:
-      llinfo("EXCEPTION: Unknown"
-             " CAUSE: %08x EPC: %08x\n", cause, epc);
+      alert("EXCEPTION: Unknown"
+            " CAUSE: %08x EPC: %08x\n", cause, epc);
       break;
     }
 #else
-  llerr("EXCEPTION: CAUSE: %08x EPC: %08x\n", cause, epc);
+  alert("EXCEPTION: CAUSE: %08x EPC: %08x\n", cause, epc);
 #endif
 #endif
 
diff --git a/arch/mips/src/pic32mz/pic32mz-gpio.c b/arch/mips/src/pic32mz/pic32mz-gpio.c
index db8c6e5df8..e4123eb0ce 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_FEATURES) && defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_GPIO)
+#if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_GPIO)
 void pic32mz_dumpgpio(uint32_t pinset, const char *msg)
 {
   unsigned int port = pic32mz_portno(pinset);
@@ -325,17 +325,17 @@ void pic32mz_dumpgpio(uint32_t pinset, const char *msg)
       /* The following requires exclusive access to the GPIO registers */
 
       sched_lock();
-      llerr("IOPORT%c pinset: %04x base: %08x -- %s\n",
-            'A'+port, pinset, base, msg);
-      llerr("   TRIS: %08x   PORT: %08x    LAT: %08x    ODC: %08x\n",
-            getreg32(base + PIC32MZ_IOPORT_TRIS_OFFSET),
-            getreg32(base + PIC32MZ_IOPORT_PORT_OFFSET),
-            getreg32(base + PIC32MZ_IOPORT_LAT_OFFSET),
-            getreg32(base + PIC32MZ_IOPORT_ODC_OFFSET));
-      llerr("  CNCON: %08x   CNEN: %08x  CNPUE: %08x\n",
-            getreg32(PIC32MZ_IOPORT_CNCON),
-            getreg32(PIC32MZ_IOPORT_CNEN),
-            getreg32(PIC32MZ_IOPORT_CNPUE));
+      llinfo("IOPORT%c pinset: %04x base: %08x -- %s\n",
+             'A'+port, pinset, base, msg);
+      llinfo("   TRIS: %08x   PORT: %08x    LAT: %08x    ODC: %08x\n",
+             getreg32(base + PIC32MZ_IOPORT_TRIS_OFFSET),
+             getreg32(base + PIC32MZ_IOPORT_PORT_OFFSET),
+             getreg32(base + PIC32MZ_IOPORT_LAT_OFFSET),
+             getreg32(base + PIC32MZ_IOPORT_ODC_OFFSET));
+      llinfo("  CNCON: %08x   CNEN: %08x  CNPUE: %08x\n",
+             getreg32(PIC32MZ_IOPORT_CNCON),
+             getreg32(PIC32MZ_IOPORT_CNEN),
+             getreg32(PIC32MZ_IOPORT_CNPUE));
       sched_unlock();
     }
 }
diff --git a/arch/mips/src/pic32mz/pic32mz-gpio.h b/arch/mips/src/pic32mz/pic32mz-gpio.h
index 1c967bc802..f7464a59d4 100644
--- a/arch/mips/src/pic32mz/pic32mz-gpio.h
+++ b/arch/mips/src/pic32mz/pic32mz-gpio.h
@@ -253,7 +253,7 @@ void pic32mz_gpioirqdisable(pinset_t pinset);
  *
  ************************************************************************************/
 
-#ifdef CONFIG_DEBUG_GPIO
+#if defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_GPIO)
 void pic32mz_dumpgpio(uint32_t pinset, const char *msg);
 #else
 #  define pic32mz_dumpgpio(p,m)
diff --git a/arch/mips/src/pic32mz/pic32mz-spi.c b/arch/mips/src/pic32mz/pic32mz-spi.c
index 956128eaeb..633698787c 100644
--- a/arch/mips/src/pic32mz/pic32mz-spi.c
+++ b/arch/mips/src/pic32mz/pic32mz-spi.c
@@ -71,13 +71,11 @@
 
 #ifdef CONFIG_DEBUG_SPI
 #  define spierr  llerr
-#  ifdef CONFIG_DEBUG_INFO
-#    define spiinfo llerr
-#  else
-#    define spiinfo(x...)
-#  endif
+#  define spiwarn llwarn
+#  define spiinfo llinfo
 #else
 #  define spierr(x...)
+#  define spiwarn(x...)
 #  define spiinfo(x...)
 #endif
 
@@ -496,7 +494,7 @@ static bool spi_checkreg(struct pic32mz_dev_s *priv, uintptr_t regaddr,
         {
           /* Yes... show how many times we did it */
 
-          llerr("...[Repeats %d times]...\n", priv->ntimes);
+          llinfo("...[Repeats %d times]...\n", priv->ntimes);
         }
 
       /* Save information about the new access */
@@ -546,8 +544,8 @@ static uint32_t spi_getreg(FAR struct pic32mz_dev_s *priv,
     {
       /* Yes.. */
 
-      llerr("%08lx->%08lx\n",
-            (unsigned long)regaddr, (unsigned long)regval);
+      llinfo("%08lx->%08lx\n",
+             (unsigned long)regaddr, (unsigned long)regval);
     }
 
   /* Return the value read */
@@ -588,8 +586,8 @@ static void spi_putaddr(FAR struct pic32mz_dev_s *priv, uintptr_t regaddr,
     {
       /* Yes.. */
 
-      llerr("%08lx<-%08lx\n",
-      (unsigned long)regaddr, (unsigned long)regval);
+      llinfo("%08lx<-%08lx\n",
+             (unsigned long)regaddr, (unsigned long)regval);
     }
 
   /* Write the value to the register */
@@ -887,7 +885,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
   priv->frequency = frequency;
   priv->actual    = actual;
 
-  spierr("New frequency: %d Actual: %d\n", frequency, actual);
+  spiinfo("New frequency: %d Actual: %d\n", frequency, actual);
   return actual;
 }
 
@@ -1025,7 +1023,7 @@ static void spi_setbits(FAR struct spi_dev_s *dev, int nbits)
         }
       else
         {
-          spierr("Unsupported nbits: %d\n", nbits);
+          spierr("ERROR: Unsupported nbits: %d\n", nbits);
           return;
         }
 
@@ -1275,7 +1273,7 @@ FAR struct spi_dev_s *pic32mz_spibus_initialize(int port)
   else
 #endif
    {
-     spierr("Unsuppport port: %d\n", port);
+     spierr("ERROR: Unsuppport port: %d\n", port);
      return NULL;
    }
 
@@ -1311,7 +1309,7 @@ FAR struct spi_dev_s *pic32mz_spibus_initialize(int port)
   ret = irq_attach(priv->config->rxirq, spi_interrupt);
   if (ret < 0)
     {
-      spierr("Failed to attach RX interrupt: %d port: %d\n",
+      spierr("ERROR: Failed to attach RX interrupt: %d port: %d\n",
              priv->config->rxirq, port);
       goto errout;
     }
@@ -1319,7 +1317,7 @@ FAR struct spi_dev_s *pic32mz_spibus_initialize(int port)
   ret = irq_attach(priv->config->txirq, spi_interrupt);
   if (ret < 0)
     {
-      spierr("Failed to attach TX interrupt: %d port: %d\n",
+      spierr("ERROR: Failed to attach TX interrupt: %d port: %d\n",
              priv->tconfig->xirq, port);
       goto errout_with_rxirq;
     }
@@ -1327,7 +1325,7 @@ FAR struct spi_dev_s *pic32mz_spibus_initialize(int port)
   ret = irq_attach(priv->config->firq, spi_interrupt);
   if (ret < 0)
     {
-      spierr("Failed to attach fault interrupt: %d port: %d\n",
+      spierr("ERROR: Failed to attach fault interrupt: %d port: %d\n",
              priv->config->firq, port);
       goto errout_with_txirq;
     }
diff --git a/arch/rgmp/src/x86/com.c b/arch/rgmp/src/x86/com.c
index fced9f66e8..495aa4b692 100644
--- a/arch/rgmp/src/x86/com.c
+++ b/arch/rgmp/src/x86/com.c
@@ -263,23 +263,27 @@ static int up_setup(struct uart_dev_s *dev)
       }
 
     // Set speed; requires DLAB latch
+
     outb(base+COM_LCR, COM_LCR_DLAB);
     data.val = 115200 / priv->baud;
     outb(base+COM_DLL, data.sep.low);
     outb(base+COM_DLM, data.sep.high);
 
     // set data bits, stop bit, parity; turn off DLAB latch
+
     outb(base+COM_LCR, priv->lcr.val);
 
     // OUT2 must be set to enable interrupt
+
     outb(base+COM_MCR, COM_MCR_OUT2);
 
     // setup FIFO
+
     outb(base+COM_FCR, 1);
 
     // disable COM interrupts
-    outb(base+COM_IER, 0);
 
+    outb(base+COM_IER, 0);
     return OK;
 }
 
-- 
GitLab


From 64fa0ab51fd744961ecd73d749bf783e55869d5b Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 14 Jun 2016 12:36:59 -0600
Subject: [PATCH 80/91] Fix Kconfig dependency

---
 arch/mips/src/pic32mx/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/mips/src/pic32mx/Kconfig b/arch/mips/src/pic32mx/Kconfig
index 61b5b71c7f..366c50fdf5 100644
--- a/arch/mips/src/pic32mx/Kconfig
+++ b/arch/mips/src/pic32mx/Kconfig
@@ -1097,7 +1097,7 @@ config NET_WOL
 config NET_REGDEBUG
 	bool "Register level debug"
 	default n
-	depends on PIC32MX_ETHERNET && DEBUG_FEATURES
+	depends on PIC32MX_ETHERNET && DEBUG_NET_INFO
 	---help---
 		Enabled low level register debug.  Also needs CONFIG_DEBUG_FEATURES.
 
-- 
GitLab


From 688e553d1d5c28368aacc68792d2ab12a92fccb4 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 14 Jun 2016 12:38:40 -0600
Subject: [PATCH 81/91] arch/hc/:  Change some *err() message to *info()
 messages if what was a *dbg() message does not indicate and error condition.

---
 arch/hc/src/common/up_exit.c            | 20 ++++++++++----------
 arch/hc/src/common/up_initialize.c      |  4 ++--
 arch/hc/src/common/up_releasepending.c  |  2 +-
 arch/hc/src/common/up_reprioritizertr.c |  2 +-
 arch/hc/src/m9s12/m9s12_ethernet.c      |  6 +++---
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/arch/hc/src/common/up_exit.c b/arch/hc/src/common/up_exit.c
index 78e82c6088..251e91cefc 100644
--- a/arch/hc/src/common/up_exit.c
+++ b/arch/hc/src/common/up_exit.c
@@ -85,8 +85,8 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
   int i;
 #endif
 
-  serr("  TCB=%p name=%s pid=%d\n", tcb, tcb->argv[0], tcb->pid);
-  serr("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
+  sinfo("  TCB=%p name=%s pid=%d\n", tcb, tcb->argv[0], tcb->pid);
+  sinfo("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
 
 #if CONFIG_NFILE_DESCRIPTORS > 0
   filelist = tcb->group->tg_filelist;
@@ -95,8 +95,8 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
       struct inode *inode = filelist->fl_files[i].f_inode;
       if (inode)
         {
-          serr("      fd=%d refcount=%d\n",
-               i, inode->i_crefs);
+          sinfo("      fd=%d refcount=%d\n",
+                i, inode->i_crefs);
         }
     }
 #endif
@@ -109,11 +109,11 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
       if (filep->fs_fd >= 0)
         {
 #if CONFIG_STDIO_BUFFER_SIZE > 0
-          serr("      fd=%d nbytes=%d\n",
-               filep->fs_fd,
-               filep->fs_bufpos - filep->fs_bufstart);
+          sinfo("      fd=%d nbytes=%d\n",
+                filep->fs_fd,
+                filep->fs_bufpos - filep->fs_bufstart);
 #else
-          serr("      fd=%d\n", filep->fs_fd);
+          sinfo("      fd=%d\n", filep->fs_fd);
 #endif
         }
     }
@@ -146,10 +146,10 @@ void _exit(int status)
 
   (void)up_irq_save();
 
-  sllerr("TCB=%p exiting\n", this_task());
+  sllinfo("TCB=%p exiting\n", this_task());
 
 #if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
-  sllerr("Other tasks:\n");
+  sllinfo("Other tasks:\n");
   sched_foreach(_up_dumponexit, NULL);
 #endif
 
diff --git a/arch/hc/src/common/up_initialize.c b/arch/hc/src/common/up_initialize.c
index b7b6b19d77..a358d29e9b 100644
--- a/arch/hc/src/common/up_initialize.c
+++ b/arch/hc/src/common/up_initialize.c
@@ -74,13 +74,13 @@ static void up_calibratedelay(void)
 {
   int i;
 
-  llerr("Beginning 100s delay\n");
+  llwarn("Beginning 100s delay\n");
   for (i = 0; i < 100; i++)
     {
       up_mdelay(1000);
     }
 
-  llerr("End 100s delay\n");
+  llwarn("End 100s delay\n");
 }
 #else
 # define up_calibratedelay()
diff --git a/arch/hc/src/common/up_releasepending.c b/arch/hc/src/common/up_releasepending.c
index 27f7fa868d..5d237ac478 100644
--- a/arch/hc/src/common/up_releasepending.c
+++ b/arch/hc/src/common/up_releasepending.c
@@ -66,7 +66,7 @@ void up_release_pending(void)
 {
   struct tcb_s *rtcb = this_task();
 
-  sllerr("From TCB=%p\n", rtcb);
+  sllinfo("From TCB=%p\n", rtcb);
 
   /* Merge the g_pendingtasks list into the ready-to-run task list */
 
diff --git a/arch/hc/src/common/up_reprioritizertr.c b/arch/hc/src/common/up_reprioritizertr.c
index 6155f4e200..986b9ed3ac 100644
--- a/arch/hc/src/common/up_reprioritizertr.c
+++ b/arch/hc/src/common/up_reprioritizertr.c
@@ -95,7 +95,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
       struct tcb_s *rtcb = this_task();
       bool switch_needed;
 
-      sllerr("TCB=%p PRI=%d\n", tcb, priority);
+      sllinfo("TCB=%p PRI=%d\n", tcb, priority);
 
       /* Remove the tcb task from the ready-to-run list.
        * sched_removereadytorun will return true if we just
diff --git a/arch/hc/src/m9s12/m9s12_ethernet.c b/arch/hc/src/m9s12/m9s12_ethernet.c
index a96de8c408..1dd9c6b4fc 100644
--- a/arch/hc/src/m9s12/m9s12_ethernet.c
+++ b/arch/hc/src/m9s12/m9s12_ethernet.c
@@ -549,9 +549,9 @@ static int emac_ifup(struct net_driver_s *dev)
 {
   FAR struct emac_driver_s *priv = (FAR struct emac_driver_s *)dev->d_private;
 
-  nerr("Bringing up: %d.%d.%d.%d\n",
-       dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
-       (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24 );
+  ninfo("Bringing up: %d.%d.%d.%d\n",
+        dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
+        (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24 );
 
   /* Initialize PHYs, the Ethernet interface, and setup up Ethernet interrupts */
 
-- 
GitLab


From 5cc9a13f95f18d2eb1a26047a2d07ca2478baf8d Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 14 Jun 2016 12:45:12 -0600
Subject: [PATCH 82/91] arch/avr/:  Change some *err() message to *info()
 messages if what was a *dbg() message does not indicate and error condition.

---
 arch/avr/src/at32uc3/at32uc3_gpioirq.c    |  6 +++---
 arch/avr/src/at32uc3/at32uc3_irq.c        |  6 +++---
 arch/avr/src/avr/up_releasepending.c      |  2 +-
 arch/avr/src/avr/up_reprioritizertr.c     |  2 +-
 arch/avr/src/avr/up_schedulesigaction.c   |  5 +++--
 arch/avr/src/avr/up_sigdeliver.c          |  4 ++--
 arch/avr/src/avr/up_spi.c                 |  6 +++---
 arch/avr/src/avr32/up_releasepending.c    |  2 +-
 arch/avr/src/avr32/up_reprioritizertr.c   |  2 +-
 arch/avr/src/avr32/up_schedulesigaction.c |  5 +++--
 arch/avr/src/avr32/up_sigdeliver.c        |  4 ++--
 arch/avr/src/common/up_exit.c             | 20 ++++++++++----------
 arch/avr/src/common/up_initialize.c       |  4 ++--
 13 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/arch/avr/src/at32uc3/at32uc3_gpioirq.c b/arch/avr/src/at32uc3/at32uc3_gpioirq.c
index 57ab58aec4..0972429bae 100644
--- a/arch/avr/src/at32uc3/at32uc3_gpioirq.c
+++ b/arch/avr/src/at32uc3/at32uc3_gpioirq.c
@@ -228,7 +228,7 @@ static void gpio_porthandler(uint32_t regbase, int irqbase, uint32_t irqset, voi
                 }
               else
                 {
-                  llerr("No handler: pin=%d ifr=%08x irqset=%08x",
+                  llerr("ERROR: No handler: pin=%d ifr=%08x irqset=%08x",
                         pin, ifr, irqset);
                 }
             }
@@ -247,8 +247,8 @@ static void gpio_porthandler(uint32_t regbase, int irqbase, uint32_t irqset, voi
           putreg32(bit, regbase + AVR32_GPIO_IFRC_OFFSET);
           ifr &= ~bit;
 
-          llerr("IRQ on unconfigured pin: pin=%d ifr=%08x irqset=%08x",
-                pin, ifr, irqset);
+          llwarn("WARNING: IRQ on unconfigured pin: pin=%d ifr=%08x irqset=%08x",
+                 pin, ifr, irqset);
         }
     }
 }
diff --git a/arch/avr/src/at32uc3/at32uc3_irq.c b/arch/avr/src/at32uc3/at32uc3_irq.c
index 5e72f9a37e..f6964b7404 100644
--- a/arch/avr/src/at32uc3/at32uc3_irq.c
+++ b/arch/avr/src/at32uc3/at32uc3_irq.c
@@ -177,7 +177,7 @@ static int up_getgrp(unsigned int irq)
 static int avr32_xcptn(int irq, FAR void *context)
 {
   (void)up_irq_save();
-  llerr("PANIC!!! Exception IRQ: %d\n", irq);
+  alert("PANIC!!! Exception IRQ: %d\n", irq);
   PANIC();
   return 0;
 }
@@ -321,11 +321,11 @@ unsigned int avr32_intirqno(unsigned int level)
           mask <<= 1;
         }
 
-       llerr("Spurious interrupt: group=%d IRR=%08x\n", group, irr);
+       llerr("ERROR: Spurious interrupt: group=%d IRR=%08x\n", group, irr);
        return -ENODEV;
     }
 
-  llerr("Bad group: %d\n", group);
+  llerr("ERROR: Bad group: %d\n", group);
   return AVR32_IRQ_BADVECTOR;
 }
 
diff --git a/arch/avr/src/avr/up_releasepending.c b/arch/avr/src/avr/up_releasepending.c
index 5bd675f10b..2501d8340c 100644
--- a/arch/avr/src/avr/up_releasepending.c
+++ b/arch/avr/src/avr/up_releasepending.c
@@ -66,7 +66,7 @@ void up_release_pending(void)
 {
   struct tcb_s *rtcb = this_task();
 
-  sllerr("From TCB=%p\n", rtcb);
+  sllinfo("From TCB=%p\n", rtcb);
 
   /* Merge the g_pendingtasks list into the ready-to-run task list */
 
diff --git a/arch/avr/src/avr/up_reprioritizertr.c b/arch/avr/src/avr/up_reprioritizertr.c
index e2e8cb45c2..24fdd401cd 100644
--- a/arch/avr/src/avr/up_reprioritizertr.c
+++ b/arch/avr/src/avr/up_reprioritizertr.c
@@ -94,7 +94,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
       struct tcb_s *rtcb = this_task();
       bool switch_needed;
 
-      sllerr("TCB=%p PRI=%d\n", tcb, priority);
+      sllinfo("TCB=%p PRI=%d\n", tcb, priority);
 
       /* Remove the tcb task from the ready-to-run list.
        * sched_removereadytorun will return true if we just
diff --git a/arch/avr/src/avr/up_schedulesigaction.c b/arch/avr/src/avr/up_schedulesigaction.c
index 6d067f8fc2..16f7a33587 100644
--- a/arch/avr/src/avr/up_schedulesigaction.c
+++ b/arch/avr/src/avr/up_schedulesigaction.c
@@ -94,7 +94,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
 {
   irqstate_t flags;
 
-  serr("tcb=0x%p sigdeliver=0x%p\n", tcb, sigdeliver);
+  sinfo("tcb=0x%p sigdeliver=0x%p\n", tcb, sigdeliver);
 
   /* Make sure that interrupts are disabled */
 
@@ -108,7 +108,8 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
        * being delivered to the currently executing task.
        */
 
-      serr("rtcb=0x%p g_current_regs=0x%p\n", this_task(), g_current_regs);
+      sinfo("rtcb=0x%p g_current_regs=0x%p\n",
+            this_task(), g_current_regs);
 
       if (tcb == this_task())
         {
diff --git a/arch/avr/src/avr/up_sigdeliver.c b/arch/avr/src/avr/up_sigdeliver.c
index 96163e20f8..c73460793e 100644
--- a/arch/avr/src/avr/up_sigdeliver.c
+++ b/arch/avr/src/avr/up_sigdeliver.c
@@ -82,7 +82,7 @@ void up_sigdeliver(void)
 
   board_autoled_on(LED_SIGNAL);
 
-  serr("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
+  sinfo("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
         rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
   ASSERT(rtcb->xcp.sigdeliver != NULL);
 
@@ -117,7 +117,7 @@ void up_sigdeliver(void)
    * errno that is needed by the user logic (it is probably EINTR).
    */
 
-  serr("Resuming\n");
+  sinfo("Resuming\n");
   (void)up_irq_save();
   rtcb->pterrno = saved_errno;
 
diff --git a/arch/avr/src/avr/up_spi.c b/arch/avr/src/avr/up_spi.c
index 6f13f7cd58..29b236dcb0 100644
--- a/arch/avr/src/avr/up_spi.c
+++ b/arch/avr/src/avr/up_spi.c
@@ -263,7 +263,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
       actual          = priv->actual;
     }
 
-  spierr("Frequency %d->%d\n", frequency, actual);
+  spiinfo("Frequency %d->%d\n", frequency, actual);
   return actual;
 }
 
@@ -402,7 +402,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size
 {
   FAR uint8_t *ptr = (FAR uint8_t *)buffer;
 
-  spierr("nwords: %d\n", nwords);
+  spiinfo("nwords: %d\n", nwords);
   while (nwords-- > 0)
     {
       (void)spi_send(dev, (uint16_t)*ptr++);
@@ -433,7 +433,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw
 {
   FAR uint8_t *ptr = (FAR uint8_t *)buffer;
 
-  spierr("nwords: %d\n", nwords);
+  spiinfo("nwords: %d\n", nwords);
   while (nwords-- > 0)
     {
       *ptr++ = spi_send(dev, (uint16_t)0xff);
diff --git a/arch/avr/src/avr32/up_releasepending.c b/arch/avr/src/avr32/up_releasepending.c
index 9640d7d844..29bc26dbf2 100644
--- a/arch/avr/src/avr32/up_releasepending.c
+++ b/arch/avr/src/avr32/up_releasepending.c
@@ -67,7 +67,7 @@ void up_release_pending(void)
 {
   struct tcb_s *rtcb = this_task();
 
-  sllerr("From TCB=%p\n", rtcb);
+  sllinfo("From TCB=%p\n", rtcb);
 
   /* Merge the g_pendingtasks list into the ready-to-run task list */
 
diff --git a/arch/avr/src/avr32/up_reprioritizertr.c b/arch/avr/src/avr32/up_reprioritizertr.c
index 6a39f52646..bf60353cf1 100644
--- a/arch/avr/src/avr32/up_reprioritizertr.c
+++ b/arch/avr/src/avr32/up_reprioritizertr.c
@@ -95,7 +95,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
       struct tcb_s *rtcb = this_task();
       bool switch_needed;
 
-      sllerr("TCB=%p PRI=%d\n", tcb, priority);
+      sllinfo("TCB=%p PRI=%d\n", tcb, priority);
 
       /* Remove the tcb task from the ready-to-run list.
        * sched_removereadytorun will return true if we just
diff --git a/arch/avr/src/avr32/up_schedulesigaction.c b/arch/avr/src/avr32/up_schedulesigaction.c
index f9bb311fe8..4ec759448d 100644
--- a/arch/avr/src/avr32/up_schedulesigaction.c
+++ b/arch/avr/src/avr32/up_schedulesigaction.c
@@ -94,7 +94,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
 {
   irqstate_t flags;
 
-  serr("tcb=0x%p sigdeliver=0x%p\n", tcb, sigdeliver);
+  sinfo("tcb=0x%p sigdeliver=0x%p\n", tcb, sigdeliver);
 
   /* Make sure that interrupts are disabled */
 
@@ -108,7 +108,8 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver)
        * being delivered to the currently executing task.
        */
 
-      serr("rtcb=0x%p g_current_regs=0x%p\n", this_task(), g_current_regs);
+      sinfo("rtcb=0x%p g_current_regs=0x%p\n",
+            this_task(), g_current_regs);
 
       if (tcb == this_task())
         {
diff --git a/arch/avr/src/avr32/up_sigdeliver.c b/arch/avr/src/avr32/up_sigdeliver.c
index ded924df87..811e4b031c 100644
--- a/arch/avr/src/avr32/up_sigdeliver.c
+++ b/arch/avr/src/avr32/up_sigdeliver.c
@@ -86,7 +86,7 @@ void up_sigdeliver(void)
 
   board_autoled_on(LED_SIGNAL);
 
-  serr("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
+  sinfo("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
         rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
   ASSERT(rtcb->xcp.sigdeliver != NULL);
 
@@ -117,7 +117,7 @@ void up_sigdeliver(void)
    * errno that is needed by the user logic (it is probably EINTR).
    */
 
-  serr("Resuming\n");
+  sinfo("Resuming\n");
   (void)up_irq_save();
   rtcb->pterrno = saved_errno;
 
diff --git a/arch/avr/src/common/up_exit.c b/arch/avr/src/common/up_exit.c
index 2ceb474129..73dd3bb353 100644
--- a/arch/avr/src/common/up_exit.c
+++ b/arch/avr/src/common/up_exit.c
@@ -77,8 +77,8 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
   int i;
 #endif
 
-  serr("  TCB=%p name=%s pid=%d\n", tcb, tcb->argv[0], tcb->pid);
-  serr("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
+  sinfo("  TCB=%p name=%s pid=%d\n", tcb, tcb->argv[0], tcb->pid);
+  sinfo("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
 
 #if CONFIG_NFILE_DESCRIPTORS > 0
   filelist = tcb->group->tg_filelist;
@@ -87,8 +87,8 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
       struct inode *inode = filelist->fl_files[i].f_inode;
       if (inode)
         {
-          serr("      fd=%d refcount=%d\n",
-               i, inode->i_crefs);
+          sinfo("      fd=%d refcount=%d\n",
+                i, inode->i_crefs);
         }
     }
 #endif
@@ -101,11 +101,11 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
       if (filep->fs_fd >= 0)
         {
 #if CONFIG_STDIO_BUFFER_SIZE > 0
-          serr("      fd=%d nbytes=%d\n",
-               filep->fs_fd,
-               filep->fs_bufpos - filep->fs_bufstart);
+          sinfo("      fd=%d nbytes=%d\n",
+                filep->fs_fd,
+                filep->fs_bufpos - filep->fs_bufstart);
 #else
-          serr("      fd=%d\n", filep->fs_fd);
+          sinfo("      fd=%d\n", filep->fs_fd);
 #endif
         }
     }
@@ -138,10 +138,10 @@ void _exit(int status)
 
   (void)up_irq_save();
 
-  sllerr("TCB=%p exiting\n", this_task());
+  sllinfo("TCB=%p exiting\n", this_task());
 
 #if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG_FEATURES)
-  sllerr("Other tasks:\n");
+  sllinfo("Other tasks:\n");
   sched_foreach(_up_dumponexit, NULL);
 #endif
 
diff --git a/arch/avr/src/common/up_initialize.c b/arch/avr/src/common/up_initialize.c
index 6171403c03..8f58cdcf6e 100644
--- a/arch/avr/src/common/up_initialize.c
+++ b/arch/avr/src/common/up_initialize.c
@@ -125,13 +125,13 @@ static void up_calibratedelay(void)
 {
   int i;
 
-  llerr("Beginning 100s delay\n");
+  llwarn("Beginning 100s delay\n");
   for (i = 0; i < 100; i++)
     {
       up_mdelay(1000);
     }
 
-  llerr("End 100s delay\n");
+  llwarn("End 100s delay\n");
 }
 #else
 # define up_calibratedelay()
-- 
GitLab


From 573b1d415c49cb990d34b6ddee9030b6ef4836a5 Mon Sep 17 00:00:00 2001
From: Frank Benkert 
Date: Tue, 14 Jun 2016 13:12:16 -0600
Subject: [PATCH 83/91] * SAMV7: SPI: SPI-Freq. 40MHz; VARSELECT; hw-features  
 This change adds the following improvements:   - Increase the allowed
 SPI-Frequency from 20 to 40 MHz.   - Correct and rename the "VARSELECT"
 option This option was included in the code as "CONFIG_SPI_VARSELECT" but
 nowhere  defined in a Kconfig file. The patch renames it to
 "CONFIG_SAMV7_SPI_VARSELECT" and corrects the implementation according the
 datasheet of Atmel. In short, this option switches the processor from "fixed
 peripheral selection" (single device) to "variable peripheral selection"
 (multiple devices on the bus).   - Add a new Function to the interface to
 control the timing and delays of the chip according the ChipSelect lines.
 This function can control the delay between the assertion of the ChipSelect
 and the first bit, between the last bit and the de-assertion of the
 ChipSelect and between two ChipSelects. This is needed to tune the transfer
 according the specification of the connected devices.   - Add three
 "hw-features" for the SAMV7, which controls the behavior of the ChipSelect:  
   1. force CS inactive after transfer: this forces a (short) de-assertion of
 the CS after a transfer, even if more data is       available in time     2.
 force CS active after transfer: this forces the CS to stay active after a
 transfer, even if the chip runs out of data. Btw.: this is a prerequisit to
 make the LASTXFER bit working at all.     - escape LASTXFER: this suppresses
 the LASTXFER bit at the end of the  next transfer. The "escape"-Flag is reset
 automatically.

---
 arch/arm/src/samv7/Kconfig   |  17 +++
 arch/arm/src/samv7/sam_spi.c | 286 +++++++++++++++++++++++++++++++++--
 drivers/spi/Kconfig          |  19 +++
 include/nuttx/spi/spi.h      |  51 ++++++-
 4 files changed, 359 insertions(+), 14 deletions(-)

diff --git a/arch/arm/src/samv7/Kconfig b/arch/arm/src/samv7/Kconfig
index 8b5c3b6870..763accea23 100644
--- a/arch/arm/src/samv7/Kconfig
+++ b/arch/arm/src/samv7/Kconfig
@@ -835,6 +835,23 @@ config SAMV7_SPI_CS_DECODING
 	---help---
 		Use Peripheral Chip Select Decoding on SPI Master
 
+config SAMV7_SPI_VARSELECT
+	bool "SPI Variable Peripheral Select Mode"
+	default n
+	---help---
+		When enabled, the spi device is working in the "Variable Peripheral
+		Select Mode" (VARMODE) instead of the "Fixed Peripheral Select Mode"
+		(FIXEDMODE).
+
+		In FIXEDMODE the ChipSelect is set (once) with a call to spi_select and
+		stays the same value all the time. In addition an eventually signaled
+		LASTXFER has to be written to the global control register (SPI_CR).
+		Within the VARMODE, the ChipSelect can be changed with each datablock
+		transferred via spi_exchange because it is encoded by the driver
+		within the data.
+
+		The same behavior applies for the LASTXFER bit.
+
 config SAMV7_SPI_DMA
 	bool "SPI DMA"
 	default n
diff --git a/arch/arm/src/samv7/sam_spi.c b/arch/arm/src/samv7/sam_spi.c
index 6168c78f9a..10ed7dd6aa 100644
--- a/arch/arm/src/samv7/sam_spi.c
+++ b/arch/arm/src/samv7/sam_spi.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/arm/src/samv7/sam_spi.c
  *
- *   Copyright (C) 2015=2016 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2015-2016 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt 
  *            Diego Sanchez 
  *
@@ -194,6 +194,7 @@ struct sam_spidev_s
   sem_t spisem;                /* Assures mutually exclusive access to SPI */
   select_t select;             /* SPI select call-out */
   bool initialized;            /* TRUE: Controller has been initialized */
+  bool escape_lastxfer;        /* Dont set LASTXFER-Bit in the next transfer */
 #ifdef CONFIG_SAMV7_SPI_DMA
   uint8_t pid;                 /* SPI peripheral ID */
 #endif
@@ -266,6 +267,12 @@ static int      spi_lock(struct spi_dev_s *dev, bool lock);
 static void     spi_select(struct spi_dev_s *dev, enum spi_dev_e devid,
                   bool selected);
 static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency);
+#ifdef CONFIG_SPI_CS_DELAY_CONTROL
+static int      spi_setdelay(struct spi_dev_s *dev, uint32_t a, uint32_t b, uint32_t c);
+#endif
+#ifdef CONFIG_SPI_HWFEATURES
+static int      spi_hwfeatures(struct spi_dev_s *dev, uint8_t features);
+#endif
 static void     spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode);
 static void     spi_setbits(struct spi_dev_s *dev, int nbits);
 static uint16_t spi_send(struct spi_dev_s *dev, uint16_t ch);
@@ -313,10 +320,13 @@ static const struct spi_ops_s g_spi0ops =
   .lock              = spi_lock,
   .select            = spi_select,
   .setfrequency      = spi_setfrequency,
+#ifdef CONFIG_SPI_CS_DELAY_CONTROL
+  .setdelay          = spi_setdelay,
+#endif
   .setmode           = spi_setmode,
   .setbits           = spi_setbits,
 #ifdef CONFIG_SPI_HWFEATURES
-  .hwfeatures        = 0,                 /* Not supported */
+  .hwfeatures        = spi_hwfeatures,
 #endif
   .status            = sam_spi0status,
 #ifdef CONFIG_SPI_CMDDATA
@@ -352,6 +362,9 @@ static const struct spi_ops_s g_spi1ops =
   .lock              = spi_lock,
   .select            = spi_select,
   .setfrequency      = spi_setfrequency,
+#ifdef CONFIG_SPI_CS_DELAY_CONTROL
+  .setdelay          = spi_setdelay,
+#endif
   .setmode           = spi_setmode,
   .setbits           = spi_setbits,
   .status            = sam_spi1status,
@@ -951,7 +964,18 @@ static void spi_select(struct spi_dev_s *dev, enum spi_dev_e devid,
 
       regval  = spi_getreg(spi, SAM_SPI_MR_OFFSET);
       regval &= ~SPI_MR_PCS_MASK;
+
+      /* SPI_VARSELECT means, that the ChipSelect for each device is set within
+       * the transferred data (SAM_SPI_TDR) instead inside the mode register
+       * (SAM_SPI_MR).
+       * In addition, the LASTXFER flag is also set within the transferred data
+       * (SAM_SPI_TDR) instead inside the control register (SAM_SPI_CR).
+       * (see spi_exchange)
+       */
+
+#ifndef CONFIG_SAMV7_SPI_VARSELECT
       regval |= (spi_cs2pcs(spics) << SPI_MR_PCS_SHIFT);
+#endif
       spi_putreg(spi, regval, SAM_SPI_MR_OFFSET);
     }
 
@@ -1016,9 +1040,9 @@ static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency)
 
   scbr = SAM_SPI_CLOCK / frequency;
 
-  if (scbr < 8)
+  if (scbr < 2)
     {
-      scbr = 8;
+      scbr = 2;
     }
   else if (scbr > 254)
     {
@@ -1079,6 +1103,189 @@ static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency)
   return actual;
 }
 
+/****************************************************************************
+ * Name: spi_setdelay
+ *
+ * Description:
+ *   Set the SPI Delays in nanoseconds. Optional.
+ *
+ * Input Parameters:
+ *   dev        - Device-specific state data
+ *   startdelay - The delay between CS active and first CLK
+ *   stopdelay  - The delay between last CLK and CS inactive
+ *   csdelay    - The delay between CS inactive and CS active again
+ *
+ * Returned Value:
+ *   Returns 0 if ok
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_SPI_CS_DELAY_CONTROL
+static int spi_setdelay(struct spi_dev_s *dev, uint32_t startdelay,
+                        uint32_t stopdelay, uint32_t csdelay)
+{
+  struct sam_spics_s *spics = (struct sam_spics_s *)dev;
+  struct sam_spidev_s *spi = spi_device(spics);
+  uint64_t dlybs;
+  uint64_t dlybct;
+  uint64_t dlybcs;
+  uint32_t regval;
+  unsigned int offset;
+
+  spivdbg("cs=%d startdelay=%d\n", spics->cs, startdelay);
+  spivdbg("cs=%d stopdelay=%d\n", spics->cs, stopdelay);
+  spivdbg("cs=%d csdelay=%d\n", spics->cs, csdelay);
+
+  offset = (unsigned int)g_csroffset[spics->cs];
+
+  /* startdelay = DLYBS: Delay Before SPCK.
+   * This field defines the delay from NPCS valid to the first valid SPCK
+   * transition. When DLYBS equals zero, the NPCS valid to SPCK transition is
+   * 1/2 the SPCK clock period.
+   * Otherwise, the following equations determine the delay:
+   *
+   *   Delay Before SPCK = DLYBS / SPI_CLK
+   *
+   * For a 2uS delay
+   *
+   *   DLYBS = SPI_CLK * 0.000002 = SPI_CLK / 500000
+   *
+   * TODO: Check for boundaries!
+   */
+
+  dlybs   = SAM_SPI_CLOCK;
+  dlybs  *= startdelay;
+  dlybs  /= 1000000000;
+  regval  = spi_getreg(spi, offset);
+  regval &= ~SPI_CSR_DLYBS_MASK;
+  regval |= (uint32_t) dlybs << SPI_CSR_DLYBS_SHIFT;
+
+  /* stopdelay = DLYBCT: Delay Between Consecutive Transfers.
+   * This field defines the delay between two consecutive transfers with the
+   * same peripheral without removing the chip select. The delay is always
+   * inserted after each transfer and before removing the chip select if
+   * needed.
+   *
+   *   Delay Between Consecutive Transfers = (32 x DLYBCT) / SPI_CLK
+   *
+   * For a 5uS delay:
+   *
+   *   DLYBCT = SPI_CLK * 0.000005 / 32 = SPI_CLK / 200000 / 32
+   */
+
+  dlybct  = SAM_SPI_CLOCK;
+  dlybct *= stopdelay;
+  dlybct /= 1000000000;
+  dlybct /= 32;
+  regval  = spi_getreg(spi, offset);
+  regval &= ~SPI_CSR_DLYBCT_MASK;
+  regval |= (uint32_t) dlybct << SPI_CSR_DLYBCT_SHIFT;
+  spi_putreg(spi, regval, offset);
+
+  /* csdelay = DLYBCS: Delay Between Chip Selects.
+   * This field defines the delay between the inactivation and the activation
+   * of NPCS. The DLYBCS time guarantees non-overlapping chip selects and
+   * solves bus contentions in case of peripherals having long data float
+   * times. If DLYBCS is lower than 6, six peripheral clock periods are
+   * inserted by default.
+   *
+   *   Delay Between Chip Selects = DLYBCS / SPI_CLK
+   *
+   *   DLYBCS = SPI_CLK * Delay
+   */
+  dlybcs  = SAM_SPI_CLOCK;
+  dlybcs *= csdelay;
+  dlybcs /= 1000000000;
+  regval  = spi_getreg(spi, SAM_SPI_MR_OFFSET);
+  regval &= ~SPI_MR_DLYBCS_MASK;
+  regval |= dlybcs << SPI_MR_DLYBCS_SHIFT;
+  spi_putreg(spi, regval, SAM_SPI_MR_OFFSET);
+
+  return 0;
+}
+#endif
+
+/****************************************************************************
+ * Name: spi_hwfeatures
+ *
+ * Description:
+ *   Use some super-special hardware Features. Optional.
+ *
+ * Input Parameters:
+ *   dev      -  Device-specific state data
+ *   features -  Bitmask of the activated features
+ *
+ * Returned Value:
+ *   Returns 0 if ok
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_SPI_HWFEATURES
+static int spi_hwfeatures(struct spi_dev_s *dev, uint8_t features)
+{
+  struct sam_spics_s *spics = (struct sam_spics_s *)dev;
+  struct sam_spidev_s *spi = spi_device(spics);
+  uint32_t regval;
+  unsigned int offset;
+
+  /* CS rises after every Transmission, also if we provide new data
+   * immediately.
+   */
+
+  if (features & HWFEAT_FORCE_CS_INACTIVE_AFTER_TRANSFER)
+    {
+      offset  = (unsigned int)g_csroffset[spics->cs];
+      regval  = spi_getreg(spi, offset);
+      regval |= SPI_CSR_CSNAAT; /* Chip Select Not Active After Transfer */
+      regval &= ~SPI_CSR_CSAAT; /* Chip Select Active After Transfer */
+      spi_putreg(spi, regval, offset);
+    }
+  else
+    {
+      offset  = (unsigned int)g_csroffset[spics->cs];
+      regval  = spi_getreg(spi, offset);
+      regval &= ~SPI_CSR_CSNAAT; /* Chip Select Not Active After Transfer */
+      spi_putreg(spi, regval, offset);
+    }
+
+  /* CS does not rise automatically after a transmission, also if the spi runs
+   * out of data (for a long time)
+   */
+
+  if ((features & HWFEAT_FORCE_CS_ACTIVE_AFTER_TRANSFER) != 0)
+    {
+      offset  = (unsigned int)g_csroffset[spics->cs];
+      regval  = spi_getreg(spi, offset);
+      regval &= ~SPI_CSR_CSNAAT; /* Chip Select Not Active After Transfer */
+      regval |= SPI_CSR_CSAAT; /* Chip Select Active After Transfer */
+      spi_putreg(spi, regval, offset);
+    }
+  else
+    {
+      offset  = (unsigned int)g_csroffset[spics->cs];
+      regval  = spi_getreg(spi, offset);
+      regval &= ~SPI_CSR_CSAAT; /* Chip Select Not Active After Transfer */
+      spi_putreg(spi, regval, offset);
+    }
+
+  /* Do not set the LASTXFER-Bit at the last word of the next exchange,
+   * Flag is auto-resetting after the next LASTXFER condition.
+   * (see spi_exchange)
+   */
+
+  if ((features & HWFEAT_ESCAPE_LASTXFER) != 0)
+    {
+      spi->escape_lastxfer = true;
+    }
+  else
+    {
+      spi->escape_lastxfer = false;
+    }
+
+  return 0;
+}
+#endif
+
 /****************************************************************************
  * Name: spi_setmode
  *
@@ -1191,7 +1398,9 @@ static void spi_setbits(struct spi_dev_s *dev, int nbits)
 
       spiinfo("csr[offset=%02x]=%08x\n", offset, regval);
 
-      /* Save the selection so the subsequence re-configurations will be faster */
+      /* Save the selection so the subsequence re-configurations will be
+       * faster.
+       */
 
       spics->nbits = nbits;
     }
@@ -1347,16 +1556,37 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
           data = 0xffff;
         }
 
+      /* SPI_VARSELECT means, that the ChipSelect for each device is set within
+       * the transferred data (SAM_SPI_TDR) instead inside the mode register
+       * (SAM_SPI_MR).
+       * In addition, the LASTXFER flag is also set within the transferred data
+       * (SAM_SPI_TDR) instead inside the control register (SAM_SPI_CR).
+       */
+
+#ifdef CONFIG_SAMV7_SPI_VARSELECT
       /* Set the PCS field in the value written to the TDR */
 
       data |= pcs;
 
       /* Do we need to set the LASTXFER bit in the TDR value too? */
 
-#ifdef CONFIG_SPI_VARSELECT
       if (nwords == 1)
         {
-          data |= SPI_TDR_LASTXFER;
+          if (spi->escape_lastxfer == false)
+            {
+              /* According the data sheet (SAME70 Rev. 2016-01) this LASTXFER
+               * bit has no effect without also setting CSAAT.
+               * (see HWFEAT_FORCE_CS_ACTIVE_AFTER_TRANSFER)
+               */
+
+               data |= SPI_TDR_LASTXFER;
+            }
+          else
+            {
+              /* the escaping should only prevent ONE last-xfer */
+
+              spi->escape_lastxfer = false;
+            }
         }
 #endif
 
@@ -1370,6 +1600,32 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
 
       spi_putreg(spi, data, SAM_SPI_TDR_OFFSET);
 
+#ifndef CONFIG_SAMV7_SPI_VARSELECT
+      /* To de-assert the chip select line at the end of the transfer, the
+       * Last Transfer (LASTXFER) bit in SPI_CR must be set after writing the
+       * last data to transmit into SPI_TDR.
+       */
+
+      if (nwords == 1)
+        {
+          if (spi->escape_lastxfer == false)
+            {
+              /* According the datasheet (SAME70 Rev. 2016-01) this LASTXFER
+               * bit has no effect without also setting CSAAT.
+               * (see HWFEAT_FORCE_CS_ACTIVE_AFTER_TRANSFER)
+               */
+
+              spi_putreg(spi, SPI_CR_LASTXFER, SAM_SPI_CR_OFFSET);
+            }
+          else
+            {
+              /* the escaping should only prevent ONE last-xfer */
+
+              spi->escape_lastxfer = false;
+            }
+        }
+#endif
+
       /* Wait for the read data to be available in the RDR.
        * TODO:  Data transfer rates would be improved using the RX FIFO
        *        (and also DMA)
@@ -1870,15 +2126,22 @@ FAR struct spi_dev_s *sam_spibus_initialize(int port)
 
       /* Configure the SPI mode register */
 
+      regval = SPI_MR_MSTR | SPI_MR_MODFDIS;
+
 #if defined(CONFIG_SAMV7_SPI_CS_DECODING)
       /* Enable Peripheral Chip Select Decoding? */
 
-      spi_putreg(spi, SPI_MR_MSTR | SPI_MR_MODFDIS | SPI_MR_PCSDEC,
-                 SAM_SPI_MR_OFFSET);
-#else
-      spi_putreg(spi, SPI_MR_MSTR | SPI_MR_MODFDIS, SAM_SPI_MR_OFFSET);
+      regval |= SPI_MR_PCSDEC;
+#endif
+
+# ifdef CONFIG_SAMV7_SPI_VARSELECT
+      /* Enable Variable Peripheral Selection? */
+
+      regval |= SPI_MR_PS;
 #endif
 
+      spi_putreg(spi, regval, SAM_SPI_MR_OFFSET);
+
       /* And enable the SPI */
 
       spi_putreg(spi, SPI_CR_SPIEN, SAM_SPI_CR_OFFSET);
@@ -1894,6 +2157,7 @@ FAR struct spi_dev_s *sam_spibus_initialize(int port)
        */
 
       sem_init(&spi->spisem, 0, 1);
+      spi->escape_lastxfer = false;
       spi->initialized = true;
 
 #ifdef CONFIG_SAMV7_SPI_DMA
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index b4c8e93bbc..ff38027e39 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -71,6 +71,25 @@ config SPI_CRCGENERATION
 		generation of SPI CRCs.  Enables the HWFEAT_CRCGENERATION option
 		as well as the hwfeartures() interface method.
 
+config SPI_CS_CONTROL
+	bool "SPI CS Behavior Control"
+	default n
+	select SPI_HWFEATURES
+	---help---
+		Enables possibilities to define the behavior of CS.
+		Also enables the hwfeatures() interface method.
+
+config SPI_CS_DELAY_CONTROL
+	bool "SPI CS Delay Control"
+	default n
+	---help---
+		Enables possibilities to define the SPI-ChipSelect-Delays like
+		time between ChipSelect assertion and first Data-Bit, the time
+		between the last Data-Bit and the de-assertion and the minimum
+		delay between two ChipSelects.
+
+		This option enables the setdelay() interface method.
+
 if SPI_BITBANG
 
 config SPI_BITBANG_VARWIDTH
diff --git a/include/nuttx/spi/spi.h b/include/nuttx/spi/spi.h
index 5daacd3005..45b041ffba 100644
--- a/include/nuttx/spi/spi.h
+++ b/include/nuttx/spi/spi.h
@@ -127,6 +127,27 @@
 
 #define SPI_SETFREQUENCY(d,f) ((d)->ops->setfrequency(d,f))
 
+/****************************************************************************
+ * Name: SPI_SETDELAY
+ *
+ * Description:
+ *   Set the SPI Delays in nanoseconds. Optional.
+ *
+ * Input Parameters:
+ *   dev        - Device-specific state data
+ *   startdelay - The delay between CS active and first CLK
+ *   stopdelay  - The delay between last CLK and CS inactive
+ *   csdelay    - The delay between CS inactive and CS active again
+ *
+ * Returned Value:
+ *   Returns the actual frequency selected
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_SPI_CS_DELAY_CONTROL
+#  define SPI_SETDELAY(d,a,b,c) ((d)->ops->setdelay(d,a,b,c))
+#endif
+
 /****************************************************************************
  * Name: SPI_SETMODE
  *
@@ -189,15 +210,35 @@
 #  define SPI_HWFEATURES(d,f) \
   (((d)->ops->hwfeatures) ? (d)->ops->hwfeatures(d,f) : ((f) == 0 ? OK : -ENOSYS))
 
-  /* These are currently defined feature flags */
+  /* These are currently defined feature flags:
+   *
+   *   Bit 0: HWFEAT_CRCGENERATION
+   *          Hardware CRC generation
+   *   Bit 1: HWFEAT_FORCE_CS_INACTIVE_AFTER_TRANSFER
+   *          CS rises after every Transmission, also if we provide new data
+   *          immediately
+   *   Bit 2: HWFEAT_FORCE_CS_ACTIVE_AFTER_TRANSFER
+   *          CS does not rise automatically after a transmission, also if
+   *          the spi runs out of data (for a long time)
+   *   Bit 3: HWFEAT_ESCAPE_LASTXFER
+   *          Do not set the LASTXFER-Bit at the last word of the next
+   *          exchange, Flag is auto-resetting after the next LASTXFER
+   *          condition. (see spi_exchange)
+   */
 
 #  ifdef CONFIG_SPI_CRCGENERATION
-#    HWFEAT_CRCGENERATION (1 << 0) /* Bit 0: Hardward CRC generation */
+#    define HWFEAT_CRCGENERATION                     (1 << 0)
+#  endif
+
+#  ifdef CONFIG_SPI_CS_CONTROL
+#    define HWFEAT_FORCE_CS_INACTIVE_AFTER_TRANSFER  (1 << 1)
+#    define HWFEAT_FORCE_CS_ACTIVE_AFTER_TRANSFER    (1 << 2)
+#    define HWFEAT_ESCAPE_LASTXFER                   (1 << 3)
 #  endif
 
 #else
   /* Any attempt to select hardware features with CONFIG_SPI_HWFEATURES
-   * deselected will cause an assertion.
+   * deselected will return an -ENOSYS error.
    */
 
 #  define SPI_HWFEATURES(d,f) (((f) == 0) ? OK : -ENOSYS)
@@ -431,6 +472,10 @@ struct spi_ops_s
   CODE void     (*select)(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
                   bool selected);
   CODE uint32_t (*setfrequency)(FAR struct spi_dev_s *dev, uint32_t frequency);
+#ifdef CONFIG_SPI_CS_DELAY_CONTROL
+  CODE int      (*setdelay)(FAR struct spi_dev_s *dev, uint32_t a, uint32_t b,
+                  uint32_t c);
+#endif
   CODE void     (*setmode)(FAR struct spi_dev_s *dev, enum spi_mode_e mode);
   CODE void     (*setbits)(FAR struct spi_dev_s *dev, int nbits);
 #ifdef CONFIG_SPI_HWFEATURES
-- 
GitLab


From c384f33ac97264ea7f8e89a65c120ed938b0b928 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 14 Jun 2016 13:24:28 -0600
Subject: [PATCH 84/91] Update ChangeLog

---
 ChangeLog | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 88b34ff733..d7c18ea014 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -12005,3 +12005,43 @@
 	  system debug output. It enables general file system debug logic and
 	  enables selection of CONFIG_DEBUG_FS_ERROR, CONFIG_DEBUG_FS_WARN,
 	  and CONFIG_DEBUG_FS_INFO (2016-06-12).
+	* strtoul() and strtoull():  Fix errno settings required by function
+	  definition.  Resolved Bitbucket Issue #1. From Sebastien Lorquet
+	  (2016-06-13)
+	* arch/arm/src/stm32f7:  Add SPI driver.  DMA not yet supported.  From
+	  David Sidrane (2016-06-14).
+	* configs/nucleo-144:  Add test for STM32 F7 SPI.  From David Sidrane
+	  (2016-06-14).
+	* alert(): New debug macro: alert().  This is high priority,
+	  unconditional output and is used to simplify and stanardize crash
+	  error reporting(2016-06-14).
+	* arch/arm/src/tiva: Bug Fix in tiva_serial.c - UART5, UART6 and UART7
+	  were not being configured as TTYS0 for printing over serial console.
+	  From Shirshak Sengupta (2016-06-14).
+	* SAMV7: SPI: SPI-Freq. 40MHz; VARSELECT; hw-features
+	  This change adds the following improvements:
+	  - Increase the allowed SPI-Frequency from 20 to 40 MHz.
+	  - Correct and rename the "VARSELECT" option
+	    This option was included in the code as "CONFIG_SPI_VARSELECT" but
+	    nowhere  defined in a Kconfig file. The patch renames it to
+	    "CONFIG_SAMV7_SPI_VARSELECT" and corrects the implementation
+	    according the datasheet of Atmel. In short, this option switches
+	    the processor from "fixed peripheral selection" (single device) to
+	    "variable peripheral selection" (multiple devices on the bus).
+	  - Add a new Function to the interface to control the timing and delays
+	    of the chip according the ChipSelect lines. This function can
+	    control the delay between the assertion of the ChipSelect and the
+	    first bit, between the last bit and the de-assertion of the
+	    ChipSelect and between two ChipSelects. This is needed to tune the
+	    transfer according the specification of the connected devices.  
+	  - Add three "hw-features" for the SAMV7, which controls the behavior
+	    of the ChipSelect:
+	    - force CS inactive after transfer: this forces a (short)
+	      de-assertion of the CS after a transfer, even if more data is
+	      available in time
+	    - force CS active after transfer: this forces the CS to stay active
+	      after a transfer, even if the chip runs out of data.
+	      Btw.: this is a prerequisit to make the LASTXFER bit working at all.
+	    - escape LASTXFER: this suppresses the LASTXFER bit at the end of the
+	      next transfer. The "escape"-Flag is reset automatically.
+	  From Frank Benkert (2016-06-14)
-- 
GitLab


From a97d8378c9809b7028b7ac022602fc7adde01b1e Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 14 Jun 2016 15:48:40 -0600
Subject: [PATCH 85/91] Remove some excessive, redundant debug info per request
 of antin Berezenko

---
 ChangeLog                                   |  2 +-
 arch/arm/src/tiva/chip/tm4c129_syscontrol.h |  2 +-
 drivers/leds/pca9635pw.c                    | 22 ++++-----------------
 3 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d7c18ea014..d4085fd5db 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -12023,7 +12023,7 @@
 	  - Increase the allowed SPI-Frequency from 20 to 40 MHz.
 	  - Correct and rename the "VARSELECT" option
 	    This option was included in the code as "CONFIG_SPI_VARSELECT" but
-	    nowhere  defined in a Kconfig file. The patch renames it to
+	    nowhere  defined in a Kconfig file. The change renames it to
 	    "CONFIG_SAMV7_SPI_VARSELECT" and corrects the implementation
 	    according the datasheet of Atmel. In short, this option switches
 	    the processor from "fixed peripheral selection" (single device) to
diff --git a/arch/arm/src/tiva/chip/tm4c129_syscontrol.h b/arch/arm/src/tiva/chip/tm4c129_syscontrol.h
index 5a4886ec6c..928be38e95 100644
--- a/arch/arm/src/tiva/chip/tm4c129_syscontrol.h
+++ b/arch/arm/src/tiva/chip/tm4c129_syscontrol.h
@@ -254,7 +254,7 @@
 #define TIVA_SYSCON_UNIQUEID2_OFFSET   0x0f28 /* Unique ID 2 */
 #define TIVA_SYSCON_UNIQUEID3_OFFSET   0x0f2c /* Unique ID 3 */
 
-/*( CCM System Control Registers (CCM Control Offset) */
+/* CCM System Control Registers (CCM Control Offset) */
 
 #define TIVA_SYSCON_CCMCGREQ_OFFSET    0x0204 /* Cryptographic Modules Clock Gating Request */
 
diff --git a/drivers/leds/pca9635pw.c b/drivers/leds/pca9635pw.c
index 62cf0c1cbf..b0820e17f3 100644
--- a/drivers/leds/pca9635pw.c
+++ b/drivers/leds/pca9635pw.c
@@ -53,14 +53,12 @@
  ****************************************************************************/
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define derr llerr
-#  ifdef CONFIG_DEBUG_INFO
-#    define dinfo llinfo
-#  else
-#    define dinfo(x...)
-#  endif
+#  define derr  llerr
+#  define dwarn llwarn
+#  define dinfo llinfo
 #else
 #  define derr(x...)
+#  define dwarn(x...)
 #  define dinfo(x...)
 #endif
 
@@ -121,8 +119,6 @@ static int pca9635pw_i2c_write_byte(FAR struct pca9635pw_dev_s *priv,
 {
   struct i2c_config_s config;
 
-  dinfo("pca9635pw_i2c_write_byte\n");
-
   /* assemble the 2 byte message comprised of reg_addr and reg_val */
 
   uint8_t const BUFFER_SIZE = 2;
@@ -142,7 +138,6 @@ static int pca9635pw_i2c_write_byte(FAR struct pca9635pw_dev_s *priv,
   dinfo("i2c addr: 0x%02X reg addr: 0x%02X value: 0x%02X\n", priv->i2c_addr,
         buffer[0], buffer[1]);
 
-
   ret = i2c_write(priv->i2c, &config, buffer, BUFFER_SIZE);
   if (ret != OK)
     {
@@ -189,11 +184,8 @@ static int pca9635pw_set_led_mode(FAR struct pca9635pw_dev_s *priv,
 
 static int pca9635pw_open(FAR struct file *filep)
 {
-  dinfo("pca9635pw_open\n");
-
   FAR struct inode *inode = filep->f_inode;
   FAR struct pca9635pw_dev_s *priv = inode->i_private;
-
   int ret = -1;
 
   /* Wake up the PCA9635PW (sleep bit PCA9635PW_MODE_1_SLEEP is set to zero
@@ -261,11 +253,8 @@ static int pca9635pw_open(FAR struct file *filep)
 
 static int pca9635pw_close(FAR struct file *filep)
 {
-  dinfo("pca9635pw_close\n");
-
   FAR struct inode *inode = filep->f_inode;
   FAR struct pca9635pw_dev_s *priv = inode->i_private;
-
   int ret = -1;
 
   /* Turn all led drivers off */
@@ -301,11 +290,8 @@ static int pca9635pw_close(FAR struct file *filep)
 
 static int pca9635pw_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 {
-  dinfo("pca9635pw_ioctl\n");
-
   FAR struct inode *inode = filep->f_inode;
   FAR struct pca9635pw_dev_s *priv = inode->i_private;
-
   int ret = OK;
 
   dinfo("cmd: %d arg: %ld\n", cmd, arg);
-- 
GitLab


From a308ea553bdd375877b99f69b5642039f01f1549 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 14 Jun 2016 15:48:40 -0600
Subject: [PATCH 86/91] Remove some excessive, redundant debug info per request
 of antin Berezenko.  See Issue #8.

---
 ChangeLog                                   |  2 +-
 arch/arm/src/tiva/chip/tm4c129_syscontrol.h |  2 +-
 drivers/leds/pca9635pw.c                    | 22 ++++-----------------
 3 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d7c18ea014..d4085fd5db 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -12023,7 +12023,7 @@
 	  - Increase the allowed SPI-Frequency from 20 to 40 MHz.
 	  - Correct and rename the "VARSELECT" option
 	    This option was included in the code as "CONFIG_SPI_VARSELECT" but
-	    nowhere  defined in a Kconfig file. The patch renames it to
+	    nowhere  defined in a Kconfig file. The change renames it to
 	    "CONFIG_SAMV7_SPI_VARSELECT" and corrects the implementation
 	    according the datasheet of Atmel. In short, this option switches
 	    the processor from "fixed peripheral selection" (single device) to
diff --git a/arch/arm/src/tiva/chip/tm4c129_syscontrol.h b/arch/arm/src/tiva/chip/tm4c129_syscontrol.h
index 5a4886ec6c..928be38e95 100644
--- a/arch/arm/src/tiva/chip/tm4c129_syscontrol.h
+++ b/arch/arm/src/tiva/chip/tm4c129_syscontrol.h
@@ -254,7 +254,7 @@
 #define TIVA_SYSCON_UNIQUEID2_OFFSET   0x0f28 /* Unique ID 2 */
 #define TIVA_SYSCON_UNIQUEID3_OFFSET   0x0f2c /* Unique ID 3 */
 
-/*( CCM System Control Registers (CCM Control Offset) */
+/* CCM System Control Registers (CCM Control Offset) */
 
 #define TIVA_SYSCON_CCMCGREQ_OFFSET    0x0204 /* Cryptographic Modules Clock Gating Request */
 
diff --git a/drivers/leds/pca9635pw.c b/drivers/leds/pca9635pw.c
index 62cf0c1cbf..b0820e17f3 100644
--- a/drivers/leds/pca9635pw.c
+++ b/drivers/leds/pca9635pw.c
@@ -53,14 +53,12 @@
  ****************************************************************************/
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define derr llerr
-#  ifdef CONFIG_DEBUG_INFO
-#    define dinfo llinfo
-#  else
-#    define dinfo(x...)
-#  endif
+#  define derr  llerr
+#  define dwarn llwarn
+#  define dinfo llinfo
 #else
 #  define derr(x...)
+#  define dwarn(x...)
 #  define dinfo(x...)
 #endif
 
@@ -121,8 +119,6 @@ static int pca9635pw_i2c_write_byte(FAR struct pca9635pw_dev_s *priv,
 {
   struct i2c_config_s config;
 
-  dinfo("pca9635pw_i2c_write_byte\n");
-
   /* assemble the 2 byte message comprised of reg_addr and reg_val */
 
   uint8_t const BUFFER_SIZE = 2;
@@ -142,7 +138,6 @@ static int pca9635pw_i2c_write_byte(FAR struct pca9635pw_dev_s *priv,
   dinfo("i2c addr: 0x%02X reg addr: 0x%02X value: 0x%02X\n", priv->i2c_addr,
         buffer[0], buffer[1]);
 
-
   ret = i2c_write(priv->i2c, &config, buffer, BUFFER_SIZE);
   if (ret != OK)
     {
@@ -189,11 +184,8 @@ static int pca9635pw_set_led_mode(FAR struct pca9635pw_dev_s *priv,
 
 static int pca9635pw_open(FAR struct file *filep)
 {
-  dinfo("pca9635pw_open\n");
-
   FAR struct inode *inode = filep->f_inode;
   FAR struct pca9635pw_dev_s *priv = inode->i_private;
-
   int ret = -1;
 
   /* Wake up the PCA9635PW (sleep bit PCA9635PW_MODE_1_SLEEP is set to zero
@@ -261,11 +253,8 @@ static int pca9635pw_open(FAR struct file *filep)
 
 static int pca9635pw_close(FAR struct file *filep)
 {
-  dinfo("pca9635pw_close\n");
-
   FAR struct inode *inode = filep->f_inode;
   FAR struct pca9635pw_dev_s *priv = inode->i_private;
-
   int ret = -1;
 
   /* Turn all led drivers off */
@@ -301,11 +290,8 @@ static int pca9635pw_close(FAR struct file *filep)
 
 static int pca9635pw_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 {
-  dinfo("pca9635pw_ioctl\n");
-
   FAR struct inode *inode = filep->f_inode;
   FAR struct pca9635pw_dev_s *priv = inode->i_private;
-
   int ret = OK;
 
   dinfo("cmd: %d arg: %ld\n", cmd, arg);
-- 
GitLab


From 787af112a2c697d7f5b7334ebc2ba28d9b3b133a Mon Sep 17 00:00:00 2001
From: Konstantin Berezenko 
Date: Tue, 14 Jun 2016 15:09:30 -0700
Subject: [PATCH 87/91] Add RGB driver NCP5623C

---
 drivers/leds/Kconfig    |   8 +
 drivers/leds/Make.defs  |   5 +
 drivers/leds/ncp5623c.c | 462 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 475 insertions(+)
 create mode 100644 drivers/leds/ncp5623c.c

diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 5a673606fc..edcbb97528 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -56,4 +56,12 @@ config PCA9635PW
 		Enable support for the NXP PCA9635PW LED driver which can be
 		utilized to drive up to 16 LED's.
 
+config NCP5623C
+	bool "NCP5623C I2C LED Driver"
+	default n
+	select I2C
+	---help---
+		Enable support for the onsemi NCP5623C LED driver which can be
+		utilized to drive up to 3 LED's.
+
 endmenu # LED Support
diff --git a/drivers/leds/Make.defs b/drivers/leds/Make.defs
index 794ba4202c..3c1a929ab8 100644
--- a/drivers/leds/Make.defs
+++ b/drivers/leds/Make.defs
@@ -61,6 +61,11 @@ ifeq ($(CONFIG_PCA9635PW),y)
   LEDDEPATH = --dep-path leds
   LEDVPATH = :leds
 endif
+ifeq ($(CONFIG_NCP5623C),y)
+  CSRCS += ncp5623c.c
+  LEDDEPATH = --dep-path leds
+  LEDVPATH = :leds
+endif
 
 # Include LED build support (if any LED drivers were selected)
 
diff --git a/drivers/leds/ncp5623c.c b/drivers/leds/ncp5623c.c
new file mode 100644
index 0000000000..82e86d00ed
--- /dev/null
+++ b/drivers/leds/ncp5623c.c
@@ -0,0 +1,462 @@
+/****************************************************************************
+ * drivers/leds/ncp5623c.c
+ * based on drivers/leds/pca9635pw.c
+ *
+ *   Author: Konstantin Berzenko 
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include 
+
+#include 
+#include 
+
+#include 
+#include 
+#include 
+
+#if defined(CONFIG_I2C) && defined(CONFIG_NCP5623C)
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#ifdef CONFIG_DEBUG_LEDS
+#  define derr llerr
+#  ifdef CONFIG_DEBUG_INFO
+#    define dinfo llinfo
+#  else
+#    define dinfo(x...)
+#  endif
+#else
+#  define derr(x...)
+#  define dinfo(x...)
+#endif
+
+/****************************************************************************
+ * Private Type Definitions
+ ****************************************************************************/
+
+struct ncp5623c_dev_s
+{
+  FAR struct i2c_master_s *i2c;
+  uint8_t i2c_addr;
+};
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static int ncp5623c_i2c_write_byte(FAR struct ncp5623c_dev_s *priv,
+                                    uint8_t const reg_addr,
+                                    uint8_t const reg_val);
+
+static int ncp5623c_open(FAR struct file *filep);
+static int ncp5623c_close(FAR struct file *filep);
+static int ncp5623c_ioctl(FAR struct file *filep, int cmd, unsigned long arg);
+static ssize_t ncp5623c_read(FAR struct file *filep, FAR char *buffer,
+                 size_t buflen);
+static ssize_t ncp5623c_write(FAR struct file *filep, FAR const char *buffer,
+                 size_t buflen);
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static const struct file_operations g_ncp5623c_fileops =
+{
+  ncp5623c_open,               /* open */
+  ncp5623c_close,              /* close */
+  ncp5623c_read,               /* read */
+  ncp5623c_write,              /* write */
+  0,                           /* seek */
+  ncp5623c_ioctl,              /* ioctl */
+  0                            /* poll */
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: ncp5623c_i2c_write_byte
+ *
+ * Description:
+ *   Write a single byte to one of the NCP5623C configuration registers.
+ *
+ ****************************************************************************/
+
+static int ncp5623c_i2c_write_byte(FAR struct ncp5623c_dev_s *priv,
+                                    uint8_t const reg_addr,
+                                    uint8_t const reg_val)
+{
+  struct i2c_config_s config;
+  int ret = OK;
+
+  /* assemble the 1 byte message comprised of reg_val */
+
+  uint8_t const BUFFER_SIZE = 1;
+  uint8_t buffer[BUFFER_SIZE];
+
+  buffer[0] = NCP5623C_SET_REG(reg_addr, reg_val);
+
+  /* Setup up the I2C configuration */
+
+  config.frequency = I2C_BUS_FREQ_HZ;
+  config.address   = priv->i2c_addr;
+  config.addrlen   = 7;
+
+  /* Write the data (no RESTART) */
+
+  dinfo("i2c addr: 0x%02X value: 0x%02X\n", priv->i2c_addr,
+      buffer[0]);
+
+
+  ret = i2c_write(priv->i2c, &config, buffer, BUFFER_SIZE);
+  if (ret != OK)
+    {
+      derr("i2c_write returned error code %d\n", ret);
+      return ret;
+    }
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: ncp5623c_open
+ *
+ * Description:
+ *   This function is called whenever a NCP5623C device is opened.
+ *
+ ****************************************************************************/
+
+static int ncp5623c_open(FAR struct file *filep)
+{
+  dinfo("ncp5623c_open\n");
+
+  FAR struct inode *inode = filep->f_inode;
+  FAR struct ncp5623c_dev_s *priv = inode->i_private;
+
+  int ret = -1;
+
+  /*  shutdown the NCP5623C */
+
+  ret = ncp5623c_i2c_write_byte(priv, NCP5623C_SHUTDOWN,
+                                 0x00);
+  if (ret != OK)
+    {
+      derr("Could not shut down the NCP5623C\n");
+      return ret;
+    }
+
+  /*  Set up Max current */
+
+  ret = ncp5623c_i2c_write_byte(priv, NCP5623C_ILED,
+											0x1F);
+  if (ret != OK)
+    {
+      derr("Could not set up max current\n");
+      return ret;
+    }
+
+ // let the chip settle a bit
+ usleep(1);
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: ncp5623c_close
+ *
+ * Description:
+ *   This function is called whenever a NCP5623C device is closed.
+ *
+ ****************************************************************************/
+
+static int ncp5623c_close(FAR struct file *filep)
+{
+  dinfo("ncp5623c_close\n");
+
+  FAR struct inode *inode = filep->f_inode;
+  FAR struct ncp5623c_dev_s *priv = inode->i_private;
+
+  int ret = -1;
+
+  /* shut down NCP5623C */
+
+  ret =ncp5623c_i2c_write_byte(priv, NCP5623C_SHUTDOWN,
+                                0x00);
+  if (ret != OK)
+    {
+      return ret;
+    }
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: ncp5623c_ioctl
+ *
+ * Description:
+ *   This function is called whenever an ioctl call to a NCP5623C is performed.
+ *
+ ****************************************************************************/
+
+static int ncp5623c_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
+{
+  FAR struct inode *inode = filep->f_inode;
+  FAR struct ncp5623c_dev_s *priv = inode->i_private;
+
+  int ret = OK;
+
+  dinfo("cmd: %d arg: %ld\n", cmd, arg);
+
+  switch (cmd)
+    {
+    case LEDIOC_SET_REG:
+      {
+        /* Retrieve the information handed over as argument for this ioctl */
+
+        FAR const struct ncp5623c_set_reg_s *ptr =
+          (FAR const struct ncp5623c_set_reg_s *)((uintptr_t)arg);
+
+        DEBUGASSERT(ptr != NULL);
+        if (ptr->reg > NCP5623C_MAX_REG) {
+          derr("Unrecognized register: %d\n", ptr->reg);
+          ret = -EFAULT;
+          break;
+        }
+
+        ret = ncp5623c_i2c_write_byte(priv, ptr->reg, ptr->val);
+      }
+      break;
+
+      /* The used ioctl command was invalid */
+
+    default:
+      {
+        derr("Unrecognized cmd: %d\n", cmd);
+        ret = -ENOTTY;
+      }
+      break;
+    }
+
+  return ret;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: ncp5623c_register
+ *
+ * Description:
+ *   Register the NCP5623C device as 'devpath'
+ *
+ * Input Parameters:
+ *   devpath - The full path to the driver to register. E.g., "/dev/rgbdrv0".
+ *   i2c     - An instance of the I2C interface to use to communicate
+ *             with the LED driver.
+ *   ncp5623c_i2c_addr
+ *           - The I2C address of the NCP5623C.
+ *
+ * Returned Value:
+ *   Zero (OK) on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+int ncp5623c_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
+                       uint8_t const ncp5623c_i2c_addr)
+{
+  /* Sanity check */
+
+  DEBUGASSERT(i2c != NULL);
+
+  /* Initialize the NCP5623C device structure */
+
+  FAR struct ncp5623c_dev_s *priv =
+    (FAR struct ncp5623c_dev_s *)kmm_malloc(sizeof(struct ncp5623c_dev_s));
+
+  if (priv == NULL)
+    {
+      derr("Failed to allocate instance of ncp5623c_dev_s\n");
+      return -ENOMEM;
+    }
+
+  priv->i2c = i2c;
+  priv->i2c_addr = ncp5623c_i2c_addr;
+
+  /* Register the character driver */
+
+  int const ret = register_driver(devpath, &g_ncp5623c_fileops, 666, priv);
+  if (ret != OK)
+    {
+      derr("Failed to register driver: %d\n", ret);
+      kmm_free(priv);
+      return ret;
+    }
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: ncp5623c_read
+ *
+ * Description:
+ *   A dummy read method.  This is provided only to satisfy the VFS layer.
+ *
+ ****************************************************************************/
+
+static ssize_t ncp5623c_read(FAR struct file *filep, FAR char *buffer,
+                           size_t buflen)
+{
+  /* Return zero -- usually meaning end-of-file */
+
+  return 0;
+}
+
+/****************************************************************************
+ * Name: ncp5623c_write
+ *
+ * Description:
+ *   A dummy write method.  This is provided only to satisfy the VFS layer.
+ *
+ ****************************************************************************/
+
+static ssize_t ncp5623c_write(FAR struct file *filep, FAR const char *buffer,
+                            size_t buflen)
+{
+  dinfo("%s\n", buffer);
+
+  FAR struct inode *inode = filep->f_inode;
+  FAR struct ncp5623c_dev_s *priv = inode->i_private;
+  int ret = OK;
+
+  unsigned int red;
+  unsigned int green;
+  unsigned int blue;
+  char color[3];
+
+  /* We need to receive a string #RRGGBB = 7 bytes */
+
+  if (buffer == NULL || buflen < 7)
+    {
+      /* Well... nothing to do */
+
+      return -EINVAL;
+    }
+
+  /* Check if it is a color format */
+
+  if (buffer[0] != '#')
+    {
+      /* The color code needs to start with # */
+
+      return -EINVAL;
+    }
+
+  /* Move buffer to next character */
+
+  buffer++;
+
+  color[0] = buffer[0];
+  color[1] = buffer[1];
+  color[2] = '\0';
+
+  red = strtol(color, NULL, 16);
+
+  color[0] = buffer[2];
+  color[1] = buffer[3];
+  color[2] = '\0';
+
+  green = strtol(color, NULL, 16);
+
+  color[0] = buffer[4];
+  color[1] = buffer[5];
+  color[2] = '\0';
+
+  blue = strtol(color, NULL, 16);
+
+  /* Sane check */
+
+  if (red > NCP5623C_MAX_VALUE)
+    {
+      red = NCP5623C_MAX_VALUE;
+    }
+
+  if (green > NCP5623C_MAX_VALUE)
+    {
+      green = NCP5623C_MAX_VALUE;
+    }
+
+  if (blue > NCP5623C_MAX_VALUE)
+    {
+      blue = NCP5623C_MAX_VALUE;
+    }
+
+  /* Setup LED R */
+
+  ret = ncp5623c_i2c_write_byte(priv, NCP5623C_PWM1,
+                                 red);
+  if (ret != OK)
+    {
+      derr("Could set red led\n");
+      return ret;
+    }
+
+  /* Setup LED G */
+
+  ret = ncp5623c_i2c_write_byte(priv, NCP5623C_PWM2,
+                                 green);
+  if (ret != OK)
+    {
+      derr("Could set green led\n");
+      return ret;
+    }
+
+  /* Setup LED B */
+
+  ret = ncp5623c_i2c_write_byte(priv, NCP5623C_PWM3,
+                                 blue);
+  if (ret != OK)
+    {
+      derr("Could set blue led\n");
+      return ret;
+    }
+
+  return buflen;
+}
+
+#endif /* CONFIG_I2C && CONFIG_I2C_NCP5623C */
-- 
GitLab


From ec455a8f4cf264c78a308e83a8f65d2e93fdf117 Mon Sep 17 00:00:00 2001
From: Konstantin Berezenko 
Date: Tue, 14 Jun 2016 15:16:10 -0700
Subject: [PATCH 88/91] Forgot to add the header file for the ncp5623c driver

---
 include/nuttx/leds/ncp5623c.h | 154 ++++++++++++++++++++++++++++++++++
 1 file changed, 154 insertions(+)
 create mode 100644 include/nuttx/leds/ncp5623c.h

diff --git a/include/nuttx/leds/ncp5623c.h b/include/nuttx/leds/ncp5623c.h
new file mode 100644
index 0000000000..ef715f6192
--- /dev/null
+++ b/include/nuttx/leds/ncp5623c.h
@@ -0,0 +1,154 @@
+/****************************************************************************
+ * include/nuttx/leds/ncp5623c.h
+ * based on include/nuttx/leds/pca9635pw.c
+ *
+ *   Author: Konstantin Berzenko 
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+#ifndef __INCLUDE_NUTTX_LEDS_NCP5623C_H
+#define __INCLUDE_NUTTX_LEDS_NCP5623C_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include 
+#include 
+
+/* Configuration
+ * CONFIG_I2C - Enables support for I2C drivers
+ * CONFIG_NCP5623C - Enables support for the NCP5623C driver
+ */
+
+#if defined(CONFIG_I2C) && defined(CONFIG_NCP5623C)
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* I2C definitions */
+
+#define I2C_BUS_FREQ_HZ            (400000)
+
+/* NCP5623C register addresses */
+
+#define NCP5623C_SHUTDOWN           (0x00)             /* System Shut Down */
+#define NCP5623C_ILED               (0x1)              /* ILED current */
+#define NCP5623C_PWM1               (0x2)              /* LED 1 brightness control */
+#define NCP5623C_PWM2               (0x3)              /* LED 2 brightness control */
+#define NCP5623C_PWM3               (0x4)              /* LED 3 brightness control */
+#define NCP5623C_UPWARD             (0x5)              /* Set Up the IEND Upward */
+#define NCP5623C_DWNWRD             (0x6)              /* Set Up the IEND Downward */
+#define NCP5623C_GRAD               (0x7)              /* Set Up the Gradual Dimming */
+#define NCP5623C_MAX_REG            (0x7)              /* Highest register */
+
+#define NCP5623C_ADDRESS_MASK       (0xE0)             /* Address part of reg */
+#define NCP5623C_VALUE_MASK         (0x1F)             /* Value part of reg */
+#define NCP5623C_SHIFT_ADDRESS      (5)
+#define NCP5623C_MAX_VALUE          (0x1F)             /* Max value of all registers */
+
+#define NCP5623C_SET_REG(addr, val) (((addr << NCP5623C_SHIFT_ADDRESS) & NCP5623C_ADDRESS_MASK) \
+												 | (val & NCP5623C_VALUE_MASK)) // combine addr and val
+
+/* IOCTL commands */
+
+#define LEDIOC_SET_REG  _ULEDIOC(1)    /* Arg: ncp5623c_set_reg_s * pointer */
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+enum led_select_e
+{
+  LED_1 = NCP5623C_PWM1,
+  LED_2 = NCP5623C_PWM2,
+  LED_3 = NCP5623C_PWM3
+};
+
+/* This structure is used in an IOCTL command for setting the PWM of an individual
+ * LED. The desired LED is selected by setting the 'led' parameter accordingly
+ * whereas the 'led_pwm' field governs the brightness of the selected LED. A value
+ * of 0 (0x00) leads to a duty cycle of 0 % = LED off while a value of 255 (0xFF)
+ * leads to a duty cycle of 99.6 % = Maximum brightness.
+ */
+
+struct ncp5623c_set_reg_s
+{
+  uint8_t reg;
+  uint8_t val;
+};
+
+/****************************************************************************
+ * Forward declarations
+ ****************************************************************************/
+
+struct i2c_master_s;
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+#ifdef __cplusplus
+#define EXTERN extern "C"
+extern "C"
+{
+#else
+#define EXTERN extern
+#endif
+
+/****************************************************************************
+ * Name: ncp5623c_register
+ *
+ * Description:
+ *   Register the NCP5623C device as 'devpath'
+ *
+ * Input Parameters:
+ *   devpath - The full path to the driver to register. E.g., "/dev/leddrv0".
+ *   i2c     - An instance of the I2C interface to use to communicate
+ *             with the LM92.
+ *   ncp5623c_i2c_addr
+ *           - The I2C address of the NCP5623C.
+ *
+ * Returned Value:
+ *   Zero (OK) on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+int ncp5623c_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
+                       uint8_t const ncp5623c_i2c_addr);
+
+#undef EXTERN
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CONFIG_I2C && CONFIG_I2C_NCP5623C */
+#endif /* __INCLUDE_NUTTX_LEDS_NCP5623C_H */
-- 
GitLab


From c442336bfe95654e11a120665342cd3f9bd4999f Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 14 Jun 2016 16:26:21 -0600
Subject: [PATCH 89/91] cosmetic changes from review of last PR

---
 drivers/leds/ncp5623c.c | 83 ++++++++++++++++++-----------------------
 1 file changed, 36 insertions(+), 47 deletions(-)

diff --git a/drivers/leds/ncp5623c.c b/drivers/leds/ncp5623c.c
index 82e86d00ed..f53265fd7b 100644
--- a/drivers/leds/ncp5623c.c
+++ b/drivers/leds/ncp5623c.c
@@ -53,14 +53,12 @@
  ****************************************************************************/
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define derr llerr
-#  ifdef CONFIG_DEBUG_INFO
-#    define dinfo llinfo
-#  else
-#    define dinfo(x...)
-#  endif
+#  define derr  llerr
+#  define dwarn llwarn
+#  define dinfo llinfo
 #else
 #  define derr(x...)
+#  define dwarn(x...)
 #  define dinfo(x...)
 #endif
 
@@ -79,8 +77,7 @@ struct ncp5623c_dev_s
  ****************************************************************************/
 
 static int ncp5623c_i2c_write_byte(FAR struct ncp5623c_dev_s *priv,
-                                    uint8_t const reg_addr,
-                                    uint8_t const reg_val);
+                 uint8_t const reg_addr, uint8_t const reg_val);
 
 static int ncp5623c_open(FAR struct file *filep);
 static int ncp5623c_close(FAR struct file *filep);
@@ -118,13 +115,13 @@ static const struct file_operations g_ncp5623c_fileops =
  ****************************************************************************/
 
 static int ncp5623c_i2c_write_byte(FAR struct ncp5623c_dev_s *priv,
-                                    uint8_t const reg_addr,
-                                    uint8_t const reg_val)
+                                   uint8_t const reg_addr,
+                                   uint8_t const reg_val)
 {
   struct i2c_config_s config;
   int ret = OK;
 
-  /* assemble the 1 byte message comprised of reg_val */
+  /* Assemble the 1 byte message comprised of reg_val */
 
   uint8_t const BUFFER_SIZE = 1;
   uint8_t buffer[BUFFER_SIZE];
@@ -140,13 +137,13 @@ static int ncp5623c_i2c_write_byte(FAR struct ncp5623c_dev_s *priv,
   /* Write the data (no RESTART) */
 
   dinfo("i2c addr: 0x%02X value: 0x%02X\n", priv->i2c_addr,
-      buffer[0]);
+        buffer[0]);
 
 
   ret = i2c_write(priv->i2c, &config, buffer, BUFFER_SIZE);
   if (ret != OK)
     {
-      derr("i2c_write returned error code %d\n", ret);
+      derr("ERROR: i2c_write returned error code %d\n", ret);
       return ret;
     }
 
@@ -163,36 +160,32 @@ static int ncp5623c_i2c_write_byte(FAR struct ncp5623c_dev_s *priv,
 
 static int ncp5623c_open(FAR struct file *filep)
 {
-  dinfo("ncp5623c_open\n");
-
   FAR struct inode *inode = filep->f_inode;
   FAR struct ncp5623c_dev_s *priv = inode->i_private;
 
   int ret = -1;
 
-  /*  shutdown the NCP5623C */
+  /* Shutdown the NCP5623C */
 
-  ret = ncp5623c_i2c_write_byte(priv, NCP5623C_SHUTDOWN,
-                                 0x00);
+  ret = ncp5623c_i2c_write_byte(priv, NCP5623C_SHUTDOWN, 0x00);
   if (ret != OK)
     {
-      derr("Could not shut down the NCP5623C\n");
+      derr("ERROR: Could not shut down the NCP5623C\n");
       return ret;
     }
 
-  /*  Set up Max current */
+  /* Set up Max current */
 
-  ret = ncp5623c_i2c_write_byte(priv, NCP5623C_ILED,
-											0x1F);
+  ret = ncp5623c_i2c_write_byte(priv, NCP5623C_ILED, 0x1F);
   if (ret != OK)
     {
-      derr("Could not set up max current\n");
+      derr("ERROR: Could not set up max current\n");
       return ret;
     }
 
- // let the chip settle a bit
- usleep(1);
+  /* Let the chip settle a bit */
 
+  usleep(1);
   return OK;
 }
 
@@ -206,17 +199,13 @@ static int ncp5623c_open(FAR struct file *filep)
 
 static int ncp5623c_close(FAR struct file *filep)
 {
-  dinfo("ncp5623c_close\n");
-
   FAR struct inode *inode = filep->f_inode;
   FAR struct ncp5623c_dev_s *priv = inode->i_private;
-
   int ret = -1;
 
-  /* shut down NCP5623C */
+  /* Shut down NCP5623C */
 
-  ret =ncp5623c_i2c_write_byte(priv, NCP5623C_SHUTDOWN,
-                                0x00);
+  ret = ncp5623c_i2c_write_byte(priv, NCP5623C_SHUTDOWN, 0x00);
   if (ret != OK)
     {
       return ret;
@@ -237,7 +226,6 @@ static int ncp5623c_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 {
   FAR struct inode *inode = filep->f_inode;
   FAR struct ncp5623c_dev_s *priv = inode->i_private;
-
   int ret = OK;
 
   dinfo("cmd: %d arg: %ld\n", cmd, arg);
@@ -252,11 +240,12 @@ static int ncp5623c_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
           (FAR const struct ncp5623c_set_reg_s *)((uintptr_t)arg);
 
         DEBUGASSERT(ptr != NULL);
-        if (ptr->reg > NCP5623C_MAX_REG) {
-          derr("Unrecognized register: %d\n", ptr->reg);
-          ret = -EFAULT;
-          break;
-        }
+        if (ptr->reg > NCP5623C_MAX_REG)
+          {
+            derr("ERROR: Unrecognized register: %d\n", ptr->reg);
+            ret = -EFAULT;
+            break;
+          }
 
         ret = ncp5623c_i2c_write_byte(priv, ptr->reg, ptr->val);
       }
@@ -266,7 +255,7 @@ static int ncp5623c_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
     default:
       {
-        derr("Unrecognized cmd: %d\n", cmd);
+        derr("ERROR: Unrecognized cmd: %d\n", cmd);
         ret = -ENOTTY;
       }
       break;
@@ -298,7 +287,7 @@ static int ncp5623c_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
  ****************************************************************************/
 
 int ncp5623c_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
-                       uint8_t const ncp5623c_i2c_addr)
+                      uint8_t const ncp5623c_i2c_addr)
 {
   /* Sanity check */
 
@@ -311,7 +300,7 @@ int ncp5623c_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
 
   if (priv == NULL)
     {
-      derr("Failed to allocate instance of ncp5623c_dev_s\n");
+      derr("ERROR: Failed to allocate instance of ncp5623c_dev_s\n");
       return -ENOMEM;
     }
 
@@ -323,7 +312,7 @@ int ncp5623c_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
   int const ret = register_driver(devpath, &g_ncp5623c_fileops, 666, priv);
   if (ret != OK)
     {
-      derr("Failed to register driver: %d\n", ret);
+      derr("ERROR: Failed to register driver: %d\n", ret);
       kmm_free(priv);
       return ret;
     }
@@ -356,10 +345,8 @@ static ssize_t ncp5623c_read(FAR struct file *filep, FAR char *buffer,
  ****************************************************************************/
 
 static ssize_t ncp5623c_write(FAR struct file *filep, FAR const char *buffer,
-                            size_t buflen)
+                              size_t buflen)
 {
-  dinfo("%s\n", buffer);
-
   FAR struct inode *inode = filep->f_inode;
   FAR struct ncp5623c_dev_s *priv = inode->i_private;
   int ret = OK;
@@ -369,6 +356,8 @@ static ssize_t ncp5623c_write(FAR struct file *filep, FAR const char *buffer,
   unsigned int blue;
   char color[3];
 
+  dinfo("%s\n", buffer);
+
   /* We need to receive a string #RRGGBB = 7 bytes */
 
   if (buffer == NULL || buflen < 7)
@@ -432,7 +421,7 @@ static ssize_t ncp5623c_write(FAR struct file *filep, FAR const char *buffer,
                                  red);
   if (ret != OK)
     {
-      derr("Could set red led\n");
+      derr("ERROR: Could set red led\n");
       return ret;
     }
 
@@ -442,7 +431,7 @@ static ssize_t ncp5623c_write(FAR struct file *filep, FAR const char *buffer,
                                  green);
   if (ret != OK)
     {
-      derr("Could set green led\n");
+      derr("ERROR: Could set green led\n");
       return ret;
     }
 
@@ -452,7 +441,7 @@ static ssize_t ncp5623c_write(FAR struct file *filep, FAR const char *buffer,
                                  blue);
   if (ret != OK)
     {
-      derr("Could set blue led\n");
+      derr("ERROR: Could set blue led\n");
       return ret;
     }
 
-- 
GitLab


From 58a0fa8a1eeb070bef122607f54365165bd57a8b Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 14 Jun 2016 16:41:10 -0600
Subject: [PATCH 90/91] Trivial spacing changes from review of last PR

---
 include/nuttx/leds/ncp5623c.h | 41 ++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/include/nuttx/leds/ncp5623c.h b/include/nuttx/leds/ncp5623c.h
index ef715f6192..e78a83ee68 100644
--- a/include/nuttx/leds/ncp5623c.h
+++ b/include/nuttx/leds/ncp5623c.h
@@ -56,31 +56,32 @@
 
 /* I2C definitions */
 
-#define I2C_BUS_FREQ_HZ            (400000)
+#define I2C_BUS_FREQ_HZ        (400000)
 
 /* NCP5623C register addresses */
 
-#define NCP5623C_SHUTDOWN           (0x00)             /* System Shut Down */
-#define NCP5623C_ILED               (0x1)              /* ILED current */
-#define NCP5623C_PWM1               (0x2)              /* LED 1 brightness control */
-#define NCP5623C_PWM2               (0x3)              /* LED 2 brightness control */
-#define NCP5623C_PWM3               (0x4)              /* LED 3 brightness control */
-#define NCP5623C_UPWARD             (0x5)              /* Set Up the IEND Upward */
-#define NCP5623C_DWNWRD             (0x6)              /* Set Up the IEND Downward */
-#define NCP5623C_GRAD               (0x7)              /* Set Up the Gradual Dimming */
-#define NCP5623C_MAX_REG            (0x7)              /* Highest register */
-
-#define NCP5623C_ADDRESS_MASK       (0xE0)             /* Address part of reg */
-#define NCP5623C_VALUE_MASK         (0x1F)             /* Value part of reg */
-#define NCP5623C_SHIFT_ADDRESS      (5)
-#define NCP5623C_MAX_VALUE          (0x1F)             /* Max value of all registers */
-
-#define NCP5623C_SET_REG(addr, val) (((addr << NCP5623C_SHIFT_ADDRESS) & NCP5623C_ADDRESS_MASK) \
-												 | (val & NCP5623C_VALUE_MASK)) // combine addr and val
+#define NCP5623C_SHUTDOWN      (0x00)     /* System Shut Down */
+#define NCP5623C_ILED          (0x1)      /* ILED current */
+#define NCP5623C_PWM1          (0x2)      /* LED 1 brightness control */
+#define NCP5623C_PWM2          (0x3)      /* LED 2 brightness control */
+#define NCP5623C_PWM3          (0x4)      /* LED 3 brightness control */
+#define NCP5623C_UPWARD        (0x5)      /* Set Up the IEND Upward */
+#define NCP5623C_DWNWRD        (0x6)      /* Set Up the IEND Downward */
+#define NCP5623C_GRAD          (0x7)      /* Set Up the Gradual Dimming */
+#define NCP5623C_MAX_REG       (0x7)      /* Highest register */
+
+#define NCP5623C_ADDRESS_MASK  (0xe0)     /* Address part of reg */
+#define NCP5623C_VALUE_MASK    (0x1f)     /* Value part of reg */
+#define NCP5623C_SHIFT_ADDRESS (5)
+#define NCP5623C_MAX_VALUE     (0x1f)     /* Max value of all registers */
+
+#define NCP5623C_SET_REG(addr, val) \
+  (((addr << NCP5623C_SHIFT_ADDRESS) & NCP5623C_ADDRESS_MASK) | \
+   (val & NCP5623C_VALUE_MASK))           /* combine addr and val */
 
 /* IOCTL commands */
 
-#define LEDIOC_SET_REG  _ULEDIOC(1)    /* Arg: ncp5623c_set_reg_s * pointer */
+#define LEDIOC_SET_REG _ULEDIOC(1)        /* Arg: ncp5623c_set_reg_s * pointer */
 
 /****************************************************************************
  * Public Types
@@ -143,7 +144,7 @@ extern "C"
  ****************************************************************************/
 
 int ncp5623c_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
-                       uint8_t const ncp5623c_i2c_addr);
+                      uint8_t const ncp5623c_i2c_addr);
 
 #undef EXTERN
 #ifdef __cplusplus
-- 
GitLab


From a13577c572c21170c47aa597ebdf3214f2ef8643 Mon Sep 17 00:00:00 2001
From: Konstantin Berezenko 
Date: Tue, 14 Jun 2016 16:46:12 -0700
Subject: [PATCH 91/91] Minor fix to error messages: ncp5623c

---
 drivers/leds/ncp5623c.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/leds/ncp5623c.c b/drivers/leds/ncp5623c.c
index f53265fd7b..77c1a77dda 100644
--- a/drivers/leds/ncp5623c.c
+++ b/drivers/leds/ncp5623c.c
@@ -421,7 +421,7 @@ static ssize_t ncp5623c_write(FAR struct file *filep, FAR const char *buffer,
                                  red);
   if (ret != OK)
     {
-      derr("ERROR: Could set red led\n");
+      derr("ERROR: Could not set red led\n");
       return ret;
     }
 
@@ -431,7 +431,7 @@ static ssize_t ncp5623c_write(FAR struct file *filep, FAR const char *buffer,
                                  green);
   if (ret != OK)
     {
-      derr("ERROR: Could set green led\n");
+      derr("ERROR: Could not set green led\n");
       return ret;
     }
 
@@ -441,7 +441,7 @@ static ssize_t ncp5623c_write(FAR struct file *filep, FAR const char *buffer,
                                  blue);
   if (ret != OK)
     {
-      derr("ERROR: Could set blue led\n");
+      derr("ERROR: Could not set blue led\n");
       return ret;
     }
 
-- 
GitLab